Github messages for voidlinux
 help / color / mirror / Atom feed
From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [NOMERGE] libadwaita, gi-docgen
Date: Wed, 04 Aug 2021 23:48:15 +0200	[thread overview]
Message-ID: <20210804214815.bXm4zV4as1m5-Vtn9m4sD1890eIfUKc2_OU8crMAEBo@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-31102@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 951 bytes --]

There is an updated pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages libadwaita
https://github.com/void-linux/void-packages/pull/31102

[NOMERGE] libadwaita, gi-docgen
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### 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

libadwaita needs to wait for a release
gi-docgen is a documentation generator for GObject-based libraries, it will replace gtk-doc in some projects

A patch file from https://github.com/void-linux/void-packages/pull/31102.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libadwaita-31102.patch --]
[-- Type: text/x-diff, Size: 8434 bytes --]

From 894be4f209eb5953d4454d1ca3fd2d2445fe67d5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 21:01:55 +0200
Subject: [PATCH 1/3] vala: update to 0.52.2.

---
 common/shlibs                                 |  2 +-
 .../vala/patches/disable-unstable-tests.patch | 21 +++++++++++++++++++
 srcpkgs/vala/template                         | 17 +++++++++------
 3 files changed, 33 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/vala/patches/disable-unstable-tests.patch

diff --git a/common/shlibs b/common/shlibs
index f768a637aed5..7a0c44e9a713 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3119,7 +3119,7 @@ libmirage.so.11 libmirage-3.1.0_1
 libwkhtmltox.so.0 libwkhtmltopdf-0.12.5_1
 libsysprof-4.so sysprof-3.37.90_1
 libsysprof-ui-4.so sysprof-3.37.90_1
-libvala-0.50.so.0 libvala-0.50.0_1
+libvala-0.52.so.0 libvala-0.52.0_1
 libvaladoc-0.50.so.0 libvaladoc-0.50.0_1
 libvalaccodegen.so libvala-0.44.0_1
 libphodav-2.0.so.0 phodav-2.2_1
diff --git a/srcpkgs/vala/patches/disable-unstable-tests.patch b/srcpkgs/vala/patches/disable-unstable-tests.patch
new file mode 100644
index 000000000000..16d2da6150e4
--- /dev/null
+++ b/srcpkgs/vala/patches/disable-unstable-tests.patch
@@ -0,0 +1,21 @@
+This patch disables unstable tests:
+
+* dbus/filedescriptor.test: Fails on github-ci, but passes on other linux systems.
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -703,7 +703,6 @@ TESTS = \
+ 	dbus/dynamic-method.test \
+ 	dbus/enum-string-marshalling.vala \
+ 	dbus/signals.test \
+-	dbus/filedescriptor.test \
+ 	dbus/filedescriptor-async.test \
+ 	dbus/filedescriptor-errors.test \
+ 	dbus/dicts.test \
+@@ -1236,7 +1235,6 @@ endif
+ if ENABLE_TEST_ASAN
+ XFAIL_TESTS = \
+ 	objects/property-array.vala \
+-	dbus/filedescriptor-errors.test \
+ 	$(NULL)
+ endif
+ 
diff --git a/srcpkgs/vala/template b/srcpkgs/vala/template
index 4250b7f044a1..57e68b81c41f 100644
--- a/srcpkgs/vala/template
+++ b/srcpkgs/vala/template
@@ -1,11 +1,11 @@
 # Template file for 'vala'
 pkgname=vala
 # Should be kept in sync with 'valadoc' (shared distfiles)
-version=0.50.0
-revision=2
+version=0.52.2
+revision=1
 build_style=gnu-configure
 configure_args="--disable-valadoc"
-hostmakedepends="flex libxslt pkg-config"
+hostmakedepends="flex libxslt pkg-config automake libtool"
 makedepends="libfl-devel libglib-devel"
 checkdepends="dbus libgirepository-devel"
 short_desc="Compiler for the GObject type system"
@@ -14,16 +14,21 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Vala"
 changelog="https://gitlab.gnome.org/GNOME/vala/raw/0.50/NEWS"
 distfiles="${GNOME_SITE}/vala/${version%.*}/vala-${version}.tar.xz"
-checksum=838adc50ac08881e06cf233fefd93740dec1530312cc1cf12c36d4e0e87d3071
+checksum=3a3c460803ba661e513be3d0984b583e05473f602c75fa98e91755503714a97b
 shlib_provides="libvalaccodegen.so"
+make_check=extended
+
+pre_configure() {
+	autoreconf -if
+}
 
 post_install() {
 	# remove the /usr/bin prefix from the vapigen variable
 	# so the package that use it fall into our wrapper.
 	# keep the binary versioned, we don't know the potential
 	# fallout from using the unversioned one
-	vsed -e 's|^vapigen=.*|vapigen=vapigen-0.50|g' \
-		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-0.50.pc
+	vsed -e "s|^vapigen=.*|vapigen=vapigen-${version%.*}|g" \
+		 -i ${DESTDIR}/usr/lib/pkgconfig/vapigen-${version%.*}.pc
 }
 
 libvala_package() {

From 493137d9c57802291a90b023c7ea4418bdfa048e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Wed, 21 Apr 2021 21:19:57 +0200
Subject: [PATCH 2/3] io.elementary.code: rebuild with vala-0.52.2

---
 srcpkgs/io.elementary.code/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template
index 8d43ad4130d2..66de4b50be05 100644
--- a/srcpkgs/io.elementary.code/template
+++ b/srcpkgs/io.elementary.code/template
@@ -1,7 +1,7 @@
 # Template file for 'io.elementary.code'
 pkgname=io.elementary.code
 version=3.4.1
-revision=3
+revision=4
 wrksrc="code-${version}"
 build_style=meson
 hostmakedepends="pkg-config vala intltool glib-devel"

From 2a792fd151ed830f274535234b6de4d5ea04d32b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 23 Jul 2021 22:52:02 +0200
Subject: [PATCH 3/3] New package: libadwaita-1.0.0a2

---
 common/shlibs                                 |  1 +
 srcpkgs/libadwaita-demo                       |  1 +
 srcpkgs/libadwaita-devel                      |  1 +
 .../patches/disable-broken-tests.patch        | 10 ++++
 srcpkgs/libadwaita/template                   | 59 +++++++++++++++++++
 srcpkgs/libadwaita/update                     |  1 +
 6 files changed, 73 insertions(+)
 create mode 120000 srcpkgs/libadwaita-demo
 create mode 120000 srcpkgs/libadwaita-devel
 create mode 100644 srcpkgs/libadwaita/patches/disable-broken-tests.patch
 create mode 100644 srcpkgs/libadwaita/template
 create mode 100644 srcpkgs/libadwaita/update

diff --git a/common/shlibs b/common/shlibs
index 7a0c44e9a713..6b893dbee12c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4027,3 +4027,4 @@ librnnoise.so.0 rnnoise-0.4.1_1
 liblhasa.so.0 lhasa-0.3.1_2
 libmt32emu.so.2 libmt32emu-2.5.1_1
 libqrtr-glib.so.0 libqrtr-glib-1.0.0_1
+libadwaita-1.so.0 libadwaita-0.0.0.2021.04.17_1
diff --git a/srcpkgs/libadwaita-demo b/srcpkgs/libadwaita-demo
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-demo
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita-devel b/srcpkgs/libadwaita-devel
new file mode 120000
index 000000000000..0d8db913cd66
--- /dev/null
+++ b/srcpkgs/libadwaita-devel
@@ -0,0 +1 @@
+libadwaita
\ No newline at end of file
diff --git a/srcpkgs/libadwaita/patches/disable-broken-tests.patch b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
new file mode 100644
index 000000000000..f7a101abbdc3
--- /dev/null
+++ b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
@@ -0,0 +1,10 @@
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -22,7 +22,6 @@
+ test_names = [
+   'test-action-row',
+   'test-application-window',
+-  'test-avatar',
+   'test-bin',
+   'test-carousel',
+   'test-carousel-indicator-dots',
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
new file mode 100644
index 000000000000..0299638f97fc
--- /dev/null
+++ b/srcpkgs/libadwaita/template
@@ -0,0 +1,59 @@
+# Template file for 'libadwaita'
+pkgname=libadwaita
+version=1.0.0a2
+revision=1
+_ver=1.0.0-alpha.2
+wrksrc="$pkgname-$_ver"
+build_style=meson
+build_helper="gir"
+configure_args="-Dexamples=true -Dtests=true $(vopt_bool gtk_doc)
+ $(vopt_bool gir vapi) -Dintrospection=$(vopt_if gir enabled disabled)"
+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"
+checkdepends="xvfb-run"
+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/"
+distfiles="https://gitlab.gnome.org/GNOME/libadwaita/-/archive/$_ver/libadwaita-$_ver.tar.gz"
+checksum=0b59561825eab9e4b930e330eb64a5eef29d1d797549bbf2a734158d6cb347fd
+
+build_options="gir gtk_doc"
+build_options_default="gir gtk_doc"
+
+do_check() {
+	xvfb-run ninja -C build test
+}
+
+pre_build() {
+	# help gi-docgen find gi files on cross
+	if [ -n "$CROSS_BUILD" ]; then
+		export XDG_DATA_DIRS=/usr/$XBPS_CROSS_TRIPLET/usr/share/
+	fi
+}
+
+libadwaita-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} gtk4-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		if [ "$build_option_gir" ]; then
+			vmove usr/share/gir-1.0
+			vmove usr/share/vala
+		fi
+		if [ "$build_option_gtk_doc" ]; then
+			vmove usr/share/doc/libadwaita-1
+		fi
+	}
+}
+
+libadwaita-demo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - demonstration application"
+	pkg_install() {
+		vmove usr/bin/adwaita-1-demo
+	}
+}
diff --git a/srcpkgs/libadwaita/update b/srcpkgs/libadwaita/update
new file mode 100644
index 000000000000..4844cc1ef598
--- /dev/null
+++ b/srcpkgs/libadwaita/update
@@ -0,0 +1 @@
+pattern='/libadwaita-\K.*(?=\.tar\.gz")'

  parent reply	other threads:[~2021-08-04 21:48 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-24 23:15 [PR PATCH] " paper42
2021-05-31 22:17 ` [PR PATCH] [Updated] " paper42
2021-06-01 13:06 ` paper42
2021-07-23 20:57 ` paper42
2021-07-23 21:22 ` paper42
2021-08-04 21:38 ` paper42
2021-08-04 21:48 ` paper42 [this message]
2021-08-08 13:02 ` [PR PATCH] [Updated] New package: libadwaita-1.0.0a2 paper42
2021-08-08 16:11 ` [PR PATCH] [Merged]: New package: libadwaita-1.0.0alpha2 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=20210804214815.bXm4zV4as1m5-Vtn9m4sD1890eIfUKc2_OU8crMAEBo@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).