Attachment #216376 for bug #247896




# $FreeBSD: head/misc/valentina/Makefile 531601 2020-04-13 12:35:58Z tcberner $

PORTNAME=	valentina
PORTVERSION=	0.7.0.0a
PORTREVISION=	0
CATEGORIES=	misc
MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/

MAINTAINER=	yuri@FreeBSD.org
COMMENT=	Sewing pattern drafting tool aiming to remake the garment industry

LICENSE=	GPLv3
LICENSE_FILE=	${WRKSRC}/LICENSE_GPL.txt

USES=		compiler:c++17-lang desktop-file-utils gl gmake qmake qt:5
USE_QT=		buildtools_build concurrent core gui linguisttools_build network \
		opengl printsupport svg testlib_build widgets xml xmlpatterns
USE_QT=		concurrent core gui network opengl printsupport svg widgets xml xmlpatterns buildtools_build linguisttools_build testlib_build
USE_GL=		gl
USE_LDCONFIG=	yes

USE_GITLAB=	yes
GL_ACCOUNT=	smart-pattern
GL_COMMIT=	cc506e96eae8c951cdbdbbc07c7ed3ba38392295

QMAKE_ARGS=	CONFIG+="noTests" CONFIG+="noRunPath" PREFIX="${PREFIX}"
.if !defined(WITH_CCACHE_BUILD) || defined(NO_CCACHE)
QMAKE_ARGS+=	CONFIG+="no_ccache"
.endif
BINARY_ALIAS=	git=/usr/bin/true

WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}

post-patch:
	@${REINPLACE_CMD} 's|DEFAULT_PREFIX = /usr|DEFAULT_PREFIX = ${PREFIX}|' ${WRKSRC}/common.pri
	@${REINPLACE_CMD} 's|/usr/share|${PREFIX}/share|' ${WRKSRC}/src/app/valentina/valentina.pro ${WRKSRC}/src/app/tape/tape.pro
	@${REINPLACE_CMD} 's|g++ -dumpversion|g++${GCC_DEFAULT} -dumpversion|' ${WRKSRC}/Valentina.pro

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)misc/valentina/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1540485495	1	TIMESTAMP = 1594455957
2	SHA256 (valentina-0.6.1.tar.gz) = 165cf34558983116f6f424beae4806f909c61fe4bcffd583461a8614b3d2d2bb	2	SHA256 (smart-pattern-valentina-cc506e96eae8c951cdbdbbc07c7ed3ba38392295_GL0.tar.gz) = 39510e7a43e64c9de71ae649b2fd86d7b0fc8f75b3df78c23d12e671301491cf
3	SIZE (valentina-0.6.1.tar.gz) = 35642532	3	SIZE (smart-pattern-valentina-cc506e96eae8c951cdbdbbc07c7ed3ba38392295_GL0.tar.gz) = 42392237

Lines 1-6 Link Here

(-)misc/valentina/files/patch-common.pri (-1 / +1 lines)
1	--- common.pri.orig 2018-08-11 23:09:01 UTC	1	--- common.pri.orig 2018-08-11 23:09:01 UTC
2	+++ common.pri	2	+++ common.pri
3	@@ -164,11 +164,11 @@ defineTest(forceCopyToDestdir) {	3	@@ -218,11 +218,11 @@ defineTest(forceCopyToDestdir) {
4	# We use precompiled headers for more fast compilation source code.	4	# We use precompiled headers for more fast compilation source code.
5	defineReplace(set_PCH){	5	defineReplace(set_PCH){
6	no_ccache{	6	no_ccache{




--- src/libs/vmisc/debugbreak.h.orig	2018-10-20 17:36:33 UTC
+++ src/libs/vmisc/debugbreak.h
@@ -100,6 +100,13 @@ __inline__ static void trap_instruction(void)
      * 'aarch64_default_breakpoint' */
     __asm__ volatile(".inst 0xd4200000");
 }
+#elif defined(__powerpc__)
+enum { HAVE_TRAP_INSTRUCTION = 1 };
+__attribute__((gnu_inline, always_inline))
+__inline__ static void trap_instruction(void)
+{
+    __asm__ volatile(".4byte 0x7d821008");
+}
 #else
 enum { HAVE_TRAP_INSTRUCTION = 0 };
 #endif




bin/valentina
lib/libqmuparser.so
lib/libqmuparser.so.2
lib/libqmuparser.so.2.7
lib/libqmuparser.so.2.7.0
lib/libvpropertyexplorer.so
lib/libvpropertyexplorer.so.1
lib/libvpropertyexplorer.so.1.0
lib/libvpropertyexplorer.so.1.0.0
share/applications/tape.desktop
share/applications/valentina.desktop
share/icons/hicolor/128x128/apps/tape.png
share/icons/hicolor/128x128/apps/valentina.png
share/icons/hicolor/128x128/mimetypes/application-x-valentina-i-measurements.png
share/icons/hicolor/128x128/mimetypes/application-x-valentina-pattern.png
share/icons/hicolor/128x128/mimetypes/application-x-valentina-s-measurements.png
share/icons/hicolor/256x256/apps/tape.png
share/icons/hicolor/256x256/apps/valentina.png
share/icons/hicolor/256x256/mimetypes/application-x-valentina-i-measurements.png
share/icons/hicolor/256x256/mimetypes/application-x-valentina-pattern.png
share/icons/hicolor/256x256/mimetypes/application-x-valentina-s-measurements.png
share/icons/hicolor/48x48/apps/tape.png
share/icons/hicolor/48x48/apps/valentina.png
share/icons/hicolor/48x48/mimetypes/application-x-valentina-i-measurements.png
share/icons/hicolor/48x48/mimetypes/application-x-valentina-pattern.png
share/icons/hicolor/48x48/mimetypes/application-x-valentina-s-measurements.png
share/icons/hicolor/512x512/apps/tape.png
share/icons/hicolor/512x512/apps/valentina.png
share/icons/hicolor/512x512/mimetypes/application-x-valentina-i-measurements.png
share/icons/hicolor/512x512/mimetypes/application-x-valentina-pattern.png
share/icons/hicolor/512x512/mimetypes/application-x-valentina-s-measurements.png
share/icons/hicolor/64x64/apps/tape.png
share/icons/hicolor/64x64/apps/valentina.png
share/icons/hicolor/64x64/mimetypes/application-x-valentina-i-measurements.png
share/icons/hicolor/64x64/mimetypes/application-x-valentina-pattern.png
share/icons/hicolor/64x64/mimetypes/application-x-valentina-s-measurements.png
%%DATADIR%%/labels/def_pattern_label.xml
%%DATADIR%%/labels/def_piece_label.xml
%%DATADIR%%/tables/multisize/GOST_man_ru.vst

Return to bug 247896

Lines 1-10 Link Here

(-)misc/valentina/Makefile (-19 / +10 lines)
1	# $FreeBSD: head/misc/valentina/Makefile 531601 2020-04-13 12:35:58Z tcberner $	1	# $FreeBSD: head/misc/valentina/Makefile 531601 2020-04-13 12:35:58Z tcberner $
2		2
3	PORTNAME= valentina	3	PORTNAME= valentina
4	DISTVERSION= 0.6.1	4	PORTVERSION= 0.7.0.0a
5	PORTREVISION= 3	5	PORTREVISION= 0
6	CATEGORIES= misc	6	CATEGORIES= misc
7	MASTER_SITES= https://bitbucket.org/${BB_ACCOUNT}/${BB_PROJECT}/get/${BB_COMMIT}.tar.gz?dummy=/
8		7
9	MAINTAINER= yuri@FreeBSD.org	8	MAINTAINER= yuri@FreeBSD.org
10	COMMENT= Sewing pattern drafting tool aiming to remake the garment industry	9	COMMENT= Sewing pattern drafting tool aiming to remake the garment industry
Lines 12-39 Link Here
12	LICENSE= GPLv3	11	LICENSE= GPLv3
13	LICENSE_FILE= ${WRKSRC}/LICENSE_GPL.txt	12	LICENSE_FILE= ${WRKSRC}/LICENSE_GPL.txt
14		13
15	BROKEN= Does not build with Qt5-5.14	14	USES= compiler:c++17-lang desktop-file-utils gl gmake qmake qt:5
16		15	USE_QT= buildtools_build concurrent core gui linguisttools_build network \
17	USES= compiler:c++11-lang desktop-file-utils gl gmake qmake qt:5	16	opengl printsupport svg testlib_build widgets xml xmlpatterns
18	USE_QT= concurrent core gui network opengl printsupport svg widgets xml xmlpatterns buildtools_build linguisttools_build testlib_build
19	USE_GL= gl	17	USE_GL= gl
20	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
21		19
22	BB_ACCOUNT= dismine	20	USE_GITLAB= yes
23	BB_PROJECT= ${PORTNAME}	21	GL_ACCOUNT= smart-pattern
24	BB_COMMIT= a2e2f6648b28	22	GL_COMMIT= cc506e96eae8c951cdbdbbc07c7ed3ba38392295
25		23
26	QMAKE_ARGS= CONFIG+="noTests" CONFIG+="noRunPath"	24	QMAKE_ARGS= CONFIG+="noTests" CONFIG+="noRunPath" PREFIX="${PREFIX}"
27	.if !defined(WITH_CCACHE_BUILD) \|\| defined(NO_CCACHE)	25	.if !defined(WITH_CCACHE_BUILD) \|\| defined(NO_CCACHE)
28	QMAKE_ARGS+= CONFIG+="no_ccache"	26	QMAKE_ARGS+= CONFIG+="no_ccache"
29	.endif	27	.endif
30	BINARY_ALIAS= hg=/usr/bin/true	28	BINARY_ALIAS= git=/usr/bin/true
31
32	WRKSRC= ${WRKDIR}/${BB_ACCOUNT}-${BB_PROJECT}-${BB_COMMIT}
33
34	post-patch:
35	@${REINPLACE_CMD} 's\|DEFAULT_PREFIX = /usr\|DEFAULT_PREFIX = ${PREFIX}\|' ${WRKSRC}/common.pri
36	@${REINPLACE_CMD} 's\|/usr/share\|${PREFIX}/share\|' ${WRKSRC}/src/app/valentina/valentina.pro ${WRKSRC}/src/app/tape/tape.pro
37	@${REINPLACE_CMD} 's\|g++ -dumpversion\|g++${GCC_DEFAULT} -dumpversion\|' ${WRKSRC}/Valentina.pro
38		29
39	.include <bsd.port.mk>	30	.include <bsd.port.mk>

Lines 1-16 Link Here

(-)misc/valentina/files/patch-src_libs_vmisc_debugbreak.h (-16 lines)
1	--- src/libs/vmisc/debugbreak.h.orig 2018-10-20 17:36:33 UTC
2	+++ src/libs/vmisc/debugbreak.h
3	@@ -100,6 +100,13 @@ __inline__ static void trap_instruction(void)
4	* 'aarch64_default_breakpoint' */
5	__asm__ volatile(".inst 0xd4200000");
6	}
7	+#elif defined(__powerpc__)
8	+enum { HAVE_TRAP_INSTRUCTION = 1 };
9	+__attribute__((gnu_inline, always_inline))
10	+__inline__ static void trap_instruction(void)
11	+{
12	+ __asm__ volatile(".4byte 0x7d821008");
13	+}
14	#else
15	enum { HAVE_TRAP_INSTRUCTION = 0 };
16	#endif

Lines 2-20 Link Here

(-)misc/valentina/pkg-plist (-7 / +27 lines)
2	bin/valentina	2	bin/valentina
3	lib/libqmuparser.so	3	lib/libqmuparser.so
4	lib/libqmuparser.so.2	4	lib/libqmuparser.so.2
5	lib/libqmuparser.so.2.6	5	lib/libqmuparser.so.2.7
6	lib/libqmuparser.so.2.6.0	6	lib/libqmuparser.so.2.7.0
7	lib/libvpropertyexplorer.so	7	lib/libvpropertyexplorer.so
8	lib/libvpropertyexplorer.so.1	8	lib/libvpropertyexplorer.so.1
9	lib/libvpropertyexplorer.so.1.0	9	lib/libvpropertyexplorer.so.1.0
10	lib/libvpropertyexplorer.so.1.0.0	10	lib/libvpropertyexplorer.so.1.0.0
11	share/applications/tape.desktop	11	share/applications/tape.desktop
12	share/applications/valentina.desktop	12	share/applications/valentina.desktop
13	share/pixmaps/application-x-valentina-i-measurements.png	13	share/icons/hicolor/128x128/apps/tape.png
14	share/pixmaps/application-x-valentina-pattern.png	14	share/icons/hicolor/128x128/apps/valentina.png
15	share/pixmaps/application-x-valentina-s-measurements.png	15	share/icons/hicolor/128x128/mimetypes/application-x-valentina-i-measurements.png
16	share/pixmaps/tape.png	16	share/icons/hicolor/128x128/mimetypes/application-x-valentina-pattern.png
17	share/pixmaps/valentina.png	17	share/icons/hicolor/128x128/mimetypes/application-x-valentina-s-measurements.png
		18	share/icons/hicolor/256x256/apps/tape.png
		19	share/icons/hicolor/256x256/apps/valentina.png
		20	share/icons/hicolor/256x256/mimetypes/application-x-valentina-i-measurements.png
		21	share/icons/hicolor/256x256/mimetypes/application-x-valentina-pattern.png
		22	share/icons/hicolor/256x256/mimetypes/application-x-valentina-s-measurements.png
		23	share/icons/hicolor/48x48/apps/tape.png
		24	share/icons/hicolor/48x48/apps/valentina.png
		25	share/icons/hicolor/48x48/mimetypes/application-x-valentina-i-measurements.png
		26	share/icons/hicolor/48x48/mimetypes/application-x-valentina-pattern.png
		27	share/icons/hicolor/48x48/mimetypes/application-x-valentina-s-measurements.png
		28	share/icons/hicolor/512x512/apps/tape.png
		29	share/icons/hicolor/512x512/apps/valentina.png
		30	share/icons/hicolor/512x512/mimetypes/application-x-valentina-i-measurements.png
		31	share/icons/hicolor/512x512/mimetypes/application-x-valentina-pattern.png
		32	share/icons/hicolor/512x512/mimetypes/application-x-valentina-s-measurements.png
		33	share/icons/hicolor/64x64/apps/tape.png
		34	share/icons/hicolor/64x64/apps/valentina.png
		35	share/icons/hicolor/64x64/mimetypes/application-x-valentina-i-measurements.png
		36	share/icons/hicolor/64x64/mimetypes/application-x-valentina-pattern.png
		37	share/icons/hicolor/64x64/mimetypes/application-x-valentina-s-measurements.png
18	%%DATADIR%%/labels/def_pattern_label.xml	38	%%DATADIR%%/labels/def_pattern_label.xml
19	%%DATADIR%%/labels/def_piece_label.xml	39	%%DATADIR%%/labels/def_piece_label.xml
20	%%DATADIR%%/tables/multisize/GOST_man_ru.vst	40	%%DATADIR%%/tables/multisize/GOST_man_ru.vst