From 61555c814da658605e0c60c7bf147a023866f349 Mon Sep 17 00:00:00 2001 From: Rasmus Thomsen Date: Mon, 11 Mar 2019 10:16:59 +0100 Subject: [PATCH] gedit: update to 3.32.0. --- common/shlibs | 1 + srcpkgs/gedit/template | 42 +++++++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/common/shlibs b/common/shlibs index bdd49cb5843..6c609bd29a4 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3422,3 +3422,4 @@ libqhttpengine.so.1 qhttpengine-1.0.1_1 libqmdnsengine.so.0 qmdnsengine-0.1.0_1 libyang.so.0.16 libyang-0.16r3_1 libhtp.so.2 libhtp-0.5.30_1 +libgedit-3.14.so gedit-3.32.0_1 diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template index 97b746f761a..dbf45467cca 100644 --- a/srcpkgs/gedit/template +++ b/srcpkgs/gedit/template @@ -1,40 +1,44 @@ # Template file for 'gedit' pkgname=gedit -version=3.30.2 +version=3.32.0 revision=1 -build_style=gnu-configure +build_helper="gir" +build_style=meson pycompile_module="gi/overrides" pycompile_dirs="usr/lib/gedit/plugins" -configure_args="--disable-schemas-compile --enable-python --enable-gvfs-metadata - $(vopt_enable gir introspection)" -hostmakedepends="gnome-doc-utils intltool itstool pkg-config - $(vopt_if gir 'gobject-introspection')" -makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview-devel - libpeas-devel $(vopt_if gir 'python-gobject-devel')" +configure_args="-Dplugins=true -Dvapi=$(vopt_if vala true false) + -Dintrospection=$(vopt_if gir true false)" +hostmakedepends="itstool pkg-config glib-devel gdk-pixbuf perl $(vopt_if vala vala)" +makedepends="gsettings-desktop-schemas-devel gspell-devel gtksourceview4-devel + libpeas-devel libsoup-devel $(vopt_if gir 'python-gobject-devel')" depends="desktop-file-utils gsettings-desktop-schemas iso-codes" -short_desc="A text editor for GNOME" -maintainer="Rasmus Thomsen " -homepage="https://wiki.gnome.org/Apps/Gedit" +short_desc="Text editor for GNOME" +maintainer="Rasmus Thomsen " license="GPL-2.0-or-later" +homepage="https://wiki.gnome.org/Apps/Gedit" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=eaf3b17856a0fb7c6f363c2ebbf4f26c5be6eb6552a49e58c44aee0fcb789163 -nocross="requires libpeas which requires girepository which is not cross" +checksum=c9e2e2a865c962ef172892a5d3459dc834871761ae6456b68436b3b577f22ad3 +shlib_provides="libgedit-3.14.so" -build_options="gir" -if [ -z "$CROSS_BUILD" ]; then - build_options_default="gir" -fi +build_options="gir vala" +case "$XBPS_TARGET_MACHINE" in + i686-musl|x86_64-musl) build_options_default+=" gir vala" ;; + *-musl) ;; + *) build_options_default+=" gir vala" ;; +esac gedit-devel_package() { - depends="gtksourceview-devel libpeas-devel" + depends="${sourcepkg}>=${version}_${revision} gtksourceview-devel libpeas-devel" short_desc+=" - development files" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/share/gtk-doc if [ "$build_option_gir" ]; then vmove usr/share/gedit/gir-1.0 fi + if [ "$build_option_vala" ]; then + vmove usr/share/vala + fi } }