diff --git a/webkitgtk-2.44.3.tar.xz.asc b/webkitgtk-2.44.3.tar.xz.asc deleted file mode 100644 index d98e35b5df880155890e4ba7ad5ff4776f02c16f..0000000000000000000000000000000000000000 --- a/webkitgtk-2.44.3.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEAToBJ6ycZbNP+mJSbBAJtpOXU5MFAma7BpQACgkQbBAJtpOX -U5PeIxAAhv6cl4WsiFyPuNQdzik1GdxtSuFxpBW9SokOxFPn4zW/sMIkke20q1et -RhGwKskkuOEgavV/2grC07d8peFbsse6zTeerZECRaB+Saj7ZOWoZQoDbCTxWjzi -yoxsziwIJA4LDdhqxV8TRSCl3bLy+uFQkUfNX1JJot9bMze+9lUjxJ/hAglCUjP8 -WIJdQ1mE+cJguBHJMfdZbDINLywRjesaLXAvTCmpnn3mn0GXMbCQM+W+GCybwhMB -1dl8eFEfcvAhUe85mHJNW3WmYRzvquTMuFuLzU8b1U1/6+LQc+IOXAZEpkP9ztSn -VItLwPnHJ/4g5KY+gUonMxZ1LMhTwiu/ga41Yez0sZftkC6tgIPIldaTY/tjeNLh -C5GnMSyRTJ7d2ywLJSdzCIGkwhOJ7oHArGxbpzCWft3rrU8SbvQd3dGOMip1iniN -ewdMyoqZQgzN51BRUklhjoBCaUkcVbgYr6qfLZiU42kR4RWgrTx/s//naCM4peQe -8vGeRlF9zpsGw3ivCJBNjqk9SrqcPQ2i52lgKs28DkVy13duuQwKEMa+/Tv7eH60 -wNdKSRjeA81DLZkuyX5yJOEJ1pru1HiS4sdP112dPb1HajVhOehZJc7a8b9ohOH5 -go2lIxnJjZOXRHM/JwtTcLKsnfna1m6yzNGdOHNcLKPJodHcpXY= -=jHOh ------END PGP SIGNATURE----- diff --git a/webkitgtk-2.44.3.tar.xz b/webkitgtk-2.48.1.tar.xz similarity index 70% rename from webkitgtk-2.44.3.tar.xz rename to webkitgtk-2.48.1.tar.xz index ccfc4a39ce184ccfbc26a320e8c6dd38aef6562b..026b5b0cc5ffab78c930cfdf121fba16d3e3d871 100644 Binary files a/webkitgtk-2.44.3.tar.xz and b/webkitgtk-2.48.1.tar.xz differ diff --git a/webkitgtk-2.48.1.tar.xz.asc b/webkitgtk-2.48.1.tar.xz.asc new file mode 100644 index 0000000000000000000000000000000000000000..427f2489c3f5a129c7763dabbe38e01e661cd813 --- /dev/null +++ b/webkitgtk-2.48.1.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEAToBJ6ycZbNP+mJSbBAJtpOXU5MFAmftAf8ACgkQbBAJtpOX +U5PdBg//TpfUIuSwl5OgwqsB8WNvrtCdGGwrYa3k9E9pp57KHLvlqNeDmToy/U9t +gAOIUIyIxgVBRgJQrcQW/NfPx49jd3ISt9h54A0c/MgIb4+4vsvoRz3pwX407+QR +7rZA72GA1im3u5+IWTGeeWzTGNQtvGbd1DzA6OpdvC0MRS2JAfYvgDHyAzaQu0Of +JZdMrZlwoaMeZDTKI+qV/ZY2mZ59xiD0ltRU6X1B7/YS2MEsqztO7FFWO/xuhdps +qIZF/jwuVfcGrI5JPVZzsf0V2RHmgF4j9rNEZwSxP8BkWfYQ+BjZI6gzKjVgDYED +6D70tf0+q9UqSSYaX0Wk2+IqaNiO09md4nYZJ1I6VLz8sm6AZTB2XXiWxB3hEuFO +j7Dk11I4DKPJjBHIQN/3kqutvRG5plyi4HIL2BzvnVstxrlTAocIFvhey1GOiLSu +UfX97ruyNECpwMIafxCsqOVAjg4wkf6df0yCJVokNRBunnsQPABjDXfhS7dDvE3B +6u2BIVudba2xEeMqqHZBrFAy4UXLcfJYnvvsBbPGFHibooCIuwd5VrTIVUE7bsI1 +QqEAlryx1grnyDN77aHri2bBK44aHMIix19kRgwdK8wcT3iz1vdUcgigcDYbD2Sc +0LGzxB5OY+jd7zvSczqNCX6Ll7W7dIgjR60nuVl4+yYNnzSM+EM= +=6kwl +-----END PGP SIGNATURE----- diff --git a/webkitgtk.spec b/webkitgtk.spec index a8557abe582a527cf38aa6e74e6f47828d73d857..78fab2354461b878aa0f98637df448cc4473ed94 100644 --- a/webkitgtk.spec +++ b/webkitgtk.spec @@ -14,7 +14,7 @@ %global with_gamepad 0 Name: webkitgtk -Version: 2.44.3 +Version: 2.48.1 Release: %{anolis_release}%{?dist} Summary: GTK web content engine library @@ -23,10 +23,13 @@ URL: https://www.webkitgtk.org/ Source0: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz Source1: https://webkitgtk.org/releases/webkitgtk-%{version}.tar.xz.asc +ExcludeArch: loongarch64 + BuildRequires: bison BuildRequires: bubblewrap BuildRequires: cmake BuildRequires: flex +BuildRequires: flite-devel BuildRequires: gcc-c++ BuildRequires: gettext BuildRequires: gi-docgen @@ -53,6 +56,7 @@ BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(enchant-2) BuildRequires: pkgconfig(epoxy) +BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(gbm) @@ -113,6 +117,7 @@ Recommends: gstreamer1-plugins-good Recommends: xdg-desktop-portal-gtk Provides: bundled(angle) Provides: bundled(pdfjs) +Provides: bundled(skia) Provides: bundled(xdgmime) Obsoletes: webkit2gtk5.0 < %{version}-%{release} @@ -132,33 +137,13 @@ Recommends: gstreamer1-plugins-good Recommends: xdg-desktop-portal-gtk Provides: bundled(angle) Provides: bundled(pdfjs) +Provides: bundled(skia) Provides: bundled(xdgmime) %description -n webkit2gtk4.1 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} @@ -180,20 +165,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 @@ -213,19 +184,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 @@ -242,16 +200,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} @@ -270,20 +218,8 @@ 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} +%autosetup -p1 -n webkitgtk-%{version} %build # Increase the DIE limit so our debuginfo packages can be size-optimized. @@ -364,15 +300,11 @@ files for developing applications that use JavaScript engine from webkit2gtk-4.0 %{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 %limit_build -m 3072 %define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1 -export NINJA_STATUS="[2/3][%f/%t %es] " -%cmake_build %limit_build -m 3072 - -%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 %limit_build -m 3072 %install @@ -382,12 +314,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 @@ -432,20 +360,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/ @@ -469,18 +383,6 @@ export NINJA_STATUS="[3/3][%f/%t %es] " %{_datadir}/gir-1.0/WebKit2-4.1.gir %{_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* @@ -493,12 +395,6 @@ export NINJA_STATUS="[3/3][%f/%t %es] " %dir %{_libdir}/girepository-1.0 %{_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 @@ -518,16 +414,6 @@ export NINJA_STATUS="[3/3][%f/%t %es] " %dir %{_datadir}/gir-1.0 %{_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}/doc @@ -540,15 +426,12 @@ export NINJA_STATUS="[3/3][%f/%t %es] " %{_datadir}/doc/javascriptcoregtk-4.1/ %{_datadir}/doc/webkit2gtk-4.1/ %{_datadir}/doc/webkit2gtk-web-extension-4.1/ - -%files -n webkit2gtk4.0-doc -%dir %{_datadir}/doc -%{_datadir}/doc/javascriptcoregtk-4.0/ -%{_datadir}/doc/webkit2gtk-4.0/ -%{_datadir}/doc/webkit2gtk-web-extension-4.0/ %endif %changelog +* Mon May 12 2025 wenxin - 2.48.1-1 +- update to 2.48.1 + * Tue Nov 26 2024 mgb01105731 - 2.44.3-1 - update to 2.44.3