Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 28 Jan 2017 22:24:40 +0000 (UTC)
From:      Matthias Andree <mandree@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r432689 - in head/graphics/rawtherapee: . files
Message-ID:  <201701282224.v0SMOeEY018944@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mandree
Date: Sat Jan 28 22:24:39 2017
New Revision: 432689
URL: https://svnweb.freebsd.org/changeset/ports/432689

Log:
  Update to new 5.0-gtk3 release (synch with graphics/rawtherapee-devel)
  
  Changes:    <http://rawtherapee.com/blog/rawtherapee-5-released>;
  
  Due to GCC issues on i386 with stack misalignment for SSE2 instructions,
  use the base system clang there, and use GCC 5+ on amd64.  Since i386
  has no OpenMP support, even clang 3.4 in FreeBSD 10.3 is good enough.
  
  Note that the cache directory suffix, which used to be 4.1, is now
  empty, so the cache directory is now ~user/.cache/RawTherapee.
  ~user/.cache/RawTherapee4.1 should be renamed before the start, or
  removed.
  
  Miscellaneous cleanups all over the place.

Added:
  head/graphics/rawtherapee/files/patch-rtengine_imagedata.cc   (contents, props changed)
  head/graphics/rawtherapee/files/patch-rtengine_opthelper.h
     - copied, changed from r432539, head/graphics/rawtherapee-devel/files/patch-rtengine_opthelper.h
  head/graphics/rawtherapee/files/patch-rtgui_cachemanager.cc   (contents, props changed)
Deleted:
  head/graphics/rawtherapee/files/patch-202250
  head/graphics/rawtherapee/files/patch-AboutThisBuild.cmake
  head/graphics/rawtherapee/files/patch-CVE-2015-3885
  head/graphics/rawtherapee/files/patch-rtengine_safegtk.cc
Modified:
  head/graphics/rawtherapee/Makefile
  head/graphics/rawtherapee/distinfo
  head/graphics/rawtherapee/files/patch-rtengine_dcraw.cc
  head/graphics/rawtherapee/files/patch-rtgui_soundman.cc
  head/graphics/rawtherapee/pkg-plist

Modified: head/graphics/rawtherapee/Makefile
==============================================================================
--- head/graphics/rawtherapee/Makefile	Sat Jan 28 22:18:11 2017	(r432688)
+++ head/graphics/rawtherapee/Makefile	Sat Jan 28 22:24:39 2017	(r432689)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	rawtherapee
-PORTVERSION=	4.2
-PORTREVISION=	6
+PORTVERSION=	5.0
+DISTVERSIONSUFFIX=	-gtk3
 CATEGORIES=	graphics
 MASTER_SITES=	http://rawtherapee.com/shared/source/
 
@@ -13,6 +13,7 @@ COMMENT=	Powerful RAW image processing a
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libcanberra-gtk.so:audio/libcanberra \
+		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libexpat.so:textproc/expat2 \
 		libfftw3.so:math/fftw3 \
 		libfftw3f.so:math/fftw3-float \
@@ -28,17 +29,20 @@ USES=		cmake:outsource desktop-file-util
 		jpeg localbase:ldflags pkgconfig tar:xz
 DOS2UNIX_REGEX=	.*\.(cc|h)
 LDFLAGS+=	-Wl,--as-needed # fontconfig, freetype, gettext, libX11
-USE_GNOME=	gtkmm24
+USE_GNOME=	gtkmm30
 USE_LDCONFIG=	yes
-CFLAGS+=	-I${LOCALBASE}/include -fPIC
-CXXFLAGS+=	-I${LOCALBASE}/include -fPIC
+# The -D_GLIBCXX_USE_C99 works around stoi not being defined
+# by default because the GCC headers believe FreeBSD insufficiently C99
+# compliant.
+CFLAGS+=	-I${LOCALBASE}/include -fPIC -D_GLIBCXX_USE_C99 -Wno-deprecated-declarations -Wno-unused-result
 LDFLAGS+=	-lpthread
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}"
 CMAKE_ARGS+=	-DDOCDIR="${DOCSDIR}" \
 		-DCREDITSDIR="${DOCSDIR}" \
 		-DLICENCEDIR="${DOCSDIR}" \
 		-DDESKTOPDIR="${DESKTOPDIR}" \
 		-DDATADIR="${DATADIR}" \
-		-DCACHE_NAME_SUFFIX="4.1" \
+		-DCACHE_NAME_SUFFIX="" \
 		-Wno-dev \
 		-DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW
 # 3.4.x: CMAKE_EXE_LINKER_FLAGS is not passed to TRY_COMPILE by default
@@ -54,31 +58,30 @@ CMAKE_ARGS+=	-DPROC_TARGET_NUMBER="1"
 
 RTDIR=		${PREFIX}/libdata/${PORTNAME}
 
-OPTIONS_DEFINE=		OPTIMIZED_CFLAGS OPENMP
+OPTIONS_DEFINE=		OPTIMIZED_CFLAGS OPENMP NATIVE
 OPTIONS_DEFAULT=	OPTIMIZED_CFLAGS OPENMP
 OPENMP_DESC=		Enable multicore processing using OpenMP (amd64)
 OPTIMIZED_CFLAGS_DESC=	Use extra compiler optimizations (requires SSE2 support)
+NATIVE_DESC=		Use -march=native for compilation (do not use for generic packages!)
 
 OPENMP_CMAKE_BOOL=	OPTION_OMP
 
-OPTIMIZED_CFLAGS_CFLAGS=	-O3 -funroll-loops \
-			${OPTIMIZED_CFLAGS_CFLAGS_${CHOSEN_COMPILER_TYPE}}
-OPTIMIZED_CFLAGS_CFLAGS_gcc=	-fexpensive-optimizations
+OPTIMIZED_CFLAGS_CFLAGS=	-O3 -funroll-loops -msse2
+# GCC 5.4 includes -fexpensive-optimizations in -O2 already
 
 .include <bsd.port.options.mk>
 
 # -------------------------------------------------------------------
 #
 
+.if ${PORT_OPTIONS:MNATIVE}
+CMAKE_ARGS+=	-DPROC_TARGET_NUMBER="2"
+.endif
+
 .if !empty(PORT_OPTIONS:MOPENMP) && ${ARCH} == "amd64"
 LIB_DEPENDS+=	libomp.so.0:devel/openmp
 OPENMP_FLAGS=	-lm -lomp
 LDFLAGS+=	${OPENMP_FLAGS}
-.if ${OSVERSION} < 1100101
-# clang 3.4 doesn't support OpenMP,
-# OTOH gcc 4.9 doesn't generate usable code on FreeBSD 11.
-USES+=		compiler:gcc-c++11-lib
-.endif
 .endif
 
 .if defined(WITH_DEBUG)
@@ -86,20 +89,36 @@ CMAKE_BUILD_TYPE=	RelWithDebInfo
 STRIP=
 .endif
 
+.if ${ARCH} == i386
+USES+=		compiler:c++11-lib
+# FIXME: if we were to use GCC on i386, we'd need to use -mstackrealign
+# or similar options, else we get SIGBUS when SSE2 is enabled due to
+# improper alignment. Base clang is good enough though, i386 does not
+# support OpenMP, and those seeking ultimate performance need to use
+# amd64.
+.else
+USES+=		compiler:gcc-c++11-lib
+.endif
+
 # -------------------------------------------------------------------
 
 .include <bsd.port.pre.mk>
 
+.if ${CHOSEN_COMPILER_TYPE} == gcc
+# Workaround: this needs to be late because Mk/Uses/compiler.mk tramples
+# over previously set values with gcc-libc++-configure as of r432539.
+# GCC 4.9 doesn't generate usable code on FreeBSD 11.0.
+USE_GCC=	5+
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's#DESTINATION "$${CMAKE_INSTALL_PREFIX}/share/man/man1"#DESTINATION "${MANPREFIX}/man/man1/"#' \
 		${WRKSRC}/CMakeLists.txt
-	${RM} ${WRKSRC}/rtengine/dcraw.patch \
-		${WRKSRC}/rtengine/dcraw.c
 
 # paranoia: run rawtherapee --help to be sure it finds all its
 # shared libraries (this hinges on proper RPATH setting and propagation)
 post-install:
-	${SETENV} HOME=/dev/null ${STAGEDIR}${PREFIX}/bin/rawtherapee --help 2>&1 \
-	| ${EGREP} -q "RawTherapee, version ${PKGVERSION:C/_.*//:C/,.*//}"
+	${SETENV} LANG= LC_ALL=C LANGUAGE= DISPLAY= HOME=/dev/null ${STAGEDIR}${PREFIX}/bin/rawtherapee --help 2>&1 \
+	    | ${EGREP} -q "RawTherapee, version ${PKGVERSION:C/_.*//:C/,.*//}|cannot open display:"
 
 .include <bsd.port.post.mk>

Modified: head/graphics/rawtherapee/distinfo
==============================================================================
--- head/graphics/rawtherapee/distinfo	Sat Jan 28 22:18:11 2017	(r432688)
+++ head/graphics/rawtherapee/distinfo	Sat Jan 28 22:24:39 2017	(r432689)
@@ -1,2 +1,3 @@
-SHA256 (rawtherapee-4.2.tar.xz) = fa4c13e8842df096b19d2dabaed5a61f5f9d4547f7b4f0dc6b77f80bdec16479
-SIZE (rawtherapee-4.2.tar.xz) = 7787664
+TIMESTAMP = 1485205646
+SHA256 (rawtherapee-5.0-gtk3.tar.xz) = 25c6bb738535d1efa905bd21fb732bdea352d589d9740a730ec409a49e7eacd8
+SIZE (rawtherapee-5.0-gtk3.tar.xz) = 10442940

Modified: head/graphics/rawtherapee/files/patch-rtengine_dcraw.cc
==============================================================================
--- head/graphics/rawtherapee/files/patch-rtengine_dcraw.cc	Sat Jan 28 22:18:11 2017	(r432688)
+++ head/graphics/rawtherapee/files/patch-rtengine_dcraw.cc	Sat Jan 28 22:24:39 2017	(r432689)
@@ -1,12 +1,11 @@
---- rtengine/dcraw.cc.orig	2017-01-14 17:35:19 UTC
+--- rtengine/dcraw.cc.orig	2016-12-30 15:28:53 UTC
 +++ rtengine/dcraw.cc
-@@ -8726,7 +8726,8 @@ static void decodeFPDeltaRow(Bytef * src
-       dst[col*3 + 2] = src[col + realTileWidth*2];
-     }
-   } else {
--    if (((union { uint32_t x; uint8_t c; }){1}).c) {
-+    union X { uint32_t x; uint8_t c; };
-+    if (((union X){1}).c) {
- 		for (size_t col = 0; col < tileWidth; ++col) {
- 			for (size_t byte = 0; byte < bytesps; ++byte)
- 				dst[col*bytesps + byte] = src[col + realTileWidth*(bytesps-byte-1)];  // Little endian
+@@ -2011,7 +2011,7 @@ void CLASS hasselblad_correct()
+                                             {bhu-1,0},{bhu-1,bwu/2},{bhu-1,bwu-1}};
+             for (col = 0; col < bw; col++) {
+                 for (i = 0; i < 9; i++) {
+-                    ushort dist = (ushort)sqrt(abs(corners[i][0] - row) * abs(corners[i][0] - row) + abs(corners[i][1] - col) * abs(corners[i][1] - col));
++                    ushort dist = (ushort)sqrt(std::fabs(corners[i][0] - row) * std::fabs(corners[i][0] - row) + std::fabs(corners[i][1] - col) * std::fabs(corners[i][1] - col));
+                     ushort weight = dist > maxdist ? 0 : maxdist - dist;
+                     corners_weight[9*(row*bw+col)+i] = weight;
+                 }

Added: head/graphics/rawtherapee/files/patch-rtengine_imagedata.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/rawtherapee/files/patch-rtengine_imagedata.cc	Sat Jan 28 22:24:39 2017	(r432689)
@@ -0,0 +1,11 @@
+--- rtengine/imagedata.cc.orig	2017-01-26 22:12:23 UTC
++++ rtengine/imagedata.cc
+@@ -444,7 +444,7 @@ void ImageData::extractInfo ()
+                         if (baseIsoTag) {
+                             std::string isoData = baseIsoTag->valueToString();
+                             if (isoData.size() > 1) {
+-                                iso_speed = stoi(isoData);
++                                iso_speed = std::stoi(isoData);
+                             }
+                         }
+                     }

Copied and modified: head/graphics/rawtherapee/files/patch-rtengine_opthelper.h (from r432539, head/graphics/rawtherapee-devel/files/patch-rtengine_opthelper.h)
==============================================================================
--- head/graphics/rawtherapee-devel/files/patch-rtengine_opthelper.h	Thu Jan 26 20:32:02 2017	(r432539, copy source)
+++ head/graphics/rawtherapee/files/patch-rtengine_opthelper.h	Sat Jan 28 22:24:39 2017	(r432689)
@@ -1,4 +1,4 @@
---- rtengine/opthelper.h.orig	2017-01-05 02:25:57 UTC
+--- rtengine/opthelper.h.orig	2017-01-26 22:12:23 UTC
 +++ rtengine/opthelper.h
 @@ -69,7 +69,7 @@
          #define ALIGNED64

Added: head/graphics/rawtherapee/files/patch-rtgui_cachemanager.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/rawtherapee/files/patch-rtgui_cachemanager.cc	Sat Jan 28 22:24:39 2017	(r432689)
@@ -0,0 +1,11 @@
+--- rtgui/cachemanager.cc.orig	2017-01-26 22:12:22 UTC
++++ rtgui/cachemanager.cc
+@@ -36,7 +36,7 @@ namespace
+ {
+ 
+ constexpr auto cacheDirMode = 511;
+-constexpr auto cacheDirs = { "profiles", "images", "aehistograms", "embprofiles", "data" };
++constexpr const char *cacheDirs[] = { "profiles", "images", "aehistograms", "embprofiles", "data" };
+ 
+ }
+ 

Modified: head/graphics/rawtherapee/files/patch-rtgui_soundman.cc
==============================================================================
--- head/graphics/rawtherapee/files/patch-rtgui_soundman.cc	Sat Jan 28 22:18:11 2017	(r432688)
+++ head/graphics/rawtherapee/files/patch-rtgui_soundman.cc	Sat Jan 28 22:24:39 2017	(r432689)
@@ -1,4 +1,4 @@
---- rtgui/soundman.cc.orig	2017-01-14 17:35:19 UTC
+--- rtgui/soundman.cc.orig	2017-01-26 22:12:22 UTC
 +++ rtgui/soundman.cc
 @@ -24,9 +24,7 @@
  #ifdef WIN32
@@ -11,7 +11,7 @@
  #include <canberra-gtk.h>
  #endif
  
-@@ -65,7 +63,7 @@ void SoundManager::playSoundAsync(const 
+@@ -67,7 +65,7 @@ void SoundManager::playSoundAsync(const 
      wchar_t *wfilename = (wchar_t*)g_utf8_to_utf16 (sound.c_str(), -1, NULL, NULL, NULL);
      PlaySoundW(wfilename, NULL, sndParam);
      g_free( wfilename );

Modified: head/graphics/rawtherapee/pkg-plist
==============================================================================
--- head/graphics/rawtherapee/pkg-plist	Sat Jan 28 22:18:11 2017	(r432688)
+++ head/graphics/rawtherapee/pkg-plist	Sat Jan 28 22:24:39 2017	(r432689)
@@ -2,10 +2,10 @@ bin/rawtherapee
 man/man1/rawtherapee.1.gz
 share/appdata/rawtherapee.appdata.xml
 share/applications/rawtherapee.desktop
-%%DOCSDIR%%/AUTHORS.txt
-%%DOCSDIR%%/AboutThisBuild.txt
-%%DOCSDIR%%/LICENSE.txt
-%%DOCSDIR%%/RELEASE_NOTES.txt
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS.txt
+%%PORTDOCS%%%%DOCSDIR%%/AboutThisBuild.txt
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
+%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES.txt
 share/icons/hicolor/128x128/apps/rawtherapee.png
 share/icons/hicolor/16x16/apps/rawtherapee.png
 share/icons/hicolor/24x24/apps/rawtherapee.png
@@ -13,23 +13,36 @@ share/icons/hicolor/256x256/apps/rawther
 share/icons/hicolor/32x32/apps/rawtherapee.png
 share/icons/hicolor/48x48/apps/rawtherapee.png
 %%DATADIR%%/camconst.json
+%%DATADIR%%/dcpprofiles/Canon EOS 100D.dcp
 %%DATADIR%%/dcpprofiles/Canon EOS 20D.dcp
 %%DATADIR%%/dcpprofiles/Canon EOS 400D.dcp
 %%DATADIR%%/dcpprofiles/Canon EOS 40D.dcp
 %%DATADIR%%/dcpprofiles/Canon EOS 450D.dcp
+%%DATADIR%%/dcpprofiles/Canon EOS 50D.dcp
 %%DATADIR%%/dcpprofiles/Canon EOS 550D.dcp
 %%DATADIR%%/dcpprofiles/Canon EOS 5D Mark III.dcp
 %%DATADIR%%/dcpprofiles/Canon EOS 5D.dcp
+%%DATADIR%%/dcpprofiles/Canon EOS 6D.dcp
+%%DATADIR%%/dcpprofiles/Canon EOS 7D Mark II.dcp
 %%DATADIR%%/dcpprofiles/Canon EOS 7D.dcp
 %%DATADIR%%/dcpprofiles/Canon EOS D60.dcp
 %%DATADIR%%/dcpprofiles/Canon EOS Digital Rebel XSi.dcp
 %%DATADIR%%/dcpprofiles/Canon EOS Digital Rebel XTi.dcp
+%%DATADIR%%/dcpprofiles/Canon EOS Kiss X7.dcp
+%%DATADIR%%/dcpprofiles/Canon EOS Rebel SL1.dcp
 %%DATADIR%%/dcpprofiles/Canon EOS Rebel T2i.dcp
 %%DATADIR%%/dcpprofiles/Canon EOS-1D Mark III.dcp
 %%DATADIR%%/dcpprofiles/Canon PowerShot G10.dcp
 %%DATADIR%%/dcpprofiles/Canon PowerShot G12.dcp
+%%DATADIR%%/dcpprofiles/Canon PowerShot G7 X.dcp
 %%DATADIR%%/dcpprofiles/Canon PowerShot S110.dcp
 %%DATADIR%%/dcpprofiles/Fujifilm FinePix S9500.dcp
+%%DATADIR%%/dcpprofiles/Fujifilm X-E1.dcp
+%%DATADIR%%/dcpprofiles/Fujifilm X-E2.dcp
+%%DATADIR%%/dcpprofiles/FUJIFILM X-Pro2.dcp
+%%DATADIR%%/dcpprofiles/FUJIFILM X-T1.dcp
+%%DATADIR%%/dcpprofiles/Fujifilm X-T10.dcp
+%%DATADIR%%/dcpprofiles/FUJIFILM X100T.dcp
 %%DATADIR%%/dcpprofiles/Leaf Aptus 75.dcp
 %%DATADIR%%/dcpprofiles/Nikon D200.dcp
 %%DATADIR%%/dcpprofiles/Nikon D300.dcp
@@ -38,12 +51,17 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/dcpprofiles/Nikon D3S.dcp
 %%DATADIR%%/dcpprofiles/Nikon D50.dcp
 %%DATADIR%%/dcpprofiles/Nikon D5100.dcp
+%%DATADIR%%/dcpprofiles/NIKON D600.dcp
 %%DATADIR%%/dcpprofiles/Nikon D700.dcp
 %%DATADIR%%/dcpprofiles/Nikon D7000.dcp
+%%DATADIR%%/dcpprofiles/NIKON D7200.dcp
+%%DATADIR%%/dcpprofiles/NIKON D750.dcp
 %%DATADIR%%/dcpprofiles/Nikon D800.dcp
+%%DATADIR%%/dcpprofiles/NIKON D810.dcp
 %%DATADIR%%/dcpprofiles/Olympus E-1.dcp
 %%DATADIR%%/dcpprofiles/Olympus E-510.dcp
 %%DATADIR%%/dcpprofiles/Olympus E-520.dcp
+%%DATADIR%%/dcpprofiles/OLYMPUS E-M10.dcp
 %%DATADIR%%/dcpprofiles/Olympus E-M5.dcp
 %%DATADIR%%/dcpprofiles/Olympus E-P2.dcp
 %%DATADIR%%/dcpprofiles/Olympus XZ-1.dcp
@@ -55,15 +73,21 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/dcpprofiles/Panasonic DMC-G5.dcp
 %%DATADIR%%/dcpprofiles/Panasonic DMC-GH1.dcp
 %%DATADIR%%/dcpprofiles/Panasonic DMC-GH2.dcp
-%%DATADIR%%/dcpprofiles/Pentax K-5 II.dcp
-%%DATADIR%%/dcpprofiles/Pentax K-5.dcp
+%%DATADIR%%/dcpprofiles/PENTAX K-5 II.dcp
+%%DATADIR%%/dcpprofiles/PENTAX K-5.dcp
 %%DATADIR%%/dcpprofiles/Pentax K-r.dcp
-%%DATADIR%%/dcpprofiles/Pentax K10D.dcp
+%%DATADIR%%/dcpprofiles/PENTAX K10D.dcp
 %%DATADIR%%/dcpprofiles/Pentax K200D.dcp
+%%DATADIR%%/dcpprofiles/RICOH PENTAX K-1.dcp
+%%DATADIR%%/dcpprofiles/RICOH PENTAX K-3.dcp
 %%DATADIR%%/dcpprofiles/Sony DSLR-A700.dcp
 %%DATADIR%%/dcpprofiles/Sony DSLR-A900.dcp
+%%DATADIR%%/dcpprofiles/SONY ILCE-6000.dcp
+%%DATADIR%%/dcpprofiles/SONY ILCE-7M2.dcp
 %%DATADIR%%/dcpprofiles/Sony NEX-5N.dcp
 %%DATADIR%%/dcpprofiles/Sony SLT-A55V.dcp
+%%DATADIR%%/dcpprofiles/SONY SLT-A99V.dcp
+%%DATADIR%%/dcpprofiles/YI TECHNOLOGY M1.dcp
 %%DATADIR%%/iccprofiles/input/Canon EOS 20D.icc
 %%DATADIR%%/iccprofiles/input/Canon EOS 40D.icc
 %%DATADIR%%/iccprofiles/input/Canon EOS 450D.icc
@@ -92,6 +116,15 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/iccprofiles/input/Sony DSLR-A700.icc
 %%DATADIR%%/iccprofiles/input/Sony DSLR-A900.icc
 %%DATADIR%%/iccprofiles/input/Sony SLT-A55V.icc
+%%DATADIR%%/iccprofiles/input/sd14-bl15-crop-matrix-gamma-wp10.icm
+%%DATADIR%%/iccprofiles/input/sd14-bl15-crop-matrix-gamma-wp11.icm
+%%DATADIR%%/iccprofiles/input/sd14-bl15-crop-matrix-gamma-wp12.icm
+%%DATADIR%%/iccprofiles/input/sd1_merrill_cloudy8140-CROP-WP10.icm
+%%DATADIR%%/iccprofiles/input/sd1_merrill_cloudy8140-CROP-WP11.icm
+%%DATADIR%%/iccprofiles/input/sd1_merrill_sunny8161-crop-wp10.icm
+%%DATADIR%%/iccprofiles/input/sd1_merrill_sunny8161-crop-wp11.icm
+%%DATADIR%%/iccprofiles/input/sd1_merrill_tungsten8130-CROP-WP10.icm
+%%DATADIR%%/iccprofiles/input/sd1_merrill_tungsten8130-CROP-WP11.icm
 %%DATADIR%%/iccprofiles/output/RT_Large_g10.icc
 %%DATADIR%%/iccprofiles/output/RT_Large_gBT709.icc
 %%DATADIR%%/iccprofiles/output/RT_Large_gsRGB.icc
@@ -99,13 +132,7 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/iccprofiles/output/RT_sRGB.icm
 %%DATADIR%%/iccprofiles/output/RT_sRGB_g10.icm
 %%DATADIR%%/iccprofiles/output/RT_sRGB_gBT709.icm
-%%DATADIR%%/images/beforeafter.png
-%%DATADIR%%/images/cglabel0.png
-%%DATADIR%%/images/cglabel1.png
-%%DATADIR%%/images/cglabel2.png
-%%DATADIR%%/images/cglabel3.png
-%%DATADIR%%/images/cglabel4.png
-%%DATADIR%%/images/cglabel5.png
+%%DATADIR%%/iccprofiles/output/Rec2020.icm
 %%DATADIR%%/images/Chanmixer-B.png
 %%DATADIR%%/images/Chanmixer-BB.png
 %%DATADIR%%/images/Chanmixer-BG.png
@@ -124,25 +151,10 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/Chanmixer-RG.png
 %%DATADIR%%/images/Chanmixer-RR.png
 %%DATADIR%%/images/Chanmixer-Y.png
-%%DATADIR%%/images/clabel0.png
-%%DATADIR%%/images/clabel1.png
-%%DATADIR%%/images/clabel2.png
-%%DATADIR%%/images/clabel3.png
-%%DATADIR%%/images/clabel4.png
-%%DATADIR%%/images/clabel5.png
-%%DATADIR%%/images/closedhand.png
-%%DATADIR%%/images/colour.png
-%%DATADIR%%/images/crop-auto.png
-%%DATADIR%%/images/crop.png
-%%DATADIR%%/images/cross.png
-%%DATADIR%%/images/crossed-arrows-out.png
-%%DATADIR%%/images/curveType-controlPoints.png
-%%DATADIR%%/images/curveType-flatLinear.png
-%%DATADIR%%/images/curveType-linear.png
-%%DATADIR%%/images/curveType-NURBS.png
-%%DATADIR%%/images/curveType-parametric.png
-%%DATADIR%%/images/curveType-spline.png
-%%DATADIR%%/images/curveType-unchanged.png
+%%DATADIR%%/images/Dark/actions/Chanmixer-Bgamma.png
+%%DATADIR%%/images/Dark/actions/Chanmixer-Ggamma.png
+%%DATADIR%%/images/Dark/actions/Chanmixer-Rgamma.png
+%%DATADIR%%/images/Dark/actions/PanelEnding.png
 %%DATADIR%%/images/Dark/actions/ajd-ca-blue1.png
 %%DATADIR%%/images/Dark/actions/ajd-ca-blue2.png
 %%DATADIR%%/images/Dark/actions/ajd-ca-red1.png
@@ -153,6 +165,14 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/Dark/actions/ajd-wb-green2.png
 %%DATADIR%%/images/Dark/actions/ajd-wb-temp1.png
 %%DATADIR%%/images/Dark/actions/ajd-wb-temp2.png
+%%DATADIR%%/images/Dark/actions/arrow-down-small.png
+%%DATADIR%%/images/Dark/actions/arrow-down.png
+%%DATADIR%%/images/Dark/actions/arrow-left-small.png
+%%DATADIR%%/images/Dark/actions/arrow-left.png
+%%DATADIR%%/images/Dark/actions/arrow-right-small.png
+%%DATADIR%%/images/Dark/actions/arrow-right.png
+%%DATADIR%%/images/Dark/actions/arrow-up-small.png
+%%DATADIR%%/images/Dark/actions/arrow-up.png
 %%DATADIR%%/images/Dark/actions/beforeafter.png
 %%DATADIR%%/images/Dark/actions/cglabel0.png
 %%DATADIR%%/images/Dark/actions/cglabel1.png
@@ -160,9 +180,6 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/Dark/actions/cglabel3.png
 %%DATADIR%%/images/Dark/actions/cglabel4.png
 %%DATADIR%%/images/Dark/actions/cglabel5.png
-%%DATADIR%%/images/Dark/actions/Chanmixer-Bgamma.png
-%%DATADIR%%/images/Dark/actions/Chanmixer-Ggamma.png
-%%DATADIR%%/images/Dark/actions/Chanmixer-Rgamma.png
 %%DATADIR%%/images/Dark/actions/clabel0.png
 %%DATADIR%%/images/Dark/actions/clabel1.png
 %%DATADIR%%/images/Dark/actions/clabel2.png
@@ -170,15 +187,17 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/Dark/actions/clabel4.png
 %%DATADIR%%/images/Dark/actions/clabel5.png
 %%DATADIR%%/images/Dark/actions/closedhand.png
+%%DATADIR%%/images/Dark/actions/colorPickers-hide.png
+%%DATADIR%%/images/Dark/actions/colorPickers-show.png
 %%DATADIR%%/images/Dark/actions/colour.png
 %%DATADIR%%/images/Dark/actions/crop-auto.png
 %%DATADIR%%/images/Dark/actions/crop.png
 %%DATADIR%%/images/Dark/actions/crossed-arrows-in.png
 %%DATADIR%%/images/Dark/actions/crossed-arrows-out.png
+%%DATADIR%%/images/Dark/actions/curveType-NURBS.png
 %%DATADIR%%/images/Dark/actions/curveType-controlPoints.png
 %%DATADIR%%/images/Dark/actions/curveType-flatLinear.png
 %%DATADIR%%/images/Dark/actions/curveType-linear.png
-%%DATADIR%%/images/Dark/actions/curveType-NURBS.png
 %%DATADIR%%/images/Dark/actions/curveType-parametric.png
 %%DATADIR%%/images/Dark/actions/curveType-spline.png
 %%DATADIR%%/images/Dark/actions/detail.png
@@ -197,7 +216,14 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/Dark/actions/editednot-small.png
 %%DATADIR%%/images/Dark/actions/editednotg-small.png
 %%DATADIR%%/images/Dark/actions/editmodehand.png
+%%DATADIR%%/images/Dark/actions/expanderClosed.png
+%%DATADIR%%/images/Dark/actions/expanderDisabled.png
+%%DATADIR%%/images/Dark/actions/expanderEnabled.png
+%%DATADIR%%/images/Dark/actions/expanderInconsistent.png
+%%DATADIR%%/images/Dark/actions/expanderOpened.png
 %%DATADIR%%/images/Dark/actions/exposure.png
+%%DATADIR%%/images/Dark/actions/filter-original-1.png
+%%DATADIR%%/images/Dark/actions/filter-original-2.png
 %%DATADIR%%/images/Dark/actions/filter.png
 %%DATADIR%%/images/Dark/actions/filterclear.png
 %%DATADIR%%/images/Dark/actions/fullscreen-exit.png
@@ -208,6 +234,7 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/Dark/actions/gtk-cancel.png
 %%DATADIR%%/images/Dark/actions/gtk-close-small.png
 %%DATADIR%%/images/Dark/actions/gtk-close.png
+%%DATADIR%%/images/Dark/actions/gtk-color-picker-add.png
 %%DATADIR%%/images/Dark/actions/gtk-color-picker-small.png
 %%DATADIR%%/images/Dark/actions/gtk-color-picker.png
 %%DATADIR%%/images/Dark/actions/gtk-copy.png
@@ -230,6 +257,7 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/Dark/actions/gtk-undoall-rtl.png
 %%DATADIR%%/images/Dark/actions/gtk-zoom-100-small.png
 %%DATADIR%%/images/Dark/actions/gtk-zoom-100.png
+%%DATADIR%%/images/Dark/actions/gtk-zoom-crop.png
 %%DATADIR%%/images/Dark/actions/gtk-zoom-fit.png
 %%DATADIR%%/images/Dark/actions/gtk-zoom-in-small.png
 %%DATADIR%%/images/Dark/actions/gtk-zoom-in.png
@@ -253,6 +281,10 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/Dark/actions/histValueg.png
 %%DATADIR%%/images/Dark/actions/image-editor.png
 %%DATADIR%%/images/Dark/actions/info.png
+%%DATADIR%%/images/Dark/actions/intent-absolute.png
+%%DATADIR%%/images/Dark/actions/intent-perceptual.png
+%%DATADIR%%/images/Dark/actions/intent-relative.png
+%%DATADIR%%/images/Dark/actions/intent-saturation.png
 %%DATADIR%%/images/Dark/actions/list-add-small.png
 %%DATADIR%%/images/Dark/actions/list-add.png
 %%DATADIR%%/images/Dark/actions/list-remove-red-small.png
@@ -270,7 +302,6 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/Dark/actions/panel-to-left.png
 %%DATADIR%%/images/Dark/actions/panel-to-right.png
 %%DATADIR%%/images/Dark/actions/panel-to-top.png
-%%DATADIR%%/images/Dark/actions/PanelEnding.png
 %%DATADIR%%/images/Dark/actions/perspective-h1.png
 %%DATADIR%%/images/Dark/actions/perspective-h2.png
 %%DATADIR%%/images/Dark/actions/perspective-v1.png
@@ -313,6 +344,8 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/Dark/actions/rotate-right-3.png
 %%DATADIR%%/images/Dark/actions/rotate-right.png
 %%DATADIR%%/images/Dark/actions/rtwindow.png
+%%DATADIR%%/images/Dark/actions/softProof.png
+%%DATADIR%%/images/Dark/actions/spGamutCheck.png
 %%DATADIR%%/images/Dark/actions/stock-flip-horizontal.png
 %%DATADIR%%/images/Dark/actions/stock-flip-vertical.png
 %%DATADIR%%/images/Dark/actions/stock-rotate-270.png
@@ -322,16 +355,20 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/Dark/actions/toleftend.png
 %%DATADIR%%/images/Dark/actions/torightend.png
 %%DATADIR%%/images/Dark/actions/transform.png
+%%DATADIR%%/images/Dark/actions/trash-hide-deleted.png
 %%DATADIR%%/images/Dark/actions/trash-show-empty.png
 %%DATADIR%%/images/Dark/actions/trash-show-full.png
 %%DATADIR%%/images/Dark/actions/trash-thumbnail.png
 %%DATADIR%%/images/Dark/actions/trash.png
+%%DATADIR%%/images/Dark/actions/unchanged-18.png
+%%DATADIR%%/images/Dark/actions/unchanged-22.png
 %%DATADIR%%/images/Dark/actions/undelete-rtl.png
 %%DATADIR%%/images/Dark/actions/undelete-thumbnail-rtl.png
 %%DATADIR%%/images/Dark/actions/undelete-thumbnail.png
 %%DATADIR%%/images/Dark/actions/undelete.png
 %%DATADIR%%/images/Dark/actions/warnhl.png
 %%DATADIR%%/images/Dark/actions/warnsh.png
+%%DATADIR%%/images/Dark/actions/wavelet.png
 %%DATADIR%%/images/Dark/actions/wb-auto.png
 %%DATADIR%%/images/Dark/actions/wb-camera.png
 %%DATADIR%%/images/Dark/actions/wb-cloudy.png
@@ -361,48 +398,10 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/Dark/places/gtk-directory.png
 %%DATADIR%%/images/Dark/places/user-desktop.png
 %%DATADIR%%/images/Dark/places/user-home.png
-%%DATADIR%%/images/default-settings-ltr.png
-%%DATADIR%%/images/default-settings-rtl.png
-%%DATADIR%%/images/detail.png
-%%DATADIR%%/images/distortion-auto.png
-%%DATADIR%%/images/distortion.png
-%%DATADIR%%/images/edited-small.png
-%%DATADIR%%/images/edited.png
-%%DATADIR%%/images/editedg-small.png
-%%DATADIR%%/images/editednot-small.png
-%%DATADIR%%/images/editednotg-small.png
-%%DATADIR%%/images/empty.png
-%%DATADIR%%/images/exposure.png
-%%DATADIR%%/images/filter.png
-%%DATADIR%%/images/filterclear.png
-%%DATADIR%%/images/folder.png
-%%DATADIR%%/images/fullscreen-exit.png
-%%DATADIR%%/images/fullscreen.png
-%%DATADIR%%/images/grayrated.png
-%%DATADIR%%/images/gtk-add.png
-%%DATADIR%%/images/gtk-apply.png
-%%DATADIR%%/images/gtk-close-small.png
-%%DATADIR%%/images/gtk-close.png
-%%DATADIR%%/images/gtk-color-picker-small.png
-%%DATADIR%%/images/gtk-color-picker.png
-%%DATADIR%%/images/gtk-open.png
-%%DATADIR%%/images/gtk-save-large.png
-%%DATADIR%%/images/gtk-undo-ltr.png
-%%DATADIR%%/images/gtk-undo-rtl.png
-%%DATADIR%%/images/gtk-undoall-ltr.png
-%%DATADIR%%/images/gtk-undoall-rtl.png
-%%DATADIR%%/images/gtk-zoom-100.png
-%%DATADIR%%/images/gtk-zoom-fit.png
-%%DATADIR%%/images/gtk-zoom-in.png
-%%DATADIR%%/images/gtk-zoom-out.png
-%%DATADIR%%/images/histBar.png
-%%DATADIR%%/images/histBlue.png
-%%DATADIR%%/images/histGreen.png
-%%DATADIR%%/images/histRaw.png
-%%DATADIR%%/images/histRed.png
-%%DATADIR%%/images/histValue.png
-%%DATADIR%%/images/image-editor.png
-%%DATADIR%%/images/info.png
+%%DATADIR%%/images/Light/actions/Chanmixer-Bgamma.png
+%%DATADIR%%/images/Light/actions/Chanmixer-Ggamma.png
+%%DATADIR%%/images/Light/actions/Chanmixer-Rgamma.png
+%%DATADIR%%/images/Light/actions/PanelEnding.png
 %%DATADIR%%/images/Light/actions/ajd-ca-blue1.png
 %%DATADIR%%/images/Light/actions/ajd-ca-blue2.png
 %%DATADIR%%/images/Light/actions/ajd-ca-red1.png
@@ -413,6 +412,14 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/Light/actions/ajd-wb-green2.png
 %%DATADIR%%/images/Light/actions/ajd-wb-temp1.png
 %%DATADIR%%/images/Light/actions/ajd-wb-temp2.png
+%%DATADIR%%/images/Light/actions/arrow-down-small.png
+%%DATADIR%%/images/Light/actions/arrow-down.png
+%%DATADIR%%/images/Light/actions/arrow-left-small.png
+%%DATADIR%%/images/Light/actions/arrow-left.png
+%%DATADIR%%/images/Light/actions/arrow-right-small.png
+%%DATADIR%%/images/Light/actions/arrow-right.png
+%%DATADIR%%/images/Light/actions/arrow-up-small.png
+%%DATADIR%%/images/Light/actions/arrow-up.png
 %%DATADIR%%/images/Light/actions/beforeafter.png
 %%DATADIR%%/images/Light/actions/cglabel0.png
 %%DATADIR%%/images/Light/actions/cglabel1.png
@@ -420,9 +427,6 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/Light/actions/cglabel3.png
 %%DATADIR%%/images/Light/actions/cglabel4.png
 %%DATADIR%%/images/Light/actions/cglabel5.png
-%%DATADIR%%/images/Light/actions/Chanmixer-Bgamma.png
-%%DATADIR%%/images/Light/actions/Chanmixer-Ggamma.png
-%%DATADIR%%/images/Light/actions/Chanmixer-Rgamma.png
 %%DATADIR%%/images/Light/actions/clabel0.png
 %%DATADIR%%/images/Light/actions/clabel1.png
 %%DATADIR%%/images/Light/actions/clabel2.png
@@ -430,15 +434,17 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/Light/actions/clabel4.png
 %%DATADIR%%/images/Light/actions/clabel5.png
 %%DATADIR%%/images/Light/actions/closedhand.png
+%%DATADIR%%/images/Light/actions/colorPickers-hide.png
+%%DATADIR%%/images/Light/actions/colorPickers-show.png
 %%DATADIR%%/images/Light/actions/colour.png
 %%DATADIR%%/images/Light/actions/crop-auto.png
 %%DATADIR%%/images/Light/actions/crop.png
 %%DATADIR%%/images/Light/actions/crossed-arrows-in.png
 %%DATADIR%%/images/Light/actions/crossed-arrows-out.png
+%%DATADIR%%/images/Light/actions/curveType-NURBS.png
 %%DATADIR%%/images/Light/actions/curveType-controlPoints.png
 %%DATADIR%%/images/Light/actions/curveType-flatLinear.png
 %%DATADIR%%/images/Light/actions/curveType-linear.png
-%%DATADIR%%/images/Light/actions/curveType-NURBS.png
 %%DATADIR%%/images/Light/actions/curveType-parametric.png
 %%DATADIR%%/images/Light/actions/curveType-spline.png
 %%DATADIR%%/images/Light/actions/detail.png
@@ -457,7 +463,14 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/Light/actions/editednot-small.png
 %%DATADIR%%/images/Light/actions/editednotg-small.png
 %%DATADIR%%/images/Light/actions/editmodehand.png
+%%DATADIR%%/images/Light/actions/expanderClosed.png
+%%DATADIR%%/images/Light/actions/expanderDisabled.png
+%%DATADIR%%/images/Light/actions/expanderEnabled.png
+%%DATADIR%%/images/Light/actions/expanderInconsistent.png
+%%DATADIR%%/images/Light/actions/expanderOpened.png
 %%DATADIR%%/images/Light/actions/exposure.png
+%%DATADIR%%/images/Light/actions/filter-original-1.png
+%%DATADIR%%/images/Light/actions/filter-original-2.png
 %%DATADIR%%/images/Light/actions/filter.png
 %%DATADIR%%/images/Light/actions/filterclear.png
 %%DATADIR%%/images/Light/actions/fullscreen-exit.png
@@ -468,6 +481,7 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/Light/actions/gtk-cancel.png
 %%DATADIR%%/images/Light/actions/gtk-close-small.png
 %%DATADIR%%/images/Light/actions/gtk-close.png
+%%DATADIR%%/images/Light/actions/gtk-color-picker-add.png
 %%DATADIR%%/images/Light/actions/gtk-color-picker-small.png
 %%DATADIR%%/images/Light/actions/gtk-color-picker.png
 %%DATADIR%%/images/Light/actions/gtk-copy.png
@@ -490,6 +504,7 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/Light/actions/gtk-undoall-rtl.png
 %%DATADIR%%/images/Light/actions/gtk-zoom-100-small.png
 %%DATADIR%%/images/Light/actions/gtk-zoom-100.png
+%%DATADIR%%/images/Light/actions/gtk-zoom-crop.png
 %%DATADIR%%/images/Light/actions/gtk-zoom-fit.png
 %%DATADIR%%/images/Light/actions/gtk-zoom-in-small.png
 %%DATADIR%%/images/Light/actions/gtk-zoom-in.png
@@ -513,6 +528,10 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/Light/actions/histValueg.png
 %%DATADIR%%/images/Light/actions/image-editor.png
 %%DATADIR%%/images/Light/actions/info.png
+%%DATADIR%%/images/Light/actions/intent-absolute.png
+%%DATADIR%%/images/Light/actions/intent-perceptual.png
+%%DATADIR%%/images/Light/actions/intent-relative.png
+%%DATADIR%%/images/Light/actions/intent-saturation.png
 %%DATADIR%%/images/Light/actions/list-add-small.png
 %%DATADIR%%/images/Light/actions/list-add.png
 %%DATADIR%%/images/Light/actions/list-remove-red-small.png
@@ -530,7 +549,6 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/Light/actions/panel-to-left.png
 %%DATADIR%%/images/Light/actions/panel-to-right.png
 %%DATADIR%%/images/Light/actions/panel-to-top.png
-%%DATADIR%%/images/Light/actions/PanelEnding.png
 %%DATADIR%%/images/Light/actions/perspective-h1.png
 %%DATADIR%%/images/Light/actions/perspective-h2.png
 %%DATADIR%%/images/Light/actions/perspective-v1.png
@@ -573,6 +591,8 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/Light/actions/rotate-right-3.png
 %%DATADIR%%/images/Light/actions/rotate-right.png
 %%DATADIR%%/images/Light/actions/rtwindow.png
+%%DATADIR%%/images/Light/actions/softProof.png
+%%DATADIR%%/images/Light/actions/spGamutCheck.png
 %%DATADIR%%/images/Light/actions/stock-flip-horizontal.png
 %%DATADIR%%/images/Light/actions/stock-flip-vertical.png
 %%DATADIR%%/images/Light/actions/stock-rotate-270.png
@@ -582,16 +602,20 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/Light/actions/toleftend.png
 %%DATADIR%%/images/Light/actions/torightend.png
 %%DATADIR%%/images/Light/actions/transform.png
+%%DATADIR%%/images/Light/actions/trash-hide-deleted.png
 %%DATADIR%%/images/Light/actions/trash-show-empty.png
 %%DATADIR%%/images/Light/actions/trash-show-full.png
 %%DATADIR%%/images/Light/actions/trash-thumbnail.png
 %%DATADIR%%/images/Light/actions/trash.png
+%%DATADIR%%/images/Light/actions/unchanged-18.png
+%%DATADIR%%/images/Light/actions/unchanged-22.png
 %%DATADIR%%/images/Light/actions/undelete-rtl.png
 %%DATADIR%%/images/Light/actions/undelete-thumbnail-rtl.png
 %%DATADIR%%/images/Light/actions/undelete-thumbnail.png
 %%DATADIR%%/images/Light/actions/undelete.png
 %%DATADIR%%/images/Light/actions/warnhl.png
 %%DATADIR%%/images/Light/actions/warnsh.png
+%%DATADIR%%/images/Light/actions/wavelet.png
 %%DATADIR%%/images/Light/actions/wb-auto.png
 %%DATADIR%%/images/Light/actions/wb-camera.png
 %%DATADIR%%/images/Light/actions/wb-cloudy.png
@@ -621,6 +645,75 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/Light/places/gtk-directory.png
 %%DATADIR%%/images/Light/places/user-desktop.png
 %%DATADIR%%/images/Light/places/user-home.png
+%%DATADIR%%/images/PanelEnding.png
+%%DATADIR%%/images/beforeafter.png
+%%DATADIR%%/images/cglabel0.png
+%%DATADIR%%/images/cglabel1.png
+%%DATADIR%%/images/cglabel2.png
+%%DATADIR%%/images/cglabel3.png
+%%DATADIR%%/images/cglabel4.png
+%%DATADIR%%/images/cglabel5.png
+%%DATADIR%%/images/clabel0.png
+%%DATADIR%%/images/clabel1.png
+%%DATADIR%%/images/clabel2.png
+%%DATADIR%%/images/clabel3.png
+%%DATADIR%%/images/clabel4.png
+%%DATADIR%%/images/clabel5.png
+%%DATADIR%%/images/closedhand.png
+%%DATADIR%%/images/colour.png
+%%DATADIR%%/images/crop-auto.png
+%%DATADIR%%/images/crop.png
+%%DATADIR%%/images/cross.png
+%%DATADIR%%/images/crossed-arrows-out.png
+%%DATADIR%%/images/curveType-NURBS.png
+%%DATADIR%%/images/curveType-controlPoints.png
+%%DATADIR%%/images/curveType-flatLinear.png
+%%DATADIR%%/images/curveType-linear.png
+%%DATADIR%%/images/curveType-parametric.png
+%%DATADIR%%/images/curveType-spline.png
+%%DATADIR%%/images/curveType-unchanged.png
+%%DATADIR%%/images/default-settings-ltr.png
+%%DATADIR%%/images/default-settings-rtl.png
+%%DATADIR%%/images/detail.png
+%%DATADIR%%/images/distortion-auto.png
+%%DATADIR%%/images/distortion.png
+%%DATADIR%%/images/edited-small.png
+%%DATADIR%%/images/edited.png
+%%DATADIR%%/images/editedg-small.png
+%%DATADIR%%/images/editednot-small.png
+%%DATADIR%%/images/editednotg-small.png
+%%DATADIR%%/images/empty.png
+%%DATADIR%%/images/exposure.png
+%%DATADIR%%/images/filter.png
+%%DATADIR%%/images/filterclear.png
+%%DATADIR%%/images/folder.png
+%%DATADIR%%/images/fullscreen-exit.png
+%%DATADIR%%/images/fullscreen.png
+%%DATADIR%%/images/grayrated.png
+%%DATADIR%%/images/gtk-add.png
+%%DATADIR%%/images/gtk-apply.png
+%%DATADIR%%/images/gtk-close-small.png
+%%DATADIR%%/images/gtk-close.png
+%%DATADIR%%/images/gtk-color-picker-small.png
+%%DATADIR%%/images/gtk-color-picker.png
+%%DATADIR%%/images/gtk-open.png
+%%DATADIR%%/images/gtk-save-large.png
+%%DATADIR%%/images/gtk-undo-ltr.png
+%%DATADIR%%/images/gtk-undo-rtl.png
+%%DATADIR%%/images/gtk-undoall-ltr.png
+%%DATADIR%%/images/gtk-undoall-rtl.png
+%%DATADIR%%/images/gtk-zoom-100.png
+%%DATADIR%%/images/gtk-zoom-fit.png
+%%DATADIR%%/images/gtk-zoom-in.png
+%%DATADIR%%/images/gtk-zoom-out.png
+%%DATADIR%%/images/histBar.png
+%%DATADIR%%/images/histBlue.png
+%%DATADIR%%/images/histGreen.png
+%%DATADIR%%/images/histRaw.png
+%%DATADIR%%/images/histRed.png
+%%DATADIR%%/images/histValue.png
+%%DATADIR%%/images/image-editor.png
+%%DATADIR%%/images/info.png
 %%DATADIR%%/images/list-add-small.png
 %%DATADIR%%/images/list-remove-red-small.png
 %%DATADIR%%/images/list-remove.png
@@ -641,7 +734,6 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/panel-to-left.png
 %%DATADIR%%/images/panel-to-right.png
 %%DATADIR%%/images/panel-to-top.png
-%%DATADIR%%/images/PanelEnding.png
 %%DATADIR%%/images/popuparrow.png
 %%DATADIR%%/images/processing-pause.png
 %%DATADIR%%/images/processing-play.png
@@ -655,7 +747,9 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/images/refresh-white.png
 %%DATADIR%%/images/resize.png
 %%DATADIR%%/images/rt-logo-large.png
-%%DATADIR%%/images/rt-logo.png
+%%DATADIR%%/images/rt-logo-medium.png
+%%DATADIR%%/images/rt-logo-small.png
+%%DATADIR%%/images/rt-logo-tiny.png
 %%DATADIR%%/images/saved.png
 %%DATADIR%%/images/savedg.png
 %%DATADIR%%/images/savednot.png
@@ -683,7 +777,6 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/languages/Chinese (Traditional)
 %%DATADIR%%/languages/Czech
 %%DATADIR%%/languages/Dansk
-%%DATADIR%%/languages/default
 %%DATADIR%%/languages/Deutsch
 %%DATADIR%%/languages/English (UK)
 %%DATADIR%%/languages/English (US)
@@ -694,8 +787,8 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/languages/Hebrew
 %%DATADIR%%/languages/Italiano
 %%DATADIR%%/languages/Japanese
-%%DATADIR%%/languages/Latvian
 %%DATADIR%%/languages/LICENSE
+%%DATADIR%%/languages/Latvian
 %%DATADIR%%/languages/Magyar
 %%DATADIR%%/languages/Nederlands
 %%DATADIR%%/languages/Norsk BM
@@ -710,6 +803,7 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/languages/Suomi
 %%DATADIR%%/languages/Swedish
 %%DATADIR%%/languages/Turkish
+%%DATADIR%%/languages/default
 %%DATADIR%%/options
 %%DATADIR%%/profiles/BW/BW 1.pp3
 %%DATADIR%%/profiles/BW/BW 2.pp3
@@ -757,6 +851,7 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/profiles/Generic/Natural 2.pp3
 %%DATADIR%%/profiles/Generic/Punchy 1.pp3
 %%DATADIR%%/profiles/Generic/Punchy 2.pp3
+%%DATADIR%%/profiles/Non-raw/Brighten.pp3
 %%DATADIR%%/profiles/Pop/Pop 1.pp3
 %%DATADIR%%/profiles/Pop/Pop 2 L.pp3
 %%DATADIR%%/profiles/Pop/Pop 3 Skin.pp3
@@ -777,62 +872,8 @@ share/icons/hicolor/48x48/apps/rawtherap
 %%DATADIR%%/sounds/BatchComplete.wav
 %%DATADIR%%/sounds/Empty.wav
 %%DATADIR%%/sounds/ProcessComplete.wav
-%%DATADIR%%/themes/09-Gray-Orange.gtkrc
-%%DATADIR%%/themes/09-Gray-Orange.iconset
-%%DATADIR%%/themes/17-Gray-Red.gtkrc
-%%DATADIR%%/themes/17-Gray-Red.iconset
-%%DATADIR%%/themes/21-Gray-Gray.gtkrc
-%%DATADIR%%/themes/21-Gray-Gray.iconset
-%%DATADIR%%/themes/21-Gray-Orange.gtkrc
-%%DATADIR%%/themes/21-Gray-Orange.iconset
-%%DATADIR%%/themes/21-Gray-Purple.gtkrc
-%%DATADIR%%/themes/21-Gray-Purple.iconset
-%%DATADIR%%/themes/21-Gray-Red.gtkrc
-%%DATADIR%%/themes/21-Gray-Red.iconset
-%%DATADIR%%/themes/25-Gray-Gray.gtkrc
-%%DATADIR%%/themes/25-Gray-Gray.iconset
-%%DATADIR%%/themes/25-Gray-Purple.gtkrc
-%%DATADIR%%/themes/25-Gray-Purple.iconset
-%%DATADIR%%/themes/25-Gray-Red.gtkrc
-%%DATADIR%%/themes/25-Gray-Red.iconset
-%%DATADIR%%/themes/37-Gray-Red-Textured.gtkrc
-%%DATADIR%%/themes/37-Gray-Red-Textured.iconset
-%%DATADIR%%/themes/37-Gray-Red.gtkrc
-%%DATADIR%%/themes/37-Gray-Red.iconset
-%%DATADIR%%/themes/63-Gray-Cyan.gtkrc
-%%DATADIR%%/themes/63-Gray-Cyan.iconset
-%%DATADIR%%/themes/92-Beige-DarkCyan.gtkrc
-%%DATADIR%%/themes/92-Beige-DarkCyan.iconset
-%%DATADIR%%/themes/gray_textured/arrow-down-ins.png
-%%DATADIR%%/themes/gray_textured/arrow-down-pre.png
-%%DATADIR%%/themes/gray_textured/arrow-down.png
-%%DATADIR%%/themes/gray_textured/arrow-left-ins.png
-%%DATADIR%%/themes/gray_textured/arrow-left-pre.png
-%%DATADIR%%/themes/gray_textured/arrow-left.png
-%%DATADIR%%/themes/gray_textured/arrow-right-ins.png
-%%DATADIR%%/themes/gray_textured/arrow-right-pre.png
-%%DATADIR%%/themes/gray_textured/arrow-right.png
-%%DATADIR%%/themes/gray_textured/arrow-up-ins.png
-%%DATADIR%%/themes/gray_textured/arrow-up-pre.png
-%%DATADIR%%/themes/gray_textured/arrow-up.png
-%%DATADIR%%/themes/gray_textured/button-insensitive.png
-%%DATADIR%%/themes/gray_textured/button-normal.png
-%%DATADIR%%/themes/gray_textured/button-normal.xcf
-%%DATADIR%%/themes/gray_textured/button-prelight.png
-%%DATADIR%%/themes/gray_textured/button-pressed.png
-%%DATADIR%%/themes/gray_textured/null.png
-%%DATADIR%%/themes/gray_textured/pbtroughh.png
-%%DATADIR%%/themes/gray_textured/pbtroughv.png
-%%DATADIR%%/themes/gray_textured/rangeslider-ins.png
-%%DATADIR%%/themes/gray_textured/rangeslider-pre.png
-%%DATADIR%%/themes/gray_textured/rangeslider.png
-%%DATADIR%%/themes/gray_textured/slider-h-ins.png
-%%DATADIR%%/themes/gray_textured/slider-h-pre.png
-%%DATADIR%%/themes/gray_textured/slider-h.png
-%%DATADIR%%/themes/gray_textured/slider-v-ins.png
-%%DATADIR%%/themes/gray_textured/slider-v-pre.png
-%%DATADIR%%/themes/gray_textured/slider-v.png
-%%DATADIR%%/themes/gray_textured/trough2-h.png
-%%DATADIR%%/themes/gray_textured/trough2.png
-%%DATADIR%%/themes/slim
+%%DATADIR%%/themes/RawTherapee-GTK3-20_.css
+%%DATADIR%%/themes/RawTherapee-GTK3-_19.css
+%%DATADIR%%/themes/TooWaBlue-Dark-GTK3-20_.css
+%%DATADIR%%/themes/TooWaBlue-GTK3-20_.css
 %%DATADIR%%/themes/system.iconset



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