commit libdbus-1-qt3-0 for openSUSE:Factory
Hello community,
here is the log from the commit of package libdbus-1-qt3-0 for openSUSE:Factory
checked in at 2012-07-04 06:58:48
Comparing /work/SRC/openSUSE:Factory/libdbus-1-qt3-0 (Old)
and /work/SRC/openSUSE:Factory/.libdbus-1-qt3-0.new (New)
Package is libdbus-1-qt3-0, Maintainer is hsc...@novell.com
Changes:
--- /work/SRC/openSUSE:Factory/libdbus-1-qt3-0/libdbus-1-qt3-0.changes
2012-05-31 17:06:12.0 +0200
+++ /work/SRC/openSUSE:Factory/.libdbus-1-qt3-0.new/libdbus-1-qt3-0.changes
2012-07-04 06:58:50.0 +0200
@@ -1,0 +2,5 @@
+Tue Jul 3 18:17:23 UTC 2012 - co...@suse.com
+
+- add -32bit lib for kdebase3 to use
+
+---
New:
baselibs.conf
Other differences:
--
++ libdbus-1-qt3-0.spec ++
--- /var/tmp/diff_new_pack.5LH49i/_old 2012-07-04 06:58:52.0 +0200
+++ /var/tmp/diff_new_pack.5LH49i/_new 2012-07-04 06:58:52.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package libdbus-1-qt3-0 (Version 0.8.1)
+# spec file for package libdbus-1-qt3-0
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -13,19 +13,22 @@
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
Name: libdbus-1-qt3-0
Url:http://www.freedesktop.org/wiki/Software/DBusBindings
%define appname libdbus-1-qt3
-BuildRequires: dbus-1-devel qt3-devel
-License:GPL-2.0+
-Group: Development/Libraries/C and C++
-AutoReqProv:on
+BuildRequires: dbus-1-devel
+BuildRequires: qt3-devel
Version:0.8.1
-Release:64
+Release:0
Summary:Qt3 DBus Bindings
+License:GPL-2.0+
+Group: Development/Libraries/C and C++
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0:%{appname}-%{version}.tar.bz2
+Source1:baselibs.conf
Patch1: fix_ifdef.patch
Patch2: r785103.patch
Patch3: r795238.patch
@@ -37,11 +40,11 @@
This library provides Qt3-classes for accessing the DBus
%package devel
-License:GPL-2.0+
Summary:Development files for libdbus-1-qt3
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}-%{release}
-Requires: dbus-1-devel qt3-devel
+Requires: dbus-1-devel
+Requires: qt3-devel
%description devel
This library provides Qt3-classes for accessing the DBus.
@@ -49,12 +52,12 @@
This package holds the development files for libdbus-1-qt3.
%package -n dbusxml2qt3
-License:GPL-2.0+
Summary:Generate Qt3-classes from DBus-introspection data
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}-%{release}
%description -n dbusxml2qt3
+dbusxml2qt3 allows to generate Qt3-classes from DBus-introspection data
%prep
%setup -n %{appname}-%{version} -q
++ baselibs.conf ++
libdbus-1-qt3-0
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libdbus-1-qt3-0 for openSUSE:Factory
Hello community, here is the log from the commit of package libdbus-1-qt3-0 for openSUSE:Factory checked in at 2012-05-31 17:06:11 Comparing /work/SRC/openSUSE:Factory/libdbus-1-qt3-0 (Old) and /work/SRC/openSUSE:Factory/.libdbus-1-qt3-0.new (New) Package is libdbus-1-qt3-0, Maintainer is hsc...@novell.com Changes: --- /work/SRC/openSUSE:Factory/libdbus-1-qt3-0/libdbus-1-qt3-0.changes 2012-04-12 09:36:52.0 +0200 +++ /work/SRC/openSUSE:Factory/.libdbus-1-qt3-0.new/libdbus-1-qt3-0.changes 2012-05-31 17:06:12.0 +0200 @@ -1,0 +2,6 @@ +Wed May 30 00:21:46 UTC 2012 - an...@opensuse.org + +- add patch by Serghei Amelian that fixes a bug that prevents + udisks integration + +--- New: gentoo-5d2ce844509819ff37b0389131d5adacd5c6d2e6.patch Other differences: -- ++ libdbus-1-qt3-0.spec ++ --- /var/tmp/diff_new_pack.PtgH52/_old 2012-05-31 17:06:13.0 +0200 +++ /var/tmp/diff_new_pack.PtgH52/_new 2012-05-31 17:06:13.0 +0200 @@ -31,6 +31,7 @@ Patch3: r795238.patch Patch4: fix_circular_destructor.patch Patch5: gentoo-140659d46b44b18c311d8d6f0cb7c96cbc43c6b5.patch +Patch6: gentoo-5d2ce844509819ff37b0389131d5adacd5c6d2e6.patch %description This library provides Qt3-classes for accessing the DBus @@ -62,6 +63,7 @@ %patch3 -p0 %patch4 -p0 %patch5 -p3 +%patch6 -p3 %build export QTDIR=/usr/lib/qt3 ++ gentoo-5d2ce844509819ff37b0389131d5adacd5c6d2e6.patch ++ From 5d2ce844509819ff37b0389131d5adacd5c6d2e6 Mon Sep 17 00:00:00 2001 From: Serghei Amelian serghei.amel...@gmail.com Date: Wed, 30 May 2012 00:42:12 +0300 Subject: [PATCH] [dbus] dispatch signals occurred while the application is blocked in QDBusConnection::sendWithReply() --- dbus/src/qdbusconnection.cpp |3 +++ 1 file changed, 3 insertions(+) diff --git a/dbus/src/qdbusconnection.cpp b/dbus/src/qdbusconnection.cpp index 761a746..249fecc 100644 --- a/dbus/src/qdbusconnection.cpp +++ b/dbus/src/qdbusconnection.cpp @@ -285,6 +285,9 @@ QDBusMessage QDBusConnection::sendWithReply(const QDBusMessage message, QDBusEr dbus_message_unref(msg); +// dispatch signals occurred while waiting for reply +scheduleDispatch(); + return QDBusMessage::fromDBusMessage(reply); } -- 1.7.10 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libdbus-1-qt3-0 for openSUSE:Factory
Hello community,
here is the log from the commit of package libdbus-1-qt3-0 for openSUSE:Factory
checked in at 2012-04-12 09:36:48
Comparing /work/SRC/openSUSE:Factory/libdbus-1-qt3-0 (Old)
and /work/SRC/openSUSE:Factory/.libdbus-1-qt3-0.new (New)
Package is libdbus-1-qt3-0, Maintainer is hsc...@novell.com
Changes:
--- /work/SRC/openSUSE:Factory/libdbus-1-qt3-0/libdbus-1-qt3-0.changes
2012-03-26 14:01:30.0 +0200
+++ /work/SRC/openSUSE:Factory/.libdbus-1-qt3-0.new/libdbus-1-qt3-0.changes
2012-04-12 09:36:52.0 +0200
@@ -1,0 +2,6 @@
+Wed Apr 11 13:54:45 UTC 2012 - an...@opensuse.org
+
+- add a patch to fix a bug with incorrectly de-marshalling arrays
+ of objectpath by Serghei Amelian
+
+---
New:
gentoo-140659d46b44b18c311d8d6f0cb7c96cbc43c6b5.patch
Other differences:
--
++ libdbus-1-qt3-0.spec ++
--- /var/tmp/diff_new_pack.CP0s9H/_old 2012-04-12 09:36:54.0 +0200
+++ /var/tmp/diff_new_pack.CP0s9H/_new 2012-04-12 09:36:54.0 +0200
@@ -30,6 +30,7 @@
Patch2: r785103.patch
Patch3: r795238.patch
Patch4: fix_circular_destructor.patch
+Patch5: gentoo-140659d46b44b18c311d8d6f0cb7c96cbc43c6b5.patch
%description
This library provides Qt3-classes for accessing the DBus
@@ -60,6 +61,7 @@
%patch2 -p1
%patch3 -p0
%patch4 -p0
+%patch5 -p3
%build
export QTDIR=/usr/lib/qt3
++ gentoo-140659d46b44b18c311d8d6f0cb7c96cbc43c6b5.patch ++
From 140659d46b44b18c311d8d6f0cb7c96cbc43c6b5 Mon Sep 17 00:00:00 2001
From: Serghei Amelian serghei.amel...@gmail.com
Date: Wed, 11 Apr 2012 15:58:40 +0300
Subject: [PATCH] fix de-marshalling array of ObjectPath
---
dbus/src/qdbusmarshall.cpp | 22 +-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/dbus/src/qdbusmarshall.cpp b/dbus/src/qdbusmarshall.cpp
index 8951090..de44a27 100644
--- a/dbus/src/qdbusmarshall.cpp
+++ b/dbus/src/qdbusmarshall.cpp
@@ -342,6 +342,19 @@ void qFetchStringKeyMapEntry(QDBusDataMapQString map,
DBusMessageIter* it)
map.insert(key, qFetchParameter(itemIter));
}
+void qFetchObjectPathKeyMapEntry(QDBusDataMapQDBusObjectPath map,
DBusMessageIter* it)
+{
+DBusMessageIter itemIter;
+dbus_message_iter_recurse(it, itemIter);
+Q_ASSERT(dbus_message_iter_has_next(itemIter));
+
+QDBusObjectPath key = qFetchParameter(itemIter).toObjectPath();
+
+dbus_message_iter_next(itemIter);
+
+map.insert(key, qFetchParameter(itemIter));
+}
+
static QDBusData qFetchMap(DBusMessageIter *it, const QDBusData prototype)
{
if (dbus_message_iter_get_arg_type(it) == DBUS_TYPE_INVALID)
@@ -417,7 +430,6 @@ static QDBusData qFetchMap(DBusMessageIter *it, const
QDBusData prototype)
}
case DBUS_TYPE_STRING: // fall through
-case DBUS_TYPE_OBJECT_PATH: // fall through
case DBUS_TYPE_SIGNATURE: {
QDBusDataMapQString map = prototype.toStringKeyMap();
do {
@@ -427,6 +439,14 @@ static QDBusData qFetchMap(DBusMessageIter *it, const
QDBusData prototype)
return QDBusData::fromStringKeyMap(map);
}
+case DBUS_TYPE_OBJECT_PATH: {
+QDBusDataMapQDBusObjectPath map = prototype.toObjectPathKeyMap();
+do {
+qFetchObjectPathKeyMapEntry(map, it);
+} while (dbus_message_iter_next(it));
+return QDBusData::fromObjectPathKeyMap(map);
+}
+
default:
break;
}
--
1.7.5.4
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libdbus-1-qt3-0 for openSUSE:Factory
Hello community,
here is the log from the commit of package libdbus-1-qt3-0 for openSUSE:Factory
checked in at 2012-03-26 14:01:29
Comparing /work/SRC/openSUSE:Factory/libdbus-1-qt3-0 (Old)
and /work/SRC/openSUSE:Factory/.libdbus-1-qt3-0.new (New)
Package is libdbus-1-qt3-0, Maintainer is hsc...@novell.com
Changes:
--- /work/SRC/openSUSE:Factory/libdbus-1-qt3-0/libdbus-1-qt3-0.changes
2011-09-23 02:08:05.0 +0200
+++ /work/SRC/openSUSE:Factory/.libdbus-1-qt3-0.new/libdbus-1-qt3-0.changes
2012-03-26 14:01:30.0 +0200
@@ -1,0 +2,5 @@
+Tue Mar 13 14:01:03 UTC 2012 - an...@opensuse.org
+
+- specify QTDIR explicitely, cleanup
+
+---
Other differences:
--
++ libdbus-1-qt3-0.spec ++
--- /var/tmp/diff_new_pack.S95c9V/_old 2012-03-26 14:01:32.0 +0200
+++ /var/tmp/diff_new_pack.S95c9V/_new 2012-03-26 14:01:32.0 +0200
@@ -13,10 +13,6 @@
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-# norootforbuild
-
Name: libdbus-1-qt3-0
Url:http://www.freedesktop.org/wiki/Software/DBusBindings
@@ -38,12 +34,6 @@
%description
This library provides Qt3-classes for accessing the DBus
-
-
-Authors:
-
-Kevin Krammer kevin.kram...@gmx.at
-
%package devel
License:GPL-2.0+
Summary:Development files for libdbus-1-qt3
@@ -56,12 +46,6 @@
This package holds the development files for libdbus-1-qt3.
-
-
-Authors:
-
-Kevin Krammer kevin.kram...@gmx.at
-
%package -n dbusxml2qt3
License:GPL-2.0+
Summary:Generate Qt3-classes from DBus-introspection data
@@ -69,13 +53,6 @@
Requires: %{name} = %{version}-%{release}
%description -n dbusxml2qt3
-dbusxml2qt3 allows to generate Qt3-classes from DBus-introspection data
-
-
-
-Authors:
-
-Kevin Krammer kevin.kram...@gmx.at
%prep
%setup -n %{appname}-%{version} -q
@@ -85,7 +62,9 @@
%patch4 -p0
%build
-%configure --disable-static --with-pic
+export QTDIR=/usr/lib/qt3
+export PATH=$PATH:$QTDIR/bin
+%configure --disable-static --with-pic --with-qt-dir=$QTDIR
%{__make} %{?jobs:-j%jobs}
cd tools/dbusxml2qt3
qmake
@@ -100,9 +79,6 @@
%postun -p /sbin/ldconfig
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-,root,root)
%doc README AUTHORS ChangeLog COPYING INSTALL
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit libdbus-1-qt3-0 for openSUSE:Factory
Hello community,
here is the log from the commit of package libdbus-1-qt3-0 for openSUSE:Factory
checked in at 2011-12-06 18:23:06
Comparing /work/SRC/openSUSE:Factory/libdbus-1-qt3-0 (Old)
and /work/SRC/openSUSE:Factory/.libdbus-1-qt3-0.new (New)
Package is libdbus-1-qt3-0, Maintainer is hsc...@novell.com
Changes:
Other differences:
--
++ libdbus-1-qt3-0.spec ++
--- /var/tmp/diff_new_pack.q0eFGW/_old 2011-12-06 18:40:39.0 +0100
+++ /var/tmp/diff_new_pack.q0eFGW/_new 2011-12-06 18:40:39.0 +0100
@@ -22,7 +22,7 @@
Url:http://www.freedesktop.org/wiki/Software/DBusBindings
%define appname libdbus-1-qt3
BuildRequires: dbus-1-devel qt3-devel
-License:GPL v2 or later
+License:GPL-2.0+
Group: Development/Libraries/C and C++
AutoReqProv:on
Version:0.8.1
@@ -45,7 +45,7 @@
Kevin Krammer kevin.kram...@gmx.at
%package devel
-License:GPL v2 or later
+License:GPL-2.0+
Summary:Development files for libdbus-1-qt3
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}-%{release}
@@ -63,7 +63,7 @@
Kevin Krammer kevin.kram...@gmx.at
%package -n dbusxml2qt3
-License:GPL v2 or later
+License:GPL-2.0+
Summary:Generate Qt3-classes from DBus-introspection data
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}-%{release}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
