Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 25 Apr 2021 11:31:53 GMT
From:      =?utf-8?B?RmVybmFuZG8gQXBlc3RlZ3XDrWE=?= <fernape@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 26d446d1f205 - main - graphics/fractgen: Update to 2.1.11
Message-ID:  <202104251131.13PBVr7q058556@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by fernape:

URL: https://cgit.FreeBSD.org/ports/commit/?id=26d446d1f205777481ebd81fbc19ed1b49a66d3c

commit 26d446d1f205777481ebd81fbc19ed1b49a66d3c
Author:     Fernando ApesteguĂ­a <fernape@FreeBSD.org>
AuthorDate: 2021-04-20 07:23:29 +0000
Commit:     Fernando ApesteguĂ­a <fernape@FreeBSD.org>
CommitDate: 2021-04-25 11:28:07 +0000

    graphics/fractgen: Update to 2.1.11
    
    ChangeLog:
    https://github.com/dreibh/fractgen/commit/0bfe7ec2a58737ada917fc0db2b08df61e4185d3
    
    PR:     255175
    Reported by:    gspurki@gmail.com
    Approved by:    dreibh@iem.uni-due.de (maintainer, timeout > 1 week)
---
 graphics/fractgen/Makefile                                    |  9 ++-------
 graphics/fractgen/distinfo                                    |  6 +++---
 graphics/fractgen/files/patch-CMakeLists.txt                  | 11 -----------
 graphics/fractgen/files/patch-src_CMakeLists.txt              | 11 -----------
 graphics/fractgen/files/patch-src_colorschemeinterface.cc     | 10 ----------
 .../fractgen/files/patch-src_fractalalgorithminterface.cc     | 10 ----------
 graphics/fractgen/files/patch-src_fractalgenerator.cc         | 11 -----------
 graphics/fractgen/files/patch-src_fractgen.cc                 | 11 -----------
 graphics/fractgen/pkg-plist                                   |  3 ++-
 9 files changed, 7 insertions(+), 75 deletions(-)

diff --git a/graphics/fractgen/Makefile b/graphics/fractgen/Makefile
index ec7008a11320..83490fcec745 100644
--- a/graphics/fractgen/Makefile
+++ b/graphics/fractgen/Makefile
@@ -1,7 +1,7 @@
 # Created by: Thomas Dreibholz <dreibh@iem.uni-due.de>
 
 PORTNAME=	fractgen
-PORTVERSION=	2.1.10
+PORTVERSION=	2.1.11
 CATEGORIES=	graphics
 MASTER_SITES=	https://www.uni-due.de/~be0001/fractalgenerator/download/
 
@@ -12,14 +12,9 @@ LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		compiler:c++11-lang tar:xz cmake qt:5
-USE_QT=		core xml widgets printsupport \
+USE_QT=		core xml widgets printsupport gui \
 		buildtools_build qmake_build linguisttools_build
 
 CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR=${PREFIX}/man
 
-post-patch:
-		# We patch **in** %%PREFIX%% (see patch-src_fractgen.cc) and now we
-		# can replace it with the real prefix that we wanted to use.
-		$(REINPLACE_CMD) 's+%%PREFIX%%+$(PREFIX)+' $(WRKSRC)/src/fractgen.cc
-
 .include <bsd.port.mk>
diff --git a/graphics/fractgen/distinfo b/graphics/fractgen/distinfo
index fe880d9ed417..3a84d689f378 100644
--- a/graphics/fractgen/distinfo
+++ b/graphics/fractgen/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1609889732
-SHA256 (fractgen-2.1.10.tar.xz) = 5d321e7ef1f31ca690e890283ffe60f9fbdd46ef77a01b81df0df7a947ab96b7
-SIZE (fractgen-2.1.10.tar.xz) = 314404
+TIMESTAMP = 1618742988
+SHA256 (fractgen-2.1.11.tar.xz) = db0975cd5913799419cb4c46442ed2b888c9af6a8c19b438f5f6e7ea38bc2011
+SIZE (fractgen-2.1.11.tar.xz) = 317392
diff --git a/graphics/fractgen/files/patch-CMakeLists.txt b/graphics/fractgen/files/patch-CMakeLists.txt
deleted file mode 100644
index 058d189cec1a..000000000000
--- a/graphics/fractgen/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- CMakeLists.txt.orig	2021-01-18 10:00:09 UTC
-+++ CMakeLists.txt
-@@ -80,7 +80,7 @@ ENDIF()
- 
- # ###### Qt #################################################################
- SET(CMAKE_AUTOMOC ON)
--FIND_PACKAGE(Qt5 COMPONENTS Core Xml Widgets PrintSupport REQUIRED)
-+FIND_PACKAGE(Qt5 COMPONENTS Core LinguistTools Xml Widgets PrintSupport REQUIRED)
- 
- # ###### KDE ################################################################
- OPTION(ENABLE_KDE "Include KDE version" 0)
diff --git a/graphics/fractgen/files/patch-src_CMakeLists.txt b/graphics/fractgen/files/patch-src_CMakeLists.txt
deleted file mode 100644
index 29fb1a4db314..000000000000
--- a/graphics/fractgen/files/patch-src_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/CMakeLists.txt.orig	2020-10-10 15:10:01 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 Qt5::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
deleted file mode 100644
index fc6d7be23122..000000000000
--- a/graphics/fractgen/files/patch-src_colorschemeinterface.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/colorschemeinterface.cc.orig	2019-09-01 12:18:45 UTC
-+++ src/colorschemeinterface.cc
-@@ -24,6 +24,7 @@
- 
- #include <string.h>
- 
-+#include <algorithm>
- 
- QList<ColorSchemeInterface*>* ColorSchemeInterface::ColorSchemeList = nullptr;
- bool                          ColorSchemeInterface::Updated         = false;
diff --git a/graphics/fractgen/files/patch-src_fractalalgorithminterface.cc b/graphics/fractgen/files/patch-src_fractalalgorithminterface.cc
deleted file mode 100644
index 9287f1a2dbb6..000000000000
--- a/graphics/fractgen/files/patch-src_fractalalgorithminterface.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/fractalalgorithminterface.cc.orig	2019-09-01 12:19:42 UTC
-+++ src/fractalalgorithminterface.cc
-@@ -23,6 +23,7 @@
- #include "fractalalgorithminterface.h"
- #include "uintconfigentry.h"
- 
-+#include <algorithm>
- 
- QList<FractalAlgorithmInterface*>* FractalAlgorithmInterface::AlgorithmList = nullptr;
- bool                               FractalAlgorithmInterface::Updated       = false;
diff --git a/graphics/fractgen/files/patch-src_fractalgenerator.cc b/graphics/fractgen/files/patch-src_fractalgenerator.cc
deleted file mode 100644
index 0dd792f5bece..000000000000
--- a/graphics/fractgen/files/patch-src_fractalgenerator.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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);
diff --git a/graphics/fractgen/files/patch-src_fractgen.cc b/graphics/fractgen/files/patch-src_fractgen.cc
deleted file mode 100644
index d74ad51270e1..000000000000
--- a/graphics/fractgen/files/patch-src_fractgen.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/pkg-plist b/graphics/fractgen/pkg-plist
index 9db23f4170ad..142b36fedeba 100644
--- a/graphics/fractgen/pkg-plist
+++ b/graphics/fractgen/pkg-plist
@@ -11,7 +11,6 @@ share/mime/packages/fractgen.xml
 %%DATADIR%%/examples/alpha06.fsf
 %%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
@@ -20,6 +19,8 @@ share/mime/packages/fractgen.xml
 %%DATADIR%%/examples/beta06.fsf
 %%DATADIR%%/examples/beta07.fsf
 %%DATADIR%%/examples/beta08.fsf
+%%DATADIR%%/examples/delta01.fsf
+%%DATADIR%%/examples/demo-fractal.fsf
 %%DATADIR%%/examples/gamma01.fsf
 %%DATADIR%%/examples/gamma02.fsf
 %%DATADIR%%/examples/gamma03.fsf



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104251131.13PBVr7q058556>