* [PR PATCH] gosh: remove package, unused.
@ 2023-01-19 15:35 leahneukirchen
2023-01-19 16:38 ` [PR PATCH] [Updated] " leahneukirchen
2023-01-20 13:44 ` [PR PATCH] [Merged]: gosh: remove package, unused. Gauche: update to 0.9.12 leahneukirchen
0 siblings, 2 replies; 3+ messages in thread
From: leahneukirchen @ 2023-01-19 15:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 479 bytes --]
There is a new pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages gosh
https://github.com/void-linux/void-packages/pull/41741
gosh: remove package, unused.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
A patch file from https://github.com/void-linux/void-packages/pull/41741.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gosh-41741.patch --]
[-- Type: text/x-diff, Size: 4530 bytes --]
From fd84565e8101e90aef82b8a45dcd202024a40b31 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 19 Jan 2023 14:03:57 +0100
Subject: [PATCH 1/2] gosh: remove package, unused.
---
srcpkgs/gosh/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/gosh/template
diff --git a/srcpkgs/gosh/template b/srcpkgs/gosh/template
deleted file mode 100644
index ab4b86011e3b..000000000000
--- a/srcpkgs/gosh/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'gosh'
-pkgname=gosh
-version=0.2.3
-revision=13
-build_style=go
-go_import_path="github.com/mkouhei/gosh"
-short_desc="Interactive shell for Golang"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/mkouhei/gosh"
-distfiles="https://github.com/mkouhei/gosh/archive/v${version}.tar.gz"
-checksum=0b601b467a57d809134a13c8e52c4986eb328931a4db3c237630cdcd9891a707
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1538b42fd3bd..e86740d57a3c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -137,6 +137,7 @@ replaces="
goat<=0.0.0.28022016_10
goffice0.8<=0.8.17_6
goproxy<=7.0_1
+ gosh<=0.2.3_13
govendor<=1.0.9_3
gradio<=7.2_1
grv<=0.3.1_3
From a514888364a4ff4bccc5f64102169bfd50fb9863 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 19 Jan 2023 14:06:05 +0100
Subject: [PATCH 2/2] Gauche: install binary as gosh, preserving upstream
defaults.
---
srcpkgs/Gauche/patches/src-makefile.patch | 19 -------------------
srcpkgs/Gauche/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/Gauche/patches/src-makefile.patch
diff --git a/srcpkgs/Gauche/patches/src-makefile.patch b/srcpkgs/Gauche/patches/src-makefile.patch
deleted file mode 100644
index f74d19149b7e..000000000000
--- a/srcpkgs/Gauche/patches/src-makefile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/Makefile.in 2019-12-13 22:50:49.000000000 +0100
-+++ b/src/Makefile-patched.in 2020-04-30 22:47:55.667135591 +0200
-@@ -59,6 +59,7 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- BUILD_GOSH_FLAGS =
-+GOSH = @GOSH@
-
- # These are set by configure
- DEFS = @DEFS@
-@@ -526,7 +527,7 @@
- "$(DESTDIR)$(SITE_SCM_DIR)" \
- "$(DESTDIR)$(SITE_ARCH_DIR)"
- @CROSS_COMPILING_no@GAUCHE_INSTALL = ./gosh -ftest $(srcdir)/gauche-install.in
--@CROSS_COMPILING_yes@GAUCHE_INSTALL = gosh $(srcdir)/gauche-install.in
-+@CROSS_COMPILING_yes@GAUCHE_INSTALL = $(GOSH) $(srcdir)/gauche-install.in
-
- install : install-core
-
diff --git a/srcpkgs/Gauche/template b/srcpkgs/Gauche/template
index 74beafdc6863..2523378d92c5 100644
--- a/srcpkgs/Gauche/template
+++ b/srcpkgs/Gauche/template
@@ -1,10 +1,11 @@
# Template file for 'Gauche'
pkgname=Gauche
version=0.9.9
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="texinfo"
makedepends="libticonv-devel libatomic_ops-devel"
+checkdepends="iana-etc"
short_desc="Practical Scheme R7RS implementation"
maintainer="rc-05 <rc23@email.it>"
license="BSD-3-Clause"
@@ -12,26 +13,19 @@ homepage="https://practical-scheme.net/gauche/"
distfiles="${SOURCEFORGE_SITE}/gauche/${pkgname}-${version}.tgz"
checksum=4ca9325322a7efadb9680d156eb7b53521321c9ca4955c4cbe738bc2e1d7f7fb
alternatives="
- scheme:scheme:/usr/bin/gauche
- scheme:scheme.1:/usr/share/man/man1/gauche.1
+ scheme:scheme:/usr/bin/gosh
+ scheme:scheme.1:/usr/share/man/man1/gosh.1
"
if [ -n "$CROSS_BUILD" ]; then
# Gauche needs itself to bootstrap for cross compilation.
hostmakedepends+=" Gauche"
- # Normally BUILD_GOSH doesn't need to be set but in this case it is mandatory
- # as the native Gauche binary (which is needed to cross-compile for another
- # architecture) has been renamed for conflict problems with another package with
- # the same name.
- configure_args="BUILD_GOSH=/usr/bin/gauche"
- make_install_args="GOSH=/usr/bin/gauche"
fi
post_install() {
- # Needed as Gauche's binary conflicts with the "gosh" package bin.
- mv $DESTDIR/usr/bin/gosh $DESTDIR/usr/bin/gauche
- # Modify also the manual page filename to remain consitent.
- mv $DESTDIR/usr/share/man/man1/gosh.1 $DESTDIR/usr/share/man/man1/gauche.1
+ # Void previously shipped the binary as "gauche", symlink for
+ # consistancy.
+ ln -sf gosh $DESTDIR/usr/bin/gauche
vlicense COPYING
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] gosh: remove package, unused.
2023-01-19 15:35 [PR PATCH] gosh: remove package, unused leahneukirchen
@ 2023-01-19 16:38 ` leahneukirchen
2023-01-20 13:44 ` [PR PATCH] [Merged]: gosh: remove package, unused. Gauche: update to 0.9.12 leahneukirchen
1 sibling, 0 replies; 3+ messages in thread
From: leahneukirchen @ 2023-01-19 16:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 496 bytes --]
There is an updated pull request by leahneukirchen against master on the void-packages repository
https://github.com/leahneukirchen/void-packages gosh
https://github.com/void-linux/void-packages/pull/41741
gosh: remove package, unused.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
cc @rc-05
A patch file from https://github.com/void-linux/void-packages/pull/41741.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gosh-41741.patch --]
[-- Type: text/x-diff, Size: 5797 bytes --]
From fd84565e8101e90aef82b8a45dcd202024a40b31 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 19 Jan 2023 14:03:57 +0100
Subject: [PATCH 1/3] gosh: remove package, unused.
---
srcpkgs/gosh/template | 12 ------------
srcpkgs/removed-packages/template | 1 +
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 srcpkgs/gosh/template
diff --git a/srcpkgs/gosh/template b/srcpkgs/gosh/template
deleted file mode 100644
index ab4b86011e3b..000000000000
--- a/srcpkgs/gosh/template
+++ /dev/null
@@ -1,12 +0,0 @@
-# Template file for 'gosh'
-pkgname=gosh
-version=0.2.3
-revision=13
-build_style=go
-go_import_path="github.com/mkouhei/gosh"
-short_desc="Interactive shell for Golang"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/mkouhei/gosh"
-distfiles="https://github.com/mkouhei/gosh/archive/v${version}.tar.gz"
-checksum=0b601b467a57d809134a13c8e52c4986eb328931a4db3c237630cdcd9891a707
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 1538b42fd3bd..e86740d57a3c 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -137,6 +137,7 @@ replaces="
goat<=0.0.0.28022016_10
goffice0.8<=0.8.17_6
goproxy<=7.0_1
+ gosh<=0.2.3_13
govendor<=1.0.9_3
gradio<=7.2_1
grv<=0.3.1_3
From a514888364a4ff4bccc5f64102169bfd50fb9863 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 19 Jan 2023 14:06:05 +0100
Subject: [PATCH 2/3] Gauche: install binary as gosh, preserving upstream
defaults.
---
srcpkgs/Gauche/patches/src-makefile.patch | 19 -------------------
srcpkgs/Gauche/template | 20 +++++++-------------
2 files changed, 7 insertions(+), 32 deletions(-)
delete mode 100644 srcpkgs/Gauche/patches/src-makefile.patch
diff --git a/srcpkgs/Gauche/patches/src-makefile.patch b/srcpkgs/Gauche/patches/src-makefile.patch
deleted file mode 100644
index f74d19149b7e..000000000000
--- a/srcpkgs/Gauche/patches/src-makefile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/Makefile.in 2019-12-13 22:50:49.000000000 +0100
-+++ b/src/Makefile-patched.in 2020-04-30 22:47:55.667135591 +0200
-@@ -59,6 +59,7 @@
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- BUILD_GOSH_FLAGS =
-+GOSH = @GOSH@
-
- # These are set by configure
- DEFS = @DEFS@
-@@ -526,7 +527,7 @@
- "$(DESTDIR)$(SITE_SCM_DIR)" \
- "$(DESTDIR)$(SITE_ARCH_DIR)"
- @CROSS_COMPILING_no@GAUCHE_INSTALL = ./gosh -ftest $(srcdir)/gauche-install.in
--@CROSS_COMPILING_yes@GAUCHE_INSTALL = gosh $(srcdir)/gauche-install.in
-+@CROSS_COMPILING_yes@GAUCHE_INSTALL = $(GOSH) $(srcdir)/gauche-install.in
-
- install : install-core
-
diff --git a/srcpkgs/Gauche/template b/srcpkgs/Gauche/template
index 74beafdc6863..2523378d92c5 100644
--- a/srcpkgs/Gauche/template
+++ b/srcpkgs/Gauche/template
@@ -1,10 +1,11 @@
# Template file for 'Gauche'
pkgname=Gauche
version=0.9.9
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="texinfo"
makedepends="libticonv-devel libatomic_ops-devel"
+checkdepends="iana-etc"
short_desc="Practical Scheme R7RS implementation"
maintainer="rc-05 <rc23@email.it>"
license="BSD-3-Clause"
@@ -12,26 +13,19 @@ homepage="https://practical-scheme.net/gauche/"
distfiles="${SOURCEFORGE_SITE}/gauche/${pkgname}-${version}.tgz"
checksum=4ca9325322a7efadb9680d156eb7b53521321c9ca4955c4cbe738bc2e1d7f7fb
alternatives="
- scheme:scheme:/usr/bin/gauche
- scheme:scheme.1:/usr/share/man/man1/gauche.1
+ scheme:scheme:/usr/bin/gosh
+ scheme:scheme.1:/usr/share/man/man1/gosh.1
"
if [ -n "$CROSS_BUILD" ]; then
# Gauche needs itself to bootstrap for cross compilation.
hostmakedepends+=" Gauche"
- # Normally BUILD_GOSH doesn't need to be set but in this case it is mandatory
- # as the native Gauche binary (which is needed to cross-compile for another
- # architecture) has been renamed for conflict problems with another package with
- # the same name.
- configure_args="BUILD_GOSH=/usr/bin/gauche"
- make_install_args="GOSH=/usr/bin/gauche"
fi
post_install() {
- # Needed as Gauche's binary conflicts with the "gosh" package bin.
- mv $DESTDIR/usr/bin/gosh $DESTDIR/usr/bin/gauche
- # Modify also the manual page filename to remain consitent.
- mv $DESTDIR/usr/share/man/man1/gosh.1 $DESTDIR/usr/share/man/man1/gauche.1
+ # Void previously shipped the binary as "gauche", symlink for
+ # consistancy.
+ ln -sf gosh $DESTDIR/usr/bin/gauche
vlicense COPYING
}
From bd83fee99d8a72f0c89a3ecc4594c79df7446fd1 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Thu, 19 Jan 2023 17:38:33 +0100
Subject: [PATCH 3/3] Gauche: update to 0.9.12.
---
srcpkgs/Gauche/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/Gauche/template b/srcpkgs/Gauche/template
index 2523378d92c5..fd087256ff7a 100644
--- a/srcpkgs/Gauche/template
+++ b/srcpkgs/Gauche/template
@@ -1,7 +1,7 @@
# Template file for 'Gauche'
pkgname=Gauche
-version=0.9.9
-revision=2
+version=0.9.12
+revision=1
build_style=gnu-configure
hostmakedepends="texinfo"
makedepends="libticonv-devel libatomic_ops-devel"
@@ -10,8 +10,8 @@ short_desc="Practical Scheme R7RS implementation"
maintainer="rc-05 <rc23@email.it>"
license="BSD-3-Clause"
homepage="https://practical-scheme.net/gauche/"
-distfiles="${SOURCEFORGE_SITE}/gauche/${pkgname}-${version}.tgz"
-checksum=4ca9325322a7efadb9680d156eb7b53521321c9ca4955c4cbe738bc2e1d7f7fb
+distfiles="https://github.com/shirok/Gauche/releases/download/release${version//\./_}/Gauche-${version}.tgz"
+checksum=b4ae64921b07a96661695ebd5aac0dec813d1a68e546a61609113d7843f5b617
alternatives="
scheme:scheme:/usr/bin/gosh
scheme:scheme.1:/usr/share/man/man1/gosh.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: gosh: remove package, unused. Gauche: update to 0.9.12.
2023-01-19 15:35 [PR PATCH] gosh: remove package, unused leahneukirchen
2023-01-19 16:38 ` [PR PATCH] [Updated] " leahneukirchen
@ 2023-01-20 13:44 ` leahneukirchen
1 sibling, 0 replies; 3+ messages in thread
From: leahneukirchen @ 2023-01-20 13:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 357 bytes --]
There's a merged pull request on the void-packages repository
gosh: remove package, unused. Gauche: update to 0.9.12.
https://github.com/void-linux/void-packages/pull/41741
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
cc @rc-05
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-01-20 13:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-19 15:35 [PR PATCH] gosh: remove package, unused leahneukirchen
2023-01-19 16:38 ` [PR PATCH] [Updated] " leahneukirchen
2023-01-20 13:44 ` [PR PATCH] [Merged]: gosh: remove package, unused. Gauche: update to 0.9.12 leahneukirchen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).