* [gentoo-commits] repo/gentoo:master commit in: media-gfx/librecad/files/, media-gfx/librecad/
@ 2016-09-05 12:23 Slawek Lis
0 siblings, 0 replies; 5+ messages in thread
From: Slawek Lis @ 2016-09-05 12:23 UTC (permalink / raw
To: gentoo-commits
commit: 54efa1134353a0745cb87fc2229b39a606d31fea
Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 5 12:24:40 2016 +0000
Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Mon Sep 5 12:25:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54efa113
media-gfx/librecad: version bump to 2.1.1
Reported in bug 592234
Reported-by: poncho <AT> spahan.ch
Package-Manager: portage-2.3.0
media-gfx/librecad/Manifest | 1 +
media-gfx/librecad/files/iota-fix-2.1.1.patch | 10 ++++
media-gfx/librecad/librecad-2.1.1.ebuild | 70 +++++++++++++++++++++++++++
3 files changed, 81 insertions(+)
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 514b5dd..654dd1a 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -4,3 +4,4 @@ DIST librecad-2.0.6.zip 17401781 SHA256 09a58f9a4b578eb7381f299414344f82c6e32015
DIST librecad-2.0.7.zip 17457197 SHA256 36d2fa1c60324bb743f0ddde0b9da1dc6b57a370422de714adef27a0cd32d9d2 SHA512 afbe094dd565e2b058c5b1c28e88b76b883d1b9f20f60047e5a7771ec5d353e6a3e73abee8e4d7ac5f916ead7fb15719cf7bab034d670f7d7f54ca394d314803 WHIRLPOOL 5d196be5e54e4ceb7f2650015f35bf6ba77440b7a81d51f68a9a15408d399779f5c61289a5adaacbf1538735f7f0761152371291bab8bc8c8fb8109c3e1ddfc3
DIST librecad-2.0.8.zip 23469997 SHA256 3f3affbff85fd16746a0e551777c4f234d2b03384d04edf9483d36db1c7144a3 SHA512 d0dd1fdcaafbb7b83a8d0791e132633e9a72648d7d8d7ffdfc02bb092348472a05917df7ea1f2096404afabc92d586b75f6cafa3bc54da535bcaf005c96ed8a7 WHIRLPOOL 14ae2c433345b5081c92426913744d57f2fa4a97621fb55143995365381d5fbed6c8ad6a1f3a6d215dc4791e3493259b3e09801bfb288a85de7db87f010aae49
DIST librecad-2.0.9.zip 25524745 SHA256 3fd92e8249642462d41d688446393ee5e79f68b7b0d9878388c6c194af2cb43a SHA512 e2029389b2ced67a94d9411cb2f49f524ac12542409bc7829a043af9611dd51544fc431e364f4dcfb1a8b645b2bc6eb86fc74294726a65ee687f69bd7eb8f700 WHIRLPOOL 20aaa38cd92547bae6cee4b696f5b7f3699438481c5051af6112c6b1661ffb018509ff1fdcfb4591e8828c8ffcfcc5a3002c594dbcf95beba93e9768c5133c02
+DIST librecad-2.1.1.zip 26085717 SHA256 a5d27119ff137611c090fb174890ed1312c56897fb1482327d676da148fbd7dc SHA512 82b27e75fddae798da0e30e0c560d3769dfddab936e33a3585fd3e871eccf88e51c28d5ed938a530cb65c2e2ecfc593772ca83a2d23dd29126aa8225595f3d01 WHIRLPOOL 50ac34d0bdf1cd55ee6f7a959c1c1430197ac8acb7739755887b726349e39c9a1fe32ef25cab285aeaf649057701256f6210750c986ddb67ed3f338c80e300ed
diff --git a/media-gfx/librecad/files/iota-fix-2.1.1.patch b/media-gfx/librecad/files/iota-fix-2.1.1.patch
new file mode 100644
index 00000000..12506f4
--- /dev/null
+++ b/media-gfx/librecad/files/iota-fix-2.1.1.patch
@@ -0,0 +1,10 @@
+--- librecad/src/lib/engine/rs_spline.cpp.old 2016-06-20 20:43:27.000000000 +0200
++++ librecad/src/lib/engine/rs_spline.cpp 2016-09-05 13:23:25.459841304 +0200
+@@ -26,6 +26,7 @@
+
+ #include<iostream>
+ #include<cmath>
++#include<numeric>
+ #include "rs_spline.h"
+
+
diff --git a/media-gfx/librecad/librecad-2.1.1.ebuild b/media-gfx/librecad/librecad-2.1.1.ebuild
new file mode 100644
index 00000000..359ab6c
--- /dev/null
+++ b/media-gfx/librecad/librecad-2.1.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils qmake-utils
+
+DESCRIPTION="Generic 2D CAD program"
+HOMEPAGE="http://www.librecad.org/"
+SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="3d debug doc tools qt4 +qt5"
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+DEPEND="
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qtsvg:4
+ dev-qt/qthelp:4
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qthelp:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ )
+ dev-libs/boost:=
+ dev-cpp/muParser
+ media-libs/freetype:2"
+
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/LibreCAD-${PV}"
+
+src_prepare() {
+ epatch "${FILESDIR}/iota-fix-2.1.1.patch"
+
+ # currently RS_VECTOR3D causes an internal compiler error on GCC-4.8
+ if ! use 3d; then
+ sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
+ fi
+}
+
+src_configure() {
+ if use qt4; then
+ eqmake4 -r
+ else
+ eqmake5 -r
+ fi
+}
+
+src_install() {
+ dobin unix/librecad
+ use tools && dobin unix/ttf2lff
+ insinto /usr/share/${PN}
+ doins -r unix/resources/*
+ use doc && insinto html && dodoc -r librecad/support/doc/*
+ insinto /usr/share/appdata
+ doins unix/appdata/librecad.appdata.xml
+ doicon librecad/res/main/${PN}.png
+ make_desktop_entry ${PN} LibreCAD ${PN} Graphics
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/librecad/files/, media-gfx/librecad/
@ 2017-11-27 6:50 Slawek Lis
0 siblings, 0 replies; 5+ messages in thread
From: Slawek Lis @ 2017-11-27 6:50 UTC (permalink / raw
To: gentoo-commits
commit: 706e2bd000f5e2e01db5abfd0fb2866ac646da1d
Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 06:30:29 2017 +0000
Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 06:49:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=706e2bd0
media-gfx/librecad: dropped old version, with unsupported qt4
Dropped versions: 2.0.3, 2.0.9, 2.1.1
Related bug: https://bugs.gentoo.org/631808
Package-Manager: Portage-2.3.16, Repoman-2.3.6
media-gfx/librecad/Manifest | 3 --
media-gfx/librecad/files/iota-fix-2.1.1.patch | 10 ----
media-gfx/librecad/librecad-2.0.3.ebuild | 37 --------------
media-gfx/librecad/librecad-2.0.9-r1.ebuild | 67 --------------------------
media-gfx/librecad/librecad-2.1.1.ebuild | 69 ---------------------------
5 files changed, 186 deletions(-)
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index cc4f479ec31..e972fbdaa29 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,4 +1 @@
-DIST librecad-2.0.3.zip 16590256 SHA256 4221348541c46c6e9698c1fa3471a14a81376e022a009a164a7f0d0035da4643 SHA512 c40952ae967d83197645bef65dac6e050ddeacf536401b2b99cd18d753462af086ac2a410c6746a92c094ad76fd9177a900c21531ed7b7fcdf1e4b0f7f070e00 WHIRLPOOL c2e1d33b17b7a47ffd9b3795ad292b22cb1225aceacf052494745243630b0537e21701930b9433ea235c462d65581efc2b5ccda3b37712d4ab639ab9bcc6a97d
-DIST librecad-2.0.9.zip 25524745 SHA256 3fd92e8249642462d41d688446393ee5e79f68b7b0d9878388c6c194af2cb43a SHA512 e2029389b2ced67a94d9411cb2f49f524ac12542409bc7829a043af9611dd51544fc431e364f4dcfb1a8b645b2bc6eb86fc74294726a65ee687f69bd7eb8f700 WHIRLPOOL 20aaa38cd92547bae6cee4b696f5b7f3699438481c5051af6112c6b1661ffb018509ff1fdcfb4591e8828c8ffcfcc5a3002c594dbcf95beba93e9768c5133c02
-DIST librecad-2.1.1.zip 26085717 SHA256 a5d27119ff137611c090fb174890ed1312c56897fb1482327d676da148fbd7dc SHA512 82b27e75fddae798da0e30e0c560d3769dfddab936e33a3585fd3e871eccf88e51c28d5ed938a530cb65c2e2ecfc593772ca83a2d23dd29126aa8225595f3d01 WHIRLPOOL 50ac34d0bdf1cd55ee6f7a959c1c1430197ac8acb7739755887b726349e39c9a1fe32ef25cab285aeaf649057701256f6210750c986ddb67ed3f338c80e300ed
DIST librecad-2.1.3.zip 26086377 SHA256 f05af030c71192109c1472c6fd24696fcb564b2eb83ff9789b88bec2e93c10a3 SHA512 9a41c17b512ccbc1a0ebb0e6da8e7297663490479f042fadaffda819e371afc7fa49b789449df9fd4e36a2e2b6f95b9b5be19df47cf3c4252111db2a7ed7f009 WHIRLPOOL a0209b3513fd5f10e608795e34267d5efc7338996ba6cc485cbd9084200cb87fb8b51ab3f224520fc8c693c5ac3db8d049dde68011e8005922ad9c761625971c
diff --git a/media-gfx/librecad/files/iota-fix-2.1.1.patch b/media-gfx/librecad/files/iota-fix-2.1.1.patch
deleted file mode 100644
index 12506f4b820..00000000000
--- a/media-gfx/librecad/files/iota-fix-2.1.1.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- librecad/src/lib/engine/rs_spline.cpp.old 2016-06-20 20:43:27.000000000 +0200
-+++ librecad/src/lib/engine/rs_spline.cpp 2016-09-05 13:23:25.459841304 +0200
-@@ -26,6 +26,7 @@
-
- #include<iostream>
- #include<cmath>
-+#include<numeric>
- #include "rs_spline.h"
-
-
diff --git a/media-gfx/librecad/librecad-2.0.3.ebuild b/media-gfx/librecad/librecad-2.0.3.ebuild
deleted file mode 100644
index c1767e4ccf7..00000000000
--- a/media-gfx/librecad/librecad-2.0.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qt4-r2
-
-DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="http://www.librecad.org/"
-SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug doc tools"
-
-DEPEND="
- dev-cpp/muParser
- dev-qt/qtgui:4
- dev-qt/qthelp:4
- dev-qt/qtsvg:4
- dev-libs/boost
- media-libs/freetype
- "
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/LibreCAD-${PV}"
-
-src_install() {
- dobin unix/librecad
- use tools && dobin unix/ttf2lff
- insinto /usr/share/${PN}
- doins -r unix/resources/*
- use doc && dohtml -r librecad/support/doc/*
- doicon librecad/res/main/${PN}.png
- make_desktop_entry ${PN} LibreCAD ${PN} Graphics
-}
diff --git a/media-gfx/librecad/librecad-2.0.9-r1.ebuild b/media-gfx/librecad/librecad-2.0.9-r1.ebuild
deleted file mode 100644
index c1bc2045685..00000000000
--- a/media-gfx/librecad/librecad-2.0.9-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qmake-utils
-
-DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="http://www.librecad.org/"
-SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="3d debug doc tools qt4 +qt5"
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-DEPEND="
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtsvg:4
- dev-qt/qthelp:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qthelp:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- )
- dev-libs/boost:=
- dev-cpp/muParser
- media-libs/freetype:2"
-
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/LibreCAD-${PV}"
-
-src_prepare() {
- # currently RS_VECTOR3D causes an internal compiler error on GCC-4.8
- if ! use 3d; then
- sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
- fi
-}
-
-src_configure() {
- if use qt4; then
- eqmake4 -r
- else
- eqmake5 -r
- fi
-}
-
-src_install() {
- dobin unix/librecad
- use tools && dobin unix/ttf2lff
- insinto /usr/share/${PN}
- doins -r unix/resources/*
- use doc && insinto html && dodoc -r librecad/support/doc/*
- insinto /usr/share/appdata
- 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.1.1.ebuild b/media-gfx/librecad/librecad-2.1.1.ebuild
deleted file mode 100644
index 87af2fd665b..00000000000
--- a/media-gfx/librecad/librecad-2.1.1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qmake-utils
-
-DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="http://www.librecad.org/"
-SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="3d debug doc tools qt4 +qt5"
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-DEPEND="
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtsvg:4
- dev-qt/qthelp:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qthelp:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- )
- dev-libs/boost:=
- dev-cpp/muParser
- media-libs/freetype:2"
-
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/LibreCAD-${PV}"
-
-src_prepare() {
- epatch "${FILESDIR}/iota-fix-2.1.1.patch"
-
- # currently RS_VECTOR3D causes an internal compiler error on GCC-4.8
- if ! use 3d; then
- sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
- fi
-}
-
-src_configure() {
- if use qt4; then
- eqmake4 -r
- else
- eqmake5 -r
- fi
-}
-
-src_install() {
- dobin unix/librecad
- use tools && dobin unix/ttf2lff
- insinto /usr/share/${PN}
- doins -r unix/resources/*
- use doc && insinto html && dodoc -r librecad/support/doc/*
- insinto /usr/share/appdata
- doins unix/appdata/librecad.appdata.xml
- doicon librecad/res/main/${PN}.png
- make_desktop_entry ${PN} LibreCAD ${PN} Graphics
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/librecad/files/, media-gfx/librecad/
@ 2019-08-15 19:47 Slawek Lis
0 siblings, 0 replies; 5+ messages in thread
From: Slawek Lis @ 2019-08-15 19:47 UTC (permalink / raw
To: gentoo-commits
commit: 431e3685b3b65d0660a958fbee48dd2b42196b75
Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 15 19:38:16 2019 +0000
Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
CommitDate: Thu Aug 15 19:38:16 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=431e3685
media-gfx/librecad: Patch for compilation errors with gcc-9
Merged commit d0a0ef284b7fcc5c0d65b92c30855f62b637653f from librecad repo
Closes: https://bugs.gentoo.org/685906
Package-Manager: Portage-2.3.71, Repoman-2.3.16
Signed-off-by: Slawek Lis <slis <AT> gentoo.org>
.../librecad/files/librecad-2.1.3-gcc-9.patch | 209 +++++++++++++++++++++
media-gfx/librecad/librecad-2.1.3-r5.ebuild | 51 +++++
2 files changed, 260 insertions(+)
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
new file mode 100644
index 00000000000..f8214f29fab
--- /dev/null
+++ b/media-gfx/librecad/files/librecad-2.1.3-gcc-9.patch
@@ -0,0 +1,209 @@
+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/librecad-2.1.3-r5.ebuild b/media-gfx/librecad/librecad-2.1.3-r5.ebuild
new file mode 100644
index 00000000000..2c3fc115cc9
--- /dev/null
+++ b/media-gfx/librecad/librecad-2.1.3-r5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop qmake-utils
+
+DESCRIPTION="Generic 2D CAD program"
+HOMEPAGE="https://www.librecad.org/"
+SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="3d 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/linguist-tools:5
+ dev-qt/qthelp:5
+ dev-qt/qtxml:5
+"
+
+S="${WORKDIR}/LibreCAD-${PV}"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" "${FILESDIR}/${P}-gcc-9.patch" )
+
+src_configure() {
+ eqmake5 -r
+}
+
+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/appdata
+ doins unix/appdata/librecad.appdata.xml
+ doicon librecad/res/main/${PN}.png
+ make_desktop_entry ${PN} LibreCAD ${PN} Graphics
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/librecad/files/, media-gfx/librecad/
@ 2020-05-20 12:25 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2020-05-20 12:25 UTC (permalink / raw
To: gentoo-commits
commit: 778c32d5d85ee0f3240c3c77da0a1ba95fdb74f2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 20 12:22:22 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 20 12:24:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=778c32d5
media-gfx/librecad: Fix build with Qt 5.15
Bug: https://bugs.gentoo.org/699716
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../librecad/files/librecad-2.1.3-qt-5.15.patch | 37 ++++++++++++++++++++++
media-gfx/librecad/librecad-2.1.3-r5.ebuild | 1 +
2 files changed, 38 insertions(+)
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
new file mode 100644
index 00000000000..a1cfe62408f
--- /dev/null
+++ b/media-gfx/librecad/files/librecad-2.1.3-qt-5.15.patch
@@ -0,0 +1,37 @@
+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/librecad-2.1.3-r5.ebuild b/media-gfx/librecad/librecad-2.1.3-r5.ebuild
index b9ce27bf50e..1c3ced1015e 100644
--- a/media-gfx/librecad/librecad-2.1.3-r5.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r5.ebuild
@@ -37,6 +37,7 @@ S="${WORKDIR}/LibreCAD-${PV}"
PATCHES=(
"${FILESDIR}/${P}-qt-5.11.patch"
"${FILESDIR}/${P}-gcc-9.patch"
+ "${FILESDIR}/${P}-qt-5.15.patch" # pending upstream PR#1224
)
src_configure() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/librecad/files/, media-gfx/librecad/
@ 2024-06-09 6:24 Joonas Niilola
0 siblings, 0 replies; 5+ messages in thread
From: Joonas Niilola @ 2024-06-09 6:24 UTC (permalink / raw
To: gentoo-commits
commit: 308ef54ee21bbaf93f9d3c17c2809c660f580942
Author: Denis Pronin <dannftk <AT> yandex <DOT> ru>
AuthorDate: Mon Feb 19 12:23:42 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jun 9 06:24:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=308ef54e
media-gfx/librecad: add a patch to fix building with clang
fix missing FILE declaration in lib/debug/rs_debug.h
Closes: https://bugs.gentoo.org/919822
Signed-off-by: Denis Pronin <dannftk <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/35423
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
| 29 ++++++++++++++++++++++
media-gfx/librecad/librecad-2.2.0.ebuild | 6 ++++-
2 files changed, 34 insertions(+), 1 deletion(-)
--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
new file mode 100644
index 000000000000..3caec03b011a
--- /dev/null
+++ b/media-gfx/librecad/files/librecad-2.2.0-fix-missing-header.patch
@@ -0,0 +1,29 @@
+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.2.0.ebuild b/media-gfx/librecad/librecad-2.2.0.ebuild
index 092799ec110b..f86b8253e177 100644
--- a/media-gfx/librecad/librecad-2.2.0.ebuild
+++ b/media-gfx/librecad/librecad-2.2.0.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
@@ -40,6 +40,10 @@ BDEPEND="
dev-qt/linguist-tools:5
"
+PATCHES=(
+ "${FILESDIR}/${P}-fix-missing-header.patch"
+)
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-06-09 6:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-27 6:50 [gentoo-commits] repo/gentoo:master commit in: media-gfx/librecad/files/, media-gfx/librecad/ Slawek Lis
-- strict thread matches above, loose matches on Subject: below --
2024-06-09 6:24 Joonas Niilola
2020-05-20 12:25 Andreas Sturmlechner
2019-08-15 19:47 Slawek Lis
2016-09-05 12:23 Slawek Lis
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox