From: bugcrazy <bugcrazy@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] devilutionX: update to 1.3.0
Date: Sat, 20 Nov 2021 08:14:42 +0100 [thread overview]
Message-ID: <20211120071442.c-RjpBLtL08d4A8HQGh1eowhiIM8setVOVLDe_mz7zg@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34039@inbox.vuxu.org>
[-- 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
+}
next prev parent reply other threads:[~2021-11-20 7:14 UTC|newest]
Thread overview: 118+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-12 8:31 [PR PATCH] " 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 ` bugcrazy [this message]
2021-11-20 7:27 ` 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
2022-01-03 17:35 ` bugcrazy
2022-04-17 0:32 ` bugcrazy
2022-07-16 2:13 ` devilutionX: update to 1.4.0 github-actions
2022-07-21 9:43 ` [PR PATCH] [Updated] " bugcrazy
2022-07-31 1:37 ` bugcrazy
2022-07-31 2:39 ` [PR PATCH] [Updated] " bugcrazy
2022-10-09 3:59 ` bugcrazy
2022-10-09 4:23 ` devilutionX: update to 1.4.1 (maintainer version) bugcrazy
2022-12-05 1:55 ` [PR PATCH] [Updated] " bugcrazy
2022-12-22 14:12 ` bugcrazy
2023-01-08 17:03 ` bugcrazy
2023-01-10 0:18 ` bugcrazy
2023-01-10 0:31 ` bugcrazy
2023-01-10 0:51 ` abenson
2023-01-10 0:51 ` abenson
2023-01-10 15:41 ` [PR PATCH] [Updated] " bugcrazy
2023-01-10 15:44 ` bugcrazy
2023-01-10 16:03 ` bugcrazy
2023-01-11 0:11 ` abenson
2023-01-11 0:11 ` [PR REVIEW] " abenson
2023-01-11 0:14 ` abenson
2023-01-11 0:15 ` abenson
2023-01-11 4:54 ` ahesford
2023-01-11 4:59 ` ahesford
2023-01-11 5:47 ` [PR PATCH] [Updated] " bugcrazy
2023-01-11 5:47 ` [PR REVIEW] " bugcrazy
2023-01-11 5:54 ` bugcrazy
2023-01-11 5:59 ` bugcrazy
2023-01-11 6:01 ` bugcrazy
2023-01-11 6:09 ` bugcrazy
2023-01-11 6:24 ` bugcrazy
2023-01-11 6:45 ` kruceter
2023-01-11 18:03 ` [PR REVIEW] " abenson
2023-01-11 18:04 ` abenson
2023-01-11 18:05 ` abenson
2023-01-13 2:21 ` [PR PATCH] [Updated] " bugcrazy
2023-01-13 2:33 ` bugcrazy
2023-01-13 2:40 ` [PR REVIEW] " bugcrazy
2023-01-13 2:52 ` [PR PATCH] [Updated] " bugcrazy
2023-01-13 3:06 ` [PR REVIEW] " bugcrazy
2023-01-13 3:16 ` bugcrazy
2023-01-13 3:34 ` bugcrazy
2023-01-13 14:10 ` [PR REVIEW] " abenson
2023-01-13 14:17 ` abenson
2023-01-13 14:22 ` abenson
2023-01-13 14:25 ` ahesford
2023-01-13 14:38 ` ahesford
2023-01-13 14:38 ` ahesford
2023-01-13 14:38 ` ahesford
2023-01-13 14:43 ` abenson
2023-01-14 23:59 ` [PR PATCH] [Updated] " bugcrazy
2023-01-15 0:02 ` [PR REVIEW] " bugcrazy
2023-01-15 0:02 ` bugcrazy
2023-01-15 0:04 ` bugcrazy
2023-01-15 0:05 ` bugcrazy
2023-01-15 0:06 ` bugcrazy
2023-01-15 0:07 ` bugcrazy
2023-01-15 0:11 ` kruceter
2023-01-15 0:12 ` kruceter
2023-01-15 0:26 ` classabbyamp
2023-01-15 0:26 ` classabbyamp
2023-01-15 0:26 ` classabbyamp
2023-01-15 0:26 ` classabbyamp
2023-01-15 1:09 ` [PR PATCH] [Updated] " bugcrazy
2023-01-15 1:12 ` [PR REVIEW] " bugcrazy
2023-01-15 1:13 ` bugcrazy
2023-01-15 1:13 ` bugcrazy
2023-01-15 1:14 ` bugcrazy
2023-01-15 1:29 ` kruceter
2023-01-15 1:29 ` kruceter
2023-01-15 1:29 ` kruceter
2023-01-15 3:41 ` [PR PATCH] [Updated] " bugcrazy
2023-01-15 3:47 ` [PR REVIEW] " bugcrazy
2023-01-15 4:03 ` bugcrazy
2023-01-15 4:05 ` bugcrazy
2023-01-15 4:14 ` bugcrazy
2023-01-15 5:22 ` kruceter
2023-01-15 5:22 ` kruceter
2023-01-15 5:23 ` kruceter
2023-01-15 5:30 ` kruceter
2023-01-15 13:06 ` ahesford
2023-01-15 15:58 ` bugcrazy
2023-01-15 16:38 ` bugcrazy
2023-01-15 16:40 ` bugcrazy
2023-01-15 16:43 ` ahesford
2023-01-15 17:07 ` bugcrazy
2023-01-15 17:12 ` ahesford
2023-01-15 19:32 ` [PR PATCH] [Closed]: " classabbyamp
2023-01-15 19:32 ` classabbyamp
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211120071442.c-RjpBLtL08d4A8HQGh1eowhiIM8setVOVLDe_mz7zg@z \
--to=bugcrazy@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).