From owner-svn-ports-all@freebsd.org Sat Jul 11 15:50:25 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 85B2D3670B2; Sat, 11 Jul 2020 15:50:25 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B3vWP2yMTz46BQ; Sat, 11 Jul 2020 15:50:25 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 484B4156E7; Sat, 11 Jul 2020 15:50:25 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06BFoPiw048675; Sat, 11 Jul 2020 15:50:25 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06BFoNKb048663; Sat, 11 Jul 2020 15:50:23 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202007111550.06BFoNKb048663@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sat, 11 Jul 2020 15:50:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r541983 - in head/misc/valentina: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/misc/valentina: . files X-SVN-Commit-Revision: 541983 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Jul 2020 15:50:25 -0000 Author: yuri Date: Sat Jul 11 15:50:23 2020 New Revision: 541983 URL: https://svnweb.freebsd.org/changeset/ports/541983 Log: misc/valentina: Update 0.6.1 -> 0.7.0.0a PR: 247896 Submitted by: vvd@unislabs.com (initial version) Added: head/misc/valentina/files/patch-src_libs_vgeometry_vellipticalarc.cpp (contents, props changed) head/misc/valentina/files/patch-src_libs_vgeometry_vplacelabelitem.cpp (contents, props changed) head/misc/valentina/files/patch-src_libs_vpatterndb_vpassmark.h (contents, props changed) Modified: head/misc/valentina/Makefile head/misc/valentina/distinfo head/misc/valentina/files/patch-common.pri head/misc/valentina/files/patch-src_libs_vmisc_debugbreak.h head/misc/valentina/pkg-descr head/misc/valentina/pkg-plist Modified: head/misc/valentina/Makefile ============================================================================== --- head/misc/valentina/Makefile Sat Jul 11 15:48:40 2020 (r541982) +++ head/misc/valentina/Makefile Sat Jul 11 15:50:23 2020 (r541983) @@ -1,10 +1,8 @@ # $FreeBSD$ PORTNAME= valentina -DISTVERSION= 0.6.1 -PORTREVISION= 3 +DISTVERSION= 0.7.0.0a 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 +10,22 @@ COMMENT= Sewing pattern drafting tool aiming to remake 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++11-lang desktop-file-utils dos2unix 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 +DOS2UNIX_FILE= src/libs/vgeometry/vellipticalarc.cpp +USE_GITLAB= yes +GL_ACCOUNT= smart-pattern +GL_COMMIT= 15e731671f9471390d7ccf95c7eb5bbda8c25f95 + QMAKE_ARGS= CONFIG+="noTests" CONFIG+="noRunPath" .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 .include Modified: head/misc/valentina/distinfo ============================================================================== --- head/misc/valentina/distinfo Sat Jul 11 15:48:40 2020 (r541982) +++ head/misc/valentina/distinfo Sat Jul 11 15:50:23 2020 (r541983) @@ -1,3 +1,3 @@ -TIMESTAMP = 1540485495 -SHA256 (valentina-0.6.1.tar.gz) = 165cf34558983116f6f424beae4806f909c61fe4bcffd583461a8614b3d2d2bb -SIZE (valentina-0.6.1.tar.gz) = 35642532 +TIMESTAMP = 1594379769 +SHA256 (smart-pattern-valentina-15e731671f9471390d7ccf95c7eb5bbda8c25f95_GL0.tar.gz) = 113f1c5375c2ee4b1f0ff1f8684125e8c6a181eb857e1d625df79df792597f6c +SIZE (smart-pattern-valentina-15e731671f9471390d7ccf95c7eb5bbda8c25f95_GL0.tar.gz) = 42388820 Modified: head/misc/valentina/files/patch-common.pri ============================================================================== --- head/misc/valentina/files/patch-common.pri Sat Jul 11 15:48:40 2020 (r541982) +++ head/misc/valentina/files/patch-common.pri Sat Jul 11 15:50:23 2020 (r541983) @@ -1,6 +1,6 @@ ---- common.pri.orig 2018-08-11 23:09:01 UTC +--- common.pri.orig 2020-07-11 05:51:06 UTC +++ common.pri -@@ -164,11 +164,11 @@ defineTest(forceCopyToDestdir) { +@@ -209,11 +209,11 @@ defineTest(forceCopyToDestdir) { # We use precompiled headers for more fast compilation source code. defineReplace(set_PCH){ no_ccache{ @@ -15,3 +15,12 @@ *msvc* { PRECOMPILED_SOURCE = stable.cpp # MSVC need also cpp file. +@@ -311,7 +311,7 @@ defineReplace(FindLatestTagDistance){ + } + + # Default prefix. Use for creation install path. +-DEFAULT_PREFIX = /usr ++DEFAULT_PREFIX = /usr/local + + # In debug mode on Unix system we use all usefull for us compilers keys for checking errors. + # Also trying make all possible for speed up build time. Added: head/misc/valentina/files/patch-src_libs_vgeometry_vellipticalarc.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/valentina/files/patch-src_libs_vgeometry_vellipticalarc.cpp Sat Jul 11 15:50:23 2020 (r541983) @@ -0,0 +1,10 @@ +--- src/libs/vgeometry/vellipticalarc.cpp.orig 2020-07-11 05:51:16 UTC ++++ src/libs/vgeometry/vellipticalarc.cpp +@@ -30,6 +30,7 @@ + + #include + #include ++#include + + #include "../vmisc/def.h" + #include "../vmisc/vmath.h" Added: head/misc/valentina/files/patch-src_libs_vgeometry_vplacelabelitem.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/valentina/files/patch-src_libs_vgeometry_vplacelabelitem.cpp Sat Jul 11 15:50:23 2020 (r541983) @@ -0,0 +1,10 @@ +--- src/libs/vgeometry/vplacelabelitem.cpp.orig 2020-07-11 05:51:16 UTC ++++ src/libs/vgeometry/vplacelabelitem.cpp +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include + + //--------------------------------------------------------------------------------------------------------------------- + VPlaceLabelItem::VPlaceLabelItem() Modified: head/misc/valentina/files/patch-src_libs_vmisc_debugbreak.h ============================================================================== --- head/misc/valentina/files/patch-src_libs_vmisc_debugbreak.h Sat Jul 11 15:48:40 2020 (r541982) +++ head/misc/valentina/files/patch-src_libs_vmisc_debugbreak.h Sat Jul 11 15:50:23 2020 (r541983) @@ -1,8 +1,8 @@ ---- src/libs/vmisc/debugbreak.h.orig 2018-10-20 17:36:33 UTC +--- src/libs/vmisc/debugbreak.h.orig 2020-07-11 05:51:16 UTC +++ src/libs/vmisc/debugbreak.h -@@ -100,6 +100,13 @@ __inline__ static void trap_instruction(void) - * 'aarch64_default_breakpoint' */ - __asm__ volatile(".inst 0xd4200000"); +@@ -119,6 +119,13 @@ __inline__ static void trap_instruction(void) + * The workaround is the same as ARM Thumb mode: use debugbreak-gdb.py + * or manually jump over the instruction. */ } +#elif defined(__powerpc__) +enum { HAVE_TRAP_INSTRUCTION = 1 }; @@ -12,5 +12,5 @@ + __asm__ volatile(".4byte 0x7d821008"); +} #else - enum { HAVE_TRAP_INSTRUCTION = 0 }; + #define DEBUG_BREAK_IMPL DEBUG_BREAK_USE_SIGTRAP #endif Added: head/misc/valentina/files/patch-src_libs_vpatterndb_vpassmark.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/valentina/files/patch-src_libs_vpatterndb_vpassmark.h Sat Jul 11 15:50:23 2020 (r541983) @@ -0,0 +1,10 @@ +--- src/libs/vpatterndb/vpassmark.h.orig 2020-07-11 05:51:16 UTC ++++ src/libs/vpatterndb/vpassmark.h +@@ -30,6 +30,7 @@ + + #include + #include ++#include + + #include "vpiece.h" + #include "../vgeometry/vgeometrydef.h" Modified: head/misc/valentina/pkg-descr ============================================================================== --- head/misc/valentina/pkg-descr Sat Jul 11 15:48:40 2020 (r541982) +++ head/misc/valentina/pkg-descr Sat Jul 11 15:50:23 2020 (r541983) @@ -7,4 +7,4 @@ manufacturers, enable independent and small designers up to make a decent living, rebuild local garment districts, and reduce or eliminate slave labor. -WWW: https://valentinaproject.bitbucket.io/ +WWW: https://gitlab.com/smart-pattern/valentina Modified: head/misc/valentina/pkg-plist ============================================================================== --- head/misc/valentina/pkg-plist Sat Jul 11 15:48:40 2020 (r541982) +++ head/misc/valentina/pkg-plist Sat Jul 11 15:50:23 2020 (r541983) @@ -2,19 +2,39 @@ bin/tape 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