From e164c9a45a0fc73ad6cfe09035e82e0708e259ac Mon Sep 17 00:00:00 2001 From: Enno Boland 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 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 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 " +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 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 " +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 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 " +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 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 " +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")'