aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2020-12-24 09:19:22 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2020-12-24 12:42:20 +0000
commite75ecf272752401243d8af198d187dd309bc4ac8 (patch)
tree6d361e6010aa79a03fa33f977fb84089be73b4da
parent1c57a767f437c4a312643dc5e847a13a6a760ace (diff)
downloadaports-e75ecf272752401243d8af198d187dd309bc4ac8.tar.gz
aports-e75ecf272752401243d8af198d187dd309bc4ac8.tar.bz2
aports-e75ecf272752401243d8af198d187dd309bc4ac8.tar.xz
community/xfce4-panel: upgrade to 4.16.0
-rw-r--r--community/xfce4-panel/APKBUILD15
-rw-r--r--community/xfce4-panel/gir-gio.patch17
2 files changed, 7 insertions, 25 deletions
diff --git a/community/xfce4-panel/APKBUILD b/community/xfce4-panel/APKBUILD
index c51283c766..fa2740dd3c 100644
--- a/community/xfce4-panel/APKBUILD
+++ b/community/xfce4-panel/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=xfce4-panel
-pkgver=4.14.4
-pkgrel=1
+pkgver=4.16.0
+pkgrel=0
pkgdesc="Panel for the Xfce desktop environment"
url="https://xfce.org/"
arch="all"
@@ -9,11 +9,10 @@ license="GPL-2.0-or-later AND LGPL-2.1-or-later"
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
depends="hicolor-icon-theme"
depends_dev="xfconf-dev"
-# NOTE: vala has been disabled due to FTBFS with vala 0.48
makedepends="$depends_dev libxfce4ui-dev exo-dev garcon-dev libwnck3-dev
- gobject-introspection-dev gtk+2.0-dev gtk+3.0-dev libxfce4util-dev"
+ gobject-introspection-dev gtk+2.0-dev gtk+3.0-dev libxfce4util-dev
+ vala"
source="https://archive.xfce.org/src/xfce/xfce4-panel/${pkgver%.*}/xfce4-panel-$pkgver.tar.bz2
- gir-gio.patch
"
build() {
@@ -25,7 +24,8 @@ build() {
--libexecdir=/usr/lib \
--localstatedir=/var \
--disable-static \
- --enable-introspection
+ --enable-introspection \
+ --enable-vala
make
}
@@ -37,5 +37,4 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="5ae7c7acf0254fdc3f5eaccf75d7c12699ab8147322f231af7bd17b1238b8c25a96d628dada9caa086fc8fde2b7dc4030a38eb7b863b290f9e069193b3728d85 xfce4-panel-4.14.4.tar.bz2
-d4d6b985b148417e72339c3a5b642345d9d6193ac2524954a645c59c3c286db50408b0877857785138a328b26f40807b2d26f2e98c8379feefeec7fc525bc8db gir-gio.patch"
+sha512sums="ab3c4f23d67ff382c6f8bdc6c4f35c968f7789ab35132836c0aba824d074eda09c8cc7518b1f9f251a8e9cd6fa52844f194e70af52e3e11b0576d0ab8917a2f5 xfce4-panel-4.16.0.tar.bz2"
diff --git a/community/xfce4-panel/gir-gio.patch b/community/xfce4-panel/gir-gio.patch
deleted file mode 100644
index 1b250d3015..0000000000
--- a/community/xfce4-panel/gir-gio.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Hack to fix the .gir
-
-Upstream: https://gitlab.xfce.org/xfce/xfce4-panel/-/merge_requests/2
-
-diff --git a/libxfce4panel/Makefile.in b/libxfce4panel/Makefile.in
-index 0bfd688..aadf922 100644
---- a/libxfce4panel/Makefile.in
-+++ b/libxfce4panel/Makefile.in
-@@ -860,7 +860,7 @@ INTROSPECTION_COMPILER_ARGS = \
- --includedir=.
-
- @HAVE_INTROSPECTION_TRUE@introspection_sources = $(libxfce4panel_2_0_la_SOURCES)
--@HAVE_INTROSPECTION_TRUE@libxfce4panel_2_0_gir_INCLUDES = GObject-2.0 GLib-2.0 Gtk-3.0 libxfce4util-1.0
-+@HAVE_INTROSPECTION_TRUE@libxfce4panel_2_0_gir_INCLUDES = GObject-2.0 GLib-2.0 Gio-2.0 Gtk-3.0 libxfce4util-1.0
- @HAVE_INTROSPECTION_TRUE@libxfce4panel_2_0_gir_CFLAGS = $(AM_CPPFLAGS)
- @HAVE_INTROSPECTION_TRUE@libxfce4panel_2_0_gir_LIBS = libxfce4panel-2.0.la
- @HAVE_INTROSPECTION_TRUE@libxfce4panel_2_0_gir_FILES = $(introspection_sources)