Attachment 198564 Details for Bug 232516 – v1 (see commit message inside describing other changes)

[patch] v1 (see commit message inside describing other changes)

openscad-devel.2018.10.22.diff (text/plain), 6.51 KB, created by Jan Beich on 2018-10-24 14:38:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2018-10-24 14:38:18 UTC

Size: 6.51 KB

patch

obsolete

>From fef246f0c7eea7cbf635d97a66a264afbb76ab1f Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Wed, 24 Oct 2018 13:34:57 +0000
>Subject: [PATCH] cad/openscad-devel: update to 2018.10.22
>
>- Switch to Qt5 because Qt4 is broken/deprecated, see
>  https://github.com/openscad/openscad/issues/2533
>- Add missing dependencies found via stage-qa
>- Drop unused dependencies via -Wl,--as-needed
>- Drop variables for dependencies detected via pkg-config
>- Drop DIST_SUBDIR becasue USE_GITHUB properly names distfiles
>- Drop redundant GH_ACCOUNT = GH_PROJECT = PORTNAME
>- Close ' (quote) in COMMENT to unbreak syntax highlighting
>- Sort _DEPENDS
>
>PR:		232516
>Approved by:	mr (maintainer)
>---
> cad/openscad-devel/Makefile                   | 48 +++++++++----------
> cad/openscad-devel/distinfo                   |  6 +--
> cad/openscad-devel/files/patch-openscad.pro   | 13 -----
> .../files/patch-src-ModuleCache.h             | 10 ----
> cad/openscad-devel/pkg-plist                  |  4 +-
> 5 files changed, 28 insertions(+), 53 deletions(-)
> delete mode 100644 cad/openscad-devel/files/patch-openscad.pro
> delete mode 100644 cad/openscad-devel/files/patch-src-ModuleCache.h
>
>diff --git a/cad/openscad-devel/Makefile b/cad/openscad-devel/Makefile
>index b5533bb452de..c578db1ecf02 100644
>--- a/cad/openscad-devel/Makefile
>+++ b/cad/openscad-devel/Makefile
>@@ -2,48 +2,44 @@
> # $FreeBSD$
> 
> PORTNAME=	openscad
>-PORTVERSION=	2018.04.19
>-PORTREVISION=	5
>+PORTVERSION=	2018.10.22
> CATEGORIES=	cad
> PKGNAMESUFFIX=	-devel
>-DIST_SUBDIR=	${PORTNAME}
> 
> MAINTAINER=	mr@FreeBSD.org
>-COMMENT=	Programmer's solid 3D CAD modeller
>+COMMENT=	Programmer's solid 3D CAD modeller #'
> 
> LICENSE=	GPLv2+
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
>-		${LOCALBASE}/include/boost/tuple/tuple.hpp:devel/boost-libs
>-LIB_DEPENDS=	libgmp.so:math/gmp \
>-		libmpfr.so:math/mpfr \
>+LIB_DEPENDS=	libzip.so:archivers/libzip \
>+		libhidapi.so:comms/hidapi \
>+		libboost_regex.so:devel/boost-libs \
>+		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
>+		libopencsg.so:graphics/opencsg \
> 		libCGAL.so:math/cgal \
>-		libqscintilla2_qt4.so:devel/qscintilla2 \
>+		libgmp.so:math/gmp \
>+		libmpfr.so:math/mpfr \
>+		libfreetype.so:print/freetype2 \
> 		libharfbuzz.so:print/harfbuzz \
>-		libopencsg.so:graphics/opencsg \
>-		libzip.so:archivers/libzip
>+		libfontconfig.so:x11-fonts/fontconfig
> 
> CONFLICTS=	openscad
> 
>-USES=		bison compiler:c++11-lang desktop-file-utils eigen:3 gettext-tools \
>-		pkgconfig python:run qmake qt:4 shebangfix
>+USES=		bison compiler:c++11-lib desktop-file-utils eigen:3 gettext \
>+		pkgconfig qmake qt:5 shared-mime-info
> USE_GITHUB=	yes
>-GH_ACCOUNT=	openscad
>-GH_PROJECT=	openscad
>-GH_TAGNAME=	179074dff8c23cbc0e651ce8463737df0006f4ca
>-
>-#SHEBANG_FILES=	libraries/MCAD/get_submodules.py
>-USE_GL=		glu glew
>-USE_QT=		corelib gui opengl moc_build uic_build rcc_build
>-PLIST_SUB=	PORTVERSION=${PORTVERSION}
>-QMAKE_ENV=	EIGENDIR=${LOCALBASE}/include/eigen3
>-QMAKE_ARGS+=	VERSION=${PORTVERSION} \
>-		CONFIG+="experimental" \
>-		QMAKE_LEX=${LOCALBASE}/bin/flex \
>-		QMAKE_YAC=${LOCALBASE}/bin/bison
>+USE_GL=		gl glu glew
>+USE_GNOME=	glib20 libxml2
>+USE_QT=		buildtools_build core concurrent_build dbus gui multimedia widgets
>+USE_XORG=	x11
>+GH_TAGNAME=	b8160eac0cca045e091fa65c3f7fbe68fdfada59
>+QMAKE_ARGS=	CONFIG+="experimental" VERSION=${PORTVERSION}
>+# Avoid overlinking: kvm, procstat, boost(thread, system), Qt5(concurrent, network, printsupport)
>+LDFLAGS+=	-Wl,--as-needed
> 
> post-patch:
>+	@${REINPLACE_CMD} 's/-libusb//' ${WRKSRC}/features/hidapi.prf
> 	@${REINPLACE_CMD} -e 's,share/man,man,' \
> 		${WRKSRC}/openscad.pro
> 
>diff --git a/cad/openscad-devel/distinfo b/cad/openscad-devel/distinfo
>index f81cd85cee63..8eea4c0bef29 100644
>--- a/cad/openscad-devel/distinfo
>+++ b/cad/openscad-devel/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1524416781
>-SHA256 (openscad/openscad-openscad-2018.04.19-179074dff8c23cbc0e651ce8463737df0006f4ca_GH0.tar.gz) = 6ca736909959d72eba21a1d421fc215742d26dad5b70dabe72b37e29e025088a
>-SIZE (openscad/openscad-openscad-2018.04.19-179074dff8c23cbc0e651ce8463737df0006f4ca_GH0.tar.gz) = 13915669
>+TIMESTAMP = 1540263111
>+SHA256 (openscad-openscad-2018.10.22-b8160eac0cca045e091fa65c3f7fbe68fdfada59_GH0.tar.gz) = d5692d8c617aaac58c3c14167044b7ea6220735771167280c2d372ceb93615bb
>+SIZE (openscad-openscad-2018.10.22-b8160eac0cca045e091fa65c3f7fbe68fdfada59_GH0.tar.gz) = 13924891
>diff --git a/cad/openscad-devel/files/patch-openscad.pro b/cad/openscad-devel/files/patch-openscad.pro
>deleted file mode 100644
>index f764f845f1fa..000000000000
>--- a/cad/openscad-devel/files/patch-openscad.pro
>+++ /dev/null
>@@ -1,13 +0,0 @@
>---- openscad.pro.orig	2018-04-19 22:08:08 UTC
>-+++ openscad.pro
>-@@ -105,6 +106,10 @@ mingw* {
>- CONFIG += qt
>- QT += widgets concurrent
>- 
>-+freebsd* {
>-+   LIBS += -lcompat
>-+}
>-+
>- netbsd* {
>-    QMAKE_LFLAGS += -L/usr/X11R7/lib
>-    QMAKE_LFLAGS += -Wl,-R/usr/X11R7/lib
>diff --git a/cad/openscad-devel/files/patch-src-ModuleCache.h b/cad/openscad-devel/files/patch-src-ModuleCache.h
>deleted file mode 100644
>index 45667ac28988..000000000000
>--- a/cad/openscad-devel/files/patch-src-ModuleCache.h
>+++ /dev/null
>@@ -1,10 +0,0 @@
>---- src/ModuleCache.h.orig	2018-04-19 22:08:08 UTC
>-+++ src/ModuleCache.h
>-@@ -1,6 +1,7 @@
>- #pragma once
>- 
>- #include <string>
>-+#include <time.h>
>- #include <unordered_map>
>- 
>- /*!
>diff --git a/cad/openscad-devel/pkg-plist b/cad/openscad-devel/pkg-plist
>index 85da8269b612..8036c0ced7ab 100644
>--- a/cad/openscad-devel/pkg-plist
>+++ b/cad/openscad-devel/pkg-plist
>@@ -1,7 +1,7 @@
> bin/openscad
> man/man1/openscad.1.gz
>-share/appdata/openscad.appdata.xml
> share/applications/openscad.desktop
>+share/metainfo/org.openscad.OpenSCAD.appdata.xml
> share/mime/packages/openscad.xml
> %%DATADIR%%/color-schemes/editor/dark-background.json
> %%DATADIR%%/color-schemes/editor/light-background.json
>@@ -24,6 +24,7 @@ share/mime/packages/openscad.xml
> %%DATADIR%%/color-schemes/render/tomorrow.json
> %%DATADIR%%/examples/Advanced/GEB.scad
> %%DATADIR%%/examples/Advanced/animation.scad
>+%%DATADIR%%/examples/Advanced/assert.scad
> %%DATADIR%%/examples/Advanced/children.scad
> %%DATADIR%%/examples/Advanced/children_indexed.scad
> %%DATADIR%%/examples/Advanced/module_recursion.scad
>@@ -41,6 +42,7 @@ share/mime/packages/openscad.xml
> %%DATADIR%%/examples/Basics/rotate_extrude.scad
> %%DATADIR%%/examples/Basics/text_on_cube.scad
> %%DATADIR%%/examples/COPYING-CC0.txt
>+%%DATADIR%%/examples/Functions/echo.scad
> %%DATADIR%%/examples/Functions/functions.scad
> %%DATADIR%%/examples/Functions/list_comprehensions.scad
> %%DATADIR%%/examples/Functions/polygon_areas.scad

Flags:

jbeich: maintainer-approval? (mr)

Actions: View | Diff

Attachments on bug 232516: 198455 | 198564