Control: tags 1075026 + patch Dear maintainer,
I've uploaded an NMU for gnome-paint (versioned as 0.4.0-10.1). The diff is attached to this message. cu Adrian
diffstat for gnome-paint-0.4.0 gnome-paint-0.4.0 changelog | 7 + patches/gcc-14.patch | 227 +++++++++++++++++++++++++++++++++++++++++++++++++++ patches/series | 1 3 files changed, 235 insertions(+) diff -Nru gnome-paint-0.4.0/debian/changelog gnome-paint-0.4.0/debian/changelog --- gnome-paint-0.4.0/debian/changelog 2024-04-17 14:30:15.000000000 +0300 +++ gnome-paint-0.4.0/debian/changelog 2025-04-10 23:32:13.000000000 +0300 @@ -1,3 +1,10 @@ +gnome-paint (0.4.0-10.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with gcc 14. (Closes: #1075026) + + -- Adrian Bunk <[email protected]> Thu, 10 Apr 2025 23:32:13 +0300 + gnome-paint (0.4.0-10) unstable; urgency=medium [ Steve Langasek ] diff -Nru gnome-paint-0.4.0/debian/patches/gcc-14.patch gnome-paint-0.4.0/debian/patches/gcc-14.patch --- gnome-paint-0.4.0/debian/patches/gcc-14.patch 1970-01-01 02:00:00.000000000 +0200 +++ gnome-paint-0.4.0/debian/patches/gcc-14.patch 2025-04-10 23:32:13.000000000 +0300 @@ -0,0 +1,227 @@ +Description: Fix FTBFS with gcc 14 +Author: Adrian Bunk <[email protected]> +Bug-Debian: https://bugs.debian.org/1075026 + +--- gnome-paint-0.4.0.orig/src/image_menu.c ++++ gnome-paint-0.4.0/src/image_menu.c +@@ -63,8 +63,8 @@ static gdouble convert_units (int from, + + static GPFlipRotateDlg m_fr = {NULL, GP_FILP_HORZ, GDK_PIXBUF_ROTATE_COUNTERCLOCKWISE}; + +-static m_cur_unit = px; +-static m_prev_unit = px; ++static int m_cur_unit = px; ++static int m_prev_unit = px; + + /************** Flip and rotate stuff **************************************/ + void +--- gnome-paint-0.4.0.orig/src/toolbar.c ++++ gnome-paint-0.4.0/src/toolbar.c +@@ -79,7 +79,7 @@ static GtkToggleToolButton *previous_bu + static GtkToggleToolButton *current_button = NULL; + + /* private functions */ +-static GtkWidget * get_gtk_image( GtkWidget *widget, gchar** xpm ); ++static GtkWidget * get_gtk_image( GtkWidget *widget, const gchar** xpm ); + static void show_frame_rect ( gboolean show ); + static void tool_toggled ( GtkToggleToolButton *button, gp_tool_enum tool ); + +@@ -333,13 +333,13 @@ void + on_sel1_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)sel1_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)sel1_xpm ) ); + } + void + on_sel2_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)sel2_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)sel2_xpm ) ); + } + + /*Rect Bar realize functions*/ +@@ -347,19 +347,19 @@ void + on_rect0_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)rect0_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)rect0_xpm ) ); + } + void + on_rect1_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)rect1_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)rect1_xpm ) ); + } + void + on_rect2_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)rect2_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)rect2_xpm ) ); + } + + /*Line Bar realize functions*/ +@@ -367,31 +367,31 @@ void + on_line0_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)line_0_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)line_0_xpm ) ); + } + void + on_line1_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)line_1_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)line_1_xpm ) ); + } + void + on_line2_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)line_2_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)line_2_xpm ) ); + } + void + on_line3_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)line_3_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)line_3_xpm ) ); + } + void + on_line4_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)line_4_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)line_4_xpm ) ); + } + + /*Erase Bar realize functions*/ +@@ -399,105 +399,105 @@ void + on_erase0_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)erase_0_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)erase_0_xpm ) ); + } + void + on_erase1_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)erase_1_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)erase_1_xpm ) ); + } + void + on_erase2_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)erase_2_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)erase_2_xpm ) ); + } + void + on_erase3_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)erase_3_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)erase_3_xpm ) ); + } + /*Brush Bar realize functions*/ + void + on_brush0_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)brush_0_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)brush_0_xpm ) ); + } + void + on_brush1_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)brush_1_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)brush_1_xpm ) ); + } + void + on_brush2_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)brush_2_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)brush_2_xpm ) ); + } + void + on_brush3_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)brush_3_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)brush_3_xpm ) ); + } + void + on_brush4_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)brush_4_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)brush_4_xpm ) ); + } + void + on_brush5_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)brush_5_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)brush_5_xpm ) ); + } + void + on_brush6_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)brush_6_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)brush_6_xpm ) ); + } + void + on_brush7_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)brush_7_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)brush_7_xpm ) ); + } + void + on_brush8_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)brush_8_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)brush_8_xpm ) ); + } + void + on_brush9_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)brush_9_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)brush_9_xpm ) ); + } + void + on_brush10_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)brush_10_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)brush_10_xpm ) ); + } + void + on_brush11_realize (GtkObject *object, gpointer user_data) + { + gtk_tool_button_set_icon_widget ( GTK_TOOL_BUTTON(object), +- get_gtk_image( GTK_WIDGET(object), (gchar**)brush_11_xpm ) ); ++ get_gtk_image( GTK_WIDGET(object), (const gchar**)brush_11_xpm ) ); + } + + + /*private*/ + + static GtkWidget * +-get_gtk_image ( GtkWidget *widget, gchar** xpm ) ++get_gtk_image ( GtkWidget *widget, const gchar** xpm ) + { + GdkPixbuf *pixbuf = NULL; + GtkWidget *gtkimage = NULL; diff -Nru gnome-paint-0.4.0/debian/patches/series gnome-paint-0.4.0/debian/patches/series --- gnome-paint-0.4.0/debian/patches/series 2024-04-17 14:29:36.000000000 +0300 +++ gnome-paint-0.4.0/debian/patches/series 2025-04-10 23:32:13.000000000 +0300 @@ -8,3 +8,4 @@ 0008-Included-patch-by-Logan-Rosen-and-one-other-gdk-func.patch 0009-Merged-new-translations.patch no-implicit-declarations.patch +gcc-14.patch
