Hello community, here is the log from the commit of package balsa for openSUSE:Factory checked in at 2014-09-30 19:36:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/balsa (Old) and /work/SRC/openSUSE:Factory/.balsa.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "balsa" Changes: -------- --- /work/SRC/openSUSE:Factory/balsa/balsa.changes 2013-05-06 09:39:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.balsa.new/balsa.changes 2014-09-30 19:36:50.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Sep 9 13:34:34 UTC 2014 - [email protected] + +- Add balsa-support-webkit2gtk-4.0.patch: Support building with + webkit2gtk3 (bgo#736493). +- Add conditional pkgconfig(webkit2gtk-4.0) BuildRequires for + versions newer than 1310 as the above patch adds support for it. +- Add libtool BuildRequires and call to autoreconf, as above patch + touches the build system. + +------------------------------------------------------------------- New: ---- balsa-support-webkit2gtk-4.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ balsa.spec ++++++ --- /var/tmp/diff_new_pack.QGrrNa/_old 2014-09-30 19:36:50.000000000 +0200 +++ /var/tmp/diff_new_pack.QGrrNa/_new 2014-09-30 19:36:50.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package balsa # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,10 @@ Group: Productivity/Networking/Email/Clients Url: http://pawsa.fedorapeople.org/balsa/ Source: http://pawsa.fedorapeople.org/balsa/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM balsa-support-webkit2gtk-4.0.patch bgo#736493 [email protected] -- Support webkit2gtk-4.0. Configure will favor webkit2gtk-4.0 over webkit2gtk-3.0 if found. +Patch0: balsa-support-webkit2gtk-4.0.patch +# Needed for patch0 +BuildRequires: libtool BuildRequires: compface BuildRequires: fdupes BuildRequires: gpgme-devel @@ -50,7 +54,11 @@ BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(unique-1.0) +%if 0%{?suse_version} < 1320 BuildRequires: pkgconfig(webkit2gtk-3.0) +%else +BuildRequires: pkgconfig(webkit2gtk-4.0) +%endif Recommends: %{base_name}-lang %if "%{name}" != "%{base_name}" Conflicts: %{base_name} @@ -73,8 +81,11 @@ %prep %setup -q -n %{base_name}-%{version} translation-update-upstream +%patch0 -p1 %build +# Needed for patch0 +autoreconf -fiv %configure\ %if %TOUCHSCREEN_OPTIMIZATION --enable-touch-ui\ ++++++ balsa-support-webkit2gtk-4.0.patch ++++++ >From edc51f473359991bc43a00efa5e11ab279b04082 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger <[email protected]> Date: Thu, 11 Sep 2014 19:05:01 +0200 Subject: [PATCH] Add support for webkit2gtk-4.0 Configure will favor webkit2gtk-4.0 over webkit2gtk-3.0 if found. --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b9ae71a..89c4187 100644 --- a/configure.ac +++ b/configure.ac @@ -410,7 +410,8 @@ case "$use_html_widget" in fi fi if test $use_html_widget = webkit2 ; then - PKG_CHECK_MODULES(HTML, [webkit2gtk-3.0 >= 1.11.92 ]) + PKG_CHECK_EXISTS([webkit2gtk-4.0], wk2gtk=webkit2gtk-4.0, wk2gtk=webkit2gtk-3.0) + PKG_CHECK_MODULES(HTML, [$wk2gtk >= 1.11.92 ]) AC_DEFINE(USE_WEBKIT2,1,[Defined when WebKit2 is requested.]) else if $PKG_CONFIG --atleast-version=1.5.1 webkitgtk-3.0 ; then -- 2.1.0 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
