commit ff74030d0ce640355dd81b1c55cba6cc3fc202179d08fdfa3065b8d18d77e878 Author: Dave Plater Date: Sun Mar 11 14:16:47 2012 +0000 Accepting request 108779 from home:plater Needed by ffado svn to enable the dbus server to build again. OBS-URL: https://build.opensuse.org/request/show/108779 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libdbus-c++?expand=0&rev=1 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/libdbus-c++-0.9.0.tar.bz2 b/libdbus-c++-0.9.0.tar.bz2 new file mode 100644 index 0000000..f8150b9 --- /dev/null +++ b/libdbus-c++-0.9.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e6042151a275a0ddc7a9ecb67724d4971a97f8fd091f60450ad6a954bf71d8e +size 367798 diff --git a/libdbus-c++-noreturn.patch b/libdbus-c++-noreturn.patch new file mode 100644 index 0000000..cb6e7a1 --- /dev/null +++ b/libdbus-c++-noreturn.patch @@ -0,0 +1,21 @@ +Index: include/dbus-c++/util.h +=================================================================== +--- include/dbus-c++/util.h.orig 2011-11-28 17:03:19.000000000 +0200 ++++ include/dbus-c++/util.h 2012-03-11 13:21:18.851849466 +0200 +@@ -243,6 +243,7 @@ public: + // TODO: think about return type in this case + // this assert should help me to find the use case where it's needed... + //assert (false); ++ return _cb->call(param); + } + + R call(P param) const +@@ -255,6 +256,8 @@ public: + // TODO: think about return type in this case + // this assert should help me to find the use case where it's needed... + //assert (false); ++ return _cb->call(param); ++ + } + + bool empty() const diff --git a/libdbus-c++-pthread.patch b/libdbus-c++-pthread.patch new file mode 100644 index 0000000..ba87178 --- /dev/null +++ b/libdbus-c++-pthread.patch @@ -0,0 +1,11 @@ +Index: dbus-c++-1.pc.in +=================================================================== +--- dbus-c++-1.pc.in.orig 2011-11-28 22:52:01.000000000 +0200 ++++ dbus-c++-1.pc.in 2012-03-11 15:49:36.452603560 +0200 +@@ -7,5 +7,5 @@ Name: @PACKAGE@ + Description: Native C++ bindings for D-Bus + Requires: dbus-1 + Version: @VERSION@ +-Libs: -L${libdir} -ldbus-c++-1 ++Libs: -L${libdir} -ldbus-c++-1 -lpthread + Cflags: -I${includedir}/dbus-c++-1 -DDBUS_API_SUBJECT_TO_CHANGE diff --git a/libdbus-c++.changes b/libdbus-c++.changes new file mode 100644 index 0000000..fc138ef --- /dev/null +++ b/libdbus-c++.changes @@ -0,0 +1,13 @@ +------------------------------------------------------------------- +Sun Mar 11 11:53:09 UTC 2012 - davejplater@gmail.com + +- Added libdbus-c++-noreturn.patch to fix rpmlint error, will be + reported upstream as the comment in the source file suggests that + the developer hasn't decided what to do about it yet. + +------------------------------------------------------------------- +Sat Feb 25 08:20:55 UTC 2012 - davejplater@gmail.com + +- Created package dbus-c++ for ffado svn build. +- See bnc#747391 & bnc#736115 + diff --git a/libdbus-c++.spec b/libdbus-c++.spec new file mode 100644 index 0000000..6270ae3 --- /dev/null +++ b/libdbus-c++.spec @@ -0,0 +1,131 @@ +# +# spec file for package libdbus-c++ +# +# 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 +# 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.opensuse.org/ +# + +Name: libdbus-c++ +Version: 0.9.0 +Release: 1 +Summary: C++ Interface for DBus +URL: http://dbus-cplusplus.sourceforge.net/index.html +License: LGPL-2.0 +Group: System/Libraries +Source0: %{name}-%{version}.tar.bz2 +# Fix no return from function +Patch0: libdbus-c++-noreturn.patch +# Attempt to fix ffado build +Patch1: libdbus-c++-pthread.patch +BuildRequires: pkgconfig gcc-c++ dbus-1-devel +BuildRequires: autoconf automake libtool +BuildRequires: dbus-1-glib-devel libexpat-devel +BuildRequires: gtkmm2-devel dos2unix doxygen +# ecore +%if 0%{?suse_version} >= 1030 +BuildRequires: libexpat-devel +%else +BuildRequires: expat +%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build + + +%description +Ability to reflect dbus methods and signals into a more natural +C++ object system. + + +%package -n libdbus-c++-1-0 +Group: System/Libraries +Summary: Libdbus-c++ library + + +%description -n libdbus-c++-1-0 +Ability to reflect dbus methods and signals into a more natural +C++ object system. The libdbus-c++ library. + + +%package -n libdbus-c++-glib-1-0 +Group: System/Libraries +Summary: Glib for libdbus-c++ + + +%description -n libdbus-c++-glib-1-0 +Ability to reflect dbus methods and signals into a more natural +C++ object system. The glib libdbus-c++ library. + + +%package devel +Requires: libdbus-c++-glib-1-0 = %{version} +Requires: libdbus-c++-1-0 = %{version} +Group: Development/Libraries/C and C++ +Summary: Header files for libdbus-c++ + + +%description devel +Ability to reflect dbus methods and signals into a more natural +C++ object system. Files for building against libdbus-c++ + +%prep + +%setup -q +%patch0 +%patch1 + +%build +#./autogen.sh +%ifarch x86_64 +export LDFLAGS="$LDFLAGS -lexpat" +%else +export LDFLAGS="$LDFLAGS -lexpat -lpthread" +%endif +%configure --disable-ecore --enable-doxygen-docs --enable-static=no +make %{?_smp_flags} + + +%install +%makeinstall +dos2unix -k AUTHORS + + +%post -n libdbus-c++-glib-1-0 -p /sbin/ldconfig + +%postun -n libdbus-c++-glib-1-0 -p /sbin/ldconfig + +%post -n libdbus-c++-1-0 -p /sbin/ldconfig + +%postun -n libdbus-c++-1-0 -p /sbin/ldconfig + +%files -n libdbus-c++-1-0 +%defattr(755,root,root) +%{_libdir}/libdbus-c++-1.so.0 +%{_libdir}/libdbus-c++-1.so.0.0.0 + +%files -n libdbus-c++-glib-1-0 +%defattr(755,root,root) +%{_libdir}/libdbus-c++-glib-1.so.0 +%{_libdir}/libdbus-c++-glib-1.so.0.0.0 + +%files devel +%defattr(-,root,root) +%doc AUTHORS COPYING README TODO +%{_bindir}/dbusxx-xml2cpp +%{_bindir}/dbusxx-introspect +%{_libdir}/libdbus-c++-1.so +%{_libdir}/libdbus-c++-1.la +%{_libdir}/libdbus-c++-glib-1.la +%{_libdir}/libdbus-c++-glib-1.so +%{_includedir}/dbus-c++-1 +%{_libdir}/pkgconfig/*.pc + +%changelog