* Re: [PR PATCH] [Updated] [NOMERGE] libadwaita, gi-docgen
2021-05-24 23:15 [PR PATCH] [NOMERGE] libadwaita, gi-docgen paper42
@ 2021-05-31 22:17 ` paper42
2021-06-01 13:06 ` paper42
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: paper42 @ 2021-05-31 22:17 UTC (permalink / raw)
To: ml
[-- 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: 7634 bytes --]
From 75c46b7c08389cb488b7a68b0fc59026e50183ac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:28:46 +0200
Subject: [PATCH 1/4] New package: python3-smartypants-2.0.1
---
srcpkgs/python3-smartypants/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/python3-smartypants/template
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
new file mode 100644
index 000000000000..703954559d76
--- /dev/null
+++ b/srcpkgs/python3-smartypants/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-smartypants'
+pkgname=python3-smartypants
+version=2.0.1
+revision=1
+wrksrc="smartypants.py-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+checkdepends="python3-docutils"
+depends="python3"
+short_desc="Python with the SmartyPants"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/leohemsted/smartypants.py/"
+distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
+checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
From e3454a81411efa7a849d5a634242301532fedfb7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:28:53 +0200
Subject: [PATCH 2/4] New package: python3-typogrify-2.0.7
---
srcpkgs/python3-typogrify/template | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/python3-typogrify/template
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
new file mode 100644
index 000000000000..94274c68604a
--- /dev/null
+++ b/srcpkgs/python3-typogrify/template
@@ -0,0 +1,15 @@
+# Template file for 'python3-typogrify'
+pkgname=python3-typogrify
+version=2.0.7
+revision=1
+wrksrc="typogrify-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-smartypants"
+short_desc="Filters to enhance web typography"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/mintchaos/typogrify"
+distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
+checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
+make_check=no # conflicting dependencies
From 7b5389589d481094ff91a2608c8870e534ccc049 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:29:00 +0200
Subject: [PATCH 3/4] New package: gi-docgen-2021.6
---
srcpkgs/gi-docgen/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/gi-docgen/template
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
new file mode 100644
index 000000000000..d98b8ad90e3e
--- /dev/null
+++ b/srcpkgs/gi-docgen/template
@@ -0,0 +1,14 @@
+# Template file for 'gi-docgen'
+pkgname=gi-docgen
+version=2021.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
+short_desc="Documentation generator for GObject-based libraries"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="Apache-2.0, GPL-3.0-or-later"
+homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
+distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
+checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
+make_check=no # no tests, but check fails
From 2e9df83499e59b3f4369d80715c7d847932981b0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 9 Mar 2021 17:08:52 +0100
Subject: [PATCH 4/4] New package: libadwaita-1.0.0a1
---
common/shlibs | 1 +
srcpkgs/libadwaita-devel | 1 +
.../libadwaita/patches/fix-cross-doc.patch | 19 +++++++
srcpkgs/libadwaita/template | 49 +++++++++++++++++++
srcpkgs/libadwaita/update | 1 +
5 files changed, 71 insertions(+)
create mode 120000 srcpkgs/libadwaita-devel
create mode 100644 srcpkgs/libadwaita/patches/fix-cross-doc.patch
create mode 100644 srcpkgs/libadwaita/template
create mode 100644 srcpkgs/libadwaita/update
diff --git a/common/shlibs b/common/shlibs
index 3de2c2bc64c2..047926b77223 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3991,3 +3991,4 @@ libbasu.so.0 basu-0.2.0_1
libXcomp.so.3 nx-libs-3.5.99.24_1
libXcompshad.so.3 nx-libs-3.5.99.24_1
libNX_X11.so.6 nx-libs-3.5.99.24_1
+libadwaita-1.so.0 libadwaita-0.0.0.2021.04.17_1
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/fix-cross-doc.patch b/srcpkgs/libadwaita/patches/fix-cross-doc.patch
new file mode 100644
index 000000000000..8967a6f5a1da
--- /dev/null
+++ b/srcpkgs/libadwaita/patches/fix-cross-doc.patch
@@ -0,0 +1,19 @@
+--- doc/meson.build
++++ doc/meson.build
+@@ -17,6 +17,7 @@ libadwaita_toml = configure_file(
+
+ dependency('gi-docgen', version: '>= 2021.1',
+ fallback: ['gi-docgen', 'dummy_dep'],
++ native: true,
+ required: get_option('gtk_doc'))
+
+ gidocgen = find_program('gi-docgen', native: true)
+@@ -27,7 +28,7 @@ custom_target('libadwaita-doc',
+ input: [ libadwaita_toml, libadwaita_gir[0] ],
+ output: 'libadwaita-@0@'.format(apiversion),
+ command: [
+- gidocgen,
++ 'gi-docgen',
+ 'generate',
+ '--quiet',
+ '--add-include-path=@0@'.format(meson.current_build_dir() / '../../src'),
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
new file mode 100644
index 000000000000..7806c087b406
--- /dev/null
+++ b/srcpkgs/libadwaita/template
@@ -0,0 +1,49 @@
+# Template file for 'libadwaita'
+pkgname=libadwaita
+version=1.0.0a1
+revision=1
+_ver=1.0.0-alpha.1
+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=15b99dd4116bd0d8c6e98b2ec8867a254cd109d96c112096cf90a8cd5b764e24
+
+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
+ vmove usr/share/doc/libadwaita-1
+ }
+}
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")'
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] [NOMERGE] libadwaita, gi-docgen
2021-05-24 23:15 [PR PATCH] [NOMERGE] libadwaita, gi-docgen paper42
2021-05-31 22:17 ` [PR PATCH] [Updated] " paper42
@ 2021-06-01 13:06 ` paper42
2021-07-23 20:57 ` paper42
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: paper42 @ 2021-06-01 13:06 UTC (permalink / raw)
To: ml
[-- 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: 7953 bytes --]
From bde16043794f74f397d8d5a5780bd5368af39c96 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:28:46 +0200
Subject: [PATCH 1/4] New package: python3-smartypants-2.0.1
---
srcpkgs/python3-smartypants/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/python3-smartypants/template
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
new file mode 100644
index 000000000000..728196e7100c
--- /dev/null
+++ b/srcpkgs/python3-smartypants/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-smartypants'
+pkgname=python3-smartypants
+version=2.0.1
+revision=1
+wrksrc="smartypants.py-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-docutils"
+short_desc="Python with the SmartyPants"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/leohemsted/smartypants.py/"
+distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
+checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
+
+post_install() {
+ vlicense COPYING
+}
From 557b4430253ef52e7641a7c693e0847832f6d3eb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:28:53 +0200
Subject: [PATCH 2/4] New package: python3-typogrify-2.0.7
---
srcpkgs/python3-typogrify/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/python3-typogrify/template
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
new file mode 100644
index 000000000000..adef37d8b2a4
--- /dev/null
+++ b/srcpkgs/python3-typogrify/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-typogrify'
+pkgname=python3-typogrify
+version=2.0.7
+revision=1
+wrksrc="typogrify-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-smartypants"
+short_desc="Filters to enhance web typography"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/mintchaos/typogrify"
+distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
+checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
+make_check=no # conflicting dependencies
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 3c343e1806566a6d61b61938a20b04bbc027be20 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:29:00 +0200
Subject: [PATCH 3/4] New package: gi-docgen-2021.6
---
srcpkgs/gi-docgen/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/gi-docgen/template
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
new file mode 100644
index 000000000000..d98b8ad90e3e
--- /dev/null
+++ b/srcpkgs/gi-docgen/template
@@ -0,0 +1,14 @@
+# Template file for 'gi-docgen'
+pkgname=gi-docgen
+version=2021.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
+short_desc="Documentation generator for GObject-based libraries"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="Apache-2.0, GPL-3.0-or-later"
+homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
+distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
+checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
+make_check=no # no tests, but check fails
From 2f030e65b16edb0f4f0c33a94cf37dcceed65a43 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 9 Mar 2021 17:08:52 +0100
Subject: [PATCH 4/4] New package: libadwaita-1.0.0a1
---
common/shlibs | 1 +
srcpkgs/libadwaita-demo | 1 +
srcpkgs/libadwaita-devel | 1 +
.../libadwaita/patches/fix-cross-doc.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/fix-cross-doc.patch
create mode 100644 srcpkgs/libadwaita/template
create mode 100644 srcpkgs/libadwaita/update
diff --git a/common/shlibs b/common/shlibs
index 2485880dfe80..5665cb57e676 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4006,3 +4006,4 @@ libbasu.so.0 basu-0.2.0_1
libXcomp.so.3 nx-libs-3.5.99.24_1
libXcompshad.so.3 nx-libs-3.5.99.24_1
libNX_X11.so.6 nx-libs-3.5.99.24_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/fix-cross-doc.patch b/srcpkgs/libadwaita/patches/fix-cross-doc.patch
new file mode 100644
index 000000000000..9a8724bca5f1
--- /dev/null
+++ b/srcpkgs/libadwaita/patches/fix-cross-doc.patch
@@ -0,0 +1,10 @@
+--- doc/meson.build
++++ doc/meson.build
+@@ -17,6 +17,7 @@ libadwaita_toml = configure_file(
+
+ dependency('gi-docgen', version: '>= 2021.1',
+ fallback: ['gi-docgen', 'dummy_dep'],
++ native: true,
+ required: get_option('gtk_doc'))
+
+ gidocgen = find_program('gi-docgen', native: true)
diff --git a/srcpkgs/libadwaita/template b/srcpkgs/libadwaita/template
new file mode 100644
index 000000000000..3631d884450d
--- /dev/null
+++ b/srcpkgs/libadwaita/template
@@ -0,0 +1,59 @@
+# Template file for 'libadwaita'
+pkgname=libadwaita
+version=1.0.0a1
+revision=1
+_ver=1.0.0-alpha.1
+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=15b99dd4116bd0d8c6e98b2ec8867a254cd109d96c112096cf90a8cd5b764e24
+
+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")'
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] [NOMERGE] libadwaita, gi-docgen
2021-05-24 23:15 [PR PATCH] [NOMERGE] libadwaita, gi-docgen 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
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: paper42 @ 2021-07-23 20:57 UTC (permalink / raw)
To: ml
[-- 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: 7186 bytes --]
From dbf83a4d8c268aff34d41711ae777203431ce04d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:28:46 +0200
Subject: [PATCH 1/4] New package: python3-smartypants-2.0.1
---
srcpkgs/python3-smartypants/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/python3-smartypants/template
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
new file mode 100644
index 000000000000..728196e7100c
--- /dev/null
+++ b/srcpkgs/python3-smartypants/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-smartypants'
+pkgname=python3-smartypants
+version=2.0.1
+revision=1
+wrksrc="smartypants.py-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-docutils"
+short_desc="Python with the SmartyPants"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/leohemsted/smartypants.py/"
+distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
+checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
+
+post_install() {
+ vlicense COPYING
+}
From 91f2b21672ecfb10d3d6b86e84761834b30ab441 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:28:53 +0200
Subject: [PATCH 2/4] New package: python3-typogrify-2.0.7
---
srcpkgs/python3-typogrify/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/python3-typogrify/template
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
new file mode 100644
index 000000000000..adef37d8b2a4
--- /dev/null
+++ b/srcpkgs/python3-typogrify/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-typogrify'
+pkgname=python3-typogrify
+version=2.0.7
+revision=1
+wrksrc="typogrify-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-smartypants"
+short_desc="Filters to enhance web typography"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/mintchaos/typogrify"
+distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
+checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
+make_check=no # conflicting dependencies
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 5d7a2f2bc3659ae061d0ee06408425b064dc84d9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:29:00 +0200
Subject: [PATCH 3/4] New package: gi-docgen-2021.6
---
srcpkgs/gi-docgen/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/gi-docgen/template
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
new file mode 100644
index 000000000000..d98b8ad90e3e
--- /dev/null
+++ b/srcpkgs/gi-docgen/template
@@ -0,0 +1,14 @@
+# Template file for 'gi-docgen'
+pkgname=gi-docgen
+version=2021.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
+short_desc="Documentation generator for GObject-based libraries"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="Apache-2.0, GPL-3.0-or-later"
+homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
+distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
+checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
+make_check=no # no tests, but check fails
From fcf653d4fdaabee87f1465688601fce89b2adbde Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 23 Jul 2021 22:52:02 +0200
Subject: [PATCH 4/4] New package: libadwaita-1.0.0a2
---
common/shlibs | 1 +
srcpkgs/libadwaita-demo | 1 +
srcpkgs/libadwaita-devel | 1 +
srcpkgs/libadwaita/template | 59 +++++++++++++++++++++++++++++++++++++
srcpkgs/libadwaita/update | 1 +
5 files changed, 63 insertions(+)
create mode 120000 srcpkgs/libadwaita-demo
create mode 120000 srcpkgs/libadwaita-devel
create mode 100644 srcpkgs/libadwaita/template
create mode 100644 srcpkgs/libadwaita/update
diff --git a/common/shlibs b/common/shlibs
index a7afbf2a56f7..cc42bad845d3 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/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")'
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] [NOMERGE] libadwaita, gi-docgen
2021-05-24 23:15 [PR PATCH] [NOMERGE] libadwaita, gi-docgen paper42
` (2 preceding siblings ...)
2021-07-23 20:57 ` paper42
@ 2021-07-23 21:22 ` paper42
2021-08-04 21:38 ` paper42
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: paper42 @ 2021-07-23 21:22 UTC (permalink / raw)
To: ml
[-- 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: 11363 bytes --]
From 15d8cef5efdeabdebc397ca85226ae247fa1165d 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/6] 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 a7afbf2a56f7..6cc491f96a9b 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 22f59ae265a9a6629bfae82c0b34a0c62792c24d 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/6] 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 e252de9862e5ef8f23877f5e9749bb3ca8b2a883 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:28:46 +0200
Subject: [PATCH 3/6] New package: python3-smartypants-2.0.1
---
srcpkgs/python3-smartypants/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/python3-smartypants/template
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
new file mode 100644
index 000000000000..728196e7100c
--- /dev/null
+++ b/srcpkgs/python3-smartypants/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-smartypants'
+pkgname=python3-smartypants
+version=2.0.1
+revision=1
+wrksrc="smartypants.py-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-docutils"
+short_desc="Python with the SmartyPants"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/leohemsted/smartypants.py/"
+distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
+checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
+
+post_install() {
+ vlicense COPYING
+}
From de98002fa9a94a7a15aa1bbc1419e72a28e3e2d5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:28:53 +0200
Subject: [PATCH 4/6] New package: python3-typogrify-2.0.7
---
srcpkgs/python3-typogrify/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/python3-typogrify/template
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
new file mode 100644
index 000000000000..adef37d8b2a4
--- /dev/null
+++ b/srcpkgs/python3-typogrify/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-typogrify'
+pkgname=python3-typogrify
+version=2.0.7
+revision=1
+wrksrc="typogrify-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-smartypants"
+short_desc="Filters to enhance web typography"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/mintchaos/typogrify"
+distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
+checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
+make_check=no # conflicting dependencies
+
+post_install() {
+ vlicense LICENSE.txt
+}
From 5763bf7afd28edbdc7481d55e07b78e1f8c7a613 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:29:00 +0200
Subject: [PATCH 5/6] New package: gi-docgen-2021.6
---
srcpkgs/gi-docgen/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/gi-docgen/template
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
new file mode 100644
index 000000000000..d98b8ad90e3e
--- /dev/null
+++ b/srcpkgs/gi-docgen/template
@@ -0,0 +1,14 @@
+# Template file for 'gi-docgen'
+pkgname=gi-docgen
+version=2021.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
+short_desc="Documentation generator for GObject-based libraries"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="Apache-2.0, GPL-3.0-or-later"
+homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
+distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
+checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
+make_check=no # no tests, but check fails
From 172fb0af2b0c116b082e08649e77077bf8e2304f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 23 Jul 2021 22:52:02 +0200
Subject: [PATCH 6/6] New package: libadwaita-1.0.0a2
---
common/shlibs | 1 +
srcpkgs/libadwaita-demo | 1 +
srcpkgs/libadwaita-devel | 1 +
srcpkgs/libadwaita/template | 59 +++++++++++++++++++++++++++++++++++++
srcpkgs/libadwaita/update | 1 +
5 files changed, 63 insertions(+)
create mode 120000 srcpkgs/libadwaita-demo
create mode 120000 srcpkgs/libadwaita-devel
create mode 100644 srcpkgs/libadwaita/template
create mode 100644 srcpkgs/libadwaita/update
diff --git a/common/shlibs b/common/shlibs
index 6cc491f96a9b..1db1647edc29 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/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")'
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] [NOMERGE] libadwaita, gi-docgen
2021-05-24 23:15 [PR PATCH] [NOMERGE] libadwaita, gi-docgen paper42
` (3 preceding siblings ...)
2021-07-23 21:22 ` paper42
@ 2021-08-04 21:38 ` paper42
2021-08-04 21:48 ` paper42
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: paper42 @ 2021-08-04 21:38 UTC (permalink / raw)
To: ml
[-- 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: 12054 bytes --]
From e164c9a45a0fc73ad6cfe09035e82e0708e259ac 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/6] 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 76b01681307551894e3a19854ae54df307bcac38 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/6] 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 0931aa3453d55c1e41acd1b655409ccb7e2c1b87 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:28:46 +0200
Subject: [PATCH 3/6] New package: python3-smartypants-2.0.1
---
srcpkgs/python3-smartypants/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/python3-smartypants/template
diff --git a/srcpkgs/python3-smartypants/template b/srcpkgs/python3-smartypants/template
new file mode 100644
index 000000000000..728196e7100c
--- /dev/null
+++ b/srcpkgs/python3-smartypants/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-smartypants'
+pkgname=python3-smartypants
+version=2.0.1
+revision=1
+wrksrc="smartypants.py-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+checkdepends="python3-docutils"
+short_desc="Python with the SmartyPants"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/leohemsted/smartypants.py/"
+distfiles="https://github.com/leohemsted/smartypants.py/archive/refs/tags/v$version.tar.gz"
+checksum=b98191911ff3b4144ef8ad53e776a2d0ad24bd508a905c6ce523597c40022773
+
+post_install() {
+ vlicense COPYING
+}
From d07242de862f212c6c5c40dddacea4f5930e0671 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:28:53 +0200
Subject: [PATCH 4/6] New package: python3-typogrify-2.0.7
---
srcpkgs/python3-typogrify/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/python3-typogrify/template
diff --git a/srcpkgs/python3-typogrify/template b/srcpkgs/python3-typogrify/template
new file mode 100644
index 000000000000..adef37d8b2a4
--- /dev/null
+++ b/srcpkgs/python3-typogrify/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-typogrify'
+pkgname=python3-typogrify
+version=2.0.7
+revision=1
+wrksrc="typogrify-$version"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-smartypants"
+short_desc="Filters to enhance web typography"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="BSD-3-Clause"
+homepage="https://github.com/mintchaos/typogrify"
+distfiles="https://github.com/mintchaos/typogrify/archive/refs/tags/$version.tar.gz"
+checksum=d5081966c1c1423157e240d5cfe7435b56ca30be57ff8c7fe6f90f6cc42295ee
+make_check=no # conflicting dependencies
+
+post_install() {
+ vlicense LICENSE.txt
+}
From f94f2df35ba505679aac04546a8501a8c6dfa7b7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 25 May 2021 00:29:00 +0200
Subject: [PATCH 5/6] New package: gi-docgen-2021.6
---
srcpkgs/gi-docgen/template | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 srcpkgs/gi-docgen/template
diff --git a/srcpkgs/gi-docgen/template b/srcpkgs/gi-docgen/template
new file mode 100644
index 000000000000..d98b8ad90e3e
--- /dev/null
+++ b/srcpkgs/gi-docgen/template
@@ -0,0 +1,14 @@
+# Template file for 'gi-docgen'
+pkgname=gi-docgen
+version=2021.6
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3 python3-Pygments python3-typogrify python3-Jinja2 python3-toml"
+short_desc="Documentation generator for GObject-based libraries"
+maintainer="Michal Vasilek <michal@vasilek.cz>"
+license="Apache-2.0, GPL-3.0-or-later"
+homepage="https://gnome.pages.gitlab.gnome.org/gi-docgen/"
+distfiles="https://gitlab.gnome.org/GNOME/gi-docgen/-/archive/$version/gi-docgen-$version.tar.gz"
+checksum=d43cc51cb0c614f8906469bf313dbd23337f355a3281ecd4324980be773cdff1
+make_check=no # no tests, but check fails
From 875bdada24c1e45bc7832e13dcbb4bc91bbf423a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 23 Jul 2021 22:52:02 +0200
Subject: [PATCH 6/6] 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..53d2a7b59b6d
--- /dev/null
+++ b/srcpkgs/libadwaita/patches/disable-broken-tests.patch
@@ -0,0 +1,10 @@
+--- a/meson.build
++++ b/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")'
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] [NOMERGE] libadwaita, gi-docgen
2021-05-24 23:15 [PR PATCH] [NOMERGE] libadwaita, gi-docgen paper42
` (4 preceding siblings ...)
2021-08-04 21:38 ` paper42
@ 2021-08-04 21:48 ` paper42
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
7 siblings, 0 replies; 9+ messages in thread
From: paper42 @ 2021-08-04 21:48 UTC (permalink / raw)
To: ml
[-- 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")'
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] New package: libadwaita-1.0.0a2
2021-05-24 23:15 [PR PATCH] [NOMERGE] libadwaita, gi-docgen paper42
` (5 preceding siblings ...)
2021-08-04 21:48 ` paper42
@ 2021-08-08 13:02 ` paper42
2021-08-08 16:11 ` [PR PATCH] [Merged]: New package: libadwaita-1.0.0alpha2 paper42
7 siblings, 0 replies; 9+ messages in thread
From: paper42 @ 2021-08-08 13:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 972 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
New package: libadwaita-1.0.0a2
<!-- 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~~ merged in #31820
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: 4091 bytes --]
From c403ae6ed1795de62ab381eeba511bb43f6fc3b9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 23 Jul 2021 22:52:02 +0200
Subject: [PATCH] New package: libadwaita-1.0.0alpha2
---
common/shlibs | 1 +
srcpkgs/libadwaita-demo | 1 +
srcpkgs/libadwaita-devel | 1 +
.../patches/disable-broken-tests.patch | 10 ++++
srcpkgs/libadwaita/template | 59 +++++++++++++++++++
5 files changed, 72 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
diff --git a/common/shlibs b/common/shlibs
index b8fda590d5f3..5affb5dc09fd 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3511,6 +3511,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
libswitchboard-2.0.so.0 switchboard-2.3.2_1
libcodecore.so.0 libio.elementary.code-3.0_1
libio.elementary.music-core.so.0 libio.elementary.music-5.0_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..cb23b656c004
--- /dev/null
+++ b/srcpkgs/libadwaita/template
@@ -0,0 +1,59 @@
+# Template file for 'libadwaita'
+pkgname=libadwaita
+version=1.0.0alpha2
+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
+ }
+}
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Merged]: New package: libadwaita-1.0.0alpha2
2021-05-24 23:15 [PR PATCH] [NOMERGE] libadwaita, gi-docgen paper42
` (6 preceding siblings ...)
2021-08-08 13:02 ` [PR PATCH] [Updated] New package: libadwaita-1.0.0a2 paper42
@ 2021-08-08 16:11 ` paper42
7 siblings, 0 replies; 9+ messages in thread
From: paper42 @ 2021-08-08 16:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 777 bytes --]
There's a merged pull request on the void-packages repository
New package: libadwaita-1.0.0alpha2
https://github.com/void-linux/void-packages/pull/31102
Description:
<!-- 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
~~gi-docgen is a documentation generator for GObject-based libraries, it will replace gtk-doc in some projects~~ merged in #31820
^ permalink raw reply [flat|nested] 9+ messages in thread