From 2cc89183df862c1744a6578032803737b64fe467 Mon Sep 17 00:00:00 2001 From: rfranke Date: Tue, 28 Jan 2020 22:02:13 +0100 Subject: [PATCH 1/2] Prepend DATADIR only once to LENSFUNDBDIR, see #5622 DATADIR is also prepended to a relative LENSFUNDBDIR in rtengine::init. This removal in CMakeLists.txt keeps the cmake argument LENSFUNDBDIR unmodified in the ~/.config/RawTherapee*/options file. This fixes a path like ../../Resources/../../Resources/./share/lensfun for LENSFUNDBDIR=./share/lensfun under macOS. --- CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bbc129eae..7c60fa37c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,10 +252,6 @@ if(NOT DEFINED APPDATADIR) endif() endif() -if(DEFINED LENSFUNDBDIR AND NOT IS_ABSOLUTE "${LENSFUNDBDIR}") - set(LENSFUNDBDIR "${DATADIR}/${LENSFUNDBDIR}") -endif() - if(APPLE) if("${CODESIGNID}") set(CODESIGNID "${CODESIGNID}" CACHE STRING "Codesigning Identity") From 5a5856fa1d59b1e9053a708674ea2551c681babf Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Fri, 31 Jan 2020 01:26:27 +0100 Subject: [PATCH 2/2] Date bump --- LICENSE.txt | 2 +- header | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index 653f0ac50..2ba8256ab 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ RawTherapee - A powerful, cross-platform raw image processing program. Copyright (C) 2004-2012 Gabor Horvath - Copyright (C) 2010-2019 RawTherapee development team. + Copyright (C) 2010-2020 RawTherapee development team. RawTherapee is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/header b/header index 966153c0e..a98fbbac1 100644 --- a/header +++ b/header @@ -7,7 +7,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * RawTherapee is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the