From: oreo639 <oreo639@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: gnome-console-42.beta
Date: Sat, 09 Apr 2022 18:47:08 +0200 [thread overview]
Message-ID: <20220409164708.ufuzp1IRyoHf8nlbj24H7kljp6SlAMwsYGHxH0sVUP8@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-36445@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1309 bytes --]
There is an updated pull request by oreo639 against master on the void-packages repository
https://github.com/oreo639/void-packages gconsole
https://github.com/void-linux/void-packages/pull/36445
New package: gnome-console-42.beta
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
https://github.com/void-linux/void-packages/pull/36311
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-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/36445.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gconsole-36445.patch --]
[-- Type: text/x-diff, Size: 5090 bytes --]
From 41e74d8eeb8eedde1087ae947794c42550d9c959 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 31 Mar 2022 16:40:10 -0700
Subject: [PATCH 1/2] New package: gnome-console-42.beta
---
srcpkgs/gnome-console/template | 25 ++++++++++++++++++++++++
srcpkgs/nautilus-gnome-console-extension | 1 +
2 files changed, 26 insertions(+)
create mode 100644 srcpkgs/gnome-console/template
create mode 120000 srcpkgs/nautilus-gnome-console-extension
diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
new file mode 100644
index 000000000000..f7103cd69c92
--- /dev/null
+++ b/srcpkgs/gnome-console/template
@@ -0,0 +1,25 @@
+# Template file for 'gnome-console'
+pkgname=gnome-console
+version=42.beta
+revision=1
+build_style=meson
+configure_args="-Dnautilus=enabled"
+hostmakedepends="pkg-config desktop-file-utils gettext sassc
+ gobject-introspection glib-devel gtk+3-devel"
+makedepends="libhandy1-devel vte3-devel libgtop-devel nautilus-devel
+ gsettings-desktop-schemas-devel"
+depends="gsettings-desktop-schemas"
+short_desc="Simple user-friendly terminal emulator for the GNOME desktop"
+maintainer="oreo639 <oreo6391@gmail.org>"
+license="GPL-3.0-or-later"
+homepage="https://gitlab.gnome.org/GNOME/console"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=2eafec8720210dcc01e47aa98a1bc6c76fb1c155365dac7bfcd7ab170477e834
+
+nautilus-gnome-console-extension_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - integration for nautilus"
+ pkg_install() {
+ vmove usr/lib/nautilus/extensions-3.0
+ }
+}
diff --git a/srcpkgs/nautilus-gnome-console-extension b/srcpkgs/nautilus-gnome-console-extension
new file mode 120000
index 000000000000..4107e3ff7e4c
--- /dev/null
+++ b/srcpkgs/nautilus-gnome-console-extension
@@ -0,0 +1 @@
+gnome-console
\ No newline at end of file
From 32729d40d3cd366f94438604d6eab987988d00c1 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sat, 9 Apr 2022 04:27:04 -0700
Subject: [PATCH 2/2] glib: support gnome-console
---
.../glib/patches/gnome-console-support.patch | 62 +++++++++++++++++++
srcpkgs/glib/template | 2 +-
2 files changed, 63 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/glib/patches/gnome-console-support.patch
diff --git a/srcpkgs/glib/patches/gnome-console-support.patch b/srcpkgs/glib/patches/gnome-console-support.patch
new file mode 100644
index 000000000000..b142aa0b7514
--- /dev/null
+++ b/srcpkgs/glib/patches/gnome-console-support.patch
@@ -0,0 +1,62 @@
+Currently glib hardcodes a list of terminals and that list will not be expanding.
+The hope being that it will eventually be replaced with some kind of api.
+Until then, we might as well add gnome-console/kgx to the list
+
+See: https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1404#note_1331262
+Source: https://github.com/NixOS/nixpkgs/commit/c987121acf5c87436a0b05ca75cd70bf38c452ca
+
+diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
+index 60d6debb2..a441bfec9 100644
+--- a/gio/gdesktopappinfo.c
++++ b/gio/gdesktopappinfo.c
+@@ -2627,6 +2627,7 @@ prepend_terminal_to_vector (int *argc,
+ int i, j;
+ char **term_argv = NULL;
+ int term_argc = 0;
++ gboolean pass_cmd_as_single_arg = FALSE;
+ char *check;
+ char **the_argv;
+
+@@ -2672,6 +2673,11 @@ prepend_terminal_to_vector (int *argc,
+ }
+ else
+ {
++ if (check == NULL) {
++ check = g_find_program_in_path ("kgx");
++ if (check != NULL)
++ pass_cmd_as_single_arg = TRUE;
++ }
+ if (check == NULL)
+ check = g_find_program_in_path ("tilix");
+ if (check == NULL)
+@@ -2697,14 +2703,27 @@ prepend_terminal_to_vector (int *argc,
+ }
+ }
+
+- real_argc = term_argc + *argc;
++ real_argc = term_argc + (pass_cmd_as_single_arg ? 1 : *argc);
+ real_argv = g_new (char *, real_argc + 1);
+
+ for (i = 0; i < term_argc; i++)
+ real_argv[i] = term_argv[i];
+
+- for (j = 0; j < *argc; j++, i++)
+- real_argv[i] = (char *)the_argv[j];
++ if (pass_cmd_as_single_arg) {
++ char **quoted_argv = g_new (char *, *argc + 1);
++
++ for (j = 0; j < *argc; j++) {
++ quoted_argv[j] = g_shell_quote (the_argv[j]);
++ g_free (the_argv[j]);
++ }
++ quoted_argv[j] = NULL;
++
++ real_argv[i++] = g_strjoinv (" ", quoted_argv);
++ g_strfreev (quoted_argv);
++ } else {
++ for (j = 0; j < *argc; j++, i++)
++ real_argv[i] = (char *)the_argv[j];
++ }
+
+ real_argv[i] = NULL;
+
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index d301dadb8990..97b067e40b46 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
pkgname=glib
version=2.72.0
-revision=1
+revision=2
build_style=meson
# static version is necessary for qemu-user-static;
# also disable LTO, otherwise there are multiple failures when linking qemu
next prev parent reply other threads:[~2022-04-09 16:47 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-31 23:52 [PR PATCH] " oreo639
2022-03-31 23:58 ` paper42
2022-04-01 0:04 ` oreo639
2022-04-01 0:04 ` [PR PATCH] [Updated] " oreo639
2022-04-01 0:05 ` oreo639
2022-04-01 0:08 ` oreo639
2022-04-01 0:08 ` oreo639
2022-04-01 0:09 ` oreo639
2022-04-01 0:10 ` oreo639
2022-04-01 0:11 ` oreo639
2022-04-01 0:17 ` [PR PATCH] [Updated] " oreo639
2022-04-01 0:43 ` oreo639
2022-04-01 1:20 ` oreo639
2022-04-01 1:20 ` oreo639
2022-04-02 10:56 ` [PR REVIEW] " paper42
2022-04-02 10:58 ` paper42
2022-04-02 18:47 ` [PR PATCH] [Closed]: " oreo639
2022-04-09 11:40 ` oreo639
2022-04-09 11:40 ` oreo639
2022-04-09 11:56 ` [PR PATCH] [Updated] " oreo639
2022-04-09 12:04 ` [PR REVIEW] " paper42
2022-04-09 12:11 ` [PR PATCH] [Updated] " oreo639
2022-04-09 12:13 ` oreo639
2022-04-09 12:13 ` [PR REVIEW] " oreo639
2022-04-09 12:16 ` [PR PATCH] [Updated] " oreo639
2022-04-09 16:47 ` oreo639 [this message]
2022-04-12 19:45 ` oreo639
2022-05-01 2:20 ` oreo639
2022-07-25 4:55 ` oreo639
2022-07-25 5:20 ` [PR PATCH] [Updated] New package: gnome-console-42.2 oreo639
2022-07-26 20:11 ` [PR REVIEW] " paper42
2022-07-26 20:11 ` paper42
2022-07-26 20:27 ` [PR PATCH] [Updated] " oreo639
2022-07-26 21:00 ` [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=20220409164708.ufuzp1IRyoHf8nlbj24H7kljp6SlAMwsYGHxH0sVUP8@z \
--to=oreo639@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).