* Re: New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
@ 2022-03-31 23:58 ` paper42
2022-04-01 0:04 ` oreo639
` (31 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: paper42 @ 2022-03-31 23:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 319 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/36445#issuecomment-1085245572
Comment:
afaik GNOME didn't replace gnome-terminal with gnome-console with GNOME 42, so this is separate from #36311 and should be marked as a draft because this packages a beta version.
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
2022-03-31 23:58 ` paper42
@ 2022-04-01 0:04 ` oreo639
2022-04-01 0:04 ` [PR PATCH] [Updated] " oreo639
` (30 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-04-01 0:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 300 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/36445#issuecomment-1085249440
Comment:
> afaik GNOME didn't replace gnome-terminal with gnome-console with GNOME 42
Yes, I just made this separate since it doesn't depend on anything from there.
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Updated] New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
2022-03-31 23:58 ` paper42
2022-04-01 0:04 ` oreo639
@ 2022-04-01 0:04 ` oreo639
2022-04-01 0:05 ` oreo639
` (29 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-04-01 0:04 UTC (permalink / raw)
To: ml
[-- 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: 3043 bytes --]
From ed4dce8063869dfb2e1d41b626b992f65848564e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 31 Mar 2022 16:39:31 -0700
Subject: [PATCH 1/2] vte3: update to 0.68.0
---
srcpkgs/vte3/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index f88f797740b9..d75cd4edef2f 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,6 +1,6 @@
# Template file for 'vte3'
pkgname=vte3
-version=0.66.2
+version=0.68.0
revision=1
wrksrc="vte-${version}"
build_style=meson
@@ -15,7 +15,7 @@ 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=e89974673a72a0a06edac6d17830b82bb124decf0cb3b52cebc92ec3ff04d976
+checksum=13e7d4789ca216a33780030d246c9b13ddbfd04094c6316eea7ff92284dd1749
# Suppress warnings as errors for NULL format strings (musl libc)
CXXFLAGS="-Wno-error=format="
From 2cc0e7814a59a0fecbe2054cbc078745e5341efa 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 2/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..1f8a7de56ec4
--- /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 appstream-glib gettext
+ gobject-introspection sassc glib-devel"
+makedepends="gtk+3-devel 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
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (2 preceding siblings ...)
2022-04-01 0:04 ` [PR PATCH] [Updated] " oreo639
@ 2022-04-01 0:05 ` oreo639
2022-04-01 0:08 ` oreo639
` (28 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-04-01 0:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/36445#issuecomment-1085249440
Comment:
> afaik GNOME didn't replace gnome-terminal with gnome-console with GNOME 42
They did, I just made this separate since it doesn't depend on anything from there.
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (3 preceding siblings ...)
2022-04-01 0:05 ` oreo639
@ 2022-04-01 0:08 ` oreo639
2022-04-01 0:08 ` oreo639
` (27 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-04-01 0:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 300 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/36445#issuecomment-1085249440
Comment:
> afaik GNOME didn't replace gnome-terminal with gnome-console with GNOME 42
Yes, I just made this separate since it doesn't depend on anything from there.
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (4 preceding siblings ...)
2022-04-01 0:08 ` oreo639
@ 2022-04-01 0:08 ` oreo639
2022-04-01 0:09 ` oreo639
` (26 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-04-01 0:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 311 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/36445#issuecomment-1085252734
Comment:
Oh, sorry I misread your comment, they did replace gnome-terminal with gnome-console for GNOME 42:
https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1404
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (5 preceding siblings ...)
2022-04-01 0:08 ` oreo639
@ 2022-04-01 0:09 ` oreo639
2022-04-01 0:10 ` oreo639
` (25 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-04-01 0:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 311 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/36445#issuecomment-1085252734
Comment:
Oh, sorry I misread your comment, they did replace gnome-terminal with gnome-console for GNOME 42:
https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1404
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (6 preceding siblings ...)
2022-04-01 0:09 ` oreo639
@ 2022-04-01 0:10 ` oreo639
2022-04-01 0:11 ` oreo639
` (24 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-04-01 0:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 300 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/36445#issuecomment-1085249440
Comment:
> afaik GNOME didn't replace gnome-terminal with gnome-console with GNOME 42
Yes, I just made this separate since it doesn't depend on anything from there.
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (7 preceding siblings ...)
2022-04-01 0:10 ` oreo639
@ 2022-04-01 0:11 ` oreo639
2022-04-01 0:17 ` [PR PATCH] [Updated] " oreo639
` (23 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-04-01 0:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 546 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/36445#issuecomment-1085254867
Comment:
> afaik GNOME didn't replace gnome-terminal with gnome-console with GNOME 42
Sorry I misread this, they did replace gnome-terminal with gnome-console (gnome-terminal was moved from gnome-core into gnome-world).
https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1404
I made this a separate PR to make it easier to review and since it doesn't depend on anything else GNOME 42 related.
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Updated] New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (8 preceding siblings ...)
2022-04-01 0:11 ` oreo639
@ 2022-04-01 0:17 ` oreo639
2022-04-01 0:43 ` oreo639
` (22 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-04-01 0:17 UTC (permalink / raw)
To: ml
[-- 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: 3043 bytes --]
From ed4dce8063869dfb2e1d41b626b992f65848564e Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Thu, 31 Mar 2022 16:39:31 -0700
Subject: [PATCH 1/2] vte3: update to 0.68.0
---
srcpkgs/vte3/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index f88f797740b9..d75cd4edef2f 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,6 +1,6 @@
# Template file for 'vte3'
pkgname=vte3
-version=0.66.2
+version=0.68.0
revision=1
wrksrc="vte-${version}"
build_style=meson
@@ -15,7 +15,7 @@ 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=e89974673a72a0a06edac6d17830b82bb124decf0cb3b52cebc92ec3ff04d976
+checksum=13e7d4789ca216a33780030d246c9b13ddbfd04094c6316eea7ff92284dd1749
# Suppress warnings as errors for NULL format strings (musl libc)
CXXFLAGS="-Wno-error=format="
From f0d6d5ccda3e53042a66f3baf32c62256bc51f66 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 2/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..1f8a7de56ec4
--- /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 appstream-glib gettext
+ gobject-introspection sassc glib-devel"
+makedepends="gtk+3-devel 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
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (9 preceding siblings ...)
2022-04-01 0:17 ` [PR PATCH] [Updated] " oreo639
@ 2022-04-01 0:43 ` oreo639
2022-04-01 1:20 ` oreo639
` (21 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-04-01 0:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 608 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/36445#issuecomment-1085254867
Comment:
> afaik GNOME didn't replace gnome-terminal with gnome-console with GNOME 42
Sorry I misread this, they did replace gnome-terminal with gnome-console (gnome-terminal was moved from gnome-core into gnome-world).
https://gitlab.gnome.org/GNOME/gnome-build-meta/-/issues/457
https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1404
I made this a separate PR to make it easier to review and since it doesn't depend on anything else GNOME 42 related.
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (10 preceding siblings ...)
2022-04-01 0:43 ` oreo639
@ 2022-04-01 1:20 ` oreo639
2022-04-01 1:20 ` oreo639
` (20 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-04-01 1:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/36445#issuecomment-1085294882
Comment:
Should this become apart of the gnome 42 PR (and added to gnome-core) or no?
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (11 preceding siblings ...)
2022-04-01 1:20 ` oreo639
@ 2022-04-01 1:20 ` oreo639
2022-04-02 10:56 ` [PR REVIEW] " paper42
` (19 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-04-01 1:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 270 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/36445#issuecomment-1085294882
Comment:
Should this become apart of the gnome 42 PR (and added to gnome-core) or no? (the vte update is needed by gnome-terminal anyway)
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR REVIEW] New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (12 preceding siblings ...)
2022-04-01 1:20 ` oreo639
@ 2022-04-02 10:56 ` paper42
2022-04-02 10:58 ` paper42
` (18 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: paper42 @ 2022-04-02 10:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 221 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/36445#discussion_r841062435
Comment:
```suggestion
hostmakedepends="pkg-config desktop-file-utils gettext
```
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (13 preceding siblings ...)
2022-04-02 10:56 ` [PR REVIEW] " paper42
@ 2022-04-02 10:58 ` paper42
2022-04-02 18:47 ` [PR PATCH] [Closed]: " oreo639
` (17 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: paper42 @ 2022-04-02 10:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 340 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/36445#issuecomment-1086615147
Comment:
> Should this become apart of the gnome 42 PR (and added to gnome-core) or no? (the vte update is needed by gnome-terminal anyway)
If they replaced gnome-terminal with kgx, we should do the same.
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Closed]: New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (14 preceding siblings ...)
2022-04-02 10:58 ` paper42
@ 2022-04-02 18:47 ` oreo639
2022-04-09 11:40 ` oreo639
` (16 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-04-02 18:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1152 bytes --]
There's a closed pull request on the void-packages repository
New package: gnome-console-42.beta
https://github.com/void-linux/void-packages/pull/36445
Description:
<!-- 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
-->
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (15 preceding siblings ...)
2022-04-02 18:47 ` [PR PATCH] [Closed]: " oreo639
@ 2022-04-09 11:40 ` oreo639
2022-04-09 11:40 ` oreo639
` (15 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-04-09 11:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/36445#issuecomment-1093946228
Comment:
Reopened per https://github.com/void-linux/void-packages/pull/36311#issuecomment-1093905497
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (16 preceding siblings ...)
2022-04-09 11:40 ` oreo639
@ 2022-04-09 11:40 ` oreo639
2022-04-09 11:56 ` [PR PATCH] [Updated] " oreo639
` (14 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-04-09 11:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
New comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/36445#issuecomment-1093946228
Comment:
Reopened per https://github.com/void-linux/void-packages/pull/36311#issuecomment-1093905497
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Updated] New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (17 preceding siblings ...)
2022-04-09 11:40 ` oreo639
@ 2022-04-09 11:56 ` oreo639
2022-04-09 12:04 ` [PR REVIEW] " paper42
` (13 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-04-09 11:56 UTC (permalink / raw)
To: ml
[-- 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: 5001 bytes --]
From bdc46ef4f1dbe4f09a704921f5de6f00bd8c6213 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..8bebd62378d1
--- /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
+ gobject-introspection sassc glib-devel"
+makedepends="gtk+3-devel 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 b70434ea32cf9e791110ce8df2d69f57e35a4b61 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..1eac1103ba31
--- /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
+
+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
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR REVIEW] New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (18 preceding siblings ...)
2022-04-09 11:56 ` [PR PATCH] [Updated] " oreo639
@ 2022-04-09 12:04 ` paper42
2022-04-09 12:11 ` [PR PATCH] [Updated] " oreo639
` (12 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: paper42 @ 2022-04-09 12:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 182 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/36445#discussion_r846623539
Comment:
please add the source of this patch
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Updated] New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (19 preceding siblings ...)
2022-04-09 12:04 ` [PR REVIEW] " paper42
@ 2022-04-09 12:11 ` oreo639
2022-04-09 12:13 ` oreo639
` (11 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-04-09 12:11 UTC (permalink / raw)
To: ml
[-- 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: 5102 bytes --]
From bdc46ef4f1dbe4f09a704921f5de6f00bd8c6213 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..8bebd62378d1
--- /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
+ gobject-introspection sassc glib-devel"
+makedepends="gtk+3-devel 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 0825b784c8340cf489215903b4baf9aabec1ae58 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 | 65 +++++++++++++++++++
srcpkgs/glib/template | 2 +-
2 files changed, 66 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..adcf30a00463
--- /dev/null
+++ b/srcpkgs/glib/patches/gnome-console-support.patch
@@ -0,0 +1,65 @@
+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
+
+Original patch:
+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
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Updated] New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (20 preceding siblings ...)
2022-04-09 12:11 ` [PR PATCH] [Updated] " oreo639
@ 2022-04-09 12:13 ` oreo639
2022-04-09 12:13 ` [PR REVIEW] " oreo639
` (10 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-04-09 12:13 UTC (permalink / raw)
To: ml
[-- 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: 5092 bytes --]
From bdc46ef4f1dbe4f09a704921f5de6f00bd8c6213 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..8bebd62378d1
--- /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
+ gobject-introspection sassc glib-devel"
+makedepends="gtk+3-devel 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 85ffac3a304167110a8e30723bb49570716a2326 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 | 63 +++++++++++++++++++
srcpkgs/glib/template | 2 +-
2 files changed, 64 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..fbae08427606
--- /dev/null
+++ b/srcpkgs/glib/patches/gnome-console-support.patch
@@ -0,0 +1,63 @@
+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
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR REVIEW] New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (21 preceding siblings ...)
2022-04-09 12:13 ` oreo639
@ 2022-04-09 12:13 ` oreo639
2022-04-09 12:16 ` [PR PATCH] [Updated] " oreo639
` (9 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-04-09 12:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 157 bytes --]
New review comment by oreo639 on void-packages repository
https://github.com/void-linux/void-packages/pull/36445#discussion_r846624498
Comment:
Thank you.
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Updated] New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (22 preceding siblings ...)
2022-04-09 12:13 ` [PR REVIEW] " oreo639
@ 2022-04-09 12:16 ` oreo639
2022-04-09 16:47 ` oreo639
` (8 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-04-09 12:16 UTC (permalink / raw)
To: ml
[-- 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 bdc46ef4f1dbe4f09a704921f5de6f00bd8c6213 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..8bebd62378d1
--- /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
+ gobject-introspection sassc glib-devel"
+makedepends="gtk+3-devel 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 c376a453146b94e3daa8a61de07f363d076560f0 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
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Updated] New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (23 preceding siblings ...)
2022-04-09 12:16 ` [PR PATCH] [Updated] " oreo639
@ 2022-04-09 16:47 ` oreo639
2022-04-12 19:45 ` oreo639
` (7 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-04-09 16:47 UTC (permalink / raw)
To: ml
[-- 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
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Updated] New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (24 preceding siblings ...)
2022-04-09 16:47 ` oreo639
@ 2022-04-12 19:45 ` oreo639
2022-05-01 2:20 ` oreo639
` (6 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-04-12 19:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1305 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: **YES**
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: 5159 bytes --]
From 5bc5f6ea8df697e42886f8e460563b7030026ece 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 | 26 ++++++++++++++++++++++++
srcpkgs/nautilus-gnome-console-extension | 1 +
2 files changed, 27 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..1c9932cb3d5b
--- /dev/null
+++ b/srcpkgs/gnome-console/template
@@ -0,0 +1,26 @@
+# 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"
+changelog="https://gitlab.gnome.org/GNOME/console/-/blob/main/NEWS"
+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 c96fad3e9730aa8739843be5a7d4f6e3d532f356 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
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Updated] New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (25 preceding siblings ...)
2022-04-12 19:45 ` oreo639
@ 2022-05-01 2:20 ` oreo639
2022-07-25 4:55 ` oreo639
` (5 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-05-01 2:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1305 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: **YES**
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: 5155 bytes --]
From 5d747082c5b9312c7b95d46406683513f0ffd9d0 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 | 26 ++++++++++++++++++++++++
srcpkgs/nautilus-gnome-console-extension | 1 +
2 files changed, 27 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..de4b630e35ed
--- /dev/null
+++ b/srcpkgs/gnome-console/template
@@ -0,0 +1,26 @@
+# 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"
+changelog="https://gitlab.gnome.org/GNOME/console/-/blob/main/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=2eafec8720210dcc01e47aa98a1bc6c76fb1c155365dac7bfcd7ab170477e834
+
+nautilus-gnome-console-extension_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - nautilus integration"
+ 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 3286c9f773b62a382c1994155c78af13a01362fa 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
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Updated] New package: gnome-console-42.beta
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (26 preceding siblings ...)
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
` (4 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-07-25 4:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1305 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: **YES**
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: 4764 bytes --]
From be221de8cd2da5f6bef229d081594753f71b848f 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 1/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 b69e5bbda63a..8583a6616511 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
pkgname=glib
version=2.72.2
-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
From bebf19c139d9e31a5cd1440f1fc79a80ee6e9032 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 24 Jul 2022 21:55:20 -0700
Subject: [PATCH 2/2] New package: gnome-console-42.2
---
srcpkgs/gnome-console/template | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
create mode 100644 srcpkgs/gnome-console/template
diff --git a/srcpkgs/gnome-console/template b/srcpkgs/gnome-console/template
new file mode 100644
index 000000000000..9b4cb52e7082
--- /dev/null
+++ b/srcpkgs/gnome-console/template
@@ -0,0 +1,26 @@
+# Template file for 'gnome-console'
+pkgname=gnome-console
+version=42.2
+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"
+changelog="https://gitlab.gnome.org/GNOME/console/-/raw/gnome-42/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=7d26e6c18744c575a787293263f60ceff630107098e9e58a7765b00ac7437049
+
+nautilus-gnome-console-extension_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - nautilus integration"
+ pkg_install() {
+ vmove usr/lib/nautilus/extensions-3.0
+ }
+}
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Updated] New package: gnome-console-42.2
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (27 preceding siblings ...)
2022-07-25 4:55 ` oreo639
@ 2022-07-25 5:20 ` oreo639
2022-07-26 20:11 ` [PR REVIEW] " paper42
` (3 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-07-25 5:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1302 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.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
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: 5152 bytes --]
From be221de8cd2da5f6bef229d081594753f71b848f 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 1/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 b69e5bbda63a..8583a6616511 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
pkgname=glib
version=2.72.2
-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
From 42bd12ddc380e4d44b480567e348e5f7c161351b Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 24 Jul 2022 21:55:20 -0700
Subject: [PATCH 2/2] New package: gnome-console-42.2
---
srcpkgs/gnome-console/template | 26 ++++++++++++++++++++++++
srcpkgs/nautilus-gnome-console-extension | 1 +
2 files changed, 27 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..9b4cb52e7082
--- /dev/null
+++ b/srcpkgs/gnome-console/template
@@ -0,0 +1,26 @@
+# Template file for 'gnome-console'
+pkgname=gnome-console
+version=42.2
+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"
+changelog="https://gitlab.gnome.org/GNOME/console/-/raw/gnome-42/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=7d26e6c18744c575a787293263f60ceff630107098e9e58a7765b00ac7437049
+
+nautilus-gnome-console-extension_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - nautilus integration"
+ 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
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR REVIEW] New package: gnome-console-42.2
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (28 preceding siblings ...)
2022-07-25 5:20 ` [PR PATCH] [Updated] New package: gnome-console-42.2 oreo639
@ 2022-07-26 20:11 ` paper42
2022-07-26 20:11 ` paper42
` (2 subsequent siblings)
32 siblings, 0 replies; 34+ messages in thread
From: paper42 @ 2022-07-26 20:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 212 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/36445#discussion_r930369741
Comment:
```suggestion
gsettings-desktop-schemas-devel pcre2-devel"
```
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR REVIEW] New package: gnome-console-42.2
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (29 preceding siblings ...)
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
32 siblings, 0 replies; 34+ messages in thread
From: paper42 @ 2022-07-26 20:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 224 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/36445#discussion_r930369140
Comment:
```suggestion
gobject-introspection glib-devel gtk-update-icon-cache "
```
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Updated] New package: gnome-console-42.2
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (30 preceding siblings ...)
2022-07-26 20:11 ` paper42
@ 2022-07-26 20:27 ` oreo639
2022-07-26 21:00 ` [PR PATCH] [Merged]: " paper42
32 siblings, 0 replies; 34+ messages in thread
From: oreo639 @ 2022-07-26 20:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1302 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.2
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
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: 5174 bytes --]
From be221de8cd2da5f6bef229d081594753f71b848f 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 1/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 b69e5bbda63a..8583a6616511 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,7 +1,7 @@
# Template file for 'glib'
pkgname=glib
version=2.72.2
-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
From 75066c23f7f194c8e519b7f562cb4478cf3c3f39 Mon Sep 17 00:00:00 2001
From: oreo639 <31916379+Oreo639@users.noreply.github.com>
Date: Sun, 24 Jul 2022 21:55:20 -0700
Subject: [PATCH 2/2] New package: gnome-console-42.2
---
srcpkgs/gnome-console/template | 26 ++++++++++++++++++++++++
srcpkgs/nautilus-gnome-console-extension | 1 +
2 files changed, 27 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..7e09b6cc9945
--- /dev/null
+++ b/srcpkgs/gnome-console/template
@@ -0,0 +1,26 @@
+# Template file for 'gnome-console'
+pkgname=gnome-console
+version=42.2
+revision=1
+build_style=meson
+configure_args="-Dnautilus=enabled"
+hostmakedepends="pkg-config desktop-file-utils gettext sassc
+ gobject-introspection glib-devel gtk-update-icon-cache"
+makedepends="libhandy1-devel vte3-devel libgtop-devel nautilus-devel
+ gsettings-desktop-schemas-devel pcre2-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"
+changelog="https://gitlab.gnome.org/GNOME/console/-/raw/gnome-42/NEWS"
+distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
+checksum=7d26e6c18744c575a787293263f60ceff630107098e9e58a7765b00ac7437049
+
+nautilus-gnome-console-extension_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - nautilus integration"
+ 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
^ permalink raw reply [flat|nested] 34+ messages in thread* Re: [PR PATCH] [Merged]: New package: gnome-console-42.2
2022-03-31 23:52 [PR PATCH] New package: gnome-console-42.beta oreo639
` (31 preceding siblings ...)
2022-07-26 20:27 ` [PR PATCH] [Updated] " oreo639
@ 2022-07-26 21:00 ` paper42
32 siblings, 0 replies; 34+ messages in thread
From: paper42 @ 2022-07-26 21:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1145 bytes --]
There's a merged pull request on the void-packages repository
New package: gnome-console-42.2
https://github.com/void-linux/void-packages/pull/36445
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
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
-->
^ permalink raw reply [flat|nested] 34+ messages in thread