From 35893a8f51da0854c585417e231237eff49ccdc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 17:03:14 +0700 Subject: [PATCH 01/25] libopenraw: reduce dependencies of -devel --- srcpkgs/libopenraw/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libopenraw/template b/srcpkgs/libopenraw/template index 542d63319c5883..3f5fced26e2bc2 100644 --- a/srcpkgs/libopenraw/template +++ b/srcpkgs/libopenraw/template @@ -1,7 +1,7 @@ # Template file for 'libopenraw' pkgname=libopenraw version=0.1.3 -revision=2 +revision=3 build_style=gnu-configure configure_args="--with-boost=${XBPS_CROSS_BASE}/usr" hostmakedepends="pkg-config curl" @@ -20,7 +20,7 @@ post_install() { } libopenraw-devel_package() { - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + depends="${sourcepkg}>=${version}_${revision}" description=" - development files" pkg_install() { vmove "usr/lib/*.so" From 1a8fb6a5c0eeab5e34872488fc957b6d9023a297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 10 Dec 2024 13:02:53 +0700 Subject: [PATCH 02/25] New package: libxfce4windowing-4.19.10 --- common/shlibs | 2 ++ srcpkgs/libxfce4windowing-devel | 1 + srcpkgs/libxfce4windowing/template | 28 ++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 120000 srcpkgs/libxfce4windowing-devel create mode 100644 srcpkgs/libxfce4windowing/template diff --git a/common/shlibs b/common/shlibs index e2742f96a693e0..d968caaf3a97fc 100644 --- a/common/shlibs +++ b/common/shlibs @@ -747,6 +747,8 @@ libgarcon-1.so.0 garcon-0.1.12_1 libgarcon-gtk3-1.so.0 garcon-0.6.1_1 libxfce4ui-2.so.0 libxfce4ui-4.18.0_1 libxfce4kbd-private-3.so.0 libxfce4ui-4.18.0_1 +libxfce4windowingui-0.so.0 libxfce4windowing-4.19.10_1 +libxfce4windowing-0.so.0 libxfce4windowing-4.19.10_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/libxfce4windowing-devel b/srcpkgs/libxfce4windowing-devel new file mode 120000 index 00000000000000..34733cb580bc80 --- /dev/null +++ b/srcpkgs/libxfce4windowing-devel @@ -0,0 +1 @@ +libxfce4windowing \ No newline at end of file diff --git a/srcpkgs/libxfce4windowing/template b/srcpkgs/libxfce4windowing/template new file mode 100644 index 00000000000000..6c302f4615e56f --- /dev/null +++ b/srcpkgs/libxfce4windowing/template @@ -0,0 +1,28 @@ +# Template file for 'libxfce4windowing' +pkgname=libxfce4windowing +version=4.20.0 +revision=1 +build_style=meson +build_helper=gir +hostmakedepends="wayland-devel pkg-config xfce4-dev-tools glib-devel gettext" +makedepends="libdisplay-info-devel gtk+3-devel libglib-devel gdk-pixbuf-devel + libgirepository-devel libX11-devel libwnck-devel libXrandr-devel wayland-devel + wayland-protocols " +short_desc="Windowing concept abstraction library for X11 and Wayland" +maintainer="Đoàn Trần Công Danh " +license="LGPL-2.1-or-later" +homepage="https://xfce.org/" +distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" +checksum=56f29b1d79606fb00a12c83ef4ece12877d2b22bf1acaaff89537fbe8e939f68 + +libxfce4windowing-devel_package() { + depends="libglib-devel gdk-pixbuf-devel gtk+3-devel libdisplay-info-devel + ${sourcepkg}>=${version}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove usr/lib/pkgconfig + vmove "usr/lib/*.so" + vmove "usr/share/gir-*" + } +} From d9ece1c384681a7bf540289d0f599fef303fb4e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 07:20:11 +0700 Subject: [PATCH 03/25] Thunar: update to 4.20.0. --- srcpkgs/Thunar/template | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template index 32fedbb4caeece..0b36f7bc94c830 100644 --- a/srcpkgs/Thunar/template +++ b/srcpkgs/Thunar/template @@ -1,13 +1,12 @@ # Template file for 'Thunar' pkgname=Thunar -version=4.18.11 -revision=2 +version=4.20.0 +revision=1 build_style=gnu-configure build_helper="gir" configure_args="--enable-gio-unix --enable-gudev - --enable-exif --disable-static --enable-notifications - --with-locales-dir=/usr/share/locale" -hostmakedepends="pkg-config intltool glib-devel" + --enable-exif --disable-static --enable-notifications" +hostmakedepends="pkg-config gettext glib-devel polkit" makedepends="exo-devel libexif-devel libgudev-devel libnotify-devel xfce4-panel-devel libSM-devel libICE-devel libX11-devel cairo-devel pcre2-devel pango-devel atk-devel gdk-pixbuf-devel libxfce4ui-devel @@ -19,7 +18,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=7d0bdae2076a568c137d403ab5600e06a7a4f7a02514d486da7b8414aa75d612 +checksum=27731a76f3aecf3752b1ca35afad89e264c52244f70083d933507dd4a17548b0 Thunar-devel_package() { depends="libglib-devel gtk+3-devel ${sourcepkg}>=${version}_${revision}" From 573d68fe2d16806af0105de3f9897b3b1fb61cba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 07:20:19 +0700 Subject: [PATCH 04/25] exo: update to 4.20.0. --- srcpkgs/exo/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/exo/template b/srcpkgs/exo/template index 2105e3f7d66609..8b6a13e7658062 100644 --- a/srcpkgs/exo/template +++ b/srcpkgs/exo/template @@ -1,10 +1,10 @@ # Template file for 'exo' pkgname=exo -version=4.18.0 +version=4.20.0 revision=1 build_style=gnu-configure -configure_args="--disable-static --with-locales-dir=/usr/share/locale" -hostmakedepends="pkg-config intltool gettext glib-devel" +configure_args="--disable-static" +hostmakedepends="pkg-config 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,7 +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=4f2c61d045a888cdb64297fd0ae20cc23da9b97ffb82562ed12806ed21da7d55 +checksum=4277f799245f1efde01cd917fd538ba6b12cf91c9f8a73fe2035fd5456ec078d exo-devel_package() { depends="libxfce4ui-devel exo-${version}_${revision}" From 8416c03b76cf73f7187cc65a66e3ac53d286c720 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 07:20:22 +0700 Subject: [PATCH 05/25] garcon: update to 4.20.0. --- srcpkgs/garcon/template | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/srcpkgs/garcon/template b/srcpkgs/garcon/template index bfc19a51d154f3..f180edc4f10f4f 100644 --- a/srcpkgs/garcon/template +++ b/srcpkgs/garcon/template @@ -1,12 +1,11 @@ # Template file for 'garcon' pkgname=garcon -version=4.18.2 +version=4.20.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" +configure_args="--disable-static --enable-introspection" +hostmakedepends="pkg-config gettext glib-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" @@ -15,10 +14,14 @@ 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=1b8c9292e131968fbfc8987bbc62c5ba47186dd45ef4e47c5d8c5088bb2d434d +checksum=7fb8517c12309ca4ddf8b42c34bc0c315e38ea077b5442bfcc4509415feada8f -build_options="gir" -build_options_default="gir" +pre_configure() { + mkdir -p garcon-gtk/.libs + ln -s ../../garcon/.libs/libgarcon-1.so.0 garcon-gtk/.libs/ + LDFLAGS+=" -Wl,--rpath-link=$wrksrc/garcon/.libs" + LDFLAGS+=" -Wl,--rpath-link=$wrksrc/garcon-gtk/.libs" +} garcon-devel_package() { depends="${sourcepkg}>=${version}_${revision} libxfce4ui-devel gtk+3-devel" @@ -28,8 +31,6 @@ garcon-devel_package() { vmove usr/lib/pkgconfig vmove "usr/lib/*.so" vmove usr/share/gtk-doc - if [ "$build_option_gir" ]; then - vmove usr/share/gir-1.0 - fi + vmove usr/share/gir-1.0 } } From 7356c43f863762c438aa5403971db18a3cafbae9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 07:20:53 +0700 Subject: [PATCH 06/25] libxfce4util: update to 4.20.0. --- common/shlibs | 2 +- srcpkgs/libxfce4util/template | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/common/shlibs b/common/shlibs index d968caaf3a97fc..3ffb0631367320 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.18.0_1 +libxfce4util.so.7 libxfce4util-4.20.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 diff --git a/srcpkgs/libxfce4util/template b/srcpkgs/libxfce4util/template index fc8a755802f5f2..a01ad2424870ed 100644 --- a/srcpkgs/libxfce4util/template +++ b/srcpkgs/libxfce4util/template @@ -1,22 +1,17 @@ # Template file for 'libxfce4util' pkgname=libxfce4util -version=4.18.2 +version=4.20.0 revision=1 build_style=gnu-configure build_helper="gir" -configure_args="--with-locales-dir=/usr/share/locale" -hostmakedepends="pkg-config intltool $(vopt_if gir vala)" +hostmakedepends="pkg-config gettext vala" makedepends="libglib-devel" short_desc="Utility library for the Xfce4 desktop environment" maintainer="mobinmob " license="LGPL-2.0-or-later" homepage="https://xfce.org/" distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2" -checksum=d9a329182b78f7e2520cd4aafcbb276bbbf162f6a89191676539ad2e3889c353 - -# Package build options -build_options="gir" -build_options_default="gir" +checksum=21493f9c9995a282823db93839f6b9f06ae31edb094191ba9acf04d932a2b592 libxfce4util-devel_package() { depends="libglib-devel ${sourcepkg}>=${version}_${revision}" @@ -26,8 +21,6 @@ libxfce4util-devel_package() { vmove usr/lib/pkgconfig vmove usr/share/gtk-doc vmove "usr/lib/*.so" - if [ "$build_option_gir" ]; then - vmove usr/share/gir-1.0 - fi + vmove usr/share/gir-1.0 } } From f5a0774791fb3a9805e4a7b8539a1c7a897549d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 07:20:53 +0700 Subject: [PATCH 07/25] libxfce4ui: update to 4.20.0. --- common/shlibs | 4 ++-- srcpkgs/libxfce4ui/template | 21 ++++++--------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/common/shlibs b/common/shlibs index 3ffb0631367320..5d597c8d44b0bd 100644 --- a/common/shlibs +++ b/common/shlibs @@ -745,8 +745,8 @@ libqgpgme.so.15 gpgmeqt-1.18.0_1 libqgpgmeqt6.so.15 gpgme-qt6-1.23.2_1 libgarcon-1.so.0 garcon-0.1.12_1 libgarcon-gtk3-1.so.0 garcon-0.6.1_1 -libxfce4ui-2.so.0 libxfce4ui-4.18.0_1 -libxfce4kbd-private-3.so.0 libxfce4ui-4.18.0_1 +libxfce4ui-2.so.0 libxfce4ui-4.20.0_1 +libxfce4kbd-private-3.so.0 libxfce4ui-4.20.0_1 libxfce4windowingui-0.so.0 libxfce4windowing-4.19.10_1 libxfce4windowing-0.so.0 libxfce4windowing-4.19.10_1 libxml++-2.6.so.2 libxml++-2.32.0_1 diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template index 87e368f8aaf49a..678001b3340d63 100644 --- a/srcpkgs/libxfce4ui/template +++ b/srcpkgs/libxfce4ui/template @@ -1,15 +1,12 @@ # Template file for 'libxfce4ui' pkgname=libxfce4ui -version=4.18.6 +version=4.20.0 revision=1 build_style=gnu-configure build_helper="gir" -configure_args="--with-locales-dir=/usr/share/locale --disable-static - --enable-tests - $(vopt_enable gir introspection) $(vopt_enable gir vala)" +configure_args="--disable-static --enable-tests --enable-introspection --enable-vala" conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml" -hostmakedepends="pkg-config intltool glib-devel gettext-devel - $(vopt_if gir vala)" +hostmakedepends="pkg-config glib-devel gettext 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" @@ -17,11 +14,7 @@ maintainer="Đoàn Trần Công Danh " license="LGPL-2.0-or-later" homepage="https://xfce.org/" distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=77dd99206cc8c6c7f69c269c83c7ee6a037bca9d4a89b1a6d9765e5a09ce30cd - -# Package build options -build_options="gir" -build_options_default="gir" +checksum=75e8996984f20375aadecd5c16f5147c211ed0bd26d7861ab0257561eb76eaee libxfce4ui-devel_package() { depends="${sourcepkg}>=${version}_${revision} @@ -32,10 +25,8 @@ libxfce4ui-devel_package() { vmove usr/lib/pkgconfig vmove "usr/lib/*.so" vmove usr/share/gtk-doc - if [ "$build_option_gir" ]; then - vmove usr/share/gir-1.0 - vmove usr/share/vala - fi + vmove usr/share/gir-1.0 + vmove usr/share/vala } } From 2c222cad6a42a58120b43e8caae75913989ea3db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 07:20:55 +0700 Subject: [PATCH 08/25] mousepad: update to 0.6.3. --- srcpkgs/mousepad/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/mousepad/template b/srcpkgs/mousepad/template index 84698d3ce93899..39453d59439741 100644 --- a/srcpkgs/mousepad/template +++ b/srcpkgs/mousepad/template @@ -1,11 +1,10 @@ # Template file for 'mousepad' pkgname=mousepad -version=0.6.2 +version=0.6.3 revision=1 build_style=gnu-configure -configure_args="--with-locales-dir=/usr/share/locale" -hostmakedepends="glib-devel intltool pkg-config" -makedepends="gtksourceview4-devel gspell-devel" +hostmakedepends="glib-devel gettext pkg-config polkit" +makedepends="gtksourceview4-devel gspell-devel libxfce4ui-devel polkit-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="Simple text editor for Xfce based on Leafpad" maintainer="mobinmob " @@ -13,4 +12,4 @@ license="GPL-2.0-or-later" homepage="https://xfce.org/" changelog="https://gitlab.xfce.org/apps/mousepad/-/raw/master/NEWS" distfiles="https://archive.xfce.org/src/apps/mousepad/${version%.*}/mousepad-${version}.tar.bz2" -checksum=e7cacb3b8cb1cd689e6341484691069e73032810ca51fc747536fc36eb18d19d +checksum=2ff162c185f18014ab9c82c2ac2dfce4fba20eb0005e7690ee27f00b9cb929b9 From 8a1e6f8fd066bf4788ecf564db17522183ab5704 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 07:22:11 +0700 Subject: [PATCH 09/25] thunar-volman: update to 4.20.0. --- srcpkgs/thunar-volman/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template index defd2479aaf44a..5e3527d0d859d3 100644 --- a/srcpkgs/thunar-volman/template +++ b/srcpkgs/thunar-volman/template @@ -1,10 +1,9 @@ # Template file for 'thunar-volman' pkgname=thunar-volman -version=4.18.0 +version=4.20.0 revision=1 build_style=gnu-configure -configure_args="--with-locales-dir=/usr/share/locale" -hostmakedepends="pkg-config intltool" +hostmakedepends="pkg-config gettext" makedepends="libgudev-devel libnotify-devel libxfce4ui-devel exo-devel" depends="hicolor-icon-theme desktop-file-utils" short_desc="Thunar Volume Manager" @@ -13,4 +12,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=93b75c7ffbe246a21f4190295acc148e184be8df397e431b258d0d676e87fc65 +checksum=b0dad852959b515b8fbfd1ed552e362340347d26d5246e7f1b973027131eb1da From 9fdf4fa7db8561dadd0b63e0f6e4e2e8894bcd91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 07:22:11 +0700 Subject: [PATCH 10/25] tumbler: update to 4.20.0. --- srcpkgs/tumbler/template | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/srcpkgs/tumbler/template b/srcpkgs/tumbler/template index fff20110698b35..5ee07b91cec002 100644 --- a/srcpkgs/tumbler/template +++ b/srcpkgs/tumbler/template @@ -1,11 +1,10 @@ # Template file for 'tumbler' pkgname=tumbler -version=4.18.2 -revision=2 +version=4.20.0 +revision=1 build_style=gnu-configure -configure_args="--with-locales-dir=/usr/share/locale - --disable-gstreamer-thumbnailer --enable-poppler-thumbnailer" -hostmakedepends="intltool pkg-config glib-devel perl" +configure_args="--disable-gstreamer-thumbnailer --enable-poppler-thumbnailer" +hostmakedepends="gettext 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" @@ -14,7 +13,7 @@ maintainer="Đoàn Trần Công Danh " 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=b530eec635eac7f898c0d8d3a3ff79d76a145d3bed3e786d54b1ec058132be7a +checksum=74b1647d55926547e98bfac70838ff63c5a84299a5e10c81c38d1fab90e25880 tumbler-devel_package() { depends="libglib-devel ${sourcepkg}>=${version}_${revision}" From 7f0a4ae42d2bc150ebc375877586e09c742174fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 07:22:12 +0700 Subject: [PATCH 11/25] xfce4-appfinder: update to 4.20.0. --- srcpkgs/xfce4-appfinder/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xfce4-appfinder/template b/srcpkgs/xfce4-appfinder/template index 0b31f1d1f34829..70881d4e342507 100644 --- a/srcpkgs/xfce4-appfinder/template +++ b/srcpkgs/xfce4-appfinder/template @@ -1,10 +1,9 @@ # Template file for 'xfce4-appfinder' pkgname=xfce4-appfinder -version=4.18.1 +version=4.20.0 revision=1 build_style=gnu-configure -configure_args="--with-locales-dir=/usr/share/locale" -hostmakedepends="pkg-config intltool" +hostmakedepends="pkg-config gettext" makedepends="garcon-devel libxfce4ui-devel gtk+3-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="Appfinder for the Xfce Desktop Environment" @@ -13,4 +12,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=9854ea653981be544ad545850477716c4c92d0c43eb47b75f78534837c0893f9 +checksum=82ca82f77dc83e285db45438c2fe31df445148aa986ffebf2faabee4af9e7304 From 83ed583dc443a260d68fbc249618e03392079120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 07:22:13 +0700 Subject: [PATCH 12/25] xfce4-dev-tools: update to 4.20.0. --- srcpkgs/xfce4-dev-tools/template | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/srcpkgs/xfce4-dev-tools/template b/srcpkgs/xfce4-dev-tools/template index 59fc89b3fdcb25..52ab74f7a95c97 100644 --- a/srcpkgs/xfce4-dev-tools/template +++ b/srcpkgs/xfce4-dev-tools/template @@ -1,17 +1,16 @@ # Template file for 'xfce4-dev-tools' pkgname=xfce4-dev-tools -version=4.18.1 -revision=2 +version=4.20.0 +revision=1 build_style=gnu-configure -hostmakedepends="pkg-config libxslt" +hostmakedepends="pkg-config libxslt meson" makedepends="libglib-devel" -depends="automake libtool" short_desc="Xfce developer tools" maintainer="Đoàn Trần Công Danh " license="GPL-2.0-or-later" homepage="https://xfce.org/" distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=812cabe7048922ebc176564b73c3e427e467c9566365ee3e54c0487d305a7681 +checksum=1fba39a08a0ecc771eaa3a3b6e4272a4f0b9e7c67d0f66e780cd6090cd4466aa post_patch() { [ "$CROSS_BUILD" ] || return 0 From 65ee8d9b4059fe6b740f8903a876b8bb53e58318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 07:22:13 +0700 Subject: [PATCH 13/25] xfce4-dict: update to 0.8.8. --- srcpkgs/xfce4-dict/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xfce4-dict/template b/srcpkgs/xfce4-dict/template index 5551eb9f9a23a3..d676b912270474 100644 --- a/srcpkgs/xfce4-dict/template +++ b/srcpkgs/xfce4-dict/template @@ -1,14 +1,13 @@ # Template file for 'xfce4-dict' pkgname=xfce4-dict -version=0.8.6 +version=0.8.8 revision=1 build_style=gnu-configure -configure_args="--with-locales-dir=/usr/share/locale" -hostmakedepends="pkg-config intltool" +hostmakedepends="pkg-config gettext" makedepends="xfce4-panel-devel" short_desc="Dictionary plugin for the Xfce panel" maintainer="Alexander Mamay " license="GPL-2.0-or-later" homepage="https://goodies.xfce.org/projects/applications/xfce4-dict" distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=ae5db7ca70354d3293fc08eaf7ca40cdbc91799a219f199d824684b39e6c0a41 +checksum=0d0cb079d276d82c174a52c94ee4df12df490a525befc44650e261f8e5eae916 From d5e4103923bd7e5e219d9ab3270b98ab6cf179ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 07:22:14 +0700 Subject: [PATCH 14/25] xfce4-notifyd: update to 0.9.6. --- srcpkgs/xfce4-notifyd/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xfce4-notifyd/template b/srcpkgs/xfce4-notifyd/template index 6406da5af00cb5..967585850a6020 100644 --- a/srcpkgs/xfce4-notifyd/template +++ b/srcpkgs/xfce4-notifyd/template @@ -1,6 +1,6 @@ # Template file for 'xfce4-notifyd' pkgname=xfce4-notifyd -version=0.9.4 +version=0.9.6 revision=1 build_style=gnu-configure configure_args="--enable-dbus-start-daemon" @@ -14,7 +14,7 @@ license="GPL-2.0-or-later" homepage="https://goodies.xfce.org/projects/applications/xfce4-notifyd" changelog="https://gitlab.xfce.org/apps/xfce4-notifyd/-/raw/master/NEWS" distfiles="https://archive.xfce.org/src/apps/${pkgname}/${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=ae6c128c055c44bd07202f73ae69ad833c5e4754f3530696965136e4d9ea7818 +checksum=9e53265cca7d835c31b3c2c0d3ae961704870839ef583dcca3e4cc98ae3d2671 provides="notification-daemon-${version}_${revision}" replaces="notification-daemon>=0" From 383c99b062a0e708e6e05362fb4fdf0a62f2e919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 07:22:15 +0700 Subject: [PATCH 15/25] xfce4-panel: update to 4.20.0. --- common/shlibs | 2 +- srcpkgs/xfce4-panel/template | 22 +++++++--------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/common/shlibs b/common/shlibs index 5d597c8d44b0bd..c732517b8d50ed 100644 --- a/common/shlibs +++ b/common/shlibs @@ -184,7 +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.20.0_1 -libxfce4panel-2.0.so.4 libxfce4panel-4.18.0_1 +libxfce4panel-2.0.so.4 libxfce4panel-4.20.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 79a0def1bbe051..d51998cfb188ef 100644 --- a/srcpkgs/xfce4-panel/template +++ b/srcpkgs/xfce4-panel/template @@ -1,25 +1,19 @@ # Template file for 'xfce4-panel' pkgname=xfce4-panel -version=4.18.6 +version=4.20.0 revision=1 build_style=gnu-configure build_helper="gir" -configure_args="--with-locales-dir=/usr/share/locale - --disable-static --enable-gio-unix" -hostmakedepends="pkg-config intltool gettext-devel glib-devel - $(vopt_if gir vala)" +configure_args="--disable-static --enable-gio-unix" +hostmakedepends="pkg-config gettext glib-devel vala" makedepends="libwnck-devel libxfce4ui-devel xfconf-devel garcon-devel exo-devel - libdbusmenu-gtk3-devel" + libdbusmenu-gtk3-devel libxfce4windowing-devel gtk-layer-shell-devel" short_desc="Next generation panel for the XFCE desktop environment" maintainer="Đoàn Trần Công Danh " 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=21337161f58bb9b6e42760cb6883bc79beea27882aa6272b61f0e09d750d7c62 - -# Package build options -build_options="gir" -build_options_default="gir" +checksum=ff33cd5f5d16c2193fe305f4878d82cd8d2feea92f2594bcd27b2b5c392d43b8 xfce4-panel-devel_package() { depends="libxfce4ui-devel libxfce4panel>=${version}_${revision}" @@ -29,10 +23,8 @@ xfce4-panel-devel_package() { vmove usr/lib/pkgconfig vmove usr/share/gtk-doc vmove "usr/lib/*.so" - if [ "$build_option_gir" ]; then - vmove usr/share/gir-1.0 - vmove usr/share/vala - fi + vmove usr/share/gir-1.0 + vmove usr/share/vala } } From 4083b1b23f781e8c7af537fa0da1ff286c2f2204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 07:22:15 +0700 Subject: [PATCH 16/25] xfce4-power-manager: update to 4.20.0. --- .../xfce4-power-manager/patches/void.patch | 26 +++++++++++++------ srcpkgs/xfce4-power-manager/template | 11 ++++---- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/srcpkgs/xfce4-power-manager/patches/void.patch b/srcpkgs/xfce4-power-manager/patches/void.patch index f2517900d574d6..d6cd4016387dce 100644 --- a/srcpkgs/xfce4-power-manager/patches/void.patch +++ b/srcpkgs/xfce4-power-manager/patches/void.patch @@ -1,22 +1,23 @@ --- a/src/xfpm-pm-helper.c +++ b/src/xfpm-pm-helper.c -@@ -69,11 +69,8 @@ - #define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/acpiconf -s 3" +@@ -72,12 +72,8 @@ #define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/acpiconf -s 4" + #define UP_BACKEND_HYBRID_SLEEP_COMMAND "/usr/bin/false" #endif -#ifdef BACKEND_TYPE_LINUX -#define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/pm-suspend" -#define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/pm-hibernate" +-#define UP_BACKEND_HYBRID_SLEEP_COMMAND "/usr/sbin/pm-suspend-hybrid" -#endif -#ifdef BACKEND_TYPE_OPENBSD +/* voidlinux and openbsd use zzz(8) */ +#if defined(BACKEND_TYPE_LINUX) || defined(BACKEND_TYPE_OPENBSD) - #define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/zzz" + #define UP_BACKEND_SUSPEND_COMMAND "/usr/sbin/zzz" #define UP_BACKEND_HIBERNATE_COMMAND "/usr/sbin/ZZZ" - #endif + #define UP_BACKEND_HYBRID_SLEEP_COMMAND "/usr/bin/false" --- a/src/xfpm-suspend.c +++ b/src/xfpm-suspend.c -@@ -103,33 +103,6 @@ freebsd_supports_sleep_state (const gcha +@@ -105,33 +105,6 @@ freebsd_supports_sleep_state (const gcha } #endif @@ -33,7 +34,7 @@ - XFPM_DEBUG ("Executing command: %s", command); - - if (!g_spawn_command_line_sync (command, NULL, NULL, &status, &error) -- || !g_spawn_check_exit_status (status, &error)) +- || !g_spawn_check_wait_status (status, &error)) - { - g_warning ("Failed to run script: %s", error->message); - g_error_free (error); @@ -50,7 +51,7 @@ gboolean xfpm_suspend_can_suspend (void) { -@@ -137,7 +110,7 @@ xfpm_suspend_can_suspend (void) +@@ -139,7 +112,7 @@ xfpm_suspend_can_suspend (void) return freebsd_supports_sleep_state ("S3"); #endif #ifdef BACKEND_TYPE_LINUX @@ -59,7 +60,7 @@ #endif #ifdef BACKEND_TYPE_OPENBSD return TRUE; -@@ -153,7 +126,7 @@ xfpm_suspend_can_hibernate (void) +@@ -155,7 +128,7 @@ xfpm_suspend_can_hibernate (void) return freebsd_supports_sleep_state ("S4"); #endif #ifdef BACKEND_TYPE_LINUX @@ -68,3 +69,12 @@ #endif #ifdef BACKEND_TYPE_OPENBSD return TRUE; +@@ -171,7 +144,7 @@ xfpm_suspend_can_hybrid_sleep (void) + return TRUE; + #endif + #ifdef BACKEND_TYPE_LINUX +- return linux_supports_sleep_state ("suspend-hybrid"); ++ return TRUE; + #endif + #ifdef BACKEND_TYPE_OPENBSD + return TRUE; diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template index ff812bf54fad30..33773c0101897c 100644 --- a/srcpkgs/xfce4-power-manager/template +++ b/srcpkgs/xfce4-power-manager/template @@ -1,15 +1,16 @@ # Template file for 'xfce4-power-manager' pkgname=xfce4-power-manager -version=4.18.4 +version=4.20.0 revision=1 build_style=gnu-configure -configure_args="--with-locales-dir=/usr/share/locale --disable-static" -hostmakedepends="pkg-config intltool" -makedepends="libxfce4ui-devel libnotify-devel upower-devel xfce4-panel-devel" +configure_args="--disable-static" +hostmakedepends="pkg-config gettext glib-devel wayland-devel polkit" +makedepends="libxfce4ui-devel libnotify-devel upower-devel xfce4-panel-devel + polkit-devel libglib-devel wayland-devel" depends="hicolor-icon-theme desktop-file-utils upower" short_desc="Xfce power manager" maintainer="Đoàn Trần Công Danh " license="GPL-2.0-or-later" homepage="https://xfce.org/" distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2" -checksum=76918f7bdcd936dbbf20efd9221a33be0cd504c7d7ffce792bace3c720f3d874 +checksum=971391cef63352833bdd92df28957392e17e1f2b3d486c0f57294fd204d6ed29 From 5cbcbdfb2e67c87ed89b64b0dcc8d23cabdec67e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 07:22:16 +0700 Subject: [PATCH 17/25] xfce4-pulseaudio-plugin: update to 0.4.9. --- srcpkgs/xfce4-pulseaudio-plugin/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/xfce4-pulseaudio-plugin/template b/srcpkgs/xfce4-pulseaudio-plugin/template index 331c6ebd88d111..148c8260e101b5 100644 --- a/srcpkgs/xfce4-pulseaudio-plugin/template +++ b/srcpkgs/xfce4-pulseaudio-plugin/template @@ -1,15 +1,15 @@ # Template file for 'xfce4-pulseaudio-plugin' pkgname=xfce4-pulseaudio-plugin -version=0.4.8 +version=0.4.9 revision=1 build_style=gnu-configure -configure_args="--with-locales-dir=/usr/share/locale" -hostmakedepends="gettext intltool pkg-config" -makedepends="exo-devel libkeybinder3-devel libnotify-devel pulseaudio-devel xfce4-panel-devel" +hostmakedepends="gettext pkg-config" +makedepends="exo-devel libkeybinder3-devel libnotify-devel pulseaudio-devel + libcanberra-devel xfce4-panel-devel" depends="pavucontrol" short_desc="Pulseaudio volume control plugin for Xfce4 panel" maintainer="Orphaned " 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/xfce4-pulseaudio-plugin/${version%.*}/xfce4-pulseaudio-plugin-${version}.tar.bz2" -checksum=bd742b207c39c221e91c57c9c9be2839eb802d1b1ee01a02b7427cd02d3f0348 +checksum=a0807615fb2848d0361b7e4568a44f26d189fda48011c7ba074986c8bfddc99a From 93c27dcf169004db5998880617b8e5392de208a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 07:22:16 +0700 Subject: [PATCH 18/25] xfce4-screenshooter: update to 1.11.1. --- srcpkgs/xfce4-screenshooter/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/xfce4-screenshooter/template b/srcpkgs/xfce4-screenshooter/template index 8b58c111b61cef..9fc504c8839845 100644 --- a/srcpkgs/xfce4-screenshooter/template +++ b/srcpkgs/xfce4-screenshooter/template @@ -3,7 +3,6 @@ pkgname=xfce4-screenshooter version=1.11.1 revision=1 build_style=gnu-configure -configure_args="--with-locales-dir=/usr/share/locale" hostmakedepends="pkg-config gettext glib-devel wayland-devel" makedepends="libxfce4ui-devel xfce4-panel-devel exo-devel libsoup3-devel" depends="desktop-file-utils hicolor-icon-theme" From 9d16a1c428e0eb5148a4686c12c4ac953a31c10b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 07:22:17 +0700 Subject: [PATCH 19/25] xfce4-session: update to 4.20.0. --- srcpkgs/xfce4-session/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/xfce4-session/template b/srcpkgs/xfce4-session/template index 2e9db790555155..51624c6c6893af 100644 --- a/srcpkgs/xfce4-session/template +++ b/srcpkgs/xfce4-session/template @@ -1,11 +1,11 @@ # Template file for 'xfce4-session' pkgname=xfce4-session -version=4.18.4 +version=4.20.0 revision=1 build_style=gnu-configure -configure_args="--with-locales-dir=/usr/share/locale --disable-static --enable-polkit" -hostmakedepends="pkg-config intltool gettext-devel glib-devel iceauth" -makedepends="libxfce4ui-devel upower-devel +configure_args="--disable-static --enable-polkit" +hostmakedepends="pkg-config gettext glib-devel iceauth polkit" +makedepends="libxfce4ui-devel upower-devel libxfce4windowing-devel gtk-layer-shell-devel libwnck-devel xfce4-panel-devel libSM-devel polkit-devel" depends="iceauth hicolor-icon-theme desktop-file-utils" conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml" @@ -14,4 +14,4 @@ maintainer="Đoàn Trần Công Danh " license="GPL-2.0-or-later" homepage="https://xfce.org/" distfiles="https://archive.xfce.org/src/xfce/$pkgname/${version%.*}/$pkgname-$version.tar.bz2" -checksum=9a9c5074c7338b881a5259d3b643619bf84901360c03478e1a697938ece06516 +checksum=5229233fe6ee692361cc28724886c5b08e0216d89f09c42d273191d38fd64f85 From 834d606c51ab64df9d5a9f61bea9535f1f39c1fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 07:22:18 +0700 Subject: [PATCH 20/25] xfce4-settings: update to 4.20.0. --- srcpkgs/xfce4-settings/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template index 14a71c907ad97c..5c3c6f548bfc68 100644 --- a/srcpkgs/xfce4-settings/template +++ b/srcpkgs/xfce4-settings/template @@ -1,13 +1,13 @@ # Template file for 'xfce4-settings' pkgname=xfce4-settings -version=4.18.6 +version=4.20.0 revision=1 build_style=gnu-configure -configure_args="--with-locales-dir=/usr/share/locale - --enable-sound-settings --enable-pluggable-dialogs --enable-xrandr - --enable-upower-glib" -hostmakedepends="intltool pkg-config" +build_helper=gir +configure_args="--enable-sound-settings --enable-xrandr --enable-upower-glib" +hostmakedepends="gettext pkg-config glib-devel libxml2 wayland-devel" makedepends="exo-devel garcon-devel libcanberra-devel libnotify-devel + libglib-devel gtk-layer-shell-devel wayland-devel libxklavier-devel upower-devel libXrandr-devel xf86-input-libinput-devel" depends="desktop-file-utils gnome-icon-theme" conf_files="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml" @@ -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=d9a9051b6026edd6766c64bb403b51e9167e4d31e7f1c7f843d3aed19f667bfe +checksum=23548da3429a296501fbfdbc98a861ee241b9fdd47e8d5de1781f57c6bbce5a9 From 4bf8aa8becb7e53f01c8d8437cc38f3c41d1f880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 07:22:18 +0700 Subject: [PATCH 21/25] xfce4-weather-plugin: update to 0.11.3. --- ...-Generalise-input-to-array-of-gchar.patch} | 46 ++++++--- ...=> 0002-libsoup-Port-to-libsoup-3.0.patch} | 99 ++++++++++++------- srcpkgs/xfce4-weather-plugin/template | 9 +- 3 files changed, 99 insertions(+), 55 deletions(-) rename srcpkgs/xfce4-weather-plugin/patches/{0003-parsers-Generalise-input-to-array-of-gchar.patch => 0001-parsers-Generalise-input-to-array-of-gchar.patch} (86%) rename srcpkgs/xfce4-weather-plugin/patches/{0004-libsoup-Port-to-libsoup-3.0.patch => 0002-libsoup-Port-to-libsoup-3.0.patch} (85%) diff --git a/srcpkgs/xfce4-weather-plugin/patches/0003-parsers-Generalise-input-to-array-of-gchar.patch b/srcpkgs/xfce4-weather-plugin/patches/0001-parsers-Generalise-input-to-array-of-gchar.patch similarity index 86% rename from srcpkgs/xfce4-weather-plugin/patches/0003-parsers-Generalise-input-to-array-of-gchar.patch rename to srcpkgs/xfce4-weather-plugin/patches/0001-parsers-Generalise-input-to-array-of-gchar.patch index 3856ddabab611d..54358476ed7bf7 100644 --- a/srcpkgs/xfce4-weather-plugin/patches/0003-parsers-Generalise-input-to-array-of-gchar.patch +++ b/srcpkgs/xfce4-weather-plugin/patches/0001-parsers-Generalise-input-to-array-of-gchar.patch @@ -1,7 +1,7 @@ -From dc3e3cdcba7d1c5159bb27b390ffd1b3a7feeb84 Mon Sep 17 00:00:00 2001 +From c0653a903c6f2cecdf41ac9eaeba4f4617656ffe Mon Sep 17 00:00:00 2001 From: Đoàn Trần Công Danh Date: Fri, 1 Mar 2024 21:56:34 +0700 -Subject: [PATCH 3/4] parsers: Generalise input to array of gchar +Subject: [PATCH 1/2] parsers: Generalise input to array of gchar In a later change, we will move to libsoup-3.0, which doesn't expose `response_body' in SoupMessage. @@ -16,10 +16,10 @@ Prepare for that move. 5 files changed, 76 insertions(+), 29 deletions(-) diff --git a/panel-plugin/weather-config.c b/panel-plugin/weather-config.c -index 66e0719..d08f2d2 100644 +index 2645408..19fa1d8 100644 --- a/panel-plugin/weather-config.c +++ b/panel-plugin/weather-config.c -@@ -241,9 +241,16 @@ cb_lookup_altitude(SoupSession *session, +@@ -245,6 +245,13 @@ cb_lookup_altitude(SoupSession *session, xfceweather_dialog *dialog = (xfceweather_dialog *) user_data; xml_altitude *altitude; gdouble alt = 0; @@ -31,13 +31,18 @@ index 66e0719..d08f2d2 100644 + len = msg->response_body->length; + } + if (global_dialog == NULL) { + weather_debug("%s called after dialog was destroyed", G_STRFUNC); +@@ -252,7 +259,7 @@ cb_lookup_altitude(SoupSession *session, + } + altitude = (xml_altitude *) - parse_xml_document(msg, (XmlParseFunc) parse_altitude); + parse_xml_document(body, len, (XmlParseFunc) parse_altitude); if (altitude) { alt = string_to_double(altitude->altitude, -9999); -@@ -265,9 +272,16 @@ cb_lookup_timezone(SoupSession *session, +@@ -274,6 +281,13 @@ cb_lookup_timezone(SoupSession *session, { xfceweather_dialog *dialog = (xfceweather_dialog *) user_data; xml_timezone *xml_tz; @@ -49,6 +54,11 @@ index 66e0719..d08f2d2 100644 + len = msg->response_body->length; + } + if (global_dialog == NULL) { + weather_debug("%s called after dialog was destroyed", G_STRFUNC); +@@ -281,7 +295,7 @@ cb_lookup_timezone(SoupSession *session, + } + xml_tz = (xml_timezone *) - parse_xml_document(msg, (XmlParseFunc) parse_timezone); + parse_xml_document(body, len, (XmlParseFunc) parse_timezone); @@ -156,10 +166,10 @@ index a9d019d..09b9c02 100644 xml_astro *xml_astro_copy(const xml_astro *src); diff --git a/panel-plugin/weather-search.c b/panel-plugin/weather-search.c -index b63e68d..cfbcd55 100644 +index 7e87ae8..6a2ba1f 100644 --- a/panel-plugin/weather-search.c +++ b/panel-plugin/weather-search.c -@@ -87,10 +87,17 @@ cb_searchdone(SoupSession *session, +@@ -89,6 +89,13 @@ cb_searchdone(SoupSession *session, gint found = 0; GtkTreeIter iter; GtkTreeSelection *selection; @@ -171,6 +181,10 @@ index b63e68d..cfbcd55 100644 + len = msg->response_body->length; + } + if (global_dialog == NULL) { + weather_debug("%s called after dialog was destroyed", G_STRFUNC); +@@ -97,7 +104,7 @@ cb_searchdone(SoupSession *session, + gtk_widget_set_sensitive(dialog->find_button, TRUE); - doc = get_xml_document(msg); @@ -178,7 +192,7 @@ index b63e68d..cfbcd55 100644 if (!doc) return; -@@ -377,9 +384,16 @@ cb_geolocation(SoupSession *session, +@@ -385,6 +392,13 @@ cb_geolocation(SoupSession *session, xml_geolocation *geo; gchar *full_loc; units_config *units; @@ -190,6 +204,11 @@ index b63e68d..cfbcd55 100644 + len = msg->response_body->length; + } + if (global_dialog == NULL) { + weather_debug("%s called after dialog was destroyed", G_STRFUNC); +@@ -392,7 +406,7 @@ cb_geolocation(SoupSession *session, + } + geo = (xml_geolocation *) - parse_xml_document(msg, (XmlParseFunc) parse_geolocation); + parse_xml_document(body, len, (XmlParseFunc) parse_geolocation); @@ -197,10 +216,10 @@ index b63e68d..cfbcd55 100644 if (!geo) { diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c -index daebd00..3a6a2b6 100644 +index 0a92b4e..b75c633 100644 --- a/panel-plugin/weather.c +++ b/panel-plugin/weather.c -@@ -494,11 +494,17 @@ cb_astro_update_sun(SoupSession *session, +@@ -489,11 +489,17 @@ cb_astro_update_sun(SoupSession *session, json_object *json_tree; time_t now_t; guint astro_forecast_days; @@ -219,7 +238,7 @@ index daebd00..3a6a2b6 100644 if (G_LIKELY(json_tree)) { if (!parse_astrodata_sun(json_tree, data->astrodata)) { data->msg_parse->sun_msg_parse_error++; -@@ -550,11 +556,17 @@ cb_astro_update_moon(SoupSession *session, +@@ -545,11 +551,17 @@ cb_astro_update_moon(SoupSession *session, json_object *json_tree; time_t now_t; guint astro_forecast_days; @@ -238,7 +257,7 @@ index daebd00..3a6a2b6 100644 if (G_LIKELY(json_tree)) { if (!parse_astrodata_moon(json_tree, data->astrodata)) { data->msg_parse->moon_msg_parse_error++; -@@ -611,17 +623,23 @@ cb_weather_update(SoupSession *session, +@@ -606,17 +618,23 @@ cb_weather_update(SoupSession *session, gpointer user_data) { plugin_data *data = user_data; @@ -264,3 +283,6 @@ index daebd00..3a6a2b6 100644 if (G_LIKELY(doc)) { root_node = xmlDocGetRootElement(doc); if (G_LIKELY(root_node)) +-- +2.47.1.613.gc27f4b7a9fc45 + diff --git a/srcpkgs/xfce4-weather-plugin/patches/0004-libsoup-Port-to-libsoup-3.0.patch b/srcpkgs/xfce4-weather-plugin/patches/0002-libsoup-Port-to-libsoup-3.0.patch similarity index 85% rename from srcpkgs/xfce4-weather-plugin/patches/0004-libsoup-Port-to-libsoup-3.0.patch rename to srcpkgs/xfce4-weather-plugin/patches/0002-libsoup-Port-to-libsoup-3.0.patch index f2e1d953443d50..19caa8a863e947 100644 --- a/srcpkgs/xfce4-weather-plugin/patches/0004-libsoup-Port-to-libsoup-3.0.patch +++ b/srcpkgs/xfce4-weather-plugin/patches/0002-libsoup-Port-to-libsoup-3.0.patch @@ -1,11 +1,11 @@ -From ec857414aaf53ff447062631734cdf44ab29d141 Mon Sep 17 00:00:00 2001 +From 279c975dc1f95bd1ce9152eee1d19122e7deb9a8 Mon Sep 17 00:00:00 2001 From: Đoàn Trần Công Danh Date: Fri, 1 Mar 2024 21:56:34 +0700 -Subject: [PATCH 4/4] libsoup: Port to libsoup-3.0 +Subject: [PATCH 2/2] libsoup: Port to libsoup-3.0 --- README | 4 +- - configure.ac.in | 2 +- + configure.ac | 2 +- panel-plugin/weather-config.c | 32 ++++--- panel-plugin/weather-search.c | 37 ++++++--- panel-plugin/weather-summary.c | 23 ++++-- @@ -13,11 +13,28 @@ Subject: [PATCH 4/4] libsoup: Port to libsoup-3.0 panel-plugin/weather.h | 2 +- 7 files changed, 132 insertions(+), 115 deletions(-) -diff --git a/configure.ac.in b/configure.ac.in -index 8127fb0..0bf3da4 100644 +diff --git a/README b/README +index 6587581..3530b1f 100644 +--- a/README ++++ b/README +@@ -152,10 +152,10 @@ using gdb or any other debugger should the plugin crash: + BUILD REQUIREMENTS AND DEPENDENCIES + ========================================================================== + To be able to build the plugin, the following requirements have to be +-met in addition to those of XFCE-4.14: ++met in addition to those of XFCE-4.16: + + * >=libxml-2.4.0 +-* >=libsoup-2.42.0 ++* >=libsoup-3.0.0 + * >=upower-0.9.0 (optional) + + You might also need developer libraries necessary for building other +diff --git a/configure.ac b/configure.ac +index 324599f..049ef88 100644 --- a/configure.ac +++ b/configure.ac -@@ -71,7 +71,7 @@ XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.16.0]) +@@ -70,7 +70,7 @@ XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.16.0]) XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-2.0], [4.14.0]) XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.12.0]) XDT_CHECK_PACKAGE([LIBXML], [libxml-2.0], [2.4.0]) @@ -27,10 +44,10 @@ index 8127fb0..0bf3da4 100644 XDT_CHECK_OPTIONAL_PACKAGE([UPOWER_GLIB], [upower-glib], [0.9.0], [upower], [upower for adapting update interval to power state]) diff --git a/panel-plugin/weather-config.c b/panel-plugin/weather-config.c -index d08f2d2..06bd802 100644 +index 19fa1d8..d27c825 100644 --- a/panel-plugin/weather-config.c +++ b/panel-plugin/weather-config.c -@@ -234,8 +234,8 @@ sanitize_location_name(const gchar *location_name) +@@ -238,8 +238,8 @@ sanitize_location_name(const gchar *location_name) static void @@ -41,7 +58,7 @@ index d08f2d2..06bd802 100644 gpointer user_data) { xfceweather_dialog *dialog = (xfceweather_dialog *) user_data; -@@ -243,11 +243,14 @@ cb_lookup_altitude(SoupSession *session, +@@ -247,11 +247,14 @@ cb_lookup_altitude(SoupSession *session, gdouble alt = 0; const gchar *body = NULL; gsize len = 0; @@ -58,9 +75,9 @@ index d08f2d2..06bd802 100644 + else + body = g_bytes_get_data(response, &len); - altitude = (xml_altitude *) - parse_xml_document(body, len, (XmlParseFunc) parse_altitude); -@@ -262,23 +265,27 @@ cb_lookup_altitude(SoupSession *session, + if (global_dialog == NULL) { + weather_debug("%s called after dialog was destroyed", G_STRFUNC); +@@ -271,23 +274,27 @@ cb_lookup_altitude(SoupSession *session, else if (dialog->pd->units->altitude == FEET) alt /= 0.3048; gtk_spin_button_set_value(GTK_SPIN_BUTTON(dialog->spin_alt), alt); @@ -92,9 +109,9 @@ index d08f2d2..06bd802 100644 + else + body = g_bytes_get_data(response, &len); - xml_tz = (xml_timezone *) - parse_xml_document(body, len, (XmlParseFunc) parse_timezone); -@@ -290,6 +297,7 @@ cb_lookup_timezone(SoupSession *session, + if (global_dialog == NULL) { + weather_debug("%s called after dialog was destroyed", G_STRFUNC); +@@ -304,6 +311,7 @@ cb_lookup_timezone(SoupSession *session, xml_timezone_free(xml_tz); } else gtk_entry_set_text(GTK_ENTRY(dialog->text_timezone), ""); @@ -103,10 +120,10 @@ index d08f2d2..06bd802 100644 diff --git a/panel-plugin/weather-search.c b/panel-plugin/weather-search.c -index cfbcd55..d49dd79 100644 +index 6a2ba1f..e030ff8 100644 --- a/panel-plugin/weather-search.c +++ b/panel-plugin/weather-search.c -@@ -76,8 +76,8 @@ sanitize_str(const gchar *str) +@@ -78,8 +78,8 @@ sanitize_str(const gchar *str) static void @@ -117,7 +134,7 @@ index cfbcd55..d49dd79 100644 gpointer user_data) { search_dialog *dialog = (search_dialog *) user_data; -@@ -89,17 +89,22 @@ cb_searchdone(SoupSession *session, +@@ -91,11 +91,14 @@ cb_searchdone(SoupSession *session, GtkTreeSelection *selection; const gchar *body = NULL; gsize len = 0; @@ -134,6 +151,9 @@ index cfbcd55..d49dd79 100644 + else + body = g_bytes_get_data(response, &len); + if (global_dialog == NULL) { + weather_debug("%s called after dialog was destroyed", G_STRFUNC); +@@ -105,8 +108,10 @@ cb_searchdone(SoupSession *session, gtk_widget_set_sensitive(dialog->find_button, TRUE); doc = get_xml_document(body, len); @@ -145,7 +165,7 @@ index cfbcd55..d49dd79 100644 cur_node = xmlDocGetRootElement(doc); if (cur_node) { -@@ -133,6 +138,7 @@ cb_searchdone(SoupSession *session, +@@ -140,6 +145,7 @@ cb_searchdone(SoupSession *session, } gtk_tree_view_column_set_title(dialog->column, _("Results")); @@ -153,7 +173,7 @@ index cfbcd55..d49dd79 100644 } -@@ -376,8 +382,8 @@ get_preferred_units(const gchar *country_code) +@@ -384,8 +390,8 @@ get_preferred_units(const gchar *country_code) static void @@ -164,7 +184,7 @@ index cfbcd55..d49dd79 100644 gpointer user_data) { geolocation_data *data = (geolocation_data *) user_data; -@@ -386,11 +392,14 @@ cb_geolocation(SoupSession *session, +@@ -394,11 +400,14 @@ cb_geolocation(SoupSession *session, units_config *units; const gchar *body = NULL; gsize len = 0; @@ -181,9 +201,9 @@ index cfbcd55..d49dd79 100644 + else + body = g_bytes_get_data(response, &len); - geo = (xml_geolocation *) - parse_xml_document(body, len, (XmlParseFunc) parse_geolocation); -@@ -398,6 +407,7 @@ cb_geolocation(SoupSession *session, + if (global_dialog == NULL) { + weather_debug("%s called after dialog was destroyed", G_STRFUNC); +@@ -411,6 +420,7 @@ cb_geolocation(SoupSession *session, if (!geo) { data->cb(NULL, NULL, NULL, NULL, data->user_data); @@ -191,7 +211,7 @@ index cfbcd55..d49dd79 100644 g_free(data); return; } -@@ -428,6 +438,7 @@ cb_geolocation(SoupSession *session, +@@ -441,6 +451,7 @@ cb_geolocation(SoupSession *session, g_slice_free(units_config, units); xml_geolocation_free(geo); g_free(full_loc); @@ -251,7 +271,7 @@ index a6a2f56..224bb34 100644 diff --git a/panel-plugin/weather.c b/panel-plugin/weather.c -index 3a6a2b6..18fca37 100644 +index b75c633..1a84537 100644 --- a/panel-plugin/weather.c +++ b/panel-plugin/weather.c @@ -23,6 +23,8 @@ @@ -280,7 +300,7 @@ index 3a6a2b6..18fca37 100644 } -@@ -486,8 +489,8 @@ calc_next_download_time(const update_info *upi, +@@ -481,8 +484,8 @@ calc_next_download_time(const update_info *upi, * Process downloaded sun astro data and schedule next astro update. */ static void @@ -291,7 +311,7 @@ index 3a6a2b6..18fca37 100644 gpointer user_data) { plugin_data *data = user_data; -@@ -496,14 +499,17 @@ cb_astro_update_sun(SoupSession *session, +@@ -491,14 +494,17 @@ cb_astro_update_sun(SoupSession *session, guint astro_forecast_days; const gchar *body = NULL; gsize len = 0; @@ -315,7 +335,7 @@ index 3a6a2b6..18fca37 100644 json_tree = get_json_tree(body, len); if (G_LIKELY(json_tree)) { if (!parse_astrodata_sun(json_tree, data->astrodata)) { -@@ -519,10 +525,12 @@ cb_astro_update_sun(SoupSession *session, +@@ -514,10 +520,12 @@ cb_astro_update_sun(SoupSession *session, g_warning("Error parsing sun astronomical data!"); weather_debug("No json_tree"); } @@ -330,7 +350,7 @@ index 3a6a2b6..18fca37 100644 } astro_forecast_days = data->forecast_days + 1; -@@ -548,8 +556,8 @@ cb_astro_update_sun(SoupSession *session, +@@ -543,8 +551,8 @@ cb_astro_update_sun(SoupSession *session, * Process downloaded moon astro data and schedule next astro update. */ static void @@ -341,7 +361,7 @@ index 3a6a2b6..18fca37 100644 gpointer user_data) { plugin_data *data = user_data; -@@ -558,14 +566,17 @@ cb_astro_update_moon(SoupSession *session, +@@ -553,14 +561,17 @@ cb_astro_update_moon(SoupSession *session, guint astro_forecast_days; const gchar *body = NULL; gsize len = 0; @@ -365,7 +385,7 @@ index 3a6a2b6..18fca37 100644 json_tree = get_json_tree(body, len); if (G_LIKELY(json_tree)) { if (!parse_astrodata_moon(json_tree, data->astrodata)) { -@@ -581,10 +592,12 @@ cb_astro_update_moon(SoupSession *session, +@@ -576,10 +587,12 @@ cb_astro_update_moon(SoupSession *session, g_warning("Error parsing moon astronomical data"); weather_debug("No json_tree"); } @@ -380,7 +400,7 @@ index 3a6a2b6..18fca37 100644 } astro_forecast_days = data->forecast_days + 1; -@@ -618,8 +631,8 @@ cb_astro_update_moon(SoupSession *session, +@@ -613,8 +626,8 @@ cb_astro_update_moon(SoupSession *session, * Process downloaded weather data and schedule next weather update. */ static void @@ -391,7 +411,7 @@ index 3a6a2b6..18fca37 100644 gpointer user_data) { plugin_data *data = user_data; -@@ -629,16 +642,19 @@ cb_weather_update(SoupSession *session, +@@ -624,16 +637,19 @@ cb_weather_update(SoupSession *session, gboolean parsing_error = TRUE; const gchar *body = NULL; gsize len = 0; @@ -417,7 +437,7 @@ index 3a6a2b6..18fca37 100644 doc = get_xml_document(body, len); if (G_LIKELY(doc)) { root_node = xmlDocGetRootElement(doc); -@@ -650,12 +666,13 @@ cb_weather_update(SoupSession *session, +@@ -645,12 +661,13 @@ cb_weather_update(SoupSession *session, } xmlFreeDoc(doc); } @@ -435,7 +455,7 @@ index 3a6a2b6..18fca37 100644 data->weather_update->next = calc_next_download_time(data->weather_update, now_t); -@@ -1713,32 +1730,6 @@ mi_click(GtkWidget *widget, +@@ -1708,32 +1725,6 @@ mi_click(GtkWidget *widget, update_weatherdata_with_reset(data); } @@ -468,7 +488,7 @@ index 3a6a2b6..18fca37 100644 #ifdef HAVE_UPOWER_GLIB static void -@@ -2038,9 +2029,10 @@ static plugin_data * +@@ -2037,9 +2028,10 @@ static plugin_data * xfceweather_create_control(XfcePanelPlugin *plugin) { plugin_data *data = g_slice_new0(plugin_data); @@ -481,7 +501,7 @@ index 3a6a2b6..18fca37 100644 GtkWidget *refresh; cairo_surface_t *icon = NULL; data_types lbl; -@@ -2078,29 +2070,26 @@ xfceweather_create_control(XfcePanelPlugin *plugin) +@@ -2077,29 +2069,26 @@ xfceweather_create_control(XfcePanelPlugin *plugin) /* Setup session for HTTP connections */ data->session = soup_session_new(); @@ -538,3 +558,6 @@ index 208de09..01974ce 100644 gpointer user_data); void scrollbox_set_visible(plugin_data *data); +-- +2.47.1.613.gc27f4b7a9fc45 + diff --git a/srcpkgs/xfce4-weather-plugin/template b/srcpkgs/xfce4-weather-plugin/template index 40bb3ff92c0b72..dfa939a83ec5ae 100644 --- a/srcpkgs/xfce4-weather-plugin/template +++ b/srcpkgs/xfce4-weather-plugin/template @@ -1,10 +1,9 @@ # Template file for 'xfce4-weather-plugin' pkgname=xfce4-weather-plugin -version=0.11.2 +version=0.11.3 revision=1 build_style=gnu-configure -configure_args="--with-locales-dir=/usr/share/locale" -hostmakedepends="pkg-config intltool xfce4-dev-tools gettext-devel" +hostmakedepends="pkg-config gettext xfce4-dev-tools automake libtool" makedepends="libxfce4ui-devel xfce4-panel-devel libxml2-devel libsoup3-devel json-c-devel upower-devel" depends="hicolor-icon-theme" @@ -13,9 +12,9 @@ maintainer="Orphaned " 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" -checksum=65d40aff7863550858a9f9d2b6054f27c69a3e7e712991785987f9a73bba876b +checksum=002d1fe63906d2f3a012f3cb58cceff1dfbcc466759e36c76d3b03dd01c0dc57 lib32disabled=yes pre_configure() { - autoreconf -fi + autoreconf -f } From 44399b0f990b88a8ead2a2fc26ac83fb8c31ceed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 07:22:19 +0700 Subject: [PATCH 22/25] xfce4: update to 4.20. --- srcpkgs/xfce4/template | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/srcpkgs/xfce4/template b/srcpkgs/xfce4/template index 72325ed1e4846e..160b07a644801b 100644 --- a/srcpkgs/xfce4/template +++ b/srcpkgs/xfce4/template @@ -1,6 +1,6 @@ # Template file for 'xfce4' pkgname=xfce4 -version=4.18.0 +version=4.20 revision=1 build_style=meta depends=" @@ -13,16 +13,16 @@ depends=" xfwm4>=${version} xfwm4-themes>=4.10.0 xfce4-power-manager>=${version} - xfce4-terminal>=0.8.10 - xfce4-taskmanager>=1.2.3 + xfce4-terminal>=1.1.3 + xfce4-taskmanager>=1.5.7 Thunar>=${version} thunar-volman>=${version} exo>=${version} parole>=4.18.0 - ristretto>=0.10.0 - mousepad>=0.5.1 - xfce4-notifyd>=0.6.2 - xfce4-screensaver>=0.1.11 + ristretto>=0.13.2 + mousepad>=0.6.3 + xfce4-notifyd>=0.9.6 + xfce4-screensaver>=4.18.3 tumbler>=${version} xdg-user-dirs-gtk upower From 42bafedce543e0c84f21afc0f9f561bc3a378f86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 07:22:20 +0700 Subject: [PATCH 23/25] xfconf: update to 4.20.0. --- srcpkgs/xfconf/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xfconf/template b/srcpkgs/xfconf/template index 887265f808ff77..7d44067339d6d7 100644 --- a/srcpkgs/xfconf/template +++ b/srcpkgs/xfconf/template @@ -1,11 +1,11 @@ # Template file for 'xfconf' pkgname=xfconf -version=4.18.3 +version=4.20.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 perl" +configure_args="--enable-gsettings-backend" +hostmakedepends="pkg-config gettext 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 " 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=c56cc69056f6947b2c60b165ec1e4c2b0acf26a778da5f86c89ffce24d5ebd98 +checksum=8bc43c60f1716b13cf35fc899e2a36ea9c6cdc3478a8f051220eef0f53567efd build_options="gir" build_options_default="gir" From a45b4db849ed03cb8ac148bc0f40ca1600a5d0dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 07:22:20 +0700 Subject: [PATCH 24/25] xfdesktop: update to 4.20.0. --- srcpkgs/xfdesktop/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template index 45e508c6db88ad..c01a45b60b86a1 100644 --- a/srcpkgs/xfdesktop/template +++ b/srcpkgs/xfdesktop/template @@ -1,11 +1,11 @@ # Template file for 'xfdesktop' pkgname=xfdesktop -version=4.18.1 +version=4.20.0 revision=1 -build_style=gnu-configure -configure_args="--with-locales-dir=/usr/share/locale" -hostmakedepends="pkg-config intltool glib-devel Thunar-devel" +build_style=meson +hostmakedepends="pkg-config gettext glib-devel Thunar-devel" makedepends="libxfce4ui-devel exo-devel garcon-devel + gtk-layer-shell-devel libyaml-devel libxfce4windowing-devel libnotify-devel libwnck-devel" depends="hicolor-icon-theme desktop-file-utils" short_desc="Desktop manager for the Xfce Desktop Environment" @@ -13,4 +13,4 @@ maintainer="Đoàn Trần Công Danh " license="GPL-2.0-or-later" homepage="https://xfce.org/" distfiles="https://archive.xfce.org/src/xfce/xfdesktop/${version%.*}/$pkgname-$version.tar.bz2" -checksum=ef9268190c25877e22a9ff5aa31cc8ede120239cb0dfca080c174e7eed4ff756 +checksum=227041ba80c7f3eb9c99dec817f1132b35d8aec7a4335703f61ba1735cd65632 From 49da7f67a47591ea6c3b28162652a75a05ab950c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 16 Dec 2024 07:22:21 +0700 Subject: [PATCH 25/25] xfwm4: update to 4.20.0. --- srcpkgs/xfwm4/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/xfwm4/template b/srcpkgs/xfwm4/template index e9c1a032713b28..8ac59d49743f46 100644 --- a/srcpkgs/xfwm4/template +++ b/srcpkgs/xfwm4/template @@ -1,10 +1,9 @@ # Template file for 'xfwm4' pkgname=xfwm4 -version=4.18.0 +version=4.20.0 revision=1 build_style=gnu-configure -configure_args="--with-locales-dir=/usr/share/locale" -hostmakedepends="pkg-config intltool" +hostmakedepends="pkg-config gettext" makedepends="libxfce4ui-devel startup-notification-devel libXcomposite-devel libXdamage-devel libXfixes-devel libXrandr-devel libXrender-devel libXpresent-devel libwnck-devel" @@ -14,7 +13,7 @@ maintainer="Đoàn Trần Công Danh " license="GPL-2.0-or-later" homepage="https://xfce.org/" distfiles="https://archive.xfce.org/src/xfce/xfwm4/${version%.*}/xfwm4-${version}.tar.bz2" -checksum=92cd1b889bb25cb4bc06c1c6736c238d96e79c1e706b9f77fad0a89d6e5fc13f +checksum=a58b63e49397aa0d8d1dcf0636be93c8bb5926779aef5165e0852890190dcf06 post_patch() { # compositor may be buggy on old and big endian hardware