From 580308699078789f2d7d566d5193dca3b01f3d80 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 14 Aug 2025 07:27:58 +0000 Subject: [PATCH] Import from CS git --- .gitignore | 2 +- .webkit2gtk3.metadata | 2 +- SOURCES/glib-2.56.patch | 121 ++++++++++++++-------------- SOURCES/webkitgtk-2.48.3.tar.xz.asc | 16 ---- SOURCES/webkitgtk-2.48.5.tar.xz.asc | 16 ++++ SPECS/webkit2gtk3.spec | 5 +- 6 files changed, 81 insertions(+), 81 deletions(-) delete mode 100644 SOURCES/webkitgtk-2.48.3.tar.xz.asc create mode 100644 SOURCES/webkitgtk-2.48.5.tar.xz.asc diff --git a/.gitignore b/.gitignore index d9e307e..b5abd4b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/webkitgtk-2.48.3.tar.xz +SOURCES/webkitgtk-2.48.5.tar.xz SOURCES/webkitgtk-keys.gpg diff --git a/.webkit2gtk3.metadata b/.webkit2gtk3.metadata index 4fdaa21..b2c76d0 100644 --- a/.webkit2gtk3.metadata +++ b/.webkit2gtk3.metadata @@ -1,2 +1,2 @@ -36faf2c30967db57175caf88cefd3d25781ae6d7 SOURCES/webkitgtk-2.48.3.tar.xz +5c8b55b9081c75e12d44583d4296fd7a84abc7b1 SOURCES/webkitgtk-2.48.5.tar.xz 04b10b8a486542c4551269c20b18b5c1c6cb4f94 SOURCES/webkitgtk-keys.gpg diff --git a/SOURCES/glib-2.56.patch b/SOURCES/glib-2.56.patch index 9f9e12f..9f571fd 100644 --- a/SOURCES/glib-2.56.patch +++ b/SOURCES/glib-2.56.patch @@ -1,48 +1,8 @@ -diff --git a/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c b/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c -index ef000cd2b910..432c97257048 100644 ---- a/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c -+++ b/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c -@@ -175,11 +175,12 @@ static void featureTreeViewRenderStatusData(GtkTreeViewColumn *column, GtkCellRe - { - g_autoptr(WebKitFeature) feature = NULL; - gtk_tree_model_get(model, iter, FEATURES_LIST_COLUMN_FEATURE, &feature, -1); -- g_autoptr(GEnumClass) enumClass = g_type_class_ref(WEBKIT_TYPE_FEATURE_STATUS); -+ GEnumClass *enumClass = g_type_class_ref(WEBKIT_TYPE_FEATURE_STATUS); - g_object_set(renderer, - "markup", NULL, - "text", g_enum_get_value(enumClass, webkit_feature_get_status(feature))->value_nick, - NULL); -+ g_type_class_unref(enumClass); - } - - static void featureTreeViewRenderCategoryData(GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer data) -diff --git a/Tools/MiniBrowser/gtk/main.c b/Tools/MiniBrowser/gtk/main.c -index 8be643a54151..ae82b41400b5 100644 ---- a/Tools/MiniBrowser/gtk/main.c -+++ b/Tools/MiniBrowser/gtk/main.c -@@ -273,7 +273,7 @@ static gboolean parseFeaturesOptionCallback(const gchar *option, const gchar *va - "features, prefixes '-' and '!' disable features. Names are case-insensitive. Example:\n" - "\n %s --features='!DirPseudo,+WebAnimationsCustomEffects,webgl'\n\n" - "Available features (+/- = enabled/disabled by default):\n\n", g_get_prgname()); -- g_autoptr(GEnumClass) statusEnum = g_type_class_ref(WEBKIT_TYPE_FEATURE_STATUS); -+ GEnumClass *statusEnum = g_type_class_ref(WEBKIT_TYPE_FEATURE_STATUS); - for (gsize i = 0; i < webkit_feature_list_get_length(featureList); i++) { - WebKitFeature *feature = webkit_feature_list_get(featureList, i); - g_print(" %c %s (%s)", -@@ -284,6 +284,7 @@ static gboolean parseFeaturesOptionCallback(const gchar *option, const gchar *va - g_print(": %s", webkit_feature_get_name(feature)); - g_print("\n"); - } -+ g_type_class_unref(statusEnum); - exit(EXIT_SUCCESS); - } - -From 4e525b9192df17a80b07188af6b6e7cf6476ff10 Mon Sep 17 00:00:00 2001 +From de6f529213b43a938dcaa125475cef0a1c5e786d Mon Sep 17 00:00:00 2001 From: Michael Catanzaro -Date: Fri, 4 Apr 2025 13:20:59 -0500 -Subject: [PATCH] Revert "[GLib] Remove all GLIB_CHECK_VERSION conditionals" +Date: Fri, 4 Apr 2025 13:58:05 -0500 +Subject: [PATCH] Build against GLib 2.56 -This reverts commit 85b637b69f1c3a6242420b198d1c173477ce0f22. --- Source/WTF/wtf/URL.h | 4 ++-- Source/WTF/wtf/glib/GRefPtr.cpp | 2 ++ @@ -58,8 +18,9 @@ This reverts commit 85b637b69f1c3a6242420b198d1c173477ce0f22. .../glib/WebKitOverridingResolver.cpp | 4 ++++ Source/WebKit/Shared/glib/ArgumentCodersGLib.cpp | 6 ++++++ Source/cmake/OptionsGTK.cmake | 13 ++++++++++++- - Source/cmake/OptionsWPE.cmake | 13 ++++++++++++- - 15 files changed, 94 insertions(+), 4 deletions(-) + Tools/MiniBrowser/gtk/BrowserSettingsDialog.c | 3 ++- + Tools/MiniBrowser/gtk/main.c | 3 ++- + 16 files changed, 86 insertions(+), 5 deletions(-) diff --git a/Source/WTF/wtf/URL.h b/Source/WTF/wtf/URL.h index 8a7864508a8e..f065677c68ad 100644 @@ -392,7 +353,7 @@ index 150d74ed0296..f461e3c695fe 100644 resolverClass->lookup_by_address_async = webkitOverridingResolverLookupByAddressAsync; resolverClass->lookup_by_address_finish = webkitOverridingResolverLookupByAddressFinish; diff --git a/Source/WebKit/Shared/glib/ArgumentCodersGLib.cpp b/Source/WebKit/Shared/glib/ArgumentCodersGLib.cpp -index a73466be12f1..9ab0cfb6f440 100644 +index 1bf17f0f9b67..ef9f5c2e45f0 100644 --- a/Source/WebKit/Shared/glib/ArgumentCodersGLib.cpp +++ b/Source/WebKit/Shared/glib/ArgumentCodersGLib.cpp @@ -121,11 +121,13 @@ void ArgumentCoder>::encode(Encoder& encoder, const GRe @@ -425,7 +386,7 @@ index a73466be12f1..9ab0cfb6f440 100644 GType certificateType = g_tls_backend_get_certificate_type(g_tls_backend_get_default()); GRefPtr certificate; -@@ -156,8 +160,10 @@ std::optional> ArgumentCoder>: +@@ -157,8 +161,10 @@ std::optional> ArgumentCoder>: certificateType, nullptr, nullptr, "certificate", certificateData.get(), "issuer", issuer, @@ -435,11 +396,19 @@ index a73466be12f1..9ab0cfb6f440 100644 +#endif nullptr))); issuer = certificate.get(); - } + i++; diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index 4a285e849cfd..0aca16c1d25f 100644 +index 8a611c26a0ac..a74c49f46471 100644 --- a/Source/cmake/OptionsGTK.cmake +++ b/Source/cmake/OptionsGTK.cmake +@@ -7,7 +7,6 @@ SET_PROJECT_VERSION(2 48 5) + + set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") + +-find_package(GLIB 2.70.0 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule) + find_package(Cairo 1.14.0 REQUIRED) + find_package(LibGcrypt 1.7.0 REQUIRED) + find_package(Libtasn1 REQUIRED) @@ -205,6 +204,13 @@ else () SET_AND_EXPOSE_TO_BUILD(ENABLE_2022_GLIB_API OFF) endif () @@ -466,17 +435,45 @@ index 4a285e849cfd..0aca16c1d25f 100644 if (ENABLE_GAMEPAD) find_package(Manette 0.2.4) if (NOT Manette_FOUND) +diff --git a/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c b/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c +index ef000cd2b910..432c97257048 100644 +--- a/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c ++++ b/Tools/MiniBrowser/gtk/BrowserSettingsDialog.c +@@ -175,11 +175,12 @@ static void featureTreeViewRenderStatusData(GtkTreeViewColumn *column, GtkCellRe + { + g_autoptr(WebKitFeature) feature = NULL; + gtk_tree_model_get(model, iter, FEATURES_LIST_COLUMN_FEATURE, &feature, -1); +- g_autoptr(GEnumClass) enumClass = g_type_class_ref(WEBKIT_TYPE_FEATURE_STATUS); ++ GEnumClass *enumClass = g_type_class_ref(WEBKIT_TYPE_FEATURE_STATUS); + g_object_set(renderer, + "markup", NULL, + "text", g_enum_get_value(enumClass, webkit_feature_get_status(feature))->value_nick, + NULL); ++ g_type_class_unref(enumClass); + } + + static void featureTreeViewRenderCategoryData(GtkTreeViewColumn *column, GtkCellRenderer *renderer, GtkTreeModel *model, GtkTreeIter *iter, gpointer data) +diff --git a/Tools/MiniBrowser/gtk/main.c b/Tools/MiniBrowser/gtk/main.c +index 8433f5360dc4..9e76cb6cde5d 100644 +--- a/Tools/MiniBrowser/gtk/main.c ++++ b/Tools/MiniBrowser/gtk/main.c +@@ -276,7 +276,7 @@ static gboolean parseFeaturesOptionCallback(const gchar *option, const gchar *va + "features, prefixes '-' and '!' disable features. Names are case-insensitive. Example:\n" + "\n %s --features='!DirPseudo,+WebAnimationsCustomEffects,webgl'\n\n" + "Available features (+/- = enabled/disabled by default):\n\n", g_get_prgname()); +- g_autoptr(GEnumClass) statusEnum = g_type_class_ref(WEBKIT_TYPE_FEATURE_STATUS); ++ GEnumClass *statusEnum = g_type_class_ref(WEBKIT_TYPE_FEATURE_STATUS); + for (gsize i = 0; i < webkit_feature_list_get_length(featureList); i++) { + WebKitFeature *feature = webkit_feature_list_get(featureList, i); + g_print(" %c %s (%s)", +@@ -287,6 +287,7 @@ static gboolean parseFeaturesOptionCallback(const gchar *option, const gchar *va + g_print(": %s", webkit_feature_get_name(feature)); + g_print("\n"); + } ++ g_type_class_unref(statusEnum); + exit(EXIT_SUCCESS); + } + -- -2.49.0 -diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index 6c39538ba6fc..0a30e0c4c7c1 100644 ---- a/Source/cmake/OptionsGTK.cmake -+++ b/Source/cmake/OptionsGTK.cmake -@@ -7,7 +7,6 @@ SET_PROJECT_VERSION(2 48 1) - - set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") - --find_package(GLIB 2.70.0 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule) - find_package(Cairo 1.14.0 REQUIRED) - find_package(LibGcrypt 1.7.0 REQUIRED) - find_package(Libtasn1 REQUIRED) +2.50.1 + diff --git a/SOURCES/webkitgtk-2.48.3.tar.xz.asc b/SOURCES/webkitgtk-2.48.3.tar.xz.asc deleted file mode 100644 index 663f521..0000000 --- a/SOURCES/webkitgtk-2.48.3.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEAToBJ6ycZbNP+mJSbBAJtpOXU5MFAmg26CoACgkQbBAJtpOX -U5N7Ng/9HAO3gM/ND9M8WW5/OChxZCZ7Xe88UBDd3ncNeDvIEsq/A3WeVId7yXpr -ta1ynsZM3ws/3zaEWNIXHoCDgDXeca0tYCiJN0VkFxXZqDpbgM8IaEZbF0HibdJA -/lX4YyF5mTvM1h0lTrdHpDHUxdqKRRNKX5VdlDdRSZyNAkJsP+ryeGudUW62MvP4 -VBXvK2ZSLdBFTY+ddc02MOaGKg6ToVo2PMQtDMJd4ujjQZ+F2H66Cbp4lthdx8JA -skcfHbVjsqLsUwBPtmYIEueIYn0x8mwyxS9ZIkVtsC2sMS9KyLOv5Tzig7VDaGJy -YcrVWUWc5OSKa23QZrCWqIkYyhlTGlhmcVHgO3C9mXjmAt8EGycrSW4HWFMeq6d6 -pz7otK0ZGWqaJVybpJcJ4QtLn5i+qf4wEIotQIBwOnb3EZiJ4aKpy5B+auS9q+xl -xpHP7eEl8r+R0CywwWYHFVRJn22jYSzcD5rF8lp3B4vj2Pn8sWN95ineUHICp9um -8Z4DRDjhwmOgtg4Fsnp0ZOLCqsYua7psJQ24RZ8MTxzReGbX7kOlE9l2IvsPoiR/ -9ENPaYChpeChaIlv1RsyvX785wl8mFxZLrxGG3JXf0kcDLd5SQ1xv2W0n4zqrzvO -zj2Yozkv/BdXPXiWuhCIF69qIlgxs2UM6f8AJfJ5/StDoPpY2aQ= -=3Phy ------END PGP SIGNATURE----- diff --git a/SOURCES/webkitgtk-2.48.5.tar.xz.asc b/SOURCES/webkitgtk-2.48.5.tar.xz.asc new file mode 100644 index 0000000..f7337db --- /dev/null +++ b/SOURCES/webkitgtk-2.48.5.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEAToBJ6ycZbNP+mJSbBAJtpOXU5MFAmiMe7UACgkQbBAJtpOX +U5MrwA//TJ0W7S9Nbs2p4OIs6lQv+ntLrTVZAKFu+AUYJ/r3sUp9awGGivS37ZC8 +gh33JDqzt9pm1sVXGNTB8NmEcRUu9QfsEsJUUEnk7n6dLmQr8Cb7aXK8b4ma8Mgo +zLpuU5rHPtZ5Cx7Y3wXw0mNBf2ZcvHrFfVhDrrgziIMUu9dcuOVI3inEvfh8CKcO +a+j+j1qNvxLGgPOfkXZH/cvGckCLxJuQ+/aX0k/3Top6mSHJTeMxtU7K2bSkgQmC +GoSoRqOFLPBp2UxAKWYcgr8kh7wjt5mov3NtNyMmCC6bjwtwX3ClLjgQfHekS5Iu +niPm9Q/FoF1JSbiXrpPf8KZVTUg9D1lzQFvJYHl9w5gWGE6wgjxX7TM1ooYvW0Gr +v9FBDIXGlXid+hBx8j0igRQW/V6sH5uSt690m5ElZj4KkJ6+uhLkIMcSGc6HYWhI +vtCNytTGd9wsAB97bYvcJv/qEW94hnGSdE0HvarAcdZbO52oljOAtqzaYi7Hw111 +expNG3FU98UTWX0LHsv1c5/z9ph7x5EFyipkBML5J9LT8KV/+IrXPBkXQ45yaf3D +s+KpRlkxFGj9uFhRgl4OLR4UrSfgEkrAPnVud2zrIik+A4mHgX9y8FKmktFioJhU +faiEXzPzrHgMeEtlJW8vvWVoO9ZgIsYKma9sOn8aU/f7yjFak4I= +=KRFp +-----END PGP SIGNATURE----- diff --git a/SPECS/webkit2gtk3.spec b/SPECS/webkit2gtk3.spec index 72da4c7..f44b5ad 100644 --- a/SPECS/webkit2gtk3.spec +++ b/SPECS/webkit2gtk3.spec @@ -6,7 +6,7 @@ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g')- Name: webkit2gtk3 -Version: 2.48.3 +Version: 2.48.5 Release: 1%{?dist} Summary: GTK Web content engine library @@ -312,6 +312,9 @@ export NINJA_STATUS="[%f/%t][%e] " %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir %changelog +* Fri Aug 08 2025 Michael Catanzaro - 2.48.5-1 +- Update to 2.48.5 + * Fri May 30 2025 Michael Catanzaro - 2.48.3-1 - Update to 2.48.3