* [PR PATCH] Update glib and glibmm and *mm friends
@ 2021-02-03 5:41 ericonr
2021-02-03 5:43 ` [PR PATCH] [Updated] " ericonr
` (7 more replies)
0 siblings, 8 replies; 9+ messages in thread
From: ericonr @ 2021-02-03 5:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1595 bytes --]
There is a new pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages glibu
https://github.com/void-linux/void-packages/pull/28425
Update glib and glibmm and *mm friends
<!-- Mark items with [x] where applicable -->
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
I believe this is the last release series before the ABI break that uses gtk4. I will be preparing a PR for those, but I don't know what the transition period will look like.
A patch file from https://github.com/void-linux/void-packages/pull/28425.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glibu-28425.patch --]
[-- Type: text/x-diff, Size: 7021 bytes --]
From 5ca5fb8c1f95c8af76c0ffb731efc86cbd7e8c4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 28 Jan 2021 01:18:43 -0300
Subject: [PATCH 1/5] glib: update to 2.66.4.
---
srcpkgs/glib/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 0d6de76ea88..da7c929c7e2 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.4
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=97df8670e32f9fd4f7392b0980e661dd625012015d58350da1e58e343f4af984
build_options="gtk_doc"
desc_option_gtk_doc="Build GTK API docs"
From a10d7cb6a489ad0828d81f4bd6430f79f75275d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 04:36:57 -0300
Subject: [PATCH 2/5] glibmm: update to 2.66.0
---
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 <gottox@voidlinux.org>"
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 cef8a752e46..ca2cf94fb71 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
grv<=0.3.1_3
From 2cc84bc4d65cf8310fc85b871a327c03bfa7a36d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 <gottox@voidlinux.org>"
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 16ce57b6a5a689f979cd921835341a6717133244 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 <gottox@voidlinux.org>"
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 450e570f1a2fdd889287d162bdf760badd2df9f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 04:37:05 -0300
Subject: [PATCH 5/5] gtkmm: update to 3.24.3.
---
srcpkgs/gtkmm/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gtkmm/template b/srcpkgs/gtkmm/template
index a4e24bcbf3b..32b78b06228 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"
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() {
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] Update glib and glibmm and *mm friends
2021-02-03 5:41 [PR PATCH] Update glib and glibmm and *mm friends ericonr
@ 2021-02-03 5:43 ` ericonr
2021-02-03 15:13 ` ericonr
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-02-03 5:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1619 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages glibu
https://github.com/void-linux/void-packages/pull/28425
Update glib and glibmm and *mm friends
<!-- Mark items with [x] where applicable -->
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
I believe this is the last release series, the future is the ABI breaking version that uses gtk4. I will be preparing a PR for those, but I don't know what the transition period will look like.
A patch file from https://github.com/void-linux/void-packages/pull/28425.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glibu-28425.patch --]
[-- Type: text/x-diff, Size: 7044 bytes --]
From 5ca5fb8c1f95c8af76c0ffb731efc86cbd7e8c4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 28 Jan 2021 01:18:43 -0300
Subject: [PATCH 1/5] glib: update to 2.66.4.
---
srcpkgs/glib/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 0d6de76ea88..da7c929c7e2 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.4
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=97df8670e32f9fd4f7392b0980e661dd625012015d58350da1e58e343f4af984
build_options="gtk_doc"
desc_option_gtk_doc="Build GTK API docs"
From 112da28223484fe20da162486636287b78a2dd98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 <gottox@voidlinux.org>"
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 cef8a752e46..ca2cf94fb71 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
grv<=0.3.1_3
From 5979031628a904a8921e184d80058c13219d16d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 <gottox@voidlinux.org>"
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 3c6900f18c1e78b88f5e2c940ff7626a43cc89d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 <gottox@voidlinux.org>"
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 0e9c48dc106172b07ef8b866a1f2d374628f1c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 04:37:05 -0300
Subject: [PATCH 5/5] gtkmm: update to 3.24.3.
---
srcpkgs/gtkmm/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gtkmm/template b/srcpkgs/gtkmm/template
index a4e24bcbf3b..32b78b06228 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"
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() {
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] Update glib and glibmm and *mm friends
2021-02-03 5:41 [PR PATCH] Update glib and glibmm and *mm friends ericonr
2021-02-03 5:43 ` [PR PATCH] [Updated] " ericonr
@ 2021-02-03 15:13 ` ericonr
2021-02-04 3:00 ` ericonr
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-02-03 15:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1619 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages glibu
https://github.com/void-linux/void-packages/pull/28425
Update glib and glibmm and *mm friends
<!-- Mark items with [x] where applicable -->
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
I believe this is the last release series, the future is the ABI breaking version that uses gtk4. I will be preparing a PR for those, but I don't know what the transition period will look like.
A patch file from https://github.com/void-linux/void-packages/pull/28425.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glibu-28425.patch --]
[-- Type: text/x-diff, Size: 8808 bytes --]
From 5ca5fb8c1f95c8af76c0ffb731efc86cbd7e8c4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 28 Jan 2021 01:18:43 -0300
Subject: [PATCH 1/6] glib: update to 2.66.4.
---
srcpkgs/glib/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 0d6de76ea88..da7c929c7e2 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.4
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=97df8670e32f9fd4f7392b0980e661dd625012015d58350da1e58e343f4af984
build_options="gtk_doc"
desc_option_gtk_doc="Build GTK API docs"
From 112da28223484fe20da162486636287b78a2dd98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 04:36:57 -0300
Subject: [PATCH 2/6] 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 <gottox@voidlinux.org>"
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 cef8a752e46..ca2cf94fb71 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
grv<=0.3.1_3
From 5979031628a904a8921e184d80058c13219d16d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 04:36:32 -0300
Subject: [PATCH 3/6] 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 <gottox@voidlinux.org>"
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 3c6900f18c1e78b88f5e2c940ff7626a43cc89d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 04:36:08 -0300
Subject: [PATCH 4/6] 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 <gottox@voidlinux.org>"
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 0e9c48dc106172b07ef8b866a1f2d374628f1c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 04:37:05 -0300
Subject: [PATCH 5/6] gtkmm: update to 3.24.3.
---
srcpkgs/gtkmm/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gtkmm/template b/srcpkgs/gtkmm/template
index a4e24bcbf3b..32b78b06228 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"
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() {
From a5764bba0723d3ee7d7c6c1cc9e77cef1b260fab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 3 Feb 2021 12:11:05 -0300
Subject: [PATCH 6/6] glib: disable fileutils tests.
Broken on container where user is root.
---
srcpkgs/glib/patches/disable-broken-tests.patch | 12 ++++++------
1 file changed, 6 insertions(+), 6 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' : {},
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] Update glib and glibmm and *mm friends
2021-02-03 5:41 [PR PATCH] Update glib and glibmm and *mm friends ericonr
2021-02-03 5:43 ` [PR PATCH] [Updated] " ericonr
2021-02-03 15:13 ` ericonr
@ 2021-02-04 3:00 ` ericonr
2021-02-04 6:08 ` ericonr
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-02-04 3:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1619 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages glibu
https://github.com/void-linux/void-packages/pull/28425
Update glib and glibmm and *mm friends
<!-- Mark items with [x] where applicable -->
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
I believe this is the last release series, the future is the ABI breaking version that uses gtk4. I will be preparing a PR for those, but I don't know what the transition period will look like.
A patch file from https://github.com/void-linux/void-packages/pull/28425.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glibu-28425.patch --]
[-- Type: text/x-diff, Size: 8817 bytes --]
From 0cf78b15da1ced4a1ef0f1f64d6607db82445ca4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 28 Jan 2021 01:18:43 -0300
Subject: [PATCH 1/6] glib: update to 2.66.4.
---
srcpkgs/glib/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 0d6de76ea88..da7c929c7e2 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.4
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=97df8670e32f9fd4f7392b0980e661dd625012015d58350da1e58e343f4af984
build_options="gtk_doc"
desc_option_gtk_doc="Build GTK API docs"
From b73e39c5addc0f18a6c8454454b2c0900009b8c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 04:36:57 -0300
Subject: [PATCH 2/6] 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 <gottox@voidlinux.org>"
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 a6650150f440c3bb1826b07ade91443252c0c506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 04:36:32 -0300
Subject: [PATCH 3/6] 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 <gottox@voidlinux.org>"
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 2c978ee5e008e272744297f352bc25d040114108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 04:36:08 -0300
Subject: [PATCH 4/6] 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 <gottox@voidlinux.org>"
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 d42d20acc7cf835c251be67798c17318bc79e6a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Fri, 29 Jan 2021 04:37:05 -0300
Subject: [PATCH 5/6] gtkmm: update to 3.24.3.
---
srcpkgs/gtkmm/template | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gtkmm/template b/srcpkgs/gtkmm/template
index a4e24bcbf3b..32b78b06228 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"
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() {
From 490f9db87b26bca66341fce23c07c22b8d2ab22a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 3 Feb 2021 12:11:05 -0300
Subject: [PATCH 6/6] glib: disable fileutils tests.
Broken on container where user is root.
---
srcpkgs/glib/patches/disable-broken-tests.patch | 12 ++++++------
1 file changed, 6 insertions(+), 6 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' : {},
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] Update glib and glibmm and *mm friends
2021-02-03 5:41 [PR PATCH] Update glib and glibmm and *mm friends ericonr
` (2 preceding siblings ...)
2021-02-04 3:00 ` ericonr
@ 2021-02-04 6:08 ` ericonr
2021-02-04 19:01 ` ericonr
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-02-04 6:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1619 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages glibu
https://github.com/void-linux/void-packages/pull/28425
Update glib and glibmm and *mm friends
<!-- Mark items with [x] where applicable -->
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
I believe this is the last release series, the future is the ABI breaking version that uses gtk4. I will be preparing a PR for those, but I don't know what the transition period will look like.
A patch file from https://github.com/void-linux/void-packages/pull/28425.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glibu-28425.patch --]
[-- Type: text/x-diff, Size: 8698 bytes --]
From bc3fb845417b416a512e1e559f776c09942d17e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 28 Jan 2021 01:18:43 -0300
Subject: [PATCH 1/5] glib: update to 2.66.4.
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..da7c929c7e2 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.4
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=97df8670e32f9fd4f7392b0980e661dd625012015d58350da1e58e343f4af984
build_options="gtk_doc"
desc_option_gtk_doc="Build GTK API docs"
From 0cf6fa25b3ea3074b787b6af166bb9d37fcd637c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 <gottox@voidlinux.org>"
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 b78bb44a8bc2ca1800da544207554c36010e9965 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 <gottox@voidlinux.org>"
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 4169f80905ff1fc1f082fc2c4d5ff7be64f91826 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 <gottox@voidlinux.org>"
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 47e9dca7c74a647c443ddad0ca464a0ff83c8472 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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() {
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Update glib and glibmm and *mm friends
2021-02-03 5:41 [PR PATCH] Update glib and glibmm and *mm friends ericonr
` (3 preceding siblings ...)
2021-02-04 6:08 ` ericonr
@ 2021-02-04 19:01 ` ericonr
2021-02-05 1:27 ` [PR PATCH] [Updated] " ericonr
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-02-04 19:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 243 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28425#issuecomment-773534530
Comment:
https://mail.gnome.org/archives/desktop-devel-list/2021-February/msg00000.html lol, will wait for 2.66
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] Update glib and glibmm and *mm friends
2021-02-03 5:41 [PR PATCH] Update glib and glibmm and *mm friends ericonr
` (4 preceding siblings ...)
2021-02-04 19:01 ` ericonr
@ 2021-02-05 1:27 ` ericonr
2021-02-05 4:13 ` ericonr
2021-02-05 4:48 ` [PR PATCH] [Merged]: " ericonr
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-02-05 1:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1619 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages glibu
https://github.com/void-linux/void-packages/pull/28425
Update glib and glibmm and *mm friends
<!-- Mark items with [x] where applicable -->
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
I believe this is the last release series, the future is the ABI breaking version that uses gtk4. I will be preparing a PR for those, but I don't know what the transition period will look like.
A patch file from https://github.com/void-linux/void-packages/pull/28425.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glibu-28425.patch --]
[-- Type: text/x-diff, Size: 8698 bytes --]
From 77d7ea0b2718374d4d4f71711a8174c1b869d506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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?= <erico.erc@gmail.com>
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 <gottox@voidlinux.org>"
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?= <erico.erc@gmail.com>
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 <gottox@voidlinux.org>"
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?= <erico.erc@gmail.com>
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 <gottox@voidlinux.org>"
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?= <erico.erc@gmail.com>
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() {
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Updated] Update glib and glibmm and *mm friends
2021-02-03 5:41 [PR PATCH] Update glib and glibmm and *mm friends ericonr
` (5 preceding siblings ...)
2021-02-05 1:27 ` [PR PATCH] [Updated] " ericonr
@ 2021-02-05 4:13 ` ericonr
2021-02-05 4:48 ` [PR PATCH] [Merged]: " ericonr
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-02-05 4:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1619 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages glibu
https://github.com/void-linux/void-packages/pull/28425
Update glib and glibmm and *mm friends
<!-- Mark items with [x] where applicable -->
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
I believe this is the last release series, the future is the ABI breaking version that uses gtk4. I will be preparing a PR for those, but I don't know what the transition period will look like.
A patch file from https://github.com/void-linux/void-packages/pull/28425.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glibu-28425.patch --]
[-- Type: text/x-diff, Size: 9462 bytes --]
From 7767c099149aa97c1bb6cd2219572ff72e0de9c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 28 Jan 2021 01:18:43 -0300
Subject: [PATCH 1/5] glib: update to 2.66.6.
- build static libraries.
- remove LTO from build to avoid issues when linking qemu-user-static.
Thanks to leah for finding the fix.
- disable fileutils tests, broken on container where user is root.
---
srcpkgs/glib/patches/disable-broken-tests.patch | 12 ++++++------
srcpkgs/glib/template | 9 ++++++---
2 files changed, 12 insertions(+), 9 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..c011c7ef7b4 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,10 +1,12 @@
# Template file for 'glib'
pkgname=glib
-version=2.66.2
+version=2.66.6
revision=1
build_style=meson
+# static version is necessary for qemu-user-static;
+# also disable LTO, otherwise there are multiple failures when linking qemu
configure_args="-Dfam=false -Dman=true -Dselinux=disabled
- $(vopt_bool gtk_doc gtk_doc)"
+ $(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
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 dbus"
@@ -14,7 +16,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"
@@ -36,6 +38,7 @@ libglib-devel_package() {
vmove usr/lib/glib-2.0
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
+ vmove "usr/lib/*.a"
}
}
From a58088207aa2dcd97c380a6d5cb58b771331842d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 <gottox@voidlinux.org>"
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 7266e0add3ce98ec2451327fb416e9d4618245cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 <gottox@voidlinux.org>"
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 96d7f3675e5af57920d673e8f641aec2a4b8bdd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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 <gottox@voidlinux.org>"
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 c7217a78cf70c7357905be6c777f916b273dcc55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
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() {
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PR PATCH] [Merged]: Update glib and glibmm and *mm friends
2021-02-03 5:41 [PR PATCH] Update glib and glibmm and *mm friends ericonr
` (6 preceding siblings ...)
2021-02-05 4:13 ` ericonr
@ 2021-02-05 4:48 ` ericonr
7 siblings, 0 replies; 9+ messages in thread
From: ericonr @ 2021-02-05 4:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1465 bytes --]
There's a merged pull request on the void-packages repository
Update glib and glibmm and *mm friends
https://github.com/void-linux/void-packages/pull/28425
Description:
<!-- Mark items with [x] where applicable -->
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
I believe this is the last release series, the future is the ABI breaking version that uses gtk4. I will be preparing a PR for those, but I don't know what the transition period will look like.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-02-05 4:48 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-03 5:41 [PR PATCH] Update glib and glibmm and *mm friends ericonr
2021-02-03 5:43 ` [PR PATCH] [Updated] " ericonr
2021-02-03 15:13 ` ericonr
2021-02-04 3:00 ` ericonr
2021-02-04 6:08 ` ericonr
2021-02-04 19:01 ` ericonr
2021-02-05 1:27 ` [PR PATCH] [Updated] " ericonr
2021-02-05 4:13 ` ericonr
2021-02-05 4:48 ` [PR PATCH] [Merged]: " ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).