From a141c49349db5baed22335e27aca30cad2225177 Mon Sep 17 00:00:00 2001 From: christopher Date: Sat, 28 Sep 2019 14:33:01 -0600 Subject: [PATCH 1/2] new version --- .gitignore | 1 + fedora-crypto-policy.patch | 24 ------------------------ sources | 2 +- wpewebkit.spec | 18 +++++++++++++----- 4 files changed, 15 insertions(+), 30 deletions(-) delete mode 100644 fedora-crypto-policy.patch diff --git a/.gitignore b/.gitignore index cf1b2f8..3281b19 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /wpewebkit-2.24.0.tar.xz /wpewebkit-2.24.1.tar.xz /wpewebkit-2.24.2.tar.xz +/wpewebkit-2.26.1.tar.xz diff --git a/fedora-crypto-policy.patch b/fedora-crypto-policy.patch deleted file mode 100644 index 90e1d67..0000000 --- a/fedora-crypto-policy.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up wpewebkit-2.20.1/Source/WebKit/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp.fedora-crypto-policy webkitgtk-2.17.92/Source/WebKit/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp ---- wpewebkit-2.20.1/Source/WebKit/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp.fedora-crypto-policy 2017-09-05 13:39:59.294426661 +0200 -+++ wpewebkit-2.20.1/Source/WebKit/NetworkProcess/EntryPoint/unix/NetworkProcessMain.cpp 2017-09-05 13:40:09.144389997 +0200 -@@ -43,7 +43,7 @@ int main(int argc, char** argv) - // overwrite this priority string if it's already set by the user. - // https://bugzilla.gnome.org/show_bug.cgi?id=738633 - // WARNING: This needs to be KEPT IN SYNC with WebProcessMain.cpp. -- setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0:!ARCFOUR-128", 0); -+ setenv("G_TLS_GNUTLS_PRIORITY", "@SYSTEM:%COMPAT:!VERS-SSL3.0:!ARCFOUR-128", 0); - - #if USE(GCRYPT) - PAL::GCrypt::initialize(); -diff -up wpewebkit-2.20.1/Source/WebKit/WebProcess/EntryPoint/unix/WebProcessMain.cpp.fedora-crypto-policy webkitgtk-2.17.92/Source/WebKit/WebProcess/EntryPoint/unix/WebProcessMain.cpp ---- wpewebkit-2.20.1/Source/WebKit/WebProcess/EntryPoint/unix/WebProcessMain.cpp.fedora-crypto-policy 2017-09-05 13:40:28.558317735 +0200 -+++ wpewebkit-2.20.1/Source/WebKit/WebProcess/EntryPoint/unix/WebProcessMain.cpp 2017-09-05 13:40:56.057215378 +0200 -@@ -43,7 +43,7 @@ int main(int argc, char** argv) - // overwrite this priority string if it's already set by the user. - // https://bugzilla.gnome.org/show_bug.cgi?id=738633 - // WARNING: This needs to be KEPT IN SYNC with WebProcessMain.cpp. -- setenv("G_TLS_GNUTLS_PRIORITY", "NORMAL:%COMPAT:!VERS-SSL3.0:!ARCFOUR-128", 0); -+ setenv("G_TLS_GNUTLS_PRIORITY", "@SYSTEM:%COMPAT:!VERS-SSL3.0:!ARCFOUR-128", 0); - - #if USE(GCRYPT) - PAL::GCrypt::initialize(); diff --git a/sources b/sources index 106aff2..d4464a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wpewebkit-2.24.2.tar.xz) = ee3f6767d9d153043635426f0998f9e5264fb8dfbe2ac2fbebcf0461d993c11b82d63d192f6053f9b1947e3488ead9c9526fa7c07d2e9dfc798bd49000956798 +SHA512 (wpewebkit-2.26.1.tar.xz) = eabfa1ba4b98c7a37db51b94559c1251164988fba42a1df7872912e8a174d3ca0d04dad5e0191e16c417957c563eb18b1bd2a6722cb19a273e4e4b06bf906636 diff --git a/wpewebkit.spec b/wpewebkit.spec index 808391c..291d5b5 100644 --- a/wpewebkit.spec +++ b/wpewebkit.spec @@ -6,18 +6,16 @@ cp -p %1 _license_files/$(echo '%1' | sed -e 's!/!.!g') Name: wpewebkit -Version: 2.24.2 -Release: 2%{?dist} +Version: 2.26.1 +Release: 1%{?dist} Summary: A WebKit port optimized for low-end devices License: LGPLv2 and BSD URL: http://www.%{name}.org/ Source0: http://wpewebkit.org/releases/%{name}-%{version}.tar.xz -# https://bugs.webkit.org/show_bug.cgi?id=158785 -Patch0: fedora-crypto-policy.patch # Explicitly specify python2 over python to avoid build fails -Patch1: python2.patch +Patch0: python2.patch BuildRequires: openjpeg2-devel BuildRequires: bison @@ -54,6 +52,12 @@ BuildRequires: rubygems BuildRequires: sqlite-devel BuildRequires: woff2-devel BuildRequires: libepoxy-devel +BuildRequires: atk-devel at-spi2-atk-devel +BuildRequires: bubblewrap +BuildRequires: libseccomp-devel +BuildRequires: xdg-dbus-proxy +Requires: atk +Requires: at-spi2-atk %description WPE allows embedders to create simple and performant systems based on @@ -162,6 +166,10 @@ popd %changelog +* Sat Sep 28 2019 Chris King - 2.26.1-1 +- New version, added atk/bubblewrap libs for build, removed crypto patch as its + no longer needed. + * Sat Jul 27 2019 Fedora Release Engineering - 2.24.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From bf301f80a49df6bcbc426bf74d532fe26491a6d5 Mon Sep 17 00:00:00 2001 From: christopher Date: Sat, 28 Sep 2019 20:41:24 -0600 Subject: [PATCH 2/2] sobump --- wpewebkit.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wpewebkit.spec b/wpewebkit.spec index 291d5b5..a789487 100644 --- a/wpewebkit.spec +++ b/wpewebkit.spec @@ -148,8 +148,8 @@ popd %files %{_bindir}/WPEWebDriver -%{_libdir}/libWPEWebKit-1.0.so.2 -%{_libdir}/libWPEWebKit-1.0.so.2.* +%{_libdir}/libWPEWebKit-1.0.so.3 +%{_libdir}/libWPEWebKit-1.0.so.3.* %{_libexecdir}/wpe-webkit-1.0 %{_libdir}/wpe-webkit-1.0 %doc NEWS @@ -168,7 +168,7 @@ popd %changelog * Sat Sep 28 2019 Chris King - 2.26.1-1 - New version, added atk/bubblewrap libs for build, removed crypto patch as its - no longer needed. + no longer needed. Also, sobump. * Sat Jul 27 2019 Fedora Release Engineering - 2.24.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild