Re: [PR PATCH] [Updated] zeroinstall-injector: rename to zeroinstall, update to 2.16.

[mobinmob <mobinmob@users.noreply.github.com>]

[-- 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