Hello community,
here is the log from the commit of package gnome-phone-manager for
openSUSE:Factory checked in at 2012-01-05 19:12:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-phone-manager (Old)
and /work/SRC/openSUSE:Factory/.gnome-phone-manager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-phone-manager", Maintainer is "gnome-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-phone-manager/gnome-phone-manager.changes
2011-10-18 14:13:54.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.gnome-phone-manager.new/gnome-phone-manager.changes
2012-01-05 19:12:02.000000000 +0100
@@ -1,0 +2,10 @@
+Thu Dec 1 16:59:27 UTC 2011 - dims...@opensuse.org
+
+- Add gnome-phone-manager-g_thread.patch: g_thread_init is no
+ longer used (since glib 2.24).
+- Add gnome-phone-manager-bt33api.patch: Support gnome-bluetooth
+ 3.3 API.
+- Add gnome-common BuildRequires and call to gnome-autogen.sh, as
+ gnome-phone-manager-bt33api.patch touches configure.in.
+
+-------------------------------------------------------------------
New:
----
gnome-phone-manager-bt33api.patch
gnome-phone-manager-g_thread.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-phone-manager.spec ++++++
--- /var/tmp/diff_new_pack.lQVEge/_old 2012-01-05 19:12:02.000000000 +0100
+++ /var/tmp/diff_new_pack.lQVEge/_new 2012-01-05 19:12:02.000000000 +0100
@@ -27,7 +27,13 @@
Source:
http://download.gnome.org/sources/gnome-phone-manager/0.68/%{name}-%{version}.tar.bz2
# PATCH-FIX-OPENSUSE gnome-phone-manager-desktop-icon-check.patch bnc337219
Patch0: gnome-phone-manager-desktop-icon-check.patch
+# PATCH-FIX-UPSTREAM gnome-phone-manager-g_thread.patch bgo#665302
dims...@opensuse.org -- No longer use g_thread_init.
+Patch1: gnome-phone-manager-g_thread.patch
+# PATCH-FIX-UPSTREAM gnome-phone-manager-bt33api.patch bgo#665309
dims...@opensuse.org -- Support gnome-bluetooth 3.3 API
+Patch2: gnome-phone-manager-bt33api.patch
BuildRequires: fdupes
+# Needed by patch2
+BuildRequires: gnome-common
BuildRequires: intltool
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(bluez)
@@ -79,8 +85,11 @@
%prep
%setup -q
%patch0
+%patch1 -p1
+%patch2 -p1
%build
+NOCONFIGURE=1 gnome-autogen.sh
%configure \
--disable-static \
--disable-schemas-install
++++++ gnome-phone-manager-bt33api.patch ++++++
>From d51067ce7b0063f8106761da3df4cac585680017 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dims...@opensuse.org>
Date: Thu, 1 Dec 2011 18:53:00 +0100
Subject: [PATCH 1/2] Bug 665309: support gnome-bluetooth 3.3 API
---
configure.in | 5 +++++
gnome-bluetooth/phonemgr.c | 6 +++++-
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/configure.in b/configure.in
index 101a77f..42e4836 100644
--- a/configure.in
+++ b/configure.in
@@ -100,6 +100,11 @@ if test x$ENABLE_BLUETOOTH_PLUGIN = "xyes" ; then
fi
if test x$HAVE_BLUETOOTH_PLUGIN = "xyes"; then
AC_DEFINE(HAVE_BLUETOOTH_PLUGIN, 1, [Defined to 1 if you build the
gnome-bluetooth plugin.])
+ dnl Verifying if we have gnome-bluetooth >= 3.3, which had an API
change.
+ PKG_CHECK_MODULES(GNOME_BLUETOOTH_33, gnome-bluetooth-1.0 >= 3.3,
+ AC_DEFINE(GNOME_BT33_API, 1, [Defined to 1 if you
build with gnome-bluetooth 3.3 API.]),
+ AC_DEFINE(GNOME_BT33_API, 0, [Defined to 1 if you
build with gnome-bluetooth 3.3 API.]))
+
fi
AM_CONDITIONAL(HAVE_BLUETOOTH_PLUGIN, test x$HAVE_BLUETOOTH_PLUGIN = "xyes")
diff --git a/gnome-bluetooth/phonemgr.c b/gnome-bluetooth/phonemgr.c
index 9ebac12..07afa56 100644
--- a/gnome-bluetooth/phonemgr.c
+++ b/gnome-bluetooth/phonemgr.c
@@ -44,7 +44,11 @@ get_type (const char *address)
gboolean cont;
client = bluetooth_client_new ();
- model = bluetooth_client_get_device_model (client, NULL);
+ model = bluetooth_client_get_device_model (client
+#if !GNOME_BT33_API
+ , NULL
+#endif
+ );
if (model == NULL) {
g_object_unref (client);
return type;
--
1.7.7
++++++ gnome-phone-manager-g_thread.patch ++++++
Index: gnome-phone-manager-0.68/src/main.c
===================================================================
--- gnome-phone-manager-0.68.orig/src/main.c
+++ gnome-phone-manager-0.68/src/main.c
@@ -49,8 +49,6 @@ main (int argc, char **argv)
GOptionContext *context;
GError *error = NULL;
- g_thread_init (NULL);
-
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
Index: gnome-phone-manager-0.68/src/test-entry.c
===================================================================
--- gnome-phone-manager-0.68.orig/src/test-entry.c
+++ gnome-phone-manager-0.68/src/test-entry.c
@@ -45,8 +45,6 @@ int main (int argc, char **argv)
{
GtkWidget *window, *entry;
- g_thread_init (NULL);
-
gtk_init (&argc, &argv);
window = gtk_dialog_new ();
Index: gnome-phone-manager-0.68/telepathy/main.c
===================================================================
--- gnome-phone-manager-0.68.orig/telepathy/main.c
+++ gnome-phone-manager-0.68/telepathy/main.c
@@ -59,7 +59,6 @@ main(int argc,
GOptionContext *context;
g_set_prgname("telepathy-phoney");
- g_thread_init (NULL);
setlocale (LC_ALL, "");
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
