mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-04-06 13:10:33 +02:00
gnu: Remove unused patches.
* gnu/packages/patches/dbus-c++-gcc-compat.patch, gnu/packages/patches/dbus-c++-threading-mutex.patch: Remove files. * gnu/local.mk (dist_patch_DATA): Unregister them. Change-Id: Id629a757cc89e3f799c0fa1880bdc0c3a3b1a0bf
This commit is contained in:
@@ -1179,8 +1179,6 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/dbacl-icheck-multiple-definitions.patch \
|
||||
%D%/packages/patches/dblatex-inkscape-1.0.patch \
|
||||
%D%/packages/patches/dbus-helper-search-path.patch \
|
||||
%D%/packages/patches/dbus-c++-gcc-compat.patch \
|
||||
%D%/packages/patches/dbus-c++-threading-mutex.patch \
|
||||
%D%/packages/patches/ddd-build.patch \
|
||||
%D%/packages/patches/debops-setup-py-avoid-git.patch \
|
||||
%D%/packages/patches/dee-vapi.patch \
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
Fix a string comparison in C++ 11.
|
||||
|
||||
Taken from Debian:
|
||||
https://sources.debian.org/src/dbus-c++/0.9.0-8.1/debian/patches/06_fix_gcc-7_ftbfs.patch/
|
||||
|
||||
--- a/src/pipe.cpp
|
||||
+++ b/src/pipe.cpp
|
||||
@@ -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,37 +0,0 @@
|
||||
Description: Fix FTBFS if DBUS_HAS_RECURSIVE_MUTEX is undefined
|
||||
Author: Peter Williams <peter@newton.cx>
|
||||
Last-Update: 2018-01-26
|
||||
|
||||
Taken from Debian:
|
||||
https://sources.debian.org/src/dbus-c++/0.9.0-8.1/debian/patches/07_fix_mutex_ftbfs.patch/
|
||||
|
||||
--- dbus-c++-0.9.0.orig/include/dbus-c++/dispatcher.h
|
||||
+++ dbus-c++-0.9.0/include/dbus-c++/dispatcher.h
|
||||
@@ -267,6 +267,19 @@ struct Threading
|
||||
return new Mx;
|
||||
}
|
||||
|
||||
+#ifndef DBUS_HAS_RECURSIVE_MUTEX
|
||||
+ static bool mutex_free(Mutex *mx)
|
||||
+ {
|
||||
+ delete mx;
|
||||
+ return true;
|
||||
+ }
|
||||
+
|
||||
+ static bool mutex_lock(Mutex *mx)
|
||||
+ {
|
||||
+ mx->lock();
|
||||
+ return true;
|
||||
+ }
|
||||
+#else
|
||||
static void mutex_free(Mutex *mx)
|
||||
{
|
||||
delete mx;
|
||||
@@ -276,6 +289,7 @@ struct Threading
|
||||
{
|
||||
mx->lock();
|
||||
}
|
||||
+#endif
|
||||
|
||||
static void mutex_unlock(Mutex *mx)
|
||||
{
|
||||
Reference in New Issue
Block a user