summaryrefslogtreecommitdiff
path: root/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch
diff options
context:
space:
mode:
authorAndreas K. Huettel (dilfridge) <mail@akhuettel.de>2011-11-01 23:22:29 +0100
committerAndreas K. Huettel (dilfridge) <mail@akhuettel.de>2011-11-01 23:22:29 +0100
commit24041512a56cb3543ecd76770a2155288684e2fc (patch)
treef2a978600f14572196a3d8a4d0ed0432de2bea8d /dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch
parent316950809ad391f35bd9eaf410bb6b66b0ffe7f0 (diff)
downloadkde-24041512a56cb3543ecd76770a2155288684e2fc.tar.gz
kde-24041512a56cb3543ecd76770a2155288684e2fc.tar.bz2
kde-24041512a56cb3543ecd76770a2155288684e2fc.zip
[dev-libs/libdbusmenu] Moved to main tree
Diffstat (limited to 'dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch')
-rw-r--r--dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch119
1 files changed, 0 insertions, 119 deletions
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch b/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch
deleted file mode 100644
index e178447f7ae..00000000000
--- a/dev-libs/libdbusmenu/files/libdbusmenu-0.3.94-optional-gtk.patch
+++ /dev/null
@@ -1,119 +0,0 @@
---- configure.ac.orig 2011-01-29 20:37:03.892284177 +0100
-+++ configure.ac 2011-01-29 20:42:10.969923186 +0100
-@@ -58,29 +58,39 @@
- GTK_REQUIRED_VERSION=2.16
- GTK3_REQUIRED_VERSION=2.91
-
-+AC_ARG_ENABLE([gtk],
-+ AC_HELP_STRING([--disable-gtk], [Disable libdbusmenu-gtk library]),
-+ [enable_gtk=$enableval], [enable_gtk=auto])
-+AM_CONDITIONAL([WANT_LIBDBUSMENUGTK], [test "x$enable_gtk" != "xno"])
-+
- AC_ARG_WITH([gtk],
- [AS_HELP_STRING([--with-gtk],
- [Which version of gtk to use @<:@default=2@:>@])],
- [],
- [with_gtk=2])
-+AM_CONDITIONAL([USE_GTK3], [test "x$with_gtk" = "x3"])
-+
-+AS_IF([test "x$enable_gtk" != "xno"],[
- AS_IF([test "x$with_gtk" = x3],
- [PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
- glib-2.0 >= $GLIB_REQUIRED_VERSION
-- libxml-2.0 >= $XML_REQUIRED_VERSION)
-+ libxml-2.0 >= $XML_REQUIRED_VERSION,
-+ [have_gtk=yes]
-+)
-- AC_SUBST(DBUSMENUGTK_CFLAGS)
-- AC_SUBST(DBUSMENUGTK_LIBS)
- AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available])
- ],
- [test "x$with_gtk" = x2],
- [PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION
- glib-2.0 >= $GLIB_REQUIRED_VERSION
-- libxml-2.0 >= $XML_REQUIRED_VERSION)
-+ libxml-2.0 >= $XML_REQUIRED_VERSION,
-+ [have_gtk=yes]
-+)
-- AC_SUBST(DBUSMENUGTK_CFLAGS)
-- AC_SUBST(DBUSMENUGTK_LIBS)
- ],
- [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
- )
--AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
-+])
-+AC_SUBST(DBUSMENUGTK_CFLAGS)
-+AC_SUBST(DBUSMENUGTK_LIBS)
-
- ###########################
- # Dependencies - dumper
-@@ -193,1 +193,6 @@
-
-+AS_IF([test "x$enable_gtk" = "xyes"],
-+ AC_MSG_NOTICE([ Gtk: yes (gtk$with_gtk)]),
-+ AC_MSG_NOTICE([ Gtk: no])
-+)
-+
---- Makefile.am.orig 2010-09-20 21:58:41.616751481 +0200
-+++ Makefile.am 2010-09-20 21:59:23.492035983 +0200
-@@ -5,5 +5,9 @@
-
-+if WANT_LIBDBUSMENUGTK
-+LIBDBUSMENUGTK_SUBDIR = libdbusmenu-gtk
-+endif
-+
- SUBDIRS = \
- libdbusmenu-glib \
-- libdbusmenu-gtk \
-+ $(LIBDBUSMENUGTK_SUBDIR) \
- tools \
---- tests/Makefile.am.orig 2011-01-29 20:47:16.721588701 +0100
-+++ tests/Makefile.am 2011-01-29 20:45:10.116455527 +0100
-@@ -11,13 +11,17 @@
- test-glib-proxy \
- test-glib-simple-items \
- test-glib-submenu \
-- test-json \
-+ test-json
-+
-+if WANT_LIBDBUSMENUGTK
-+TESTS += \
- test-gtk-objects-test \
- test-gtk-label \
- test-gtk-shortcut \
- test-gtk-reorder \
- test-gtk-submenu \
- test-gtk-parser-test
-+endif
-
- check_PROGRAMS = \
- glib-server-nomenu \
-@@ -31,20 +35,24 @@
- test-glib-proxy-client \
- test-glib-proxy-server \
- test-glib-proxy-proxy \
-- test-gtk-objects \
- test-glib-submenu-client \
- test-glib-submenu-server \
-+ test-glib-simple-items \
-+ test-json-client \
-+ test-json-server
-+
-+if WANT_LIBDBUSMENUGTK
-+check_PROGRAMS += \
-+ test-gtk-objects \
- test-gtk-label-client \
- test-gtk-label-server \
- test-gtk-shortcut-client \
- test-gtk-shortcut-server \
-- test-glib-simple-items \
- test-gtk-reorder-server \
-- test-json-client \
-- test-json-server \
- test-gtk-submenu-server \
- test-gtk-submenu-client \
- test-gtk-parser
-+endif
-
- XVFB_RUN=". $(srcdir)/run-xvfb.sh"
-