From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] libadwaita: update to 1.4.0.
Date: Tue, 10 Oct 2023 14:24:57 +0200 [thread overview]
Message-ID: <20231010122457.1uBIxMvAWOdL2NA03SK-ULJuZ_vp0VktbFqSEHFzzl8@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46507@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1291 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages libadwaita-1.4
https://github.com/void-linux/void-packages/pull/46507
libadwaita: update to 1.4.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
needs to be merged after #45570
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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
-->
A patch file from https://github.com/void-linux/void-packages/pull/46507.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libadwaita-1.4-46507.patch --]
[-- Type: text/x-diff, Size: 4676 bytes --]
From e79f07ab46d3ac8f00ef3ea29ed6e7a8454f0668 Mon Sep 17 00:00:00 2001
From: Emi Vasilek <emi.vasilek@gmail.com>
Date: Sat, 7 Oct 2023 18:18:42 +0200
Subject: [PATCH 1/2] libadwaita: update to 1.4.0.
---
common/shlibs | 2 +-
srcpkgs/libadwaita/patches/disable-broken-tests.patch | 10 ----------
srcpkgs/libadwaita/template | 10 +++++-----
3 files changed, 6 insertions(+), 16 deletions(-)
delete mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
diff --git a/common/shlibs b/common/shlibs
index f70ec850d7d78..df55cc9311f38 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3487,7 +3487,7 @@ liburiparser.so.1 uriparser-0.8.6_1
libcpptest.so.1 cpptest-2.0.0_1
libhandy-0.0.so.0 libhandy-0.0.3_1
libhandy-1.so.0 libhandy1-0.90.0_1
-libadwaita-1.so.0 libadwaita-1.0.0alpha2_1
+libadwaita-1.so.0 libadwaita-1.4.0_1
libswitchboard-2.0.so.0 switchboard-2.3.2_1
libcodecore.so.0 libio.elementary.code-3.0_1
libpantheon-files-core.so.6 libio.elementary.files-6.0.0_1
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
deleted file mode 100644
index dba1ca021140c..0000000000000
--- a/srcpkgs/libadwaita/patches/disable-broken-tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/tests/meson.build
-+++ b/tests/meson.build
-@@ -36,7 +36,6 @@
- 'test-preferences-group',
- 'test-preferences-page',
- 'test-preferences-row',
-- 'test-preferences-window',
- 'test-split-button',
- 'test-squeezer',
- 'test-status-page',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index 9957cf5ff38f5..1869ddde4ff0b 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -1,6 +1,6 @@
# Template file for 'libadwaita'
pkgname=libadwaita
-version=1.3.1
+version=1.4.0
revision=1
build_style=meson
build_helper="gir"
@@ -8,15 +8,15 @@ configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
$(vopt_bool gir vapi) $(vopt_feature gir introspection)"
hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
$(vopt_if gir vala-devel) gettext sassc"
-makedepends="gtk4-devel libglib-devel harfbuzz-devel"
+makedepends="gtk4-devel libglib-devel harfbuzz-devel AppStream-devel"
checkdepends="xvfb-run cantarell-fonts"
short_desc="GTK4 building blocks for modern adaptive applications"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
-changelog="https://gitlab.gnome.org/GNOME/libadwaita/-/raw/libadwaita-1-3/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/libadwaita/-/raw/libadwaita-1-4/NEWS"
distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz"
-checksum=6b8bbf413c501b46c8616a0e5b836d7a34091140941412520bbd9ddda6df8cbd
+checksum=e51a098a54d43568218fc48fcf52e80e36f469b3ce912d8ce9c308a37e9f47c2
make_check_pre="xvfb-run"
build_options="gir gtk_doc"
@@ -30,7 +30,7 @@ pre_build() {
}
libadwaita-devel_package() {
- depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
+ depends="${sourcepkg}>=${version}_${revision} gtk4-devel AppStream-devel"
short_desc+=" - development files"
pkg_install() {
vmove "usr/lib/*.so"
From b40349fc015396d03fa438d2d86379f981ee530e Mon Sep 17 00:00:00 2001
From: Emi Vasilek <emi.vasilek@gmail.com>
Date: Tue, 10 Oct 2023 14:24:32 +0200
Subject: [PATCH 2/2] fix cu
---
srcpkgs/libadwaita/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
index 1869ddde4ff0b..074f28b4cb82a 100644
--- a/srcpkgs/libadwaita/template
+++ b/srcpkgs/libadwaita/template
@@ -9,7 +9,7 @@ configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
hostmakedepends="glib-devel pkg-config $(vopt_if gtk_doc gi-docgen)
$(vopt_if gir vala-devel) gettext sassc"
makedepends="gtk4-devel libglib-devel harfbuzz-devel AppStream-devel"
-checkdepends="xvfb-run cantarell-fonts"
+checkdepends="xvfb-run cantarell-fonts dbus"
short_desc="GTK4 building blocks for modern adaptive applications"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.0-or-later"
@@ -17,7 +17,7 @@ homepage="https://gitlab.gnome.org/GNOME/libadwaita/"
changelog="https://gitlab.gnome.org/GNOME/libadwaita/-/raw/libadwaita-1-4/NEWS"
distfiles="${GNOME_SITE}/libadwaita/${version%.*}/libadwaita-${version}.tar.xz"
checksum=e51a098a54d43568218fc48fcf52e80e36f469b3ce912d8ce9c308a37e9f47c2
-make_check_pre="xvfb-run"
+make_check_pre="dbus-run-session xvfb-run"
build_options="gir gtk_doc"
build_options_default="gir gtk_doc"
next prev parent reply other threads:[~2023-10-10 12:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-07 17:02 [PR PATCH] " paper42
2023-10-10 11:20 ` [PR PATCH] [Updated] " paper42
2023-10-10 12:24 ` paper42 [this message]
2023-10-10 13:21 ` paper42
2023-10-10 13:36 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231010122457.1uBIxMvAWOdL2NA03SK-ULJuZ_vp0VktbFqSEHFzzl8@z \
--to=paper42@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).