Hello community,
here is the log from the commit of package libproxy for openSUSE:Factory
checked in at Tue Jun 21 09:14:01 CEST 2011.
--------
--- GNOME/libproxy/libproxy-plugins.changes 2011-06-07 12:48:24.000000000
+0200
+++ /mounts/work_src_done/STABLE/libproxy/libproxy-plugins.changes
2011-06-20 20:28:35.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Jun 20 18:26:49 UTC 2011 - dims...@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.
+
+-------------------------------------------------------------------
libproxy.changes: same change
calling whatdependson for head-i586
New:
----
libproxy-javascriptcoregtk.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libproxy-plugins.spec ++++++
--- /var/tmp/diff_new_pack.5Ot6Jp/_old 2011-06-21 09:11:53.000000000 +0200
+++ /var/tmp/diff_new_pack.5Ot6Jp/_new 2011-06-21 09:11:53.000000000 +0200
@@ -43,7 +43,7 @@
Group: System/Libraries
Summary: Libproxy provides consistent proxy configuration to
applications
Version: 0.4.7
-Release: 1
+Release: 2
%if 0%{?build_snapshot}
%define _sourcename %{_name}
%else
@@ -53,6 +53,8 @@
# Script used for automatic snapshot updates
Source98: update-from-svn.sh
Source99: baselibs.conf
+# PATCH-FIX-UPSTREAM libproxy-javascriptcoregtk.patch dims...@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
@@ -218,6 +220,7 @@
%package -n libproxy1-config-gnome
+
Summary: Libproxy module for GNOME configuration
%else
@@ -319,6 +322,7 @@
%prep
%setup -q -n %{_sourcename}
+%patch0 -p0
mkdir build
%build
++++++ libproxy.spec ++++++
--- /var/tmp/diff_new_pack.5Ot6Jp/_old 2011-06-21 09:11:53.000000000 +0200
+++ /var/tmp/diff_new_pack.5Ot6Jp/_new 2011-06-21 09:11:53.000000000 +0200
@@ -43,7 +43,7 @@
Group: System/Libraries
Summary: Libproxy provides consistent proxy configuration to
applications
Version: 0.4.7
-Release: 1
+Release: 3
%if 0%{?build_snapshot}
%define _sourcename %{_name}
%else
@@ -53,6 +53,8 @@
# Script used for automatic snapshot updates
Source98: update-from-svn.sh
Source99: baselibs.conf
+# PATCH-FIX-UPSTREAM libproxy-javascriptcoregtk.patch dims...@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
@@ -218,6 +220,7 @@
%package -n libproxy1-config-gnome
+
Summary: Libproxy module for GNOME configuration
%else
@@ -319,6 +322,7 @@
%prep
%setup -q -n %{_sourcename}
+%patch0 -p0
mkdir build
%build
++++++ libproxy-javascriptcoregtk.patch ++++++
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()
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
