pool/libproxy
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 74232 from GNOME:Factory

Browse Source 
Fix build of the plugins when using libwebkitgtk-3.0 1.5.1 (forwarded request 74231 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/74232
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libproxy?expand=0&rev=33
This commit is contained in:
Sascha Peilicke 2011-06-21 07:13:49 +00:00 committed by Git OBS Bridge
commit caa4d190f7
5 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libproxy-javascriptcoregtk.patch Normal file
View File

@ -0,0 +1,17 @@
Index: libproxy/cmake/modules/pacrunner_webkit.cmk
===================================================================
--- libproxy/cmake/modules/pacrunner_webkit.cmk (revision 815)
+++ libproxy/cmake/modules/pacrunner_webkit.cmk (working copy)
@@ -13,7 +13,10 @@
endif()
else()
if(WITH_WEBKIT3)
- px_check_modules(WEBKIT webkitgtk-3.0)
+ px_check_modules(WEBKIT javascriptcoregtk-3.0>=1.5.0)
+ if(NOT WEBKIT_LIBRARIES)
+ px_check_modules(WEBKIT webkitgtk-3.0<1.5.0)
+ endif(NOT WEBKIT_LIBRARIES)
else()
px_check_modules(WEBKIT webkit-1.0)
endif()

8
libproxy-plugins.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Jun 20 18:26:49 UTC 2011 - dimstar@opensuse.org
- Add libproxy-javascriptcoregtk.patch: Fix build with
webkitgtk-3.0 version 1.5.1: javascriptcoregtk became independent
and can be used on it's own now and is actually what libproxy
depends on. Patch taken from upstream svn, r816.
-------------------------------------------------------------------
Mon Jun 6 21:51:45 UTC 2011 - dimstar@opensuse.org

5
libproxy-plugins.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package libproxy-plugins
# spec file for package libproxy
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -53,6 +53,8 @@ Source: http://libproxy.googlecode.com/files/%{_sourcename}.tar.bz2
# Script used for automatic snapshot updates
Source98: update-from-svn.sh
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM libproxy-javascriptcoregtk.patch dimstar@opensuse.org -- Fix build with javascriptcoregtk3, which got split out of webkitgtk3. Patch from upstream svn.
Patch0: libproxy-javascriptcoregtk.patch
License: GPLv2+ ; LGPLv2.1+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
@ -319,6 +321,7 @@ about network configuration changes.
%prep
%setup -q -n %{_sourcename}
%patch0 -p0
mkdir build
%build

8
libproxy.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Jun 20 18:26:49 UTC 2011 - dimstar@opensuse.org
- Add libproxy-javascriptcoregtk.patch: Fix build with
webkitgtk-3.0 version 1.5.1: javascriptcoregtk became independent
and can be used on it's own now and is actually what libproxy
depends on. Patch taken from upstream svn, r816.
-------------------------------------------------------------------
Mon Jun 6 21:51:45 UTC 2011 - dimstar@opensuse.org

3
libproxy.spec
View File

@ -53,6 +53,8 @@ Source: http://libproxy.googlecode.com/files/%{_sourcename}.tar.bz2
# Script used for automatic snapshot updates
Source98: update-from-svn.sh
Source99: baselibs.conf
# PATCH-FIX-UPSTREAM libproxy-javascriptcoregtk.patch dimstar@opensuse.org -- Fix build with javascriptcoregtk3, which got split out of webkitgtk3. Patch from upstream svn.
Patch0: libproxy-javascriptcoregtk.patch
License: GPLv2+ ; LGPLv2.1+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: cmake
@ -319,6 +321,7 @@ about network configuration changes.
%prep
%setup -q -n %{_sourcename}
%patch0 -p0
mkdir build
%build