From c60ddb85e298e0c66d9fcaca1a596bf71055180c Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 5 May 2020 16:38:29 +0200 Subject: [PATCH] weechat: bump version. --- net-irc/weechat/patches/weechat-2.6.patchset | 39 ------------------- ...{weechat-2.6.recipe => weechat-2.8.recipe} | 15 +++++-- 2 files changed, 12 insertions(+), 42 deletions(-) delete mode 100644 net-irc/weechat/patches/weechat-2.6.patchset rename net-irc/weechat/{weechat-2.6.recipe => weechat-2.8.recipe} (84%) diff --git a/net-irc/weechat/patches/weechat-2.6.patchset b/net-irc/weechat/patches/weechat-2.6.patchset deleted file mode 100644 index b3cc296ac..000000000 --- a/net-irc/weechat/patches/weechat-2.6.patchset +++ /dev/null @@ -1,39 +0,0 @@ -From fd03745a74c99ea33d52c239f7f22785872cc7dd Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Sat, 20 Feb 2016 11:34:21 +0000 -Subject: Haiku patch - - -diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt -index b2ef514..17931f7 100644 ---- a/src/gui/curses/CMakeLists.txt -+++ b/src/gui/curses/CMakeLists.txt -@@ -27,7 +27,13 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS") - list(APPEND EXTRA_LIBS "socket" "nsl") - endif() - --list(APPEND EXTRA_LIBS "pthread") -+if(${CMAKE_SYSTEM_NAME} STREQUAL "Haiku") -+ list(APPEND EXTRA_LIBS "network") -+endif() -+ -+if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Haiku") -+ list(APPEND EXTRA_LIBS "pthread") -+endif() - - if(ICONV_LIBRARY) - list(APPEND EXTRA_LIBS ${ICONV_LIBRARY}) -@@ -37,7 +43,9 @@ if(LIBINTL_LIBRARY) - list(APPEND EXTRA_LIBS ${LIBINTL_LIBRARY}) - endif() - --list(APPEND EXTRA_LIBS "m") -+if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Haiku") -+ list(APPEND EXTRA_LIBS "m") -+endif() - - list(APPEND EXTRA_LIBS ${CURL_LIBRARIES}) - --- -2.19.1 - diff --git a/net-irc/weechat/weechat-2.6.recipe b/net-irc/weechat/weechat-2.8.recipe similarity index 84% rename from net-irc/weechat/weechat-2.6.recipe rename to net-irc/weechat/weechat-2.8.recipe index 535d4acd1..9f33337cc 100644 --- a/net-irc/weechat/weechat-2.6.recipe +++ b/net-irc/weechat/weechat-2.8.recipe @@ -5,11 +5,10 @@ It is highly customizable and extensible with scripts." HOMEPAGE="https://weechat.org/" COPYRIGHT="2003-2019 Sébastien Helleu" LICENSE="GNU GPL v3" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/weechat/weechat/archive/v$portVersion.tar.gz" SOURCE_FILENAME="weechat-$portVersion.tar.gz" -CHECKSUM_SHA256="fa416e43f86a67e521bc1a4c1949d2032495864568af31016b9840bcfca35033" -PATCHES="weechat-$portVersion.patchset" +CHECKSUM_SHA256="69da6874e2d583b4a4666b166f520ee45b6ac84544a4a9434030f82989893c88" ARCHITECTURES="!x86_gcc2 x86 x86_64" if [ "$targetArchitecture" = x86_gcc2 ]; then @@ -28,6 +27,7 @@ REQUIRES=" lib:libgcrypt$secondaryArchSuffix lib:libgnutls$secondaryArchSuffix lib:libgpg_error$secondaryArchSuffix # for libgcrypt + lib:libiconv$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:liblua$secondaryArchSuffix >= 5.3 lib:libncurses$secondaryArchSuffix @@ -46,6 +46,7 @@ BUILD_REQUIRES=" devel:libcurl$secondaryArchSuffix devel:libgcrypt$secondaryArchSuffix devel:libgnutls$secondaryArchSuffix + devel:libiconv$secondaryArchSuffix devel:libintl$secondaryArchSuffix devel:liblua$secondaryArchSuffix >= 5.3 devel:libncurses$secondaryArchSuffix @@ -67,6 +68,14 @@ BUILD() -DINCLUDEDIR=$includeDir \ -DWEECHAT_HOME=~/config/settings/weechat \ -DSHAREDIR=$dataDir \ + -DENABLE_PERL=OFF \ + -DENABLE_PHP=OFF \ + -DENABLE_PYTHON=OFF \ + -DENABLE_SPELL=OFF \ + -DENABLE_JAVASCRIPT=OFF \ + -DENABLE_TCL=OFF \ + -DENABLE_GUILE=OFF \ + -DENABLE_RUBY=OFF \ .. make $jobArgs }