From owner-svn-ports-all@freebsd.org Wed Jan 6 00:38:45 2021 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 BB44D4D8464; Wed, 6 Jan 2021 00:38:45 +0000 (UTC) (envelope-from adridg@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 4D9Vps4vL0z4Qrr; Wed, 6 Jan 2021 00:38:45 +0000 (UTC) (envelope-from adridg@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 96C18155F4; Wed, 6 Jan 2021 00:38:45 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 1060cjPL074374; Wed, 6 Jan 2021 00:38:45 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 1060chfC074367; Wed, 6 Jan 2021 00:38:43 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <202101060038.1060chfC074367@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Wed, 6 Jan 2021 00:38:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r560461 - in head/graphics/fractgen: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/graphics/fractgen: . files X-SVN-Commit-Revision: 560461 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.34 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: Wed, 06 Jan 2021 00:38:45 -0000 Author: adridg Date: Wed Jan 6 00:38:43 2021 New Revision: 560461 URL: https://svnweb.freebsd.org/changeset/ports/560461 Log: Update graphics/fractgen to latest upstream release The release is a month or two old by now. Some Qt 5.15.2 patches have landed in the release, but not all of them. New translations require additional dependencies and patching in the right directory to search (PREFIX/share). There are no useful release notes for this release. PR: 251335 Added: head/graphics/fractgen/files/patch-src_CMakeLists.txt (contents, props changed) head/graphics/fractgen/files/patch-src_fractalgenerator.cc (contents, props changed) head/graphics/fractgen/files/patch-src_fractgen.cc (contents, props changed) Deleted: head/graphics/fractgen/files/patch-git-48cf904f47d9eb3819e6e5f6c19feaae0a3bf901.diff head/graphics/fractgen/files/patch-src_imagedisplay.cc head/graphics/fractgen/files/patch-src_imagedisplay.h Modified: head/graphics/fractgen/Makefile head/graphics/fractgen/distinfo head/graphics/fractgen/files/patch-src_colorschemeinterface.cc head/graphics/fractgen/files/patch-src_fractalalgorithminterface.cc head/graphics/fractgen/pkg-plist Modified: head/graphics/fractgen/Makefile ============================================================================== --- head/graphics/fractgen/Makefile Wed Jan 6 00:33:49 2021 (r560460) +++ head/graphics/fractgen/Makefile Wed Jan 6 00:38:43 2021 (r560461) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= fractgen -PORTVERSION= 2.1.7 +PORTVERSION= 2.1.10 CATEGORIES= graphics MASTER_SITES= https://www.uni-due.de/~be0001/fractalgenerator/download/ @@ -13,8 +13,12 @@ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING USES= compiler:c++11-lang tar:xz cmake qt:5 -USE_QT= core xml widgets printsupport buildtools_build qmake_build +USE_QT= core xml widgets printsupport \ + buildtools_build qmake_build linguisttools_build CMAKE_ARGS+= -DCMAKE_INSTALL_MANDIR=${PREFIX}/man + +post-patch: + $(REINPLACE_CMD) 's+%%PREFIX%%+$(PREFIX)+' $(WRKSRC)/src/*.cc .include Modified: head/graphics/fractgen/distinfo ============================================================================== --- head/graphics/fractgen/distinfo Wed Jan 6 00:33:49 2021 (r560460) +++ head/graphics/fractgen/distinfo Wed Jan 6 00:38:43 2021 (r560461) @@ -1,3 +1,3 @@ -TIMESTAMP = 1565194937 -SHA256 (fractgen-2.1.7.tar.xz) = 733bc6d62afae87c39ad994f6b64caa8fbd5c004b94b45063452b5963278f33d -SIZE (fractgen-2.1.7.tar.xz) = 71852 +TIMESTAMP = 1609889732 +SHA256 (fractgen-2.1.10.tar.xz) = 5d321e7ef1f31ca690e890283ffe60f9fbdd46ef77a01b81df0df7a947ab96b7 +SIZE (fractgen-2.1.10.tar.xz) = 314404 Added: head/graphics/fractgen/files/patch-src_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/fractgen/files/patch-src_CMakeLists.txt Wed Jan 6 00:38:43 2021 (r560461) @@ -0,0 +1,11 @@ +--- src/CMakeLists.txt.orig 2021-01-05 23:51:38 UTC ++++ src/CMakeLists.txt +@@ -39,7 +39,7 @@ FOREACH(tsFile IN LISTS FRACTGEN_TS_FILES) + GET_FILENAME_COMPONENT(fileBase ${tsFile} NAME_WE) + SET(qmFile "${fileBase}.qm") + ADD_CUSTOM_COMMAND(OUTPUT ${qmFile} +- COMMAND qtchooser -qt=5 -run-tool=lrelease ${tsFile}) ++ COMMAND qtchooser -qt=qt5 -run-tool=lrelease ${tsFile}) + ADD_CUSTOM_TARGET(target_${qmFile} ALL DEPENDS ${qmFile}) + LIST(APPEND FRACTGEN_QM_FILES ${qmFile}) + ENDFOREACH() Modified: head/graphics/fractgen/files/patch-src_colorschemeinterface.cc ============================================================================== --- head/graphics/fractgen/files/patch-src_colorschemeinterface.cc Wed Jan 6 00:33:49 2021 (r560460) +++ head/graphics/fractgen/files/patch-src_colorschemeinterface.cc Wed Jan 6 00:38:43 2021 (r560461) @@ -8,12 +8,3 @@ QList* ColorSchemeInterface::ColorSchemeList = nullptr; bool ColorSchemeInterface::Updated = false; -@@ -69,7 +70,7 @@ static bool lessThan(const ColorSchemeInterface* c1, - ColorSchemeInterface* ColorSchemeInterface::getColorScheme(const unsigned int index) - { - if(Updated) { -- qSort(ColorSchemeList->begin(), ColorSchemeList->end(), lessThan); -+ std::sort(ColorSchemeList->begin(), ColorSchemeList->end(), lessThan); - Updated = false; - } - return(ColorSchemeList->value(index, nullptr)); Modified: head/graphics/fractgen/files/patch-src_fractalalgorithminterface.cc ============================================================================== --- head/graphics/fractgen/files/patch-src_fractalalgorithminterface.cc Wed Jan 6 00:33:49 2021 (r560460) +++ head/graphics/fractgen/files/patch-src_fractalalgorithminterface.cc Wed Jan 6 00:38:43 2021 (r560461) @@ -8,12 +8,3 @@ QList* FractalAlgorithmInterface::AlgorithmList = nullptr; bool FractalAlgorithmInterface::Updated = false; -@@ -100,7 +101,7 @@ static bool lessThan(const FractalAlgorithmInterface* - FractalAlgorithmInterface* FractalAlgorithmInterface::getAlgorithm(const unsigned int index) - { - if(Updated) { -- qSort(AlgorithmList->begin(), AlgorithmList->end(), lessThan); -+ std::sort(AlgorithmList->begin(), AlgorithmList->end(), lessThan); - Updated = false; - } - return(AlgorithmList->value(index, nullptr)); Added: head/graphics/fractgen/files/patch-src_fractalgenerator.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/fractgen/files/patch-src_fractalgenerator.cc Wed Jan 6 00:38:43 2021 (r560461) @@ -0,0 +1,11 @@ +--- src/fractalgenerator.cc.orig 2020-10-10 15:10:01 UTC ++++ src/fractalgenerator.cc +@@ -128,7 +128,7 @@ FractalGeneratorApp::FractalGeneratorApp(QWidget* pare + helpMenu->addAction(tr("&About"), this, SLOT(slotHelpAbout())); + + Printer.setColorMode(QPrinter::Color); +- Printer.setOrientation(QPrinter::Landscape); ++ Printer.setPageOrientation(QPageLayout::Landscape); + Printer.setOutputFileName(tr("Fractal.pdf")); + + statusBar()->showMessage(tr("Welcome to FractGen!"), 3000); Added: head/graphics/fractgen/files/patch-src_fractgen.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/fractgen/files/patch-src_fractgen.cc Wed Jan 6 00:38:43 2021 (r560461) @@ -0,0 +1,11 @@ +--- src/fractgen.cc.orig 2021-01-06 00:19:32 UTC ++++ src/fractgen.cc +@@ -34,7 +34,7 @@ int main(int argc, char *argv[]) + QTranslator applicationTranslator; + if(!applicationTranslator.load("fractgen_" + QLocale::system().name())) { + applicationTranslator.load("fractgen_" + QLocale::system().name(), +- "/usr/share/fractgen"); ++ "%%PREFIX%%/share/fractgen"); + } + application.installTranslator(&applicationTranslator); + Modified: head/graphics/fractgen/pkg-plist ============================================================================== --- head/graphics/fractgen/pkg-plist Wed Jan 6 00:33:49 2021 (r560460) +++ head/graphics/fractgen/pkg-plist Wed Jan 6 00:38:43 2021 (r560461) @@ -1,3 +1,8 @@ +bin/fractgen +man/man1/fractgen.1.gz +share/applications/fractgen.desktop +share/icons/hicolor/512x512/apps/fractgen.png +share/mime/packages/fractgen.xml %%DATADIR%%/examples/alpha01.fsf %%DATADIR%%/examples/alpha02.fsf %%DATADIR%%/examples/alpha03.fsf @@ -7,7 +12,24 @@ %%DATADIR%%/examples/alpha07.fsf %%DATADIR%%/examples/alpha08.fsf %%DATADIR%%/examples/demo-fractal.fsf +%%DATADIR%%/examples/beta01.fsf +%%DATADIR%%/examples/beta02.fsf +%%DATADIR%%/examples/beta03.fsf +%%DATADIR%%/examples/beta04.fsf +%%DATADIR%%/examples/beta05.fsf +%%DATADIR%%/examples/beta06.fsf +%%DATADIR%%/examples/beta07.fsf +%%DATADIR%%/examples/beta08.fsf +%%DATADIR%%/examples/gamma01.fsf +%%DATADIR%%/examples/gamma02.fsf +%%DATADIR%%/examples/gamma03.fsf +%%DATADIR%%/examples/gamma04.fsf +%%DATADIR%%/examples/gamma05.fsf +%%DATADIR%%/examples/gamma06.fsf +%%DATADIR%%/examples/gamma07.fsf +%%DATADIR%%/examples/gamma08.fsf %%DATADIR%%/examples/test1.fsf %%DATADIR%%/examples/test2.fsf -bin/fractgen -man/man1/fractgen.1.gz +%%DATADIR%%/examples/test3.fsf +%%DATADIR%%/fractgen_de.qm +%%DATADIR%%/fractgen_nb.qm