Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 7 Oct 2021 08:28:46 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 503ff24c1b3b - main - misc/valentina: Remove unnecessary patch
Message-ID:  <202110070828.1978Sk26061400@gitrepo.freebsd.org>

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

URL: https://cgit.FreeBSD.org/ports/commit/?id=503ff24c1b3b27c4c33f538df432127cfd7acef1

commit 503ff24c1b3b27c4c33f538df432127cfd7acef1
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2021-10-07 08:15:06 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2021-10-07 08:27:37 +0000

    misc/valentina: Remove unnecessary patch
---
 misc/valentina/Makefile               |  2 +-
 misc/valentina/files/patch-common.pri | 26 --------------------------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/misc/valentina/Makefile b/misc/valentina/Makefile
index 398c65f2059a..16493b955e35 100644
--- a/misc/valentina/Makefile
+++ b/misc/valentina/Makefile
@@ -20,7 +20,7 @@ GL_COMMIT=	5b7e98bf48a86e3c444423a9f03533440a39aad9
 
 DOS2UNIX_FILES=	src/libs/vgeometry/vellipticalarc.cpp
 
-QMAKE_ARGS=	CONFIG+="noTests" CONFIG+="noRunPath"
+QMAKE_ARGS=	CONFIG+="noTests" CONFIG+="noRunPath" PREFIX=${PREFIX}
 .if !defined(WITH_CCACHE_BUILD) || defined(NO_CCACHE)
 QMAKE_ARGS+=	CONFIG+="no_ccache"
 .endif
diff --git a/misc/valentina/files/patch-common.pri b/misc/valentina/files/patch-common.pri
deleted file mode 100644
index 35607230f0f0..000000000000
--- a/misc/valentina/files/patch-common.pri
+++ /dev/null
@@ -1,26 +0,0 @@
---- common.pri.orig	2020-10-24 09:23:35 UTC
-+++ common.pri
-@@ -21,7 +21,7 @@ unix{
-     }
- 
-     # Default prefix. Use for creation install path.
--    DEFAULT_PREFIX = /usr
-+    DEFAULT_PREFIX = /usr/local
- 
-     # Prefix for binary file.
-     isEmpty(PREFIX){
-@@ -222,11 +222,11 @@ defineTest(forceCopyToDestdir) {
- # We use precompiled headers for more fast compilation source code.
- defineReplace(set_PCH){
-     no_ccache{
--        CONFIG += precompile_header # Turn on creation precompiled headers (PCH).
-+        CONFIG -= precompile_header # Turn on creation precompiled headers (PCH).
-         export(CONFIG) # export value to global variable.
- 
--        PRECOMPILED_HEADER = stable.h # Header file with all all static headers: libraries, static local headers.
--        export(PRECOMPILED_HEADER) # export value to global variable
-+        #PRECOMPILED_HEADER = stable.h # Header file with all all static headers: libraries, static local headers.
-+        #export(PRECOMPILED_HEADER) # export value to global variable
- 
-         *msvc* {
-             PRECOMPILED_SOURCE = stable.cpp # MSVC need also cpp file.



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