pool/gnome-bluetooth
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 50686 from GNOME:Factory

Browse Source 
Copy from GNOME:Factory/gnome-bluetooth based on submit request 50686 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/50686
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-bluetooth?expand=0&rev=36
This commit is contained in:
OBS User autobuild 2010-10-15 14:44:44 +00:00 committed by Git OBS Bridge
commit c625bf03d6
5 changed files with 129 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnome-bluetooth-2.31.90.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f5dec899c9fd425972074308fdd6287376bd7087a33101fe0644fa82c10076dc
size 3662410

3
gnome-bluetooth-2.32.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:57b1f06c96a1b85e1c19ff919d708cc38e95edae658881ed99968c325839a973
size 1231205

191
gnome-bluetooth-fix-parallel-build.patch → gnome-bluetooth-fix-introspection-build.patch
View File

@ -1,89 +1,31 @@
Index: gnome-bluetooth-2.31.90/lib/Makefile.am commit c07d2f7fd6c38deda7b827902e62c507e55ac300
=================================================================== Author: Vincent Untz <vuntz@gnome.org>
--- gnome-bluetooth-2.31.90.orig/lib/Makefile.am Date: Fri Oct 1 18:05:03 2010 +0200
+++ gnome-bluetooth-2.31.90/lib/Makefile.am
@@ -1,7 +1,7 @@ Fix introspection build
SUBDIRS = plugins
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 = -# FIXME https://bugzilla.gnome.org/show_bug.cgi?id=595675
-BUILT_GIRSOURCES = DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install \
+CLEANFILES = --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 DISTCLEANFILES = intltool-extract intltool-update intltool-merge gnome-doc-utils.make
lib_LTLIBRARIES = libgnome-bluetooth.la
@@ -55,41 +55,33 @@ gnomebluetooth_HEADERS = \
AM_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPLUGINDIR=\"$(libdir)/gnome-bluetooth/plugins\" diff --git a/acinclude.m4 b/acinclude.m4
index 5cf8c03..deebd2b 100644
-if HAVE_INTROSPECTION --- a/acinclude.m4
-BUILT_GIRSOURCES += GnomeBluetooth-1.0.gir +++ b/acinclude.m4
+-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
@@ -1,93 +1,3 @@ @@ -1,93 +1,3 @@
-dnl -*- mode: autoconf -*- -dnl -*- mode: autoconf -*-
-dnl Copyright 2009 Johan Dahlin -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 as-ac-expand.m4 0.2.0 -*- autoconf -*-
dnl autostars m4 macro for expanding directories using configure's prefix 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

14
gnome-bluetooth.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
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
- Update to version 2.32.0:
+ Updated translations.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Sep 19 00:50:00 CEST 2010 - vuntz@opensuse.org Sun Sep 19 00:50:00 CEST 2010 - vuntz@opensuse.org

8
gnome-bluetooth.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package gnome-bluetooth (Version 2.31.90) # spec file for package gnome-bluetooth (Version 2.32.0)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -18,7 +18,7 @@
Name: gnome-bluetooth Name: gnome-bluetooth
Version: 2.31.90 Version: 2.32.0
Release: 1 Release: 1
License: GPLv2+ License: GPLv2+
Summary: GNOME Bluetooth graphical utilities Summary: GNOME Bluetooth graphical utilities
@ -27,8 +27,8 @@ Group: System/GUI/GNOME
Source: http://download.gnome.org/sources/gnome-bluetooth/2.27/gnome-bluetooth-%{version}.tar.bz2 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 # PATCH-MISSING-TAG -- See http://en.opensuse.org/Packaging/Patches
Patch0: lxde-support.patch 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 # PATCH-FIX-UPSTREAM gnome-bluetooth-fix-introspection-build.patch bgo#630024 vuntz@opensuse.org -- Fix build with recent gobject-introspection
Patch1: gnome-bluetooth-fix-parallel-build.patch Patch1: gnome-bluetooth-fix-introspection-build.patch
BuildRequires: fdupes BuildRequires: fdupes
# Needed for geoclue plugin # Needed for geoclue plugin
BuildRequires: gconf2-devel BuildRequires: gconf2-devel