From 0d034eb51b21ddcf60d0b9e2a48e35f08c68d034 Mon Sep 17 00:00:00 2001 From: AntoFox Date: Fri, 30 Jan 2026 12:55:27 +0100 Subject: [PATCH 1/6] xapp: rename from xapps, update to 3.2.1. --- srcpkgs/xapp-devel | 1 + srcpkgs/{xapps => xapp}/template | 23 ++++++++++++----------- srcpkgs/xapps-devel | 1 - 3 files changed, 13 insertions(+), 12 deletions(-) create mode 120000 srcpkgs/xapp-devel rename srcpkgs/{xapps => xapp}/template (59%) delete mode 120000 srcpkgs/xapps-devel diff --git a/srcpkgs/xapp-devel b/srcpkgs/xapp-devel new file mode 120000 index 00000000000000..97ab80ac323228 --- /dev/null +++ b/srcpkgs/xapp-devel @@ -0,0 +1 @@ +xapp \ No newline at end of file diff --git a/srcpkgs/xapps/template b/srcpkgs/xapp/template similarity index 59% rename from srcpkgs/xapps/template rename to srcpkgs/xapp/template index 91c08dfae42405..babc2d1acdeed7 100644 --- a/srcpkgs/xapps/template +++ b/srcpkgs/xapp/template @@ -1,23 +1,22 @@ -# Template file for 'xapps' -pkgname=xapps -version=2.8.8 -revision=2 +# Template file for 'xapp' +pkgname=xapp +version=3.2.1 +revision=1 build_style=meson build_helper="gir" -hostmakedepends="glib-devel pkg-config vala python3 gettext" -makedepends="gettext-devel libgnomekbd-devel python3-gobject-devel - libdbusmenu-gtk3-devel libxkbfile-devel cairo-devel gtk+3-devel libglib-devel - gdk-pixbuf-devel libX11-devel libgnomekbd-devel" +hostmakedepends="pkg-config meson ninja gettext libdbusmenu-gtk3 libdbusmenu-gtk3-devel gtk-update-icon-cache" +makedepends="glib-devel dbus-devel gtk+3-devel gdk-pixbuf-devel cairo-devel libX11-devel libgnomekbd-devel python3-gobject-devel" depends="inxi xfconf" short_desc="Cross-desktop libraries and common resources from Linux Mint" -maintainer="Michael Aldridge " +maintainer="Antonio Volpicelli AntoFox " license="GPL-3.0-or-later, LGPL-3.0-or-later" homepage="https://github.com/linuxmint/xapp" changelog="https://raw.githubusercontent.com/linuxmint/xapp/master/debian/changelog" distfiles="https://github.com/linuxmint/xapp/archive/${version}.tar.gz" -checksum=343cc336dc0fba86f4b27a46125600c2173c6d7ea0bf7df28cf941c42b55a45d +checksum=213b6790e00b90f63f90cf6ce189efb5948a23b67330e3aa81fadb4ef822a6ef +replaces="xapps>=0" -xapps-devel_package() { +xapp-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision} gtk+3-devel libglib-devel cairo-devel libX11-devel libgnomekbd-devel @@ -30,3 +29,5 @@ xapps-devel_package() { vmove usr/share/vala } } + + diff --git a/srcpkgs/xapps-devel b/srcpkgs/xapps-devel deleted file mode 120000 index 993477a504c4b9..00000000000000 --- a/srcpkgs/xapps-devel +++ /dev/null @@ -1 +0,0 @@ -xapps \ No newline at end of file From 954003f66e9c731b5c75ea05a955f8047fb3e2c2 Mon Sep 17 00:00:00 2001 From: AntoFox Date: Mon, 2 Feb 2026 14:47:54 +0100 Subject: [PATCH 2/6] xapps: rename to xapp and add transitional package --- srcpkgs/xapps-devel | 1 + srcpkgs/xapps/template | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 120000 srcpkgs/xapps-devel create mode 100644 srcpkgs/xapps/template diff --git a/srcpkgs/xapps-devel b/srcpkgs/xapps-devel new file mode 120000 index 00000000000000..993477a504c4b9 --- /dev/null +++ b/srcpkgs/xapps-devel @@ -0,0 +1 @@ +xapps \ No newline at end of file diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template new file mode 100644 index 00000000000000..0c24651b23bc4a --- /dev/null +++ b/srcpkgs/xapps/template @@ -0,0 +1,10 @@ +# Template file for 'xapps' +pkgname=xapps +version=2.8.3 # usa la stessa versione del pacchetto xapp +revision=1 +build_style=meta +short_desc="Transitional package for xapp" +maintainer="" +license="GPL-3.0-or-later" # stessa licenza di xapp +homepage="https://github.com/linuxmint/xapp" +depends="xapp>=${version}_${revision}" From dd624b87a8bee13d4061d3636a9f4246cc27ca3e Mon Sep 17 00:00:00 2001 From: AntoFox Date: Mon, 2 Feb 2026 20:45:45 +0100 Subject: [PATCH 3/6] xapp: move transitional packages to subpackages --- srcpkgs/xapp/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/srcpkgs/xapp/template b/srcpkgs/xapp/template index babc2d1acdeed7..28957540c0c8c8 100644 --- a/srcpkgs/xapp/template +++ b/srcpkgs/xapp/template @@ -31,3 +31,16 @@ xapp-devel_package() { } +# Transitional package xapps-devel +xapps_package() { + build_style=meta + depends="xapp>=${version}_${revision}" + short_desc="Transitional package for xapp" +} + +# Transitional package xapps-devel +xapps-devel_package() { + build_style=meta + depends="xapp-devel>=${version}_${revision}" + short_desc="Transitional package for xapp-devel" +} From b4c468402a81e4d877aca7304a50c450399a6590 Mon Sep 17 00:00:00 2001 From: AntoFox Date: Mon, 2 Feb 2026 20:52:40 +0100 Subject: [PATCH 4/6] update template --- srcpkgs/xapp/template | 17 +++++++++-------- srcpkgs/xapps-devel | 1 - srcpkgs/xapps/template | 10 ---------- 3 files changed, 9 insertions(+), 19 deletions(-) delete mode 120000 srcpkgs/xapps-devel delete mode 100644 srcpkgs/xapps/template diff --git a/srcpkgs/xapp/template b/srcpkgs/xapp/template index 28957540c0c8c8..983e0b44d8805e 100644 --- a/srcpkgs/xapp/template +++ b/srcpkgs/xapp/template @@ -31,16 +31,17 @@ xapp-devel_package() { } -# Transitional package xapps-devel xapps_package() { - build_style=meta - depends="xapp>=${version}_${revision}" - short_desc="Transitional package for xapp" + depends="xapp>=${version}_${revision}" + metapackage=yes + short_desc+=" (transitional dummy package)" + + } -# Transitional package xapps-devel + xapps-devel_package() { - build_style=meta - depends="xapp-devel>=${version}_${revision}" - short_desc="Transitional package for xapp-devel" + depends="xapp-devel>=${version}_${revision}" + metapackage=yes + short_desc+=" (transitional dummy package)" } diff --git a/srcpkgs/xapps-devel b/srcpkgs/xapps-devel deleted file mode 120000 index 993477a504c4b9..00000000000000 --- a/srcpkgs/xapps-devel +++ /dev/null @@ -1 +0,0 @@ -xapps \ No newline at end of file diff --git a/srcpkgs/xapps/template b/srcpkgs/xapps/template deleted file mode 100644 index 0c24651b23bc4a..00000000000000 --- a/srcpkgs/xapps/template +++ /dev/null @@ -1,10 +0,0 @@ -# Template file for 'xapps' -pkgname=xapps -version=2.8.3 # usa la stessa versione del pacchetto xapp -revision=1 -build_style=meta -short_desc="Transitional package for xapp" -maintainer="" -license="GPL-3.0-or-later" # stessa licenza di xapp -homepage="https://github.com/linuxmint/xapp" -depends="xapp>=${version}_${revision}" From 9fa656eaef0bff1721bc987cde78ca8311544779 Mon Sep 17 00:00:00 2001 From: AntoFox Date: Fri, 6 Feb 2026 13:38:54 +0000 Subject: [PATCH 5/6] fix tab --- srcpkgs/xapp/template | 12 +++++------- srcpkgs/xapps | 1 + srcpkgs/xapps-devel | 1 + 3 files changed, 7 insertions(+), 7 deletions(-) create mode 120000 srcpkgs/xapps create mode 120000 srcpkgs/xapps-devel diff --git a/srcpkgs/xapp/template b/srcpkgs/xapp/template index 983e0b44d8805e..c82a5812f2e0d7 100644 --- a/srcpkgs/xapp/template +++ b/srcpkgs/xapp/template @@ -4,11 +4,11 @@ version=3.2.1 revision=1 build_style=meson build_helper="gir" -hostmakedepends="pkg-config meson ninja gettext libdbusmenu-gtk3 libdbusmenu-gtk3-devel gtk-update-icon-cache" +hostmakedepends="pkg-config meson ninja gettext libdbusmenu-gtk3 libdbusmenu-gtk3-devel gtk-update-icon-cache gobject-introspection" makedepends="glib-devel dbus-devel gtk+3-devel gdk-pixbuf-devel cairo-devel libX11-devel libgnomekbd-devel python3-gobject-devel" depends="inxi xfconf" short_desc="Cross-desktop libraries and common resources from Linux Mint" -maintainer="Antonio Volpicelli AntoFox " +maintainer="Michael Aldridge " license="GPL-3.0-or-later, LGPL-3.0-or-later" homepage="https://github.com/linuxmint/xapp" changelog="https://raw.githubusercontent.com/linuxmint/xapp/master/debian/changelog" @@ -30,7 +30,6 @@ xapp-devel_package() { } } - xapps_package() { depends="xapp>=${version}_${revision}" metapackage=yes @@ -39,9 +38,8 @@ xapps_package() { } - xapps-devel_package() { - depends="xapp-devel>=${version}_${revision}" - metapackage=yes - short_desc+=" (transitional dummy package)" + depends="xapp-devel>=${version}_${revision}" + metapackage=yes + short_desc+=" (transitional dummy package)" } diff --git a/srcpkgs/xapps b/srcpkgs/xapps new file mode 120000 index 00000000000000..97ab80ac323228 --- /dev/null +++ b/srcpkgs/xapps @@ -0,0 +1 @@ +xapp \ No newline at end of file diff --git a/srcpkgs/xapps-devel b/srcpkgs/xapps-devel new file mode 120000 index 00000000000000..a508f1cffedbf4 --- /dev/null +++ b/srcpkgs/xapps-devel @@ -0,0 +1 @@ +xapp-devel \ No newline at end of file From 6ca67706cf0d99adff480a2854ff9959705debb5 Mon Sep 17 00:00:00 2001 From: AntoFox Date: Sat, 14 Feb 2026 14:25:58 +0100 Subject: [PATCH 6/6] Update libxapp version to 3.2.1 --- common/shlibs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/shlibs b/common/shlibs index 32d7b9301cfd59..7b08311fe76528 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2972,7 +2972,7 @@ libpcre2-posix.so.3 libpcre2-10.39_1 libui.so.0 libui-alpha3.1_1 libgnome-autoar-0.so.0 gnome-autoar-0.1.1_1 libgnome-autoar-gtk-0.so.0 gnome-autoar-0.1.1_1 -libxapp.so.1 xapps-1.0.2_1 +libxapp.so.1 xapp-3.2.1_1 libite.so.5 libite-2.0.1_1 liblog4cplus-2.1.so.9 log4cplus-2.1.2_1 liblog4cplusU-2.1.so.9 log4cplus-2.1.2_1