From owner-svn-ports-all@freebsd.org Sun Sep 2 13:11:51 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EB886FEF22A; Sun, 2 Sep 2018 13:11:50 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A29A8783F6; Sun, 2 Sep 2018 13:11:50 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9D6F319BC2; Sun, 2 Sep 2018 13:11:50 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w82DBore086487; Sun, 2 Sep 2018 13:11:50 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w82DBnna086482; Sun, 2 Sep 2018 13:11:49 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201809021311.w82DBnna086482@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sun, 2 Sep 2018 13:11:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r478789 - in head/graphics/gcolor3: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/graphics/gcolor3: . files X-SVN-Commit-Revision: 478789 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Sep 2018 13:11:51 -0000 Author: tobik Date: Sun Sep 2 13:11:49 2018 New Revision: 478789 URL: https://svnweb.freebsd.org/changeset/ports/478789 Log: 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 Added: head/graphics/gcolor3/files/ head/graphics/gcolor3/files/patch-src_gcolor3-color-row.c (contents, props changed) head/graphics/gcolor3/files/patch-src_gcolor3-color-selection.c (contents, props changed) Modified: head/graphics/gcolor3/Makefile head/graphics/gcolor3/distinfo head/graphics/gcolor3/pkg-plist Modified: head/graphics/gcolor3/Makefile ============================================================================== --- head/graphics/gcolor3/Makefile Sun Sep 2 11:42:21 2018 (r478788) +++ head/graphics/gcolor3/Makefile Sun Sep 2 13:11:49 2018 (r478789) @@ -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 Modified: head/graphics/gcolor3/distinfo ============================================================================== --- head/graphics/gcolor3/distinfo Sun Sep 2 11:42:21 2018 (r478788) +++ head/graphics/gcolor3/distinfo Sun Sep 2 13:11:49 2018 (r478789) @@ -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 Added: head/graphics/gcolor3/files/patch-src_gcolor3-color-row.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gcolor3/files/patch-src_gcolor3-color-row.c Sun Sep 2 13:11:49 2018 (r478789) @@ -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); + Added: head/graphics/gcolor3/files/patch-src_gcolor3-color-selection.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/gcolor3/files/patch-src_gcolor3-color-selection.c Sun Sep 2 13:11:49 2018 (r478789) @@ -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 + #include ++#include ++#ifdef GDK_WINDOWING_WAYLAND + #include ++#endif + #include + #include + Modified: head/graphics/gcolor3/pkg-plist ============================================================================== --- head/graphics/gcolor3/pkg-plist Sun Sep 2 11:42:21 2018 (r478788) +++ head/graphics/gcolor3/pkg-plist Sun Sep 2 13:11:49 2018 (r478789) @@ -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