update to ghex-3.18.3

This commit is contained in:
jasper 2016-10-12 18:21:09 +00:00
parent 67da032d1f
commit c57fb0b0d6
5 changed files with 4 additions and 76 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.65 2016/06/14 08:01:46 jasper Exp $
# $OpenBSD: Makefile,v 1.66 2016/10/12 18:21:09 jasper Exp $
COMMENT= binary editor
GNOME_PROJECT= ghex
GNOME_VERSION= 3.18.2
GNOME_VERSION= 3.18.3
SHARED_LIBS += gtkhex-3 0.0 # 0.0

View File

@ -1,2 +1,2 @@
SHA256 (gnome/ghex-3.18.2.tar.xz) = 69NBxJ4sxOcQIwcDzSDp/rsptk40obU5bWqoGJNuVb8=
SIZE (gnome/ghex-3.18.2.tar.xz) = 1570888
SHA256 (gnome/ghex-3.18.3.tar.xz) = xnRQ+G+cCcIHaPGvNsEaZvr0YOoA+7piipCJpoBICNM=
SIZE (gnome/ghex-3.18.3.tar.xz) = 1630720

View File

@ -1,21 +0,0 @@
$OpenBSD: patch-src_chartable_c,v 1.2 2016/06/14 08:36:37 jasper Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=767638
--- src/chartable.c.orig Tue Jun 14 09:33:22 2016
+++ src/chartable.c Tue Jun 14 09:54:18 2016
@@ -186,10 +186,14 @@ GtkWidget *create_char_table()
else
row[0] = "";
for(col = 1; col < 4; col++) {
+#if defined(__GNUC__) && (__GNUC__ > 4)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+#endif
label = g_strdup_printf(fmt[col], i);
+#if defined(__GNUC__) && (__GNUC__ > 4)
#pragma GCC diagnostic pop
+#endif
row[col] = label;
}
for(col = 0; col < 8; col++) {

View File

@ -1,27 +0,0 @@
$OpenBSD: patch-src_ghex-window_c,v 1.2 2016/06/14 08:36:37 jasper Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=767638
--- src/ghex-window.c.orig Tue Jun 14 09:53:18 2016
+++ src/ghex-window.c Tue Jun 14 09:55:25 2016
@@ -781,8 +781,10 @@ ghex_window_update_status_message(GHexWindow *win)
return;
}
+#if defined(__GNUC__) && (__GNUC__ > 4)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+#endif
current_pos = gtk_hex_get_cursor(win->gh);
if(g_snprintf(fmt, FMT_LEN, _("Offset: %s"), offset_fmt) < FMT_LEN) {
g_snprintf(status, STATUS_LEN, fmt, current_pos);
@@ -797,7 +799,9 @@ ghex_window_update_status_message(GHexWindow *win)
}
}
}
+#if defined(__GNUC__) && (__GNUC__ > 4)
#pragma GCC diagnostic pop
+#endif
ghex_window_show_status(win, status);
}

View File

@ -1,24 +0,0 @@
$OpenBSD: patch-src_ui_c,v 1.2 2016/06/14 08:36:37 jasper Exp $
https://bugzilla.gnome.org/show_bug.cgi?id=767638
--- src/ui.c.orig Tue Jun 14 09:53:22 2016
+++ src/ui.c Tue Jun 14 09:56:18 2016
@@ -112,13 +112,17 @@ create_dialog_title(GtkWidget *window, gchar *title)
win = ghex_window_get_active();
+#if defined(__GNUC__) && (__GNUC__ > 4)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+#endif
if(win != NULL && win->gh != NULL)
full_title = g_strdup_printf(title, win->gh->document->path_end);
else
full_title = g_strdup_printf(title, "");
+#if defined(__GNUC__) && (__GNUC__ > 4)
#pragma GCC diagnostic pop
+#endif
if(full_title) {
gtk_window_set_title(GTK_WINDOW(window), full_title);