diff --git a/seq24-gcc43-fixes.diff b/seq24-gcc43-fixes.diff new file mode 100644 index 0000000..477d420 --- /dev/null +++ b/seq24-gcc43-fixes.diff @@ -0,0 +1,263 @@ +--- src/font_w.xpm-dist 2007-10-22 15:52:50.000000000 +0200 ++++ src/font_w.xpm 2007-10-22 15:53:09.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * font_w_xpm[] = { ++static const char * font_w_xpm[] = { + "145 209 2 1", + " c #000000", + ". c #FFFFFF", +--- src/zoom.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/zoom.xpm 2007-10-22 15:56:20.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * zoom_xpm[] = { ++static const char * zoom_xpm[] = { + "16 14 10 1", + " c None", + ". c #000000", +--- src/play2.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/play2.xpm 2007-10-22 15:55:30.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * play2_xpm[] = { ++static const char * play2_xpm[] = { + "16 11 5 1", + " c None", + ". c #000000", +--- src/length.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/length.xpm 2007-10-22 15:54:52.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * length_xpm[] = { ++static const char * length_xpm[] = { + "36 11 2 1", + " c None", + ". c #000000", +--- src/undo.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/undo.xpm 2007-10-22 15:56:16.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * undo_xpm[] = { ++static const char * undo_xpm[] = { + "16 14 3 1", + " c None", + ". c #000000", +--- src/copy.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/copy.xpm 2007-10-22 15:54:32.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * copy_xpm[] = { ++static const char * copy_xpm[] = { + "33 11 4 1", + " c None", + ". c #000000", +--- src/event.cpp-dist 2007-10-22 15:46:20.000000000 +0200 ++++ src/event.cpp 2007-10-22 15:47:03.000000000 +0200 +@@ -18,6 +18,7 @@ + // + //----------------------------------------------------------------------------- + #include "event.h" ++#include + + event::event() + { +--- src/midi.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/midi.xpm 2007-10-22 15:55:12.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * midi_xpm[] = { ++static const char * midi_xpm[] = { + "14 14 4 1", + " c None", + ". c #000000", +--- src/stop.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/stop.xpm 2007-10-22 15:56:03.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * stop_xpm[] = { ++static const char * stop_xpm[] = { + "15 11 5 1", + " c None", + ". c #000000", +--- src/menu_empty.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/menu_empty.xpm 2007-10-22 15:55:02.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * menu_empty_xpm[] = { ++static const char * menu_empty_xpm[] = { + "10 10 2 1", + " c None", + ". c #000000", +--- src/note_length.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/note_length.xpm 2007-10-22 15:55:17.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * note_length_xpm[] = { ++static const char * note_length_xpm[] = { + "29 12 2 1", + " c None", + ". c #000000", +--- src/expand.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/expand.xpm 2007-10-22 15:54:42.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * expand_xpm[] = { ++static const char * expand_xpm[] = { + "33 11 4 1", + " c None", + ". c #000000", +--- src/rec.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/rec.xpm 2007-10-22 15:55:38.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * rec_xpm[] = { ++static const char * rec_xpm[] = { + "36 14 10 1", + " c None", + ". c #000000", +--- src/collapse.xpm-dist 2007-10-22 15:54:15.000000000 +0200 ++++ src/collapse.xpm 2007-10-22 15:54:19.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * collapse_xpm[] = { ++static const char * collapse_xpm[] = { + "27 11 3 1", + " c None", + ". c #000000", +--- src/tools.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/tools.xpm 2007-10-22 15:56:12.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * tools_xpm[] = { ++static const char * tools_xpm[] = { + "13 14 5 1", + " c None", + ". c #000000", +--- src/seq24.xpm-dist 2007-10-22 15:53:53.000000000 +0200 ++++ src/seq24.xpm 2007-10-22 15:53:58.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * seq24_xpm[] = { ++static const char * seq24_xpm[] = { + "124 32 3 1", + " c None", + ". c None", +--- src/loop.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/loop.xpm 2007-10-22 15:54:58.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * loop_xpm[] = { ++static const char * loop_xpm[] = { + "33 12 3 1", + " c None", + ". c #000000", +--- src/scale.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/scale.xpm 2007-10-22 15:55:43.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * scale_xpm[] = { ++static const char * scale_xpm[] = { + "30 14 2 1", + " c None", + ". c #000000", +--- src/key.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/key.xpm 2007-10-22 15:54:48.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * key_xpm[] = { ++static const char * key_xpm[] = { + "13 14 3 1", + " c None", + ". c #000000", +--- src/font.cpp-dist 2007-10-22 15:52:30.000000000 +0200 ++++ src/font.cpp 2007-10-22 15:52:43.000000000 +0200 +@@ -25,6 +25,7 @@ + #include "font_b.xpm" + + #include ++#include + + font::font( ) + { +--- src/down.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/down.xpm 2007-10-22 15:54:36.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * down_xpm[] = { ++static const char * down_xpm[] = { + "7 14 2 1", + " c None", + ". c #000000", +--- src/snap.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/snap.xpm 2007-10-22 15:55:59.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * snap_xpm[] = { ++static const char * snap_xpm[] = { + "29 12 5 1", + " c None", + ". c #000000", +--- src/font_b.xpm-dist 2007-10-22 15:52:48.000000000 +0200 ++++ src/font_b.xpm 2007-10-22 15:53:04.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * font_b_xpm[] = { ++static const char * font_b_xpm[] = { + "145 209 3 1", + " c None", + ". c #000000", +--- src/bus.xpm-dist 2007-10-22 15:54:08.000000000 +0200 ++++ src/bus.xpm 2007-10-22 15:54:12.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * bus_xpm[] = { ++static const char * bus_xpm[] = { + "36 14 4 1", + " c None", + ". c #000000", +--- src/perfedit.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/perfedit.xpm 2007-10-22 15:55:25.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * perfedit_xpm[] = { ++static const char * perfedit_xpm[] = { + "23 14 11 1", + " c None", + ". c #000000", +--- src/thru.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/thru.xpm 2007-10-22 15:56:08.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * thru_xpm[] = { ++static const char * thru_xpm[] = { + "62 14 10 1", + " c None", + ". c #000000", +--- src/play.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/play.xpm 2007-10-22 15:55:34.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * play_xpm[] = { ++static const char * play_xpm[] = { + "36 14 10 1", + " c None", + ". c #000000", +--- src/sequences.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/sequences.xpm 2007-10-22 15:55:55.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * sequences_xpm[] = { ++static const char * sequences_xpm[] = { + "30 14 3 1", + " c None", + ". c #000000", +--- src/menu_full.xpm-dist 2007-10-22 15:54:24.000000000 +0200 ++++ src/menu_full.xpm 2007-10-22 15:55:07.000000000 +0200 +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * menu_full_xpm[] = { ++static const char * menu_full_xpm[] = { + "10 10 2 1", + " c None", + ". c #000000", diff --git a/seq24.changes b/seq24.changes index 78a4429..a5ebfb8 100644 --- a/seq24.changes +++ b/seq24.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 22 15:56:41 CEST 2007 - tiwai@suse.de + +- fix build with gcc 4.3 + ------------------------------------------------------------------- Thu Oct 12 18:16:21 CEST 2006 - tiwai@suse.de diff --git a/seq24.spec b/seq24.spec index 0a164c0..a208ff6 100644 --- a/seq24.spec +++ b/seq24.spec @@ -1,7 +1,7 @@ # # spec file for package seq24 (Version 0.8.7) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -11,16 +11,17 @@ # norootforbuild Name: seq24 -BuildRequires: alsa-devel gcc-c++ gtkmm24-devel jack-devel update-desktop-files +BuildRequires: alsa-devel gcc-c++ gtkmm2-devel jack-devel update-desktop-files Summary: A Small, Real-Time MIDI Sequencer Version: 0.8.7 -Release: 1 -License: GPL +Release: 128 +License: GPL v2 or later Group: Productivity/Multimedia/Sound/Midi Source: %{name}-%{version}.tar.bz2 Source1: %name.desktop Source2: seq24.png -URL: http://www.filter24.org/seq24/ +Patch: seq24-gcc43-fixes.diff +Url: http://www.filter24.org/seq24/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -35,6 +36,7 @@ Authors: %prep %setup +%patch %{?suse_update_config:%{suse_update_config -f}} %build @@ -58,12 +60,11 @@ cp %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog NEWS README RTC SEQ24 %{_bindir}/* -%if %suse_version > 820 /usr/share/applications/*.desktop -%endif %{_datadir}/pixmaps/*.png - -%changelog -n seq24 +%changelog +* Mon Oct 22 2007 - tiwai@suse.de +- fix build with gcc 4.3 * Thu Oct 12 2006 - tiwai@suse.de - updated to version 0.8.7: * Undo support (Ctrl-Z)