From: DragonGhost7 <DragonGhost7@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Conky: update to 1.15.0, adopt.
Date: Tue, 22 Nov 2022 03:43:53 +0100 [thread overview]
Message-ID: <20221122024353.x6csOsIXoxBUbcAZAXWlW7iGFiUJGC8XykIsRc1_7zs@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40237@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 555 bytes --]
There is an updated pull request by DragonGhost7 against master on the void-packages repository
https://github.com/DragonGhost7/void-packages conky
https://github.com/void-linux/void-packages/pull/40237
Conky: update to 1.15.0, adopt.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
- I built this PR locally for my native architecture, (x86_64)
A patch file from https://github.com/void-linux/void-packages/pull/40237.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-conky-40237.patch --]
[-- Type: text/x-diff, Size: 6811 bytes --]
From 11f0366168742dd5b777479557f879abd853675b Mon Sep 17 00:00:00 2001
From: DragonGhost7 <darkiridiumghost@gmail.com>
Date: Mon, 21 Nov 2022 21:42:57 -0500
Subject: [PATCH] conky: update to 1.14.0, merge with conky-cli, adopt.
---
srcpkgs/conky-cli | 1 +
srcpkgs/conky-cli/template | 37 ------------------
srcpkgs/conky-cli/update | 2 -
srcpkgs/conky/template | 80 +++++++++++++++++++++++++++++++++-----
4 files changed, 71 insertions(+), 49 deletions(-)
create mode 120000 srcpkgs/conky-cli
delete mode 100644 srcpkgs/conky-cli/template
delete mode 100644 srcpkgs/conky-cli/update
diff --git a/srcpkgs/conky-cli b/srcpkgs/conky-cli
new file mode 120000
index 000000000000..50b610ce4a24
--- /dev/null
+++ b/srcpkgs/conky-cli
@@ -0,0 +1 @@
+conky
\ No newline at end of file
diff --git a/srcpkgs/conky-cli/template b/srcpkgs/conky-cli/template
deleted file mode 100644
index 3eeec06dd1eb..000000000000
--- a/srcpkgs/conky-cli/template
+++ /dev/null
@@ -1,37 +0,0 @@
-# Template file for 'conky-cli'
-# Keep in sync with 'conky'
-pkgname=conky-cli
-version=1.13.1
-revision=1
-build_style=cmake
-conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
-configure_args="-DMAINTAINER_MODE=ON -DRELEASE=ON
- -DDOC_PATH=share/doc/${pkgname} -DBUILD_X11=OFF -DBUILD_CURL=ON -DBUILD_XDBE=OFF
- -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=OFF -DBUILD_IMLIB2=OFF -DBUILD_WLAN=ON
- -DBUILD_DOCS=ON"
-hostmakedepends="libtool pkg-config docbook2x man-db"
-makedepends="libcurl-devel libglib-devel libxml2-devel lua53-devel
- ncurses-devel wireless_tools-devel"
-short_desc="Conky command line without X11"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="BSD-3-Clause, GPL-3.0-or-later"
-homepage="https://github.com/brndnmtthws/conky"
-distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz"
-checksum=f85c96250b501e937b9b5d2ff3f06176e14777c94cec81373bbfc8a619d7a05a
-
-provides="conky-${version}_${revision}"
-conflicts="conky>=0"
-
-post_extract() {
- sed -i -e '1iinclude(CheckIncludeFile)' \
- -e 's/NCURSES ncurses/NCURSES ncursesw/' \
- cmake/ConkyPlatformChecks.cmake
-}
-
-post_install() {
- vmkdir etc/conky
- mv ${DESTDIR}/usr/share/doc/conky-cli/conky.conf ${DESTDIR}/etc/conky/
- mv ${DESTDIR}/usr/share/doc/conky-cli/conky_no_x11.conf ${DESTDIR}/etc/conky/
- rm ${DESTDIR}/usr/share/doc/conky-cli/convert.lua
- vlicense COPYING
-}
diff --git a/srcpkgs/conky-cli/update b/srcpkgs/conky-cli/update
deleted file mode 100644
index 38312d141904..000000000000
--- a/srcpkgs/conky-cli/update
+++ /dev/null
@@ -1,2 +0,0 @@
-pkgname="conky"
-ignore=1.999
diff --git a/srcpkgs/conky/template b/srcpkgs/conky/template
index 016ddeab5c8a..a4891c6d9e3a 100644
--- a/srcpkgs/conky/template
+++ b/srcpkgs/conky/template
@@ -1,30 +1,90 @@
# Template file for 'conky'
# Keep in sync with 'conky-cli'
pkgname=conky
-version=1.13.1
+version=1.14.0
revision=1
+wrksrc="${pkgname}-${version}"
+create_wrksrc=yes
build_style=cmake
conf_files="/etc/conky/conky.conf /etc/conky/conky_no_x11.conf"
configure_args="-DMAINTAINER_MODE=ON -DRELEASE=ON
- -DDOC_PATH=share/doc/${pkgname} -DBUILD_X11=ON -DBUILD_CURL=ON -DBUILD_XDBE=ON
- -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=ON -DBUILD_IMLIB2=ON -DBUILD_WLAN=ON
- -DBUILD_LUA_CAIRO=ON -DBUILD_LUA_IMLIB2=ON -DBUILD_LUA_RSVG=ON
- -DBUILD_XSHAPE=ON -DBUILD_DOCS=ON"
+ -DDOC_PATH=share/doc/${pkgname} -DBUILD_CURL=ON
+ -DBUILD_RSS=ON -DBUILD_WEATHER_METAR=ON -DBUILD_WLAN=ON"
hostmakedepends="libtool pkg-config docbook2x man-db toluapp"
makedepends="alsa-lib-devel imlib2-devel libXdamage-devel libXft-devel
libXinerama-devel libcurl-devel librsvg-devel lua53-devel ncurses-devel
toluapp-devel wireless_tools-devel"
short_desc="Lightweight system monitor for X"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="DragonGhost7 <darkiridiumghost@gmail.com>"
license="BSD-3-Clause, GPL-3.0-or-later"
homepage="https://github.com/brndnmtthws/conky"
-distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz"
-checksum=f85c96250b501e937b9b5d2ff3f06176e14777c94cec81373bbfc8a619d7a05a
+distfiles="https://github.com/brndnmtthws/conky/archive/v${version}.tar.gz
+ https://github.com/brndnmtthws/conky/releases/download/v${version}/conky.1.gz"
+checksum="36314449441eeae4d2bb1713cdd0738bfb581a9b23d5374137965684de04d964
+ 0c3eb754352c5861bcac530629e75caab1014df9f8edda163c4fe7a4aaef5cc4"
+_x11_args="-DBUILD_X11=ON -DBUILD_XDBE=ON -DBUILD_IMLIB2=ON
+ -DBUILD_LUA_CAIRO=ON -DBUILD_LUA_IMLIB2=ON -DBUILD_LUA_RSVG=ON -DBUILD_XSHAPE=ON"
+_no_x11_args=" -DBUILD_X11=OFF -DBUILD_XDBE=OFF -DBUILD_IMLIB2=OFF"
-post_install() {
+post_extract() {
+ cp -r ${pkgname}-${version} ${pkgname}-cli-${version}
+ sed -i -e '1iinclude(CheckIncludeFile)' \
+ -e 's/NCURSES ncurses/NCURSES ncursesw/' \
+ ${pkgname}-cli-${version}/cmake/ConkyPlatformChecks.cmake
+}
+
+do_configure() {
+ cmake_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=None
+ -DCMAKE_INSTALL_SYSCONFDIR=/etc"
+ cd ${pkgname}-${version}
+ mkdir -p build; cd build
+ export CMAKE_GENERATOR="${CMAKE_GENERATOR:-Ninja}"
+ CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" \
+ cmake ${cmake_args} ${configure_args} ${_x11_args} ..
+
+ cd ${wrksrc}/${pkgname}-cli-${version}
+ mkdir -p build; cd build
+ CFLAGS="-DNDEBUG ${CFLAGS/ -pipe / }" CXXFLAGS="-DNDEBUG ${CXXFLAGS/ -pipe / }" \
+ cmake ${cmake_args} ${configure_args} ${_no_x11_args} ..
+}
+
+do_build() {
+ cd ${pkgname}-${version}/build
+ ninja ${makejobs} ${make_build_args} ${make_build_target}
+ cd ${wrksrc}/${pkgname}-cli-${version}/build
+ ninja ${makejobs} ${make_build_args} ${make_build_target}
+}
+
+do_check() {
+ cd ${pkgname}-${version}/build
+ ninja ${makejobs} test
+ cd ${wrksrc}/${pkgname}-cli-${version}/build
+ ninja ${makejobs} test
+}
+
+do_install() {
+ cd ${pkgname}-${version}/build
+ DESTDIR=${DESTDIR} ninja ${make_install_args} install
vmkdir etc/conky
mv ${DESTDIR}/usr/share/doc/conky/conky.conf ${DESTDIR}/etc/conky/
mv ${DESTDIR}/usr/share/doc/conky/conky_no_x11.conf ${DESTDIR}/etc/conky/
rm ${DESTDIR}/usr/share/doc/conky/convert.lua
- vlicense COPYING
+ vlicense ${wrksrc}/${pkgname}-${version}/COPYING
+ vman ${wrksrc}/conky.1
+}
+
+conky-cli_package() {
+ short_desc="Conky command line without X11"
+ provides="conky-${version}_${revision}"
+ conflicts="conky>=0"
+ pkg_install() {
+ cd ${wrksrc}/${pkgname}-cli-${version}/build
+ DESTDIR=${PKGDESTDIR} ninja ${make_install_args} install
+ vmkdir etc/conky
+ mv ${PKGDESTDIR}/usr/share/doc/conky/conky.conf ${PKGDESTDIR}/etc/conky/
+ mv ${PKGDESTDIR}/usr/share/doc/conky/conky_no_x11.conf ${PKGDESTDIR}/etc/conky/
+ rm ${PKGDESTDIR}/usr/share/doc/conky/convert.lua
+ vlicense ${wrksrc}/${pkgname}-cli-${version}/COPYING
+ vman ${wrksrc}/conky.1
+ }
}
next prev parent reply other threads:[~2022-11-22 2:43 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-31 1:14 [PR PATCH] " DragonGhost7
2022-10-31 1:41 ` [PR PATCH] [Updated] " DragonGhost7
2022-10-31 2:30 ` DragonGhost7
2022-11-04 18:38 ` [PR REVIEW] " paper42
2022-11-04 21:20 ` DragonGhost7
2022-11-05 4:37 ` [PR PATCH] [Updated] " DragonGhost7
2022-11-05 4:37 ` DragonGhost7
2022-11-05 4:37 ` DragonGhost7
2022-11-05 17:50 ` [PR REVIEW] " paper42
2022-11-05 17:50 ` paper42
2022-11-05 17:50 ` paper42
2022-11-05 18:10 ` DragonGhost7
2022-11-05 18:31 ` paper42
2022-11-05 19:19 ` DragonGhost7
2022-11-22 2:43 ` DragonGhost7 [this message]
2022-11-22 4:54 ` [PR PATCH] [Updated] " DragonGhost7
2022-11-22 5:46 ` DragonGhost7
2022-11-22 5:51 ` DragonGhost7
2022-11-22 5:53 ` DragonGhost7
2022-11-22 6:03 ` DragonGhost7
2022-11-23 1:21 ` [PR PATCH] [Updated] " DragonGhost7
2023-02-21 2:02 ` github-actions
2023-03-07 2:07 ` [PR PATCH] [Closed]: " github-actions
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221122024353.x6csOsIXoxBUbcAZAXWlW7iGFiUJGC8XykIsRc1_7zs@z \
--to=dragonghost7@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).