summaryrefslogtreecommitdiff
path: root/dev-libs/libgamin/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:57:42 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:57:42 +0100
commit1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch)
treee48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-libs/libgamin/files
parentd87262dd706fec50cd150aab3e93883b6337466d (diff)
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/libgamin/files')
-rw-r--r--dev-libs/libgamin/files/libgamin-0.1.10-G_CONST_RETURN-removal.patch67
-rw-r--r--dev-libs/libgamin/files/libgamin-0.1.10-armel-features.patch47
-rw-r--r--dev-libs/libgamin/files/libgamin-0.1.10-compilewarnings.patch22
-rw-r--r--dev-libs/libgamin/files/libgamin-0.1.10-crosscompile-fix.patch38
-rw-r--r--dev-libs/libgamin/files/libgamin-0.1.10-deadlock.patch65
-rw-r--r--dev-libs/libgamin/files/libgamin-0.1.10-disable_python_static_library.patch13
-rw-r--r--dev-libs/libgamin/files/libgamin-0.1.10-noinst-lib.patch76
7 files changed, 0 insertions, 328 deletions
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-G_CONST_RETURN-removal.patch b/dev-libs/libgamin/files/libgamin-0.1.10-G_CONST_RETURN-removal.patch
deleted file mode 100644
index 087312f5baae..000000000000
--- a/dev-libs/libgamin/files/libgamin-0.1.10-G_CONST_RETURN-removal.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 2a9d32734a2e5125ae77de6c75789e1c6ee24dbe Mon Sep 17 00:00:00 2001
-From: Maciej Piechotka <uzytkownik2@gmail.com>
-Date: Tue, 13 Sep 2011 09:47:05 +0200
-Subject: [PATCH] Fix compilation of recent glib removing G_CONST_RETURN
-
----
- server/gam_node.c | 2 +-
- server/gam_node.h | 2 +-
- server/gam_subscription.c | 2 +-
- server/gam_subscription.h | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/server/gam_node.c b/server/gam_node.c
-index 02358ba..d0302d2 100644
---- a/server/gam_node.c
-+++ b/server/gam_node.c
-@@ -122,7 +122,7 @@ gam_node_set_is_dir(GamNode * node, gboolean is_dir)
- * it has finished with the string. If it must keep it longer, it
- * should makes its own copy. The returned string must not be freed.
- */
--G_CONST_RETURN char *
-+const char *
- gam_node_get_path(GamNode * node)
- {
- g_assert(node);
-diff --git a/server/gam_node.h b/server/gam_node.h
-index 02c8692..83349a8 100644
---- a/server/gam_node.h
-+++ b/server/gam_node.h
-@@ -58,7 +58,7 @@ gboolean gam_node_is_dir (GamNode *node);
- void gam_node_set_is_dir (GamNode *node,
- gboolean is_dir);
-
--G_CONST_RETURN char *gam_node_get_path (GamNode *node);
-+const char *gam_node_get_path (GamNode *node);
-
- GList *gam_node_get_subscriptions (GamNode *node);
-
-diff --git a/server/gam_subscription.c b/server/gam_subscription.c
-index dfa3273..4675b34 100644
---- a/server/gam_subscription.c
-+++ b/server/gam_subscription.c
-@@ -141,7 +141,7 @@ gam_subscription_pathlen(GamSubscription * sub)
- * @param sub the GamSubscription
- * @returns The path being monitored. It should not be freed.
- */
--G_CONST_RETURN char *
-+const char *
- gam_subscription_get_path(GamSubscription * sub)
- {
- if (sub == NULL)
-diff --git a/server/gam_subscription.h b/server/gam_subscription.h
-index d894fbe..e6b4e15 100644
---- a/server/gam_subscription.h
-+++ b/server/gam_subscription.h
-@@ -21,7 +21,7 @@ int gam_subscription_pathlen (GamSubscription *sub);
-
- int gam_subscription_get_reqno (GamSubscription *sub);
-
--G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub);
-+const char *gam_subscription_get_path (GamSubscription *sub);
-
- GamListener *gam_subscription_get_listener (GamSubscription *sub);
-
---
-1.7.6.1
-
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-armel-features.patch b/dev-libs/libgamin/files/libgamin-0.1.10-armel-features.patch
deleted file mode 100644
index fdfcbd7e6db6..000000000000
--- a/dev-libs/libgamin/files/libgamin-0.1.10-armel-features.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 05dcfcd69848e119c6a30d363bc41e896029f8af Mon Sep 17 00:00:00 2001
-From: Sebastian Dröge <slomo@debian.org>
-Date: Tue, 15 Dec 2009 12:24:25 +0000
-Subject: Bug 588338 - Enable linux specific features on armel
-
----
-diff --git a/configure.in b/configure.in
-index b0bbaec..e4b684e 100644
---- a/configure.in
-+++ b/configure.in
-@@ -176,7 +176,7 @@ fi
-
- dnl check what OS we're on
- #AM_CONDITIONAL(HAVE_LINUX, test x$target_os = xlinux-gnu)
--if test x$target_os = xlinux-gnu; then
-+if test x$target_os = xlinux-gnu -o x$target_os = xlinux-gnueabi; then
- AC_DEFINE([HAVE_LINUX],[],[Whether we are using linux or not])
- fi
-
-@@ -223,7 +223,7 @@ fi
- dnl check if inotify backend is enabled
- AM_CONDITIONAL(ENABLE_INOTIFY, test x$inotify = xtrue)
-
--if test x$os = xlinux-gnu; then
-+if test x$os = xlinux-gnu -o x$os = xlinux-gnueabi; then
- AC_ARG_ENABLE(dnotify,
- AC_HELP_STRING([--disable-dnotify], [Disable the DNotify backend]),
- [dnotify="${enableval}"], [dnotify=true])
-@@ -297,10 +297,12 @@ else
- fi
-
- dnl Use weak symbols on linux/gcc to avoid imposing libpthreads to apps
--if test x$os = xlinux-gnu -a x$WITH_THREADS = x1 ; then
-- if test "${CC}" = "gcc" ; then
-- echo Use weak symbols !
-- THREAD_LIBS=
-+if test x$os = xlinux-gnu -o x$os = xlinux-gnueabi ; then
-+ if test x$WITH_THREADS = x1 ; then
-+ if test "${CC}" = "gcc" ; then
-+ echo Use weak symbols !
-+ THREAD_LIBS=
-+ fi
- fi
- fi
- AC_SUBST(THREAD_LIBS)
---
-cgit v0.9.0.2
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-compilewarnings.patch b/dev-libs/libgamin/files/libgamin-0.1.10-compilewarnings.patch
deleted file mode 100644
index d3e0931391a7..000000000000
--- a/dev-libs/libgamin/files/libgamin-0.1.10-compilewarnings.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gamin-0.1.9/lib/gam_error.h.1 2007-08-15 01:09:13.000000000 +0200
-+++ gamin-0.1.9/lib/gam_error.h 2007-08-15 01:09:27.000000000 +0200
-@@ -47,6 +47,9 @@
-
- int gam_errno(void);
-
-+void gam_error_init(void);
-+void gam_error_check(void);
-+
- #ifdef GAM_DEBUG_ENABLED
-
- #ifdef GAMIN_DEBUG_API
-@@ -70,9 +73,6 @@
- const char* format, ...);
- #define GAM_DEBUG if (gam_debug_active) gam_debug
-
--void gam_error_init(void);
--void gam_error_check(void);
--
- #else
- /*
- * no debug, redefine the macro empty content
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-crosscompile-fix.patch b/dev-libs/libgamin/files/libgamin-0.1.10-crosscompile-fix.patch
deleted file mode 100644
index ce3a15b5e160..000000000000
--- a/dev-libs/libgamin/files/libgamin-0.1.10-crosscompile-fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- configure.in.orig 2009-04-26 23:00:43.445135823 +0300
-+++ configure.in 2009-04-26 23:25:04.042489243 +0300
-@@ -389,8 +389,7 @@
-
- AC_MSG_CHECKING(abstract socket namespace)
- AC_LANG_PUSH(C)
--AC_RUN_IFELSE([AC_LANG_PROGRAM(
--[[
-+AC_TRY_RUN([
- #include <sys/types.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -398,8 +397,8 @@
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <errno.h>
--]],
--[[
-+
-+int main() {
- int listen_fd;
- struct sockaddr_un addr;
-
-@@ -424,9 +423,11 @@
- }
- else
- exit (0);
--]])],
-- [have_abstract_sockets=yes],
-- [have_abstract_sockets=no])
-+}
-+],
-+have_abstract_sockets=yes,
-+have_abstract_sockets=no,
-+have_abstract_sockets=no)
- AC_LANG_POP(C)
- AC_MSG_RESULT($have_abstract_sockets)
-
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-deadlock.patch b/dev-libs/libgamin/files/libgamin-0.1.10-deadlock.patch
deleted file mode 100644
index 9f2b2a5150bd..000000000000
--- a/dev-libs/libgamin/files/libgamin-0.1.10-deadlock.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From cc14440eface093548cb3bc7814da11d9a99d283 Mon Sep 17 00:00:00 2001
-From: Anssi Hannula <anssi@mageia.org>
-Date: Wed, 4 Jan 2012 00:23:55 +0200
-Subject: [PATCH] fix possible server deadlock in ih_sub_cancel
-
-ih_sub_foreach() calls ih_sub_cancel() while inotify_lock is locked.
-However, ih_sub_cancel() locks it again, and locking GMutex recursively
-causes undefined behaviour.
-
-Fix that by removing locking from ih_sub_cancel() as ih_sub_foreach()
-is its only user. Also make the function static so that it won't
-accidentally get used by other files without locking (inotify-helper.h
-is an internal server header).
-
-This should fix the intermittent deadlocks I've been experiencing
-causing KDE applications to no longer start, and probably also
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361
----
- server/inotify-helper.c | 7 ++-----
- server/inotify-helper.h | 1 -
- 2 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/server/inotify-helper.c b/server/inotify-helper.c
-index d77203e..0789fa4 100644
---- a/server/inotify-helper.c
-+++ b/server/inotify-helper.c
-@@ -123,13 +123,11 @@ ih_sub_add (ih_sub_t * sub)
-
- /**
- * Cancels a subscription which was being monitored.
-+ * inotify_lock must be held when calling.
- */
--gboolean
-+static gboolean
- ih_sub_cancel (ih_sub_t * sub)
- {
-- G_LOCK(inotify_lock);
--
--
- if (!sub->cancelled)
- {
- IH_W("cancelling %s\n", sub->pathname);
-@@ -140,7 +138,6 @@ ih_sub_cancel (ih_sub_t * sub)
- sub_list = g_list_remove (sub_list, sub);
- }
-
-- G_UNLOCK(inotify_lock);
- return TRUE;
- }
-
-diff --git a/server/inotify-helper.h b/server/inotify-helper.h
-index 5d3b6d0..d36b5fd 100644
---- a/server/inotify-helper.h
-+++ b/server/inotify-helper.h
-@@ -34,7 +34,6 @@ gboolean ih_startup (event_callback_t ecb,
- found_callback_t fcb);
- gboolean ih_running (void);
- gboolean ih_sub_add (ih_sub_t *sub);
--gboolean ih_sub_cancel (ih_sub_t *sub);
-
- /* Return FALSE from 'f' if the subscription should be cancelled */
- void ih_sub_foreach (void *callerdata, gboolean (*f)(ih_sub_t *sub, void *callerdata));
---
-1.7.7.2
-
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-disable_python_static_library.patch b/dev-libs/libgamin/files/libgamin-0.1.10-disable_python_static_library.patch
deleted file mode 100644
index 562fc071eac7..000000000000
--- a/dev-libs/libgamin/files/libgamin-0.1.10-disable_python_static_library.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- python/Makefile.am
-+++ python/Makefile.am
-@@ -10,8 +10,9 @@
- python_LTLIBRARIES = _gamin.la
-
- _gamin_la_SOURCES = gamin.c
-+_gamin_la_CFLAGS = -shared
- _gamin_la_LIBADD = $(top_builddir)/libgamin/libgamin-1.la
--_gamin_la_LDFLAGS = -module -avoid-version
-+_gamin_la_LDFLAGS = -module -avoid-version -shared
-
- python_PYTHON = gamin.py
-
diff --git a/dev-libs/libgamin/files/libgamin-0.1.10-noinst-lib.patch b/dev-libs/libgamin/files/libgamin-0.1.10-noinst-lib.patch
deleted file mode 100644
index 1f2fcff6f5b4..000000000000
--- a/dev-libs/libgamin/files/libgamin-0.1.10-noinst-lib.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From e68aacc084d65fd0780991265444061b24422bd0 Mon Sep 17 00:00:00 2001
-From: Remi Cardona <remi@gentoo.org>
-Date: Mon, 20 Oct 2008 19:17:36 +0200
-Subject: [PATCH] make libgamin_shared a "noinst" libtool helper lib
-
----
- lib/Makefile.am | 4 ++--
- libgamin/Makefile.am | 15 ++-------------
- server/Makefile.am | 2 +-
- 3 files changed, 5 insertions(+), 16 deletions(-)
-
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index 3e2289c..af2152a 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -7,9 +7,9 @@ if GAMIN_DEBUG
- INCLUDES += -DGAM_DEBUG_ENABLED
- endif
-
--lib_LIBRARIES = libgamin_shared.a
-+noinst_LTLIBRARIES = libgamin_shared.la
-
--libgamin_shared_a_SOURCES = \
-+libgamin_shared_la_SOURCES = \
- gam_event.c \
- gam_event.h \
- gam_error.c \
-diff --git a/libgamin/Makefile.am b/libgamin/Makefile.am
-index 35aa740..14fc06b 100644
---- a/libgamin/Makefile.am
-+++ b/libgamin/Makefile.am
-@@ -25,19 +25,9 @@ libgamin_1_la_SOURCES = \
- gam_data.h \
- gam_fork.c \
- gam_fork.h \
-- gam_protocol.h \
-- gam_error.c \
-- gam_event.c
-+ gam_protocol.h
-
--gam_error.c: $(top_srcdir)/lib/gam_error.c
-- @(cp $(top_srcdir)/lib/gam_error.c gam_error.c)
--
--gam_event.c: $(top_srcdir)/lib/gam_event.c
-- @(cp $(top_srcdir)/lib/gam_event.c gam_event.c)
--
--CLEANFILES=gam_error.c gam_event.c
--
--libgamin_1_la_LIBADD =
-+libgamin_1_la_LIBADD = $(top_builddir)/lib/libgamin_shared.la
-
- libgamin_1_la_LDFLAGS = -Wl,--version-script=$(srcdir)/gamin_sym.version \
- -version-info @GAMIN_VERSION_INFO@ @THREAD_LIBS@
-@@ -54,6 +44,5 @@ noinst_PROGRAMS= gamin
-
- gamin_SOURCES = gamin.c
- gamin_LDFLAGS =
--gamin_DEPENDENCIES = $(DEPS) libgamin-1.la
- gamin_LDADD= $(LDADDS) libgamin-1.la
-
-diff --git a/server/Makefile.am b/server/Makefile.am
-index 37aed8b..6aa5e02 100644
---- a/server/Makefile.am
-+++ b/server/Makefile.am
-@@ -80,7 +80,7 @@ endif
-
- gam_server_LDFLAGS =
- gam_server_DEPENDENCIES = $(DEPS)
--gam_server_LDADD= $(top_builddir)/lib/libgamin_shared.a $(LDADDS) $(DAEMON_LIBS)
-+gam_server_LDADD= $(top_builddir)/lib/libgamin_shared.la $(LDADDS) $(DAEMON_LIBS)
-
- if ENABLE_HURD_MACH_NOTIFY
- gam_server_LDADD += -lports -lthreads
---
-1.6.0.2
-