diff options
Diffstat (limited to 'media-gfx')
| -rw-r--r-- | media-gfx/Manifest.gz | bin | 38338 -> 38344 bytes | |||
| -rw-r--r-- | media-gfx/librecad/Manifest | 10 | ||||
| -rw-r--r-- | media-gfx/librecad/files/librecad-2.1.3-boost-1.76.patch | 29 | ||||
| -rw-r--r-- | media-gfx/librecad/files/librecad-2.1.3-gcc-9.patch | 209 | ||||
| -rw-r--r-- | media-gfx/librecad/files/librecad-2.1.3-qt-5.11.patch | 40 | ||||
| -rw-r--r-- | media-gfx/librecad/files/librecad-2.1.3-qt-5.15.patch | 37 | ||||
| -rw-r--r-- | media-gfx/librecad/files/librecad-2.2.0-fix-missing-header.patch | 29 | ||||
| -rw-r--r-- | media-gfx/librecad/librecad-2.1.3-r7.ebuild | 99 | ||||
| -rw-r--r-- | media-gfx/librecad/librecad-2.2.0.ebuild | 89 |
9 files changed, 0 insertions, 542 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex 255cd2c262ce..8a6d70dcbfa8 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest index 88a947365675..9d484e14a9ad 100644 --- a/media-gfx/librecad/Manifest +++ b/media-gfx/librecad/Manifest @@ -1,14 +1,4 @@ -AUX librecad-2.1.3-boost-1.76.patch 1032 BLAKE2B 9c8893627fd43cb831d48e9f86472c0e0029cfa155f08e3813f12f7f2750a91eac1d384ad149ee87585437d26426242e6f69364cabb33d30db74d220494b0395 SHA512 7751fc6ec2106f4b0a8f9d1fdd676ec4e2098d79e52e6365c5e857bc0e96adde30c66320f6b2625c0ecec7e4bff0352683b467a5e699b57c6ad87f494bd1bcb8 -AUX librecad-2.1.3-gcc-9.patch 8494 BLAKE2B 85f7cfd7822d27c4b76b6cc9b71f9667b912ef80229e2a70110155d4b52f0e203b186ffb6a0be160d6d2aadcaf241994d7f78d81a096d7540c46b946ed7cb892 SHA512 5adb8086244ec18e78f503b7522ea79213b629d297bb07fad0c21ae1e205731fd544aff7e979f1cc5709542a23311c771d61f13f4ba09f34baff9a24deae5eed -AUX librecad-2.1.3-qt-5.11.patch 1396 BLAKE2B 80e637b724df81dce60c17354bed56a2329dd4c3f445b40ea18a4a49614f2ee34114e1b6cc008b29e2dbd7b65c53340aaa447173f6f4d23d80e1a8809131aae7 SHA512 5e4ae43ac89fc8acf779fec9e062cac3896f0e41b0bf7fdab91ef128ab1a20a4ecda71ef332d9af7403f11a813323cc509e0682e5ffdf97786599271a2711f25 -AUX librecad-2.1.3-qt-5.15.patch 1270 BLAKE2B 0947b13ff328e4f1c3ac04d846e7ed372d76d4858cecff5fe4ff8fc8c3c1558cd0e9ac53354e1f0b5b1d137db09c8205f034df9356b9b9e3206a611608fb8166 SHA512 b1a5afe1d22b7725c7d10a10bed5e52495cda7699ff20bd0f75bbfe28f7131a3d9cd5ec0a1ae7fd329196d2f88bb4b8336301fdb6efa073d773f31340a062ba0 -AUX librecad-2.2.0-fix-missing-header.patch 872 BLAKE2B cfa4d3908b6a1edd46ed9d624b5b6e4ee84c7935d5b047d10e85e319ace6748a27b6b9b93ccfd2f8c9e27ce72449a00ac27ffeb88e478422d1fac82fd20ff8d1 SHA512 3487425bc33eb706a68998369194c8005c7a50f244806d68555c706268e6d10bcab99abab90b5c86fb3615e344aa1f690eb4d1f40d44564e67555025c3bdf26e -DIST librecad-2.1.3.tar.gz 22415288 BLAKE2B fb920113a7e4b2e9e7e3425f77364c36f6be676a3cd109798786b06d31698fd11437bc7f50cb843ca02d761730e83db7fde475d1bce6a65336a845b5b0114918 SHA512 246cffcc1ea3389997b4a738ab5e3d78e8c1096817ecb1ca28f38d601bc5d1a95f60798ac82308914a34da7b5dbc302b8363cf8b58a97221fdc8ee63010adc6c DIST librecad-2.2.0.2.tar.gz 13645528 BLAKE2B 43a9ada4d6fe8c0cb96dc1003a9e7aa3b4d21619ce9776de1e6d273dd884f2313f9e90abed9cadcd44aaac2131bb62ffb0105bc0d8a097513ac42b9886107021 SHA512 054c6e6cf35a30099e71dd022574864c42d99db8bfa73b544113573723f8e6db2c92f9b7a827b947528f8ad9c743bca73a77a81bc50a9dc66f290480bb38db05 -DIST librecad-2.2.0.tar.gz 13837301 BLAKE2B ede9181b6805455d10773b70a8262ffb5a1c48f353dbfd1b80f705ba3194be700e9a486cdf528c4e8015b327a75a29c81b832186024d48229a6cc5fd9ca2dc12 SHA512 df33eac311b5232d6fc0480be1b1c9d257a33ba22f9b7897af4c1761978c87c07a962ae3ea37e8728661a788152157fc621aae65d60d44ae37b2028919cc96a2 -DIST librecad-gentoo-CVE-patches-2.1.3.tar.gz 11687 BLAKE2B 4676fa60033e6d0ace35bbebfae569366a50ec46c2dc5b90bace9564e1f6c2020f733f63981788b6f5288fb0c57760215e7b35f294656c21787ebdefa8447fa0 SHA512 b485b41ab1d6eb61750c11a9b327fc70d28cd0cf689b3cd815b4982d3d800737f402522d9c3d416f1e43422166e7de4f97055de238cc2fe80cc45f11fa3377e6 -EBUILD librecad-2.1.3-r7.ebuild 2879 BLAKE2B 4b9da167e4db48da0c8a41bf43c3d5fcadabea9f57a82270fec85b18da2dd6823d60be0eea3bd4bad7f4324599c47fd4b020276f3a4a28f7be5a2d13004a5f8a SHA512 3ed191982b167c0cabdd28e5ab7702784e0da508f358a066507bde711cb5917c885de435985ea0636e96d1f94586f76c007607a7ec1e1f90cb14646724988546 EBUILD librecad-2.2.0.2.ebuild 2355 BLAKE2B 16afc5c397a9d304a21542c1e642097c591997db0bd44816ac6a20c62ab9c9e59db6496d9c985d68279e1507ca8f53fe787a27d5b166c09de2881c6fe49529b9 SHA512 22bdefe9263b512008c74df3e272173a5b9dadaf782da131ffbdcf04984ab671e1250d1c1f274f2e8a7d11624a8d9a17a60a701b9a1b08a2b5de9cbee8ac839f -EBUILD librecad-2.2.0.ebuild 2413 BLAKE2B 96ede5e05dda79f883dd89b2cd759e56400b2474b3609e135e0faa34904121694e396f34cd121a9b4df84afe57d818a1bb7ca253f6a894d96aff41a093dd89b2 SHA512 84d0f89d8f9f35ddb21a18537bcbc02cad1f665009e5f0c251fd78bc73baeb1f0273244e4e7b353bd97f4484a21542953e45042d8c53ab210677e6a49396990b EBUILD librecad-9999.ebuild 2342 BLAKE2B 435e4e8c7d5d7e3c1fd3338b98bda4617cc1b246a0670bcda542d0e061593d4da6a176bdddc7508cf543121a42a7ae72c04948c52176a731da67f756b153c38b SHA512 6b3c27abf552b61ce21b30605ef31015a557424679940281a1516ec3f9f5ca296289896fbcc08f15764e8a9a6ef653ceb2e4672538d01b48f708b030af2f0c0e MISC metadata.xml 333 BLAKE2B 2790ea3fb043f1d8393fd715b4669edab3229e1de59e27cc70f3fd3cc13f83964ad1dc6a5534af981111b4ba1a2c7d29501015459e300905574fbc59fce88ee2 SHA512 bf932b64f53780d10e7e64845f4d50f1726f9d57e4625cb94ed2dcc761a0d7f409731b9e9cd1475880b283b43d7b0b979493b984cb243f09954a38f39baac5b9 diff --git a/media-gfx/librecad/files/librecad-2.1.3-boost-1.76.patch b/media-gfx/librecad/files/librecad-2.1.3-boost-1.76.patch deleted file mode 100644 index 2500bab79b19..000000000000 --- a/media-gfx/librecad/files/librecad-2.1.3-boost-1.76.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1fd07fcd847659d518efa0897a9f603de83fe362 Mon Sep 17 00:00:00 2001 -From: Jiri Slaby <jslaby@suse.cz> -Date: Tue, 4 May 2021 09:25:03 +0200 -Subject: [PATCH] add boost tuple include to fix build - -With boost 1.76, we see: -lib/engine/rs_ellipse.cpp:70:15: error: 'tuple' in namespace 'boost::math' does not name a template type - 70 | boost::math::tuple<double, double, double> operator()(double const& z) const { - | ^~~~~ - -Fix this by including the proper boost header. ---- - librecad/src/lib/engine/rs_ellipse.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/librecad/src/lib/engine/rs_ellipse.cpp b/librecad/src/lib/engine/rs_ellipse.cpp -index 291f734ea..d47bf6ca4 100644 ---- a/librecad/src/lib/engine/rs_ellipse.cpp -+++ b/librecad/src/lib/engine/rs_ellipse.cpp -@@ -48,6 +48,9 @@ - #include <boost/version.hpp> - #include <boost/math/tools/roots.hpp> - #include <boost/math/special_functions/ellint_2.hpp> -+#if BOOST_VERSION > 104500 -+#include <boost/math/tools/tuple.hpp> -+#endif - #endif - - namespace{ diff --git a/media-gfx/librecad/files/librecad-2.1.3-gcc-9.patch b/media-gfx/librecad/files/librecad-2.1.3-gcc-9.patch deleted file mode 100644 index f8214f29fab3..000000000000 --- a/media-gfx/librecad/files/librecad-2.1.3-gcc-9.patch +++ /dev/null @@ -1,209 +0,0 @@ -diff --git a/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp b/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp -index c14da00e4..f305408aa 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp -+++ b/librecad/src/actions/rs_actiondrawcircletan1_2p.cpp -@@ -36,11 +36,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - #include "rs_preview.h" - #include "rs_debug.h" - --namespace{ --//list of entity types supported by current action --auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle}; --} -- - struct RS_ActionDrawCircleTan1_2P::Points { - std::vector<RS_Vector> points; - RS_CircleData cData; -diff --git a/librecad/src/actions/rs_actiondrawcircletan1_2p.h b/librecad/src/actions/rs_actiondrawcircletan1_2p.h -index a6f40a6ea..b5976c9f6 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan1_2p.h -+++ b/librecad/src/actions/rs_actiondrawcircletan1_2p.h -@@ -79,6 +79,9 @@ class RS_ActionDrawCircleTan1_2P : public RS_PreviewActionInterface { - private: - struct Points; - std::unique_ptr<Points> pPoints; -+ -+ //list of entity types supported by current action -+ const std::initializer_list<RS2::EntityType> enTypeList {RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle}; - }; - - #endif -diff --git a/librecad/src/actions/rs_actiondrawcircletan2.cpp b/librecad/src/actions/rs_actiondrawcircletan2.cpp -index d0558f05b..820e42266 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan2.cpp -+++ b/librecad/src/actions/rs_actiondrawcircletan2.cpp -@@ -33,10 +33,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - #include "rs_preview.h" - #include "rs_debug.h" - --namespace { --auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle}; --} -- - struct RS_ActionDrawCircleTan2::Points { - RS_CircleData cData; - RS_Vector coord; -diff --git a/librecad/src/actions/rs_actiondrawcircletan2.h b/librecad/src/actions/rs_actiondrawcircletan2.h -index bed568970..5b2040e90 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan2.h -+++ b/librecad/src/actions/rs_actiondrawcircletan2.h -@@ -77,6 +77,9 @@ class RS_ActionDrawCircleTan2 : public RS_PreviewActionInterface { - private: - struct Points; - std::unique_ptr<Points> pPoints; -+ -+ //list of entity types supported by current action -+ const std::initializer_list<RS2::EntityType> enTypeList {RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle}; - }; - - #endif -diff --git a/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp b/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp -index 324c16686..51cd29a19 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp -+++ b/librecad/src/actions/rs_actiondrawcircletan2_1p.cpp -@@ -35,10 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - #include "rs_preview.h" - #include "rs_debug.h" - --namespace { --auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle}; --} -- - struct RS_ActionDrawCircleTan2_1P::Points { - RS_Vector point; - RS_CircleData cData; -diff --git a/librecad/src/actions/rs_actiondrawcircletan2_1p.h b/librecad/src/actions/rs_actiondrawcircletan2_1p.h -index 40c239037..e44a56c36 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan2_1p.h -+++ b/librecad/src/actions/rs_actiondrawcircletan2_1p.h -@@ -73,6 +73,9 @@ class RS_ActionDrawCircleTan2_1P : public RS_PreviewActionInterface { - private: - struct Points; - std::unique_ptr<Points> pPoints; -+ -+ //list of entity types supported by current action -+ const std::initializer_list<RS2::EntityType> enTypeList {RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle}; - }; - - #endif -diff --git a/librecad/src/actions/rs_actiondrawcircletan3.cpp b/librecad/src/actions/rs_actiondrawcircletan3.cpp -index 026ed30e5..eaca13d63 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan3.cpp -+++ b/librecad/src/actions/rs_actiondrawcircletan3.cpp -@@ -35,10 +35,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - #include "rs_preview.h" - #include "rs_debug.h" - --namespace { --auto enTypeList={RS2::EntityArc, RS2::EntityCircle, RS2::EntityLine, RS2::EntityPoint}; --} -- - struct RS_ActionDrawCircleTan3::Points { - std::vector<RS_AtomicEntity*> circles; - std::shared_ptr<RS_CircleData> cData{std::make_shared<RS_CircleData>()}; -diff --git a/librecad/src/actions/rs_actiondrawcircletan3.h b/librecad/src/actions/rs_actiondrawcircletan3.h -index d0cabfa2d..3201c5f88 100644 ---- a/librecad/src/actions/rs_actiondrawcircletan3.h -+++ b/librecad/src/actions/rs_actiondrawcircletan3.h -@@ -78,6 +78,8 @@ class RS_ActionDrawCircleTan3 : public RS_PreviewActionInterface { - struct Points; - std::unique_ptr<Points> pPoints; - -+ //list of entity types supported by current action -+ const std::initializer_list<RS2::EntityType> enTypeList {RS2::EntityArc, RS2::EntityCircle, RS2::EntityLine, RS2::EntityPoint}; - }; - - #endif -diff --git a/librecad/src/actions/rs_actiondrawlinerelangle.cpp b/librecad/src/actions/rs_actiondrawlinerelangle.cpp -index 8415dd604..b9ce996fe 100644 ---- a/librecad/src/actions/rs_actiondrawlinerelangle.cpp -+++ b/librecad/src/actions/rs_actiondrawlinerelangle.cpp -@@ -38,11 +38,6 @@ - #include "rs_preview.h" - #include "rs_debug.h" - --namespace { --auto enTypeList={RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle, -- RS2::EntityEllipse}; --} -- - RS_ActionDrawLineRelAngle::RS_ActionDrawLineRelAngle( - RS_EntityContainer& container, - RS_GraphicView& graphicView, -diff --git a/librecad/src/actions/rs_actiondrawlinerelangle.h b/librecad/src/actions/rs_actiondrawlinerelangle.h -index 1e102792d..71e5185b7 100644 ---- a/librecad/src/actions/rs_actiondrawlinerelangle.h -+++ b/librecad/src/actions/rs_actiondrawlinerelangle.h -@@ -110,6 +110,9 @@ class RS_ActionDrawLineRelAngle : public RS_PreviewActionInterface { - * Is the angle fixed? - */ - bool fixedAngle; -+ -+ //list of entity types supported by current action -+ const std::initializer_list<RS2::EntityType> enTypeList {RS2::EntityLine, RS2::EntityArc, RS2::EntityCircle,RS2::EntityEllipse}; - }; - - #endif -diff --git a/librecad/src/actions/rs_actiondrawlinetangent1.cpp b/librecad/src/actions/rs_actiondrawlinetangent1.cpp -index 197b0cb6c..47a93c766 100644 ---- a/librecad/src/actions/rs_actiondrawlinetangent1.cpp -+++ b/librecad/src/actions/rs_actiondrawlinetangent1.cpp -@@ -36,12 +36,6 @@ - #include "rs_preview.h" - #include "rs_debug.h" - --namespace{ --auto circleType={RS2::EntityArc, RS2::EntityCircle, -- RS2::EntityEllipse, RS2::EntitySplinePoints -- }; --} -- - RS_ActionDrawLineTangent1::RS_ActionDrawLineTangent1( - RS_EntityContainer& container, - RS_GraphicView& graphicView) -diff --git a/librecad/src/actions/rs_actiondrawlinetangent1.h b/librecad/src/actions/rs_actiondrawlinetangent1.h -index 0f76b3684..d20d302dd 100644 ---- a/librecad/src/actions/rs_actiondrawlinetangent1.h -+++ b/librecad/src/actions/rs_actiondrawlinetangent1.h -@@ -66,6 +66,12 @@ class RS_ActionDrawLineTangent1 : public RS_PreviewActionInterface { - std::unique_ptr<RS_Vector> point; - /** Chosen entity */ - RS_Entity* circle; -+ -+ //list of entity types supported by current action -+ const std::initializer_list<RS2::EntityType> circleType { RS2::EntityArc, -+ RS2::EntityCircle, -+ RS2::EntityEllipse, -+ RS2::EntitySplinePoints }; - }; - - #endif -diff --git a/librecad/src/actions/rs_actiondrawlinetangent2.cpp b/librecad/src/actions/rs_actiondrawlinetangent2.cpp -index fed3545e0..0f1600e53 100644 ---- a/librecad/src/actions/rs_actiondrawlinetangent2.cpp -+++ b/librecad/src/actions/rs_actiondrawlinetangent2.cpp -@@ -35,10 +35,6 @@ - #include "rs_preview.h" - #include "rs_debug.h" - --namespace{ --auto circleType={RS2::EntityArc, RS2::EntityCircle, RS2::EntityEllipse}; --} -- - RS_ActionDrawLineTangent2::RS_ActionDrawLineTangent2( - RS_EntityContainer& container, - RS_GraphicView& graphicView) -diff --git a/librecad/src/actions/rs_actiondrawlinetangent2.h b/librecad/src/actions/rs_actiondrawlinetangent2.h -index b0d884cd7..95d82465d 100644 ---- a/librecad/src/actions/rs_actiondrawlinetangent2.h -+++ b/librecad/src/actions/rs_actiondrawlinetangent2.h -@@ -68,6 +68,9 @@ class RS_ActionDrawLineTangent2 : public RS_PreviewActionInterface { - /** 2nd chosen entity */ - RS_Entity* circle2; - bool valid; -+ -+ //list of entity types supported by current action -+ const std::initializer_list<RS2::EntityType> circleType {RS2::EntityArc, RS2::EntityCircle, RS2::EntityEllipse}; - }; - - #endif diff --git a/media-gfx/librecad/files/librecad-2.1.3-qt-5.11.patch b/media-gfx/librecad/files/librecad-2.1.3-qt-5.11.patch deleted file mode 100644 index 0c61a66d8a1a..000000000000 --- a/media-gfx/librecad/files/librecad-2.1.3-qt-5.11.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 6c392e903e162b9283e88f53006e929663f2e883 Mon Sep 17 00:00:00 2001 -From: Jiri Slaby <jslaby@suse.cz> -Date: Mon, 11 Jun 2018 10:44:00 +0200 -Subject: [PATCH] fix build with Qt 5.11 - -The new Qt removed some implicit inclusions of headers. To avoid build -errors, add explicit includes of those we use in the sources. - -Signed-off-by: Jiri Slaby <jslaby@suse.cz> ---- - librecad/src/ui/forms/qg_commandwidget.cpp | 1 + - librecad/src/ui/generic/colorwizard.cpp | 1 + - librecad/src/ui/generic/widgetcreator.cpp | 2 ++ - 3 files changed, 4 insertions(+) - -diff --git a/librecad/src/ui/forms/qg_commandwidget.cpp b/librecad/src/ui/forms/qg_commandwidget.cpp -index 835e47d67..2c878e833 100644 ---- a/librecad/src/ui/forms/qg_commandwidget.cpp -+++ b/librecad/src/ui/forms/qg_commandwidget.cpp -@@ -27,6 +27,7 @@ - ** - **********************************************************************/ - #include "qg_commandwidget.h" -+#include <QAction> - #include <QKeyEvent> - #include <algorithm> - -diff --git a/librecad/src/ui/generic/widgetcreator.cpp b/librecad/src/ui/generic/widgetcreator.cpp -index 7c35144ff..d51190842 100644 ---- a/librecad/src/ui/generic/widgetcreator.cpp -+++ b/librecad/src/ui/generic/widgetcreator.cpp -@@ -27,6 +27,8 @@ - #include "widgetcreator.h" - #include "ui_widgetcreator.h" - -+#include <QAction> -+#include <QActionGroup> - #include <QSettings> - #include <QLineEdit> - #include <QPushButton> diff --git a/media-gfx/librecad/files/librecad-2.1.3-qt-5.15.patch b/media-gfx/librecad/files/librecad-2.1.3-qt-5.15.patch deleted file mode 100644 index a1cfe62408f9..000000000000 --- a/media-gfx/librecad/files/librecad-2.1.3-qt-5.15.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 81741a875847c806c05f0f3a4610e69b3c3002aa Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Wed, 20 May 2020 14:12:15 +0200 -Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include) - ---- - librecad/src/lib/engine/lc_splinepoints.cpp | 1 + - librecad/src/lib/gui/rs_painterqt.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/librecad/src/lib/engine/lc_splinepoints.cpp b/librecad/src/lib/engine/lc_splinepoints.cpp -index 5eaed81b..e6324ec1 100644 ---- a/librecad/src/lib/engine/lc_splinepoints.cpp -+++ b/librecad/src/lib/engine/lc_splinepoints.cpp -@@ -21,6 +21,7 @@ along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - **********************************************************************/ - -+#include <QPainterPath> - #include <QPolygonF> - #include "lc_splinepoints.h" - -diff --git a/librecad/src/lib/gui/rs_painterqt.h b/librecad/src/lib/gui/rs_painterqt.h -index 878753cb..a0b432e0 100644 ---- a/librecad/src/lib/gui/rs_painterqt.h -+++ b/librecad/src/lib/gui/rs_painterqt.h -@@ -29,6 +29,7 @@ - #define RS_PAINTERQT_H - - #include <QPainter> -+#include <QPainterPath> - - #include "rs_painter.h" - #include "rs_pen.h" --- -2.26.2 - diff --git a/media-gfx/librecad/files/librecad-2.2.0-fix-missing-header.patch b/media-gfx/librecad/files/librecad-2.2.0-fix-missing-header.patch deleted file mode 100644 index 3caec03b011a..000000000000 --- a/media-gfx/librecad/files/librecad-2.2.0-fix-missing-header.patch +++ /dev/null @@ -1,29 +0,0 @@ -The patch is borrowed from upstream https://github.com/LibreCAD/LibreCAD - -https://github.com/LibreCAD/LibreCAD/commit/6e0f1556bbd554e528295f92597a80a109344607 - -https://bugs.gentoo.org/919822 - -commit 6e0f1556bbd554e528295f92597a80a109344607 -Author: Denis Pronin <dannftk@yandex.ru> -Date: Sun Jun 2 22:23:11 2024 +0300 - - fix compilation with clang and llvm's libcxx - - librecad/src/lib/debug/rs_debug.h requires cstdio to be included because of FILE - type being used - - Signed-off-by: Denis Pronin <dannftk@yandex.ru> - -diff --git a/librecad/src/lib/debug/rs_debug.h b/librecad/src/lib/debug/rs_debug.h -index 23918574..8950efcc 100644 ---- a/librecad/src/lib/debug/rs_debug.h -+++ b/librecad/src/lib/debug/rs_debug.h -@@ -28,6 +28,7 @@ - #ifndef RS_DEBUG_H - #define RS_DEBUG_H - -+#include <cstdio> - #include <iosfwd> - #ifdef __hpux - #include <sys/_size_t.h> diff --git a/media-gfx/librecad/librecad-2.1.3-r7.ebuild b/media-gfx/librecad/librecad-2.1.3-r7.ebuild deleted file mode 100644 index 3edea50eab0b..000000000000 --- a/media-gfx/librecad/librecad-2.1.3-r7.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PLOCALES="ar ca cs da de el en en_au es es_ar es_bo es_cl es_co es_cr es_do es_ec es_gt es_hn es_mx es_ni es_pa es_pe es_pr es_py es_sv es_us es_uy es_ve et eu fi fr gl hi hu id_ID it ja ko lv nl no pa pl pt_br pt_pt ro_ro ru sk sl sq_al sv ta tr uk zh_cn zh_tw" - -inherit desktop edo plocale qmake-utils - -DESCRIPTION="Generic 2D CAD program" -HOMEPAGE="https://www.librecad.org/" - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git" - inherit git-r3 -else - SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.tar.gz - https://github.com/Fat-Zer/librecad-gentoo-CVE-patches/archive/v${PV/_/}.tar.gz -> librecad-gentoo-CVE-patches-${PV}.tar.gz - " - S="${WORKDIR}/LibreCAD-${PV}" - KEYWORDS="amd64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug doc tools" - -RDEPEND=" - dev-cpp/muParser - dev-libs/boost:= - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - media-libs/freetype:2 -" -DEPEND="${RDEPEND} - dev-qt/qthelp:5 - dev-qt/qtxml:5 -" -BDEPEND=" - dev-qt/linguist-tools:5 -" - -PATCHES=( - "${FILESDIR}/${P}-qt-5.11.patch" - "${FILESDIR}/${P}-gcc-9.patch" - "${FILESDIR}/${P}-qt-5.15.patch" - "${FILESDIR}/${P}-boost-1.76.patch" # bug 788706, upstream PR#1345 -) - -src_prepare() { - default - - # Note: the CVE patches are borrowed from debian packaging; some of the - # patches are too big for the tree; move them to a separate repo/ - # see bug #825362 and bug #832210 - eapply "${WORKDIR}/librecad-gentoo-CVE-patches-${PV}" - - # Stock script doesn't work correctly on gentoo (see bug #847394) - # and also it compiles all translations regardles of selected locales. - # To avoid this just comment out locale building and do it manually - sed -i -e '/LRELEASE/s!^!# !' scripts/postprocess-unix.sh || die - - plocale_find_changes 'librecad/ts' 'librecad_' '.ts' -} - -src_configure() { - eqmake5 -r -} - -src_compile() { - default - - build_locale() { - local lrelease="$(qt5_get_bindir)/lrelease" - edo "${lrelease}" "librecad/ts/librecad_${1}.ts" \ - -qm "unix/resources/qm/librecad_${1}.qm" - edo "${lrelease}" "plugins/ts/plugins_${1}.ts" \ - -qm "unix/resources/qm/plugins_${1}.qm" - } - - plocale_for_each_locale build_locale - # We want the en locale to be always present. Otherwise it could - # be impossible to select the English command set which is quite crucial. - has en $(plocale_get_locales) || build_locale en -} - -src_install() { - dobin unix/librecad - use tools && dobin unix/ttf2lff - insinto /usr/share/${PN} - doins -r unix/resources/* - use doc && docinto html && dodoc -r librecad/support/doc/* - insinto /usr/share/metainfo - doins unix/appdata/librecad.appdata.xml - doicon librecad/res/main/${PN}.png - make_desktop_entry ${PN} LibreCAD ${PN} Graphics -} diff --git a/media-gfx/librecad/librecad-2.2.0.ebuild b/media-gfx/librecad/librecad-2.2.0.ebuild deleted file mode 100644 index f86b8253e177..000000000000 --- a/media-gfx/librecad/librecad-2.2.0.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PLOCALES="ar ca cs da de el en en_au es es_ar es_bo es_cl es_co es_cr es_do es_ec es_gt es_hn es_mx es_ni es_pa es_pe es_pr es_py es_sv es_us es_uy es_ve et eu fi fr gl hi hu id_ID it ja ko lv mk nl no pa pl pt_br pt_pt ro_ro ru sk sl sq_al sv ta tr uk zh_cn zh_tw" - -inherit desktop edo plocale qmake-utils - -DESCRIPTION="Generic 2D CAD program" -HOMEPAGE="https://www.librecad.org/" - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git" - inherit git-r3 -else - SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/LibreCAD-${PV}" - KEYWORDS="amd64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="debug doc tools" - -RDEPEND=" - dev-cpp/muParser - dev-libs/boost:= - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - media-libs/freetype:2 -" -DEPEND="${RDEPEND} - dev-qt/qthelp:5 - dev-qt/qtxml:5 -" -BDEPEND=" - dev-qt/linguist-tools:5 -" - -PATCHES=( - "${FILESDIR}/${P}-fix-missing-header.patch" -) - -src_prepare() { - default - - # Stock script doesn't work correctly on gentoo (see bug #847394) - # and also it compiles all translations regardles of selected locales. - # To avoid this just comment out locale building and do it manually - sed -i -e '/LRELEASE/s!^!# !' scripts/postprocess-unix.sh || die - - plocale_find_changes 'librecad/ts' 'librecad_' '.ts' -} - -src_configure() { - eqmake5 -r -} - -src_compile() { - default - - build_locale() { - local lrelease="$(qt5_get_bindir)/lrelease" - edo "${lrelease}" "librecad/ts/librecad_${1}.ts" \ - -qm "unix/resources/qm/librecad_${1}.qm" - edo "${lrelease}" "plugins/ts/plugins_${1}.ts" \ - -qm "unix/resources/qm/plugins_${1}.qm" - } - - plocale_for_each_locale build_locale - # We want the en locale to be always present. Otherwise it could - # be impossible to select the English command set which is quite crucial. - has en $(plocale_get_locales) || build_locale en -} - -src_install() { - dobin unix/librecad - use tools && dobin unix/ttf2lff - insinto /usr/share/${PN} - doins -r unix/resources/* - use doc && docinto html && dodoc -r librecad/support/doc/* - insinto /usr/share/metainfo - doins unix/appdata/org.librecad.librecad.appdata.xml - doicon librecad/res/main/${PN}.png - make_desktop_entry ${PN} LibreCAD ${PN} Graphics -} |