diff options
author | joerg <joerg@pkgsrc.org> | 2013-08-30 16:56:56 +0000 |
---|---|---|
committer | joerg <joerg@pkgsrc.org> | 2013-08-30 16:56:56 +0000 |
commit | 4656f150039adc07424d29727b1422a248715fdf (patch) | |
tree | 6ba7c21ccb396b8b890fd9d9a3f58a46f96009b6 /chat/weechat/patches | |
parent | 53b1bc22608908b6a767e9e8e98a06ad259e7a76 (diff) | |
download | pkgsrc-4656f150039adc07424d29727b1422a248715fdf.tar.gz |
Link with curses on NetBSD. Don't try to overwrite terminfo internals
that are const. Drop --package-name.
Diffstat (limited to 'chat/weechat/patches')
-rw-r--r-- | chat/weechat/patches/patch-po_CMakeLists.txt | 13 | ||||
-rw-r--r-- | chat/weechat/patches/patch-src_gui_curses_CMakeLists_txt | 15 | ||||
-rw-r--r-- | chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c | 15 |
3 files changed, 38 insertions, 5 deletions
diff --git a/chat/weechat/patches/patch-po_CMakeLists.txt b/chat/weechat/patches/patch-po_CMakeLists.txt new file mode 100644 index 00000000000..ba059784ec3 --- /dev/null +++ b/chat/weechat/patches/patch-po_CMakeLists.txt @@ -0,0 +1,13 @@ +$NetBSD: patch-po_CMakeLists.txt,v 1.1 2013/08/30 16:56:56 joerg Exp $ + +--- po/CMakeLists.txt.orig 2013-08-30 13:48:27.000000000 +0000 ++++ po/CMakeLists.txt +@@ -55,7 +55,7 @@ IF(XGETTEXT_EXECUTABLE AND MSGMERGE_EXEC + ADD_CUSTOM_COMMAND( + OUTPUT ${POT_FILE_PATH} + COMMAND ${XGETTEXT_EXECUTABLE} +- ARGS -o ${POT_FILE_PATH} --add-comments='TRANSLATORS:' --keyword='_' --keyword='weechat_gettext' --keyword='N_' --keyword='NG_:1,2' --keyword='weechat_ngettext:1,2' --no-location --directory=${CMAKE_SOURCE_DIR} --package-name='WeeChat' --package-version=${VERSION} --msgid-bugs-address=${BUGS_ADDRESS} --copyright-holder='NAME' ${SRC_FILES} ++ ARGS -o ${POT_FILE_PATH} --add-comments='TRANSLATORS:' --keyword='_' --keyword='weechat_gettext' --keyword='N_' --keyword='NG_:1,2' --keyword='weechat_ngettext:1,2' --no-location --directory=${CMAKE_SOURCE_DIR} --msgid-bugs-address=${BUGS_ADDRESS} --copyright-holder='NAME' ${SRC_FILES} + DEPENDS ${POT_DEPENDS} + COMMENT "Generating ${POT_FILE}" + ) diff --git a/chat/weechat/patches/patch-src_gui_curses_CMakeLists_txt b/chat/weechat/patches/patch-src_gui_curses_CMakeLists_txt index 79ce18aa432..897849e57a8 100644 --- a/chat/weechat/patches/patch-src_gui_curses_CMakeLists_txt +++ b/chat/weechat/patches/patch-src_gui_curses_CMakeLists_txt @@ -1,8 +1,8 @@ -$NetBSD: patch-src_gui_curses_CMakeLists_txt,v 1.1 2013/06/09 21:19:02 tonio Exp $ +$NetBSD: patch-src_gui_curses_CMakeLists_txt,v 1.2 2013/08/30 16:56:56 joerg Exp $ Test for ncursesw ---- src/gui/curses/CMakeLists.txt.orig 2013-06-09 20:57:43.000000000 +0000 +--- src/gui/curses/CMakeLists.txt.orig 2013-05-20 08:06:14.000000000 +0000 +++ src/gui/curses/CMakeLists.txt @@ -34,9 +34,11 @@ SET(EXECUTABLE weechat-curses) @@ -17,3 +17,14 @@ Test for ncursesw ELSE(NCURSESW_HEADERS) CHECK_INCLUDE_FILES(ncurses.h NCURSES_HEADERS) IF(NCURSES_HEADERS) +@@ -57,6 +59,10 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBS + LIST(APPEND EXTRA_LIBS "pthread") + ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD") + ++IF(${CMAKE_SYSTEM_NAME} STREQUAL "NetBSD") ++ LIST(APPEND EXTRA_LIBS "curses") ++ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "NetBSD") ++ + IF(ICONV_LIBRARY) + LIST(APPEND EXTRA_LIBS ${ICONV_LIBRARY}) + ENDIF(ICONV_LIBRARY) diff --git a/chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c b/chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c index 8fb251a81db..ce88f282cc7 100644 --- a/chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c +++ b/chat/weechat/patches/patch-src_gui_curses_gui-curses-term_c @@ -1,4 +1,4 @@ -$NetBSD: patch-src_gui_curses_gui-curses-term_c,v 1.2 2013/05/11 18:31:11 riastradh Exp $ +$NetBSD: patch-src_gui_curses_gui-curses-term_c,v 1.3 2013/08/30 16:56:56 joerg Exp $ Include <ncurses/term.h>, not <ncursesw/term.h>. Check for HAVE_NCURSES_TERM_H, not for HAVE_NCURSES_CURSES_H. @@ -6,9 +6,9 @@ Check for HAVE_NCURSES_TERM_H, not for HAVE_NCURSES_CURSES_H. Workaround for build failure on early NetBSD 6.99.* and prerelease 6.0 (PR 46492) ---- src/gui/curses/gui-curses-term.c.orig 2012-03-10 07:56:43.000000000 +0000 +--- src/gui/curses/gui-curses-term.c.orig 2013-05-20 08:06:14.000000000 +0000 +++ src/gui/curses/gui-curses-term.c -@@ -25,9 +25,13 @@ +@@ -23,9 +23,13 @@ #include "config.h" #endif @@ -24,3 +24,12 @@ Workaround for build failure on early NetBSD 6.99.* and prerelease 6.0 #include <term.h> #endif +@@ -41,7 +45,7 @@ + void + gui_term_set_eat_newline_glitch (int value) + { +-#ifdef HAVE_EAT_NEWLINE_GLITCH ++#if defined(HAVE_EAT_NEWLINE_GLITCH) && !defined(__NetBSD__) + eat_newline_glitch = value; + #else + /* make C compiler happy */ |