Sync from SUSE:ALP:Source:Standard:1.0 libdbus-c++ revision a7f57f09657b106d64c5382a1e947fa2
This commit is contained in:
parent
7f89bdf400
commit
8426c5bf64
23
.gitattributes
vendored
23
.gitattributes
vendored
@ -1,23 +0,0 @@
|
||||
## 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
|
||||
@ -1,4 +0,0 @@
|
||||
<multibuild>
|
||||
<package>glib</package>
|
||||
<package>docs</package>
|
||||
</multibuild>
|
||||
@ -1,2 +0,0 @@
|
||||
libdbus-c++-1-1
|
||||
libdbus-c++-glib-1-1
|
||||
BIN
libdbus-c++-0.9.1+git20170322.tar.gz
(Stored with Git LFS)
BIN
libdbus-c++-0.9.1+git20170322.tar.gz
(Stored with Git LFS)
Binary file not shown.
@ -1,11 +0,0 @@
|
||||
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);
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
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 <gtkmm.h>
|
||||
#include <dbus-c++/dbus.h>
|
||||
#include <dbus-c++/glib-integration.h>
|
||||
-#include <gtkmm.h>
|
||||
|
||||
#include "dbus-glue.h"
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
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
|
||||
@ -1,11 +0,0 @@
|
||||
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
|
||||
@ -1,28 +0,0 @@
|
||||
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)
|
||||
@ -1,121 +0,0 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 13 07:23:25 UTC 2022 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Do not reference %release in requires/conflicts: with builds
|
||||
going across _multibuild, the rebuild counter of the two flavors
|
||||
is not guaranteed to be in sync (i.e glib flavor could build more
|
||||
often).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 25 22:22:13 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||
|
||||
- Fix self-conflict of devel package
|
||||
- Remove redundant .changes files for other flavors again (added
|
||||
without changelog entry)
|
||||
- Correct baselibs entry, add glib flavor again (removed to "fix"
|
||||
an erroneous factory-auto reject)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 25 07:34:29 UTC 2019 - Dave Plater <davejplater@gmail.com>
|
||||
|
||||
- Remove conflict between current libdbus-c++-devel and
|
||||
libdbus-c++-glib-devel.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 22 00:37:29 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||
|
||||
- Drop -Werror=date-time, it is not supported by older GCCs, and
|
||||
newer ones support SOURCE_DATE_EPOCH
|
||||
- Conflict older devel packages, to avoid file conflicts.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 21 00:54:46 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
|
||||
|
||||
- Split package into base, glib and docs package using _multibuild.
|
||||
The glib flavor depends on gtkmm, but the base package is
|
||||
sufficient for building most of the distribution, most notably
|
||||
ffado/jack and its dependees.
|
||||
- Drop libdbus-c++-nodocdatetime.patch, doxygen honors SOURCE_DATE_EPOCH
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
- Update groups, summaries, descriptions
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Oct 12 18:52:44 UTC 2016 - dimstar@opensuse.org
|
||||
|
||||
- Use the standardized patch tag line as described at
|
||||
https://en.opensuse.org/openSUSE:Packaging_Patches_guidelines.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Apr 19 13:12:38 UTC 2016 - zaitor@opensuse.org
|
||||
|
||||
- Stop exporting CFLAGS and CXXFLAGS, no longer needed due to
|
||||
changes in libsigc++.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 3 19:52:06 UTC 2016 - mpluskal@suse.com
|
||||
|
||||
- Use url for source
|
||||
- Remove conditions for unsupported releases
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 20 21:00:19 UTC 2015 - zaitor@opensuse.org
|
||||
|
||||
- Export CFLAGS="%{optflags} -std=gnu++11" and
|
||||
CXXFLAGS="%{optflags} -std=gnu++11". Fix build with updated MM
|
||||
stack.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 23 10:03:24 UTC 2015 - dimstar@opensuse.org
|
||||
|
||||
- Add libdbus-c++-glibmm-2.43.patch: Fix build with glibmm 2.4,
|
||||
which has the bind_property macro defined already.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 23 14:03:27 UTC 2013 - coolo@suse.com
|
||||
|
||||
- pthread is needed for the test app - not just on i586
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 20 07:33:35 UTC 2012 - davejplater@gmail.com
|
||||
|
||||
- Created libdbus-c++-gcc47.patch to fix a gcc 47 build error
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 12 08:42:55 UTC 2012 - davejplater@gmail.com
|
||||
|
||||
- Added baselibs.conf for 32 bit compat libs.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
194
libdbus-c++.spec
194
libdbus-c++.spec
@ -1,194 +0,0 @@
|
||||
#
|
||||
# spec file
|
||||
#
|
||||
# Copyright (c) 2022 SUSE LLC
|
||||
#
|
||||
# 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 https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%global flavor @BUILD_FLAVOR@%{nil}
|
||||
|
||||
%if "%{flavor}" == "glib"
|
||||
%bcond_with docs
|
||||
%bcond_without glib
|
||||
%global psuffix -glib
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "docs"
|
||||
%bcond_without docs
|
||||
%bcond_with glib
|
||||
%global psuffix -api-docs
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == ""
|
||||
%bcond_with docs
|
||||
%bcond_with glib
|
||||
%endif
|
||||
|
||||
%define sname libdbus-c++
|
||||
|
||||
%define _rev e3455d20fc0b6e00bce7668fbd9b165fdc8a7040
|
||||
%define sover 1
|
||||
|
||||
Name: libdbus-c++%{?psuffix}
|
||||
Version: 0.9.1+git20170322
|
||||
Release: 0
|
||||
Summary: C++ Interface for DBus
|
||||
License: LGPL-2.1-or-later
|
||||
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: https://github.com/andreas-volz/dbus-cplusplus/archive/%{_rev}.tar.gz#/%{sname}-%{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
|
||||
# PATCH-FIX-UPSTREAM libdbus-c++-pthread.patch davejplater@gmail.com -- Get ffado to build with libdbus-c++
|
||||
Patch1: libdbus-c++-pthread.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: gcc-c++
|
||||
%if %{with docs}
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: graphviz-gnome
|
||||
%endif
|
||||
%if %{with glib}
|
||||
BuildRequires: gtkmm2-devel
|
||||
BuildRequires: pkgconfig(dbus-glib-1)
|
||||
%endif
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(dbus-1)
|
||||
# ecore
|
||||
BuildRequires: libexpat-devel
|
||||
%if "%{flavor}" == "docs"
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
|
||||
%description
|
||||
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++%{?psuffix}-1-%{sover}
|
||||
Summary: C++ Interface for D-Bus
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n libdbus-c++%{?psuffix}-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.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for libdbus-c++
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: libdbus-c++%{?psuffix}-1-%{sover} = %{version}
|
||||
Recommends: libdbus-c++-api-docs
|
||||
Conflicts: libdbus-c++-devel < %{version}
|
||||
%if 0%{?suse_version} <= 1500
|
||||
%if %{with glib}
|
||||
Requires: libdbus-c++-devel = %{version}
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%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 -n dbus-cplusplus-%{_rev}
|
||||
%patch0
|
||||
%patch1
|
||||
%patch4 -p1
|
||||
%patch5
|
||||
%patch6
|
||||
|
||||
%build
|
||||
export SOVER="%{sover}:0:0"
|
||||
export LDFLAGS="$LDFLAGS -lexpat -lpthread -pie"
|
||||
export CFLAGS="%{optflags} -fPIC"
|
||||
export CXXFLAGS="%{optflags} --std=c++11 -fPIC"
|
||||
./bootstrap
|
||||
%configure \
|
||||
--disable-ecore \
|
||||
--enable-static=no \
|
||||
%if %{without glib}
|
||||
--disable-glib \
|
||||
%endif
|
||||
%if %{with docs}
|
||||
--enable-doxygen-docs \
|
||||
%else
|
||||
--disable-doxygen-docs \
|
||||
--enable-tests \
|
||||
--enable-examples
|
||||
%endif
|
||||
|
||||
%if "%{flavor}" == "docs"
|
||||
make %{?_smp_mflags} -C doc
|
||||
%else
|
||||
make %{?_smp_mflags}
|
||||
%endif
|
||||
|
||||
%install
|
||||
%if "%{flavor}" == "docs"
|
||||
%fdupes -s doc/
|
||||
|
||||
%else
|
||||
%make_install
|
||||
dos2unix -k AUTHORS
|
||||
rm -f %{buildroot}%{_libdir}/*.la
|
||||
|
||||
# Remove files packaged in the base flavor
|
||||
%if "%{flavor}" == "glib"
|
||||
rm %{buildroot}%{_bindir}/*
|
||||
rm -Rf %{buildroot}%{_includedir}
|
||||
rm -Rf %{buildroot}%{_libdir}/libdbus-c++-1.so*
|
||||
rm -Rf %{buildroot}%{_libdir}/pkgconfig/dbus-c++-1.pc
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%post -n libdbus-c++%{?psuffix}-1-%{sover} -p /sbin/ldconfig
|
||||
%postun -n libdbus-c++%{?psuffix}-1-%{sover} -p /sbin/ldconfig
|
||||
|
||||
%if "%{flavor}" == "docs"
|
||||
%files
|
||||
%doc doc/html doc/img
|
||||
%else
|
||||
|
||||
%files -n libdbus-c++%{?psuffix}-1-%{sover}
|
||||
%{_libdir}/libdbus-c++%{?psuffix}-1.so.%{sover}*
|
||||
|
||||
%files devel
|
||||
%if "%{flavor}" == ""
|
||||
%license COPYING
|
||||
%doc AUTHORS README TODO
|
||||
%{_bindir}/dbusxx-xml2cpp
|
||||
%{_bindir}/dbusxx-introspect
|
||||
%{_includedir}/dbus-c++-1
|
||||
%endif
|
||||
|
||||
%{_libdir}/libdbus-c++%{?psuffix}-1.so
|
||||
%{_libdir}/pkgconfig/*%{?psuffix}*.pc
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
Loading…
Reference in New Issue
Block a user