Update to 3.36.0

4 files changed, 20 insertions, 79 deletions

diff --git a/graphics/gnome-color-manager/Makefile b/graphics/gnome-color-manager/Makefile
index e1b20f2b654c..27a40afb6c17 100644
--- a/graphics/gnome-color-manager/Makefile
+++ b/graphics/gnome-color-manager/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gnome-color-manager
-PORTVERSION=	3.28.0
-PORTREVISION=	4
+PORTVERSION=	3.36.0
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
@@ -27,7 +26,8 @@ LIB_DEPENDS=	liblcms2.so:graphics/lcms2 \
 
 PORTSCOUT=	limitw:1,even
 
-USES=		compiler:c++11-lang gettext gnome meson pkgconfig tar:xz
+USES=		compiler:c++11-lang desktop-file-utils gettext gnome meson \
+		pkgconfig tar:xz
 USE_GNOME=	cairo gtk30 vte3
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
diff --git a/graphics/gnome-color-manager/distinfo b/graphics/gnome-color-manager/distinfo
index 0bcaf80e747d..c931f9e92881 100644
--- a/graphics/gnome-color-manager/distinfo
+++ b/graphics/gnome-color-manager/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1526110568
-SHA256 (gnome/gnome-color-manager-3.28.0.tar.xz) = ec333a9fa4688b29b0f4b6cabe941f7f40bfe9a1369ba75b7ffc185c8d7a3dd6
-SIZE (gnome/gnome-color-manager-3.28.0.tar.xz) = 2605620
+TIMESTAMP = 1601154861
+SHA256 (gnome/gnome-color-manager-3.36.0.tar.xz) = 9ddb9e6b6472e119801381f90905332ec1d4258981721bba831ca246ceb3ad3b
+SIZE (gnome/gnome-color-manager-3.36.0.tar.xz) = 2175016
diff --git a/graphics/gnome-color-manager/files/patch-gentoo_00878b b/graphics/gnome-color-manager/files/patch-gentoo_00878b
deleted file mode 100644
index 9c1550f78d6a..000000000000
--- a/graphics/gnome-color-manager/files/patch-gentoo_00878b
+++ /dev/null
@@ -1,42 +0,0 @@
-Patch kindly borrowed from Mageia.
-
-https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/4
-
-diff -Nru a/src/gcm-helper-exiv.cpp b/src/gcm-helper-exiv.cpp
---- src/gcm-helper-exiv.cpp	2018-09-04 13:50:05.000000000 +0200
-+++ src/gcm-helper-exiv.cpp	2018-12-31 15:39:52.288495398 +0100
-@@ -19,8 +19,7 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-  */
- 
--#include <exiv2/image.hpp>
--#include <exiv2/exif.hpp>
-+#include <exiv2/exiv2.hpp>
- #include <iostream>
- #include <iomanip>
- 
-@@ -51,7 +50,11 @@
- 		if (argc == 2)
- 			filename = argv[1];
- 		if (filename.empty())
-+#if EXIV2_TEST_VERSION(0,27,0)
-+			throw Exiv2::Error(Exiv2::kerErrorMessage, "No filename specified");
-+#else
- 			throw Exiv2::Error(1, "No filename specified");
-+#endif
- 		image = Exiv2::ImageFactory::open(filename);
- 		image->readMetadata();
- 
-@@ -60,7 +63,11 @@
- 		if (exifData.empty()) {
- 			std::string error(argv[1]);
- 			error += ": No Exif data found in the file";
-+#if EXIV2_TEST_VERSION(0,27,0)
-+			throw Exiv2::Error(Exiv2::kerErrorMessage, error);
-+#else
- 			throw Exiv2::Error(1, error);
-+#endif
- 		}
- 
- 		/* try to find make, model and serial number */
-
diff --git a/graphics/gnome-color-manager/pkg-plist b/graphics/gnome-color-manager/pkg-plist
index 6b60850f633a..3176c7c33a65 100644
--- a/graphics/gnome-color-manager/pkg-plist
+++ b/graphics/gnome-color-manager/pkg-plist
@@ -1,15 +1,11 @@
-bin/gcm-calibrate
 bin/gcm-import
 bin/gcm-inspect
 bin/gcm-picker
 bin/gcm-viewer
-%%RAW%%libexec/gcm-helper-exiv
-man/man1/gcm-calibrate.1.gz
 man/man1/gcm-import.1.gz
 man/man1/gcm-inspect.1.gz
 man/man1/gcm-picker.1.gz
 man/man1/gcm-viewer.1.gz
-share/applications/gcm-calibrate.desktop
 share/applications/gcm-import.desktop
 share/applications/gcm-picker.desktop
 share/applications/org.gnome.ColorProfileViewer.desktop
@@ -17,33 +13,6 @@ share/applications/org.gnome.ColorProfileViewer.desktop
 %%DATADIR%%/figures/viewer-example-01.png
 %%DATADIR%%/figures/viewer-example-02.png
 %%DATADIR%%/figures/viewer-example-03.png
-%%DATADIR%%/icons/calibration-long.svg
-%%DATADIR%%/icons/calibration-normal.svg
-%%DATADIR%%/icons/calibration-short.svg
-%%DATADIR%%/icons/clock.svg
-%%DATADIR%%/icons/icons/crt.svg
-%%DATADIR%%/icons/icons/lcd.svg
-%%DATADIR%%/icons/icons/projector.svg
-%%DATADIR%%/icons/scan-target-bad.svg
-%%DATADIR%%/icons/scan-target-good.svg
-%%DATADIR%%/icons/scan-target.svg
-%%DATADIR%%/targets/CMP-DigitalTarget3.png
-%%DATADIR%%/targets/CMP_DT_003.png
-%%DATADIR%%/targets/ColorChecker24.png
-%%DATADIR%%/targets/ColorCheckerDC.png
-%%DATADIR%%/targets/ColorCheckerSG.png
-%%DATADIR%%/targets/IT872.png
-%%DATADIR%%/targets/LaserSoftDCPro.png
-%%DATADIR%%/targets/QPcard_201.png
-%%DATADIR%%/targets/QPcard_202.png
-%%DATADIR%%/targets/i1_RGB_Scan_14.png
-%%DATADIR%%/targets/unknown.png
-%%DATADIR%%/ti1/display-long.ti1
-%%DATADIR%%/ti1/display-normal.ti1
-%%DATADIR%%/ti1/display-short.ti1
-%%DATADIR%%/ti1/printer-long.ti1
-%%DATADIR%%/ti1/printer-normal.ti1
-%%DATADIR%%/ti1/printer-short.ti1
 share/help/C/gnome-color-manager/color-import-linux.page
 share/help/C/gnome-color-manager/color-import-osx.page
 share/help/C/gnome-color-manager/color-import-windows.page
@@ -84,10 +53,22 @@ share/help/gl/gnome-color-manager/color-import-linux.page
 share/help/gl/gnome-color-manager/color-import-osx.page
 share/help/gl/gnome-color-manager/color-import-windows.page
 share/help/gl/gnome-color-manager/legal.xml
+share/help/hr/gnome-color-manager/color-import-linux.page
+share/help/hr/gnome-color-manager/color-import-osx.page
+share/help/hr/gnome-color-manager/color-import-windows.page
+share/help/hr/gnome-color-manager/legal.xml
 share/help/hu/gnome-color-manager/color-import-linux.page
 share/help/hu/gnome-color-manager/color-import-osx.page
 share/help/hu/gnome-color-manager/color-import-windows.page
 share/help/hu/gnome-color-manager/legal.xml
+share/help/id/gnome-color-manager/color-import-linux.page
+share/help/id/gnome-color-manager/color-import-osx.page
+share/help/id/gnome-color-manager/color-import-windows.page
+share/help/id/gnome-color-manager/legal.xml
+share/help/it/gnome-color-manager/color-import-linux.page
+share/help/it/gnome-color-manager/color-import-osx.page
+share/help/it/gnome-color-manager/color-import-windows.page
+share/help/it/gnome-color-manager/legal.xml
 share/help/ko/gnome-color-manager/color-import-linux.page
 share/help/ko/gnome-color-manager/color-import-osx.page
 share/help/ko/gnome-color-manager/color-import-windows.page
@@ -153,6 +134,7 @@ share/locale/gl/LC_MESSAGES/gnome-color-manager.mo
 share/locale/gu/LC_MESSAGES/gnome-color-manager.mo
 share/locale/he/LC_MESSAGES/gnome-color-manager.mo
 share/locale/hi/LC_MESSAGES/gnome-color-manager.mo
+share/locale/hr/LC_MESSAGES/gnome-color-manager.mo
 share/locale/hu/LC_MESSAGES/gnome-color-manager.mo
 share/locale/id/LC_MESSAGES/gnome-color-manager.mo
 share/locale/is/LC_MESSAGES/gnome-color-manager.mo
@@ -165,6 +147,7 @@ share/locale/lt/LC_MESSAGES/gnome-color-manager.mo
 share/locale/lv/LC_MESSAGES/gnome-color-manager.mo
 share/locale/ml/LC_MESSAGES/gnome-color-manager.mo
 share/locale/mr/LC_MESSAGES/gnome-color-manager.mo
+share/locale/ms/LC_MESSAGES/gnome-color-manager.mo
 share/locale/nb/LC_MESSAGES/gnome-color-manager.mo
 share/locale/ne/LC_MESSAGES/gnome-color-manager.mo
 share/locale/nl/LC_MESSAGES/gnome-color-manager.mo