r25961 - in /desktop/experimental/gtk+3.0/debian: changelog patches/006_reenable_pixbuf_engine.patch patches/070_mandatory-relibtoolize.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Thu Dec 16 14:48:56 2010
New Revision: 25961

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25961
Log:
  + debian/patches/006_reenable_pixbuf_engine.patch:
    - New patch. Build the pixbuf engine even if it hasn't been ported to
      the new GtkThemingEngine API.

Added:
    desktop/experimental/gtk+3.0/debian/patches/006_reenable_pixbuf_engine.patch
Modified:
    desktop/experimental/gtk+3.0/debian/changelog
    desktop/experimental/gtk+3.0/debian/patches/070_mandatory-relibtoolize.patch
    desktop/experimental/gtk+3.0/debian/patches/series

Modified: desktop/experimental/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/changelog?rev=25961&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/changelog [utf-8] Thu Dec 16 14:48:56 2010
@@ -6,6 +6,9 @@
     + debian/patches/004_git_add_missing_include.patch:
       - New patch from upstream git, add a missing include that
         otherwise caused the build to fail when disabling X extensions.
+    + debian/patches/006_reenable_pixbuf_engine.patch:
+      - New patch. Build the pixbuf engine even if it hasn't been ported to
+        the new GtkThemingEngine API.
     + debian/patches/*:
       - Refreshed.
     + debian/libgtk3.0-0.symbols:

Added: desktop/experimental/gtk+3.0/debian/patches/006_reenable_pixbuf_engine.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/006_reenable_pixbuf_engine.patch?rev=25961&op=file
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/006_reenable_pixbuf_engine.patch (added)
+++ desktop/experimental/gtk+3.0/debian/patches/006_reenable_pixbuf_engine.patch [utf-8] Thu Dec 16 14:48:56 2010
@@ -1,0 +1,11 @@
+--- a/modules/engines/Makefile.am
++++ b/modules/engines/Makefile.am
+@@ -5,7 +5,7 @@
+ endif
+ 
+ # the theme engines need to be ported to GtkThemingEngine
+-# SUBDIRS = $(wimp) pixbuf
++SUBDIRS = $(wimp) pixbuf
+ 
+ DIST_SUBDIRS = ms-windows pixbuf
+ 

Modified: desktop/experimental/gtk+3.0/debian/patches/070_mandatory-relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/070_mandatory-relibtoolize.patch?rev=25961&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/070_mandatory-relibtoolize.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/070_mandatory-relibtoolize.patch [utf-8] Thu Dec 16 14:48:56 2010
@@ -8687,7 +8687,15 @@
  ms_librarian = @ms_librarian@
 --- a/modules/engines/Makefile.in
 +++ b/modules/engines/Makefile.in
-@@ -162,6 +162,7 @@
+@@ -38,7 +38,6 @@
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ 	$(top_srcdir)/Makefile.decl
+ subdir = modules/engines
+-SUBDIRS =
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+ 	$(top_srcdir)/m4/introspection.m4 $(top_srcdir)/m4/libtool.m4 \
+@@ -162,6 +161,7 @@
  GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
  GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
  GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
@@ -8695,7 +8703,7 @@
  GDK_WLIBS = @GDK_WLIBS@
  GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
  GLIB_CFLAGS = @GLIB_CFLAGS@
-@@ -318,6 +319,7 @@
+@@ -318,6 +318,7 @@
  libexecdir = @libexecdir@
  localedir = @localedir@
  localstatedir = @localstatedir@
@@ -8703,6 +8711,15 @@
  mandir = @mandir@
  mkdir_p = @mkdir_p@
  ms_librarian = @ms_librarian@
+@@ -367,7 +368,7 @@
+ @USE_WIN32_TRUE at wimp = ms-windows
+ 
+ # the theme engines need to be ported to GtkThemingEngine
+-# SUBDIRS = $(wimp) pixbuf
++SUBDIRS = $(wimp) pixbuf
+ DIST_SUBDIRS = ms-windows pixbuf
+ all: all-recursive
+ 
 --- a/modules/engines/ms-windows/Makefile.in
 +++ b/modules/engines/ms-windows/Makefile.in
 @@ -219,6 +219,7 @@

Modified: desktop/experimental/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/series?rev=25961&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/series [utf-8] Thu Dec 16 14:48:56 2010
@@ -3,6 +3,7 @@
 003_gdk.pc_privates.patch
 004_git_add_missing_include.patch
 005_support_disabling_x11_extensions.patch
+006_reenable_pixbuf_engine.patch
 015_default-fallback-icon-theme.patch
 022_disable-viqr-im-for-vi-locale.patch
 041_ia32-libs.patch