diff -Nru hexter-1.1.0/ChangeLog hexter-1.1.1/ChangeLog --- hexter-1.1.0/ChangeLog 2018-03-18 19:26:18.000000000 +0000 +++ hexter-1.1.1/ChangeLog 2021-01-02 00:37:02.000000000 +0000 @@ -1,3 +1,9 @@ +20210101 smbolton -- version 1.1.1 + +* Fixed a segfault in hexter_gtk when compiled with gcc 9 or later. Thanks to + Martin Tarenskeen, Ben Hart, Alexandre Almeida, and Jean-michel Thiemonge + for the fix. + 20180318 smbolton -- version 1.1.0 * Switched to run_synth() instead of run_multiple_synths(), and removed the diff -Nru hexter-1.1.0/configure.ac hexter-1.1.1/configure.ac --- hexter-1.1.0/configure.ac 2018-03-18 19:26:18.000000000 +0000 +++ hexter-1.1.1/configure.ac 2021-01-02 00:37:02.000000000 +0000 @@ -1,10 +1,11 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(hexter, 1.1.0, sean-at-smbolton-dot-com) +AC_INIT(hexter, 1.1.1, sean-at-smbolton-dot-com) AC_CONFIG_SRCDIR(src/hexter.c) -AM_INIT_AUTOMAKE -AM_CONFIG_HEADER(config.h) +AM_INIT_AUTOMAKE([subdir-objects]) +AM_CONFIG_HEADER([config.h]) +AC_CONFIG_MACRO_DIRS([m4]) AC_PROG_CC diff -Nru hexter-1.1.0/debian/changelog hexter-1.1.1/debian/changelog --- hexter-1.1.0/debian/changelog 2020-07-03 20:58:28.000000000 +0000 +++ hexter-1.1.1/debian/changelog 2021-01-12 20:39:36.000000000 +0000 @@ -1,3 +1,12 @@ +hexter (1.1.1-1) unstable; urgency=medium + + * New upstream version 1.1.1 + * Remove segfault patch, applied by upstream + * Bump S-V to 4.5.1, no changes needed + * Update d/copyright year + + -- Dennis Braun Tue, 12 Jan 2021 21:39:36 +0100 + hexter (1.1.0-7) unstable; urgency=medium * Fix segfault on startup (Closes: #960407) diff -Nru hexter-1.1.0/debian/control hexter-1.1.1/debian/control --- hexter-1.1.0/debian/control 2020-05-07 19:56:17.000000000 +0000 +++ hexter-1.1.1/debian/control 2021-01-12 20:38:51.000000000 +0000 @@ -15,7 +15,7 @@ libasound2-dev, libgtk2.0-dev, liblo-dev -Standards-Version: 4.5.0 +Standards-Version: 4.5.1 Vcs-Git: https://salsa.debian.org/multimedia-team/hexter.git Vcs-Browser: https://salsa.debian.org/multimedia-team/hexter Homepage: http://smbolton.com/hexter.html diff -Nru hexter-1.1.0/debian/copyright hexter-1.1.1/debian/copyright --- hexter-1.1.0/debian/copyright 2020-05-21 13:14:47.000000000 +0000 +++ hexter-1.1.1/debian/copyright 2021-01-12 20:38:51.000000000 +0000 @@ -5,7 +5,7 @@ Files: * Copyright: - 1991-2018 Sean Bolton and others + 1991-2021 Sean Bolton and others 2004 Pete Bessman 2003 Peter Hanappe and others 2002 by Juan Linietsky diff -Nru hexter-1.1.0/debian/patches/02-fix_segfault.patch hexter-1.1.1/debian/patches/02-fix_segfault.patch --- hexter-1.1.0/debian/patches/02-fix_segfault.patch 2020-07-03 20:58:28.000000000 +0000 +++ hexter-1.1.1/debian/patches/02-fix_segfault.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -Description: Fix Segfault on startup -Author: Benjamin Hart -Forwarded: https://github.com/smbolton/hexter/pull/11 - ---- hexter.orig/src/gui_widgy_editor.c -+++ hexter/src/gui_widgy_editor.c -@@ -862,24 +862,33 @@ - } - - static void --place_combo(GtkObject *adj, GtkWidget *table, int x, int y, int type) -+combo_box_append_text(GtkWidget *w, const char** labels) - { -- const char **labels; - int i; -- /* -FIX- this is kinda ugly */ -+ for (i = 0; labels[i]; i++) -+ { -+ gtk_combo_box_append_text(GTK_COMBO_BOX(w), labels[i]); -+ } -+} -+ -+static void -+place_combo(GtkObject *adj, GtkWidget *table, int x, int y, int type) -+{ -+ /* -FIX- this is still kinda ugly */ -+ const char* labelsLfoWave[] = { "Tri", "Saw+", "Saw-", "Square", "Sine", "S/H", 0 }; -+ const char* labelsCurve[] = { "-Lin", "-Exp", "+Exp", "+Lin", 0 }; -+ -+ GtkWidget *w = gtk_combo_box_new_text(); - switch (type) { - default: - case PEPT_LFOWave: -- labels = (const char *[]){ "Tri", "Saw+", "Saw-", "Square", "Sine", "S/H", NULL }; -+ combo_box_append_text(w, labelsLfoWave); - break; - case PEPT_Curve: -- labels = (const char *[]){ "-Lin", "-Exp", "+Exp", "+Lin", NULL }; -+ combo_box_append_text(w, labelsCurve); - break; - } - -- GtkWidget *w = gtk_combo_box_new_text(); -- for (i = 0; labels[i]; i++) -- gtk_combo_box_append_text(GTK_COMBO_BOX(w), labels[i]); - gtk_combo_box_set_active((GtkComboBox *)w, 0); - gtk_table_attach (GTK_TABLE (table), w, x, x + 1, y, y + 1, - (GtkAttachOptions) (0), diff -Nru hexter-1.1.0/debian/patches/series hexter-1.1.1/debian/patches/series --- hexter-1.1.0/debian/patches/series 2020-07-03 20:58:28.000000000 +0000 +++ hexter-1.1.1/debian/patches/series 2021-01-12 20:38:51.000000000 +0000 @@ -1,2 +1 @@ 01-pathmax.patch -02-fix_segfault.patch diff -Nru hexter-1.1.0/Makefile.am hexter-1.1.1/Makefile.am --- hexter-1.1.0/Makefile.am 2018-03-18 19:26:18.000000000 +0000 +++ hexter-1.1.1/Makefile.am 2021-01-02 00:37:02.000000000 +0000 @@ -26,4 +26,5 @@ extra/tx7_roms.dx7 AUTOMAKE_OPTIONS = foreign +ACLOCAL_AMFLAGS = -I m4 diff -Nru hexter-1.1.0/src/gui_widgy_editor.c hexter-1.1.1/src/gui_widgy_editor.c --- hexter-1.1.0/src/gui_widgy_editor.c 2018-03-18 19:26:18.000000000 +0000 +++ hexter-1.1.1/src/gui_widgy_editor.c 2021-01-02 00:37:02.000000000 +0000 @@ -1,6 +1,6 @@ /* hexter DSSI software synthesizer GUI * - * Copyright (C) 2011, 2012, 2018 Sean Bolton. + * Copyright (C) 2011, 2012, 2018, 2021 Sean Bolton. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -862,24 +862,33 @@ } static void -place_combo(GtkObject *adj, GtkWidget *table, int x, int y, int type) +combo_box_append_text(GtkWidget *w, const char** labels) { - const char **labels; int i; - /* -FIX- this is kinda ugly */ + for (i = 0; labels[i]; i++) + { + gtk_combo_box_append_text(GTK_COMBO_BOX(w), labels[i]); + } +} + +static void +place_combo(GtkObject *adj, GtkWidget *table, int x, int y, int type) +{ + /* -FIX- this is still kinda ugly */ + const char* labels_lfo_wave[] = { "Tri", "Saw+", "Saw-", "Square", "Sine", "S/H", 0 }; + const char* labels_curve[] = { "-Lin", "-Exp", "+Exp", "+Lin", 0 }; + + GtkWidget *w = gtk_combo_box_new_text(); switch (type) { default: case PEPT_LFOWave: - labels = (const char *[]){ "Tri", "Saw+", "Saw-", "Square", "Sine", "S/H", NULL }; + combo_box_append_text(w, labels_lfo_wave); break; case PEPT_Curve: - labels = (const char *[]){ "-Lin", "-Exp", "+Exp", "+Lin", NULL }; + combo_box_append_text(w, labels_curve); break; } - GtkWidget *w = gtk_combo_box_new_text(); - for (i = 0; labels[i]; i++) - gtk_combo_box_append_text(GTK_COMBO_BOX(w), labels[i]); gtk_combo_box_set_active((GtkComboBox *)w, 0); gtk_table_attach (GTK_TABLE (table), w, x, x + 1, y, y + 1, (GtkAttachOptions) (0),