Hello community, here is the log from the commit of package ModemManager for openSUSE:Factory checked in at 2012-01-05 19:14:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ModemManager (Old) and /work/SRC/openSUSE:Factory/.ModemManager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ModemManager", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/ModemManager/ModemManager.changes 2011-10-02 09:44:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ModemManager.new/ModemManager.changes 2012-01-05 19:14:11.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Nov 16 13:44:45 UTC 2011 - [email protected] + +- Add ModemManager-glib-2.31.patch: fix build with glib 2.31. + +------------------------------------------------------------------- +Tue Nov 15 14:15:25 UTC 2011 - [email protected] + +- Really enable parallel build: fix typo smp_flags => smp_mflags. + +------------------------------------------------------------------- New: ---- ModemManager-glib-2.31.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ModemManager.spec ++++++ --- /var/tmp/diff_new_pack.irUbKu/_old 2012-01-05 19:14:14.000000000 +0100 +++ /var/tmp/diff_new_pack.irUbKu/_new 2012-01-05 19:14:14.000000000 +0100 @@ -25,6 +25,8 @@ Url: http://cgit.freedesktop.org/ModemManager/ModemManager Group: Productivity/Networking/System Source0: http://download.gnome.org/sources/ModemManager/0.5/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM ModemManager-glib-2.31.patch [email protected] -- Taken from git, remove some includes and deprecated API to fix build with glib 2.31 +Patch0: ModemManager-glib-2.31.patch BuildRequires: dbus-1-glib-devel BuildRequires: hicolor-icon-theme BuildRequires: intltool @@ -55,6 +57,7 @@ %prep %setup -q +%patch0 -p1 %build pppddir=`ls -1d %{_libdir}/pppd/2*` @@ -63,7 +66,7 @@ --disable-static \ --with-pppd-plugin-dir=$pppddir \ --with-polkit -%__make %{?_smp_flags} +%__make %{?_smp_mflags} %install %makeinstall ++++++ ModemManager-glib-2.31.patch ++++++ >From 28f64090dfa15097587bbea69209df10b8ab8593 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado <[email protected]> Date: Mon, 24 Oct 2011 19:09:11 +0000 Subject: core: don't include private headers from glib The "glib/gtypes.h" is now considered private, and only "glib.h" should be included directly. --- diff --git a/src/mm-at-serial-port.h b/src/mm-at-serial-port.h index 5d5f13f..cec5dc3 100644 --- a/src/mm-at-serial-port.h +++ b/src/mm-at-serial-port.h @@ -18,7 +18,6 @@ #define MM_AT_SERIAL_PORT_H #include <glib.h> -#include <glib/gtypes.h> #include <glib-object.h> #include "mm-serial-port.h" diff --git a/src/mm-manager.h b/src/mm-manager.h index 1c98458..c6a64bd 100644 --- a/src/mm-manager.h +++ b/src/mm-manager.h @@ -17,7 +17,6 @@ #ifndef MM_MANAGER_H #define MM_MANAGER_H -#include <glib/gtypes.h> #include <glib-object.h> #include <dbus/dbus-glib.h> #include "mm-modem.h" diff --git a/src/mm-modem-base.h b/src/mm-modem-base.h index 933aae1..be11af6 100644 --- a/src/mm-modem-base.h +++ b/src/mm-modem-base.h @@ -18,7 +18,6 @@ #define MM_MODEM_BASE_H #include <glib.h> -#include <glib/gtypes.h> #include <glib-object.h> #include "mm-port.h" diff --git a/src/mm-plugin-base.h b/src/mm-plugin-base.h index 4b0932c..5b049a4 100644 --- a/src/mm-plugin-base.h +++ b/src/mm-plugin-base.h @@ -17,7 +17,6 @@ #define MM_PLUGIN_BASE_H #include <glib.h> -#include <glib/gtypes.h> #include <glib-object.h> #define G_UDEV_API_IS_SUBJECT_TO_CHANGE diff --git a/src/mm-port.h b/src/mm-port.h index 4bcffd4..df935db 100644 --- a/src/mm-port.h +++ b/src/mm-port.h @@ -17,7 +17,6 @@ #define MM_PORT_H #include <glib.h> -#include <glib/gtypes.h> #include <glib-object.h> typedef enum { diff --git a/src/mm-qcdm-serial-port.h b/src/mm-qcdm-serial-port.h index 2786ee8..605016d 100644 --- a/src/mm-qcdm-serial-port.h +++ b/src/mm-qcdm-serial-port.h @@ -18,7 +18,6 @@ #define MM_QCDM_SERIAL_PORT_H #include <glib.h> -#include <glib/gtypes.h> #include <glib-object.h> #include "mm-serial-port.h" diff --git a/src/mm-serial-port.h b/src/mm-serial-port.h index eb12cbb..9450926 100644 --- a/src/mm-serial-port.h +++ b/src/mm-serial-port.h @@ -18,7 +18,6 @@ #define MM_SERIAL_PORT_H #include <glib.h> -#include <glib/gtypes.h> #include <glib-object.h> #include "mm-port.h" -- cgit v0.9.0.2-2-gbebe >From 58aa172b4e539605554dd300dca199b34fbf9186 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado <[email protected]> Date: Mon, 24 Oct 2011 19:31:37 +0000 Subject: serial: use g_value_set_schar() and g_value_get_schar() when glib >= 2.31 --- diff --git a/src/mm-serial-port.c b/src/mm-serial-port.c index 7749196..caf500d 100644 --- a/src/mm-serial-port.c +++ b/src/mm-serial-port.c @@ -1360,7 +1360,11 @@ set_property (GObject *object, guint prop_id, priv->bits = g_value_get_uint (value); break; case PROP_PARITY: +#if GLIB_CHECK_VERSION(2,31,0) + priv->parity = g_value_get_schar (value); +#else priv->parity = g_value_get_char (value); +#endif break; case PROP_STOPBITS: priv->stopbits = g_value_get_uint (value); @@ -1400,7 +1404,11 @@ get_property (GObject *object, guint prop_id, g_value_set_uint (value, priv->bits); break; case PROP_PARITY: +#if GLIB_CHECK_VERSION(2,31,0) + g_value_set_schar (value, priv->parity); +#else g_value_set_char (value, priv->parity); +#endif break; case PROP_STOPBITS: g_value_set_uint (value, priv->stopbits); -- cgit v0.9.0.2-2-gbebe -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
