From dbaef16de70b670f94c59bc3d593f096219b2aab Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 24 Mar 2017 21:58:15 +0100 Subject: [PATCH] libwpd: bump version, enable x86_64. * remove libtool file. --- ...wpd-0.10.0.recipe => libwpd-0.10.1.recipe} | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) rename app-text/libwpd/{libwpd-0.10.0.recipe => libwpd-0.10.1.recipe} (82%) diff --git a/app-text/libwpd/libwpd-0.10.0.recipe b/app-text/libwpd/libwpd-0.10.1.recipe similarity index 82% rename from app-text/libwpd/libwpd-0.10.0.recipe rename to app-text/libwpd/libwpd-0.10.1.recipe index b52b3178c..b7c0433ef 100644 --- a/app-text/libwpd/libwpd-0.10.0.recipe +++ b/app-text/libwpd/libwpd-0.10.1.recipe @@ -9,11 +9,11 @@ COPYRIGHT="William Lachance Fridrich Strba" LICENSE="MPL v2.0 GNU LGPL v2.1" -REVISION="2" +REVISION="1" SOURCE_URI="http://prdownloads.sourceforge.net/libwpd/libwpd-$portVersion.tar.bz2" -CHECKSUM_SHA256="f2bf5d65156a351ce404550dd822c8db8ab8740b393f61dba828d1b2cb33fe91" +CHECKSUM_SHA256="efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d" -ARCHITECTURES="!x86_gcc2 x86 ?x86_64" +ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" @@ -21,7 +21,7 @@ PROVIDES=" cmd:wpd2html$secondaryArchSuffix cmd:wpd2raw$secondaryArchSuffix cmd:wpd2text$secondaryArchSuffix - lib:libwpd_0.10$secondaryArchSuffix = 10.0.0 compat >= 10 + lib:libwpd_0.10$secondaryArchSuffix = 10.0.1 compat >= 10 " REQUIRES=" haiku$secondaryArchSuffix @@ -33,7 +33,7 @@ REQUIRES=" PROVIDES_devel=" libwpd${secondaryArchSuffix}_devel = $portVersion - devel:libwpd_0.10$secondaryArchSuffix = 10.0.0 compat >= 10 + devel:libwpd_0.10$secondaryArchSuffix = 10.0.1 compat >= 10 " REQUIRES_devel=" libwpd$secondaryArchSuffix == $portVersion base @@ -48,24 +48,20 @@ BUILD_REQUIRES=" BUILD_PREREQUIRES=" haiku${secondaryArchSuffix}_devel cmd:aclocal - cmd:libtoolize cmd:autoconf cmd:automake cmd:autoheader + cmd:awk cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix + cmd:libtoolize cmd:make - cmd:awk cmd:pkg_config$secondaryArchSuffix " BUILD() { - libtoolize --force --copy --install - aclocal - autoheader - automake -a -c --foreign - autoconf + autoreconf -fi runConfigure ./configure make $jobArgs } @@ -74,6 +70,8 @@ INSTALL() { make install + rm $libDir/libwpd-0.10.la + prepareInstalledDevelLibs libwpd-0.10 fixPkgconfig