Commit bb577d24 authored by John Johnson's avatar John Johnson

net-irc/weechat: revbump

* python3.7 added
* cleanup ruby versions supported
* newer patch corresponding to diff lines in new sources
parent dbdba48c
src/gui/curses/CMakeLists.txt | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt
index 284956f..492fc77 100644
--- a/src/gui/curses/CMakeLists.txt
+++ b/src/gui/curses/CMakeLists.txt
@@ -35,7 +35,14 @@ main.c)
set(EXECUTABLE weechat)
-find_package(Ncurses)
+
+find_package(PkgConfig)
+pkg_search_module(NCURSES ncursesw ncurses)
+
+if(NOT NCURSES_FOUND)
+ find_package(Ncurses)
+endif(NCURSES_FOUND)
+
if(NCURSES_FOUND)
check_include_files(ncursesw/ncurses.h NCURSESW_HEADERS)
if(NCURSESW_HEADERS)
@@ -46,7 +53,7 @@ if(NCURSES_FOUND)
add_definitions(-DHAVE_NCURSES_H)
endif()
endif()
- list(APPEND EXTRA_LIBS ${NCURSES_LIBRARY})
+ list(APPEND EXTRA_LIBS ${NCURSES_LIBRARY} ${NCURSES_LIBRARIES} )
endif()
if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
......@@ -2,7 +2,7 @@ Use pkgconfig to find ncurses libs in order to support separate libtinfo.
--- weechat-2.1/src/gui/curses/normal/CMakeLists.txt
+++ weechat-2.1/src/gui/curses/normal/CMakeLists.txt
@@ -29,7 +29,13 @@
@@ -32,7 +32,13 @@
../gui-curses-window.c
)
......@@ -17,7 +17,7 @@ Use pkgconfig to find ncurses libs in order to support separate libtinfo.
if(NCURSES_FOUND)
check_include_files(ncursesw/ncurses.h NCURSESW_HEADERS)
if(NCURSESW_HEADERS)
@@ -54,7 +60,7 @@
@@ -57,7 +63,7 @@
add_dependencies(${EXECUTABLE} weechat_gui_curses_normal)
......
......@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python{2_7,3_5,3_6} )
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
CMAKE_MAKEFILE_GENERATOR=emake
inherit python-single-r1 cmake-utils
......@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
EGIT_REPO_URI="https://github.com/weechat/weechat.git"
else
SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
KEYWORDS="~amd64 ~x86 ~x64-macos"
KEYWORDS="amd64 ~arm x86 ~x64-macos"
fi
DESCRIPTION="Portable and multi-interface IRC client"
......@@ -40,7 +40,7 @@ RDEPEND="
perl? ( dev-lang/perl:= )
php? ( >=dev-lang/php-7.0:* )
python? ( ${PYTHON_DEPS} )
ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.2 ) )
ruby? ( || ( dev-lang/ruby:2.5 dev-lang/ruby:2.4 dev-lang/ruby:2.3 ) )
ssl? ( net-libs/gnutls )
spell? ( app-text/aspell )
tcl? ( >=dev-lang/tcl-8.4.15:0= )
......@@ -59,7 +59,7 @@ DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.ado
# tests need to be fixed to not use system plugins if weechat is already installed
RESTRICT="test"
PATCHES=( "${FILESDIR}"/${PN}-2.1-tinfo.patch )
PATCHES=( "${FILESDIR}"/${PN}-2.2-tinfo.patch )
pkg_setup() {
use python && python-single-r1_pkg_setup
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment