xapps: update to 3.2.1, rename to xapp

common/shlibs

@@ -2973,7 +2973,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

srcpkgs/cinnamon-screensaver/template

@@ -9,7 +9,7 @@ makedepends="cinnamon-desktop-devel dbus-glib-devel
  xdotool-devel gtk+3-devel libglib-devel dbus-devel libXinerama-devel
  libgnomekbd-devel pam-devel python3-devel"
 depends="cinnamon-translations hicolor-icon-theme python3-gobject
- python3-setproctitle python3-xapp xapps"
+ python3-setproctitle python3-xapp xapp"
 conf_files="/etc/pam.d/${pkgname}"
 short_desc="Cinnamon screensaver"
 maintainer="Orphaned <orphan@voidlinux.org>"

srcpkgs/cinnamon-session/template

@@ -7,7 +7,7 @@ build_helper="gir"
 hostmakedepends="pkg-config gettext dbus-glib-devel glib-devel xmlto"
 makedepends="gtk+3-devel dbus-devel json-glib-devel libSM-devel
  cinnamon-desktop-devel libcanberra-devel upower-devel
- elogind-devel libXtst-devel xapps-devel"
+ elogind-devel libXtst-devel xapp-devel"
 depends="cinnamon-desktop desktop-file-utils hicolor-icon-theme elogind"
 short_desc="Cinnamon session handler"
 maintainer="Orphaned <orphan@voidlinux.org>"

srcpkgs/cinnamon/template

@@ -8,7 +8,7 @@ hostmakedepends="pkg-config gettext glib-devel xmlto perl cjs
  gtk-doc python3-libsass"
 makedepends="cjs-devel clutter-gtk-devel cinnamon-menus-devel gstreamer1-devel
  muffin-devel libgnomekbd-devel polkit-devel libcanberra-devel gtk+3-devel
- startup-notification-devel pulseaudio-devel dbus-glib-devel xapps-devel
+ startup-notification-devel pulseaudio-devel dbus-glib-devel xapp-devel
  NetworkManager-devel libcroco-devel cinnamon-desktop-devel librsvg-devel
  gcr-devel"
 depends="accountsservice libcaribou cinnamon-settings-daemon>=${version%.*}

srcpkgs/lightdm-slick-greeter/template

@@ -5,7 +5,7 @@ revision=1
 build_style=meson
 hostmakedepends="pkg-config gettext vala"
 makedepends="gtk+3-devel lightdm-devel libcanberra-devel ayatana-ido-devel
- xapps-devel"
+ xapp-devel"
 depends="hicolor-icon-theme"
 conf_files="/etc/lightdm/slick-greeter.conf"
 short_desc="Light Display Manager GTK+ Greeter from Linux Mint"

srcpkgs/nemo-extensions/template

@@ -31,6 +31,6 @@ cinnamon-all_package() {
 	 muffin>=${version%.*}
 	 nemo>=${version%.*}
 	 nemo-extensions>=${version}
-	 xreader xapps touchegg
+	 xreader xapp touchegg
 	 "
 }

srcpkgs/nemo-terminal/template

@@ -6,7 +6,7 @@ build_wrksrc=nemo-terminal
 build_style=python3-module
 hostmakedepends="pkg-config python3-setuptools"
 makedepends="nemo-devel libglib-devel"
-depends="nemo-python vte3 glib gtk+3 xapps"
+depends="nemo-python vte3 glib gtk+3 xapp"
 short_desc="Nemo terminal extension"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"

srcpkgs/nemo/template

@@ -7,7 +7,7 @@ build_helper=gir
 pycompile_dirs="/usr/share/nemo/actions/myaction.py"
 hostmakedepends="gettext glib-devel pkg-config"
 makedepends="cinnamon-desktop-devel dconf-devel exempi-devel
- libexif-devel libnotify-devel xapps-devel libgsf-devel gtk+3-devel
+ libexif-devel libnotify-devel xapp-devel libgsf-devel gtk+3-devel
  libxml2-devel"
 depends="cinnamon-translations dconf gvfs"
 short_desc="Cinnamon file manager (nautilus fork)"

srcpkgs/python3-xapp/template

@@ -4,7 +4,7 @@ version=2.4.2
 revision=2
 build_style=meson
 hostmakedepends="python3 python3-packaging-bootstrap"
-depends="python3 python3-psutil xapps"
+depends="python3 python3-psutil xapp"
 short_desc="Python3 Xapp Library"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="LGPL-2.1-or-later"

srcpkgs/xapp-devel

@@ -0,0 +1 @@
+xapp

srcpkgs/xapps/template → 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 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="Michael Aldridge <maldridge@voidlinux.org>"
 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,17 @@ xapps-devel_package() {
 		vmove usr/share/vala
 	}
 }
+
+xapps_package() {
+	depends="xapp>=${version}_${revision}"
+	metapackage=yes
+	short_desc+=" (transitional dummy package)"
+
+
+}
+
+xapps-devel_package() {
+	depends="xapp-devel>=${version}_${revision}"
+	metapackage=yes
+	short_desc+=" (transitional dummy package)"
+}

srcpkgs/xapps

@@ -0,0 +1 @@
+xapp

srcpkgs/xapps-devel

@@ -1 +1 @@
-xapps
+xapp