patch 9.1.0437: Motif requires non-const char pointer for XPM data

Problem:  Motif requires non-const char pointer for XPM data shared with
          GTK (Tony Mechelynck, after v9.1.0432)
Solution: Cast non-const to const char pointer for GTK (Drew Vogel).

closes: #14834

Signed-off-by: Drew Vogel <dvogel@github>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/runtime/vim16x16.xpm b/runtime/vim16x16.xpm
index 9b55218cc0ecd5c7419d23b7d841a0affe59ba4d..cb75b71781d00037aa38a21816d06705d6e9870f 100644 (file)
--- a/runtime/vim16x16.xpm
+++ b/runtime/vim16x16.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * vim16x16[] = {
+static char * vim16x16[] = {
 "16 16 8 1",
 "      c None",
 ".     c #000000",

diff --git a/runtime/vim32x32.xpm b/runtime/vim32x32.xpm
index 017b93b6f8fd68756040f3e65374b68ea2c11c2e..43a3a40c0b207a812d4448091c0e6fefc4f2f52f 100644 (file)
--- a/runtime/vim32x32.xpm
+++ b/runtime/vim32x32.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * vim32x32[] = {
+static char * vim32x32[] = {
 "32 32 8 1",
 "      c None",
 ".     c #000000",

diff --git a/runtime/vim48x48.xpm b/runtime/vim48x48.xpm
index 8bd08bc5a3936c8bb2048e18e44507438567c400..b2fdd95924e0232c21026d69164cd85ec47f4189 100644 (file)
--- a/runtime/vim48x48.xpm
+++ b/runtime/vim48x48.xpm
@@ -1,5 +1,5 @@
 /* XPM */
-static const char * vim48x48[] = {
+static char * vim48x48[] = {
 "48 48 8 1",
 "      c None",
 ".     c #000000",

diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 066aa174560a4c5470095786ccbc8b1342c7d59b..67ee531b6f573d9ac9bcab79387a5ee9adde36eb 100644 (file)
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -2727,9 +2727,9 @@ mainwin_realize(GtkWidget *widget UNUSED, gpointer data UNUSED)
         */
        GList *icons = NULL;
 
-       icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data(vim16x16));
-       icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data(vim32x32));
-       icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data(vim48x48));
+       icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data((const char **)vim16x16));
+       icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data((const char **)vim32x32));
+       icons = g_list_prepend(icons, gdk_pixbuf_new_from_xpm_data((const char **)vim48x48));
 
        gtk_window_set_icon_list(GTK_WINDOW(gui.mainwin), icons);
 

diff --git a/src/version.c b/src/version.c
index 98ec4754e5184867f24181300248f701963a1e81..7188cbd88815c35c7e432a3574076d4dfa28e1f5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    437,
 /**/
     436,
 /**/