update patches from fedora

[packages/cinnamon.git] / gir_bluetooth.patch

diff --git a/gir_bluetooth.patch b/gir_bluetooth.patch
deleted file mode 100644 (file)
index 16de729..0000000
--- a/gir_bluetooth.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/configure.ac     2012-03-13 16:15:41.000000000 +0000
-+++ b/configure.ac     2012-03-31 08:39:24.489010332 +0100
-@@ -130,6 +130,7 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >=
-         [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0`
-        BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
-        AC_SUBST([BLUETOOTH_LIBS],["$BLUETOOTH_LIBS"])
-+       AC_SUBST([BLUETOOTH_DIR],["$BLUETOOTH_DIR"])
-        AC_DEFINE_UNQUOTED([BLUETOOTH_DIR],["$BLUETOOTH_DIR"],[Path to installed GnomeBluetooth typelib and library])
-        AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have libgnome-bluetooth-applet])
-        AC_SUBST([HAVE_BLUETOOTH],[1])
---- a/src/Makefile.am  2012-03-13 16:15:41.000000000 +0000
-+++ b/src/Makefile.am  2012-03-31 08:41:42.958012667 +0100
-@@ -277,7 +277,7 @@ Cinnamon_0_1_gir_CFLAGS = $(libcinnamon_
- Cinnamon_0_1_gir_LIBS = libcinnamon.la
- Cinnamon_0_1_gir_FILES = $(libcinnamon_la_gir_sources)
- Cinnamon_0_1_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/St-1.0.gir \
--      --add-include-path=$(MUFFIN_GIR_DIR)
-+       --add-include-path=$(MUFFIN_GIR_DIR) $(if $(BLUETOOTH_DIR),-L $(BLUETOOTH_DIR),)
- INTROSPECTION_GIRS += Cinnamon-0.1.gir
- CLEANFILES += Cinnamon-0.1.gir
-