diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-10-17 11:41:00 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-10-17 12:57:32 +0000 |
| commit | 233e61d0881c08da221342a8fc000e9f63eda834 (patch) | |
| tree | 0eaa9e9f68e2a563f2dbb2fbb28728af1538f665 | |
| parent | 4076ab5853ca7dca9a1f1ea70601f83c881a2a4a (diff) | |
| download | aports-233e61d0881c08da221342a8fc000e9f63eda834.tar.bz2 aports-233e61d0881c08da221342a8fc000e9f63eda834.tar.xz | |
community/libxfce4util: fix vala api
reported upstream: https://bugzilla.xfce.org/show_bug.cgi?id=14766
| -rw-r--r-- | community/libxfce4util/APKBUILD | 8 | ||||
| -rw-r--r-- | community/libxfce4util/vala.patch | 58 |
2 files changed, 63 insertions, 3 deletions
diff --git a/community/libxfce4util/APKBUILD b/community/libxfce4util/APKBUILD index 95fda1dbec..0d7d3d94a6 100644 --- a/community/libxfce4util/APKBUILD +++ b/community/libxfce4util/APKBUILD @@ -1,14 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxfce4util pkgver=4.13.2 -pkgrel=2 +pkgrel=3 pkgdesc="Basic utility non-GUI functions for Xfce" url="https://xfce.org/" arch="all" license="GPL-2.0-only" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" makedepends="glib-dev gtk-doc intltool gobject-introspection-dev vala" -source="https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2" +source="https://archive.xfce.org/src/xfce/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2 + vala.patch" build() { cd "$builddir" @@ -36,4 +37,5 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="3bbb718f3a6d2213c86695b3f99d1e67c859ce635e5d066b18745d2ee57c0b2eea468b61079d8e2514c2d8f5fa847539d236ec0ed3fd17fecd9d1b36dc3595c4 libxfce4util-4.13.2.tar.bz2" +sha512sums="3bbb718f3a6d2213c86695b3f99d1e67c859ce635e5d066b18745d2ee57c0b2eea468b61079d8e2514c2d8f5fa847539d236ec0ed3fd17fecd9d1b36dc3595c4 libxfce4util-4.13.2.tar.bz2 +79a28105e997ce51beed8f84a8c39d2bb199dc346408958d3776ea14d3df00c3343e0d3d66051ef5ff15821daaef5409829d948feed437d8f0ffc4630870dfdb vala.patch" diff --git a/community/libxfce4util/vala.patch b/community/libxfce4util/vala.patch new file mode 100644 index 0000000000..700b1052ca --- /dev/null +++ b/community/libxfce4util/vala.patch @@ -0,0 +1,58 @@ +From bd9b419cafa3e9f854a27efb94090c0c69c2ab52 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue, 16 Oct 2018 19:31:15 +0200 +Subject: [PATCH] Fix vala binding + +Fix the XfceRc vala binding by adding custom vala code. +--- + libxfce4util/Makefile.am | 2 +- + libxfce4util/libxfce4util-1.0-custom.vala | 11 +++++++++++ + 2 files changed, 12 insertions(+), 1 deletion(-) + create mode 100644 libxfce4util/libxfce4util-1.0-custom.vala + +diff --git a/libxfce4util/Makefile.am b/libxfce4util/Makefile.am +index e7dff26..2b317e6 100644 +--- a/libxfce4util/Makefile.am ++++ b/libxfce4util/Makefile.am +@@ -164,7 +164,7 @@ VAPIGEN_GIRDIRS = $(prefix)/share/gir-1.0 + + ## libxfce4util_1_0_vapi_DEPS = libxfce4util-1.0 + libxfce4util_1_0_vapi_METADATADIRS = $(srcdir) +-libxfce4util_1_0_vapi_FILES = libxfce4util-1.0.gir ++libxfce4util_1_0_vapi_FILES = libxfce4util-1.0.gir libxfce4util-1.0-custom.vala + + vapidir = $(datadir)/vala/vapi + vapi_DATA = $(VAPIGEN_VAPIS) +diff --git a/libxfce4util/libxfce4util-1.0-custom.vala b/libxfce4util/libxfce4util-1.0-custom.vala +new file mode 100644 +index 0000000..9ef6bea +--- /dev/null ++++ b/libxfce4util/libxfce4util-1.0-custom.vala +@@ -0,0 +1,11 @@ ++namespace Xfce { ++ ++ [Compact] ++ [CCode (cheader_filename = "libxfce4util/libxfce4util.h", free_function = "xfce_rc_close")] ++ public class Rc { ++ [CCode (has_construct_function = false, cname = "xfce_rc_simple_open")] ++ public Rc (string filename, bool readonly); ++ [CCode (has_construct_function = false, cname = "xfce_rc_config_open")] ++ public Rc.from_resource (Xfce.ResourceType type, string resource, bool readonly); ++ } ++} +-- +2.19.1 + +diff --git a/libxfce4util/Makefile.in b/libxfce4util/Makefile.in +index d22907e..c329aa3 100644 +--- a/libxfce4util/Makefile.in ++++ b/libxfce4util/Makefile.in +@@ -707,7 +707,7 @@ EXTRA_DIST = abicheck.sh libxfce4util.symbols libxfce4util-alias.h \ + @ENABLE_VAPIGEN_TRUE@VAPIGEN_VAPIS = libxfce4util-1.0.vapi + @ENABLE_VAPIGEN_TRUE@VAPIGEN_GIRDIRS = $(prefix)/share/gir-1.0 + @ENABLE_VAPIGEN_TRUE@libxfce4util_1_0_vapi_METADATADIRS = $(srcdir) +-@ENABLE_VAPIGEN_TRUE@libxfce4util_1_0_vapi_FILES = libxfce4util-1.0.gir ++@ENABLE_VAPIGEN_TRUE@libxfce4util_1_0_vapi_FILES = libxfce4util-1.0.gir libxfce4util-1.0-custom.vala + @ENABLE_VAPIGEN_TRUE@vapidir = $(datadir)/vala/vapi + @ENABLE_VAPIGEN_TRUE@vapi_DATA = $(VAPIGEN_VAPIS) + @HAVE_GNUC_VISIBILITY_TRUE@TESTS = abicheck.sh |