glib: update to 2.66.0
This commit is contained in:
parent
867f090293
commit
892e8c261b
3 changed files with 74 additions and 3 deletions
13
srcpkgs/glib/patches/allow-older-gtk-doc.patch
Normal file
13
srcpkgs/glib/patches/allow-older-gtk-doc.patch
Normal file
|
@ -0,0 +1,13 @@
|
|||
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
|
58
srcpkgs/glib/patches/disable-broken-tests.patch
Normal file
58
srcpkgs/glib/patches/disable-broken-tests.patch
Normal file
|
@ -0,0 +1,58 @@
|
|||
From 8020c2f669d45dd71b7e79bb088f87970b191001 Mon Sep 17 00:00:00 2001
|
||||
From: Daniel Kolesa <daniel@octaforge.org>
|
||||
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
|
||||
--- gio/tests/meson.build
|
||||
+++ gio/tests/meson.build
|
||||
@@ -39,7 +39,6 @@ gio_tests = {
|
||||
'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' : {},
|
||||
}
|
||||
|
||||
@@ -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
|
||||
--- glib/tests/meson.build
|
||||
+++ glib/tests/meson.build
|
||||
@@ -20,9 +20,6 @@ glib_tests = {
|
||||
'environment' : {},
|
||||
'error' : {},
|
||||
'fileutils' : {},
|
||||
- 'gdatetime' : {
|
||||
- 'suite' : ['slow'],
|
||||
- },
|
||||
'guuid' : {},
|
||||
'gvariant' : {
|
||||
'suite' : ['slow'],
|
||||
--
|
||||
2.28.0
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
# Template file for 'glib'
|
||||
pkgname=glib
|
||||
version=2.64.3
|
||||
version=2.66.0
|
||||
revision=1
|
||||
build_style=meson
|
||||
configure_args="-Dfam=false -Dman=true -Dselinux=disabled
|
||||
-Dgtk_doc=$(vopt_if gtk_doc true false)"
|
||||
$(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"
|
||||
|
@ -14,7 +14,7 @@ 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=fe9cbc97925d14c804935f067a3ad77ef55c0bbe9befe68962318f5a767ceb22
|
||||
checksum=c5a66bf143065648c135da4c943d2ac23cce15690fc91c358013b2889111156c
|
||||
|
||||
build_options="gtk_doc"
|
||||
desc_option_gtk_doc="Build GTK API docs"
|
||||
|
|
Loading…
Reference in a new issue