From 6f8038813c460b4f0572d5ef595cdfa94af3a94d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 21 May 2019 10:20:03 +0100 Subject: gentoo resync : 21.05.2019 --- .../files/gnome-shell-3.12-bluetooth-flag.patch | 50 ---------------------- .../files/gnome-shell-3.22.0-gir-build-fix.patch | 28 ------------ 2 files changed, 78 deletions(-) delete mode 100644 gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch delete mode 100644 gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch (limited to 'gnome-base/gnome-shell/files') diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch b/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch deleted file mode 100644 index 2fa93af25cd0..000000000000 --- a/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 3c9c3b19fcb212171036e1e57e749411b5fd7d65 Mon Sep 17 00:00:00 2001 -From: Sobhan Mohammadpour -Date: Thu, 28 Feb 2013 18:48:32 +0330 -Subject: [PATCH 2/3] Make bluetooth support optional - -https://bugs.gentoo.org/show_bug.cgi?id=398145 - -Ed Catmur 2012-01-08 13:46:22 UTC -libgnome-bluetooth-applet is a private library so they shouldn't be linking -against it anyway. I tried to work out how to tell libtool to add it to rpath -but got totally lost. - -I'll see if I can work out how to fix the automagic gnome-bluetooth dependency -so I can at least merge USE=-bluetooth. ---- - configure.ac | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9a30e65..aa710f0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -138,11 +138,21 @@ AS_IF([test x$enable_browser_plugin = xyes], [ - ]) - AM_CONDITIONAL(BUILD_BROWSER_PLUGIN, test x$enable_browser_plugin = xyes) - -+AC_MSG_CHECKING([for bluetooth support]) -+AC_ARG_WITH([bluetooth], -+ AS_HELP_STRING([--without-bluetooth], -+ [Build without gnome-bluetooth library (default: auto)])) -+AS_IF([test "x$with_bluetooth" != "xno"], [ - PKG_CHECK_MODULES(BLUETOOTH, gnome-bluetooth-1.0 >= 3.9.0, -- [AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet]) -- AC_SUBST([HAVE_BLUETOOTH],[1])], -+ [AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet]) -+ AC_SUBST([HAVE_BLUETOOTH],[1]) -+ AC_MSG_RESULT([yes])], - [AC_DEFINE([HAVE_BLUETOOTH],[0]) -- AC_SUBST([HAVE_BLUETOOTH],[0])]) -+ AC_SUBST([HAVE_BLUETOOTH],[0]) -+ AC_MSG_RESULT([no])]) -+], [AC_DEFINE([HAVE_BLUETOOTH],[0]) -+ AC_SUBST([HAVE_BLUETOOTH],[0]) -+ AC_MSG_RESULT([no])]) - - PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION gio-2.0) - AC_SUBST(CALENDAR_SERVER_CFLAGS) --- -1.9.0 - diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch b/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch deleted file mode 100644 index b0c5fb769e8f..000000000000 --- a/gnome-base/gnome-shell/files/gnome-shell-3.22.0-gir-build-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 395bede20811b0cf2bcecb0b4e5bcbc2c2fa35f4 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue -Date: Sat, 12 Nov 2016 00:21:25 +0100 -Subject: [PATCH] Add missing rpath to point to mutter specific libraries - -Reported-By: AlphatPC@gmail.com -X-Gentoo-Bug: 597842 -X-Gentoo-Url: https://bugs.gentoo.org/show_bug.cgi?id=597842 ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index e9aacfe..fd98ba5 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -311,7 +311,7 @@ shell-enum-types.c: $(srcdir)/shell-enum-types.c.in stamp-shell-enum-types.h - rm -f $(@F).tmp - EXTRA_DIST += shell-enum-types.c.in - --libgnome_shell_ldflags = -avoid-version -+libgnome_shell_ldflags = -avoid-version -Wl,-rpath,$(MUTTER_TYPELIB_DIR) - libgnome_shell_libadd = \ - -lm \ - $(GNOME_SHELL_LIBS) \ --- -2.10.1 - -- cgit v1.2.3