From 719f8fbd838b8fb7c988b145c02c5dd222d49afd Mon Sep 17 00:00:00 2001 From: rsadowski Date: Sat, 11 Jan 2020 07:26:00 +0000 Subject: [PATCH] Update weechat to 2.7 and add some Makefile tweaks Changelog: https://weechat.org/news/108/20191208-Version-2.7 ok abieber zhuk --- net/weechat/Makefile | 47 ++++++++++--------- net/weechat/distinfo | 4 +- net/weechat/patches/patch-CMakeLists_txt | 25 ++++++++++ net/weechat/patches/patch-doc_CMakeLists_txt | 19 ++++---- .../patch-src_plugins_lua_CMakeLists_txt | 4 +- .../patch-src_plugins_ruby_CMakeLists_txt | 4 +- .../patches/patch-tests_CMakeLists_txt | 4 +- net/weechat/pkg/PLIST-lua | 4 +- net/weechat/pkg/PLIST-main | 35 ++++++-------- net/weechat/pkg/PLIST-python | 4 +- net/weechat/pkg/PLIST-ruby | 4 +- net/weechat/pkg/PLIST-tcl | 4 +- 12 files changed, 92 insertions(+), 66 deletions(-) create mode 100644 net/weechat/patches/patch-CMakeLists_txt diff --git a/net/weechat/Makefile b/net/weechat/Makefile index 4b8cdb9ffaf..f1adb7481fa 100644 --- a/net/weechat/Makefile +++ b/net/weechat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.44 2019/09/22 19:34:56 rsadowski Exp $ +# $OpenBSD: Makefile,v 1.45 2020/01/11 07:26:00 rsadowski Exp $ COMMENT-main= fast, light and extensible chat client COMMENT-lua= Lua bindings for weechat @@ -6,7 +6,7 @@ COMMENT-python= Python bindings for weechat COMMENT-ruby= Ruby bindings for weechat COMMENT-tcl= Tcl bindings for weechat -V= 2.6 +V= 2.7 DISTNAME= weechat-${V} PKGNAME-main= weechat-${V} @@ -46,15 +46,20 @@ MODPY_RUNDEP= No MODRUBY_RUNDEP= No BUILD_DEPENDS= devel/gettext,-tools \ - devel/cpputest + devel/cpputest \ + sysutils/flock + +RUN_DEPENDS= sysutils/flock LIB_DEPENDS= devel/gettext,-runtime \ - security/libgcrypt \ - security/gnutls \ net/curl \ + security/gnutls \ + security/libgcrypt \ textproc/aspell/core -MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3} +TEST_DEPENDS= devel/cpputest + +MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3} LIB_DEPENDS-lua= ${MODLUA_LIB_DEPENDS} RUN_DEPENDS-lua= net/weechat,-main ${MODLUA_RUN_DEPENDS} @@ -68,22 +73,22 @@ RUN_DEPENDS-ruby= net/weechat,-main ${MODRUBY_RUN_DEPENDS} LIB_DEPENDS-tcl= ${MODTCL_LIB_DEPENDS} RUN_DEPENDS-tcl= net/weechat,-main ${MODTCL_RUN_DEPENDS} -TEST_DEPENDS += devel/cpputest +CONFIGURE_ARGS= -DENABLE_SPELL=ON \ + -DENABLE_RUBY=ON \ + -DENABLE_LUA=ON \ + -DENABLE_TCL=ON \ + -DENABLE_PYTHON=ON \ + -DENABLE_TESTS=ON -CONFIGURE_ARGS+=-DENABLE_SPELL=ON \ - -DENABLE_GUILE=OFF \ - -DENABLE_RUBY=ON \ - -DENABLE_LUA=ON \ - -DENABLE_TCL=ON \ - -DENABLE_PHP=OFF \ - -DENABLE_PYTHON=ON \ - -DENABLE_JAVASCRIPT=OFF \ - -DHAVE_BACKTRACE=OFF \ - -DENABLE_TESTS=ON \ - -DCA_FILE=/etc/ssl/cert.pem \ - -DTCL_TCLSH=${MODTCL_BIN} \ - -DTCL_INCLUDE_PATH=${MODTCL_INCDIR} \ - -DMODTCL_LIB=${MODTCL_LIB} +CONFIGURE_ARGS+= -DENABLE_GUILE=OFF \ + -DENABLE_PHP=OFF \ + -DENABLE_JAVASCRIPT=OFF \ + -DHAVE_BACKTRACE=OFF + +CONFIGURE_ARGS+= -DCA_FILE=/etc/ssl/cert.pem \ + -DTCL_TCLSH=${MODTCL_BIN} \ + -DTCL_INCLUDE_PATH=${MODTCL_INCDIR} \ + -DMODTCL_LIB=${MODTCL_LIB} pre-configure: rm -f ${WRKSRC}/cmake/{FindLua,FindRuby,FindTCL}.cmake diff --git a/net/weechat/distinfo b/net/weechat/distinfo index 82bf6aa7f09..243bed1679a 100644 --- a/net/weechat/distinfo +++ b/net/weechat/distinfo @@ -1,2 +1,2 @@ -SHA256 (weechat-2.6.tar.gz) = 76n/U7eM+6S/HEnsrBZRg4po0RCfdlM7cD7JCSBhn8I= -SIZE (weechat-2.6.tar.gz) = 4212612 +SHA256 (weechat-2.7.tar.gz) = UDikfG6H5W/Nk3rMFZ2J92hFpBKJI8EAcAq6p8Xbeu0= +SIZE (weechat-2.7.tar.gz) = 4393859 diff --git a/net/weechat/patches/patch-CMakeLists_txt b/net/weechat/patches/patch-CMakeLists_txt new file mode 100644 index 00000000000..7a56a0dd9ab --- /dev/null +++ b/net/weechat/patches/patch-CMakeLists_txt @@ -0,0 +1,25 @@ +$OpenBSD: patch-CMakeLists_txt,v 1.1 2020/01/11 07:26:00 rsadowski Exp $ + +Disable icons and weechat.desktop to avoid GUI dependencies + +Index: CMakeLists.txt +--- CMakeLists.txt.orig ++++ CMakeLists.txt +@@ -235,7 +235,7 @@ if(DL_LIBRARY) + list(APPEND EXTRA_LIBS dl) + endif() + +-add_subdirectory(icons) ++#add_subdirectory(icons) + + if(ENABLE_NLS) + add_subdirectory(po) +@@ -302,7 +302,7 @@ if(CYGWIN) + endif() + + # desktop file +-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.desktop DESTINATION ${SHAREDIR}/applications) ++#install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.desktop DESTINATION ${SHAREDIR}/applications) + + # packages + set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Fast, light and extensible chat client") diff --git a/net/weechat/patches/patch-doc_CMakeLists_txt b/net/weechat/patches/patch-doc_CMakeLists_txt index e81986db15e..39574a03c7e 100644 --- a/net/weechat/patches/patch-doc_CMakeLists_txt +++ b/net/weechat/patches/patch-doc_CMakeLists_txt @@ -1,10 +1,11 @@ -$OpenBSD: patch-doc_CMakeLists_txt,v 1.7 2017/03/23 01:46:23 danj Exp $ ---- doc/CMakeLists.txt.orig Sun Jan 15 01:41:25 2017 -+++ doc/CMakeLists.txt Sun Mar 12 20:36:40 2017 -@@ -26,15 +26,15 @@ if(ENABLE_MAN OR ENABLE_DOC) - +$OpenBSD: patch-doc_CMakeLists_txt,v 1.8 2020/01/11 07:26:00 rsadowski Exp $ +Index: doc/CMakeLists.txt +--- doc/CMakeLists.txt.orig ++++ doc/CMakeLists.txt +@@ -22,15 +22,15 @@ if(ENABLE_MAN OR ENABLE_DOC) + find_package(Asciidoctor) + if(ASCIIDOCTOR_FOUND) set(ASCIIDOCTOR_ARGS -a experimental -a icons=font -a revnumber="${VERSION}" -a sectanchors -a source-highlighter=prettify) - - add_subdirectory(cs) - add_subdirectory(de) - add_subdirectory(en) @@ -22,7 +23,7 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.7 2017/03/23 01:46:23 danj Exp $ +# add_subdirectory(it) +# add_subdirectory(ja) +# add_subdirectory(pl) -+# #add_subdirectory(ru) - ++# add_subdirectory(ru) + else() + message(SEND_ERROR "Asciidoctor not found") endif() - diff --git a/net/weechat/patches/patch-src_plugins_lua_CMakeLists_txt b/net/weechat/patches/patch-src_plugins_lua_CMakeLists_txt index 3e40e4fd29c..4c02444d641 100644 --- a/net/weechat/patches/patch-src_plugins_lua_CMakeLists_txt +++ b/net/weechat/patches/patch-src_plugins_lua_CMakeLists_txt @@ -1,8 +1,8 @@ -$OpenBSD: patch-src_plugins_lua_CMakeLists_txt,v 1.2 2019/07/12 04:42:34 rsadowski Exp $ +$OpenBSD: patch-src_plugins_lua_CMakeLists_txt,v 1.3 2020/01/11 07:26:00 rsadowski Exp $ Index: src/plugins/lua/CMakeLists.txt --- src/plugins/lua/CMakeLists.txt.orig +++ src/plugins/lua/CMakeLists.txt -@@ -24,8 +24,8 @@ weechat-lua-api.h) +@@ -25,8 +25,8 @@ add_library(lua MODULE set_target_properties(lua PROPERTIES PREFIX "") if(LUA_FOUND) diff --git a/net/weechat/patches/patch-src_plugins_ruby_CMakeLists_txt b/net/weechat/patches/patch-src_plugins_ruby_CMakeLists_txt index 02bfb814918..d34c1562aed 100644 --- a/net/weechat/patches/patch-src_plugins_ruby_CMakeLists_txt +++ b/net/weechat/patches/patch-src_plugins_ruby_CMakeLists_txt @@ -1,8 +1,8 @@ -$OpenBSD: patch-src_plugins_ruby_CMakeLists_txt,v 1.2 2019/07/12 04:42:34 rsadowski Exp $ +$OpenBSD: patch-src_plugins_ruby_CMakeLists_txt,v 1.3 2020/01/11 07:26:00 rsadowski Exp $ Index: src/plugins/ruby/CMakeLists.txt --- src/plugins/ruby/CMakeLists.txt.orig +++ src/plugins/ruby/CMakeLists.txt -@@ -24,9 +24,7 @@ set_target_properties(ruby PROPERTIES PREFIX "") +@@ -25,9 +25,7 @@ set_target_properties(ruby PROPERTIES PREFIX "") if(RUBY_FOUND) include_directories(${RUBY_INCLUDE_DIRS}) diff --git a/net/weechat/patches/patch-tests_CMakeLists_txt b/net/weechat/patches/patch-tests_CMakeLists_txt index 97f052406f3..1c36883afcc 100644 --- a/net/weechat/patches/patch-tests_CMakeLists_txt +++ b/net/weechat/patches/patch-tests_CMakeLists_txt @@ -1,9 +1,9 @@ -$OpenBSD: patch-tests_CMakeLists_txt,v 1.2 2019/09/22 19:34:56 rsadowski Exp $ +$OpenBSD: patch-tests_CMakeLists_txt,v 1.3 2020/01/11 07:26:00 rsadowski Exp $ Index: tests/CMakeLists.txt --- tests/CMakeLists.txt.orig +++ tests/CMakeLists.txt -@@ -59,7 +59,7 @@ if(ICONV_LIBRARY) +@@ -61,7 +61,7 @@ if(ICONV_LIBRARY) list(APPEND EXTRA_LIBS ${ICONV_LIBRARY}) endif() diff --git a/net/weechat/pkg/PLIST-lua b/net/weechat/pkg/PLIST-lua index 5a0bc8d3790..c61ddea78cc 100644 --- a/net/weechat/pkg/PLIST-lua +++ b/net/weechat/pkg/PLIST-lua @@ -1,2 +1,2 @@ -@comment $OpenBSD: PLIST-lua,v 1.1.1.1 2012/06/26 15:06:42 sthen Exp $ -lib/weechat/plugins/lua.so +@comment $OpenBSD: PLIST-lua,v 1.2 2020/01/11 07:26:00 rsadowski Exp $ +@so lib/weechat/plugins/lua.so diff --git a/net/weechat/pkg/PLIST-main b/net/weechat/pkg/PLIST-main index 285b953f947..563d9332968 100644 --- a/net/weechat/pkg/PLIST-main +++ b/net/weechat/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.12 2019/07/12 04:42:35 rsadowski Exp $ +@comment $OpenBSD: PLIST-main,v 1.13 2020/01/11 07:26:00 rsadowski Exp $ @bin bin/weechat bin/weechat-curses @bin bin/weechat-headless @@ -7,20 +7,20 @@ include/weechat/weechat-plugin.h lib/pkgconfig/weechat.pc lib/weechat/ lib/weechat/plugins/ -lib/weechat/plugins/alias.so -lib/weechat/plugins/buflist.so -lib/weechat/plugins/charset.so -lib/weechat/plugins/exec.so -lib/weechat/plugins/fifo.so -lib/weechat/plugins/fset.so -lib/weechat/plugins/irc.so -lib/weechat/plugins/logger.so -lib/weechat/plugins/perl.so -lib/weechat/plugins/relay.so -lib/weechat/plugins/script.so -lib/weechat/plugins/spell.so -lib/weechat/plugins/trigger.so -lib/weechat/plugins/xfer.so +@so lib/weechat/plugins/alias.so +@so lib/weechat/plugins/buflist.so +@so lib/weechat/plugins/charset.so +@so lib/weechat/plugins/exec.so +@so lib/weechat/plugins/fifo.so +@so lib/weechat/plugins/fset.so +@so lib/weechat/plugins/irc.so +@so lib/weechat/plugins/logger.so +@so lib/weechat/plugins/perl.so +@so lib/weechat/plugins/relay.so +@so lib/weechat/plugins/script.so +@so lib/weechat/plugins/spell.so +@so lib/weechat/plugins/trigger.so +@so lib/weechat/plugins/xfer.so share/doc/weechat/ share/doc/weechat/weechat_dev.en.adoc share/doc/weechat/weechat_faq.en.adoc @@ -30,11 +30,6 @@ share/doc/weechat/weechat_relay_protocol.en.adoc share/doc/weechat/weechat_scripting.en.adoc share/doc/weechat/weechat_tester.en.adoc share/doc/weechat/weechat_user.en.adoc -@comment share/icons/ -@comment share/icons/hicolor/ -@comment share/icons/hicolor/32x32/ -@comment share/icons/hicolor/32x32/apps/ -@comment share/icons/hicolor/32x32/apps/weechat.png share/locale/cs/LC_MESSAGES/weechat.mo share/locale/de/LC_MESSAGES/weechat.mo share/locale/es/LC_MESSAGES/weechat.mo diff --git a/net/weechat/pkg/PLIST-python b/net/weechat/pkg/PLIST-python index 70d6622eb2c..b929c40a97c 100644 --- a/net/weechat/pkg/PLIST-python +++ b/net/weechat/pkg/PLIST-python @@ -1,2 +1,2 @@ -@comment $OpenBSD: PLIST-python,v 1.1.1.1 2012/06/26 15:06:42 sthen Exp $ -lib/weechat/plugins/python.so +@comment $OpenBSD: PLIST-python,v 1.2 2020/01/11 07:26:00 rsadowski Exp $ +@so lib/weechat/plugins/python.so diff --git a/net/weechat/pkg/PLIST-ruby b/net/weechat/pkg/PLIST-ruby index a71fb52e1b3..11290ff4260 100644 --- a/net/weechat/pkg/PLIST-ruby +++ b/net/weechat/pkg/PLIST-ruby @@ -1,2 +1,2 @@ -@comment $OpenBSD: PLIST-ruby,v 1.1.1.1 2012/06/26 15:06:42 sthen Exp $ -lib/weechat/plugins/ruby.so +@comment $OpenBSD: PLIST-ruby,v 1.2 2020/01/11 07:26:00 rsadowski Exp $ +@so lib/weechat/plugins/ruby.so diff --git a/net/weechat/pkg/PLIST-tcl b/net/weechat/pkg/PLIST-tcl index 59f6ef0da6d..04ea3cbc125 100644 --- a/net/weechat/pkg/PLIST-tcl +++ b/net/weechat/pkg/PLIST-tcl @@ -1,2 +1,2 @@ -@comment $OpenBSD: PLIST-tcl,v 1.1.1.1 2012/06/26 15:06:42 sthen Exp $ -lib/weechat/plugins/tcl.so +@comment $OpenBSD: PLIST-tcl,v 1.2 2020/01/11 07:26:00 rsadowski Exp $ +@so lib/weechat/plugins/tcl.so