pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/chat/weechat weechat: Drop patches that are no longer ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/7da1eea1ac40
branches: trunk
changeset: 426296:7da1eea1ac40
user: nia <nia%pkgsrc.org@localhost>
date: Mon Mar 30 11:07:18 2020 +0000
description:
weechat: Drop patches that are no longer needed.
diffstat:
chat/weechat/Makefile | 12 ++-
chat/weechat/distinfo | 8 +-
chat/weechat/options.mk | 8 +--
chat/weechat/patches/patch-CMakeLists.txt | 41 ------------
chat/weechat/patches/patch-cmake_FindNcurses.cmake | 24 -------
chat/weechat/patches/patch-src_core_weechat.c | 4 +-
chat/weechat/patches/patch-src_plugins_charset_charset.c | 14 ----
chat/weechat/patches/patch-src_plugins_python_CMakeLists.txt | 15 ----
8 files changed, 12 insertions(+), 114 deletions(-)
diffs (191 lines):
diff -r ccdb692c8696 -r 7da1eea1ac40 chat/weechat/Makefile
--- a/chat/weechat/Makefile Mon Mar 30 10:53:56 2020 +0000
+++ b/chat/weechat/Makefile Mon Mar 30 11:07:18 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2020/03/30 09:31:52 nia Exp $
+# $NetBSD: Makefile,v 1.113 2020/03/30 11:07:18 nia Exp $
DISTNAME= weechat-2.8
CATEGORIES= chat
@@ -35,12 +35,14 @@
BUILDLINK_TRANSFORM+= rm:-Werror-implicit-function-declaration
-# use standard cmake mechanisms for detecting python
-# works better with pkgsrc.
+.include "options.mk"
+
pre-configure:
- ${RM} -f ${WRKSRC}/cmake/FindPython.cmake
+.if !empty(PKG_OPTIONS:Mpython)
+ ${LN} -sf ${BUILDLINK_DIR}/lib/pkgconfig/python-${PYVERSSUFFIX}.pc \
+ ${BUILDLINK_DIR}/lib/pkgconfig/python3.pc
+.endif
-.include "options.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
diff -r ccdb692c8696 -r 7da1eea1ac40 chat/weechat/distinfo
--- a/chat/weechat/distinfo Mon Mar 30 10:53:56 2020 +0000
+++ b/chat/weechat/distinfo Mon Mar 30 11:07:18 2020 +0000
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.60 2020/03/30 09:31:52 nia Exp $
+$NetBSD: distinfo,v 1.61 2020/03/30 11:07:18 nia Exp $
SHA1 (weechat-2.8.tar.xz) = fec7018168f2fa973b1a4d8224fdac8b59617ada
RMD160 (weechat-2.8.tar.xz) = 6c1453c5b97ba061bc2539033e62eb7f07ee52c8
SHA512 (weechat-2.8.tar.xz) = 3bebb42118fca6b601f1de8f4d52378619a10e5c490f5b46f86d27a9680f00a56d48a1ade729e78d965cae589e6c80647c22414393000c7d3cfcc94a1e41c4df
Size (weechat-2.8.tar.xz) = 2248868 bytes
-SHA1 (patch-CMakeLists.txt) = 493e49c0c698ff7b2685ba489d693fc1d388318d
-SHA1 (patch-cmake_FindNcurses.cmake) = 93969b86538f1b707903dce4691af99a67ede6ce
SHA1 (patch-po_CMakeLists.txt) = 014b42ff303a4e4213de95339ab97f029f38a068
-SHA1 (patch-src_core_weechat.c) = 062cd7443a756edbdf60289a7847b4278d520105
-SHA1 (patch-src_plugins_charset_charset.c) = f0b6e5268908caab5efa8048c8a55b0083ec0ca4
+SHA1 (patch-src_core_weechat.c) = aeb3cb052976e6b4603d3515ffc40bed98434a9f
SHA1 (patch-src_plugins_perl_weechat-perl.c) = 49e61419ea82157fa54a7847a653625944d3b341
-SHA1 (patch-src_plugins_python_CMakeLists.txt) = 1f425f6c852c5973f84eea0add3c63bb6fcfa772
diff -r ccdb692c8696 -r 7da1eea1ac40 chat/weechat/options.mk
--- a/chat/weechat/options.mk Mon Mar 30 10:53:56 2020 +0000
+++ b/chat/weechat/options.mk Mon Mar 30 11:07:18 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.23 2019/12/06 15:39:06 jperkin Exp $
+# $NetBSD: options.mk,v 1.24 2020/03/30 11:07:18 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.weechat
# mk/curses will handle wide-curses
@@ -18,12 +18,6 @@
PYTHON_VERSIONS_INCOMPATIBLE= 27
.include "../../lang/python/extension.mk"
CMAKE_ARGS+= -DENABLE_PYTHON=ON
-CMAKE_ARGS+= -DPython_EXECUTABLE=${PYTHONBIN}
-. if ${OPSYS} == "Darwin"
-CMAKE_ARGS+= -DPYTHON_LIBRARIES=${PREFIX}/lib/libpython${PYVERSSUFFIX}.dylib
-. else
-CMAKE_ARGS+= -DPYTHON_LIBRARIES=${PREFIX}/lib/libpython${PYVERSSUFFIX}.so
-. endif
PLIST.python= yes
.else
CMAKE_ARGS+= -DENABLE_PYTHON=OFF
diff -r ccdb692c8696 -r 7da1eea1ac40 chat/weechat/patches/patch-CMakeLists.txt
--- a/chat/weechat/patches/patch-CMakeLists.txt Mon Mar 30 10:53:56 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2017/11/04 17:23:20 maya Exp $
-
-Check that eat_newline_glitch can be assigned to
-
---- CMakeLists.txt.orig 2017-09-23 11:08:45.000000000 +0000
-+++ CMakeLists.txt
-@@ -150,7 +150,33 @@ check_include_files("sys/resource.h" HAV
-
- check_function_exists(mallinfo HAVE_MALLINFO)
-
--check_symbol_exists("eat_newline_glitch" "term.h" HAVE_EAT_NEWLINE_GLITCH)
-+include(CheckCSourceCompiles)
-+find_package(Ncurses)
-+check_include_files(ncursesw/term.h HAVE_NCURSESW_TERM_H)
-+check_include_files(ncurses/term.h HAVE_NCURSES_TERM_H)
-+
-+
-+set(OLD_CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
-+
-+if(NCURSES_FOUND)
-+ set(CMAKE_REQUIRED_LIBRARIES "ncurses")
-+else()
-+ set(CMAKE_REQUIRED_LIBRARIES "curses")
-+endif()
-+
-+CHECK_C_SOURCE_COMPILES("
-+ #ifdef HAVE_NCURSES_TERM_H
-+ #include <ncurses/term.h>
-+ #endif
-+ #include <term.h>
-+
-+ int main() {
-+ eat_newline_glitch = 1;
-+ return 0;
-+ }
-+ " HAVE_EAT_NEWLINE_GLITCH)
-+
-+set(CMAKE_REQUIRED_LIBRARIES "${OLD_CMAKE_REQUIRED_LIBRARIES}")
-
- # Check for Large File Support
- if(ENABLE_LARGEFILE)
diff -r ccdb692c8696 -r 7da1eea1ac40 chat/weechat/patches/patch-cmake_FindNcurses.cmake
--- a/chat/weechat/patches/patch-cmake_FindNcurses.cmake Mon Mar 30 10:53:56 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-cmake_FindNcurses.cmake,v 1.4 2019/09/17 11:30:27 nia Exp $
-
-Don't try to look for ncurses.h, so FAKE_NCURSES works for netbsd curses.
-
---- cmake/FindNcurses.cmake.orig 2019-09-08 06:13:58.000000000 +0000
-+++ cmake/FindNcurses.cmake
-@@ -22,7 +22,7 @@ if(NCURSES_FOUND)
- endif()
-
- find_path(NCURSES_INCLUDE_PATH
-- NAMES ncurses.h curses.h
-+ NAMES curses.h ncurses.h
- PATH_SUFFIXES ncursesw ncurses
- PATHS /usr/include /usr/local/include /usr/pkg/include
- )
-@@ -41,7 +41,7 @@ if(NCURSESW_LIBRARY)
- set(NCURSES_LIBRARY ${NCURSESW_LIBRARY})
- else()
- find_library(NCURSES_LIBRARY
-- NAMES ncurses
-+ NAMES curses ncurses
- PATHS /lib /usr/lib /usr/local/lib /usr/pkg/lib
- )
- find_package(PkgConfig QUIET)
diff -r ccdb692c8696 -r 7da1eea1ac40 chat/weechat/patches/patch-src_core_weechat.c
--- a/chat/weechat/patches/patch-src_core_weechat.c Mon Mar 30 10:53:56 2020 +0000
+++ b/chat/weechat/patches/patch-src_core_weechat.c Mon Mar 30 11:07:18 2020 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_core_weechat.c,v 1.1 2019/03/07 18:09:24 jperkin Exp $
+$NetBSD: patch-src_core_weechat.c,v 1.2 2020/03/30 11:07:18 nia Exp $
-Need unistd.h for mkdtemp(3).
+Need unistd.h for mkdtemp(3) (on what platform?)
--- src/core/weechat.c.orig 2019-02-17 07:20:07.000000000 +0000
+++ src/core/weechat.c
diff -r ccdb692c8696 -r 7da1eea1ac40 chat/weechat/patches/patch-src_plugins_charset_charset.c
--- a/chat/weechat/patches/patch-src_plugins_charset_charset.c Mon Mar 30 10:53:56 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_plugins_charset_charset.c,v 1.1 2013/12/12 20:17:56 jperkin Exp $
-
-Need strings.h for strcasecmp()
-
---- src/plugins/charset/charset.c.orig 2013-05-20 08:06:14.000000000 +0000
-+++ src/plugins/charset/charset.c
-@@ -25,6 +25,7 @@
- #define __USE_GNU
- #endif
- #include <string.h>
-+#include <strings.h>
- #include <iconv.h>
-
- #include "../weechat-plugin.h"
diff -r ccdb692c8696 -r 7da1eea1ac40 chat/weechat/patches/patch-src_plugins_python_CMakeLists.txt
--- a/chat/weechat/patches/patch-src_plugins_python_CMakeLists.txt Mon Mar 30 10:53:56 2020 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_plugins_python_CMakeLists.txt,v 1.1 2019/12/10 13:04:06 nia Exp $
-
-We do not ship pkg-config files for python.
-
---- src/plugins/python/CMakeLists.txt.orig 2019-12-08 08:48:53.000000000 +0000
-+++ src/plugins/python/CMakeLists.txt
-@@ -24,7 +24,7 @@ add_library(python MODULE
- set_target_properties(python PROPERTIES PREFIX "")
-
- if(PYTHON_FOUND)
-- target_link_libraries(python PkgConfig::PYTHON weechat_plugins_scripts coverage_config)
-+ target_link_libraries(python ${PYTHON_LIBRARIES} weechat_plugins_scripts coverage_config)
- endif()
-
- install(TARGETS python LIBRARY DESTINATION ${WEECHAT_LIBDIR}/plugins)
Home |
Main Index |
Thread Index |
Old Index