From: paper42 <paper42@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] vte3: update to 0.70.0, build gtk4 library
Date: Sat, 01 Oct 2022 18:20:14 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39596@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1260 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages vte3-gtk4
https://github.com/void-linux/void-packages/pull/39596
vte3: update to 0.70.0, build gtk4 library
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- 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/39596.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vte3-gtk4-39596.patch --]
[-- Type: text/x-diff, Size: 4032 bytes --]
From 238931bdb83c6b3551749af8e9802ce9940ad065 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Fri, 30 Sep 2022 21:42:51 +0200
Subject: [PATCH] vte3: update to 0.70.0, build gtk4 library
---
common/shlibs | 1 +
srcpkgs/vte3-gtk4 | 1 +
srcpkgs/vte3-gtk4-devel | 1 +
srcpkgs/vte3/template | 47 ++++++++++++++++++++++++++++++-----------
4 files changed, 38 insertions(+), 12 deletions(-)
create mode 120000 srcpkgs/vte3-gtk4
create mode 120000 srcpkgs/vte3-gtk4-devel
diff --git a/common/shlibs b/common/shlibs
index 33311eb0fed8..0c8349894019 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -823,6 +823,7 @@ libXevie.so.1 libXevie-1.0.2_1
libatspi.so.0 at-spi2-core-1.91.91_1
libatk-bridge-2.0.so.0 at-spi2-atk-2.6.0_1
libvte-2.91.so.0 vte3-0.68.0_1
+libvte-2.91-gtk4.so.0 vte3-gtk4-0.70.0_1
libpipeline.so.1 libpipeline-1.2.0_1
libosp.so.5 opensp-1.5.2_1
libogrove.so.0 openjade-1.3.2_1
diff --git a/srcpkgs/vte3-gtk4 b/srcpkgs/vte3-gtk4
new file mode 120000
index 000000000000..30ca3abb8773
--- /dev/null
+++ b/srcpkgs/vte3-gtk4
@@ -0,0 +1 @@
+vte3
\ No newline at end of file
diff --git a/srcpkgs/vte3-gtk4-devel b/srcpkgs/vte3-gtk4-devel
new file mode 120000
index 000000000000..30ca3abb8773
--- /dev/null
+++ b/srcpkgs/vte3-gtk4-devel
@@ -0,0 +1 @@
+vte3
\ No newline at end of file
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index aaaa69bfe51f..4d3bda10c502 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,21 +1,21 @@
# Template file for 'vte3'
pkgname=vte3
-version=0.68.0
-revision=2
+version=0.70.0
+revision=1
wrksrc="vte-${version}"
build_style=meson
build_helper="gir"
configure_args="-Db_ndebug=false -Db_lto=false -D_systemd=false
- $(vopt_bool gir gir) $(vopt_bool gir vapi)"
-hostmakedepends="glib-devel gperf intltool pkg-config
+ $(vopt_bool gir gir) $(vopt_bool gir vapi) -Dgtk4=true"
+hostmakedepends="glib-devel gperf gettext pkg-config
$(vopt_if gir vala)"
-makedepends="gnutls-devel gtk+3-devel pcre2-devel $(vopt_if gir vala-devel)"
+makedepends="gnutls-devel gtk4-devel gtk+3-devel pcre2-devel $(vopt_if gir vala-devel)"
short_desc="Terminal widget with improved accessibility and I18N support"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-3.0-or-later, LGPL-2.1-or-later, LGPL-3.0-or-later"
homepage="https://wiki.gnome.org/Apps/Terminal/VTE"
distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz"
-checksum=13e7d4789ca216a33780030d246c9b13ddbfd04094c6316eea7ff92284dd1749
+checksum=93e0dd4a1bc2a7a1a62da64160a274cce456976ea1567d98591da96e2d265ae6
# Suppress warnings as errors for NULL format strings (musl libc)
CXXFLAGS="-Wno-error=format="
@@ -28,16 +28,39 @@ pre_build() {
export GIR_EXTRA_LIBS_PATH="${wrksrc}/src/.libs"
}
+vte3-gtk4_package() {
+ short_desc+=" - GTK4 version"
+ pkg_install() {
+ vmove usr/bin/vte-2.91-gtk4
+ vmove usr/lib/libvte-2.91-gtk4.so.0
+ vmove usr/lib/girepository-1.0/Vte-3.91.typelib
+ }
+}
+
vte3-devel_package() {
- depends="gnutls-devel gtk+3-devel pcre2-devel vte3>=${version}_${revision}"
+ depends="libglib-devel gtk+3-devel pango-devel ${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include/vte-2.91
+ vmove usr/lib/pkgconfig/vte-2.91.pc
+ vmove usr/lib/libvte-2.91.so
+ if [ "$build_option_gir" ]; then
+ vmove usr/share/gir-1.0/Vte-2.91.gir
+ vmove "usr/share/vala/vapi/vte-2.91.*"
+ fi
+ }
+}
+
+vte3-gtk4-devel_package() {
+ depends="libglib-devel gtk4-devel pango-devel ${sourcepkg}>=${version}_${revision}"
short_desc+=" - development files"
pkg_install() {
- vmove usr/include
- vmove usr/lib/pkgconfig
- vmove "usr/lib/*.so"
+ vmove usr/include/vte-2.91-gtk4
+ vmove usr/lib/libvte-2.91-gtk4.so
+ vmove usr/lib/pkgconfig/vte-2.91-gtk4.pc
if [ "$build_option_gir" ]; then
- vmove usr/share/gir-1.0
- vmove usr/share/vala
+ vmove usr/share/gir-1.0/Vte-3.91.gir
+ vmove "usr/share/vala/vapi/vte-2.91-gtk4.*"
fi
}
}
next reply other threads:[~2022-10-01 16:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-01 16:20 paper42 [this message]
2022-10-01 16:57 ` [PR PATCH] [Merged]: " paper42
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-39596@inbox.vuxu.org \
--to=paper42@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).