Skip to content

Commit

Permalink
www/*chromium: update to 117.0.5938.132
Browse files Browse the repository at this point in the history
  • Loading branch information
Robert Nagy authored and Robert Nagy committed Sep 29, 2023
1 parent a35f4a1 commit c473615
Show file tree
Hide file tree
Showing 13 changed files with 78 additions and 42 deletions.
2 changes: 1 addition & 1 deletion www/chromium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= chromium
PORTVERSION= 117.0.5938.92
PORTVERSION= 117.0.5938.132
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
https://nerd.hu/distfiles/:external
Expand Down
14 changes: 7 additions & 7 deletions www/chromium/distinfo
@@ -1,9 +1,9 @@
TIMESTAMP = 1695449336
SHA256 (chromium-117.0.5938.92.tar.xz) = 65ca491927902557cafc384c879b567c3728b06fc8ea0c46c45e2f0ce543342c
SIZE (chromium-117.0.5938.92.tar.xz) = 3139036620
SHA256 (chrome-linux-117.0.5938.92-llvm13.profdata.tar.xz) = ab400b9b453a90da93eb1f8599e2b2fc489eaea13041b2588b68e7bfbb8d33a1
SIZE (chrome-linux-117.0.5938.92-llvm13.profdata.tar.xz) = 28701408
SHA256 (chromium-117.0.5938.92-testdata.tar.xz) = b4e532a5a6b4d2d170357ad2cfe95102a3b3ee69b535a46df9aed3a64c700444
SIZE (chromium-117.0.5938.92-testdata.tar.xz) = 269661528
TIMESTAMP = 1695982966
SHA256 (chromium-117.0.5938.132.tar.xz) = 28f077123a51942839a9ec518a64930cbc192186e799ef8ccdef19c93ddbaead
SIZE (chromium-117.0.5938.132.tar.xz) = 3141005880
SHA256 (chrome-linux-117.0.5938.132-llvm13.profdata.tar.xz) = 89d863f4e7b7b19a09cf92cf2f40bede07c0bbff557f130b60d59fd731ce40f2
SIZE (chrome-linux-117.0.5938.132-llvm13.profdata.tar.xz) = 28667668
SHA256 (chromium-117.0.5938.132-testdata.tar.xz) = bc297e44601f9d9320723d715329e53ed69f3683930edc56671ac626b24248ec
SIZE (chromium-117.0.5938.132-testdata.tar.xz) = 269841680
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
12 changes: 6 additions & 6 deletions www/chromium/files/patch-chrome_app_generated__resources.grd
@@ -1,4 +1,4 @@
--- chrome/app/generated_resources.grd.orig 2023-09-13 12:11:42 UTC
--- chrome/app/generated_resources.grd.orig 2023-09-29 10:14:06 UTC
+++ chrome/app/generated_resources.grd
@@ -2,7 +2,7 @@

Expand Down Expand Up @@ -45,7 +45,7 @@
<message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="Dialog content that educates users that Chrome Apps will soon no longer launch.">
Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available.
</message>
@@ -10361,7 +10361,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
@@ -10364,7 +10364,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
<message name="IDS_APP_MENU_BUTTON_UPDATE" desc="Short label next to app-menu button when an update is available.">
Update
</message>
Expand All @@ -54,7 +54,7 @@
<message name="IDS_APP_MENU_BUTTON_UPDATE_ALT1" desc="Alternate short label next to app-menu button when an update is available.">
Finish update
</message>
@@ -10700,7 +10700,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
@@ -10703,7 +10703,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
Google Pay
</message>

Expand All @@ -63,7 +63,7 @@
<message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
Use system title bar and borders
</message>
@@ -11685,7 +11685,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
@@ -11688,7 +11688,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
</message>

<!-- Device Trust Consent dialog -->
Expand All @@ -72,7 +72,7 @@
<message name="IDS_DEVICE_SIGNALS_CONSENT_DIALOG_TITLE" desc="Title of the dialog shown when user consent is required to share device signals.">
Share information about your device?
</message>
@@ -12084,7 +12084,7 @@ Please help our engineers fix this problem. Tell us wh
@@ -12087,7 +12087,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>

Expand All @@ -81,7 +81,7 @@
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
Minimize
</message>
@@ -14306,7 +14306,7 @@ Please help our engineers fix this problem. Tell us wh
@@ -14309,7 +14309,7 @@ Please help our engineers fix this problem. Tell us wh
Open Anyway
</message>

Expand Down
@@ -0,0 +1,13 @@
--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2023-09-29 10:14:06 UTC
+++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
@@ -280,7 +280,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
} else if (strcmp(os, "linux") == 0) {
info->os = extensions::api::runtime::PlatformOs::kLinux;
} else if (strcmp(os, "openbsd") == 0) {
- info->os = extensions::api::runtime::PlatformOs::kOpenbsd;
+ info->os = extensions::api::runtime::PlatformOs::kLinux;
+ } else if (strcmp(os, "freebsd") == 0) {
+ info->os = extensions::api::runtime::PlatformOs::kLinux;
} else if (strcmp(os, "fuchsia") == 0) {
info->os = extensions::api::runtime::PlatformOs::kFuchsia;
} else {
@@ -1,6 +1,6 @@
--- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig 2023-09-13 12:11:42 UTC
--- chrome/browser/ui/views/frame/tab_strip_region_view.cc.orig 2023-09-29 10:14:06 UTC
+++ chrome/browser/ui/views/frame/tab_strip_region_view.cc
@@ -164,7 +164,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr
@@ -170,7 +170,7 @@ TabStripRegionView::TabStripRegionView(std::unique_ptr

// TODO(crbug.com/1052397): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
Expand Down
@@ -1,6 +1,6 @@
--- components/password_manager/core/browser/login_database.cc.orig 2023-09-13 12:11:42 UTC
--- components/password_manager/core/browser/login_database.cc.orig 2023-09-29 10:14:06 UTC
+++ components/password_manager/core/browser/login_database.cc
@@ -960,7 +960,7 @@ std::string GeneratePlaceholders(size_t count) {
@@ -1046,7 +1046,7 @@ std::string GeneratePlaceholders(size_t count) {
return result;
}

Expand All @@ -9,7 +9,7 @@
// Fills |form| with necessary data required to be removed from the database
// and returns it.
PasswordForm GetFormForRemoval(sql::Statement& statement) {
@@ -977,7 +977,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme
@@ -1063,7 +1063,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme
// Whether we should try to return the decryptable passwords while the
// encryption service fails for some passwords.
bool ShouldReturnPartialPasswords() {
Expand All @@ -18,7 +18,7 @@
return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords);
#else
return false;
@@ -1832,7 +1832,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
@@ -1918,7 +1918,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
}

DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() {
Expand Down
9 changes: 7 additions & 2 deletions www/chromium/files/patch-net_dns_address__info.cc
@@ -1,11 +1,16 @@
--- net/dns/address_info.cc.orig 2023-09-13 12:11:42 UTC
--- net/dns/address_info.cc.orig 2023-09-29 10:14:06 UTC
+++ net/dns/address_info.cc
@@ -77,7 +77,7 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get(
@@ -77,8 +77,12 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get(
// error.
// http://crbug.com/134142
err = ERR_NAME_NOT_RESOLVED;
-#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FREEBSD)
+#elif BUILDFLAG(IS_POSIX)
+#ifdef EAI_NODATA
if (os_error != EAI_NONAME && os_error != EAI_NODATA)
+#else
+ if (os_error != EAI_NONAME)
+#endif
err = ERR_NAME_RESOLUTION_FAILED;
#endif

2 changes: 1 addition & 1 deletion www/ungoogled-chromium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= ungoogled-chromium
PORTVERSION= 117.0.5938.92
PORTVERSION= 117.0.5938.132
UGVERSION= ${DISTVERSION}-1
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
Expand Down
14 changes: 7 additions & 7 deletions www/ungoogled-chromium/distinfo
@@ -1,9 +1,9 @@
TIMESTAMP = 1695642703
SHA256 (chromium-117.0.5938.92.tar.xz) = 65ca491927902557cafc384c879b567c3728b06fc8ea0c46c45e2f0ce543342c
SIZE (chromium-117.0.5938.92.tar.xz) = 3139036620
SHA256 (ungoogled-chromium-117.0.5938.92-1.tar.gz) = e2def21268ba379e5cba3709239f9ce57b7aa4fc4e54709372529284793d49c2
SIZE (ungoogled-chromium-117.0.5938.92-1.tar.gz) = 651900
SHA256 (chromium-117.0.5938.92-testdata.tar.xz) = b4e532a5a6b4d2d170357ad2cfe95102a3b3ee69b535a46df9aed3a64c700444
SIZE (chromium-117.0.5938.92-testdata.tar.xz) = 269661528
TIMESTAMP = 1695983108
SHA256 (chromium-117.0.5938.132.tar.xz) = 28f077123a51942839a9ec518a64930cbc192186e799ef8ccdef19c93ddbaead
SIZE (chromium-117.0.5938.132.tar.xz) = 3141005880
SHA256 (ungoogled-chromium-117.0.5938.132-1.tar.gz) = f987bf804a78707b76676476dc07d61508e36acbb5bd99f07d6934c823109d91
SIZE (ungoogled-chromium-117.0.5938.132-1.tar.gz) = 651922
SHA256 (chromium-117.0.5938.132-testdata.tar.xz) = bc297e44601f9d9320723d715329e53ed69f3683930edc56671ac626b24248ec
SIZE (chromium-117.0.5938.132-testdata.tar.xz) = 269841680
SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
@@ -1,4 +1,4 @@
--- chrome/app/generated_resources.grd.orig 2023-09-17 07:59:53 UTC
--- chrome/app/generated_resources.grd.orig 2023-09-29 10:30:11 UTC
+++ chrome/app/generated_resources.grd
@@ -2,7 +2,7 @@

Expand Down Expand Up @@ -45,7 +45,7 @@
<message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="Dialog content that educates users that Chrome Apps will soon no longer launch.">
Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available.
</message>
@@ -10361,7 +10361,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
@@ -10364,7 +10364,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
<message name="IDS_APP_MENU_BUTTON_UPDATE" desc="Short label next to app-menu button when an update is available.">
Update
</message>
Expand All @@ -54,7 +54,7 @@
<message name="IDS_APP_MENU_BUTTON_UPDATE_ALT1" desc="Alternate short label next to app-menu button when an update is available.">
Finish update
</message>
@@ -10700,7 +10700,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
@@ -10703,7 +10703,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
Google Pay
</message>

Expand All @@ -63,7 +63,7 @@
<message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
Use system title bar and borders
</message>
@@ -11685,7 +11685,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
@@ -11688,7 +11688,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
</message>

<!-- Device Trust Consent dialog -->
Expand All @@ -72,7 +72,7 @@
<message name="IDS_DEVICE_SIGNALS_CONSENT_DIALOG_TITLE" desc="Title of the dialog shown when user consent is required to share device signals.">
Share information about your device?
</message>
@@ -12084,7 +12084,7 @@ Please help our engineers fix this problem. Tell us wh
@@ -12087,7 +12087,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>

Expand All @@ -81,7 +81,7 @@
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
Minimize
</message>
@@ -14306,7 +14306,7 @@ Please help our engineers fix this problem. Tell us wh
@@ -14309,7 +14309,7 @@ Please help our engineers fix this problem. Tell us wh
Open Anyway
</message>

Expand Down
@@ -0,0 +1,13 @@
--- chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc.orig 2023-09-29 10:30:11 UTC
+++ chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
@@ -280,7 +280,9 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(Platfor
} else if (strcmp(os, "linux") == 0) {
info->os = extensions::api::runtime::PlatformOs::kLinux;
} else if (strcmp(os, "openbsd") == 0) {
- info->os = extensions::api::runtime::PlatformOs::kOpenbsd;
+ info->os = extensions::api::runtime::PlatformOs::kLinux;
+ } else if (strcmp(os, "freebsd") == 0) {
+ info->os = extensions::api::runtime::PlatformOs::kLinux;
} else if (strcmp(os, "fuchsia") == 0) {
info->os = extensions::api::runtime::PlatformOs::kFuchsia;
} else {
@@ -1,6 +1,6 @@
--- components/password_manager/core/browser/login_database.cc.orig 2023-09-17 07:59:53 UTC
--- components/password_manager/core/browser/login_database.cc.orig 2023-09-29 10:30:11 UTC
+++ components/password_manager/core/browser/login_database.cc
@@ -960,7 +960,7 @@ std::string GeneratePlaceholders(size_t count) {
@@ -1046,7 +1046,7 @@ std::string GeneratePlaceholders(size_t count) {
return result;
}

Expand All @@ -9,7 +9,7 @@
// Fills |form| with necessary data required to be removed from the database
// and returns it.
PasswordForm GetFormForRemoval(sql::Statement& statement) {
@@ -977,7 +977,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme
@@ -1063,7 +1063,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme
// Whether we should try to return the decryptable passwords while the
// encryption service fails for some passwords.
bool ShouldReturnPartialPasswords() {
Expand All @@ -18,7 +18,7 @@
return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords);
#else
return false;
@@ -1832,7 +1832,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
@@ -1918,7 +1918,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
}

DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() {
Expand Down
9 changes: 7 additions & 2 deletions www/ungoogled-chromium/files/patch-net_dns_address__info.cc
@@ -1,11 +1,16 @@
--- net/dns/address_info.cc.orig 2023-09-17 07:59:53 UTC
--- net/dns/address_info.cc.orig 2023-09-29 10:30:11 UTC
+++ net/dns/address_info.cc
@@ -77,7 +77,7 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get(
@@ -77,8 +77,12 @@ AddressInfo::AddressInfoAndResult AddressInfo::Get(
// error.
// http://crbug.com/134142
err = ERR_NAME_NOT_RESOLVED;
-#elif BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_FREEBSD)
+#elif BUILDFLAG(IS_POSIX)
+#ifdef EAI_NODATA
if (os_error != EAI_NONAME && os_error != EAI_NODATA)
+#else
+ if (os_error != EAI_NONAME)
+#endif
err = ERR_NAME_RESOLUTION_FAILED;
#endif

0 comments on commit c473615

Please sign in to comment.