Hello community,
here is the log from the commit of package gthumb for openSUSE:Factory checked
in at 2014-09-30 19:36:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gthumb (Old)
and /work/SRC/openSUSE:Factory/.gthumb.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gthumb"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gthumb/gthumb.changes 2014-08-13
08:48:39.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.gthumb.new/gthumb.changes 2014-09-30
19:37:07.000000000 +0200
@@ -1,0 +2,10 @@
+Sat Aug 23 20:20:57 UTC 2014 - dims...@opensuse.org
+
+- Add gthumb-webkit2gtk.patch: Support building against
+ webkit2gtk-3.0 and webkit2gtk-4.0.
+- Add gnome-common BuildRequires and call to gnome-autogen.sh, as
+ above patch touches the build system.
+- Add conditional pkgconfig(webkit2gtk-4.0) BuildRequires for 13.2
+ and newer.
+
+-------------------------------------------------------------------
New:
----
gthumb-webkit2gtk.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gthumb.spec ++++++
--- /var/tmp/diff_new_pack.brqF5l/_old 2014-09-30 19:37:08.000000000 +0200
+++ /var/tmp/diff_new_pack.brqF5l/_new 2014-09-30 19:37:08.000000000 +0200
@@ -29,12 +29,16 @@
Patch0: gthumb-new-icon-for-gear-menu.patch
# PATCH-FIX-UPSTREAM gthumb-fix-forbidden-flicker-upload.patch
zai...@opensuse.org -- Fix forbidden when trying to upload to Flickr, taken
from upstream git.
Patch1: gthumb-fix-forbidden-flicker-upload.patch
+# PATCH-FIX-UPSTREAM gthumb-webkit2gtk.patch dims...@opensuse.org -- Support
building against either webkit2gtk-4.0 or webkit2gtk-3.0, taken from upstream
git.
+Patch2: gthumb-webkit2gtk.patch
# For web albums
BuildRequires: bison
BuildRequires: fdupes
# For web albums
BuildRequires: flex
BuildRequires: gcc-c++
+# Needed for patch2
+BuildRequires: gnome-common
BuildRequires: gnome-doc-utils-devel
BuildRequires: intltool
BuildRequires: itstool
@@ -63,7 +67,11 @@
BuildRequires: pkgconfig(libsoup-gnome-2.4) >= 2.42
BuildRequires: pkgconfig(libwebp) >= 0.2.0
BuildRequires: pkgconfig(sm) >= 1.0.0
+%if 0%{?suse_version} < 1320
BuildRequires: pkgconfig(webkit2gtk-3.0)
+%else
+BuildRequires: pkgconfig(webkit2gtk-4.0)
+%endif
BuildRequires: pkgconfig(zlib)
Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -92,8 +100,11 @@
translation-update-upstream
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
+# Needed for patch2
+NOCONFIGURE=1 gnome-autogen.sh
%configure\
--disable-static \
--enable-libraw \
++++++ gthumb-webkit2gtk.patch ++++++
>From 1deef9ef5730606f3a2f7340af80e3e3b02e4302 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dims...@opensuse.org>
Date: Fri, 15 Aug 2014 16:47:27 +0200
Subject: [PATCH] Build against either webkit2gtk-3.0 or webkit2gtk-4.0
The API changes were minor and none affected gthumb.
---
configure.ac | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 6f9f03e..d2b82cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -508,10 +508,14 @@ AC_ARG_ENABLE([webkit2],
if test x$enable_webkit2 = xyes ; then
PKG_CHECK_MODULES(WEBKIT2,
- [webkit2gtk-3.0 >= $WEBKIT2_REQUIRED],
+ [webkit2gtk-4.0 >= $WEBKIT2_REQUIRED],
[AC_DEFINE(HAVE_WEBKIT2, 1, [Have webkit2gtk])
enable_webkit2=yes],
- [enable_webkit2=no])
+ [PKG_CHECK_MODULES(WEBKIT2,
+ [webkit2gtk-3.0 >=
$WEBKIT2_REQUIRED],
+ [AC_DEFINE(HAVE_WEBKIT2, 1, [Have
webkit2gtk])
+ enable_webkit2=yes],
+ [enable_webkit2=no])])
fi
AC_SUBST(WEBKIT2_CFLAGS)
AC_SUBST(WEBKIT2_LIBS)
--
1.8.1.4
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
