Mailinglist Archive: opensuse-commit (1423 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package midori for openSUSE:Factory checked 
in at 2012-05-08 06:46:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/midori (Old)
 and      /work/SRC/openSUSE:Factory/.midori.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "midori", Maintainer is ""

Changes:
--------
--- /work/SRC/openSUSE:Factory/midori/midori.changes    2012-04-24 
11:22:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.midori.new/midori.changes       2012-05-08 
06:46:55.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Apr 16 14:26:15 UTC 2012 - gber@xxxxxxxxxxxx
+
+- added midori-fix-broken-libsoup-macros.patch in order to fix the
+  broken usage of HAVE_LIBSOUP_* macros (lp#983137)
+
+-------------------------------------------------------------------

New:
----
  midori-fix-broken-libsoup-macros.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ midori.spec ++++++
--- /var/tmp/diff_new_pack.MHt1Sl/_old  2012-05-08 06:46:57.000000000 +0200
+++ /var/tmp/diff_new_pack.MHt1Sl/_new  2012-05-08 06:46:57.000000000 +0200
@@ -26,6 +26,8 @@
 Source:         
http://archive.xfce.org/src/apps/%{name}/0.4/%{name}-%{version}.tar.bz2
 # PATCH-FIX-OPENSUSE midori-0.4.2-workaround-vala-bug.patch gber@xxxxxxxxxxxx 
-- Works around a prolem with Vala generating a function for string.replace() 
that potentially returns random data
 Patch0:         midori-0.4.2-workaround-vala-bug.patch
+# PATCH-FIX-UPSTREAM midori-fix-broken-libsoup-macros.patch lp#983137 
gber@xxxxxxxxxxxx -- Fix the broken HAVE_LIBSOUP_* macro definitions in 0.4.5
+Patch1:         midori-fix-broken-libsoup-macros.patch
 BuildRequires:  docutils
 BuildRequires:  gtk-doc
 BuildRequires:  intltool
@@ -91,6 +93,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 awk '/^\[/ && $0 != "[Desktop Entry]" { exit } { print }' 
data/midori.desktop.in \
     >data/midori.desktop.in.new
 mv data/midori.desktop.in.new data/midori.desktop.in

++++++ midori-fix-broken-libsoup-macros.patch ++++++
Index: midori-0.4.5/wscript
===================================================================
--- midori-0.4.5.orig/wscript
+++ midori-0.4.5/wscript
@@ -260,11 +260,11 @@ def configure (conf):
     check_pkg ('libsoup-2.4', '2.27.90')
     conf.define ('LIBSOUP_VERSION', conf.check_cfg (modversion='libsoup-2.4'))
     if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 3):
-        conf.define ('LIBSOUP_2_29_3', 1)
+        conf.define ('HAVE_LIBSOUP_2_29_3', 1)
     if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 91):
-        conf.define ('LIBSOUP_2_29_91', 1)
+        conf.define ('HAVE_LIBSOUP_2_29_91', 1)
     if check_version (conf.env['LIBSOUP_VERSION'], 2, 37, 1):
-        conf.define ('LIBSOUP_2_37_1', 1)
+        conf.define ('HAVE_LIBSOUP_2_37_1', 1)
     check_pkg ('libxml-2.0', '2.6')
     check_pkg ('sqlite3', '3.0', True, var='SQLITE')
 
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx