From 8290b36082914237cedfb0dd096970d283a2b2c6 Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Thu, 14 Jun 2018 20:59:27 +0000
Subject: [PATCH] libodfgen: bump to 0.1.7, add debuginfo, fix COPYRIGHT.
 (#2688)

---
 ...en-0.1.6.recipe => libodfgen-0.1.7.recipe} | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)
 rename app-text/libodfgen/{libodfgen-0.1.6.recipe => libodfgen-0.1.7.recipe} (61%)

diff --git a/app-text/libodfgen/libodfgen-0.1.6.recipe b/app-text/libodfgen/libodfgen-0.1.7.recipe
similarity index 61%
rename from app-text/libodfgen/libodfgen-0.1.6.recipe
rename to app-text/libodfgen/libodfgen-0.1.7.recipe
index 97a8f63c8..bfedd2833 100644
--- a/app-text/libodfgen/libodfgen-0.1.6.recipe
+++ b/app-text/libodfgen/libodfgen-0.1.7.recipe
@@ -1,21 +1,25 @@
 SUMMARY="An ODF export library"
 DESCRIPTION="libodfgen is an ODF export library for projects using librevenge."
-HOMEPAGE="http://sourceforge.net/p/libwpd/wiki/libodfgen"
-COPYRIGHT="Fridrich Strba
-	Laurent Alonso
-	David Tardon"
+HOMEPAGE="https://sourceforge.net/p/libwpd/wiki/libodfgen/"
+COPYRIGHT="2004-2015 Fridrich Strba
+	2011-2018 Laurent Alonso
+	2013-2018 David Tardon"
 LICENSE="MPL v2.0
 	GNU LGPL v2.1"
-REVISION="2"
-SOURCE_URI="http://prdownloads.sourceforge.net/libwpd/libodfgen-$portVersion.tar.bz2"
-CHECKSUM_SHA256="2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2"
+REVISION="1"
+SOURCE_URI="https://downloads.sourceforge.net/libwpd/libodfgen-$portVersion.tar.xz"
+CHECKSUM_SHA256="323e491f956c8ca2abb12c998e350670930a32317bf9662b0615dd4b3922b831"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion="1.0.7"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+portVers="${portVersion%.*}"
+
 PROVIDES="
 	libodfgen$secondaryArchSuffix = $portVersion
-	lib:libodfgen_0.1$secondaryArchSuffix = 1.0.6 compat >= 1
+	lib:libodfgen_$portVers$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -27,7 +31,7 @@ REQUIRES="
 
 PROVIDES_devel="
 	libodfgen${secondaryArchSuffix}_devel = $portVersion
-	devel:libodfgen_0.1$secondaryArchSuffix = 1.0.6 compat >= 1
+	devel:libodfgen_$portVers$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libodfgen$secondaryArchSuffix == $portVersion base
@@ -42,16 +46,19 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
-	cmd:libtoolize
 	cmd:autoconf
 	cmd:automake
 	cmd:autoheader
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+defineDebugInfoPackage libodfgen$secondaryArchSuffix \
+	"$libDir"/libodfgen-$portVers.so.$libVersion
+
 BUILD()
 {
 	libtoolize --force --copy --install
@@ -67,9 +74,14 @@ INSTALL()
 {
 	make install
 
-	rm $libDir/libodfgen-0.1.la
-	prepareInstalledDevelLibs libodfgen-0.1
+	rm -f "$libDir"/libodfgen-$portVers.la
+	prepareInstalledDevelLib libodfgen-$portVers
 	fixPkgconfig
 
 	packageEntries devel $developDir
 }
+
+TEST()
+{
+	make check
+}