* [gentoo-commits] repo/gentoo:master commit in: media-gfx/solvespace/files/, media-gfx/solvespace/
@ 2021-06-07 16:04 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2021-06-07 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 099369de66cdc8a91f4e9b372bb2c38a6767a881
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 7 06:40:38 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 7 07:13:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=099369de
media-gfx/solvespace: fix build with GCC 11
Closes: https://bugs.gentoo.org/790776
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../solvespace-2.3-gcc11-missing-limits-inc.patch | 19 +++++++++++++++++++
media-gfx/solvespace/solvespace-2.3.ebuild | 7 ++++++-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/media-gfx/solvespace/files/solvespace-2.3-gcc11-missing-limits-inc.patch b/media-gfx/solvespace/files/solvespace-2.3-gcc11-missing-limits-inc.patch
new file mode 100644
index 00000000000..ecf02fc5c01
--- /dev/null
+++ b/media-gfx/solvespace/files/solvespace-2.3-gcc11-missing-limits-inc.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/790776
+--- a/src/exportvector.cpp
++++ b/src/exportvector.cpp
+@@ -4,6 +4,7 @@
+ // Copyright 2008-2013 Jonathan Westhues.
+ //-----------------------------------------------------------------------------
+ #include <libdxfrw.h>
++#include <limits>
+ #include "solvespace.h"
+
+ VectorFileWriter::~VectorFileWriter() {
+--- a/src/importdxf.cpp
++++ b/src/importdxf.cpp
+@@ -1,3 +1,5 @@
++#include <limits>
++
+ #include "solvespace.h"
+ #include "libdxfrw.h"
+ #include "libdwgr.h"
diff --git a/media-gfx/solvespace/solvespace-2.3.ebuild b/media-gfx/solvespace/solvespace-2.3.ebuild
index ca5fc5249b9..25975546f2b 100644
--- a/media-gfx/solvespace/solvespace-2.3.ebuild
+++ b/media-gfx/solvespace/solvespace-2.3.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
+
DXFRW_COMMIT="87ff1082f49b1286a033ac8f38fe8dde0975bb8b"
DXFRW_PV="0.6.3"
DXFRW_P="libdxfrw-${DXFRW_PV}-${DXFRW_COMMIT}"
@@ -31,6 +32,10 @@ DEPEND="${RDEPEND}
# NOTE: please keep commit hash actually when version up
GIT_COMMIT_HASH="4d1e1341d926ac356b295d5cc3d61c7a6cd7d07d"
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3-gcc11-missing-limits-inc.patch
+)
+
src_prepare() {
rm -r "extlib/libdxfrw" || die "rm extlib/libdxfrw failed"
mv "${WORKDIR}/libdxfrw-${DXFRW_COMMIT}" "extlib/libdxfrw" || die "move libdxfrw-${DXFRW_COMMIT} failed"
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/solvespace/files/, media-gfx/solvespace/
@ 2022-02-28 21:12 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2022-02-28 21:12 UTC (permalink / raw
To: gentoo-commits
commit: bfe34cee1837f876589efb047ec867252e8267a2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 26 20:29:30 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 21:12:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfe34cee
media-gfx/solvespace: Drop 2.3
Bug: https://bugs.gentoo.org/784359
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/solvespace/Manifest | 2 -
.../solvespace-2.3-gcc11-missing-limits-inc.patch | 19 -------
media-gfx/solvespace/solvespace-2.3.ebuild | 61 ----------------------
3 files changed, 82 deletions(-)
diff --git a/media-gfx/solvespace/Manifest b/media-gfx/solvespace/Manifest
index 16f31c32664c..0ea117d9b3ce 100644
--- a/media-gfx/solvespace/Manifest
+++ b/media-gfx/solvespace/Manifest
@@ -1,5 +1,3 @@
DIST libdxfrw-0.6.3-0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz 691804 BLAKE2B 84c90a591fac71144e9e13aace7c1a00dfc1bd6f27b0bcde6b60541f5b5d3ccc04ae1c759f60cb467445cc884840d04bf4613b5cc553fbbf6951cac33a084d50 SHA512 9ab498aa7f369be79d800e8ca5ec55fa54be79d0778937b81d4c8da776b3419cb8a75400b54b205efc338da32e2e781afd0bed1bd8efed1a0b212dc8682a2615
-DIST libdxfrw-0.6.3-87ff1082f49b1286a033ac8f38fe8dde0975bb8b.tar.gz 691867 BLAKE2B bd3414930efe8cc1185a20f889dda3ec8ea46e40d3a1a4c24975683fc444161acdff576a1f40c34203e523e88bacf3841c50928340e7865650a113e65375f930 SHA512 0f8e2561887fbc5101787f0d7818328864b5c4a679ef539fcdbda8c124ab4a808663f9ba645d397f154596eab1eb7c6f0bdf3883bf6975392863e01bada3a1f0
DIST mimalloc-2.0.1-dc6bce256d4f3ce87761f9337977dff3d8b1776c.tar.gz 912721 BLAKE2B 0129b7650303be9bd82e9a99f6a81cc5aacf93c4e2d36813520d59b61410c00c2b84979b9aa901dc9f67a88110115882987b4eceebe880c548adbab4a328c415 SHA512 bf1770ae0225207aa072a103cb13671ac8a759aeb8e81dec6b1bf4192dc87c927153c34a4d6c42075d021cdb4a294a2863e9f70eed386912ccc0699120bd967e
-DIST solvespace-2.3.tar.gz 2115940 BLAKE2B 67e2d81e0a609d0344a6f28d33a78609b01c7105785f93aa1124f0592fe0e31d4846e6dd406339b2ef2c5f3961f91302a73c5391fe2e0f435e78c3a97ed67612 SHA512 9d22e467337591cd9a4935124d18733b8337f5785ab5738f4a94300f283ffe7d313569e379ae77e509d14182ffde8c9db7beaebb46ea7c0507c6b05010fe1a56
DIST solvespace-3.0.tar.gz 2734860 BLAKE2B 2efc9d98723c60abdb1c76ac086c40ff2f9b8bc9c315978731493d115fa55a080176ef48d930e3b503c0de0604dbfd2bc3bd99a581f359eb07a23034d09f84bf SHA512 b07b41fac1d67c5350082600a2f09e3fa611a1273e0c93ff93d11a7a1dbf550ff33465686eaff04fdb8350d1fe854ab0301d8723ef31cc65c687ba59cb89187f
diff --git a/media-gfx/solvespace/files/solvespace-2.3-gcc11-missing-limits-inc.patch b/media-gfx/solvespace/files/solvespace-2.3-gcc11-missing-limits-inc.patch
deleted file mode 100644
index ecf02fc5c01e..000000000000
--- a/media-gfx/solvespace/files/solvespace-2.3-gcc11-missing-limits-inc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://bugs.gentoo.org/790776
---- a/src/exportvector.cpp
-+++ b/src/exportvector.cpp
-@@ -4,6 +4,7 @@
- // Copyright 2008-2013 Jonathan Westhues.
- //-----------------------------------------------------------------------------
- #include <libdxfrw.h>
-+#include <limits>
- #include "solvespace.h"
-
- VectorFileWriter::~VectorFileWriter() {
---- a/src/importdxf.cpp
-+++ b/src/importdxf.cpp
-@@ -1,3 +1,5 @@
-+#include <limits>
-+
- #include "solvespace.h"
- #include "libdxfrw.h"
- #include "libdwgr.h"
diff --git a/media-gfx/solvespace/solvespace-2.3.ebuild b/media-gfx/solvespace/solvespace-2.3.ebuild
deleted file mode 100644
index 25975546f2b6..000000000000
--- a/media-gfx/solvespace/solvespace-2.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DXFRW_COMMIT="87ff1082f49b1286a033ac8f38fe8dde0975bb8b"
-DXFRW_PV="0.6.3"
-DXFRW_P="libdxfrw-${DXFRW_PV}-${DXFRW_COMMIT}"
-
-inherit cmake-utils gnome2-utils
-
-DESCRIPTION="Parametric 2d/3d CAD"
-HOMEPAGE="http://solvespace.com"
-SRC_URI="https://github.com/solvespace/solvespace/archive/v${PV}.tar.gz -> ${P}.tar.gz
- https://github.com/solvespace/libdxfrw/archive/${DXFRW_COMMIT}.tar.gz -> ${DXFRW_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-cpp/gtkmm:2.4=
- dev-cpp/pangomm:1.4
- dev-libs/json-c:=
- media-libs/fontconfig
- media-libs/freetype:2
- media-libs/glew:0=
- media-libs/libpng:0=
- virtual/opengl"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-# NOTE: please keep commit hash actually when version up
-GIT_COMMIT_HASH="4d1e1341d926ac356b295d5cc3d61c7a6cd7d07d"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.3-gcc11-missing-limits-inc.patch
-)
-
-src_prepare() {
- rm -r "extlib/libdxfrw" || die "rm extlib/libdxfrw failed"
- mv "${WORKDIR}/libdxfrw-${DXFRW_COMMIT}" "extlib/libdxfrw" || die "move libdxfrw-${DXFRW_COMMIT} failed"
- sed -i '/include(GetGitCommitHash)/d' CMakeLists.txt || die 'remove GetGitCommitHash by sed failed'
- # fixed in master already
- sed -i -e 's/CHAR_WIDTH/CHAR_WIDTH_/' src/textwin.cpp src/toolbar.cpp src/win32/w32main.cpp src/ui.h || die 'sed failed'
- cmake-utils_src_prepare
-}
-
-src_configure() {
- local mycmakeargs=(
- -DGIT_COMMIT_HASH="${GIT_COMMIT_HASH}"
- )
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/solvespace/files/, media-gfx/solvespace/
@ 2022-06-09 19:33 Matthew Smith
0 siblings, 0 replies; 3+ messages in thread
From: Matthew Smith @ 2022-06-09 19:33 UTC (permalink / raw
To: gentoo-commits
commit: 42c7e4fdba892a459a42e6bce12afadcfd052bcb
Author: Matthew Smith <matthew <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 9 19:21:31 2022 +0000
Commit: Matthew Smith <matthew <AT> gentoo <DOT> org>
CommitDate: Thu Jun 9 19:32:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42c7e4fd
media-gfx/solvespace: add 3.1
Signed-off-by: Matthew Smith <matthew <AT> gentoo.org>
media-gfx/solvespace/Manifest | 1 +
.../files/solvespace-3.1-use-system-mimalloc.patch | 41 +++++++++++
media-gfx/solvespace/solvespace-3.1.ebuild | 79 ++++++++++++++++++++++
3 files changed, 121 insertions(+)
diff --git a/media-gfx/solvespace/Manifest b/media-gfx/solvespace/Manifest
index 445aa5c0bdbc..881e7a36fd2c 100644
--- a/media-gfx/solvespace/Manifest
+++ b/media-gfx/solvespace/Manifest
@@ -1,2 +1,3 @@
DIST libdxfrw-0.6.3-0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz 691804 BLAKE2B 84c90a591fac71144e9e13aace7c1a00dfc1bd6f27b0bcde6b60541f5b5d3ccc04ae1c759f60cb467445cc884840d04bf4613b5cc553fbbf6951cac33a084d50 SHA512 9ab498aa7f369be79d800e8ca5ec55fa54be79d0778937b81d4c8da776b3419cb8a75400b54b205efc338da32e2e781afd0bed1bd8efed1a0b212dc8682a2615
DIST solvespace-3.0.tar.gz 2734860 BLAKE2B 2efc9d98723c60abdb1c76ac086c40ff2f9b8bc9c315978731493d115fa55a080176ef48d930e3b503c0de0604dbfd2bc3bd99a581f359eb07a23034d09f84bf SHA512 b07b41fac1d67c5350082600a2f09e3fa611a1273e0c93ff93d11a7a1dbf550ff33465686eaff04fdb8350d1fe854ab0301d8723ef31cc65c687ba59cb89187f
+DIST solvespace-3.1.tar.gz 2764243 BLAKE2B 764637f84a187c6a86cf65cd672466f48e1e5abd9d335945fc47f2ea48f7d22a94f6840a6019f2380e8416e903bb55f97d9adb18fa6f2e7a94933c2a5b51ef6c SHA512 76794c4b103036f423471c72209521c273b40edcf9a725d2407e757b8dded033863f58640f1bcdf19d7dd1b296334f8745a632875e06604fa4d5b261dd23ba98
diff --git a/media-gfx/solvespace/files/solvespace-3.1-use-system-mimalloc.patch b/media-gfx/solvespace/files/solvespace-3.1-use-system-mimalloc.patch
new file mode 100644
index 000000000000..118a920c741d
--- /dev/null
+++ b/media-gfx/solvespace/files/solvespace-3.1-use-system-mimalloc.patch
@@ -0,0 +1,41 @@
+From a793c7d67fc886b1eb66ab67551f3a2448e4adc0 Mon Sep 17 00:00:00 2001
+From: Matthew Smith <matthew@gentoo.org>
+Date: Thu, 9 Jun 2022 20:19:19 +0100
+Subject: [PATCH] build: Use system mimalloc
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -185,13 +185,7 @@ endif()
+ message(STATUS "Using in-tree libdxfrw")
+ add_subdirectory(extlib/libdxfrw)
+
+-message(STATUS "Using in-tree mimalloc")
+-set(MI_OVERRIDE OFF CACHE BOOL "")
+-set(MI_BUILD_SHARED OFF CACHE BOOL "")
+-set(MI_BUILD_OBJECT OFF CACHE BOOL "")
+-set(MI_BUILD_TESTS OFF CACHE BOOL "")
+-add_subdirectory(extlib/mimalloc EXCLUDE_FROM_ALL)
+-set(MIMALLOC_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/extlib/mimalloc/include)
++find_package(mimalloc REQUIRED)
+
+ if(NOT FORCE_VENDORED_Eigen3)
+ find_package(Eigen3 CONFIG)
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -27,7 +27,6 @@ target_include_directories(slvs_deps INTERFACE SYSTEM
+ ${PNG_PNG_INCLUDE_DIR}
+ ${FREETYPE_INCLUDE_DIRS}
+ ${CAIRO_INCLUDE_DIRS}
+- ${MIMALLOC_INCLUDE_DIR}
+ ${EIGEN3_INCLUDE_DIRS})
+ target_link_libraries(slvs_deps INTERFACE
+ dxfrw
+@@ -35,7 +34,7 @@ target_link_libraries(slvs_deps INTERFACE
+ ${PNG_LIBRARY}
+ ${FREETYPE_LIBRARY}
+ ${CAIRO_LIBRARIES}
+- mimalloc-static)
++ mimalloc)
+
+ if(Backtrace_FOUND)
+ target_include_directories(slvs_deps INTERFACE SYSTEM
diff --git a/media-gfx/solvespace/solvespace-3.1.ebuild b/media-gfx/solvespace/solvespace-3.1.ebuild
new file mode 100644
index 000000000000..347d89fe867d
--- /dev/null
+++ b/media-gfx/solvespace/solvespace-3.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# solvespace's libdxfrw is quite heavily modified and incompatible with
+# the upstream libdxfrw.
+DXFRW_COMMIT="0b7b7b709d9299565db603f878214656ef5e9ddf"
+DXFRW_PV="0.6.3"
+DXFRW_P="libdxfrw-${DXFRW_PV}-${DXFRW_COMMIT}"
+
+inherit cmake toolchain-funcs xdg
+
+DESCRIPTION="Parametric 2d/3d CAD"
+HOMEPAGE="http://solvespace.com"
+SRC_URI="https://github.com/solvespace/solvespace/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/solvespace/libdxfrw/archive/${DXFRW_COMMIT}.tar.gz -> ${DXFRW_P}.tar.gz"
+
+# licenses
+# + SolveSpace (GPL-3+)
+# |- Bitstream Vera (BitstreamVera)
+# + libdxfrw (GPL-2+)
+
+IUSE="openmp"
+KEYWORDS="~amd64 ~x86"
+LICENSE="BitstreamVera GPL-2+ GPL-3+"
+SLOT="0"
+
+RDEPEND="
+ dev-cpp/atkmm:0
+ dev-cpp/glibmm:2
+ dev-cpp/gtkmm:3.0[X]
+ dev-cpp/pangomm:1.4
+ dev-libs/glib:2
+ dev-libs/json-c:=
+ dev-libs/libsigc++:2
+ dev-libs/libspnav[X]
+ dev-libs/mimalloc:=
+ media-libs/fontconfig
+ media-libs/freetype:2[X]
+ media-libs/libpng:0=
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/cairo[X]
+ x11-libs/gtk+:3[X]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.1-use-system-mimalloc.patch )
+
+# This is shown to the user in the UI and --version.
+MY_HASH="0e0b0252e23dd5bd4ae82ababcc54c44aee036d6"
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+ rm -r extlib/libdxfrw || die
+ mv "${WORKDIR}"/libdxfrw-${DXFRW_COMMIT} extlib/libdxfrw || die
+
+ sed -i '/include(GetGitCommitHash)/d' CMakeLists.txt || die
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_OPENMP=$(usex openmp)
+ -DGIT_COMMIT_HASH=${MY_HASH}
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-06-09 19:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-09 19:33 [gentoo-commits] repo/gentoo:master commit in: media-gfx/solvespace/files/, media-gfx/solvespace/ Matthew Smith
-- strict thread matches above, loose matches on Subject: below --
2022-02-28 21:12 Andreas Sturmlechner
2021-06-07 16:04 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox