From 5709f5f470df9fc8fdeec1e60cd1f4b952acaa18 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 3 Apr 2023 21:04:26 +0000 Subject: [PATCH] Import rpm: c8s --- .gitignore | 1 + dbus-c++-gcc4.7.patch | 12 ++ dbus-c++-linkfix.patch | 12 ++ dbus-c++-macro_collision.patch | 14 +++ dbus-c++-threading.patch | 45 +++++++ dbus-c++-writechar.patch | 9 ++ dbus-c++.spec | 215 +++++++++++++++++++++++++++++++++ sources | 1 + 8 files changed, 309 insertions(+) create mode 100644 .gitignore create mode 100644 dbus-c++-gcc4.7.patch create mode 100644 dbus-c++-linkfix.patch create mode 100644 dbus-c++-macro_collision.patch create mode 100644 dbus-c++-threading.patch create mode 100644 dbus-c++-writechar.patch create mode 100644 dbus-c++.spec create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4b985fa --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/libdbus-c++-0.9.0.tar.gz diff --git a/dbus-c++-gcc4.7.patch b/dbus-c++-gcc4.7.patch new file mode 100644 index 0000000..5cb8096 --- /dev/null +++ b/dbus-c++-gcc4.7.patch @@ -0,0 +1,12 @@ +diff --git a/include/dbus-c++/eventloop-integration.h b/include/dbus-c++/eventloop-integration.h +index 1b0302e..3e44304 100644 +--- a/include/dbus-c++/eventloop-integration.h ++++ b/include/dbus-c++/eventloop-integration.h +@@ -26,6 +26,7 @@ + #define __DBUSXX_EVENTLOOP_INTEGRATION_H + + #include ++#include + #include "api.h" + #include "dispatcher.h" + #include "util.h" diff --git a/dbus-c++-linkfix.patch b/dbus-c++-linkfix.patch new file mode 100644 index 0000000..3672fe2 --- /dev/null +++ b/dbus-c++-linkfix.patch @@ -0,0 +1,12 @@ +diff -up libdbus-c++-0.9.0/src/Makefile.am.linkfix libdbus-c++-0.9.0/src/Makefile.am +--- libdbus-c++-0.9.0/src/Makefile.am.linkfix 2013-12-17 16:07:22.326715886 +0100 ++++ libdbus-c++-0.9.0/src/Makefile.am 2013-12-17 16:07:34.474542044 +0100 +@@ -29,7 +29,7 @@ libdbus_c___1_la_CXXFLAGS = \ + -Wno-unused-parameter + + libdbus_c___1_la_LIBADD = \ +- $(dbus_LIBS) ++ $(dbus_LIBS) $(xml_LIBS) + + AM_CPPFLAGS = \ + $(dbus_CFLAGS) \ diff --git a/dbus-c++-macro_collision.patch b/dbus-c++-macro_collision.patch new file mode 100644 index 0000000..5704402 --- /dev/null +++ b/dbus-c++-macro_collision.patch @@ -0,0 +1,14 @@ +diff -rupN libdbus-c++-0.9.0/examples/glib/dbus-browser.h libdbus-c++-0.9.0-new/examples/glib/dbus-browser.h +--- libdbus-c++-0.9.0/examples/glib/dbus-browser.h 2015-03-05 23:43:26.903517530 +0100 ++++ libdbus-c++-0.9.0-new/examples/glib/dbus-browser.h 2011-11-28 16:03:19.000000000 +0100 +@@ -1,9 +1,9 @@ + #ifndef __DEMO_DBUS_BROWSER_H + #define __DEMO_DBUS_BROWSER_H + ++#include + #include + #include +-#include + + #include "dbus-glue.h" + diff --git a/dbus-c++-threading.patch b/dbus-c++-threading.patch new file mode 100644 index 0000000..c4fafef --- /dev/null +++ b/dbus-c++-threading.patch @@ -0,0 +1,45 @@ +--- libdbus-c++-0.9.0/include/dbus-c++/dispatcher.h.threading 2017-02-15 13:40:53.796004263 +0000 ++++ libdbus-c++-0.9.0/include/dbus-c++/dispatcher.h 2017-02-15 13:40:46.907000493 +0000 +@@ -188,6 +188,7 @@ + /* classes for multithreading support + */ + ++#if 0 + class DXXAPI Mutex + { + public: +@@ -243,9 +244,11 @@ + typedef bool (*CondVarWaitTimeoutFn)(CondVar *cv, Mutex *mx, int timeout); + typedef void (*CondVarWakeOneFn)(CondVar *cv); + typedef void (*CondVarWakeAllFn)(CondVar *cv); ++#endif + + void DXXAPI _init_threading(); + ++#if 0 + void DXXAPI _init_threading( + MutexNewFn, MutexFreeFn, MutexLockFn, MutexUnlockFn, + CondVarNewFn, CondVarFreeFn, CondVarWaitFn, CondVarWaitTimeoutFn, CondVarWakeOneFn, CondVarWakeAllFn +@@ -312,6 +315,7 @@ + cv->wake_all(); + } + }; ++#endif + + } /* namespace DBus */ + +--- libdbus-c++-0.9.0/src/dispatcher.cpp.threading 2017-02-15 13:48:22.627249868 +0000 ++++ libdbus-c++-0.9.0/src/dispatcher.cpp 2017-02-15 13:48:29.164253445 +0000 +@@ -253,6 +253,7 @@ + #endif//DBUS_HAS_THREADS_INIT_DEFAULT + } + ++#if 0 + void DBus::_init_threading( + MutexNewFn m1, + MutexFreeFn m2, +@@ -318,3 +319,4 @@ + #endif//DBUS_HAS_RECURSIVE_MUTEX + dbus_threads_init(&functions); + } ++#endif diff --git a/dbus-c++-writechar.patch b/dbus-c++-writechar.patch new file mode 100644 index 0000000..d936b7f --- /dev/null +++ b/dbus-c++-writechar.patch @@ -0,0 +1,9 @@ +--- libdbus-c++-0.9.0/src/pipe.cpp.writechar 2017-02-16 11:07:13.591950169 +0000 ++++ libdbus-c++-0.9.0/src/pipe.cpp 2017-02-16 11:04:17.158796092 +0000 +@@ -83,5 +83,5 @@ + void Pipe::signal() + { + // TODO: ignoring return of read/write generates warning; maybe relevant for eventloop work... +- ::write(_fd_write, '\0', 1); ++ ::write(_fd_write, "", 1); + } diff --git a/dbus-c++.spec b/dbus-c++.spec new file mode 100644 index 0000000..9cbc5f8 --- /dev/null +++ b/dbus-c++.spec @@ -0,0 +1,215 @@ +# Disabled by default for RHEL https://bugzilla.redhat.com/show_bug.cgi?id=1553111 +%bcond_with ecore + +Name: dbus-c++ +Version: 0.9.0 +Release: 17%{?dist} +Summary: Native C++ bindings for D-Bus + +Group: System Environment/Libraries +License: LGPLv2+ +URL: http://sourceforge.net/projects/dbus-cplusplus/ +Source0: http://downloads.sourceforge.net/dbus-cplusplus/lib%{name}-%{version}.tar.gz + +Patch1: dbus-c++-gcc4.7.patch +Patch2: dbus-c++-linkfix.patch +# Fix collision between macro bind_property in dbus-c++/interface.h and method +# bind_property in glibmm/binding.h +Patch3: dbus-c++-macro_collision.patch +# Remove broken classes for multithreading support +# https://sourceforge.net/p/dbus-cplusplus/patches/18/ +Patch4: dbus-c++-threading.patch +# https://sourceforge.net/p/dbus-cplusplus/patches/19/ +Patch5: dbus-c++-writechar.patch + +BuildRequires: dbus-devel +BuildRequires: glib2-devel +BuildRequires: gtkmm24-devel +BuildRequires: autoconf automake libtool +BuildRequires: expat-devel +%if %{with ecore} +BuildRequires: ecore-devel +%endif + +%description +dbus-c++ attempts to provide a C++ API for D-Bus. +Subpackages are provided with mainloop integration. + +%if %{with ecore} +%package ecore +Summary: Ecore library for %{name} +Group: System Environment/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +%description ecore +This package contains the ecore mainloop library for %{name} +%endif + +%package glib +Summary: GLib library for %{name} +Group: System Environment/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +%description glib +This package contains the GLib mainloop library for %{name} + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: pkgconfig +%description devel +This package contains libraries and header files for +developing applications that use %{name}. + + +%prep +%setup -q -n lib%{name}-%{version} +sed -i 's/\r//' AUTHORS +sed -i 's/libtoolize --force --copy/libtoolize -if --copy/' bootstrap +%patch1 -p1 -b .gcc47 +%patch2 -p1 -b .linkfix +%patch3 -p1 -b .collision +%patch4 -p1 -b .threading +%patch5 -p1 -b .writechar + +%build +autoreconf -vfi +export CPPFLAGS='%{optflags}' CXXFLAGS='--std=gnu++11 %{optflags}' +%configure --disable-static --disable-tests \ +%if %{without ecore} + --disable-ecore +%endif +make %{?_smp_mflags} + +%install +make install DESTDIR=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc AUTHORS +%{_bindir}/dbusxx-introspect +%{_bindir}/dbusxx-xml2cpp +%{_libdir}/libdbus-c++-1.so.0* + +%if %{with ecore} +%files ecore +%{_libdir}/libdbus-c++-ecore-1.so.0* +%endif + +%files glib +%{_libdir}/libdbus-c++-glib-1.so.0* + +%files devel +%doc TODO +%{_includedir}/* +%{_libdir}/*.so +%{_libdir}/pkgconfig/* + +%changelog +* Thu Mar 15 2018 Colin Walters - 0.9.0-17 +- Add a bcond for ecore, some downstream distributions may not want it + +* Wed Aug 02 2017 Fedora Release Engineering - 0.9.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 0.9.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Feb 16 2017 Jonathan Wakely - 0.9.0-13 +- Remove broken multi-threading support that doesn't build with GCC 7 + +* Fri Feb 10 2017 Fedora Release Engineering - 0.9.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 03 2016 Fedora Release Engineering - 0.9.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jan 14 2016 Lubomir Rintel - 0.9.0-10 +- Fix FTBFS + +* Wed Jun 17 2015 Fedora Release Engineering - 0.9.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu May 7 2015 Peter Robinson 0.9.0-8 +- Split ecore/glib mainloop out to subpackage to reduce deps +- Use %%license + +* Sun Apr 19 2015 Zbigniew Jędrzejewski-Szmek - 0.9.0-7 +- Rebuilt with gcc5 once again + +* Thu Mar 05 2015 Sandro Mani - 0.9.0-6 +- Add patch to fix macro macro collision (#1187045) + +* Fri Feb 27 2015 Adel Gadllah - 0.9.0-5 +- Rebuilt with gcc5 + +* Sat Aug 16 2014 Fedora Release Engineering - 0.9.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 0.9.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Wed Feb 26 2014 Jiri Popelka - 0.9.0-2 +- fix bootstrap script for ppc64le (#1070306) + +* Tue Dec 17 2013 Jiri Popelka - 0.9.0-1 +- 0.9.0 + +* Sat Aug 03 2013 Fedora Release Engineering - 0.5.0-0.17.20090203git13281b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 0.5.0-0.16.20090203git13281b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 0.5.0-0.15.20090203git13281b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Feb 28 2012 Fedora Release Engineering - 0.5.0-0.14.20090203git13281b3 +- Rebuilt for c++ ABI breakage + +* Fri Jan 13 2012 Fedora Release Engineering - 0.5.0-0.13.20090203git13281b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 0.5.0-0.12.20090203git13281b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Feb 13 2010 Adel Gadllah - 0.5.0-0.11.20090203git13281b3 +- Fix FTBS (RH #565052) + +* Fri Jul 31 2009 Adel Gadllah - 0.5.0-0.10.20090203git13281b3 +- Fix build + +* Fri Jul 24 2009 Fedora Release Engineering - 0.5.0-0.9.20090203git13281b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Tue Feb 24 2009 Fedora Release Engineering - 0.5.0-0.8.20090203git13281b3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Feb 18 2009 Adel Gadllah - 0.5.0-0.7.20090203git13281b3 +- bump.. + +* Wed Feb 18 2009 Adel Gadllah - 0.5.0-0.6.20090203git13281b3 +- Fix build with new gcc + +* Wed Feb 18 2009 Adel Gadllah - 0.5.0-0.5.20090203git13281b3 +- Add the ability to get the senders unix userid (Patch by Jiri Moskovcak) + +* Tue Feb 03 2009 Adel Gadllah - 0.5.0-0.4.20090203git13281b3 +- Update to new git snapshot +- Should fix RH #483418 + +* Wed Jul 16 2008 Adel Gadllah - 0.5.0-0.3.20080716git1337c65 +- Generate tarball with git-archive +- Fix cflags + +* Wed Jul 16 2008 Adel Gadllah - 0.5.0-0.2.20080716git1337c65 +- Add commit id to version + +* Wed Jul 16 2008 Adel Gadllah - 0.5.0-0.1.20080716git +- Initial package diff --git a/sources b/sources new file mode 100644 index 0000000..acf0284 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (libdbus-c++-0.9.0.tar.gz) = 7acebbb4254b2886cc0f05c5ddeeeac0b5863c5552d32249463b89380b0b95b8225c80bd98b8c7fcaada42ab770b5eff41b15390cd0d78bf1ee322ac6c2de319