aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2020-05-26 09:16:12 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2020-05-26 10:53:32 +0000
commitb8a706c06abdcc5fdb5c958eb0e316bf0686713a (patch)
tree1bdb2191fb518003b4e41042e28fc93decf73633
parentd6d3150441f7f4eb5e1efff5b397aadc36680d7c (diff)
downloadaports-b8a706c06abdcc5fdb5c958eb0e316bf0686713a.tar.gz
aports-b8a706c06abdcc5fdb5c958eb0e316bf0686713a.tar.bz2
aports-b8a706c06abdcc5fdb5c958eb0e316bf0686713a.tar.xz
community/xfce4-panel: fix introspection file
fix vala build of xfce4-stopwatch-plugin
-rw-r--r--community/xfce4-panel/APKBUILD9
-rw-r--r--community/xfce4-panel/gir-gio.patch17
2 files changed, 23 insertions, 3 deletions
diff --git a/community/xfce4-panel/APKBUILD b/community/xfce4-panel/APKBUILD
index e14435229d..c51283c766 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=0
+pkgrel=1
pkgdesc="Panel for the Xfce desktop environment"
url="https://xfce.org/"
arch="all"
@@ -12,7 +12,9 @@ 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"
-source="https://archive.xfce.org/src/xfce/xfce4-panel/${pkgver%.*}/xfce4-panel-$pkgver.tar.bz2"
+source="https://archive.xfce.org/src/xfce/xfce4-panel/${pkgver%.*}/xfce4-panel-$pkgver.tar.bz2
+ gir-gio.patch
+ "
build() {
./configure \
@@ -35,4 +37,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="5ae7c7acf0254fdc3f5eaccf75d7c12699ab8147322f231af7bd17b1238b8c25a96d628dada9caa086fc8fde2b7dc4030a38eb7b863b290f9e069193b3728d85 xfce4-panel-4.14.4.tar.bz2"
+sha512sums="5ae7c7acf0254fdc3f5eaccf75d7c12699ab8147322f231af7bd17b1238b8c25a96d628dada9caa086fc8fde2b7dc4030a38eb7b863b290f9e069193b3728d85 xfce4-panel-4.14.4.tar.bz2
+d4d6b985b148417e72339c3a5b642345d9d6193ac2524954a645c59c3c286db50408b0877857785138a328b26f40807b2d26f2e98c8379feefeec7fc525bc8db gir-gio.patch"
diff --git a/community/xfce4-panel/gir-gio.patch b/community/xfce4-panel/gir-gio.patch
new file mode 100644
index 0000000000..1b250d3015
--- /dev/null
+++ b/community/xfce4-panel/gir-gio.patch
@@ -0,0 +1,17 @@
+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)