Mailinglist Archive: opensuse-commit (1059 mails)

< Previous Next >
commit libdbus-1-qt3-0
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Wed, 09 Jan 2008 21:27:47 +0100
  • Message-id: <20080109202747.6B168678336@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package libdbus-1-qt3-0
checked in at Wed Jan 9 21:27:47 CET 2008.

--------
--- KDE/libdbus-1-qt3-0/libdbus-1-qt3-0.changes 2007-12-17 16:43:50.000000000
+0100
+++ /mounts/work_src_done/STABLE/libdbus-1-qt3-0/libdbus-1-qt3-0.changes
2008-01-09 19:02:01.000000000 +0100
@@ -1,0 +2,5 @@
+Wed Jan 9 19:01:49 CET 2008 - dmueller@xxxxxxx
+
+- fix generation of nm introspection (branch update)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libdbus-1-qt3-0.spec ++++++
--- /var/tmp/diff_new_pack.f31193/_old 2008-01-09 21:26:33.000000000 +0100
+++ /var/tmp/diff_new_pack.f31193/_new 2008-01-09 21:26:33.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package libdbus-1-qt3-0 (Version 0.8)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -19,7 +19,7 @@
Group: Development/Libraries/C and C++
AutoReqProv: on
Version: 0.8
-Release: 2
+Release: 8
Summary: Qt3 DBus Bindings
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{appname}-%{version}.tar.bz2
@@ -119,6 +119,8 @@
%{_bindir}/dbusxml2qt3

%changelog
+* Wed Jan 09 2008 - dmueller@xxxxxxx
+- fix generation of nm introspection (branch update)
* Mon Dec 17 2007 - dmueller@xxxxxxx
- include bugfixes from SVN
* Wed Dec 12 2007 - hschaa@xxxxxxx

++++++ BRANCH_UPDATE.diff ++++++
--- /var/tmp/diff_new_pack.f31193/_old 2008-01-09 21:26:33.000000000 +0100
+++ /var/tmp/diff_new_pack.f31193/_new 2008-01-09 21:26:33.000000000 +0100
@@ -140,6 +140,15 @@

stream << endl;
}
+@@ -352,7 +345,7 @@ static void writeInterfaceIncludes(const
+ stream << "#include \"" << (*it).name.lower() << ".h\"" << endl;
+ }
+
+- stream << "#include \"introspectable.h\"" << endl;
++ stream << "#include \"introspectableinterface.h\"" << endl;
+
+ stream << endl;
+ }
@@ -491,6 +484,7 @@ static void writeMethodDeclarations(cons

case Class::Proxy:
@@ -148,7 +157,7 @@
stream << " virtual void setDBusProperty(const QString&
name,"
<< " const QDBusVariant& variant, QDBusError& error);"
<< endl;
-@@ -649,6 +643,57 @@ static void writeProxyProperties(const C
+@@ -649,6 +643,56 @@ static void writeProxyProperties(const C
}
}

@@ -189,7 +198,6 @@
+{
+ closeIncludeGuard(baseName, headerStream);
+ writeFileFooter(headerStream);
-+
+ writeFileFooter(sourceStream);
+
+ QIODevice* device = headerStream.device();
@@ -206,7 +214,7 @@
bool ClassGenerator::extractClass(const QDomElement& interfaceElement,
Class& classData)
{
-@@ -668,22 +713,11 @@ bool ClassGenerator::extractClass(const
+@@ -668,22 +712,11 @@ bool ClassGenerator::extractClass(const
return MethodGenerator::extractMethods(interfaceElement, classData);
}

@@ -232,7 +240,7 @@
writeHeaderIncludes(classData, Class::Interface, headerStream);

openNamespaces(classData.namespaces, headerStream);
-@@ -695,11 +729,8 @@ bool ClassGenerator::generateInterface(c
+@@ -695,11 +728,8 @@ bool ClassGenerator::generateInterface(c

closeClassDeclaration(classData, Class::Interface, headerStream);
closeNamespaces(classData.namespaces, headerStream);
@@ -244,7 +252,7 @@
writeSourceIncludes(classData, Class::Interface, sourceStream);

openNamespaces(classData.namespaces, sourceStream);
-@@ -713,27 +744,15 @@ bool ClassGenerator::generateInterface(c
+@@ -713,27 +743,15 @@ bool ClassGenerator::generateInterface(c
MethodGenerator::writeInterfaceMainMethod(classData, sourceStream);

closeNamespaces(classData.namespaces, sourceStream);
@@ -275,7 +283,7 @@
writeHeaderIncludes(classData, Class::Proxy, headerStream);

openNamespaces(classData.namespaces, headerStream);
-@@ -744,11 +763,8 @@ bool ClassGenerator::generateProxy(const
+@@ -744,11 +762,8 @@ bool ClassGenerator::generateProxy(const

closeClassDeclaration(classData, Class::Proxy, headerStream);
closeNamespaces(classData.namespaces, headerStream);
@@ -287,7 +295,7 @@
writeSourceIncludes(classData, Class::Proxy, sourceStream);

openNamespaces(classData.namespaces, sourceStream);
-@@ -763,28 +779,16 @@ bool ClassGenerator::generateProxy(const
+@@ -763,28 +778,16 @@ bool ClassGenerator::generateProxy(const
MethodGenerator::writeSignalHandler(classData, sourceStream);

closeNamespaces(classData.namespaces, sourceStream);
@@ -319,10 +327,11 @@
writeHeaderIncludes(classData, Class::Node, headerStream);

openNamespaces(classData.namespaces, headerStream);
-@@ -793,10 +797,8 @@ bool ClassGenerator::generateNode(const
+@@ -792,11 +795,8 @@ bool ClassGenerator::generateNode(const
+
closeClassDeclaration(classData, Class::Node, headerStream);
closeNamespaces(classData.namespaces, headerStream);
- closeIncludeGuard(classData.name, headerStream);
+- closeIncludeGuard(classData.name, headerStream);
- writeFileFooter(headerStream);

// create source
@@ -330,7 +339,7 @@
writeSourceIncludes(classData, Class::Node, sourceStream);
writeInterfaceIncludes(interfaces, sourceStream);

-@@ -809,7 +811,6 @@ bool ClassGenerator::generateNode(const
+@@ -809,7 +809,6 @@ bool ClassGenerator::generateNode(const
MethodGenerator::writeNodeMethods(classData, interfaces, sourceStream);

closeNamespaces(classData.namespaces, sourceStream);
@@ -484,7 +493,7 @@
if (classData.dbusName ==
"org.freedesktop.DBus.Introspectable")
hasIntrospectable = true;
else
-@@ -103,7 +124,152 @@ int main(int argc, char** argv)
+@@ -103,7 +124,156 @@ int main(int argc, char** argv)
}
}

@@ -518,12 +527,16 @@
+ exit(3);
+ }
+
-+ QStringList nameParts = QStringList::split("::",
options["classname"]);
++ // class name for node is handled differently later on
++ if (!generateNode)
++ {
++ QStringList nameParts = QStringList::split("::",
options["classname"]);
+
-+ interfaces[0].name = nameParts.back();
++ interfaces[0].name = nameParts.back();
+
-+ nameParts.pop_back();
-+ interfaces[0].namespaces = nameParts;
++ nameParts.pop_back();
++ interfaces[0].namespaces = nameParts;
++ }
+ }
+
+ if (checkForOption(options, "namespace"))
@@ -638,7 +651,7 @@
{
if (!hasIntrospectable)
{
-@@ -133,10 +299,40 @@ int main(int argc, char** argv)
+@@ -133,10 +303,40 @@ int main(int argc, char** argv)
method.arguments << argument;
classData.methods << method;

@@ -681,7 +694,7 @@

QStringList nameParts = QStringList::split("::", nodeClassName);

-@@ -146,10 +342,291 @@ int main(int argc, char** argv)
+@@ -146,10 +346,291 @@ int main(int argc, char** argv)
nameParts.pop_back();
classData.namespaces = nameParts;

@@ -1000,9 +1013,33 @@

argument.sourceIncludes["qdbus"].append("<dbus/qdbusdatamap.h>");
}
}
+--- qdbusconnection_p.h
++++ qdbusconnection_p.h
+@@ -53,8 +53,8 @@ class QSocketNotifier;
+ class QTimer;
+ class QTimerEvent;
+
+-typedef struct DBusConnection;
+-typedef struct DBusServer;
++struct DBusConnection;
++struct DBusServer;
+
+ class QDBusConnectionPrivate: public QObject
+ {
+--- dbus-1-qt3.pc.in
++++ dbus-1-qt3.pc.in
+@@ -5,7 +5,7 @@ includedir=${prefix}/include/dbus-1.0/qt
+
+ Name: dbus-1-qt3
+ Description: Qt3 D-BUS Bindings
+-Version: 0.8
++Version: 0.8.1
+ Requires: dbus-1 >= 0.90
+ Libs: -L${libdir} -ldbus-1-qt3
+ Cflags: -I${includedir}
--- Makefile.am
+++ Makefile.am
-@@ -23,24 +23,24 @@ dbusinclude_HEADERS= \
+@@ -23,31 +23,31 @@ dbusinclude_HEADERS= \
# dbus/qdbusserver.h

libdbus_1_qt3_la_SOURCES = \
@@ -1045,6 +1082,14 @@

CLEANFILES = qdbusserver.moc qdbusconnection.moc qdbusproxy.moc

+ DISTCLEANFILES = dbus-1-qt3.pc
+
+ libdbus_1_qt3_la_LIBADD= $(LIB_QT) $(DBUS_LIBS)
+-libdbus_1_qt3_la_LDFLAGS= $(QT_LDFLAGS) -version-info 8:0:8 -no-undefined
++libdbus_1_qt3_la_LDFLAGS= $(QT_LDFLAGS) -version-info 8:1:8 -no-undefined
+
+ # files that are an exception
+ qdbusserver.moc: dbus/qdbusserver.h
@@ -59,9 +59,6 @@ qdbusconnection.moc: qdbusconnection_p.h
qdbusproxy.moc: dbus/qdbusproxy.h
$(MOC) -o qdbusproxy.moc $(srcdir)/dbus/qdbusproxy.h


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread