* [PR PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16.
@ 2020-04-15 22:46 mobinmob
2020-04-15 23:10 ` mobinmob
` (20 more replies)
0 siblings, 21 replies; 22+ messages in thread
From: mobinmob @ 2020-04-15 22:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 536 bytes --]
There is a new pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages zeroinstall
https://github.com/void-linux/void-packages/pull/21039
zeroinstall-injector: rename to zeroinstall, update to 2.16.
Update to new version (ocaml rewrite), rename and adopt.
Based on https://github.com/void-linux/void-packages/pull/18155 and https://github.com/void-linux/void-packages/pull/19563 .
A patch file from https://github.com/void-linux/void-packages/pull/21039.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zeroinstall-21039.patch --]
[-- Type: text/x-diff, Size: 3375 bytes --]
From 4fa6aa15f1d0aef46c52ab44440ed995fd68b405 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 10 Jan 2020 01:20:59 +0200
Subject: [PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16.
---
srcpkgs/zeroinstall-injector | 1 +
srcpkgs/zeroinstall-injector/template | 20 -----------
srcpkgs/zeroinstall/template | 34 +++++++++++++++++++
.../update | 0
4 files changed, 35 insertions(+), 20 deletions(-)
create mode 120000 srcpkgs/zeroinstall-injector
delete mode 100644 srcpkgs/zeroinstall-injector/template
create mode 100644 srcpkgs/zeroinstall/template
rename srcpkgs/{zeroinstall-injector => zeroinstall}/update (100%)
diff --git a/srcpkgs/zeroinstall-injector b/srcpkgs/zeroinstall-injector
new file mode 120000
index 00000000000..6198f145407
--- /dev/null
+++ b/srcpkgs/zeroinstall-injector
@@ -0,0 +1 @@
+zeroinstall
\ No newline at end of file
diff --git a/srcpkgs/zeroinstall-injector/template b/srcpkgs/zeroinstall-injector/template
deleted file mode 100644
index 0a274c7c17c..00000000000
--- a/srcpkgs/zeroinstall-injector/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'zeroinstall-injector'
-pkgname=zeroinstall-injector
-version=2.3.4
-revision=2
-archs=noarch
-wrksrc="0install-${version}"
-build_style=python2-module
-hostmakedepends="python"
-depends="gnupg python-dbus pygtk desktop-file-utils hicolor-icon-theme xdg-utils"
-pycompile_module="zeroinstall"
-short_desc="A cross-distribution software installation system"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://0install.net"
-distfiles="${SOURCEFORGE_SITE}/zero-install/0install-$version.tar.bz2"
-checksum=79aa6cfdbd2db5dcfffea1edd583190e8508012f7e095487bc59cb64b5db587b
-
-pre_configure() {
- sed -i "s|man/|share/&|" setup.py
-}
diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
new file mode 100644
index 00000000000..eec869299eb
--- /dev/null
+++ b/srcpkgs/zeroinstall/template
@@ -0,0 +1,34 @@
+# Template file for 'zeroinstall'
+pkgname=zeroinstall
+version=2.16
+revision=1
+wrksrc="0install-v${version}"
+build_style=gnu-makefile
+make_install_target="install_system"
+make_check_args="test"
+hostmakedepends="gettext opam m4 tar pkg-config which"
+makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
+short_desc="Cross-distribution software installation system"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="LGPL-2.1-only"
+homepage="http://0install.net"
+distfiles="https://github.com/0install/0install/releases/download/v${version}/0install-v${version}.tbz"
+checksum=4a040cd8ab3a55a84f8daec48306b45d9c9662860fe003c927ef8b485cdecef3
+nocross="opam is nocross"
+
+
+
+pre_build() {
+ opam init -y --compiler=4.07.0 --disable-sandboxing
+ eval $(opam env)
+ opam install -y yojson xmlm ounit lwt lwt_react obus ocurl sha dune lablgtk3 lwt_glib
+}
+
+
+zeroinstall-injector_package() {
+ build_style=meta
+ archs=noarch
+ short_desc+=" - transitional dummy pkg"
+ depends="zeroinstall-${version}_${revision}"
+}
diff --git a/srcpkgs/zeroinstall-injector/update b/srcpkgs/zeroinstall/update
similarity index 100%
rename from srcpkgs/zeroinstall-injector/update
rename to srcpkgs/zeroinstall/update
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: zeroinstall-injector: rename to zeroinstall, update to 2.16.
2020-04-15 22:46 [PR PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16 mobinmob
@ 2020-04-15 23:10 ` mobinmob
2020-04-16 8:17 ` mobinmob
` (19 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: mobinmob @ 2020-04-15 23:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/21039#issuecomment-614324317
Comment:
c-i builds fail (again...).
It build and works fine on my x86_64 system :)
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: zeroinstall-injector: rename to zeroinstall, update to 2.16.
2020-04-15 22:46 [PR PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16 mobinmob
2020-04-15 23:10 ` mobinmob
@ 2020-04-16 8:17 ` mobinmob
2020-04-16 11:14 ` [PR PATCH] [Updated] " mobinmob
` (18 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: mobinmob @ 2020-04-16 8:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 218 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/21039#issuecomment-614324317
Comment:
c-i builds fail (again...).
It builds and works fine on my x86_64 system :)
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] zeroinstall-injector: rename to zeroinstall, update to 2.16.
2020-04-15 22:46 [PR PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16 mobinmob
2020-04-15 23:10 ` mobinmob
2020-04-16 8:17 ` mobinmob
@ 2020-04-16 11:14 ` mobinmob
2020-04-17 0:50 ` mobinmob
` (17 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: mobinmob @ 2020-04-16 11:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 541 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages zeroinstall
https://github.com/void-linux/void-packages/pull/21039
zeroinstall-injector: rename to zeroinstall, update to 2.16.
Update to new version (ocaml rewrite), rename and adopt.
Based on https://github.com/void-linux/void-packages/pull/18155 and https://github.com/void-linux/void-packages/pull/19563 .
A patch file from https://github.com/void-linux/void-packages/pull/21039.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zeroinstall-21039.patch --]
[-- Type: text/x-diff, Size: 3353 bytes --]
From 6cb63ccc4f4ab5b549098e4b7c318e6ee7115736 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 10 Jan 2020 01:20:59 +0200
Subject: [PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16.
---
srcpkgs/zeroinstall-injector | 1 +
srcpkgs/zeroinstall-injector/template | 20 ------------
srcpkgs/zeroinstall/template | 31 +++++++++++++++++++
.../update | 0
4 files changed, 32 insertions(+), 20 deletions(-)
create mode 120000 srcpkgs/zeroinstall-injector
delete mode 100644 srcpkgs/zeroinstall-injector/template
create mode 100644 srcpkgs/zeroinstall/template
rename srcpkgs/{zeroinstall-injector => zeroinstall}/update (100%)
diff --git a/srcpkgs/zeroinstall-injector b/srcpkgs/zeroinstall-injector
new file mode 120000
index 00000000000..6198f145407
--- /dev/null
+++ b/srcpkgs/zeroinstall-injector
@@ -0,0 +1 @@
+zeroinstall
\ No newline at end of file
diff --git a/srcpkgs/zeroinstall-injector/template b/srcpkgs/zeroinstall-injector/template
deleted file mode 100644
index 0a274c7c17c..00000000000
--- a/srcpkgs/zeroinstall-injector/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'zeroinstall-injector'
-pkgname=zeroinstall-injector
-version=2.3.4
-revision=2
-archs=noarch
-wrksrc="0install-${version}"
-build_style=python2-module
-hostmakedepends="python"
-depends="gnupg python-dbus pygtk desktop-file-utils hicolor-icon-theme xdg-utils"
-pycompile_module="zeroinstall"
-short_desc="A cross-distribution software installation system"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://0install.net"
-distfiles="${SOURCEFORGE_SITE}/zero-install/0install-$version.tar.bz2"
-checksum=79aa6cfdbd2db5dcfffea1edd583190e8508012f7e095487bc59cb64b5db587b
-
-pre_configure() {
- sed -i "s|man/|share/&|" setup.py
-}
diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
new file mode 100644
index 00000000000..0ed81e9bcf1
--- /dev/null
+++ b/srcpkgs/zeroinstall/template
@@ -0,0 +1,31 @@
+# Template file for 'zeroinstall'
+pkgname=zeroinstall
+version=2.16
+revision=1
+wrksrc="0install-v${version}"
+build_style=gnu-makefile
+make_install_target="install_system"
+hostmakedepends="gettext opam m4 tar pkg-config which"
+makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
+short_desc="Cross-distribution software installation system"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="LGPL-2.1-only"
+homepage="http://0install.net"
+distfiles="https://github.com/0install/0install/releases/download/v${version}/0install-v${version}.tbz"
+checksum=4a040cd8ab3a55a84f8daec48306b45d9c9662860fe003c927ef8b485cdecef3
+nocross="yes" #opam is nocross
+
+pre_build() {
+ opam init -y --compiler=4.07.0 --disable-sandboxing
+ eval $(opam env)
+ opam install -y yojson xmlm ounit lwt lwt_react obus ocurl sha dune lablgtk3 lwt_glib
+}
+
+
+zeroinstall-injector_package() {
+ build_style=meta
+ archs=noarch
+ short_desc+=" - transitional dummy pkg"
+ depends="zeroinstall-${version}_${revision}"
+}
diff --git a/srcpkgs/zeroinstall-injector/update b/srcpkgs/zeroinstall/update
similarity index 100%
rename from srcpkgs/zeroinstall-injector/update
rename to srcpkgs/zeroinstall/update
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] zeroinstall-injector: rename to zeroinstall, update to 2.16.
2020-04-15 22:46 [PR PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16 mobinmob
` (2 preceding siblings ...)
2020-04-16 11:14 ` [PR PATCH] [Updated] " mobinmob
@ 2020-04-17 0:50 ` mobinmob
2020-04-17 1:06 ` mobinmob
` (16 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: mobinmob @ 2020-04-17 0:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 541 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages zeroinstall
https://github.com/void-linux/void-packages/pull/21039
zeroinstall-injector: rename to zeroinstall, update to 2.16.
Update to new version (ocaml rewrite), rename and adopt.
Based on https://github.com/void-linux/void-packages/pull/18155 and https://github.com/void-linux/void-packages/pull/19563 .
A patch file from https://github.com/void-linux/void-packages/pull/21039.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zeroinstall-21039.patch --]
[-- Type: text/x-diff, Size: 4368 bytes --]
From 7247891f03b44184cd154f7e67433d56487962ff Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 10 Jan 2020 01:20:59 +0200
Subject: [PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16.
---
...3349fd0405439532f2ff0896a3697c73ccaaf.diff | 13 ++++++++
srcpkgs/zeroinstall-injector | 1 +
srcpkgs/zeroinstall-injector/template | 20 -------------
srcpkgs/zeroinstall/template | 30 +++++++++++++++++++
.../update | 0
5 files changed, 44 insertions(+), 20 deletions(-)
create mode 100644 srcpkgs/libgit2-glib/patches/7f63349fd0405439532f2ff0896a3697c73ccaaf.diff
create mode 120000 srcpkgs/zeroinstall-injector
delete mode 100644 srcpkgs/zeroinstall-injector/template
create mode 100644 srcpkgs/zeroinstall/template
rename srcpkgs/{zeroinstall-injector => zeroinstall}/update (100%)
diff --git a/srcpkgs/libgit2-glib/patches/7f63349fd0405439532f2ff0896a3697c73ccaaf.diff b/srcpkgs/libgit2-glib/patches/7f63349fd0405439532f2ff0896a3697c73ccaaf.diff
new file mode 100644
index 00000000000..75860e6f4e9
--- /dev/null
+++ b/srcpkgs/libgit2-glib/patches/7f63349fd0405439532f2ff0896a3697c73ccaaf.diff
@@ -0,0 +1,13 @@
+diff --git a/meson.build b/meson.build
+index 6d314b5..3a423b3 100644
+--- a/meson.build
++++ b/meson.build
+@@ -135,7 +135,7 @@ if enable_vapi
+ assert(enable_gir, 'vapi support was requested, but introspection support is mandatory.')
+ assert(add_languages('vala', required: false), 'vapi support was requested, but vala not found.')
+
+- meson.add_install_script('meson_vapi_link.py', libgit2_glib_datadir)
++ meson.add_install_script('meson_vapi_link.py', get_option('datadir'))
+ endif
+
+ # Check for libgit2 ssh support
diff --git a/srcpkgs/zeroinstall-injector b/srcpkgs/zeroinstall-injector
new file mode 120000
index 00000000000..6198f145407
--- /dev/null
+++ b/srcpkgs/zeroinstall-injector
@@ -0,0 +1 @@
+zeroinstall
\ No newline at end of file
diff --git a/srcpkgs/zeroinstall-injector/template b/srcpkgs/zeroinstall-injector/template
deleted file mode 100644
index 0a274c7c17c..00000000000
--- a/srcpkgs/zeroinstall-injector/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'zeroinstall-injector'
-pkgname=zeroinstall-injector
-version=2.3.4
-revision=2
-archs=noarch
-wrksrc="0install-${version}"
-build_style=python2-module
-hostmakedepends="python"
-depends="gnupg python-dbus pygtk desktop-file-utils hicolor-icon-theme xdg-utils"
-pycompile_module="zeroinstall"
-short_desc="A cross-distribution software installation system"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://0install.net"
-distfiles="${SOURCEFORGE_SITE}/zero-install/0install-$version.tar.bz2"
-checksum=79aa6cfdbd2db5dcfffea1edd583190e8508012f7e095487bc59cb64b5db587b
-
-pre_configure() {
- sed -i "s|man/|share/&|" setup.py
-}
diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
new file mode 100644
index 00000000000..d6852da1fde
--- /dev/null
+++ b/srcpkgs/zeroinstall/template
@@ -0,0 +1,30 @@
+# Template file for 'zeroinstall'
+pkgname=zeroinstall
+version=2.16
+revision=1
+wrksrc="0install-v${version}"
+build_style=gnu-makefile
+make_install_target="install_system"
+hostmakedepends="gettext opam m4 tar pkg-config which"
+makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
+short_desc="Cross-distribution software installation system"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="LGPL-2.1-only"
+homepage="http://0install.net"
+distfiles="https://github.com/0install/0install/releases/download/v${version}/0install-v${version}.tbz"
+checksum=4a040cd8ab3a55a84f8daec48306b45d9c9662860fe003c927ef8b485cdecef3
+nocross="opam is nocross"
+
+pre_build() {
+ opam init -y --compiler=4.07.0 --disable-sandboxing
+ eval $(opam env)
+ opam install -y yojson xmlm ounit lwt lwt_react obus ocurl sha dune lablgtk3 lwt_glib
+}
+
+zeroinstall-injector_package() {
+ build_style=meta
+ archs=noarch
+ short_desc+=" - transitional dummy pkg"
+ depends="zeroinstall-${version}_${revision}"
+}
diff --git a/srcpkgs/zeroinstall-injector/update b/srcpkgs/zeroinstall/update
similarity index 100%
rename from srcpkgs/zeroinstall-injector/update
rename to srcpkgs/zeroinstall/update
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] zeroinstall-injector: rename to zeroinstall, update to 2.16.
2020-04-15 22:46 [PR PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16 mobinmob
` (3 preceding siblings ...)
2020-04-17 0:50 ` mobinmob
@ 2020-04-17 1:06 ` mobinmob
2020-04-17 12:30 ` Piraty
` (15 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: mobinmob @ 2020-04-17 1:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 541 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages zeroinstall
https://github.com/void-linux/void-packages/pull/21039
zeroinstall-injector: rename to zeroinstall, update to 2.16.
Update to new version (ocaml rewrite), rename and adopt.
Based on https://github.com/void-linux/void-packages/pull/18155 and https://github.com/void-linux/void-packages/pull/19563 .
A patch file from https://github.com/void-linux/void-packages/pull/21039.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zeroinstall-21039.patch --]
[-- Type: text/x-diff, Size: 3347 bytes --]
From 3f842d996a1bcd098217b857d4ef1c4a97118139 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 17 Apr 2020 04:05:28 +0300
Subject: [PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16.
---
srcpkgs/zeroinstall-injector | 1 +
srcpkgs/zeroinstall-injector/template | 20 -------------
srcpkgs/zeroinstall/template | 30 +++++++++++++++++++
.../update | 0
4 files changed, 31 insertions(+), 20 deletions(-)
create mode 120000 srcpkgs/zeroinstall-injector
delete mode 100644 srcpkgs/zeroinstall-injector/template
create mode 100644 srcpkgs/zeroinstall/template
rename srcpkgs/{zeroinstall-injector => zeroinstall}/update (100%)
diff --git a/srcpkgs/zeroinstall-injector b/srcpkgs/zeroinstall-injector
new file mode 120000
index 00000000000..6198f145407
--- /dev/null
+++ b/srcpkgs/zeroinstall-injector
@@ -0,0 +1 @@
+zeroinstall
\ No newline at end of file
diff --git a/srcpkgs/zeroinstall-injector/template b/srcpkgs/zeroinstall-injector/template
deleted file mode 100644
index 0a274c7c17c..00000000000
--- a/srcpkgs/zeroinstall-injector/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'zeroinstall-injector'
-pkgname=zeroinstall-injector
-version=2.3.4
-revision=2
-archs=noarch
-wrksrc="0install-${version}"
-build_style=python2-module
-hostmakedepends="python"
-depends="gnupg python-dbus pygtk desktop-file-utils hicolor-icon-theme xdg-utils"
-pycompile_module="zeroinstall"
-short_desc="A cross-distribution software installation system"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://0install.net"
-distfiles="${SOURCEFORGE_SITE}/zero-install/0install-$version.tar.bz2"
-checksum=79aa6cfdbd2db5dcfffea1edd583190e8508012f7e095487bc59cb64b5db587b
-
-pre_configure() {
- sed -i "s|man/|share/&|" setup.py
-}
diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
new file mode 100644
index 00000000000..d6852da1fde
--- /dev/null
+++ b/srcpkgs/zeroinstall/template
@@ -0,0 +1,30 @@
+# Template file for 'zeroinstall'
+pkgname=zeroinstall
+version=2.16
+revision=1
+wrksrc="0install-v${version}"
+build_style=gnu-makefile
+make_install_target="install_system"
+hostmakedepends="gettext opam m4 tar pkg-config which"
+makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
+short_desc="Cross-distribution software installation system"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="LGPL-2.1-only"
+homepage="http://0install.net"
+distfiles="https://github.com/0install/0install/releases/download/v${version}/0install-v${version}.tbz"
+checksum=4a040cd8ab3a55a84f8daec48306b45d9c9662860fe003c927ef8b485cdecef3
+nocross="opam is nocross"
+
+pre_build() {
+ opam init -y --compiler=4.07.0 --disable-sandboxing
+ eval $(opam env)
+ opam install -y yojson xmlm ounit lwt lwt_react obus ocurl sha dune lablgtk3 lwt_glib
+}
+
+zeroinstall-injector_package() {
+ build_style=meta
+ archs=noarch
+ short_desc+=" - transitional dummy pkg"
+ depends="zeroinstall-${version}_${revision}"
+}
diff --git a/srcpkgs/zeroinstall-injector/update b/srcpkgs/zeroinstall/update
similarity index 100%
rename from srcpkgs/zeroinstall-injector/update
rename to srcpkgs/zeroinstall/update
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: zeroinstall-injector: rename to zeroinstall, update to 2.16.
2020-04-15 22:46 [PR PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16 mobinmob
` (4 preceding siblings ...)
2020-04-17 1:06 ` mobinmob
@ 2020-04-17 12:30 ` Piraty
2020-04-17 12:37 ` mobinmob
` (14 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Piraty @ 2020-04-17 12:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 152 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/21039#issuecomment-615217635
Comment:
travis fails
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: zeroinstall-injector: rename to zeroinstall, update to 2.16.
2020-04-15 22:46 [PR PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16 mobinmob
` (5 preceding siblings ...)
2020-04-17 12:30 ` Piraty
@ 2020-04-17 12:37 ` mobinmob
2020-04-17 13:16 ` mobinmob
` (13 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: mobinmob @ 2020-04-17 12:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 229 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/21039#issuecomment-615220889
Comment:
@Piraty Yes and I have no idea why...
I am actually using the ocaml version in x86_64.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: zeroinstall-injector: rename to zeroinstall, update to 2.16.
2020-04-15 22:46 [PR PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16 mobinmob
` (6 preceding siblings ...)
2020-04-17 12:37 ` mobinmob
@ 2020-04-17 13:16 ` mobinmob
2020-04-19 12:36 ` Piraty
` (12 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: mobinmob @ 2020-04-17 13:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/21039#issuecomment-615238279
Comment:
@Piraty
My (local) build log: https://termbin.com/lue6
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: zeroinstall-injector: rename to zeroinstall, update to 2.16.
2020-04-15 22:46 [PR PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16 mobinmob
` (7 preceding siblings ...)
2020-04-17 13:16 ` mobinmob
@ 2020-04-19 12:36 ` Piraty
2020-04-19 12:52 ` mobinmob
` (11 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Piraty @ 2020-04-19 12:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 588 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/21039#issuecomment-616123715
Comment:
I did a local build (rebased 3f842d996a1bcd098217b857d4ef1c4a97118139 onto 828b33121c23730a58871d64f1dd4fcd2b92296a) and even got a different error.
Maybe it's racy?
```
=> zeroinstall-2.16_1: running do_build ...
dune build --root=. --profile=release @install
dune runtest --root=. --profile=release
Error: Error: mkdir: _build/default/.dune: File exists
make: *** [Makefile:65: test] Error 1
make: *** Waiting for unfinished jobs....
```
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: zeroinstall-injector: rename to zeroinstall, update to 2.16.
2020-04-15 22:46 [PR PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16 mobinmob
` (8 preceding siblings ...)
2020-04-19 12:36 ` Piraty
@ 2020-04-19 12:52 ` mobinmob
2020-04-19 12:53 ` mobinmob
` (10 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: mobinmob @ 2020-04-19 12:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 918 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/21039#issuecomment-616127114
Comment:
> I did a local build (rebased [3f842d9](https://github.com/void-linux/void-packages/commit/3f842d996a1bcd098217b857d4ef1c4a97118139) onto [828b331](https://github.com/void-linux/void-packages/commit/828b33121c23730a58871d64f1dd4fcd2b92296a)) and even got a different error.
> Maybe it's racy?
>
> ```
> => zeroinstall-2.16_1: running do_build ...
> dune build --root=. --profile=release @install
> dune runtest --root=. --profile=release
> Error: Error: mkdir: _build/default/.dune: File exists
> make: *** [Makefile:65: test] Error 1
> make: *** Waiting for unfinished jobs....
> ```
Let me rebase onto master and try again...
I only had conflicts with the template when I forcibly quit the build process (CTRL+C).
I use the default chroot method for xbps-src.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: zeroinstall-injector: rename to zeroinstall, update to 2.16.
2020-04-15 22:46 [PR PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16 mobinmob
` (9 preceding siblings ...)
2020-04-19 12:52 ` mobinmob
@ 2020-04-19 12:53 ` mobinmob
2020-04-19 12:59 ` mobinmob
` (9 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: mobinmob @ 2020-04-19 12:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 943 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/21039#issuecomment-616127114
Comment:
> I did a local build (rebased [3f842d9](https://github.com/void-linux/void-packages/commit/3f842d996a1bcd098217b857d4ef1c4a97118139) onto [828b331](https://github.com/void-linux/void-packages/commit/828b33121c23730a58871d64f1dd4fcd2b92296a)) and even got a different error.
> Maybe it's racy?
>
> ```
> => zeroinstall-2.16_1: running do_build ...
> dune build --root=. --profile=release @install
> dune runtest --root=. --profile=release
> Error: Error: mkdir: _build/default/.dune: File exists
> make: *** [Makefile:65: test] Error 1
> make: *** Waiting for unfinished jobs....
> ```
Let me rebase onto master and try again...
I only had conflicts with the template when I forcibly quit the build process (CTRL+C) and tried to build again.
I use the default chroot method for xbps-src.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: zeroinstall-injector: rename to zeroinstall, update to 2.16.
2020-04-15 22:46 [PR PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16 mobinmob
` (10 preceding siblings ...)
2020-04-19 12:53 ` mobinmob
@ 2020-04-19 12:59 ` mobinmob
2020-04-19 13:04 ` Piraty
` (8 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: mobinmob @ 2020-04-19 12:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 951 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/21039#issuecomment-616127114
Comment:
> I did a local build (rebased [3f842d9](https://github.com/void-linux/void-packages/commit/3f842d996a1bcd098217b857d4ef1c4a97118139) onto [828b331](https://github.com/void-linux/void-packages/commit/828b33121c23730a58871d64f1dd4fcd2b92296a)) and even got a different error.
> Maybe it's racy?
>
> ```
> => zeroinstall-2.16_1: running do_build ...
> dune build --root=. --profile=release @install
> dune runtest --root=. --profile=release
> Error: Error: mkdir: _build/default/.dune: File exists
> make: *** [Makefile:65: test] Error 1
> make: *** Waiting for unfinished jobs....
> ```
Let me rebase onto master and try again...
I only had errors with the template when I forcibly quit the build process (CTRL+C) and tried to build again right away.
I use the default chroot method for xbps-src.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: zeroinstall-injector: rename to zeroinstall, update to 2.16.
2020-04-15 22:46 [PR PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16 mobinmob
` (11 preceding siblings ...)
2020-04-19 12:59 ` mobinmob
@ 2020-04-19 13:04 ` Piraty
2020-04-19 13:45 ` [PR PATCH] [Updated] " mobinmob
` (7 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Piraty @ 2020-04-19 13:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 177 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/21039#issuecomment-616129611
Comment:
`disable_parallel_build=yes` fixes it
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] zeroinstall-injector: rename to zeroinstall, update to 2.16.
2020-04-15 22:46 [PR PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16 mobinmob
` (12 preceding siblings ...)
2020-04-19 13:04 ` Piraty
@ 2020-04-19 13:45 ` mobinmob
2020-04-19 13:47 ` mobinmob
` (6 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: mobinmob @ 2020-04-19 13:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 541 bytes --]
There is an updated pull request by mobinmob against master on the void-packages repository
https://github.com/mobinmob/void-packages zeroinstall
https://github.com/void-linux/void-packages/pull/21039
zeroinstall-injector: rename to zeroinstall, update to 2.16.
Update to new version (ocaml rewrite), rename and adopt.
Based on https://github.com/void-linux/void-packages/pull/18155 and https://github.com/void-linux/void-packages/pull/19563 .
A patch file from https://github.com/void-linux/void-packages/pull/21039.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zeroinstall-21039.patch --]
[-- Type: text/x-diff, Size: 3374 bytes --]
From c9ee151f605e1305296aeabe95f8d15131c6d887 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 17 Apr 2020 04:05:28 +0300
Subject: [PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16.
---
srcpkgs/zeroinstall-injector | 1 +
srcpkgs/zeroinstall-injector/template | 20 ------------
srcpkgs/zeroinstall/template | 31 +++++++++++++++++++
.../update | 0
4 files changed, 32 insertions(+), 20 deletions(-)
create mode 120000 srcpkgs/zeroinstall-injector
delete mode 100644 srcpkgs/zeroinstall-injector/template
create mode 100644 srcpkgs/zeroinstall/template
rename srcpkgs/{zeroinstall-injector => zeroinstall}/update (100%)
diff --git a/srcpkgs/zeroinstall-injector b/srcpkgs/zeroinstall-injector
new file mode 120000
index 00000000000..6198f145407
--- /dev/null
+++ b/srcpkgs/zeroinstall-injector
@@ -0,0 +1 @@
+zeroinstall
\ No newline at end of file
diff --git a/srcpkgs/zeroinstall-injector/template b/srcpkgs/zeroinstall-injector/template
deleted file mode 100644
index 0a274c7c17c..00000000000
--- a/srcpkgs/zeroinstall-injector/template
+++ /dev/null
@@ -1,20 +0,0 @@
-# Template file for 'zeroinstall-injector'
-pkgname=zeroinstall-injector
-version=2.3.4
-revision=2
-archs=noarch
-wrksrc="0install-${version}"
-build_style=python2-module
-hostmakedepends="python"
-depends="gnupg python-dbus pygtk desktop-file-utils hicolor-icon-theme xdg-utils"
-pycompile_module="zeroinstall"
-short_desc="A cross-distribution software installation system"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="LGPL-2.1"
-homepage="http://0install.net"
-distfiles="${SOURCEFORGE_SITE}/zero-install/0install-$version.tar.bz2"
-checksum=79aa6cfdbd2db5dcfffea1edd583190e8508012f7e095487bc59cb64b5db587b
-
-pre_configure() {
- sed -i "s|man/|share/&|" setup.py
-}
diff --git a/srcpkgs/zeroinstall/template b/srcpkgs/zeroinstall/template
new file mode 100644
index 00000000000..dfdc5410664
--- /dev/null
+++ b/srcpkgs/zeroinstall/template
@@ -0,0 +1,31 @@
+# Template file for 'zeroinstall'
+pkgname=zeroinstall
+version=2.16
+revision=1
+wrksrc="0install-v${version}"
+build_style=gnu-makefile
+make_install_target="install_system"
+hostmakedepends="gettext opam m4 tar pkg-config which"
+makedepends="libressl-devel libcurl-devel gnupg glib-devel gtk+3-devel"
+depends="gnupg desktop-file-utils hicolor-icon-theme xdg-utils"
+short_desc="Cross-distribution software installation system"
+maintainer="mobinmob <mobinmob@disroot.org>"
+license="LGPL-2.1-only"
+homepage="http://0install.net"
+distfiles="https://github.com/0install/0install/releases/download/v${version}/0install-v${version}.tbz"
+checksum=4a040cd8ab3a55a84f8daec48306b45d9c9662860fe003c927ef8b485cdecef3
+nocross="opam is nocross"
+disable_parallel_build=yes
+
+pre_build() {
+ opam init -y --compiler=4.07.0 --disable-sandboxing
+ eval $(opam env)
+ opam install -y yojson xmlm ounit lwt lwt_react obus ocurl sha dune lablgtk3 lwt_glib
+}
+
+zeroinstall-injector_package() {
+ build_style=meta
+ archs=noarch
+ short_desc+=" - transitional dummy pkg"
+ depends="zeroinstall-${version}_${revision}"
+}
diff --git a/srcpkgs/zeroinstall-injector/update b/srcpkgs/zeroinstall/update
similarity index 100%
rename from srcpkgs/zeroinstall-injector/update
rename to srcpkgs/zeroinstall/update
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: zeroinstall-injector: rename to zeroinstall, update to 2.16.
2020-04-15 22:46 [PR PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16 mobinmob
` (13 preceding siblings ...)
2020-04-19 13:45 ` [PR PATCH] [Updated] " mobinmob
@ 2020-04-19 13:47 ` mobinmob
2020-04-19 15:03 ` Piraty
` (5 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: mobinmob @ 2020-04-19 13:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 317 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/21039#issuecomment-616138793
Comment:
> `disable_parallel_build=yes` fixes it
Thank you! I rebased and pushed with the change.
Locally I had the same results with and without it, but that can be just luck. ;)
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: zeroinstall-injector: rename to zeroinstall, update to 2.16.
2020-04-15 22:46 [PR PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16 mobinmob
` (14 preceding siblings ...)
2020-04-19 13:47 ` mobinmob
@ 2020-04-19 15:03 ` Piraty
2020-04-19 15:09 ` mobinmob
` (4 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Piraty @ 2020-04-19 15:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 184 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/21039#issuecomment-616156139
Comment:
@mobinmob do you build with `XBPS_MAKEJOBS`?
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: zeroinstall-injector: rename to zeroinstall, update to 2.16.
2020-04-15 22:46 [PR PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16 mobinmob
` (15 preceding siblings ...)
2020-04-19 15:03 ` Piraty
@ 2020-04-19 15:09 ` mobinmob
2020-04-19 15:25 ` [PR PATCH] [Closed]: " Piraty
` (3 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: mobinmob @ 2020-04-19 15:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 247 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/21039#issuecomment-616157724
Comment:
@Piraty Unfortunately it doesn't make sense in my machine so no.
Now I get why it builds fine for me 😝
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Closed]: zeroinstall-injector: rename to zeroinstall, update to 2.16.
2020-04-15 22:46 [PR PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16 mobinmob
` (16 preceding siblings ...)
2020-04-19 15:09 ` mobinmob
@ 2020-04-19 15:25 ` Piraty
2020-04-21 11:39 ` q66
` (2 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: Piraty @ 2020-04-19 15:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 379 bytes --]
There's a closed pull request on the void-packages repository
zeroinstall-injector: rename to zeroinstall, update to 2.16.
https://github.com/void-linux/void-packages/pull/21039
Description:
Update to new version (ocaml rewrite), rename and adopt.
Based on https://github.com/void-linux/void-packages/pull/18155 and https://github.com/void-linux/void-packages/pull/19563 .
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: zeroinstall-injector: rename to zeroinstall, update to 2.16.
2020-04-15 22:46 [PR PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16 mobinmob
` (17 preceding siblings ...)
2020-04-19 15:25 ` [PR PATCH] [Closed]: " Piraty
@ 2020-04-21 11:39 ` q66
2020-04-21 12:18 ` mobinmob
2020-04-21 12:42 ` q66
20 siblings, 0 replies; 22+ messages in thread
From: q66 @ 2020-04-21 11:39 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/21039#issuecomment-617126986
Comment:
so... why exactly does this need to install its own ocaml compiler? because this will break *a ton* of platforms.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: zeroinstall-injector: rename to zeroinstall, update to 2.16.
2020-04-15 22:46 [PR PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16 mobinmob
` (18 preceding siblings ...)
2020-04-21 11:39 ` q66
@ 2020-04-21 12:18 ` mobinmob
2020-04-21 12:42 ` q66
20 siblings, 0 replies; 22+ messages in thread
From: mobinmob @ 2020-04-21 12:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 440 bytes --]
New comment by mobinmob on void-packages repository
https://github.com/void-linux/void-packages/pull/21039#issuecomment-617143965
Comment:
> so... why exactly does this need to install its own ocaml compiler? because this will break _a ton_ of platforms.
Previous version - the first I packaged- did not work with newer compilers. The current version specifies only a compiler newer than 4.0.5. I will test with the system compiler ;)
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: zeroinstall-injector: rename to zeroinstall, update to 2.16.
2020-04-15 22:46 [PR PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16 mobinmob
` (19 preceding siblings ...)
2020-04-21 12:18 ` mobinmob
@ 2020-04-21 12:42 ` q66
20 siblings, 0 replies; 22+ messages in thread
From: q66 @ 2020-04-21 12:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 161 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/21039#issuecomment-617155312
Comment:
i just tested, it's fine
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2020-04-21 12:42 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-15 22:46 [PR PATCH] zeroinstall-injector: rename to zeroinstall, update to 2.16 mobinmob
2020-04-15 23:10 ` mobinmob
2020-04-16 8:17 ` mobinmob
2020-04-16 11:14 ` [PR PATCH] [Updated] " mobinmob
2020-04-17 0:50 ` mobinmob
2020-04-17 1:06 ` mobinmob
2020-04-17 12:30 ` Piraty
2020-04-17 12:37 ` mobinmob
2020-04-17 13:16 ` mobinmob
2020-04-19 12:36 ` Piraty
2020-04-19 12:52 ` mobinmob
2020-04-19 12:53 ` mobinmob
2020-04-19 12:59 ` mobinmob
2020-04-19 13:04 ` Piraty
2020-04-19 13:45 ` [PR PATCH] [Updated] " mobinmob
2020-04-19 13:47 ` mobinmob
2020-04-19 15:03 ` Piraty
2020-04-19 15:09 ` mobinmob
2020-04-19 15:25 ` [PR PATCH] [Closed]: " Piraty
2020-04-21 11:39 ` q66
2020-04-21 12:18 ` mobinmob
2020-04-21 12:42 ` q66
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).