From: Piraty <Piraty@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Xfce4: cleanup
Date: Mon, 06 Apr 2020 12:32:04 +0200 [thread overview]
Message-ID: <20200406103204.ZvClQFk44LblkqJzyHJLe4oo7Lc5Nt3RmeWdte1PK5k@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-20696@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 715 bytes --]
There is an updated pull request by Piraty against master on the void-packages repository
https://github.com/Piraty/void-packages xfce-cleanup
https://github.com/void-linux/void-packages/pull/20696
Xfce4: cleanup
* ignore releases for all xfce components that use an odd minor version for development releases (most of https://git.xfce.org/xfce/ ). I'm tired of people PR version bumps for development releases.
* remove two abandoned packages
* downgrade [xfce4-power-manager](https://github.com/void-linux/void-packages/pull/19971) to stable release
TODO:
* [ ] please verify I didn't screw up with `reverts=`
A patch file from https://github.com/void-linux/void-packages/pull/20696.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xfce-cleanup-20696.patch --]
[-- Type: text/x-diff, Size: 13684 bytes --]
From 9b2b0867d51c899b45b738b59937d2e4293bc991 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 6 Apr 2020 09:19:14 +0200
Subject: [PATCH 01/15] gtk-xfce-engine: remove
* distfiles gone
* abandoned by upstream
* nothing depends on it
---
srcpkgs/gtk-xfce-engine/template | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 srcpkgs/gtk-xfce-engine/template
diff --git a/srcpkgs/gtk-xfce-engine/template b/srcpkgs/gtk-xfce-engine/template
deleted file mode 100644
index b122c227b82..00000000000
--- a/srcpkgs/gtk-xfce-engine/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'gtk-xfce-engine'
-pkgname=gtk-xfce-engine
-version=3.2.0
-revision=2
-lib32disabled=yes
-build_style=gnu-configure
-configure_args="--disable-static"
-hostmakedepends="pkg-config intltool glib-devel"
-makedepends="gtk+-devel"
-short_desc="Xfce GTK+2 theme engine"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="https://xfce.org/"
-distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=875c9c3bda96faf050a2224649cc42129ffb662c4de33add8c0fd1fb860b47ed
From a644313383043f40a82cf4c456f3316c48e5cbe4 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 6 Apr 2020 09:26:53 +0200
Subject: [PATCH 02/15] xfce4-hardware-monitor-plugin: remove
* distfiles gone
* abandoned by upstream
---
srcpkgs/xfce4-hardware-monitor-plugin/template | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 srcpkgs/xfce4-hardware-monitor-plugin/template
diff --git a/srcpkgs/xfce4-hardware-monitor-plugin/template b/srcpkgs/xfce4-hardware-monitor-plugin/template
deleted file mode 100644
index b69c1cbf3fd..00000000000
--- a/srcpkgs/xfce4-hardware-monitor-plugin/template
+++ /dev/null
@@ -1,18 +0,0 @@
-# Template file for 'xfce4-hardware-monitor-plugin'
-pkgname=xfce4-hardware-monitor-plugin
-version=1.6.0
-revision=3
-build_style=gnu-configure
-hostmakedepends="autoconf automake libtool intltool pkg-config glib-devel gettext-devel"
-makedepends="xfce4-panel-devel libgtop-devel libgnomecanvasmm-devel gtkmm2-devel libsensors-devel"
-short_desc="Hardware monitoring plugin for the xfce-panel"
-maintainer="Piraty <piraty1@inbox.ru>"
-license="GPL-3.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-hardware-monitor-plugin"
-changelog="https://git.xfce.org/panel-plugins/xfce4-hardware-monitor-plugin/plain/ChangeLog"
-distfiles="https://git.xfce.org/panel-plugins/xfce4-hardware-monitor-plugin/snapshot/${pkgname}-${version}.tar.gz"
-checksum=68ba4d63ea94866a1b19bf0e91b8ed27140c0cef714a5beead58cd2e03a96786
-
-pre_configure() {
- autoreconf -fi
-}
From 9ff5942962653099ac4dc3879b270fbf5698b7b7 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 6 Apr 2020 09:27:33 +0200
Subject: [PATCH 03/15] xfce4-plugins: remove dependency:
xfce4-hardware-monitor-plugin
---
srcpkgs/xfce4-plugins/template | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/srcpkgs/xfce4-plugins/template b/srcpkgs/xfce4-plugins/template
index ef949c00230..4324a73dfee 100644
--- a/srcpkgs/xfce4-plugins/template
+++ b/srcpkgs/xfce4-plugins/template
@@ -1,7 +1,7 @@
# Template file for 'xfce4-plugins'
pkgname=xfce4-plugins
version=1.3
-revision=2
+revision=3
build_style=meta
depends="
xfce4-battery-plugin
@@ -11,7 +11,6 @@ depends="
xfce4-diskperf-plugin
xfce4-fsguard-plugin
xfce4-genmon-plugin
- xfce4-hardware-monitor-plugin
xfce4-kbdleds-plugin
xfce4-mailwatch-plugin
xfce4-mpc-plugin
From b393e8d0981e750155e8f3530071876065b6deaf Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 6 Apr 2020 09:47:59 +0200
Subject: [PATCH 04/15] xfce4-power-manager: downgrade to 1.6.6
This reverts commit d6adc35579ca4b1e29204843e3000279c7bdae7c.
1.7.0 is a development release
---
.../xfce4-power-manager/patches/void.patch | 72 +++++++++++++++++++
srcpkgs/xfce4-power-manager/template | 5 +-
srcpkgs/xfce4-power-manager/update | 1 +
3 files changed, 76 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/xfce4-power-manager/patches/void.patch
create mode 100644 srcpkgs/xfce4-power-manager/update
diff --git a/srcpkgs/xfce4-power-manager/patches/void.patch b/srcpkgs/xfce4-power-manager/patches/void.patch
new file mode 100644
index 00000000000..5e06b35f8f9
--- /dev/null
+++ b/srcpkgs/xfce4-power-manager/patches/void.patch
@@ -0,0 +1,72 @@
+--- src/xfpm-pm-helper.c.orig 2019-08-13 12:17:22.787621859 +0200
++++ src/xfpm-pm-helper.c 2019-08-13 12:18:31.946471555 +0200
+@@ -69,11 +69,8 @@
+ #define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/acpiconf -s 3"
+ #define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/acpiconf -s 4"
+ #endif
+-#ifdef BACKEND_TYPE_LINUX
+-#define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/pm-suspend"
+-#define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/pm-hibernate"
+-#endif
+-#ifdef BACKEND_TYPE_OPENBSD
++/* voidlinux and openbsd use zzz(8) */
++#if defined(BACKEND_TYPE_LINUX) || defined(BACKEND_TYPE_OPENBSD)
+ #define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/zzz"
+ #define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/ZZZ"
+ #endif
+--- src/xfpm-suspend.c.orig 2019-08-13 12:19:21.476080088 +0200
++++ src/xfpm-suspend.c 2019-08-13 12:20:59.699286887 +0200
+@@ -101,35 +101,6 @@ freebsd_supports_sleep_state (const gcha
+ }
+ #endif
+
+-#ifdef BACKEND_TYPE_LINUX
+-static gboolean
+-linux_supports_sleep_state (const gchar *state)
+-{
+- gboolean ret = FALSE;
+- gchar *command;
+- GError *error = NULL;
+- gint exit_status;
+-
+- XFPM_DEBUG("entering");
+-
+- /* run script from pm-utils */
+- command = g_strdup_printf ("/usr/bin/pm-is-supported --%s", state);
+- g_debug ("executing command: %s", command);
+- ret = g_spawn_command_line_sync (command, NULL, NULL, &exit_status, &error);
+- if (!ret) {
+- g_warning ("failed to run script: %s", error->message);
+- g_error_free (error);
+- goto out;
+- }
+- ret = (WIFEXITED(exit_status) && (WEXITSTATUS(exit_status) == EXIT_SUCCESS));
+-
+-out:
+- g_free (command);
+-
+- return ret;
+-}
+-#endif
+-
+
+ gboolean
+ xfpm_suspend_can_suspend (void)
+@@ -139,7 +110,7 @@ xfpm_suspend_can_suspend (void)
+ return freebsd_supports_sleep_state ("S3");
+ #endif
+ #ifdef BACKEND_TYPE_LINUX
+- return linux_supports_sleep_state ("suspend");
++ return TRUE;
+ #endif
+ #ifdef BACKEND_TYPE_OPENBSD
+ return TRUE;
+@@ -156,7 +127,7 @@ xfpm_suspend_can_hibernate (void)
+ return freebsd_supports_sleep_state ("S4");
+ #endif
+ #ifdef BACKEND_TYPE_LINUX
+- return linux_supports_sleep_state ("hibernate");
++ return TRUE;
+ #endif
+ #ifdef BACKEND_TYPE_OPENBSD
+ return TRUE;
diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index 44f33af9d31..40210ad92c7 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,6 +1,7 @@
# Template file for 'xfce4-power-manager'
pkgname=xfce4-power-manager
-version=1.7.0
+version=1.6.6
+reverts=1.7.0_1
revision=1
build_style=gnu-configure
configure_args="--disable-static"
@@ -12,4 +13,4 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://xfce.org/"
distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=45368ccf70f5a87ba9c8b732e2462ecbc0184550e7cc54a58cbeb74086e7124b
+checksum=1b7bf0d3e8af69b10f7b6a518451e01fc7888e0d9d360bc33f6c89179bb6080b
diff --git a/srcpkgs/xfce4-power-manager/update b/srcpkgs/xfce4-power-manager/update
new file mode 100644
index 00000000000..5636324afbc
--- /dev/null
+++ b/srcpkgs/xfce4-power-manager/update
@@ -0,0 +1 @@
+ignore="*.*[13579].*"
From 3165e393c99e3b85eca581cea1b4c828f702cd4b Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 6 Apr 2020 12:12:45 +0200
Subject: [PATCH 05/15] garcon: ignore development releases
Odd minor versions are development releases,
see: https://mail.xfce.org/pipermail/xfce/2020-April/036904.html
---
srcpkgs/garcon/update | 1 +
1 file changed, 1 insertion(+)
create mode 100644 srcpkgs/garcon/update
diff --git a/srcpkgs/garcon/update b/srcpkgs/garcon/update
new file mode 100644
index 00000000000..5636324afbc
--- /dev/null
+++ b/srcpkgs/garcon/update
@@ -0,0 +1 @@
+ignore="*.*[13579].*"
From 7799de95396e62fe4a4df36d5be2a76885dc0db1 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 6 Apr 2020 09:36:31 +0200
Subject: [PATCH 06/15] libxfce4ui: ignore development releases
---
srcpkgs/libxfce4ui/update | 1 +
1 file changed, 1 insertion(+)
create mode 100644 srcpkgs/libxfce4ui/update
diff --git a/srcpkgs/libxfce4ui/update b/srcpkgs/libxfce4ui/update
new file mode 100644
index 00000000000..5636324afbc
--- /dev/null
+++ b/srcpkgs/libxfce4ui/update
@@ -0,0 +1 @@
+ignore="*.*[13579].*"
From 3b642567053e9d803a1d6dbc581ef8923d7f9493 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 6 Apr 2020 09:36:31 +0200
Subject: [PATCH 07/15] libxfce4util: ignore development releases
---
srcpkgs/libxfce4util/update | 1 +
1 file changed, 1 insertion(+)
create mode 100644 srcpkgs/libxfce4util/update
diff --git a/srcpkgs/libxfce4util/update b/srcpkgs/libxfce4util/update
new file mode 100644
index 00000000000..5636324afbc
--- /dev/null
+++ b/srcpkgs/libxfce4util/update
@@ -0,0 +1 @@
+ignore="*.*[13579].*"
From fb6ff91498d8b15d7831f98e9ca9d4c12cbf09cf Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 6 Apr 2020 11:22:28 +0200
Subject: [PATCH 08/15] xfce4-appfinder: ignore development releases
---
srcpkgs/xfce4-appfinder/update | 1 +
1 file changed, 1 insertion(+)
create mode 100644 srcpkgs/xfce4-appfinder/update
diff --git a/srcpkgs/xfce4-appfinder/update b/srcpkgs/xfce4-appfinder/update
new file mode 100644
index 00000000000..5636324afbc
--- /dev/null
+++ b/srcpkgs/xfce4-appfinder/update
@@ -0,0 +1 @@
+ignore="*.*[13579].*"
From d0745a643af345599e9888d813225bcdf4d2c8f6 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 6 Apr 2020 12:18:49 +0200
Subject: [PATCH 09/15] xfce4-dev-tools: ignore development releases
---
srcpkgs/xfce4-dev-tools/update | 1 +
1 file changed, 1 insertion(+)
create mode 100644 srcpkgs/xfce4-dev-tools/update
diff --git a/srcpkgs/xfce4-dev-tools/update b/srcpkgs/xfce4-dev-tools/update
new file mode 100644
index 00000000000..5636324afbc
--- /dev/null
+++ b/srcpkgs/xfce4-dev-tools/update
@@ -0,0 +1 @@
+ignore="*.*[13579].*"
From 8d02fae8baef6d94a0e1b08887dc387be8eaddd4 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 6 Apr 2020 09:36:31 +0200
Subject: [PATCH 10/15] xfce4-panel: ignore development releases
---
srcpkgs/xfce4-panel/update | 1 +
1 file changed, 1 insertion(+)
create mode 100644 srcpkgs/xfce4-panel/update
diff --git a/srcpkgs/xfce4-panel/update b/srcpkgs/xfce4-panel/update
new file mode 100644
index 00000000000..5636324afbc
--- /dev/null
+++ b/srcpkgs/xfce4-panel/update
@@ -0,0 +1 @@
+ignore="*.*[13579].*"
From 6982afbc9e6e4e6da443cf2c401ec0309dcbe34a Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 6 Apr 2020 12:13:04 +0200
Subject: [PATCH 11/15] xfce4-session: ignore development releases
---
srcpkgs/xfce4-session/update | 1 +
1 file changed, 1 insertion(+)
create mode 100644 srcpkgs/xfce4-session/update
diff --git a/srcpkgs/xfce4-session/update b/srcpkgs/xfce4-session/update
new file mode 100644
index 00000000000..5636324afbc
--- /dev/null
+++ b/srcpkgs/xfce4-session/update
@@ -0,0 +1 @@
+ignore="*.*[13579].*"
From 8d1b656cab2b590be8cc0d5216cc28b98139e2e4 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 6 Apr 2020 09:36:31 +0200
Subject: [PATCH 12/15] xfce4-settings: ignore development releases
---
srcpkgs/xfce4-settings/update | 1 +
1 file changed, 1 insertion(+)
create mode 100644 srcpkgs/xfce4-settings/update
diff --git a/srcpkgs/xfce4-settings/update b/srcpkgs/xfce4-settings/update
new file mode 100644
index 00000000000..5636324afbc
--- /dev/null
+++ b/srcpkgs/xfce4-settings/update
@@ -0,0 +1 @@
+ignore="*.*[13579].*"
From 0f38b333b5fde80f92a3c8a595ad40f187029744 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 6 Apr 2020 12:17:29 +0200
Subject: [PATCH 13/15] xfconf: ignore development releases
---
srcpkgs/xfconf/update | 1 +
1 file changed, 1 insertion(+)
create mode 100644 srcpkgs/xfconf/update
diff --git a/srcpkgs/xfconf/update b/srcpkgs/xfconf/update
new file mode 100644
index 00000000000..5636324afbc
--- /dev/null
+++ b/srcpkgs/xfconf/update
@@ -0,0 +1 @@
+ignore="*.*[13579].*"
From df6c28dfc47901ab9dc2925ca7c19503092f21fa Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 6 Apr 2020 12:12:17 +0200
Subject: [PATCH 14/15] xfdesktop: ignore development releases
---
srcpkgs/xfdesktop/update | 1 +
1 file changed, 1 insertion(+)
create mode 100644 srcpkgs/xfdesktop/update
diff --git a/srcpkgs/xfdesktop/update b/srcpkgs/xfdesktop/update
new file mode 100644
index 00000000000..5636324afbc
--- /dev/null
+++ b/srcpkgs/xfdesktop/update
@@ -0,0 +1 @@
+ignore="*.*[13579].*"
From 6a5147b17e81b768759a8c7651569c492d9f0984 Mon Sep 17 00:00:00 2001
From: Piraty <piraty1@inbox.ru>
Date: Mon, 6 Apr 2020 12:12:01 +0200
Subject: [PATCH 15/15] xfwm4: ignore development releases
---
srcpkgs/xfwm4/update | 1 +
1 file changed, 1 insertion(+)
create mode 100644 srcpkgs/xfwm4/update
diff --git a/srcpkgs/xfwm4/update b/srcpkgs/xfwm4/update
new file mode 100644
index 00000000000..5636324afbc
--- /dev/null
+++ b/srcpkgs/xfwm4/update
@@ -0,0 +1 @@
+ignore="*.*[13579].*"
next prev parent reply other threads:[~2020-04-06 10:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-06 10:27 [PR PATCH] " Piraty
2020-04-06 10:32 ` Piraty [this message]
2020-04-06 15:02 ` [PR PATCH] [Updated] " Piraty
2020-04-06 16:08 ` [PR PATCH] [Merged]: " Piraty
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=20200406103204.ZvClQFk44LblkqJzyHJLe4oo7Lc5Nt3RmeWdte1PK5k@z \
--to=piraty@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).