diff options
| author |   Christopher Brannon <teiresias@gentoo.org> | 2014-03-03 16:50:33 +0000 |
|---|---|---|
| committer | Christopher Brannon <teiresias@gentoo.org> | 2014-03-03 16:50:33 +0000 |
| commit | ade3dda1efd9fc1e47c38f53025f968ef5e0c7ac (patch) | |
| tree | 41ecda0a14f4c91f61dd67d00647683187dc71ab /media-gfx | |
| parent | Remove vulnerable versions, security bug #497260 (diff) | |
| download | gentoo-2-ade3dda1efd9fc1e47c38f53025f968ef5e0c7ac.tar.gz gentoo-2-ade3dda1efd9fc1e47c38f53025f968ef5e0c7ac.tar.bz2 gentoo-2-ade3dda1efd9fc1e47c38f53025f968ef5e0c7ac.zip | |
Use pkg-config when linking against systemd (bug #502422).
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x6521e06d)
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/sane-backends/ChangeLog | 9 | ||||
| -rw-r--r-- | media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch | 24 | ||||
| -rw-r--r-- | media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild (renamed from media-gfx/sane-backends/sane-backends-1.0.24-r2.ebuild) | 3 |
3 files changed, 34 insertions, 2 deletions
diff --git a/media-gfx/sane-backends/ChangeLog b/media-gfx/sane-backends/ChangeLog index 2a1e4ccd985e..e162f3cf0cf1 100644 --- a/media-gfx/sane-backends/ChangeLog +++ b/media-gfx/sane-backends/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-gfx/sane-backends # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.241 2014/02/22 19:27:06 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/ChangeLog,v 1.242 2014/03/03 16:50:33 teiresias Exp $ + +*sane-backends-1.0.24-r3 (03 Mar 2014) + + 03 Mar 2014; Christopher Brannon <teiresias@gentoo.org> + -sane-backends-1.0.24-r2.ebuild, +sane-backends-1.0.24-r3.ebuild, + +files/sane-backends-1.0.24-systemd_pkgconfig.patch: + Use pkg-config when linking against systemd (bug #502422). 22 Feb 2014; Markus Meier <maekke@gentoo.org> sane-backends-1.0.24-r1.ebuild: arm stable, bug #497460 diff --git a/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch b/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch new file mode 100644 index 000000000000..2a75145ae4f4 --- /dev/null +++ b/media-gfx/sane-backends/files/sane-backends-1.0.24-systemd_pkgconfig.patch @@ -0,0 +1,24 @@ +diff --git a/configure.in b/configure.in +index 7413646..2c05265 100644 +--- a/configure.in ++++ b/configure.in +@@ -347,17 +347,11 @@ dnl fi + AC_ARG_WITH(systemd, + AC_HELP_STRING([--with-systemd], [enable systemd support @<:@default=yes@:>@])) + if test "x$with_systemd" != xno ; then +- dnl added by llagendijk 12/7/2012 to detect systemd for saned +- $as_echo_n "Checking for systemd..." +- if test -e /usr/include/systemd/sd-daemon.h ; then ++ PKG_CHECK_MODULES(SYSTEMD, [libsystemd libsystemd-daemon], have_systemd=yes, have_systemd=no) ++ if test "x$have_systemd" = xyes; then + AC_DEFINE(HAVE_SYSTEMD, 1, [Is /usr/include/systemd/sd-daemon.h available?]) +- have_systemd="yes" +- SYSTEMD_LIBS=" -lsystemd-daemon" + AC_SUBST(SYSTEMD_LIBS) +- $as_echo "yes" + else +- have_systemd="no" +- $as_echo "no" + if test "x$with_systemd" = xyes; then + AC_MSG_ERROR([Systemd support was requested but systemd was not found]) + fi diff --git a/media-gfx/sane-backends/sane-backends-1.0.24-r2.ebuild b/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild index 27df7aed1e69..cf619c0528e9 100644 --- a/media-gfx/sane-backends/sane-backends-1.0.24-r2.ebuild +++ b/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r2.ebuild,v 1.1 2014/02/21 19:46:35 teiresias Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/sane-backends/sane-backends-1.0.24-r3.ebuild,v 1.1 2014/03/03 16:50:33 teiresias Exp $ EAPI="5" @@ -168,6 +168,7 @@ src_prepare() { epatch "${FILESDIR}"/niash_array_index.patch \ "${FILESDIR}"/${P}-unused-cups.patch \ "${FILESDIR}"/${P}-automagic_systemd.patch \ + "${FILESDIR}"/${P}-systemd_pkgconfig.patch \ "${FILESDIR}"/${P}-kodakaio_avahi.patch \ "${FILESDIR}"/${P}-saned_pidfile_location.patch # Fix for "make check". |