+ 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.
This commit is contained in:
Emilio Pozuelo Monfort
2010-12-16 14:48:56 +00:00
parent 5be75bbf4a
commit b9cda7cc42
4 changed files with 34 additions and 2 deletions

3
debian/changelog vendored
View File

@ -6,6 +6,9 @@ gtk+3.0 (2.91.6-1) UNRELEASED; urgency=low
+ 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:

View File

@ -0,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

View File

@ -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@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 @@

View File

@ -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