diff options
-rw-r--r-- | graphics/fractgen/Makefile | 8 | ||||
-rw-r--r-- | graphics/fractgen/distinfo | 6 | ||||
-rw-r--r-- | graphics/fractgen/files/patch-src_CMakeLists.txt | 11 | ||||
-rw-r--r-- | graphics/fractgen/files/patch-src_colorschemeinterface.cc | 9 | ||||
-rw-r--r-- | graphics/fractgen/files/patch-src_fractalalgorithminterface.cc | 9 | ||||
-rw-r--r-- | graphics/fractgen/files/patch-src_fractalgenerator.cc (renamed from graphics/fractgen/files/patch-git-48cf904f47d9eb3819e6e5f6c19feaae0a3bf901.diff) | 6 | ||||
-rw-r--r-- | graphics/fractgen/files/patch-src_fractgen.cc | 11 | ||||
-rw-r--r-- | graphics/fractgen/files/patch-src_imagedisplay.cc | 30 | ||||
-rw-r--r-- | graphics/fractgen/files/patch-src_imagedisplay.h | 21 | ||||
-rw-r--r-- | graphics/fractgen/pkg-plist | 26 |
10 files changed, 57 insertions, 80 deletions
diff --git a/graphics/fractgen/Makefile b/graphics/fractgen/Makefile index 5687e6f1b780..44212772a03f 100644 --- a/graphics/fractgen/Makefile +++ b/graphics/fractgen/Makefile @@ -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 <bsd.port.mk> diff --git a/graphics/fractgen/distinfo b/graphics/fractgen/distinfo index ff2c0d8987a7..fe880d9ed417 100644 --- a/graphics/fractgen/distinfo +++ b/graphics/fractgen/distinfo @@ -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 diff --git a/graphics/fractgen/files/patch-src_CMakeLists.txt b/graphics/fractgen/files/patch-src_CMakeLists.txt new file mode 100644 index 000000000000..b0cd02e09e48 --- /dev/null +++ b/graphics/fractgen/files/patch-src_CMakeLists.txt @@ -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() diff --git a/graphics/fractgen/files/patch-src_colorschemeinterface.cc b/graphics/fractgen/files/patch-src_colorschemeinterface.cc index b34835d7b3ce..fc6d7be23122 100644 --- a/graphics/fractgen/files/patch-src_colorschemeinterface.cc +++ b/graphics/fractgen/files/patch-src_colorschemeinterface.cc @@ -8,12 +8,3 @@ QList<ColorSchemeInterface*>* 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)); diff --git a/graphics/fractgen/files/patch-src_fractalalgorithminterface.cc b/graphics/fractgen/files/patch-src_fractalalgorithminterface.cc index 83ab812ef80a..9287f1a2dbb6 100644 --- a/graphics/fractgen/files/patch-src_fractalalgorithminterface.cc +++ b/graphics/fractgen/files/patch-src_fractalalgorithminterface.cc @@ -8,12 +8,3 @@ QList<FractalAlgorithmInterface*>* 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)); diff --git a/graphics/fractgen/files/patch-git-48cf904f47d9eb3819e6e5f6c19feaae0a3bf901.diff b/graphics/fractgen/files/patch-src_fractalgenerator.cc index 383eafc23723..0dd792f5bece 100644 --- a/graphics/fractgen/files/patch-git-48cf904f47d9eb3819e6e5f6c19feaae0a3bf901.diff +++ b/graphics/fractgen/files/patch-src_fractalgenerator.cc @@ -1,8 +1,6 @@ -diff --git src/fractalgenerator.cc src/fractalgenerator.cc -index dc8fb31..8f5d399 100644 ---- src/fractalgenerator.cc +--- src/fractalgenerator.cc.orig 2020-10-10 15:10:01 UTC +++ src/fractalgenerator.cc -@@ -128,7 +128,7 @@ FractalGeneratorApp::FractalGeneratorApp(QWidget* parent, const QString& fileNam +@@ -128,7 +128,7 @@ FractalGeneratorApp::FractalGeneratorApp(QWidget* pare helpMenu->addAction(tr("&About"), this, SLOT(slotHelpAbout())); Printer.setColorMode(QPrinter::Color); diff --git a/graphics/fractgen/files/patch-src_fractgen.cc b/graphics/fractgen/files/patch-src_fractgen.cc new file mode 100644 index 000000000000..d74ad51270e1 --- /dev/null +++ b/graphics/fractgen/files/patch-src_fractgen.cc @@ -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); + diff --git a/graphics/fractgen/files/patch-src_imagedisplay.cc b/graphics/fractgen/files/patch-src_imagedisplay.cc deleted file mode 100644 index 17e226930a76..000000000000 --- a/graphics/fractgen/files/patch-src_imagedisplay.cc +++ /dev/null @@ -1,30 +0,0 @@ -Fix build with Qt5-5.14 - ---- src/imagedisplay.cc.orig 2020-04-04 12:10:32 UTC -+++ src/imagedisplay.cc -@@ -134,7 +134,7 @@ void ImageDisplay::mousePressEvent(QMouseEvent* mouseE - MarkX2 = MarkX1; - MarkY2 = MarkY1; - Marking = true; -- LastOffsetUpdate = QTime::currentTime(); -+ LastOffsetUpdate.start(); - update(); - } - } -@@ -143,7 +143,6 @@ void ImageDisplay::mousePressEvent(QMouseEvent* mouseE - // ###### Handle mouse release for marking ################################## - void ImageDisplay::mouseReleaseEvent(QMouseEvent* mouseEvent) - { -- LastOffsetUpdate = QTime(); - mouseMoveEvent(mouseEvent); - - if((mouseEvent->button() & Qt::LeftButton) && (Marking)) { -@@ -185,7 +184,7 @@ void ImageDisplay::mouseMoveEvent(QMouseEvent* mouseEv - - if((movex != 0) || (movey != 0)) { - offsetUpdate((int)OffsetX + movex, (int)OffsetY + movey); -- LastOffsetUpdate = QTime::currentTime(); -+ LastOffsetUpdate.start(); - } - - getMarkPosition(mouseEvent, MarkX2, MarkY2); diff --git a/graphics/fractgen/files/patch-src_imagedisplay.h b/graphics/fractgen/files/patch-src_imagedisplay.h deleted file mode 100644 index d083a9307d87..000000000000 --- a/graphics/fractgen/files/patch-src_imagedisplay.h +++ /dev/null @@ -1,21 +0,0 @@ -Fix build with Qt5-5.14 - ---- src/imagedisplay.h.orig 2020-04-04 12:04:22 UTC -+++ src/imagedisplay.h -@@ -23,6 +23,7 @@ - #ifndef IMAGEDISPLAY_H - #define IMAGEDISPLAY_H - -+#include <QElapsedTimer> - #include <QtWidgets/QWidget> - #include <QImage> - #include <QPainter> -@@ -85,7 +86,7 @@ class ImageDisplay : public QWidget { - QImage* Image; - unsigned int OffsetX; - unsigned int OffsetY; -- QTime LastOffsetUpdate; -+ QElapsedTimer LastOffsetUpdate; - int MarkX1; - int MarkY1; - int MarkX2; diff --git a/graphics/fractgen/pkg-plist b/graphics/fractgen/pkg-plist index 9c780a7c3102..9db23f4170ad 100644 --- a/graphics/fractgen/pkg-plist +++ b/graphics/fractgen/pkg-plist @@ -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 |