diff options
| author | Ørjan Malde <red@foxi.me> | 2024-02-17 14:07:04 +0100 |
|---|---|---|
| committer | Ørjan Malde <red@foxi.me> | 2024-02-17 17:06:08 +0100 |
| commit | 2c6a4cbd0e161b2416be7e47f8b59d01f77a2291 (patch) | |
| tree | 7b910d97ec8a8f7e914a6eefbd2b344babeaad8e | |
| parent | 5374e0fe1540ceecbfa735fbefe7ae45aaa46e39 (diff) | |
| download | midipix_build-2c6a4cbd0e161b2416be7e47f8b59d01f77a2291.tar.bz2 midipix_build-2c6a4cbd0e161b2416be7e47f8b59d01f77a2291.tar.xz | |
groups.d/241.native_packages_inet.group: weechat: fix linking to libtinfow
Signed-off-by: Ørjan Malde <red@foxi.me>
| -rw-r--r-- | groups.d/241.native_packages_inet.group | 1 | ||||
| -rw-r--r-- | patches/weechat-3.8_pre.local.patch | 29 |
2 files changed, 19 insertions, 11 deletions
diff --git a/groups.d/241.native_packages_inet.group b/groups.d/241.native_packages_inet.group index bc6ed3af..aee27cab 100644 --- a/groups.d/241.native_packages_inet.group +++ b/groups.d/241.native_packages_inet.group @@ -258,7 +258,6 @@ mutt_cv_regex_broken=no"}; : ${PKG_WEECHAT_CONFIGURE_ARGS_EXTRA:="--disable-guile --disable-javascript --disable-python --disable-ruby --disable-tcl --enable-perl PERL_CFLAGS=-I${PREFIX_NATIVE}/lib/perl5/5.36.0/${DEFAULT_TARGET}/CORE PERL_LFLAGS=-lperl"}; : ${PKG_WEECHAT_ENV_VARS_EXTRA:="CURL_CONFIG=${PREFIX_NATIVE}/bin/curl-config:LIBGCRYPT_CONFIG=${PREFIX_NATIVE}/bin/libgcrypt-config:PKGCONFIG=${DEFAULT_TARGET}-pkg-config"}; : ${PKG_WEECHAT_CFLAGS_CONFIGURE_EXTRA:="-I${PREFIX_NATIVE}/include/lua5.4 -I${PREFIX_NATIVE}/include/php -I${PREFIX_NATIVE}/include/php/main -I${PREFIX_NATIVE}/include/php/Zend -I${PREFIX_NATIVE}/include/php/TSRM"}; -: ${PKG_WEECHAT_LDFLAGS_CONFIGURE_EXTRA:="-Wl,--as-needed -ltinfow -Wl,--no-as-needed"}; : ${PKG_WGET_DEPENDS:="gnutls gpgme libz libidn2 libpsl libiconv"}; : ${PKG_WGET_SHA256SUM:=81542f5cefb8faacc39bbbc6c82ded80e3e4a88505ae72ea51df27525bcde04c}; : ${PKG_WGET_VERSION:=1.21.4}; diff --git a/patches/weechat-3.8_pre.local.patch b/patches/weechat-3.8_pre.local.patch index dd37cde4..ebb73eed 100644 --- a/patches/weechat-3.8_pre.local.patch +++ b/patches/weechat-3.8_pre.local.patch @@ -1,7 +1,7 @@ -diff -ru weechat-2.9.orig/configure.ac weechat-2.9/configure.ac ---- weechat-2.9.orig/configure.ac 2020-07-18 13:59:02.000000000 +0200 -+++ weechat-2.9/configure.ac 2020-10-06 22:27:28.776471083 +0200 -@@ -192,18 +192,6 @@ +diff -ru weechat-3.8.orig/configure.ac weechat-3.8/configure.ac +--- weechat-3.8.orig/configure.ac 2023-01-08 10:07:07.000000000 +0100 ++++ weechat-3.8/configure.ac 2024-02-17 14:04:48.583831305 +0100 +@@ -184,18 +184,6 @@ fi # ------------------------------------------------------------------------------ @@ -20,10 +20,19 @@ diff -ru weechat-2.9.orig/configure.ac weechat-2.9/configure.ac # dynamic loader # ------------------------------------------------------------------------------ -@@ -398,52 +398,6 @@ - +@@ -231,7 +219,7 @@ + NCURSES_LFLAGS="-lncurses" + fi + else +- NCURSES_LFLAGS="-lncursesw" ++ NCURSES_LFLAGS="-lncursesw -ltinfow" + fi + AC_CHECK_HEADERS([ncurses.h ncursesw/curses.h]) + AC_SUBST(NCURSES_LFLAGS) +@@ -409,52 +397,6 @@ + # ---------------------------------- perl -------------------------------------- - + -PERL_VERSION= - -if test "x$enable_perl" = "xyes" ; then @@ -73,7 +82,7 @@ diff -ru weechat-2.9.orig/configure.ac weechat-2.9/configure.ac if test "x$enable_perl" = "xyes" ; then AC_SUBST(PERL_CFLAGS) AC_SUBST(PERL_LFLAGS) -@@ -1049,8 +1037,8 @@ +@@ -1053,8 +995,8 @@ *** or try to install it with your software package manager.]) else AC_MSG_RESULT(yes) @@ -84,7 +93,7 @@ diff -ru weechat-2.9.orig/configure.ac weechat-2.9/configure.ac AC_SUBST(GCRYPT_CFLAGS) AC_SUBST(GCRYPT_LFLAGS) fi -@@ -1070,8 +1058,8 @@ +@@ -1074,8 +1016,8 @@ *** or try to install it with your software package manager.]) else AC_MSG_RESULT(yes) @@ -95,7 +104,7 @@ diff -ru weechat-2.9.orig/configure.ac weechat-2.9/configure.ac AC_SUBST(GNUTLS_CFLAGS) AC_SUBST(GNUTLS_LFLAGS) fi -@@ -1160,8 +1148,8 @@ +@@ -1164,8 +1106,8 @@ *** or try to install it with your software package manager.]) else AC_MSG_RESULT(yes) |