From 77d7ea0b2718374d4d4f71711a8174c1b869d506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Thu, 28 Jan 2021 01:18:43 -0300 Subject: [PATCH 1/5] glib: update to 2.66.6. Also disable fileutils tests, broken on container where user is root. --- srcpkgs/glib/patches/disable-broken-tests.patch | 12 ++++++------ srcpkgs/glib/template | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch index c8d1967ff89..15e87215d27 100644 --- a/srcpkgs/glib/patches/disable-broken-tests.patch +++ b/srcpkgs/glib/patches/disable-broken-tests.patch @@ -1,4 +1,4 @@ -diff --git a/gio/tests/meson.build b/gio/tests/meson.build +diff --git gio/tests/meson.build gio/tests/meson.build index d8ebd56..be72f5c 100644 --- gio/tests/meson.build +++ gio/tests/meson.build @@ -19,11 +19,11 @@ index d8ebd56..be72f5c 100644 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 +diff --git glib/tests/meson.build glib/tests/meson.build +index 6eb23e8..d7aacfa 100644 --- glib/tests/meson.build +++ glib/tests/meson.build -@@ -11,18 +11,12 @@ glib_tests = { +@@ -11,18 +11,11 @@ glib_tests = { 'cache' : {}, 'charset' : {}, 'checksum' : {}, @@ -35,14 +35,14 @@ index 6eb23e8..59807ff 100644 'dir' : {}, 'environment' : {}, 'error' : {}, - 'fileutils' : {}, +- 'fileutils' : {}, - 'gdatetime' : { - 'suite' : ['slow'], - }, 'guuid' : {}, 'gvariant' : { 'suite' : ['slow'], -@@ -54,7 +48,6 @@ glib_tests = { +@@ -54,7 +47,6 @@ glib_tests = { 'mutex' : {}, 'node' : {}, 'once' : {}, diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index 0d6de76ea88..f826b7932e1 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -1,6 +1,6 @@ # Template file for 'glib' pkgname=glib -version=2.66.2 +version=2.66.6 revision=1 build_style=meson configure_args="-Dfam=false -Dman=true -Dselinux=disabled @@ -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=ec390bed4e8dd0f89e918f385e8d4cfd7470b1ef7c1ce93ec5c4fc6e3c6a17c4 +checksum=80fff9c63d2725834328071c42003c311f77f91caf2285195c587c62f5638329 build_options="gtk_doc" desc_option_gtk_doc="Build GTK API docs" From 9a8054a1825fcf461423edad1c507bebc601acf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 29 Jan 2021 04:36:57 -0300 Subject: [PATCH 2/5] glibmm: update to 2.66.0. Also drop glibmm-doc. --- srcpkgs/glibmm-doc | 1 - srcpkgs/glibmm/template | 16 ++++------------ srcpkgs/removed-packages/template | 1 + 3 files changed, 5 insertions(+), 13 deletions(-) delete mode 120000 srcpkgs/glibmm-doc diff --git a/srcpkgs/glibmm-doc b/srcpkgs/glibmm-doc deleted file mode 120000 index d5491e56bc0..00000000000 --- a/srcpkgs/glibmm-doc +++ /dev/null @@ -1 +0,0 @@ -glibmm \ No newline at end of file diff --git a/srcpkgs/glibmm/template b/srcpkgs/glibmm/template index 6e51158ece0..3697ed41a02 100644 --- a/srcpkgs/glibmm/template +++ b/srcpkgs/glibmm/template @@ -1,8 +1,8 @@ # Template file for 'glibmm' pkgname=glibmm -version=2.64.2 -revision=2 -build_style=gnu-configure +version=2.66.0 +revision=1 +build_style=meson hostmakedepends="glib-devel perl pkg-config" makedepends="libglib-devel libsigc++-devel" checkdepends="glib-networking" @@ -11,15 +11,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://www.gtkmm.org" distfiles="${GNOME_SITE}/glibmm/${version%.*}/glibmm-${version}.tar.xz" -checksum=a75282e58d556d9b2bb44262b6f5fb76c824ac46a25a06f527108bec86b8d4ec - -glibmm-doc_package() { - short_desc+=" - documentation" - pkg_install() { - vmove usr/share/doc - vmove usr/share/devhelp - } -} +checksum=9e1db7d43d2e2d4dfa2771354e21a69a6beec7c446b711619cf8c779e13a581e glibmm-devel_package() { depends="${makedepends} glibmm>=${version}_${revision}" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 229c78a6bcc..d50d4f980b0 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -38,6 +38,7 @@ replaces=" gens-gs<=2.16.7_2 geoip-data<=20171002_2 gksu<=2.0.2_4 + glibmm-doc<=2.64.2_2 go1.4-bootstrap<=20171003_2 goffice0.8<=0.8.17_6 gst1-python<=1.18.3_1 From 20b5cd4964676a5da46d3f21917666117874c3ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 29 Jan 2021 04:36:32 -0300 Subject: [PATCH 3/5] atkmm: update to 2.28.1. --- srcpkgs/atkmm/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/atkmm/template b/srcpkgs/atkmm/template index a5453a1447a..8e0a09ea9f2 100644 --- a/srcpkgs/atkmm/template +++ b/srcpkgs/atkmm/template @@ -1,9 +1,8 @@ # Template file for 'atkmm' pkgname=atkmm -version=2.28.0 +version=2.28.1 revision=1 -build_style=gnu-configure -configure_args="--disable-documentation" +build_style=meson hostmakedepends="pkg-config" makedepends="libsigc++-devel atk-devel glibmm-devel" short_desc="Set of interfaces for accessibility (C++ bindings)" @@ -11,7 +10,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://www.gtkmm.org" distfiles="${GNOME_SITE}/atkmm/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4c4cfc917fd42d3879ce997b463428d6982affa0fb660cafcc0bc2d9afcedd3a +checksum=116876604770641a450e39c1f50302884848ce9cc48d43c5dc8e8efc31f31bad atkmm-devel_package() { depends="${makedepends} atkmm>=${version}_${revision}" From ecaf313d63db4c8f1a45c774409838fef9e8687d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 29 Jan 2021 04:36:08 -0300 Subject: [PATCH 4/5] pangomm: update to 2.46.0. --- srcpkgs/pangomm/template | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/srcpkgs/pangomm/template b/srcpkgs/pangomm/template index 632236f5d96..29757083e84 100644 --- a/srcpkgs/pangomm/template +++ b/srcpkgs/pangomm/template @@ -1,9 +1,8 @@ # Template file for 'pangomm' pkgname=pangomm -version=2.42.1 +version=2.46.0 revision=1 -build_style=gnu-configure -configure_args="--disable-documentation" +build_style=meson hostmakedepends="pkg-config" makedepends="libsigc++-devel glibmm-devel cairomm-devel pango-devel" short_desc="C++ bindings for the pango library" @@ -11,7 +10,7 @@ maintainer="Enno Boland " license="LGPL-2.1-or-later" homepage="https://gtkmm.org" distfiles="${GNOME_SITE}/pangomm/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=14bf04939930870d5cfa96860ed953ad2ce07c3fd8713add4a1bfe585589f40f +checksum=d3787d04d6198b606f3efa357b3b452a7140e2a7dee56f9f9ce516d7d5fcec1b pangomm-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From 38612e041c3bea92280c608595380bbdd968b349 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89rico=20Rolim?= Date: Fri, 29 Jan 2021 04:37:05 -0300 Subject: [PATCH 5/5] gtkmm: update to 3.24.3. Add gdk-pixbuf to hostmakedepends, since gdk-pixbuf-pixdata is necessary during build. --- srcpkgs/gtkmm/template | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/srcpkgs/gtkmm/template b/srcpkgs/gtkmm/template index a4e24bcbf3b..8efe5d72596 100644 --- a/srcpkgs/gtkmm/template +++ b/srcpkgs/gtkmm/template @@ -1,10 +1,9 @@ # Template file for 'gtkmm' pkgname=gtkmm -version=3.24.2 +version=3.24.3 revision=1 -build_style=gnu-configure -configure_args="--disable-documentation" -hostmakedepends="automake libtool pkg-config mm-common" +build_style=meson +hostmakedepends="pkg-config mm-common gdk-pixbuf" makedepends="gtk+3-devel glibmm-devel atkmm-devel pangomm-devel" checkdepends="xvfb-run" short_desc="C++ bindings for The GTK+ toolkit (v3)" @@ -13,10 +12,10 @@ 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=6d71091bcd1863133460d4188d04102810e9123de19706fb656b7bb915b4adc3 +checksum=60497c4f7f354c3bd2557485f0254f8b7b4cf4bebc9fee0be26a77744eacd435 do_check() { - xvfb-run make check + xvfb-run ninja -C build test } gtkmm-devel_package() {