From 0c01fac9809d4ebee67eaf74f90435daa4ba0c4f Mon Sep 17 00:00:00 2001
From: Jack Duvall <jediguy9@gmail.com>
Date: Mar 27 2020 21:35:35 +0000
Subject: Final patches to make things work all the way through


---

diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index c0c61ac..02de8ce 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -296,6 +296,7 @@ zstd")";
 : ${PKG_TDNF_VERSION:=2.0.0-alpha.1};
 : ${PKG_TDNF_URL:=https://github.com/vmware/tdnf/archive/v${PKG_TDNF_VERSION}.tar.gz};
 : ${PKG_TDNF_CONFIGURE_ARGS_EXTRA:="--disable-static"};
+: ${PKG_TDNF_ENV_VARS_EXTRA:="LIBSOLV_LIBS=-lsolv:LIBSOLVEXT_LIBS=-lsolvext"};
 : ${PKG_TDNF_FORCE_AUTORECONF:=1};
 : ${PKG_TDNF_IN_TREE:=1};
 : ${PKG_TDNF_SUBDIR:=tdnf-${PKG_TDNF_VERSION}};
diff --git a/groups/251.native_packages_lib.group b/groups/251.native_packages_lib.group
index e11be92..bfb4935 100644
--- a/groups/251.native_packages_lib.group
+++ b/groups/251.native_packages_lib.group
@@ -73,6 +73,7 @@ libxslt libz libzip")";
 : ${PKG_LIBFLAC_SHA256SUM:=213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748};
 : ${PKG_LIBFLAC_VERSION:=1.3.3};
 : ${PKG_LIBFLAC_URL:=https://ftp.osuosl.org/pub/xiph/releases/flac/flac-${PKG_LIBFLAC_VERSION}.tar.xz};
+: ${PKG_LIBFLAC_CONFIGURE_ARGS_EXTRA:="--with-ogg=yes"};
 : ${PKG_LIBGCRYPT_DEPENDS:="libgpg_error"};
 : ${PKG_LIBGCRYPT_SHA256SUM:=3b4a2a94cb637eff5bdebbcaf46f4d95c4f25206f459809339cdada0eb577ac3};
 : ${PKG_LIBGCRYPT_VERSION:=1.8.5};
diff --git a/patches/curl-7.61.0.local.patch b/patches/curl-7.61.0.local.patch
index 3376743..3794ece 100644
--- a/patches/curl-7.61.0.local.patch
+++ b/patches/curl-7.61.0.local.patch
@@ -1,5 +1,6 @@
---- curl-7.61.0/configure.orig	2018-07-09 07:52:18.000000000 +0100
-+++ curl-7.61.0/configure	2020-03-12 08:51:25.825416713 +0000
+diff -ru a/configure b/configure
+--- a/configure	2018-07-09 07:52:18.000000000 +0100
++++ b/configure	2020-03-12 08:51:25.825416713 +0000
 @@ -14553,6 +14553,16 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
@@ -893,3 +894,19 @@
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler halts on compilation errors" >&5
  $as_echo_n "checking if compiler halts on compilation errors... " >&6; }
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+diff -ru a/curl-config.in b/curl-config.in
+--- a/curl-config.in	2018-06-14 10:31:24.000000000 -0400
++++ b/curl-config.in	2020-03-27 15:39:03.029645413 -0400
+@@ -143,11 +143,7 @@
+         ;;
+ 
+     --libs)
+-        if test "X@libdir@" != "X/usr/lib" -a "X@libdir@" != "X/usr/lib64"; then
+-           CURLLIBDIR="-L@libdir@ "
+-        else
+-           CURLLIBDIR=""
+-        fi
++        CURLLIBDIR=""
+         if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
+           echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@
+         else
diff --git a/patches/libassuan-2.5.3_pre.local.patch b/patches/libassuan-2.5.3_pre.local.patch
new file mode 100644
index 0000000..d6529b8
--- /dev/null
+++ b/patches/libassuan-2.5.3_pre.local.patch
@@ -0,0 +1,17 @@
+diff -ru a/src/libassuan-config.in b/src/libassuan-config.in
+--- a/src/libassuan-config.in	2018-10-25 05:20:28.000000000 -0400
++++ b/src/libassuan-config.in	2020-03-11 18:47:54.410306584 -0400
+@@ -131,13 +131,5 @@
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+-    if test "@libdir@" != "/usr/lib" ; then
+-      libdirs="-L@libdir@"
+-      for i in $lib $extralibs ; do
+-	if test "$i" = "-L@libdir@" ; then
+-	  libdirs=""
+-	fi
+-      done
+-    fi
+     echo $libdirs $lib $extralibs
+ fi
diff --git a/patches/zstd-1.3.4.local.patch b/patches/zstd-1.3.4.local.patch
index 10723d6..40e5250 100644
--- a/patches/zstd-1.3.4.local.patch
+++ b/patches/zstd-1.3.4.local.patch
@@ -1,5 +1,6 @@
---- zstd-1.3.4/programs/Makefile.orig	2018-03-26 22:19:34.000000000 +0000
-+++ zstd-1.3.4/programs/Makefile	2018-04-30 14:55:39.468000000 +0000
+diff -ru a/programs/Makefile b/programs/Makefile
+--- a/programs/Makefile	2018-03-26 22:19:34.000000000 +0000
++++ b/programs/Makefile	2018-04-30 14:55:39.468000000 +0000
 @@ -38,7 +38,6 @@
  CPPFLAGS+= -I$(ZSTDDIR) -I$(ZSTDDIR)/common -I$(ZSTDDIR)/compress \
             -I$(ZSTDDIR)/dictBuilder \
@@ -8,3 +9,13 @@
  DEBUGFLAGS+=-Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
              -Wstrict-aliasing=1 -Wswitch-enum -Wdeclaration-after-statement \
              -Wstrict-prototypes -Wundef -Wpointer-arith -Wformat-security \
+diff -ru a/lib/libzstd.pc.in b/lib/libzstd.pc.in
+--- a/lib/libzstd.pc.in	2020-03-27 11:36:13.368590549 -0400
++++ b/lib/libzstd.pc.in	2020-03-27 11:36:28.362034466 -0400
+@@ -10,5 +10,5 @@
+ Description: fast lossless compression algorithm library
+ URL: http://www.zstd.net/
+ Version: @VERSION@
+-Libs: -L${libdir} -lzstd
++Libs: -lzstd
+ Cflags: -I${includedir}