From 53f62e82b8351549a27584ca3d366258103aa824 Mon Sep 17 00:00:00 2001 From: Tobias Kortkamp <tobik@FreeBSD.org> Date: Sat, 20 Oct 2018 09:17:28 +0000 Subject: [PATCH] graphics/gcolor3: Update to 2.3.1 - Update WWW and move to new home on GNOME's Gitlab - Drop upstreamed patches Changes: https://gitlab.gnome.org/World/gcolor3/tags/v2.3.1 --- graphics/gcolor3/Makefile | 8 +++++--- graphics/gcolor3/distinfo | 6 +++--- .../gcolor3/files/patch-src_gcolor3-color-row.c | 17 ----------------- .../files/patch-src_gcolor3-color-selection.c | 15 --------------- graphics/gcolor3/pkg-descr | 2 +- graphics/gcolor3/pkg-plist | 2 +- 6 files changed, 10 insertions(+), 40 deletions(-) delete mode 100644 graphics/gcolor3/files/patch-src_gcolor3-color-row.c delete mode 100644 graphics/gcolor3/files/patch-src_gcolor3-color-selection.c diff --git a/graphics/gcolor3/Makefile b/graphics/gcolor3/Makefile index add14734d8aa..4aa6f447ce23 100644 --- a/graphics/gcolor3/Makefile +++ b/graphics/gcolor3/Makefile @@ -2,7 +2,7 @@ PORTNAME= gcolor3 DISTVERSIONPREFIX= v -DISTVERSION= 2.3 +DISTVERSION= 2.3.1 CATEGORIES= graphics MAINTAINER= tobik@FreeBSD.org @@ -14,8 +14,10 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_powerpc64= fails to compile: main.c: In function '_print_version_and_exit': will never be executed USES= gnome gettext meson libtool pkgconfig -USE_GITHUB= yes -GH_ACCOUNT= Hjdskes +USE_GITLAB= yes +GL_SITE= https://gitlab.gnome.org +GL_ACCOUNT= World +GL_COMMIT= 17dca0125fc3c931418d8723b684332d35bd5715 USE_GNOME= cairo gdkpixbuf2 gtk30 intltool INSTALLS_ICONS= yes diff --git a/graphics/gcolor3/distinfo b/graphics/gcolor3/distinfo index 53271055e873..6175757124a4 100644 --- a/graphics/gcolor3/distinfo +++ b/graphics/gcolor3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1535877677 -SHA256 (Hjdskes-gcolor3-v2.3_GH0.tar.gz) = 37d668a0dae32a1031a150d680be2c51efce45f5ac3c11fb6c1166449da21ea0 -SIZE (Hjdskes-gcolor3-v2.3_GH0.tar.gz) = 135462 +TIMESTAMP = 1540025149 +SHA256 (World-gcolor3-17dca0125fc3c931418d8723b684332d35bd5715_GL0.tar.gz) = 880efe4ded8d5be97605ee461a69b8dced7c215e91acb63b6f2f6c26f611a6f3 +SIZE (World-gcolor3-17dca0125fc3c931418d8723b684332d35bd5715_GL0.tar.gz) = 132277 diff --git a/graphics/gcolor3/files/patch-src_gcolor3-color-row.c b/graphics/gcolor3/files/patch-src_gcolor3-color-row.c deleted file mode 100644 index b14683a05b32..000000000000 --- a/graphics/gcolor3/files/patch-src_gcolor3-color-row.c +++ /dev/null @@ -1,17 +0,0 @@ -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 deleted file mode 100644 index cd7bfb5cdcd7..000000000000 --- a/graphics/gcolor3/files/patch-src_gcolor3-color-selection.c +++ /dev/null @@ -1,15 +0,0 @@ -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-descr b/graphics/gcolor3/pkg-descr index b9757ffad32f..1ae274b412a0 100644 --- a/graphics/gcolor3/pkg-descr +++ b/graphics/gcolor3/pkg-descr @@ -6,4 +6,4 @@ When you have found the perfect combination of colors, naturally you want to save them. Gcolor3 allows you to conveniently save and retrieve colors. -WWW: https://hjdskes.github.io/projects/gcolor3/ +WWW: https://www.hjdskes.nl/projects/gcolor3/ diff --git a/graphics/gcolor3/pkg-plist b/graphics/gcolor3/pkg-plist index 564a9c79acdc..cdd04349dddb 100644 --- a/graphics/gcolor3/pkg-plist +++ b/graphics/gcolor3/pkg-plist @@ -2,7 +2,7 @@ bin/gcolor3 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/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