diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index b1f45719ca129082b4d14a4795dfc8e2a71b4b9e..f0e4b647d70f55f15d4d6702625573a1187055d3 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -1,10 +1,5 @@ -%define debug_package %{nil} # Filter out provides for private libraries -%global __provides_exclude_from ^(%{_libdir}/webkit2gtk-4\\.0/.*\\.so|%{_libdir}/webkit2gtk-4\\.1/.*\\.so|%{_libdir}/webkit2gtk-5\\.0/.*\\.so)$ -%global _dwz_max_die_limit 250000000 -%global _dwz_max_die_limit_x86_64 250000000 -%global _find_debuginfo_opts %limit_build -m 8192 %global add_to_license_files() \ mkdir -p _license_files ; \ @@ -16,7 +11,7 @@ Name: webkit2gtk3 Version: 2.38.2 -Release: 2 +Release: 3 Summary: GTK web content engine library License: LGPLv2 URL: https://www.webkitgtk.org/ @@ -96,6 +91,8 @@ BuildRequires: pkgconfig(wpe-1.0) BuildRequires: pkgconfig(wpebackend-fdo-1.0) BuildRequires: pkgconfig(xt) +%global __provides_exclude_from ^(%{_libdir}/webkit2gtk-4\\.0/.*\\.so|%{_libdir}/webkit2gtk-4\\.1/.*\\.so|%{_libdir}/webkit2gtk-5\\.0/.*\\.so)$ + Requires: javascriptcoregtk4.0%{?_isa} = %{version}-%{release} Requires: bubblewrap Requires: xdg-dbus-proxy @@ -118,60 +115,6 @@ Provides: webkit2gtk3%{?_isa} = %{version}-%{release} 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 webkit2gtk5.0 -Summary: WebKitGTK for GTK 4 -Requires: javascriptcoregtk5.0%{?_isa} = %{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) - -%description -n webkit2gtk5.0 -WebKitGTK is the port of the WebKit web rendering engine to the -GTK platform. This package contains WebKitGTK for GTK 4. - -%package -n webkit2gtk4.1 -Summary: WebKitGTK for GTK 3 and libsoup 3 -Requires: javascriptcoregtk4.1%{?_isa} = %{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) - -%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 webkit2gtk5.0-devel -Summary: Development files for webkit2gtk5.0 -Requires: webkit2gtk5.0%{?_isa} = %{version}-%{release} -Requires: javascriptcoregtk5.0%{?_isa} = %{version}-%{release} -Requires: javascriptcoregtk5.0-devel%{?_isa} = %{version}-%{release} - -%description -n webkit2gtk5.0-devel -The webkit2gtk5.0-devel package contains libraries, build data, and header -files for developing applications that use webkit2gtk5.0. - -%package -n webkit2gtk4.1-devel -Summary: Development files for webkit2gtk4.1 -Requires: webkit2gtk4.1%{?_isa} = %{version}-%{release} -Requires: javascriptcoregtk4.1%{?_isa} = %{version}-%{release} -Requires: javascriptcoregtk4.1-devel%{?_isa} = %{version}-%{release} - -%description -n webkit2gtk4.1-devel -The webkit2gtk4.1-devel package contains libraries, build data, and header -files for developing applications that use webkit2gtk4.1. %package -n webkit2gtk3-devel Summary: Development files for webkit2gtk4.0 @@ -187,23 +130,6 @@ Provides: webkit2gtk3-devel = %{version}-%{release} The webkit2gtk4.0-devel package contains libraries, build data, and header files for developing applications that use webkit2gtk4.0. -%if %{with docs} -%package -n webkit2gtk5.0-help -Summary: Documentation files for webkit2gtk5.0 -BuildArch: noarch -Requires: webkit2gtk5.0 = %{version}-%{release} - -%description -n webkit2gtk5.0-help -This package contains developer documentation for webkit2gtk5.0. - -%package -n webkit2gtk4.1-help -Summary: Documentation files for webkit2gtk4.1 -BuildArch: noarch -Requires: webkit2gtk4.1 = %{version}-%{release} - -%description -n webkit2gtk4.1-help -This package contains developer documentation for webkit2gtk4.1. - %package -n webkit2gtk3-help Summary: Documentation files for webkit2gtk4.0 BuildArch: noarch @@ -219,139 +145,30 @@ Provides: webkit2gtk3-help = %{version}-%{release} %description -n webkit2gtk3-help This package contains developer documentation for webkit2gtk4.0. -%endif -%package -n jsc5.0 -Summary: JavaScript engine from webkit2gtk5.0 -Provides: javascriptcoregtk5.0%{?_isa} = %{version}-%{release} - -%description -n jsc5.0 -This package contains JavaScript engine from webkit2gtk5.0. - -%package -n jsc4.1 -Summary: JavaScript engine from webkit2gtk4.1 -Provides: javascriptcoregtk4.1%{?_isa} = %{version}-%{release} -Obsoletes: webkit2gtk4.1-jsc < %{version}-%{release} - -%description -n jsc4.1 -This package contains JavaScript engine from webkit2gtk4.1. - -%package -n webkit2gtk3-jsc -Summary: JavaScript engine from webkit2gtk3 -Provides: javascriptcoregtk4.0%{?_isa} = %{version}-%{release} -Obsoletes: webkitgtk4-jsc < %{version}-%{release} -Provides: webkitgtk4-jsc = %{version}-%{release} -Obsoletes: webkit2gtk3-jsc < %{version}-%{release} -Provides: webkit2gtk3-jsc = %{version}-%{release} -Obsoletes: jsc4.0 < %{version}-%{release} -Provides: jsc4.0 = %{version}-%{release} -Provides: jsc4.0%{?_isa} = %{version}-%{release} - -%description -n webkit2gtk3-jsc -This package contains JavaScript engine from webkit2gtk4.0. - -%package -n jsc5.0-devel -Summary: Development files for JavaScript engine from webkit2gtk5.0 -Provides: javascriptcoregtk5.0-devel%{?_isa} = %{version}-%{release} -Requires: javascriptcoregtk5.0%{?_isa} = %{version}-%{release} - -%description -n jsc5.0-devel -The javascriptcoregtk5.0-devel package contains libraries, build data, and header -files for developing applications that use JavaScript engine from webkit2gtk-5.0. - -%package -n jsc4.1-devel -Summary: Development files for JavaScript engine from webkit2gtk4.1 -Provides: javascriptcoregtk4.1-devel%{?_isa} = %{version}-%{release} -Requires: javascriptcoregtk4.1%{?_isa} = %{version}-%{release} -Obsoletes: webkit2gtk4.1-jsc-devel < %{version}-%{release} - -%description -n jsc4.1-devel -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 webkit2gtk3-jsc-devel -Summary: Development files for JavaScript engine from webkit2gtk4.0 -Provides: javascriptcoregtk4.0-devel%{?_isa} = %{version}-%{release} -Requires: javascriptcoregtk4.0%{?_isa} = %{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} -Obsoletes: jsc4.0-devel < %{version}-%{release} -Provides: jsc4.0-devel = %{version}-%{release} -Provides: jsc4.0-devel%{?_isa} = %{version}-%{release} - -%description -n webkit2gtk3-jsc-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} %build -%ifarch %{ix86} -%global optflags %(echo %{optflags} | sed 's/-g /-g1 /') -%endif -#%%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-5.0 -mkdir -p build-5.0 -pushd build-5.0 -%cmake \ - -GNinja \ - -DPORT=GTK \ - -DCMAKE_BUILD_TYPE=Release \ - -DUSE_GTK4=ON \ - -DENABLE_WEBDRIVER=OFF \ -%if %{without docs} - -DENABLE_DOCUMENTATION=OFF \ -%endif - -DENABLE_GAMEPAD=OFF \ -%ifarch aarch64 loongarch64 - -DENABLE_JIT=OFF \ - -DUSE_SYSTEM_MALLOC=ON \ -%endif -%if 0%{?openEuler} -%ifarch aarch64 - -DUSE_64KB_PAGE_BLOCK=ON \ -%endif -%endif - .. - %{nil} -export NINJA_STATUS="[1/3][%f/%t %es] " -%ninja_build -j8 -popd +%global _dwz_max_die_limit 250000000 +%global _dwz_max_die_limit_x86_64 250000000 -#%%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1 -mkdir -p build-4.1 -pushd build-4.1 -%cmake \ - -GNinja \ - -DPORT=GTK \ - -DCMAKE_BUILD_TYPE=Release \ -%if %{without docs} - -DENABLE_DOCUMENTATION=OFF \ -%endif - -DENABLE_GAMEPAD=OFF \ -%if 0%{?openEuler} -%ifarch aarch64 - -DUSE_64KB_PAGE_BLOCK=ON \ -%endif -%endif - .. - %{nil} -export NINJA_STATUS="[2/3][%f/%t %es] " -%ninja_build -j8 -popd -#%%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0 + + +%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0 mkdir -p build-4.0 pushd build-4.0 +##export CXXFLAGS="$RPM_OPT_FLAGS -gsplit-dwarf" %cmake \ -GNinja \ -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ -DUSE_SOUP2=ON \ -DENABLE_WEBDRIVER=OFF \ + -DDEBUG_FISSION=OFF \ %if %{without docs} -DENABLE_DOCUMENTATION=OFF \ %endif @@ -367,42 +184,23 @@ pushd build-4.0 %endif .. %{nil} -export NINJA_STATUS="[3/3][%f/%t %es] " +export NINJA_STATUS="[2/3][%f/%t %es] " %ninja_build -j8 popd - -#%%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-5.0 -#export NINJA_STATUS="[1/3][%f/%t %es] " -#%%ninja_build - -#%%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1 -#export NINJA_STATUS="[2/3][%f/%t %es] " -#%%ninja_build - #%%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0 #export NINJA_STATUS="[3/3][%f/%t %es] " #%%ninja_build -%install -#%%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-5.0 -pushd build-5.0 -%ninja_install -popd - -#%%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.1 -pushd build-4.1 -%ninja_install -popd -#%%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0 +%install +%define _vpath_builddir %{_vendor}-%{_target_os}-build/webkit2gtk-4.0 pushd build-4.0 %ninja_install popd -%find_lang WebKit2GTK-5.0 -%find_lang WebKit2GTK-4.1 %find_lang WebKit2GTK-4.0 + # Finally, copy over and rename various files for %%license inclusion %add_to_license_files Source/JavaScriptCore/COPYING.LIB %add_to_license_files Source/ThirdParty/ANGLE/LICENSE @@ -418,34 +216,6 @@ popd %add_to_license_files Source/WTF/wtf/dtoa/COPYING %add_to_license_files Source/WTF/wtf/dtoa/LICENSE -%files -n webkit2gtk5.0 -f WebKit2GTK-5.0.lang -%license _license_files/*ThirdParty* -%license _license_files/*WebCore* -%license _license_files/*WebInspectorUI* -%license _license_files/*WTF* -%{_libdir}/libwebkit2gtk-5.0.so.0* -%dir %{_libdir}/girepository-1.0 -%{_libdir}/girepository-1.0/WebKit2-5.0.typelib -%{_libdir}/girepository-1.0/WebKit2WebExtension-5.0.typelib -%{_libdir}/webkit2gtk-5.0/ -%{_libexecdir}/webkit2gtk-5.0/ -%exclude %{_libexecdir}/webkit2gtk-5.0/MiniBrowser -%exclude %{_libexecdir}/webkit2gtk-5.0/jsc -%{_bindir}/WebKitWebDriver - -%files -n webkit2gtk4.1 -f WebKit2GTK-4.1.lang -%license _license_files/*ThirdParty* -%license _license_files/*WebCore* -%license _license_files/*WebInspectorUI* -%license _license_files/*WTF* -%{_libdir}/libwebkit2gtk-4.1.so.0* -%dir %{_libdir}/girepository-1.0 -%{_libdir}/girepository-1.0/WebKit2-4.1.typelib -%{_libdir}/girepository-1.0/WebKit2WebExtension-4.1.typelib -%{_libdir}/webkit2gtk-4.1/ -%{_libexecdir}/webkit2gtk-4.1/ -%exclude %{_libexecdir}/webkit2gtk-4.1/MiniBrowser -%exclude %{_libexecdir}/webkit2gtk-4.1/jsc %files -n webkit2gtk3 -f WebKit2GTK-4.0.lang %license _license_files/*ThirdParty* @@ -460,30 +230,11 @@ popd %{_libexecdir}/webkit2gtk-4.0/ %exclude %{_libexecdir}/webkit2gtk-4.0/MiniBrowser %exclude %{_libexecdir}/webkit2gtk-4.0/jsc - -%files -n webkit2gtk5.0-devel -%{_libexecdir}/webkit2gtk-5.0/MiniBrowser -%{_includedir}/webkitgtk-5.0/ -%exclude %{_includedir}/webkitgtk-5.0/JavaScriptCore -%exclude %{_includedir}/webkitgtk-5.0/jsc -%{_libdir}/libwebkit2gtk-5.0.so -%{_libdir}/pkgconfig/webkit2gtk-5.0.pc -%{_libdir}/pkgconfig/webkit2gtk-web-extension-5.0.pc -%dir %{_datadir}/gir-1.0 -%{_datadir}/gir-1.0/WebKit2-5.0.gir -%{_datadir}/gir-1.0/WebKit2WebExtension-5.0.gir - -%files -n webkit2gtk4.1-devel -%{_libexecdir}/webkit2gtk-4.1/MiniBrowser -%{_includedir}/webkitgtk-4.1/ -%exclude %{_includedir}/webkitgtk-4.1/JavaScriptCore -%exclude %{_includedir}/webkitgtk-4.1/jsc -%{_libdir}/libwebkit2gtk-4.1.so -%{_libdir}/pkgconfig/webkit2gtk-4.1.pc -%{_libdir}/pkgconfig/webkit2gtk-web-extension-4.1.pc -%dir %{_datadir}/gir-1.0 -%{_datadir}/gir-1.0/WebKit2-4.1.gir -%{_datadir}/gir-1.0/WebKit2WebExtension-4.1.gir +/usr/lib64/girepository-1.0/JavaScriptCore-4.0.typelib +/usr/lib64/libjavascriptcoregtk-4.0.so +/usr/lib64/libjavascriptcoregtk-4.0.so.18 +/usr/lib64/libjavascriptcoregtk-4.0.so.18.21.5 +/usr/lib64/pkgconfig/javascriptcoregtk-4.0.pc %files -n webkit2gtk3-devel %{_libexecdir}/webkit2gtk-4.0/MiniBrowser @@ -493,80 +244,9 @@ popd %{_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 jsc5.0 -%license _license_files/*JavaScriptCore* -%{_libdir}/libjavascriptcoregtk-5.0.so.0* -%dir %{_libdir}/girepository-1.0 -%{_libdir}/girepository-1.0/JavaScriptCore-5.0.typelib - -%files -n jsc4.1 -%license _license_files/*JavaScriptCore* -%{_libdir}/libjavascriptcoregtk-4.1.so.0* -%dir %{_libdir}/girepository-1.0 -%{_libdir}/girepository-1.0/JavaScriptCore-4.1.typelib - -%files -n webkit2gtk3-jsc -%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 jsc5.0-devel -%{_libexecdir}/webkit2gtk-5.0/jsc -%dir %{_includedir}/webkitgtk-5.0 -%{_includedir}/webkitgtk-5.0/JavaScriptCore/ -%{_includedir}/webkitgtk-5.0/jsc/ -%{_libdir}/libjavascriptcoregtk-5.0.so -%{_libdir}/pkgconfig/javascriptcoregtk-5.0.pc -%dir %{_datadir}/gir-1.0 -%{_datadir}/gir-1.0/JavaScriptCore-5.0.gir - -%files -n jsc4.1-devel -%{_libexecdir}/webkit2gtk-4.1/jsc -%dir %{_includedir}/webkitgtk-4.1 -%{_includedir}/webkitgtk-4.1/JavaScriptCore/ -%{_includedir}/webkitgtk-4.1/jsc/ -%{_libdir}/libjavascriptcoregtk-4.1.so -%{_libdir}/pkgconfig/javascriptcoregtk-4.1.pc -%dir %{_datadir}/gir-1.0 -%{_datadir}/gir-1.0/JavaScriptCore-4.1.gir - -%files -n webkit2gtk3-jsc-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 webkit2gtk5.0-help -%dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/javascriptcoregtk-5.0/ -%{_datadir}/gtk-doc/html/webkit2gtk-5.0/ -%{_datadir}/gtk-doc/html/webkit2gtk-web-extension-5.0/ - -%files -n webkit2gtk4.1-help -%dir %{_datadir}/gtk-doc -%dir %{_datadir}/gtk-doc/html -%{_datadir}/gtk-doc/html/javascriptcoregtk-4.1/ -%{_datadir}/gtk-doc/html/webkit2gtk-4.1/ -%{_datadir}/gtk-doc/html/webkit2gtk-web-extension-4.1/ %files -n webkit2gtk3-help -%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 +%{_datadir} %changelog * Thu Feb 16 2023 wenlong ding - 2.38.2-2