From c4ac251bd3b46b02de65e5e6e3d670c3d8270671 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Thu, 21 Dec 2017 07:49:44 +0100
Subject: [PATCH] libiptcdata: fix build for x86_64, add defineDebugInfoPackage
 (#1928)

---
 .../libiptcdata/libiptcdata-1.0.4.recipe      | 38 +++++++++++--------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/media-libs/libiptcdata/libiptcdata-1.0.4.recipe b/media-libs/libiptcdata/libiptcdata-1.0.4.recipe
index 6b3e5a4d9..1f13809af 100644
--- a/media-libs/libiptcdata/libiptcdata-1.0.4.recipe
+++ b/media-libs/libiptcdata/libiptcdata-1.0.4.recipe
@@ -8,18 +8,21 @@ this metadata."
 HOMEPAGE="http://libiptcdata.sourceforge.net/"
 COPYRIGHT="2005 David Moore"
 LICENSE="GNU LGPL v2.1"
-REVISION="2"
-SOURCE_URI="http://prdownloads.sourceforge.net/libiptcdata/libiptcdata-1.0.4.tar.gz?download"
+REVISION="3"
+SOURCE_URI="http://prdownloads.sourceforge.net/libiptcdata/libiptcdata-$portVersion.tar.gz?download"
 CHECKSUM_SHA256="79f63b8ce71ee45cefd34efbb66e39a22101443f4060809b8fc29c5eebdcee0e"
-SOURCE_FILENAME="libiptcdata-1.0.4.tar.gz"
-PATCHES="libiptcdata-1.0.4.patch"
+SOURCE_FILENAME="libiptcdata-$portVersion.tar.gz"
+PATCHES="libiptcdata-$portVersion.patch"
 
 ARCHITECTURES="x86_gcc2 ?x86 x86_64"
 
+libVersion=0.3.3
+libVersionCompat="$libVersion compat >= 0"
+
 PROVIDES="
 	libiptcdata = $portVersion
 	cmd:iptc = $portVersion
-	lib:libiptcdata = 0.3.3
+	lib:libiptcdata = $libVersionCompat
 	"
 REQUIRES="
 	haiku
@@ -29,7 +32,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libiptcdata_devel = $portVersion
-	devel:libiptcdata = 0.3.3
+	devel:libiptcdata = $libVersion
 	"
 REQUIRES_devel="
 	libiptcdata == $portVersion base
@@ -40,22 +43,22 @@ BUILD_REQUIRES="
 	devel:libiconv
 	"
 BUILD_PREREQUIRES="
+	cmd:aclocal
+	cmd:autoconf
+	cmd:autopoint
 	cmd:gcc
+	cmd:libtoolize
 	cmd:ld
 	cmd:make
-	cmd:libtool
-	cmd:autoconf
-	cmd:aclocal_1.13
-	cmd:automake_1.13
 	"
 
+defineDebugInfoPackage libiptcdata \
+	$libDir/libiptcdata.so.$libVersion
+
 BUILD()
 {
-	libtoolize --force --copy --install
-	aclocal-1.13 -I m4
-	autoconf
-	automake-1.13
-	runConfigure ./configure --disable-gtk-doc --enable-static --enable-shared
+	autoreconf -vfi
+	runConfigure ./configure --enable-static --enable-shared
 	make $jobArgs
 }
 
@@ -63,7 +66,10 @@ INSTALL()
 {
 	make install
 
-	prepareInstalledDevelLibs libiptcdata
+	# remove libtool file
+	rm -r $libDir/*.la
+
+	prepareInstalledDevelLib libiptcdata
 	fixPkgconfig
 
 	# devel package