From 4b3c9ce5efd65ef3223fbdd56602f705f15d9909 Mon Sep 17 00:00:00 2001 From: jasper Date: Mon, 27 Jun 2016 11:20:01 +0000 Subject: [PATCH] update to eog-3.20.3 --- x11/gnome/eog/Makefile | 4 ++-- x11/gnome/eog/distinfo | 4 ++-- .../eog/patches/patch-src_eog-exif-util_c | 22 +++++++++++++++++++ x11/gnome/eog/pkg/PLIST | 3 +-- 4 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 x11/gnome/eog/patches/patch-src_eog-exif-util_c diff --git a/x11/gnome/eog/Makefile b/x11/gnome/eog/Makefile index 3056a8c15b6..95ef922ebf4 100644 --- a/x11/gnome/eog/Makefile +++ b/x11/gnome/eog/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.129 2016/05/10 06:55:34 jasper Exp $ +# $OpenBSD: Makefile,v 1.130 2016/06/27 11:20:01 jasper Exp $ COMMENT= Eye of GNOME, image viewing and cataloging program GNOME_PROJECT= eog -GNOME_VERSION= 3.20.2 +GNOME_VERSION= 3.20.3 CATEGORIES= graphics diff --git a/x11/gnome/eog/distinfo b/x11/gnome/eog/distinfo index c3173fb3694..e63a0e4718c 100644 --- a/x11/gnome/eog/distinfo +++ b/x11/gnome/eog/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome/eog-3.20.2.tar.xz) = 19Air4XqAEbpCwL8lGcnVzALu9tCLu8r4q/Jn8LNh+c= -SIZE (gnome/eog-3.20.2.tar.xz) = 4613004 +SHA256 (gnome/eog-3.20.3.tar.xz) = FjCMOJ3s7TrLgB3MGAxeXhix22ulvVg1tTIMupsNLCY= +SIZE (gnome/eog-3.20.3.tar.xz) = 4607588 diff --git a/x11/gnome/eog/patches/patch-src_eog-exif-util_c b/x11/gnome/eog/patches/patch-src_eog-exif-util_c new file mode 100644 index 00000000000..de19ea13914 --- /dev/null +++ b/x11/gnome/eog/patches/patch-src_eog-exif-util_c @@ -0,0 +1,22 @@ +$OpenBSD: patch-src_eog-exif-util_c,v 1.5 2016/06/27 11:20:01 jasper Exp $ + +error: #pragma GCC diagnostic not allowed inside functions + +--- src/eog-exif-util.c.orig Mon Jun 27 13:14:25 2016 ++++ src/eog-exif-util.c Mon Jun 27 13:14:56 2016 +@@ -118,11 +118,15 @@ eog_exif_util_format_date_with_strptime (const gchar * + if (!GPOINTER_TO_BOOLEAN (strptime_updates_wday.retval)) + _calculate_wday_yday (&tm); + ++#if defined(__GNUC__) && (__GNUC__ > 4) + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wformat-nonliteral" ++#endif + /* A strftime-formatted string, to display the date the image was taken. */ + dlen = strftime (tmp_date, DATE_BUF_SIZE * sizeof(gchar), format, &tm); ++#if defined(__GNUC__) && (__GNUC__ > 4) + #pragma GCC diagnostic pop ++#endif + new_date = g_strndup (tmp_date, dlen); + } + diff --git a/x11/gnome/eog/pkg/PLIST b/x11/gnome/eog/pkg/PLIST index 5f54bb626d9..6b46045a148 100644 --- a/x11/gnome/eog/pkg/PLIST +++ b/x11/gnome/eog/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.47 2016/04/25 15:20:06 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.48 2016/06/27 11:20:01 jasper Exp $ @bin bin/eog include/eog-3.0/ include/eog-3.0/eog/ @@ -112,7 +112,6 @@ share/gtk-doc/html/eog/eog-zoom.html share/gtk-doc/html/eog/eog.devhelp2 share/gtk-doc/html/eog/home.png share/gtk-doc/html/eog/index.html -share/gtk-doc/html/eog/index.sgml share/gtk-doc/html/eog/left-insensitive.png share/gtk-doc/html/eog/left.png share/gtk-doc/html/eog/pt01.html