# ChangeLog for dev-libs/libgamin
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/ChangeLog,v 1.26 2011/07/11 04:16:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/ChangeLog,v 1.27 2011/09/25 16:25:55 pacho Exp $
+
+ 25 Sep 2011; Pacho Ramos <pacho@gentoo.org> libgamin-0.1.10-r2.ebuild,
+ +files/libgamin-0.1.10-G_CONST_RETURN-removal.patch,
+ +files/libgamin-0.1.10-armel-features.patch,
+ +files/libgamin-0.1.10-crosscompile-fix.patch:
+ Fix compilation with latest glib, bug #382783 by Maciej Piechotka; fix
+ crosscompilation issues, bug #267604 by Andrei Slavoiu; enable linux specific
+ features on armel, upstream bug #588338; drop DG_DISABLE_DEPRECATED; don't
+ try to even check for python, simplifying ebuild for people running python3
+ as main interpreter; use gnome.org eclass to set SRC_URI and use bz2 tarball
+ instead of gz.
11 Jul 2011; Samuli Suominen <ssuominen@gentoo.org>
libgamin-0.1.10-r2.ebuild:
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
+AUX libgamin-0.1.10-G_CONST_RETURN-removal.patch 2470 RMD160 c268dc79478f01dae6efb0af1e5b7c65adfaa9d6 SHA1 2823cda93c1587232d28e656875af1519ad1a2cd SHA256 adddd1f54bb33669d9163398308ebb732f33b6c12b1363a0dcf765ff28fc30ad
+AUX libgamin-0.1.10-armel-features.patch 1490 RMD160 14aed4cfd34d0330ff934332b18da50e415cc844 SHA1 675b8820e81938cc17c7dc7563f395e1fc2fdfb0 SHA256 6b6faf3084ca2ddf577575395172901d637a96e5db8dd42bc5268d58a767d30e
AUX libgamin-0.1.10-compilewarnings.patch 526 RMD160 b460c5b724a36934c5e4a411a3d5e6d5a8f820ef SHA1 8358f05948018bfd46b752f76006f5272f5f9385 SHA256 dfca2bee08ba14c873a6bcd732359dd7e3a9372d6d9fb82378194d7a73a30e68
+AUX libgamin-0.1.10-crosscompile-fix.patch 764 RMD160 14125504c9fdbff416e4fce389c15e96ba3015ab SHA1 b89bb0c5859bef266f6ac368a3f6cec9224ebff6 SHA256 27e92227c19a6ae61336f66cefe7d44fca43fe7e0c8122fe32c313b4d848f28c
AUX libgamin-0.1.10-disable_python_static_library.patch 340 RMD160 9e479b3483d658efdeff40f92e3a405568467623 SHA1 c7378e36fe7a15ba92fbef45c57515e922d3bb52 SHA256 460306119bc6be6fd19d173eadfa28493fc72e90fceaf3ee49b50fee50a4f5d1
AUX libgamin-0.1.10-noinst-lib.patch 2207 RMD160 f0d2479f5aec3ef8852a36214c168ef560de3594 SHA1 544895f7345413c5314b4d5892492e7b27c8eb6b SHA256 e19ede71d259fbe5888c06635441365a48687034b24c5f15edd808a7cbd9cdc7
-DIST gamin-0.1.10.tar.gz 653392 RMD160 fb6ba5ec2d2f49afacf10dda4095f02f5930d686 SHA1 f4c6b9fe87757552ef58fef4abef9e42cd3142ac SHA256 28085f0ae8be10eab582ff186af4fb0be92cc6c62b5cc19cd09b295c7c2899a1
+DIST gamin-0.1.10.tar.bz2 452194 RMD160 6524915876be79b19060571e01ee6a472ed1adee SHA1 c4d5462d8cef5e412f55861bd317dcce5cac3318 SHA256 a59948b20ce2f14136c013f155abb8c8d51db2ea167c063ff33461e453fec10a
DIST gamin-0.1.9-freebsd.patch.bz2 4635 RMD160 9f53abfcb9e785e9408cb8f1d35ff36fb739d878 SHA1 3d276802bbab47885dfcba0bbe6422711c84e676 SHA256 fcd1a6655d1c7cd86db6102931a4da1c22bc85f1c4692959c1a966fec5231723
DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52d0 SHA1 fd71a70b023b9087c8a7bb76a0dc135a61059652 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af
-EBUILD libgamin-0.1.10-r2.ebuild 3153 RMD160 6837da9d626d1c0f413ee31d2e380e20d4fe9478 SHA1 272bef989315263ded2552455dff3353d36f1266 SHA256 4a0dc1f3602dd31e4aaf2d82d25e1c35e4434667f6b1d2de8d617ed8889f8ca2
-MISC ChangeLog 3801 RMD160 8c0c2aef1eb3d4bdeea1dde8a9a7547d4a6ba896 SHA1 d18935f1b7d5d3c0aa5515c0ac88dd4dcb51b075 SHA256 3c6d26bdc5e655963223d2f0f1674c5641f79843641c08505fe104a24c2eb366
+EBUILD libgamin-0.1.10-r2.ebuild 3523 RMD160 6af2033cfa5fd478ff60cd99f0872e429b050636 SHA1 964b51c4e5d9b3adb3e0011f169b565de9e2bedc SHA256 b111026a21fe29dd6bbc5426ee32cd0dada3f0c7cff8b186188554c935b06147
+MISC ChangeLog 4426 RMD160 8cb6de53a4c31007bdf6137d231092c876c54c39 SHA1 8d6f653c4768ac61a9c85094b57aa5867065f705 SHA256 69863d7215c2e44c977579d988aa27d2f5f2ba2eb8984e16edfd5482755c9c45
MISC metadata.xml 234 RMD160 bd496dac30573bf707591b2b2ad497860e5aa029 SHA1 4641c1e70e35e944e7019aeae967deb1d2c28186 SHA256 3018e3b31ed690a57bfc14e35699dd20ea3b352fc28b918f699e6955b57a2d97
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iF4EAREIAAYFAk4aeMcACgkQXkR9YqOcLPHcfwD9EvdaRAqy3ftdNxc20SAorVLg
-LVctQzfTfrUygAQyHz4BAI0c2eZD7+iM+PLjB2r7BwA15DNzWtVidCOT3f7ELG+C
-=rn1u
+iEYEARECAAYFAk5/VhkACgkQCaWpQKGI+9S9dgCfZcOcpsptRjHz6zKYAR95PcW9
++CsAni/XFJ4Fad5rRcS3CUg1fbA65ESj
+=ghbJ
-----END PGP SIGNATURE-----
--- /dev/null
+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
+
--- /dev/null
+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
--- /dev/null
+--- 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)
+
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild,v 1.13 2011/07/11 04:16:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgamin/libgamin-0.1.10-r2.ebuild,v 1.14 2011/09/25 16:25:55 pacho Exp $
-EAPI=2
+EAPI="3"
PYTHON_DEPEND="python? 2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.*"
+GNOME_ORG_MODULE="gamin"
-inherit autotools eutils flag-o-matic libtool python
-
-MY_PN=${PN//lib/}
-MY_P=${MY_PN}-${PV}
+inherit autotools eutils flag-o-matic libtool python gnome.org
DESCRIPTION="Library providing the FAM File Alteration Monitor API"
HOMEPAGE="http://www.gnome.org/~veillard/gamin/"
-SRC_URI="http://www.gnome.org/~veillard/${MY_PN}/sources/${MY_P}.tar.gz
- mirror://gentoo/${MY_PN}-0.1.9-freebsd.patch.bz2
+SRC_URI="${SRC_URI}
+ mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2
http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz" # pkg.m4 for eautoreconf
LICENSE="LGPL-2"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
IUSE="debug kernel_linux python static-libs"
-RESTRICT="test" # need gam-server
+RESTRICT="test" # needs gam-server
RDEPEND="!app-admin/fam
!<app-admin/gamin-0.1.10"
DEPEND="${RDEPEND}"
-S=${WORKDIR}/${MY_P}
-
pkg_setup() {
if use python; then
python_pkg_setup
mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
# Fix QA warnings, bug #257281, upstream #466791
- epatch "${FILESDIR}"/${P}-compilewarnings.patch
+ epatch "${FILESDIR}"/${PN}-0.1.10-compilewarnings.patch
# Fix compile warnings; bug #188923
- epatch "${DISTDIR}"/${MY_PN}-0.1.9-freebsd.patch.bz2
+ epatch "${DISTDIR}"/gamin-0.1.9-freebsd.patch.bz2
# Fix collision problem due to intermediate library, upstream bug #530635
- epatch "${FILESDIR}"/${P}-noinst-lib.patch
+ 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"
+
+ # Drop DEPRECATED flags
+ sed -i -e 's:-DG_DISABLE_DEPRECATED:$(NULL):g' server/Makefile.am || die
# Build only shared version of Python module.
- epatch "${FILESDIR}"/${P}-disable_python_static_library.patch
+ epatch "${FILESDIR}"/${PN}-0.1.10-disable_python_static_library.patch
# Python bindings are built/installed manually.
sed -e "/SUBDIRS += python/d" -i Makefile.am
projects / gentoo.git / commitdiff