From: ericonr <ericonr@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Update Waybar, fmt and revbump kodi (+ patch)
Date: Wed, 30 Sep 2020 19:31:33 +0200 [thread overview]
Message-ID: <20200930173133.j2dL2KbMk2ZaN4iaWBoCsFY-aodtzr4jYW2d_UQQifU@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: 531 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)
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...
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: 6950 bytes --]
From db0a1cd43f8c66584a519b5688ad01a1adffc9db 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 1/5] 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 ded49667426..af538a48638 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3575,7 +3575,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 7453905417b4338030ed2fce4c8e821583d1a9f7 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 2/5] 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 34ba47a9c38c5fd7b953ab9cb30acba7c6dcd351 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 3/5] kodi: revbump for fmt, fix DPMS behavior.
---
srcpkgs/kodi/patches/fix-dpms.patch | 24 ++++++++++++++++++++++++
srcpkgs/kodi/template | 4 ++--
2 files changed, 26 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/kodi/patches/fix-dpms.patch
diff --git a/srcpkgs/kodi/patches/fix-dpms.patch b/srcpkgs/kodi/patches/fix-dpms.patch
new file mode 100644
index 00000000000..8d532c1a27e
--- /dev/null
+++ b/srcpkgs/kodi/patches/fix-dpms.patch
@@ -0,0 +1,24 @@
+diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc-18.7.1-Leia/xbmc/windowing/X11/WinSystemX11.cpp
+index 8b0c56579b..5db641efbd 100644
+--- a/xbmc/windowing/X11/WinSystemX11.cpp
++++ b/xbmc/windowing/X11/WinSystemX11.cpp
+@@ -26,6 +26,7 @@
+ #include "messaging/ApplicationMessenger.h"
+ #include <X11/Xatom.h>
+ #include <X11/extensions/Xrandr.h>
++#include "Application.h"
+
+ #include "WinEventsX11.h"
+ #include "input/InputManager.h"
+@@ -557,8 +558,10 @@ void CWinSystemX11::NotifyXRREvent()
+ {
+ UpdateResolutions();
+ }
+-
++ if (!g_application.IsDPMSActive())
++ {
+ RecreateWindow();
++ }
+ }
+
+ void CWinSystemX11::RecreateWindow()
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 60aed089cb9ad72ea42cb203356c37a83545b8be 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 4/5] 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 cbe475aee98cbf8d8fbedd000513c0dc6bb8879f 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 5/5] 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
next prev parent reply other threads:[~2020-09-30 17:31 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-30 17:09 [PR PATCH] " ericonr
2020-09-30 17:31 ` ericonr [this message]
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 ` [PR PATCH] [Updated] Update Waybar, fmt and revbump kodi (+ patch) + update jsoncpp and revbump more stuff ericonr
2020-10-09 19:22 ` 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=20200930173133.j2dL2KbMk2ZaN4iaWBoCsFY-aodtzr4jYW2d_UQQifU@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).