[PR PATCH] wine: install man page for wine executable

[PR PATCH] wine: install man page for wine executable

[amak79]

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

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

https://github.com/amak79/void-packages wine
https://github.com/void-linux/void-packages/pull/43664

wine: install man page for wine executable
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**
 Closes #43436
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/43664.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-43664.patch --]
[-- Type: text/x-diff, Size: 867 bytes --]

From ef07d570c72a704f72f456438fdb919536cc1b97 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sat, 29 Apr 2023 14:40:29 +1000
Subject: [PATCH] wine: install man page for wine executable

---
 srcpkgs/wine/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 88e16b563fba..35c616cee6ba 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
 # Template file for 'wine'
 pkgname=wine
 version=8.6
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
@@ -112,6 +112,11 @@ post_install() {
 			ln -s ${_wine_libexec}/wine64 ${DESTDIR}/usr/bin/wine64
 		;;
 	esac
+
+	# install man page for wine executable
+	for man in loader/wine.*man ; do
+		vman ${man} ${man%.man}.1
+	done
 }
 
 libwine_package() {

Re: wine: install man page for wine executable

[amak79]

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

New comment by amak79 on void-packages repository

https://github.com/void-linux/void-packages/pull/43664#issuecomment-1528938149

Comment:
I need to make some changes so please do not merge yet.

Re: wine: install man page for wine executable

[amak79]

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

New comment by amak79 on void-packages repository

https://github.com/void-linux/void-packages/pull/43664#issuecomment-1528938149

Comment:
I need to make some changes so please do not merge yet.

Re: [PR PATCH] [Updated] wine: install man page for wine executable

[amak79]

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

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

https://github.com/amak79/void-packages wine
https://github.com/void-linux/void-packages/pull/43664

wine: install man page for wine executable
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**
 Closes #43436
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/43664.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-43664.patch --]
[-- Type: text/x-diff, Size: 1050 bytes --]

From 9c59bfc82b98ba56efca34067ef1f6b519085731 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sat, 29 Apr 2023 14:40:29 +1000
Subject: [PATCH] wine: install man page for wine executable

---
 srcpkgs/wine/template | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 56196ee592db..67bab336c526 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
 # Template file for 'wine'
 pkgname=wine
 version=8.7
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
@@ -112,6 +112,14 @@ post_install() {
 			ln -s ${_wine_libexec}/wine64 ${DESTDIR}/usr/bin/wine64
 		;;
 	esac
+
+	# install man page for wine executable
+	vman loader/wine.man wine.1
+	# vman is unable to install manuals with 'UTF-8'
+	# string in filename in the correct location.
+	for lang in de fr pl ; do
+		vinstall loader/wine.${lang}.UTF-8.man 644 usr/share/man/${lang}.UTF-8/man1 wine.1
+	done
 }
 
 libwine_package() {

Re: wine: install man page for wine executable

[amak79]

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

New comment by amak79 on void-packages repository

https://github.com/void-linux/void-packages/pull/43664#issuecomment-1528979366

Comment:
I used `vinstall` to install the `wine.de.UTF-8.man`, `wine.fr.UTF-8.man` and `wine.pl.UTF-8.man` manuals. `vman` is unable to install them in the correct location because of the 'UTF-8' string in the filename, but this causes xlint to fail. Should I just rename the manuals before calling `vman`?

Re: wine: install man page for wine executable

[amak79]

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

New comment by amak79 on void-packages repository

https://github.com/void-linux/void-packages/pull/43664#issuecomment-1528979366

Comment:
I used `vinstall` to install the `wine.de.UTF-8.man`, `wine.fr.UTF-8.man` and `wine.pl.UTF-8.man` manuals. `vman` is unable to install them in the correct location because of the 'UTF-8' string in the filename, but this causes xlint to fail. They should be installed in `/usr/share/man/<lang>.UTF-8/man1` like how Wine installs the `winemaker` and `wineserver` manuals.

Should I just rename the manuals before calling `vman`?

Re: wine: install man page for wine executable

[amak79]

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

New comment by amak79 on void-packages repository

https://github.com/void-linux/void-packages/pull/43664#issuecomment-1528979366

Comment:
I used `vinstall` to install the `wine.de.UTF-8.man`, `wine.fr.UTF-8.man` and `wine.pl.UTF-8.man` manuals. `vman` is unable to install them in the correct location because of the 'UTF-8' string in the filename, but this causes xlint to fail. They should be installed in `/usr/share/man/<lang>.UTF-8/man1` like how Wine installs the `winemaker` and `wineserver` manuals.

Should I just rename the manuals (dropping 'UTF-8' string) before calling `vman`?

Re: wine: install man page for wine executable

[amak79]

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

New comment by amak79 on void-packages repository

https://github.com/void-linux/void-packages/pull/43664#issuecomment-1528979366

Comment:
I used `vinstall` to install the `wine.de.UTF-8.man`, `wine.fr.UTF-8.man` and `wine.pl.UTF-8.man` manuals, but this causes xlint to fail. `vman` is unable to install them in the correct location because of the 'UTF-8' string in the filename. They should be installed in `/usr/share/man/<lang>.UTF-8/man1` like how Wine installs the `winemaker` and `wineserver` manuals.

Should I just rename the manuals (dropping 'UTF-8' string) before calling `vman`?

Re: wine: install man page for wine executable

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43664#issuecomment-1529103385

Comment:
I've fixed the underlying issue with `vman`  in #43686, but I think in this case it would make more sense to patch [this makefile](https://github.com/wine-mirror/wine/blob/wine-8.6/loader/Makefile.in) to do something more like [this makefile](https://github.com/wine-mirror/wine/blob/wine-8.6/server/Makefile.in#L47-L50)

Re: wine: install man page for wine executable

[amak79]

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

New comment by amak79 on void-packages repository

https://github.com/void-linux/void-packages/pull/43664#issuecomment-1529339434

Comment:
I tried patching the makefile like you suggested but I couldn't get it to work. The auto-generated top-level makefile just doesn't have an install rule for the man pages. I ended up using `vman` with your fix applied. I will push my changes once your fix is merged.

Re: wine: install man page for wine executable

[classabbyamp]

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43664#issuecomment-1537156117

Comment:
vman should work now

Re: [PR PATCH] [Updated] wine: install man page for wine executable

[amak79]

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

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

https://github.com/amak79/void-packages wine
https://github.com/void-linux/void-packages/pull/43664

wine: install man page for wine executable
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**
 Closes #43436
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/43664.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-43664.patch --]
[-- Type: text/x-diff, Size: 921 bytes --]

From a3c257e9b3185617e9571346d67e818ceef39a40 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sat, 29 Apr 2023 14:40:29 +1000
Subject: [PATCH] wine: install man page for wine executable

---
 srcpkgs/wine/template | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 56196ee592db..d107cb5500c2 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
 # Template file for 'wine'
 pkgname=wine
 version=8.7
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
@@ -112,6 +112,12 @@ post_install() {
 			ln -s ${_wine_libexec}/wine64 ${DESTDIR}/usr/bin/wine64
 		;;
 	esac
+
+	# install man page for wine executable
+	vman loader/wine.man wine.1
+	for lang in de fr pl ; do
+		vman loader/wine.${lang}.UTF-8.man wine.${lang}.UTF-8.1
+	done
 }
 
 libwine_package() {

Re: [PR REVIEW] wine: install man page for wine executable

[classabbyamp]

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/43664#discussion_r1186961074

Comment:
```suggestion
	for f in loader/wine*.man; do
		vman "$f" "${f//man/1}"
```
i think this should work

Re: [PR PATCH] [Updated] wine: install man page for wine executable

[amak79]

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

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

https://github.com/amak79/void-packages wine
https://github.com/void-linux/void-packages/pull/43664

wine: install man page for wine executable
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**
 Closes #43436
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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/43664.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-wine-43664.patch --]
[-- Type: text/x-diff, Size: 862 bytes --]

From b87acf7d21940b4c596266fc5a42dc30d41dda2a Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sat, 29 Apr 2023 14:40:29 +1000
Subject: [PATCH] wine: install man page for wine executable

---
 srcpkgs/wine/template | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template
index 56196ee592db..6c0b6ea93578 100644
--- a/srcpkgs/wine/template
+++ b/srcpkgs/wine/template
@@ -1,7 +1,7 @@
 # Template file for 'wine'
 pkgname=wine
 version=8.7
-revision=1
+revision=2
 _pkgver=${version/r/-r}
 create_wrksrc=yes
 build_wrksrc=wine-${_pkgver}
@@ -112,6 +112,11 @@ post_install() {
 			ln -s ${_wine_libexec}/wine64 ${DESTDIR}/usr/bin/wine64
 		;;
 	esac
+
+	# install man page for wine executable
+	for f in loader/wine*.man; do
+		vman "$f" "${f//man/1}"
+	done
 }
 
 libwine_package() {

Re: [PR REVIEW] wine: install man page for wine executable

[amak79]

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

New review comment by amak79 on void-packages repository

https://github.com/void-linux/void-packages/pull/43664#discussion_r1186968544

Comment:
I applied your suggestion. Thanks.

Re: [PR PATCH] [Merged]: wine: install man page for wine executable

[classabbyamp]

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

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

wine: install man page for wine executable
https://github.com/void-linux/void-packages/pull/43664

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**
 Closes #43436
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-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
-->