rpm/webkit2gtk3
SHA256
1
0
Fork 0
forked from pool/webkit2gtk3
Code Pull Requests Activity

Accepting request 661551 from GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/661551
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/webkit2gtk3?expand=0&rev=71
This commit is contained in:
Dominique Leuenberger 2019-01-03 17:03:24 +00:00 committed by Git OBS Bridge
commit 3e32e693c6
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
webkit2gtk3.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Dec 26 19:21:01 UTC 2018 - bjorn.lie@gmail.com
- Pass DENABLE_ACCELERATED_2D_CANVAS=ON to cmake, build accelerated
2d canvas support, we already build the needed support in cairo.
- Switch to Ninja build, add ninja BuildRequires and pass GNinja to
cmake and use ninja_build and ninja_make macros.
-------------------------------------------------------------------
Wed Dec 26 16:54:29 UTC 2018 - schwab@suse.de
- Don't use gold on ppc.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 17 10:12:07 UTC 2018 - bjorn.lie@gmail.com Mon Dec 17 10:12:07 UTC 2018 - bjorn.lie@gmail.com

12
webkit2gtk3.spec
View File

@ -32,7 +32,7 @@
%define _gold_linker 0 %define _gold_linker 0
%endif %endif
%else %else
%ifarch s390 %ifarch ppc s390
%define _gold_linker 0 %define _gold_linker 0
%endif %endif
%endif %endif
@ -56,6 +56,7 @@ Source99: webkit2gtk3.keyring
Patch0: webkit2gtk3-python3.patch Patch0: webkit2gtk3-python3.patch
# PATCh-FIX-UPSTREAM webkit2gtk3-boo1088932-a11y-state-set.patch boo#1088932 webkit#184366 mgorse@suse.com -- fix crash when atk_object_ref_state_set is called on an AtkObject that's being destroyed. # PATCh-FIX-UPSTREAM webkit2gtk3-boo1088932-a11y-state-set.patch boo#1088932 webkit#184366 mgorse@suse.com -- fix crash when atk_object_ref_state_set is called on an AtkObject that's being destroyed.
Patch1: webkit2gtk3-boo1088932-a11y-state-set.patch Patch1: webkit2gtk3-boo1088932-a11y-state-set.patch
BuildRequires: Mesa-libEGL-devel BuildRequires: Mesa-libEGL-devel
BuildRequires: Mesa-libGL-devel BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLESv1_CM-devel BuildRequires: Mesa-libGLESv1_CM-devel
@ -74,6 +75,7 @@ BuildRequires: gperf >= 3.0.1
BuildRequires: hyphen-devel BuildRequires: hyphen-devel
BuildRequires: libicu-devel BuildRequires: libicu-devel
BuildRequires: libjpeg-devel BuildRequires: libjpeg-devel
BuildRequires: ninja
BuildRequires: perl >= 5.10.0 BuildRequires: perl >= 5.10.0
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: ruby >= 1.8.7 BuildRequires: ruby >= 1.8.7
@ -139,8 +141,8 @@ more.
%package -n libwebkit2gtk%{_wk2sover} %package -n libwebkit2gtk%{_wk2sover}
Summary: Library for rendering web content, GTK+ Port Summary: Library for rendering web content, GTK+ Port
# Require the injected bundles. The bundles are dlopen()ed
Group: System/Libraries Group: System/Libraries
# Require the injected bundles. The bundles are dlopen()ed
Requires: webkit2gtk-4_0-injected-bundles Requires: webkit2gtk-4_0-injected-bundles
Recommends: %{_pkgname_no_slpp}-lang Recommends: %{_pkgname_no_slpp}-lang
Provides: %{_pkgname_no_slpp} = %{version} Provides: %{_pkgname_no_slpp} = %{version}
@ -312,6 +314,7 @@ export PYTHON=%{_bindir}/python3
%global optflags %(echo %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads | sed 's/-g /-g1 /') %global optflags %(echo %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads | sed 's/-g /-g1 /')
%endif %endif
%cmake \ %cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libwebkit2gtk%{_wk2sover} \ -DLIBEXEC_INSTALL_DIR=%{_libexecdir}/libwebkit2gtk%{_wk2sover} \
-DPORT=GTK \ -DPORT=GTK \
@ -326,6 +329,7 @@ export PYTHON=%{_bindir}/python3
-DENABLE_MEDIA_SOURCE=OFF \ -DENABLE_MEDIA_SOURCE=OFF \
%endif %endif
-DENABLE_MINIBROWSER=ON \ -DENABLE_MINIBROWSER=ON \
-DENABLE_ACCELERATED_2D_CANVAS=ON \
%if %{with python3} %if %{with python3}
-DPYTHON_EXECUTABLE=%{_bindir}/python3 \ -DPYTHON_EXECUTABLE=%{_bindir}/python3 \
%endif %endif
@ -340,10 +344,10 @@ export PYTHON=%{_bindir}/python3
-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" \ -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" \
-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread" -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now -pthread"
make -j $max_link_jobs %ninja_build -j $max_link_jobs
%install %install
%cmake_install %ninja_install -C build
%find_lang WebKit2GTK-4.0 %find_lang WebKit2GTK-4.0
%post -n libwebkit2gtk%{_wk2sover} -p /sbin/ldconfig %post -n libwebkit2gtk%{_wk2sover} -p /sbin/ldconfig