Mailinglist Archive: opensuse-commit (861 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package gdk-pixbuf for openSUSE:Factory
checked in at Mon Jan 10 10:42:35 CET 2011.



--------
--- GNOME/gdk-pixbuf/gdk-pixbuf.changes 2010-11-17 16:09:13.000000000 +0100
+++ /mounts/work_src_done/STABLE/gdk-pixbuf/gdk-pixbuf.changes  2011-01-06 
02:37:49.000000000 +0100
@@ -1,0 +2,10 @@
+Tue Dec 28 22:20:56 UTC 2010 - dimstar@xxxxxxxxxxxx
+
+- Add gdk-pixbuf-add-gir_PACKAGES.patch: vapigen 0.12 parses the
+  .gir and the .vapi file, complaining about duplicate definitions.
+  The error is seen in packages building against gdk-pixbuf and
+  using vala-unstable to create own vala bindings.
+- Add gnome-common BuildRequires, because the patch touches
+  Makefile.am, and call to gnome-autogen.sh in the build section.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  gdk-pixbuf-add-gir_PACKAGES.patch

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

Other differences:
------------------
++++++ gdk-pixbuf.spec ++++++
--- /var/tmp/diff_new_pack.Zwgbfn/_old  2011-01-10 10:38:48.000000000 +0100
+++ /var/tmp/diff_new_pack.Zwgbfn/_new  2011-01-10 10:38:48.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package gdk-pixbuf (Version 2.22.1)
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -21,7 +21,7 @@
 
 Name:           gdk-pixbuf
 Version:        2.22.1
-Release:        1
+Release:        2
 License:        LGPLv2+
 Summary:        An image loading library
 Group:          System/Libraries
@@ -29,6 +29,10 @@
 Source1:        macros.gdk-pixbuf
 Source2:        README.SUSE
 Source99:       baselibs.conf
+# PATCH-FIX-UPSTREAM gdk-pixbuf-add-gir_PACKAGES.patch bgo#635364 
dimstar@xxxxxxxxxxxx -- Add gir_PACKAGES. This helps vapigen 0.12 to add proper 
package information, needed to bind .vapi and .gir files, in case both are 
installed.
+Patch0:         gdk-pixbuf-add-gir_PACKAGES.patch
+# Needed for patch0
+BuildRequires:  gnome-common
 BuildRequires:  libjasper-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
@@ -89,8 +93,11 @@
 %if "%_lib" == "lib64"
 cp -a %{S:2} .
 %endif
+%patch0 -p1
 
 %build
+# Needed for patch0
+NOCONFIGURE=1 gnome-autogen.sh
 %configure \
         --disable-static \
         --enable-introspection \

++++++ gdk-pixbuf-add-gir_PACKAGES.patch ++++++
> From b68e5328451d5d805c44b2e33f7b0f0565f3a572 Mon Sep 17 00:00:00 2001
From: Evan Nemerson <evan@xxxxxxxxxxxxxxx>
Date: Sat, 20 Nov 2010 09:39:07 -0800
Subject: [PATCH] introspection: Add C include and exported packages information 
to GIR

https://bugzilla.gnome.org/show_bug.cgi?id=635364
---
 gdk-pixbuf/Makefile.am |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index d4105d2..72f4aa5 100644
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -677,7 +677,8 @@ EXTRA_DIST +=                                       \
 if HAVE_INTROSPECTION
 
 GdkPixbuf-2.0.gir: libgdk_pixbuf-2.0.la Makefile
-GdkPixbuf_2_0_gir_SCANNERFLAGS = --warn-all --strip-prefix=Gdk
+GdkPixbuf_2_0_gir_SCANNERFLAGS = --warn-all --strip-prefix=Gdk 
--c-include="gdk-pixbuf/gdk-pixdata.h"
+GdkPixbuf_2_0_gir_EXPORT_PACKAGES = gdk-pixbuf-2.0
 GdkPixbuf_2_0_gir_INCLUDES = GModule-2.0 Gio-2.0
 GdkPixbuf_2_0_gir_LIBS = libgdk_pixbuf-2.0.la
 GdkPixbuf_2_0_gir_CFLAGS = $(INCLUDES)
-- 
1.7.2.3



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



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx