diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-07-16 10:11:47 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2005-07-16 10:11:47 +0000 |
| commit | 8b09c2b86eaeb78295d8f6d0037ff97722356bb5 (patch) | |
| tree | 1bb191cc4ce15f09d9ad2b27cdcc1557dccfb605 /app-admin/gamin | |
| parent | Remove fbsd patch for now. (diff) | |
| download | gentoo-2-8b09c2b86eaeb78295d8f6d0037ff97722356bb5.tar.gz gentoo-2-8b09c2b86eaeb78295d8f6d0037ff97722356bb5.tar.bz2 gentoo-2-8b09c2b86eaeb78295d8f6d0037ff97722356bb5.zip | |
Updated freebsd patch to build fine on GLIBC systems, too.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'app-admin/gamin')
| -rw-r--r-- | app-admin/gamin/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/gamin/files/gamin-0.1.2-freebsd.patch | 25 | ||||
| -rw-r--r-- | app-admin/gamin/gamin-0.1.2.ebuild | 4 |
3 files changed, 25 insertions, 10 deletions
diff --git a/app-admin/gamin/ChangeLog b/app-admin/gamin/ChangeLog index a159571b9480..9c6b62a37c03 100644 --- a/app-admin/gamin/ChangeLog +++ b/app-admin/gamin/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/gamin # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/ChangeLog,v 1.25 2005/07/16 10:09:51 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/ChangeLog,v 1.26 2005/07/16 10:11:47 flameeyes Exp $ + + 16 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> + files/gamin-0.1.2-freebsd.patch: + Updated freebsd patch to build fine on GLIBC systems, too. 16 Jul 2005; Martin Schlemmer <azarah@gentoo.org> gamin-0.1.2.ebuild: Remove fbsd patch for now. diff --git a/app-admin/gamin/files/gamin-0.1.2-freebsd.patch b/app-admin/gamin/files/gamin-0.1.2-freebsd.patch index 39ad8c485847..67cb6bd499e7 100644 --- a/app-admin/gamin/files/gamin-0.1.2-freebsd.patch +++ b/app-admin/gamin/files/gamin-0.1.2-freebsd.patch @@ -1,4 +1,4 @@ -diff -ur gamin-0.1.2/libgamin/gam_api.c gamin-0.1.2-fbsd/libgamin/gam_api.c +diff -ur -x '*~' gamin-0.1.2/libgamin/gam_api.c gamin-0.1.2-fbsd/libgamin/gam_api.c --- gamin-0.1.2/libgamin/gam_api.c 2005-06-15 12:53:25.000000000 +0200 +++ gamin-0.1.2-fbsd/libgamin/gam_api.c 2005-07-16 00:15:37.317345328 +0200 @@ -421,7 +421,7 @@ @@ -29,10 +29,21 @@ diff -ur gamin-0.1.2/libgamin/gam_api.c gamin-0.1.2-fbsd/libgamin/gam_api.c { int on = 1; Only in gamin-0.1.2-fbsd/libgamin: gam_api.c.orig -diff -ur gamin-0.1.2/libgamin/gam_data.c gamin-0.1.2-fbsd/libgamin/gam_data.c +diff -ur -x '*~' gamin-0.1.2/libgamin/gam_data.c gamin-0.1.2-fbsd/libgamin/gam_data.c --- gamin-0.1.2/libgamin/gam_data.c 2005-05-18 16:45:04.000000000 +0200 -+++ gamin-0.1.2-fbsd/libgamin/gam_data.c 2005-07-16 00:15:37.321344720 +0200 -@@ -471,7 +471,7 @@ ++++ gamin-0.1.2-fbsd/libgamin/gam_data.c 2005-07-16 12:06:58.586806112 +0200 +@@ -17,6 +17,10 @@ + #ifdef HAVE_PTHREAD_H + #include <pthread.h> + ++# ifdef __GLIBC__ ++# define PTHREAD_MUTEX_RECURSIVE PTHREAD_MUTEX_RECURSIVE_NP ++# endif ++ + static int is_threaded = -1; + #endif + +@@ -471,7 +475,7 @@ } if (is_threaded > 0) { pthread_mutexattr_init(&attr); @@ -41,7 +52,7 @@ diff -ur gamin-0.1.2/libgamin/gam_data.c gamin-0.1.2-fbsd/libgamin/gam_data.c pthread_mutex_init(&ret->lock, &attr); pthread_mutexattr_destroy(&attr); } -diff -ur gamin-0.1.2/server/gam_channel.c gamin-0.1.2-fbsd/server/gam_channel.c +diff -ur -x '*~' gamin-0.1.2/server/gam_channel.c gamin-0.1.2-fbsd/server/gam_channel.c --- gamin-0.1.2/server/gam_channel.c 2005-06-15 13:02:34.000000000 +0200 +++ gamin-0.1.2-fbsd/server/gam_channel.c 2005-07-16 00:15:37.326343960 +0200 @@ -29,7 +29,7 @@ @@ -71,7 +82,7 @@ diff -ur gamin-0.1.2/server/gam_channel.c gamin-0.1.2-fbsd/server/gam_channel.c /* Set the socket to receive credentials on the next message */ { int on = 1; -diff -ur gamin-0.1.2/server/gam_connection.c gamin-0.1.2-fbsd/server/gam_connection.c +diff -ur -x '*~' gamin-0.1.2/server/gam_connection.c gamin-0.1.2-fbsd/server/gam_connection.c --- gamin-0.1.2/server/gam_connection.c 2005-06-14 14:31:19.000000000 +0200 +++ gamin-0.1.2-fbsd/server/gam_connection.c 2005-07-16 00:15:37.332343048 +0200 @@ -30,10 +30,7 @@ @@ -95,7 +106,7 @@ diff -ur gamin-0.1.2/server/gam_connection.c gamin-0.1.2-fbsd/server/gam_connect *size = sizeof(GAMPacket) - conn->request_len; return (0); -diff -ur gamin-0.1.2/tests/testing.c gamin-0.1.2-fbsd/tests/testing.c +diff -ur -x '*~' gamin-0.1.2/tests/testing.c gamin-0.1.2-fbsd/tests/testing.c --- gamin-0.1.2/tests/testing.c 2005-06-13 10:59:29.000000000 +0200 +++ gamin-0.1.2-fbsd/tests/testing.c 2005-07-16 00:15:37.337342288 +0200 @@ -436,9 +436,9 @@ diff --git a/app-admin/gamin/gamin-0.1.2.ebuild b/app-admin/gamin/gamin-0.1.2.ebuild index 4b5e6b431e5f..a371fbe50979 100644 --- a/app-admin/gamin/gamin-0.1.2.ebuild +++ b/app-admin/gamin/gamin-0.1.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/gamin-0.1.2.ebuild,v 1.3 2005/07/16 10:09:51 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/gamin/gamin-0.1.2.ebuild,v 1.4 2005/07/16 10:11:47 flameeyes Exp $ inherit eutils libtool @@ -27,7 +27,7 @@ src_unpack() { cd ${S} # Fixup FreeBSD support, bug #99158 -# epatch ${FILESDIR}/${P}-freebsd.patch + epatch ${FILESDIR}/${P}-freebsd.patch # Add support for legacy inotify interface epatch ${FILESDIR}/${P}-inotify-legacy-backend.patch |