Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] devilutionX: update to 1.3.0
@ 2021-11-12  8:31 bugcrazy
  2021-11-12  8:32 ` bugcrazy
                   ` (27 more replies)
  0 siblings, 28 replies; 29+ messages in thread
From: bugcrazy @ 2021-11-12  8:31 UTC (permalink / raw)
  To: ml

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

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

https://github.com/bugcrazy/void-packages patch-9
https://github.com/void-linux/void-packages/pull/34039

devilutionX: update to 1.3.0
Required packages to build devilutionX

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

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/34039.patch is attached

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

From 06351a836a678e4222db7495fc5e3a1c5c6fa15d Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Fri, 12 Nov 2021 04:50:29 -0300
Subject: [PATCH] devilutionX: update to 1.3.0

Required packages to build devilutionX
---
 common/shlibs                                 |  1 +
 srcpkgs/StormLib/template                     | 17 ++++++
 srcpkgs/devilutionX/template                  |  9 ++--
 .../smpq/patches/fix-smpq-compilation.patch   | 52 +++++++++++++++++++
 srcpkgs/smpq/template                         | 19 +++++++
 5 files changed, 94 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/StormLib/template
 create mode 100644 srcpkgs/smpq/patches/fix-smpq-compilation.patch
 create mode 100644 srcpkgs/smpq/template

diff --git a/common/shlibs b/common/shlibs
index fd78e1e33c3f..0f1f407dad48 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4062,3 +4062,4 @@ libomalloc-0.9.6.so singular-4.2.1_1
 libsingular_resources-4.2.1.so singular-4.2.1_1
 libm4ri-0.0.20200125.so m4ri-20200125_1
 libm4rie-0.0.20200125.so m4rie-20200125_1
+libstorm.so.9 StormLib-9.23_1
diff --git a/srcpkgs/StormLib/template b/srcpkgs/StormLib/template
new file mode 100644
index 000000000000..16e089059f5d
--- /dev/null
+++ b/srcpkgs/StormLib/template
@@ -0,0 +1,17 @@
+# Template file for 'StormLib'
+pkgname=StormLib
+version=9.23
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DWITH_LIBTOMCRYPT=ON"
+makedepends="bzip2-devel zlib-devel libtomcrypt-devel libtommath-devel"
+short_desc="C/C++ API to read and write MPQ files with support for merged archives"
+maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
+license="MIT"
+homepage="https://github.com/ladislav-zezula/StormLib"
+distfiles="https://github.com/ladislav-zezula/StormLib/archive/v${version}.tar.gz"
+checksum=d62ba42f1e02efcb2cbaa03bd2e20fbd18c45499ef5fe65ffb89ee52a7bd9c92
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 829ff248926b..743bd0b5c809 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,16 +1,17 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.2.1
+version=1.3.0
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\""
-makedepends="SDL2-devel SDL2_ttf-devel SDL2_mixer-devel libsodium-devel"
+configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON"
+hostmakedepends="git gettext pkg-config smpq"
+makedepends="SDL2-devel SDL2_mixer-devel fmt-devel libpng-devel libsodium-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
 distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521
+checksum=b01bfcdba7144566f1658eb50748b00d85f252f6bf8daf14a4fcccd5dc5bd9cc
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/smpq/patches/fix-smpq-compilation.patch b/srcpkgs/smpq/patches/fix-smpq-compilation.patch
new file mode 100644
index 000000000000..985fe3d3fa13
--- /dev/null
+++ b/srcpkgs/smpq/patches/fix-smpq-compilation.patch
@@ -0,0 +1,52 @@
+--- a/CMakeLists.txt	2016-12-12 23:31:14.000000000 +0100
++++ b/CMakeLists.txt	2021-10-01 13:06:43.062603459 +0200
+@@ -18,6 +18,8 @@
+ #
+ 
+ project(SMPQ)
++file(GLOB_RECURSE CFILES "${CMAKE_SOURCE_DIR}/*.c")
++SET_SOURCE_FILES_PROPERTIES(${CFILES} PROPERTIES LANGUAGE CXX)
+ set(VERSION 1.6)
+ cmake_minimum_required(VERSION 2.6)
+ 
+@@ -43,9 +45,9 @@
+ 
+ 	try_compile(CHECK ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/check.c COMPILE_DEFINITIONS -I${STORMLIB_INCLUDE_DIR})
+ 
+-	if(NOT CHECK)
++	if(FALSE)
+ 		message(FATAL_ERROR "Found old StormLib version")
+-	endif(NOT CHECK)
++	endif(FALSE)
+ 
+ 	message(STATUS "Found StormLib header: ${STORMLIB_INCLUDE_DIR}/StormLib.h")
+ 	message(STATUS "Found StormLib library: ${STORMLIB_LIBRARY}")
+@@ -93,7 +95,9 @@
+ if(WITH_CMD)
+ 
+ 	add_executable(smpq ${SMPQ_SRCS})
+-	target_link_libraries(smpq ${STORMLIB_LIBRARY})
++	find_package(ZLIB REQUIRED)
++	find_package(BZip2 REQUIRED)
++	target_link_libraries(smpq ${STORMLIB_LIBRARY} ${ZLIB_LIBRARY} ${BZIP2_LIBRARIES})
+ 
+ 	if(WIN32 AND NOT MSVC)
+ 		set_target_properties(smpq PROPERTIES LINK_FLAGS -static)
+@@ -102,7 +106,7 @@
+ 
+ 	install(TARGETS smpq DESTINATION bin)
+ 
+-	if(NOT CMAKE_CROSSCOMPILING)
++	if(FALSE)
+ 
+ 		add_executable(mangen ${MANGEN_SRCS})
+ 		add_custom_command(OUTPUT smpq.1 COMMAND mangen > smpq.1 DEPENDS mangen)
+@@ -110,7 +114,7 @@
+ 
+ 		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/smpq.1 DESTINATION share/man/man1)
+ 
+-	endif(NOT CMAKE_CROSSCOMPILING)
++	endif(FALSE)
+ 
+ 	if(WIN32 AND WITH_NSIS)
+ 	
diff --git a/srcpkgs/smpq/template b/srcpkgs/smpq/template
new file mode 100644
index 000000000000..4ec5559456b2
--- /dev/null
+++ b/srcpkgs/smpq/template
@@ -0,0 +1,19 @@
+# Template file for 'smpq'
+pkgname=smpq
+version=1.6
+revision=1
+build_style=cmake
+configure_args="-DWITH_KDE=OFF"
+makedepends="bzip2-devel zlib-devel StormLib"
+short_desc="StormLib MPQ archiving utility"
+maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://launchpad.net/smpq"
+distfiles="https://launchpad.net/smpq/trunk/${version}/+download/smpq_${version}.orig.tar.gz"
+checksum=b5d2dc8a5de8629b71ee5d3612b6e84d88418b86c5cd39ba315e9eb0462f18cb
+patch_args="-Np1"
+
+do_build() {
+	cd ${wrksrc}
+	cd build
+}

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
@ 2021-11-12  8:32 ` bugcrazy
  2021-11-12  8:44 ` [PR PATCH] [Updated] " bugcrazy
                   ` (26 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: bugcrazy @ 2021-11-12  8:32 UTC (permalink / raw)
  To: ml

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

New comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#issuecomment-966918108

Comment:
Two new packages are created needed to build devilutionX, they are StormLib and smpq.

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
  2021-11-12  8:32 ` bugcrazy
@ 2021-11-12  8:44 ` bugcrazy
  2021-11-14 20:11 ` [PR REVIEW] " abenson
                   ` (25 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: bugcrazy @ 2021-11-12  8:44 UTC (permalink / raw)
  To: ml

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

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

https://github.com/bugcrazy/void-packages patch-9
https://github.com/void-linux/void-packages/pull/34039

devilutionX: update to 1.3.0
Required packages to build devilutionX

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

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/34039.patch is attached

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

From efdd0d0ba9e9c7c0ac58c616b8be61f123aadb1b Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Fri, 12 Nov 2021 04:50:29 -0300
Subject: [PATCH] devilutionX: update to 1.3.0

Required packages to build devilutionX

Fixing checksum error
---
 common/shlibs                                 |  1 +
 srcpkgs/StormLib/template                     | 17 ++++++
 srcpkgs/devilutionX/template                  |  9 ++--
 .../smpq/patches/fix-smpq-compilation.patch   | 52 +++++++++++++++++++
 srcpkgs/smpq/template                         | 19 +++++++
 5 files changed, 94 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/StormLib/template
 create mode 100644 srcpkgs/smpq/patches/fix-smpq-compilation.patch
 create mode 100644 srcpkgs/smpq/template

diff --git a/common/shlibs b/common/shlibs
index fd78e1e33c3f..0f1f407dad48 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4062,3 +4062,4 @@ libomalloc-0.9.6.so singular-4.2.1_1
 libsingular_resources-4.2.1.so singular-4.2.1_1
 libm4ri-0.0.20200125.so m4ri-20200125_1
 libm4rie-0.0.20200125.so m4rie-20200125_1
+libstorm.so.9 StormLib-9.23_1
diff --git a/srcpkgs/StormLib/template b/srcpkgs/StormLib/template
new file mode 100644
index 000000000000..16e089059f5d
--- /dev/null
+++ b/srcpkgs/StormLib/template
@@ -0,0 +1,17 @@
+# Template file for 'StormLib'
+pkgname=StormLib
+version=9.23
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DWITH_LIBTOMCRYPT=ON"
+makedepends="bzip2-devel zlib-devel libtomcrypt-devel libtommath-devel"
+short_desc="C/C++ API to read and write MPQ files with support for merged archives"
+maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
+license="MIT"
+homepage="https://github.com/ladislav-zezula/StormLib"
+distfiles="https://github.com/ladislav-zezula/StormLib/archive/v${version}.tar.gz"
+checksum=d62ba42f1e02efcb2cbaa03bd2e20fbd18c45499ef5fe65ffb89ee52a7bd9c92
+
+post_install() {
+	vlicense LICENSE
+}
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 829ff248926b..fd24b976fdc3 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,16 +1,17 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.2.1
+version=1.3.0
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\""
-makedepends="SDL2-devel SDL2_ttf-devel SDL2_mixer-devel libsodium-devel"
+configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON"
+hostmakedepends="git gettext pkg-config smpq"
+makedepends="SDL2-devel SDL2_mixer-devel fmt-devel libpng-devel libsodium-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
 distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521
+checksum=6911ec6432430ff30212b6817f311987793c0661f39dc395103d01555fdc8c77
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/smpq/patches/fix-smpq-compilation.patch b/srcpkgs/smpq/patches/fix-smpq-compilation.patch
new file mode 100644
index 000000000000..985fe3d3fa13
--- /dev/null
+++ b/srcpkgs/smpq/patches/fix-smpq-compilation.patch
@@ -0,0 +1,52 @@
+--- a/CMakeLists.txt	2016-12-12 23:31:14.000000000 +0100
++++ b/CMakeLists.txt	2021-10-01 13:06:43.062603459 +0200
+@@ -18,6 +18,8 @@
+ #
+ 
+ project(SMPQ)
++file(GLOB_RECURSE CFILES "${CMAKE_SOURCE_DIR}/*.c")
++SET_SOURCE_FILES_PROPERTIES(${CFILES} PROPERTIES LANGUAGE CXX)
+ set(VERSION 1.6)
+ cmake_minimum_required(VERSION 2.6)
+ 
+@@ -43,9 +45,9 @@
+ 
+ 	try_compile(CHECK ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/check.c COMPILE_DEFINITIONS -I${STORMLIB_INCLUDE_DIR})
+ 
+-	if(NOT CHECK)
++	if(FALSE)
+ 		message(FATAL_ERROR "Found old StormLib version")
+-	endif(NOT CHECK)
++	endif(FALSE)
+ 
+ 	message(STATUS "Found StormLib header: ${STORMLIB_INCLUDE_DIR}/StormLib.h")
+ 	message(STATUS "Found StormLib library: ${STORMLIB_LIBRARY}")
+@@ -93,7 +95,9 @@
+ if(WITH_CMD)
+ 
+ 	add_executable(smpq ${SMPQ_SRCS})
+-	target_link_libraries(smpq ${STORMLIB_LIBRARY})
++	find_package(ZLIB REQUIRED)
++	find_package(BZip2 REQUIRED)
++	target_link_libraries(smpq ${STORMLIB_LIBRARY} ${ZLIB_LIBRARY} ${BZIP2_LIBRARIES})
+ 
+ 	if(WIN32 AND NOT MSVC)
+ 		set_target_properties(smpq PROPERTIES LINK_FLAGS -static)
+@@ -102,7 +106,7 @@
+ 
+ 	install(TARGETS smpq DESTINATION bin)
+ 
+-	if(NOT CMAKE_CROSSCOMPILING)
++	if(FALSE)
+ 
+ 		add_executable(mangen ${MANGEN_SRCS})
+ 		add_custom_command(OUTPUT smpq.1 COMMAND mangen > smpq.1 DEPENDS mangen)
+@@ -110,7 +114,7 @@
+ 
+ 		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/smpq.1 DESTINATION share/man/man1)
+ 
+-	endif(NOT CMAKE_CROSSCOMPILING)
++	endif(FALSE)
+ 
+ 	if(WIN32 AND WITH_NSIS)
+ 	
diff --git a/srcpkgs/smpq/template b/srcpkgs/smpq/template
new file mode 100644
index 000000000000..4ec5559456b2
--- /dev/null
+++ b/srcpkgs/smpq/template
@@ -0,0 +1,19 @@
+# Template file for 'smpq'
+pkgname=smpq
+version=1.6
+revision=1
+build_style=cmake
+configure_args="-DWITH_KDE=OFF"
+makedepends="bzip2-devel zlib-devel StormLib"
+short_desc="StormLib MPQ archiving utility"
+maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://launchpad.net/smpq"
+distfiles="https://launchpad.net/smpq/trunk/${version}/+download/smpq_${version}.orig.tar.gz"
+checksum=b5d2dc8a5de8629b71ee5d3612b6e84d88418b86c5cd39ba315e9eb0462f18cb
+patch_args="-Np1"
+
+do_build() {
+	cd ${wrksrc}
+	cd build
+}

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
  2021-11-12  8:32 ` bugcrazy
  2021-11-12  8:44 ` [PR PATCH] [Updated] " bugcrazy
@ 2021-11-14 20:11 ` abenson
  2021-11-14 20:12 ` abenson
                   ` (24 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: abenson @ 2021-11-14 20:11 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r748902549

Comment:
The new packages should have their own commits.

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (2 preceding siblings ...)
  2021-11-14 20:11 ` [PR REVIEW] " abenson
@ 2021-11-14 20:12 ` abenson
  2021-11-14 20:14 ` abenson
                   ` (23 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: abenson @ 2021-11-14 20:12 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r748902618

Comment:
This is the default, its not necessary.

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (3 preceding siblings ...)
  2021-11-14 20:12 ` abenson
@ 2021-11-14 20:14 ` abenson
  2021-11-14 20:14 ` abenson
                   ` (22 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: abenson @ 2021-11-14 20:14 UTC (permalink / raw)
  To: ml

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

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#issuecomment-968356178

Comment:
`StormLib` shoudl also be split into `StormLib-devel`.

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (4 preceding siblings ...)
  2021-11-14 20:14 ` abenson
@ 2021-11-14 20:14 ` abenson
  2021-11-14 20:32 ` [PR REVIEW] " abenson
                   ` (21 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: abenson @ 2021-11-14 20:14 UTC (permalink / raw)
  To: ml

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

New comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#issuecomment-968356178

Comment:
`StormLib` should be split into `StormLib-devel`.

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (5 preceding siblings ...)
  2021-11-14 20:14 ` abenson
@ 2021-11-14 20:32 ` abenson
  2021-11-14 20:40 ` abenson
                   ` (20 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: abenson @ 2021-11-14 20:32 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r748904746

Comment:
Why not just remove the lines entirely?

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (6 preceding siblings ...)
  2021-11-14 20:32 ` [PR REVIEW] " abenson
@ 2021-11-14 20:40 ` abenson
  2021-11-17  3:30 ` [PR PATCH] [Updated] " bugcrazy
                   ` (19 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: abenson @ 2021-11-14 20:40 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r748905799

Comment:
Same here, just remove the lines 

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (7 preceding siblings ...)
  2021-11-14 20:40 ` abenson
@ 2021-11-17  3:30 ` bugcrazy
  2021-11-17  3:31 ` [PR REVIEW] " bugcrazy
                   ` (18 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: bugcrazy @ 2021-11-17  3:30 UTC (permalink / raw)
  To: ml

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

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

https://github.com/bugcrazy/void-packages patch-9
https://github.com/void-linux/void-packages/pull/34039

devilutionX: update to 1.3.0
Required packages to build devilutionX

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

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/34039.patch is attached

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

From 514d3aaebc46395536290e909422179752a8c038 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Fri, 12 Nov 2021 04:50:29 -0300
Subject: [PATCH] devilutionX: update to 1.3.0

Required packages to build devilutionX

Fixing checksum error

Applying suggestions and adjustments
---
 common/shlibs                                 |  1 +
 srcpkgs/StormLib-devel                        |  1 +
 srcpkgs/StormLib/template                     | 25 +++++++++
 srcpkgs/devilutionX/template                  |  9 ++--
 .../smpq/patches/fix-smpq-compilation.patch   | 53 +++++++++++++++++++
 srcpkgs/smpq/template                         | 20 +++++++
 6 files changed, 105 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/StormLib-devel
 create mode 100644 srcpkgs/StormLib/template
 create mode 100644 srcpkgs/smpq/patches/fix-smpq-compilation.patch
 create mode 100644 srcpkgs/smpq/template

diff --git a/common/shlibs b/common/shlibs
index fd78e1e33c3f..0f1f407dad48 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4062,3 +4062,4 @@ libomalloc-0.9.6.so singular-4.2.1_1
 libsingular_resources-4.2.1.so singular-4.2.1_1
 libm4ri-0.0.20200125.so m4ri-20200125_1
 libm4rie-0.0.20200125.so m4rie-20200125_1
+libstorm.so.9 StormLib-9.23_1
diff --git a/srcpkgs/StormLib-devel b/srcpkgs/StormLib-devel
new file mode 120000
index 000000000000..fdd58877ee63
--- /dev/null
+++ b/srcpkgs/StormLib-devel
@@ -0,0 +1 @@
+StormLib
\ No newline at end of file
diff --git a/srcpkgs/StormLib/template b/srcpkgs/StormLib/template
new file mode 100644
index 000000000000..57b55e4539c1
--- /dev/null
+++ b/srcpkgs/StormLib/template
@@ -0,0 +1,25 @@
+# Template file for 'StormLib'
+pkgname=StormLib
+version=9.23
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DWITH_LIBTOMCRYPT=ON"
+makedepends="bzip2-devel zlib-devel libtomcrypt-devel libtommath-devel"
+short_desc="C/C++ API to read and write MPQ files with support for merged archives"
+maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
+license="MIT"
+homepage="https://github.com/ladislav-zezula/StormLib"
+distfiles="https://github.com/ladislav-zezula/StormLib/archive/v${version}.tar.gz"
+checksum=d62ba42f1e02efcb2cbaa03bd2e20fbd18c45499ef5fe65ffb89ee52a7bd9c92
+
+post_install() {
+	vlicense LICENSE
+}
+
+StormLib-devel_package() {	
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 829ff248926b..e146d594bdd9 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,16 +1,17 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.2.1
+version=1.3.0
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\""
-makedepends="SDL2-devel SDL2_ttf-devel SDL2_mixer-devel libsodium-devel"
+configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON"
+hostmakedepends="git gettext pkg-config smpq"
+makedepends="SDL2-devel fmt-devel libpng-devel libsodium-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
 distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521
+checksum=6911ec6432430ff30212b6817f311987793c0661f39dc395103d01555fdc8c77
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/smpq/patches/fix-smpq-compilation.patch b/srcpkgs/smpq/patches/fix-smpq-compilation.patch
new file mode 100644
index 000000000000..d3d9f7bf47cc
--- /dev/null
+++ b/srcpkgs/smpq/patches/fix-smpq-compilation.patch
@@ -0,0 +1,53 @@
+--- a/CMakeLists.txt	2021-11-17 00:05:26.153515080 -0300
++++ b/CMakeLists.txt	2021-11-17 00:07:09.549884637 -0300
+@@ -18,6 +18,8 @@
+ #
+ 
+ project(SMPQ)
++file(GLOB_RECURSE CFILES "${CMAKE_SOURCE_DIR}/*.c")
++SET_SOURCE_FILES_PROPERTIES(${CFILES} PROPERTIES LANGUAGE CXX)
+ set(VERSION 1.6)
+ cmake_minimum_required(VERSION 2.6)
+ 
+@@ -42,11 +44,7 @@
+ 	endif(NOT STORMLIB_LIBRARY)
+ 
+ 	try_compile(CHECK ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/check.c COMPILE_DEFINITIONS -I${STORMLIB_INCLUDE_DIR})
+-
+-	if(NOT CHECK)
+-		message(FATAL_ERROR "Found old StormLib version")
+-	endif(NOT CHECK)
+-
++	
+ 	message(STATUS "Found StormLib header: ${STORMLIB_INCLUDE_DIR}/StormLib.h")
+ 	message(STATUS "Found StormLib library: ${STORMLIB_LIBRARY}")
+ 
+@@ -93,24 +91,16 @@
+ if(WITH_CMD)
+ 
+ 	add_executable(smpq ${SMPQ_SRCS})
+-	target_link_libraries(smpq ${STORMLIB_LIBRARY})
++	find_package(ZLIB REQUIRED)
++	find_package(BZip2 REQUIRED)
++	target_link_libraries(smpq ${STORMLIB_LIBRARY} ${ZLIB_LIBRARY} ${BZIP2_LIBRARIES})
+ 
+ 	if(WIN32 AND NOT MSVC)
+ 		set_target_properties(smpq PROPERTIES LINK_FLAGS -static)
+ 		target_link_libraries(smpq wininet stdc++)
+ 	endif(WIN32 AND NOT MSVC)
+ 
+-	install(TARGETS smpq DESTINATION bin)
+-
+-	if(NOT CMAKE_CROSSCOMPILING)
+-
+-		add_executable(mangen ${MANGEN_SRCS})
+-		add_custom_command(OUTPUT smpq.1 COMMAND mangen > smpq.1 DEPENDS mangen)
+-		add_custom_target(man ALL DEPENDS smpq.1)
+-
+-		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/smpq.1 DESTINATION share/man/man1)
+-
+-	endif(NOT CMAKE_CROSSCOMPILING)
++	install(TARGETS smpq DESTINATION bin)	
+ 
+ 	if(WIN32 AND WITH_NSIS)
+ 
diff --git a/srcpkgs/smpq/template b/srcpkgs/smpq/template
new file mode 100644
index 000000000000..d610da90f8af
--- /dev/null
+++ b/srcpkgs/smpq/template
@@ -0,0 +1,20 @@
+# Template file for 'smpq'
+pkgname=smpq
+version=1.6
+revision=1
+build_style=cmake
+configure_args="-DWITH_KDE=OFF"
+hostmakedepends="StormLib"
+makedepends="bzip2-devel zlib-devel StormLib-devel"
+short_desc="StormLib MPQ archiving utility"
+maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://launchpad.net/smpq"
+distfiles="https://launchpad.net/smpq/trunk/${version}/+download/smpq_${version}.orig.tar.gz"
+checksum=b5d2dc8a5de8629b71ee5d3612b6e84d88418b86c5cd39ba315e9eb0462f18cb
+patch_args="-Np1"
+
+do_build() {
+	cd ${wrksrc}
+	cd build
+}

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (8 preceding siblings ...)
  2021-11-17  3:30 ` [PR PATCH] [Updated] " bugcrazy
@ 2021-11-17  3:31 ` bugcrazy
  2021-11-17  3:32 ` bugcrazy
                   ` (17 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: bugcrazy @ 2021-11-17  3:31 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r750855650

Comment:
I forgot that.

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (9 preceding siblings ...)
  2021-11-17  3:31 ` [PR REVIEW] " bugcrazy
@ 2021-11-17  3:32 ` bugcrazy
  2021-11-17  3:33 ` bugcrazy
                   ` (16 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: bugcrazy @ 2021-11-17  3:32 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r750856025

Comment:
In which line, what is it not necessary?


^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (10 preceding siblings ...)
  2021-11-17  3:32 ` bugcrazy
@ 2021-11-17  3:33 ` bugcrazy
  2021-11-17  3:44 ` [PR PATCH] [Updated] " bugcrazy
                   ` (15 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: bugcrazy @ 2021-11-17  3:33 UTC (permalink / raw)
  To: ml

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

New comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#issuecomment-971143448

Comment:
> `StormLib` should be split into `StormLib-devel`.

Done!

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (11 preceding siblings ...)
  2021-11-17  3:33 ` bugcrazy
@ 2021-11-17  3:44 ` bugcrazy
  2021-11-17  3:45 ` [PR REVIEW] " bugcrazy
                   ` (14 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: bugcrazy @ 2021-11-17  3:44 UTC (permalink / raw)
  To: ml

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

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

https://github.com/bugcrazy/void-packages patch-9
https://github.com/void-linux/void-packages/pull/34039

devilutionX: update to 1.3.0
Required packages to build devilutionX

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

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/34039.patch is attached

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

From f3b5a00768d88412eb832012a46c99f3df101119 Mon Sep 17 00:00:00 2001
From: bugcrazy <39757967+bugcrazy@users.noreply.github.com>
Date: Fri, 12 Nov 2021 04:50:29 -0300
Subject: [PATCH] devilutionX: update to 1.3.0

Required packages to build devilutionX

Fixing checksum error

Applying suggestions and adjustments

Fix whitespace
---
 common/shlibs                                 |  1 +
 srcpkgs/StormLib-devel                        |  1 +
 srcpkgs/StormLib/template                     | 25 +++++++++
 srcpkgs/devilutionX/template                  |  9 ++--
 .../smpq/patches/fix-smpq-compilation.patch   | 53 +++++++++++++++++++
 srcpkgs/smpq/template                         | 20 +++++++
 6 files changed, 105 insertions(+), 4 deletions(-)
 create mode 120000 srcpkgs/StormLib-devel
 create mode 100644 srcpkgs/StormLib/template
 create mode 100644 srcpkgs/smpq/patches/fix-smpq-compilation.patch
 create mode 100644 srcpkgs/smpq/template

diff --git a/common/shlibs b/common/shlibs
index fd78e1e33c3f..0f1f407dad48 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4062,3 +4062,4 @@ libomalloc-0.9.6.so singular-4.2.1_1
 libsingular_resources-4.2.1.so singular-4.2.1_1
 libm4ri-0.0.20200125.so m4ri-20200125_1
 libm4rie-0.0.20200125.so m4rie-20200125_1
+libstorm.so.9 StormLib-9.23_1
diff --git a/srcpkgs/StormLib-devel b/srcpkgs/StormLib-devel
new file mode 120000
index 000000000000..fdd58877ee63
--- /dev/null
+++ b/srcpkgs/StormLib-devel
@@ -0,0 +1 @@
+StormLib
\ No newline at end of file
diff --git a/srcpkgs/StormLib/template b/srcpkgs/StormLib/template
new file mode 100644
index 000000000000..cb14a60206da
--- /dev/null
+++ b/srcpkgs/StormLib/template
@@ -0,0 +1,25 @@
+# Template file for 'StormLib'
+pkgname=StormLib
+version=9.23
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DWITH_LIBTOMCRYPT=ON"
+makedepends="bzip2-devel zlib-devel libtomcrypt-devel libtommath-devel"
+short_desc="C/C++ API to read and write MPQ files with support for merged archives"
+maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
+license="MIT"
+homepage="https://github.com/ladislav-zezula/StormLib"
+distfiles="https://github.com/ladislav-zezula/StormLib/archive/v${version}.tar.gz"
+checksum=d62ba42f1e02efcb2cbaa03bd2e20fbd18c45499ef5fe65ffb89ee52a7bd9c92
+
+post_install() {
+	vlicense LICENSE
+}
+
+StormLib-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 829ff248926b..e146d594bdd9 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,16 +1,17 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.2.1
+version=1.3.0
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\""
-makedepends="SDL2-devel SDL2_ttf-devel SDL2_mixer-devel libsodium-devel"
+configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON"
+hostmakedepends="git gettext pkg-config smpq"
+makedepends="SDL2-devel fmt-devel libpng-devel libsodium-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
 distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521
+checksum=6911ec6432430ff30212b6817f311987793c0661f39dc395103d01555fdc8c77
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/smpq/patches/fix-smpq-compilation.patch b/srcpkgs/smpq/patches/fix-smpq-compilation.patch
new file mode 100644
index 000000000000..d3d9f7bf47cc
--- /dev/null
+++ b/srcpkgs/smpq/patches/fix-smpq-compilation.patch
@@ -0,0 +1,53 @@
+--- a/CMakeLists.txt	2021-11-17 00:05:26.153515080 -0300
++++ b/CMakeLists.txt	2021-11-17 00:07:09.549884637 -0300
+@@ -18,6 +18,8 @@
+ #
+ 
+ project(SMPQ)
++file(GLOB_RECURSE CFILES "${CMAKE_SOURCE_DIR}/*.c")
++SET_SOURCE_FILES_PROPERTIES(${CFILES} PROPERTIES LANGUAGE CXX)
+ set(VERSION 1.6)
+ cmake_minimum_required(VERSION 2.6)
+ 
+@@ -42,11 +44,7 @@
+ 	endif(NOT STORMLIB_LIBRARY)
+ 
+ 	try_compile(CHECK ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/check.c COMPILE_DEFINITIONS -I${STORMLIB_INCLUDE_DIR})
+-
+-	if(NOT CHECK)
+-		message(FATAL_ERROR "Found old StormLib version")
+-	endif(NOT CHECK)
+-
++	
+ 	message(STATUS "Found StormLib header: ${STORMLIB_INCLUDE_DIR}/StormLib.h")
+ 	message(STATUS "Found StormLib library: ${STORMLIB_LIBRARY}")
+ 
+@@ -93,24 +91,16 @@
+ if(WITH_CMD)
+ 
+ 	add_executable(smpq ${SMPQ_SRCS})
+-	target_link_libraries(smpq ${STORMLIB_LIBRARY})
++	find_package(ZLIB REQUIRED)
++	find_package(BZip2 REQUIRED)
++	target_link_libraries(smpq ${STORMLIB_LIBRARY} ${ZLIB_LIBRARY} ${BZIP2_LIBRARIES})
+ 
+ 	if(WIN32 AND NOT MSVC)
+ 		set_target_properties(smpq PROPERTIES LINK_FLAGS -static)
+ 		target_link_libraries(smpq wininet stdc++)
+ 	endif(WIN32 AND NOT MSVC)
+ 
+-	install(TARGETS smpq DESTINATION bin)
+-
+-	if(NOT CMAKE_CROSSCOMPILING)
+-
+-		add_executable(mangen ${MANGEN_SRCS})
+-		add_custom_command(OUTPUT smpq.1 COMMAND mangen > smpq.1 DEPENDS mangen)
+-		add_custom_target(man ALL DEPENDS smpq.1)
+-
+-		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/smpq.1 DESTINATION share/man/man1)
+-
+-	endif(NOT CMAKE_CROSSCOMPILING)
++	install(TARGETS smpq DESTINATION bin)	
+ 
+ 	if(WIN32 AND WITH_NSIS)
+ 
diff --git a/srcpkgs/smpq/template b/srcpkgs/smpq/template
new file mode 100644
index 000000000000..d610da90f8af
--- /dev/null
+++ b/srcpkgs/smpq/template
@@ -0,0 +1,20 @@
+# Template file for 'smpq'
+pkgname=smpq
+version=1.6
+revision=1
+build_style=cmake
+configure_args="-DWITH_KDE=OFF"
+hostmakedepends="StormLib"
+makedepends="bzip2-devel zlib-devel StormLib-devel"
+short_desc="StormLib MPQ archiving utility"
+maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://launchpad.net/smpq"
+distfiles="https://launchpad.net/smpq/trunk/${version}/+download/smpq_${version}.orig.tar.gz"
+checksum=b5d2dc8a5de8629b71ee5d3612b6e84d88418b86c5cd39ba315e9eb0462f18cb
+patch_args="-Np1"
+
+do_build() {
+	cd ${wrksrc}
+	cd build
+}

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (12 preceding siblings ...)
  2021-11-17  3:44 ` [PR PATCH] [Updated] " bugcrazy
@ 2021-11-17  3:45 ` bugcrazy
  2021-11-17  3:46 ` bugcrazy
                   ` (13 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: bugcrazy @ 2021-11-17  3:45 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r750860029

Comment:
Using (FALSE), obtain the same result as you remove the rows. I refizes the patch by removing the lines.

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (13 preceding siblings ...)
  2021-11-17  3:45 ` [PR REVIEW] " bugcrazy
@ 2021-11-17  3:46 ` bugcrazy
  2021-11-17  5:25 ` bugcrazy
                   ` (12 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: bugcrazy @ 2021-11-17  3:46 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r750860211

Comment:
I removed the lines

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (14 preceding siblings ...)
  2021-11-17  3:46 ` bugcrazy
@ 2021-11-17  5:25 ` bugcrazy
  2021-11-17 18:16 ` abenson
                   ` (11 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: bugcrazy @ 2021-11-17  5:25 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r750890904

Comment:
I opened PR for [Stormlib](34108) 

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (15 preceding siblings ...)
  2021-11-17  5:25 ` bugcrazy
@ 2021-11-17 18:16 ` abenson
  2021-11-17 23:22 ` bugcrazy
                   ` (10 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: abenson @ 2021-11-17 18:16 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r751517030

Comment:
No, the commit should still be in this PR, just needs to be a separate commit.

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (16 preceding siblings ...)
  2021-11-17 18:16 ` abenson
@ 2021-11-17 23:22 ` bugcrazy
  2021-11-18  0:02 ` abenson
                   ` (9 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: bugcrazy @ 2021-11-17 23:22 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r751721509

Comment:
It would not be better for separate PR, I say StormLib, smpq and devilutionX, each having your PR, devilutionX PR would only update, other PR would be new packages. Because it is easier to find failures, to compile everything at once and have strange results. 

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (17 preceding siblings ...)
  2021-11-17 23:22 ` bugcrazy
@ 2021-11-18  0:02 ` abenson
  2021-11-18  0:02 ` abenson
                   ` (8 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: abenson @ 2021-11-18  0:02 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r751778790

Comment:
The `patch_args`

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (18 preceding siblings ...)
  2021-11-18  0:02 ` abenson
@ 2021-11-18  0:02 ` abenson
  2021-11-20  7:01 ` [PR PATCH] [Updated] " bugcrazy
                   ` (7 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: abenson @ 2021-11-18  0:02 UTC (permalink / raw)
  To: ml

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

New review comment by abenson on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r751779036

Comment:
If those packages are required for the update, this should be in this PR.

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (19 preceding siblings ...)
  2021-11-18  0:02 ` abenson
@ 2021-11-20  7:01 ` bugcrazy
  2021-11-20  7:02 ` [PR REVIEW] " bugcrazy
                   ` (6 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: bugcrazy @ 2021-11-20  7:01 UTC (permalink / raw)
  To: ml

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

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

https://github.com/bugcrazy/void-packages patch-9
https://github.com/void-linux/void-packages/pull/34039

devilutionX: update to 1.3.0
Required packages to build devilutionX

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

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/34039.patch is attached

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

From 95e2c778e3070f4850389ec3756d9f6b126496bb Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:49:08 -0300
Subject: [PATCH 1/5] devilutionX: update to 1.3.0

---
 srcpkgs/devilutionX/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 829ff248926b..e146d594bdd9 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,16 +1,17 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.2.1
+version=1.3.0
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\""
-makedepends="SDL2-devel SDL2_ttf-devel SDL2_mixer-devel libsodium-devel"
+configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON"
+hostmakedepends="git gettext pkg-config smpq"
+makedepends="SDL2-devel fmt-devel libpng-devel libsodium-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
 distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521
+checksum=6911ec6432430ff30212b6817f311987793c0661f39dc395103d01555fdc8c77
 
 post_install() {
 	vlicense LICENSE

From c7c0e3373658d8c1732eb4f97848efad8a2a2321 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:50:56 -0300
Subject: [PATCH 2/5] Added shared library

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index fd78e1e33c3f..0f1f407dad48 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4062,3 +4062,4 @@ libomalloc-0.9.6.so singular-4.2.1_1
 libsingular_resources-4.2.1.so singular-4.2.1_1
 libm4ri-0.0.20200125.so m4ri-20200125_1
 libm4rie-0.0.20200125.so m4rie-20200125_1
+libstorm.so.9 StormLib-9.23_1

From 8a8feb331cb6080ec49629826f4abce9cb6759b7 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:53:54 -0300
Subject: [PATCH 3/5] Added Symbolic link

---
 srcpkgs/StormLib-devel | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 srcpkgs/StormLib-devel

diff --git a/srcpkgs/StormLib-devel b/srcpkgs/StormLib-devel
new file mode 120000
index 000000000000..fdd58877ee63
--- /dev/null
+++ b/srcpkgs/StormLib-devel
@@ -0,0 +1 @@
+StormLib
\ No newline at end of file

From 2d1770c72b4ec95371549fe7f630258745f741ec Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:57:14 -0300
Subject: [PATCH 4/5] New package: StormLib-9.23.

---
 srcpkgs/StormLib/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/StormLib/template

diff --git a/srcpkgs/StormLib/template b/srcpkgs/StormLib/template
new file mode 100644
index 000000000000..cb14a60206da
--- /dev/null
+++ b/srcpkgs/StormLib/template
@@ -0,0 +1,25 @@
+# Template file for 'StormLib'
+pkgname=StormLib
+version=9.23
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DWITH_LIBTOMCRYPT=ON"
+makedepends="bzip2-devel zlib-devel libtomcrypt-devel libtommath-devel"
+short_desc="C/C++ API to read and write MPQ files with support for merged archives"
+maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
+license="MIT"
+homepage="https://github.com/ladislav-zezula/StormLib"
+distfiles="https://github.com/ladislav-zezula/StormLib/archive/v${version}.tar.gz"
+checksum=d62ba42f1e02efcb2cbaa03bd2e20fbd18c45499ef5fe65ffb89ee52a7bd9c92
+
+post_install() {
+	vlicense LICENSE
+}
+
+StormLib-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From e189e04cc4332ea91637a354429d4e9d3b50f27d Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:59:28 -0300
Subject: [PATCH 5/5] New package: smpq-1.6.

---
 .../smpq/patches/fix-smpq-compilation.patch   | 53 +++++++++++++++++++
 srcpkgs/smpq/template                         | 19 +++++++
 2 files changed, 72 insertions(+)
 create mode 100644 srcpkgs/smpq/patches/fix-smpq-compilation.patch
 create mode 100644 srcpkgs/smpq/template

diff --git a/srcpkgs/smpq/patches/fix-smpq-compilation.patch b/srcpkgs/smpq/patches/fix-smpq-compilation.patch
new file mode 100644
index 000000000000..d3d9f7bf47cc
--- /dev/null
+++ b/srcpkgs/smpq/patches/fix-smpq-compilation.patch
@@ -0,0 +1,53 @@
+--- a/CMakeLists.txt	2021-11-17 00:05:26.153515080 -0300
++++ b/CMakeLists.txt	2021-11-17 00:07:09.549884637 -0300
+@@ -18,6 +18,8 @@
+ #
+ 
+ project(SMPQ)
++file(GLOB_RECURSE CFILES "${CMAKE_SOURCE_DIR}/*.c")
++SET_SOURCE_FILES_PROPERTIES(${CFILES} PROPERTIES LANGUAGE CXX)
+ set(VERSION 1.6)
+ cmake_minimum_required(VERSION 2.6)
+ 
+@@ -42,11 +44,7 @@
+ 	endif(NOT STORMLIB_LIBRARY)
+ 
+ 	try_compile(CHECK ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/check.c COMPILE_DEFINITIONS -I${STORMLIB_INCLUDE_DIR})
+-
+-	if(NOT CHECK)
+-		message(FATAL_ERROR "Found old StormLib version")
+-	endif(NOT CHECK)
+-
++	
+ 	message(STATUS "Found StormLib header: ${STORMLIB_INCLUDE_DIR}/StormLib.h")
+ 	message(STATUS "Found StormLib library: ${STORMLIB_LIBRARY}")
+ 
+@@ -93,24 +91,16 @@
+ if(WITH_CMD)
+ 
+ 	add_executable(smpq ${SMPQ_SRCS})
+-	target_link_libraries(smpq ${STORMLIB_LIBRARY})
++	find_package(ZLIB REQUIRED)
++	find_package(BZip2 REQUIRED)
++	target_link_libraries(smpq ${STORMLIB_LIBRARY} ${ZLIB_LIBRARY} ${BZIP2_LIBRARIES})
+ 
+ 	if(WIN32 AND NOT MSVC)
+ 		set_target_properties(smpq PROPERTIES LINK_FLAGS -static)
+ 		target_link_libraries(smpq wininet stdc++)
+ 	endif(WIN32 AND NOT MSVC)
+ 
+-	install(TARGETS smpq DESTINATION bin)
+-
+-	if(NOT CMAKE_CROSSCOMPILING)
+-
+-		add_executable(mangen ${MANGEN_SRCS})
+-		add_custom_command(OUTPUT smpq.1 COMMAND mangen > smpq.1 DEPENDS mangen)
+-		add_custom_target(man ALL DEPENDS smpq.1)
+-
+-		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/smpq.1 DESTINATION share/man/man1)
+-
+-	endif(NOT CMAKE_CROSSCOMPILING)
++	install(TARGETS smpq DESTINATION bin)	
+ 
+ 	if(WIN32 AND WITH_NSIS)
+ 
diff --git a/srcpkgs/smpq/template b/srcpkgs/smpq/template
new file mode 100644
index 000000000000..9642c4d98ca0
--- /dev/null
+++ b/srcpkgs/smpq/template
@@ -0,0 +1,19 @@
+# Template file for 'smpq'
+pkgname=smpq
+version=1.6
+revision=1
+build_style=cmake
+configure_args="-DWITH_KDE=OFF"
+hostmakedepends="StormLib"
+makedepends="bzip2-devel zlib-devel StormLib-devel"
+short_desc="StormLib MPQ archiving utility"
+maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://launchpad.net/smpq"
+distfiles="https://launchpad.net/smpq/trunk/${version}/+download/smpq_${version}.orig.tar.gz"
+checksum=b5d2dc8a5de8629b71ee5d3612b6e84d88418b86c5cd39ba315e9eb0462f18cb
+
+do_build() {
+	cd ${wrksrc}
+	cd build
+}

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (20 preceding siblings ...)
  2021-11-20  7:01 ` [PR PATCH] [Updated] " bugcrazy
@ 2021-11-20  7:02 ` bugcrazy
  2021-11-20  7:14 ` [PR PATCH] [Updated] " bugcrazy
                   ` (5 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: bugcrazy @ 2021-11-20  7:02 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r753644146

Comment:
Done!

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (21 preceding siblings ...)
  2021-11-20  7:02 ` [PR REVIEW] " bugcrazy
@ 2021-11-20  7:14 ` bugcrazy
  2021-11-20  7:27 ` [PR REVIEW] " bugcrazy
                   ` (4 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: bugcrazy @ 2021-11-20  7:14 UTC (permalink / raw)
  To: ml

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

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

https://github.com/bugcrazy/void-packages patch-9
https://github.com/void-linux/void-packages/pull/34039

devilutionX: update to 1.3.0
Required packages to build devilutionX

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

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/34039.patch is attached

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

From f17bcc676e7e95def5399a9c4ea362e73e493dca Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:49:08 -0300
Subject: [PATCH 1/5] devilutionX: update to 1.3.0

---
 srcpkgs/devilutionX/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 829ff248926b..e146d594bdd9 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,16 +1,17 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.2.1
+version=1.3.0
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\""
-makedepends="SDL2-devel SDL2_ttf-devel SDL2_mixer-devel libsodium-devel"
+configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON"
+hostmakedepends="git gettext pkg-config smpq"
+makedepends="SDL2-devel fmt-devel libpng-devel libsodium-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
 distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521
+checksum=6911ec6432430ff30212b6817f311987793c0661f39dc395103d01555fdc8c77
 
 post_install() {
 	vlicense LICENSE

From 0848fb18c2e5d5f42a022ec6c1bfb886a7a42d77 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:50:56 -0300
Subject: [PATCH 2/5] Added shared library

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index a7908585fbbd..c32da1ced636 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4062,3 +4062,4 @@ libomalloc-0.9.6.so singular-4.2.1_1
 libsingular_resources-4.2.1.so singular-4.2.1_1
 libm4ri-0.0.20200125.so m4ri-20200125_1
 libm4rie-0.0.20200125.so m4rie-20200125_1
+libstorm.so.9 StormLib-9.23_1

From e4ab5054a02f5bf9c80bd720b69401199a8f5b40 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:53:54 -0300
Subject: [PATCH 3/5] Added Symbolic link

---
 srcpkgs/StormLib-devel | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 srcpkgs/StormLib-devel

diff --git a/srcpkgs/StormLib-devel b/srcpkgs/StormLib-devel
new file mode 120000
index 000000000000..fdd58877ee63
--- /dev/null
+++ b/srcpkgs/StormLib-devel
@@ -0,0 +1 @@
+StormLib
\ No newline at end of file

From e2897bfc49bf04393cea0b8745863c0a82bc49e4 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:57:14 -0300
Subject: [PATCH 4/5] New package: StormLib-9.23.

---
 srcpkgs/StormLib/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/StormLib/template

diff --git a/srcpkgs/StormLib/template b/srcpkgs/StormLib/template
new file mode 100644
index 000000000000..cb14a60206da
--- /dev/null
+++ b/srcpkgs/StormLib/template
@@ -0,0 +1,25 @@
+# Template file for 'StormLib'
+pkgname=StormLib
+version=9.23
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DWITH_LIBTOMCRYPT=ON"
+makedepends="bzip2-devel zlib-devel libtomcrypt-devel libtommath-devel"
+short_desc="C/C++ API to read and write MPQ files with support for merged archives"
+maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
+license="MIT"
+homepage="https://github.com/ladislav-zezula/StormLib"
+distfiles="https://github.com/ladislav-zezula/StormLib/archive/v${version}.tar.gz"
+checksum=d62ba42f1e02efcb2cbaa03bd2e20fbd18c45499ef5fe65ffb89ee52a7bd9c92
+
+post_install() {
+	vlicense LICENSE
+}
+
+StormLib-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From 1d170ee96def22f568c52e2153c54d2d1c66d8ea Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:59:28 -0300
Subject: [PATCH 5/5] New package: smpq-1.6.

---
 .../smpq/patches/fix-smpq-compilation.patch   | 53 +++++++++++++++++++
 srcpkgs/smpq/template                         | 19 +++++++
 2 files changed, 72 insertions(+)
 create mode 100644 srcpkgs/smpq/patches/fix-smpq-compilation.patch
 create mode 100644 srcpkgs/smpq/template

diff --git a/srcpkgs/smpq/patches/fix-smpq-compilation.patch b/srcpkgs/smpq/patches/fix-smpq-compilation.patch
new file mode 100644
index 000000000000..d3d9f7bf47cc
--- /dev/null
+++ b/srcpkgs/smpq/patches/fix-smpq-compilation.patch
@@ -0,0 +1,53 @@
+--- a/CMakeLists.txt	2021-11-17 00:05:26.153515080 -0300
++++ b/CMakeLists.txt	2021-11-17 00:07:09.549884637 -0300
+@@ -18,6 +18,8 @@
+ #
+ 
+ project(SMPQ)
++file(GLOB_RECURSE CFILES "${CMAKE_SOURCE_DIR}/*.c")
++SET_SOURCE_FILES_PROPERTIES(${CFILES} PROPERTIES LANGUAGE CXX)
+ set(VERSION 1.6)
+ cmake_minimum_required(VERSION 2.6)
+ 
+@@ -42,11 +44,7 @@
+ 	endif(NOT STORMLIB_LIBRARY)
+ 
+ 	try_compile(CHECK ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/check.c COMPILE_DEFINITIONS -I${STORMLIB_INCLUDE_DIR})
+-
+-	if(NOT CHECK)
+-		message(FATAL_ERROR "Found old StormLib version")
+-	endif(NOT CHECK)
+-
++	
+ 	message(STATUS "Found StormLib header: ${STORMLIB_INCLUDE_DIR}/StormLib.h")
+ 	message(STATUS "Found StormLib library: ${STORMLIB_LIBRARY}")
+ 
+@@ -93,24 +91,16 @@
+ if(WITH_CMD)
+ 
+ 	add_executable(smpq ${SMPQ_SRCS})
+-	target_link_libraries(smpq ${STORMLIB_LIBRARY})
++	find_package(ZLIB REQUIRED)
++	find_package(BZip2 REQUIRED)
++	target_link_libraries(smpq ${STORMLIB_LIBRARY} ${ZLIB_LIBRARY} ${BZIP2_LIBRARIES})
+ 
+ 	if(WIN32 AND NOT MSVC)
+ 		set_target_properties(smpq PROPERTIES LINK_FLAGS -static)
+ 		target_link_libraries(smpq wininet stdc++)
+ 	endif(WIN32 AND NOT MSVC)
+ 
+-	install(TARGETS smpq DESTINATION bin)
+-
+-	if(NOT CMAKE_CROSSCOMPILING)
+-
+-		add_executable(mangen ${MANGEN_SRCS})
+-		add_custom_command(OUTPUT smpq.1 COMMAND mangen > smpq.1 DEPENDS mangen)
+-		add_custom_target(man ALL DEPENDS smpq.1)
+-
+-		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/smpq.1 DESTINATION share/man/man1)
+-
+-	endif(NOT CMAKE_CROSSCOMPILING)
++	install(TARGETS smpq DESTINATION bin)	
+ 
+ 	if(WIN32 AND WITH_NSIS)
+ 
diff --git a/srcpkgs/smpq/template b/srcpkgs/smpq/template
new file mode 100644
index 000000000000..9642c4d98ca0
--- /dev/null
+++ b/srcpkgs/smpq/template
@@ -0,0 +1,19 @@
+# Template file for 'smpq'
+pkgname=smpq
+version=1.6
+revision=1
+build_style=cmake
+configure_args="-DWITH_KDE=OFF"
+hostmakedepends="StormLib"
+makedepends="bzip2-devel zlib-devel StormLib-devel"
+short_desc="StormLib MPQ archiving utility"
+maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://launchpad.net/smpq"
+distfiles="https://launchpad.net/smpq/trunk/${version}/+download/smpq_${version}.orig.tar.gz"
+checksum=b5d2dc8a5de8629b71ee5d3612b6e84d88418b86c5cd39ba315e9eb0462f18cb
+
+do_build() {
+	cd ${wrksrc}
+	cd build
+}

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: [PR REVIEW] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (22 preceding siblings ...)
  2021-11-20  7:14 ` [PR PATCH] [Updated] " bugcrazy
@ 2021-11-20  7:27 ` bugcrazy
  2021-11-20 14:59 ` Chocimier
                   ` (3 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: bugcrazy @ 2021-11-20  7:27 UTC (permalink / raw)
  To: ml

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

New review comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#discussion_r753646226

Comment:
The creator of devilutionX software, says that the smpq package is optional, but it is not, needs this package to compile. 

https://github.com/diasurgical/devilutionX/blob/master/docs/building.md#if-you-want-to-build-the-devilutionxmpq-file-optional 

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (23 preceding siblings ...)
  2021-11-20  7:27 ` [PR REVIEW] " bugcrazy
@ 2021-11-20 14:59 ` Chocimier
  2021-11-20 22:10 ` [PR PATCH] [Updated] " bugcrazy
                   ` (2 subsequent siblings)
  27 siblings, 0 replies; 29+ messages in thread
From: Chocimier @ 2021-11-20 14:59 UTC (permalink / raw)
  To: ml

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

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#issuecomment-974661695

Comment:
StormLib-devel need to depend on StormLib, this should fix cross builds.

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (24 preceding siblings ...)
  2021-11-20 14:59 ` Chocimier
@ 2021-11-20 22:10 ` bugcrazy
  2021-11-20 22:12 ` bugcrazy
  2021-11-24 22:02 ` [PR PATCH] [Updated] " bugcrazy
  27 siblings, 0 replies; 29+ messages in thread
From: bugcrazy @ 2021-11-20 22:10 UTC (permalink / raw)
  To: ml

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

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

https://github.com/bugcrazy/void-packages patch-9
https://github.com/void-linux/void-packages/pull/34039

devilutionX: update to 1.3.0
Required packages to build devilutionX

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

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/34039.patch is attached

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

From f17bcc676e7e95def5399a9c4ea362e73e493dca Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:49:08 -0300
Subject: [PATCH 1/5] devilutionX: update to 1.3.0

---
 srcpkgs/devilutionX/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 829ff248926b..e146d594bdd9 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,16 +1,17 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.2.1
+version=1.3.0
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\""
-makedepends="SDL2-devel SDL2_ttf-devel SDL2_mixer-devel libsodium-devel"
+configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON"
+hostmakedepends="git gettext pkg-config smpq"
+makedepends="SDL2-devel fmt-devel libpng-devel libsodium-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
 distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521
+checksum=6911ec6432430ff30212b6817f311987793c0661f39dc395103d01555fdc8c77
 
 post_install() {
 	vlicense LICENSE

From 0848fb18c2e5d5f42a022ec6c1bfb886a7a42d77 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:50:56 -0300
Subject: [PATCH 2/5] Added shared library

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index a7908585fbbd..c32da1ced636 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4062,3 +4062,4 @@ libomalloc-0.9.6.so singular-4.2.1_1
 libsingular_resources-4.2.1.so singular-4.2.1_1
 libm4ri-0.0.20200125.so m4ri-20200125_1
 libm4rie-0.0.20200125.so m4rie-20200125_1
+libstorm.so.9 StormLib-9.23_1

From e4ab5054a02f5bf9c80bd720b69401199a8f5b40 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:53:54 -0300
Subject: [PATCH 3/5] Added Symbolic link

---
 srcpkgs/StormLib-devel | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 srcpkgs/StormLib-devel

diff --git a/srcpkgs/StormLib-devel b/srcpkgs/StormLib-devel
new file mode 120000
index 000000000000..fdd58877ee63
--- /dev/null
+++ b/srcpkgs/StormLib-devel
@@ -0,0 +1 @@
+StormLib
\ No newline at end of file

From e2897bfc49bf04393cea0b8745863c0a82bc49e4 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:57:14 -0300
Subject: [PATCH 4/5] New package: StormLib-9.23.

---
 srcpkgs/StormLib/template | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 srcpkgs/StormLib/template

diff --git a/srcpkgs/StormLib/template b/srcpkgs/StormLib/template
new file mode 100644
index 000000000000..cb14a60206da
--- /dev/null
+++ b/srcpkgs/StormLib/template
@@ -0,0 +1,25 @@
+# Template file for 'StormLib'
+pkgname=StormLib
+version=9.23
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DWITH_LIBTOMCRYPT=ON"
+makedepends="bzip2-devel zlib-devel libtomcrypt-devel libtommath-devel"
+short_desc="C/C++ API to read and write MPQ files with support for merged archives"
+maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
+license="MIT"
+homepage="https://github.com/ladislav-zezula/StormLib"
+distfiles="https://github.com/ladislav-zezula/StormLib/archive/v${version}.tar.gz"
+checksum=d62ba42f1e02efcb2cbaa03bd2e20fbd18c45499ef5fe65ffb89ee52a7bd9c92
+
+post_install() {
+	vlicense LICENSE
+}
+
+StormLib-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From 1d170ee96def22f568c52e2153c54d2d1c66d8ea Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 03:59:28 -0300
Subject: [PATCH 5/5] New package: smpq-1.6.

---
 .../smpq/patches/fix-smpq-compilation.patch   | 53 +++++++++++++++++++
 srcpkgs/smpq/template                         | 19 +++++++
 2 files changed, 72 insertions(+)
 create mode 100644 srcpkgs/smpq/patches/fix-smpq-compilation.patch
 create mode 100644 srcpkgs/smpq/template

diff --git a/srcpkgs/smpq/patches/fix-smpq-compilation.patch b/srcpkgs/smpq/patches/fix-smpq-compilation.patch
new file mode 100644
index 000000000000..d3d9f7bf47cc
--- /dev/null
+++ b/srcpkgs/smpq/patches/fix-smpq-compilation.patch
@@ -0,0 +1,53 @@
+--- a/CMakeLists.txt	2021-11-17 00:05:26.153515080 -0300
++++ b/CMakeLists.txt	2021-11-17 00:07:09.549884637 -0300
+@@ -18,6 +18,8 @@
+ #
+ 
+ project(SMPQ)
++file(GLOB_RECURSE CFILES "${CMAKE_SOURCE_DIR}/*.c")
++SET_SOURCE_FILES_PROPERTIES(${CFILES} PROPERTIES LANGUAGE CXX)
+ set(VERSION 1.6)
+ cmake_minimum_required(VERSION 2.6)
+ 
+@@ -42,11 +44,7 @@
+ 	endif(NOT STORMLIB_LIBRARY)
+ 
+ 	try_compile(CHECK ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/check.c COMPILE_DEFINITIONS -I${STORMLIB_INCLUDE_DIR})
+-
+-	if(NOT CHECK)
+-		message(FATAL_ERROR "Found old StormLib version")
+-	endif(NOT CHECK)
+-
++	
+ 	message(STATUS "Found StormLib header: ${STORMLIB_INCLUDE_DIR}/StormLib.h")
+ 	message(STATUS "Found StormLib library: ${STORMLIB_LIBRARY}")
+ 
+@@ -93,24 +91,16 @@
+ if(WITH_CMD)
+ 
+ 	add_executable(smpq ${SMPQ_SRCS})
+-	target_link_libraries(smpq ${STORMLIB_LIBRARY})
++	find_package(ZLIB REQUIRED)
++	find_package(BZip2 REQUIRED)
++	target_link_libraries(smpq ${STORMLIB_LIBRARY} ${ZLIB_LIBRARY} ${BZIP2_LIBRARIES})
+ 
+ 	if(WIN32 AND NOT MSVC)
+ 		set_target_properties(smpq PROPERTIES LINK_FLAGS -static)
+ 		target_link_libraries(smpq wininet stdc++)
+ 	endif(WIN32 AND NOT MSVC)
+ 
+-	install(TARGETS smpq DESTINATION bin)
+-
+-	if(NOT CMAKE_CROSSCOMPILING)
+-
+-		add_executable(mangen ${MANGEN_SRCS})
+-		add_custom_command(OUTPUT smpq.1 COMMAND mangen > smpq.1 DEPENDS mangen)
+-		add_custom_target(man ALL DEPENDS smpq.1)
+-
+-		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/smpq.1 DESTINATION share/man/man1)
+-
+-	endif(NOT CMAKE_CROSSCOMPILING)
++	install(TARGETS smpq DESTINATION bin)	
+ 
+ 	if(WIN32 AND WITH_NSIS)
+ 
diff --git a/srcpkgs/smpq/template b/srcpkgs/smpq/template
new file mode 100644
index 000000000000..9642c4d98ca0
--- /dev/null
+++ b/srcpkgs/smpq/template
@@ -0,0 +1,19 @@
+# Template file for 'smpq'
+pkgname=smpq
+version=1.6
+revision=1
+build_style=cmake
+configure_args="-DWITH_KDE=OFF"
+hostmakedepends="StormLib"
+makedepends="bzip2-devel zlib-devel StormLib-devel"
+short_desc="StormLib MPQ archiving utility"
+maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://launchpad.net/smpq"
+distfiles="https://launchpad.net/smpq/trunk/${version}/+download/smpq_${version}.orig.tar.gz"
+checksum=b5d2dc8a5de8629b71ee5d3612b6e84d88418b86c5cd39ba315e9eb0462f18cb
+
+do_build() {
+	cd ${wrksrc}
+	cd build
+}

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (25 preceding siblings ...)
  2021-11-20 22:10 ` [PR PATCH] [Updated] " bugcrazy
@ 2021-11-20 22:12 ` bugcrazy
  2021-11-24 22:02 ` [PR PATCH] [Updated] " bugcrazy
  27 siblings, 0 replies; 29+ messages in thread
From: bugcrazy @ 2021-11-20 22:12 UTC (permalink / raw)
  To: ml

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

New comment by bugcrazy on void-packages repository

https://github.com/void-linux/void-packages/pull/34039#issuecomment-974718774

Comment:
> StormLib-devel need to depend on StormLib, this should fix cross builds.

Done!

^ permalink raw reply	[flat|nested] 29+ messages in thread

* Re: [PR PATCH] [Updated] devilutionX: update to 1.3.0
  2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
                   ` (26 preceding siblings ...)
  2021-11-20 22:12 ` bugcrazy
@ 2021-11-24 22:02 ` bugcrazy
  27 siblings, 0 replies; 29+ messages in thread
From: bugcrazy @ 2021-11-24 22:02 UTC (permalink / raw)
  To: ml

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

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

https://github.com/bugcrazy/void-packages patch-9
https://github.com/void-linux/void-packages/pull/34039

devilutionX: update to 1.3.0
Required packages to build devilutionX

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

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/34039.patch is attached

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

From ef225902adde246e37723fa1d277fa254db3fb93 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:07:20 -0300
Subject: [PATCH 1/5] devilutionX: update to 1.3.0

---
 srcpkgs/devilutionX/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/devilutionX/template b/srcpkgs/devilutionX/template
index 829ff248926b..e146d594bdd9 100644
--- a/srcpkgs/devilutionX/template
+++ b/srcpkgs/devilutionX/template
@@ -1,16 +1,17 @@
 # Template file for 'devilutionX'
 pkgname=devilutionX
-version=1.2.1
+version=1.3.0
 revision=1
 build_style=cmake
-configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON -DTTF_FONT_PATH=\"/usr/share/fonts/truetype/CharisSILB.ttf\""
-makedepends="SDL2-devel SDL2_ttf-devel SDL2_mixer-devel libsodium-devel"
+configure_args="-DVERSION_NUM=$version -DBINARY_RELEASE=ON"
+hostmakedepends="git gettext pkg-config smpq"
+makedepends="SDL2-devel fmt-devel libpng-devel libsodium-devel"
 short_desc="Diablo I engine for modern operating systems"
 maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
 license="Unlicense"
 homepage="https://github.com/diasurgical/devilutionX"
 distfiles="https://github.com/diasurgical/devilutionX/archive/${version}.tar.gz"
-checksum=002dcbd4d4a5bdf8db1a3ec01139e5bfbed46d6a1caa32b17c9f2df161ad3521
+checksum=6911ec6432430ff30212b6817f311987793c0661f39dc395103d01555fdc8c77
 
 post_install() {
 	vlicense LICENSE

From e69b92d6380285a7991a0694e1490ef524eedb62 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:08:34 -0300
Subject: [PATCH 2/5] Added shared library

---
 common/shlibs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/shlibs b/common/shlibs
index 3199833de6cd..ca0781937a23 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4070,3 +4070,4 @@ libbrial_groebner.so.3 brial-1.2.10_1
 libm4ri-0.0.20200125.so m4ri-20200125_1
 libm4rie-0.0.20200125.so m4rie-20200125_1
 libptytty.so.0 libptytty-2.0_1
+libstorm.so.9 StormLib-9.23_1

From 119ca3402a3d7daff3aff6b03f4e4b2984496121 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:08:51 -0300
Subject: [PATCH 3/5] Added Symbolic link

---
 srcpkgs/StormLib-devel | 1 +
 1 file changed, 1 insertion(+)
 create mode 120000 srcpkgs/StormLib-devel

diff --git a/srcpkgs/StormLib-devel b/srcpkgs/StormLib-devel
new file mode 120000
index 000000000000..fdd58877ee63
--- /dev/null
+++ b/srcpkgs/StormLib-devel
@@ -0,0 +1 @@
+StormLib
\ No newline at end of file

From 7ebf11159120eaa0d516badb4ba54857480253d7 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:09:25 -0300
Subject: [PATCH 4/5] New package: StormLib-9.23.

---
 srcpkgs/StormLib/template | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 srcpkgs/StormLib/template

diff --git a/srcpkgs/StormLib/template b/srcpkgs/StormLib/template
new file mode 100644
index 000000000000..b3c43437af49
--- /dev/null
+++ b/srcpkgs/StormLib/template
@@ -0,0 +1,26 @@
+# Template file for 'StormLib'
+pkgname=StormLib
+version=9.23
+revision=1
+build_style=cmake
+configure_args="-DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DWITH_LIBTOMCRYPT=ON"
+makedepends="bzip2-devel zlib-devel libtomcrypt-devel libtommath-devel"
+short_desc="C/C++ API to read and write MPQ files with support for merged archives"
+maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
+license="MIT"
+homepage="https://github.com/ladislav-zezula/StormLib"
+distfiles="https://github.com/ladislav-zezula/StormLib/archive/v${version}.tar.gz"
+checksum=d62ba42f1e02efcb2cbaa03bd2e20fbd18c45499ef5fe65ffb89ee52a7bd9c92
+
+post_install() {
+	vlicense LICENSE
+}
+
+StormLib-devel_package() {
+	short_desc+=" - development files"
+	depends="StormLib>=${version}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}

From 1ee98cd539b330a4303cdb78b4e615e12a8b8064 Mon Sep 17 00:00:00 2001
From: bugcrazy <marcoaureliopc@gmail.com>
Date: Sat, 20 Nov 2021 19:09:56 -0300
Subject: [PATCH 5/5] New package: smpq-1.6.

---
 .../smpq/patches/fix-smpq-compilation.patch   | 53 +++++++++++++++++++
 srcpkgs/smpq/template                         | 19 +++++++
 2 files changed, 72 insertions(+)
 create mode 100644 srcpkgs/smpq/patches/fix-smpq-compilation.patch
 create mode 100644 srcpkgs/smpq/template

diff --git a/srcpkgs/smpq/patches/fix-smpq-compilation.patch b/srcpkgs/smpq/patches/fix-smpq-compilation.patch
new file mode 100644
index 000000000000..d3d9f7bf47cc
--- /dev/null
+++ b/srcpkgs/smpq/patches/fix-smpq-compilation.patch
@@ -0,0 +1,53 @@
+--- a/CMakeLists.txt	2021-11-17 00:05:26.153515080 -0300
++++ b/CMakeLists.txt	2021-11-17 00:07:09.549884637 -0300
+@@ -18,6 +18,8 @@
+ #
+ 
+ project(SMPQ)
++file(GLOB_RECURSE CFILES "${CMAKE_SOURCE_DIR}/*.c")
++SET_SOURCE_FILES_PROPERTIES(${CFILES} PROPERTIES LANGUAGE CXX)
+ set(VERSION 1.6)
+ cmake_minimum_required(VERSION 2.6)
+ 
+@@ -42,11 +44,7 @@
+ 	endif(NOT STORMLIB_LIBRARY)
+ 
+ 	try_compile(CHECK ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/check.c COMPILE_DEFINITIONS -I${STORMLIB_INCLUDE_DIR})
+-
+-	if(NOT CHECK)
+-		message(FATAL_ERROR "Found old StormLib version")
+-	endif(NOT CHECK)
+-
++	
+ 	message(STATUS "Found StormLib header: ${STORMLIB_INCLUDE_DIR}/StormLib.h")
+ 	message(STATUS "Found StormLib library: ${STORMLIB_LIBRARY}")
+ 
+@@ -93,24 +91,16 @@
+ if(WITH_CMD)
+ 
+ 	add_executable(smpq ${SMPQ_SRCS})
+-	target_link_libraries(smpq ${STORMLIB_LIBRARY})
++	find_package(ZLIB REQUIRED)
++	find_package(BZip2 REQUIRED)
++	target_link_libraries(smpq ${STORMLIB_LIBRARY} ${ZLIB_LIBRARY} ${BZIP2_LIBRARIES})
+ 
+ 	if(WIN32 AND NOT MSVC)
+ 		set_target_properties(smpq PROPERTIES LINK_FLAGS -static)
+ 		target_link_libraries(smpq wininet stdc++)
+ 	endif(WIN32 AND NOT MSVC)
+ 
+-	install(TARGETS smpq DESTINATION bin)
+-
+-	if(NOT CMAKE_CROSSCOMPILING)
+-
+-		add_executable(mangen ${MANGEN_SRCS})
+-		add_custom_command(OUTPUT smpq.1 COMMAND mangen > smpq.1 DEPENDS mangen)
+-		add_custom_target(man ALL DEPENDS smpq.1)
+-
+-		install(FILES ${CMAKE_CURRENT_BINARY_DIR}/smpq.1 DESTINATION share/man/man1)
+-
+-	endif(NOT CMAKE_CROSSCOMPILING)
++	install(TARGETS smpq DESTINATION bin)	
+ 
+ 	if(WIN32 AND WITH_NSIS)
+ 
diff --git a/srcpkgs/smpq/template b/srcpkgs/smpq/template
new file mode 100644
index 000000000000..9642c4d98ca0
--- /dev/null
+++ b/srcpkgs/smpq/template
@@ -0,0 +1,19 @@
+# Template file for 'smpq'
+pkgname=smpq
+version=1.6
+revision=1
+build_style=cmake
+configure_args="-DWITH_KDE=OFF"
+hostmakedepends="StormLib"
+makedepends="bzip2-devel zlib-devel StormLib-devel"
+short_desc="StormLib MPQ archiving utility"
+maintainer="MarcoAPC <marcoaureliopc@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://launchpad.net/smpq"
+distfiles="https://launchpad.net/smpq/trunk/${version}/+download/smpq_${version}.orig.tar.gz"
+checksum=b5d2dc8a5de8629b71ee5d3612b6e84d88418b86c5cd39ba315e9eb0462f18cb
+
+do_build() {
+	cd ${wrksrc}
+	cd build
+}

^ permalink raw reply	[flat|nested] 29+ messages in thread

end of thread, other threads:[~2021-11-24 22:02 UTC | newest]

Thread overview: 29+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-12  8:31 [PR PATCH] devilutionX: update to 1.3.0 bugcrazy
2021-11-12  8:32 ` bugcrazy
2021-11-12  8:44 ` [PR PATCH] [Updated] " bugcrazy
2021-11-14 20:11 ` [PR REVIEW] " abenson
2021-11-14 20:12 ` abenson
2021-11-14 20:14 ` abenson
2021-11-14 20:14 ` abenson
2021-11-14 20:32 ` [PR REVIEW] " abenson
2021-11-14 20:40 ` abenson
2021-11-17  3:30 ` [PR PATCH] [Updated] " bugcrazy
2021-11-17  3:31 ` [PR REVIEW] " bugcrazy
2021-11-17  3:32 ` bugcrazy
2021-11-17  3:33 ` bugcrazy
2021-11-17  3:44 ` [PR PATCH] [Updated] " bugcrazy
2021-11-17  3:45 ` [PR REVIEW] " bugcrazy
2021-11-17  3:46 ` bugcrazy
2021-11-17  5:25 ` bugcrazy
2021-11-17 18:16 ` abenson
2021-11-17 23:22 ` bugcrazy
2021-11-18  0:02 ` abenson
2021-11-18  0:02 ` abenson
2021-11-20  7:01 ` [PR PATCH] [Updated] " bugcrazy
2021-11-20  7:02 ` [PR REVIEW] " bugcrazy
2021-11-20  7:14 ` [PR PATCH] [Updated] " bugcrazy
2021-11-20  7:27 ` [PR REVIEW] " bugcrazy
2021-11-20 14:59 ` Chocimier
2021-11-20 22:10 ` [PR PATCH] [Updated] " bugcrazy
2021-11-20 22:12 ` bugcrazy
2021-11-24 22:02 ` [PR PATCH] [Updated] " bugcrazy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).