r18592 - in /desktop/experimental/gtk+2.0/debian: changelog patches/003_gdk.pc_privates.patch

[kov at users.alioth.debian.org]

Author: kov
Date: Tue Mar  3 03:58:42 2009
New Revision: 18592

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18592
Log:
refreshed 003_gdk.pc_privates.patch

Modified:
    desktop/experimental/gtk+2.0/debian/changelog
    desktop/experimental/gtk+2.0/debian/patches/003_gdk.pc_privates.patch

Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=18592&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Tue Mar  3 03:58:42 2009
@@ -9,6 +9,8 @@
   * 030_gtkentry_password-char-circle.patch:
   - dropped; upstream provides a different solution to setting the default
     invisible char now, that takes the font being used into consideration
+  * 003_gdk.pc_privates.patch:
+  - refreshed
 
  -- Gustavo Noronha Silva <kov at debian.org>  Mon, 02 Mar 2009 22:01:03 -0300
 

Modified: desktop/experimental/gtk+2.0/debian/patches/003_gdk.pc_privates.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/patches/003_gdk.pc_privates.patch?rev=18592&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/patches/003_gdk.pc_privates.patch (original)
+++ desktop/experimental/gtk+2.0/debian/patches/003_gdk.pc_privates.patch Tue Mar  3 03:58:42 2009
@@ -1,13 +1,13 @@
-Index: gtk+-2.14.7/configure.in
+Index: gtk+2.0-2.15.5/configure.in
 ===================================================================
---- gtk+-2.14.7.orig/configure.in	2009-02-17 23:06:24.718714576 +0100
-+++ gtk+-2.14.7/configure.in	2009-02-17 23:07:30.398582828 +0100
-@@ -1680,21 +1680,23 @@ LDFLAGS="$saved_ldflags"
+--- gtk+2.0-2.15.5.orig/configure.in	2009-03-03 00:53:16.000000000 -0300
++++ gtk+2.0-2.15.5/configure.in	2009-03-03 00:57:09.000000000 -0300
+@@ -1703,21 +1703,23 @@
  
  GDK_PACKAGES="$PANGO_PACKAGES gio-2.0"
  if test "x$gdktarget" = "xx11"; then
--  GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES"
-+  GDK_PRIVATE_PACKAGES="$X_PACKAGES"
+-  GDK_PACKAGES="$GDK_PACKAGES $X_PACKAGES cairo-xlib"
++  GDK_PRIVATE_PACKAGES="$X_PACKAGES cairo-xlib"
  fi
 -GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
 -GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
@@ -30,11 +30,11 @@
  AC_SUBST(GDK_EXTRA_LIBS)
  AC_SUBST(GDK_EXTRA_CFLAGS)
  AC_SUBST(GDK_DEP_LIBS)
-Index: gtk+-2.14.7/gdk-2.0.pc.in
+Index: gtk+2.0-2.15.5/gdk-2.0.pc.in
 ===================================================================
---- gtk+-2.14.7.orig/gdk-2.0.pc.in	2009-01-07 17:33:57.000000000 +0100
-+++ gtk+-2.14.7/gdk-2.0.pc.in	2009-02-17 23:07:30.402582917 +0100
-@@ -8,5 +8,6 @@ Name: GDK
+--- gtk+2.0-2.15.5.orig/gdk-2.0.pc.in	2009-03-02 16:03:47.000000000 -0300
++++ gtk+2.0-2.15.5/gdk-2.0.pc.in	2009-03-03 00:53:35.000000000 -0300
+@@ -8,5 +8,6 @@
  Description: GTK+ Drawing Kit (${target} target)
  Version: @VERSION@
  Requires: gdk-pixbuf-2.0 @GDK_PACKAGES@