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 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 53% rename from srcpkgs/xapps/template rename to srcpkgs/xapp/template index 91c08dfae42405..c82a5812f2e0d7 100644 --- a/srcpkgs/xapps/template +++ b/srcpkgs/xapp/template @@ -1,13 +1,11 @@ -# 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 " @@ -15,9 +13,10 @@ 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)" +} 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 index 993477a504c4b9..a508f1cffedbf4 120000 --- a/srcpkgs/xapps-devel +++ b/srcpkgs/xapps-devel @@ -1 +1 @@ -xapps \ No newline at end of file +xapp-devel \ No newline at end of file