[PR PATCH] instead: update to 3.3.3.

[PR PATCH] instead: update to 3.3.3.

[UsernameRandomlyGenerated]

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

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

https://github.com/UsernameRandomlyGenerated/void-packages instead333
https://github.com/void-linux/void-packages/pull/29628

instead: update to 3.3.3.
<!-- 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
- [x] 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/29628.patch is attached

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

From 3de8441230c5768230dbd33a276d2c382964fb4c Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 20 Mar 2021 14:23:56 +0100
Subject: [PATCH] instead: update to 3.3.3.

---
 srcpkgs/instead/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/instead/template b/srcpkgs/instead/template
index 81b5e1b39d28..5013040b7687 100644
--- a/srcpkgs/instead/template
+++ b/srcpkgs/instead/template
@@ -1,6 +1,6 @@
 # Template file for 'instead'
 pkgname=instead
-version=3.3.2
+version=3.3.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_SDL2=$(vopt_if sdl2 ON OFF)
@@ -14,7 +14,7 @@ license="MIT"
 homepage="https://instead-hub.github.io"
 changelog="https://raw.githubusercontent.com/instead-hub/instead/master/ChangeLog"
 distfiles="https://github.com/instead-hub/instead/releases/download/${version}/instead_${version}.tar.gz"
-checksum=bb98f6903291bcc40fb06f2203ab8e05272ec84fded412482b6faa54bea3a90b
+checksum=1a39a8999254e585dbbc94b3da3ed8b28669d01c70f1f9e17864af4ad91f77b3
 
 build_options="gtk3 sdl2"
 build_options_default="sdl2"

Re: [PR PATCH] [Updated] instead: update to 3.3.3.

[UsernameRandomlyGenerated]

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

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

https://github.com/UsernameRandomlyGenerated/void-packages instead333
https://github.com/void-linux/void-packages/pull/29628

instead: update to 3.3.3.
<!-- 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
- [x] 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/29628.patch is attached

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

From b99ce337f4492301559835e52dffed8cc0bb4ff1 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 20 Mar 2021 14:23:56 +0100
Subject: [PATCH] instead: update to 3.3.3.

---
 srcpkgs/instead/template | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/instead/template b/srcpkgs/instead/template
index 81b5e1b39d28..1536a2166788 100644
--- a/srcpkgs/instead/template
+++ b/srcpkgs/instead/template
@@ -1,23 +1,23 @@
 # Template file for 'instead'
 pkgname=instead
-version=3.3.2
+version=3.3.3
 revision=1
 build_style=cmake
 configure_args="-DWITH_SDL2=$(vopt_if sdl2 ON OFF)
  -DWITH_GTK3=$(vopt_if gtk3 ON OFF)"
-makedepends="lua51-devel $(vopt_if gtk3 'gtk+3-devel' 'gtk+-devel')
- $(vopt_if sdl2 'SDL2_image-devel SDL2_mixer-devel
- SDL2_ttf-devel' 'SDL_image-devel SDL_mixer-devel SDL_ttf-devel')"
+hostmakedepends="pkg-config"
+makedepends="lua51-devel $(vopt_if gtk3 'gtk+3-devel')
+ $(vopt_if sdl2 'SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel')"
 short_desc="Interactive fiction interpreter"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://instead-hub.github.io"
 changelog="https://raw.githubusercontent.com/instead-hub/instead/master/ChangeLog"
 distfiles="https://github.com/instead-hub/instead/releases/download/${version}/instead_${version}.tar.gz"
-checksum=bb98f6903291bcc40fb06f2203ab8e05272ec84fded412482b6faa54bea3a90b
+checksum=1a39a8999254e585dbbc94b3da3ed8b28669d01c70f1f9e17864af4ad91f77b3
 
 build_options="gtk3 sdl2"
-build_options_default="sdl2"
+build_options_default="gtk3 sdl2"
 
 post_install() {
 	vlicense COPYING

Re: instead: update to 3.3.3.

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/29628#issuecomment-803494188

Comment:
What happens if the `gtk3` option is disabled? The old template used it as a switch between gtk2 and gtk3, so there was always *some* gtk dependency. Unless there is a compelling reason to allow building a version without any gtk support, I'd just drop the option and always pull in gtk3.

Re: instead: update to 3.3.3.

[UsernameRandomlyGenerated]

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

New comment by UsernameRandomlyGenerated on void-packages repository

https://github.com/void-linux/void-packages/pull/29628#issuecomment-803547431

Comment:
Without gtk3 it builds and works pretty much the same but there is no gtk file pick dialog (F4 button). It's enabled by default in 3.3.3. I can remove the option if you think it's a good call, I don't use the package myself so I can't make any argument for or against it.

Re: instead: update to 3.3.3.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29628#issuecomment-805467160

Comment:
I'd go with @ahesford's suggestion; simply remove the build option and force gtk3.

Re: [PR PATCH] [Updated] instead: update to 3.3.3.

[UsernameRandomlyGenerated]

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

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

https://github.com/UsernameRandomlyGenerated/void-packages instead333
https://github.com/void-linux/void-packages/pull/29628

instead: update to 3.3.3.
<!-- 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
- [x] 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/29628.patch is attached

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

From 1b19aedb9f39f4ff6030f6186f9307194bc808a5 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 20 Mar 2021 14:23:56 +0100
Subject: [PATCH] instead: update to 3.3.4.

---
 srcpkgs/instead/template | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/instead/template b/srcpkgs/instead/template
index 81b5e1b39d28..66800783564b 100644
--- a/srcpkgs/instead/template
+++ b/srcpkgs/instead/template
@@ -1,23 +1,17 @@
 # Template file for 'instead'
 pkgname=instead
-version=3.3.2
+version=3.3.4
 revision=1
 build_style=cmake
-configure_args="-DWITH_SDL2=$(vopt_if sdl2 ON OFF)
- -DWITH_GTK3=$(vopt_if gtk3 ON OFF)"
-makedepends="lua51-devel $(vopt_if gtk3 'gtk+3-devel' 'gtk+-devel')
- $(vopt_if sdl2 'SDL2_image-devel SDL2_mixer-devel
- SDL2_ttf-devel' 'SDL_image-devel SDL_mixer-devel SDL_ttf-devel')"
+hostmakedepends="pkg-config"
+makedepends="lua51-devel gtk+3-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel"
 short_desc="Interactive fiction interpreter"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://instead-hub.github.io"
 changelog="https://raw.githubusercontent.com/instead-hub/instead/master/ChangeLog"
 distfiles="https://github.com/instead-hub/instead/releases/download/${version}/instead_${version}.tar.gz"
-checksum=bb98f6903291bcc40fb06f2203ab8e05272ec84fded412482b6faa54bea3a90b
-
-build_options="gtk3 sdl2"
-build_options_default="sdl2"
+checksum=ff705290646b764a189f08e852deee82baa56f467f5f3fe9e687df81c3c819d6
 
 post_install() {
 	vlicense COPYING

Re: instead: update to 3.3.3.

[UsernameRandomlyGenerated]

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

New comment by UsernameRandomlyGenerated on void-packages repository

https://github.com/void-linux/void-packages/pull/29628#issuecomment-808872692

Comment:
I've removed build option for SDL1 too, SDL2 is also default and I don't think anyone needs building with the old one, though I'll restore it if you think I should.

Re: instead: update to 3.3.3.

[ahesford]

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/29628#issuecomment-808941490

Comment:
I don't really have an opinion here and will defer to @ericonr if he does. Dropping the SDL2 option seems ok, because anybody who objects to the list option can always revert that part of the change.

Re: instead: update to 3.3.3.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/29628#issuecomment-808942404

Comment:
Please mention the changes in the commit message ;)

Besides that, I'm okay with dropping SDL and forcing SDL2.

Re: [PR PATCH] [Updated] instead: update to 3.3.3.

[UsernameRandomlyGenerated]

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

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

https://github.com/UsernameRandomlyGenerated/void-packages instead333
https://github.com/void-linux/void-packages/pull/29628

instead: update to 3.3.3.
<!-- 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
- [x] 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/29628.patch is attached

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

From 14014638f9a2bf53c4f9412f6b296e48c999aad7 Mon Sep 17 00:00:00 2001
From: UsernameRandomlyGenerated <coredavid@tutanota.com>
Date: Sat, 20 Mar 2021 14:23:56 +0100
Subject: [PATCH] instead: update to 3.3.4, drop gtk3 and sdl2 build option

Both are enabled by default in upstream.
---
 srcpkgs/instead/template | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/instead/template b/srcpkgs/instead/template
index 81b5e1b39d28..66800783564b 100644
--- a/srcpkgs/instead/template
+++ b/srcpkgs/instead/template
@@ -1,23 +1,17 @@
 # Template file for 'instead'
 pkgname=instead
-version=3.3.2
+version=3.3.4
 revision=1
 build_style=cmake
-configure_args="-DWITH_SDL2=$(vopt_if sdl2 ON OFF)
- -DWITH_GTK3=$(vopt_if gtk3 ON OFF)"
-makedepends="lua51-devel $(vopt_if gtk3 'gtk+3-devel' 'gtk+-devel')
- $(vopt_if sdl2 'SDL2_image-devel SDL2_mixer-devel
- SDL2_ttf-devel' 'SDL_image-devel SDL_mixer-devel SDL_ttf-devel')"
+hostmakedepends="pkg-config"
+makedepends="lua51-devel gtk+3-devel SDL2_image-devel SDL2_mixer-devel SDL2_ttf-devel"
 short_desc="Interactive fiction interpreter"
 maintainer="SolitudeSF <solitudesf@protonmail.com>"
 license="MIT"
 homepage="https://instead-hub.github.io"
 changelog="https://raw.githubusercontent.com/instead-hub/instead/master/ChangeLog"
 distfiles="https://github.com/instead-hub/instead/releases/download/${version}/instead_${version}.tar.gz"
-checksum=bb98f6903291bcc40fb06f2203ab8e05272ec84fded412482b6faa54bea3a90b
-
-build_options="gtk3 sdl2"
-build_options_default="sdl2"
+checksum=ff705290646b764a189f08e852deee82baa56f467f5f3fe9e687df81c3c819d6
 
 post_install() {
 	vlicense COPYING

Re: [PR PATCH] [Closed]: instead: update to 3.3.3.

[ericonr]

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

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

instead: update to 3.3.3.
https://github.com/void-linux/void-packages/pull/29628

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