mirror of
https://github.com/openbsd/ports.git
synced 2026-06-17 23:13:55 +02:00
Update weechat to 4.9.0
This commit is contained in:
@@ -4,8 +4,7 @@ COMMENT-python= Python bindings for weechat
|
||||
COMMENT-ruby= Ruby bindings for weechat
|
||||
COMMENT-tcl= Tcl bindings for weechat
|
||||
|
||||
V= 4.8.1
|
||||
REVISION-main= 0
|
||||
V= 4.9.0
|
||||
DISTNAME= weechat-${V}
|
||||
|
||||
PKGNAME-main= weechat-${V}
|
||||
@@ -26,7 +25,7 @@ PERMIT_PACKAGE= Yes
|
||||
WANTLIB-main += aspell c cjson curl curses gcrypt gnutls iconv intl
|
||||
WANTLIB-main += m perl pthread z zstd
|
||||
WANTLIB-lua += ${MODLUA_WANTLIB}
|
||||
WANTLIB-python += ${MODPY_WANTLIB}
|
||||
WANTLIB-python += ${MODPY_WANTLIB} intl pthread util
|
||||
WANTLIB-tcl += ${MODTCL_WANTLIB}
|
||||
# uses link libruby*.so
|
||||
WANTLIB-ruby += ${MODRUBY_WANTLIB}
|
||||
@@ -90,6 +89,8 @@ CONFIGURE_ARGS+= -DTCL_TCLSH=${MODTCL_BIN} \
|
||||
-DTCL_INCLUDE_PATH=${MODTCL_INCDIR} \
|
||||
-DMODTCL_LIB=${MODTCL_LIB}
|
||||
|
||||
MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib
|
||||
|
||||
.include <bsd.port.arch.mk>
|
||||
.if ${PROPERTIES:Mclang}
|
||||
# needed for ruby 3 on llvm
|
||||
@@ -97,7 +98,7 @@ CONFIGURE_ENV= CFLAGS="${CFLAGS} -fdeclspec"
|
||||
.endif
|
||||
|
||||
pre-configure:
|
||||
rm -f ${WRKSRC}/cmake/{FindLua,FindRuby,FindTCL}.cmake
|
||||
rm -f ${WRKSRC}/cmake/{FindLua,FindRuby,FindTCL,FindPython}.cmake
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/weechat
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
SHA256 (weechat-4.8.1.tar.gz) = /1Z30/o33tEwKIzJ1KJUMRyefEHOSPyRAeDfHKoo+f0=
|
||||
SIZE (weechat-4.8.1.tar.gz) = 5314228
|
||||
SHA256 (weechat-4.9.0.tar.gz) = M3/CTApMAKosRyYvEjAUsj1Vxc8CeF7P3yBPlszvXGU=
|
||||
SIZE (weechat-4.9.0.tar.gz) = 5317497
|
||||
|
||||
@@ -18,9 +18,9 @@ Index: CMakeLists.txt
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char -fms-extensions -Wall -Wextra")
|
||||
if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
|
||||
# extra options specific to GCC
|
||||
@@ -291,7 +291,7 @@ if(DL_LIBRARY)
|
||||
list(APPEND EXTRA_LIBS ${DL_LIBRARY})
|
||||
endif()
|
||||
@@ -275,7 +275,7 @@ list(APPEND EXTRA_LIBS ${LIBCURL_LDFLAGS})
|
||||
|
||||
list(APPEND EXTRA_LIBS ${CMAKE_DL_LIBS})
|
||||
|
||||
-add_subdirectory(icons)
|
||||
+#add_subdirectory(icons)
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
Index: src/plugins/lua/CMakeLists.txt
|
||||
--- src/plugins/lua/CMakeLists.txt.orig
|
||||
+++ src/plugins/lua/CMakeLists.txt
|
||||
@@ -28,8 +28,8 @@ set_target_properties(lua PROPERTIES PREFIX "")
|
||||
@@ -29,7 +29,7 @@ add_library(lua MODULE
|
||||
set_target_properties(lua PROPERTIES PREFIX "")
|
||||
|
||||
if(LUA_FOUND)
|
||||
add_definitions(${LUA_CFLAGS})
|
||||
- include_directories(${LUA_INCLUDE_DIRS})
|
||||
- target_link_libraries(lua ${LUA_LDFLAGS} weechat_plugins_scripts coverage_config)
|
||||
+ include_directories(${LUA_INCLUDE_DIR})
|
||||
+ target_link_libraries(lua ${LUA_LIBRARY} weechat_plugins_scripts coverage_config)
|
||||
endif()
|
||||
add_definitions(${LUA_CFLAGS})
|
||||
-include_directories(${LUA_INCLUDE_DIRS})
|
||||
-target_link_libraries(lua ${LUA_LDFLAGS} weechat_plugins_scripts coverage_config)
|
||||
+include_directories(${LUA_INCLUDE_DIR})
|
||||
+target_link_libraries(lua ${LUA_LIBRARY} weechat_plugins_scripts coverage_config)
|
||||
|
||||
install(TARGETS lua LIBRARY DESTINATION "${WEECHAT_LIBDIR}/plugins")
|
||||
|
||||
@@ -1,14 +1,13 @@
|
||||
Index: src/plugins/ruby/CMakeLists.txt
|
||||
--- src/plugins/ruby/CMakeLists.txt.orig
|
||||
+++ src/plugins/ruby/CMakeLists.txt
|
||||
@@ -30,8 +30,8 @@ if(RUBY_FOUND)
|
||||
# caused by Ruby headers (with Ruby ≥ 3.1.0)
|
||||
# see: https://github.com/ruby/ruby/pull/7085
|
||||
add_definitions(-Wno-unused-parameter)
|
||||
- include_directories(${Ruby_INCLUDE_DIRS})
|
||||
- target_link_libraries(ruby ${Ruby_LIBRARIES} weechat_plugins_scripts coverage_config)
|
||||
+ include_directories(${Ruby_INCLUDE_DIR} ${Ruby_CONFIG_INCLUDE_DIR})
|
||||
+ target_link_libraries(ruby ${Ruby_LIBRARY} weechat_plugins_scripts coverage_config)
|
||||
endif(RUBY_FOUND)
|
||||
@@ -31,7 +31,7 @@ set_target_properties(ruby PROPERTIES PREFIX "")
|
||||
# caused by Ruby headers (with Ruby ≥ 3.1.0)
|
||||
# see: https://github.com/ruby/ruby/pull/7085
|
||||
add_definitions(-Wno-unused-parameter)
|
||||
-include_directories(${Ruby_INCLUDE_DIRS})
|
||||
-target_link_libraries(ruby ${Ruby_LIBRARIES} weechat_plugins_scripts coverage_config)
|
||||
+include_directories(${Ruby_INCLUDE_DIR} ${Ruby_CONFIG_INCLUDE_DIR})
|
||||
+target_link_libraries(ruby ${Ruby_LIBRARY} weechat_plugins_scripts coverage_config)
|
||||
|
||||
install(TARGETS ruby LIBRARY DESTINATION "${WEECHAT_LIBDIR}/plugins")
|
||||
|
||||
Reference in New Issue
Block a user