From 7e9dd72e71aec774151344f69fb32dda8da03f73 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 7 Jul 2022 12:53:43 +0200 Subject: [PATCH] tepl: update to 6.1.1. --- srcpkgs/tepl/patches/no-gir.patch | 45 ------------------------------- srcpkgs/tepl/template | 27 +++++++++++-------- 2 files changed, 16 insertions(+), 56 deletions(-) delete mode 100644 srcpkgs/tepl/patches/no-gir.patch diff --git a/srcpkgs/tepl/patches/no-gir.patch b/srcpkgs/tepl/patches/no-gir.patch deleted file mode 100644 index 89009560285..00000000000 --- a/srcpkgs/tepl/patches/no-gir.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 17e57ed156450fe59001cb0a14f8d87c40d6bf77 Mon Sep 17 00:00:00 2001 -From: Daniel Kolesa -Date: Sat, 15 Aug 2020 00:09:15 +0200 -Subject: [PATCH] Allow disabling gir - ---- - meson_options.txt | 5 +++++ - tepl/meson.build | 4 ++++ - 2 files changed, 9 insertions(+) - -diff --git meson_options.txt meson_options.txt -index cad97dd..5e99084 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -3,3 +3,8 @@ option( - type: 'boolean', value: false, - description: 'Build API reference (requires gtk-doc)' - ) -+option( -+ 'gir', -+ type: 'boolean', value: true, -+ description: 'Build gobject-introspection' -+) -diff --git tepl/meson.build tepl/meson.build -index 226d913..b35dd3a 100644 ---- a/tepl/meson.build -+++ b/tepl/meson.build -@@ -164,6 +164,8 @@ PKG_CONFIG.generate(tepl_lib, - libraries: TEPL_PUBLIC_DEPS, - ) - -+if get_option('gir') -+ - GNOME.generate_gir( - tepl_lib, - export_packages: 'tepl-@0@'.format(TEPL_API_VERSION), -@@ -182,3 +184,5 @@ GNOME.generate_gir( - # Support for deps being built as subprojects: - dependencies: TEPL_DEPS, - ) -+ -+endif --- -2.28.0 - diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template index 2991585cf54..fae1e1d3a3f 100644 --- a/srcpkgs/tepl/template +++ b/srcpkgs/tepl/template @@ -1,27 +1,29 @@ # Template file for 'tepl' pkgname=tepl -version=6.00.0 -revision=4 +version=6.1.1 +revision=1 build_style=meson build_helper=gir -configure_args="$(vopt_bool gir gir)" -hostmakedepends="glib-devel pkg-config" +configure_args="$(vopt_bool gir gobject_introspection) $(vopt_bool gtk_doc gtk_doc)" +hostmakedepends="glib-devel pkg-config gettext $(vopt_if gtk_doc gtk-doc)" makedepends="amtk-devel libglib-devel gtksourceview4-devel gtk+3-devel - libxml2-devel uchardet-devel" + libxml2-devel uchardet-devel gsettings-desktop-schemas-devel" +checkdepends="xvfb-run" short_desc="Text editor product line" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Projects/Tepl" +changelog="https://gitlab.gnome.org/swilmet/tepl/-/raw/main/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a86397a895dca9c0de7a5ccb063bda8f7ef691cccb950ce2cfdee367903e7a63 +checksum=a0fbcbcf82dbcb031e1cbea286ab3edc70d5a6ea4125038242a1b1d3ff0278aa +make_check_pre="xvfb-run" -build_options="gir" +build_options="gir gtk_doc" build_options_default="gir" -do_check() { - # Need X - : -} +if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" gtk_doc" +fi tepl-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" @@ -33,5 +35,8 @@ tepl-devel_package() { if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 fi + if [ "$build_option_gtk_doc" ]; then + vmove usr/share/gtk-doc + fi } }