From b0951fbee2dd53ca3f104ae99f889c6b8e3bdcc5 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Mon, 19 Aug 2019 10:09:59 +0000
Subject: ncurses[tw]: upgrade to ncurses-6.1, remove hard-coded -I/include
 from *.pc.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
---
 patches/ncurses-6.1.local.patch   | 34 ++++++++++++++++++++++++++++++++++
 patches/ncursestw-6.1.local.patch |  1 +
 patches/ncursesw-6.1.local.patch  |  1 +
 3 files changed, 36 insertions(+)
 create mode 100644 patches/ncurses-6.1.local.patch
 create mode 120000 patches/ncursestw-6.1.local.patch
 create mode 120000 patches/ncursesw-6.1.local.patch

(limited to 'patches')

diff --git a/patches/ncurses-6.1.local.patch b/patches/ncurses-6.1.local.patch
new file mode 100644
index 00000000..5b290ae4
--- /dev/null
+++ b/patches/ncurses-6.1.local.patch
@@ -0,0 +1,34 @@
+diff -ru a/configure b/configure
+--- a/configure	2018-01-20 00:27:18.000000000 +0000
++++ b/configure	2019-08-19 09:46:30.361489923 +0000
+@@ -6317,7 +6317,7 @@
+ 		fi
+ 		cf_cv_rm_so_locs=yes
+ 		;;
+-	(linux*|gnu*|k*bsd*-gnu)
++	(linux*|gnu*|k*bsd*-gnu|midipix*)
+ 		if test "$DFT_LWR_MODEL" = "shared" ; then
+ 			LOCAL_LDFLAGS="${LD_RPATH_OPT}\$(LOCAL_LIBDIR)"
+ 			LOCAL_LDFLAGS2="$LOCAL_LDFLAGS"
+diff -ru a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in
+--- a/misc/gen-pkgconfig.in	2018-01-01 22:51:23.000000000 +0000
++++ b/misc/gen-pkgconfig.in	2019-08-19 10:00:35.426023772 +0000
+@@ -64,17 +64,7 @@
+ MENU_LIBRARY="${MENU_NAME}@USE_ARG_SUFFIX@"
+ FORM_LIBRARY="${FORM_NAME}@USE_ARG_SUFFIX@"
+ 
+-CFLAGS="@PKG_CFLAGS@"
+-if test "$includedir" != "/usr/include" ; then
+-	includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include,'`
+-	test "$includetop" = "/usr/include" && includetop="$includedir"
+-	if test "x$includetop" != "x$includedir"
+-	then
+-		CFLAGS="$CFLAGS -I${includetop}"
+-	fi
+-	CFLAGS="$CFLAGS -I\${includedir}"
+-fi
+-
++CFLAGS=
+ LDFLAGS=
+ if test "$libdir" != "/usr/lib" ; then
+ 	LDFLAGS="$LDFLAGS -L\${libdir}"
diff --git a/patches/ncursestw-6.1.local.patch b/patches/ncursestw-6.1.local.patch
new file mode 120000
index 00000000..4c06615b
--- /dev/null
+++ b/patches/ncursestw-6.1.local.patch
@@ -0,0 +1 @@
+ncurses-6.1.local.patch
\ No newline at end of file
diff --git a/patches/ncursesw-6.1.local.patch b/patches/ncursesw-6.1.local.patch
new file mode 120000
index 00000000..4c06615b
--- /dev/null
+++ b/patches/ncursesw-6.1.local.patch
@@ -0,0 +1 @@
+ncurses-6.1.local.patch
\ No newline at end of file
-- 
cgit v1.2.3