diff options
| author |   Artur Maciag <maciag.artur@gmail.com> | 2013-05-01 22:50:09 +0200 |
|---|---|---|
| committer | Artur Maciag <maciag.artur@gmail.com> | 2013-05-01 22:50:09 +0200 |
| commit | 75ab9cec705dfd86e2f7c1e726720b99d3f9f957 (patch) | |
| tree | c4964035f007ae86dd1c9e0e5b9bed26a6fbc624 /gnome-extra/cinnamon/files/cinnamon-1.6.1-automagic-gnome-bluetooth.patch | |
| parent | [gnome-extra/nemo] 1.7.5 ebuild added (diff) | |
| download | piczu-75ab9cec705dfd86e2f7c1e726720b99d3f9f957.tar.gz piczu-75ab9cec705dfd86e2f7c1e726720b99d3f9f957.tar.bz2 piczu-75ab9cec705dfd86e2f7c1e726720b99d3f9f957.zip | |
[gnome-extra/cinnamon] 1.7.8 ebuild added
Diffstat (limited to 'gnome-extra/cinnamon/files/cinnamon-1.6.1-automagic-gnome-bluetooth.patch')
| -rw-r--r-- | gnome-extra/cinnamon/files/cinnamon-1.6.1-automagic-gnome-bluetooth.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/gnome-extra/cinnamon/files/cinnamon-1.6.1-automagic-gnome-bluetooth.patch b/gnome-extra/cinnamon/files/cinnamon-1.6.1-automagic-gnome-bluetooth.patch new file mode 100644 index 0000000..9a8f5ab --- /dev/null +++ b/gnome-extra/cinnamon/files/cinnamon-1.6.1-automagic-gnome-bluetooth.patch @@ -0,0 +1,44 @@ +From ee11a71f55eb0860fb61f5c250792221387f09bf Mon Sep 17 00:00:00 2001 +From: root <admin@catmur.co.uk> +Date: Sun, 8 Jan 2012 13:55:05 +0000 +Subject: [PATCH] Fix automagic gnome-bluetooth dependency + +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 | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 69728ed..58c35f9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -113,6 +113,8 @@ PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0) + PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7) + + 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_EXISTS([gnome-bluetooth-1.0 >= 3.1.0], + [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0` + BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0` +@@ -125,6 +127,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0], + [AC_DEFINE([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])]) + + MUFFIN_GIR_DIR=`$PKG_CONFIG --variable=girdir libmuffin` + MUFFIN_TYPELIB_DIR=`$PKG_CONFIG --variable=typelibdir libmuffin` +-- +1.7.12 + |