Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Xfce 4.18
@ 2022-12-16  2:19 sgn
  2022-12-16  2:26 ` [PR PATCH] [Updated] " sgn
  2022-12-16  6:51 ` [PR PATCH] [Merged]: " sgn
  0 siblings, 2 replies; 3+ messages in thread
From: sgn @ 2022-12-16  2:19 UTC (permalink / raw)
  To: ml

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

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages xfce-4.18
https://github.com/void-linux/void-packages/pull/41128

Xfce 4.18
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/41128.patch is attached

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

From 250c1d75f967b31151250c8059dcd0d71ed5ea8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:46:54 +0700
Subject: [PATCH 01/23] Thunar: update to 4.18.0.

---
 srcpkgs/Thunar/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index 721d300edf32..d92eb19f33c6 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -1,7 +1,6 @@
 # Template file for 'Thunar'
 pkgname=Thunar
-reverts="4.17.0_1"
-version=4.16.11
+version=4.18.0
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -17,11 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://docs.xfce.org/xfce/thunar/Start"
 changelog="https://gitlab.xfce.org/xfce/thunar/-/raw/xfce-${version%.*}/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/thunar/${version%.*}/thunar-${version}.tar.bz2"
-checksum=f47dde90b2e5e3e31920a4f57ddd3670282d0a90870a45e89148fce41b2a8a1b
-
-post_install() {
-	rm -rf ${DESTDIR}/usr/lib/systemd
-}
+checksum=d1f4b080c97b9e390eff199aaaac7562fb20f031686f8d5ee5207e953bfc2feb
 
 Thunar-devel_package() {
 	depends="libglib-devel gtk+3-devel ${sourcepkg}>=${version}_${revision}"

From 62f5e380f83c5e31c65caa601cdea6b6902dc0b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:46:55 +0700
Subject: [PATCH 02/23] exo: update to 4.18.0.

---
 .../exo/patches/configure-crosscompile.patch  | 47 -------------------
 srcpkgs/exo/template                          | 14 ++----
 2 files changed, 3 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/exo/patches/configure-crosscompile.patch

diff --git a/srcpkgs/exo/patches/configure-crosscompile.patch b/srcpkgs/exo/patches/configure-crosscompile.patch
deleted file mode 100644
index 935cd5f465e7..000000000000
--- a/srcpkgs/exo/patches/configure-crosscompile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -137,22 +137,29 @@ AC_FUNC_MMAP()
- dnl ***************************************
- dnl *** Check for strftime() extensions ***
- dnl ***************************************
--AC_TRY_RUN([
--  #include <string.h>
--  #include <time.h>
--  int
--  main (int argc, char **argv)
--  {
--    struct tm tm;
--    char      buffer[16];
--    tm.tm_year = 81;
--    if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0)
--      return 0;
--    return 1;
--  }
--], [
-+AC_CACHE_CHECK([Define if strftime supports %E and %O modifiers], ac_cv_strftime_extensions,
-+  [AC_TRY_RUN([
-+    #include <string.h>
-+    #include <time.h>
-+    int
-+    main (int argc, char **argv)
-+    {
-+      struct tm tm;
-+      char      buffer[16];
-+      tm.tm_year = 81;
-+      if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0)
-+        return 0;
-+      return 1;
-+    }
-+  ],
-+  ac_cv_strftime_extensions=yes,
-+  ac_cv_strftime_extensions=no,
-+  [AC_MSG_ERROR([cross-compiling, preset ac_cv_strftime_extensions=yes/no])]
-+  )]
-+)
-+if test x"$ac_cv_strftime_extensions" = x"yes"; then
-   AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.])
--])
-+fi
- 
- dnl ******************************
- dnl *** Check for i18n support ***
diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index 5b8c4f3fbd95..2105e3f7d666 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,10 +1,10 @@
 # Template file for 'exo'
 pkgname=exo
-version=4.16.4
+version=4.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-locales-dir=/usr/share/locale"
-hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
+hostmakedepends="pkg-config intltool gettext glib-devel"
 makedepends="gtk+3-devel libxfce4ui-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Extension library for the Xfce desktop environment"
@@ -13,15 +13,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://docs.xfce.org/xfce/exo/start"
 changelog="https://gitlab.xfce.org/xfce/exo/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/exo/${version%.*}/exo-${version}.tar.bz2"
-checksum=82a50c67e78f1e5c420b7615515bcca759b86eeab99224ab8eca4306b89d2eca
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		# Disable tests:
-		sed -i 's/^\([[:blank:]]*po\).*$/\1/;/^[[:blank:]]*tests$/d' Makefile.am
-	fi
-	NOCONFIGURE=1 xdt-autogen
-}
+checksum=4f2c61d045a888cdb64297fd0ae20cc23da9b97ffb82562ed12806ed21da7d55
 
 exo-devel_package() {
 	depends="libxfce4ui-devel exo-${version}_${revision}"

From c4694ec215f944fa28e5855c0de0e664d78ba150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:46:56 +0700
Subject: [PATCH 03/23] garcon: update to 4.18.0.

---
 srcpkgs/garcon/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template
index 18543988ddfe..1a5f1786fc76 100644
--- a/srcpkgs/garcon/template
+++ b/srcpkgs/garcon/template
@@ -1,21 +1,21 @@
 # Template file for 'garcon'
 pkgname=garcon
-version=4.16.1
+version=4.18.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
 configure_args="--disable-static --with-locales-dir=/usr/share/locale
  --enable-introspection=$(vopt_if gir yes no)"
 hostmakedepends="pkg-config intltool gettext-devel glib-devel"
-makedepends="libglib-devel libxfce4ui-devel"
+makedepends="libglib-devel libxfce4ui-devel libxfce4util-devel gtk+3-devel"
 conf_files="/etc/xdg/menus/xfce-applications.menu"
 short_desc="Glib/GIO freedesktop.org compliant menu implementation"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/xfce/garcon/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/garcon/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=84914927a2c1fda167f67af26a6640630a744a22940df508aa6c752cdbd3d21d
+checksum=54633487566a8b8502b71c11a7f719efe27c069bd5773cc95f11ff4ea8f11a14
 
 build_options="gir"
 build_options_default="gir"

From f66661fc0c95efa51762f36465c2d5edba2e459e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:46:57 +0700
Subject: [PATCH 04/23] libxfce4ui: update to 4.18.0.

---
 common/shlibs               |  6 ++----
 srcpkgs/libxfce4ui/template | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b9fecc044025..de063309cc61 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -735,10 +735,8 @@ libqgpgme.so.15 gpgmeqt-1.18.0_1
 libgarcon-1.so.0 garcon-0.1.12_1
 libgarcon-gtk2-1.so.0 garcon-0.4.0_1
 libgarcon-gtk3-1.so.0 garcon-0.6.1_1
-libxfce4ui-1.so.0 libxfce4ui-4.9.2_1
-libxfce4ui-2.so.0 libxfce4ui-4.12.1_2
-libxfce4kbd-private-2.so.0 libxfce4ui-4.9.2_1
-libxfce4kbd-private-3.so.0 libxfce4ui-4.12.1_2
+libxfce4ui-2.so.0 libxfce4ui-4.18.0_1
+libxfce4kbd-private-3.so.0 libxfce4ui-4.18.0_1
 libxml++-2.6.so.2 libxml++-2.32.0_1
 libxml++-3.0.so.1 libxml++3.0-3.0.1_1
 libftgl.so.2 ftgl-2.1.2_1
diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index 3eac04ff283f..5e420efecf62 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,14 +1,15 @@
 # Template file for 'libxfce4ui'
 pkgname=libxfce4ui
-version=4.16.1
-revision=2
+version=4.18.0
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-locales-dir=/usr/share/locale --disable-static
- $(vopt_enable gir introspection) $(vopt_enable vala vala)"
+ --enable-tests
+ $(vopt_enable gir introspection) $(vopt_enable gir vala)"
 conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml"
-hostmakedepends="xfce4-dev-tools pkg-config intltool glib-devel gettext-devel
- $(vopt_if vala vala)"
+hostmakedepends="pkg-config intltool glib-devel gettext-devel
+ $(vopt_if gir vala)"
 makedepends="gtk+3-devel glade3-devel libxfce4util-devel xfconf-devel
  libxml2-devel startup-notification-devel libSM-devel libgtop-devel"
 short_desc="Replacement of the old libxfcegui4 library"
@@ -16,14 +17,15 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=d96946ae5af6bf078dda415419e0021909f763ee0020b42f3e26f603e51585f6
+checksum=532247c4387c17bb9ef94a73147039b8d013c3131c95cdbd2fa85fbcc848d06b
 
 # Package build options
-build_options="gir vala"
-build_options_default="gir vala"
+build_options="gir"
+build_options_default="gir"
 
 libxfce4ui-devel_package() {
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}
+	 gtk+3-devel libxfce4util-devel xfconf-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -32,8 +34,6 @@ libxfce4ui-devel_package() {
 		vmove usr/share/gtk-doc
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
 	}

From 7afe59a6267cc7238d51b939782751cc13705fc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:46:58 +0700
Subject: [PATCH 05/23] libxfce4util: update to 4.18.0.

---
 common/shlibs                 | 2 +-
 srcpkgs/libxfce4util/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index de063309cc61..c432c7f3722d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -183,7 +183,7 @@ libnl-cli-3.so.200 libnl3-3.2.1_1
 libreadline.so.8 libreadline8-8.0_1
 libhistory.so.8 libhistory8-8.0_1
 libxfconf-0.so.3 xfconf-4.13.7_1
-libxfce4util.so.7 libxfce4util-4.12.1_1
+libxfce4util.so.7 libxfce4util-4.18.0_1
 libxfce4panel-1.0.so.4 libxfce4panel-4.9.2_1
 libxfce4panel-2.0.so.4 libxfce4panel-4.12.0_1
 libgdbm.so.6 gdbm-1.16_1
diff --git a/srcpkgs/libxfce4util/template b/srcpkgs/libxfce4util/template
index d7063292062e..a3adb78a2a91 100644
--- a/srcpkgs/libxfce4util/template
+++ b/srcpkgs/libxfce4util/template
@@ -1,18 +1,18 @@
 # Template file for 'libxfce4util'
 pkgname=libxfce4util
-version=4.16.0
-revision=2
+version=4.18.0
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-locales-dir=/usr/share/locale"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool $(vopt_if gir vala)"
 makedepends="libglib-devel"
 short_desc="Utility library for the Xfce4 desktop environment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=60598d745d1fc81ff5ad3cecc3a8d1b85990dd22023e7743f55abd87d8b55b83
+checksum=1157ca717fd3dd1da7724a6432a4fb24af9cd922f738e971fd1fd36dfaeac3c9
 
 # Package build options
 build_options="gir"

From 27f9b556b1a27e8bb93a10aaa0fda1c97921f3dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:46:59 +0700
Subject: [PATCH 06/23] thunar-volman: update to 4.18.0.

---
 srcpkgs/thunar-volman/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index f68f33ba7ddb..defd2479aaf4 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -1,7 +1,7 @@
 # Template file for 'thunar-volman'
 pkgname=thunar-volman
-version=4.16.0
-revision=2
+version=4.18.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://git.xfce.org/xfce/thunar-volman/plain/NEWS?h=${pkgname}-${version}"
 distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=d2c0e719b242b7fd3db70bc6678a2df1abf2cfaa899b775a1591a5efa08a547d
+checksum=93b75c7ffbe246a21f4190295acc148e184be8df397e431b258d0d676e87fc65

From 349547c7c31519995fa28df153d31aa219103b60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:47:00 +0700
Subject: [PATCH 07/23] tumbler: update to 4.18.0.

---
 srcpkgs/tumbler-plugins-extra |  1 +
 srcpkgs/tumbler/template      | 23 +++++++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)
 create mode 120000 srcpkgs/tumbler-plugins-extra

diff --git a/srcpkgs/tumbler-plugins-extra b/srcpkgs/tumbler-plugins-extra
new file mode 120000
index 000000000000..c24b8fa4190c
--- /dev/null
+++ b/srcpkgs/tumbler-plugins-extra
@@ -0,0 +1 @@
+tumbler
\ No newline at end of file
diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 2e630194f006..da14bf9ba5ac 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,18 +1,20 @@
 # Template file for 'tumbler'
 pkgname=tumbler
-version=4.16.1
+version=4.18.0
 revision=1
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale --disable-gstreamer-thumbnailer"
-hostmakedepends="intltool pkg-config glib-devel"
-makedepends="ffmpegthumbnailer-devel gtk+-devel libgsf-devel libopenraw-devel
- poppler-glib-devel"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-gstreamer-thumbnailer --enable-poppler-thumbnailer"
+hostmakedepends="intltool pkg-config glib-devel perl"
+makedepends="ffmpegthumbnailer-devel libglib-devel libgsf-devel libopenraw-devel
+ poppler-glib-devel libxfce4util-devel libgepub-devel freetype-devel
+ libcurl-devel"
 short_desc="D-Bus Thumbnailer service"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/xfce/tumbler/start"
 distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=852bbffa13f35b48ce92e243a03a118e32037c03e68297335c2bc4578e39273e
+checksum=4087f3af4ef31271d3f315421a2f1fe67e4fda7ad60bbab1f073627914dfcf00
 
 tumbler-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
@@ -24,3 +26,12 @@ tumbler-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+tumbler-plugins-extra_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - extra plugins (may use network)"
+	pkg_install() {
+		vmove usr/lib/tumbler-1/plugins/tumbler-cover-thumbnailer.so
+		vmove usr/lib/tumbler-1/plugins/tumbler-gepub-thumbnailer.so
+	}
+}

From 847d617b1f0a54a59a0082e9d0d7d731a7998fda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:47:01 +0700
Subject: [PATCH 08/23] xfce4-appfinder: update to 4.18.0.

---
 srcpkgs/xfce4-appfinder/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template
index 1806da1a1fe6..a57bf35d096c 100644
--- a/srcpkgs/xfce4-appfinder/template
+++ b/srcpkgs/xfce4-appfinder/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-appfinder'
 pkgname=xfce4-appfinder
-version=4.16.1
+version=4.18.0
 revision=1
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel libxfce4ui-devel gtk+3-devel"
 depends="desktop-file-utils hicolor-icon-theme"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/xfce/xfce4-appfinder/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=bfe3e9bd92695014ee74a2fbb7f5fd1b4c29cf043c4a11598b8958324c81e7ec
+checksum=962a98d7b327d2073ed4cd0f78bce7945ed51b97d52fd60196e8b02ef819c18c

From e21abca8ac6b59c271b3e073362e0c9407a2cf8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:47:02 +0700
Subject: [PATCH 09/23] xfce4-dev-tools: update to 4.18.0.

---
 srcpkgs/xfce4-dev-tools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index bb32b0f042af..7ee56b003820 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
-version=4.16.0
-revision=2
+version=4.18.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=f50b3070e66f3ebdf331744dd1ec5e1af5de333965d491e15ce05545e8eb4f04
+checksum=eedb4fc955f0e3459c46864ff98579295db2b900743e0ff69cad5970ba76be37
 
 post_patch() {
 	[ "$CROSS_BUILD" ] || return 0

From c34bec1d71c933106520b8bd439374304fbbb56a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:47:03 +0700
Subject: [PATCH 10/23] xfce4-panel: update to 4.18.0.

---
 common/shlibs                | 3 +--
 srcpkgs/xfce4-panel/template | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c432c7f3722d..28feaf772764 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -184,8 +184,7 @@ libreadline.so.8 libreadline8-8.0_1
 libhistory.so.8 libhistory8-8.0_1
 libxfconf-0.so.3 xfconf-4.13.7_1
 libxfce4util.so.7 libxfce4util-4.18.0_1
-libxfce4panel-1.0.so.4 libxfce4panel-4.9.2_1
-libxfce4panel-2.0.so.4 libxfce4panel-4.12.0_1
+libxfce4panel-2.0.so.4 libxfce4panel-4.18.0_1
 libgdbm.so.6 gdbm-1.16_1
 libgdbm_compat.so.4 gdbm-1.10_1_1
 libintl.so.8 gettext-libs-0.19.2_1
diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 020f15b74e7a..d5659636e599 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,12 +1,12 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
-version=4.16.5
+version=4.18.0
 revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-locales-dir=/usr/share/locale
- --disable-static --enable-gio-unix --enable-gtk3"
-hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel
+ --disable-static --enable-gio-unix"
+hostmakedepends="pkg-config intltool gettext-devel glib-devel
  $(vopt_if gir vala)"
 makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel
  libdbusmenu-gtk3-devel"
@@ -15,7 +15,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/xfce/xfce4-panel/start"
 distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=096693e2bc76cf760cfe00dc76ec121c4d23f9166aa29945ae41616e8ec78230
+checksum=be80023fd546587831bab25ded15ae4c9e346289a75744b6ba4cf4ee53794710
 
 # Package build options
 build_options="gir"

From 41ffa832ece0af909510d0d451588722f2d8c8d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:47:04 +0700
Subject: [PATCH 11/23] xfce4-power-manager: update to 4.18.0.

---
 srcpkgs/xfce4-power-manager/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index 5cd71275b2c9..2962f4b717bc 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-power-manager'
 pkgname=xfce4-power-manager
-version=4.16.0
-revision=3
+version=4.18.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -12,4 +12,4 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=eb9c587c01b502fa45a32e7fc2aba98fa6d8391475133883654f77e562c43bf3
+checksum=2eee467886252f9fa704c978ec67dafad5274ede93e59b092a688faa7e72c39a

From 4df0e83fea5fd442df403887c2d61ced17a13d34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:47:05 +0700
Subject: [PATCH 12/23] xfce4-session: update to 4.18.0.

---
 srcpkgs/xfce4-session/template | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index baf4905cd85f..5407a23ecc81 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
-version=4.16.0
-revision=2
+version=4.18.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-polkit"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel iceauth"
@@ -14,9 +14,4 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=22f273f212481d71e0b5618c62710cd85f69aea74f5ea5c0093f7918b07d17b7
-
-post_install() {
-	# startxfce4 needs bash.
-	replace_interpreter bash ${DESTDIR}/usr/bin/startxfce4
-}
+checksum=38badb500b272012f494543a60a9c0563c381647cc95bed73b68aec0b0b89a7f

From dfb6d505a504325a16427cdfb2d1de091b4cbe1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:47:06 +0700
Subject: [PATCH 13/23] xfce4-settings: update to 4.18.0.

---
 srcpkgs/xfce4-settings/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 26feb7198029..ce17e931a83e 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-settings'
 pkgname=xfce4-settings
-version=4.16.5
-revision=2
+version=4.18.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale
  --enable-sound-settings --enable-pluggable-dialogs --enable-xrandr
@@ -17,4 +17,4 @@ license="GPL-2.0-only"
 homepage="https://xfce.org/"
 changelog="https://raw.githubusercontent.com/xfce-mirror/xfce4-settings/xfce-4.16/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=7a4f74802486d7e77a1c9fa4fda19b13fc8a8dec3e5074f367e34fa82b40d28e
+checksum=ed3f75837cb33cd694610fc87cd569c4782b7ac4e099143a3dbe8fff1f1c6a9d

From 9629044e3fb8964fa8776e5caa2cd2c4f2530de5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:47:07 +0700
Subject: [PATCH 14/23] xfconf: update to 4.18.0.

---
 srcpkgs/xfconf/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template
index 37972143d8aa..72095bfd5298 100644
--- a/srcpkgs/xfconf/template
+++ b/srcpkgs/xfconf/template
@@ -1,11 +1,11 @@
 # Template file for 'xfconf'
 pkgname=xfconf
-version=4.16.0
-revision=2
+version=4.18.0
+revision=1
 build_helper=gir
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --enable-gsettings-backend"
-hostmakedepends="pkg-config intltool glib-devel vala-devel"
+hostmakedepends="pkg-config intltool glib-devel vala-devel perl"
 makedepends="libxfce4util-devel vala-devel"
 checkdepends="dbus xvfb-run"
 short_desc="Xfce hierarchical (tree-like) configuration system"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, LGPL-2.0-only"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/xfconf/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=652a119007c67d9ba6c0bc7a740c923d33f32d03dc76dfc7ba682584e72a5425
+checksum=2e8c50160bf800a807aea094fc9dad81f9f361f42db56607508ed5b4855d2906
 build_options="gir"
 build_options_default="gir"
 

From b47657670f4e8c54ae82cc83665296f42b048f27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:47:08 +0700
Subject: [PATCH 15/23] xfdesktop: update to 4.18.0.

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

diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template
index b58ed1c4dd53..10a5dcb5f9fc 100644
--- a/srcpkgs/xfdesktop/template
+++ b/srcpkgs/xfdesktop/template
@@ -1,6 +1,6 @@
 # Template file for 'xfdesktop'
 pkgname=xfdesktop
-version=4.16.1
+version=4.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -13,4 +13,4 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/xfdesktop/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=e31dcb0008ae55e99e42128a4694002203305287434a8ee0f9937e7298a4bd11
+checksum=661783e7e6605459926d80bca46d25ce2197c221456457a863ea9d0252120d14

From b16bfdda0c4114ec4aede0d35b33f0c74bcf9025 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:47:09 +0700
Subject: [PATCH 16/23] xfwm4: update to 4.18.0.

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

diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template
index 484d0fa26ce1..e9c1a032713b 100644
--- a/srcpkgs/xfwm4/template
+++ b/srcpkgs/xfwm4/template
@@ -1,6 +1,6 @@
 # Template file for 'xfwm4'
 pkgname=xfwm4
-version=4.16.1
+version=4.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/xfwm4/${version%.*}/xfwm4-${version}.tar.bz2"
-checksum=b5b24ca04bd73c642db0a4b4df81d262381d758f01b51108257d48b391b8718c
+checksum=92cd1b889bb25cb4bc06c1c6736c238d96e79c1e706b9f77fad0a89d6e5fc13f
 
 post_patch() {
 	# compositor may be buggy on old and big endian hardware

From 9b3149b1ad54c5971b6801dd467b820c25e9b4ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:56:18 +0700
Subject: [PATCH 17/23] xfce4: update to 4.18.0.

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

diff --git a/srcpkgs/xfce4/template b/srcpkgs/xfce4/template
index 8de684d9cd8e..8aa20158602e 100644
--- a/srcpkgs/xfce4/template
+++ b/srcpkgs/xfce4/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4'
 pkgname=xfce4
-version=4.16.0
+version=4.18.0
 revision=1
 build_style=meta
 depends="

From 765a63677d9222765e1e95dac7be9847081bc590 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 16 Dec 2022 09:08:31 +0700
Subject: [PATCH 18/23] xfce4-cpufreq-plugin: update to 1.2.8.

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

diff --git a/srcpkgs/xfce4-cpufreq-plugin/template b/srcpkgs/xfce4-cpufreq-plugin/template
index 0ed8983ae9f2..06cb4e026484 100644
--- a/srcpkgs/xfce4-cpufreq-plugin/template
+++ b/srcpkgs/xfce4-cpufreq-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-cpufreq-plugin'
 pkgname=xfce4-cpufreq-plugin
-version=1.2.7
+version=1.2.8
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -12,4 +12,4 @@ 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"
-checksum=5ad4fb6150f51917b2a8af65926c6e4e83340827835782a14844c6b88dbcc58c
+checksum=07e458d9f4725e572001fb7eb66b9e931792311146e0f75ad5d87b9ae19573e9

From 1d20b1d861dcabda1c371f6bebdd9091b2198dac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 16 Dec 2022 09:08:37 +0700
Subject: [PATCH 19/23] xfce4-cpugraph-plugin: update to 1.2.7.

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

diff --git a/srcpkgs/xfce4-cpugraph-plugin/template b/srcpkgs/xfce4-cpugraph-plugin/template
index ed54f1da6ca1..be571e51a44f 100644
--- a/srcpkgs/xfce4-cpugraph-plugin/template
+++ b/srcpkgs/xfce4-cpugraph-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-cpugraph-plugin'
 pkgname=xfce4-cpugraph-plugin
-version=1.2.6
+version=1.2.7
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -12,7 +12,7 @@ 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"
-checksum=773246f57c1824a85468d4119c17aeb07170ed1ebace8fa406c7fbcf5b47af99
+checksum=68a651e278ed7186964e455b69b15da77f8d56257e5c3d6adf783b3ee9337405
 
 post_install() {
 	vlicense COPYING

From 3997a474489d9d99709758891f4e063174c05fa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 16 Dec 2022 09:08:43 +0700
Subject: [PATCH 20/23] xfce4-datetime-plugin: update to 0.8.2.

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

diff --git a/srcpkgs/xfce4-datetime-plugin/template b/srcpkgs/xfce4-datetime-plugin/template
index a0cad51eea8e..096643c93e2f 100644
--- a/srcpkgs/xfce4-datetime-plugin/template
+++ b/srcpkgs/xfce4-datetime-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-datetime-plugin'
 pkgname=xfce4-datetime-plugin
-version=0.8.1
+version=0.8.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
 homepage="https://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin"
 changelog="https://gitlab.xfce.org/panel-plugins/xfce4-datetime-plugin/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/panel-plugins/xfce4-datetime-plugin/${version%.*}/xfce4-datetime-plugin-${version}.tar.bz2"
-checksum=e9f6f15be29ceb5c45718006b46dbd19b89981617d0768b2ef942b5a70af2540
+checksum=6c388cc457015f629fecf546f1ee815d7c12e29576718f19bea5d496a8d7e037

From 5febe7548f5ee5dd8f5c91b6742f4343bc991591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 16 Dec 2022 09:09:10 +0700
Subject: [PATCH 21/23] xfce4-places-plugin: update to 1.8.3.

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

diff --git a/srcpkgs/xfce4-places-plugin/template b/srcpkgs/xfce4-places-plugin/template
index af30b9c13f2d..af19608834b7 100644
--- a/srcpkgs/xfce4-places-plugin/template
+++ b/srcpkgs/xfce4-places-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-places-plugin'
 pkgname=xfce4-places-plugin
-version=1.8.2
+version=1.8.3
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -11,4 +11,4 @@ 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/xfce4-places-plugin/${version%.*}/xfce4-places-plugin-${version}.tar.bz2"
-checksum=1e32b2aa14ddd6e145d506dad16d7ebdfa2d378cf652d9d0d066fe1d523b7001
+checksum=f11d0e6d03f22ab02c2e6b507d365b5a918532e8819e50647ee1860eca60c743

From 1f15e2bf79c1531894a81c7d398456a1c719ccc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 16 Dec 2022 09:09:26 +0700
Subject: [PATCH 22/23] xfce4-sensors-plugin: update to 1.4.4.

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

diff --git a/srcpkgs/xfce4-sensors-plugin/template b/srcpkgs/xfce4-sensors-plugin/template
index 31dc3db93f37..68fcf4ffad84 100644
--- a/srcpkgs/xfce4-sensors-plugin/template
+++ b/srcpkgs/xfce4-sensors-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-sensors-plugin'
 pkgname=xfce4-sensors-plugin
-version=1.4.3
+version=1.4.4
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
@@ -13,7 +13,7 @@ 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"
-checksum=171c0235f70c65f0ffee587e960d9da79b284855df22130239eac26272ec06c9
+checksum=6c1605a738e5df40e084d08ac93f962cd445093396de1e9bfadc7ab4588c36b6
 
 if [ "$CROSS_BUILD" ]; then
 	# Cannot detect these when cross compiling

From 4e5d2c9734bc9ee36b90ead159d11970ca9a81d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Fri, 16 Dec 2022 09:09:43 +0700
Subject: [PATCH 23/23] xfce4-systemload-plugin: update to 1.3.2.

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

diff --git a/srcpkgs/xfce4-systemload-plugin/template b/srcpkgs/xfce4-systemload-plugin/template
index e3d299fcf39d..08d65811c5c6 100644
--- a/srcpkgs/xfce4-systemload-plugin/template
+++ b/srcpkgs/xfce4-systemload-plugin/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4-systemload-plugin'
 pkgname=xfce4-systemload-plugin
-version=1.3.1
+version=1.3.2
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -11,7 +11,7 @@ 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"
-checksum=56d1007801d52d7c2b5a13bb54745f6d7f06fda28b49ce936145633068817652
+checksum=bb303fc3020e053ad1fa0b8fcbf0d7681c5563bb8f649357d6a95a577802b072
 
 post_install() {
 	vlicense COPYING

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

* Re: [PR PATCH] [Updated] Xfce 4.18
  2022-12-16  2:19 [PR PATCH] Xfce 4.18 sgn
@ 2022-12-16  2:26 ` sgn
  2022-12-16  6:51 ` [PR PATCH] [Merged]: " sgn
  1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2022-12-16  2:26 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages xfce-4.18
https://github.com/void-linux/void-packages/pull/41128

Xfce 4.18
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/41128.patch is attached

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

From 250c1d75f967b31151250c8059dcd0d71ed5ea8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:46:54 +0700
Subject: [PATCH 01/17] Thunar: update to 4.18.0.

---
 srcpkgs/Thunar/template | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index 721d300edf32..d92eb19f33c6 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -1,7 +1,6 @@
 # Template file for 'Thunar'
 pkgname=Thunar
-reverts="4.17.0_1"
-version=4.16.11
+version=4.18.0
 revision=1
 build_style=gnu-configure
 build_helper="gir"
@@ -17,11 +16,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://docs.xfce.org/xfce/thunar/Start"
 changelog="https://gitlab.xfce.org/xfce/thunar/-/raw/xfce-${version%.*}/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/thunar/${version%.*}/thunar-${version}.tar.bz2"
-checksum=f47dde90b2e5e3e31920a4f57ddd3670282d0a90870a45e89148fce41b2a8a1b
-
-post_install() {
-	rm -rf ${DESTDIR}/usr/lib/systemd
-}
+checksum=d1f4b080c97b9e390eff199aaaac7562fb20f031686f8d5ee5207e953bfc2feb
 
 Thunar-devel_package() {
 	depends="libglib-devel gtk+3-devel ${sourcepkg}>=${version}_${revision}"

From 62f5e380f83c5e31c65caa601cdea6b6902dc0b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:46:55 +0700
Subject: [PATCH 02/17] exo: update to 4.18.0.

---
 .../exo/patches/configure-crosscompile.patch  | 47 -------------------
 srcpkgs/exo/template                          | 14 ++----
 2 files changed, 3 insertions(+), 58 deletions(-)
 delete mode 100644 srcpkgs/exo/patches/configure-crosscompile.patch

diff --git a/srcpkgs/exo/patches/configure-crosscompile.patch b/srcpkgs/exo/patches/configure-crosscompile.patch
deleted file mode 100644
index 935cd5f465e7..000000000000
--- a/srcpkgs/exo/patches/configure-crosscompile.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -137,22 +137,29 @@ AC_FUNC_MMAP()
- dnl ***************************************
- dnl *** Check for strftime() extensions ***
- dnl ***************************************
--AC_TRY_RUN([
--  #include <string.h>
--  #include <time.h>
--  int
--  main (int argc, char **argv)
--  {
--    struct tm tm;
--    char      buffer[16];
--    tm.tm_year = 81;
--    if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0)
--      return 0;
--    return 1;
--  }
--], [
-+AC_CACHE_CHECK([Define if strftime supports %E and %O modifiers], ac_cv_strftime_extensions,
-+  [AC_TRY_RUN([
-+    #include <string.h>
-+    #include <time.h>
-+    int
-+    main (int argc, char **argv)
-+    {
-+      struct tm tm;
-+      char      buffer[16];
-+      tm.tm_year = 81;
-+      if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0)
-+        return 0;
-+      return 1;
-+    }
-+  ],
-+  ac_cv_strftime_extensions=yes,
-+  ac_cv_strftime_extensions=no,
-+  [AC_MSG_ERROR([cross-compiling, preset ac_cv_strftime_extensions=yes/no])]
-+  )]
-+)
-+if test x"$ac_cv_strftime_extensions" = x"yes"; then
-   AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.])
--])
-+fi
- 
- dnl ******************************
- dnl *** Check for i18n support ***
diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template
index 5b8c4f3fbd95..2105e3f7d666 100644
--- a/srcpkgs/exo/template
+++ b/srcpkgs/exo/template
@@ -1,10 +1,10 @@
 # Template file for 'exo'
 pkgname=exo
-version=4.16.4
+version=4.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static --with-locales-dir=/usr/share/locale"
-hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel"
+hostmakedepends="pkg-config intltool gettext glib-devel"
 makedepends="gtk+3-devel libxfce4ui-devel"
 depends="hicolor-icon-theme desktop-file-utils"
 short_desc="Extension library for the Xfce desktop environment"
@@ -13,15 +13,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://docs.xfce.org/xfce/exo/start"
 changelog="https://gitlab.xfce.org/xfce/exo/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/exo/${version%.*}/exo-${version}.tar.bz2"
-checksum=82a50c67e78f1e5c420b7615515bcca759b86eeab99224ab8eca4306b89d2eca
-
-pre_configure() {
-	if [ "$CROSS_BUILD" ]; then
-		# Disable tests:
-		sed -i 's/^\([[:blank:]]*po\).*$/\1/;/^[[:blank:]]*tests$/d' Makefile.am
-	fi
-	NOCONFIGURE=1 xdt-autogen
-}
+checksum=4f2c61d045a888cdb64297fd0ae20cc23da9b97ffb82562ed12806ed21da7d55
 
 exo-devel_package() {
 	depends="libxfce4ui-devel exo-${version}_${revision}"

From c4694ec215f944fa28e5855c0de0e664d78ba150 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:46:56 +0700
Subject: [PATCH 03/17] garcon: update to 4.18.0.

---
 srcpkgs/garcon/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template
index 18543988ddfe..1a5f1786fc76 100644
--- a/srcpkgs/garcon/template
+++ b/srcpkgs/garcon/template
@@ -1,21 +1,21 @@
 # Template file for 'garcon'
 pkgname=garcon
-version=4.16.1
+version=4.18.0
 revision=1
 build_style=gnu-configure
 build_helper=gir
 configure_args="--disable-static --with-locales-dir=/usr/share/locale
  --enable-introspection=$(vopt_if gir yes no)"
 hostmakedepends="pkg-config intltool gettext-devel glib-devel"
-makedepends="libglib-devel libxfce4ui-devel"
+makedepends="libglib-devel libxfce4ui-devel libxfce4util-devel gtk+3-devel"
 conf_files="/etc/xdg/menus/xfce-applications.menu"
 short_desc="Glib/GIO freedesktop.org compliant menu implementation"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/xfce/garcon/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/garcon/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=84914927a2c1fda167f67af26a6640630a744a22940df508aa6c752cdbd3d21d
+checksum=54633487566a8b8502b71c11a7f719efe27c069bd5773cc95f11ff4ea8f11a14
 
 build_options="gir"
 build_options_default="gir"

From f66661fc0c95efa51762f36465c2d5edba2e459e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:46:57 +0700
Subject: [PATCH 04/17] libxfce4ui: update to 4.18.0.

---
 common/shlibs               |  6 ++----
 srcpkgs/libxfce4ui/template | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index b9fecc044025..de063309cc61 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -735,10 +735,8 @@ libqgpgme.so.15 gpgmeqt-1.18.0_1
 libgarcon-1.so.0 garcon-0.1.12_1
 libgarcon-gtk2-1.so.0 garcon-0.4.0_1
 libgarcon-gtk3-1.so.0 garcon-0.6.1_1
-libxfce4ui-1.so.0 libxfce4ui-4.9.2_1
-libxfce4ui-2.so.0 libxfce4ui-4.12.1_2
-libxfce4kbd-private-2.so.0 libxfce4ui-4.9.2_1
-libxfce4kbd-private-3.so.0 libxfce4ui-4.12.1_2
+libxfce4ui-2.so.0 libxfce4ui-4.18.0_1
+libxfce4kbd-private-3.so.0 libxfce4ui-4.18.0_1
 libxml++-2.6.so.2 libxml++-2.32.0_1
 libxml++-3.0.so.1 libxml++3.0-3.0.1_1
 libftgl.so.2 ftgl-2.1.2_1
diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template
index 3eac04ff283f..5e420efecf62 100644
--- a/srcpkgs/libxfce4ui/template
+++ b/srcpkgs/libxfce4ui/template
@@ -1,14 +1,15 @@
 # Template file for 'libxfce4ui'
 pkgname=libxfce4ui
-version=4.16.1
-revision=2
+version=4.18.0
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-locales-dir=/usr/share/locale --disable-static
- $(vopt_enable gir introspection) $(vopt_enable vala vala)"
+ --enable-tests
+ $(vopt_enable gir introspection) $(vopt_enable gir vala)"
 conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml"
-hostmakedepends="xfce4-dev-tools pkg-config intltool glib-devel gettext-devel
- $(vopt_if vala vala)"
+hostmakedepends="pkg-config intltool glib-devel gettext-devel
+ $(vopt_if gir vala)"
 makedepends="gtk+3-devel glade3-devel libxfce4util-devel xfconf-devel
  libxml2-devel startup-notification-devel libSM-devel libgtop-devel"
 short_desc="Replacement of the old libxfcegui4 library"
@@ -16,14 +17,15 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="LGPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=d96946ae5af6bf078dda415419e0021909f763ee0020b42f3e26f603e51585f6
+checksum=532247c4387c17bb9ef94a73147039b8d013c3131c95cdbd2fa85fbcc848d06b
 
 # Package build options
-build_options="gir vala"
-build_options_default="gir vala"
+build_options="gir"
+build_options_default="gir"
 
 libxfce4ui-devel_package() {
-	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}
+	 gtk+3-devel libxfce4util-devel xfconf-devel"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -32,8 +34,6 @@ libxfce4ui-devel_package() {
 		vmove usr/share/gtk-doc
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
 	}

From 7afe59a6267cc7238d51b939782751cc13705fc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:46:58 +0700
Subject: [PATCH 05/17] libxfce4util: update to 4.18.0.

---
 common/shlibs                 | 2 +-
 srcpkgs/libxfce4util/template | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index de063309cc61..c432c7f3722d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -183,7 +183,7 @@ libnl-cli-3.so.200 libnl3-3.2.1_1
 libreadline.so.8 libreadline8-8.0_1
 libhistory.so.8 libhistory8-8.0_1
 libxfconf-0.so.3 xfconf-4.13.7_1
-libxfce4util.so.7 libxfce4util-4.12.1_1
+libxfce4util.so.7 libxfce4util-4.18.0_1
 libxfce4panel-1.0.so.4 libxfce4panel-4.9.2_1
 libxfce4panel-2.0.so.4 libxfce4panel-4.12.0_1
 libgdbm.so.6 gdbm-1.16_1
diff --git a/srcpkgs/libxfce4util/template b/srcpkgs/libxfce4util/template
index d7063292062e..a3adb78a2a91 100644
--- a/srcpkgs/libxfce4util/template
+++ b/srcpkgs/libxfce4util/template
@@ -1,18 +1,18 @@
 # Template file for 'libxfce4util'
 pkgname=libxfce4util
-version=4.16.0
-revision=2
+version=4.18.0
+revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-locales-dir=/usr/share/locale"
-hostmakedepends="pkg-config intltool"
+hostmakedepends="pkg-config intltool $(vopt_if gir vala)"
 makedepends="libglib-devel"
 short_desc="Utility library for the Xfce4 desktop environment"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=60598d745d1fc81ff5ad3cecc3a8d1b85990dd22023e7743f55abd87d8b55b83
+checksum=1157ca717fd3dd1da7724a6432a4fb24af9cd922f738e971fd1fd36dfaeac3c9
 
 # Package build options
 build_options="gir"

From 27f9b556b1a27e8bb93a10aaa0fda1c97921f3dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:46:59 +0700
Subject: [PATCH 06/17] thunar-volman: update to 4.18.0.

---
 srcpkgs/thunar-volman/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index f68f33ba7ddb..defd2479aaf4 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -1,7 +1,7 @@
 # Template file for 'thunar-volman'
 pkgname=thunar-volman
-version=4.16.0
-revision=2
+version=4.18.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://git.xfce.org/xfce/thunar-volman/plain/NEWS?h=${pkgname}-${version}"
 distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=d2c0e719b242b7fd3db70bc6678a2df1abf2cfaa899b775a1591a5efa08a547d
+checksum=93b75c7ffbe246a21f4190295acc148e184be8df397e431b258d0d676e87fc65

From 349547c7c31519995fa28df153d31aa219103b60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:47:00 +0700
Subject: [PATCH 07/17] tumbler: update to 4.18.0.

---
 srcpkgs/tumbler-plugins-extra |  1 +
 srcpkgs/tumbler/template      | 23 +++++++++++++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)
 create mode 120000 srcpkgs/tumbler-plugins-extra

diff --git a/srcpkgs/tumbler-plugins-extra b/srcpkgs/tumbler-plugins-extra
new file mode 120000
index 000000000000..c24b8fa4190c
--- /dev/null
+++ b/srcpkgs/tumbler-plugins-extra
@@ -0,0 +1 @@
+tumbler
\ No newline at end of file
diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template
index 2e630194f006..da14bf9ba5ac 100644
--- a/srcpkgs/tumbler/template
+++ b/srcpkgs/tumbler/template
@@ -1,18 +1,20 @@
 # Template file for 'tumbler'
 pkgname=tumbler
-version=4.16.1
+version=4.18.0
 revision=1
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale --disable-gstreamer-thumbnailer"
-hostmakedepends="intltool pkg-config glib-devel"
-makedepends="ffmpegthumbnailer-devel gtk+-devel libgsf-devel libopenraw-devel
- poppler-glib-devel"
+configure_args="--with-locales-dir=/usr/share/locale
+ --disable-gstreamer-thumbnailer --enable-poppler-thumbnailer"
+hostmakedepends="intltool pkg-config glib-devel perl"
+makedepends="ffmpegthumbnailer-devel libglib-devel libgsf-devel libopenraw-devel
+ poppler-glib-devel libxfce4util-devel libgepub-devel freetype-devel
+ libcurl-devel"
 short_desc="D-Bus Thumbnailer service"
 maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/xfce/tumbler/start"
 distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=852bbffa13f35b48ce92e243a03a118e32037c03e68297335c2bc4578e39273e
+checksum=4087f3af4ef31271d3f315421a2f1fe67e4fda7ad60bbab1f073627914dfcf00
 
 tumbler-devel_package() {
 	depends="libglib-devel ${sourcepkg}>=${version}_${revision}"
@@ -24,3 +26,12 @@ tumbler-devel_package() {
 		vmove "usr/lib/*.so"
 	}
 }
+
+tumbler-plugins-extra_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - extra plugins (may use network)"
+	pkg_install() {
+		vmove usr/lib/tumbler-1/plugins/tumbler-cover-thumbnailer.so
+		vmove usr/lib/tumbler-1/plugins/tumbler-gepub-thumbnailer.so
+	}
+}

From 847d617b1f0a54a59a0082e9d0d7d731a7998fda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:47:01 +0700
Subject: [PATCH 08/17] xfce4-appfinder: update to 4.18.0.

---
 srcpkgs/xfce4-appfinder/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template
index 1806da1a1fe6..a57bf35d096c 100644
--- a/srcpkgs/xfce4-appfinder/template
+++ b/srcpkgs/xfce4-appfinder/template
@@ -1,9 +1,9 @@
 # Template file for 'xfce4-appfinder'
 pkgname=xfce4-appfinder
-version=4.16.1
+version=4.18.0
 revision=1
 build_style=gnu-configure
-configure_args="--with-locales-dir=/usr/share/locale --enable-gtk3"
+configure_args="--with-locales-dir=/usr/share/locale"
 hostmakedepends="pkg-config intltool"
 makedepends="garcon-devel libxfce4ui-devel gtk+3-devel"
 depends="desktop-file-utils hicolor-icon-theme"
@@ -13,4 +13,4 @@ license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 changelog="https://gitlab.xfce.org/xfce/xfce4-appfinder/-/raw/master/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=bfe3e9bd92695014ee74a2fbb7f5fd1b4c29cf043c4a11598b8958324c81e7ec
+checksum=962a98d7b327d2073ed4cd0f78bce7945ed51b97d52fd60196e8b02ef819c18c

From e21abca8ac6b59c271b3e073362e0c9407a2cf8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:47:02 +0700
Subject: [PATCH 09/17] xfce4-dev-tools: update to 4.18.0.

---
 srcpkgs/xfce4-dev-tools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template
index bb32b0f042af..7ee56b003820 100644
--- a/srcpkgs/xfce4-dev-tools/template
+++ b/srcpkgs/xfce4-dev-tools/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-dev-tools'
 pkgname=xfce4-dev-tools
-version=4.16.0
-revision=2
+version=4.18.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="automake libtool gtk-doc intltool pkg-config glib-devel"
 makedepends="libglib-devel"
@@ -11,7 +11,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=f50b3070e66f3ebdf331744dd1ec5e1af5de333965d491e15ce05545e8eb4f04
+checksum=eedb4fc955f0e3459c46864ff98579295db2b900743e0ff69cad5970ba76be37
 
 post_patch() {
 	[ "$CROSS_BUILD" ] || return 0

From c34bec1d71c933106520b8bd439374304fbbb56a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:47:03 +0700
Subject: [PATCH 10/17] xfce4-panel: update to 4.18.0.

---
 common/shlibs                | 3 +--
 srcpkgs/xfce4-panel/template | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index c432c7f3722d..28feaf772764 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -184,8 +184,7 @@ libreadline.so.8 libreadline8-8.0_1
 libhistory.so.8 libhistory8-8.0_1
 libxfconf-0.so.3 xfconf-4.13.7_1
 libxfce4util.so.7 libxfce4util-4.18.0_1
-libxfce4panel-1.0.so.4 libxfce4panel-4.9.2_1
-libxfce4panel-2.0.so.4 libxfce4panel-4.12.0_1
+libxfce4panel-2.0.so.4 libxfce4panel-4.18.0_1
 libgdbm.so.6 gdbm-1.16_1
 libgdbm_compat.so.4 gdbm-1.10_1_1
 libintl.so.8 gettext-libs-0.19.2_1
diff --git a/srcpkgs/xfce4-panel/template b/srcpkgs/xfce4-panel/template
index 020f15b74e7a..d5659636e599 100644
--- a/srcpkgs/xfce4-panel/template
+++ b/srcpkgs/xfce4-panel/template
@@ -1,12 +1,12 @@
 # Template file for 'xfce4-panel'
 pkgname=xfce4-panel
-version=4.16.5
+version=4.18.0
 revision=1
 build_style=gnu-configure
 build_helper="gir"
 configure_args="--with-locales-dir=/usr/share/locale
- --disable-static --enable-gio-unix --enable-gtk3"
-hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel
+ --disable-static --enable-gio-unix"
+hostmakedepends="pkg-config intltool gettext-devel glib-devel
  $(vopt_if gir vala)"
 makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel
  libdbusmenu-gtk3-devel"
@@ -15,7 +15,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://docs.xfce.org/xfce/xfce4-panel/start"
 distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=096693e2bc76cf760cfe00dc76ec121c4d23f9166aa29945ae41616e8ec78230
+checksum=be80023fd546587831bab25ded15ae4c9e346289a75744b6ba4cf4ee53794710
 
 # Package build options
 build_options="gir"

From 41ffa832ece0af909510d0d451588722f2d8c8d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:47:04 +0700
Subject: [PATCH 11/17] xfce4-power-manager: update to 4.18.0.

---
 srcpkgs/xfce4-power-manager/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index 5cd71275b2c9..2962f4b717bc 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-power-manager'
 pkgname=xfce4-power-manager
-version=4.16.0
-revision=3
+version=4.18.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static"
 hostmakedepends="pkg-config intltool"
@@ -12,4 +12,4 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=eb9c587c01b502fa45a32e7fc2aba98fa6d8391475133883654f77e562c43bf3
+checksum=2eee467886252f9fa704c978ec67dafad5274ede93e59b092a688faa7e72c39a

From 4df0e83fea5fd442df403887c2d61ced17a13d34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:47:05 +0700
Subject: [PATCH 12/17] xfce4-session: update to 4.18.0.

---
 srcpkgs/xfce4-session/template | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template
index baf4905cd85f..5407a23ecc81 100644
--- a/srcpkgs/xfce4-session/template
+++ b/srcpkgs/xfce4-session/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-session'
 pkgname=xfce4-session
-version=4.16.0
-revision=2
+version=4.18.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-polkit"
 hostmakedepends="xfce4-dev-tools pkg-config intltool gettext-devel glib-devel iceauth"
@@ -14,9 +14,4 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=22f273f212481d71e0b5618c62710cd85f69aea74f5ea5c0093f7918b07d17b7
-
-post_install() {
-	# startxfce4 needs bash.
-	replace_interpreter bash ${DESTDIR}/usr/bin/startxfce4
-}
+checksum=38badb500b272012f494543a60a9c0563c381647cc95bed73b68aec0b0b89a7f

From dfb6d505a504325a16427cdfb2d1de091b4cbe1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:47:06 +0700
Subject: [PATCH 13/17] xfce4-settings: update to 4.18.0.

---
 srcpkgs/xfce4-settings/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 26feb7198029..ce17e931a83e 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -1,7 +1,7 @@
 # Template file for 'xfce4-settings'
 pkgname=xfce4-settings
-version=4.16.5
-revision=2
+version=4.18.0
+revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale
  --enable-sound-settings --enable-pluggable-dialogs --enable-xrandr
@@ -17,4 +17,4 @@ license="GPL-2.0-only"
 homepage="https://xfce.org/"
 changelog="https://raw.githubusercontent.com/xfce-mirror/xfce4-settings/xfce-4.16/NEWS"
 distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2"
-checksum=7a4f74802486d7e77a1c9fa4fda19b13fc8a8dec3e5074f367e34fa82b40d28e
+checksum=ed3f75837cb33cd694610fc87cd569c4782b7ac4e099143a3dbe8fff1f1c6a9d

From 9629044e3fb8964fa8776e5caa2cd2c4f2530de5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:47:07 +0700
Subject: [PATCH 14/17] xfconf: update to 4.18.0.

---
 srcpkgs/xfconf/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template
index 37972143d8aa..72095bfd5298 100644
--- a/srcpkgs/xfconf/template
+++ b/srcpkgs/xfconf/template
@@ -1,11 +1,11 @@
 # Template file for 'xfconf'
 pkgname=xfconf
-version=4.16.0
-revision=2
+version=4.18.0
+revision=1
 build_helper=gir
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale --enable-gsettings-backend"
-hostmakedepends="pkg-config intltool glib-devel vala-devel"
+hostmakedepends="pkg-config intltool glib-devel vala-devel perl"
 makedepends="libxfce4util-devel vala-devel"
 checkdepends="dbus xvfb-run"
 short_desc="Xfce hierarchical (tree-like) configuration system"
@@ -13,7 +13,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-only, LGPL-2.0-only"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/xfconf/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=652a119007c67d9ba6c0bc7a740c923d33f32d03dc76dfc7ba682584e72a5425
+checksum=2e8c50160bf800a807aea094fc9dad81f9f361f42db56607508ed5b4855d2906
 build_options="gir"
 build_options_default="gir"
 

From b47657670f4e8c54ae82cc83665296f42b048f27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:47:08 +0700
Subject: [PATCH 15/17] xfdesktop: update to 4.18.0.

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

diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template
index b58ed1c4dd53..10a5dcb5f9fc 100644
--- a/srcpkgs/xfdesktop/template
+++ b/srcpkgs/xfdesktop/template
@@ -1,6 +1,6 @@
 # Template file for 'xfdesktop'
 pkgname=xfdesktop
-version=4.16.1
+version=4.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -13,4 +13,4 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/xfdesktop/${version%.*}/$pkgname-$version.tar.bz2"
-checksum=e31dcb0008ae55e99e42128a4694002203305287434a8ee0f9937e7298a4bd11
+checksum=661783e7e6605459926d80bca46d25ce2197c221456457a863ea9d0252120d14

From b16bfdda0c4114ec4aede0d35b33f0c74bcf9025 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:47:09 +0700
Subject: [PATCH 16/17] xfwm4: update to 4.18.0.

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

diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template
index 484d0fa26ce1..e9c1a032713b 100644
--- a/srcpkgs/xfwm4/template
+++ b/srcpkgs/xfwm4/template
@@ -1,6 +1,6 @@
 # Template file for 'xfwm4'
 pkgname=xfwm4
-version=4.16.1
+version=4.18.0
 revision=1
 build_style=gnu-configure
 configure_args="--with-locales-dir=/usr/share/locale"
@@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
 license="GPL-2.0-or-later"
 homepage="https://xfce.org/"
 distfiles="https://archive.xfce.org/src/xfce/xfwm4/${version%.*}/xfwm4-${version}.tar.bz2"
-checksum=b5b24ca04bd73c642db0a4b4df81d262381d758f01b51108257d48b391b8718c
+checksum=92cd1b889bb25cb4bc06c1c6736c238d96e79c1e706b9f77fad0a89d6e5fc13f
 
 post_patch() {
 	# compositor may be buggy on old and big endian hardware

From 9b3149b1ad54c5971b6801dd467b820c25e9b4ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 14 Nov 2022 10:56:18 +0700
Subject: [PATCH 17/17] xfce4: update to 4.18.0.

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

diff --git a/srcpkgs/xfce4/template b/srcpkgs/xfce4/template
index 8de684d9cd8e..8aa20158602e 100644
--- a/srcpkgs/xfce4/template
+++ b/srcpkgs/xfce4/template
@@ -1,6 +1,6 @@
 # Template file for 'xfce4'
 pkgname=xfce4
-version=4.16.0
+version=4.18.0
 revision=1
 build_style=meta
 depends="

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

* Re: [PR PATCH] [Merged]: Xfce 4.18
  2022-12-16  2:19 [PR PATCH] Xfce 4.18 sgn
  2022-12-16  2:26 ` [PR PATCH] [Updated] " sgn
@ 2022-12-16  6:51 ` sgn
  1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2022-12-16  6:51 UTC (permalink / raw)
  To: ml

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

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

Xfce 4.18
https://github.com/void-linux/void-packages/pull/41128

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

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

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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
-->


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

end of thread, other threads:[~2022-12-16  6:51 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-16  2:19 [PR PATCH] Xfce 4.18 sgn
2022-12-16  2:26 ` [PR PATCH] [Updated] " sgn
2022-12-16  6:51 ` [PR PATCH] [Merged]: " sgn

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