From a772b0e6c49f8195a6339d8d3b62d98a6bd7d161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 7 Oct 2020 18:00:34 -0300 Subject: [PATCH 1/6] New package: xvfb-run-1.20.9.2. --- srcpkgs/xvfb-run/template | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 srcpkgs/xvfb-run/template diff --git a/srcpkgs/xvfb-run/template b/srcpkgs/xvfb-run/template new file mode 100644 index 00000000000..994031975f3 --- /dev/null +++ b/srcpkgs/xvfb-run/template @@ -0,0 +1,25 @@ +# Template file for 'xvfb-run' +pkgname=xvfb-run +version=1.20.9.2 +revision=1 +_ver=${version%.*}-${version##*.} +create_wrksrc=yes +depends="xorg-server-xvfb xauth" +short_desc="Xvfb wrapper" +maintainer="Érico Nogueira " +license="GPL-2.0-or-later" +homepage="https://salsa.debian.org/xorg-team/xserver/xorg-server" +distfiles="${homepage}/-/raw/xorg-server-2_${_ver}/debian/local/xvfb-run + ${homepage}/-/raw/xorg-server-2_${_ver}/debian/local/xvfb-run.1" +checksum="fd05e0f8e6207c3984b980a0f037381c9c4a6f22a6dd94fdcfa995318db2a0a4 + 08f14f55e14e52e5d98713c4d8f25ae68d67e2ee188dc0247770c6ada6e27c05" +skip_extraction="xvfb-run xvfb-run.1" + +do_extract() { + cp ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}{,.1} ${wrksrc} +} + +do_install() { + vbin xvfb-run + vman xvfb-run.1 +} From 49530f54cc3f09b1ef6a33c05c1b7aea8d5d7b66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 7 Oct 2020 20:22:41 -0300 Subject: [PATCH 2/6] gtk-doc: update to 1.33.0. --- ...-Please-make-the-output-reproducible.patch | 51 ---------- ...kdb-ensure-deterministic-index-files.patch | 22 ----- ...BEGIN-END-_IGNORE_DEPRECATIONS-lines.patch | 28 ------ ...typedef-can-be-followed-by-decorator.patch | 57 ----------- ...an-support-deprecated-struct-members.patch | 86 ---------------- ...tree-structure-without-using-anytree.patch | 98 ------------------- .../patches/0008-pkg-config-hack.patch | 11 --- srcpkgs/gtk-doc/template | 16 +-- 8 files changed, 10 insertions(+), 359 deletions(-) delete mode 100644 srcpkgs/gtk-doc/patches/0001-Please-make-the-output-reproducible.patch delete mode 100644 srcpkgs/gtk-doc/patches/0002-mkdb-ensure-deterministic-index-files.patch delete mode 100644 srcpkgs/gtk-doc/patches/0003-Skip-G_GNUC_-BEGIN-END-_IGNORE_DEPRECATIONS-lines.patch delete mode 100644 srcpkgs/gtk-doc/patches/0004-typedef-can-be-followed-by-decorator.patch delete mode 100644 srcpkgs/gtk-doc/patches/0005-scan-support-deprecated-struct-members.patch delete mode 100644 srcpkgs/gtk-doc/patches/0006-Implement-a-simple-tree-structure-without-using-anytree.patch delete mode 100644 srcpkgs/gtk-doc/patches/0008-pkg-config-hack.patch diff --git a/srcpkgs/gtk-doc/patches/0001-Please-make-the-output-reproducible.patch b/srcpkgs/gtk-doc/patches/0001-Please-make-the-output-reproducible.patch deleted file mode 100644 index e687a5a48b7..00000000000 --- a/srcpkgs/gtk-doc/patches/0001-Please-make-the-output-reproducible.patch +++ /dev/null @@ -1,51 +0,0 @@ -From: Chris Lamb -Date: Sat, 7 Dec 2019 13:56:24 +0000 -Subject: Please make the output reproducible -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -Whilst working on the Reproducible Builds effort [0] we noticed that -gtk-doc generates unreproducible output. - -There will likely be more issues but this one is at least fairly -simple in that it iterates over a set structure when printing -some .devhelp2 headers, for example: - -│ │ │ │ - -│ │ │ │ - -│ │ │ │ -│ │ │ │ - -│ │ │ │ + -│ │ │ │ -│ │ │ │ + -│ │ │ │ -│ │ │ │ - -│ │ │ │ -│ │ │ │ + -│ │ │ │ + - -This was originally filed in Debian as #946311 [1]. - - [0] https://reproducible-builds.org/ - [1] https://bugs.debian.org/946331 - -Signed-off-by: Chris Lamb -Origin: upstream, commit: 06eda7ca8fa42c654fd2ad861c1c43c1b395bc57 ---- - gtkdoc/mkdb.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gtkdoc/mkdb.py b/gtkdoc/mkdb.py -index bcb5423..087ede2 100644 ---- a/gtkdoc/mkdb.py -+++ b/gtkdoc/mkdb.py -@@ -2491,7 +2491,7 @@ def OutputBook(main_file, book_top, book_bottom, obj_tree): - - - ''') -- for version in set(Since.values()): -+ for version in sorted(set(Since.values())): - dash_version = version.replace('.', '-') - OUTPUT.write(''' - Index of new API in %s diff --git a/srcpkgs/gtk-doc/patches/0002-mkdb-ensure-deterministic-index-files.patch b/srcpkgs/gtk-doc/patches/0002-mkdb-ensure-deterministic-index-files.patch deleted file mode 100644 index 581ea5584ff..00000000000 --- a/srcpkgs/gtk-doc/patches/0002-mkdb-ensure-deterministic-index-files.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Stefan Sauer -Date: Mon, 23 Dec 2019 12:23:41 +0100 -Subject: mkdb: ensure deterministic index files. - -Origin: upstream, commit: 51762cfe2b47c886558ee5b311dca24bd5ddcd83 ---- - gtkdoc/mkdb.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gtkdoc/mkdb.py b/gtkdoc/mkdb.py -index 087ede2..1e033d4 100644 ---- a/gtkdoc/mkdb.py -+++ b/gtkdoc/mkdb.py -@@ -969,7 +969,7 @@ def OutputIndex(basename, apiindex): - - def OutputSinceIndexes(): - """Generate the 'since' api index files.""" -- for version in set(Since.values()): -+ for version in sorted(set(Since.values())): - logging.info("Since : [%s]", version) - index = {x: IndexEntriesSince[x] for x in IndexEntriesSince.keys() if Since[x] == version} - OutputIndex("api-index-" + version, index) diff --git a/srcpkgs/gtk-doc/patches/0003-Skip-G_GNUC_-BEGIN-END-_IGNORE_DEPRECATIONS-lines.patch b/srcpkgs/gtk-doc/patches/0003-Skip-G_GNUC_-BEGIN-END-_IGNORE_DEPRECATIONS-lines.patch deleted file mode 100644 index 6877f97c3f4..00000000000 --- a/srcpkgs/gtk-doc/patches/0003-Skip-G_GNUC_-BEGIN-END-_IGNORE_DEPRECATIONS-lines.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Xavier Claessens -Date: Thu, 2 Jan 2020 21:56:10 -0500 -Subject: Skip G_GNUC_(BEGIN|END)_IGNORE_DEPRECATIONS lines - -For some reason, glib has to put empty line before and after each of -these lines otherwise the symbol following it is undeclared. - -Origin: upstream, commit:ca42972cd3fc5420a429ae752228c0c89ec7c763 ---- - gtkdoc/scan.py | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/gtkdoc/scan.py b/gtkdoc/scan.py -index d04d4d4..7de08ad 100644 ---- a/gtkdoc/scan.py -+++ b/gtkdoc/scan.py -@@ -561,6 +561,11 @@ def ScanHeaderContent(input_lines, decl_list, get_types, options): - logging.info('Found start of comment: %s', line.strip()) - continue - -+ # Skip begin/end deprecation macros. -+ m = re.search(r'^\s*G_GNUC_(BEGIN|END)_IGNORE_DEPRECATIONS', line) -+ if m: -+ continue -+ - logging.info('no decl: %s', line.strip()) - - cm = [m.match(line) for m in CLINE_MATCHER] diff --git a/srcpkgs/gtk-doc/patches/0004-typedef-can-be-followed-by-decorator.patch b/srcpkgs/gtk-doc/patches/0004-typedef-can-be-followed-by-decorator.patch deleted file mode 100644 index 08d20acdd17..00000000000 --- a/srcpkgs/gtk-doc/patches/0004-typedef-can-be-followed-by-decorator.patch +++ /dev/null @@ -1,57 +0,0 @@ -From: Xavier Claessens -Date: Fri, 3 Jan 2020 06:47:47 -0500 -Subject: typedef can be followed by decorator - -Origin: upstream, commit:b922e1486e6fa34611527f2628fef34ce4ffd42e ---- - gtkdoc/scan.py | 30 +++++++++++++++++------------- - 1 file changed, 17 insertions(+), 13 deletions(-) - -diff --git a/gtkdoc/scan.py b/gtkdoc/scan.py -index 7de08ad..5a5da92 100644 ---- a/gtkdoc/scan.py -+++ b/gtkdoc/scan.py -@@ -96,19 +96,8 @@ CLINE_MATCHER = [ - (struct|union)\s* - \w*\s*{""", re.VERBOSE), - # 12-14: OTHER TYPEDEFS -- re.compile( -- r"""^\s*typedef\s+ -- (?:struct|union)\s+\w+[\s\*]+ -- (\w+) # 1: name -- \s*;""", re.VERBOSE), -- re.compile( -- r"""^\s* -- (?:G_GNUC_EXTENSION\s+)? -- typedef\s+ -- (.+[\s\*]) # 1: e.g. 'unsigned int' -- (\w+) # 2: name -- (?:\s*\[[^\]]+\])* -- \s*;""", re.VERBOSE), -+ None, # in InitScanner() -+ None, # in InitScanner() - re.compile(r'^\s*typedef\s+'), - # 15: VARIABLES (extern'ed variables) - None, # in InitScanner() -@@ -267,6 +256,21 @@ def InitScanner(options): - %s # 3: optional decorator - \s*;""" % optional_decorators_regex, re.VERBOSE) - # OTHER TYPEDEFS -+ CLINE_MATCHER[12] = re.compile( -+ r"""^\s*typedef\s+ -+ (?:struct|union)\s+\w+[\s\*]+ -+ (\w+) # 1: name -+ %s # 2: optional decorator -+ \s*;""" % optional_decorators_regex, re.VERBOSE) -+ CLINE_MATCHER[13] = re.compile( -+ r"""^\s* -+ (?:G_GNUC_EXTENSION\s+)? -+ typedef\s+ -+ (.+?[\s\*]) # 1: e.g. 'unsigned int' -+ (\w+) # 2: name -+ (?:\s*\[[^\]]+\])* -+ %s # 3: optional decorator -+ \s*;""" % optional_decorators_regex, re.VERBOSE) - CLINE_MATCHER[15] = re.compile( - r"""^\s* - (?:extern|[A-Za-z_]+VAR%s)\s+ diff --git a/srcpkgs/gtk-doc/patches/0005-scan-support-deprecated-struct-members.patch b/srcpkgs/gtk-doc/patches/0005-scan-support-deprecated-struct-members.patch deleted file mode 100644 index 403e227af84..00000000000 --- a/srcpkgs/gtk-doc/patches/0005-scan-support-deprecated-struct-members.patch +++ /dev/null @@ -1,86 +0,0 @@ -From: Jason Crain -Date: Mon, 6 Jan 2020 19:05:42 -0700 -Subject: scan: support deprecated struct members - -gcc allows deprecating members of structs. For example: - -struct data { - int x G_GNUC_DEPRECATED_FOR(replacement); -}; - -However, this currently causes the entire struct to be marked as -deprecated and confuses mkdb because it doesn't understand the -G_GNUC_DEPRECATED_FOR symbol. - -Fix this by having the whole struct only be marked as deprecated if the -'_DEPRECATED' is after the closing bracket of the struct, similar to how -it already does for enums, and having scan automatically remove all -G_GNUC_* decorators from struct members, similar to how it already does -for functions. - -Origin: upstream, commit:b866a90b385d5eed12e123cfac0cf587f716c168 ---- - gtkdoc/scan.py | 12 ++++++++++-- - tests/scan.py | 17 +++++++++++++++++ - 2 files changed, 27 insertions(+), 2 deletions(-) - -diff --git a/gtkdoc/scan.py b/gtkdoc/scan.py -index 5a5da92..6c6534a 100644 ---- a/gtkdoc/scan.py -+++ b/gtkdoc/scan.py -@@ -538,7 +538,7 @@ def ScanHeaderContent(input_lines, decl_list, get_types, options): - # section (#endif /* XXX_DEPRECATED */ - if deprecated_conditional_nest == 0 and '_DEPRECATED' in line: - m = re.search(r'^\s*#\s*(if*|define|endif)', line) -- if not (m or in_declaration == 'enum'): -+ if not (m or in_declaration == 'enum' or in_declaration == 'struct'): - logging.info('Found deprecation annotation (decl: "%s"): "%s"', - in_declaration, line.strip()) - deprecated_conditional_nest += 0.1 -@@ -953,9 +953,17 @@ def ScanHeaderContent(input_lines, decl_list, get_types, options): - title = '%s' % objectname - - logging.info('Store struct: "%s"', symbol) -+ # Structs could contain deprecated members and that doesn't -+ # mean the whole struct is deprecated, so they are ignored when -+ # setting deprecated_conditional_nest above. Here we can check -+ # if the _DEPRECATED is between '}' and ';' which would mean -+ # the struct as a whole is deprecated. -+ if re.search(r'\n\s*\}.*_DEPRECATED.*;\s*$', decl): -+ deprecated = '\n' - if AddSymbolToList(slist, symbol): - structsym = in_declaration.upper() -- stripped_decl = re.sub('(%s)' % optional_decorators_regex, '', decl) -+ regex = r'(?:\s+(?:G_GNUC_\w+(?:\(\w*\))?%s))' % ignore_decorators -+ stripped_decl = re.sub(regex, '', decl) - decl_list.append('<%s>\n%s\n%s%s\n' % - (structsym, symbol, deprecated, stripped_decl, structsym)) - if symbol in forward_decls: -diff --git a/tests/scan.py b/tests/scan.py -index ad63541..6d608b6 100755 ---- a/tests/scan.py -+++ b/tests/scan.py -@@ -552,6 +552,23 @@ class ScanHeaderContentStructs(ScanHeaderContentTestCase): - slist, doc_comments = self.scanHeaderContent([header]) - self.assertDecl('data', expected, slist) - -+ def test_HandleDeprecatedMemberDecorator(self): -+ """Struct with deprecated members.""" -+ header = textwrap.dedent("""\ -+ struct data { -+ int x1 G_GNUC_DEPRECATED; -+ int x2 G_GNUC_DEPRECATED_FOR(replacement); -+ };""") -+ expected = textwrap.dedent("""\ -+ struct data { -+ int x1; -+ int x2; -+ };""") -+ scan.InitScanner(self.options) -+ slist, doc_comments = self.scanHeaderContent( -+ header.splitlines(keepends=True)) -+ self.assertDecl('data', expected, slist) -+ - - class ScanHeaderContentUnions(ScanHeaderContentTestCase): - """Test parsing of union declarations.""" diff --git a/srcpkgs/gtk-doc/patches/0006-Implement-a-simple-tree-structure-without-using-anytree.patch b/srcpkgs/gtk-doc/patches/0006-Implement-a-simple-tree-structure-without-using-anytree.patch deleted file mode 100644 index 5acf8f95ce3..00000000000 --- a/srcpkgs/gtk-doc/patches/0006-Implement-a-simple-tree-structure-without-using-anytree.patch +++ /dev/null @@ -1,98 +0,0 @@ -From: Simon McVittie -Date: Thu, 22 Aug 2019 09:31:19 +0100 -Subject: Implement a simple tree structure without using anytree - -anytree isn't currently available in Debian or Ubuntu, and seems like a -lot of code just to get a tree data structure. NIH just the bits we need. ---- - gtkdoc/mkhtml2.py | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++- - tests/mkhtml2.py | 2 +- - 2 files changed, 52 insertions(+), 2 deletions(-) - -diff --git a/gtkdoc/mkhtml2.py b/gtkdoc/mkhtml2.py -index 91860a7..48d918e 100644 ---- a/gtkdoc/mkhtml2.py -+++ b/gtkdoc/mkhtml2.py -@@ -101,7 +101,6 @@ import os - import shutil - import sys - --from anytree import Node, PreOrderIter - from copy import deepcopy - from glob import glob - from lxml import etree -@@ -254,6 +253,57 @@ def get_chunk_titles(module, node, tree_node): - return result - - -+class PreOrderIter: -+ def __init__(self, node): -+ self.__node = node -+ -+ def __iter__(self): -+ yield self.__node -+ -+ for child in self.__node.descendants: -+ yield child -+ -+ -+class Node: -+ def __init__(self, name, parent=None, **kwargs): -+ self.name = name -+ self.__root = None -+ self.__attrs = kwargs -+ self.children = [] -+ -+ assert parent is None or isinstance(parent, Node) -+ self.parent = parent -+ if parent is not None: -+ self.__root = parent.root -+ parent.children.append(self) -+ -+ @property -+ def root(self): -+ return self.__root or self -+ -+ @property -+ def descendants(self): -+ ret = [] -+ -+ for child in self.children: -+ ret.append(child) -+ -+ for other in child.descendants: -+ ret.append(other) -+ -+ return ret -+ -+ def __iter__(self): -+ for child in self.children: -+ yield child -+ -+ def __getattr__(self, name): -+ try: -+ return self.__attrs[name] -+ except KeyError as e: -+ raise AttributeError(str(e)) -+ -+ - def chunk(xml_node, module, depth=0, idx=0, parent=None): - """Chunk the tree. - -diff --git a/tests/mkhtml2.py b/tests/mkhtml2.py -index c61ee27..439e7fe 100755 ---- a/tests/mkhtml2.py -+++ b/tests/mkhtml2.py -@@ -22,11 +22,11 @@ import logging - import textwrap - import unittest - --from anytree import PreOrderIter - from lxml import etree - from parameterized import parameterized - - from gtkdoc import mkhtml2 -+from gtkdoc.mkhtml2 import PreOrderIter - - - class TestChunking(unittest.TestCase): diff --git a/srcpkgs/gtk-doc/patches/0008-pkg-config-hack.patch b/srcpkgs/gtk-doc/patches/0008-pkg-config-hack.patch deleted file mode 100644 index ab51c7ecce1..00000000000 --- a/srcpkgs/gtk-doc/patches/0008-pkg-config-hack.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/gtkdoc/config.py.in -+++ b/gtkdoc/config.py.in -@@ -3,7 +3,7 @@ version = "@VERSION@" - # tools - dblatex = '@DBLATEX@' - fop = '@FOP@' --pkg_config = '@PKG_CONFIG@' -+pkg_config = 'pkg-config' - xsltproc = '@XSLTPROC@' - - # configured directories diff --git a/srcpkgs/gtk-doc/template b/srcpkgs/gtk-doc/template index 276ef20c5e7..fab172c2bdd 100644 --- a/srcpkgs/gtk-doc/template +++ b/srcpkgs/gtk-doc/template @@ -1,17 +1,21 @@ # Template file for 'gtk-doc' pkgname=gtk-doc -version=1.32 -revision=2 -build_style=gnu-configure +version=1.33.0 +revision=1 +build_style=meson +# disable tests to avoid cyclic dependency on glib +configure_args="-Dtests=false" pycompile_dirs="usr/share/gtk-doc/python/gtkdoc" -hostmakedepends="gettext docbook-xml docbook-xsl itstool libxslt pkg-config python3" +hostmakedepends="gettext docbook-xml docbook-xsl itstool libxslt pkg-config + python3 python3-Pygments" +makedepends depends="docbook-xml docbook-xsl libxslt python3-anytree python3-Pygments python3-lxml" short_desc="Documentation tool for public library API" maintainer="Enno Boland " license="GPL-2.0-or-later, GFDL-1.1-or-later" homepage="http://www.gtk.org/gtk-doc/" -distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz" -checksum=de0ef034fb17cb21ab0c635ec730d19746bce52984a6706e7bbec6fb5e0b907c +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=d5e3b3f837174d246fa8482455740627efec1e5210aa15d0c7989ca68f72bb51 python_version=3 patch_args="-Np1" From 84625f9ce6296cd2c57f27de23fd207146ba422e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 7 Oct 2020 18:02:14 -0300 Subject: [PATCH 3/6] glib: update to 2.66.1, update broken tests. Most test failures here are related to musl's support for locale. All these failures are brought up with upstream in https://gitlab.gnome.org/GNOME/glib/-/issues/2220 --- .../glib/patches/allow-older-gtk-doc.patch | 13 ---- .../glib/patches/disable-broken-tests.patch | 76 +++++++++---------- srcpkgs/glib/template | 10 ++- 3 files changed, 42 insertions(+), 57 deletions(-) delete mode 100644 srcpkgs/glib/patches/allow-older-gtk-doc.patch diff --git a/srcpkgs/glib/patches/allow-older-gtk-doc.patch b/srcpkgs/glib/patches/allow-older-gtk-doc.patch deleted file mode 100644 index 8ab712f76cd..00000000000 --- a/srcpkgs/glib/patches/allow-older-gtk-doc.patch +++ /dev/null @@ -1,13 +0,0 @@ -Since we ship gtk-doc patches from Debian, we can do this. - ---- docs/reference/meson.build -+++ docs/reference/meson.build -@@ -52,7 +52,7 @@ if get_option('gtk_doc') - endif - # Check we have the minimum gtk-doc version required. Older versions won't - # generate correct documentation. -- dependency('gtk-doc', version : '>=1.32.1', -+ dependency('gtk-doc', version : '>=1.32', - fallback : ['gtk-doc', 'dummy_dep'], - default_options : ['tests=false']) - endif diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch index 4a369120b7b..c8d1967ff89 100644 --- a/srcpkgs/glib/patches/disable-broken-tests.patch +++ b/srcpkgs/glib/patches/disable-broken-tests.patch @@ -1,49 +1,38 @@ -From 8020c2f669d45dd71b7e79bb088f87970b191001 Mon Sep 17 00:00:00 2001 -From: Daniel Kolesa -Date: Sun, 16 Aug 2020 05:13:18 +0200 -Subject: [PATCH] disable broken tests - ---- - gio/tests/meson.build | 6 ------ - glib/tests/meson.build | 3 --- - 2 files changed, 9 deletions(-) - -diff --git gio/tests/meson.build gio/tests/meson.build -index d8ebd56..ef06158 100644 +diff --git a/gio/tests/meson.build b/gio/tests/meson.build +index d8ebd56..be72f5c 100644 --- gio/tests/meson.build +++ gio/tests/meson.build -@@ -39,7 +39,6 @@ gio_tests = { +@@ -35,7 +35,6 @@ gio_tests = { + 'cancellable' : {}, + 'contexts' : {}, + 'contenttype' : {}, +- 'converter-stream' : {}, 'credentials' : {}, 'data-input-stream' : {}, 'data-output-stream' : {}, -- 'defaultvalue' : {'extra_sources' : [giotypefuncs_inc]}, - 'fileattributematcher' : {}, - 'filter-streams' : {}, - 'giomodule' : {}, -@@ -79,7 +78,6 @@ gio_tests = { - 'tls-interaction' : {'extra_sources' : ['gtesttlsbackend.c']}, - 'tls-database' : {'extra_sources' : ['gtesttlsbackend.c']}, - 'tls-bindings' : {'extra_sources' : ['gtesttlsbackend.c']}, -- 'gdbus-address-get-session' : {}, - 'win32-appinfo' : {}, - } +@@ -550,7 +549,7 @@ if installed_tests_enabled + endforeach + endif -@@ -136,10 +134,6 @@ endif - if host_machine.system() != 'windows' - gio_tests += { - 'file' : {}, -- 'gdbus-peer' : { -- 'dependencies' : [libgdbus_example_objectmanager_dep], -- 'install_rpath' : installed_tests_execdir -- }, - 'gdbus-peer-object-manager' : {}, - 'live-g-file' : {}, - 'socket-address' : {}, -diff --git glib/tests/meson.build glib/tests/meson.build -index 6eb23e8..1f8cd5c 100644 +-if not meson.is_cross_build() or meson.has_exe_wrapper() ++if false + + plugin_resources_c = custom_target('plugin-resources.c', + input : 'test4.gresource.xml', +diff --git a/glib/tests/meson.build b/glib/tests/meson.build +index 6eb23e8..59807ff 100644 --- glib/tests/meson.build +++ glib/tests/meson.build -@@ -20,9 +20,6 @@ glib_tests = { +@@ -11,18 +11,12 @@ glib_tests = { + 'cache' : {}, + 'charset' : {}, + 'checksum' : {}, +- 'collate' : {}, + 'cond' : {}, +- 'convert' : {}, + 'dataset' : {}, +- 'date' : {}, + 'dir' : {}, 'environment' : {}, 'error' : {}, 'fileutils' : {}, @@ -53,6 +42,11 @@ index 6eb23e8..1f8cd5c 100644 'guuid' : {}, 'gvariant' : { 'suite' : ['slow'], --- -2.28.0 - +@@ -54,7 +48,6 @@ glib_tests = { + 'mutex' : {}, + 'node' : {}, + 'once' : {}, +- 'option-context' : {}, + 'option-argv0' : {}, + 'overflow' : {}, + 'overflow-fallback' : { diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index e927e5f06dd..3332d69ff1e 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -1,20 +1,20 @@ # Template file for 'glib' pkgname=glib -version=2.66.0 +version=2.66.1 revision=1 build_style=meson configure_args="-Dfam=false -Dman=true -Dselinux=disabled $(vopt_bool gtk_doc gtk_doc)" hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)" makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel" -checkdepends="desktop-file-utils shared-mime-info tzdata" +checkdepends="desktop-file-utils shared-mime-info tzdata dbus" short_desc="GNU library of C routines" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GLib" changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS" distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz" -checksum=c5a66bf143065648c135da4c943d2ac23cce15690fc91c358013b2889111156c +checksum=a269ffe69fbcc3a21ff1acb1b6146b2a5723499d6e2de33ae16ccb6d2438ef60 build_options="gtk_doc" desc_option_gtk_doc="Build GTK API docs" @@ -23,6 +23,10 @@ if [ -z "$CROSS_BUILD" ]; then build_options_default+=" gtk_doc" fi +do_check() { + dbus-run-session ninja -C build test +} + libglib-devel_package() { depends="${makedepends} glib>=${version}_${revision}" short_desc+=" - development files" From d1a1307995cb6021253b6d8db56e0f13aeacc532 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 7 Oct 2020 18:01:17 -0300 Subject: [PATCH 4/6] gtkmm: update to 3.24.2, add checkdeps, changelog. --- srcpkgs/gtkmm/template | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gtkmm/template b/srcpkgs/gtkmm/template index e253218c972..a4e24bcbf3b 100644 --- a/srcpkgs/gtkmm/template +++ b/srcpkgs/gtkmm/template @@ -1,17 +1,23 @@ # Template file for 'gtkmm' pkgname=gtkmm -version=3.24.1 -revision=2 +version=3.24.2 +revision=1 build_style=gnu-configure configure_args="--disable-documentation" hostmakedepends="automake libtool pkg-config mm-common" makedepends="gtk+3-devel glibmm-devel atkmm-devel pangomm-devel" +checkdepends="xvfb-run" short_desc="C++ bindings for The GTK+ toolkit (v3)" maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://gtkmm.org" +changelog="https://gitlab.gnome.org/GNOME/gtkmm/-/raw/master/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ddfe42ed2458a20a34de252854bcf4b52d3f0c671c045f56b42aa27c7542d2fd +checksum=6d71091bcd1863133460d4188d04102810e9123de19706fb656b7bb915b4adc3 + +do_check() { + xvfb-run make check +} gtkmm-devel_package() { depends="${makedepends} gtkmm>=${version}_${revision}" From a31769a3e202c5eff62710f7c55a50ef3d118d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 7 Oct 2020 18:01:48 -0300 Subject: [PATCH 5/6] glibmm: add checkdepends, remove noarch. This enables all tests to run. --- srcpkgs/glibmm/template | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/srcpkgs/glibmm/template b/srcpkgs/glibmm/template index bc373d3a90b..6e51158ece0 100644 --- a/srcpkgs/glibmm/template +++ b/srcpkgs/glibmm/template @@ -1,10 +1,11 @@ # Template file for 'glibmm' pkgname=glibmm version=2.64.2 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="glib-devel perl pkg-config" makedepends="libglib-devel libsigc++-devel" +checkdepends="glib-networking" short_desc="C++ bindings for GLib" maintainer="Enno Boland " license="LGPL-2.1-or-later" @@ -12,13 +13,7 @@ homepage="https://www.gtkmm.org" distfiles="${GNOME_SITE}/glibmm/${version%.*}/glibmm-${version}.tar.xz" checksum=a75282e58d556d9b2bb44262b6f5fb76c824ac46a25a06f527108bec86b8d4ec -post_patch() { - # remove failing test - echo "int main() { return 0; }" > tests/giomm_tls_client/main.cc -} - glibmm-doc_package() { - archs=noarch short_desc+=" - documentation" pkg_install() { vmove usr/share/doc From d0c066dda10025a5912fe438895c4d8d71c25d41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Wed, 7 Oct 2020 18:03:55 -0300 Subject: [PATCH 6/6] cabbage: leave note about xvfb-run, xlintify. Not possible to check if tests run correctly with it, since the package is broken. --- srcpkgs/cabbage/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/cabbage/template b/srcpkgs/cabbage/template index feb3808203b..4bf1093d070 100644 --- a/srcpkgs/cabbage/template +++ b/srcpkgs/cabbage/template @@ -12,7 +12,7 @@ makedepends="libfreeglut-devel libcurl-devel jack-devel libXcomposite-devel depends="csound" short_desc="Framework for audio software development" maintainer="Olga U " -license="GPL-2.1-or-later" +license="GPL-3.0-or-later" homepage="http://cabbageaudio.com/" distfiles="https://github.com/WeAreROLI/JUCE/archive/${_jucever}.tar.gz https://github.com/rorywalsh/cabbage/archive/v${version}.tar.gz @@ -49,6 +49,7 @@ Projucer() { # https://github.com/WeAreROLI/JUCE/issues/422 # The HOME variable is spoofed because it looks for headers in # ~/SDKs/ (path hardcoded) + # TODO: use xvfb-run script for testing Xvfb :999 & XVFB_PID=$!