From de4333fd7d43d7a6e77c76a8779b241d574d685e Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Fri, 2 Mar 2018 22:37:01 +0000
Subject: [PATCH] libmspub: bump to 0.1.4, add debuginfo, fix COPYRIGHT.
 (#2263)

Also switch HOMEPAGE & SOURCE_URI to https and tarball to tar.xz.
---
 ...pub-0.1.2.recipe => libmspub-0.1.4.recipe} | 51 +++++++++++--------
 1 file changed, 31 insertions(+), 20 deletions(-)
 rename app-text/libmspub/{libmspub-0.1.2.recipe => libmspub-0.1.4.recipe} (52%)

diff --git a/app-text/libmspub/libmspub-0.1.2.recipe b/app-text/libmspub/libmspub-0.1.4.recipe
similarity index 52%
rename from app-text/libmspub/libmspub-0.1.2.recipe
rename to app-text/libmspub/libmspub-0.1.4.recipe
index 5480f3ceb..9dd47555e 100644
--- a/app-text/libmspub/libmspub-0.1.2.recipe
+++ b/app-text/libmspub/libmspub-0.1.4.recipe
@@ -1,23 +1,29 @@
 SUMMARY="Microsoft Publisher import library"
-DESCRIPTION="libmspub is a library that parses the file format of Microsoft Publisher \
-documents of all versions."
-HOMEPAGE="http://wiki.documentfoundation.org/DLP/Libraries/libmspub"
-COPYRIGHT="Brennan Vincent
-	Fridrich Strba
-	David Tardon"
+DESCRIPTION="libmspub is a library that parses the file format of Microsoft \
+Publisher documents of all versions."
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libmspub"
+COPYRIGHT="2012-2013 Brennan Vincent
+	2012-2018 David Tardon
+	2012-2014, 2017 Fridrich Štrba
+	2013 Franz Schmid"
 LICENSE="MPL v2.0"
-REVISION="3"
-SOURCE_URI="http://dev-www.libreoffice.org/src/libmspub/libmspub-$portVersion.tar.bz2"
-CHECKSUM_SHA256="26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a"
+REVISION="1"
+SOURCE_URI="https://dev-www.libreoffice.org/src/libmspub/libmspub-$portVersion.tar.xz"
+CHECKSUM_SHA256="ef36c1a1aabb2ba3b0bedaaafe717bf4480be2ba8de6f3894be5fd3702b013ba"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion="1.0.4"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+portVers="${portVersion%.*}"
+portVersionCompat="$portVersion compat >= $portVers"
+
 PROVIDES="
-	libmspub$secondaryArchSuffix = $portVersion
-	cmd:pub2raw$secondaryArchSuffix
-	cmd:pub2xhtml$secondaryArchSuffix
-	lib:libmspub_0.1$secondaryArchSuffix = 1.0.2 compat >= 1
+	libmspub$secondaryArchSuffix = $portVersionCompat
+	cmd:pub2raw$secondaryArchSuffix = $portVersionCompat
+	cmd:pub2xhtml$secondaryArchSuffix = $portVersionCompat
+	lib:libmspub_$portVers$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -32,8 +38,8 @@ REQUIRES="
 	"
 
 PROVIDES_devel="
-	libmspub${secondaryArchSuffix}_devel = $portVersion
-	devel:libmspub_0.1$secondaryArchSuffix = 1.0.2 compat >= 1
+	libmspub${secondaryArchSuffix}_devel = $portVersionCompat
+	devel:libmspub_$portVers$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libmspub$secondaryArchSuffix == $portVersion base
@@ -52,15 +58,20 @@ BUILD_REQUIRES="
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
-	cmd:libtoolize
-	cmd:autoreconf
 	cmd:automake
-	cmd:gcc$secondaryArchSuffix
+	cmd:autoreconf
+	cmd:g++$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+defineDebugInfoPackage libmspub$secondaryArchSuffix \
+	"$binDir"/pub2raw \
+	"$binDir"/pub2xhtml \
+	"$libDir"/libmspub-$portVers.so.$libVersion
+
 BUILD()
 {
 	autoreconf -fi
@@ -72,9 +83,9 @@ INSTALL()
 {
 	make install
 
-	rm $libDir/libmspub-0.1.la
+	rm -f "$libDir"/libmspub*.la
 	
-	prepareInstalledDevelLibs libmspub-0.1
+	prepareInstalledDevelLib libmspub-$portVers
 	fixPkgconfig
 
 	packageEntries devel $developDir