* [PR PATCH] libhandy1: various improvements
@ 2021-02-06 16:57 paper42
2021-02-06 17:29 ` [PR PATCH] [Updated] " paper42
2021-02-06 23:55 ` [PR PATCH] [Merged]: " sgn
0 siblings, 2 replies; 3+ messages in thread
From: paper42 @ 2021-02-06 16:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1772 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages 0001-libhandy1-various-improvements.patch
https://github.com/void-linux/void-packages/pull/28552
libhandy1: various improvements
* enable tests
* install demo to libhandy1-demo
* install gtk-docs
* fix license
* remove conflict of libhandy1-devel with libhandy-devel
<!-- 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/28552.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-0001-libhandy1-various-improvements.patch-28552.patch --]
[-- Type: text/x-diff, Size: 2842 bytes --]
From 8773ec28613e7045c4fd72fc2d7d27e772e7ae16 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 6 Feb 2021 17:25:35 +0100
Subject: [PATCH] libhandy1: various improvements
* enable tests
* install demo to libhandy1-demo
* install gtk-docs
* fix license
* remove conflict of libhandy1-devel with libhandy-devel
---
srcpkgs/libhandy1-demo | 1 +
srcpkgs/libhandy1/template | 28 ++++++++++++++++++++--------
2 files changed, 21 insertions(+), 8 deletions(-)
create mode 120000 srcpkgs/libhandy1-demo
diff --git a/srcpkgs/libhandy1-demo b/srcpkgs/libhandy1-demo
new file mode 120000
index 00000000000..133e5d4d748
--- /dev/null
+++ b/srcpkgs/libhandy1-demo
@@ -0,0 +1 @@
+libhandy1
\ No newline at end of file
diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template
index b1b7f1f9c32..dee91deffe0 100644
--- a/srcpkgs/libhandy1/template
+++ b/srcpkgs/libhandy1/template
@@ -1,19 +1,19 @@
# Template file for 'libhandy1'
pkgname=libhandy1
version=1.0.3
-revision=1
+revision=2
wrksrc="libhandy-${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 gir 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 gir 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="GTK+3 Building blocks for modern adaptive applications"
+checkdepends="xvfb-run"
+short_desc="GTK+3 building blocks for modern adaptive applications"
maintainer="Paper <paper@tilde.institute>"
-license="LGPL-2.0-or-later"
+license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/libhandy/"
distfiles="${GNOME_SITE}/libhandy/${version%.*}/libhandy-${version}.tar.xz"
checksum=559bb3acc2c362488917eb72ed25bdc181f4ae26ac94d177634cc5d34c867f7a
@@ -22,9 +22,12 @@ build_options="gir glade"
desc_option_glade="Generate glade modules and catalog files"
build_options_default="gir glade"
+do_check() {
+ xvfb-run ninja -C build test
+}
+
libhandy1-devel_package() {
depends="${sourcepkg}>=${version}_${revision} gtk+3-devel"
- conflicts="libhandy-devel>=0"
short_desc+=" - development files"
pkg_install() {
vmove "usr/lib/*.so"
@@ -38,5 +41,14 @@ libhandy1-devel_package() {
vmove usr/share/gir-1.0
vmove usr/share/vala
fi
+ vmove usr/share/gtk-doc
+ }
+}
+
+libhandy1-demo_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - demonstration application"
+ pkg_install() {
+ vmove usr/bin/handy-1-demo
}
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] libhandy1: various improvements
2021-02-06 16:57 [PR PATCH] libhandy1: various improvements paper42
@ 2021-02-06 17:29 ` paper42
2021-02-06 23:55 ` [PR PATCH] [Merged]: " sgn
1 sibling, 0 replies; 3+ messages in thread
From: paper42 @ 2021-02-06 17:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1777 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages 0001-libhandy1-various-improvements.patch
https://github.com/void-linux/void-packages/pull/28552
libhandy1: various improvements
* enable tests
* install demo to libhandy1-demo
* install gtk-docs
* fix license
* remove conflict of libhandy1-devel with libhandy-devel
<!-- 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/28552.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-0001-libhandy1-various-improvements.patch-28552.patch --]
[-- Type: text/x-diff, Size: 2650 bytes --]
From cff2c1aeadceb86c689a319cdfdd5ebd10cef1b9 Mon Sep 17 00:00:00 2001
From: Paper <paper@tilde.institute>
Date: Sat, 6 Feb 2021 17:25:35 +0100
Subject: [PATCH] libhandy1: various improvements
* enable tests
* install demo to libhandy1-demo
* fix license
* remove conflict of libhandy1-devel with libhandy-devel
---
srcpkgs/libhandy1-demo | 1 +
srcpkgs/libhandy1/template | 25 ++++++++++++++++++-------
2 files changed, 19 insertions(+), 7 deletions(-)
create mode 120000 srcpkgs/libhandy1-demo
diff --git a/srcpkgs/libhandy1-demo b/srcpkgs/libhandy1-demo
new file mode 120000
index 00000000000..133e5d4d748
--- /dev/null
+++ b/srcpkgs/libhandy1-demo
@@ -0,0 +1 @@
+libhandy1
\ No newline at end of file
diff --git a/srcpkgs/libhandy1/template b/srcpkgs/libhandy1/template
index b1b7f1f9c32..fa41b59229b 100644
--- a/srcpkgs/libhandy1/template
+++ b/srcpkgs/libhandy1/template
@@ -1,19 +1,19 @@
# Template file for 'libhandy1'
pkgname=libhandy1
version=1.0.3
-revision=1
+revision=2
wrksrc="libhandy-${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 gir 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 gir vala-devel)"
makedepends="gtk+3-devel libglib-devel $(vopt_if glade glade3-devel)"
-short_desc="GTK+3 Building blocks for modern adaptive applications"
+checkdepends="xvfb-run"
+short_desc="GTK+3 building blocks for modern adaptive applications"
maintainer="Paper <paper@tilde.institute>"
-license="LGPL-2.0-or-later"
+license="LGPL-2.1-or-later"
homepage="https://gitlab.gnome.org/GNOME/libhandy/"
distfiles="${GNOME_SITE}/libhandy/${version%.*}/libhandy-${version}.tar.xz"
checksum=559bb3acc2c362488917eb72ed25bdc181f4ae26ac94d177634cc5d34c867f7a
@@ -22,9 +22,12 @@ build_options="gir glade"
desc_option_glade="Generate glade modules and catalog files"
build_options_default="gir glade"
+do_check() {
+ xvfb-run ninja -C build test
+}
+
libhandy1-devel_package() {
depends="${sourcepkg}>=${version}_${revision} gtk+3-devel"
- conflicts="libhandy-devel>=0"
short_desc+=" - development files"
pkg_install() {
vmove "usr/lib/*.so"
@@ -40,3 +43,11 @@ libhandy1-devel_package() {
fi
}
}
+
+libhandy1-demo_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - demonstration application"
+ pkg_install() {
+ vmove usr/bin/handy-1-demo
+ }
+}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: libhandy1: various improvements
2021-02-06 16:57 [PR PATCH] libhandy1: various improvements paper42
2021-02-06 17:29 ` [PR PATCH] [Updated] " paper42
@ 2021-02-06 23:55 ` sgn
1 sibling, 0 replies; 3+ messages in thread
From: sgn @ 2021-02-06 23:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1567 bytes --]
There's a merged pull request on the void-packages repository
libhandy1: various improvements
https://github.com/void-linux/void-packages/pull/28552
Description:
* enable tests
* install demo to libhandy1-demo
* fix license
* remove conflict of libhandy1-devel with libhandy-devel
<!-- 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] 3+ messages in thread
end of thread, other threads:[~2021-02-06 23:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-06 16:57 [PR PATCH] libhandy1: various improvements paper42
2021-02-06 17:29 ` [PR PATCH] [Updated] " paper42
2021-02-06 23:55 ` [PR PATCH] [Merged]: " sgn
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).