* [PR PATCH] cdogs sdl 1.3.1
@ 2022-10-06 10:19 Gottox
2022-10-06 10:20 ` [PR PATCH] [Updated] " Gottox
2022-10-08 21:11 ` [PR PATCH] [Closed]: cdogs-sdl-1.3.1 classabbyamp
0 siblings, 2 replies; 3+ messages in thread
From: Gottox @ 2022-10-06 10:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 554 bytes --]
There is a new pull request by Gottox against master on the void-packages repository
https://github.com/Gottox/void-packages cdogs-sdl-1.3.1
https://github.com/void-linux/void-packages/pull/39757
cdogs sdl 1.3.1
- occt
- freecad: rebuild for occt-7.6.3_1
- gmsh: rebuild for occt-7.6.3_1
- horizon: rebuild for occt-7.6.3_1
- kicad: rebuild for occt-7.6.3_1
- python3-occ: rebuild for occt-7.6.3_1
- PrusaSlicer: update to 2.5.0.
- cdogs-sdl: update to 1.3.1.
A patch file from https://github.com/void-linux/void-packages/pull/39757.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cdogs-sdl-1.3.1-39757.patch --]
[-- Type: text/x-diff, Size: 12574 bytes --]
From 373ace674f8a14eff70ac4287314c9e5d0b37ad3 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 11:45:57 +0200
Subject: [PATCH 1/8] occt
---
.../occt/patches/cmake-build-type-none.patch | 13 ----------
srcpkgs/occt/patches/musl-fenv.patch | 14 +++++-----
srcpkgs/occt/patches/musl-mallinfo.patch | 26 +++++++++++--------
srcpkgs/occt/template | 12 ++++++---
4 files changed, 30 insertions(+), 35 deletions(-)
delete mode 100644 srcpkgs/occt/patches/cmake-build-type-none.patch
diff --git a/srcpkgs/occt/patches/cmake-build-type-none.patch b/srcpkgs/occt/patches/cmake-build-type-none.patch
deleted file mode 100644
index ecb0e3da3929..000000000000
--- a/srcpkgs/occt/patches/cmake-build-type-none.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,7 +4,7 @@ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_D
-
- set (CMAKE_SUPPRESS_REGENERATION TRUE)
-
--set (CMAKE_CONFIGURATION_TYPES Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
-+set (CMAKE_CONFIGURATION_TYPES None Release Debug RelWithDebInfo CACHE INTERNAL "" FORCE)
-
- # macro: include patched file if it exists
- macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE)
diff --git a/srcpkgs/occt/patches/musl-fenv.patch b/srcpkgs/occt/patches/musl-fenv.patch
index 09da8d0afeae..a8a776ce29a9 100644
--- a/srcpkgs/occt/patches/musl-fenv.patch
+++ b/srcpkgs/occt/patches/musl-fenv.patch
@@ -5,18 +5,18 @@ is probably wrong, but I don't have a replacement for the
non-posix functions fegetexcept(3) and feenableexcept(3).
"""
---- a/src/OSD/OSD_signal.cxx
-+++ b/src/OSD/OSD_signal.cxx
-@@ -703,7 +703,7 @@
+--- a/src/OSD/OSD_signal.cxx.orig 2022-07-22 10:53:38.000000000 +0200
++++ b/src/OSD/OSD_signal.cxx 2022-10-06 09:19:02.286414340 +0200
+@@ -761,7 +761,7 @@ typedef void (* SIG_PFV) (int);
#include <signal.h>
--#if !defined(__ANDROID__) && !defined(__QNX__)
-+#if !defined(__ANDROID__) && !defined(__QNX__) && defined(__GLIBC__)
+-#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__)
++#if !defined(__ANDROID__) && !defined(__QNX__) && !defined(__EMSCRIPTEN__) && defined(__GLIBC__)
#include <sys/signal.h>
#endif
-@@ -914,7 +914,7 @@
+@@ -977,7 +977,7 @@ static void SegvHandler(const int theSig
//=======================================================================
void OSD::SetFloatingSignal (Standard_Boolean theFloatingSignal)
{
@@ -25,7 +25,7 @@ non-posix functions fegetexcept(3) and feenableexcept(3).
feclearexcept (FE_ALL_EXCEPT);
if (theFloatingSignal)
{
-@@ -947,7 +947,7 @@
+@@ -1010,7 +1010,7 @@ void OSD::SetFloatingSignal (Standard_Bo
//=======================================================================
Standard_Boolean OSD::ToCatchFloatingSignals()
{
diff --git a/srcpkgs/occt/patches/musl-mallinfo.patch b/srcpkgs/occt/patches/musl-mallinfo.patch
index 4e5825bf1cb0..1ce5b16b793f 100644
--- a/srcpkgs/occt/patches/musl-mallinfo.patch
+++ b/srcpkgs/occt/patches/musl-mallinfo.patch
@@ -1,17 +1,21 @@
In musl libc there is no struct mallinfo and no function mallinf()
---- a/src/OSD/OSD_MemInfo.cxx
-+++ b/src/OSD/OSD_MemInfo.cxx
-@@ -147,8 +147,12 @@
- }
- aFile.close();
+--- a/src/OSD/OSD_MemInfo.cxx.orig 2022-10-06 09:21:55.466236104 +0200
++++ b/src/OSD/OSD_MemInfo.cxx 2022-10-06 09:25:34.105323581 +0200
+@@ -188,12 +188,16 @@ void OSD_MemInfo::Update()
+ #endif
+ #endif
+ #if defined(__GLIBC__)
- struct mallinfo aMI = mallinfo();
- myCounters[MemHeapUsage] = aMI.uordblks;
-+ #else /* XXX not yet coded */
-+ myCounters[MemHeapUsage] = 0;
+ #ifdef HAS_MALLINFO2
+ const struct mallinfo2 aMI = mallinfo2();
+ #else
+ const struct mallinfo aMI = mallinfo();
+ #endif
+ myCounters[MemHeapUsage] = aMI.uordblks;
++ #else
++ myCounters[MemHeapUsage] = 0;
+ #endif
+ }
- #elif (defined(__APPLE__))
- struct task_basic_info aTaskInfo;
+ if (!IsActive (MemVirtual)
diff --git a/srcpkgs/occt/template b/srcpkgs/occt/template
index 6624fea8b53f..caefd2092c53 100644
--- a/srcpkgs/occt/template
+++ b/srcpkgs/occt/template
@@ -1,8 +1,7 @@
# Template file for 'occt'
pkgname=occt
-reverts=7.5.0_1
-version=7.4.0p1
-revision=5
+version=7.6.3
+revision=1
_gittag="V${version//./_}"
wrksrc=occt-${_gittag}
build_style=cmake
@@ -18,9 +17,14 @@ homepage="https://www.opencascade.com"
# distfile: use git instead of official tarball, which requires registration
# see https://www.opencascade.com/content/packaging-again-debian
distfiles="https://git.dev.opencascade.org/gitweb/?p=occt.git;a=snapshot;h=refs/tags/${_gittag};sf=tgz>occt-${_gittag}.tar.gz"
-checksum=e00fedc221560fda31653c23a8f3d0eda78095c87519f338d4f4088e2ee9a9c0
+checksum=baae5b3a7a38825396fc45ef9d170db406339f5eeec62e21b21036afeda31200
conflicts="oce>=0"
+pre_build() {
+ cp build/OpenCASCADECompileDefinitionsAndFlags-release.cmake \
+ build/OpenCASCADECompileDefinitionsAndFlags-none.cmake
+}
+
post_install() {
rm ${PKGDESTDIR}/usr/share/doc/opencascade/*_LGPL_*.txt
vlicense OCCT_LGPL_EXCEPTION.txt
From dd15d8d3a52e7d1634eaa96f30f03318673b977d Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 09:55:51 +0200
Subject: [PATCH 2/8] freecad: rebuild for occt-7.6.3_1
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 85f6cf44daf6..ff6fad3cad42 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=0.20.1
-revision=4
+revision=5
wrksrc="FreeCAD-${version}"
build_style=cmake
From abbffa21b6681a2b468232645338d846c07d70c5 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 09:55:54 +0200
Subject: [PATCH 3/8] gmsh: rebuild for occt-7.6.3_1
---
srcpkgs/gmsh/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gmsh/template b/srcpkgs/gmsh/template
index 616e140277b1..286c2fc91645 100644
--- a/srcpkgs/gmsh/template
+++ b/srcpkgs/gmsh/template
@@ -1,7 +1,7 @@
# Template file for 'gmsh'
pkgname=gmsh
version=4.8.4
-revision=1
+revision=2
wrksrc="${pkgname}-${version}-source"
build_style=cmake
configure_args="-DENABLE_SYSTEM_CONTRIB=ON
From 4d31f5d60b28e05eadc571bbb827140c1e7551f8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 09:55:54 +0200
Subject: [PATCH 4/8] horizon: rebuild for occt-7.6.3_1
---
srcpkgs/horizon/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/horizon/template b/srcpkgs/horizon/template
index 7496696147c9..287bf6afde3e 100644
--- a/srcpkgs/horizon/template
+++ b/srcpkgs/horizon/template
@@ -1,7 +1,7 @@
# Template file for 'horizon'
pkgname=horizon
version=2.3.1
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="GOLD="
make_install_target="install install-man"
From 9362961bac5eb6313b047a135a8a8990e767b914 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 09:55:55 +0200
Subject: [PATCH 5/8] kicad: rebuild for occt-7.6.3_1
---
srcpkgs/kicad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kicad/template b/srcpkgs/kicad/template
index 23b9ad9418d4..4db59d0bdd22 100644
--- a/srcpkgs/kicad/template
+++ b/srcpkgs/kicad/template
@@ -1,7 +1,7 @@
# Template file for 'kicad'
pkgname=kicad
version=6.0.7
-revision=1
+revision=2
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
configure_args="-DKICAD_SCRIPTING_WXPYTHON=ON
From d824bacfed0fd3f30090fc379028b9263ee627b0 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 10:38:54 +0200
Subject: [PATCH 6/8] python3-occ: rebuild for occt-7.6.3_1
---
srcpkgs/python3-occ/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-occ/template b/srcpkgs/python3-occ/template
index bee03373a3d1..b0fad2218585 100644
--- a/srcpkgs/python3-occ/template
+++ b/srcpkgs/python3-occ/template
@@ -1,7 +1,7 @@
# Template file for 'python3-occ'
pkgname=python3-occ
version=7.4.1
-revision=3
+revision=4
archs="i686* x86_64* armv7l* aarch64* ppc*"
wrksrc="pythonocc-core-${version}"
build_style=cmake
From d32b465870f2c179fa345122cb05b85241f9f84e Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 11:46:51 +0200
Subject: [PATCH 7/8] PrusaSlicer: update to 2.5.0.
---
.../PrusaSlicer/patches/cmake-relax-dependency.patch | 11 +++++++++++
srcpkgs/PrusaSlicer/template | 8 ++++----
2 files changed, 15 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch
diff --git a/srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch b/srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch
new file mode 100644
index 000000000000..f0f83f90d45f
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cmake-relax-dependency.patch
@@ -0,0 +1,11 @@
+--- PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt.orig 2022-09-17 11:47:02.398209546 +0200
++++ PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt 2022-09-17 11:47:30.092595307 +0200
+@@ -19,7 +19,7 @@ include(GenerateExportHeader)
+
+ generate_export_header(OCCTWrapper)
+
+-find_package(OpenCASCADE 7.6.2 REQUIRED)
++find_package(OpenCASCADE 7.6.3 REQUIRED)
+
+ set(OCCT_LIBS
+ TKXDESTEP
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b8dba603326f..60a456945ac9 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
-version=2.4.2
-revision=2
+version=2.5.0
+revision=1
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,13 +11,13 @@ hostmakedepends="pkg-config"
makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel occt-devel"
short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
maintainer="Jasper Chan <jasperchan515@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.prusa3d.com/prusaslicer/"
distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=ac3a77212260e8d0baf9df027c29e0ae965bc77f371e59fd27b8fe103ebb1f23
+checksum=dbbf3e10c812d1dc7bae4bd6879e60f864d763b2738b099dd34b9636d0e5eb6a
post_extract() {
# Mark tests that fail on certain targets
From daa9ce7061184bf8a61a97d2b89985642d02fedf Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 12:19:29 +0200
Subject: [PATCH 8/8] cdogs-sdl: update to 1.3.1.
---
srcpkgs/cdogs-sdl/template | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cdogs-sdl/template b/srcpkgs/cdogs-sdl/template
index c58760d38373..dd5cb4182763 100644
--- a/srcpkgs/cdogs-sdl/template
+++ b/srcpkgs/cdogs-sdl/template
@@ -1,9 +1,12 @@
# Template file for 'cdogs-sdl'
pkgname=cdogs-sdl
-version=0.11.1
-revision=2
+version=1.3.1
+revision=1
build_style=cmake
-configure_args="-DCDOGS_DATA_DIR=/usr/share/cdogs/"
+configure_args="
+ -DCMAKE_INSTALL_PREFIX=/usr/share/cdogs-sdl/
+ -DCDOGS_DATA_DIR=/usr/share/cdogs-sdl/
+"
hostmakedepends="pkg-config python3-protobuf protobuf"
makedepends="SDL2-devel SDL2_mixer-devel SDL2_image-devel SDL2_net-devel
gtk+3-devel protobuf-devel"
@@ -12,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://cxong.github.io/cdogs-sdl/"
distfiles="https://github.com/cxong/cdogs-sdl/archive/${version}.tar.gz"
-checksum=9c077b363859f22e5701f9fe1a0b3cf5f9e3464cf7110942f8ad7e70e833d6b1
+checksum=3b863a092b23da8b210383831ff490a10dd6fda77b997fe2bf39cedcfa0a8937
replaces="cdogs-sdl-data<=0.7.3"
CFLAGS="-fcommon"
@@ -20,3 +23,8 @@ CFLAGS="-fcommon"
pre_configure() {
vsed -i CMakeLists.txt -e "s; -Werror;;"
}
+
+post_install() {
+ mv "$DESTDIR"/usr/share/cdogs-sdl/bin/ "$DESTDIR"/usr/bin/
+ mv "$DESTDIR"/usr/share/cdogs-sdl/share/* "$DESTDIR"/usr/share/
+}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] cdogs sdl 1.3.1
2022-10-06 10:19 [PR PATCH] cdogs sdl 1.3.1 Gottox
@ 2022-10-06 10:20 ` Gottox
2022-10-08 21:11 ` [PR PATCH] [Closed]: cdogs-sdl-1.3.1 classabbyamp
1 sibling, 0 replies; 3+ messages in thread
From: Gottox @ 2022-10-06 10:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 559 bytes --]
There is an updated pull request by Gottox against master on the void-packages repository
https://github.com/Gottox/void-packages cdogs-sdl-1.3.1
https://github.com/void-linux/void-packages/pull/39757
cdogs sdl 1.3.1
- occt
- freecad: rebuild for occt-7.6.3_1
- gmsh: rebuild for occt-7.6.3_1
- horizon: rebuild for occt-7.6.3_1
- kicad: rebuild for occt-7.6.3_1
- python3-occ: rebuild for occt-7.6.3_1
- PrusaSlicer: update to 2.5.0.
- cdogs-sdl: update to 1.3.1.
A patch file from https://github.com/void-linux/void-packages/pull/39757.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cdogs-sdl-1.3.1-39757.patch --]
[-- Type: text/x-diff, Size: 1610 bytes --]
From 5ab808b27e670b6e46556b0734c393a72eb41397 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Thu, 6 Oct 2022 12:19:29 +0200
Subject: [PATCH] cdogs-sdl: update to 1.3.1.
---
srcpkgs/cdogs-sdl/template | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/cdogs-sdl/template b/srcpkgs/cdogs-sdl/template
index c58760d38373..dd5cb4182763 100644
--- a/srcpkgs/cdogs-sdl/template
+++ b/srcpkgs/cdogs-sdl/template
@@ -1,9 +1,12 @@
# Template file for 'cdogs-sdl'
pkgname=cdogs-sdl
-version=0.11.1
-revision=2
+version=1.3.1
+revision=1
build_style=cmake
-configure_args="-DCDOGS_DATA_DIR=/usr/share/cdogs/"
+configure_args="
+ -DCMAKE_INSTALL_PREFIX=/usr/share/cdogs-sdl/
+ -DCDOGS_DATA_DIR=/usr/share/cdogs-sdl/
+"
hostmakedepends="pkg-config python3-protobuf protobuf"
makedepends="SDL2-devel SDL2_mixer-devel SDL2_image-devel SDL2_net-devel
gtk+3-devel protobuf-devel"
@@ -12,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://cxong.github.io/cdogs-sdl/"
distfiles="https://github.com/cxong/cdogs-sdl/archive/${version}.tar.gz"
-checksum=9c077b363859f22e5701f9fe1a0b3cf5f9e3464cf7110942f8ad7e70e833d6b1
+checksum=3b863a092b23da8b210383831ff490a10dd6fda77b997fe2bf39cedcfa0a8937
replaces="cdogs-sdl-data<=0.7.3"
CFLAGS="-fcommon"
@@ -20,3 +23,8 @@ CFLAGS="-fcommon"
pre_configure() {
vsed -i CMakeLists.txt -e "s; -Werror;;"
}
+
+post_install() {
+ mv "$DESTDIR"/usr/share/cdogs-sdl/bin/ "$DESTDIR"/usr/bin/
+ mv "$DESTDIR"/usr/share/cdogs-sdl/share/* "$DESTDIR"/usr/share/
+}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Closed]: cdogs-sdl-1.3.1
2022-10-06 10:19 [PR PATCH] cdogs sdl 1.3.1 Gottox
2022-10-06 10:20 ` [PR PATCH] [Updated] " Gottox
@ 2022-10-08 21:11 ` classabbyamp
1 sibling, 0 replies; 3+ messages in thread
From: classabbyamp @ 2022-10-08 21:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 178 bytes --]
There's a closed pull request on the void-packages repository
cdogs-sdl-1.3.1
https://github.com/void-linux/void-packages/pull/39757
Description:
cdogs-sdl: update to 1.3.1.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-08 21:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-06 10:19 [PR PATCH] cdogs sdl 1.3.1 Gottox
2022-10-06 10:20 ` [PR PATCH] [Updated] " Gottox
2022-10-08 21:11 ` [PR PATCH] [Closed]: cdogs-sdl-1.3.1 classabbyamp
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).