pool/libdbus-c__
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 493160 from multimedia:libs

Browse Source 
Disable api documentation build to prevent cycles.

OBS-URL: https://build.opensuse.org/request/show/493160
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libdbus-c++?expand=0&rev=13
This commit is contained in:
Dominique Leuenberger 2017-05-27 11:05:51 +00:00 committed by Git OBS Bridge
commit e25051ee54
9 changed files with 146 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
baselibs.conf
View File

@ -1,2 +1,2 @@
libdbus-c++-1-0
libdbus-c++-glib-1-0
libdbus-c++-1-1
libdbus-c++-glib-1-1

3
libdbus-c++-0.9.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bc11ac297b3cb010be904c72789695543ee3fdf3d75cdc8225fd371385af4e61
size 466362

BIN
libdbus-c++-0.9.1+git20170322.tar.gz (Stored with Git LFS) Normal file
View File

Binary file not shown.

12
libdbus-c++-gcc47.patch
View File

@ -1,12 +0,0 @@
Index: src/eventloop-integration.cpp
===================================================================
--- src/eventloop-integration.cpp.orig 2011-11-28 17:04:18.000000000 +0200
+++ src/eventloop-integration.cpp 2012-03-19 09:22:12.179566265 +0200
@@ -38,6 +38,7 @@
#include <cassert>
#include <sys/poll.h>
#include <fcntl.h>
+#include <unistd.h>
using namespace DBus;
using namespace std;

11
libdbus-c++-gcc7.patch Normal file
View File

@ -0,0 +1,11 @@
Index: src/pipe.cpp
===================================================================
--- src/pipe.cpp.orig 2011-11-30 00:16:31.000000000 +0200
+++ src/pipe.cpp 2017-03-27 10:34:55.261175583 +0200
@@ -83,5 +83,5 @@ ssize_t Pipe::read(void *buffer, unsigne
void Pipe::signal()
{
// TODO: ignoring return of read/write generates warning; maybe relevant for eventloop work...
- ::write(_fd_write, '\0', 1);
+ ::write(_fd_write, 0, 1);
}

17
libdbus-c++-nodocdatetime.patch
View File

@ -1,7 +1,7 @@
Index: doc/foot.html
===================================================================
--- doc/foot.html.orig 2011-11-30 18:57:37.000000000 +0200
+++ doc/foot.html 2012-03-13 14:44:14.494516524 +0200
--- doc/foot.html.orig 2016-09-24 11:03:56.000000000 +0200
+++ doc/foot.html 2017-04-10 15:51:55.951931300 +0200
@@ -10,7 +10,6 @@
<table><tr>
<td></td>
@ -10,3 +10,16 @@ Index: doc/foot.html
</tr></table>
</div>
Index: doc/Doxyfile.in
===================================================================
--- doc/Doxyfile.in.orig 2016-09-24 11:03:56.000000000 +0200
+++ doc/Doxyfile.in 2017-04-10 15:54:18.748279756 +0200
@@ -836,7 +836,7 @@ HTML_STYLESHEET = @srcdir@/dbus-c
# page will contain the date and time when the page was generated. Setting
# this to NO can help when comparing the output of multiple runs.
-HTML_TIMESTAMP = YES
+HTML_TIMESTAMP = NO
# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
# files or namespaces will be aligned in HTML using tables. If set to

28
libdbus-c++-sover.patch Normal file
View File

@ -0,0 +1,28 @@
Index: src/Makefile.am
===================================================================
--- src/Makefile.am.orig 2016-09-24 11:03:56.000000000 +0200
+++ src/Makefile.am 2017-03-28 14:53:22.941031645 +0200
@@ -28,6 +28,9 @@ libdbus_c___1_la_CXXFLAGS = \
-I$(top_srcdir)/include \
-Wno-unused-parameter
+libdbus_c___1_la_LDFLAGS= \
+ -version-info "$(SOVER)"
+
libdbus_c___1_la_LIBADD = \
$(dbus_LIBS)
Index: src/integration/glib/Makefile.am
===================================================================
--- src/integration/glib/Makefile.am.orig 2016-09-24 11:03:56.000000000 +0200
+++ src/integration/glib/Makefile.am 2017-03-28 15:04:24.695822590 +0200
@@ -16,6 +16,9 @@ libdbus_c___glib_1_la_LIBADD = \
$(dbus_LIBS) \
$(glib_LIBS)
+libdbus_c___glib_1_la_LDFLAGS= \
+ -version-info "$(SOVER)"
+
AM_CPPFLAGS = \
$(dbus_CFLAGS) \
$(glib_CFLAGS)

18
libdbus-c++.changes
View File

@ -1,3 +1,21 @@
-------------------------------------------------------------------
Mon Apr 10 14:00:47 UTC 2017 - davejplater@gmail.com
- Update libdbus-c++-nodocdatetime.patch
-------------------------------------------------------------------
Mon Mar 27 15:23:02 UTC 2017 - davejplater@gmail.com
- Update to git snapshot 0.9.1+git20170322 to fix ffado gcc7 build.
- Added libdbus-c++-gcc7.patch.
- Added libdbus-c++-sover.patch.
- Removed patch libdbus-c++-gcc47.patch.
- Upstream changes:
Fixed undefined ssize_t for clang-3.8.0 on FreeBSD
Fix copying containers
link to expat on linux
configure.ac: declare this version 0.9.1pw
-------------------------------------------------------------------
Sun Oct 16 18:04:30 UTC 2016 - jengelh@inai.de

98
libdbus-c++.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package libdbus-c++
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,14 +16,20 @@
#
%define _rev e3455d20fc0b6e00bce7668fbd9b165fdc8a7040
%define sover 1
# Html documentation build causes cycles
%define buildoc 0
Name: libdbus-c++
Version: 0.9.0
Version: 0.9.1+git20170322
Release: 0
Summary: C++ Interface for DBus
License: LGPL-2.1+
Group: Development/Libraries/C and C++
Url: http://dbus-cplusplus.sourceforge.net/index.html
Source0: http://sourceforge.net/projects/dbus-cplusplus/files/dbus-c%%2B%%2B/%{version}/%{name}-%{version}.tar.gz
#Source0: http://sourceforge.net/projects/dbus-cplusplus/files/dbus-c%%2B%%2B/%%{version}/%%{name}-%%{version}.tar.gz
Source0: https://github.com/andreas-volz/dbus-cplusplus/archive/%{_rev}.tar.gz#/%{name}-%{version}.tar.gz
Source1: baselibs.conf
# PATCH-FIX-UPSTREAM libdbus-c++-noreturn.patch davejplater@gmail.com -- Fix no return from function
Patch0: libdbus-c++-noreturn.patch
@ -31,17 +37,21 @@ Patch0: libdbus-c++-noreturn.patch
Patch1: libdbus-c++-pthread.patch
# PATCH-FIX-OPENSUSE libdbus-c++-nodocdatetime.patch davejplater@gmail.com -- No current date / time allowed in docs?
Patch2: libdbus-c++-nodocdatetime.patch
# PATCH-FIX-UPSTREAM libdbus-c++-gcc47.patch davejplater@gmail.com -- Fix gcc47 build errors
Patch3: libdbus-c++-gcc47.patch
# PATCH-FIX-UPSTREAM libdbus-c++-glibmm-2.43.patch dimstar@opensuse.org -- Fix build with glibmm2 2.43.x+
Patch4: libdbus-c++-glibmm-2.43.patch
# PATCH-FIX-UPSTREAM libdbus-c++-gcc7.patch davejplater@gmail.com -- Fix gcc7 build errors
Patch5: libdbus-c++-gcc7.patch
# PATCH_FIX_OPENSUSE libdbus-c++-sover.patch davejplater@gmail.com -- Prevent errors due to symbol incompatability.
Patch6: libdbus-c++-sover.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: dos2unix
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: graphviz
%if %{buildoc} == 1
BuildRequires: doxygen
BuildRequires: graphviz-gnome
%endif
BuildRequires: gtkmm2-devel
BuildRequires: libexpat-devel
BuildRequires: libtool
@ -57,20 +67,20 @@ DBus-c++ provides a C++ API for D-BUS. The library has
a glib and an ecore mainloop integration. It also offers an
optional own main loop.
%package -n libdbus-c++-1-0
%package -n libdbus-c++-1-%{sover}
Summary: C++ Interface for D-Bus
Group: System/Libraries
%description -n libdbus-c++-1-0
%description -n libdbus-c++-1-%{sover}
DBus-c++ provides a C++ API for D-BUS. The library has
a glib and an ecore mainloop integration. It also offers an
optional own main loop. The libdbus-c++ library.
%package -n libdbus-c++-glib-1-0
%package -n libdbus-c++-glib-1-%{sover}
Summary: Glib integration for libdbus-c++
Group: System/Libraries
%description -n libdbus-c++-glib-1-0
%description -n libdbus-c++-glib-1-%{sover}
DBus-c++ provides a C++ API for D-BUS. The library has
a glib and an ecore mainloop integration. It also offers an
optional own main loop. The glib libdbus-c++ library.
@ -78,55 +88,79 @@ optional own main loop. The glib libdbus-c++ library.
%package devel
Summary: Development files for libdbus-c++
Group: Development/Libraries/C and C++
Requires: libdbus-c++-1-0 = %{version}
Requires: libdbus-c++-glib-1-0 = %{version}
Requires: libdbus-c++-1-%{sover} = %{version}
Requires: libdbus-c++-glib-1-%{sover} = %{version}
%description devel
DBus-c++ provides a C++ API for D-BUS. The library has
a glib and an ecore mainloop integration. It also offers an
optional own main loop.
This subpackage contains the files needed for building against
libdbus-c++.
%prep
%setup -q
%setup -q -n dbus-cplusplus-%{_rev}
#-n dbus-cplusplus-%%{_rev}
%patch0
%patch1
%patch2
%patch3
%patch4 -p1
%patch5
%patch6
%build
export SOVER="%{sover}:0:0"
#%%{sover}
# --enable-doxygen-docs -fpermissive
./bootstrap
#./autogen.sh
%if 1 == 0
%define gcc_version 7
export CC=gcc-7
export CPP=cpp-7
export CXX=g++-7
%endif
export LDFLAGS="$LDFLAGS -lexpat -lpthread"
%configure --disable-ecore --enable-doxygen-docs --enable-static=no
make %{?_smp_flags}
%if 0%{?gcc_version} > 5
export CXXFLAGS="%{optflags} --std=c++11 -fPIC -Werror=date-time"
%else
export CXXFLAGS="%{optflags} --std=c++11 -fPIC"
%endif
%configure --disable-ecore --enable-static=no \
%if %{buildoc} == 1
--enable-doxygen-docs \
%else
--disable-doxygen-docs \
%endif
--enable-tests \
--enable-examples
make %{?_smp_mflags}
%install
%make_install
dos2unix -k AUTHORS
rm -f %{buildroot}%{_libdir}/*.la
%if %{buildoc} == 1
%fdupes -s doc/
%endif
%post -n libdbus-c++-glib-1-0 -p /sbin/ldconfig
%post -n libdbus-c++-glib-1-%{sover} -p /sbin/ldconfig
%postun -n libdbus-c++-glib-1-0 -p /sbin/ldconfig
%postun -n libdbus-c++-glib-1-%{sover} -p /sbin/ldconfig
%post -n libdbus-c++-1-0 -p /sbin/ldconfig
%post -n libdbus-c++-1-%{sover} -p /sbin/ldconfig
%postun -n libdbus-c++-1-0 -p /sbin/ldconfig
%postun -n libdbus-c++-1-%{sover} -p /sbin/ldconfig
%files -n libdbus-c++-1-0
%files -n libdbus-c++-1-%{sover}
%defattr(755,root,root)
%{_libdir}/libdbus-c++-1.so.0
%{_libdir}/libdbus-c++-1.so.0.0.0
%{_libdir}/libdbus-c++-1.so.%{sover}
%{_libdir}/libdbus-c++-1.so.%{sover}.0.0
%files -n libdbus-c++-glib-1-0
%files -n libdbus-c++-glib-1-%{sover}
%defattr(755,root,root)
%{_libdir}/libdbus-c++-glib-1.so.0
%{_libdir}/libdbus-c++-glib-1.so.0.0.0
%{_libdir}/libdbus-c++-glib-1.so.%{sover}
%{_libdir}/libdbus-c++-glib-1.so.%{sover}.0.0
# TODO: Separate the two lib's devel packages. There's only one set of headers though.
# FIXME: Every html file contains date and time, must be fixed before docs are included.
@ -134,12 +168,18 @@ rm -f %{buildroot}%{_libdir}/*.la
%files devel
%defattr(-,root,root)
%if %{buildoc} == 1
%doc AUTHORS COPYING README TODO doc/html doc/img
%else
%doc AUTHORS COPYING README TODO
%endif
%{_bindir}/dbusxx-xml2cpp
%{_bindir}/dbusxx-introspect
%{_libdir}/libdbus-c++-1.so
%{_libdir}/libdbus-c++-glib-1.so
%{_includedir}/dbus-c++-1
%{_libdir}/pkgconfig/*.pc
# doc/html doc/img
%changelog