diff --git a/webkitgtk-2.38.3.tar.xz b/webkitgtk-2.38.4.tar.xz similarity index 74% rename from webkitgtk-2.38.3.tar.xz rename to webkitgtk-2.38.4.tar.xz index 6045030d375b577b4ec7307e88bbde65e36de916..3b8ef12830861c88451b5b50d08949e1928bc7c0 100644 Binary files a/webkitgtk-2.38.3.tar.xz and b/webkitgtk-2.38.4.tar.xz differ diff --git a/webkit2gtk3.spec b/webkitgtk.spec similarity index 80% rename from webkit2gtk3.spec rename to webkitgtk.spec index dd3ab81d360a8da9ed54b1a49d2c0606cedd5a8a..9980d188ace0bbf1351ba9300e33e02b4bd5af71 100644 --- a/webkit2gtk3.spec +++ b/webkitgtk.spec @@ -8,8 +8,10 @@ %bcond_without docs -Name: webkit2gtk3 -Version: 2.38.3 +%global with_gamepad 0 + +Name: webkitgtk +Version: 2.38.4 Release: %{anolis_release}%{?dist} Summary: GTK Web content engine library @@ -23,7 +25,6 @@ BuildRequires: cmake BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: gettext -BuildRequires: git BuildRequires: gnupg2 BuildRequires: gperf BuildRequires: gtk-doc @@ -31,10 +32,10 @@ BuildRequires: hyphen-devel BuildRequires: libatomic BuildRequires: ninja-build BuildRequires: perl(English) -BuildRequires: perl(File::Copy::Recursive) BuildRequires: perl(FindBin) BuildRequires: perl(JSON::PP) -BuildRequires: perl(Switch) +BuildRequires: perl(lib) +BuildRequires: perl(File::Copy) BuildRequires: python3 BuildRequires: ruby BuildRequires: rubygems @@ -106,71 +107,85 @@ BuildRequires: zlib-devel BuildRequires: pkgconfig(manette-0.2) %endif +%global __provides_exclude_from ^%{_libdir}/webkit2gtk-4\\.0/.*\\.so$ + +%description +WebKitGTK is the port of the portable web rendering engine WebKit to the +GTK platform. + +This package contains WebKit2 based WebKitGTK for GTK 3. + +%package -n webkit2gtk4.0 +Summary: WebKitGTK for GTK 3 and libsoup 2 Requires: bubblewrap Requires: xdg-dbus-proxy - Recommends: geoclue2 Recommends: gstreamer1-plugins-bad-free Recommends: gstreamer1-plugins-good Recommends: xdg-desktop-portal-gtk - Obsoletes: webkitgtk4 < %{version}-%{release} Provides: webkitgtk4 = %{version}-%{release} - +Obsoletes: webkit2gtk3 < %{version} +Provides: webkit2gtk3 = %{version} Provides: bundled(angle) +Provides: bundled(pdfjs) Provides: bundled(xdgmime) +Requires: javascriptcoregtk4.0 = %{version}-%{release} -Requires: %{name}-jsc = %{version}-%{release} - -%global __provides_exclude_from ^%{_libdir}/webkit2gtk-4\\.0/.*\\.so$ - -%description -WebKitGTK is the port of the portable web rendering engine WebKit to the -GTK platform. - -This package contains WebKit2 based WebKitGTK for GTK 3. +%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 devel +%package -n webkit2gtk4.0-devel Summary: Development files for %{name} -Requires: %{name} = %{version}-%{release} -Requires: %{name}-jsc = %{version}-%{release} -Requires: %{name}-jsc-devel = %{version}-%{release} +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} +Provides: webkit2gtk3-devel = %{version} -%description devel -The %{name}-devel package contains libraries, build data, and header -files for developing applications that use %{name}. +%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 doc +%package -n webkit2gtk4.0-doc Summary: Documentation files for %{name} BuildArch: noarch -Requires: %{name} = %{version}-%{release} +Requires: webkit2gtk4.0 = %{version}-%{release} Obsoletes: webkitgtk4-doc < %{version}-%{release} Provides: webkitgtk4-doc = %{version}-%{release} +Obsoletes: webkit2gtk3-doc < %{version} +Provides: webkit2gtk3-doc = %{version} +Recommends: gi-docgen-fonts -%description doc -This package contains developer documentation for %{name}. +%description -n webkit2gtk4.0-doc +This package contains developer documentation for webkit2gtk4.0. %endif -%package jsc +%package -n javascriptcoregtk4.0 Summary: JavaScript engine from %{name} Obsoletes: webkitgtk4-jsc < %{version}-%{release} Provides: webkitgtk4-jsc = %{version}-%{release} +Obsoletes: webkit2gtk3-jsc < %{version} +Provides: webkit2gtk3-jsc = %{version} -%description jsc -This package contains JavaScript engine from %{name}. +%description -n javascriptcoregtk4.0 +This package contains the JavaScript engine from webkit2gtk4.0. -%package jsc-devel +%package -n javascriptcoregtk4.0-devel Summary: Development files for JavaScript engine from %{name} -Requires: %{name}-jsc = %{version}-%{release} +Requires: javascriptcoregtk4.0 = %{version}-%{release} Obsoletes: webkitgtk4-jsc-devel < %{version}-%{release} Provides: webkitgtk4-jsc-devel = %{version}-%{release} +Obsoletes: webkit2gtk3-jsc-devel < %{version} +Provides: webkit2gtk3-jsc-devel = %{version} -%description jsc-devel -The %{name}-jsc-devel package contains libraries, build data, and header -files for developing applications that use JavaScript engine from %{name}. +%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} @@ -233,7 +248,7 @@ export NINJA_STATUS="[%f/%t][%e] " %generate_compatibility_deps -%files -f WebKit2GTK-4.0.lang +%files -n webkit2gtk4.0 -f WebKit2GTK-4.0.lang %license _license_files/*ThirdParty* %license _license_files/*WebCore* %license _license_files/*WebInspectorUI* @@ -251,7 +266,7 @@ export NINJA_STATUS="[%f/%t][%e] " %{_bindir}/WebKitWebDriver %{abidir}/WebKitWebDriver-option.list -%files devel +%files -n webkit2gtk4.0-devel %{_libexecdir}/webkit2gtk-4.0/MiniBrowser %{_includedir}/webkitgtk-4.0/ %exclude %{_includedir}/webkitgtk-4.0/JavaScriptCore @@ -263,7 +278,7 @@ export NINJA_STATUS="[%f/%t][%e] " %{_datadir}/gir-1.0/WebKit2-4.0.gir %{_datadir}/gir-1.0/WebKit2WebExtension-4.0.gir -%files jsc +%files -n javascriptcoregtk4.0 %license _license_files/*JavaScriptCore* %dir %{abidir} %{_libdir}/libjavascriptcoregtk-4.0.so.* @@ -271,7 +286,7 @@ export NINJA_STATUS="[%f/%t][%e] " %dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/JavaScriptCore-4.0.typelib -%files jsc-devel +%files -n javascriptcoregtk4.0-devel %{_libexecdir}/webkit2gtk-4.0/jsc %dir %{_includedir}/webkitgtk-4.0 %{_includedir}/webkitgtk-4.0/JavaScriptCore/ @@ -282,7 +297,7 @@ export NINJA_STATUS="[%f/%t][%e] " %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir %if %{with docs} -%files doc +%files -n webkit2gtk4.0-doc %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html %{_datadir}/gtk-doc/html/javascriptcoregtk-4.0/ @@ -291,6 +306,10 @@ export NINJA_STATUS="[%f/%t][%e] " %endif %changelog +* Sat Feb 4 2023 Funda Wang - 2.38.4-1 +- New version 2.38.4 +- Adopt to name change in the future + * Wed Dec 28 2022 Funda Wang - 2.38.3-1 - New version 2.38.3