[patch] xsane-0.998-r2.patch

xsane-0.998-r2.patch (text/plain), 807 bytes, created by Vicente Olivert Riera (RETIRED) on 2012-11-11 11:04:20 UTC

--- xsane-0.998-r1.ebuild	2012-08-22 04:31:21.000000000 +0200
+++ xsane-0.998-r2.ebuild	2012-11-11 11:59:08.089075842 +0100
@@ -4,7 +4,7 @@
 
 EAPI="4"
 
-inherit eutils
+inherit eutils toolchain-funcs
 
 DESCRIPTION="graphical scanning frontend"
 HOMEPAGE="http://www.xsane.org/"
@@ -45,6 +45,9 @@
 
 	# Fix compability with libpng15 wrt #377363
 	sed -i -e 's:png_ptr->jmpbuf:png_jmpbuf(png_ptr):' src/xsane-save.c || die
+
+	# Fix calling AR directly (bug #442606)
+	sed -i -e "s:ar r:$(tc-getAR) r:" lib/Makefile.in || die
 }
 
 src_configure() {
@@ -76,7 +79,7 @@
 			die "Can't find GIMP plugin directory."
 		fi
 		dodir "${plugindir#${EPREFIX}}"
-		dosym /usr/bin/xsane "${plugindir#${EPREFIX}}"
+		dosym /usr/bin/xsane "${plugindir#${EPREFIX}}/xsane"
 	fi
 
 	newicon src/xsane-48x48.png ${PN}.png