[PR PATCH] PikoPixel.app: update to 1.0.b10, and fix and clean up package code

[PR PATCH] PikoPixel.app: update to 1.0.b10, and fix and clean up package code

[RoundDuckKira]

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

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

https://github.com/RoundDuckKira/void-packages pikoupdate
https://github.com/void-linux/void-packages/pull/28227

PikoPixel.app: update to 1.0.b10, and fix and clean up package code
<!-- 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?
- [x] 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.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [ ] 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/28227.patch is attached

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

From 6d52d1c2f978b78435988f20728a1f9e18ab8b23 Mon Sep 17 00:00:00 2001
From: "Kira L. Patton" <roundduckkira@protonmail.com>
Date: Mon, 25 Jan 2021 13:33:01 -0500
Subject: [PATCH 1/4] PikoPixel.app: update to 1.0.b10, and fix and clean up
 package code and update author info

---
 srcpkgs/PikoPixel.app/template | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/PikoPixel.app/template b/srcpkgs/PikoPixel.app/template
index 33eda021519..6763dab2041 100644
--- a/srcpkgs/PikoPixel.app/template
+++ b/srcpkgs/PikoPixel.app/template
@@ -1,6 +1,6 @@
 # Template file for 'PikoPixel.app'
 pkgname=PikoPixel.app
-version=1.0.b9e
+version=1.0.b10
 revision=1
 wrksrc="PikoPixel.Sources.${version%.*}-${version##*.}"
 build_wrksrc=PikoPixel
@@ -8,21 +8,17 @@ build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="gnustep-make gcc-objc tar which"
 makedepends="gnustep-base-devel gnustep-gui-devel"
-depends="gnustep-base gnustep-gui gnustep-back"
+depends="gnustep-gui-data gnustep-back"
 short_desc="GNUstep application for drawing/editing pixel-art"
-maintainer="Kira Patton <roundduckman@protonmail.com>"
+maintainer="Kira L. Patton <roundduckkira@protonmail.com>"
 license="AGPL-3.0-only"
 homepage="http://twilightedge.com/mac/pikopixel/"
 distfiles="http://twilightedge.com/downloads/PikoPixel.Sources.${version%.*}-${version##*.}.tar.gz"
-checksum=96977fc51343d294c7d7e76d8f1ac7aa82ae9da1d7d082dee6cee8035959afbe
+checksum=e754a89b4a3de5e034c96468d3bc37a0909ea7c06905546ee85658a5dfb547ac
 
-pre_build() {
-	source /usr/share/GNUstep/Makefiles/GNUstep.sh
-}
-
-pre_install() {
-	source /usr/share/GNUstep/Makefiles/GNUstep.sh
-}
+if [ -e /usr/share/GNUstep/Makefiles/GNUstep.sh ]; then
+	. /usr/share/GNUstep/Makefiles/GNUstep.sh
+fi
 
 post_install() {
 	vinstall PikoPixel.app/Resources/PikoPixel.desktop 0755 /usr/share/applications/

From 70bce3e945c4a00d24ac15cc76c12df041f18e43 Mon Sep 17 00:00:00 2001
From: "Kira L. Patton" <roundduckkira@protonmail.com>
Date: Mon, 25 Jan 2021 15:25:42 -0500
Subject: [PATCH 2/4] PikoPixel.app: update to 1.0.b10, and fix package

---
 srcpkgs/PikoPixel.app/template | 1 -
 1 file changed, 1 deletion(-)

diff --git a/srcpkgs/PikoPixel.app/template b/srcpkgs/PikoPixel.app/template
index 6763dab2041..c2a05c0c1a5 100644
--- a/srcpkgs/PikoPixel.app/template
+++ b/srcpkgs/PikoPixel.app/template
@@ -8,7 +8,6 @@ build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="gnustep-make gcc-objc tar which"
 makedepends="gnustep-base-devel gnustep-gui-devel"
-depends="gnustep-gui-data gnustep-back"
 short_desc="GNUstep application for drawing/editing pixel-art"
 maintainer="Kira L. Patton <roundduckkira@protonmail.com>"
 license="AGPL-3.0-only"

From 56e9c7b5e005100f495ea9128136342a22de1747 Mon Sep 17 00:00:00 2001
From: "Kira L. Patton" <roundduckkira@protonmail.com>
Date: Mon, 25 Jan 2021 15:55:09 -0500
Subject: [PATCH 3/4] PikoPixel.app: update to 1.0.b10, and fix and clean up
 package code

---
 srcpkgs/PikoPixel.app/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/PikoPixel.app/template b/srcpkgs/PikoPixel.app/template
index c2a05c0c1a5..0803e03ec3f 100644
--- a/srcpkgs/PikoPixel.app/template
+++ b/srcpkgs/PikoPixel.app/template
@@ -7,6 +7,7 @@ build_wrksrc=PikoPixel
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="gnustep-make gcc-objc tar which"
+depends="gnustep-back"
 makedepends="gnustep-base-devel gnustep-gui-devel"
 short_desc="GNUstep application for drawing/editing pixel-art"
 maintainer="Kira L. Patton <roundduckkira@protonmail.com>"

From 840a54bd6687cb2a926d9d913a5b4c41a50565ba Mon Sep 17 00:00:00 2001
From: "Kira L. Patton" <roundduckkira@protonmail.com>
Date: Mon, 25 Jan 2021 16:08:19 -0500
Subject: [PATCH 4/4] PikoPixel.app: update to 1.0.b10 and fix package

---
 srcpkgs/PikoPixel.app/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/PikoPixel.app/template b/srcpkgs/PikoPixel.app/template
index 0803e03ec3f..75580158737 100644
--- a/srcpkgs/PikoPixel.app/template
+++ b/srcpkgs/PikoPixel.app/template
@@ -7,8 +7,8 @@ build_wrksrc=PikoPixel
 build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="gnustep-make gcc-objc tar which"
-depends="gnustep-back"
 makedepends="gnustep-base-devel gnustep-gui-devel"
+depends="gnustep-back"
 short_desc="GNUstep application for drawing/editing pixel-art"
 maintainer="Kira L. Patton <roundduckkira@protonmail.com>"
 license="AGPL-3.0-only"

Re: PikoPixel.app: update to 1.0.b10, and fix and clean up package code

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/28227#issuecomment-767252258

Comment:
Please squash the commits :)

Re: PikoPixel.app: update to 1.0.b10, and fix and clean up package code

[RoundDuckKira]

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

New comment by RoundDuckKira on void-packages repository

https://github.com/void-linux/void-packages/pull/28227#issuecomment-769385601

Comment:
> Please squash the commits :)

Oh crap I was off for a bit and now back, umm how do you do that?

Re: PikoPixel.app: update to 1.0.b10, and fix and clean up package code

[RoundDuckKira]

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

New comment by RoundDuckKira on void-packages repository

https://github.com/void-linux/void-packages/pull/28227#issuecomment-769385601

Comment:
> Please squash the commits :)

Oh crap I was off for a bit and now back, umm how do you do that? @ericonr 

Re: [PR PATCH] [Updated] PikoPixel.app: update to 1.0.b10, and fix and clean up package code

[RoundDuckKira]

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

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

https://github.com/RoundDuckKira/void-packages pikoupdate
https://github.com/void-linux/void-packages/pull/28227

PikoPixel.app: update to 1.0.b10, and fix and clean up package code
<!-- 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?
- [x] 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.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [ ] 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/28227.patch is attached

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

From 061e5d720f20b3d9b70e4d85949abd3e00ee674e Mon Sep 17 00:00:00 2001
From: "Kira L. Patton" <roundduckkira@protonmail.com>
Date: Mon, 25 Jan 2021 13:33:01 -0500
Subject: [PATCH] PikoPixel.app: update to 1.0.b10, and fix and clean up
 package code

---
 srcpkgs/PikoPixel.app/template | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/PikoPixel.app/template b/srcpkgs/PikoPixel.app/template
index 33eda021519..75580158737 100644
--- a/srcpkgs/PikoPixel.app/template
+++ b/srcpkgs/PikoPixel.app/template
@@ -1,6 +1,6 @@
 # Template file for 'PikoPixel.app'
 pkgname=PikoPixel.app
-version=1.0.b9e
+version=1.0.b10
 revision=1
 wrksrc="PikoPixel.Sources.${version%.*}-${version##*.}"
 build_wrksrc=PikoPixel
@@ -8,21 +8,17 @@ build_style=gnu-makefile
 make_use_env=yes
 hostmakedepends="gnustep-make gcc-objc tar which"
 makedepends="gnustep-base-devel gnustep-gui-devel"
-depends="gnustep-base gnustep-gui gnustep-back"
+depends="gnustep-back"
 short_desc="GNUstep application for drawing/editing pixel-art"
-maintainer="Kira Patton <roundduckman@protonmail.com>"
+maintainer="Kira L. Patton <roundduckkira@protonmail.com>"
 license="AGPL-3.0-only"
 homepage="http://twilightedge.com/mac/pikopixel/"
 distfiles="http://twilightedge.com/downloads/PikoPixel.Sources.${version%.*}-${version##*.}.tar.gz"
-checksum=96977fc51343d294c7d7e76d8f1ac7aa82ae9da1d7d082dee6cee8035959afbe
+checksum=e754a89b4a3de5e034c96468d3bc37a0909ea7c06905546ee85658a5dfb547ac
 
-pre_build() {
-	source /usr/share/GNUstep/Makefiles/GNUstep.sh
-}
-
-pre_install() {
-	source /usr/share/GNUstep/Makefiles/GNUstep.sh
-}
+if [ -e /usr/share/GNUstep/Makefiles/GNUstep.sh ]; then
+	. /usr/share/GNUstep/Makefiles/GNUstep.sh
+fi
 
 post_install() {
 	vinstall PikoPixel.app/Resources/PikoPixel.desktop 0755 /usr/share/applications/

Re: PikoPixel.app: update to 1.0.b10, and fix and clean up package code

[RoundDuckKira]

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

New comment by RoundDuckKira on void-packages repository

https://github.com/void-linux/void-packages/pull/28227#issuecomment-769431805

Comment:
got it ready :)

Re: [PR PATCH] [Merged]: PikoPixel.app: update to 1.0.b10, and fix and clean up package code

[abenson]

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

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

PikoPixel.app: update to 1.0.b10, and fix and clean up package code
https://github.com/void-linux/void-packages/pull/28227

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?
- [x] 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.)
- [x] I built this PR locally for my native architecture, (x86_64)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl
-->