[PR PATCH] woeusb: fix version, dependencies, split gui

[PR PATCH] woeusb: fix version, dependencies, split gui

[sgn]

[-- Attachment #1: Type: text/plain, Size: 515 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages woeusb-split-gui
https://github.com/void-linux/void-packages/pull/20910

woeusb: fix version, dependencies, split gui
- fix version
- add bash as dependencies, the script is written in bash not sh
- man 1 woeusbgui said they recommend using non-gui version.
  Split them out for reduced dependencies.

A patch file from https://github.com/void-linux/void-packages/pull/20910.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-woeusb-split-gui-20910.patch --]
[-- Type: text/x-diff, Size: 3290 bytes --]

From 0fe18aa2d5364a4bf47f12a6db1b277e31226e4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Sun, 12 Apr 2020 13:26:04 +0700
Subject: [PATCH] woeusb: fix version, dependencies, split gui

---
 srcpkgs/WoeUSB          |  1 +
 srcpkgs/WoeUSB/template | 19 -----------------
 srcpkgs/woeusb/template | 46 +++++++++++++++++++++++++++++++++++++++++
 srcpkgs/woeusbgui       |  1 +
 4 files changed, 48 insertions(+), 19 deletions(-)
 create mode 120000 srcpkgs/WoeUSB
 delete mode 100644 srcpkgs/WoeUSB/template
 create mode 100644 srcpkgs/woeusb/template
 create mode 120000 srcpkgs/woeusbgui

diff --git a/srcpkgs/WoeUSB b/srcpkgs/WoeUSB
new file mode 120000
index 00000000000..8d870da0c7d
--- /dev/null
+++ b/srcpkgs/WoeUSB
@@ -0,0 +1 @@
+woeusb
\ No newline at end of file
diff --git a/srcpkgs/WoeUSB/template b/srcpkgs/WoeUSB/template
deleted file mode 100644
index 0e324e2abc4..00000000000
--- a/srcpkgs/WoeUSB/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'WoeUSB'
-pkgname=WoeUSB
-version=3.3.1
-revision=1
-build_style=gnu-configure
-configure_args="--with-wx-config=wx-config-gtk3"
-hostmakedepends="automake gettext libtool"
-makedepends="wxWidgets-gtk3-devel"
-depends="grub ntfs-3g parted wget"
-short_desc="Create a Windows USB stick installer from a real Windows DVD or image"
-maintainer="bra1nwave <bra1nwave@protonmail.com>"
-license="GPL-3.0-or-later"
-homepage="https://github.com/slacka/WoeUSB"
-distfiles="https://github.com/slacka/WoeUSB/archive/v${version}.tar.gz"
-checksum=0cab88a1113506f39d2f1c19532b2cd8d968c6a9f59129953c000e29e73f3d4f
-
-pre_configure() {
-	autoreconf -fi
-}
diff --git a/srcpkgs/woeusb/template b/srcpkgs/woeusb/template
new file mode 100644
index 00000000000..021f314d1f0
--- /dev/null
+++ b/srcpkgs/woeusb/template
@@ -0,0 +1,46 @@
+# Template file for 'woeusb'
+pkgname=woeusb
+version=3.3.1
+revision=2
+wrksrc="WoeUSB-$version"
+archs=noarch
+build_style=gnu-configure
+configure_args="--with-wx-config=wx-config-gtk3"
+hostmakedepends="automake gettext libtool"
+makedepends="wxWidgets-gtk3-devel"
+depends="bash grub ntfs-3g parted wget"
+short_desc="Create a Windows USB stick installer from a real Windows DVD or image"
+maintainer="bra1nwave <bra1nwave@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/slacka/WoeUSB"
+distfiles="https://github.com/slacka/WoeUSB/archive/v${version}.tar.gz"
+checksum=0cab88a1113506f39d2f1c19532b2cd8d968c6a9f59129953c000e29e73f3d4f
+
+post_patch() {
+	vsed -i -e "s/@@WOEUSB_VERSION@@/$version/g" \
+		configure.ac \
+		src/woeusb src/woeusb.1 src/woeusbgui.1
+}
+
+pre_configure() {
+	autoreconf -fi
+}
+
+woeusbgui_package() {
+	archs='*'
+	depends="${sourcepkg}-${version}_${revision}"
+	short_desc+=" - GUI wrapper"
+	pkg_install() {
+		vmove usr/bin/woeusbgui
+		vmove usr/share/applications
+		vmove usr/share/man/man1/woeusbgui*
+		vmove usr/share/pixmaps
+		vmove usr/share/woeusb
+	}
+}
+
+WoeUSB_package() {
+	build_style=meta
+	depends="woeusbgui"
+	short_desc+=" - old packages"
+}
diff --git a/srcpkgs/woeusbgui b/srcpkgs/woeusbgui
new file mode 120000
index 00000000000..8d870da0c7d
--- /dev/null
+++ b/srcpkgs/woeusbgui
@@ -0,0 +1 @@
+woeusb
\ No newline at end of file

Re: woeusb: fix version, dependencies, split gui

[bra1nwave]

[-- Attachment #1: Type: text/plain, Size: 233 bytes --]

New comment by bra1nwave on void-packages repository

https://github.com/void-linux/void-packages/pull/20910#issuecomment-612580261

Comment:
Why create a separate template (`woeusb`) and not just fixing the existing one (`WoeUSB`)?

Re: woeusb: fix version, dependencies, split gui

[bra1nwave]

[-- Attachment #1: Type: text/plain, Size: 233 bytes --]

New comment by bra1nwave on void-packages repository

https://github.com/void-linux/void-packages/pull/20910#issuecomment-612580261

Comment:
Why create a separate template (`woeusb`) and not just change the existing one (`WoeUSB`)?

Re: woeusb: fix version, dependencies, split gui

[sgn]

[-- Attachment #1: Type: text/plain, Size: 828 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/20910#issuecomment-612587203

Comment:
- binary is all lowercase
- who installed WoeUSB will still get full version with gui, until they want to remove it and install woeusb.

Anyway, you're this package maintainer, it's your call.

I don't want to pull wxWidget dependencies.


On 12 April 2020 15:14:16 GMT+07:00, Daniel Boguslawski <notifications@github.com> wrote:
>Why create a separate template (`woeusb`) and not just fixing the
>existing one (`WoeUSB`)?
>
>-- 
>You are receiving this because you authored the thread.
>Reply to this email directly or view it on GitHub:
>https://github.com/void-linux/void-packages/pull/20910#issuecomment-612580261

-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.

Re: woeusb: fix version, dependencies, split gui

[bra1nwave]

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]

New comment by bra1nwave on void-packages repository

https://github.com/void-linux/void-packages/pull/20910#issuecomment-612588177

Comment:
I think we should just change the existing one. There's no need to create a separate template IMHO

Re: woeusb: fix version, dependencies, split gui

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 224 bytes --]

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/20910#issuecomment-613271457

Comment:
Please keep main package WoeUSB, and create WoeUSB-cli or similar with `vmove /`.

Re: woeusb: fix version, dependencies, split gui

[sgn]

[-- Attachment #1: Type: text/plain, Size: 334 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/20910#issuecomment-613334522

Comment:
On 2020-04-14 00:23:54-0700, Piotr <notifications@github.com> wrote:
> Please keep main package WoeUSB, and create WoeUSB-cli or similar with `vmove /`.

This is the best approach, IMHO.

-- 
Danh

Re: [PR PATCH] [Updated] woeusb: fix version, dependencies, split gui

[sgn]

[-- Attachment #1: Type: text/plain, Size: 520 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages woeusb-split-gui
https://github.com/void-linux/void-packages/pull/20910

woeusb: fix version, dependencies, split gui
- fix version
- add bash as dependencies, the script is written in bash not sh
- man 1 woeusbgui said they recommend using non-gui version.
  Split them out for reduced dependencies.

A patch file from https://github.com/void-linux/void-packages/pull/20910.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-woeusb-split-gui-20910.patch --]
[-- Type: text/x-diff, Size: 1870 bytes --]

From e585ba3497a0edc9dc3ada7b45ad158e91963d14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Sun, 12 Apr 2020 13:26:04 +0700
Subject: [PATCH] woeusb: fix version, dependencies, split gui

---
 srcpkgs/WoeUSB-cli      |  1 +
 srcpkgs/WoeUSB/template | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/WoeUSB-cli

diff --git a/srcpkgs/WoeUSB-cli b/srcpkgs/WoeUSB-cli
new file mode 120000
index 00000000000..69ca6ca2f77
--- /dev/null
+++ b/srcpkgs/WoeUSB-cli
@@ -0,0 +1 @@
+WoeUSB
\ No newline at end of file
diff --git a/srcpkgs/WoeUSB/template b/srcpkgs/WoeUSB/template
index 0e324e2abc4..1bb0efa56ff 100644
--- a/srcpkgs/WoeUSB/template
+++ b/srcpkgs/WoeUSB/template
@@ -1,12 +1,12 @@
 # Template file for 'WoeUSB'
 pkgname=WoeUSB
 version=3.3.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="automake gettext libtool"
 makedepends="wxWidgets-gtk3-devel"
-depends="grub ntfs-3g parted wget"
+depends="WoeUSB-cli"
 short_desc="Create a Windows USB stick installer from a real Windows DVD or image"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
@@ -14,6 +14,22 @@ homepage="https://github.com/slacka/WoeUSB"
 distfiles="https://github.com/slacka/WoeUSB/archive/v${version}.tar.gz"
 checksum=0cab88a1113506f39d2f1c19532b2cd8d968c6a9f59129953c000e29e73f3d4f
 
+post_patch() {
+	vsed -i -e "s/@@WOEUSB_VERSION@@/$version/g" \
+		configure.ac \
+		src/woeusb src/woeusb.1 src/woeusbgui.1
+}
+
 pre_configure() {
 	autoreconf -fi
 }
+
+WoeUSB-cli_package() {
+	archs=noarch
+	depends="bash grub ntfs-3g parted wget"
+	short_desc+=" - command line only"
+	pkg_install() {
+		vmove usr/bin/woeusb
+		vmove usr/share/man/man1/woeusb.1
+	}
+}

Re: [PR PATCH] [Updated] woeusb: fix version, dependencies, split gui

[sgn]

[-- Attachment #1: Type: text/plain, Size: 520 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages woeusb-split-gui
https://github.com/void-linux/void-packages/pull/20910

woeusb: fix version, dependencies, split gui
- fix version
- add bash as dependencies, the script is written in bash not sh
- man 1 woeusbgui said they recommend using non-gui version.
  Split them out for reduced dependencies.

A patch file from https://github.com/void-linux/void-packages/pull/20910.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-woeusb-split-gui-20910.patch --]
[-- Type: text/x-diff, Size: 1961 bytes --]

From f169726f19c2532079a44fb7380f5dc5aff76ed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx+sgn@gmail.com>
Date: Sun, 12 Apr 2020 13:26:04 +0700
Subject: [PATCH] WoeUSB: fix version, dependencies, split cli

GUI version is not necessary in most case, and upstream recommend using
cli tools instead.
---
 srcpkgs/WoeUSB-cli      |  1 +
 srcpkgs/WoeUSB/template | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/WoeUSB-cli

diff --git a/srcpkgs/WoeUSB-cli b/srcpkgs/WoeUSB-cli
new file mode 120000
index 00000000000..69ca6ca2f77
--- /dev/null
+++ b/srcpkgs/WoeUSB-cli
@@ -0,0 +1 @@
+WoeUSB
\ No newline at end of file
diff --git a/srcpkgs/WoeUSB/template b/srcpkgs/WoeUSB/template
index 0e324e2abc4..1bb0efa56ff 100644
--- a/srcpkgs/WoeUSB/template
+++ b/srcpkgs/WoeUSB/template
@@ -1,12 +1,12 @@
 # Template file for 'WoeUSB'
 pkgname=WoeUSB
 version=3.3.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="automake gettext libtool"
 makedepends="wxWidgets-gtk3-devel"
-depends="grub ntfs-3g parted wget"
+depends="WoeUSB-cli"
 short_desc="Create a Windows USB stick installer from a real Windows DVD or image"
 maintainer="bra1nwave <bra1nwave@protonmail.com>"
 license="GPL-3.0-or-later"
@@ -14,6 +14,22 @@ homepage="https://github.com/slacka/WoeUSB"
 distfiles="https://github.com/slacka/WoeUSB/archive/v${version}.tar.gz"
 checksum=0cab88a1113506f39d2f1c19532b2cd8d968c6a9f59129953c000e29e73f3d4f
 
+post_patch() {
+	vsed -i -e "s/@@WOEUSB_VERSION@@/$version/g" \
+		configure.ac \
+		src/woeusb src/woeusb.1 src/woeusbgui.1
+}
+
 pre_configure() {
 	autoreconf -fi
 }
+
+WoeUSB-cli_package() {
+	archs=noarch
+	depends="bash grub ntfs-3g parted wget"
+	short_desc+=" - command line only"
+	pkg_install() {
+		vmove usr/bin/woeusb
+		vmove usr/share/man/man1/woeusb.1
+	}
+}

Re: [PR PATCH] [Closed]: woeusb: fix version, dependencies, split gui

[xtraeme]

[-- Attachment #1: Type: text/plain, Size: 363 bytes --]

There's a closed pull request on the void-packages repository

woeusb: fix version, dependencies, split gui
https://github.com/void-linux/void-packages/pull/20910

Description:
- fix version
- add bash as dependencies, the script is written in bash not sh
- man 1 woeusbgui said they recommend using non-gui version.
  Split them out for reduced dependencies.

Re: woeusb: fix version, dependencies, split gui

[xtraeme]

[-- Attachment #1: Type: text/plain, Size: 161 bytes --]

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/20910#issuecomment-613731139

Comment:
Err wrong button heh

Re: [PR PATCH] [Merged]: woeusb: fix version, dependencies, split gui

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 363 bytes --]

There's a merged pull request on the void-packages repository

woeusb: fix version, dependencies, split gui
https://github.com/void-linux/void-packages/pull/20910

Description:
- fix version
- add bash as dependencies, the script is written in bash not sh
- man 1 woeusbgui said they recommend using non-gui version.
  Split them out for reduced dependencies.