diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-09-22 00:54:55 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-09-22 00:54:55 -0400 |
| commit | ac78f5584c421abebeb0cdae1de6d8fa12361cb3 (patch) | |
| tree | 6dcee43e7e389f16454ea0da265e90084fa6ec49 | |
| parent | d194ffe79967ab7f1d6c5f262fb9e6a369c2bb62 (diff) | |
| download | gnome-panel-ac78f5584c421abebeb0cdae1de6d8fa12361cb3.tar.gz gnome-panel-ac78f5584c421abebeb0cdae1de6d8fa12361cb3.tar.xz gnome-panel-ac78f5584c421abebeb0cdae1de6d8fa12361cb3.zip | |
update a patch
| -rw-r--r-- | gnome-panel-libs.patch | 46 |
1 files changed, 15 insertions, 31 deletions
diff --git a/gnome-panel-libs.patch b/gnome-panel-libs.patch index 90ba286..f77f454 100644 --- a/gnome-panel-libs.patch +++ b/gnome-panel-libs.patch @@ -1,31 +1,15 @@ -diff -up gnome-panel-2.31.2/configure.in.libs gnome-panel-2.31.2/configure.in ---- gnome-panel-2.31.2/configure.in.libs 2010-05-26 14:17:31.000000000 -0400 -+++ gnome-panel-2.31.2/configure.in 2010-05-28 01:06:01.347433767 -0400 -@@ -72,7 +72,7 @@ dnl pkg-config dependency checks +diff -up gnome-panel-2.31.92/configure.ac.libs gnome-panel-2.31.92/configure.ac +--- gnome-panel-2.31.92/configure.ac.libs 2010-09-14 08:48:16.000000000 -0400 ++++ gnome-panel-2.31.92/configure.ac 2010-09-22 00:52:56.138997995 -0400 +@@ -235,10 +235,15 @@ AC_SUBST(X_LIBS) - PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-2.0) - --PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED libcanberra-gtk) -+PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED libcanberra-gtk dbus-glib-1 dbus-1) - AC_SUBST(PANEL_CFLAGS) - AC_SUBST(PANEL_LIBS) - -@@ -256,16 +256,17 @@ PKG_CHECK_MODULES(X, x11 xau, :, [ - X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXau $X_EXTRA_LIBS" - ]) - --AC_SUBST(X_LIBS) -- dnl X RANDR extension --if $PKG_CONFIG --exists "xrandr >= 1.2.0" ; then -- AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library]) -- have_randr=yes --else -- have_randr=no --fi +-PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.0, have_randr=yes, have_randr=no) +-if test "x$have_randr" = "xyes"; then +PKG_CHECK_MODULES(XRANDR, xrandr >= 1.2.0, [ -+ AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library]) + AC_DEFINE(HAVE_RANDR, 1, [Have the Xrandr extension library]) +-fi + have_randr=yes + X_LIBS="$X_LIBS $XRANDR_LIBS" +], [ @@ -36,18 +20,18 @@ diff -up gnome-panel-2.31.2/configure.in.libs gnome-panel-2.31.2/configure.in dnl Modules dir AC_SUBST([modulesdir],"\$(libdir)/gnome-panel/modules") -diff -up gnome-panel-2.31.2/gnome-panel/Makefile.am.libs gnome-panel-2.31.2/gnome-panel/Makefile.am ---- gnome-panel-2.31.2/gnome-panel/Makefile.am.libs 2010-05-26 11:13:52.000000000 -0400 -+++ gnome-panel-2.31.2/gnome-panel/Makefile.am 2010-05-28 01:01:38.674674304 -0400 -@@ -152,6 +152,7 @@ gnome_panel_LDADD = \ - $(top_builddir)/gnome-panel/libpanel-applet-private/libpanel-applet-private.la \ +diff -up gnome-panel-2.31.92/gnome-panel/Makefile.am.libs gnome-panel-2.31.92/gnome-panel/Makefile.am +--- gnome-panel-2.31.92/gnome-panel/Makefile.am.libs 2010-09-14 03:55:39.000000000 -0400 ++++ gnome-panel-2.31.92/gnome-panel/Makefile.am 2010-09-22 00:53:48.106998001 -0400 +@@ -154,6 +154,7 @@ gnome_panel_LDADD = \ $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \ $(PANEL_LIBS) \ -+ -lm \ + $(XRANDR_LIBS) \ ++ -lm \ $(X_LIBS) gnome_panel_LDFLAGS = -export-dynamic -@@ -168,6 +169,7 @@ gnome_desktop_item_edit_LDFLAGS = -expor +@@ -170,6 +171,7 @@ gnome_desktop_item_edit_LDFLAGS = -expor gnome_desktop_item_edit_LDADD = \ $(top_builddir)/gnome-panel/libpanel-util/libpanel-util.la \ $(PANEL_LIBS) \ |