From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Update Waybar, fmt and revbump kodi (+ patch) + update jsoncpp and revbump more stuff
Date: Fri, 09 Oct 2020 21:22:14 +0200 [thread overview]
Message-ID: <20201009192214.2slWgQc2ydqByi0UuUFXdr6h7paTC9aIUuSRIlcnUKg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-25209@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 608 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages waybar
https://github.com/void-linux/void-packages/pull/25209
Update Waybar, fmt and revbump kodi (+ patch) + update jsoncpp and revbump more stuff
Closes #23451
Closes #23040
@Hoshpak please give ok on patch, otherwise I can just revbump.
Waybar built through `xbps-src` isn't dynamically linked against `libfmt.so`, I'm not sure why... *EDIT*: it's inlining and LTO magic.
A patch file from https://github.com/void-linux/void-packages/pull/25209.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-waybar-25209.patch --]
[-- Type: text/x-diff, Size: 11030 bytes --]
From 27de12b1002af265557de2d204a7e9b43ece8a2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 30 Sep 2020 13:51:44 -0300
Subject: [PATCH 01/11] fmt: update to 7.0.3.
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 7dad8c2117d..72e24de97e7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3577,7 +3577,7 @@ libcotp.so.12 libcotp-1.2.1_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.6 fmt-5.2.1_1
+libfmt.so.7 fmt-7.0.3_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libcrypto.so.44 libcrypto44-2.8.2_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index 919bfe36e57..dc52932929e 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=6.2.1
+version=7.0.3
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="https://github.com/fmtlib/fmt"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=5edf8b0f32135ad5fafb3064de26d063571e95e8ae46829c2f4f4b52696bbff0
+checksum=b4b51bc16288e2281cddc59c28f0b4f84fed58d016fb038273a09f05f8473297
post_install() {
vlicense LICENSE.rst LICENSE
From c9e46ee08576d46c1aa7271d4e53b5c2a43fb31d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 2 Oct 2020 17:17:01 -0300
Subject: [PATCH 02/11] jsoncpp: update to 1.9.4.
---
common/shlibs | 2 +-
srcpkgs/jsoncpp/template | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 72e24de97e7..932afb75b7b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1359,7 +1359,7 @@ libspeechd.so.2 speech-dispatcher-0.8_1
libre2.so.7 re2-2020.06.01_1
libminizip.so.1 minizip-1.2.7_1
libsrtp2.so.1 libsrtp-2.1.0_1
-libjsoncpp.so.19 jsoncpp-1.8.3_1
+libjsoncpp.so.24 jsoncpp-1.9.4_1
libesmtp.so.6 libesmtp-1.0.6_4
libcaca.so.0 libcaca-0.99.beta18_3
libcaca++.so.0 libcaca-0.99.beta18_3
diff --git a/srcpkgs/jsoncpp/template b/srcpkgs/jsoncpp/template
index cc2b21df450..b3151788310 100644
--- a/srcpkgs/jsoncpp/template
+++ b/srcpkgs/jsoncpp/template
@@ -1,7 +1,7 @@
# Template build file for 'jsoncpp'.
pkgname=jsoncpp
-version=1.8.4
-revision=2
+version=1.9.4
+revision=1
build_style=cmake
configure_args="-DBUILD_STATIC_LIBS=1 -DBUILD_SHARED_LIBS=1 -DJSONCPP_WITH_TESTS=0"
short_desc="A JSON implementation in C++"
@@ -9,7 +9,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="Public Domain, MIT"
homepage="https://github.com/open-source-parsers/jsoncpp"
distfiles="https://github.com/open-source-parsers/${pkgname}/archive/${version}.tar.gz"
-checksum=c49deac9e0933bcb7044f08516861a2d560988540b23de2ac1ad443b219afdb6
+checksum=e34a628a8142643b976c7233ef381457efad79468c67cb1ae0b83a33d7493999
CXXFLAGS="-D_GLIBCXX_USE_C99_STDIO=1"
From 3a5ce2643979e9f1759e1f6c324d79e75d876042 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 30 Sep 2020 00:17:26 -0300
Subject: [PATCH 03/11] Waybar: update to 0.9.4, enable rfkill module.
---
srcpkgs/Waybar/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 39087b4d5c8..ecdc581c4b1 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,13 +1,13 @@
# Template file for 'Waybar'
pkgname=Waybar
-version=0.9.3
+version=0.9.4
revision=1
_date_version=3.0.0
create_wrksrc=yes
build_wrksrc=${pkgname}-${version}
build_style=meson
configure_args="-Dgtk-layer-shell=enabled -Dlibudev=enabled -Dman-pages=enabled
- -Dsystemd=disabled
+ -Dsystemd=disabled -Drfkill=enabled
-Dlibnl=$(vopt_if libnl enabled disabled)
-Dpulseaudio=$(vopt_if pulseaudio enabled disabled)
-Ddbusmenu-gtk=$(vopt_if dbusmenugtk enabled disabled)
@@ -29,7 +29,7 @@ changelog="https://github.com/Alexays/Waybar/releases"
distfiles="https://github.com/Alexays/Waybar/archive/${version}.tar.gz
https://github.com/HowardHinnant/date/archive/v${_date_version}.tar.gz
https://github.com/mesonbuild/hinnant-date/releases/download/${_date_version}-1/hinnant-date.zip"
-checksum="15cadd05c6a366fd99a92b0f149974c697902c4683c50e2af69f3e59571793e5
+checksum="d49c09ee253ca9cc9688d1b4d8602adc9bdae613b02e2fa1a2e7277ddc9e82e8
87bba2eaf0ebc7ec539e5e62fc317cb80671a337c1fb1b84cb9e4d42c6dbebe3
6ccaf70732d8bdbd1b6d5fdf3e1b935c23bf269bda12fdfd0e561276f63432fe"
From cf6013c89f37dae6499716fe6276758ec28e74d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 30 Sep 2020 13:52:05 -0300
Subject: [PATCH 04/11] kodi: revbump for fmt.
---
srcpkgs/kodi/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 94e05b15bf1..54903d80b02 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=18.8
-revision=1
+revision=2
_codename="Leia"
wrksrc="xbmc-${version}-${_codename}"
build_style=cmake
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
homepage="http://www.kodi.tv"
distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
-python_version=2 #unverified
+python_version=2
patch_args="-Np1"
LDFLAGS+=" -Wl,-z,stack-size=1048576"
From b77d5ccec8154939b7370cf710ac28fc578291b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 30 Sep 2020 14:04:34 -0300
Subject: [PATCH 05/11] mkvtoolnix: revbump for fmt.
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index 5b7c61284b0..f02bfab1c4e 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=50.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From a9979f1f26cb667f56dfa409a0c21dbba160678c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 30 Sep 2020 14:04:55 -0300
Subject: [PATCH 06/11] kodi-rpi: update to 18.8.
---
srcpkgs/kodi-rpi/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/kodi-rpi/template b/srcpkgs/kodi-rpi/template
index c802b465bf4..84bc59f5cbc 100644
--- a/srcpkgs/kodi-rpi/template
+++ b/srcpkgs/kodi-rpi/template
@@ -1,6 +1,6 @@
# Template file for 'kodi-rpi'
pkgname=kodi-rpi
-version=18.7.1
+version=18.8
revision=1
_codename="Leia"
wrksrc="xbmc-${version}-${_codename}"
@@ -10,9 +10,9 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.kodi.tv/"
distfiles="https://github.com/xbmc/xbmc/archive/${version}-${_codename}.tar.gz"
-checksum=5cfec391bcd168bbd4f9d38a6c8ec93e42e040cf82cf6ebf23db5e86753816fb
+checksum=6deb28f725880b1ab6c5920b55ef1190a79b0684ffb30b6e13b199d23a0af296
LDFLAGS+=" -Wl,-z,stack-size=1048576"
-python_version=2 #unverified
+python_version=2
patch_args="-Np1"
nopie=yes
From 754cf3ef33e626aa0e99f914e0a7b61fe4b84668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 2 Oct 2020 17:18:11 -0300
Subject: [PATCH 07/11] LGOGDownloader: rebuild for jsoncpp.
---
srcpkgs/LGOGDownloader/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 1ad9e8165b7..e497a40f7cd 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,7 +1,7 @@
# Template file for 'LGOGDownloader'
pkgname=LGOGDownloader
version=3.7
-revision=2
+revision=3
wrksrc="lgogdownloader-${version}"
build_style=cmake
hostmakedepends="pkg-config"
From 0eeeb854dfc638fecdd846308924c4fbf2a475c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 2 Oct 2020 17:18:12 -0300
Subject: [PATCH 08/11] cmake-gui: rebuild for jsoncpp.
---
srcpkgs/cmake-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cmake-gui/template b/srcpkgs/cmake-gui/template
index 49c11de455c..5288cbafeff 100644
--- a/srcpkgs/cmake-gui/template
+++ b/srcpkgs/cmake-gui/template
@@ -1,7 +1,7 @@
# Template file for 'cmake-gui'
pkgname=cmake-gui
version=3.18.2
-revision=1
+revision=2
wrksrc="cmake-${version}"
build_style=cmake
configure_args="
From 8ef3e671ac623ff7a38ddc01cd8a7871798ad2c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 2 Oct 2020 17:18:12 -0300
Subject: [PATCH 09/11] polybar: rebuild for jsoncpp.
---
srcpkgs/polybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/polybar/template b/srcpkgs/polybar/template
index 432db093b2d..12f488a9cad 100644
--- a/srcpkgs/polybar/template
+++ b/srcpkgs/polybar/template
@@ -1,7 +1,7 @@
# Template file for 'polybar'
pkgname=polybar
version=3.4.3
-revision=1
+revision=2
wrksrc="$pkgname"
build_style=cmake
configure_args="
From 91c07b40001567f1282bc38ff816d1a3e45c8118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 2 Oct 2020 17:18:12 -0300
Subject: [PATCH 10/11] upmpdcli: rebuild for jsoncpp.
---
srcpkgs/upmpdcli/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/upmpdcli/template b/srcpkgs/upmpdcli/template
index 14ffaca33e9..2a1e47ad569 100644
--- a/srcpkgs/upmpdcli/template
+++ b/srcpkgs/upmpdcli/template
@@ -1,7 +1,7 @@
# Template file for 'upmpdcli'.
pkgname=upmpdcli
version=1.4.14
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="pkg-config tar"
makedepends="jsoncpp-devel libmicrohttpd-devel libmpdclient-devel libupnpp-devel"
From d4e3945ffe06d582edd64973286ae0e7769af482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 2 Oct 2020 17:28:05 -0300
Subject: [PATCH 11/11] sysdig: rebuild for jsoncpp.
---
srcpkgs/sysdig/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sysdig/template b/srcpkgs/sysdig/template
index 68f7fa8a05f..d70067cb0df 100644
--- a/srcpkgs/sysdig/template
+++ b/srcpkgs/sysdig/template
@@ -1,7 +1,7 @@
# Template file for 'sysdig'
pkgname=sysdig
version=0.27.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DSYSDIG_VERSION=${version} -DUSE_BUNDLED_DEPS=OFF
-DUSE_BUNDLED_B64=ON -DUSE_BUNDLED_JQ=ON -DBUILD_DRIVER=OFF
next prev parent reply other threads:[~2020-10-09 19:22 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-30 17:09 [PR PATCH] Update Waybar, fmt and revbump kodi (+ patch) ericonr
2020-09-30 17:31 ` [PR PATCH] [Updated] " ericonr
2020-09-30 20:14 ` ericonr
2020-10-02 20:22 ` ericonr
2020-10-02 20:36 ` [PR PATCH] [Updated] " ericonr
2020-10-09 19:22 ` ericonr [this message]
2020-10-09 19:22 ` Update Waybar, fmt and revbump kodi (+ patch) + update jsoncpp and revbump more stuff ericonr
2020-10-09 19:31 ` [PR PATCH] [Merged]: " ericonr
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=20201009192214.2slWgQc2ydqByi0UuUFXdr6h7paTC9aIUuSRIlcnUKg@z \
--to=ericonr@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).