diff --git a/gnome-bluetooth-fix-parallel-build.patch b/gnome-bluetooth-fix-introspection-build.patch similarity index 69% rename from gnome-bluetooth-fix-parallel-build.patch rename to gnome-bluetooth-fix-introspection-build.patch index 41475dc..78bf7a9 100644 --- a/gnome-bluetooth-fix-parallel-build.patch +++ b/gnome-bluetooth-fix-introspection-build.patch @@ -1,89 +1,31 @@ -Index: gnome-bluetooth-2.31.90/lib/Makefile.am -=================================================================== ---- gnome-bluetooth-2.31.90.orig/lib/Makefile.am -+++ gnome-bluetooth-2.31.90/lib/Makefile.am -@@ -1,7 +1,7 @@ - SUBDIRS = plugins +commit c07d2f7fd6c38deda7b827902e62c507e55ac300 +Author: Vincent Untz +Date: Fri Oct 1 18:05:03 2010 +0200 + + Fix introspection build + + https://bugzilla.gnome.org/show_bug.cgi?id=630024 + +diff --git a/Makefile.am b/Makefile.am +index 9391392..f73baf4 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -9,10 +9,9 @@ SUBDIRS = icons lib applet properties wizard sendto $(MOBLIN_DIR) docs po help + DIST_SUBDIRS = $(DEF_SUBDIRS) moblin + EXTRA_DIST = intltool-extract.in intltool-update.in intltool-merge.in ChangeLog.pre-2.27 gtk-doc.make gnome-doc-utils.make - EXTRA_DIST = --BUILT_GIRSOURCES = -+CLEANFILES = +-# FIXME https://bugzilla.gnome.org/show_bug.cgi?id=595675 + DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install \ + --disable-desktop-update --disable-mime-update --disable-icon-update \ +- --enable-gtk-doc --disable-scrollkeeper --enable-introspection=no ++ --enable-gtk-doc --disable-scrollkeeper --enable-introspection - noinst_LTLIBRARIES = libcommon.la - lib_LTLIBRARIES = libgnome-bluetooth.la -@@ -55,41 +55,33 @@ gnomebluetooth_HEADERS = \ + DISTCLEANFILES = intltool-extract intltool-update intltool-merge gnome-doc-utils.make - AM_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPLUGINDIR=\"$(libdir)/gnome-bluetooth/plugins\" - --if HAVE_INTROSPECTION --BUILT_GIRSOURCES += GnomeBluetooth-1.0.gir -+-include $(INTROSPECTION_MAKEFILE) -+INTROSPECTION_GIRS = -+INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir) -+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) - -+if HAVE_INTROSPECTION - GnomeBluetooth-1.0.gir: $(libgnome_bluetooth_la_SOURCES) - GnomeBluetooth-1.0.gir: $(gnomebluetooth_HEADERS) - GnomeBluetooth-1.0.gir: libgnome-bluetooth.la - GnomeBluetooth-1.0.gir: $(INTROSPECTION_SCANNER) -- $(AM_V_GEN) $(INTROSPECTION_SCANNER) -v --namespace GnomeBluetooth --nsversion=1.0 \ -- --add-include-path=$(srcdir) --add-include-path=. \ -- --include=GObject-2.0 \ -- --include=Gtk-2.0 \ -- --include=DBusGLib-1.0 \ -- --include=GModule-2.0 \ -- --libtool="$(LIBTOOL)" \ -- --library=gnome-bluetooth \ -- --output $@ \ -- --pkg gobject-2.0 \ -- --pkg gtk+-2.0 \ -- --pkg dbus-glib-1 \ -- --pkg gmodule-2.0 \ -- -I$(srcdir) \ -- $(LIBGNOMEBT_CFLAGS) \ -- $(gnomebluetooth_HEADERS) - --girdir = $(INTROSPECTION_GIRDIR) --dist_gir_DATA = $(BUILT_GIRSOURCES) -+GnomeBluetooth_1_0_gir_INCLUDES = GObject-2.0 Gtk-2.0 DBusGLib-1.0 GModule-2.0 -+GnomeBluetooth_1_0_gir_CFLAGS = \ -+ -I$(srcdir) \ -+ $(LIBGNOMEBT_CFLAGS) -+GnomeBluetooth_1_0_gir_LIBS = libgnome-bluetooth.la -+GnomeBluetooth_1_0_gir_FILES = $(gnomebluetooth_HEADERS) -+GnomeBluetooth_1_0_gir_SCANNERFLAGS = --namespace=GnomeBluetooth -+INTROSPECTION_GIRS += GnomeBluetooth-1.0.gir - --EXTRA_DIST += $(BUILT_GIRSOURCES) -+girdir = $(INTROSPECTION_GIRDIR) -+gir_DATA = $(INTROSPECTION_GIRS) - --typelibsdir = $(INTROSPECTION_TYPELIBDIR) --typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) -+typelibdir = $(INTROSPECTION_TYPELIBDIR) -+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) - --%.typelib: %.gir $(G_IR_COMPILER) -- $(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@ -- -+CLEANFILES += $(gir_DATA) $(typelib_DATA) - endif # HAVE_INTROSPECTION - - BUILT_SOURCES = marshal.h marshal.c \ -@@ -101,7 +93,7 @@ BUILT_SOURCES = marshal.h marshal.c \ - - nodist_libcommon_la_SOURCES = $(BUILT_SOURCES) - --CLEANFILES = $(BUILT_SOURCES) -+CLEANFILES += $(BUILT_SOURCES) - - noinst_PROGRAMS = test-client test-agent test-deviceselection test-plugins test-class - -Index: gnome-bluetooth-2.31.90/acinclude.m4 -=================================================================== ---- gnome-bluetooth-2.31.90.orig/acinclude.m4 -+++ gnome-bluetooth-2.31.90/acinclude.m4 +diff --git a/acinclude.m4 b/acinclude.m4 +index 5cf8c03..deebd2b 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 @@ -1,93 +1,3 @@ -dnl -*- mode: autoconf -*- -dnl Copyright 2009 Johan Dahlin @@ -178,3 +120,86 @@ Index: gnome-bluetooth-2.31.90/acinclude.m4 dnl as-ac-expand.m4 0.2.0 -*- autoconf -*- dnl autostars m4 macro for expanding directories using configure's prefix +diff --git a/configure.ac b/configure.ac +index 8bbce4e..02aaf5f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -186,7 +186,7 @@ AC_SUBST(DBUS_BINDING_TOOL) + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + AC_SUBST(GLIB_GENMARSHAL) + +-GOBJECT_INTROSPECTION_CHECK([0.6.3]) ++GOBJECT_INTROSPECTION_CHECK([0.6.7]) + + GNOME_COMMON_INIT + GNOME_DEBUG_CHECK +diff --git a/lib/Makefile.am b/lib/Makefile.am +index 6da2a9c..d0bc250 100644 +--- a/lib/Makefile.am ++++ b/lib/Makefile.am +@@ -55,41 +55,27 @@ gnomebluetooth_HEADERS = \ + + AM_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPLUGINDIR=\"$(libdir)/gnome-bluetooth/plugins\" + ++-include $(INTROSPECTION_MAKEFILE) ++INTROSPECTION_GIRS = ++INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir) ++INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) ++ + if HAVE_INTROSPECTION +-BUILT_GIRSOURCES += GnomeBluetooth-1.0.gir ++introspection_sources = $(gnomebluetooth_HEADERS) + +-GnomeBluetooth-1.0.gir: $(libgnome_bluetooth_la_SOURCES) +-GnomeBluetooth-1.0.gir: $(gnomebluetooth_HEADERS) + GnomeBluetooth-1.0.gir: libgnome-bluetooth.la +-GnomeBluetooth-1.0.gir: $(INTROSPECTION_SCANNER) +- $(AM_V_GEN) $(INTROSPECTION_SCANNER) -v --namespace GnomeBluetooth --nsversion=1.0 \ +- --add-include-path=$(srcdir) --add-include-path=. \ +- --include=GObject-2.0 \ +- --include=Gtk-2.0 \ +- --include=DBusGLib-1.0 \ +- --include=GModule-2.0 \ +- --libtool="$(LIBTOOL)" \ +- --library=gnome-bluetooth \ +- --output $@ \ +- --pkg gobject-2.0 \ +- --pkg gtk+-2.0 \ +- --pkg dbus-glib-1 \ +- --pkg gmodule-2.0 \ +- -I$(srcdir) \ +- $(LIBGNOMEBT_CFLAGS) \ +- $(gnomebluetooth_HEADERS) ++GnomeBluetooth_1_0_gir_INCLUDES = GObject-2.0 Gtk-2.0 DBusGLib-1.0 GModule-2.0 ++GnomeBluetooth_1_0_gir_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) ++GnomeBluetooth_1_0_gir_LIBS = libgnome-bluetooth.la ++GnomeBluetooth_1_0_gir_SCANNERFLAGS = --strip-prefix=Bluetooth --pkg-export=gnome-bluetooth-1.0 ++GnomeBluetooth_1_0_gir_FILES = $(introspection_sources) ++INTROSPECTION_GIRS += GnomeBluetooth-1.0.gir + + girdir = $(INTROSPECTION_GIRDIR) +-dist_gir_DATA = $(BUILT_GIRSOURCES) +- +-EXTRA_DIST += $(BUILT_GIRSOURCES) +- +-typelibsdir = $(INTROSPECTION_TYPELIBDIR) +-typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib) ++gir_DATA = $(INTROSPECTION_GIRS) + +-%.typelib: %.gir $(G_IR_COMPILER) +- $(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@ +- ++typelibdir = $(INTROSPECTION_TYPELIBDIR) ++typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + endif # HAVE_INTROSPECTION + + BUILT_SOURCES = marshal.h marshal.c \ +@@ -101,7 +87,7 @@ BUILT_SOURCES = marshal.h marshal.c \ + + nodist_libcommon_la_SOURCES = $(BUILT_SOURCES) + +-CLEANFILES = $(BUILT_SOURCES) ++CLEANFILES = $(BUILT_SOURCES) $(gir_DATA) $(typelib_DATA) + + noinst_PROGRAMS = test-client test-agent test-deviceselection test-plugins test-class + diff --git a/gnome-bluetooth.changes b/gnome-bluetooth.changes index 5963e6c..6e2252c 100644 --- a/gnome-bluetooth.changes +++ b/gnome-bluetooth.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Oct 1 18:08:32 CEST 2010 - vuntz@opensuse.org + +- Add gnome-bluetooth-fix-introspection-build.patch, which + obsoletes gnome-bluetooth-fix-parallel-build.patch: this updated + patch will really fix the build with recent + gobject-introspection. + ------------------------------------------------------------------- Tue Sep 28 18:51:54 CEST 2010 - vuntz@opensuse.org diff --git a/gnome-bluetooth.spec b/gnome-bluetooth.spec index 12ee8bf..02d5ca1 100644 --- a/gnome-bluetooth.spec +++ b/gnome-bluetooth.spec @@ -27,8 +27,8 @@ Group: System/GUI/GNOME Source: http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-bluetooth-%{version}.tar.bz2 # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches Patch0: lxde-support.patch -# PATCH-FIX-UPSTREAM gnome-bluetooth-fix-parallel-build.patch bgo#630024 vuntz@opensuse.org -- Improve build system for introspection to fix parallel build -Patch1: gnome-bluetooth-fix-parallel-build.patch +# PATCH-FIX-UPSTREAM gnome-bluetooth-fix-introspection-build.patch bgo#630024 vuntz@opensuse.org -- Fix build with recent gobject-introspection +Patch1: gnome-bluetooth-fix-introspection-build.patch BuildRequires: fdupes # Needed for geoclue plugin BuildRequires: gconf2-devel