graphics/gcolor3: Update to 2.3

- Remove NLS option.  There is no support for it in the build script anymore

Changes:	https://github.com/Hjdskes/gcolor3/releases/tag/v2.3

5 files changed, 48 insertions, 24 deletions

diff --git a/graphics/gcolor3/Makefile b/graphics/gcolor3/Makefile
index d91ae08d12b4..add14734d8aa 100644
--- a/graphics/gcolor3/Makefile
+++ b/graphics/gcolor3/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	gcolor3
-PORTVERSION=	2.2
 DISTVERSIONPREFIX=	v
+DISTVERSION=	2.3
 CATEGORIES=	graphics
 
 MAINTAINER=	tobik@FreeBSD.org
@@ -13,17 +13,10 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_powerpc64=	fails to compile: main.c: In function '_print_version_and_exit': will never be executed
 
-USES=		autoreconf gmake gettext libtool pkgconfig
-USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool
-GNU_CONFIGURE=	yes
-INSTALLS_ICONS=	yes
-
+USES=		gnome gettext meson libtool pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	Hjdskes
-
-OPTIONS_DEFINE=	NLS
-OPTIONS_SUB=	yes
-
-NLS_CONFIGURE_ENABLE=	nls
+USE_GNOME=	cairo gdkpixbuf2 gtk30 intltool
+INSTALLS_ICONS=	yes
 
 .include <bsd.port.mk>
diff --git a/graphics/gcolor3/distinfo b/graphics/gcolor3/distinfo
index f96be6bd3713..53271055e873 100644
--- a/graphics/gcolor3/distinfo
+++ b/graphics/gcolor3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493043434
-SHA256 (Hjdskes-gcolor3-v2.2_GH0.tar.gz) = a3f67108ef7524b424b774b4b68332e45371703f61d659ce7ca1da47c7fb5590
-SIZE (Hjdskes-gcolor3-v2.2_GH0.tar.gz) = 37947
+TIMESTAMP = 1535877677
+SHA256 (Hjdskes-gcolor3-v2.3_GH0.tar.gz) = 37d668a0dae32a1031a150d680be2c51efce45f5ac3c11fb6c1166449da21ea0
+SIZE (Hjdskes-gcolor3-v2.3_GH0.tar.gz) = 135462
diff --git a/graphics/gcolor3/files/patch-src_gcolor3-color-row.c b/graphics/gcolor3/files/patch-src_gcolor3-color-row.c
new file mode 100644
index 000000000000..b14683a05b32
--- /dev/null
+++ b/graphics/gcolor3/files/patch-src_gcolor3-color-row.c
@@ -0,0 +1,17 @@
+https://github.com/Hjdskes/gcolor3/commit/9130ffeff091fbafff6a0c8f06b09f54657d5dfd
+
+../src/gcolor3-color-row.c:88:6: error: implicit conversion from enumeration type 'GtkStateType' to different enumeration type 'GtkStateFlags' [-Werror,-Wenum-conversion]
+                                        GTK_STATE_NORMAL,
+                                        ^~~~~~~~~~~~~~~~
+
+--- src/gcolor3-color-row.c.orig	2018-09-02 12:20:53 UTC
++++ src/gcolor3-color-row.c
+@@ -85,7 +85,7 @@ set_color_thumbnail (Gcolor3ColorRow *row)
+ 	gtk_style_context_save (style_context);
+ 	gtk_style_context_get_property (style_context,
+ 					GTK_STYLE_PROPERTY_BORDER_RADIUS,
+-					GTK_STATE_NORMAL,
++					GTK_STATE_FLAG_NORMAL,
+ 					&border_radius);
+ 	gtk_style_context_restore (style_context);
+ 
diff --git a/graphics/gcolor3/files/patch-src_gcolor3-color-selection.c b/graphics/gcolor3/files/patch-src_gcolor3-color-selection.c
new file mode 100644
index 000000000000..cd7bfb5cdcd7
--- /dev/null
+++ b/graphics/gcolor3/files/patch-src_gcolor3-color-selection.c
@@ -0,0 +1,15 @@
+https://github.com/Hjdskes/gcolor3/commit/8d89081a8e13749f5a9051821114bc5fe814eaf3
+
+--- src/gcolor3-color-selection.c.orig	2018-09-02 12:48:50 UTC
++++ src/gcolor3-color-selection.c
+@@ -36,7 +36,10 @@
+ 
+ #include <math.h>
+ #include <string.h>
++#include <gdk/gdk.h>
++#ifdef GDK_WINDOWING_WAYLAND
+ #include <gdk/gdkwayland.h>
++#endif
+ #include <gtk/gtk.h>
+ #include <glib/gi18n.h>
+ 
diff --git a/graphics/gcolor3/pkg-plist b/graphics/gcolor3/pkg-plist
index b7effd604fa9..564a9c79acdc 100644
--- a/graphics/gcolor3/pkg-plist
+++ b/graphics/gcolor3/pkg-plist
@@ -1,11 +1,10 @@
 bin/gcolor3
-share/appdata/gcolor3.appdata.xml
-share/applications/gcolor3.desktop
-share/icons/hicolor/scalable/apps/gcolor3.svg
-%%NLS%%share/locale/de_DE/LC_MESSAGES/Gcolor3.mo
-%%NLS%%share/locale/en_GB/LC_MESSAGES/Gcolor3.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/Gcolor3.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/Gcolor3.mo
-%%NLS%%share/locale/sr/LC_MESSAGES/Gcolor3.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/Gcolor3.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/Gcolor3.mo
+man/man1/gcolor3.1.gz
+share/applications/nl.hjdskes.gcolor3.desktop
+share/icons/hicolor/scalable/apps/nl.hjdskes.gcolor3.svg
+share/locale/de_DE/LC_MESSAGES/gcolor3.mo
+share/locale/en_GB/LC_MESSAGES/gcolor3.mo
+share/locale/nl/LC_MESSAGES/gcolor3.mo
+share/locale/ru/LC_MESSAGES/gcolor3.mo
+share/locale/sr/LC_MESSAGES/gcolor3.mo
+share/metainfo/nl.hjdskes.gcolor3.appdata.xml