diff options
author | Robert Xu <robxu9@gmail.com> | 2011-08-24 17:26:04 -0400 |
---|---|---|
committer | Robert Xu <robxu9@gmail.com> | 2011-08-24 17:26:04 -0400 |
commit | 93c66bf8bb8ac0124ae1800cbaaeb814742bfac5 (patch) | |
tree | 2551422a7981b35684110fae090223b7a1b6d73f /opensuse/dbus-1-tqt | |
parent | 425774d7d1d663e08bb06050924f2eeca9147bba (diff) | |
download | tde-packaging-93c66bf8bb8ac0124ae1800cbaaeb814742bfac5.tar.gz tde-packaging-93c66bf8bb8ac0124ae1800cbaaeb814742bfac5.zip |
dbus-1-tqt -> libdbus-tqt-1-0 AND tdelibs import (unchanged)
Diffstat (limited to 'opensuse/dbus-1-tqt')
-rw-r--r-- | opensuse/dbus-1-tqt/README.VERSION | 1 | ||||
-rw-r--r-- | opensuse/dbus-1-tqt/baselibs.conf | 1 | ||||
-rw-r--r-- | opensuse/dbus-1-tqt/dbus-1-tqt.changes | 56 | ||||
-rw-r--r-- | opensuse/dbus-1-tqt/dbus-1-tqt.spec | 143 | ||||
-rw-r--r-- | opensuse/dbus-1-tqt/dbus-qt3-compile-fix-thoenig-01.patch | 85 | ||||
-rw-r--r-- | opensuse/dbus-1-tqt/dbus-qt3-do-not-close-shared-connection-thoenig-01.patch | 12 |
6 files changed, 0 insertions, 298 deletions
diff --git a/opensuse/dbus-1-tqt/README.VERSION b/opensuse/dbus-1-tqt/README.VERSION deleted file mode 100644 index 3167a4836..000000000 --- a/opensuse/dbus-1-tqt/README.VERSION +++ /dev/null @@ -1 +0,0 @@ -In the TRINITY tree this is dependencies/dbus-tqt. diff --git a/opensuse/dbus-1-tqt/baselibs.conf b/opensuse/dbus-1-tqt/baselibs.conf deleted file mode 100644 index eadc4f615..000000000 --- a/opensuse/dbus-1-tqt/baselibs.conf +++ /dev/null @@ -1 +0,0 @@ -dbus-1-tqt diff --git a/opensuse/dbus-1-tqt/dbus-1-tqt.changes b/opensuse/dbus-1-tqt/dbus-1-tqt.changes deleted file mode 100644 index 152c611cd..000000000 --- a/opensuse/dbus-1-tqt/dbus-1-tqt.changes +++ /dev/null @@ -1,56 +0,0 @@ -------------------------------------------------------------------- -Sat Aug 13 16:49:42 UTC 2011 - rxu@lincomlinux.org - -- upgrade to trinity dbus-tqt and adjust accordingly - -------------------------------------------------------------------- -Sat Dec 19 00:39:25 CET 2009 - jengelh@medozas.de - -- add baselibs.conf as a source - -------------------------------------------------------------------- -Wed Dec 10 12:34:56 CET 2008 - olh@suse.de - -- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade - (bnc#437293) - -------------------------------------------------------------------- -Thu Oct 30 12:34:56 CET 2008 - olh@suse.de - -- obsolete old -XXbit packages (bnc#437293) - -------------------------------------------------------------------- -Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de - -- added baselibs.conf file to build xxbit packages - for multilib support - -------------------------------------------------------------------- -Mon Nov 6 15:53:15 CET 2006 - thoenig@suse.de - -- loosen dependency to D-Bus - -------------------------------------------------------------------- -Fri Oct 20 16:42:06 CEST 2006 - thoenig@suse.de - -- add dbus-qt3-do-not-close-shared-connection-thoenig-01.patch: - Do not close shared connection -- F=dbus-qt3-compile-fix-thoenig-01; mv $.diff $F.patch - -------------------------------------------------------------------- -Mon Aug 21 12:49:44 CEST 2006 - thoenig@suse.de - -- remove hack for 64bit architectures -- use bz2 for tar ball - -------------------------------------------------------------------- -Thu Aug 17 18:22:08 CEST 2006 - dmueller@suse.de - -- really enable -fstack-protector -- fix build on x86_64 - -------------------------------------------------------------------- -Tue Aug 1 23:03:23 CEST 2006 - thoenig@suse.de - -- split out binings to sparate spec files - diff --git a/opensuse/dbus-1-tqt/dbus-1-tqt.spec b/opensuse/dbus-1-tqt/dbus-1-tqt.spec deleted file mode 100644 index 1ab86c544..000000000 --- a/opensuse/dbus-1-tqt/dbus-1-tqt.spec +++ /dev/null @@ -1,143 +0,0 @@ -# -# spec file for package dbus-1-tqt -# -# Copyright (c) 2011 the Trinity Project (opensuse). -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.trinitydesktop.org/ -# - -# norootforbuild - - -Name: dbus-1-tqt -BuildRequires: dbus-1 dbus-1-devel libtqt4-devel cmake -URL: http://dbus.freedesktop.org/ -License: GPLv2+ -Group: Development/Libraries/TDE -Version: 0.62 -Release: 1 -AutoReqProv: on -Summary: TQt/KDE bindings for D-Bus -Source0: dbus-tqt-%{version}.tar.bz2 -Source1: baselibs.conf -Patch0: dbus-qt3-compile-fix-thoenig-01.patch -Patch1: dbus-qt3-do-not-close-shared-connection-thoenig-01.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: dbus-1 >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`) - -%package devel -License: Other uncritical OpenSource License -Summary: Developer package for TQt/KDE bindings for D-Bus -Requires: dbus-1 >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1`) -Requires: dbus-1-devel >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' dbus-1-devel`) -Requires: dbus-1-tqt = %{version} -AutoReqProv: on -Group: Development/Libraries/TDE - -%description -TQt/KDE bindings for D-Bus. - - - -Authors: --------- - Olivier Andrieu <oliv__a@users.sourceforge.net> - Philip Blundell <pb@nexus.co.uk> - Anders Carlsson <andersca@gnome.org> - Kristian Hogsberg <krh@redhat.com> - Alex Larsson <alexl@redhat.com> - Michael Meeks <michael@ximian.com> - Seth Nickell <seth@gnome.org> - Havoc Pennington <hp@redhat.com> - Harri Porten <porten@kde.org> - Matthew Rickard <mjricka@epoch.ncsc.mil> - Zack Rusin <zack@kde.org> - Joe Shaw <joe@assbarn.com> - Colin Walters <walters@gnu.org> - David Zeuthen <david@fubar.dk> - -%description devel -Developer package for TQt/KDE bindings for D-Bus. - - - -Authors: --------- - Olivier Andrieu <oliv__a@users.sourceforge.net> - Philip Blundell <pb@nexus.co.uk> - Anders Carlsson <andersca@gnome.org> - Kristian Hogsberg <krh@redhat.com> - Alex Larsson <alexl@redhat.com> - Michael Meeks <michael@ximian.com> - Seth Nickell <seth@gnome.org> - Havoc Pennington <hp@redhat.com> - Harri Porten <porten@kde.org> - Matthew Rickard <mjricka@epoch.ncsc.mil> - Zack Rusin <zack@kde.org> - Joe Shaw <joe@assbarn.com> - Colin Walters <walters@gnu.org> - David Zeuthen <david@fubar.dk> - -%prep -%setup -n dbus-tqt-%{version} -q -%patch0 -p0 -%patch1 -p0 - -%build -RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -fstack-protector -fno-strict-aliasing -fPIC" -export CFLAGS="${RPM_OPT_FLAGS}" -export CXXFLAGS="${RPM_OPT_FLAGS}" -mkdir build -cd build - cmake -DCMAKE_SKIP_RPATH=ON \\\ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \\\ - -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\ - -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\ - -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\ - -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir} \\\ - -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\ - -DCMAKE_VERBOSE_MAKEFILE=ON \\\ - -DQT_LIBRARY_DIRS=/usr/lib/qt3/%{_lib} \\\ - -DQT_INCLUDE_DIRS=/usr/lib/qt3/include \\\ - -DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \\\ - -DMAN_INSTALL_DIR=%{_mandir} \ - ../ -make - -%install -make DESTDIR=%{buildroot} install - -%post -%{run_ldconfig} - -%postun -%{run_ldconfig} - -%clean -%{__rm} -rf %{buildroot} - -%files -%defattr(-, root, root) -%{_libdir}/libdbus-tqt-1.so.1* - -%files devel -%defattr(-, root, root) -%dir %{_includedir}/dbus-1.0 -%dir %{_includedir}/dbus-1.0/dbus -%{_includedir}/dbus-1.0/dbus/connection.h -%{_includedir}/dbus-1.0/dbus/dbus-qt.h -%{_includedir}/dbus-1.0/dbus/message.h -%{_includedir}/dbus-1.0/dbus/server.h -%{_libdir}/libdbus-tqt-1.la -%{_libdir}/libdbus-tqt-1.so - -%changelog diff --git a/opensuse/dbus-1-tqt/dbus-qt3-compile-fix-thoenig-01.patch b/opensuse/dbus-1-tqt/dbus-qt3-compile-fix-thoenig-01.patch deleted file mode 100644 index 00b8b6026..000000000 --- a/opensuse/dbus-1-tqt/dbus-qt3-compile-fix-thoenig-01.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- dbus-qt3/connection.cpp 2005-04-18 05:19:17.000000000 -0600 -+++ dbus-qt3/connection.cpp 2005-04-19 14:35:07.000000000 -0600 -@@ -154,6 +154,7 @@ - - void* Connection::virtual_hook( int, void* ) - { -+ return (void *)NULL; - } - - void Connection::dbus_connection_setup_with_qt_main (DBusConnection *connection) ---- dbus-qt3/message.cpp 2005-04-18 05:19:17.000000000 -0600 -+++ dbus-qt3/message.cpp 2005-04-19 14:55:32.000000000 -0600 -@@ -359,6 +359,7 @@ - Message Message::operator=( const Message& other ) - { - //FIXME: ref the other.d->msg instead of copying it? -+ return (Message &)(d->msg); - } - /** - * Destructs message. -@@ -508,42 +509,49 @@ - const dbus_bool_t right_size_bool = b; - dbus_message_append_args( d->msg, DBUS_TYPE_BOOLEAN, &right_size_bool, - DBUS_TYPE_INVALID ); -+ return (Message &)(d->msg); - } - - Message& Message::operator<<( Q_INT8 byte ) - { - dbus_message_append_args( d->msg, DBUS_TYPE_BYTE, &byte, - DBUS_TYPE_INVALID ); -+ return (Message &)(d->msg); - } - - Message& Message::operator<<( Q_INT32 num ) - { - dbus_message_append_args( d->msg, DBUS_TYPE_INT32, &num, - DBUS_TYPE_INVALID ); -+ return (Message &)(d->msg); - } - - Message& Message::operator<<( Q_UINT32 num ) - { - dbus_message_append_args( d->msg, DBUS_TYPE_UINT32, &num, - DBUS_TYPE_INVALID ); -+ return (Message &)(d->msg); - } - - Message& Message::operator<<( Q_INT64 num ) - { - dbus_message_append_args( d->msg, DBUS_TYPE_INT64, &num, - DBUS_TYPE_INVALID ); -+ return (Message &)(d->msg); - } - - Message& Message::operator<<( Q_UINT64 num ) - { - dbus_message_append_args( d->msg, DBUS_TYPE_UINT64, &num, - DBUS_TYPE_INVALID ); -+ return (Message &)(d->msg); - } - - Message& Message::operator<<( double num ) - { - dbus_message_append_args( d->msg, DBUS_TYPE_DOUBLE, &num, - DBUS_TYPE_INVALID ); -+ return (Message &)(d->msg); - } - - Message& Message::operator<<( const QString& str ) -@@ -551,11 +559,13 @@ - const char *u = str.utf8(); - dbus_message_append_args( d->msg, DBUS_TYPE_STRING, &u, - DBUS_TYPE_INVALID ); -+ return (Message &)(d->msg); - } - - Message& Message::operator<<( const QVariant& custom ) - { - //FIXME: imeplement -+ return (Message &)(d->msg); - } - - } - diff --git a/opensuse/dbus-1-tqt/dbus-qt3-do-not-close-shared-connection-thoenig-01.patch b/opensuse/dbus-1-tqt/dbus-qt3-do-not-close-shared-connection-thoenig-01.patch deleted file mode 100644 index 3cc726de1..000000000 --- a/opensuse/dbus-1-tqt/dbus-qt3-do-not-close-shared-connection-thoenig-01.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- dbus-qt3/connection.cpp 2006-10-20 16:33:29.000000000 +0200 -+++ dbus-qt3/connection.cpp 2006-10-20 16:33:10.000000000 +0200 -@@ -106,7 +106,7 @@ - - void Connection::close() - { -- dbus_connection_close ( d->connection ); -+ dbus_connection_unref ( d->connection ); - } - - void Connection::flush() - |