diff --git a/webkitgtk-2.42.1.tar.xz b/webkitgtk-2.42.3.tar.xz similarity index 68% rename from webkitgtk-2.42.1.tar.xz rename to webkitgtk-2.42.3.tar.xz index a59c71e01528a276a24c05c1c3473f52a9ddfbc8..096bd2142d1906c5b1ad9f4420bb6a389274087c 100644 Binary files a/webkitgtk-2.42.1.tar.xz and b/webkitgtk-2.42.3.tar.xz differ diff --git a/webkitgtk.spec b/webkitgtk.spec index 5584405a8e08c57f0275eab38b54ed2bf15da725..f799c4e21719b03c27bce0bcc1f45cbdcbcbfa78 100644 --- a/webkitgtk.spec +++ b/webkitgtk.spec @@ -13,7 +13,7 @@ %global with_gamepad 0 Name: webkitgtk -Version: 2.42.1 +Version: 2.42.3 Release: %{anolis_release}%{?dist} Summary: GTK Web content engine library @@ -53,9 +53,7 @@ BuildRequires: pkgconfig(enchant-2) BuildRequires: pkgconfig(epoxy) BuildRequires: pkgconfig(fontconfig) >= 2.8.0 BuildRequires: pkgconfig(freetype2) >= 2.4.2 -BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glib-2.0) >= 2.56.4 -BuildRequires: pkgconfig(glesv2) BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(gstreamer-1.0) >= 1.16.2 BuildRequires: pkgconfig(gstreamer-plugins-bad-1.0) @@ -87,7 +85,6 @@ BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libsecret-1) -BuildRequires: pkgconfig(libsoup-2.4) >= 2.54.0 BuildRequires: pkgconfig(libsoup-3.0) >= 3.0.4 BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libtasn1) @@ -108,7 +105,7 @@ BuildRequires: pkgconfig(wpebackend-fdo-1.0) BuildRequires: pkgconfig(xt) # Filter out provides for private libraries -%global __provides_exclude_from ^(%{_libdir}/webkit2gtk-4\\.0/.*\\.so|%{_libdir}/webkit2gtk-4\\.1/.*\\.so|%{_libdir}/webkitgtk-6\\.0/.*\\.so)$ +%global __provides_exclude_from ^(%{_libdir}/webkit2gtk-4\\.1/.*\\.so|%{_libdir}/webkitgtk-6\\.0/.*\\.so)$ %description WebKitGTK is the port of the portable web rendering engine WebKit to the @@ -118,6 +115,7 @@ GTK platform. Summary: WebKitGTK for GTK 4 Requires: javascriptcoregtk6.0 = %{version}-%{release} Requires: bubblewrap +Requires: libGLES Requires: xdg-dbus-proxy Recommends: geoclue2 Recommends: gstreamer1-plugins-bad-free @@ -136,6 +134,7 @@ GTK platform. This package contains WebKitGTK for GTK 4. Summary: WebKitGTK for GTK 3 and libsoup 3 Requires: javascriptcoregtk4.1 = %{version}-%{release} Requires: bubblewrap +Requires: libGLES Requires: xdg-dbus-proxy Recommends: geoclue2 Recommends: gstreamer1-plugins-bad-free @@ -149,27 +148,6 @@ Provides: bundled(xdgmime) WebKitGTK is the port of the WebKit web rendering engine to the GTK platform. This package contains WebKitGTK for GTK 3 and libsoup 3. -%package -n webkit2gtk4.0 -Summary: WebKitGTK for GTK 3 and libsoup 2 -Requires: javascriptcoregtk4.0 = %{version}-%{release} -Requires: bubblewrap -Requires: xdg-dbus-proxy -Recommends: geoclue2 -Recommends: gstreamer1-plugins-bad-free -Recommends: gstreamer1-plugins-good -Recommends: xdg-desktop-portal-gtk -Provides: bundled(angle) -Provides: bundled(pdfjs) -Provides: bundled(xdgmime) -Obsoletes: webkitgtk4 < %{version}-%{release} -Provides: webkitgtk4 = %{version}-%{release} -Obsoletes: webkit2gtk3 < %{version}-%{release} -Provides: webkit2gtk3 = %{version}-%{release} - -%description -n webkit2gtk4.0 -WebKitGTK is the port of the WebKit web rendering engine to the -GTK platform. This package contains WebKitGTK for GTK 3 and libsoup 2. - %package -n webkitgtk6.0-devel Summary: Development files for webkitgtk6.0 Requires: webkitgtk6.0 = %{version}-%{release} @@ -191,20 +169,6 @@ Requires: javascriptcoregtk4.1-devel = %{version}-%{release} The webkit2gtk4.1-devel package contains libraries, build data, and header files for developing applications that use webkit2gtk4.1. -%package -n webkit2gtk4.0-devel -Summary: Development files for webkit2gtk4.0 -Requires: webkit2gtk4.0 = %{version}-%{release} -Requires: javascriptcoregtk4.0 = %{version}-%{release} -Requires: javascriptcoregtk4.0-devel = %{version}-%{release} -Obsoletes: webkitgtk4-devel < %{version}-%{release} -Provides: webkitgtk4-devel = %{version}-%{release} -Obsoletes: webkit2gtk3-devel < %{version}-%{release} -Provides: webkit2gtk3-devel = %{version}-%{release} - -%description -n webkit2gtk4.0-devel -The webkit2gtk4.0-devel package contains libraries, build data, and header -files for developing applications that use webkit2gtk4.0. - %if %{with docs} %package -n webkitgtk6.0-doc Summary: Documentation files for webkit2gtk5.0 @@ -225,18 +189,6 @@ Recommends: gi-docgen-fonts %description -n webkit2gtk4.1-doc This package contains developer documentation for webkit2gtk4.1. -%package -n webkit2gtk4.0-doc -Summary: Documentation files for webkit2gtk4.0 -BuildArch: noarch -Requires: webkit2gtk4.0 = %{version}-%{release} -Obsoletes: webkitgtk4-doc < %{version}-%{release} -Provides: webkitgtk4-doc = %{version}-%{release} -Obsoletes: webkit2gtk3-doc < %{version}-%{release} -Provides: webkit2gtk3-doc = %{version}-%{release} -Recommends: gi-docgen-fonts - -%description -n webkit2gtk4.0-doc -This package contains developer documentation for webkit2gtk4.0. %endif %package -n javascriptcoregtk6.0 @@ -253,16 +205,6 @@ Obsoletes: webkit2gtk4.1-jsc < %{version}-%{release} %description -n javascriptcoregtk4.1 This package contains the JavaScript engine from webkit2gtk4.1. -%package -n javascriptcoregtk4.0 -Summary: JavaScript engine from webkit2gtk4.0 -Obsoletes: webkitgtk4-jsc < %{version}-%{release} -Provides: webkitgtk4-jsc = %{version}-%{release} -Obsoletes: webkit2gtk3-jsc < %{version}-%{release} -Provides: webkit2gtk3-jsc = %{version}-%{release} - -%description -n javascriptcoregtk4.0 -This package contains the JavaScript engine from webkit2gtk4.0. - %package -n javascriptcoregtk6.0-devel Summary: Development files for JavaScript engine from webkitgtk6.0 Requires: javascriptcoregtk6.0 = %{version}-%{release} @@ -281,18 +223,6 @@ Obsoletes: webkit2gtk4.1-jsc-devel < %{version}-%{release} The javascriptcoregtk4.1-devel package contains libraries, build data, and header files for developing applications that use JavaScript engine from webkit2gtk-4.1. -%package -n javascriptcoregtk4.0-devel -Summary: Development files for JavaScript engine from webkit2gtk4.0 -Requires: javascriptcoregtk4.0 = %{version}-%{release} -Obsoletes: webkitgtk4-jsc-devel < %{version}-%{release} -Provides: webkitgtk4-jsc-devel = %{version}-%{release} -Obsoletes: webkit2gtk3-jsc-devel < %{version}-%{release} -Provides: webkit2gtk3-jsc-devel = %{version}-%{release} - -%description -n javascriptcoregtk4.0-devel -The javascriptcoregtk4.0-devel package contains libraries, build data, and header -files for developing applications that use JavaScript engine from webkit2gtk-4.0. - %prep %autosetup -p1 -n webkitgtk-%{version} @@ -350,34 +280,12 @@ rm -rf Source/ThirdParty/qunit/ %endif %{nil} -%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0 -%cmake \ - -GNinja \ - -DPORT=GTK \ - -DCMAKE_BUILD_TYPE=Release \ - -DUSE_SOUP2=ON \ - -DENABLE_WEBDRIVER=OFF \ -%if %{without docs} - -DENABLE_DOCUMENTATION=OFF \ -%endif -%if !0%{?with_gamepad} - -DENABLE_GAMEPAD=OFF \ -%endif -%ifarch aarch64 - -DUSE_64KB_PAGE_BLOCK=ON \ -%endif - %{nil} - %define _vpath_builddir %{_vendor}-%{_target_os}-build/webkitgtk-6.0 -export NINJA_STATUS="[1/3][%f/%t %es] " +export NINJA_STATUS="[1/2][%f/%t %es] " %cmake_build %define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1 -export NINJA_STATUS="[2/3][%f/%t %es] " -%cmake_build - -%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0 -export NINJA_STATUS="[3/3][%f/%t %es] " +export NINJA_STATUS="[2/2][%f/%t %es] " %cmake_build %install @@ -387,12 +295,8 @@ export NINJA_STATUS="[3/3][%f/%t %es] " %define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1 %cmake_install -%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0 -%cmake_install - %find_lang WebKitGTK-6.0 %find_lang WebKitGTK-4.1 -%find_lang WebKitGTK-4.0 # Finally, copy over and rename various files for %%license inclusion %add_to_license_files Source/JavaScriptCore/COPYING.LIB @@ -438,21 +342,6 @@ export NINJA_STATUS="[3/3][%f/%t %es] " %exclude %{_libexecdir}/webkit2gtk-4.1/MiniBrowser %exclude %{_libexecdir}/webkit2gtk-4.1/jsc -%files -n webkit2gtk4.0 -f WebKitGTK-4.0.lang -%license _license_files/*ThirdParty* -%license _license_files/*WebCore* -%license _license_files/*WebInspectorUI* -%license _license_files/*WTF* -%{_libdir}/libwebkit2gtk-4.0.so.37* -%dir %{_libdir}/girepository-1.0 -%{_libdir}/girepository-1.0/WebKit2-4.0.typelib -%{_libdir}/girepository-1.0/WebKit2WebExtension-4.0.typelib -%{_libdir}/webkit2gtk-4.0/ -%{_libexecdir}/webkit2gtk-4.0/ -%exclude %{_libexecdir}/webkit2gtk-4.0/MiniBrowser -%exclude %{_libexecdir}/webkit2gtk-4.0/jsc - - %files -n webkitgtk6.0-devel %{_libexecdir}/webkitgtk-6.0/MiniBrowser %{_includedir}/webkitgtk-6.0/ @@ -478,19 +367,6 @@ export NINJA_STATUS="[3/3][%f/%t %es] " %{_datadir}/gir-1.0/WebKit2WebExtension-4.1.gir -%files -n webkit2gtk4.0-devel -%{_libexecdir}/webkit2gtk-4.0/MiniBrowser -%{_includedir}/webkitgtk-4.0/ -%exclude %{_includedir}/webkitgtk-4.0/JavaScriptCore -%exclude %{_includedir}/webkitgtk-4.0/jsc -%{_libdir}/libwebkit2gtk-4.0.so -%{_libdir}/pkgconfig/webkit2gtk-4.0.pc -%{_libdir}/pkgconfig/webkit2gtk-web-extension-4.0.pc -%dir %{_datadir}/gir-1.0 -%{_datadir}/gir-1.0/WebKit2-4.0.gir -%{_datadir}/gir-1.0/WebKit2WebExtension-4.0.gir - - %files -n javascriptcoregtk6.0 %license _license_files/*JavaScriptCore* %{_libdir}/libjavascriptcoregtk-6.0.so.1* @@ -505,13 +381,6 @@ export NINJA_STATUS="[3/3][%f/%t %es] " %{_libdir}/girepository-1.0/JavaScriptCore-4.1.typelib -%files -n javascriptcoregtk4.0 -%license _license_files/*JavaScriptCore* -%{_libdir}/libjavascriptcoregtk-4.0.so.18* -%dir %{_libdir}/girepository-1.0 -%{_libdir}/girepository-1.0/JavaScriptCore-4.0.typelib - - %files -n javascriptcoregtk6.0-devel %{_libexecdir}/webkitgtk-6.0/jsc %dir %{_includedir}/webkitgtk-6.0 @@ -533,16 +402,6 @@ export NINJA_STATUS="[3/3][%f/%t %es] " %{_datadir}/gir-1.0/JavaScriptCore-4.1.gir -%files -n javascriptcoregtk4.0-devel -%{_libexecdir}/webkit2gtk-4.0/jsc -%dir %{_includedir}/webkitgtk-4.0 -%{_includedir}/webkitgtk-4.0/JavaScriptCore/ -%{_includedir}/webkitgtk-4.0/jsc/ -%{_libdir}/libjavascriptcoregtk-4.0.so -%{_libdir}/pkgconfig/javascriptcoregtk-4.0.pc -%dir %{_datadir}/gir-1.0 -%{_datadir}/gir-1.0/JavaScriptCore-4.0.gir - %if %{with docs} %files -n webkitgtk6.0-doc %dir %{_datadir}/gtk-doc @@ -558,15 +417,13 @@ export NINJA_STATUS="[3/3][%f/%t %es] " %{_datadir}/gtk-doc/html/webkit2gtk-4.1/ %{_datadir}/gtk-doc/html/webkit2gtk-web-extension-4.1/ -%files -n webkit2gtk4.0-doc -%dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/javascriptcoregtk-4.0/ -%{_datadir}/gtk-doc/html/webkit2gtk-4.0/ -%{_datadir}/gtk-doc/html/webkit2gtk-web-extension-4.0/ %endif %changelog +* Mon Dec 11 2023 Funda Wang - 2.42.3-1 +- New version 2.42.3 +- Disable 4.0 abi build + * Wed Sep 27 2023 Funda Wang - 2.42.1-1 - New version 2.42.1