From 11d3364851102109abbcc7971a1ab348ee7a1d95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sun, 20 Dec 2015 11:56:29 +0100 Subject: [PATCH] libdbus-c++: unbreak musl --- .../libdbus-c++/patches/fix-mutex-init.patch | 18 ++++++++++++++++++ srcpkgs/libdbus-c++/patches/musl-ssize_t.patch | 11 +++++++++++ srcpkgs/libdbus-c++/patches/musl-uint.patch | 13 +++++++++++++ srcpkgs/libdbus-c++/template | 2 +- 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/libdbus-c++/patches/fix-mutex-init.patch create mode 100644 srcpkgs/libdbus-c++/patches/musl-ssize_t.patch create mode 100644 srcpkgs/libdbus-c++/patches/musl-uint.patch diff --git a/srcpkgs/libdbus-c++/patches/fix-mutex-init.patch b/srcpkgs/libdbus-c++/patches/fix-mutex-init.patch new file mode 100644 index 00000000000..85156d9798e --- /dev/null +++ b/srcpkgs/libdbus-c++/patches/fix-mutex-init.patch @@ -0,0 +1,18 @@ +Use a portable way to initialize a recursive mutex. + +--- src/eventloop.cpp 2011-11-28 16:03:19.000000000 +0100 ++++ src/eventloop.cpp 2015-12-20 11:17:56.774568824 +0100 +@@ -85,8 +85,11 @@ + { + if (recursive) + { +- pthread_mutex_t recmutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; +- _mutex = recmutex; ++ pthread_mutexattr_t attr; ++ pthread_mutexattr_init(&attr); ++ pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); ++ pthread_mutex_init(&_mutex, &attr); ++ pthread_mutexattr_destroy(&attr); + } + else + { diff --git a/srcpkgs/libdbus-c++/patches/musl-ssize_t.patch b/srcpkgs/libdbus-c++/patches/musl-ssize_t.patch new file mode 100644 index 00000000000..0567ea2ab17 --- /dev/null +++ b/srcpkgs/libdbus-c++/patches/musl-ssize_t.patch @@ -0,0 +1,11 @@ +--- include/dbus-c++/pipe.h 2011-11-28 16:03:19.000000000 +0100 ++++ include/dbus-c++/pipe.h 2015-12-20 11:28:15.238535382 +0100 +@@ -29,6 +29,8 @@ + + /* STD */ + #include ++/* ssize_t */ ++#include + + namespace DBus + { diff --git a/srcpkgs/libdbus-c++/patches/musl-uint.patch b/srcpkgs/libdbus-c++/patches/musl-uint.patch new file mode 100644 index 00000000000..dde16171724 --- /dev/null +++ b/srcpkgs/libdbus-c++/patches/musl-uint.patch @@ -0,0 +1,13 @@ +--- tools/generate_proxy.cpp 2011-11-28 16:03:19.000000000 +0100 ++++ tools/generate_proxy.cpp 2015-12-20 11:30:56.002526689 +0100 +@@ -26,6 +26,10 @@ + #include + #include + ++#if !defined(__GLIBC__) ++typedef unsigned int uint; ++#endif ++ + #include "generator_utils.h" + #include "generate_proxy.h" + diff --git a/srcpkgs/libdbus-c++/template b/srcpkgs/libdbus-c++/template index aa3b5e70f6e..adf90bb9ffb 100644 --- a/srcpkgs/libdbus-c++/template +++ b/srcpkgs/libdbus-c++/template @@ -1,7 +1,7 @@ # Template file for 'libdbus-c++' pkgname=libdbus-c++ version=0.9.0 -revision=2 +revision=3 build_style=gnu-configure configure_args="--enable-glib --disable-ecore" hostmakedepends="autoconf automake pkg-config"