diff options
Diffstat (limited to 'media-gfx')
59 files changed, 841 insertions, 1507 deletions
diff --git a/media-gfx/asymptote/asymptote-2.89.ebuild b/media-gfx/asymptote/asymptote-2.89.ebuild index 8d3f1ada6331..cd7a9a255ce7 100644 --- a/media-gfx/asymptote/asymptote-2.89.ebuild +++ b/media-gfx/asymptote/asymptote-2.89.ebuild @@ -43,7 +43,7 @@ RDEPEND=" ) X? ( ${PYTHON_DEPS} - dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg] + dev-python/pyqt5[${PYTHON_USEDEP},gui,widgets,svg] dev-python/cson dev-python/numpy >=gnome-base/librsvg-2.40 diff --git a/media-gfx/asymptote/asymptote-2.90.ebuild b/media-gfx/asymptote/asymptote-2.90.ebuild index 41e78e722943..aa22384f0204 100644 --- a/media-gfx/asymptote/asymptote-2.90.ebuild +++ b/media-gfx/asymptote/asymptote-2.90.ebuild @@ -43,7 +43,7 @@ RDEPEND=" ) X? ( ${PYTHON_DEPS} - dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg] + dev-python/pyqt5[${PYTHON_USEDEP},gui,widgets,svg] dev-python/cson dev-python/numpy >=gnome-base/librsvg-2.40 diff --git a/media-gfx/asymptote/asymptote-2.92.ebuild b/media-gfx/asymptote/asymptote-2.92.ebuild index ca9e0caa6681..c8ddba443b11 100644 --- a/media-gfx/asymptote/asymptote-2.92.ebuild +++ b/media-gfx/asymptote/asymptote-2.92.ebuild @@ -43,7 +43,7 @@ RDEPEND=" ) X? ( ${PYTHON_DEPS} - dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets,svg] + dev-python/pyqt5[${PYTHON_USEDEP},gui,widgets,svg] dev-python/cson dev-python/numpy >=gnome-base/librsvg-2.40 diff --git a/media-gfx/blender/blender-3.3.21.ebuild b/media-gfx/blender/blender-3.3.21.ebuild index 66c872c02cea..a0f55249f096 100644 --- a/media-gfx/blender/blender-3.3.21.ebuild +++ b/media-gfx/blender/blender-3.3.21.ebuild @@ -19,7 +19,7 @@ else # Update these between major releases. TEST_TARBALL_VERSION="$(ver_cut 1-2).0" #SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )" - KEYWORDS="~amd64 ~arm ~arm64" + KEYWORDS="amd64 ~arm ~arm64" fi LICENSE="GPL-3+ cycles? ( Apache-2.0 )" diff --git a/media-gfx/blender/blender-3.6.15.ebuild b/media-gfx/blender/blender-3.6.15.ebuild index 698ccf250f72..8780d66cc455 100644 --- a/media-gfx/blender/blender-3.6.15.ebuild +++ b/media-gfx/blender/blender-3.6.15.ebuild @@ -20,7 +20,7 @@ else # Update these between major releases. TEST_TARBALL_VERSION="$(ver_cut 1-2).0" # SRC_URI+=" test? ( https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz )" - KEYWORDS="~amd64 ~arm ~arm64" + KEYWORDS="amd64 ~arm ~arm64" fi LICENSE="GPL-3+ cycles? ( Apache-2.0 )" diff --git a/media-gfx/blender/blender-4.2.1.ebuild b/media-gfx/blender/blender-4.2.1.ebuild index 88bb85849015..3a809e39731f 100644 --- a/media-gfx/blender/blender-4.2.1.ebuild +++ b/media-gfx/blender/blender-4.2.1.ebuild @@ -27,7 +27,7 @@ else # https://projects.blender.org/blender/blender-test-data/archive/blender-v$(ver_cut 1-2)-release.tar.gz # ) # " - KEYWORDS="~amd64 ~arm ~arm64" + KEYWORDS="amd64 ~arm ~arm64" RESTRICT="test" # the test archive returns LFS references. fi diff --git a/media-gfx/chafa/chafa-1.14.1.ebuild b/media-gfx/chafa/chafa-1.14.1.ebuild index 304b7e3e88e1..7b4ded23c6ce 100644 --- a/media-gfx/chafa/chafa-1.14.1.ebuild +++ b/media-gfx/chafa/chafa-1.14.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://hpjansson.org/chafa/releases/${P}.tar.xz" LICENSE="LGPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86" IUSE="+tools webp" RDEPEND=" diff --git a/media-gfx/curtail/curtail-1.11.1.ebuild b/media-gfx/curtail/curtail-1.11.1.ebuild index 8db3728be1ae..c698273b9338 100644 --- a/media-gfx/curtail/curtail-1.11.1.ebuild +++ b/media-gfx/curtail/curtail-1.11.1.ebuild @@ -19,7 +19,7 @@ else -> ${P}.tar.gz" S="${WORKDIR}/${P^}" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi LICENSE="GPL-3+" diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest index a624f400f434..6c17cf764fe5 100644 --- a/media-gfx/freecad/Manifest +++ b/media-gfx/freecad/Manifest @@ -1,2 +1 @@ -DIST freecad-0.21.2.tar.gz 66124278 BLAKE2B 84a4f8008192cd1a2ee1737b537b2668a8c028aa8c8645e6e412ab9ef79bf3bdd2cb73d96fcfd2dbcff613cdcc59cbab95821406acdc9cd7d4eb4636c081be78 SHA512 bd7e9029b24d49ac0955797bcdbea1fd0826bdf9ab246135366dfc35b427004f103acccfc66d008e3ab3928f99e04200e335908a03166545554e2d3e969ae0f5 DIST freecad-1.0.0.tar.gz 91599325 BLAKE2B 65540eb42e7d508456c9edbf2122e0f288708c33e6d00d3c8c45550e7a614f658f91ba25978a66819bc094b7138aab72a89c0172d0841be1ff798ade5a8bdc64 SHA512 afc1079ea04fd5bb8135f8ad1012d9e4e05c8839dd0a4e00253eada58fe018f445c1200d1ca7ac9f268644c946cbf55b7b313dc3d6bd010f9da3a3334103b7db diff --git a/media-gfx/freecad/files/freecad-0.21.2-boost-175-1.patch b/media-gfx/freecad/files/freecad-0.21.2-boost-175-1.patch deleted file mode 100644 index cbb78d5bdc94..000000000000 --- a/media-gfx/freecad/files/freecad-0.21.2-boost-175-1.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f555a25f9e67e628e8075fc8599d7c11807eaddd Mon Sep 17 00:00:00 2001 -From: wmayer <wmayer@users.sourceforge.net> -Date: Sun, 21 Apr 2024 08:36:16 +0200 -Subject: [PATCH] Fixes #13549: smesh doesn't compile with boost 1.85 - ---- - src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp b/src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp -index d72ff2363f39..f108cbbcb2cf 100644 ---- a/src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp -+++ b/src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp -@@ -55,7 +55,7 @@ namespace DriverGMF - - bool isExtensionCorrect( const std::string& fileName ) - { -- std::string ext = boost::filesystem::extension(fileName); -+ std::string ext = boost::filesystem::path(fileName).extension().string(); - switch ( ext.size() ) { - case 5: return ( ext == ".mesh" || ext == ".solb" ); - case 6: return ( ext == ".meshb" ); diff --git a/media-gfx/freecad/files/freecad-0.21.2-boost-175-2.patch b/media-gfx/freecad/files/freecad-0.21.2-boost-175-2.patch deleted file mode 100644 index 5f0807028859..000000000000 --- a/media-gfx/freecad/files/freecad-0.21.2-boost-175-2.patch +++ /dev/null @@ -1,22 +0,0 @@ -From aa54ba73df4d42878130c99688be35acf10725a0 Mon Sep 17 00:00:00 2001 -From: ppphp <kevinniub@gmail.com> -Date: Sat, 30 Mar 2024 13:52:32 +0800 -Subject: [PATCH] fix: c++20 deprecate copy_option - ---- - src/Gui/PreferencePackManager.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Gui/PreferencePackManager.cpp b/src/Gui/PreferencePackManager.cpp -index e0e6184a3147..e1773a436852 100644 ---- a/src/Gui/PreferencePackManager.cpp -+++ b/src/Gui/PreferencePackManager.cpp -@@ -224,7 +224,7 @@ void Gui::PreferencePackManager::importConfig(const std::string& packName, - auto savedPreferencePacksDirectory = - fs::path(App::Application::getUserAppDataDir()) / "SavedPreferencePacks"; - auto cfgFilename = savedPreferencePacksDirectory / packName / (packName + ".cfg"); -- fs::copy_file(path, cfgFilename, fs::copy_option::overwrite_if_exists); -+ fs::copy_file(path, cfgFilename, fs::copy_options::overwrite_existing); - rescan(); - } - diff --git a/media-gfx/freecad/files/freecad-0.21.2-boost-175-3.patch b/media-gfx/freecad/files/freecad-0.21.2-boost-175-3.patch deleted file mode 100644 index c4c8039dab49..000000000000 --- a/media-gfx/freecad/files/freecad-0.21.2-boost-175-3.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 91457bbdee2422c7f0372688cf72d021cf222073 Mon Sep 17 00:00:00 2001 -From: ppphp <kevinniub@gmail.com> -Date: Sat, 30 Mar 2024 19:17:56 +0800 -Subject: [PATCH] add version check macro for compatibility - ---- - src/Gui/PreferencePackManager.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/Gui/PreferencePackManager.cpp b/src/Gui/PreferencePackManager.cpp -index e1773a436852..dfc54240c00c 100644 ---- a/src/Gui/PreferencePackManager.cpp -+++ b/src/Gui/PreferencePackManager.cpp -@@ -224,7 +224,11 @@ void Gui::PreferencePackManager::importConfig(const std::string& packName, - auto savedPreferencePacksDirectory = - fs::path(App::Application::getUserAppDataDir()) / "SavedPreferencePacks"; - auto cfgFilename = savedPreferencePacksDirectory / packName / (packName + ".cfg"); -+#if BOOST_VERSION >= 107400 - fs::copy_file(path, cfgFilename, fs::copy_options::overwrite_existing); -+#else -+ fs::copy_file(path, cfgFilename, fs::copy_option::overwrite_if_exists); -+#endif - rescan(); - } - diff --git a/media-gfx/freecad/files/freecad-0.21.2-navcube-qt6.patch b/media-gfx/freecad/files/freecad-0.21.2-navcube-qt6.patch deleted file mode 100644 index 0ab999771068..000000000000 --- a/media-gfx/freecad/files/freecad-0.21.2-navcube-qt6.patch +++ /dev/null @@ -1,29 +0,0 @@ -From ccaee18917432fd02e4371a7847bdfaf0692edd1 Mon Sep 17 00:00:00 2001 -From: Martin Rodriguez Reboredo <yakoyoku@gmail.com> -Date: Sun, 19 May 2024 23:23:45 -0300 -Subject: [PATCH] Gui: Fix NaviCube for Qt6 - ---- - src/Gui/NaviCube.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/Gui/NaviCube.cpp b/src/Gui/NaviCube.cpp -index 2d164f196b3c..9e3a62d66c81 100644 ---- a/src/Gui/NaviCube.cpp -+++ b/src/Gui/NaviCube.cpp -@@ -926,6 +926,7 @@ NaviCubeImplementation::PickId NaviCubeImplementation::pickFace(short x, short y - GLubyte pixels[4] = {0}; - if (m_PickingFramebuffer && std::abs(x) <= m_CubeWidgetSize / 2 && - std::abs(y) <= m_CubeWidgetSize / 2) { -+ static_cast<QtGLWidget*>(m_View3DInventorViewer->viewport())->makeCurrent(); - m_PickingFramebuffer->bind(); - - glViewport(0, 0, m_CubeWidgetSize * 2, m_CubeWidgetSize * 2); -@@ -936,6 +937,7 @@ NaviCubeImplementation::PickId NaviCubeImplementation::pickFace(short x, short y - glReadPixels(2 * x + m_CubeWidgetSize, 2 * y + m_CubeWidgetSize, 1, 1, - GL_RGBA, GL_UNSIGNED_BYTE, &pixels); - m_PickingFramebuffer->release(); -+ static_cast<QtGLWidget*>(m_View3DInventorViewer->viewport())->doneCurrent(); - } - return pixels[3] == 255 ? static_cast<PickId>(pixels[0]) : PickId::None; - } diff --git a/media-gfx/freecad/files/freecad-0.21.2-py312-qt6.patch b/media-gfx/freecad/files/freecad-0.21.2-py312-qt6.patch deleted file mode 100644 index c1fe31ab05ad..000000000000 --- a/media-gfx/freecad/files/freecad-0.21.2-py312-qt6.patch +++ /dev/null @@ -1,186 +0,0 @@ -From 6043c90462e85fbf15e30ea4c7da7d9a22d570f2 Mon Sep 17 00:00:00 2001 -From: wmayer <wmayer@users.sourceforge.net> -Date: Wed, 7 Feb 2024 15:25:13 +0100 -Subject: [PATCH] Py3.12: harmonize with upstream of PyCXX - ---- - src/CXX/IndirectPythonInterface.cxx | 36 +++++++++++++++------ - src/CXX/Python3/IndirectPythonInterface.hxx | 6 ++-- - src/CXX/Python3/cxx_extensions.cxx | 2 +- - src/CXX/Python3/cxxextensions.c | 10 ++++++ - src/CXX/Version.hxx | 2 +- - 5 files changed, 42 insertions(+), 14 deletions(-) - -diff --git a/src/CXX/IndirectPythonInterface.cxx b/src/CXX/IndirectPythonInterface.cxx -index 3d810cea88a5..fc9e45cbd64f 100644 ---- a/src/CXX/IndirectPythonInterface.cxx -+++ b/src/CXX/IndirectPythonInterface.cxx -@@ -122,17 +122,21 @@ static PyTypeObject *ptr__Bytes_Type = NULL; - # endif - - # if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) -+# if PY_MAJOR_VERSION == 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11) - static int *ptr_Py_DebugFlag = NULL; - static int *ptr_Py_InteractiveFlag = NULL; - static int *ptr_Py_OptimizeFlag = NULL; - static int *ptr_Py_NoSiteFlag = NULL; - static int *ptr_Py_VerboseFlag = NULL; -+# endif - --# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7 -+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11 -+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7 - static const char **ptr__Py_PackageContext = NULL; --# else -+# else - static char **ptr__Py_PackageContext = NULL; --# endif -+# endif -+# endif - # endif - - # ifdef Py_REF_DEBUG -@@ -242,17 +246,21 @@ bool InitialisePythonIndirectInterface() - ptr_Py_RefTotal = GetInt_as_IntPointer( "_Py_RefTotal" ); - # endif - # if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) -+# if PY_MAJOR_VERSION == 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11) - ptr_Py_DebugFlag = GetInt_as_IntPointer( "Py_DebugFlag" ); - ptr_Py_InteractiveFlag = GetInt_as_IntPointer( "Py_InteractiveFlag" ); - ptr_Py_OptimizeFlag = GetInt_as_IntPointer( "Py_OptimizeFlag" ); - ptr_Py_NoSiteFlag = GetInt_as_IntPointer( "Py_NoSiteFlag" ); - ptr_Py_VerboseFlag = GetInt_as_IntPointer( "Py_VerboseFlag" ); -+# endif - --# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7 -+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11 -+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7 - ptr__Py_PackageContext = GetConstCharPointer_as_ConstCharPointerPointer( "_Py_PackageContext" ); --# else -+# else - ptr__Py_PackageContext = GetCharPointer_as_CharPointerPointer( "_Py_PackageContext" ); --# endif -+# endif -+# endif - # endif - - # define PYCXX_STANDARD_EXCEPTION( eclass, bclass ) -@@ -397,17 +405,21 @@ PYCXX_EXPORT PyTypeObject *_Bytes_Type() { return ptr__Bytes_Type; } - // wrap the Python Flag variables - // - # if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) -+# if PY_MAJOR_VERSION == 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11) - PYCXX_EXPORT int &_Py_DebugFlag() { return *ptr_Py_DebugFlag; } - PYCXX_EXPORT int &_Py_InteractiveFlag() { return *ptr_Py_InteractiveFlag; } - PYCXX_EXPORT int &_Py_OptimizeFlag() { return *ptr_Py_OptimizeFlag; } - PYCXX_EXPORT int &_Py_NoSiteFlag() { return *ptr_Py_NoSiteFlag; } - PYCXX_EXPORT int &_Py_VerboseFlag() { return *ptr_Py_VerboseFlag; } -+# endif - # endif - --# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7 -+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11 -+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7 - PYCXX_EXPORT const char *__Py_PackageContext() { return *ptr__Py_PackageContext; } --# else -+# else - PYCXX_EXPORT char *__Py_PackageContext() { return *ptr__Py_PackageContext; } -+# endif - # endif - - # if 0 -@@ -518,15 +530,19 @@ PYCXX_EXPORT PyTypeObject *_Bytes_Type() { return &PyBytes_Type; } - // wrap flags - // - # if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API ) -+# if PY_MAJOR_VERSION == 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11) - PYCXX_EXPORT int &_Py_DebugFlag() { return Py_DebugFlag; } - PYCXX_EXPORT int &_Py_InteractiveFlag() { return Py_InteractiveFlag; } - PYCXX_EXPORT int &_Py_OptimizeFlag() { return Py_OptimizeFlag; } - PYCXX_EXPORT int &_Py_NoSiteFlag() { return Py_NoSiteFlag; } - PYCXX_EXPORT int &_Py_VerboseFlag() { return Py_VerboseFlag; } --# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7 -+# endif -+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11 -+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7 - PYCXX_EXPORT const char *__Py_PackageContext() { return _Py_PackageContext; } --# else -+# else - PYCXX_EXPORT char *__Py_PackageContext() { return _Py_PackageContext; } -+# endif - # endif - # endif - -diff --git a/src/CXX/Python3/IndirectPythonInterface.hxx b/src/CXX/Python3/IndirectPythonInterface.hxx -index bf2c15c53f9a..eb4ae4fe63b9 100644 ---- a/src/CXX/Python3/IndirectPythonInterface.hxx -+++ b/src/CXX/Python3/IndirectPythonInterface.hxx -@@ -149,10 +149,12 @@ PYCXX_EXPORT int &_Py_NoSiteFlag(); - PYCXX_EXPORT int &_Py_TabcheckFlag(); - PYCXX_EXPORT int &_Py_VerboseFlag(); - --# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7 -+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11 -+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7 - PYCXX_EXPORT const char *__Py_PackageContext(); --# else -+# else - PYCXX_EXPORT char *__Py_PackageContext(); -+# endif - # endif - # endif - -diff --git a/src/CXX/Python3/cxx_extensions.cxx b/src/CXX/Python3/cxx_extensions.cxx -index 7371810be4a9..e6eefdafea17 100644 ---- a/src/CXX/Python3/cxx_extensions.cxx -+++ b/src/CXX/Python3/cxx_extensions.cxx -@@ -152,7 +152,7 @@ PyMethodDef *MethodTable::table() - //================================================================================ - ExtensionModuleBase::ExtensionModuleBase( const char *name ) - : m_module_name( name ) --#if defined( Py_LIMITED_API ) -+#if defined( Py_LIMITED_API ) || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 12) - , m_full_module_name( m_module_name ) - #else - , m_full_module_name( __Py_PackageContext() != NULL ? std::string( __Py_PackageContext() ) : m_module_name ) -diff --git a/src/CXX/Python3/cxxextensions.c b/src/CXX/Python3/cxxextensions.c -index 3b0f8ef7c588..afb9313ad0a8 100644 ---- a/src/CXX/Python3/cxxextensions.c -+++ b/src/CXX/Python3/cxxextensions.c -@@ -42,6 +42,14 @@ extern "C" - { - #endif - -+#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 13 -+PyObject py_object_initializer = -+ { -+ { 1 }, -+ NULL // type must be init'ed by user -+ }; -+ -+#else - PyObject py_object_initializer = - { - _PyObject_EXTRA_INIT -@@ -49,6 +57,8 @@ PyObject py_object_initializer = - NULL // type must be init'ed by user - }; - -+#endif -+ - #ifdef __cplusplus - } - #endif -diff --git a/src/CXX/Version.hxx b/src/CXX/Version.hxx -index e6069aad335e..59fe3c203b86 100644 ---- a/src/CXX/Version.hxx -+++ b/src/CXX/Version.hxx -@@ -40,7 +40,7 @@ - - #define PYCXX_VERSION_MAJOR 7 - #define PYCXX_VERSION_MINOR 1 --#define PYCXX_VERSION_PATCH 7 -+#define PYCXX_VERSION_PATCH 9 - #define PYCXX_MAKEVERSION( major, minor, patch ) ((major<<16)|(minor<<8)|(patch)) - #define PYCXX_VERSION PYCXX_MAKEVERSION( PYCXX_VERSION_MAJOR, PYCXX_VERSION_MINOR, PYCXX_VERSION_PATCH ) - #endif diff --git a/media-gfx/freecad/files/freecad-0.21.2-qtsvg-qt6.patch b/media-gfx/freecad/files/freecad-0.21.2-qtsvg-qt6.patch deleted file mode 100644 index 505862aa2bf1..000000000000 --- a/media-gfx/freecad/files/freecad-0.21.2-qtsvg-qt6.patch +++ /dev/null @@ -1,148 +0,0 @@ -From ac9a88c2c59a2d2002a7740a1597a05c819220e0 Mon Sep 17 00:00:00 2001 -From: wmayer <wmayer@users.sourceforge.net> -Date: Sat, 20 Apr 2024 14:02:38 +0200 -Subject: [PATCH] PySide6: Fixes #13533: QSvgWidget is not a child of QtSvg in - PySide6 - -* Create a compatibility module QtSvgWidgets.py to handle PySide2 & PySide6 -* In the Arch and Material modules use the QtSvgWidgets module -* Since Qt6 the method QFont.setWeight() doesn't accept an int any more but requires an enum. Since the call of QFont.setBold(True) sets - a weight of 75 the extra calls of QFont.setWeight(75) can be safely removed ---- - cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake | 3 +++ - src/Mod/Arch/ArchPrecast.py | 8 ++++---- - src/Mod/Arch/ArchWindow.py | 4 ++-- - src/Mod/Arch/importIFClegacy.py | 1 - - src/Mod/Draft/DraftGui.py | 1 - - src/Mod/Material/MaterialEditor.py | 6 +++--- - 6 files changed, 12 insertions(+), 11 deletions(-) - -diff --git a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake -index 0569c1fde9f2..fa872e287b59 100644 ---- a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake -+++ b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake -@@ -91,9 +91,12 @@ macro(SetupShibokenAndPyside) - file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtWidgets.py "from PySide${PYSIDE_MAJOR_VERSION}.QtWidgets import *\n") - if(PYSIDE_MAJOR_VERSION LESS 6) - file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtWebEngineWidgets.py "from PySide${PYSIDE_MAJOR_VERSION}.QtWebEngineWidgets import *\n") -+ file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtSvgWidgets.py "from PySide${PYSIDE_MAJOR_VERSION}.QtSvg import QGraphicsSvgItem\n" -+ "from PySide${PYSIDE_MAJOR_VERSION}.QtSvg import QSvgWidget\n") - else() - file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtWebEngineWidgets.py "from PySide${PYSIDE_MAJOR_VERSION}.QtWebEngineWidgets import *\n" - "from PySide${PYSIDE_MAJOR_VERSION}.QtWebEngineCore import QWebEnginePage\n") -+ file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtSvgWidgets.py "from PySide${PYSIDE_MAJOR_VERSION}.QtSvgWidgets import *\n") - endif() - endif() - -diff --git a/src/Mod/Arch/ArchPrecast.py b/src/Mod/Arch/ArchPrecast.py -index 7bb929b10e34..2f482902c1ce 100644 ---- a/src/Mod/Arch/ArchPrecast.py -+++ b/src/Mod/Arch/ArchPrecast.py -@@ -777,14 +777,14 @@ class _PrecastTaskPanel: - def __init__(self): - - import FreeCADGui -- from PySide import QtCore,QtGui,QtSvg -+ from PySide import QtCore,QtGui,QtSvgWidgets - self.form = QtGui.QWidget() - self.grid = QtGui.QGridLayout(self.form) - self.PrecastTypes = ["Beam","I-Beam","Pillar","Panel","Slab","Stairs"] - self.SlabTypes = ["Champagne","Hat"] - - # image display -- self.preview = QtSvg.QSvgWidget(":/ui/ParametersBeam.svg") -+ self.preview = QtSvgWidgets.QSvgWidget(":/ui/ParametersBeam.svg") - self.preview.setMaximumWidth(200) - self.preview.setMinimumHeight(120) - self.grid.addWidget(self.preview,0,0,1,2) -@@ -1263,7 +1263,7 @@ class _DentsTaskPanel: - def __init__(self): - - import FreeCADGui -- from PySide import QtCore,QtGui,QtSvg -+ from PySide import QtCore,QtGui,QtSvgWidgets - self.form = QtGui.QWidget() - self.grid = QtGui.QGridLayout(self.form) - self.Rotations = ["N","S","E","O"] -@@ -1282,7 +1282,7 @@ def __init__(self): - self.grid.addWidget(self.buttonRemove,2,1,1,1) - - # image display -- self.preview = QtSvg.QSvgWidget(":/ui/ParametersDent.svg") -+ self.preview = QtSvgWidgets.QSvgWidget(":/ui/ParametersDent.svg") - self.preview.setMaximumWidth(200) - self.preview.setMinimumHeight(120) - self.grid.addWidget(self.preview,3,0,1,2) -diff --git a/src/Mod/Arch/ArchWindow.py b/src/Mod/Arch/ArchWindow.py -index f3c11c5e9c7a..dc9c84f9a8bf 100644 ---- a/src/Mod/Arch/ArchWindow.py -+++ b/src/Mod/Arch/ArchWindow.py -@@ -34,7 +34,7 @@ - - if FreeCAD.GuiUp: - import FreeCADGui -- from PySide import QtCore, QtGui, QtSvg -+ from PySide import QtCore, QtGui, QtSvgWidgets - from draftutils.translate import translate - from PySide.QtCore import QT_TRANSLATE_NOOP - import draftguitools.gui_trackers as DraftTrackers -@@ -426,7 +426,7 @@ def taskbox(self): - self.pic.hide() - - # SVG display -- self.im = QtSvg.QSvgWidget(":/ui/ParametersWindowFixed.svg") -+ self.im = QtSvgWidgets.QSvgWidget(":/ui/ParametersWindowFixed.svg") - self.im.setMaximumWidth(200) - self.im.setMinimumHeight(120) - grid.addWidget(self.im,4,0,1,2) -diff --git a/src/Mod/Arch/importIFClegacy.py b/src/Mod/Arch/importIFClegacy.py -index 037e889ce5b9..256b29056b33 100644 ---- a/src/Mod/Arch/importIFClegacy.py -+++ b/src/Mod/Arch/importIFClegacy.py -@@ -1795,7 +1795,6 @@ def explorer(filename,schema="IFC2X3_TC1.exp"): - tree.headerItem().setText(1, "") - tree.headerItem().setText(2, "Item and Properties") - bold = QtGui.QFont() -- bold.setWeight(75) - bold.setBold(True) - - #print(ifc.Entities) -diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py -index c6e8584f4a71..2471bb66c61a 100644 ---- a/src/Mod/Draft/DraftGui.py -+++ b/src/Mod/Draft/DraftGui.py -@@ -312,7 +312,6 @@ def setupToolBar(self,task=False): - self.promptlabel = self._label("promptlabel", self.layout, hide=task) - self.cmdlabel = self._label("cmdlabel", self.layout, hide=task) - boldtxt = QtGui.QFont() -- boldtxt.setWeight(75) - boldtxt.setBold(True) - self.cmdlabel.setFont(boldtxt) - -diff --git a/src/Mod/Material/MaterialEditor.py b/src/Mod/Material/MaterialEditor.py -index cbcbde924609..28dbe83bc026 100644 ---- a/src/Mod/Material/MaterialEditor.py -+++ b/src/Mod/Material/MaterialEditor.py -@@ -27,7 +27,7 @@ - import os - from pathlib import PurePath - import sys --from PySide import QtCore, QtGui, QtSvg -+from PySide import QtCore, QtGui, QtSvgWidgets - - import FreeCAD - import FreeCADGui -@@ -92,11 +92,11 @@ def __init__(self, obj=None, prop=None, material=None, card_path="", category="S - treeView = widget.treeView - - # create preview svg slots -- self.widget.PreviewRender = QtSvg.QSvgWidget(self.iconPath + "preview-rendered.svg") -+ self.widget.PreviewRender = QtSvgWidgets.QSvgWidget(self.iconPath + "preview-rendered.svg") - self.widget.PreviewRender.setMaximumWidth(64) - self.widget.PreviewRender.setMinimumHeight(64) - self.widget.topLayout.addWidget(self.widget.PreviewRender) -- self.widget.PreviewVector = QtSvg.QSvgWidget(self.iconPath + "preview-vector.svg") -+ self.widget.PreviewVector = QtSvgWidgets.QSvgWidget(self.iconPath + "preview-vector.svg") - self.widget.PreviewVector.setMaximumWidth(64) - self.widget.PreviewVector.setMinimumHeight(64) - self.widget.topLayout.addWidget(self.widget.PreviewVector) diff --git a/media-gfx/freecad/files/freecad-0.21.2-shiboken-6.7.0.patch b/media-gfx/freecad/files/freecad-0.21.2-shiboken-6.7.0.patch deleted file mode 100644 index 8efd55121ee7..000000000000 --- a/media-gfx/freecad/files/freecad-0.21.2-shiboken-6.7.0.patch +++ /dev/null @@ -1,8 +0,0 @@ -https://bugs.gentoo.org/929973 ---- a/src/Gui/PythonWrapper.cpp -+++ b/src/Gui/PythonWrapper.cpp -@@ -480,3 +480,3 @@ - return false; -- types = Shiboken::Module::getTypes(requiredModule); -+ types = reinterpret_cast<PyTypeObject **>(Shiboken::Module::getTypes(requiredModule)); - } diff --git a/media-gfx/freecad/files/freecad-0.21.2-vtk9.3-fix.patch b/media-gfx/freecad/files/freecad-0.21.2-vtk9.3-fix.patch deleted file mode 100644 index b41e3618f55f..000000000000 --- a/media-gfx/freecad/files/freecad-0.21.2-vtk9.3-fix.patch +++ /dev/null @@ -1,33 +0,0 @@ -# fix for compiling with VTK 9.3 -https://github.com/FreeCAD/FreeCAD/pull/11496/commits/68d380a64e033c40fcb9a6dc322d9e0178de52ee -Bug: https://forum.freecad.org/viewtopic.php?t=82814 -patch by adrianinsaval (commited in 68d380a64e033c40fcb9a6dc322d9e0178de52ee) - ---- a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx -+++ b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx -@@ -39,10 +39,6 @@ - #define SMDS_EXPORT - #endif - --#ifdef VTK_HAS_MTIME_TYPE - #define VTK_MTIME_TYPE vtkMTimeType --#else --#define VTK_MTIME_TYPE unsigned long --#endif - - #endif ---- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp -+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp -@@ -1026,7 +1026,12 @@ void SMDS_UnstructuredGrid::BuildLinks() - GetLinks()->Allocate(this->GetNumberOfPoints()); - GetLinks()->Register(this); - //FIXME: vtk9 -+#if VTK_VERSION_NUMBER < VTK_VERSION_CHECK(9,3,0) - GetLinks()->BuildLinks(this); -+#else -+ GetLinks()->SetDataSet(this); -+ GetLinks()->BuildLinks(); -+#endif - GetLinks()->Delete(); - #else - this->links = smds_celllinks::new(); diff --git a/media-gfx/freecad/files/freecad-0.21.1-Gentoo-specific-don-t-check-vcs.patch b/media-gfx/freecad/files/freecad-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch index 3d851c341e2e..d901e47e2ca0 100644 --- a/media-gfx/freecad/files/freecad-0.21.1-Gentoo-specific-don-t-check-vcs.patch +++ b/media-gfx/freecad/files/freecad-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch @@ -1,16 +1,15 @@ -Signed-off-by: Jörg Habenicht <j.habenicht@gmx.de> --- a/src/Tools/SubWCRev.py +++ b/src/Tools/SubWCRev.py -@@ -509,12 +509,6 @@ - bindir = a - - vcs = [ -- GitControl(), -- DebianGitHub(), -- BazaarControl(), -- Subversion(), -- MercurialControl(), -- DebianChangelog(), - UnknownControl(), - ] - for i in vcs: +@@ -510,12 +510,6 @@ def main(): + bindir = a
+
+ vcs = [
+- GitControl(),
+- DebianGitHub(),
+- BazaarControl(),
+- Subversion(),
+- MercurialControl(),
+- DebianChangelog(),
+ UnknownControl(),
+ ]
+ for i in vcs:
diff --git a/media-gfx/freecad/freecad-0.21.2-r3.ebuild b/media-gfx/freecad/freecad-0.21.2-r3.ebuild deleted file mode 100644 index bf1b98990bc0..000000000000 --- a/media-gfx/freecad/freecad-0.21.2-r3.ebuild +++ /dev/null @@ -1,398 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit check-reqs cmake flag-o-matic optfeature python-single-r1 qmake-utils xdg - -DESCRIPTION="QT based Computer Aided Design application" -HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD" - -MY_PN=FreeCAD - -if [[ ${PV} = *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" - S="${WORKDIR}/freecad-${PV}" -else - SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64" - S="${WORKDIR}/FreeCAD-${PV}" -fi - -# code is licensed LGPL-2 -# examples are licensed CC-BY-SA (without note of specific version) -LICENSE="LGPL-2 CC-BY-SA-4.0" -SLOT="0" -IUSE="debug designer +gui qt6 test" - -FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl" -FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material - openscad part-design path points raytracing robot show surface - techdraw tux" - -for module in ${FREECAD_STABLE_MODULES}; do - IUSE="${IUSE} +${module}" -done -for module in ${FREECAD_EXPERIMENTAL_MODULES}; do - IUSE="${IUSE} ${module}" -done -unset module - -RESTRICT="!test? ( test )" - -RDEPEND=" - ${PYTHON_DEPS} - dev-libs/OpenNI2[opengl(+)] - dev-libs/boost:= - dev-libs/libfmt:= - dev-libs/libspnav[X] - dev-libs/xerces-c[icu] - !qt6? ( - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - dev-qt/qtxml:5 - dev-qt/qtxmlpatterns:5 - ) - qt6? ( - dev-qt/qtbase:6[concurrent,network,xml] - ) - media-libs/freetype - media-libs/qhull:= - sci-libs/hdf5:=[fortran,zlib] - >=sci-libs/med-4.0.0-r1 - <sci-libs/opencascade-7.8.0:=[json,vtk] - sci-libs/orocos_kdl:= - sys-libs/zlib - virtual/libusb:1 - cloud? ( - dev-libs/openssl:= - net-misc/curl - ) - fem? ( - !qt6? ( sci-libs/vtk:=[qt5,rendering] ) - qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] ) - ) - gui? ( - >=media-libs/coin-4.0.0 - virtual/glu - virtual/opengl - !qt6? ( - dev-qt/designer:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - pcl? ( sci-libs/pcl[qt5] ) - $(python_gen_cond_dep ' - dev-python/matplotlib[${PYTHON_USEDEP}] - >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] - dev-python/pyside2:=[gui,svg,webchannel,webengine,${PYTHON_USEDEP}] - dev-python/shiboken2:=[${PYTHON_USEDEP}] - ' python3_{10..11} ) - ) - qt6? ( - sci-libs/opencascade[-inspector(-)] - designer? ( dev-qt/qttools:6[designer] ) - dev-qt/qt5compat:6 - dev-qt/qttools:6[widgets] - dev-qt/qtbase:6[gui,opengl,widgets] - dev-qt/qtsvg:6 - dev-qt/qtwebengine:6[widgets] - pcl? ( sci-libs/pcl[-qt5,qt6(-)] ) - $(python_gen_cond_dep ' - dev-python/matplotlib[${PYTHON_USEDEP}] - >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] - dev-python/pyside6:=[gui,svg,webchannel,webengine,${PYTHON_USEDEP}] - dev-python/shiboken6:=[${PYTHON_USEDEP}] - ' ) - ) - ) - netgen? ( media-gfx/netgen[opencascade] ) - openscad? ( media-gfx/openscad ) - pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] ) - fem? ( dev-python/ply[${PYTHON_USEDEP}] ) - ') -" -DEPEND=" - ${RDEPEND} - >=dev-cpp/eigen-3.3.1:3 - test? ( - $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - !qt6? ( dev-qt/qttest:5 ) - ) -" -BDEPEND=" - app-text/dos2unix - dev-lang/swig - test? ( - $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - !qt6? ( dev-qt/qttest:5 ) - ) -" - -# To get required dependencies: -# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake' -# We set the following requirements by default: -# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, web. -# -# Additionally, we auto-enable mesh_part, flat_mesh and smesh -# Fem actually needs smesh, but as long as we don't have a smesh package, we enable -# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't -# reflected by the REQUIRES_MODS macro, but at -# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187. -# -# The increase in auto-enabled workbenches is due to their need in parts of the -# test suite when compiled with a minimal set of USE flags. -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - designer? ( gui ) - inspection? ( points ) - path? ( robot ) - python_single_target_python3_12? ( gui? ( qt6 ) ) -" -# There is no py3.12 support planned for pyside2 - -PATCHES=( - "${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch - "${FILESDIR}"/${PN}-0.21.1-Gentoo-specific-don-t-check-vcs.patch - "${FILESDIR}"/${PN}-0.21.2-vtk9.3-fix.patch - "${FILESDIR}"/${PN}-0.21.2-boost-175-1.patch - "${FILESDIR}"/${PN}-0.21.2-boost-175-2.patch - "${FILESDIR}"/${PN}-0.21.2-boost-175-3.patch -) - -DOCS=( CODE_OF_CONDUCT.md README.md ) - -CHECKREQS_DISK_BUILD="2G" - -pkg_setup() { - check-reqs_pkg_setup - python-single-r1_pkg_setup - [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect opencascade" -} - -src_prepare() { - # Fix desktop file - sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die - - find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert to unix line endings" - - if has_version ">=dev-python/shiboken6-6.7.0"; then - # https://bugs.gentoo.org/929973 - eapply "${FILESDIR}/${PN}-0.21.2-shiboken-6.7.0.patch" - fi - - if use qt6; then - eapply "${FILESDIR}/${PN}-0.21.2-navcube-qt6.patch" - eapply "${FILESDIR}/${PN}-0.21.2-qtsvg-qt6.patch" - eapply "${FILESDIR}/${PN}-0.21.2-py312-qt6.patch" - fi - - cmake_src_prepare -} - -src_configure() { - # -Werror=odr, -Werror=lto-type-mismatch - # https://bugs.gentoo.org/875221 - # https://github.com/FreeCAD/FreeCAD/issues/13173 - filter-lto - - local mycmakeargs=( - -DBUILD_ADDONMGR=$(usex addonmgr) - -DBUILD_ARCH=ON - -DBUILD_ASSEMBLY=OFF # deprecated - -DBUILD_CLOUD=$(usex cloud) - -DBUILD_COMPLETE=OFF # deprecated - -DBUILD_DRAFT=ON - -DBUILD_DESIGNER_PLUGIN=$(usex designer) - -DBUILD_ENABLE_CXX_STD:STRING="C++17" # needed for >=boost-1.77.0 - -DBUILD_FEM=$(usex fem) - -DBUILD_FEM_NETGEN=$(usex netgen) - -DBUILD_FLAT_MESH=ON - -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory - -DBUILD_FREETYPE=ON # automagic dep - -DBUILD_GUI=$(usex gui) - -DBUILD_IDF=$(usex idf) - -DBUILD_IMAGE=$(usex image) - -DBUILD_IMPORT=ON # import module for various file formats - -DBUILD_INSPECTION=$(usex inspection) - -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there - -DBUILD_MATERIAL=$(usex material) - -DBUILD_MESH=ON - -DBUILD_MESH_PART=ON - -DBUILD_OPENSCAD=$(usex openscad) - -DBUILD_PART=ON - -DBUILD_PART_DESIGN=$(usex part-design) - -DBUILD_PATH=$(usex path) - -DBUILD_POINTS=$(usex points) - -DBUILD_RAYTRACING=$(usex raytracing) - -DBUILD_REVERSEENGINEERING=OFF # currently only an empty sandbox - -DBUILD_ROBOT=$(usex robot) - -DBUILD_SHOW=$(usex show) - -DBUILD_SKETCHER=ON # needed by draft workspace - -DBUILD_SMESH=ON - -DBUILD_SPREADSHEET=ON - -DBUILD_START=ON - -DBUILD_SURFACE=$(usex surface) - -DBUILD_TECHDRAW=$(usex techdraw) - -DBUILD_TEST=ON # always build test workbench for run-time testing - -DBUILD_TUX=$(usex tux) - -DBUILD_VR=OFF - -DBUILD_WEB=ON # needed by start workspace - -DBUILD_WITH_CONDA=OFF - - -DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} - -DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN} - -DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN} - - -DFREECAD_BUILD_DEBIAN=OFF - - -DFREECAD_USE_EXTERNAL_KDL=ON - -DFREECAD_USE_EXTERNAL_SMESH=OFF # no package in Gentoo - -DFREECAD_USE_EXTERNAL_ZIPIOS=OFF # doesn't work yet, also no package in Gentoo tree - -DFREECAD_USE_FREETYPE=ON - -DFREECAD_USE_OCC_VARIANT:STRING="Official Version" - -DFREECAD_USE_PCL=$(usex pcl) - -DFREECAD_USE_PYBIND11=ON - -DFREECAD_USE_QT_FILEDIALOG=ON - -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine" - - # install python modules to site-packages' dir. True only for the main package, - # sub-packages will still be installed inside /usr/lib64/freecad - -DINSTALL_TO_SITEPACKAGES=ON - - # Use the version of shiboken2 that matches the selected python version - -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" - -DPython3_EXECUTABLE=${PYTHON} - ) - - if use debug; then - # BUILD_SANDBOX currently broken, see - # https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595 - mycmakeargs+=( - -DBUILD_SANDBOX=OFF - -DBUILD_TEMPLATE=ON - ) - else - mycmakeargs+=( - -DBUILD_SANDBOX=OFF - -DBUILD_TEMPLATE=OFF - ) - fi - - if use qt6; then - mycmakeargs+=( - -DFREECAD_QT_MAJOR_VERSION=6 - -DFREECAD_QT_VERSION=6 - -DQT_DEFAULT_MAJOR_VERSION=6 - -DQt6Core_MOC_EXECUTABLE="$(qt6_get_bindir)/moc" - -DQt6Core_RCC_EXECUTABLE="$(qt6_get_bindir)/rcc" - -DBUILD_QT5=OFF - # Drawing module unmaintained and not ported to qt6 - -DBUILD_DRAWING=OFF - ) - else - mycmakeargs+=( - -DFREECAD_QT_MAJOR_VERSION=5 - -DFREECAD_QT_VERSION=5 - -DQT_DEFAULT_MAJOR_VERSION=5 - -DQt5Core_MOC_EXECUTABLE="$(qt5_get_bindir)/moc" - -DQt5Core_RCC_EXECUTABLE="$(qt5_get_bindir)/rcc" - -DBUILD_QT5=ON - # Drawing module unmaintained and not ported to qt6 - -DBUILD_DRAWING=ON - ) - fi - - cmake_src_configure -} - -# We use the FreeCADCmd binary instead of the FreeCAD binary here -# for two reasons: -# 1. It works out of the box with USE=-gui as well, not needing a guard -# 2. We don't need virtualx.eclass and it's dependencies -# The exported environment variables are needed, so freecad does know -# where to save it's temporary files, and where to look and write it's -# configuration. Without those, there are sandbox violation, when it -# tries to create /var/lib/portage/home/.FreeCAD directory. -src_test() { - pushd "${BUILD_DIR}" > /dev/null || die - export FREECAD_USER_HOME="${HOME}" - export FREECAD_USER_DATA="${T}" - export FREECAD_USER_TEMP="${T}" - nonfatal ./bin/FreeCADCmd --run-test 0 - popd > /dev/null || die -} - -src_install() { - cmake_src_install - - dobin src/Tools/freecad-thumbnailer - - if use gui; then - newbin - freecad <<- _EOF_ - #!/bin/sh - # https://github.com/coin3d/coin/issues/451 - : \${QT_QPA_PLATFORM:=xcb} - export QT_QPA_PLATFORM - exec /usr/$(get_libdir)/${PN}/bin/FreeCAD \${@} - _EOF_ - mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources" - fi - dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd - - rm -r "${ED}"/usr/$(get_libdir)/${PN}/include/E57Format || die "failed to drop unneeded include directory E57Format" - use test && (rm -r "${ED}"/usr/include/${PN}/{gmock,gtest} || die) - - python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/ - # compile main package in python site-packages as well - python_optimize -} - -pkg_postinst() { - xdg_pkg_postinst - - einfo "You can load a lot of additional workbenches using the integrated" - einfo "AddonManager." - - # ToDo: check opencv, pysolar (::science), elmerfem (::science) - # ifc++, ifcopenshell, z88 (no pkgs), calculix-ccx (::waebbl) - einfo "There are a lot of additional tools, for which FreeCAD has builtin" - einfo "support. Some of them are available in Gentoo. Take a look at" - einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD" - optfeature_header "Computational utilities" - optfeature "BLAS library" sci-libs/openblas - optfeature "Statistical computation with Python" dev-python/pandas - optfeature "Use scientific computation with Python" dev-python/scipy - optfeature "Use symbolic math with Python" dev-python/sympy - optfeature_header "Imaging, Plotting and Rendering utilities" - optfeature "Dependency graphs" media-gfx/graphviz - optfeature "PBR Rendering" media-gfx/povray - optfeature_header "Import / Export" - optfeature "Interact with git repositories" dev-python/GitPython - optfeature "Work with COLLADA documents" dev-python/pycollada - optfeature "YAML importer and emitter" dev-python/pyyaml - optfeature "Importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg - optfeature "Importing and exporting geospatial data formats" sci-libs/gdal - optfeature "Working with projection data" sci-libs/proj - optfeature_header "Meshing and FEM" - optfeature "FEM mesh generator" sci-libs/gmsh - optfeature "Triangulating meshes" sci-libs/gts - optfeature "Visualization" sci-visualization/paraview -} - -pkg_postrm() { - xdg_pkg_postrm -} diff --git a/media-gfx/freecad/freecad-1.0.0-r1.ebuild b/media-gfx/freecad/freecad-1.0.0-r1.ebuild new file mode 100644 index 000000000000..4e4522a105d2 --- /dev/null +++ b/media-gfx/freecad/freecad-1.0.0-r1.ebuild @@ -0,0 +1,303 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit check-reqs cmake flag-o-matic optfeature python-single-r1 qmake-utils xdg + +DESCRIPTION="Qt based Computer Aided Design application" +HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD" + +MY_PN=FreeCAD + +if [[ ${PV} == *9999* ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" + S="${WORKDIR}/freecad-${PV}" +else + SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" + S="${WORKDIR}/FreeCAD-${PV}" +fi + +# code is licensed LGPL-2 +# examples are licensed CC-BY-SA (without note of specific version) +LICENSE="LGPL-2 CC-BY-SA-4.0" +SLOT="0" +IUSE="debug designer +gui netgen pcl +smesh spacenav test X" +# Modules are found in src/Mod/ and their options defined in: +# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake +# To get their dependencies: +# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake' +IUSE+=" addonmgr +bim cam cloud fem idf inspection +mesh openscad points reverse robot surface +techdraw" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + bim? ( mesh ) + cam? ( mesh ) + gui? ( bim ) + designer? ( gui ) + fem? ( smesh ) + inspection? ( points ) + mesh? ( smesh ) + openscad? ( mesh ) + reverse? ( mesh points ) + test? ( techdraw ) +" +# Draft Workbench needs BIM + +RESTRICT="!test? ( test )" + +RDEPEND=" + ${PYTHON_DEPS} + dev-cpp/gtest + dev-cpp/yaml-cpp + dev-libs/boost:= + dev-libs/libfmt:= + dev-libs/xerces-c[icu] + dev-qt/qtbase:6[concurrent,network,xml] + media-libs/freetype + sci-libs/opencascade:=[json] + sys-libs/zlib + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + ') + cloud? ( + dev-libs/openssl:= + net-misc/curl + ) + fem? ( + sci-libs/vtk:= + $(python_gen_cond_dep 'dev-python/ply[${PYTHON_USEDEP}]') + ) + gui? ( + >=media-libs/coin-4.0.0 + dev-qt/qtbase:6[gui,opengl,widgets] + dev-qt/qtsvg:6 + dev-qt/qttools:6[designer?,widgets] + $(python_gen_cond_dep ' + dev-python/matplotlib[${PYTHON_USEDEP}] + >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] + dev-python/pyside6:=[designer,gui,svg,${PYTHON_USEDEP}] + dev-python/shiboken6:=[${PYTHON_USEDEP}] + ' ) + virtual/glu + virtual/opengl + spacenav? ( dev-libs/libspnav[X?] ) + ) + netgen? ( media-gfx/netgen[opencascade] ) + openscad? ( $(python_gen_cond_dep 'dev-python/ply[${PYTHON_USEDEP}]') ) + pcl? ( sci-libs/pcl:= ) + smesh? ( + sci-libs/hdf5:=[zlib] + >=sci-libs/med-4.0.0-r1 + sci-libs/vtk:= + ) +" +DEPEND="${RDEPEND} + >=dev-cpp/eigen-3.3.1:3 + dev-cpp/ms-gsl +" +BDEPEND=" + dev-lang/swig + test? ( dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch + "${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch + "${FILESDIR}"/${PN}-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch +) + +DOCS=( CODE_OF_CONDUCT.md README.md ) + +CHECKREQS_DISK_BUILD="2G" + +pkg_setup() { + check-reqs_pkg_setup + python-single-r1_pkg_setup +} + +src_prepare() { + # Fix desktop file + sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecad.FreeCAD.desktop || die + + cmake_src_prepare +} + +src_configure() { + # -Werror=odr, -Werror=lto-type-mismatch + # https://bugs.gentoo.org/875221 + # https://github.com/FreeCAD/FreeCAD/issues/13173 + filter-lto + + # Fix building tests + append-ldflags -Wl,--copy-dt-needed-entries + + local mycmakeargs=( + -DBUILD_DESIGNER_PLUGIN=$(usex designer) + -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory + -DBUILD_GUI=$(usex gui) + -DBUILD_SMESH=$(usex smesh) + -DBUILD_VR=OFF + -DBUILD_WITH_CONDA=OFF + + # Modules + -DBUILD_ADDONMGR=$(usex addonmgr) + -DBUILD_ASSEMBLY=OFF # Requires OndselSolver + -DBUILD_BIM=$(usex bim) + -DBUILD_CAM=$(usex cam) + -DBUILD_CLOUD=$(usex cloud) + -DBUILD_DRAFT=ON + # see below for DRAWING + -DBUILD_FEM=$(usex fem) + -DBUILD_FEM_NETGEN=$(usex fem $(usex netgen)) + -DBUILD_FLAT_MESH=$(usex mesh) # a submodule of MeshPart + -DBUILD_HELP=ON + -DBUILD_IDF=$(usex idf) + -DBUILD_IMPORT=ON # import module for various file formats + -DBUILD_INSPECTION=$(usex inspection) + -DBUILD_JTREADER=OFF # uses an old proprietary library + -DBUILD_MATERIAL=ON + -DBUILD_MEASURE=ON + -DBUILD_MESH=$(usex mesh) + -DBUILD_MESH_PART=$(usex mesh) + -DBUILD_OPENSCAD=$(usex openscad) + -DBUILD_PART=ON + -DBUILD_PART_DESIGN=ON + -DBUILD_PLOT=ON + -DBUILD_POINTS=$(usex points) + -DBUILD_REVERSEENGINEERING=$(usex reverse) + -DBUILD_ROBOT=$(usex robot) + -DBUILD_SANDBOX=OFF + -DBUILD_SHOW=$(usex gui) + -DBUILD_SKETCHER=ON # needed by draft workspace + -DBUILD_SPREADSHEET=ON + -DBUILD_START=ON + -DBUILD_SURFACE=$(usex surface) + -DBUILD_TECHDRAW=$(usex techdraw) + -DBUILD_TEST=ON # always build test workbench for run-time testing + -DBUILD_TUX=$(usex gui) + -DBUILD_WEB=ON # needed by start workspace + + -DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} + -DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN} + -DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN} + + -DFREECAD_BUILD_DEBIAN=OFF + + -DFREECAD_USE_EXTERNAL_SMESH=OFF # no package in Gentoo + -DFREECAD_USE_EXTERNAL_ZIPIOS=OFF # doesn't work yet, also no package in Gentoo tree + -DFREECAD_USE_FREETYPE=ON + -DFREECAD_USE_OCC_VARIANT:STRING="Official Version" + -DFREECAD_USE_PCL=$(usex pcl) + -DFREECAD_USE_PYBIND11=ON + -DFREECAD_USE_QT_FILEDIALOG=ON + + # install python modules to site-packages' dir. True only for the main package, + # sub-packages will still be installed inside /usr/lib64/freecad + -DINSTALL_TO_SITEPACKAGES=ON + + # Use the version of shiboken2 that matches the selected python version + -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" + -DPython3_EXECUTABLE=${PYTHON} + ) + + if use debug; then + # BUILD_SANDBOX currently broken, see + # https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595 + mycmakeargs+=( + -DBUILD_SANDBOX=OFF + -DBUILD_TEMPLATE=ON + ) + else + mycmakeargs+=( + -DBUILD_SANDBOX=OFF + -DBUILD_TEMPLATE=OFF + ) + fi + + if use gui; then + mycmakeargs+=( + -DFREECAD_QT_MAJOR_VERSION=6 + -DFREECAD_QT_VERSION=6 + -DQT_DEFAULT_MAJOR_VERSION=6 + -DQt6Core_MOC_EXECUTABLE="$(qt6_get_bindir)/moc" + -DQt6Core_RCC_EXECUTABLE="$(qt6_get_bindir)/rcc" + -DBUILD_QT5=OFF + # Drawing module unmaintained and not ported to qt6 + -DBUILD_DRAWING=OFF + ) + fi + + cmake_src_configure +} + +# We use the FreeCADCmd binary instead of the FreeCAD binary here +# for two reasons: +# 1. It works out of the box with USE=-gui as well, not needing a guard +# 2. We don't need virtualx.eclass and its dependencies +# The environment variables are needed, so that FreeCAD knows +# where to save its temporary files, and where to look and write its +# configuration. Without those, there is a sandbox violation, when it +# tries to create /var/lib/portage/home/.FreeCAD directory. +src_test() { + cd "${BUILD_DIR}" || die + + local -x FREECAD_USER_HOME="${HOME}" + local -x FREECAD_USER_DATA="${T}" + local -x FREECAD_USER_TEMP="${T}" + ./bin/FreeCADCmd --run-test 0 --set-config AppHomePath="${BUILD_DIR}/" || die +} + +src_install() { + cmake_src_install + + dobin src/Tools/freecad-thumbnailer + + if use gui; then + newbin - freecad <<- _EOF_ + #!/bin/sh + # https://github.com/coin3d/coin/issues/451 + : "\${QT_QPA_PLATFORM:=xcb}" + export QT_QPA_PLATFORM + exec /usr/$(get_libdir)/${PN}/bin/FreeCAD "\${@}" + _EOF_ + mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources" + fi + dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd + + rm -r "${ED}"/usr/$(get_libdir)/${PN}/include/E57Format || die "failed to drop unneeded include directory E57Format" + + python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/ + # compile main package in python site-packages as well + python_optimize +} + +pkg_postinst() { + xdg_pkg_postinst + + einfo "You can load a lot of additional workbenches using the integrated" + einfo "AddonManager." + + einfo "There are a lot of additional tools, for which FreeCAD has builtin" + einfo "support. Some of them are available in Gentoo. Take a look at" + einfo "https://wiki.freecad.org/Installing_additional_components" + optfeature_header "External programs used by FreeCAD" + optfeature "dependency graphs" media-gfx/graphviz + optfeature "importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg + optfeature "importing OpenSCAD files, Mesh booleans" media-gfx/openscad + use bim && optfeature "working with COLLADA documents" dev-python/pycollada + if use fem || use mesh; then + optfeature "mesh generation" sci-libs/gmsh + fi +} + +pkg_postrm() { + xdg_pkg_postrm +} diff --git a/media-gfx/freecad/freecad-1.0.0.ebuild b/media-gfx/freecad/freecad-1.0.0.ebuild index 81368b437086..0807027c8d44 100644 --- a/media-gfx/freecad/freecad-1.0.0.ebuild +++ b/media-gfx/freecad/freecad-1.0.0.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} = *9999 ]]; then S="${WORKDIR}/freecad-${PV}" else SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64" + KEYWORDS="amd64" S="${WORKDIR}/FreeCAD-${PV}" fi @@ -26,7 +26,7 @@ fi # examples are licensed CC-BY-SA (without note of specific version) LICENSE="LGPL-2 CC-BY-SA-4.0" SLOT="0" -IUSE="debug designer +gui +qt6 test" +IUSE="debug designer +gui qt5 test" FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl" FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material @@ -53,14 +53,14 @@ RDEPEND=" dev-libs/libspnav[X] dev-libs/xerces-c[icu] dev-ruby/asciidoctor - !qt6? ( + qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtxml:5 dev-qt/qtxmlpatterns:5 ) - qt6? ( + !qt5? ( dev-qt/qtbase:6[concurrent,network,xml] ) media-libs/freetype @@ -76,14 +76,14 @@ RDEPEND=" net-misc/curl ) fem? ( - !qt6? ( sci-libs/vtk:=[qt5,rendering] ) - qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] ) + qt5? ( sci-libs/vtk:=[qt5,rendering] ) + !qt5? ( sci-libs/vtk:=[-qt5,qt6,rendering] ) ) gui? ( >=media-libs/coin-4.0.0 virtual/glu virtual/opengl - !qt6? ( + qt5? ( dev-qt/designer:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 @@ -99,7 +99,7 @@ RDEPEND=" dev-python/shiboken2:=[${PYTHON_USEDEP}] ' python3_{10..11} ) ) - qt6? ( + !qt5? ( designer? ( dev-qt/qttools:6[designer] ) dev-qt/qt5compat:6 dev-qt/qttools:6[widgets] @@ -118,13 +118,13 @@ RDEPEND=" openscad? ( media-gfx/openscad ) pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) smesh? ( - !qt6? ( sci-libs/vtk:=[qt5] ) - qt6? ( sci-libs/vtk:=[-qt5,qt6] ) + qt5? ( sci-libs/vtk:=[qt5] ) + !qt5? ( sci-libs/vtk:=[-qt5,qt6] ) ) $(python_gen_cond_dep ' dev-python/numpy[${PYTHON_USEDEP}] dev-python/pybind11[${PYTHON_USEDEP}] - addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] ) + addonmgr? ( dev-python/gitpython[${PYTHON_USEDEP}] ) fem? ( dev-python/ply[${PYTHON_USEDEP}] ) ') " @@ -133,7 +133,7 @@ DEPEND="${RDEPEND} dev-cpp/ms-gsl test? ( $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - !qt6? ( dev-qt/qttest:5 ) + qt5? ( dev-qt/qttest:5 ) ) " BDEPEND=" @@ -141,7 +141,7 @@ BDEPEND=" dev-lang/swig test? ( $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - !qt6? ( dev-qt/qttest:5 ) + qt5? ( dev-qt/qttest:5 ) dev-cpp/gtest ) " @@ -164,7 +164,7 @@ REQUIRED_USE=" designer? ( gui ) inspection? ( points ) path? ( robot ) - python_single_target_python3_12? ( gui? ( qt6 ) ) + python_single_target_python3_12? ( gui? ( !qt5 ) ) " # There is no py3.12 support planned for pyside2 @@ -285,7 +285,7 @@ src_configure() { ) fi - if use qt6; then + if ! use qt5; then mycmakeargs+=( -DFREECAD_QT_MAJOR_VERSION=6 -DFREECAD_QT_VERSION=6 @@ -373,7 +373,7 @@ pkg_postinst() { optfeature "Dependency graphs" media-gfx/graphviz optfeature "PBR Rendering" media-gfx/povray optfeature_header "Import / Export" - optfeature "Interact with git repositories" dev-python/GitPython + optfeature "Interact with git repositories" dev-python/gitpython optfeature "Work with COLLADA documents" dev-python/pycollada optfeature "YAML importer and emitter" dev-python/pyyaml optfeature "Importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index b323eccffe9b..247dc135f22e 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -7,12 +7,12 @@ PYTHON_COMPAT=( python3_{10..12} ) inherit check-reqs cmake flag-o-matic optfeature python-single-r1 qmake-utils xdg -DESCRIPTION="QT based Computer Aided Design application" +DESCRIPTION="Qt based Computer Aided Design application" HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD" MY_PN=FreeCAD -if [[ ${PV} = *9999 ]]; then +if [[ ${PV} == *9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git" S="${WORKDIR}/freecad-${PV}" @@ -26,20 +26,27 @@ fi # examples are licensed CC-BY-SA (without note of specific version) LICENSE="LGPL-2 CC-BY-SA-4.0" SLOT="0" -IUSE="debug designer +gui +qt6 test" - -FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl" -FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material - openscad part-design path points raytracing robot show smesh - surface techdraw tux" +IUSE="debug designer +gui netgen pcl +smesh spacenav test X" +# Modules are found in src/Mod/ and their options defined in: +# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake +# To get their dependencies: +# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake' +IUSE+=" addonmgr +bim cam cloud fem idf inspection +mesh openscad points reverse robot surface +techdraw" -for module in ${FREECAD_STABLE_MODULES}; do - IUSE="${IUSE} +${module}" -done -for module in ${FREECAD_EXPERIMENTAL_MODULES}; do - IUSE="${IUSE} ${module}" -done -unset module +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + bim? ( mesh ) + cam? ( mesh ) + gui? ( bim ) + designer? ( gui ) + fem? ( smesh ) + inspection? ( points ) + mesh? ( smesh ) + openscad? ( mesh ) + reverse? ( mesh points ) + test? ( techdraw ) +" +# Draft Workbench needs BIM RESTRICT="!test? ( test )" @@ -47,127 +54,59 @@ RDEPEND=" ${PYTHON_DEPS} dev-cpp/gtest dev-cpp/yaml-cpp - dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libfmt:= - dev-libs/libspnav[X] dev-libs/xerces-c[icu] - dev-ruby/asciidoctor - !qt6? ( - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtnetwork:5 - dev-qt/qtxml:5 - dev-qt/qtxmlpatterns:5 - ) - qt6? ( - dev-qt/qtbase:6[concurrent,network,xml] - ) + dev-qt/qtbase:6[concurrent,network,xml] media-libs/freetype - media-libs/qhull:= - sci-libs/hdf5:=[fortran,zlib] - >=sci-libs/med-4.0.0-r1 - sci-libs/opencascade:=[json,vtk] - sci-libs/orocos_kdl:= + sci-libs/opencascade:=[json] sys-libs/zlib - virtual/libusb:1 + $(python_gen_cond_dep ' + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + ') cloud? ( dev-libs/openssl:= net-misc/curl ) fem? ( - !qt6? ( sci-libs/vtk:=[qt5,rendering] ) - qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] ) + sci-libs/vtk:= + $(python_gen_cond_dep 'dev-python/ply[${PYTHON_USEDEP}]') ) gui? ( >=media-libs/coin-4.0.0 + dev-qt/qtbase:6[gui,opengl,widgets] + dev-qt/qtsvg:6 + dev-qt/qttools:6[designer?,widgets] + $(python_gen_cond_dep ' + dev-python/matplotlib[${PYTHON_USEDEP}] + >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] + dev-python/pyside6:=[designer,gui,svg,${PYTHON_USEDEP}] + dev-python/shiboken6:=[${PYTHON_USEDEP}] + ' ) virtual/glu virtual/opengl - !qt6? ( - dev-qt/designer:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - pcl? ( sci-libs/pcl[qt5] ) - $(python_gen_cond_dep ' - dev-python/matplotlib[${PYTHON_USEDEP}] - >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] - dev-python/pyside2:=[gui,svg,webchannel,${PYTHON_USEDEP}] - dev-python/shiboken2:=[${PYTHON_USEDEP}] - ' python3_{10..11} ) - ) - qt6? ( - designer? ( dev-qt/qttools:6[designer] ) - dev-qt/qt5compat:6 - dev-qt/qttools:6[widgets] - dev-qt/qtbase:6[gui,opengl,widgets] - dev-qt/qtsvg:6 - pcl? ( sci-libs/pcl[-qt5,qt6(-)] ) - $(python_gen_cond_dep ' - dev-python/matplotlib[${PYTHON_USEDEP}] - >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] - dev-python/pyside6:=[gui,svg,webchannel,${PYTHON_USEDEP}] - dev-python/shiboken6:=[${PYTHON_USEDEP}] - ' ) - ) + spacenav? ( dev-libs/libspnav[X?] ) ) netgen? ( media-gfx/netgen[opencascade] ) - openscad? ( media-gfx/openscad ) - pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] ) + openscad? ( $(python_gen_cond_dep 'dev-python/ply[${PYTHON_USEDEP}]') ) + pcl? ( sci-libs/pcl:= ) smesh? ( - !qt6? ( sci-libs/vtk:=[qt5] ) - qt6? ( sci-libs/vtk:=[-qt5,qt6] ) + sci-libs/hdf5:=[zlib] + >=sci-libs/med-4.0.0-r1 + sci-libs/vtk:= ) - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/pybind11[${PYTHON_USEDEP}] - addonmgr? ( dev-python/GitPython[${PYTHON_USEDEP}] ) - fem? ( dev-python/ply[${PYTHON_USEDEP}] ) - ') " DEPEND="${RDEPEND} >=dev-cpp/eigen-3.3.1:3 dev-cpp/ms-gsl - test? ( - $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - !qt6? ( dev-qt/qttest:5 ) - ) " BDEPEND=" - app-text/dos2unix dev-lang/swig - test? ( - $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]') - !qt6? ( dev-qt/qttest:5 ) - dev-cpp/gtest - ) + test? ( dev-cpp/gtest ) " -# To get required dependencies: -# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake' -# We set the following requirements by default: -# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, web. -# -# Additionally, we auto-enable mesh_part, flat_mesh and smesh -# Fem actually needs smesh, but as long as we don't have a smesh package, we enable -# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't -# reflected by the REQUIRES_MODS macro, but at -# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187. -# -# The increase in auto-enabled workbenches is due to their need in parts of the -# test suite when compiled with a minimal set of USE flags. -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - designer? ( gui ) - inspection? ( points ) - path? ( robot ) - python_single_target_python3_12? ( gui? ( qt6 ) ) -" -# There is no py3.12 support planned for pyside2 - PATCHES=( "${FILESDIR}"/${PN}-9999-Gentoo-specific-don-t-check-vcs.patch "${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch @@ -181,15 +120,12 @@ CHECKREQS_DISK_BUILD="2G" pkg_setup() { check-reqs_pkg_setup python-single-r1_pkg_setup - [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect opencascade" } src_prepare() { # Fix desktop file sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecad.FreeCAD.desktop || die - find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert to unix line endings" - cmake_src_prepare } @@ -203,48 +139,50 @@ src_configure() { append-ldflags -Wl,--copy-dt-needed-entries local mycmakeargs=( + -DBUILD_DESIGNER_PLUGIN=$(usex designer) + -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory + -DBUILD_GUI=$(usex gui) + -DBUILD_SMESH=$(usex smesh) + -DBUILD_VR=OFF + -DBUILD_WITH_CONDA=OFF + + # Modules -DBUILD_ADDONMGR=$(usex addonmgr) - -DBUILD_ARCH=ON - -DBUILD_ASSEMBLY=OFF # Requires OndselSolver + -DBUILD_ASSEMBLY=OFF # Requires OndselSolver + -DBUILD_BIM=$(usex bim) + -DBUILD_CAM=$(usex cam) -DBUILD_CLOUD=$(usex cloud) - -DBUILD_COMPLETE=OFF # deprecated -DBUILD_DRAFT=ON - -DBUILD_DESIGNER_PLUGIN=$(usex designer) - -DBUILD_ENABLE_CXX_STD:STRING="C++17" # needed for current git master + # see below for DRAWING -DBUILD_FEM=$(usex fem) - -DBUILD_FEM_NETGEN=$(usex netgen) - -DBUILD_FLAT_MESH=ON - -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory - -DBUILD_FREETYPE=ON # automagic dep - -DBUILD_GUI=$(usex gui) + -DBUILD_FEM_NETGEN=$(usex fem $(usex netgen)) + -DBUILD_FLAT_MESH=$(usex mesh) # a submodule of MeshPart + -DBUILD_HELP=ON -DBUILD_IDF=$(usex idf) - -DBUILD_IMAGE=$(usex image) -DBUILD_IMPORT=ON # import module for various file formats -DBUILD_INSPECTION=$(usex inspection) - -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there - -DBUILD_MATERIAL=$(usex material) - -DBUILD_MESH=ON - -DBUILD_MESH_PART=ON + -DBUILD_JTREADER=OFF # uses an old proprietary library + -DBUILD_MATERIAL=ON + -DBUILD_MEASURE=ON + -DBUILD_MESH=$(usex mesh) + -DBUILD_MESH_PART=$(usex mesh) -DBUILD_OPENSCAD=$(usex openscad) -DBUILD_PART=ON - -DBUILD_PART_DESIGN=$(usex part-design) - -DBUILD_PATH=$(usex path) + -DBUILD_PART_DESIGN=ON + -DBUILD_PLOT=ON -DBUILD_POINTS=$(usex points) - -DBUILD_RAYTRACING=$(usex raytracing) - -DBUILD_REVERSEENGINEERING=OFF # currently only an empty sandbox + -DBUILD_REVERSEENGINEERING=$(usex reverse) -DBUILD_ROBOT=$(usex robot) - -DBUILD_SHOW=$(usex show) + -DBUILD_SANDBOX=OFF + -DBUILD_SHOW=$(usex gui) -DBUILD_SKETCHER=ON # needed by draft workspace - -DBUILD_SMESH=$(usex smesh) -DBUILD_SPREADSHEET=ON -DBUILD_START=ON -DBUILD_SURFACE=$(usex surface) -DBUILD_TECHDRAW=$(usex techdraw) -DBUILD_TEST=ON # always build test workbench for run-time testing - -DBUILD_TUX=$(usex tux) - -DBUILD_VR=OFF + -DBUILD_TUX=$(usex gui) -DBUILD_WEB=ON # needed by start workspace - -DBUILD_WITH_CONDA=OFF -DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF} @@ -253,7 +191,6 @@ src_configure() { -DFREECAD_BUILD_DEBIAN=OFF - -DFREECAD_USE_EXTERNAL_KDL=ON -DFREECAD_USE_EXTERNAL_SMESH=OFF # no package in Gentoo -DFREECAD_USE_EXTERNAL_ZIPIOS=OFF # doesn't work yet, also no package in Gentoo tree -DFREECAD_USE_FREETYPE=ON @@ -285,7 +222,7 @@ src_configure() { ) fi - if use qt6; then + if use gui; then mycmakeargs+=( -DFREECAD_QT_MAJOR_VERSION=6 -DFREECAD_QT_VERSION=6 @@ -296,17 +233,6 @@ src_configure() { # Drawing module unmaintained and not ported to qt6 -DBUILD_DRAWING=OFF ) - else - mycmakeargs+=( - -DFREECAD_QT_MAJOR_VERSION=5 - -DFREECAD_QT_VERSION=5 - -DQT_DEFAULT_MAJOR_VERSION=5 - -DQt5Core_MOC_EXECUTABLE="$(qt5_get_bindir)/moc" - -DQt5Core_RCC_EXECUTABLE="$(qt5_get_bindir)/rcc" - -DBUILD_QT5=ON - # Drawing module unmaintained and not ported to qt6 - -DBUILD_DRAWING=ON - ) fi cmake_src_configure @@ -315,18 +241,18 @@ src_configure() { # We use the FreeCADCmd binary instead of the FreeCAD binary here # for two reasons: # 1. It works out of the box with USE=-gui as well, not needing a guard -# 2. We don't need virtualx.eclass and it's dependencies -# The exported environment variables are needed, so freecad does know -# where to save it's temporary files, and where to look and write it's -# configuration. Without those, there are sandbox violation, when it +# 2. We don't need virtualx.eclass and its dependencies +# The environment variables are needed, so that FreeCAD knows +# where to save its temporary files, and where to look and write its +# configuration. Without those, there is a sandbox violation, when it # tries to create /var/lib/portage/home/.FreeCAD directory. src_test() { - pushd "${BUILD_DIR}" > /dev/null || die - export FREECAD_USER_HOME="${HOME}" - export FREECAD_USER_DATA="${T}" - export FREECAD_USER_TEMP="${T}" - nonfatal ./bin/FreeCADCmd --run-test 0 - popd > /dev/null || die + cd "${BUILD_DIR}" || die + + local -x FREECAD_USER_HOME="${HOME}" + local -x FREECAD_USER_DATA="${T}" + local -x FREECAD_USER_TEMP="${T}" + ./bin/FreeCADCmd --run-test 0 --set-config AppHomePath="${BUILD_DIR}/" || die } src_install() { @@ -338,7 +264,7 @@ src_install() { newbin - freecad <<- _EOF_ #!/bin/sh # https://github.com/coin3d/coin/issues/451 - : \${QT_QPA_PLATFORM:=xcb} + : "\${QT_QPA_PLATFORM:=xcb}" export QT_QPA_PLATFORM exec /usr/$(get_libdir)/${PN}/bin/FreeCAD "\${@}" _EOF_ @@ -359,30 +285,17 @@ pkg_postinst() { einfo "You can load a lot of additional workbenches using the integrated" einfo "AddonManager." - # ToDo: check opencv, pysolar (::science), elmerfem (::science) - # ifc++, ifcopenshell, z88 (no pkgs), calculix-ccx (::waebbl) einfo "There are a lot of additional tools, for which FreeCAD has builtin" einfo "support. Some of them are available in Gentoo. Take a look at" - einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD" - optfeature_header "Computational utilities" - optfeature "BLAS library" sci-libs/openblas - optfeature "Statistical computation with Python" dev-python/pandas - optfeature "Use scientific computation with Python" dev-python/scipy - optfeature "Use symbolic math with Python" dev-python/sympy - optfeature_header "Imaging, Plotting and Rendering utilities" - optfeature "Dependency graphs" media-gfx/graphviz - optfeature "PBR Rendering" media-gfx/povray - optfeature_header "Import / Export" - optfeature "Interact with git repositories" dev-python/GitPython - optfeature "Work with COLLADA documents" dev-python/pycollada - optfeature "YAML importer and emitter" dev-python/pyyaml - optfeature "Importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg - optfeature "Importing and exporting geospatial data formats" sci-libs/gdal - optfeature "Working with projection data" sci-libs/proj - optfeature_header "Meshing and FEM" - optfeature "FEM mesh generator" sci-libs/gmsh - optfeature "Triangulating meshes" sci-libs/gts - optfeature "Visualization" sci-visualization/paraview + einfo "https://wiki.freecad.org/Installing_additional_components" + optfeature_header "External programs used by FreeCAD" + optfeature "dependency graphs" media-gfx/graphviz + optfeature "importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg + optfeature "importing OpenSCAD files, Mesh booleans" media-gfx/openscad + use bim && optfeature "working with COLLADA documents" dev-python/pycollada + if use fem || use mesh; then + optfeature "mesh generation" sci-libs/gmsh + fi } pkg_postrm() { diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml index 0787a07fc30c..5d5e1aeb6daa 100644 --- a/media-gfx/freecad/metadata.xml +++ b/media-gfx/freecad/metadata.xml @@ -14,6 +14,12 @@ Build the addon manager module for automatic handling of 3rd party addons </flag> + <flag name="bim"> + Build the BIM module and workbench + </flag> + <flag name="cam"> + Build the CAM module and workbench + </flag> <flag name="cloud"> Build the Cloud workbench, to access cloud providers (mostly Amazon S3). @@ -48,6 +54,9 @@ <flag name="material"> Build the material module and workbench to work with materials </flag> + <flag name="mesh"> + Build the mesh module and workbench + </flag> <flag name="netgen"> Build support for the netgen mesher through <pkg>media-gfx/netgen</pkg>. </flag> @@ -72,6 +81,9 @@ <flag name="raytracing"> Build the raytracing module and workbench for raytracing and rendering </flag> + <flag name="reverse"> + Build the reverse engineering module and workbench + </flag> <flag name="robot"> Build the robot module and workbench for studying robot movements </flag> @@ -79,7 +91,11 @@ Build the show module, a helper module for visibility automation </flag> <flag name="smesh"> - Build the Salome SMESH module + Build Salome SMESH + </flag> + <flag name="spacenav"> + Add support for space navigator devices through + <pkg>dev-libs/libspnav</pkg> </flag> <flag name="surface"> Build the surface module and workbench diff --git a/media-gfx/gifsicle/gifsicle-1.95.ebuild b/media-gfx/gifsicle/gifsicle-1.95.ebuild index 9d95e9385b78..27d12da3ef03 100644 --- a/media-gfx/gifsicle/gifsicle-1.95.ebuild +++ b/media-gfx/gifsicle/gifsicle-1.95.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz" LICENSE="GPL-2 MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="X" RDEPEND=" diff --git a/media-gfx/hugin/Manifest b/media-gfx/hugin/Manifest index 4ead73adb2da..117106f411bc 100644 --- a/media-gfx/hugin/Manifest +++ b/media-gfx/hugin/Manifest @@ -1,2 +1,2 @@ DIST hugin-2023.0.0.tar.bz2 10336322 BLAKE2B 5c35f67160d76f961e812a309a0c50bb012beac74dc888ce716e8d0e3da35dbb053ab4e5d5d043b3d3fee9885f2fc1afa962a73e794cd4df920527456d477e89 SHA512 f950afec9020972baa20931d5001cd479a9169a4eec0d459d830612f40177eea6a25e059047054b8e9679017687e4c2db9fb27f755a3d0b749e5055e2ff0adc8 -DIST hugin-2024.0.0.tar.bz2 10351323 BLAKE2B 33a0dea04f42e5a1c67d71cfd04f5bc0437bbfddc2bf662e55d7921737cd90d2efce3511d7690cc80fc8bf484866590449f80861ac7db647ff851a7f1f965a50 SHA512 e5f85bb4c96fa9ab45a6b8e0c5800f06a54976b73037f6967838737fcd664bbfa90c1a9809adcbbac46a3149f26bcffe413fff747f24b9f6c42238d840b8203e +DIST hugin-2024.0.1.tar.bz2 10352250 BLAKE2B 07b6ec632ad8525f58750a1894223102f354879e95c33cb4251d7aa237328a5180ffe6c7de0f3e23fc07dd8dd4f254cda7a9f452dc02b786bc867f15ca20b8f4 SHA512 4109f3be0b03d8b4205a79e0d76e18186278601d3e56f46271df1804db6f11f2e93fe1e1b68f2d7966c6d50ce58d4bf47e555e9cf8c34674315b2e89da36a722 diff --git a/media-gfx/hugin/hugin-2024.0.0.ebuild b/media-gfx/hugin/hugin-2024.0.1.ebuild index d61fccfde529..54769a57eedb 100644 --- a/media-gfx/hugin/hugin-2024.0.0.ebuild +++ b/media-gfx/hugin/hugin-2024.0.1.ebuild @@ -12,8 +12,6 @@ DESCRIPTION="GUI for the creation & processing of panoramic images" HOMEPAGE="http://hugin.sf.net" SRC_URI="https://downloads.sourceforge.net/${PN}/${P/_/}.tar.bz2" -S=${WORKDIR}/${PN}-$(ver_cut 1-2).0 - LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2" SLOT="0" KEYWORDS="~amd64 ~arm64 ~x86" diff --git a/media-gfx/hydrus/hydrus-565-r1.ebuild b/media-gfx/hydrus/hydrus-565-r1.ebuild index 07124a7dd9f9..75824275560f 100644 --- a/media-gfx/hydrus/hydrus-565-r1.ebuild +++ b/media-gfx/hydrus/hydrus-565-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="sqlite" DOCS_BUILDER=mkdocs @@ -61,8 +61,8 @@ RDEPEND=" dev-python/service-identity[${PYTHON_USEDEP}] dev-python/twisted[${PYTHON_USEDEP}] - dev-python/QtPy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}] - || ( dev-python/QtPy[pyside2] dev-python/QtPy[pyqt6] ) + dev-python/qtpy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}] + || ( dev-python/qtpy[pyside2] dev-python/qtpy[pyqt6] ) media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}] media-video/ffmpeg @@ -150,6 +150,6 @@ src_install() { pkg_postinst() { optfeature "automatic port forwarding support" "net-libs/miniupnpc" optfeature "memory compression in the client" "dev-python/lz4" - optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks" + optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/pysocks" optfeature "bandwidth charts support" "dev-python/pyside2[charts]" "dev-python/pyside6[charts]" } diff --git a/media-gfx/hydrus/hydrus-571.ebuild b/media-gfx/hydrus/hydrus-571.ebuild index 07124a7dd9f9..75824275560f 100644 --- a/media-gfx/hydrus/hydrus-571.ebuild +++ b/media-gfx/hydrus/hydrus-571.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="sqlite" DOCS_BUILDER=mkdocs @@ -61,8 +61,8 @@ RDEPEND=" dev-python/service-identity[${PYTHON_USEDEP}] dev-python/twisted[${PYTHON_USEDEP}] - dev-python/QtPy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}] - || ( dev-python/QtPy[pyside2] dev-python/QtPy[pyqt6] ) + dev-python/qtpy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}] + || ( dev-python/qtpy[pyside2] dev-python/qtpy[pyqt6] ) media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}] media-video/ffmpeg @@ -150,6 +150,6 @@ src_install() { pkg_postinst() { optfeature "automatic port forwarding support" "net-libs/miniupnpc" optfeature "memory compression in the client" "dev-python/lz4" - optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks" + optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/pysocks" optfeature "bandwidth charts support" "dev-python/pyside2[charts]" "dev-python/pyside6[charts]" } diff --git a/media-gfx/hydrus/hydrus-9999.ebuild b/media-gfx/hydrus/hydrus-9999.ebuild index 6c1cb6719c2e..f63b7c6b7f36 100644 --- a/media-gfx/hydrus/hydrus-9999.ebuild +++ b/media-gfx/hydrus/hydrus-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) PYTHON_REQ_USE="sqlite" DOCS_BUILDER=mkdocs @@ -57,8 +57,8 @@ RDEPEND=" dev-python/service-identity[${PYTHON_USEDEP}] dev-python/twisted[${PYTHON_USEDEP}] - dev-python/QtPy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}] - || ( dev-python/QtPy[pyside2] dev-python/QtPy[pyside6] ) + dev-python/qtpy[widgets,gui,svg,multimedia,${PYTHON_USEDEP}] + || ( dev-python/qtpy[pyside2] dev-python/qtpy[pyside6] ) media-libs/opencv[python,png,jpeg,${PYTHON_USEDEP}] media-video/ffmpeg @@ -144,6 +144,6 @@ src_install() { pkg_postinst() { optfeature "automatic port forwarding support" "net-libs/miniupnpc" optfeature "memory compression in the client" "dev-python/lz4" - optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/PySocks" + optfeature "SOCKS proxy support" "dev-python/requests[socks5]" "dev-python/pysocks" optfeature "bandwidth charts support" "dev-python/pyside2[charts]" "dev-python/pyside6[charts]" } diff --git a/media-gfx/igal/igal-3.2.ebuild b/media-gfx/igal/igal-3.2.ebuild index f5a14a2df2cf..51a66ce9c503 100644 --- a/media-gfx/igal/igal-3.2.ebuild +++ b/media-gfx/igal/igal-3.2.ebuild @@ -10,7 +10,7 @@ S="${WORKDIR}/${PN}2-${PV}" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND=" dev-lang/perl diff --git a/media-gfx/img2pdf/img2pdf-0.5.1.ebuild b/media-gfx/img2pdf/img2pdf-0.5.1.ebuild index a6489af9714d..881c283cd7f9 100644 --- a/media-gfx/img2pdf/img2pdf-0.5.1.ebuild +++ b/media-gfx/img2pdf/img2pdf-0.5.1.ebuild @@ -16,7 +16,7 @@ HOMEPAGE=" LICENSE="LGPL-3+" SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~ppc64 x86" IUSE="gui" BDEPEND=" diff --git a/media-gfx/inkscape/inkscape-1.4-r1.ebuild b/media-gfx/inkscape/inkscape-1.4-r1.ebuild index 127905e9a0a9..b3ecdedf0a6f 100644 --- a/media-gfx/inkscape/inkscape-1.4-r1.ebuild +++ b/media-gfx/inkscape/inkscape-1.4-r1.ebuild @@ -20,7 +20,7 @@ if [[ ${PV} = 9999* ]]; then EGIT_REPO_URI="https://gitlab.com/inkscape/inkscape.git" else SRC_URI="https://media.inkscape.org/dl/resources/file/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc x86" fi S="${WORKDIR}/${MY_P}" diff --git a/media-gfx/jp2a/jp2a-1.2.0.ebuild b/media-gfx/jp2a/jp2a-1.2.0.ebuild index 5644f999ab76..d2ba1d187923 100644 --- a/media-gfx/jp2a/jp2a-1.2.0.ebuild +++ b/media-gfx/jp2a/jp2a-1.2.0.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://github.com/Talinx/jp2a/releases/download/v${PV}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris" +KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~arm64-macos ~x64-macos ~x64-solaris" IUSE="curl" # TODO: restore ncurses support? diff --git a/media-gfx/jpeginfo/jpeginfo-1.7.1.ebuild b/media-gfx/jpeginfo/jpeginfo-1.7.1.ebuild index 8ff1d8261abe..0cf153a0979d 100644 --- a/media-gfx/jpeginfo/jpeginfo-1.7.1.ebuild +++ b/media-gfx/jpeginfo/jpeginfo-1.7.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://www.kokkonen.net/tjko/src/${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND="media-libs/libjpeg-turbo:=" DEPEND="${RDEPEND}" diff --git a/media-gfx/jpegoptim/jpegoptim-1.5.5.ebuild b/media-gfx/jpegoptim/jpegoptim-1.5.5.ebuild index 46f1697664d6..76927fefe6ac 100644 --- a/media-gfx/jpegoptim/jpegoptim-1.5.5.ebuild +++ b/media-gfx/jpegoptim/jpegoptim-1.5.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit cmake +inherit cmake flag-o-matic DESCRIPTION="Utility to optimize JPEG files" HOMEPAGE="https://www.kokkonen.net/tjko/projects.html" @@ -23,6 +23,8 @@ PATCHES=( ) src_configure() { + use elibc_musl && append-cppflags -D__GNU_LIBRARY__ #944902 + local mycmakeargs=( -DUSE_MOZJPEG=no ) diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index 57e97f2ef6ae..6071638e85ad 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -1,4 +1,2 @@ -DIST krita-5.1.5-exiv2-0.28.patch.xz 4664 BLAKE2B e364325be3d8e40e293a7d268136be3737ce5d2b9b5607f140b30ba3e687dc8d86545f4463348587711150f1652b521f87efc859a1bf2bc3b5ed704cf3236781 SHA512 130ba9cce7d6c0138f7ef6dab1445816c2e29752aa16643c32a7d9c00d7a156ac88f01afdb782ab03fc1e0822660a070f74c02e7cde4dfbcec30baaf3c3dba7f -DIST krita-5.1.5.tar.xz 184981952 BLAKE2B 3d8d26849d8508dc040fb3ac5ab4d0ce724f670bf7d5782b37702b55afe5063543e6aa564a1c9326c90fb16f7905941e3f1ffd4296efd6f8a1c7cb34c0b41716 SHA512 b745eb9f51bb08df0948d6b97b85aee6a74b496df3e8423fb9107d79551daadb21960b4bb5c438348f662c67d0ec5b2fa6da18cfa5feb418659881cddd24d8f1 DIST krita-5.2.3.tar.xz 186685456 BLAKE2B 42943e7ebffdb46b9da085b2069701895e37ad9c457273b9217a095f1dfdf15c715cde0b88d440abb2d73dee656730da38844f11f27022885f87bb9cc9adab26 SHA512 69a0477e3119765dd53e0502fe5a64fcdc921dfcba3ddc5dec5c1bc4342a77b172b38276f134cc56f79741e6c47b51ef51786aadf0d178ce3955e24a9fd27b74 DIST krita-5.2.6.tar.xz 186560016 BLAKE2B 788385983b371626214898391b08b1276a74b2ee3c9f01c1b1ae19d8791bfcf1ea1f59f6304643aeb6b16a2559fd2e45464596c721eb5d53546672d0efe17903 SHA512 8502ebef11ae066b298e999aba06df7858605cca14b889cec167b7ee3953b8ed86459b44ed90508d59bd7a9968cc9957309cefaa140a8d20293344f4dcb7fea7 diff --git a/media-gfx/krita/files/krita-4.3.1-tests-optional.patch b/media-gfx/krita/files/krita-4.3.1-tests-optional.patch deleted file mode 100644 index 37f2ac50ffda..000000000000 --- a/media-gfx/krita/files/krita-4.3.1-tests-optional.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 2e9369281d44a2701ac7364568d381cca0d92ec5 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 12 Jul 2020 18:55:31 +0200 -Subject: [PATCH] KritaAddBrokenUnitTest.cmake, MacroKritaAddBenchmark.cmake: - Skip ecm_add_test early if Qt5::Test is not available - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - cmake/modules/KritaAddBrokenUnitTest.cmake | 4 ++++ - cmake/modules/MacroKritaAddBenchmark.cmake | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/cmake/modules/KritaAddBrokenUnitTest.cmake b/cmake/modules/KritaAddBrokenUnitTest.cmake -index b7d0e8d852..901a0a1f99 100644 ---- a/cmake/modules/KritaAddBrokenUnitTest.cmake -+++ b/cmake/modules/KritaAddBrokenUnitTest.cmake -@@ -23,6 +23,10 @@ function(KRITA_ADD_BROKEN_UNIT_TEST) - message(FATAL_ERROR "ecm_add_test() called with multiple source files but without setting \"TEST_NAME\"") - endif() - -+ if(NOT TARGET Qt5::Test) -+ return() -+ endif() -+ - set(_testname ${ARG_NAME_PREFIX}${_targetname}) - - # add test to the global list of disabled tests -diff --git a/cmake/modules/MacroKritaAddBenchmark.cmake b/cmake/modules/MacroKritaAddBenchmark.cmake -index c748d8e319..f804d9b8f4 100644 ---- a/cmake/modules/MacroKritaAddBenchmark.cmake -+++ b/cmake/modules/MacroKritaAddBenchmark.cmake -@@ -23,6 +23,10 @@ macro (KRITA_ADD_BENCHMARK _test_NAME) - set(_nogui "NOGUI") - endif() - -+ if(NOT TARGET Qt5::Test) -+ return() -+ endif() -+ - add_executable( ${_test_NAME} ${_srcList} ) - ecm_mark_as_test(${_test_NAME}) - --- -2.27.0 - -From 3c9fe10e25e94bdb1eb5e7b07ac2696635fdc5a3 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Wed, 17 Jun 2020 20:18:28 +0200 -Subject: [PATCH] Don't build tests when testing not requested - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> - -diff --git a/libs/flake/CMakeLists.txt b/libs/flake/CMakeLists.txt -index cbdac265d2..1a50c1620a 100644 ---- a/libs/flake/CMakeLists.txt -+++ b/libs/flake/CMakeLists.txt -@@ -9,8 +9,10 @@ include_directories( - ) - - add_subdirectory(styles) --add_subdirectory(tests) --add_subdirectory(resources/tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+ add_subdirectory(resources/tests) -+endif() - - set(kritaflake_SRCS - KoGradientHelper.cpp -diff --git a/libs/image/tiles3/CMakeLists.txt b/libs/image/tiles3/CMakeLists.txt -index 88c0516360..01f2383ddb 100644 ---- a/libs/image/tiles3/CMakeLists.txt -+++ b/libs/image/tiles3/CMakeLists.txt -@@ -1 +1,3 @@ --add_subdirectory(tests) -+if(BUILD_TESTING) -+ add_subdirectory(tests) -+endif() --- -2.27.0 diff --git a/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch b/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch deleted file mode 100644 index a578f22c67f9..000000000000 --- a/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch +++ /dev/null @@ -1,73 +0,0 @@ -From ace7edcca6ad322581ab39620f21ccf3ffbd3b5a Mon Sep 17 00:00:00 2001 -From: Timo Gurr <timo.gurr@gmail.com> -Date: Fri, 5 Jan 2024 14:04:50 +0000 -Subject: [PATCH] Fix build with libjxl 0.9.0 - -Fix build with libjxl 0.9.0 - -BUG:478987 - -Test Plan ---------- - -* Upgrade to libjxl 0.9.0 -* Apply patch from MR and build krita (5.2.2) -* Open/Display a sample image e.g. https://jpegxl.info/test-page/red-room.jxl - -Formalities Checklist ---------------------- - -- [x] I confirmed this builds. -- [x] I confirmed Krita ran and the relevant functions work (Could successfully open/display a sample image https://jpegxl.info/test-page/red-room.jxl). -- [ ] I tested the relevant unit tests and can confirm they are not broken. (If not possible, don't hesitate to ask for help!) -- [x] I made sure my commits build individually and have good descriptions as per [KDE guidelines](https://community.kde.org/Policies/Commit_Policy). -- [x] I made sure my code conforms to the standards set in the HACKING file. -- [x] I can confirm the code is licensed and attributed appropriately, and that unattributed code is mine, as per [KDE Licensing Policy](https://community.kde.org/Policies/Licensing_Policy). - -_**Reminder: the reviewer is responsible for merging the patch, this is to ensure at the least two people can build the patch. In case a patch breaks the build, both the author and the reviewer should be contacted to fix the build.**_ -_**If this is not possible, the commits shall be reverted, and a notification with the reasoning and any relevant logs shall be sent to the mailing list, kimageshop@kde.org.**_ ---- - plugins/impex/jxl/JPEGXLImport.cpp | 15 ++++++++++++++- - 1 file changed, 14 insertions(+), 1 deletion(-) - -diff --git a/plugins/impex/jxl/JPEGXLImport.cpp b/plugins/impex/jxl/JPEGXLImport.cpp -index 573bae41247..f5b989b3b70 100644 ---- a/plugins/impex/jxl/JPEGXLImport.cpp -+++ b/plugins/impex/jxl/JPEGXLImport.cpp -@@ -511,7 +511,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu - JxlColorEncoding colorEncoding{}; - if (JXL_DEC_SUCCESS - == JxlDecoderGetColorAsEncodedProfile(dec.get(), -+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0) - nullptr, -+#endif - JXL_COLOR_PROFILE_TARGET_DATA, - &colorEncoding)) { - const TransferCharacteristics transferFunction = [&]() { -@@ -635,7 +637,12 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu - size_t iccSize = 0; - QByteArray iccProfile; - if (JXL_DEC_SUCCESS -- != JxlDecoderGetICCProfileSize(dec.get(), nullptr, JXL_COLOR_PROFILE_TARGET_DATA, &iccSize)) { -+ != JxlDecoderGetICCProfileSize(dec.get(), -+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) -+ nullptr, -+#endif -+ JXL_COLOR_PROFILE_TARGET_DATA, -+ &iccSize)) { - errFile << "ICC profile size retrieval failed"; - document->setErrorMessage(i18nc("JPEG-XL errors", "Unable to read the image profile.")); - return ImportExportCodes::ErrorWhileReading; -@@ -643,7 +650,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice *io, KisPropertiesConfigu - iccProfile.resize(static_cast<int>(iccSize)); - if (JXL_DEC_SUCCESS - != JxlDecoderGetColorAsICCProfile(dec.get(), -+#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0) - nullptr, -+#endif - JXL_COLOR_PROFILE_TARGET_DATA, - reinterpret_cast<uint8_t *>(iccProfile.data()), - static_cast<size_t>(iccProfile.size()))) { --- -GitLab - diff --git a/media-gfx/krita/files/krita-5.1.5-lto.patch b/media-gfx/krita/files/krita-5.1.5-lto.patch deleted file mode 100644 index 0cccee5be00e..000000000000 --- a/media-gfx/krita/files/krita-5.1.5-lto.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 2c4dd042df1518d67c117ced08c5a2f3729c3193 Mon Sep 17 00:00:00 2001 -From: Dmitry Kazakov <dimula73@gmail.com> -Date: Tue, 30 Jan 2024 15:30:53 +0100 -Subject: [PATCH] Possibly fix ODR violation in the transform tool strategies - -BUG:480520 - - -(cherry picked from commit e33c7d7d533d5289c3a37007f8cf574af5bc7102) ---- - plugins/tools/tool_transform2/kis_free_transform_strategy.cpp | 2 ++ - .../tool_transform2/kis_perspective_transform_strategy.cpp | 3 ++- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp -index 49486b6bd7c..8a63bce74e3 100644 ---- a/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp -+++ b/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp -@@ -23,6 +23,7 @@ - #include "kis_algebra_2d.h" - - -+namespace { - enum StrokeFunction { - ROTATE = 0, - MOVE, -@@ -41,6 +42,7 @@ enum StrokeFunction { - MOVECENTER, - PERSPECTIVE - }; -+} - - struct KisFreeTransformStrategy::Private - { -diff --git a/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp -index ad1d9ffe4d3..bca5b51e13f 100644 ---- a/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp -+++ b/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp -@@ -23,7 +23,7 @@ - #include "kis_transform_utils.h" - #include "kis_free_transform_strategy_gsl_helpers.h" - -- -+namespace { - enum StrokeFunction { - DRAG_HANDLE = 0, - DRAG_X_VANISHING_POINT, -@@ -43,6 +43,7 @@ enum HandleIndexes { - HANDLE_MIDDLE_RIGHT, - HANDLE_COUNT, - }; -+} - - struct KisPerspectiveTransformStrategy::Private - { --- -GitLab - diff --git a/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch b/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch deleted file mode 100644 index 534e24469e8a..000000000000 --- a/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 48edd05f32241c537cedf2831efc5eb91a112291 Mon Sep 17 00:00:00 2001 -From: killy |0veufOrever <80536642@qq.com> -Date: Tue, 19 Sep 2023 02:18:54 +0000 -Subject: [PATCH] Update OCIO to version 2.3.0 - ---- - 3rdparty/ext_ocio/CMakeLists.txt | 4 ++-- - plugins/dockers/lut/ocio_display_filter_vfx2021.cpp | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -From 21d384fe9fafde2f45f7339a2234f4022c53152f Mon Sep 17 00:00:00 2001 -From: killy |0veufOrever <80536642@qq.com> -Date: Tue, 19 Sep 2023 03:17:17 +0000 -Subject: [PATCH] Dimensions are not required when the OCIO version is less - than 2.3.0 - ---- - plugins/dockers/lut/ocio_display_filter_vfx2021.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp b/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp ---- a/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp -+++ b/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp -@@ -507,7 +507,13 @@ - unsigned height = 0; - OCIO::GpuShaderDesc::TextureType channel = OCIO::GpuShaderDesc::TEXTURE_RGB_CHANNEL; - OCIO::Interpolation interpolation = OCIO::INTERP_LINEAR; -+ -+#if OCIO_VERSION_HEX >= 0x2030000 -+ OCIO::GpuShaderCreator::TextureDimensions dimensions; -+ shaderDesc->getTexture(idx, textureName, samplerName, width, height, channel, dimensions, interpolation); -+#else - shaderDesc->getTexture(idx, textureName, samplerName, width, height, channel, interpolation); -+#endif - - if (!textureName || !*textureName || !samplerName || !*samplerName || width == 0) { - errOpenGL << "The texture data is corrupted"; diff --git a/media-gfx/krita/krita-5.1.5.ebuild b/media-gfx/krita/krita-5.1.5.ebuild deleted file mode 100644 index 854bb12e9593..000000000000 --- a/media-gfx/krita/krita-5.1.5.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="forceoptional" -PYTHON_COMPAT=( python3_{9..12} ) -KFMIN=5.82.0 -QTMIN=5.15.5 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org python-single-r1 - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz - https://dev.gentoo.org/~asturm/distfiles/${P}-exiv2-0.28.patch.xz" - KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86" -fi - -DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" -HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/" - -LICENSE="GPL-3" -SLOT="5" -IUSE="color-management fftw gif +gsl heif jpegxl +mypaint-brush-engine openexr pdf qtmedia +raw webp" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# bug 630508 -RESTRICT="test" - -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:= - dev-libs/quazip:0=[qt5(+)] - $(python_gen_cond_dep ' - dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}] - dev-python/sip:=[${PYTHON_USEDEP}] - ') - >=dev-qt/qtconcurrent-${QTMIN}:5 - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5=[-gles2-only] - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtprintsupport-${QTMIN}:5 - >=dev-qt/qtsql-${QTMIN}:5 - >=dev-qt/qtsvg-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtx11extras-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kguiaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kitemviews-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - media-gfx/exiv2:= - media-libs/lcms - media-libs/libjpeg-turbo:= - media-libs/libpng:= - media-libs/tiff:= - sys-libs/zlib - virtual/opengl - x11-libs/libX11 - x11-libs/libXi - color-management? ( >=media-libs/opencolorio-2.0.0 ) - fftw? ( sci-libs/fftw:3.0= ) - gif? ( media-libs/giflib ) - gsl? ( sci-libs/gsl:= ) - jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220825:= ) - heif? ( >=media-libs/libheif-1.11:=[x265] ) - mypaint-brush-engine? ( media-libs/libmypaint:= ) - openexr? ( media-libs/openexr:= ) - pdf? ( app-text/poppler[qt5] ) - qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 ) - raw? ( media-libs/libraw:= ) - webp? ( >=media-libs/libwebp-1.2.0:= ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-cpp/eigen:3 - dev-lang/perl - sys-devel/gettext -" - -PATCHES=( - "${FILESDIR}/${PN}-4.3.1-tests-optional.patch" - "${WORKDIR}/${P}-exiv2-0.28.patch" # bug 906472 - "${FILESDIR}/${P}-ocio-2.3.0.patch" # bug 915107 - "${FILESDIR}/${P}-sip-6.8.patch" # bug 919139 - "${FILESDIR}/${P}-libjxl-0.9.patch" # bug 922524 - "${FILESDIR}/${P}-lto.patch" # bug 922520 -) - -pkg_setup() { - python-single-r1_pkg_setup - ecm_pkg_setup -} - -src_configure() { - # Prevent sandbox violation from FindPyQt5.py module - # See Gentoo-bug 655918 - addpredict /dev/dri - - local mycmakeargs=( - -DENABLE_UPDATERS=OFF - -DKRITA_ENABLE_PCH=OFF # big mess. - -DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged - -DCMAKE_DISABLE_FIND_PACKAGE_xsimd=ON # not packaged - $(cmake_use_find_package color-management OpenColorIO) - $(cmake_use_find_package fftw FFTW3) - $(cmake_use_find_package gif GIF) - $(cmake_use_find_package gsl GSL) - $(cmake_use_find_package heif HEIF) - $(cmake_use_find_package jpegxl JPEGXL) - $(cmake_use_find_package mypaint-brush-engine LibMyPaint) - $(cmake_use_find_package openexr OpenEXR) - $(cmake_use_find_package pdf Poppler) - $(cmake_use_find_package qtmedia Qt5Multimedia) - $(cmake_use_find_package raw LibRaw) - $(cmake_use_find_package webp WebP) - ) - - ecm_src_configure -} diff --git a/media-gfx/krita/krita-5.2.3.ebuild b/media-gfx/krita/krita-5.2.3.ebuild index 6b6678994687..2c081af6668e 100644 --- a/media-gfx/krita/krita-5.2.3.ebuild +++ b/media-gfx/krita/krita-5.2.3.ebuild @@ -30,7 +30,7 @@ RDEPEND="${PYTHON_DEPS} dev-libs/libunibreak:= dev-libs/quazip:0=[qt5(+)] $(python_gen_cond_dep ' - dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}] + dev-python/pyqt5[declarative,gui,widgets,${PYTHON_USEDEP}] dev-python/sip:=[${PYTHON_USEDEP}] ') >=dev-qt/qtconcurrent-${QTMIN}:5 diff --git a/media-gfx/krita/krita-5.2.6.ebuild b/media-gfx/krita/krita-5.2.6.ebuild index dd17eae36561..526f9814a518 100644 --- a/media-gfx/krita/krita-5.2.6.ebuild +++ b/media-gfx/krita/krita-5.2.6.ebuild @@ -11,7 +11,7 @@ inherit ecm kde.org python-single-r1 if [[ ${KDE_BUILD_TYPE} = release ]]; then SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" fi DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" @@ -30,7 +30,7 @@ RDEPEND="${PYTHON_DEPS} dev-libs/libunibreak:= dev-libs/quazip:0=[qt5(+)] $(python_gen_cond_dep ' - dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}] + dev-python/pyqt5[declarative,gui,widgets,${PYTHON_USEDEP}] dev-python/sip:=[${PYTHON_USEDEP}] ') >=dev-qt/qtconcurrent-${QTMIN}:5 diff --git a/media-gfx/krita/metadata.xml b/media-gfx/krita/metadata.xml index c586507e3736..82ce837b7102 100644 --- a/media-gfx/krita/metadata.xml +++ b/media-gfx/krita/metadata.xml @@ -12,7 +12,6 @@ <flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag> <flag name="media">Enable sound support for animations via <pkg>media-libs/mlt</pkg></flag> <flag name="mypaint-brush-engine">Enable MyPaint brush engine support <pkg>media-libs/libmypaint</pkg></flag> - <flag name="qtmedia">Enable sound support for animations via <pkg>dev-qt/qtmultimedia</pkg></flag> <flag name="xsimd">Enable usage of SIMD instructions via <pkg>dev-cpp/xsimd</pkg></flag> </use> </pkgmetadata> diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild index 654ceee61524..31a315e6724e 100644 --- a/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild +++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/qtpfsgui/${P/_/.}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64" IUSE="cpu_flags_x86_sse2 fits openmp test" RESTRICT="!test? ( test )" diff --git a/media-gfx/netgen/files/netgen-6.2.2302-opencascade-7.8.0.patch b/media-gfx/netgen/files/netgen-6.2.2302-opencascade-7.8.0.patch new file mode 100644 index 000000000000..0c5664edd6bb --- /dev/null +++ b/media-gfx/netgen/files/netgen-6.2.2302-opencascade-7.8.0.patch @@ -0,0 +1,147 @@ +https://bugs.gentoo.org/930171 +https://github.com/NGSolve/netgen/issues/170 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -372,25 +372,20 @@ if (USE_OCC) + TKGeomAlgo + TKGeomBase + TKHLR +- TKIGES + TKLCAF + TKMath + TKMesh + TKOffset + TKPrim +- TKSTEP +- TKSTEP209 +- TKSTEPAttr +- TKSTEPBase +- TKSTL ++ TKDESTL + TKService + TKShHealing + TKTopAlgo + TKV3d + TKVCAF + TKXCAF +- TKXDEIGES +- TKXDESTEP ++ TKDEIGES ++ TKDESTEP + TKXSBase + TKernel + ) +--- a/libsrc/occ/Partition_Loop3d.hxx ++++ b/libsrc/occ/Partition_Loop3d.hxx +@@ -10,27 +10,16 @@ + #ifndef _Partition_Loop3d_HeaderFile + #define _Partition_Loop3d_HeaderFile + +-#ifndef _TopTools_ListOfShape_HeaderFile +-#include <TopTools_ListOfShape.hxx> +-#endif +-#ifndef _TopTools_IndexedDataMapOfShapeListOfShape_HeaderFile +-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx> +-#endif +-#ifndef _Standard_Boolean_HeaderFile ++#include <Standard_Version.hxx> + #include <Standard_Boolean.hxx> +-#endif +-#ifndef _Standard_Real_HeaderFile + #include <Standard_Real.hxx> +-#endif +-#ifndef _Standard_Version_HeaderFile +-#include <Standard_Version.hxx> +-#endif ++#include <TopTools_ListOfShape.hxx> ++#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx> + +-#if OCC_VERSION_HEX < 0x070000 ++#if OCC_VERSION_HEX < 0x070000 || OCC_VERSION_HEX > 0x070799 + #else + #include <TopTools_ShapeMapHasher.hxx> + #include <TopTools_OrientedShapeMapHasher.hxx> +- #include <TopTools_MapOfOrientedShape.hxx> + #endif + + class TopoDS_Shape; +@@ -38,6 +27,8 @@ class TopoDS_Shape; + #if OCC_VERSION_HEX < 0x070000 + class TopTools_ListOfShape; + class TopTools_MapOfOrientedShape; ++#else ++#include <TopTools_MapOfOrientedShape.hxx> + #endif + + class TopoDS_Edge; +--- a/libsrc/occ/occ_edge.cpp ++++ b/libsrc/occ/occ_edge.cpp +@@ -55,7 +55,11 @@ namespace netgen + + size_t OCCEdge::GetHash() const + { ++#if OCC_VERSION_HEX < 0x070800 + return edge.HashCode(std::numeric_limits<Standard_Integer>::max()); ++#else ++ return std::hash<TopoDS_Shape>{}(edge); ++#endif + } + + void OCCEdge::ProjectPoint(Point<3>& p, EdgePointGeomInfo* gi) const +--- a/libsrc/occ/occ_face.cpp ++++ b/libsrc/occ/occ_face.cpp +@@ -32,7 +32,11 @@ namespace netgen + + size_t OCCFace::GetHash() const + { ++#if OCC_VERSION_HEX < 0x070800 + return face.HashCode(std::numeric_limits<Standard_Integer>::max()); ++#else ++ return std::hash<TopoDS_Shape>{}(face); ++#endif + } + + Point<3> OCCFace::GetCenter() const +--- a/libsrc/occ/occ_solid.hpp ++++ b/libsrc/occ/occ_solid.hpp +@@ -16,8 +16,11 @@ namespace netgen + OCCSolid(TopoDS_Shape dshape) + : solid(TopoDS::Solid(dshape)) + { } +- ++#if OCC_VERSION_HEX < 0x070800 + size_t GetHash() const override { return solid.HashCode(std::numeric_limits<Standard_Integer>::max()); } ++#else ++ size_t GetHash() const override { return std::hash<TopoDS_Solid>{}(solid); } ++#endif + }; + } + +--- a/libsrc/occ/occ_vertex.cpp ++++ b/libsrc/occ/occ_vertex.cpp +@@ -19,6 +19,10 @@ namespace netgen + + size_t OCCVertex::GetHash() const + { ++#if OCC_VERSION_HEX < 0x070800 + return vertex.HashCode(std::numeric_limits<Standard_Integer>::max()); ++#else ++ return std::hash<TopoDS_Shape>{}(vertex); ++#endif + } + } +--- a/libsrc/occ/occgeom.cpp ++++ b/libsrc/occ/occgeom.cpp +@@ -1625,8 +1625,12 @@ +
+ // enumerate shapes and archive only integers
+ auto my_hash = [](const TopoDS_Shape & key) {
++#if OCC_VERSION_HEX < 0x070800
+ auto occ_hash = key.HashCode(1<<31UL);
+ return std::hash<decltype(occ_hash)>()(occ_hash);
++#else
++ return std::hash<TopoDS_Shape>{}(key);
++#endif
+ };
+ TopTools_IndexedMapOfShape shape_map;
+ Array<TopoDS_Shape> shape_list;
diff --git a/media-gfx/netgen/netgen-6.2.2302.ebuild b/media-gfx/netgen/netgen-6.2.2302.ebuild index 5a86024f6f64..5b3aa9d3d837 100644 --- a/media-gfx/netgen/netgen-6.2.2302.ebuild +++ b/media-gfx/netgen/netgen-6.2.2302.ebuild @@ -74,6 +74,7 @@ PATCHES=( "${FILESDIR}/${PN}-6.2.2204-disable-python-tests.patch" "${FILESDIR}/${PN}-6.2.2301-find-libjpeg-turbo-library.patch" "${FILESDIR}/${PN}-6.2.2301-fix-nullptr-deref-in-archive.patch" + "${FILESDIR}/${PN}-6.2.2302-opencascade-7.8.0.patch" ) pkg_setup() { diff --git a/media-gfx/plantuml/Manifest b/media-gfx/plantuml/Manifest index d6939a404b2d..3e405116a858 100644 --- a/media-gfx/plantuml/Manifest +++ b/media-gfx/plantuml/Manifest @@ -1 +1,2 @@ DIST plantuml-1.2024.7.tar.gz 12645142 BLAKE2B 5716e3085c8e326cb504637779fa4a50ab73fb557345858b6985e8f67412ee24d5447bb41b9037c54a565e6dd45db3dbd76245378add7d168e5bc0e05dfca83c SHA512 4f201b0341efa02deb260b44837fff2e1225715ded1fd196f7cd79d0d75baa0a5a146880d9c46470d9652df593b4c4419554d9bbc4a94d380b689359130d70dd +DIST plantuml-1.2024.8.tar.gz 12543887 BLAKE2B 719602cb8f21e5908fea32778257f0fca830746796e0130bd76f48dc7c829a528d2d0bf8b6f1a0a4ab4fc73c60e8c0b37559108f4afbaf5994597207e6497df2 SHA512 32ee9cb80171ee467b68fe98ca74a3a084bd64410de34d50c79cb40ca972d6092b9c65e0e6ee96647393fa44f152e2ecd3bdafc3f22010afbe73630573996b64 diff --git a/media-gfx/plantuml/plantuml-1.2024.8.ebuild b/media-gfx/plantuml/plantuml-1.2024.8.ebuild new file mode 100644 index 000000000000..b1af7cd7e527 --- /dev/null +++ b/media-gfx/plantuml/plantuml-1.2024.8.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +inherit java-pkg-2 java-pkg-simple desktop xdg + +DESCRIPTION="Draw UML diagrams using a simple and human readable text description" +HOMEPAGE="https://plantuml.com" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +IUSE="ant-task" + +DEPEND=">=virtual/jdk-1.8:* + ant-task? ( >=dev-java/ant-1.10.14-r3:0 )" +RDEPEND=">=virtual/jre-1.8:* + media-gfx/graphviz + ant-task? ( >=dev-java/ant-1.10.14-r3:0 )" + +JAVA_AUTOMATIC_MODULE_NAME="net.sourceforge.plantuml" +JAVA_MAIN_CLASS="net.sourceforge.plantuml.Run" +JAVA_RESOURCE_DIRS="res" +JAVA_SRC_DIR="src" + +src_prepare() { + java-pkg-2_src_prepare + if use ant-task; then + # src/net/sourceforge/plantuml/ant/readme.md + JAVA_GENTOO_CLASSPATH+="ant" + else + rm src/net/sourceforge/plantuml/ant/{CheckZip,PlantUml}Task.java || die + fi + + # java-pkg-simple wants resources in a separate directory + cp -r src res || die + cp -r skin stdlib svg themes res || die + find res -type f \( -name '*.java' -o -iname 'readme.md' \ + -o -name '*.ttf' -o -name '*.html' -o -name 'data.txt' \ + -o -name '.editorconfig' \) -exec rm -rf {} + || die +} + +src_install() { + java-pkg-simple_src_install + make_desktop_entry plantuml +} diff --git a/media-gfx/renderdoc/renderdoc-1.32.ebuild b/media-gfx/renderdoc/renderdoc-1.32.ebuild index c8d27b42b52d..d78db3dbcb7c 100644 --- a/media-gfx/renderdoc/renderdoc-1.32.ebuild +++ b/media-gfx/renderdoc/renderdoc-1.32.ebuild @@ -40,7 +40,7 @@ SRC_URI=" # swig: GPL-3+ BSD BSD-2 LICENSE="BSD BSD-2 CC-BY-3.0 GPL-3+ MIT OFL-1.1 public-domain ZLIB" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" IUSE="qt5" REQUIRED_USE="doc? ( qt5 ) qt5? ( ${PYTHON_REQUIRED_USE} )" diff --git a/media-gfx/solvespace/metadata.xml b/media-gfx/solvespace/metadata.xml index 2cfadb10cbd2..ec5d500532b3 100644 --- a/media-gfx/solvespace/metadata.xml +++ b/media-gfx/solvespace/metadata.xml @@ -15,4 +15,7 @@ <use> <flag name="system-mimalloc">Use system <pkg>dev-libs/mimalloc</pkg> instead of vendored library</flag> </use> + <upstream> + <remote-id type="github">solvespace/solvespace</remote-id> + </upstream> </pkgmetadata> diff --git a/media-gfx/solvespace/solvespace-3.1-r1.ebuild b/media-gfx/solvespace/solvespace-3.1-r1.ebuild index c7343757219f..be8fe1c14c0c 100644 --- a/media-gfx/solvespace/solvespace-3.1-r1.ebuild +++ b/media-gfx/solvespace/solvespace-3.1-r1.ebuild @@ -18,7 +18,7 @@ MIMALLOC_P="mimalloc-${MIMALLOC_PV}-${MIMALLOC_COMMIT}" inherit cmake toolchain-funcs xdg DESCRIPTION="Parametric 2d/3d CAD" -HOMEPAGE="http://solvespace.com" +HOMEPAGE="https://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 !system-mimalloc? ( https://github.com/microsoft/mimalloc/archive/${MIMALLOC_COMMIT}.tar.gz -> ${MIMALLOC_P}.tar.gz )" @@ -29,10 +29,10 @@ SRC_URI="https://github.com/solvespace/solvespace/archive/v${PV}.tar.gz -> ${P}. # + libdxfrw (GPL-2+) # + mimalloc (MIT) -IUSE="openmp +system-mimalloc" -KEYWORDS="amd64 ~arm64 ~x86" LICENSE="BitstreamVera GPL-2+ GPL-3+ !system-mimalloc? ( MIT )" SLOT="0" +KEYWORDS="amd64 ~arm64 ~x86" +IUSE="openmp +system-mimalloc" RDEPEND=" dev-cpp/atkmm:0 diff --git a/media-gfx/ueberzug/Manifest b/media-gfx/ueberzug/Manifest index e42fa608830d..45d98c701ec3 100644 --- a/media-gfx/ueberzug/Manifest +++ b/media-gfx/ueberzug/Manifest @@ -1,2 +1,3 @@ DIST ueberzug-18.2.3.tar.gz 57640 BLAKE2B c174f39cb20a24c07f12088e595492960319a9fd5079e0a23e9632353fa7c93762621224a3fde4b2462931647239e3614ed9a1dffc635fea7a51c58d2b846b68 SHA512 6f8f342b4a593e857f70c053fc5b9e75bc2c3a063221ca64850acb8c325323bee50c9d471fe55de6bbb484d8c958d5bf3037e836b52734d617f1cea4be509a08 DIST ueberzug-18.3.0.tar.gz 58280 BLAKE2B 2e91f55c39b6e9028ce95274c7e71c054fa623f2b61710a22bebec0b5a56ef719161f924b7af6741abc5c1f40d093daf24dfc562cacc4c2d639d9d0d53ed958c SHA512 ba039a46754a7120d65353c28e540e1f741a2930a7edf2d6f91b2df2d486f54fa44d141f788c17db5c83f876b7ecd1fca6aef56751e0c606fb9348b8c2580b8c +DIST ueberzug-18.3.1.tar.gz 58290 BLAKE2B 879f4dd7898a569cf70200fb683d6220bd410b7738963527030e504c59ef9095a28c4380c695ae8034ac2cd1d841df044ad4cad34f72c3ad24b8ef32c9473f7e SHA512 194f94c69d61163edde4a09b9575efa18d82119636f1b89b062fde207b18c7d0aca3ed144b08194a81417f6fe5ae9069de58b824b31ad1f34ecb80c67b4d1fc1 diff --git a/media-gfx/ueberzug/ueberzug-18.3.1.ebuild b/media-gfx/ueberzug/ueberzug-18.3.1.ebuild new file mode 100644 index 000000000000..6aba22f549c7 --- /dev/null +++ b/media-gfx/ueberzug/ueberzug-18.3.1.ebuild @@ -0,0 +1,39 @@ +# Copyright 2021-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_EXT=1 +DISTUTILS_USE_PEP517=meson-python +PYTHON_COMPAT=( python3_{10..13} ) +inherit distutils-r1 + +DESCRIPTION="Command line util to draw images on terminals by using child windows" +HOMEPAGE="https://github.com/ueber-devel/ueberzug/" +SRC_URI=" + https://github.com/ueber-devel/ueberzug/archive/refs/tags/${PV}.tar.gz + -> ${P}.tar.gz +" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +COMMON_DEPEND=" + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXres +" +RDEPEND=" + ${COMMON_DEPEND} + dev-python/attrs[${PYTHON_USEDEP}] + dev-python/docopt[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + !media-gfx/ueberzugpp +" +DEPEND=" + ${COMMON_DEPEND} + x11-base/xorg-proto +" + +distutils_enable_tests import-check diff --git a/media-gfx/wings/wings-2.2.6.1.ebuild b/media-gfx/wings/wings-2.2.6.1.ebuild index 261b738b994b..04eacee4323a 100644 --- a/media-gfx/wings/wings-2.2.6.1.ebuild +++ b/media-gfx/wings/wings-2.2.6.1.ebuild @@ -5,7 +5,7 @@ EAPI=7 inherit toolchain-funcs DESCRIPTION="Wings 3D is an advanced subdivision modeler" -HOMEPAGE="http://www.wings3d.com/" +HOMEPAGE="https://www.wings3d.com/" SRC_URI="https://downloads.sourceforge.net/wings/${P}.tar.bz2" LICENSE="BSD" diff --git a/media-gfx/wings/wings-2.3.ebuild b/media-gfx/wings/wings-2.3.ebuild index a822318d4c2a..21082b88f949 100644 --- a/media-gfx/wings/wings-2.3.ebuild +++ b/media-gfx/wings/wings-2.3.ebuild @@ -5,7 +5,7 @@ EAPI=8 inherit toolchain-funcs DESCRIPTION="Wings 3D is an advanced subdivision modeler" -HOMEPAGE="http://www.wings3d.com/" +HOMEPAGE="https://www.wings3d.com/" SRC_URI="https://downloads.sourceforge.net/wings/${P}.tar.bz2" LICENSE="BSD" diff --git a/media-gfx/xloadimage/files/xloadimage-4.1-c99.patch b/media-gfx/xloadimage/files/xloadimage-4.1-c99.patch new file mode 100644 index 000000000000..6da8b008aa86 --- /dev/null +++ b/media-gfx/xloadimage/files/xloadimage-4.1-c99.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/920772#c11 +Signed-off-by: Stephane Bakhos <nuitari@nuitari.net> +--- a/pdsuncomp.c ++++ b/pdsuncomp.c +@@ -421,8 +421,8 @@ + static char obuf[2048]; + char ibuf[2048]; + int left; +- int in_length; +- static int out_length= 2048, out_ptr= 0; ++ long int in_length; ++ static long int out_length= 2048, out_ptr= 0; + + if (Decompressing) { + left= size; diff --git a/media-gfx/xloadimage/xloadimage-4.1-r16.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r16.ebuild index 4b96c6d802fe..55580772932d 100644 --- a/media-gfx/xloadimage/xloadimage-4.1-r16.ebuild +++ b/media-gfx/xloadimage/xloadimage-4.1-r16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -16,7 +16,7 @@ S="${WORKDIR}"/${P/-/.} LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" IUSE="tiff jpeg png" RDEPEND="x11-libs/libX11 diff --git a/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild new file mode 100644 index 000000000000..2fb51b27538d --- /dev/null +++ b/media-gfx/xloadimage/xloadimage-4.1-r17.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic toolchain-funcs + +DESCRIPTION="Utility to view many different types of images under X11" +HOMEPAGE="https://sioseis.ucsd.edu/xloadimage.html https://tracker.debian.org/pkg/xloadimage" +SRC_URI=" + ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz + mirror://gentoo/${P}-gentoo-r1.diff.bz2 + https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-fix-build-for-clang16.patch.xz +" +S="${WORKDIR}"/${P/-/.} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="tiff jpeg png" + +RDEPEND="x11-libs/libX11 + tiff? ( media-libs/tiff:= ) + png? ( media-libs/libpng:= ) + jpeg? ( media-libs/libjpeg-turbo:= ) + !media-gfx/xli" +DEPEND="${RDEPEND} + x11-base/xorg-proto" + +PATCHES=( + "${WORKDIR}"/${P}-gentoo-r1.diff + "${FILESDIR}"/${P}-zio-shell-meta-char.diff + "${FILESDIR}"/${P}-endif.patch + # Do not define errno extern, but rather include errno.h + # <azarah@gentoo.org> (1 Jan 2003) + "${FILESDIR}"/${P}-include-errno_h.patch + "${FILESDIR}"/xloadimage-gentoo.patch + "${FILESDIR}"/${P}-unaligned-access.patch + "${FILESDIR}"/${P}-ldflags_and_exit.patch + "${FILESDIR}"/${P}-libpng15.patch + "${WORKDIR}"/${P}-fix-build-for-clang16.patch + # One of the previous patches screws up a bracket... + "${FILESDIR}"/${P}-bracket.patch + "${FILESDIR}"/${P}-fix-incomp-function-pointer-types.patch + "${FILESDIR}"/${P}-c99.patch +) + +src_prepare() { + default + + sed -i -e "s|OPT_FLAGS=|OPT_FLAGS=$CFLAGS|" Make.conf || die + sed -i -e "s:^#include <varargs.h>:#include <stdarg.h>:" rlelib.c || die + # qa-sed sees no-op on the next sed on non-gentoo-prefix systems, + # but that is alright + sed -i -e "/^DEFS = /s:/etc:${EPREFIX}/etc:" Makefile.in || die + sed -i \ + -e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \ + png.c || die + + eautoreconf +} + +src_configure() { + append-cflags -std=gnu17 + + # Set TIFFHeader to TIFFHeaderCommon wrt #319383 + has_version '>=media-libs/tiff-4.0.0_pre' && \ + append-flags -DTIFFHeader=TIFFHeaderCommon + + tc-export CC + econf $(use_with jpeg) \ + $(use_with png) \ + $(use_with tiff) +} + +src_compile() { + emake SYSPATHFILE="${EPREFIX}"/etc/X11/Xloadimage +} + +src_install() { + dobin xloadimage uufilter + + dosym xloadimage /usr/bin/xsetbg + dosym xloadimage /usr/bin/xview + + insinto /etc/X11 + doins xloadimagerc + + newman xloadimage.man xloadimage.1 + newman uufilter.man uufilter.1 + + echo ".so man1/xloadimage.1" > "${T}"/xsetbg.1 || die + doman "${T}"/xsetbg.1 + newman "${T}"/xsetbg.1 xview.1 + + dodoc README +} |