* update gtk-doc to 1.34.0-2

This commit is contained in:
Alexander Baldeck 2025-01-01 02:22:33 +01:00
parent e557472f0b
commit e5c5716832
4 changed files with 72 additions and 16 deletions

View File

@ -1,7 +1,7 @@
pkgbase = gtk-doc pkgbase = gtk-doc
pkgdesc = Documentation tool for public library API pkgdesc = Documentation tool for public library API
pkgver = 1.34.0 pkgver = 1.34.0
pkgrel = 1.1 pkgrel = 2
url = https://www.gtk.org/gtk-doc/ url = https://www.gtk.org/gtk-doc/
arch = any arch = any
license = GFDL-1.1-or-later license = GFDL-1.1-or-later
@ -16,12 +16,16 @@ pkgbase = gtk-doc
depends = docbook-xml depends = docbook-xml
depends = docbook-xsl depends = docbook-xsl
depends = glib2-docs depends = glib2-docs
depends = python
depends = python-lxml depends = python-lxml
depends = python-pygments depends = python-pygments
depends = sh
optdepends = dblatex: PDF support optdepends = dblatex: PDF support
source = git+https://gitlab.gnome.org/GNOME/gtk-doc.git#commit=b7c8317bf023b5116250b4c5381737d5b9786976 source = git+https://gitlab.gnome.org/GNOME/gtk-doc.git#tag=1.34.0
source = 0001-Fix-tests.patch source = 0001-Fix-tests.patch
b2sums = SKIP source = 0002-Fix-syntax-warnings.patch
b2sums = 3b2b55a85e5ab4b168bb322667a7552bc3ee6c21e05309e498a1768b36a86ce267bd492ff5d1d22fc829b7625a5b93a045177f72c56e04d6563c6c9bc464ef44
b2sums = aec43a320f2c687a8c3529eb0b396dcf318b08fec8dcae06d3c2ab0ddeed04e1d324bac158cc15a50ddae768b42a815742a86c24917b295f3c3f6f2d7ad225c7 b2sums = aec43a320f2c687a8c3529eb0b396dcf318b08fec8dcae06d3c2ab0ddeed04e1d324bac158cc15a50ddae768b42a815742a86c24917b295f3c3f6f2d7ad225c7
b2sums = 5a096a4dfd3b1ee5bd3d60606d5714fc8baefb08f12e846b25dc5235b89f3ed22d2e20ae45c36f4cfd73c9b1ae38c097884646653e4e5ae477164321968a9532
pkgname = gtk-doc pkgname = gtk-doc

3
gtk-doc/.nvchecker.toml Normal file
View File

@ -0,0 +1,3 @@
[gtk-doc]
source = "git"
git = "https://gitlab.gnome.org/GNOME/gtk-doc.git"

View File

@ -0,0 +1,46 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
Date: Sun, 29 Dec 2024 16:28:39 +0100
Subject: [PATCH] Fix syntax warnings
---
gtkdoc/scan.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gtkdoc/scan.py b/gtkdoc/scan.py
index 6b18099ca2ca..4a660aa8debd 100644
--- a/gtkdoc/scan.py
+++ b/gtkdoc/scan.py
@@ -41,8 +41,8 @@ import shutil
from . import common
TYPE_MODIFIERS = ['const', 'signed', 'unsigned', 'long', 'short', 'struct', 'union', 'enum']
-VAR_TYPE_MODIFIER = '(?:' + '|'.join([t + '\s+' for t in TYPE_MODIFIERS]) + ')*'
-RET_TYPE_MODIFIER = '(?:' + '|'.join([t + '\s+' for t in TYPE_MODIFIERS + ['G_CONST_RETURN']]) + ')*'
+VAR_TYPE_MODIFIER = '(?:' + '|'.join([t + r'\s+' for t in TYPE_MODIFIERS]) + ')*'
+RET_TYPE_MODIFIER = '(?:' + '|'.join([t + r'\s+' for t in TYPE_MODIFIERS + ['G_CONST_RETURN']]) + ')*'
# Matchers for current line
CLINE_MATCHER = [
@@ -235,8 +235,8 @@ def InitScanner(options):
ignore_decorators = ''
optional_decorators_regex = ''
if options.ignore_decorators:
- ignore_decorators = '|' + options.ignore_decorators.replace('()', '\(\w*\)')
- optional_decorators_regex = '(?:\s+(?:%s))?' % ignore_decorators[1:]
+ ignore_decorators = '|' + options.ignore_decorators.replace('()', r'\(\w*\)')
+ optional_decorators_regex = r'(?:\s+(?:%s))?' % ignore_decorators[1:]
# FUNCTION POINTER VARIABLES
CLINE_MATCHER[4] = re.compile(
@@ -484,8 +484,8 @@ def ScanHeaderContent(input_lines, decl_list, get_types, options):
ignore_decorators = '' # 1 uses
optional_decorators_regex = '' # 4 uses
if options.ignore_decorators:
- ignore_decorators = '|' + options.ignore_decorators.replace('()', '\(\w*\)')
- optional_decorators_regex = '(?:\s+(?:%s))?' % ignore_decorators[1:]
+ ignore_decorators = '|' + options.ignore_decorators.replace('()', r'\(\w*\)')
+ optional_decorators_regex = r'(?:\s+(?:%s))?' % ignore_decorators[1:]
for line in input_lines:
# If this is a private header, skip it.

View File

@ -4,7 +4,7 @@
pkgname=gtk-doc pkgname=gtk-doc
pkgver=1.34.0 pkgver=1.34.0
pkgrel=1.1 pkgrel=2
pkgdesc="Documentation tool for public library API" pkgdesc="Documentation tool for public library API"
url="https://www.gtk.org/gtk-doc/" url="https://www.gtk.org/gtk-doc/"
arch=(any) arch=(any)
@ -16,8 +16,10 @@ depends=(
docbook-xml docbook-xml
docbook-xsl docbook-xsl
glib2-docs glib2-docs
python
python-lxml python-lxml
python-pygments python-pygments
sh
) )
makedepends=( makedepends=(
dblatex dblatex
@ -30,25 +32,26 @@ checkdepends=(
gtk3 gtk3
python-parameterized python-parameterized
) )
optdepends=('dblatex: PDF support') optdepends=(
_commit=b7c8317bf023b5116250b4c5381737d5b9786976 # tags/1.34.0^0 'dblatex: PDF support'
source=(
"git+https://gitlab.gnome.org/GNOME/gtk-doc.git#commit=$_commit"
0001-Fix-tests.patch
) )
b2sums=('SKIP' source=(
'aec43a320f2c687a8c3529eb0b396dcf318b08fec8dcae06d3c2ab0ddeed04e1d324bac158cc15a50ddae768b42a815742a86c24917b295f3c3f6f2d7ad225c7') "git+https://gitlab.gnome.org/GNOME/gtk-doc.git#tag=$pkgver"
0001-Fix-tests.patch
pkgver() { 0002-Fix-syntax-warnings.patch
cd gtk-doc )
git describe --tags | sed 's/GTK_DOC_//;s/_/\./g;s/[^-]*-g/r&/;s/-/+/g' b2sums=('3b2b55a85e5ab4b168bb322667a7552bc3ee6c21e05309e498a1768b36a86ce267bd492ff5d1d22fc829b7625a5b93a045177f72c56e04d6563c6c9bc464ef44'
} 'aec43a320f2c687a8c3529eb0b396dcf318b08fec8dcae06d3c2ab0ddeed04e1d324bac158cc15a50ddae768b42a815742a86c24917b295f3c3f6f2d7ad225c7'
'5a096a4dfd3b1ee5bd3d60606d5714fc8baefb08f12e846b25dc5235b89f3ed22d2e20ae45c36f4cfd73c9b1ae38c097884646653e4e5ae477164321968a9532')
prepare() { prepare() {
cd gtk-doc cd gtk-doc
# test-gobject-mkhtml: ../xml/object.xml:139: element include: XInclude error : could not load ../../examples/gobject.c, and no fallback was found # test-gobject-mkhtml: ../xml/object.xml:139: element include: XInclude error : could not load ../../examples/gobject.c, and no fallback was found
git apply -3 ../0001-Fix-tests.patch git apply -3 ../0001-Fix-tests.patch
# SyntaxWarning: invalid escape sequence '\s'
git apply -3 ../0002-Fix-syntax-warnings.patch
} }
build() { build() {