From b0951fbee2dd53ca3f104ae99f889c6b8e3bdcc5 Mon Sep 17 00:00:00 2001 From: midipix 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 --- patches/ncurses-6.1.local.patch | 34 ++++++++++++++++++++++++++++++++++ patches/ncursestw-6.1.local.patch | 1 + patches/ncursesw-6.1.local.patch | 1 + vars/build.vars | 16 ++++++++-------- 4 files changed, 44 insertions(+), 8 deletions(-) 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 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 diff --git a/vars/build.vars b/vars/build.vars index a9cd2c0e..6de9a939 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -533,8 +533,8 @@ HOST_PACKAGES_DEPS_PREFIX="${PREFIX}"; : ${PKG_EXPAT_HOST_SHA256SUM:=17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2}; : ${PKG_EXPAT_HOST_VERSION:=2.2.6}; : ${PKG_EXPAT_HOST_URL:=http://download.openpkg.org/components/cache/expat/expat-${PKG_EXPAT_HOST_VERSION}.tar.bz2}; -: ${PKG_NCURSESW_HOST_SHA256SUM:=f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260}; -: ${PKG_NCURSESW_HOST_VERSION:=6.0}; +: ${PKG_NCURSESW_HOST_SHA256SUM:=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17}; +: ${PKG_NCURSESW_HOST_VERSION:=6.1}; : ${PKG_NCURSESW_HOST_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSESW_HOST_VERSION}.tar.gz}; : ${PKG_NCURSESW_HOST_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --with-pkg-config-libdir=${PREFIX}/lib/pkgconfig --with-manpages --with-progs --with-shared --with-termlib --without-ada --without-tests --enable-widec --without-pthread"}; : ${PKG_NCURSESW_HOST_INSTALL_FILES:=@ncursesw/ncurses.h=include/ncurses.h}; @@ -825,16 +825,16 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2"; : ${PKG_LUA_IN_TREE:=1}; : ${PKG_LUA_CONFIGURE_ARGS_EXTRA:="--with-readline --with-compat-module"}; : ${PKG_LUA_INSTALL_FILES:=@liblua.so=lib/liblua.so.0}; -: ${PKG_NCURSES_SHA256SUM:=f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260}; -: ${PKG_NCURSES_VERSION:=6.0}; +: ${PKG_NCURSES_SHA256SUM:=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17}; +: ${PKG_NCURSES_VERSION:=6.1}; : ${PKG_NCURSES_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSES_VERSION}.tar.gz}; : ${PKG_NCURSES_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --with-pkg-config-libdir=${PREFIX_NATIVE}/lib/pkgconfig --without-manpages --without-progs --with-shared --with-termlib --without-ada --without-tests --disable-widec --without-pthread"}; -: ${PKG_NCURSESTW_SHA256SUM:=f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260}; -: ${PKG_NCURSESTW_VERSION:=6.0}; +: ${PKG_NCURSESTW_SHA256SUM:=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17}; +: ${PKG_NCURSESTW_VERSION:=6.1}; : ${PKG_NCURSESTW_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSESTW_VERSION}.tar.gz}; : ${PKG_NCURSESTW_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --with-pkg-config-libdir=${PREFIX_NATIVE}/lib/pkgconfig --without-manpages --without-progs --with-shared --with-termlib --without-ada --without-tests --disable-widec --with-pthread"}; -: ${PKG_NCURSESW_SHA256SUM:=f551c24b30ce8bfb6e96d9f59b42fbea30fa3a6123384172f9e7284bcf647260}; -: ${PKG_NCURSESW_VERSION:=6.0}; +: ${PKG_NCURSESW_SHA256SUM:=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17}; +: ${PKG_NCURSESW_VERSION:=6.1}; : ${PKG_NCURSESW_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSESW_VERSION}.tar.gz}; : ${PKG_NCURSESW_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --with-pkg-config-libdir=${PREFIX_NATIVE}/lib/pkgconfig --with-manpages --with-progs --with-shared --with-termlib --without-ada --without-tests --enable-widec --without-pthread"}; : ${PKG_NCURSESW_INSTALL_FILES:=@ncursesw/ncurses.h=include/ncurses.h}; -- cgit v1.2.3