From ac5fac4df9c42be3f5287bf15323b812e8cb7296 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Tue, 2 Aug 2022 22:59:46 +0200 Subject: [PATCH 1/2] libxfce4ui: generate vala bindings --- srcpkgs/libxfce4ui/patches/vapi-deps.patch | 8 ++++++++ srcpkgs/libxfce4ui/template | 17 +++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/libxfce4ui/patches/vapi-deps.patch diff --git a/srcpkgs/libxfce4ui/patches/vapi-deps.patch b/srcpkgs/libxfce4ui/patches/vapi-deps.patch new file mode 100644 index 000000000000..8be850abcec2 --- /dev/null +++ b/srcpkgs/libxfce4ui/patches/vapi-deps.patch @@ -0,0 +1,8 @@ +--- a/libxfce4ui/libxfce4ui-2.deps ++++ b/libxfce4ui/libxfce4ui-2.deps +@@ -1,4 +1,4 @@ +-libxfce4util-1.0 ++Libxfce4util-1.0 + atk + gio-2.0 + cairo diff --git a/srcpkgs/libxfce4ui/template b/srcpkgs/libxfce4ui/template index 9b1ca8318171..d1aa37960a6e 100644 --- a/srcpkgs/libxfce4ui/template +++ b/srcpkgs/libxfce4ui/template @@ -1,13 +1,15 @@ # Template file for 'libxfce4ui' pkgname=libxfce4ui version=4.16.1 -revision=1 +revision=2 build_style=gnu-configure build_helper="gir" -configure_args="--with-locales-dir=/usr/share/locale --disable-static" +configure_args="--with-locales-dir=/usr/share/locale --disable-static + $(vopt_enable gir introspection) $(vopt_enable vala 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" -makedepends="gtk+-devel gtk+3-devel glade3-devel libxfce4util-devel xfconf-devel +hostmakedepends="xfce4-dev-tools pkg-config intltool glib-devel gettext-devel + $(vopt_if vala 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" maintainer="Orphaned " @@ -17,8 +19,8 @@ distfiles="https://archive.xfce.org/src/xfce/${pkgname}/${version%.*}/${pkgname} checksum=d96946ae5af6bf078dda415419e0021909f763ee0020b42f3e26f603e51585f6 # Package build options -build_options="gir" -build_options_default="gir" +build_options="gir vala" +build_options_default="gir vala" libxfce4ui-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" @@ -31,6 +33,9 @@ libxfce4ui-devel_package() { if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 fi + if [ "$build_option_vala" ]; then + vmove usr/share/vala + fi } } From 6cb6bb62825414d38344ab26a01c6b0878f0512d Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Wed, 3 Aug 2022 12:17:34 +0200 Subject: [PATCH 2/2] xfce4-panel: fix vala dep name --- srcpkgs/xfce4-panel/patches/valadeps.patch | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 srcpkgs/xfce4-panel/patches/valadeps.patch diff --git a/srcpkgs/xfce4-panel/patches/valadeps.patch b/srcpkgs/xfce4-panel/patches/valadeps.patch new file mode 100644 index 000000000000..305a374581d2 --- /dev/null +++ b/srcpkgs/xfce4-panel/patches/valadeps.patch @@ -0,0 +1,8 @@ +--- a/libxfce4panel/libxfce4panel-2.0.deps ++++ b/libxfce4panel/libxfce4panel-2.0.deps +@@ -5,4 +5,4 @@ + gdk-pixbuf-2.0 + gdk-3.0 + gtk+-3.0 +-libxfce4util-1.0 ++Libxfce4util-1.0