Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] libhandy: adopt, various improvements
@ 2021-02-06 16:57 paper42
  2021-02-06 17:29 ` [PR PATCH] [Updated] " paper42
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: paper42 @ 2021-02-06 16:57 UTC (permalink / raw)
  To: ml

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

There is a new pull request by paper42 against master on the void-packages repository

https://github.com/paper42/void-packages 0001-libhandy-adopt-various-improvements.patch
https://github.com/void-linux/void-packages/pull/28553

libhandy: adopt, various improvements
* enable tests
* install demo to libhandy-demo
* install gtk-docs
* fix license
* combine vala and gir build options

<!-- Mark items with [x] where applicable -->

#### General
- [ ] 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

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


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-0001-libhandy-adopt-various-improvements.patch-28553.patch --]
[-- Type: text/x-diff, Size: 3379 bytes --]

From f2ec460f32d9ea8a49a0ad4db64c54b6291ce58d Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 6 Feb 2021 17:52:43 +0100
Subject: [PATCH] libhandy: adopt, various improvements

* enable tests
* install demo to libhandy-demo
* install gtk-docs
* fix license
* combine vala and gir build options
---
 srcpkgs/libhandy-demo     |  1 +
 srcpkgs/libhandy/template | 37 ++++++++++++++++++++++++-------------
 2 files changed, 25 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/libhandy-demo

diff --git a/srcpkgs/libhandy-demo b/srcpkgs/libhandy-demo
new file mode 120000
index 00000000000..a94d500bb81
--- /dev/null
+++ b/srcpkgs/libhandy-demo
@@ -0,0 +1 @@
+libhandy
\ No newline at end of file
diff --git a/srcpkgs/libhandy/template b/srcpkgs/libhandy/template
index c19c3897efa..47ccfc840a8 100644
--- a/srcpkgs/libhandy/template
+++ b/srcpkgs/libhandy/template
@@ -1,26 +1,26 @@
 # Template file for 'libhandy'
 pkgname=libhandy
 version=0.0.13
-revision=2
+revision=3
 wrksrc="libhandy-v${version}"
 build_style=meson
 build_helper="gir"
-# tests need X anyway, so no need to build them
-configure_args="-Dexamples=false -Dtests=false $(vopt_bool vala vapi)
- -Dglade_catalog=$(vopt_if glade enabled disabled)
+configure_args="-Dexamples=true -Dtests=true -Dgtk_doc=true
+ $(vopt_bool gir vapi) -Dglade_catalog=$(vopt_if glade enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if vala vala-devel)"
+hostmakedepends="glib-devel pkg-config gtk-doc $(vopt_if gir vala-devel)"
 makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)"
-short_desc="Library full of GTK+ widgets for mobile phones"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.0-or-later"
+checkdepends="xvfb-run"
+short_desc="GTK+3 building blocks for modern adaptive applications"
+maintainer="Paper <paper@tilde.institute>"
+license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libhandy"
-distfiles="$homepage/-/archive/v${version}/libhandy-v${version}.tar.gz"
+distfiles="https://gitlab.gnome.org/GNOME/libhandy/-/archive/v${version}/libhandy-v${version}.tar.gz"
 checksum=645355a009f23f254eaec7752b9489c3c2f5832397fcec75433a7e00efbfe52f
 
-build_options="gir vala glade"
+build_options="gir glade"
 desc_option_glade="Generate glade modules and catalog files"
-build_options_default="gir vala glade"
+build_options_default="gir glade"
 
 # https://gitlab.gnome.org/GNOME/libhandy/-/merge_requests/559
 CFLAGS="-DGPC_OBJECT_DELIMITER=GLADE_PROPERTY_DEF_OBJECT_DELIMITER"
@@ -28,6 +28,10 @@ CFLAGS+=" -Dglade_widget_action_get_class=glade_widget_action_get_def"
 # https://gitlab.gnome.org/GNOME/glade/-/commit/bb626dd
 CFLAGS+=" -DGWA_GET_CLASS=GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS"
 
+do_check() {
+	xvfb-run ninja -C build test
+}
+
 libhandy-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} gtk+3-devel"
 	short_desc+=" - development files"
@@ -41,9 +45,16 @@ libhandy-devel_package() {
 		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
+		vmove usr/share/gtk-doc
+	}
+}
+
+libhandy-demo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - demonstration application"
+	pkg_install() {
+		vmove usr/bin/handy-0.0-demo
 	}
 }

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Updated] libhandy: adopt, various improvements
  2021-02-06 16:57 [PR PATCH] libhandy: adopt, various improvements paper42
@ 2021-02-06 17:29 ` paper42
  2021-02-06 22:08 ` paper42
  2021-02-10  1:01 ` [PR PATCH] [Merged]: " ericonr
  2 siblings, 0 replies; 4+ messages in thread
From: paper42 @ 2021-02-06 17:29 UTC (permalink / raw)
  To: ml

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

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

https://github.com/paper42/void-packages 0001-libhandy-adopt-various-improvements.patch
https://github.com/void-linux/void-packages/pull/28553

libhandy: adopt, various improvements
* enable tests
* install demo to libhandy-demo
* install gtk-docs
* fix license
* combine vala and gir build options

<!-- Mark items with [x] where applicable -->

#### General
- [ ] 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

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


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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-0001-libhandy-adopt-various-improvements.patch-28553.patch --]
[-- Type: text/x-diff, Size: 3309 bytes --]

From ce0de892ee98aa0b48c4e695913834304eed770d Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 6 Feb 2021 17:52:43 +0100
Subject: [PATCH] libhandy: adopt, various improvements

* enable tests
* install demo to libhandy-demo
* fix license
* combine vala and gir build options
---
 srcpkgs/libhandy-demo     |  1 +
 srcpkgs/libhandy/template | 36 +++++++++++++++++++++++-------------
 2 files changed, 24 insertions(+), 13 deletions(-)
 create mode 120000 srcpkgs/libhandy-demo

diff --git a/srcpkgs/libhandy-demo b/srcpkgs/libhandy-demo
new file mode 120000
index 00000000000..a94d500bb81
--- /dev/null
+++ b/srcpkgs/libhandy-demo
@@ -0,0 +1 @@
+libhandy
\ No newline at end of file
diff --git a/srcpkgs/libhandy/template b/srcpkgs/libhandy/template
index c19c3897efa..796cd46e735 100644
--- a/srcpkgs/libhandy/template
+++ b/srcpkgs/libhandy/template
@@ -1,26 +1,26 @@
 # Template file for 'libhandy'
 pkgname=libhandy
 version=0.0.13
-revision=2
+revision=3
 wrksrc="libhandy-v${version}"
 build_style=meson
 build_helper="gir"
-# tests need X anyway, so no need to build them
-configure_args="-Dexamples=false -Dtests=false $(vopt_bool vala vapi)
- -Dglade_catalog=$(vopt_if glade enabled disabled)
+configure_args="-Dexamples=true -Dtests=true
+ $(vopt_bool gir vapi) -Dglade_catalog=$(vopt_if glade enabled disabled)
  -Dintrospection=$(vopt_if gir enabled disabled)"
-hostmakedepends="glib-devel pkg-config $(vopt_if vala vala-devel)"
+hostmakedepends="glib-devel pkg-config $(vopt_if gir vala-devel)"
 makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)"
-short_desc="Library full of GTK+ widgets for mobile phones"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.0-or-later"
+checkdepends="xvfb-run"
+short_desc="GTK+3 building blocks for modern adaptive applications"
+maintainer="Paper <paper@tilde.institute>"
+license="LGPL-2.1-or-later"
 homepage="https://gitlab.gnome.org/GNOME/libhandy"
-distfiles="$homepage/-/archive/v${version}/libhandy-v${version}.tar.gz"
+distfiles="https://gitlab.gnome.org/GNOME/libhandy/-/archive/v${version}/libhandy-v${version}.tar.gz"
 checksum=645355a009f23f254eaec7752b9489c3c2f5832397fcec75433a7e00efbfe52f
 
-build_options="gir vala glade"
+build_options="gir glade"
 desc_option_glade="Generate glade modules and catalog files"
-build_options_default="gir vala glade"
+build_options_default="gir glade"
 
 # https://gitlab.gnome.org/GNOME/libhandy/-/merge_requests/559
 CFLAGS="-DGPC_OBJECT_DELIMITER=GLADE_PROPERTY_DEF_OBJECT_DELIMITER"
@@ -28,6 +28,10 @@ CFLAGS+=" -Dglade_widget_action_get_class=glade_widget_action_get_def"
 # https://gitlab.gnome.org/GNOME/glade/-/commit/bb626dd
 CFLAGS+=" -DGWA_GET_CLASS=GLADE_WIDGET_ADAPTOR_GET_ADAPTOR_CLASS"
 
+do_check() {
+	xvfb-run ninja -C build test
+}
+
 libhandy-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision} gtk+3-devel"
 	short_desc+=" - development files"
@@ -41,9 +45,15 @@ libhandy-devel_package() {
 		fi
 		if [ "$build_option_gir" ]; then
 			vmove usr/share/gir-1.0
-		fi
-		if [ "$build_option_vala" ]; then
 			vmove usr/share/vala
 		fi
 	}
 }
+
+libhandy-demo_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - demonstration application"
+	pkg_install() {
+		vmove usr/bin/handy-0.0-demo
+	}
+}

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: libhandy: adopt, various improvements
  2021-02-06 16:57 [PR PATCH] libhandy: adopt, various improvements paper42
  2021-02-06 17:29 ` [PR PATCH] [Updated] " paper42
@ 2021-02-06 22:08 ` paper42
  2021-02-10  1:01 ` [PR PATCH] [Merged]: " ericonr
  2 siblings, 0 replies; 4+ messages in thread
From: paper42 @ 2021-02-06 22:08 UTC (permalink / raw)
  To: ml

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/28553#issuecomment-774550886

Comment:
one test fails, but it works on my system:

```
The output from the failed tests:

19/22 test-swipe-group         FAIL           0.23s (killed by signal 5 SIGTRAP)

--- command ---
17:34:11 G_TEST_SRCDIR='/builddir/libhandy-v0.0.13/tests' PYTHONDONTWRITEBYTECODE='yes' GSETTINGS_BACKEND='memory' G_DEBUG='gc-friendly,fatal-warnings' MALLOC_CHECK_='2' G_TEST_BUILDDIR='/builddir/libhandy-v0.0.13/build/tests' /builddir/libhandy-v0.0.13/build/tests/test-swipe-group
--- stdout ---
# random seed: R02S05af253c32dbaf8a702833509942dece
--- stderr ---
Unable to init server: Could not connect: Connection refused

(/builddir/libhandy-v0.0.13/build/tests/test-swipe-group:4586): Gtk-WARNING **: 17:34:11.398: cannot open display: :99
-------
```

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Merged]: libhandy: adopt, various improvements
  2021-02-06 16:57 [PR PATCH] libhandy: adopt, various improvements paper42
  2021-02-06 17:29 ` [PR PATCH] [Updated] " paper42
  2021-02-06 22:08 ` paper42
@ 2021-02-10  1:01 ` ericonr
  2 siblings, 0 replies; 4+ messages in thread
From: ericonr @ 2021-02-10  1:01 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

libhandy: adopt, various improvements
https://github.com/void-linux/void-packages/pull/28553

Description:
* enable tests
* install demo to libhandy-demo
* fix license
* combine vala and gir build options

<!-- Mark items with [x] where applicable -->

#### General
- [ ] 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

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


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-02-10  1:01 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-06 16:57 [PR PATCH] libhandy: adopt, various improvements paper42
2021-02-06 17:29 ` [PR PATCH] [Updated] " paper42
2021-02-06 22:08 ` paper42
2021-02-10  1:01 ` [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).