Attachment 216376 Details for Bug 247896 – Update to 0.7.0.0a (development branch), fixed build with Qt 5.15, project moved to gitlab, removed absolete patches - already in upstream

[patch] Update to 0.7.0.0a (development branch), fixed build with Qt 5.15, project moved to gitlab, removed absolete patches - already in upstream

valentina.diff (text/plain), 6.17 KB, created by Vladimir Druzenko on 2020-07-11 09:25:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vladimir Druzenko

Created: 2020-07-11 09:25:11 UTC

Size: 6.17 KB

patch

obsolete

>diff -urN misc/valentina.orig/Makefile misc/valentina/Makefile
>--- misc/valentina.orig/Makefile
>+++ misc/valentina/Makefile
>@@ -1,10 +1,9 @@
> # $FreeBSD: head/misc/valentina/Makefile 531601 2020-04-13 12:35:58Z tcberner $
> 
> PORTNAME=	valentina
>-DISTVERSION=	0.6.1
>-PORTREVISION=	3
>+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
>@@ -12,28 +11,20 @@
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/LICENSE_GPL.txt
> 
>-BROKEN=		Does not build with Qt5-5.14
>-
>-USES=		compiler:c++11-lang desktop-file-utils gl gmake qmake qt:5
>-USE_QT=		concurrent core gui network opengl printsupport svg widgets xml xmlpatterns buildtools_build linguisttools_build testlib_build
>+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_GL=		gl
> USE_LDCONFIG=	yes
> 
>-BB_ACCOUNT=	dismine
>-BB_PROJECT=	${PORTNAME}
>-BB_COMMIT=	a2e2f6648b28
>+USE_GITLAB=	yes
>+GL_ACCOUNT=	smart-pattern
>+GL_COMMIT=	cc506e96eae8c951cdbdbbc07c7ed3ba38392295
> 
>-QMAKE_ARGS=	CONFIG+="noTests" CONFIG+="noRunPath"
>+QMAKE_ARGS=	CONFIG+="noTests" CONFIG+="noRunPath" PREFIX="${PREFIX}"
> .if !defined(WITH_CCACHE_BUILD) || defined(NO_CCACHE)
> QMAKE_ARGS+=	CONFIG+="no_ccache"
> .endif
>-BINARY_ALIAS=	hg=/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
>+BINARY_ALIAS=	git=/usr/bin/true
> 
> .include <bsd.port.mk>
>diff -urN misc/valentina.orig/distinfo misc/valentina/distinfo
>--- misc/valentina.orig/distinfo
>+++ misc/valentina/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1540485495
>-SHA256 (valentina-0.6.1.tar.gz) = 165cf34558983116f6f424beae4806f909c61fe4bcffd583461a8614b3d2d2bb
>-SIZE (valentina-0.6.1.tar.gz) = 35642532
>+TIMESTAMP = 1594455957
>+SHA256 (smart-pattern-valentina-cc506e96eae8c951cdbdbbc07c7ed3ba38392295_GL0.tar.gz) = 39510e7a43e64c9de71ae649b2fd86d7b0fc8f75b3df78c23d12e671301491cf
>+SIZE (smart-pattern-valentina-cc506e96eae8c951cdbdbbc07c7ed3ba38392295_GL0.tar.gz) = 42392237
>diff -urN misc/valentina.orig/files/patch-common.pri misc/valentina/files/patch-common.pri
>--- misc/valentina.orig/files/patch-common.pri
>+++ misc/valentina/files/patch-common.pri
>@@ -1,6 +1,6 @@
> --- common.pri.orig	2018-08-11 23:09:01 UTC
> +++ common.pri
>-@@ -164,11 +164,11 @@ defineTest(forceCopyToDestdir) {
>+@@ -218,11 +218,11 @@ defineTest(forceCopyToDestdir) {
>  # We use precompiled headers for more fast compilation source code.
>  defineReplace(set_PCH){
>      no_ccache{
>diff -urN misc/valentina.orig/files/patch-src_libs_vmisc_debugbreak.h misc/valentina/files/patch-src_libs_vmisc_debugbreak.h
>--- misc/valentina.orig/files/patch-src_libs_vmisc_debugbreak.h
>+++ misc/valentina/files/patch-src_libs_vmisc_debugbreak.h
>@@ -1,16 +0,0 @@
>---- 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
>diff -urN misc/valentina.orig/pkg-plist misc/valentina/pkg-plist
>--- misc/valentina.orig/pkg-plist
>+++ misc/valentina/pkg-plist
>@@ -2,19 +2,39 @@
> bin/valentina
> lib/libqmuparser.so
> lib/libqmuparser.so.2
>-lib/libqmuparser.so.2.6
>-lib/libqmuparser.so.2.6.0
>+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/pixmaps/application-x-valentina-i-measurements.png
>-share/pixmaps/application-x-valentina-pattern.png
>-share/pixmaps/application-x-valentina-s-measurements.png
>-share/pixmaps/tape.png
>-share/pixmaps/valentina.png
>+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

Flags:

vvd: maintainer-approval?

Actions: View | Diff

Attachments on bug 247896: 216365 | 216376