diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
commit | d87262dd706fec50cd150aab3e93883b6337466d (patch) | |
tree | 246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-admin/gam-server | |
parent | 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'app-admin/gam-server')
8 files changed, 0 insertions, 398 deletions
diff --git a/app-admin/gam-server/Manifest b/app-admin/gam-server/Manifest deleted file mode 100644 index 8e0dc68ac21d..000000000000 --- a/app-admin/gam-server/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -AUX gam-server-0.1.10-G_CONST_RETURN-removal.patch 2470 BLAKE2B d4676b57dc28efba8be335a50a0e8d27c65da0998f6a533cbe89f7cc166eb4a6aee2375b181fdc7596ce60677b675a8597cf177cab0b3655d425a7282f7db849 SHA512 56cf8439d64c3856cc768a0d6aa67e00e82579b0db60b1f25b195024eec1628f61013718f3139910735eafa15e05f4fabe4373ebac053778abb1c89201c6cf0c -AUX gam-server-0.1.10-armel-features.patch 1490 BLAKE2B 5fa50ed67cd357e5108db27e298f76f0b864f390a4b25d58c968697b67a46e6ad54ef4b799a448e86e44fddd61c90239745f7cbf56deb60e05371e85191fd5b1 SHA512 fe6365489428ca9206a36b8dea495d5c4beb381fe43dd49aa2fa022f8ea34d8068275ce42f41211ef7ce8bb2c1dce952673d4b2e72eec5be00161fa8f8bcb2a5 -AUX gam-server-0.1.10-crosscompile-fix.patch 764 BLAKE2B 7302b238724927ace5753b5103434533e60563e1d74d9ee9762b961d8e36ace465cb081639585dc7124be5bb0fb5c9f80832d1bfc09a3bb61869acec5abdbfca SHA512 11aca975f98d9364bfdd8e28162f922a96493012fb3c6c704115d33155b2a2e9bbd20aba64354db922f16c3589b88a07091590a5bd6aa806582b9b7875ba8e23 -AUX gam-server-0.1.10-ih_sub_cancel-deadlock.patch 2090 BLAKE2B 252b7551ca9ec48af631765ac0413c81c280c478cb9ed5b23efafc07f8c1dccd26305f4688842eed3e587c6bdc19b57c045922158026335e9c6af4abafc57287 SHA512 c0a4a318eb78b9666930e9d1a6fac5e7762f38796e5892d849c893df524310408020ea75fb02a4d79000be3440435ae640340cf2a3dd43fa031df5787762f8de -AUX gam-server-0.1.10-noinst-lib.patch 2207 BLAKE2B 28ebca731a16fb10c0f186c3eb75d731a18fd72c239a380a7bf97afacab65792003b433c9030e06c8d7748c0dabe84a92bbad8221d40c9fa9d33c6c00b0dd40d SHA512 ba7ce391f4da1a6b4c75941b8440a72f483b6f2597592f64ddca720bf46b1269e64a20a27da9c35b134100a121990d84e28ac737cffef48e90974a017ba3a4cb -DIST gamin-0.1.10.tar.bz2 452194 BLAKE2B 75537862c2b90734b616630b80103499f549fbab69f2417cc089b050a7e245d89701b0703a0916d6dc08a706785ee509ee4feed0375107f777fdf4248ff5f93b SHA512 ccdbc06eeb958ed2d888aee3fcadbadf00e9e6566802adee82035e0762ac3351ed2a2983eabe07503ddde2ddf035185c6cd98cbece2feadaaa36e8f656a38306 -DIST gamin-0.1.9-freebsd.patch.bz2 4635 BLAKE2B ea27afc7b978e15e9e957cbc1129b5bc8f0dfea7571e7bbfda981bc319929f8702d6a823bababb97af2b1da95c8403e9189c5ecaf599275e063f71d370526b89 SHA512 a9d9a8e4d85b289df6f87bf2b966ff262281db0d7e6094deb4f2c179f12c6cc3e387c1e1c28306a9fb54f2eb2837f9bdd3a34b2bb68db8abfdbecc7492e9730b -DIST pkg-config-0.26.tar.gz 396399 BLAKE2B 5a88cf825d6ad99d198418798b28c779cfd4c0bcfaa023e915a818c141a504c49a6281ea0b2d04a7a9ec89f9924c87f8b1ddaa5a088952715397081383b3528a SHA512 9390d5918dd4ac520b914d2330aa7cae2587ca7b21b03bc88372fd5dbbd78e33eeb3fca39fcdb6dd10113658f03118a1c8829149c7029eb0dd80348d100170a4 -EBUILD gam-server-0.1.10-r2.ebuild 2652 BLAKE2B 766c90d107c0133a11d97054713229138e8e1e371da59147342bf1b58b6766e9f780f6ce407c9ddd887f54f859d04332ea25fc754314223b7fd519a2376b733f SHA512 3ab8af16cd39aba455f12216dbae2c40b79e89876a8a3945bbb8b6d237b232375ec5a5379e504495090507607dbe63b671bd94ecc91fba4721402c26d38e6fd3 -MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4 diff --git a/app-admin/gam-server/files/gam-server-0.1.10-G_CONST_RETURN-removal.patch b/app-admin/gam-server/files/gam-server-0.1.10-G_CONST_RETURN-removal.patch deleted file mode 100644 index 087312f5baae..000000000000 --- a/app-admin/gam-server/files/gam-server-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/app-admin/gam-server/files/gam-server-0.1.10-armel-features.patch b/app-admin/gam-server/files/gam-server-0.1.10-armel-features.patch deleted file mode 100644 index fdfcbd7e6db6..000000000000 --- a/app-admin/gam-server/files/gam-server-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/app-admin/gam-server/files/gam-server-0.1.10-crosscompile-fix.patch b/app-admin/gam-server/files/gam-server-0.1.10-crosscompile-fix.patch deleted file mode 100644 index ce3a15b5e160..000000000000 --- a/app-admin/gam-server/files/gam-server-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/app-admin/gam-server/files/gam-server-0.1.10-ih_sub_cancel-deadlock.patch b/app-admin/gam-server/files/gam-server-0.1.10-ih_sub_cancel-deadlock.patch deleted file mode 100644 index 9f2b2a5150bd..000000000000 --- a/app-admin/gam-server/files/gam-server-0.1.10-ih_sub_cancel-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/app-admin/gam-server/files/gam-server-0.1.10-noinst-lib.patch b/app-admin/gam-server/files/gam-server-0.1.10-noinst-lib.patch deleted file mode 100644 index 1f2fcff6f5b4..000000000000 --- a/app-admin/gam-server/files/gam-server-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 - diff --git a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild deleted file mode 100644 index 856dcad4185f..000000000000 --- a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -GNOME_ORG_MODULE="gamin" -GNOME_TARBALL_SUFFIX="bz2" - -inherit autotools eutils flag-o-matic libtool multilib gnome.org - -DESCRIPTION="Library providing the FAM File Alteration Monitor API" -HOMEPAGE="https://www.gnome.org/~veillard/gamin/" -SRC_URI="${SRC_URI} - mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 - https://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-solaris" -IUSE="debug kernel_linux" - -RDEPEND=">=dev-libs/glib-2:2 - >=dev-libs/libgamin-0.1.10 - !app-admin/fam - !<app-admin/gamin-0.1.10" - -DEPEND="${RDEPEND}" - -#S=${WORKDIR}/${MY_P} - -src_prepare() { - mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die - - # Fix compile warnings; bug #188923 - epatch "${DISTDIR}/gamin-0.1.9-freebsd.patch.bz2" - - # Fix file-collision due to shared library, upstream bug #530635 - epatch "${FILESDIR}/${PN}-0.1.10-noinst-lib.patch" - - # Fix compilation with latest glib, bug #382783 - epatch "${FILESDIR}/${PN}-0.1.10-G_CONST_RETURN-removal.patch" - - # Fix crosscompilation issues, bug #267604 - epatch "${FILESDIR}/${PN}-0.1.10-crosscompile-fix.patch" - - # Enable linux specific features on armel, upstream bug #588338 - epatch "${FILESDIR}/${P}-armel-features.patch" - - # Fix deadlocks with glib-2.32, bug #413331, upstream #667230 - epatch "${FILESDIR}/${P}-ih_sub_cancel-deadlock.patch" - - # Drop DEPRECATED flags - sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die - - sed -i \ - -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \ - -e 's:AM_PROG_CC_STDC:AC_PROG_CC:' \ - configure.in || die #466948 - - # autoconf is required as the user-cflags patch modifies configure.in - # however, elibtoolize is also required, so when the above patch is - # removed, replace the following call with a call to elibtoolize - AT_M4DIR="${WORKDIR}" eautoreconf -} - -src_configure() { - # fixes bug 225403 - #append-flags "-D_GNU_SOURCE" - - # Solaris' patchs adds this to configure, but it conflicts with - # Gentoo's FreeBSD patch. - [[ ${CHOST} == *-solaris* ]] && append-libs socket nsl - - if ! has_version virtual/pkgconfig; then - export DAEMON_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include" - export DAEMON_LIBS="-lglib-2.0" - fi - - econf \ - --disable-debug \ - --disable-libgamin \ - --without-python \ - $(use_enable kernel_linux inotify) \ - $(use_enable debug debug-api) -} - -src_install() { - emake DESTDIR="${D}" install || die -} diff --git a/app-admin/gam-server/metadata.xml b/app-admin/gam-server/metadata.xml deleted file mode 100644 index f3cab85cf603..000000000000 --- a/app-admin/gam-server/metadata.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>freedesktop-bugs@gentoo.org</email> - </maintainer> -</pkgmetadata> |