Merge pull request #2915 from pullmoll/eog

eog: unbreak musl w/ libtool>=2.4.6
This commit is contained in:
Enno Boland 2015-11-07 00:19:31 +01:00
commit 7581a1e34d
2 changed files with 17 additions and 3 deletions

View File

@ -0,0 +1,14 @@
In musl libc _XOPEN_SOURCE is already defined in <features.h>
--- src/eog-util.c 2015-09-28 14:46:13.000000000 +0200
+++ src/eog-util.c 2015-11-06 16:15:18.389300086 +0100
@@ -28,7 +28,9 @@
#include <sys/time.h>
#ifdef HAVE_STRPTIME
+#ifndef _XOPEN_SOURCE
#define _XOPEN_SOURCE
+#endif
#endif /* HAVE_STRPTIME */
#include <time.h>

View File

@ -1,13 +1,13 @@
# Template file for 'eog'
pkgname=eog
version=3.18.0
revision=1
revision=2
lib32disabled=yes
build_style=gnu-configure
build_options="gir"
configure_args="$(vopt_enable gir introspection)"
hostmakedepends="pkg-config intltool gnome-doc-utils itstool
$(vopt_if gir gobject-introspection)"
hostmakedepends="pkg-config gettext-devel intltool gnome-doc-utils
itstool glib-devel $(vopt_if gir gobject-introspection)"
makedepends="
gnome-desktop-devel libpeas-devel lcms2-devel exempi-devel
libexif-devel librsvg-devel"