* Re: [PR PATCH] [Updated] swirc: update to 3.3.1. [WIP]
2021-09-11 17:45 [PR PATCH] swirc: update to 3.3.1 uhlin
@ 2021-09-11 20:28 ` uhlin
2021-09-11 21:00 ` uhlin
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: uhlin @ 2021-09-11 20:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 331 bytes --]
There is an updated pull request by uhlin against master on the void-packages repository
https://github.com/uhlin/void-packages master
https://github.com/void-linux/void-packages/pull/32933
swirc: update to 3.3.1. [WIP]
Swirc 3.3.1 out
A patch file from https://github.com/void-linux/void-packages/pull/32933.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32933.patch --]
[-- Type: text/x-diff, Size: 1553 bytes --]
From d4bab70d14084862deb59072137698ab7b954f87 Mon Sep 17 00:00:00 2001
From: Markus Uhlin <markus.uhlin@bredband.net>
Date: Sat, 11 Sep 2021 21:40:24 +0200
Subject: [PATCH] swirc: update to 3.3.1.
---
srcpkgs/swirc/template | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 7a2e90cf1dd8..d94beaa22578 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,12 @@
# Template file for 'swirc'
pkgname=swirc
-version=3.3.0
+version=3.3.1
revision=1
build_style=configure
make_install_args="PREFIX=/usr"
-hostmakedepends="pkg-config which"
-makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
+hostmakedepends="gettext pkg-config which"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel
+ $(vopt_if notify libnotify-devel)"
checkdepends="cmocka-devel"
short_desc="Curses ICB and IRC client"
maintainer="Markus Uhlin <markus.uhlin@bredband.net>"
@@ -13,7 +14,11 @@ license="BSD-3-Clause, ISC, MIT"
homepage="https://www.nifty-networks.net/swirc"
changelog="https://raw.githubusercontent.com/uhlin/swirc/master/CHANGELOG.md"
distfiles="https://www.nifty-networks.net/swirc/releases/${pkgname}-${version}.tgz"
-checksum="4faae10ab3e08d544f5377c7ba94d86d7d6c3a4c79e41b11b1b864faab0e5764"
+checksum="6066d3e31bb8d7930989586f7a8ade0a04901bc77befe2bcf58d99689d304685"
+
+build_options="notify"
+
+desc_option_notify="Enable support for desktop notifications"
post_configure() {
local _file="options.mk"
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] swirc: update to 3.3.1. [WIP]
2021-09-11 17:45 [PR PATCH] swirc: update to 3.3.1 uhlin
2021-09-11 20:28 ` [PR PATCH] [Updated] swirc: update to 3.3.1. [WIP] uhlin
@ 2021-09-11 21:00 ` uhlin
2021-09-12 9:50 ` uhlin
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: uhlin @ 2021-09-11 21:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 331 bytes --]
There is an updated pull request by uhlin against master on the void-packages repository
https://github.com/uhlin/void-packages master
https://github.com/void-linux/void-packages/pull/32933
swirc: update to 3.3.1. [WIP]
Swirc 3.3.1 out
A patch file from https://github.com/void-linux/void-packages/pull/32933.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32933.patch --]
[-- Type: text/x-diff, Size: 1553 bytes --]
From 319922ac4650a4b6d4272889f98ca413cc580f4f Mon Sep 17 00:00:00 2001
From: Markus Uhlin <markus.uhlin@bredband.net>
Date: Sat, 11 Sep 2021 21:40:24 +0200
Subject: [PATCH] swirc: update to 3.3.1.
---
srcpkgs/swirc/template | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 7a2e90cf1dd8..d94beaa22578 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,12 @@
# Template file for 'swirc'
pkgname=swirc
-version=3.3.0
+version=3.3.1
revision=1
build_style=configure
make_install_args="PREFIX=/usr"
-hostmakedepends="pkg-config which"
-makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
+hostmakedepends="gettext pkg-config which"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel
+ $(vopt_if notify libnotify-devel)"
checkdepends="cmocka-devel"
short_desc="Curses ICB and IRC client"
maintainer="Markus Uhlin <markus.uhlin@bredband.net>"
@@ -13,7 +14,11 @@ license="BSD-3-Clause, ISC, MIT"
homepage="https://www.nifty-networks.net/swirc"
changelog="https://raw.githubusercontent.com/uhlin/swirc/master/CHANGELOG.md"
distfiles="https://www.nifty-networks.net/swirc/releases/${pkgname}-${version}.tgz"
-checksum="4faae10ab3e08d544f5377c7ba94d86d7d6c3a4c79e41b11b1b864faab0e5764"
+checksum="6066d3e31bb8d7930989586f7a8ade0a04901bc77befe2bcf58d99689d304685"
+
+build_options="notify"
+
+desc_option_notify="Enable support for desktop notifications"
post_configure() {
local _file="options.mk"
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] swirc: update to 3.3.1. [WIP]
2021-09-11 17:45 [PR PATCH] swirc: update to 3.3.1 uhlin
2021-09-11 20:28 ` [PR PATCH] [Updated] swirc: update to 3.3.1. [WIP] uhlin
2021-09-11 21:00 ` uhlin
@ 2021-09-12 9:50 ` uhlin
2021-09-13 17:14 ` [PR REVIEW] swirc: update to 3.3.1 ericonr
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: uhlin @ 2021-09-12 9:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 331 bytes --]
There is an updated pull request by uhlin against master on the void-packages repository
https://github.com/uhlin/void-packages master
https://github.com/void-linux/void-packages/pull/32933
swirc: update to 3.3.1. [WIP]
Swirc 3.3.1 out
A patch file from https://github.com/void-linux/void-packages/pull/32933.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32933.patch --]
[-- Type: text/x-diff, Size: 1588 bytes --]
From 04751ab4103709f49c1aef9827bdb7c401f7b6f1 Mon Sep 17 00:00:00 2001
From: Markus Uhlin <markus.uhlin@bredband.net>
Date: Sat, 11 Sep 2021 21:40:24 +0200
Subject: [PATCH] swirc: update to 3.3.1.
---
srcpkgs/swirc/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 7a2e90cf1dd8..51c50908a5a0 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,14 @@
# Template file for 'swirc'
pkgname=swirc
-version=3.3.0
+version=3.3.1
revision=1
build_style=configure
+configure_args="--without-libintl"
make_install_args="PREFIX=/usr"
+make_install_target="install-no-lc-msgs"
hostmakedepends="pkg-config which"
-makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
+makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel
+ $(vopt_if notify libnotify-devel)"
checkdepends="cmocka-devel"
short_desc="Curses ICB and IRC client"
maintainer="Markus Uhlin <markus.uhlin@bredband.net>"
@@ -13,7 +16,11 @@ license="BSD-3-Clause, ISC, MIT"
homepage="https://www.nifty-networks.net/swirc"
changelog="https://raw.githubusercontent.com/uhlin/swirc/master/CHANGELOG.md"
distfiles="https://www.nifty-networks.net/swirc/releases/${pkgname}-${version}.tgz"
-checksum="4faae10ab3e08d544f5377c7ba94d86d7d6c3a4c79e41b11b1b864faab0e5764"
+checksum="6066d3e31bb8d7930989586f7a8ade0a04901bc77befe2bcf58d99689d304685"
+
+build_options="notify"
+
+desc_option_notify="Enable support for desktop notifications"
post_configure() {
local _file="options.mk"
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR REVIEW] swirc: update to 3.3.1.
2021-09-11 17:45 [PR PATCH] swirc: update to 3.3.1 uhlin
` (2 preceding siblings ...)
2021-09-12 9:50 ` uhlin
@ 2021-09-13 17:14 ` ericonr
2021-09-14 9:29 ` uhlin
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2021-09-13 17:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 186 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32933#discussion_r707530743
Comment:
Why did you prefer to remove `libintl`?
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR REVIEW] swirc: update to 3.3.1.
2021-09-11 17:45 [PR PATCH] swirc: update to 3.3.1 uhlin
` (3 preceding siblings ...)
2021-09-13 17:14 ` [PR REVIEW] swirc: update to 3.3.1 ericonr
@ 2021-09-14 9:29 ` uhlin
2021-09-14 12:29 ` ericonr
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: uhlin @ 2021-09-14 9:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 282 bytes --]
New review comment by uhlin on void-packages repository
https://github.com/void-linux/void-packages/pull/32933#discussion_r708087970
Comment:
Is it okey to install stuff under /usr/local? Else main.cpp needs modification in the bindtextdomain() call. Maybe I can write a patch?
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR REVIEW] swirc: update to 3.3.1.
2021-09-11 17:45 [PR PATCH] swirc: update to 3.3.1 uhlin
` (4 preceding siblings ...)
2021-09-14 9:29 ` uhlin
@ 2021-09-14 12:29 ` ericonr
2021-09-15 10:25 ` [PR PATCH] [Updated] swirc: update to 3.3.1. [WIP] uhlin
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2021-09-14 12:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 484 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/32933#discussion_r708217204
Comment:
For context: https://github.com/uhlin/swirc/blob/332223632e8667a1e649a491f20b9b0627928797/src/main.cpp#L507
Please try to write a patch, yes. The patch in our side can simply hardcode the path we install to, but if you'd like to upstream a change so it uses the path passed to Make, that'd be ideal. Or open an issue and request it :)
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] swirc: update to 3.3.1. [WIP]
2021-09-11 17:45 [PR PATCH] swirc: update to 3.3.1 uhlin
` (5 preceding siblings ...)
2021-09-14 12:29 ` ericonr
@ 2021-09-15 10:25 ` uhlin
2021-09-15 10:52 ` uhlin
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: uhlin @ 2021-09-15 10:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 331 bytes --]
There is an updated pull request by uhlin against master on the void-packages repository
https://github.com/uhlin/void-packages master
https://github.com/void-linux/void-packages/pull/32933
swirc: update to 3.3.1. [WIP]
Swirc 3.3.1 out
A patch file from https://github.com/void-linux/void-packages/pull/32933.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32933.patch --]
[-- Type: text/x-diff, Size: 1692 bytes --]
From 3c5d512fab6cfb4428ed8e9a8fad266f80d6683a Mon Sep 17 00:00:00 2001
From: Markus Uhlin <markus.uhlin@bredband.net>
Date: Sat, 11 Sep 2021 21:40:24 +0200
Subject: [PATCH] swirc: update to 3.3.1.
---
srcpkgs/swirc/template | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 7a2e90cf1dd8..05e5fd4d512f 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,12 @@
# Template file for 'swirc'
pkgname=swirc
-version=3.3.0
+version=3.3.1
revision=1
build_style=configure
make_install_args="PREFIX=/usr"
-hostmakedepends="pkg-config which"
-makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
+hostmakedepends="gettext-devel-tools pkg-config which"
+makedepends="gettext-devel libcurl-devel openssl-devel ncurses-devel libidn-devel
+ $(vopt_if notify libnotify-devel)"
checkdepends="cmocka-devel"
short_desc="Curses ICB and IRC client"
maintainer="Markus Uhlin <markus.uhlin@bredband.net>"
@@ -13,7 +14,15 @@ license="BSD-3-Clause, ISC, MIT"
homepage="https://www.nifty-networks.net/swirc"
changelog="https://raw.githubusercontent.com/uhlin/swirc/master/CHANGELOG.md"
distfiles="https://www.nifty-networks.net/swirc/releases/${pkgname}-${version}.tgz"
-checksum="4faae10ab3e08d544f5377c7ba94d86d7d6c3a4c79e41b11b1b864faab0e5764"
+checksum="6066d3e31bb8d7930989586f7a8ade0a04901bc77befe2bcf58d99689d304685"
+
+build_options="notify"
+
+desc_option_notify="Enable support for desktop notifications"
+
+post_extract() {
+ vsed -i "${wrksrc}/src/main.cpp" -e "s,/usr/local/share/locale,/usr/share/locale,"
+}
post_configure() {
local _file="options.mk"
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] swirc: update to 3.3.1. [WIP]
2021-09-11 17:45 [PR PATCH] swirc: update to 3.3.1 uhlin
` (6 preceding siblings ...)
2021-09-15 10:25 ` [PR PATCH] [Updated] swirc: update to 3.3.1. [WIP] uhlin
@ 2021-09-15 10:52 ` uhlin
2021-09-15 13:21 ` [PR PATCH] [Updated] swirc: update to 3.3.1 uhlin
2021-09-16 1:39 ` [PR PATCH] [Merged]: " ericonr
9 siblings, 0 replies; 11+ messages in thread
From: uhlin @ 2021-09-15 10:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 331 bytes --]
There is an updated pull request by uhlin against master on the void-packages repository
https://github.com/uhlin/void-packages master
https://github.com/void-linux/void-packages/pull/32933
swirc: update to 3.3.1. [WIP]
Swirc 3.3.1 out
A patch file from https://github.com/void-linux/void-packages/pull/32933.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32933.patch --]
[-- Type: text/x-diff, Size: 1994 bytes --]
From d99bbe65a1c5e9e69c90dfedd9b671ce36f9af7d Mon Sep 17 00:00:00 2001
From: Markus Uhlin <markus.uhlin@bredband.net>
Date: Sat, 11 Sep 2021 21:40:24 +0200
Subject: [PATCH] swirc: update to 3.3.1.
---
srcpkgs/swirc/template | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 7a2e90cf1dd8..b6577bfa3a41 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,13 @@
# Template file for 'swirc'
pkgname=swirc
-version=3.3.0
+version=3.3.1
revision=1
build_style=configure
+configure_args="$(vopt_with notify libnotify)"
make_install_args="PREFIX=/usr"
-hostmakedepends="pkg-config which"
-makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
+hostmakedepends="gettext-devel-tools pkg-config which"
+makedepends="gettext-devel libcurl-devel openssl-devel ncurses-devel libidn-devel
+ $(vopt_if notify libnotify-devel)"
checkdepends="cmocka-devel"
short_desc="Curses ICB and IRC client"
maintainer="Markus Uhlin <markus.uhlin@bredband.net>"
@@ -13,7 +15,16 @@ license="BSD-3-Clause, ISC, MIT"
homepage="https://www.nifty-networks.net/swirc"
changelog="https://raw.githubusercontent.com/uhlin/swirc/master/CHANGELOG.md"
distfiles="https://www.nifty-networks.net/swirc/releases/${pkgname}-${version}.tgz"
-checksum="4faae10ab3e08d544f5377c7ba94d86d7d6c3a4c79e41b11b1b864faab0e5764"
+checksum="6066d3e31bb8d7930989586f7a8ade0a04901bc77befe2bcf58d99689d304685"
+
+build_options="notify"
+
+desc_option_notify="Enable support for desktop notifications"
+
+post_extract() {
+ vsed -i "${wrksrc}/src/events/privmsg.cpp" -e "s,/usr/local/share/swirc,/usr/share/swirc,"
+ vsed -i "${wrksrc}/src/main.cpp" -e "s,/usr/local/share/locale,/usr/share/locale,"
+}
post_configure() {
local _file="options.mk"
@@ -35,6 +46,7 @@ post_check() {
# file during the "make check" phase. Thus a fresh rebuild is
# needed.
make clean
+ make -Cpo
make ${makejobs}
}
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Updated] swirc: update to 3.3.1.
2021-09-11 17:45 [PR PATCH] swirc: update to 3.3.1 uhlin
` (7 preceding siblings ...)
2021-09-15 10:52 ` uhlin
@ 2021-09-15 13:21 ` uhlin
2021-09-16 1:39 ` [PR PATCH] [Merged]: " ericonr
9 siblings, 0 replies; 11+ messages in thread
From: uhlin @ 2021-09-15 13:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 325 bytes --]
There is an updated pull request by uhlin against master on the void-packages repository
https://github.com/uhlin/void-packages master
https://github.com/void-linux/void-packages/pull/32933
swirc: update to 3.3.1.
Swirc 3.3.1 out
A patch file from https://github.com/void-linux/void-packages/pull/32933.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-32933.patch --]
[-- Type: text/x-diff, Size: 1994 bytes --]
From 6ef47dbadb74d589a5a147d5d7ed8dca75161b8e Mon Sep 17 00:00:00 2001
From: Markus Uhlin <markus.uhlin@bredband.net>
Date: Sat, 11 Sep 2021 21:40:24 +0200
Subject: [PATCH] swirc: update to 3.3.1.
---
srcpkgs/swirc/template | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/swirc/template b/srcpkgs/swirc/template
index 7a2e90cf1dd8..09ca153aa4d0 100644
--- a/srcpkgs/swirc/template
+++ b/srcpkgs/swirc/template
@@ -1,11 +1,13 @@
# Template file for 'swirc'
pkgname=swirc
-version=3.3.0
+version=3.3.1
revision=1
build_style=configure
+configure_args="$(vopt_with notify libnotify)"
make_install_args="PREFIX=/usr"
-hostmakedepends="pkg-config which"
-makedepends="libcurl-devel openssl-devel ncurses-devel libidn-devel"
+hostmakedepends="gettext-devel-tools pkg-config which"
+makedepends="gettext-devel libcurl-devel libidn-devel ncurses-devel openssl-devel
+ $(vopt_if notify libnotify-devel)"
checkdepends="cmocka-devel"
short_desc="Curses ICB and IRC client"
maintainer="Markus Uhlin <markus.uhlin@bredband.net>"
@@ -13,7 +15,16 @@ license="BSD-3-Clause, ISC, MIT"
homepage="https://www.nifty-networks.net/swirc"
changelog="https://raw.githubusercontent.com/uhlin/swirc/master/CHANGELOG.md"
distfiles="https://www.nifty-networks.net/swirc/releases/${pkgname}-${version}.tgz"
-checksum="4faae10ab3e08d544f5377c7ba94d86d7d6c3a4c79e41b11b1b864faab0e5764"
+checksum="6066d3e31bb8d7930989586f7a8ade0a04901bc77befe2bcf58d99689d304685"
+
+build_options="notify"
+
+desc_option_notify="Enable support for desktop notifications"
+
+post_extract() {
+ vsed -i "${wrksrc}/src/events/privmsg.cpp" -e "s,/usr/local/share/swirc,/usr/share/swirc,"
+ vsed -i "${wrksrc}/src/main.cpp" -e "s,/usr/local/share/locale,/usr/share/locale,"
+}
post_configure() {
local _file="options.mk"
@@ -35,6 +46,7 @@ post_check() {
# file during the "make check" phase. Thus a fresh rebuild is
# needed.
make clean
+ make -Cpo
make ${makejobs}
}
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PR PATCH] [Merged]: swirc: update to 3.3.1.
2021-09-11 17:45 [PR PATCH] swirc: update to 3.3.1 uhlin
` (8 preceding siblings ...)
2021-09-15 13:21 ` [PR PATCH] [Updated] swirc: update to 3.3.1 uhlin
@ 2021-09-16 1:39 ` ericonr
9 siblings, 0 replies; 11+ messages in thread
From: ericonr @ 2021-09-16 1:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
There's a merged pull request on the void-packages repository
swirc: update to 3.3.1.
https://github.com/void-linux/void-packages/pull/32933
Description:
Swirc 3.3.1 out
^ permalink raw reply [flat|nested] 11+ messages in thread