From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 33E621382C5 for ; Tue, 4 May 2021 22:02:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7330BE0874; Tue, 4 May 2021 22:02:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4A416E0874 for ; Tue, 4 May 2021 22:02:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 11796340D83 for ; Tue, 4 May 2021 22:02:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 186CA73D for ; Tue, 4 May 2021 22:02:52 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1620165651.4c017ffe1777b31221ca4243c3cf4ed729ccc6ea.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/openscad/, media-gfx/openscad/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/openscad/Manifest media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch media-gfx/openscad/files/openscad-2019.05_fix-boost-1.72.0-build.patch media-gfx/openscad/metadata.xml media-gfx/openscad/openscad-2019.05-r5.ebuild X-VCS-Directories: media-gfx/openscad/files/ media-gfx/openscad/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 4c017ffe1777b31221ca4243c3cf4ed729ccc6ea X-VCS-Branch: master Date: Tue, 4 May 2021 22:02:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 692c2be4-270e-4f08-b0ff-c16d429c875b X-Archives-Hash: 8b850d4869a9b9110aae12b6c81672ce commit: 4c017ffe1777b31221ca4243c3cf4ed729ccc6ea Author: Bernd Waibel posteo net> AuthorDate: Sun May 2 12:21:32 2021 +0000 Commit: Sam James gentoo org> CommitDate: Tue May 4 22:00:51 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c017ffe media-gfx/openscad: drop 2019.05 Security cleanup (CVE-2020-28599) Bug: https://bugs.gentoo.org/773217 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Bernd Waibel posteo.net> Closes: https://github.com/gentoo/gentoo/pull/20657 Signed-off-by: Sam James gentoo.org> media-gfx/openscad/Manifest | 1 - ...ad-2019.05-0001-Fix-build-with-boost-1.73.patch | 28 ----- ...2-Gentoo-specific-Disable-ccache-building.patch | 35 ------- ...ad-2019.05-0003-change-C-standard-to-c-14.patch | 76 -------------- .../openscad-2019.05_fix-boost-1.72.0-build.patch | 27 ----- media-gfx/openscad/metadata.xml | 3 - media-gfx/openscad/openscad-2019.05-r5.ebuild | 115 --------------------- 7 files changed, 285 deletions(-) diff --git a/media-gfx/openscad/Manifest b/media-gfx/openscad/Manifest index 31cd206a20c..ac0202896cd 100644 --- a/media-gfx/openscad/Manifest +++ b/media-gfx/openscad/Manifest @@ -1,2 +1 @@ -DIST openscad-2019.05.tar.gz 14604881 BLAKE2B ed7d6088606fab44284363da73643e556f07c0f0a7a223bdf718dcc36a82158bf23e315724ea520d63a3f1331207df0ea7b0ade817f01dd39b67ca6f36529d56 SHA512 073053f625ffa4fea6ed836396b7ff4b87b26cf7500b06c804983afc0f1dfd3d78bfb81b3fd217c3939b0ec915d85b0c7990773eaf968512a150deaa0399df13 DIST openscad-2021.01.tar.gz 15817555 BLAKE2B 417857d704fa3c14312641ebda983eb85a1e3bc0d517a235fa3bd2523fce6f93c1ea526c330179bc35f03e6c73d3cd7c4c57cd71480088c21bfc99bb020ab7cd SHA512 8deaa26bf4c295c12da38f323d2b2e6f827851337f5bc1cc9c79afc083c9f913c19a263086e6e853bf2c8434c1ccc705ea22ddb02dc99d39bb1e5e03fc58d128 diff --git a/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch b/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch deleted file mode 100644 index 74f48b4c1ae..00000000000 --- a/media-gfx/openscad/files/openscad-2019.05-0001-Fix-build-with-boost-1.73.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 47275a3d92969709e7605f23a408c5ed5aa483c9 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel -Date: Fri, 15 May 2020 19:09:10 +0200 -Subject: [PATCH] Fix build with boost-1.73 - -Thanks to William T Wilson for reporting and providing the patch. - -Signed-off-by: Bernd Waibel ---- - src/import.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/import.cc b/src/import.cc -index eef1323..08e46ff 100644 ---- a/src/import.cc -+++ b/src/import.cc -@@ -50,7 +50,7 @@ namespace fs = boost::filesystem; - #include - using namespace boost::assign; // bring 'operator+=()' into scope - --#include -+#include - #include - - extern PolySet * import_amf(std::string, const Location &loc); --- -2.26.2 - diff --git a/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch b/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch deleted file mode 100644 index 1a4903828e8..00000000000 --- a/media-gfx/openscad/files/openscad-2019.05-0002-Gentoo-specific-Disable-ccache-building.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2940d8e5c74faa5dcd5279c8166064ade3da5695 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel -Date: Sun, 17 May 2020 21:13:44 +0200 -Subject: [PATCH] [Gentoo-specific] Disable ccache building - -On Gentoo we use a USE flag to determine whether to use -ccache for building or not. - -Signed-off-by: Bernd Waibel ---- - openscad.pro | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/openscad.pro b/openscad.pro -index 2d190dd..9c4e67b 100755 ---- a/openscad.pro -+++ b/openscad.pro -@@ -214,10 +214,10 @@ mdi { - DEFINES += ENABLE_MDI - } - --system("ccache -V >/dev/null 2>/dev/null") { -- CONFIG += ccache -- message("Using ccache") --} -+#system("ccache -V >/dev/null 2>/dev/null") { -+# CONFIG += ccache -+# message("Using ccache") -+#} - - include(common.pri) - --- -2.26.2 - diff --git a/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch b/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch deleted file mode 100644 index 3863d5631b9..00000000000 --- a/media-gfx/openscad/files/openscad-2019.05-0003-change-C-standard-to-c-14.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 02f9a4eca87d7713a8345b8513423d9d4a5127e0 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel -Date: Fri, 27 Nov 2020 18:49:09 +0100 -Subject: [PATCH] change C++ standard to c++14 - -Signed-off-by: Bernd Waibel ---- - c++11.pri => c++std.pri | 21 ++++++++------------- - common.pri | 2 +- - 2 files changed, 9 insertions(+), 14 deletions(-) - rename c++11.pri => c++std.pri (74%) - -diff --git a/c++11.pri b/c++std.pri -similarity index 74% -rename from c++11.pri -rename to c++std.pri -index 0a2c3b6..aac656d 100644 ---- a/c++11.pri -+++ b/c++std.pri -@@ -4,16 +4,16 @@ macx { - dirs = $${BOOSTDIR} $${QMAKE_LIBDIR} - for(dir, dirs) { - system(otool -L $${dir}/libboost_thread* | grep libc++ >& /dev/null ) { -- message("Using libc++11") -+ message("Using libc++") - CONFIG += libc++ - } - else { - message("Using libstdc++") - CONFIG += libstdc++ -- c++11 { -- # libc++ is a requirement for using C++11 -- warning("Disabling C++11 since libstdc++ dependencies were found") -- CONFIG -= c++11 -+ c++std { -+ # libc++ is a requirement for using C++14 -+ warning("Disabling C++14 since libstdc++ dependencies were found") -+ CONFIG -= c++std - } - } - } -@@ -25,9 +25,9 @@ macx { - } - } - --c++11 { -- QMAKE_CXXFLAGS += -std=c++11 -- message("Using C++11") -+c++std { -+ QMAKE_CXXFLAGS += -std=c++14 -+ message("Using C++14") - - *clang*: { - # 3rd party libraries will probably violate this for a long time -@@ -41,8 +41,3 @@ c++11 { - QMAKE_OBJECTIVE_CFLAGS_WARN_ON += $$CXX11_SUPPRESS_WARNINGS - } - } --else { -- *clang* { -- QMAKE_CXXFLAGS_WARN_ON += -Wno-c++11-extensions -- } --} -diff --git a/common.pri b/common.pri -index 1110757..d1d5edc 100644 ---- a/common.pri -+++ b/common.pri -@@ -30,4 +30,4 @@ include(win.pri) - include(flex.pri) - include(bison.pri) - include(opengl.pri) --include(c++11.pri) -+include(c++std.pri) --- -2.29.2 - diff --git a/media-gfx/openscad/files/openscad-2019.05_fix-boost-1.72.0-build.patch b/media-gfx/openscad/files/openscad-2019.05_fix-boost-1.72.0-build.patch deleted file mode 100644 index 28d3285a737..00000000000 --- a/media-gfx/openscad/files/openscad-2019.05_fix-boost-1.72.0-build.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b6c170cc5dd1bc677176ee732cdb0ddae57e5cf0 Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Fri, 25 Oct 2019 15:10:26 +0000 -Subject: [PATCH] Add missing header bootlegged by Boost < 1.72 - -src/parser.y:76:6: error: no template named 'stack' in namespace 'std' -std::stack scope_stack; -~~~~~^ ---- - src/parser.y | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/parser.y b/src/parser.y -index 7f4fd56c..4c77c989 100644 ---- a/src/parser.y -+++ b/src/parser.y -@@ -46,6 +46,7 @@ - #include "printutils.h" - #include "memory.h" - #include -+#include - #include - #include "boost-utils.h" - #include "feature.h" --- -2.24.1 - diff --git a/media-gfx/openscad/metadata.xml b/media-gfx/openscad/metadata.xml index 56612a76fb9..9070d4a92fd 100644 --- a/media-gfx/openscad/metadata.xml +++ b/media-gfx/openscad/metadata.xml @@ -21,9 +21,6 @@ Mac OS X. - - Use dev-util/ccache to speed up rebuilds - Add support for gamepads through dev-qt/qtgamepad diff --git a/media-gfx/openscad/openscad-2019.05-r5.ebuild b/media-gfx/openscad/openscad-2019.05-r5.ebuild deleted file mode 100644 index 66fb9b68a87..00000000000 --- a/media-gfx/openscad/openscad-2019.05-r5.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit elisp-common qmake-utils xdg - -SITEFILE="50${PN}-gentoo.el" - -DESCRIPTION="The Programmers Solid 3D CAD Modeller" -HOMEPAGE="https://www.openscad.org/" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.src.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm64 x86" -IUSE="ccache emacs" -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/${P}_fix-boost-1.72.0-build.patch" - "${FILESDIR}/${P}-0001-Fix-build-with-boost-1.73.patch" - "${FILESDIR}/${P}-0003-change-C-standard-to-c-14.patch" -) - -RDEPEND=" - dev-cpp/eigen:3 - dev-libs/boost:= - dev-libs/double-conversion:= - dev-libs/glib:2 - dev-libs/gmp:0= - dev-libs/hidapi - dev-libs/libspnav - dev-libs/libzip:= - dev-libs/mpfr:0= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5[-gles2-only] - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtopengl:5 - dev-qt/qtwidgets:5 - media-gfx/opencsg - media-libs/fontconfig - media-libs/freetype - >=media-libs/glew-2.0.0:0= - media-libs/harfbuzz:= - =x11-libs/qscintilla-2.10.3:= - emacs? ( >=app-editors/emacs-23.1:* ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - dev-util/itstool - sys-devel/bison - sys-devel/flex - sys-devel/gettext - virtual/pkgconfig - ccache? ( dev-util/ccache ) -" - -src_prepare() { - default - - # fix path prefix - sed -i "s/\/usr\/local/\/usr/g" ${PN}.pro || die - - # change c++ standard - sed -e 's/CONFIG += c++11/CONFIG += c++std/' -i openscad.pro || die - - # disable ccache - if ! use ccache; then - eapply "${FILESDIR}/${P}-0002-Gentoo-specific-Disable-ccache-building.patch" - fi -} - -src_configure() { - eqmake5 "${PN}.pro" -} - -src_compile() { - default - - if use emacs ; then - elisp-compile contrib/*.el - fi -} - -src_install() { - emake install INSTALL_ROOT="${D}" - - if use emacs; then - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - elisp-install ${PN} contrib/*.el contrib/*.elc - fi - - mv -i "${ED}"/usr/share/openscad/locale "${ED}"/usr/share || die "failed to move locales" - ln -sf ../locale "${ED}"/usr/share/openscad/locale || die - - einstalldocs -} - -pkg_postinst() { - use emacs && elisp-site-regen - xdg_desktop_database_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - use emacs && elisp-site-regen - xdg_desktop_database_update - xdg_mimeinfo_database_update -}