devhelp: update to 43.0.

This commit is contained in:
Michal Vasilek 2022-12-11 20:06:56 +01:00
parent 4ea62de4c7
commit 5cb5f078f5
2 changed files with 7 additions and 54 deletions

View file

@ -1,48 +0,0 @@
From f1c27fd4eaa59e86005f9698bb839451a2f0ef44 Mon Sep 17 00:00:00 2001
From: r-value <i@rvalue.moe>
Date: Wed, 17 Nov 2021 18:02:20 +0800
Subject: [PATCH] Remove incorrect arg for i18n.merge_file
`i18n.merge_file` has been ignoring positional arguments and
explicitly rejects with error "ERROR: Function does not take
positional arguments" since meson 0.60.0
---
data/meson.build | 2 --
plugins/gedit-plugin/meson.build | 1 -
2 files changed, 3 deletions(-)
diff --git a/data/meson.build b/data/meson.build
index c6aeffb4..0bc531a2 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -19,7 +19,6 @@ appdata_conf = configuration_data()
appdata_conf.set('application_id', APPLICATION_ID)
appdata = APPLICATION_ID + '.appdata.xml'
appdata_file = I18N.merge_file(
- appdata,
input: configure_file(
input: 'org.gnome.Devhelp.appdata.xml.in.in',
output: APPLICATION_ID + '.appdata.xml.in',
@@ -45,7 +44,6 @@ desktop_conf = configuration_data()
desktop_conf.set('application_id', APPLICATION_ID)
desktop = APPLICATION_ID + '.desktop'
desktop_file = I18N.merge_file(
- desktop,
type: 'desktop',
input: configure_file(
input: 'org.gnome.Devhelp.desktop.in.in',
diff --git a/plugins/gedit-plugin/meson.build b/plugins/gedit-plugin/meson.build
index 4f779886..877a01ff 100644
--- a/plugins/gedit-plugin/meson.build
+++ b/plugins/gedit-plugin/meson.build
@@ -7,7 +7,6 @@ install_data(
plugin_info_file = 'devhelp.plugin'
I18N.merge_file(
- plugin_info_file,
type: 'desktop',
input: plugin_info_file + '.desktop.in',
output: plugin_info_file,
--
GitLab

View file

@ -1,22 +1,23 @@
# Template file for 'devhelp'
pkgname=devhelp
version=41.2
version=43.0
revision=1
build_helper="gir"
build_style=meson
hostmakedepends="gettext glib-devel itstool pkg-config"
makedepends="gsettings-desktop-schemas-devel webkit2gtk-devel amtk-devel"
hostmakedepends="gettext glib-devel itstool pkg-config gtk-update-icon-cache"
makedepends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel amtk-devel"
short_desc="API documentation browser for GTK+ and GNOME"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://wiki.gnome.org/Apps/Devhelp"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=ecaa90b0f4daa8fb2030f6dc690bf533ff99a773437fe0e18acfe82d997f60d2
changelog="https://gitlab.gnome.org/GNOME/devhelp/-/raw/main/NEWS"
distfiles="${GNOME_SITE}/devhelp/${version%.*}/devhelp-${version}.tar.xz"
checksum=63ceeefd05392e02044881ef1ecd724293553da5735b7efc082b2d13fe85dd04
replaces="devhelp-gedit-plugin<=40.0_1"
devhelp-devel_package() {
short_desc+=" - development files"
depends="gsettings-desktop-schemas-devel webkit2gtk-devel
depends="gsettings-desktop-schemas-devel libwebkit2gtk41-devel
devhelp-libs>=${version}_${revision}"
pkg_install() {
vmove usr/include