Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 18 Jan 2021 11:41:45 +0000 (UTC)
From:      Adriaan de Groot <adridg@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r561910 - in head/graphics/fractgen: . files
Message-ID:  <202101181141.10IBfjfH052449@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: adridg
Date: Mon Jan 18 11:41:45 2021
New Revision: 561910
URL: https://svnweb.freebsd.org/changeset/ports/561910

Log:
  Update fractgen patches to be more resilient
  
  This doesn't change the package at all, it just makes our patches
  easier to upstream. Document the %%PREFIX%% substitution a little
  better while we're at it.

Added:
  head/graphics/fractgen/files/patch-CMakeLists.txt   (contents, props changed)
Modified:
  head/graphics/fractgen/Makefile
  head/graphics/fractgen/files/patch-src_CMakeLists.txt

Modified: head/graphics/fractgen/Makefile
==============================================================================
--- head/graphics/fractgen/Makefile	Mon Jan 18 11:10:29 2021	(r561909)
+++ head/graphics/fractgen/Makefile	Mon Jan 18 11:41:45 2021	(r561910)
@@ -19,6 +19,8 @@ USE_QT=		core xml widgets printsupport \
 CMAKE_ARGS+=	-DCMAKE_INSTALL_MANDIR=${PREFIX}/man
 
 post-patch:
-		$(REINPLACE_CMD) 's+%%PREFIX%%+$(PREFIX)+' $(WRKSRC)/src/*.cc
+		# 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>

Added: head/graphics/fractgen/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/fractgen/files/patch-CMakeLists.txt	Mon Jan 18 11:41:45 2021	(r561910)
@@ -0,0 +1,11 @@
+--- 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)

Modified: head/graphics/fractgen/files/patch-src_CMakeLists.txt
==============================================================================
--- head/graphics/fractgen/files/patch-src_CMakeLists.txt	Mon Jan 18 11:10:29 2021	(r561909)
+++ head/graphics/fractgen/files/patch-src_CMakeLists.txt	Mon Jan 18 11:41:45 2021	(r561910)
@@ -1,11 +1,11 @@
---- src/CMakeLists.txt.orig	2021-01-05 23:51:38 UTC
+--- 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 qtchooser -qt=qt5 -run-tool=lrelease ${tsFile})
++                      COMMAND Qt5::lrelease ${tsFile})
     ADD_CUSTOM_TARGET(target_${qmFile} ALL DEPENDS ${qmFile})
     LIST(APPEND FRACTGEN_QM_FILES ${qmFile})
  ENDFOREACH()

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