[PR PATCH] fntsample: depends on unicode-character-database

[PR PATCH] fntsample: depends on unicode-character-database

[sgn]

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

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

https://github.com/sgn/void-packages fntsample-use-unicode-character-database
https://github.com/void-linux/void-packages/pull/29522

fntsample: depends on unicode-character-database
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/29522.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fntsample-use-unicode-character-database-29522.patch --]
[-- Type: text/x-diff, Size: 2166 bytes --]

From 28d571c569586d2337d047088b317783bc4762cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 17 Mar 2021 08:08:39 +0700
Subject: [PATCH] fntsample: depends on unicode-character-database

---
 srcpkgs/fntsample/template | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/fntsample/template b/srcpkgs/fntsample/template
index 500c58ff5521..2b133754192e 100644
--- a/srcpkgs/fntsample/template
+++ b/srcpkgs/fntsample/template
@@ -1,33 +1,20 @@
 # Template file for 'fntsample'
 pkgname=fntsample
 version=5.3
-revision=1
+revision=2
 build_style=cmake
 wrksrc="fntsample-release-${version}"
-configure_args="-DUNICODE_BLOCKS=../Blocks.txt"
+configure_args="-DUNICODE_BLOCKS=/usr/share/unicode/Blocks.txt"
 make_cmd=make
-hostmakedepends="gettext pkg-config"
+hostmakedepends="gettext pkg-config unicode-character-database"
 makedepends="cairo-devel fontconfig-devel freetype-devel glib-devel pango-devel"
+depends="unicode-character-database"
 short_desc="PDF and PostScript font samples generator"
 maintainer="svenper <svenper@tuta.io>"
 license="GPL-3.0-or-later, BSD-3-Clause"
 homepage="https://github.com/eugmes/fntsample"
 changelog="https://raw.githubusercontent.com/eugmes/fntsample/master/ChangeLog"
-distfiles="https://github.com/eugmes/fntsample/archive/release/${version}.tar.gz
- https://unicode.org/Public/11.0.0/ucd/Blocks.txt
- https://unicode.org/terms_of_use.html"
-checksum="e4e8b50b0a5e984cfdaa32b7d133bd3bf0c62edb14f752f7df1190176023972b
- 0b457b66c788a97c8521e265f0b793d4ed911356d39eb61029f9cef8554cd052
- e64365d338b707f1bac79d9391c7579eb6db270c49b711bc1665ae8e7e36173d"
-skip_extraction="Blocks.txt
- terms_of_use.html"
+distfiles="https://github.com/eugmes/fntsample/archive/release/${version}.tar.gz"
+checksum="e4e8b50b0a5e984cfdaa32b7d133bd3bf0c62edb14f752f7df1190176023972b"
 
 export CMAKE_GENERATOR="Unix Makefiles"
-
-post_extract() {
-	cp "${XBPS_SRCDISTDIR}/fntsample-${version}/Blocks.txt" "${wrksrc}/"
-}
-
-post_install() {
-	vlicense "${XBPS_SRCDISTDIR}/fntsample-${version}/terms_of_use.html"
-}

Re: fntsample: depends on unicode-character-database

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29522#issuecomment-800721510

Comment:
@svenper 

Re: [PR PATCH] [Updated] fntsample: depends on unicode-character-database

[sgn]

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

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

https://github.com/sgn/void-packages fntsample-use-unicode-character-database
https://github.com/void-linux/void-packages/pull/29522

fntsample: depends on unicode-character-database
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/29522.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fntsample-use-unicode-character-database-29522.patch --]
[-- Type: text/x-diff, Size: 2217 bytes --]

From 4e6bb9083e0ec5ae872823a8afa393fd24be804c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 17 Mar 2021 08:08:39 +0700
Subject: [PATCH] fntsample: depends on unicode-character-database

---
 srcpkgs/fntsample/template | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/srcpkgs/fntsample/template b/srcpkgs/fntsample/template
index 500c58ff5521..0f5d733ef3aa 100644
--- a/srcpkgs/fntsample/template
+++ b/srcpkgs/fntsample/template
@@ -1,33 +1,20 @@
 # Template file for 'fntsample'
 pkgname=fntsample
 version=5.3
-revision=1
-build_style=cmake
+revision=2
 wrksrc="fntsample-release-${version}"
-configure_args="-DUNICODE_BLOCKS=../Blocks.txt"
+build_style=cmake
+configure_args="-DUNICODE_BLOCKS=/usr/share/unicode/Blocks.txt"
 make_cmd=make
-hostmakedepends="gettext pkg-config"
+hostmakedepends="gettext pkg-config unicode-character-database"
 makedepends="cairo-devel fontconfig-devel freetype-devel glib-devel pango-devel"
+depends="unicode-character-database"
 short_desc="PDF and PostScript font samples generator"
 maintainer="svenper <svenper@tuta.io>"
-license="GPL-3.0-or-later, BSD-3-Clause"
+license="GPL-3.0-or-later"
 homepage="https://github.com/eugmes/fntsample"
 changelog="https://raw.githubusercontent.com/eugmes/fntsample/master/ChangeLog"
-distfiles="https://github.com/eugmes/fntsample/archive/release/${version}.tar.gz
- https://unicode.org/Public/11.0.0/ucd/Blocks.txt
- https://unicode.org/terms_of_use.html"
-checksum="e4e8b50b0a5e984cfdaa32b7d133bd3bf0c62edb14f752f7df1190176023972b
- 0b457b66c788a97c8521e265f0b793d4ed911356d39eb61029f9cef8554cd052
- e64365d338b707f1bac79d9391c7579eb6db270c49b711bc1665ae8e7e36173d"
-skip_extraction="Blocks.txt
- terms_of_use.html"
+distfiles="https://github.com/eugmes/fntsample/archive/release/${version}.tar.gz"
+checksum="e4e8b50b0a5e984cfdaa32b7d133bd3bf0c62edb14f752f7df1190176023972b"
 
 export CMAKE_GENERATOR="Unix Makefiles"
-
-post_extract() {
-	cp "${XBPS_SRCDISTDIR}/fntsample-${version}/Blocks.txt" "${wrksrc}/"
-}
-
-post_install() {
-	vlicense "${XBPS_SRCDISTDIR}/fntsample-${version}/terms_of_use.html"
-}

Re: fntsample: depends on unicode-character-database

[svenper]

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

New comment by svenper on void-packages repository

https://github.com/void-linux/void-packages/pull/29522#issuecomment-801128487

Comment:
Nice, thanks.

It looks to me like unicode-character-database is only needed during compilation, so no need for `depends`?

Re: fntsample: depends on unicode-character-database

[sgn]

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

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/29522#issuecomment-801133603

Comment:
On 2021-03-17 07:27:56-0700, svenper ***@***.***> wrote:
> Nice, thanks.
> 
> It looks to me like unicode-character-database is only needed during compilation, so no need for `depends`?

Actually, I don't know. I tried to follow what already there.
(Block.txt was shipped)
I only come into this package because the license has been changed.

I'll check if it's needed or not later.

-- 
Danh

Re: [PR PATCH] [Updated] fntsample: depends on unicode-character-database

[sgn]

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

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

https://github.com/sgn/void-packages fntsample-use-unicode-character-database
https://github.com/void-linux/void-packages/pull/29522

fntsample: depends on unicode-character-database
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/29522.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-fntsample-use-unicode-character-database-29522.patch --]
[-- Type: text/x-diff, Size: 2178 bytes --]

From 9409c072fa03cdb022a0858d8eb7102a55fdb6ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Wed, 17 Mar 2021 08:08:39 +0700
Subject: [PATCH] fntsample: depends on unicode-character-database

---
 srcpkgs/fntsample/template | 28 +++++++---------------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/srcpkgs/fntsample/template b/srcpkgs/fntsample/template
index 500c58ff5521..ab1e4ae7eb8a 100644
--- a/srcpkgs/fntsample/template
+++ b/srcpkgs/fntsample/template
@@ -1,33 +1,19 @@
 # Template file for 'fntsample'
 pkgname=fntsample
 version=5.3
-revision=1
-build_style=cmake
+revision=2
 wrksrc="fntsample-release-${version}"
-configure_args="-DUNICODE_BLOCKS=../Blocks.txt"
+build_style=cmake
+configure_args="-DUNICODE_BLOCKS=/usr/share/unicode/Blocks.txt"
 make_cmd=make
-hostmakedepends="gettext pkg-config"
+hostmakedepends="gettext pkg-config unicode-character-database"
 makedepends="cairo-devel fontconfig-devel freetype-devel glib-devel pango-devel"
 short_desc="PDF and PostScript font samples generator"
 maintainer="svenper <svenper@tuta.io>"
-license="GPL-3.0-or-later, BSD-3-Clause"
+license="GPL-3.0-or-later"
 homepage="https://github.com/eugmes/fntsample"
 changelog="https://raw.githubusercontent.com/eugmes/fntsample/master/ChangeLog"
-distfiles="https://github.com/eugmes/fntsample/archive/release/${version}.tar.gz
- https://unicode.org/Public/11.0.0/ucd/Blocks.txt
- https://unicode.org/terms_of_use.html"
-checksum="e4e8b50b0a5e984cfdaa32b7d133bd3bf0c62edb14f752f7df1190176023972b
- 0b457b66c788a97c8521e265f0b793d4ed911356d39eb61029f9cef8554cd052
- e64365d338b707f1bac79d9391c7579eb6db270c49b711bc1665ae8e7e36173d"
-skip_extraction="Blocks.txt
- terms_of_use.html"
+distfiles="https://github.com/eugmes/fntsample/archive/release/${version}.tar.gz"
+checksum="e4e8b50b0a5e984cfdaa32b7d133bd3bf0c62edb14f752f7df1190176023972b"
 
 export CMAKE_GENERATOR="Unix Makefiles"
-
-post_extract() {
-	cp "${XBPS_SRCDISTDIR}/fntsample-${version}/Blocks.txt" "${wrksrc}/"
-}
-
-post_install() {
-	vlicense "${XBPS_SRCDISTDIR}/fntsample-${version}/terms_of_use.html"
-}

Re: [PR PATCH] [Merged]: fntsample: depends on unicode-character-database

[sgn]

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

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

fntsample: depends on unicode-character-database
https://github.com/void-linux/void-packages/pull/29522

Description:
<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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
-->