From 1a519fc91302036e6702f9e0b5572c81a42392e1 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 5 Oct 2019 20:03:19 +0200
Subject: [PATCH] fontconfig: bump version (devel release).

don't depend on libuuid.
---
 ....13.1.recipe => fontconfig-2.13.92.recipe} | 13 ++---
 .../patches/fontconfig-2.13.1.patchset        | 28 -----------
 .../patches/fontconfig-2.13.92.patchset       | 48 +++++++++++++++++++
 3 files changed, 51 insertions(+), 38 deletions(-)
 rename media-libs/fontconfig/{fontconfig-2.13.1.recipe => fontconfig-2.13.92.recipe} (92%)
 delete mode 100644 media-libs/fontconfig/patches/fontconfig-2.13.1.patchset
 create mode 100644 media-libs/fontconfig/patches/fontconfig-2.13.92.patchset

diff --git a/media-libs/fontconfig/fontconfig-2.13.1.recipe b/media-libs/fontconfig/fontconfig-2.13.92.recipe
similarity index 92%
rename from media-libs/fontconfig/fontconfig-2.13.1.recipe
rename to media-libs/fontconfig/fontconfig-2.13.92.recipe
index 49f60490d..6f7a832e7 100644
--- a/media-libs/fontconfig/fontconfig-2.13.1.recipe
+++ b/media-libs/fontconfig/fontconfig-2.13.92.recipe
@@ -8,9 +8,9 @@ COPYRIGHT="2000-2005, 2006-2007 Keith Packard
 	2008 Danilo Segan
 	2012 Google, Inc."
 LICENSE="MIT"
-REVISION="4"
-SOURCE_URI="https://www.freedesktop.org/software/fontconfig/release/fontconfig-$portVersion.tar.bz2"
-CHECKSUM_SHA256="f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741"
+REVISION="1"
+SOURCE_URI="https://www.freedesktop.org/software/fontconfig/release/fontconfig-$portVersion.tar.xz"
+CHECKSUM_SHA256="506e61283878c1726550bc94f2af26168f1e9f2106eac77eaaf0b2cdfad66e4e"
 PATCHES="fontconfig-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -43,7 +43,6 @@ REQUIRES="
 	lib:libfreetype$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
-	lib:libuuid$secondaryArchSuffix
 	lib:libxml2$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
@@ -55,24 +54,18 @@ PROVIDES_devel="
 REQUIRES_devel="
 	fontconfig$secondaryArchSuffix == $portVersion base
 	devel:libfreetype$secondaryArchSuffix
-	devel:libuuid$secondaryArchSuffix
 	devel:libxml2$secondaryArchSuffix
 	"
 
 defineDebugInfoPackage fontconfig$secondaryArchSuffix \
 	$libDir/libfontconfig.so.$libVersion
 
-libuuidVersionCompat="1.3"
-if [ "$effectiveTargetArchitecture" = x86_gcc2 ]; then
-	libuuidVersionCompat="1"
-fi
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libbz2$secondaryArchSuffix
 	devel:libfreetype$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
-	devel:libuuid$secondaryArchSuffix >= $libuuidVersionCompat
 	devel:libxml2$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
diff --git a/media-libs/fontconfig/patches/fontconfig-2.13.1.patchset b/media-libs/fontconfig/patches/fontconfig-2.13.1.patchset
deleted file mode 100644
index 2718fbe28..000000000
--- a/media-libs/fontconfig/patches/fontconfig-2.13.1.patchset
+++ /dev/null
@@ -1,28 +0,0 @@
-From de04b02d209bda49593f2fff2b587991f9da76b8 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Mon, 10 Jun 2019 19:04:18 +0200
-Subject: Fix for gcc2 and test-bz106632
-
-
-diff --git a/src/fccfg.c b/src/fccfg.c
-index d7c48e8..edf238f 100644
---- a/src/fccfg.c
-+++ b/src/fccfg.c
-@@ -2247,11 +2247,13 @@ FcConfigRealFilename (FcConfig		*config,
- 	    if (!FcStrIsAbsoluteFilename (buf))
- 	    {
- 		FcChar8 *dirname = FcStrDirname (nn);
-+		FcChar8 *path;
-+
- 		FcStrFree (nn);
- 		if (!dirname)
- 		    return NULL;
- 
--		FcChar8 *path = FcStrBuildFilename (dirname, buf, NULL);
-+		path = FcStrBuildFilename (dirname, buf, NULL);
- 		FcStrFree (dirname);
- 		if (!path)
- 		    return NULL;
--- 
-2.21.0
-
diff --git a/media-libs/fontconfig/patches/fontconfig-2.13.92.patchset b/media-libs/fontconfig/patches/fontconfig-2.13.92.patchset
new file mode 100644
index 000000000..8e85d267b
--- /dev/null
+++ b/media-libs/fontconfig/patches/fontconfig-2.13.92.patchset
@@ -0,0 +1,48 @@
+From 9b00524ab93d879d199abb12b83c9768384dfb8d Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Mon, 10 Jun 2019 19:04:18 +0200
+Subject: Fix for gcc2 and test-bz106632
+
+
+diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
+index 091eed4..5a9fa94 100644
+--- a/fc-cache/fc-cache.c
++++ b/fc-cache/fc-cache.c
+@@ -142,6 +142,7 @@ scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force,
+     FcBool	    was_valid, was_processed = FcFalse;
+     int		    i;
+     const FcChar8   *sysroot = FcConfigGetSysRoot (config);
++    FcChar8 *rooted_dir = NULL;
+ 
+     /*
+      * Now scan all of the directories into separate databases
+@@ -164,7 +165,6 @@ scanDirs (FcStrList *list, FcConfig *config, FcBool force, FcBool really_force,
+ 	    continue;
+ 	}
+ 
+-    FcChar8 *rooted_dir = NULL;
+     if (sysroot)
+     {
+         rooted_dir = FcStrPlus(sysroot, dir);
+diff --git a/src/fccfg.c b/src/fccfg.c
+index e81eeba..c389683 100644
+--- a/src/fccfg.c
++++ b/src/fccfg.c
+@@ -2349,11 +2349,13 @@ FcConfigRealFilename (FcConfig		*config,
+ 	    if (!FcStrIsAbsoluteFilename (buf))
+ 	    {
+ 		FcChar8 *dirname = FcStrDirname (nn);
++		FcChar8 *path;
++
+ 		FcStrFree (nn);
+ 		if (!dirname)
+ 		    return NULL;
+ 
+-		FcChar8 *path = FcStrBuildFilename (dirname, buf, NULL);
++		path = FcStrBuildFilename (dirname, buf, NULL);
+ 		FcStrFree (dirname);
+ 		if (!path)
+ 		    return NULL;
+-- 
+2.23.0
+