Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Fix XFCE4-PLUGIN templates.
@ 2022-05-07 22:55 IT-DEVS-Group
  2022-05-09 13:22 ` abenson
                   ` (11 more replies)
  0 siblings, 12 replies; 13+ messages in thread
From: IT-DEVS-Group @ 2022-05-07 22:55 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1263 bytes --]

There is a new pull request by IT-DEVS-Group against master on the void-packages repository

https://github.com/IT-DEVS-Group/void-packages master
https://github.com/void-linux/void-packages/pull/37028

Fix XFCE4-PLUGIN templates.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37028.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37028.patch --]
[-- Type: text/x-diff, Size: 28205 bytes --]

From 5c155392461823ab76975d350d27c7cc52dec1d4 Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Sat, 7 May 2022 23:39:34 +0100
Subject: [PATCH] fix_xfce4_plugins_template

---
 Manual.md                                 | 19 ++++++++++---------
 common/environment/setup/misc.sh          |  1 +
 srcpkgs/xfce4-battery-plugin/template     |  7 ++++---
 srcpkgs/xfce4-clipman-plugin/template     |  7 ++++---
 srcpkgs/xfce4-cpufreq-plugin/template     |  6 +++---
 srcpkgs/xfce4-cpugraph-plugin/template    |  8 ++++----
 srcpkgs/xfce4-diskperf-plugin/template    |  6 +++---
 srcpkgs/xfce4-fsguard-plugin/template     |  7 ++++---
 srcpkgs/xfce4-genmon-plugin/template      |  5 +++--
 srcpkgs/xfce4-mailwatch-plugin/template   |  7 ++++---
 srcpkgs/xfce4-mpc-plugin/template         |  7 ++++---
 srcpkgs/xfce4-netload-plugin/template     |  7 ++++---
 srcpkgs/xfce4-places-plugin/template      |  7 ++++---
 srcpkgs/xfce4-pulseaudio-plugin/template  |  7 ++++---
 srcpkgs/xfce4-sensors-plugin/template     |  8 ++++----
 srcpkgs/xfce4-systemload-plugin/template  |  5 +++--
 srcpkgs/xfce4-time-out-plugin/template    |  6 +++---
 srcpkgs/xfce4-timer-plugin/template       |  7 ++++---
 srcpkgs/xfce4-verve-plugin/template       |  5 +++--
 srcpkgs/xfce4-wavelan-plugin/template     |  5 +++--
 srcpkgs/xfce4-weather-plugin/template     |  7 ++++---
 srcpkgs/xfce4-whiskermenu-plugin/template |  6 +++---
 srcpkgs/xfce4-xkb-plugin/template         |  7 ++++---
 23 files changed, 87 insertions(+), 70 deletions(-)

diff --git a/Manual.md b/Manual.md
index 8afe781f0ec1..426b103b6ed6 100644
--- a/Manual.md
+++ b/Manual.md
@@ -517,20 +517,21 @@ Example:
 
   | Variable         | Value                                           |
   |------------------|-------------------------------------------------|
-  | CPAN_SITE        | https://cpan.perl.org/modules/by-module          |
+  | CPAN_SITE        | https://cpan.perl.org/modules/by-module         |
   | DEBIAN_SITE      | http://ftp.debian.org/debian/pool               |
-  | FREEDESKTOP_SITE | https://freedesktop.org/software                 |
-  | GNOME_SITE       | https://ftp.gnome.org/pub/GNOME/sources          |
-  | GNU_SITE         | https://ftp.gnu.org/gnu                          |
-  | KERNEL_SITE      | https://www.kernel.org/pub/linux                 |
-  | MOZILLA_SITE     | https://ftp.mozilla.org/pub                      |
-  | NONGNU_SITE      | https://download.savannah.nongnu.org/releases    |
+  | FREEDESKTOP_SITE | https://freedesktop.org/software                |
+  | GNOME_SITE       | https://ftp.gnome.org/pub/GNOME/sources         |
+  | GNU_SITE         | https://ftp.gnu.org/gnu                         |
+  | KERNEL_SITE      | https://www.kernel.org/pub/linux                |
+  | MOZILLA_SITE     | https://ftp.mozilla.org/pub                     |
+  | NONGNU_SITE      | https://download.savannah.nongnu.org/releases   |
   | PYPI_SITE        | https://files.pythonhosted.org/packages/source  |
-  | SOURCEFORGE_SITE | https://downloads.sourceforge.net/sourceforge    |
+  | SOURCEFORGE_SITE | https://downloads.sourceforge.net/sourceforge   |
   | UBUNTU_SITE      | http://archive.ubuntu.com/ubuntu/pool           |
-  | XORG_SITE        | https://www.x.org/releases/individual            |
+  | XORG_SITE        | https://www.x.org/releases/individual           |
   | KDE_SITE         | https://download.kde.org/stable                 |
   | VIDEOLAN_SITE    | https://download.videolan.org/pub/videolan      |
+  | XFCE_DOWNLOADS   | https://archive.xfce.org     				   |
 
 - `checksum` The `sha256` digests matching `${distfiles}`. Multiple files can be
 separated by blanks. Please note that the order must be the same than
diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index 177b1e5622a2..ff92007201c1 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -18,5 +18,6 @@ GNU_SITE="https://ftp.gnu.org/gnu"
 FREEDESKTOP_SITE="https://freedesktop.org/software"
 KDE_SITE="https://download.kde.org/stable"
 VIDEOLAN_SITE="https://download.videolan.org/pub/videolan"
+XFCE_DOWNLOADS="https://archive.xfce.org"
 
 set +a
diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index d370cb980aad..092ea79d2ff0 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.4
-revision=1
+revision=4
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-battery-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-battery-plugin/-/blob/master/NEWS"
 checksum=107df2a837156c010e1eab5430bab90c77f0a3dc699b5937678c8a9c5e64c222
diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 4c86bf53e705..3a6c61cfc356 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"
 maintainer="Aaditya Bagga <abchk1234@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/${version%.*}/xfce4-clipman-plugin-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-clipman-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-clipman-plugin/-/blob/master/NEWS"
 checksum=ab8a5fe6f68fb1789190e498243a1d1385de3f64e984f470cbd3d1eb779399b8
diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 0ed8983ae9f2..b4462d3d4cd6 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -9,7 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpufreq-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-cpufreq-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpufreq-plugin/-/blob/master/NEWS"
 checksum=5ad4fb6150f51917b2a8af65926c6e4e83340827835782a14844c6b88dbcc58c
diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index ed54f1da6ca1..0d1572612b3e 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.2.6
-revision=1
+revision=6
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,9 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpugraph-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpugraph-plugin/-/blob/master/NEWS"
 checksum=773246f57c1824a85468d4119c17aeb07170ed1ebace8fa406c7fbcf5b47af99
 
 post_install() {
diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index d7b6f822491a..7aaaac0e9684 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.7.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,8 +10,8 @@ short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"
 maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="BSD-2-Clause"
 homepage="https://docs.xfce.org/panel-plugins/xfce4-diskperf-plugin/start"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-diskperf-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-diskperf-plugin/-/blob/master/NEWS"
 checksum=5909a65341a6af4d7ff3c7bb87aeac91c763f69b43ae9dc4a10668ac226fecc9
 
 post_install() {
diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 89cbc3e12db2..cf328a67e85e 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-fsguard-plugin/-/blob/master/NEWS"
 checksum=67d8e6a219a7117c59693adbc59c39a6eba31e3f18a5499189ef4ef28b554105
 
 post_install() {
diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index e12ff660c7ee..ad29934c9f83 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="LGPL-2.1-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-genmon-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-genmon-plugin/-/blob/master/NEWS"
 checksum=b2119fd0ff19fa293b97ec97b0de8e241799e08b86218515167c568bd9b50135
diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index d5067cd4ab1b..3d4e705af652 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=2
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,6 +10,7 @@ makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
 short_desc="Mail watcher plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-mailwatch-plugin/-/blob/master/NEWS"
 checksum=20f91ebefd2880b27f421f773115b3740f67de2bf60feace3841bfd1a09cbe2e
diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 388fcf6eda05..d0e9d9abab02 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"
 maintainer="Peter Wang <novalazy@gmail.com>"
 license="ISC"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-mpc-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-mpc-plugin/-/blob/master/NEWS"
 checksum=eefe78b7b6b95312b3a52814b7f632dc92970c1b3e9535de616315749bf67760
 
 post_install() {
diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index de056c06c519..4447c65b99d7 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.4.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-netload-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-netload-plugin/-/blob/master/NEWS"
 checksum=6c76260e101790754dd93255ec979accd97d21a21da85d8edcd6c7b01ddcd70c
diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 59eb5f820e8d..fe6180fe7711 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=3
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -9,6 +9,7 @@ makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-places-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-places-plugin/-/blob/master/NEWS"
 checksum=f211219f03c9260f624370e18c79e4176c9d35a8247158e77e5d811327610ab2
diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index d4d594f00698..edefa452dfc7 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
@@ -10,6 +10,7 @@ depends="pavucontrol"
 short_desc="Pulseaudio volume control plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-pulseaudio-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/-/blob/master/NEWS"
 checksum=5a518237e2137341d8ca6584938950525e20c28a0177e30ecaea3ba8e7a2615b
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 31dc3db93f37..8d6a631ce603 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.4.3
-revision=1
+revision=3
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -10,9 +10,9 @@ depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Xfce hardware sensors plugin"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/blob/master/NEWS"
 checksum=171c0235f70c65f0ffee587e960d9da79b284855df22130239eac26272ec06c9
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index e3d299fcf39d..69c054eaa0e4 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="System load plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-systemload-plugin/-/blob/master/NEWS"
 checksum=56d1007801d52d7c2b5a13bb54745f6d7f06fda28b49ce936145633068817652
 
 post_install() {
diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index 55da8c0ea8d5..8ead1eb88829 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -9,7 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-time-out-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-time-out-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-time-out-plugin/-/blob/master/NEWS"
 checksum=3dd8eba694ff3ba5c25bd7f5cd70dc22175fb2c0a759213f05ab8f0e629d82d4
diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index 3b2240a87ed3..5e85e8fcd168 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-timer-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-timer-plugin/-/blob/master/NEWS"
 checksum=4b52d2911b1949e945971be6533155ee6ba99c77078eac7fd43b0f2aeca824e3
diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index fe00e5a0bea2..bdb48b267cca 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-verve-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-verve-plugin/-/blob/master/NEWS"
 checksum=ebda5e5eb62d6e42afdc6f121d2f1cbd4d9d3c2b16a5e3ed8192b1b224b8f825
diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index 68b7d78ce45c..4f66faec8e1f 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-wavelan-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-wavelan-plugin/-/blob/master/NEWS"
 checksum=ea7aa36650c596b1a29567d100776c68ed732aaf0f48c92245c4466058b5481d
 
 post_install() {
diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index ef47f0f6143a..e459d54d85d5 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.11.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,7 +10,8 @@ depends="hicolor-icon-theme"
 short_desc="XFCE panel plugin to show temperature and weather"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-weather-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/blob/master/NEWS"
 checksum=e3242ea951d51bc0fded1d02a4f1f662bec16a1fb10c855f71bda6541a1153fc
 lib32disabled=yes
diff --git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template
index 14604b7bb072..582debf7e9cf 100644
--- a/srcpkgs/xfce4-whiskermenu-plugin/template
+++ b/srcpkgs/xfce4-whiskermenu-plugin/template
@@ -8,7 +8,7 @@ makedepends="exo-devel garcon-devel xfce4-panel-devel"
 short_desc="Alternate menu for Xfce4"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-2.0-or-later"
-homepage="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/raw/main/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/blob/master/NEWS"
 checksum=04ae0c1764a0d5ec70f18a760d998a2109bb6724f048554d7d6999d9072ca63e
diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index 2498a8ab3f63..b9a75f8d1d61 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libw
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="https://xfce.org/"
-distfiles="https://archive.xfce.org/src/panel-plugins/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-xkb-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-xkb-plugin/-/blob/master/NEWS"
 checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 
 post_install() {

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: Fix XFCE4-PLUGIN templates.
  2022-05-07 22:55 [PR PATCH] Fix XFCE4-PLUGIN templates IT-DEVS-Group
@ 2022-05-09 13:22 ` abenson
  2022-05-09 21:50 ` Chocimier
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: abenson @ 2022-05-09 13:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 291 bytes --]

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/37028#issuecomment-1121096530

Comment:
1. One commit per template.
2. Follow the convention for naming, i.e. `XFCE_SITE`
3. The `Manual.md` space changes should be separate from this PR.

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: Fix XFCE4-PLUGIN templates.
  2022-05-07 22:55 [PR PATCH] Fix XFCE4-PLUGIN templates IT-DEVS-Group
  2022-05-09 13:22 ` abenson
@ 2022-05-09 21:50 ` Chocimier
  2022-05-09 21:54 ` Chocimier
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Chocimier @ 2022-05-09 21:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 412 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/37028#issuecomment-1121618422

Comment:
4. revision is not supposed to be derived from version but be independent from version, see Manual.md
5. adjust templates to `xlint` rules, see CONTRIBUTING.md
6. please, provide meaningful and complete summary of changes proposed. "Fix templates" is not useful one.

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: Fix XFCE4-PLUGIN templates.
  2022-05-07 22:55 [PR PATCH] Fix XFCE4-PLUGIN templates IT-DEVS-Group
  2022-05-09 13:22 ` abenson
  2022-05-09 21:50 ` Chocimier
@ 2022-05-09 21:54 ` Chocimier
  2022-05-10 19:20 ` [PR PATCH] [Updated] " IT-DEVS-Group
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Chocimier @ 2022-05-09 21:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 424 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/37028#issuecomment-1121618422

Comment:
4. revision is not supposed to be derived from version but be independent from version, see Manual.md
5. adjust templates to `xlint` rules, see CONTRIBUTING.md
6. please, provide meaningful and complete summary of changes proposed. "Fix templates" is neither useful nor correct.

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] Fix XFCE4-PLUGIN templates.
  2022-05-07 22:55 [PR PATCH] Fix XFCE4-PLUGIN templates IT-DEVS-Group
                   ` (2 preceding siblings ...)
  2022-05-09 21:54 ` Chocimier
@ 2022-05-10 19:20 ` IT-DEVS-Group
  2022-05-10 19:26 ` IT-DEVS-Group
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: IT-DEVS-Group @ 2022-05-10 19:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 449 bytes --]

There is an updated pull request by IT-DEVS-Group against master on the void-packages repository

https://github.com/IT-DEVS-Group/void-packages master
https://github.com/void-linux/void-packages/pull/37028

Fix XFCE4-PLUGIN templates.
<!-- Uncomment relevant sections and delete options which are not applicable -->

- I tested the changes in this PR: NO

A patch file from https://github.com/void-linux/void-packages/pull/37028.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37028.patch --]
[-- Type: text/x-diff, Size: 28205 bytes --]

From 5c155392461823ab76975d350d27c7cc52dec1d4 Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Sat, 7 May 2022 23:39:34 +0100
Subject: [PATCH] fix_xfce4_plugins_template

---
 Manual.md                                 | 19 ++++++++++---------
 common/environment/setup/misc.sh          |  1 +
 srcpkgs/xfce4-battery-plugin/template     |  7 ++++---
 srcpkgs/xfce4-clipman-plugin/template     |  7 ++++---
 srcpkgs/xfce4-cpufreq-plugin/template     |  6 +++---
 srcpkgs/xfce4-cpugraph-plugin/template    |  8 ++++----
 srcpkgs/xfce4-diskperf-plugin/template    |  6 +++---
 srcpkgs/xfce4-fsguard-plugin/template     |  7 ++++---
 srcpkgs/xfce4-genmon-plugin/template      |  5 +++--
 srcpkgs/xfce4-mailwatch-plugin/template   |  7 ++++---
 srcpkgs/xfce4-mpc-plugin/template         |  7 ++++---
 srcpkgs/xfce4-netload-plugin/template     |  7 ++++---
 srcpkgs/xfce4-places-plugin/template      |  7 ++++---
 srcpkgs/xfce4-pulseaudio-plugin/template  |  7 ++++---
 srcpkgs/xfce4-sensors-plugin/template     |  8 ++++----
 srcpkgs/xfce4-systemload-plugin/template  |  5 +++--
 srcpkgs/xfce4-time-out-plugin/template    |  6 +++---
 srcpkgs/xfce4-timer-plugin/template       |  7 ++++---
 srcpkgs/xfce4-verve-plugin/template       |  5 +++--
 srcpkgs/xfce4-wavelan-plugin/template     |  5 +++--
 srcpkgs/xfce4-weather-plugin/template     |  7 ++++---
 srcpkgs/xfce4-whiskermenu-plugin/template |  6 +++---
 srcpkgs/xfce4-xkb-plugin/template         |  7 ++++---
 23 files changed, 87 insertions(+), 70 deletions(-)

diff --git a/Manual.md b/Manual.md
index 8afe781f0ec1..426b103b6ed6 100644
--- a/Manual.md
+++ b/Manual.md
@@ -517,20 +517,21 @@ Example:
 
   | Variable         | Value                                           |
   |------------------|-------------------------------------------------|
-  | CPAN_SITE        | https://cpan.perl.org/modules/by-module          |
+  | CPAN_SITE        | https://cpan.perl.org/modules/by-module         |
   | DEBIAN_SITE      | http://ftp.debian.org/debian/pool               |
-  | FREEDESKTOP_SITE | https://freedesktop.org/software                 |
-  | GNOME_SITE       | https://ftp.gnome.org/pub/GNOME/sources          |
-  | GNU_SITE         | https://ftp.gnu.org/gnu                          |
-  | KERNEL_SITE      | https://www.kernel.org/pub/linux                 |
-  | MOZILLA_SITE     | https://ftp.mozilla.org/pub                      |
-  | NONGNU_SITE      | https://download.savannah.nongnu.org/releases    |
+  | FREEDESKTOP_SITE | https://freedesktop.org/software                |
+  | GNOME_SITE       | https://ftp.gnome.org/pub/GNOME/sources         |
+  | GNU_SITE         | https://ftp.gnu.org/gnu                         |
+  | KERNEL_SITE      | https://www.kernel.org/pub/linux                |
+  | MOZILLA_SITE     | https://ftp.mozilla.org/pub                     |
+  | NONGNU_SITE      | https://download.savannah.nongnu.org/releases   |
   | PYPI_SITE        | https://files.pythonhosted.org/packages/source  |
-  | SOURCEFORGE_SITE | https://downloads.sourceforge.net/sourceforge    |
+  | SOURCEFORGE_SITE | https://downloads.sourceforge.net/sourceforge   |
   | UBUNTU_SITE      | http://archive.ubuntu.com/ubuntu/pool           |
-  | XORG_SITE        | https://www.x.org/releases/individual            |
+  | XORG_SITE        | https://www.x.org/releases/individual           |
   | KDE_SITE         | https://download.kde.org/stable                 |
   | VIDEOLAN_SITE    | https://download.videolan.org/pub/videolan      |
+  | XFCE_DOWNLOADS   | https://archive.xfce.org     				   |
 
 - `checksum` The `sha256` digests matching `${distfiles}`. Multiple files can be
 separated by blanks. Please note that the order must be the same than
diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index 177b1e5622a2..ff92007201c1 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -18,5 +18,6 @@ GNU_SITE="https://ftp.gnu.org/gnu"
 FREEDESKTOP_SITE="https://freedesktop.org/software"
 KDE_SITE="https://download.kde.org/stable"
 VIDEOLAN_SITE="https://download.videolan.org/pub/videolan"
+XFCE_DOWNLOADS="https://archive.xfce.org"
 
 set +a
diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index d370cb980aad..092ea79d2ff0 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.4
-revision=1
+revision=4
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-battery-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-battery-plugin/-/blob/master/NEWS"
 checksum=107df2a837156c010e1eab5430bab90c77f0a3dc699b5937678c8a9c5e64c222
diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 4c86bf53e705..3a6c61cfc356 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"
 maintainer="Aaditya Bagga <abchk1234@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/${version%.*}/xfce4-clipman-plugin-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-clipman-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-clipman-plugin/-/blob/master/NEWS"
 checksum=ab8a5fe6f68fb1789190e498243a1d1385de3f64e984f470cbd3d1eb779399b8
diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 0ed8983ae9f2..b4462d3d4cd6 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -9,7 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpufreq-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-cpufreq-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpufreq-plugin/-/blob/master/NEWS"
 checksum=5ad4fb6150f51917b2a8af65926c6e4e83340827835782a14844c6b88dbcc58c
diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index ed54f1da6ca1..0d1572612b3e 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.2.6
-revision=1
+revision=6
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,9 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpugraph-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpugraph-plugin/-/blob/master/NEWS"
 checksum=773246f57c1824a85468d4119c17aeb07170ed1ebace8fa406c7fbcf5b47af99
 
 post_install() {
diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index d7b6f822491a..7aaaac0e9684 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.7.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,8 +10,8 @@ short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"
 maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="BSD-2-Clause"
 homepage="https://docs.xfce.org/panel-plugins/xfce4-diskperf-plugin/start"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-diskperf-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-diskperf-plugin/-/blob/master/NEWS"
 checksum=5909a65341a6af4d7ff3c7bb87aeac91c763f69b43ae9dc4a10668ac226fecc9
 
 post_install() {
diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 89cbc3e12db2..cf328a67e85e 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-fsguard-plugin/-/blob/master/NEWS"
 checksum=67d8e6a219a7117c59693adbc59c39a6eba31e3f18a5499189ef4ef28b554105
 
 post_install() {
diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index e12ff660c7ee..ad29934c9f83 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="LGPL-2.1-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-genmon-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-genmon-plugin/-/blob/master/NEWS"
 checksum=b2119fd0ff19fa293b97ec97b0de8e241799e08b86218515167c568bd9b50135
diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index d5067cd4ab1b..3d4e705af652 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=2
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,6 +10,7 @@ makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
 short_desc="Mail watcher plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-mailwatch-plugin/-/blob/master/NEWS"
 checksum=20f91ebefd2880b27f421f773115b3740f67de2bf60feace3841bfd1a09cbe2e
diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 388fcf6eda05..d0e9d9abab02 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"
 maintainer="Peter Wang <novalazy@gmail.com>"
 license="ISC"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-mpc-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-mpc-plugin/-/blob/master/NEWS"
 checksum=eefe78b7b6b95312b3a52814b7f632dc92970c1b3e9535de616315749bf67760
 
 post_install() {
diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index de056c06c519..4447c65b99d7 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.4.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-netload-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-netload-plugin/-/blob/master/NEWS"
 checksum=6c76260e101790754dd93255ec979accd97d21a21da85d8edcd6c7b01ddcd70c
diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 59eb5f820e8d..fe6180fe7711 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=3
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -9,6 +9,7 @@ makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-places-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-places-plugin/-/blob/master/NEWS"
 checksum=f211219f03c9260f624370e18c79e4176c9d35a8247158e77e5d811327610ab2
diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index d4d594f00698..edefa452dfc7 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
@@ -10,6 +10,7 @@ depends="pavucontrol"
 short_desc="Pulseaudio volume control plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-pulseaudio-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/-/blob/master/NEWS"
 checksum=5a518237e2137341d8ca6584938950525e20c28a0177e30ecaea3ba8e7a2615b
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 31dc3db93f37..8d6a631ce603 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.4.3
-revision=1
+revision=3
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -10,9 +10,9 @@ depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Xfce hardware sensors plugin"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/blob/master/NEWS"
 checksum=171c0235f70c65f0ffee587e960d9da79b284855df22130239eac26272ec06c9
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index e3d299fcf39d..69c054eaa0e4 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="System load plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-systemload-plugin/-/blob/master/NEWS"
 checksum=56d1007801d52d7c2b5a13bb54745f6d7f06fda28b49ce936145633068817652
 
 post_install() {
diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index 55da8c0ea8d5..8ead1eb88829 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -9,7 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-time-out-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-time-out-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-time-out-plugin/-/blob/master/NEWS"
 checksum=3dd8eba694ff3ba5c25bd7f5cd70dc22175fb2c0a759213f05ab8f0e629d82d4
diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index 3b2240a87ed3..5e85e8fcd168 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-timer-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-timer-plugin/-/blob/master/NEWS"
 checksum=4b52d2911b1949e945971be6533155ee6ba99c77078eac7fd43b0f2aeca824e3
diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index fe00e5a0bea2..bdb48b267cca 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-verve-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-verve-plugin/-/blob/master/NEWS"
 checksum=ebda5e5eb62d6e42afdc6f121d2f1cbd4d9d3c2b16a5e3ed8192b1b224b8f825
diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index 68b7d78ce45c..4f66faec8e1f 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-wavelan-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-wavelan-plugin/-/blob/master/NEWS"
 checksum=ea7aa36650c596b1a29567d100776c68ed732aaf0f48c92245c4466058b5481d
 
 post_install() {
diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index ef47f0f6143a..e459d54d85d5 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.11.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,7 +10,8 @@ depends="hicolor-icon-theme"
 short_desc="XFCE panel plugin to show temperature and weather"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-weather-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/blob/master/NEWS"
 checksum=e3242ea951d51bc0fded1d02a4f1f662bec16a1fb10c855f71bda6541a1153fc
 lib32disabled=yes
diff --git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template
index 14604b7bb072..582debf7e9cf 100644
--- a/srcpkgs/xfce4-whiskermenu-plugin/template
+++ b/srcpkgs/xfce4-whiskermenu-plugin/template
@@ -8,7 +8,7 @@ makedepends="exo-devel garcon-devel xfce4-panel-devel"
 short_desc="Alternate menu for Xfce4"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-2.0-or-later"
-homepage="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/raw/main/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/blob/master/NEWS"
 checksum=04ae0c1764a0d5ec70f18a760d998a2109bb6724f048554d7d6999d9072ca63e
diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index 2498a8ab3f63..b9a75f8d1d61 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libw
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="https://xfce.org/"
-distfiles="https://archive.xfce.org/src/panel-plugins/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-xkb-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-xkb-plugin/-/blob/master/NEWS"
 checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 
 post_install() {

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] Fix XFCE4-PLUGIN templates.
  2022-05-07 22:55 [PR PATCH] Fix XFCE4-PLUGIN templates IT-DEVS-Group
                   ` (3 preceding siblings ...)
  2022-05-10 19:20 ` [PR PATCH] [Updated] " IT-DEVS-Group
@ 2022-05-10 19:26 ` IT-DEVS-Group
  2022-05-10 19:59 ` IT-DEVS-Group
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: IT-DEVS-Group @ 2022-05-10 19:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 449 bytes --]

There is an updated pull request by IT-DEVS-Group against master on the void-packages repository

https://github.com/IT-DEVS-Group/void-packages master
https://github.com/void-linux/void-packages/pull/37028

Fix XFCE4-PLUGIN templates.
<!-- Uncomment relevant sections and delete options which are not applicable -->

- I tested the changes in this PR: NO

A patch file from https://github.com/void-linux/void-packages/pull/37028.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37028.patch --]
[-- Type: text/x-diff, Size: 28998 bytes --]

From 5c155392461823ab76975d350d27c7cc52dec1d4 Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Sat, 7 May 2022 23:39:34 +0100
Subject: [PATCH 1/2] fix_xfce4_plugins_template

---
 Manual.md                                 | 19 ++++++++++---------
 common/environment/setup/misc.sh          |  1 +
 srcpkgs/xfce4-battery-plugin/template     |  7 ++++---
 srcpkgs/xfce4-clipman-plugin/template     |  7 ++++---
 srcpkgs/xfce4-cpufreq-plugin/template     |  6 +++---
 srcpkgs/xfce4-cpugraph-plugin/template    |  8 ++++----
 srcpkgs/xfce4-diskperf-plugin/template    |  6 +++---
 srcpkgs/xfce4-fsguard-plugin/template     |  7 ++++---
 srcpkgs/xfce4-genmon-plugin/template      |  5 +++--
 srcpkgs/xfce4-mailwatch-plugin/template   |  7 ++++---
 srcpkgs/xfce4-mpc-plugin/template         |  7 ++++---
 srcpkgs/xfce4-netload-plugin/template     |  7 ++++---
 srcpkgs/xfce4-places-plugin/template      |  7 ++++---
 srcpkgs/xfce4-pulseaudio-plugin/template  |  7 ++++---
 srcpkgs/xfce4-sensors-plugin/template     |  8 ++++----
 srcpkgs/xfce4-systemload-plugin/template  |  5 +++--
 srcpkgs/xfce4-time-out-plugin/template    |  6 +++---
 srcpkgs/xfce4-timer-plugin/template       |  7 ++++---
 srcpkgs/xfce4-verve-plugin/template       |  5 +++--
 srcpkgs/xfce4-wavelan-plugin/template     |  5 +++--
 srcpkgs/xfce4-weather-plugin/template     |  7 ++++---
 srcpkgs/xfce4-whiskermenu-plugin/template |  6 +++---
 srcpkgs/xfce4-xkb-plugin/template         |  7 ++++---
 23 files changed, 87 insertions(+), 70 deletions(-)

diff --git a/Manual.md b/Manual.md
index 8afe781f0ec1..426b103b6ed6 100644
--- a/Manual.md
+++ b/Manual.md
@@ -517,20 +517,21 @@ Example:
 
   | Variable         | Value                                           |
   |------------------|-------------------------------------------------|
-  | CPAN_SITE        | https://cpan.perl.org/modules/by-module          |
+  | CPAN_SITE        | https://cpan.perl.org/modules/by-module         |
   | DEBIAN_SITE      | http://ftp.debian.org/debian/pool               |
-  | FREEDESKTOP_SITE | https://freedesktop.org/software                 |
-  | GNOME_SITE       | https://ftp.gnome.org/pub/GNOME/sources          |
-  | GNU_SITE         | https://ftp.gnu.org/gnu                          |
-  | KERNEL_SITE      | https://www.kernel.org/pub/linux                 |
-  | MOZILLA_SITE     | https://ftp.mozilla.org/pub                      |
-  | NONGNU_SITE      | https://download.savannah.nongnu.org/releases    |
+  | FREEDESKTOP_SITE | https://freedesktop.org/software                |
+  | GNOME_SITE       | https://ftp.gnome.org/pub/GNOME/sources         |
+  | GNU_SITE         | https://ftp.gnu.org/gnu                         |
+  | KERNEL_SITE      | https://www.kernel.org/pub/linux                |
+  | MOZILLA_SITE     | https://ftp.mozilla.org/pub                     |
+  | NONGNU_SITE      | https://download.savannah.nongnu.org/releases   |
   | PYPI_SITE        | https://files.pythonhosted.org/packages/source  |
-  | SOURCEFORGE_SITE | https://downloads.sourceforge.net/sourceforge    |
+  | SOURCEFORGE_SITE | https://downloads.sourceforge.net/sourceforge   |
   | UBUNTU_SITE      | http://archive.ubuntu.com/ubuntu/pool           |
-  | XORG_SITE        | https://www.x.org/releases/individual            |
+  | XORG_SITE        | https://www.x.org/releases/individual           |
   | KDE_SITE         | https://download.kde.org/stable                 |
   | VIDEOLAN_SITE    | https://download.videolan.org/pub/videolan      |
+  | XFCE_DOWNLOADS   | https://archive.xfce.org     				   |
 
 - `checksum` The `sha256` digests matching `${distfiles}`. Multiple files can be
 separated by blanks. Please note that the order must be the same than
diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index 177b1e5622a2..ff92007201c1 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -18,5 +18,6 @@ GNU_SITE="https://ftp.gnu.org/gnu"
 FREEDESKTOP_SITE="https://freedesktop.org/software"
 KDE_SITE="https://download.kde.org/stable"
 VIDEOLAN_SITE="https://download.videolan.org/pub/videolan"
+XFCE_DOWNLOADS="https://archive.xfce.org"
 
 set +a
diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index d370cb980aad..092ea79d2ff0 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.4
-revision=1
+revision=4
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-battery-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-battery-plugin/-/blob/master/NEWS"
 checksum=107df2a837156c010e1eab5430bab90c77f0a3dc699b5937678c8a9c5e64c222
diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 4c86bf53e705..3a6c61cfc356 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"
 maintainer="Aaditya Bagga <abchk1234@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/${version%.*}/xfce4-clipman-plugin-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-clipman-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-clipman-plugin/-/blob/master/NEWS"
 checksum=ab8a5fe6f68fb1789190e498243a1d1385de3f64e984f470cbd3d1eb779399b8
diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 0ed8983ae9f2..b4462d3d4cd6 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -9,7 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpufreq-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-cpufreq-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpufreq-plugin/-/blob/master/NEWS"
 checksum=5ad4fb6150f51917b2a8af65926c6e4e83340827835782a14844c6b88dbcc58c
diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index ed54f1da6ca1..0d1572612b3e 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.2.6
-revision=1
+revision=6
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,9 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpugraph-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpugraph-plugin/-/blob/master/NEWS"
 checksum=773246f57c1824a85468d4119c17aeb07170ed1ebace8fa406c7fbcf5b47af99
 
 post_install() {
diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index d7b6f822491a..7aaaac0e9684 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.7.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,8 +10,8 @@ short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"
 maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="BSD-2-Clause"
 homepage="https://docs.xfce.org/panel-plugins/xfce4-diskperf-plugin/start"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-diskperf-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-diskperf-plugin/-/blob/master/NEWS"
 checksum=5909a65341a6af4d7ff3c7bb87aeac91c763f69b43ae9dc4a10668ac226fecc9
 
 post_install() {
diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 89cbc3e12db2..cf328a67e85e 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-fsguard-plugin/-/blob/master/NEWS"
 checksum=67d8e6a219a7117c59693adbc59c39a6eba31e3f18a5499189ef4ef28b554105
 
 post_install() {
diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index e12ff660c7ee..ad29934c9f83 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="LGPL-2.1-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-genmon-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-genmon-plugin/-/blob/master/NEWS"
 checksum=b2119fd0ff19fa293b97ec97b0de8e241799e08b86218515167c568bd9b50135
diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index d5067cd4ab1b..3d4e705af652 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=2
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,6 +10,7 @@ makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
 short_desc="Mail watcher plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-mailwatch-plugin/-/blob/master/NEWS"
 checksum=20f91ebefd2880b27f421f773115b3740f67de2bf60feace3841bfd1a09cbe2e
diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 388fcf6eda05..d0e9d9abab02 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"
 maintainer="Peter Wang <novalazy@gmail.com>"
 license="ISC"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-mpc-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-mpc-plugin/-/blob/master/NEWS"
 checksum=eefe78b7b6b95312b3a52814b7f632dc92970c1b3e9535de616315749bf67760
 
 post_install() {
diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index de056c06c519..4447c65b99d7 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.4.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-netload-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-netload-plugin/-/blob/master/NEWS"
 checksum=6c76260e101790754dd93255ec979accd97d21a21da85d8edcd6c7b01ddcd70c
diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 59eb5f820e8d..fe6180fe7711 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=3
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -9,6 +9,7 @@ makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-places-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-places-plugin/-/blob/master/NEWS"
 checksum=f211219f03c9260f624370e18c79e4176c9d35a8247158e77e5d811327610ab2
diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index d4d594f00698..edefa452dfc7 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
@@ -10,6 +10,7 @@ depends="pavucontrol"
 short_desc="Pulseaudio volume control plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-pulseaudio-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/-/blob/master/NEWS"
 checksum=5a518237e2137341d8ca6584938950525e20c28a0177e30ecaea3ba8e7a2615b
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 31dc3db93f37..8d6a631ce603 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.4.3
-revision=1
+revision=3
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -10,9 +10,9 @@ depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Xfce hardware sensors plugin"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/blob/master/NEWS"
 checksum=171c0235f70c65f0ffee587e960d9da79b284855df22130239eac26272ec06c9
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index e3d299fcf39d..69c054eaa0e4 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="System load plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-systemload-plugin/-/blob/master/NEWS"
 checksum=56d1007801d52d7c2b5a13bb54745f6d7f06fda28b49ce936145633068817652
 
 post_install() {
diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index 55da8c0ea8d5..8ead1eb88829 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -9,7 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-time-out-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-time-out-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-time-out-plugin/-/blob/master/NEWS"
 checksum=3dd8eba694ff3ba5c25bd7f5cd70dc22175fb2c0a759213f05ab8f0e629d82d4
diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index 3b2240a87ed3..5e85e8fcd168 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-timer-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-timer-plugin/-/blob/master/NEWS"
 checksum=4b52d2911b1949e945971be6533155ee6ba99c77078eac7fd43b0f2aeca824e3
diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index fe00e5a0bea2..bdb48b267cca 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-verve-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-verve-plugin/-/blob/master/NEWS"
 checksum=ebda5e5eb62d6e42afdc6f121d2f1cbd4d9d3c2b16a5e3ed8192b1b224b8f825
diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index 68b7d78ce45c..4f66faec8e1f 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-wavelan-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-wavelan-plugin/-/blob/master/NEWS"
 checksum=ea7aa36650c596b1a29567d100776c68ed732aaf0f48c92245c4466058b5481d
 
 post_install() {
diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index ef47f0f6143a..e459d54d85d5 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.11.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,7 +10,8 @@ depends="hicolor-icon-theme"
 short_desc="XFCE panel plugin to show temperature and weather"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-weather-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/blob/master/NEWS"
 checksum=e3242ea951d51bc0fded1d02a4f1f662bec16a1fb10c855f71bda6541a1153fc
 lib32disabled=yes
diff --git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template
index 14604b7bb072..582debf7e9cf 100644
--- a/srcpkgs/xfce4-whiskermenu-plugin/template
+++ b/srcpkgs/xfce4-whiskermenu-plugin/template
@@ -8,7 +8,7 @@ makedepends="exo-devel garcon-devel xfce4-panel-devel"
 short_desc="Alternate menu for Xfce4"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-2.0-or-later"
-homepage="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/raw/main/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/blob/master/NEWS"
 checksum=04ae0c1764a0d5ec70f18a760d998a2109bb6724f048554d7d6999d9072ca63e
diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index 2498a8ab3f63..b9a75f8d1d61 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libw
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="https://xfce.org/"
-distfiles="https://archive.xfce.org/src/panel-plugins/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-xkb-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-xkb-plugin/-/blob/master/NEWS"
 checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 
 post_install() {

From 2b97fac54d8ec711456b75dd58bfdc54153a5a6a Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Tue, 10 May 2022 20:25:45 +0100
Subject: [PATCH 2/2] add_xfce_site

---
 common/environment/setup/misc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index ff92007201c1..1c274d443e33 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -18,6 +18,6 @@ GNU_SITE="https://ftp.gnu.org/gnu"
 FREEDESKTOP_SITE="https://freedesktop.org/software"
 KDE_SITE="https://download.kde.org/stable"
 VIDEOLAN_SITE="https://download.videolan.org/pub/videolan"
-XFCE_DOWNLOADS="https://archive.xfce.org"
+XFCE_SITE="https://archive.xfce.org"
 
 set +a

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] Fix XFCE4-PLUGIN templates.
  2022-05-07 22:55 [PR PATCH] Fix XFCE4-PLUGIN templates IT-DEVS-Group
                   ` (4 preceding siblings ...)
  2022-05-10 19:26 ` IT-DEVS-Group
@ 2022-05-10 19:59 ` IT-DEVS-Group
  2022-05-10 20:41 ` IT-DEVS-Group
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: IT-DEVS-Group @ 2022-05-10 19:59 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 449 bytes --]

There is an updated pull request by IT-DEVS-Group against master on the void-packages repository

https://github.com/IT-DEVS-Group/void-packages master
https://github.com/void-linux/void-packages/pull/37028

Fix XFCE4-PLUGIN templates.
<!-- Uncomment relevant sections and delete options which are not applicable -->

- I tested the changes in this PR: NO

A patch file from https://github.com/void-linux/void-packages/pull/37028.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37028.patch --]
[-- Type: text/x-diff, Size: 29693 bytes --]

From 5c155392461823ab76975d350d27c7cc52dec1d4 Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Sat, 7 May 2022 23:39:34 +0100
Subject: [PATCH 1/3] fix_xfce4_plugins_template

---
 Manual.md                                 | 19 ++++++++++---------
 common/environment/setup/misc.sh          |  1 +
 srcpkgs/xfce4-battery-plugin/template     |  7 ++++---
 srcpkgs/xfce4-clipman-plugin/template     |  7 ++++---
 srcpkgs/xfce4-cpufreq-plugin/template     |  6 +++---
 srcpkgs/xfce4-cpugraph-plugin/template    |  8 ++++----
 srcpkgs/xfce4-diskperf-plugin/template    |  6 +++---
 srcpkgs/xfce4-fsguard-plugin/template     |  7 ++++---
 srcpkgs/xfce4-genmon-plugin/template      |  5 +++--
 srcpkgs/xfce4-mailwatch-plugin/template   |  7 ++++---
 srcpkgs/xfce4-mpc-plugin/template         |  7 ++++---
 srcpkgs/xfce4-netload-plugin/template     |  7 ++++---
 srcpkgs/xfce4-places-plugin/template      |  7 ++++---
 srcpkgs/xfce4-pulseaudio-plugin/template  |  7 ++++---
 srcpkgs/xfce4-sensors-plugin/template     |  8 ++++----
 srcpkgs/xfce4-systemload-plugin/template  |  5 +++--
 srcpkgs/xfce4-time-out-plugin/template    |  6 +++---
 srcpkgs/xfce4-timer-plugin/template       |  7 ++++---
 srcpkgs/xfce4-verve-plugin/template       |  5 +++--
 srcpkgs/xfce4-wavelan-plugin/template     |  5 +++--
 srcpkgs/xfce4-weather-plugin/template     |  7 ++++---
 srcpkgs/xfce4-whiskermenu-plugin/template |  6 +++---
 srcpkgs/xfce4-xkb-plugin/template         |  7 ++++---
 23 files changed, 87 insertions(+), 70 deletions(-)

diff --git a/Manual.md b/Manual.md
index 8afe781f0ec1..426b103b6ed6 100644
--- a/Manual.md
+++ b/Manual.md
@@ -517,20 +517,21 @@ Example:
 
   | Variable         | Value                                           |
   |------------------|-------------------------------------------------|
-  | CPAN_SITE        | https://cpan.perl.org/modules/by-module          |
+  | CPAN_SITE        | https://cpan.perl.org/modules/by-module         |
   | DEBIAN_SITE      | http://ftp.debian.org/debian/pool               |
-  | FREEDESKTOP_SITE | https://freedesktop.org/software                 |
-  | GNOME_SITE       | https://ftp.gnome.org/pub/GNOME/sources          |
-  | GNU_SITE         | https://ftp.gnu.org/gnu                          |
-  | KERNEL_SITE      | https://www.kernel.org/pub/linux                 |
-  | MOZILLA_SITE     | https://ftp.mozilla.org/pub                      |
-  | NONGNU_SITE      | https://download.savannah.nongnu.org/releases    |
+  | FREEDESKTOP_SITE | https://freedesktop.org/software                |
+  | GNOME_SITE       | https://ftp.gnome.org/pub/GNOME/sources         |
+  | GNU_SITE         | https://ftp.gnu.org/gnu                         |
+  | KERNEL_SITE      | https://www.kernel.org/pub/linux                |
+  | MOZILLA_SITE     | https://ftp.mozilla.org/pub                     |
+  | NONGNU_SITE      | https://download.savannah.nongnu.org/releases   |
   | PYPI_SITE        | https://files.pythonhosted.org/packages/source  |
-  | SOURCEFORGE_SITE | https://downloads.sourceforge.net/sourceforge    |
+  | SOURCEFORGE_SITE | https://downloads.sourceforge.net/sourceforge   |
   | UBUNTU_SITE      | http://archive.ubuntu.com/ubuntu/pool           |
-  | XORG_SITE        | https://www.x.org/releases/individual            |
+  | XORG_SITE        | https://www.x.org/releases/individual           |
   | KDE_SITE         | https://download.kde.org/stable                 |
   | VIDEOLAN_SITE    | https://download.videolan.org/pub/videolan      |
+  | XFCE_DOWNLOADS   | https://archive.xfce.org     				   |
 
 - `checksum` The `sha256` digests matching `${distfiles}`. Multiple files can be
 separated by blanks. Please note that the order must be the same than
diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index 177b1e5622a2..ff92007201c1 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -18,5 +18,6 @@ GNU_SITE="https://ftp.gnu.org/gnu"
 FREEDESKTOP_SITE="https://freedesktop.org/software"
 KDE_SITE="https://download.kde.org/stable"
 VIDEOLAN_SITE="https://download.videolan.org/pub/videolan"
+XFCE_DOWNLOADS="https://archive.xfce.org"
 
 set +a
diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index d370cb980aad..092ea79d2ff0 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.4
-revision=1
+revision=4
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-battery-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-battery-plugin/-/blob/master/NEWS"
 checksum=107df2a837156c010e1eab5430bab90c77f0a3dc699b5937678c8a9c5e64c222
diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 4c86bf53e705..3a6c61cfc356 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"
 maintainer="Aaditya Bagga <abchk1234@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/${version%.*}/xfce4-clipman-plugin-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-clipman-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-clipman-plugin/-/blob/master/NEWS"
 checksum=ab8a5fe6f68fb1789190e498243a1d1385de3f64e984f470cbd3d1eb779399b8
diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 0ed8983ae9f2..b4462d3d4cd6 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -9,7 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpufreq-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-cpufreq-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpufreq-plugin/-/blob/master/NEWS"
 checksum=5ad4fb6150f51917b2a8af65926c6e4e83340827835782a14844c6b88dbcc58c
diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index ed54f1da6ca1..0d1572612b3e 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.2.6
-revision=1
+revision=6
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,9 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpugraph-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpugraph-plugin/-/blob/master/NEWS"
 checksum=773246f57c1824a85468d4119c17aeb07170ed1ebace8fa406c7fbcf5b47af99
 
 post_install() {
diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index d7b6f822491a..7aaaac0e9684 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.7.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,8 +10,8 @@ short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"
 maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="BSD-2-Clause"
 homepage="https://docs.xfce.org/panel-plugins/xfce4-diskperf-plugin/start"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-diskperf-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-diskperf-plugin/-/blob/master/NEWS"
 checksum=5909a65341a6af4d7ff3c7bb87aeac91c763f69b43ae9dc4a10668ac226fecc9
 
 post_install() {
diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 89cbc3e12db2..cf328a67e85e 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-fsguard-plugin/-/blob/master/NEWS"
 checksum=67d8e6a219a7117c59693adbc59c39a6eba31e3f18a5499189ef4ef28b554105
 
 post_install() {
diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index e12ff660c7ee..ad29934c9f83 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="LGPL-2.1-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-genmon-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-genmon-plugin/-/blob/master/NEWS"
 checksum=b2119fd0ff19fa293b97ec97b0de8e241799e08b86218515167c568bd9b50135
diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index d5067cd4ab1b..3d4e705af652 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=2
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,6 +10,7 @@ makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
 short_desc="Mail watcher plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-mailwatch-plugin/-/blob/master/NEWS"
 checksum=20f91ebefd2880b27f421f773115b3740f67de2bf60feace3841bfd1a09cbe2e
diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 388fcf6eda05..d0e9d9abab02 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"
 maintainer="Peter Wang <novalazy@gmail.com>"
 license="ISC"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-mpc-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-mpc-plugin/-/blob/master/NEWS"
 checksum=eefe78b7b6b95312b3a52814b7f632dc92970c1b3e9535de616315749bf67760
 
 post_install() {
diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index de056c06c519..4447c65b99d7 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.4.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-netload-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-netload-plugin/-/blob/master/NEWS"
 checksum=6c76260e101790754dd93255ec979accd97d21a21da85d8edcd6c7b01ddcd70c
diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 59eb5f820e8d..fe6180fe7711 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=3
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -9,6 +9,7 @@ makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-places-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-places-plugin/-/blob/master/NEWS"
 checksum=f211219f03c9260f624370e18c79e4176c9d35a8247158e77e5d811327610ab2
diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index d4d594f00698..edefa452dfc7 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
@@ -10,6 +10,7 @@ depends="pavucontrol"
 short_desc="Pulseaudio volume control plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-pulseaudio-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/-/blob/master/NEWS"
 checksum=5a518237e2137341d8ca6584938950525e20c28a0177e30ecaea3ba8e7a2615b
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 31dc3db93f37..8d6a631ce603 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.4.3
-revision=1
+revision=3
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -10,9 +10,9 @@ depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Xfce hardware sensors plugin"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/blob/master/NEWS"
 checksum=171c0235f70c65f0ffee587e960d9da79b284855df22130239eac26272ec06c9
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index e3d299fcf39d..69c054eaa0e4 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="System load plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-systemload-plugin/-/blob/master/NEWS"
 checksum=56d1007801d52d7c2b5a13bb54745f6d7f06fda28b49ce936145633068817652
 
 post_install() {
diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index 55da8c0ea8d5..8ead1eb88829 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -9,7 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-time-out-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-time-out-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-time-out-plugin/-/blob/master/NEWS"
 checksum=3dd8eba694ff3ba5c25bd7f5cd70dc22175fb2c0a759213f05ab8f0e629d82d4
diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index 3b2240a87ed3..5e85e8fcd168 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-timer-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-timer-plugin/-/blob/master/NEWS"
 checksum=4b52d2911b1949e945971be6533155ee6ba99c77078eac7fd43b0f2aeca824e3
diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index fe00e5a0bea2..bdb48b267cca 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-verve-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-verve-plugin/-/blob/master/NEWS"
 checksum=ebda5e5eb62d6e42afdc6f121d2f1cbd4d9d3c2b16a5e3ed8192b1b224b8f825
diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index 68b7d78ce45c..4f66faec8e1f 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-wavelan-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-wavelan-plugin/-/blob/master/NEWS"
 checksum=ea7aa36650c596b1a29567d100776c68ed732aaf0f48c92245c4466058b5481d
 
 post_install() {
diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index ef47f0f6143a..e459d54d85d5 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.11.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,7 +10,8 @@ depends="hicolor-icon-theme"
 short_desc="XFCE panel plugin to show temperature and weather"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-weather-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/blob/master/NEWS"
 checksum=e3242ea951d51bc0fded1d02a4f1f662bec16a1fb10c855f71bda6541a1153fc
 lib32disabled=yes
diff --git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template
index 14604b7bb072..582debf7e9cf 100644
--- a/srcpkgs/xfce4-whiskermenu-plugin/template
+++ b/srcpkgs/xfce4-whiskermenu-plugin/template
@@ -8,7 +8,7 @@ makedepends="exo-devel garcon-devel xfce4-panel-devel"
 short_desc="Alternate menu for Xfce4"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-2.0-or-later"
-homepage="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/raw/main/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/blob/master/NEWS"
 checksum=04ae0c1764a0d5ec70f18a760d998a2109bb6724f048554d7d6999d9072ca63e
diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index 2498a8ab3f63..b9a75f8d1d61 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libw
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="https://xfce.org/"
-distfiles="https://archive.xfce.org/src/panel-plugins/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-xkb-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-xkb-plugin/-/blob/master/NEWS"
 checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 
 post_install() {

From 2b97fac54d8ec711456b75dd58bfdc54153a5a6a Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Tue, 10 May 2022 20:25:45 +0100
Subject: [PATCH 2/3] add_xfce_site

---
 common/environment/setup/misc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index ff92007201c1..1c274d443e33 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -18,6 +18,6 @@ GNU_SITE="https://ftp.gnu.org/gnu"
 FREEDESKTOP_SITE="https://freedesktop.org/software"
 KDE_SITE="https://download.kde.org/stable"
 VIDEOLAN_SITE="https://download.videolan.org/pub/videolan"
-XFCE_DOWNLOADS="https://archive.xfce.org"
+XFCE_SITE="https://archive.xfce.org"
 
 set +a

From 01924a40bf4016430113d2e749520aed743402ac Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Tue, 10 May 2022 20:59:30 +0100
Subject: [PATCH 3/3] update_mstcorefonts_version

---
 srcpkgs/msttcorefonts/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/msttcorefonts/template b/srcpkgs/msttcorefonts/template
index c5a2fafcd205..47105f6aec8c 100644
--- a/srcpkgs/msttcorefonts/template
+++ b/srcpkgs/msttcorefonts/template
@@ -1,6 +1,6 @@
 # Template file for 'msttcorefonts'
 pkgname=msttcorefonts
-version=1.3.4
+version=2.5.1
 revision=2
 hostmakedepends="cabextract"
 short_desc="Microsoft Typography Project - corefonts"

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] Fix XFCE4-PLUGIN templates.
  2022-05-07 22:55 [PR PATCH] Fix XFCE4-PLUGIN templates IT-DEVS-Group
                   ` (5 preceding siblings ...)
  2022-05-10 19:59 ` IT-DEVS-Group
@ 2022-05-10 20:41 ` IT-DEVS-Group
  2022-05-10 20:45 ` Chocimier
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: IT-DEVS-Group @ 2022-05-10 20:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 449 bytes --]

There is an updated pull request by IT-DEVS-Group against master on the void-packages repository

https://github.com/IT-DEVS-Group/void-packages master
https://github.com/void-linux/void-packages/pull/37028

Fix XFCE4-PLUGIN templates.
<!-- Uncomment relevant sections and delete options which are not applicable -->

- I tested the changes in this PR: NO

A patch file from https://github.com/void-linux/void-packages/pull/37028.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37028.patch --]
[-- Type: text/x-diff, Size: 31060 bytes --]

From 5c155392461823ab76975d350d27c7cc52dec1d4 Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Sat, 7 May 2022 23:39:34 +0100
Subject: [PATCH 1/4] fix_xfce4_plugins_template

---
 Manual.md                                 | 19 ++++++++++---------
 common/environment/setup/misc.sh          |  1 +
 srcpkgs/xfce4-battery-plugin/template     |  7 ++++---
 srcpkgs/xfce4-clipman-plugin/template     |  7 ++++---
 srcpkgs/xfce4-cpufreq-plugin/template     |  6 +++---
 srcpkgs/xfce4-cpugraph-plugin/template    |  8 ++++----
 srcpkgs/xfce4-diskperf-plugin/template    |  6 +++---
 srcpkgs/xfce4-fsguard-plugin/template     |  7 ++++---
 srcpkgs/xfce4-genmon-plugin/template      |  5 +++--
 srcpkgs/xfce4-mailwatch-plugin/template   |  7 ++++---
 srcpkgs/xfce4-mpc-plugin/template         |  7 ++++---
 srcpkgs/xfce4-netload-plugin/template     |  7 ++++---
 srcpkgs/xfce4-places-plugin/template      |  7 ++++---
 srcpkgs/xfce4-pulseaudio-plugin/template  |  7 ++++---
 srcpkgs/xfce4-sensors-plugin/template     |  8 ++++----
 srcpkgs/xfce4-systemload-plugin/template  |  5 +++--
 srcpkgs/xfce4-time-out-plugin/template    |  6 +++---
 srcpkgs/xfce4-timer-plugin/template       |  7 ++++---
 srcpkgs/xfce4-verve-plugin/template       |  5 +++--
 srcpkgs/xfce4-wavelan-plugin/template     |  5 +++--
 srcpkgs/xfce4-weather-plugin/template     |  7 ++++---
 srcpkgs/xfce4-whiskermenu-plugin/template |  6 +++---
 srcpkgs/xfce4-xkb-plugin/template         |  7 ++++---
 23 files changed, 87 insertions(+), 70 deletions(-)

diff --git a/Manual.md b/Manual.md
index 8afe781f0ec1..426b103b6ed6 100644
--- a/Manual.md
+++ b/Manual.md
@@ -517,20 +517,21 @@ Example:
 
   | Variable         | Value                                           |
   |------------------|-------------------------------------------------|
-  | CPAN_SITE        | https://cpan.perl.org/modules/by-module          |
+  | CPAN_SITE        | https://cpan.perl.org/modules/by-module         |
   | DEBIAN_SITE      | http://ftp.debian.org/debian/pool               |
-  | FREEDESKTOP_SITE | https://freedesktop.org/software                 |
-  | GNOME_SITE       | https://ftp.gnome.org/pub/GNOME/sources          |
-  | GNU_SITE         | https://ftp.gnu.org/gnu                          |
-  | KERNEL_SITE      | https://www.kernel.org/pub/linux                 |
-  | MOZILLA_SITE     | https://ftp.mozilla.org/pub                      |
-  | NONGNU_SITE      | https://download.savannah.nongnu.org/releases    |
+  | FREEDESKTOP_SITE | https://freedesktop.org/software                |
+  | GNOME_SITE       | https://ftp.gnome.org/pub/GNOME/sources         |
+  | GNU_SITE         | https://ftp.gnu.org/gnu                         |
+  | KERNEL_SITE      | https://www.kernel.org/pub/linux                |
+  | MOZILLA_SITE     | https://ftp.mozilla.org/pub                     |
+  | NONGNU_SITE      | https://download.savannah.nongnu.org/releases   |
   | PYPI_SITE        | https://files.pythonhosted.org/packages/source  |
-  | SOURCEFORGE_SITE | https://downloads.sourceforge.net/sourceforge    |
+  | SOURCEFORGE_SITE | https://downloads.sourceforge.net/sourceforge   |
   | UBUNTU_SITE      | http://archive.ubuntu.com/ubuntu/pool           |
-  | XORG_SITE        | https://www.x.org/releases/individual            |
+  | XORG_SITE        | https://www.x.org/releases/individual           |
   | KDE_SITE         | https://download.kde.org/stable                 |
   | VIDEOLAN_SITE    | https://download.videolan.org/pub/videolan      |
+  | XFCE_DOWNLOADS   | https://archive.xfce.org     				   |
 
 - `checksum` The `sha256` digests matching `${distfiles}`. Multiple files can be
 separated by blanks. Please note that the order must be the same than
diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index 177b1e5622a2..ff92007201c1 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -18,5 +18,6 @@ GNU_SITE="https://ftp.gnu.org/gnu"
 FREEDESKTOP_SITE="https://freedesktop.org/software"
 KDE_SITE="https://download.kde.org/stable"
 VIDEOLAN_SITE="https://download.videolan.org/pub/videolan"
+XFCE_DOWNLOADS="https://archive.xfce.org"
 
 set +a
diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index d370cb980aad..092ea79d2ff0 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.4
-revision=1
+revision=4
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-battery-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-battery-plugin/-/blob/master/NEWS"
 checksum=107df2a837156c010e1eab5430bab90c77f0a3dc699b5937678c8a9c5e64c222
diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 4c86bf53e705..3a6c61cfc356 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"
 maintainer="Aaditya Bagga <abchk1234@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/${version%.*}/xfce4-clipman-plugin-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-clipman-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-clipman-plugin/-/blob/master/NEWS"
 checksum=ab8a5fe6f68fb1789190e498243a1d1385de3f64e984f470cbd3d1eb779399b8
diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 0ed8983ae9f2..b4462d3d4cd6 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -9,7 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpufreq-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-cpufreq-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpufreq-plugin/-/blob/master/NEWS"
 checksum=5ad4fb6150f51917b2a8af65926c6e4e83340827835782a14844c6b88dbcc58c
diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index ed54f1da6ca1..0d1572612b3e 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.2.6
-revision=1
+revision=6
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,9 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpugraph-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpugraph-plugin/-/blob/master/NEWS"
 checksum=773246f57c1824a85468d4119c17aeb07170ed1ebace8fa406c7fbcf5b47af99
 
 post_install() {
diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index d7b6f822491a..7aaaac0e9684 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.7.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,8 +10,8 @@ short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"
 maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="BSD-2-Clause"
 homepage="https://docs.xfce.org/panel-plugins/xfce4-diskperf-plugin/start"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-diskperf-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-diskperf-plugin/-/blob/master/NEWS"
 checksum=5909a65341a6af4d7ff3c7bb87aeac91c763f69b43ae9dc4a10668ac226fecc9
 
 post_install() {
diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 89cbc3e12db2..cf328a67e85e 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-fsguard-plugin/-/blob/master/NEWS"
 checksum=67d8e6a219a7117c59693adbc59c39a6eba31e3f18a5499189ef4ef28b554105
 
 post_install() {
diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index e12ff660c7ee..ad29934c9f83 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="LGPL-2.1-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-genmon-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-genmon-plugin/-/blob/master/NEWS"
 checksum=b2119fd0ff19fa293b97ec97b0de8e241799e08b86218515167c568bd9b50135
diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index d5067cd4ab1b..3d4e705af652 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=2
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,6 +10,7 @@ makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
 short_desc="Mail watcher plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-mailwatch-plugin/-/blob/master/NEWS"
 checksum=20f91ebefd2880b27f421f773115b3740f67de2bf60feace3841bfd1a09cbe2e
diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 388fcf6eda05..d0e9d9abab02 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"
 maintainer="Peter Wang <novalazy@gmail.com>"
 license="ISC"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-mpc-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-mpc-plugin/-/blob/master/NEWS"
 checksum=eefe78b7b6b95312b3a52814b7f632dc92970c1b3e9535de616315749bf67760
 
 post_install() {
diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index de056c06c519..4447c65b99d7 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.4.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-netload-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-netload-plugin/-/blob/master/NEWS"
 checksum=6c76260e101790754dd93255ec979accd97d21a21da85d8edcd6c7b01ddcd70c
diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 59eb5f820e8d..fe6180fe7711 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=3
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -9,6 +9,7 @@ makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-places-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-places-plugin/-/blob/master/NEWS"
 checksum=f211219f03c9260f624370e18c79e4176c9d35a8247158e77e5d811327610ab2
diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index d4d594f00698..edefa452dfc7 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
@@ -10,6 +10,7 @@ depends="pavucontrol"
 short_desc="Pulseaudio volume control plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-pulseaudio-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/-/blob/master/NEWS"
 checksum=5a518237e2137341d8ca6584938950525e20c28a0177e30ecaea3ba8e7a2615b
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 31dc3db93f37..8d6a631ce603 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.4.3
-revision=1
+revision=3
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -10,9 +10,9 @@ depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Xfce hardware sensors plugin"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/blob/master/NEWS"
 checksum=171c0235f70c65f0ffee587e960d9da79b284855df22130239eac26272ec06c9
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index e3d299fcf39d..69c054eaa0e4 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="System load plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-systemload-plugin/-/blob/master/NEWS"
 checksum=56d1007801d52d7c2b5a13bb54745f6d7f06fda28b49ce936145633068817652
 
 post_install() {
diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index 55da8c0ea8d5..8ead1eb88829 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -9,7 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-time-out-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-time-out-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-time-out-plugin/-/blob/master/NEWS"
 checksum=3dd8eba694ff3ba5c25bd7f5cd70dc22175fb2c0a759213f05ab8f0e629d82d4
diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index 3b2240a87ed3..5e85e8fcd168 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-timer-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-timer-plugin/-/blob/master/NEWS"
 checksum=4b52d2911b1949e945971be6533155ee6ba99c77078eac7fd43b0f2aeca824e3
diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index fe00e5a0bea2..bdb48b267cca 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-verve-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-verve-plugin/-/blob/master/NEWS"
 checksum=ebda5e5eb62d6e42afdc6f121d2f1cbd4d9d3c2b16a5e3ed8192b1b224b8f825
diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index 68b7d78ce45c..4f66faec8e1f 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-wavelan-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-wavelan-plugin/-/blob/master/NEWS"
 checksum=ea7aa36650c596b1a29567d100776c68ed732aaf0f48c92245c4466058b5481d
 
 post_install() {
diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index ef47f0f6143a..e459d54d85d5 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.11.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,7 +10,8 @@ depends="hicolor-icon-theme"
 short_desc="XFCE panel plugin to show temperature and weather"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-weather-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/blob/master/NEWS"
 checksum=e3242ea951d51bc0fded1d02a4f1f662bec16a1fb10c855f71bda6541a1153fc
 lib32disabled=yes
diff --git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template
index 14604b7bb072..582debf7e9cf 100644
--- a/srcpkgs/xfce4-whiskermenu-plugin/template
+++ b/srcpkgs/xfce4-whiskermenu-plugin/template
@@ -8,7 +8,7 @@ makedepends="exo-devel garcon-devel xfce4-panel-devel"
 short_desc="Alternate menu for Xfce4"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-2.0-or-later"
-homepage="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/raw/main/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/blob/master/NEWS"
 checksum=04ae0c1764a0d5ec70f18a760d998a2109bb6724f048554d7d6999d9072ca63e
diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index 2498a8ab3f63..b9a75f8d1d61 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libw
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="https://xfce.org/"
-distfiles="https://archive.xfce.org/src/panel-plugins/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-xkb-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-xkb-plugin/-/blob/master/NEWS"
 checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 
 post_install() {

From 2b97fac54d8ec711456b75dd58bfdc54153a5a6a Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Tue, 10 May 2022 20:25:45 +0100
Subject: [PATCH 2/4] add_xfce_site

---
 common/environment/setup/misc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index ff92007201c1..1c274d443e33 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -18,6 +18,6 @@ GNU_SITE="https://ftp.gnu.org/gnu"
 FREEDESKTOP_SITE="https://freedesktop.org/software"
 KDE_SITE="https://download.kde.org/stable"
 VIDEOLAN_SITE="https://download.videolan.org/pub/videolan"
-XFCE_DOWNLOADS="https://archive.xfce.org"
+XFCE_SITE="https://archive.xfce.org"
 
 set +a

From 01924a40bf4016430113d2e749520aed743402ac Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Tue, 10 May 2022 20:59:30 +0100
Subject: [PATCH 3/4] update_mstcorefonts_version

---
 srcpkgs/msttcorefonts/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/msttcorefonts/template b/srcpkgs/msttcorefonts/template
index c5a2fafcd205..47105f6aec8c 100644
--- a/srcpkgs/msttcorefonts/template
+++ b/srcpkgs/msttcorefonts/template
@@ -1,6 +1,6 @@
 # Template file for 'msttcorefonts'
 pkgname=msttcorefonts
-version=1.3.4
+version=2.5.1
 revision=2
 hostmakedepends="cabextract"
 short_desc="Microsoft Typography Project - corefonts"

From 08a2795874a7131eb2f85f7b5080cd42f64a6066 Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Tue, 10 May 2022 21:41:15 +0100
Subject: [PATCH 4/4] fix_package_homepage_and_distfiles_add_changelog

---
 srcpkgs/xfce4-xkb-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index b9a75f8d1d61..bd95574f401a 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.2
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,7 +10,7 @@ short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://docs.xfce.org/panel-plugins/xfce4-xkb-plugin/start"
-distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+distfiles="${XFCE_SITE}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 changelog="https://gitlab.xfce.org/panel-plugins/xfce4-xkb-plugin/-/blob/master/NEWS"
 checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: Fix XFCE4-PLUGIN templates.
  2022-05-07 22:55 [PR PATCH] Fix XFCE4-PLUGIN templates IT-DEVS-Group
                   ` (6 preceding siblings ...)
  2022-05-10 20:41 ` IT-DEVS-Group
@ 2022-05-10 20:45 ` Chocimier
  2022-05-10 20:48 ` [PR PATCH] [Updated] " IT-DEVS-Group
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: Chocimier @ 2022-05-10 20:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 268 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/37028#issuecomment-1122843645

Comment:
There is no point in changing `msttcorefonts` if resulting package is same. Also create separate PRs for unrelated packages.

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] Fix XFCE4-PLUGIN templates.
  2022-05-07 22:55 [PR PATCH] Fix XFCE4-PLUGIN templates IT-DEVS-Group
                   ` (7 preceding siblings ...)
  2022-05-10 20:45 ` Chocimier
@ 2022-05-10 20:48 ` IT-DEVS-Group
  2022-05-10 20:51 ` IT-DEVS-Group
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: IT-DEVS-Group @ 2022-05-10 20:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 449 bytes --]

There is an updated pull request by IT-DEVS-Group against master on the void-packages repository

https://github.com/IT-DEVS-Group/void-packages master
https://github.com/void-linux/void-packages/pull/37028

Fix XFCE4-PLUGIN templates.
<!-- Uncomment relevant sections and delete options which are not applicable -->

- I tested the changes in this PR: NO

A patch file from https://github.com/void-linux/void-packages/pull/37028.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37028.patch --]
[-- Type: text/x-diff, Size: 32168 bytes --]

From 5c155392461823ab76975d350d27c7cc52dec1d4 Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Sat, 7 May 2022 23:39:34 +0100
Subject: [PATCH 1/5] fix_xfce4_plugins_template

---
 Manual.md                                 | 19 ++++++++++---------
 common/environment/setup/misc.sh          |  1 +
 srcpkgs/xfce4-battery-plugin/template     |  7 ++++---
 srcpkgs/xfce4-clipman-plugin/template     |  7 ++++---
 srcpkgs/xfce4-cpufreq-plugin/template     |  6 +++---
 srcpkgs/xfce4-cpugraph-plugin/template    |  8 ++++----
 srcpkgs/xfce4-diskperf-plugin/template    |  6 +++---
 srcpkgs/xfce4-fsguard-plugin/template     |  7 ++++---
 srcpkgs/xfce4-genmon-plugin/template      |  5 +++--
 srcpkgs/xfce4-mailwatch-plugin/template   |  7 ++++---
 srcpkgs/xfce4-mpc-plugin/template         |  7 ++++---
 srcpkgs/xfce4-netload-plugin/template     |  7 ++++---
 srcpkgs/xfce4-places-plugin/template      |  7 ++++---
 srcpkgs/xfce4-pulseaudio-plugin/template  |  7 ++++---
 srcpkgs/xfce4-sensors-plugin/template     |  8 ++++----
 srcpkgs/xfce4-systemload-plugin/template  |  5 +++--
 srcpkgs/xfce4-time-out-plugin/template    |  6 +++---
 srcpkgs/xfce4-timer-plugin/template       |  7 ++++---
 srcpkgs/xfce4-verve-plugin/template       |  5 +++--
 srcpkgs/xfce4-wavelan-plugin/template     |  5 +++--
 srcpkgs/xfce4-weather-plugin/template     |  7 ++++---
 srcpkgs/xfce4-whiskermenu-plugin/template |  6 +++---
 srcpkgs/xfce4-xkb-plugin/template         |  7 ++++---
 23 files changed, 87 insertions(+), 70 deletions(-)

diff --git a/Manual.md b/Manual.md
index 8afe781f0ec1..426b103b6ed6 100644
--- a/Manual.md
+++ b/Manual.md
@@ -517,20 +517,21 @@ Example:
 
   | Variable         | Value                                           |
   |------------------|-------------------------------------------------|
-  | CPAN_SITE        | https://cpan.perl.org/modules/by-module          |
+  | CPAN_SITE        | https://cpan.perl.org/modules/by-module         |
   | DEBIAN_SITE      | http://ftp.debian.org/debian/pool               |
-  | FREEDESKTOP_SITE | https://freedesktop.org/software                 |
-  | GNOME_SITE       | https://ftp.gnome.org/pub/GNOME/sources          |
-  | GNU_SITE         | https://ftp.gnu.org/gnu                          |
-  | KERNEL_SITE      | https://www.kernel.org/pub/linux                 |
-  | MOZILLA_SITE     | https://ftp.mozilla.org/pub                      |
-  | NONGNU_SITE      | https://download.savannah.nongnu.org/releases    |
+  | FREEDESKTOP_SITE | https://freedesktop.org/software                |
+  | GNOME_SITE       | https://ftp.gnome.org/pub/GNOME/sources         |
+  | GNU_SITE         | https://ftp.gnu.org/gnu                         |
+  | KERNEL_SITE      | https://www.kernel.org/pub/linux                |
+  | MOZILLA_SITE     | https://ftp.mozilla.org/pub                     |
+  | NONGNU_SITE      | https://download.savannah.nongnu.org/releases   |
   | PYPI_SITE        | https://files.pythonhosted.org/packages/source  |
-  | SOURCEFORGE_SITE | https://downloads.sourceforge.net/sourceforge    |
+  | SOURCEFORGE_SITE | https://downloads.sourceforge.net/sourceforge   |
   | UBUNTU_SITE      | http://archive.ubuntu.com/ubuntu/pool           |
-  | XORG_SITE        | https://www.x.org/releases/individual            |
+  | XORG_SITE        | https://www.x.org/releases/individual           |
   | KDE_SITE         | https://download.kde.org/stable                 |
   | VIDEOLAN_SITE    | https://download.videolan.org/pub/videolan      |
+  | XFCE_DOWNLOADS   | https://archive.xfce.org     				   |
 
 - `checksum` The `sha256` digests matching `${distfiles}`. Multiple files can be
 separated by blanks. Please note that the order must be the same than
diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index 177b1e5622a2..ff92007201c1 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -18,5 +18,6 @@ GNU_SITE="https://ftp.gnu.org/gnu"
 FREEDESKTOP_SITE="https://freedesktop.org/software"
 KDE_SITE="https://download.kde.org/stable"
 VIDEOLAN_SITE="https://download.videolan.org/pub/videolan"
+XFCE_DOWNLOADS="https://archive.xfce.org"
 
 set +a
diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index d370cb980aad..092ea79d2ff0 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.4
-revision=1
+revision=4
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-battery-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-battery-plugin/-/blob/master/NEWS"
 checksum=107df2a837156c010e1eab5430bab90c77f0a3dc699b5937678c8a9c5e64c222
diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 4c86bf53e705..3a6c61cfc356 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"
 maintainer="Aaditya Bagga <abchk1234@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/${version%.*}/xfce4-clipman-plugin-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-clipman-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-clipman-plugin/-/blob/master/NEWS"
 checksum=ab8a5fe6f68fb1789190e498243a1d1385de3f64e984f470cbd3d1eb779399b8
diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 0ed8983ae9f2..b4462d3d4cd6 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -9,7 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpufreq-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-cpufreq-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpufreq-plugin/-/blob/master/NEWS"
 checksum=5ad4fb6150f51917b2a8af65926c6e4e83340827835782a14844c6b88dbcc58c
diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index ed54f1da6ca1..0d1572612b3e 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.2.6
-revision=1
+revision=6
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,9 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpugraph-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpugraph-plugin/-/blob/master/NEWS"
 checksum=773246f57c1824a85468d4119c17aeb07170ed1ebace8fa406c7fbcf5b47af99
 
 post_install() {
diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index d7b6f822491a..7aaaac0e9684 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.7.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,8 +10,8 @@ short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"
 maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="BSD-2-Clause"
 homepage="https://docs.xfce.org/panel-plugins/xfce4-diskperf-plugin/start"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-diskperf-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-diskperf-plugin/-/blob/master/NEWS"
 checksum=5909a65341a6af4d7ff3c7bb87aeac91c763f69b43ae9dc4a10668ac226fecc9
 
 post_install() {
diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 89cbc3e12db2..cf328a67e85e 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-fsguard-plugin/-/blob/master/NEWS"
 checksum=67d8e6a219a7117c59693adbc59c39a6eba31e3f18a5499189ef4ef28b554105
 
 post_install() {
diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index e12ff660c7ee..ad29934c9f83 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="LGPL-2.1-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-genmon-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-genmon-plugin/-/blob/master/NEWS"
 checksum=b2119fd0ff19fa293b97ec97b0de8e241799e08b86218515167c568bd9b50135
diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index d5067cd4ab1b..3d4e705af652 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=2
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,6 +10,7 @@ makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
 short_desc="Mail watcher plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-mailwatch-plugin/-/blob/master/NEWS"
 checksum=20f91ebefd2880b27f421f773115b3740f67de2bf60feace3841bfd1a09cbe2e
diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 388fcf6eda05..d0e9d9abab02 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"
 maintainer="Peter Wang <novalazy@gmail.com>"
 license="ISC"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-mpc-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-mpc-plugin/-/blob/master/NEWS"
 checksum=eefe78b7b6b95312b3a52814b7f632dc92970c1b3e9535de616315749bf67760
 
 post_install() {
diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index de056c06c519..4447c65b99d7 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.4.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-netload-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-netload-plugin/-/blob/master/NEWS"
 checksum=6c76260e101790754dd93255ec979accd97d21a21da85d8edcd6c7b01ddcd70c
diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 59eb5f820e8d..fe6180fe7711 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=3
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -9,6 +9,7 @@ makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-places-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-places-plugin/-/blob/master/NEWS"
 checksum=f211219f03c9260f624370e18c79e4176c9d35a8247158e77e5d811327610ab2
diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index d4d594f00698..edefa452dfc7 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
@@ -10,6 +10,7 @@ depends="pavucontrol"
 short_desc="Pulseaudio volume control plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-pulseaudio-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/-/blob/master/NEWS"
 checksum=5a518237e2137341d8ca6584938950525e20c28a0177e30ecaea3ba8e7a2615b
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 31dc3db93f37..8d6a631ce603 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.4.3
-revision=1
+revision=3
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -10,9 +10,9 @@ depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Xfce hardware sensors plugin"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/blob/master/NEWS"
 checksum=171c0235f70c65f0ffee587e960d9da79b284855df22130239eac26272ec06c9
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index e3d299fcf39d..69c054eaa0e4 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="System load plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-systemload-plugin/-/blob/master/NEWS"
 checksum=56d1007801d52d7c2b5a13bb54745f6d7f06fda28b49ce936145633068817652
 
 post_install() {
diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index 55da8c0ea8d5..8ead1eb88829 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -9,7 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-time-out-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-time-out-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-time-out-plugin/-/blob/master/NEWS"
 checksum=3dd8eba694ff3ba5c25bd7f5cd70dc22175fb2c0a759213f05ab8f0e629d82d4
diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index 3b2240a87ed3..5e85e8fcd168 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-timer-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-timer-plugin/-/blob/master/NEWS"
 checksum=4b52d2911b1949e945971be6533155ee6ba99c77078eac7fd43b0f2aeca824e3
diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index fe00e5a0bea2..bdb48b267cca 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-verve-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-verve-plugin/-/blob/master/NEWS"
 checksum=ebda5e5eb62d6e42afdc6f121d2f1cbd4d9d3c2b16a5e3ed8192b1b224b8f825
diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index 68b7d78ce45c..4f66faec8e1f 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-wavelan-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-wavelan-plugin/-/blob/master/NEWS"
 checksum=ea7aa36650c596b1a29567d100776c68ed732aaf0f48c92245c4466058b5481d
 
 post_install() {
diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index ef47f0f6143a..e459d54d85d5 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.11.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,7 +10,8 @@ depends="hicolor-icon-theme"
 short_desc="XFCE panel plugin to show temperature and weather"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-weather-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/blob/master/NEWS"
 checksum=e3242ea951d51bc0fded1d02a4f1f662bec16a1fb10c855f71bda6541a1153fc
 lib32disabled=yes
diff --git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template
index 14604b7bb072..582debf7e9cf 100644
--- a/srcpkgs/xfce4-whiskermenu-plugin/template
+++ b/srcpkgs/xfce4-whiskermenu-plugin/template
@@ -8,7 +8,7 @@ makedepends="exo-devel garcon-devel xfce4-panel-devel"
 short_desc="Alternate menu for Xfce4"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-2.0-or-later"
-homepage="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/raw/main/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/blob/master/NEWS"
 checksum=04ae0c1764a0d5ec70f18a760d998a2109bb6724f048554d7d6999d9072ca63e
diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index 2498a8ab3f63..b9a75f8d1d61 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libw
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="https://xfce.org/"
-distfiles="https://archive.xfce.org/src/panel-plugins/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-xkb-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-xkb-plugin/-/blob/master/NEWS"
 checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 
 post_install() {

From 2b97fac54d8ec711456b75dd58bfdc54153a5a6a Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Tue, 10 May 2022 20:25:45 +0100
Subject: [PATCH 2/5] add_xfce_site

---
 common/environment/setup/misc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index ff92007201c1..1c274d443e33 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -18,6 +18,6 @@ GNU_SITE="https://ftp.gnu.org/gnu"
 FREEDESKTOP_SITE="https://freedesktop.org/software"
 KDE_SITE="https://download.kde.org/stable"
 VIDEOLAN_SITE="https://download.videolan.org/pub/videolan"
-XFCE_DOWNLOADS="https://archive.xfce.org"
+XFCE_SITE="https://archive.xfce.org"
 
 set +a

From 01924a40bf4016430113d2e749520aed743402ac Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Tue, 10 May 2022 20:59:30 +0100
Subject: [PATCH 3/5] update_mstcorefonts_version

---
 srcpkgs/msttcorefonts/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/msttcorefonts/template b/srcpkgs/msttcorefonts/template
index c5a2fafcd205..47105f6aec8c 100644
--- a/srcpkgs/msttcorefonts/template
+++ b/srcpkgs/msttcorefonts/template
@@ -1,6 +1,6 @@
 # Template file for 'msttcorefonts'
 pkgname=msttcorefonts
-version=1.3.4
+version=2.5.1
 revision=2
 hostmakedepends="cabextract"
 short_desc="Microsoft Typography Project - corefonts"

From 08a2795874a7131eb2f85f7b5080cd42f64a6066 Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Tue, 10 May 2022 21:41:15 +0100
Subject: [PATCH 4/5] fix_package_homepage_and_distfiles_add_changelog

---
 srcpkgs/xfce4-xkb-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index b9a75f8d1d61..bd95574f401a 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.2
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,7 +10,7 @@ short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://docs.xfce.org/panel-plugins/xfce4-xkb-plugin/start"
-distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+distfiles="${XFCE_SITE}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 changelog="https://gitlab.xfce.org/panel-plugins/xfce4-xkb-plugin/-/blob/master/NEWS"
 checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 

From 562f0f1514067a101a19bbb0f12e6a4463d8d177 Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Tue, 10 May 2022 21:47:48 +0100
Subject: [PATCH 5/5] fix_changelog_position

---
 srcpkgs/xfce4-xkb-plugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index bd95574f401a..9ca2bbbc8de2 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -10,8 +10,8 @@ short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://docs.xfce.org/panel-plugins/xfce4-xkb-plugin/start"
-distfiles="${XFCE_SITE}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 changelog="https://gitlab.xfce.org/panel-plugins/xfce4-xkb-plugin/-/blob/master/NEWS"
+distfiles="${XFCE_SITE}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 
 post_install() {

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] Fix XFCE4-PLUGIN templates.
  2022-05-07 22:55 [PR PATCH] Fix XFCE4-PLUGIN templates IT-DEVS-Group
                   ` (8 preceding siblings ...)
  2022-05-10 20:48 ` [PR PATCH] [Updated] " IT-DEVS-Group
@ 2022-05-10 20:51 ` IT-DEVS-Group
  2022-05-10 20:57 ` IT-DEVS-Group
  2022-05-10 21:01 ` [PR PATCH] [Closed]: " IT-DEVS-Group
  11 siblings, 0 replies; 13+ messages in thread
From: IT-DEVS-Group @ 2022-05-10 20:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 449 bytes --]

There is an updated pull request by IT-DEVS-Group against master on the void-packages repository

https://github.com/IT-DEVS-Group/void-packages master
https://github.com/void-linux/void-packages/pull/37028

Fix XFCE4-PLUGIN templates.
<!-- Uncomment relevant sections and delete options which are not applicable -->

- I tested the changes in this PR: NO

A patch file from https://github.com/void-linux/void-packages/pull/37028.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37028.patch --]
[-- Type: text/x-diff, Size: 33319 bytes --]

From 5c155392461823ab76975d350d27c7cc52dec1d4 Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Sat, 7 May 2022 23:39:34 +0100
Subject: [PATCH 1/6] fix_xfce4_plugins_template

---
 Manual.md                                 | 19 ++++++++++---------
 common/environment/setup/misc.sh          |  1 +
 srcpkgs/xfce4-battery-plugin/template     |  7 ++++---
 srcpkgs/xfce4-clipman-plugin/template     |  7 ++++---
 srcpkgs/xfce4-cpufreq-plugin/template     |  6 +++---
 srcpkgs/xfce4-cpugraph-plugin/template    |  8 ++++----
 srcpkgs/xfce4-diskperf-plugin/template    |  6 +++---
 srcpkgs/xfce4-fsguard-plugin/template     |  7 ++++---
 srcpkgs/xfce4-genmon-plugin/template      |  5 +++--
 srcpkgs/xfce4-mailwatch-plugin/template   |  7 ++++---
 srcpkgs/xfce4-mpc-plugin/template         |  7 ++++---
 srcpkgs/xfce4-netload-plugin/template     |  7 ++++---
 srcpkgs/xfce4-places-plugin/template      |  7 ++++---
 srcpkgs/xfce4-pulseaudio-plugin/template  |  7 ++++---
 srcpkgs/xfce4-sensors-plugin/template     |  8 ++++----
 srcpkgs/xfce4-systemload-plugin/template  |  5 +++--
 srcpkgs/xfce4-time-out-plugin/template    |  6 +++---
 srcpkgs/xfce4-timer-plugin/template       |  7 ++++---
 srcpkgs/xfce4-verve-plugin/template       |  5 +++--
 srcpkgs/xfce4-wavelan-plugin/template     |  5 +++--
 srcpkgs/xfce4-weather-plugin/template     |  7 ++++---
 srcpkgs/xfce4-whiskermenu-plugin/template |  6 +++---
 srcpkgs/xfce4-xkb-plugin/template         |  7 ++++---
 23 files changed, 87 insertions(+), 70 deletions(-)

diff --git a/Manual.md b/Manual.md
index 8afe781f0ec1..426b103b6ed6 100644
--- a/Manual.md
+++ b/Manual.md
@@ -517,20 +517,21 @@ Example:
 
   | Variable         | Value                                           |
   |------------------|-------------------------------------------------|
-  | CPAN_SITE        | https://cpan.perl.org/modules/by-module          |
+  | CPAN_SITE        | https://cpan.perl.org/modules/by-module         |
   | DEBIAN_SITE      | http://ftp.debian.org/debian/pool               |
-  | FREEDESKTOP_SITE | https://freedesktop.org/software                 |
-  | GNOME_SITE       | https://ftp.gnome.org/pub/GNOME/sources          |
-  | GNU_SITE         | https://ftp.gnu.org/gnu                          |
-  | KERNEL_SITE      | https://www.kernel.org/pub/linux                 |
-  | MOZILLA_SITE     | https://ftp.mozilla.org/pub                      |
-  | NONGNU_SITE      | https://download.savannah.nongnu.org/releases    |
+  | FREEDESKTOP_SITE | https://freedesktop.org/software                |
+  | GNOME_SITE       | https://ftp.gnome.org/pub/GNOME/sources         |
+  | GNU_SITE         | https://ftp.gnu.org/gnu                         |
+  | KERNEL_SITE      | https://www.kernel.org/pub/linux                |
+  | MOZILLA_SITE     | https://ftp.mozilla.org/pub                     |
+  | NONGNU_SITE      | https://download.savannah.nongnu.org/releases   |
   | PYPI_SITE        | https://files.pythonhosted.org/packages/source  |
-  | SOURCEFORGE_SITE | https://downloads.sourceforge.net/sourceforge    |
+  | SOURCEFORGE_SITE | https://downloads.sourceforge.net/sourceforge   |
   | UBUNTU_SITE      | http://archive.ubuntu.com/ubuntu/pool           |
-  | XORG_SITE        | https://www.x.org/releases/individual            |
+  | XORG_SITE        | https://www.x.org/releases/individual           |
   | KDE_SITE         | https://download.kde.org/stable                 |
   | VIDEOLAN_SITE    | https://download.videolan.org/pub/videolan      |
+  | XFCE_DOWNLOADS   | https://archive.xfce.org     				   |
 
 - `checksum` The `sha256` digests matching `${distfiles}`. Multiple files can be
 separated by blanks. Please note that the order must be the same than
diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index 177b1e5622a2..ff92007201c1 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -18,5 +18,6 @@ GNU_SITE="https://ftp.gnu.org/gnu"
 FREEDESKTOP_SITE="https://freedesktop.org/software"
 KDE_SITE="https://download.kde.org/stable"
 VIDEOLAN_SITE="https://download.videolan.org/pub/videolan"
+XFCE_DOWNLOADS="https://archive.xfce.org"
 
 set +a
diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index d370cb980aad..092ea79d2ff0 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.4
-revision=1
+revision=4
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-battery-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-battery-plugin/-/blob/master/NEWS"
 checksum=107df2a837156c010e1eab5430bab90c77f0a3dc699b5937678c8a9c5e64c222
diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 4c86bf53e705..3a6c61cfc356 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"
 maintainer="Aaditya Bagga <abchk1234@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/${version%.*}/xfce4-clipman-plugin-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-clipman-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-clipman-plugin/-/blob/master/NEWS"
 checksum=ab8a5fe6f68fb1789190e498243a1d1385de3f64e984f470cbd3d1eb779399b8
diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 0ed8983ae9f2..b4462d3d4cd6 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -9,7 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpufreq-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-cpufreq-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpufreq-plugin/-/blob/master/NEWS"
 checksum=5ad4fb6150f51917b2a8af65926c6e4e83340827835782a14844c6b88dbcc58c
diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index ed54f1da6ca1..0d1572612b3e 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.2.6
-revision=1
+revision=6
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,9 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpugraph-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpugraph-plugin/-/blob/master/NEWS"
 checksum=773246f57c1824a85468d4119c17aeb07170ed1ebace8fa406c7fbcf5b47af99
 
 post_install() {
diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index d7b6f822491a..7aaaac0e9684 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.7.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,8 +10,8 @@ short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"
 maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="BSD-2-Clause"
 homepage="https://docs.xfce.org/panel-plugins/xfce4-diskperf-plugin/start"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-diskperf-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-diskperf-plugin/-/blob/master/NEWS"
 checksum=5909a65341a6af4d7ff3c7bb87aeac91c763f69b43ae9dc4a10668ac226fecc9
 
 post_install() {
diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 89cbc3e12db2..cf328a67e85e 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-fsguard-plugin/-/blob/master/NEWS"
 checksum=67d8e6a219a7117c59693adbc59c39a6eba31e3f18a5499189ef4ef28b554105
 
 post_install() {
diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index e12ff660c7ee..ad29934c9f83 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="LGPL-2.1-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-genmon-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-genmon-plugin/-/blob/master/NEWS"
 checksum=b2119fd0ff19fa293b97ec97b0de8e241799e08b86218515167c568bd9b50135
diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index d5067cd4ab1b..3d4e705af652 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=2
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,6 +10,7 @@ makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
 short_desc="Mail watcher plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-mailwatch-plugin/-/blob/master/NEWS"
 checksum=20f91ebefd2880b27f421f773115b3740f67de2bf60feace3841bfd1a09cbe2e
diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 388fcf6eda05..d0e9d9abab02 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"
 maintainer="Peter Wang <novalazy@gmail.com>"
 license="ISC"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-mpc-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-mpc-plugin/-/blob/master/NEWS"
 checksum=eefe78b7b6b95312b3a52814b7f632dc92970c1b3e9535de616315749bf67760
 
 post_install() {
diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index de056c06c519..4447c65b99d7 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.4.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-netload-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-netload-plugin/-/blob/master/NEWS"
 checksum=6c76260e101790754dd93255ec979accd97d21a21da85d8edcd6c7b01ddcd70c
diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 59eb5f820e8d..fe6180fe7711 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=3
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -9,6 +9,7 @@ makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-places-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-places-plugin/-/blob/master/NEWS"
 checksum=f211219f03c9260f624370e18c79e4176c9d35a8247158e77e5d811327610ab2
diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index d4d594f00698..edefa452dfc7 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
@@ -10,6 +10,7 @@ depends="pavucontrol"
 short_desc="Pulseaudio volume control plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-pulseaudio-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/-/blob/master/NEWS"
 checksum=5a518237e2137341d8ca6584938950525e20c28a0177e30ecaea3ba8e7a2615b
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 31dc3db93f37..8d6a631ce603 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.4.3
-revision=1
+revision=3
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -10,9 +10,9 @@ depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Xfce hardware sensors plugin"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/blob/master/NEWS"
 checksum=171c0235f70c65f0ffee587e960d9da79b284855df22130239eac26272ec06c9
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index e3d299fcf39d..69c054eaa0e4 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="System load plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-systemload-plugin/-/blob/master/NEWS"
 checksum=56d1007801d52d7c2b5a13bb54745f6d7f06fda28b49ce936145633068817652
 
 post_install() {
diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index 55da8c0ea8d5..8ead1eb88829 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -9,7 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-time-out-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-time-out-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-time-out-plugin/-/blob/master/NEWS"
 checksum=3dd8eba694ff3ba5c25bd7f5cd70dc22175fb2c0a759213f05ab8f0e629d82d4
diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index 3b2240a87ed3..5e85e8fcd168 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-timer-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-timer-plugin/-/blob/master/NEWS"
 checksum=4b52d2911b1949e945971be6533155ee6ba99c77078eac7fd43b0f2aeca824e3
diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index fe00e5a0bea2..bdb48b267cca 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-verve-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-verve-plugin/-/blob/master/NEWS"
 checksum=ebda5e5eb62d6e42afdc6f121d2f1cbd4d9d3c2b16a5e3ed8192b1b224b8f825
diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index 68b7d78ce45c..4f66faec8e1f 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-wavelan-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-wavelan-plugin/-/blob/master/NEWS"
 checksum=ea7aa36650c596b1a29567d100776c68ed732aaf0f48c92245c4466058b5481d
 
 post_install() {
diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index ef47f0f6143a..e459d54d85d5 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.11.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,7 +10,8 @@ depends="hicolor-icon-theme"
 short_desc="XFCE panel plugin to show temperature and weather"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-weather-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/blob/master/NEWS"
 checksum=e3242ea951d51bc0fded1d02a4f1f662bec16a1fb10c855f71bda6541a1153fc
 lib32disabled=yes
diff --git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template
index 14604b7bb072..582debf7e9cf 100644
--- a/srcpkgs/xfce4-whiskermenu-plugin/template
+++ b/srcpkgs/xfce4-whiskermenu-plugin/template
@@ -8,7 +8,7 @@ makedepends="exo-devel garcon-devel xfce4-panel-devel"
 short_desc="Alternate menu for Xfce4"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-2.0-or-later"
-homepage="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/raw/main/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/blob/master/NEWS"
 checksum=04ae0c1764a0d5ec70f18a760d998a2109bb6724f048554d7d6999d9072ca63e
diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index 2498a8ab3f63..b9a75f8d1d61 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libw
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="https://xfce.org/"
-distfiles="https://archive.xfce.org/src/panel-plugins/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-xkb-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-xkb-plugin/-/blob/master/NEWS"
 checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 
 post_install() {

From 2b97fac54d8ec711456b75dd58bfdc54153a5a6a Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Tue, 10 May 2022 20:25:45 +0100
Subject: [PATCH 2/6] add_xfce_site

---
 common/environment/setup/misc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index ff92007201c1..1c274d443e33 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -18,6 +18,6 @@ GNU_SITE="https://ftp.gnu.org/gnu"
 FREEDESKTOP_SITE="https://freedesktop.org/software"
 KDE_SITE="https://download.kde.org/stable"
 VIDEOLAN_SITE="https://download.videolan.org/pub/videolan"
-XFCE_DOWNLOADS="https://archive.xfce.org"
+XFCE_SITE="https://archive.xfce.org"
 
 set +a

From 01924a40bf4016430113d2e749520aed743402ac Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Tue, 10 May 2022 20:59:30 +0100
Subject: [PATCH 3/6] update_mstcorefonts_version

---
 srcpkgs/msttcorefonts/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/msttcorefonts/template b/srcpkgs/msttcorefonts/template
index c5a2fafcd205..47105f6aec8c 100644
--- a/srcpkgs/msttcorefonts/template
+++ b/srcpkgs/msttcorefonts/template
@@ -1,6 +1,6 @@
 # Template file for 'msttcorefonts'
 pkgname=msttcorefonts
-version=1.3.4
+version=2.5.1
 revision=2
 hostmakedepends="cabextract"
 short_desc="Microsoft Typography Project - corefonts"

From 08a2795874a7131eb2f85f7b5080cd42f64a6066 Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Tue, 10 May 2022 21:41:15 +0100
Subject: [PATCH 4/6] fix_package_homepage_and_distfiles_add_changelog

---
 srcpkgs/xfce4-xkb-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index b9a75f8d1d61..bd95574f401a 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.2
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,7 +10,7 @@ short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://docs.xfce.org/panel-plugins/xfce4-xkb-plugin/start"
-distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+distfiles="${XFCE_SITE}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 changelog="https://gitlab.xfce.org/panel-plugins/xfce4-xkb-plugin/-/blob/master/NEWS"
 checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 

From 562f0f1514067a101a19bbb0f12e6a4463d8d177 Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Tue, 10 May 2022 21:47:48 +0100
Subject: [PATCH 5/6] fix_changelog_position

---
 srcpkgs/xfce4-xkb-plugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index bd95574f401a..9ca2bbbc8de2 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -10,8 +10,8 @@ short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://docs.xfce.org/panel-plugins/xfce4-xkb-plugin/start"
-distfiles="${XFCE_SITE}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 changelog="https://gitlab.xfce.org/panel-plugins/xfce4-xkb-plugin/-/blob/master/NEWS"
+distfiles="${XFCE_SITE}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 
 post_install() {

From 4352901732f717e8d79d3bc2f84ea5f43e5acc0c Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Tue, 10 May 2022 21:51:11 +0100
Subject: [PATCH 6/6] whiskermenu-template-fix_changelog_and_homepage_url

---
 srcpkgs/xfce4-whiskermenu-plugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template
index 582debf7e9cf..e48bf6050b76 100644
--- a/srcpkgs/xfce4-whiskermenu-plugin/template
+++ b/srcpkgs/xfce4-whiskermenu-plugin/template
@@ -9,6 +9,6 @@ short_desc="Alternate menu for Xfce4"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/start"
-distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/blob/master/NEWS"
+distfiles="${XFCE_SITE}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=04ae0c1764a0d5ec70f18a760d998a2109bb6724f048554d7d6999d9072ca63e

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] Fix XFCE4-PLUGIN templates.
  2022-05-07 22:55 [PR PATCH] Fix XFCE4-PLUGIN templates IT-DEVS-Group
                   ` (9 preceding siblings ...)
  2022-05-10 20:51 ` IT-DEVS-Group
@ 2022-05-10 20:57 ` IT-DEVS-Group
  2022-05-10 21:01 ` [PR PATCH] [Closed]: " IT-DEVS-Group
  11 siblings, 0 replies; 13+ messages in thread
From: IT-DEVS-Group @ 2022-05-10 20:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 449 bytes --]

There is an updated pull request by IT-DEVS-Group against master on the void-packages repository

https://github.com/IT-DEVS-Group/void-packages master
https://github.com/void-linux/void-packages/pull/37028

Fix XFCE4-PLUGIN templates.
<!-- Uncomment relevant sections and delete options which are not applicable -->

- I tested the changes in this PR: NO

A patch file from https://github.com/void-linux/void-packages/pull/37028.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-37028.patch --]
[-- Type: text/x-diff, Size: 34730 bytes --]

From 5c155392461823ab76975d350d27c7cc52dec1d4 Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Sat, 7 May 2022 23:39:34 +0100
Subject: [PATCH 1/7] fix_xfce4_plugins_template

---
 Manual.md                                 | 19 ++++++++++---------
 common/environment/setup/misc.sh          |  1 +
 srcpkgs/xfce4-battery-plugin/template     |  7 ++++---
 srcpkgs/xfce4-clipman-plugin/template     |  7 ++++---
 srcpkgs/xfce4-cpufreq-plugin/template     |  6 +++---
 srcpkgs/xfce4-cpugraph-plugin/template    |  8 ++++----
 srcpkgs/xfce4-diskperf-plugin/template    |  6 +++---
 srcpkgs/xfce4-fsguard-plugin/template     |  7 ++++---
 srcpkgs/xfce4-genmon-plugin/template      |  5 +++--
 srcpkgs/xfce4-mailwatch-plugin/template   |  7 ++++---
 srcpkgs/xfce4-mpc-plugin/template         |  7 ++++---
 srcpkgs/xfce4-netload-plugin/template     |  7 ++++---
 srcpkgs/xfce4-places-plugin/template      |  7 ++++---
 srcpkgs/xfce4-pulseaudio-plugin/template  |  7 ++++---
 srcpkgs/xfce4-sensors-plugin/template     |  8 ++++----
 srcpkgs/xfce4-systemload-plugin/template  |  5 +++--
 srcpkgs/xfce4-time-out-plugin/template    |  6 +++---
 srcpkgs/xfce4-timer-plugin/template       |  7 ++++---
 srcpkgs/xfce4-verve-plugin/template       |  5 +++--
 srcpkgs/xfce4-wavelan-plugin/template     |  5 +++--
 srcpkgs/xfce4-weather-plugin/template     |  7 ++++---
 srcpkgs/xfce4-whiskermenu-plugin/template |  6 +++---
 srcpkgs/xfce4-xkb-plugin/template         |  7 ++++---
 23 files changed, 87 insertions(+), 70 deletions(-)

diff --git a/Manual.md b/Manual.md
index 8afe781f0ec1..426b103b6ed6 100644
--- a/Manual.md
+++ b/Manual.md
@@ -517,20 +517,21 @@ Example:
 
   | Variable         | Value                                           |
   |------------------|-------------------------------------------------|
-  | CPAN_SITE        | https://cpan.perl.org/modules/by-module          |
+  | CPAN_SITE        | https://cpan.perl.org/modules/by-module         |
   | DEBIAN_SITE      | http://ftp.debian.org/debian/pool               |
-  | FREEDESKTOP_SITE | https://freedesktop.org/software                 |
-  | GNOME_SITE       | https://ftp.gnome.org/pub/GNOME/sources          |
-  | GNU_SITE         | https://ftp.gnu.org/gnu                          |
-  | KERNEL_SITE      | https://www.kernel.org/pub/linux                 |
-  | MOZILLA_SITE     | https://ftp.mozilla.org/pub                      |
-  | NONGNU_SITE      | https://download.savannah.nongnu.org/releases    |
+  | FREEDESKTOP_SITE | https://freedesktop.org/software                |
+  | GNOME_SITE       | https://ftp.gnome.org/pub/GNOME/sources         |
+  | GNU_SITE         | https://ftp.gnu.org/gnu                         |
+  | KERNEL_SITE      | https://www.kernel.org/pub/linux                |
+  | MOZILLA_SITE     | https://ftp.mozilla.org/pub                     |
+  | NONGNU_SITE      | https://download.savannah.nongnu.org/releases   |
   | PYPI_SITE        | https://files.pythonhosted.org/packages/source  |
-  | SOURCEFORGE_SITE | https://downloads.sourceforge.net/sourceforge    |
+  | SOURCEFORGE_SITE | https://downloads.sourceforge.net/sourceforge   |
   | UBUNTU_SITE      | http://archive.ubuntu.com/ubuntu/pool           |
-  | XORG_SITE        | https://www.x.org/releases/individual            |
+  | XORG_SITE        | https://www.x.org/releases/individual           |
   | KDE_SITE         | https://download.kde.org/stable                 |
   | VIDEOLAN_SITE    | https://download.videolan.org/pub/videolan      |
+  | XFCE_DOWNLOADS   | https://archive.xfce.org     				   |
 
 - `checksum` The `sha256` digests matching `${distfiles}`. Multiple files can be
 separated by blanks. Please note that the order must be the same than
diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index 177b1e5622a2..ff92007201c1 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -18,5 +18,6 @@ GNU_SITE="https://ftp.gnu.org/gnu"
 FREEDESKTOP_SITE="https://freedesktop.org/software"
 KDE_SITE="https://download.kde.org/stable"
 VIDEOLAN_SITE="https://download.videolan.org/pub/videolan"
+XFCE_DOWNLOADS="https://archive.xfce.org"
 
 set +a
diff --git a/srcpkgs/xfce4-battery-plugin/template b/srcpkgs/xfce4-battery-plugin/template
index d370cb980aad..092ea79d2ff0 100644
--- a/srcpkgs/xfce4-battery-plugin/template
+++ b/srcpkgs/xfce4-battery-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-battery-plugin'
 pkgname=xfce4-battery-plugin
 version=1.1.4
-revision=1
+revision=4
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Battery monitor plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, LGPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-battery-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-battery-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-battery-plugin/-/blob/master/NEWS"
 checksum=107df2a837156c010e1eab5430bab90c77f0a3dc699b5937678c8a9c5e64c222
diff --git a/srcpkgs/xfce4-clipman-plugin/template b/srcpkgs/xfce4-clipman-plugin/template
index 4c86bf53e705..3a6c61cfc356 100644
--- a/srcpkgs/xfce4-clipman-plugin/template
+++ b/srcpkgs/xfce4-clipman-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-clipman-plugin'
 pkgname=xfce4-clipman-plugin
 version=1.6.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel libXtst-devel qrencode-devel"
 short_desc="Clipboard plugin for the Xfce4 panel"
 maintainer="Aaditya Bagga <abchk1234@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/${version%.*}/xfce4-clipman-plugin-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-clipman-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-clipman-plugin/-/blob/master/NEWS"
 checksum=ab8a5fe6f68fb1789190e498243a1d1385de3f64e984f470cbd3d1eb779399b8
diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 0ed8983ae9f2..b4462d3d4cd6 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -9,7 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="CPU frequency plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpufreq-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpufreq-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-cpufreq-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpufreq-plugin/-/blob/master/NEWS"
 checksum=5ad4fb6150f51917b2a8af65926c6e4e83340827835782a14844c6b88dbcc58c
diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index ed54f1da6ca1..0d1572612b3e 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
 version=1.2.6
-revision=1
+revision=6
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,9 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="CPU graph plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later, BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpugraph-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-cpugraph-plugin/-/blob/master/NEWS"
 checksum=773246f57c1824a85468d4119c17aeb07170ed1ebace8fa406c7fbcf5b47af99
 
 post_install() {
diff --git a/srcpkgs/xfce4-diskperf-plugin/template b/srcpkgs/xfce4-diskperf-plugin/template
index d7b6f822491a..7aaaac0e9684 100644
--- a/srcpkgs/xfce4-diskperf-plugin/template
+++ b/srcpkgs/xfce4-diskperf-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-diskperf-plugin'
 pkgname=xfce4-diskperf-plugin
 version=2.7.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,8 +10,8 @@ short_desc="Plugin for the Xfce4 panel displaying disk/partition performance"
 maintainer="tibequadorian <tibequadorian@posteo.de>"
 license="BSD-2-Clause"
 homepage="https://docs.xfce.org/panel-plugins/xfce4-diskperf-plugin/start"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-diskperf-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-diskperf-plugin/-/blob/master/NEWS"
 checksum=5909a65341a6af4d7ff3c7bb87aeac91c763f69b43ae9dc4a10668ac226fecc9
 
 post_install() {
diff --git a/srcpkgs/xfce4-fsguard-plugin/template b/srcpkgs/xfce4-fsguard-plugin/template
index 89cbc3e12db2..cf328a67e85e 100644
--- a/srcpkgs/xfce4-fsguard-plugin/template
+++ b/srcpkgs/xfce4-fsguard-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-fsguard-plugin'
 pkgname=xfce4-fsguard-plugin
 version=1.1.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="File system usage monitor plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-fsguard-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-fsguard-plugin/-/blob/master/NEWS"
 checksum=67d8e6a219a7117c59693adbc59c39a6eba31e3f18a5499189ef4ef28b554105
 
 post_install() {
diff --git a/srcpkgs/xfce4-genmon-plugin/template b/srcpkgs/xfce4-genmon-plugin/template
index e12ff660c7ee..ad29934c9f83 100644
--- a/srcpkgs/xfce4-genmon-plugin/template
+++ b/srcpkgs/xfce4-genmon-plugin/template
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Generic monitor plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="LGPL-2.1-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-genmon-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-genmon-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-genmon-plugin/-/blob/master/NEWS"
 checksum=b2119fd0ff19fa293b97ec97b0de8e241799e08b86218515167c568bd9b50135
diff --git a/srcpkgs/xfce4-mailwatch-plugin/template b/srcpkgs/xfce4-mailwatch-plugin/template
index d5067cd4ab1b..3d4e705af652 100644
--- a/srcpkgs/xfce4-mailwatch-plugin/template
+++ b/srcpkgs/xfce4-mailwatch-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-mailwatch-plugin'
 pkgname=xfce4-mailwatch-plugin
 version=1.3.0
-revision=2
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,6 +10,7 @@ makedepends="libglib-devel exo-devel libxfce4ui-devel libxfce4util-devel
 short_desc="Mail watcher plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-mailwatch-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-mailwatch-plugin/-/blob/master/NEWS"
 checksum=20f91ebefd2880b27f421f773115b3740f67de2bf60feace3841bfd1a09cbe2e
diff --git a/srcpkgs/xfce4-mpc-plugin/template b/srcpkgs/xfce4-mpc-plugin/template
index 388fcf6eda05..d0e9d9abab02 100644
--- a/srcpkgs/xfce4-mpc-plugin/template
+++ b/srcpkgs/xfce4-mpc-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-mpc-plugin'
 pkgname=xfce4-mpc-plugin
 version=0.5.2
-revision=3
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="MPD client plugin for the Xfce4 panel"
 maintainer="Peter Wang <novalazy@gmail.com>"
 license="ISC"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-mpc-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-mpc-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-mpc-plugin/-/blob/master/NEWS"
 checksum=eefe78b7b6b95312b3a52814b7f632dc92970c1b3e9535de616315749bf67760
 
 post_install() {
diff --git a/srcpkgs/xfce4-netload-plugin/template b/srcpkgs/xfce4-netload-plugin/template
index de056c06c519..4447c65b99d7 100644
--- a/srcpkgs/xfce4-netload-plugin/template
+++ b/srcpkgs/xfce4-netload-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-netload-plugin'
 pkgname=xfce4-netload-plugin
 version=1.4.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Netload plugin for the Xfce panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-netload-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-netload-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-netload-plugin/-/blob/master/NEWS"
 checksum=6c76260e101790754dd93255ec979accd97d21a21da85d8edcd6c7b01ddcd70c
diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index 59eb5f820e8d..fe6180fe7711 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
 version=1.8.1
-revision=3
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="intltool pkg-config"
@@ -9,6 +9,7 @@ makedepends="exo-devel xfce4-panel-devel"
 short_desc="Folders, documents and removable drives menu plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-places-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-places-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-places-plugin/-/blob/master/NEWS"
 checksum=f211219f03c9260f624370e18c79e4176c9d35a8247158e77e5d811327610ab2
diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template
index d4d594f00698..edefa452dfc7 100644
--- a/srcpkgs/xfce4-pulseaudio-plugin/template
+++ b/srcpkgs/xfce4-pulseaudio-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-pulseaudio-plugin'
 pkgname=xfce4-pulseaudio-plugin
 version=0.4.3
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="gettext-devel xfce4-dev-tools"
@@ -10,6 +10,7 @@ depends="pavucontrol"
 short_desc="Pulseaudio volume control plugin for Xfce4 panel"
 maintainer="Steve Prybylski <sa.prybylx@gmail.com>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-pulseaudio-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-pulseaudio-plugin/-/blob/master/NEWS"
 checksum=5a518237e2137341d8ca6584938950525e20c28a0177e30ecaea3ba8e7a2615b
diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 31dc3db93f37..8d6a631ce603 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
 version=1.4.3
-revision=1
+revision=3
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -10,9 +10,9 @@ depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Xfce hardware sensors plugin"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-sensors-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-sensors-plugin/-/blob/master/NEWS"
 checksum=171c0235f70c65f0ffee587e960d9da79b284855df22130239eac26272ec06c9
 
 if [ "$CROSS_BUILD" ]; then
diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index e3d299fcf39d..69c054eaa0e4 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="System load plugin for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-systemload-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-systemload-plugin/-/blob/master/NEWS"
 checksum=56d1007801d52d7c2b5a13bb54745f6d7f06fda28b49ce936145633068817652
 
 post_install() {
diff --git a/srcpkgs/xfce4-time-out-plugin/template b/srcpkgs/xfce4-time-out-plugin/template
index 55da8c0ea8d5..8ead1eb88829 100644
--- a/srcpkgs/xfce4-time-out-plugin/template
+++ b/srcpkgs/xfce4-time-out-plugin/template
@@ -9,7 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Take a break from your computer with this plugin for Xfce4"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-time-out-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-time-out-plugin/-/raw/master/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-time-out-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-time-out-plugin/-/blob/master/NEWS"
 checksum=3dd8eba694ff3ba5c25bd7f5cd70dc22175fb2c0a759213f05ab8f0e629d82d4
diff --git a/srcpkgs/xfce4-timer-plugin/template b/srcpkgs/xfce4-timer-plugin/template
index 3b2240a87ed3..5e85e8fcd168 100644
--- a/srcpkgs/xfce4-timer-plugin/template
+++ b/srcpkgs/xfce4-timer-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-timer-plugin'
 pkgname=xfce4-timer-plugin
 version=1.7.1
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Plugin to track time for the Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-timer-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-timer-plugin/-/blob/master/NEWS"
 checksum=4b52d2911b1949e945971be6533155ee6ba99c77078eac7fd43b0f2aeca824e3
diff --git a/srcpkgs/xfce4-verve-plugin/template b/srcpkgs/xfce4-verve-plugin/template
index fe00e5a0bea2..bdb48b267cca 100644
--- a/srcpkgs/xfce4-verve-plugin/template
+++ b/srcpkgs/xfce4-verve-plugin/template
@@ -9,6 +9,7 @@ makedepends="xfce4-panel-devel"
 short_desc="Command line plugin Xfce4 panel"
 maintainer="Alexander Mamay <alexander@mamay.su>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-verve-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-verve-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-verve-plugin/-/blob/master/NEWS"
 checksum=ebda5e5eb62d6e42afdc6f121d2f1cbd4d9d3c2b16a5e3ed8192b1b224b8f825
diff --git a/srcpkgs/xfce4-wavelan-plugin/template b/srcpkgs/xfce4-wavelan-plugin/template
index 68b7d78ce45c..4f66faec8e1f 100644
--- a/srcpkgs/xfce4-wavelan-plugin/template
+++ b/srcpkgs/xfce4-wavelan-plugin/template
@@ -9,8 +9,9 @@ makedepends="xfce4-panel-devel"
 short_desc="WaveLAN plugin for the Xfce4 panel"
 maintainer="Piraty <piraty1@inbox.ru>"
 license="BSD-2-Clause"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-wavelan-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-wavelan-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-wavelan-plugin/-/blob/master/NEWS"
 checksum=ea7aa36650c596b1a29567d100776c68ed732aaf0f48c92245c4466058b5481d
 
 post_install() {
diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index ef47f0f6143a..e459d54d85d5 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.11.0
-revision=1
+revision=0
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,7 +10,8 @@ depends="hicolor-icon-theme"
 short_desc="XFCE panel plugin to show temperature and weather"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-weather-plugin"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-weather-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/blob/master/NEWS"
 checksum=e3242ea951d51bc0fded1d02a4f1f662bec16a1fb10c855f71bda6541a1153fc
 lib32disabled=yes
diff --git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template
index 14604b7bb072..582debf7e9cf 100644
--- a/srcpkgs/xfce4-whiskermenu-plugin/template
+++ b/srcpkgs/xfce4-whiskermenu-plugin/template
@@ -8,7 +8,7 @@ makedepends="exo-devel garcon-devel xfce4-panel-devel"
 short_desc="Alternate menu for Xfce4"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-2.0-or-later"
-homepage="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin"
-changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/raw/main/NEWS"
-distfiles="https://archive.xfce.org/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/blob/master/NEWS"
 checksum=04ae0c1764a0d5ec70f18a760d998a2109bb6724f048554d7d6999d9072ca63e
diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index 2498a8ab3f63..b9a75f8d1d61 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.2
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -9,8 +9,9 @@ makedepends="garcon-devel xfce4-panel-devel libxklavier-devel librsvg-devel libw
 short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
-homepage="https://xfce.org/"
-distfiles="https://archive.xfce.org/src/panel-plugins/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
+homepage="https://docs.xfce.org/panel-plugins/xfce4-xkb-plugin/start"
+distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+changelog="https://gitlab.xfce.org/panel-plugins/xfce4-xkb-plugin/-/blob/master/NEWS"
 checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 
 post_install() {

From 2b97fac54d8ec711456b75dd58bfdc54153a5a6a Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Tue, 10 May 2022 20:25:45 +0100
Subject: [PATCH 2/7] add_xfce_site

---
 common/environment/setup/misc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/environment/setup/misc.sh b/common/environment/setup/misc.sh
index ff92007201c1..1c274d443e33 100644
--- a/common/environment/setup/misc.sh
+++ b/common/environment/setup/misc.sh
@@ -18,6 +18,6 @@ GNU_SITE="https://ftp.gnu.org/gnu"
 FREEDESKTOP_SITE="https://freedesktop.org/software"
 KDE_SITE="https://download.kde.org/stable"
 VIDEOLAN_SITE="https://download.videolan.org/pub/videolan"
-XFCE_DOWNLOADS="https://archive.xfce.org"
+XFCE_SITE="https://archive.xfce.org"
 
 set +a

From 01924a40bf4016430113d2e749520aed743402ac Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Tue, 10 May 2022 20:59:30 +0100
Subject: [PATCH 3/7] update_mstcorefonts_version

---
 srcpkgs/msttcorefonts/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/msttcorefonts/template b/srcpkgs/msttcorefonts/template
index c5a2fafcd205..47105f6aec8c 100644
--- a/srcpkgs/msttcorefonts/template
+++ b/srcpkgs/msttcorefonts/template
@@ -1,6 +1,6 @@
 # Template file for 'msttcorefonts'
 pkgname=msttcorefonts
-version=1.3.4
+version=2.5.1
 revision=2
 hostmakedepends="cabextract"
 short_desc="Microsoft Typography Project - corefonts"

From 08a2795874a7131eb2f85f7b5080cd42f64a6066 Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Tue, 10 May 2022 21:41:15 +0100
Subject: [PATCH 4/7] fix_package_homepage_and_distfiles_add_changelog

---
 srcpkgs/xfce4-xkb-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index b9a75f8d1d61..bd95574f401a 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-xkb-plugin'
 pkgname=xfce4-xkb-plugin
 version=0.8.2
-revision=2
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -10,7 +10,7 @@ short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://docs.xfce.org/panel-plugins/xfce4-xkb-plugin/start"
-distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
+distfiles="${XFCE_SITE}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 changelog="https://gitlab.xfce.org/panel-plugins/xfce4-xkb-plugin/-/blob/master/NEWS"
 checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 

From 562f0f1514067a101a19bbb0f12e6a4463d8d177 Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Tue, 10 May 2022 21:47:48 +0100
Subject: [PATCH 5/7] fix_changelog_position

---
 srcpkgs/xfce4-xkb-plugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-xkb-plugin/template b/srcpkgs/xfce4-xkb-plugin/template
index bd95574f401a..9ca2bbbc8de2 100644
--- a/srcpkgs/xfce4-xkb-plugin/template
+++ b/srcpkgs/xfce4-xkb-plugin/template
@@ -10,8 +10,8 @@ short_desc="Plugin to switch keyboard layouts for the Xfce4 panel"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="BSD-2-Clause"
 homepage="https://docs.xfce.org/panel-plugins/xfce4-xkb-plugin/start"
-distfiles="${XFCE_SITE}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 changelog="https://gitlab.xfce.org/panel-plugins/xfce4-xkb-plugin/-/blob/master/NEWS"
+distfiles="${XFCE_SITE}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=bb4be13f6f73cd86a6d939e1a6b125841cf266415bc4fd134a511e4f0cf97967
 
 post_install() {

From 4352901732f717e8d79d3bc2f84ea5f43e5acc0c Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Tue, 10 May 2022 21:51:11 +0100
Subject: [PATCH 6/7] whiskermenu-template-fix_changelog_and_homepage_url

---
 srcpkgs/xfce4-whiskermenu-plugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/xfce4-whiskermenu-plugin/template b/srcpkgs/xfce4-whiskermenu-plugin/template
index 582debf7e9cf..e48bf6050b76 100644
--- a/srcpkgs/xfce4-whiskermenu-plugin/template
+++ b/srcpkgs/xfce4-whiskermenu-plugin/template
@@ -9,6 +9,6 @@ short_desc="Alternate menu for Xfce4"
 maintainer="mobinmob <mobinmob@disroot.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/start"
-distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 changelog="https://gitlab.xfce.org/panel-plugins/xfce4-whiskermenu-plugin/-/blob/master/NEWS"
+distfiles="${XFCE_SITE}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=04ae0c1764a0d5ec70f18a760d998a2109bb6724f048554d7d6999d9072ca63e

From 9bff6e2b8fcaddae7ac66867d0c2d8a12c3f4663 Mon Sep 17 00:00:00 2001
From: Vadim Naumuk <vadzim_naumuk@protonmail.com>
Date: Tue, 10 May 2022 21:57:23 +0100
Subject: [PATCH 7/7] xfce4-weather-plugin add changelog url

---
 srcpkgs/xfce4-weather-plugin/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template
index e459d54d85d5..26a10d3f5396 100644
--- a/srcpkgs/xfce4-weather-plugin/template
+++ b/srcpkgs/xfce4-weather-plugin/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-weather-plugin'
 pkgname=xfce4-weather-plugin
 version=0.11.0
-revision=0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -11,7 +11,7 @@ short_desc="XFCE panel plugin to show temperature and weather"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/panel-plugins/xfce4-weather-plugin/start"
-distfiles="${XFCE_DOWNLOADS}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 changelog="https://gitlab.xfce.org/panel-plugins/xfce4-weather-plugin/-/blob/master/NEWS"
+distfiles="${XFCE_SITE}/src/panel-plugins/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
 checksum=e3242ea951d51bc0fded1d02a4f1f662bec16a1fb10c855f71bda6541a1153fc
 lib32disabled=yes

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Closed]: Fix XFCE4-PLUGIN templates.
  2022-05-07 22:55 [PR PATCH] Fix XFCE4-PLUGIN templates IT-DEVS-Group
                   ` (10 preceding siblings ...)
  2022-05-10 20:57 ` IT-DEVS-Group
@ 2022-05-10 21:01 ` IT-DEVS-Group
  11 siblings, 0 replies; 13+ messages in thread
From: IT-DEVS-Group @ 2022-05-10 21:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 282 bytes --]

There's a closed pull request on the void-packages repository

Fix XFCE4-PLUGIN templates.
https://github.com/void-linux/void-packages/pull/37028

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

- I tested the changes in this PR: NO

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2022-05-10 21:01 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-05-07 22:55 [PR PATCH] Fix XFCE4-PLUGIN templates IT-DEVS-Group
2022-05-09 13:22 ` abenson
2022-05-09 21:50 ` Chocimier
2022-05-09 21:54 ` Chocimier
2022-05-10 19:20 ` [PR PATCH] [Updated] " IT-DEVS-Group
2022-05-10 19:26 ` IT-DEVS-Group
2022-05-10 19:59 ` IT-DEVS-Group
2022-05-10 20:41 ` IT-DEVS-Group
2022-05-10 20:45 ` Chocimier
2022-05-10 20:48 ` [PR PATCH] [Updated] " IT-DEVS-Group
2022-05-10 20:51 ` IT-DEVS-Group
2022-05-10 20:57 ` IT-DEVS-Group
2022-05-10 21:01 ` [PR PATCH] [Closed]: " IT-DEVS-Group

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).