← Back to branch summary

~bratsche/ubuntu/maverick/gtk+2.0/menu-activation-fix

« back to all changes in this revision

Viewing changes to debian/patches/003_gdk.pc_privates.patch

  • Committer: Bazaar Package Importer
  • Author(s): Robert Ancell
  • Date: 2010-07-22 21:41:30 UTC
  • mfrom: (1.11.7 upstream) (72.1.16 experimental)
  • Revision ID: james.westby@ubuntu.com-20100722214130-5uzyvpb9g4m0ts2c
Tags: 2.21.5-1ubuntu1
* Merge with Debian experimental, Ubuntu changes:
* debian/control.in:
  - Add introspection build-depends
  - Add Vcs-Bzr link
  - Add gir1.0-gtk-2.0 package
  - libgtk2.0-dev replaces gir-repository-dev
  - Conflict with appmenu-gtk (<< 0.1.3) to prevent menu proxy breakage
* debian/rules:
  - Build with --enable-introspection
  - Add gir1.0-gtk-2.0 package to BINARY_ARCH_PKGS
  - Add dh_girepository call
  - Disable devhelp files
* debian/dh_gtkmodules.in:
  - Remove obsolete script content
* debian/libgtk2.0-0.symbols:
  - Add Ubuntu specific symbols
* debian/libgtk2.0-dev.install.in:
  - Add gir files
* debian/libgtk2.0-doc.install.in
  - Disable devhelp files
* debian/gir1.0-gtk-2.0.install.in
  - Introspection package
* debian/patches/043_menu_proxy.patch
  - Add GtkMenuProxy support for remoting menus.
* debian/patches/062_dnd_menubar.patch:
  - Allow click on menubars for dnd
* debian/patches/063_treeview_almost_fixed.patch:
  - Add an ubuntu-almost-fixed-height-mode property, (required for
    software-center)
* debian/patches/071_no_offscreen_widgets_grabbing.patch:
  - Don't let offscreen widgets do grabbing
* debian/patches/072_indicator_menu_update.patch:
  - change by Cody Russell to send an update event on menu changes,
    should make the bluetooth indicator refresh correctly
* debian/patches/091_bugzilla_tooltip_refresh.patch:
  - Upstream bugzilla change to have better looking tooltips the gtk theme
    need to set "new-tooltip-style" to use those
* debian/watch:
  - Watch for unstable versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/003_gdk.pc_privates.patch
1
 
Index: b/configure.in
 
1
Index: gtk+2.0-2.21.5/configure.in
2
2
===================================================================
3
 
--- a/configure.in      2010-04-10 14:52:06.769944806 +0200
4
 
+++ b/configure.in      2010-04-10 14:52:07.373945222 +0200
5
 
@@ -1722,23 +1722,27 @@
 
3
--- gtk+2.0-2.21.5.orig/configure.in    2010-07-22 17:53:08.402066616 +0200
 
4
+++ gtk+2.0-2.21.5/configure.in 2010-07-22 17:54:32.685052226 +0200
 
5
@@ -1310,23 +1310,27 @@
6
6
 
7
7
 # Pull in gio-unix for GDesktopAppInfo usage, see at least gdkapplaunchcontext-x11.c
8
8
 if test "x$gdktarget" = "xx11"; then
9
 
-  GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES cairo-$cairo_backend"
10
 
+  GDK_PACKAGES="$PANGO_PACKAGES"
 
9
-  GDK_PACKAGES="$PANGO_PACKAGES gio-unix-2.0 $X_PACKAGES gdk-pixbuf-2.0 cairo-$cairo_backend"
 
10
+  GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
11
11
+  GDK_PRIVATE_PACKAGES="gio-unix-2.0 $X_PACKAGES cairo-$cairo_backend"
12
12
 else
13
 
-  GDK_PACKAGES="$PANGO_PACKAGES $X_PACKAGES cairo-$cairo_backend"
14
 
+  GDK_PACKAGES="$PANGO_PACKAGES"
15
 
+  GDK_PRIVATE_PACKAGES="$X_PACKAGES cairo-$cairo_backend"
 
13
-  GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend"
 
14
+  GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
 
15
+  GDK_PRIVATE_PACKAGES="gio-2.0 cairo-$cairo_backend"
16
16
 fi
17
17
 
18
 
-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
19
 
-GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
20
 
+GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_LIBS"
21
 
+GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PIXBUF_PACKAGES $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_PIXBUF_EXTRA_CFLAGS $GDK_EXTRA_CFLAGS"
 
18
-GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES`"
 
19
-GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS"
 
20
+GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES $GDK_PRIVATE_PACKAGES`"
 
21
+GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags  gthread-2.0 $GDK_PACKAGES $GDK_PRIVATE_PACKAGES` $GDK_EXTRA_CFLAGS"
22
22
 #
23
23
 # If we aren't writing explicit dependencies, then don't put the extra libraries we need
24
24
 # into the pkg-config files
25
25
 #
26
26
 if test $enable_explicit_deps != yes ; then
27
 
-  GDK_PACKAGES="$PANGO_PACKAGES"
 
27
-  GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0"
28
28
   GDK_EXTRA_LIBS=
29
29
+else
30
30
+  GDK_PACKAGES="$GDK_PACKAGES $GDK_PRIVATE_PACKAGES"
35
35
 AC_SUBST(GDK_EXTRA_LIBS)
36
36
 AC_SUBST(GDK_EXTRA_CFLAGS)
37
37
 AC_SUBST(GDK_DEP_LIBS)
38
 
Index: b/gdk-2.0.pc.in
 
38
Index: gtk+2.0-2.21.5/gdk-2.0.pc.in
39
39
===================================================================
40
 
--- a/gdk-2.0.pc.in     2010-04-10 14:52:04.881945980 +0200
41
 
+++ b/gdk-2.0.pc.in     2010-04-10 14:52:07.373945222 +0200
 
40
--- gtk+2.0-2.21.5.orig/gdk-2.0.pc.in   2010-07-12 18:23:43.000000000 +0200
 
41
+++ gtk+2.0-2.21.5/gdk-2.0.pc.in        2010-07-22 17:54:32.685052226 +0200
42
42
@@ -8,5 +8,6 @@
43
43
 Description: GTK+ Drawing Kit (${target} target)
44
44
 Version: @VERSION@
45
 
 Requires: gdk-pixbuf-2.0 @GDK_PACKAGES@
 
45
 Requires: @GDK_PACKAGES@
46
46
+Requires.private: @GDK_PRIVATE_PACKAGES@
47
47
 Libs: -L${libdir} -lgdk-${target}-@GTK_API_VERSION@ @GDK_EXTRA_LIBS@
48
48
 Cflags: -I${includedir}/gtk-2.0 -I${libdir}/gtk-2.0/include @GDK_EXTRA_CFLAGS@