gentoo resync : 14.07.2018

2 files changed, 0 insertions, 71 deletions

diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-12.10.2-gtk2-signal-fix.patch b/dev-libs/libdbusmenu/files/libdbusmenu-12.10.2-gtk2-signal-fix.patch
deleted file mode 100644
index 6d270f1370bf..000000000000
--- a/dev-libs/libdbusmenu/files/libdbusmenu-12.10.2-gtk2-signal-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-=== modified file 'libdbusmenu-gtk/parser.c'
---- libdbusmenu-gtk/parser.c	2013-06-18 19:59:44 +0000
-+++ libdbusmenu-gtk/parser.c	2013-11-03 02:46:23 +0000
-@@ -97,9 +97,7 @@
-                                                 gpointer            data);
- static void           item_inserted_cb         (GtkContainer *      menu,
-                                                 GtkWidget *         widget,
--#ifdef HAVE_GTK3
-                                                 gint                position,
--#endif
-                                                 gpointer            data);
- static void           item_removed_cb          (GtkContainer *      menu,
-                                                 GtkWidget *         widget,
-@@ -431,11 +429,7 @@
- 
- 	pdata->shell = menu;
- 	pdata->item_inserted_handler_id = g_signal_connect (G_OBJECT (menu),
--#ifdef HAVE_GTK3
-                           "insert",
--#else
--                          "child-added",
--#endif
- 		          G_CALLBACK (item_inserted_cb),
- 		          mi);
- 	pdata->item_removed_handler_id = g_signal_connect (G_OBJECT (menu),
-@@ -1394,9 +1388,7 @@
- static void
- item_inserted_cb (GtkContainer *menu,
-                   GtkWidget    *widget,
--#ifdef HAVE_GTK3
-                   gint          position,
--#endif
-                   gpointer      data)
- {
- 	DbusmenuMenuitem *menuitem = (DbusmenuMenuitem *)data;
-
diff --git a/dev-libs/libdbusmenu/files/libdbusmenu-16.04.0-configure-fix.patch b/dev-libs/libdbusmenu/files/libdbusmenu-16.04.0-configure-fix.patch
deleted file mode 100644
index a57877810904..000000000000
--- a/dev-libs/libdbusmenu/files/libdbusmenu-16.04.0-configure-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 4b79b41a25cc1e2c4355738b4bed6c73b919ffee Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Sun, 6 Aug 2017 17:55:45 +0200
-Subject: [PATCH] configure: Fix HAVE_VALGRIND not being defined when tests are
- disabled
-
-If --disable-tests is used, configure fails with the following error:
-
-  configure: error: conditional "HAVE_VALGRIND" was never defined.
-  Usually this means the macro was only invoked conditionally.
-
-This is because AM_CONDITIONAL for it is called inside the 'if' for
-tests being enabled. Move it just below that block to ensure that it's
-defined unconditionally.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index ace54d1..cbd38a6 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -120,8 +120,8 @@ PKG_CHECK_MODULES(DBUSMENUTESTS,  json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
-                                   [have_tests=yes]
- )
- PKG_CHECK_MODULES(DBUSMENUTESTSVALGRIND, valgrind, have_valgrind=yes, have_valgrind=no)
--AM_CONDITIONAL([HAVE_VALGRIND], [test "x$have_valgrind" = "xyes"])
- ])
-+AM_CONDITIONAL([HAVE_VALGRIND], [test "x$have_valgrind" = "xyes"])
- 
- AC_SUBST(DBUSMENUTESTS_CFLAGS)
- AC_SUBST(DBUSMENUTESTS_LIBS)
--- 
-2.14.0
-