diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2020-12-24 09:01:01 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2020-12-24 12:42:19 +0000 |
| commit | b3985a82f4167d9ccb37a9ea1a240bd835ae4384 (patch) | |
| tree | 9fab6d7ab3b403ed7a8d5fb1561b1d250bdaecfa | |
| parent | fd2352112bc3fe232c124337f33a69c150dbb4a2 (diff) | |
community/libxfce4util: upgrade to 4.16.0
| -rw-r--r-- | community/libxfce4util/APKBUILD | 8 | ||||
| -rw-r--r-- | community/libxfce4util/vala.patch | 58 |
2 files changed, 3 insertions, 63 deletions
diff --git a/community/libxfce4util/APKBUILD b/community/libxfce4util/APKBUILD index 2987f7b4ee6..12516c492a4 100644 --- a/community/libxfce4util/APKBUILD +++ b/community/libxfce4util/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=libxfce4util -pkgver=4.14.0 +pkgver=4.16.0 pkgrel=0 pkgdesc="Basic utility non-GUI functions for Xfce" url="https://xfce.org/" @@ -8,8 +8,7 @@ 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/libxfce4util/${pkgver%.*}/libxfce4util-$pkgver.tar.bz2 - vala.patch" +source="https://archive.xfce.org/src/xfce/libxfce4util/${pkgver%.*}/libxfce4util-$pkgver.tar.bz2" build() { ./configure \ @@ -34,5 +33,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="6ac95aea03052d9e2f886cbe76afe9bbb43511bf3fe1766097e10cd8762541ed17060a727df3ef93e226aae448c15d9dd3ad8acd55a9d5f2387cb360bdf72832 libxfce4util-4.14.0.tar.bz2 -79a28105e997ce51beed8f84a8c39d2bb199dc346408958d3776ea14d3df00c3343e0d3d66051ef5ff15821daaef5409829d948feed437d8f0ffc4630870dfdb vala.patch" +sha512sums="dce6992c3da73367461d7464794a9b2a5503666113682e07a86e18b1c5383de2b087809448d5729097571f4fda6b4af5f4f4600848514ab2ab4b3f367ca26f5c libxfce4util-4.16.0.tar.bz2" diff --git a/community/libxfce4util/vala.patch b/community/libxfce4util/vala.patch deleted file mode 100644 index 700b1052ca5..00000000000 --- a/community/libxfce4util/vala.patch +++ /dev/null @@ -1,58 +0,0 @@ -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 |