From e0142037e1b1e734d0cc2f7d8b5eb5a3d77d1e1f Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 1 Dec 2019 10:31:20 +0100
Subject: [PATCH] gcab: bump version.

switch to meson.
---
 .../gcab/{gcab-0.8.recipe => gcab-1.3.recipe} | 32 +++++++++----------
 app-arch/gcab/patches/gcab-0.8.patchset       | 22 -------------
 2 files changed, 15 insertions(+), 39 deletions(-)
 rename app-arch/gcab/{gcab-0.8.recipe => gcab-1.3.recipe} (84%)
 delete mode 100644 app-arch/gcab/patches/gcab-0.8.patchset

diff --git a/app-arch/gcab/gcab-0.8.recipe b/app-arch/gcab/gcab-1.3.recipe
similarity index 84%
rename from app-arch/gcab/gcab-0.8.recipe
rename to app-arch/gcab/gcab-1.3.recipe
index a350d0585..e571fe520 100644
--- a/app-arch/gcab/gcab-0.8.recipe
+++ b/app-arch/gcab/gcab-1.3.recipe
@@ -15,8 +15,7 @@ COPYRIGHT="2000-2002 Stuart Caie
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
 SOURCE_URI="https://download.gnome.org/sources/gcab/$portVersion/gcab-$portVersion.tar.xz"
-CHECKSUM_SHA256="0c5f602ca4a89904e045b97762b470726383e399d34a161d0ba26cc6023c7086"
-PATCHES="gcab-$portVersion.patchset"
+CHECKSUM_SHA256="10304cc8f6b550cf9f53fb3cebfb529c49394e982ef7e66e3fca9776c60a68e7"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -63,16 +62,11 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:aclocal
-	cmd:autoconf
-	cmd:autom4te
-	cmd:automake
-	cmd:autoreconf
 	cmd:gcc$secondaryArchSuffix
-	cmd:intltool_update
+	cmd:gtkdoc_scan
 	cmd:ld$secondaryArchSuffix
-	cmd:libtoolize$secondaryArchSuffix
-	cmd:make
+	cmd:meson
+	cmd:ninja
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
@@ -81,20 +75,24 @@ defineDebugInfoPackage gcab$secondaryArchSuffix \
 
 BUILD()
 {
-	autoreconf
-	runConfigure --omit-dirs binDir ./configure --bindir=$commandBinDir \
-		--enable-introspection=no
-	make $jobArgs
+	export CFLAGS=-fno-stack-protector
+	meson build -Dintrospection=false \
+		--buildtype=release --prefix=$prefix \
+		--libdir=$libDir --includedir=$includeDir
+	ninja -C build
 }
 
 INSTALL()
 {
-	make install
+	ninja -C build install
 
-	rm -f "$libDir"/libgcab*.la
+	mkdir -p $dataDir
+	mv $prefix/share/gtk-doc $dataDir
+	rm -rf $prefix/share
 
 	prepareInstalledDevelLibs \
 		libgcab-1.0
+	fixPkgconfig
 
 	packageEntries devel \
 		$developDir \
@@ -103,5 +101,5 @@ INSTALL()
 
 TEST()
 {
-	make check
+	meson test -C build
 }
diff --git a/app-arch/gcab/patches/gcab-0.8.patchset b/app-arch/gcab/patches/gcab-0.8.patchset
deleted file mode 100644
index 7ccb08716..000000000
--- a/app-arch/gcab/patches/gcab-0.8.patchset
+++ /dev/null
@@ -1,22 +0,0 @@
-From da24487953ab9230664d13ab3fd1ba0bf7b44032 Mon Sep 17 00:00:00 2001
-From: fbrosson <fbrosson@localhost>
-Date: Sat, 19 Mar 2016 15:41:35 +0000
-Subject: Skip GOBJECT_INTROSPECTION_CHECK.
-
-
-diff --git a/configure.ac b/configure.ac
-index b8b8a91..cc5027e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -17,7 +17,7 @@ AC_PROG_INSTALL
- LT_INIT([win32-dll])
- GTK_DOC_CHECK([1.14],[--flavour no-tmpl])
- PKG_PROG_PKG_CONFIG
--GOBJECT_INTROSPECTION_CHECK([0.9.4])
-+
- AM_CONDITIONAL([GIR], [test "x$INTROSPECTION_MAKEFILE" != x])
- 
- IT_PROG_INTLTOOL([0.40.0])
--- 
-2.16.1
-