weechat: Update from 2.6 to 2.7
This commit is contained in:
parent
57a5fe5c29
commit
0442247d97
|
@ -1,10 +1,9 @@
|
||||||
TERMUX_PKG_HOMEPAGE=https://weechat.org/
|
TERMUX_PKG_HOMEPAGE=https://weechat.org/
|
||||||
TERMUX_PKG_DESCRIPTION="Fast, light and extensible IRC chat client"
|
TERMUX_PKG_DESCRIPTION="Fast, light and extensible IRC chat client"
|
||||||
TERMUX_PKG_LICENSE="GPL-2.0"
|
TERMUX_PKG_LICENSE="GPL-2.0"
|
||||||
TERMUX_PKG_VERSION=2.6
|
TERMUX_PKG_VERSION=2.7
|
||||||
TERMUX_PKG_REVISION=3
|
|
||||||
TERMUX_PKG_SRCURL=https://www.weechat.org/files/src/weechat-${TERMUX_PKG_VERSION}.tar.bz2
|
TERMUX_PKG_SRCURL=https://www.weechat.org/files/src/weechat-${TERMUX_PKG_VERSION}.tar.bz2
|
||||||
TERMUX_PKG_SHA256=0b06e551e69018dbd4828113a56a9657a16cb787eb44bc83adf45424e65759d9
|
TERMUX_PKG_SHA256=0c41e0acc703f717e15030327c265f83d66791b439b3cf664041f0c03f641f02
|
||||||
TERMUX_PKG_DEPENDS="libiconv, ncurses, libgcrypt, libcurl, libgnutls, libandroid-support, zlib"
|
TERMUX_PKG_DEPENDS="libiconv, ncurses, libgcrypt, libcurl, libgnutls, libandroid-support, zlib"
|
||||||
TERMUX_PKG_BREAKS="weechat-dev"
|
TERMUX_PKG_BREAKS="weechat-dev"
|
||||||
TERMUX_PKG_REPLACES="weechat-dev"
|
TERMUX_PKG_REPLACES="weechat-dev"
|
||||||
|
@ -18,8 +17,17 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
|
||||||
-DENABLE_PERL=ON
|
-DENABLE_PERL=ON
|
||||||
-DENABLE_PYTHON3=ON
|
-DENABLE_PYTHON3=ON
|
||||||
-DENABLE_TCL=OFF
|
-DENABLE_TCL=OFF
|
||||||
|
-DENABLE_PHP=OFF
|
||||||
|
-DENABLE_JAVASCRIPT=OFF
|
||||||
|
-DENABLE_GUILE=OFF
|
||||||
|
-DENABLE_SPELL=OFF
|
||||||
|
-DENABLE_TESTS=OFF
|
||||||
|
-DSTRICT=ON
|
||||||
-DMSGFMT_EXECUTABLE=$(which msgfmt)
|
-DMSGFMT_EXECUTABLE=$(which msgfmt)
|
||||||
-DMSGMERGE_EXECUTABLE=$(which msgmerge)
|
-DMSGMERGE_EXECUTABLE=$(which msgmerge)
|
||||||
-DPKG_CONFIG_EXECUTABLE=$(which pkg-config)
|
|
||||||
-DXGETTEXT_EXECUTABLE=$(which xgettext)
|
-DXGETTEXT_EXECUTABLE=$(which xgettext)
|
||||||
"
|
"
|
||||||
|
|
||||||
|
termux_step_pre_configure() {
|
||||||
|
TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" -DPKG_CONFIG_EXECUTABLE=$PKG_CONFIG"
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,30 @@
|
||||||
|
diff -u -r ../weechat-2.7/cmake/FindGettext.cmake ./cmake/FindGettext.cmake
|
||||||
|
--- ../weechat-2.7/cmake/FindGettext.cmake 2019-12-08 08:48:53.000000000 +0000
|
||||||
|
+++ ./cmake/FindGettext.cmake 2019-12-11 23:28:42.812654000 +0000
|
||||||
|
@@ -46,25 +46,5 @@
|
||||||
|
check_include_files(libintl.h HAVE_LIBINTL_H)
|
||||||
|
|
||||||
|
if(HAVE_LIBINTL_H)
|
||||||
|
- check_function_exists(dgettext LIBC_HAS_DGETTEXT)
|
||||||
|
- if(LIBC_HAS_DGETTEXT)
|
||||||
|
- set(GETTEXT_FOUND TRUE)
|
||||||
|
- else()
|
||||||
|
- find_library(LIBINTL_LIBRARY NAMES intl
|
||||||
|
- PATHS
|
||||||
|
- /usr/local/lib
|
||||||
|
- /usr/lib
|
||||||
|
- )
|
||||||
|
- if(LIBINTL_LIBRARY)
|
||||||
|
- if(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
|
||||||
|
- set(CMAKE_REQUIRED_LIBRARIES "iconv")
|
||||||
|
- check_library_exists(${LIBINTL_LIBRARY} "libintl_dgettext" "" LIBINTL_HAS_DGETTEXT)
|
||||||
|
- else()
|
||||||
|
- check_library_exists(${LIBINTL_LIBRARY} "dgettext" "" LIBINTL_HAS_DGETTEXT)
|
||||||
|
- endif()
|
||||||
|
- if(LIBINTL_HAS_DGETTEXT)
|
||||||
|
- set(GETTEXT_FOUND TRUE)
|
||||||
|
- endif()
|
||||||
|
- endif()
|
||||||
|
- endif()
|
||||||
|
+ set(GETTEXT_FOUND TRUE)
|
||||||
|
endif()
|
|
@ -1,6 +1,6 @@
|
||||||
diff -u -r ../weechat-1.4/cmake/FindPerl.cmake ./cmake/FindPerl.cmake
|
diff -u -r ../weechat-2.7/cmake/FindPerl.cmake ./cmake/FindPerl.cmake
|
||||||
--- ../weechat-1.4/cmake/FindPerl.cmake 2016-01-10 03:17:50.000000000 -0500
|
--- ../weechat-2.7/cmake/FindPerl.cmake 2019-12-08 08:48:53.000000000 +0000
|
||||||
+++ ./cmake/FindPerl.cmake 2016-04-21 22:40:24.209760454 -0400
|
+++ ./cmake/FindPerl.cmake 2019-12-11 22:43:40.749343000 +0000
|
||||||
@@ -28,57 +28,16 @@
|
@@ -28,57 +28,16 @@
|
||||||
# PERL_CFLAGS = perl compiler options for compiling
|
# PERL_CFLAGS = perl compiler options for compiling
|
||||||
# PERL_LFLAGS = perl compiler options for linking
|
# PERL_LFLAGS = perl compiler options for linking
|
||||||
|
@ -13,7 +13,19 @@ diff -u -r ../weechat-1.4/cmake/FindPerl.cmake ./cmake/FindPerl.cmake
|
||||||
-find_program(PERL_EXECUTABLE
|
-find_program(PERL_EXECUTABLE
|
||||||
- NAMES perl perl5
|
- NAMES perl perl5
|
||||||
- PATHS /usr/bin /usr/local/bin /usr/pkg/bin
|
- PATHS /usr/bin /usr/local/bin /usr/pkg/bin
|
||||||
- )
|
+set(PERL_EXECUTABLE "@TERMUX_PREFIX@/bin/perl")
|
||||||
|
+set(PERL_INCLUDE_PATH "@TERMUX_PREFIX@/include/perl/")
|
||||||
|
+set(PERL_LIBRARY "@TERMUX_PREFIX@/lib")
|
||||||
|
+set(PERL_LFLAGS "-lperl")
|
||||||
|
+set(PERL_FOUND TRUE)
|
||||||
|
+
|
||||||
|
+mark_as_advanced(
|
||||||
|
+ PERL_EXECUTABLE
|
||||||
|
+ PERL_INCLUDE_PATH
|
||||||
|
+ PERL_LIBRARY
|
||||||
|
+ PERL_CFLAGS
|
||||||
|
+ PERL_LFLAGS
|
||||||
|
)
|
||||||
-
|
-
|
||||||
-if(PERL_EXECUTABLE)
|
-if(PERL_EXECUTABLE)
|
||||||
-
|
-
|
||||||
|
@ -59,16 +71,3 @@ diff -u -r ../weechat-1.4/cmake/FindPerl.cmake ./cmake/FindPerl.cmake
|
||||||
- PERL_LFLAGS
|
- PERL_LFLAGS
|
||||||
- )
|
- )
|
||||||
-endif()
|
-endif()
|
||||||
+set(PERL_EXECUTABLE "@TERMUX_PREFIX@/bin/perl")
|
|
||||||
+set(PERL_INCLUDE_PATH "@TERMUX_PREFIX@/include/perl/")
|
|
||||||
+set(PERL_LIBRARY "@TERMUX_PREFIX@/lib")
|
|
||||||
+set(PERL_LFLAGS "-lperl")
|
|
||||||
+set(PERL_FOUND TRUE)
|
|
||||||
+
|
|
||||||
+mark_as_advanced(
|
|
||||||
+ PERL_EXECUTABLE
|
|
||||||
+ PERL_INCLUDE_PATH
|
|
||||||
+ PERL_LIBRARY
|
|
||||||
+ PERL_CFLAGS
|
|
||||||
+ PERL_LFLAGS
|
|
||||||
+)
|
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
diff -u -r ../weechat-1.1.1/src/gui/curses/CMakeLists.txt ./src/gui/curses/CMakeLists.txt
|
diff -u -r ../weechat-2.7/src/gui/curses/CMakeLists.txt ./src/gui/curses/CMakeLists.txt
|
||||||
--- ../weechat-1.1.1/src/gui/curses/CMakeLists.txt 2015-01-25 02:40:23.000000000 -0500
|
--- ../weechat-2.7/src/gui/curses/CMakeLists.txt 2019-12-08 08:48:53.000000000 +0000
|
||||||
+++ ./src/gui/curses/CMakeLists.txt 2015-05-05 14:18:28.743723739 -0400
|
+++ ./src/gui/curses/CMakeLists.txt 2019-12-11 23:30:56.807370000 +0000
|
||||||
@@ -59,8 +59,6 @@
|
@@ -31,7 +31,7 @@
|
||||||
list(APPEND EXTRA_LIBS "socket" "nsl")
|
list(APPEND EXTRA_LIBS "network")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
-list(APPEND EXTRA_LIBS "pthread")
|
-if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Haiku")
|
||||||
-
|
+if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Haiku" AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Android")
|
||||||
if(ICONV_LIBRARY)
|
list(APPEND EXTRA_LIBS "pthread")
|
||||||
list(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue