diff options
| author | Guido Falsi <madpilot@FreeBSD.org> | 2023-02-18 23:12:20 +0000 |
|---|---|---|
| committer | Guido Falsi <madpilot@FreeBSD.org> | 2023-02-18 23:12:20 +0000 |
| commit | 5ed62a09ebef87733abf5a4490768f2321b1f528 (patch) | |
| tree | c6aff9dc2e01ba51c22291a75787441108b67ecf | |
| parent | 441e7193407d623e9fd29e32c335c676cbda0f37 (diff) | |
| download | ports-5ed62a09ebef87733abf5a4490768f2321b1f528.tar.gz ports-5ed62a09ebef87733abf5a4490768f2321b1f528.zip | |
sysutils/conky: Update to 1.18.0
| -rw-r--r-- | sysutils/conky/Makefile | 13 | ||||
| -rw-r--r-- | sysutils/conky/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/conky/files/patch-lua_CMakeLists.txt | 11 |
3 files changed, 16 insertions, 14 deletions
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile index 3b9d5f7c9a44..4f11010c3a95 100644 --- a/sysutils/conky/Makefile +++ b/sysutils/conky/Makefile @@ -1,5 +1,5 @@ PORTNAME= conky -PORTVERSION= 1.17.0 +PORTVERSION= 1.18.0 DISTVERSIONPREFIX= v CATEGORIES= sysutils @@ -11,7 +11,7 @@ LIB_DEPENDS= libinotify.so:devel/libinotify BUILD_DEPENDS= gsed:textproc/gsed USES= cpe cmake compiler:c++11-lib gettext-runtime iconv \ - localbase lua:52-53 pkgconfig tar:bzip2 + localbase:ldflags lua:52-53 pkgconfig tar:bzip2 CMAKE_ARGS= -DBUILD_PORT_MONITORS:BOOL=false \ -DBUILD_IBM:BOOL=false \ @@ -152,15 +152,6 @@ EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src_CMakeLists.txt post-patch: @${REINPLACE_CMD} -e 's,^set(INCLUDE_SEARCH_PATH \(.*\)),set(INCLUDE_SEARCH_PATH \1 ${LUA_INCDIR}),' \ ${WRKSRC}/cmake/ConkyPlatformChecks.cmake -.if ${LUA_DEFAULT} == 5.2 - # Force using lua 5.2 - @${REINPLACE_CMD} -e 's/lua.*5\.*3//' \ - ${WRKSRC}/cmake/ConkyPlatformChecks.cmake -.elif ${LUA_DEFAULT} == 5.3 - # Force using lua 5.3 - @${REINPLACE_CMD} -e 's/lua.*5\.*2//' \ - ${WRKSRC}/cmake/ConkyPlatformChecks.cmake -.endif post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/sysutils/conky/distinfo b/sysutils/conky/distinfo index 2ade9c9a619f..5d96ea75e29e 100644 --- a/sysutils/conky/distinfo +++ b/sysutils/conky/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672604377 -SHA256 (brndnmtthws-conky-v1.17.0_GH0.tar.gz) = c3558bc028bcfc583d8e7775aed20a0f264ff47dbf0debdf70a95b3a180069dc -SIZE (brndnmtthws-conky-v1.17.0_GH0.tar.gz) = 1699311 +TIMESTAMP = 1676741723 +SHA256 (brndnmtthws-conky-v1.18.0_GH0.tar.gz) = 17a131689ac07dbf97b817f310a2f5ecb572f31ff7ca33dd3c14a276f18ab355 +SIZE (brndnmtthws-conky-v1.18.0_GH0.tar.gz) = 1703679 diff --git a/sysutils/conky/files/patch-lua_CMakeLists.txt b/sysutils/conky/files/patch-lua_CMakeLists.txt new file mode 100644 index 000000000000..9bd166966418 --- /dev/null +++ b/sysutils/conky/files/patch-lua_CMakeLists.txt @@ -0,0 +1,11 @@ +--- lua/CMakeLists.txt.orig 2023-02-18 14:34:53 UTC ++++ lua/CMakeLists.txt +@@ -31,6 +31,8 @@ if(BUILD_X11) + get_filename_component(X11_SM_LIB_PATH ${X11_SM_LIB} DIRECTORY) + link_directories(${X11_SM_LIB_PATH}) + ++ link_directories(${LIBS}) ++ + # cairo_set_dash() needs this special hack to work properly if you have a + # better solution, please let me know + wrap_tolua(luacairo_src cairo.pkg libcairo.patch) |