Package: release.debian.org Severity: normal Tags: patch User: release.debian....@packages.debian.org Usertags: unblock
Hi! nted 1.10.18-11 contains a small patch which fixes nted FTBFS on architectures where char is unsigned by default. Thanks, Adrian unblock nted/1.10.18-11 -- System Information: Debian Release: 9.0 APT prefers buildd-unstable APT policy: (500, 'buildd-unstable'), (500, 'unstable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.9.0-1-amd64 (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
diff -Nru nted-1.10.18/debian/changelog nted-1.10.18/debian/changelog --- nted-1.10.18/debian/changelog 2016-01-24 19:27:54.000000000 +0100 +++ nted-1.10.18/debian/changelog 2017-03-09 21:36:58.000000000 +0100 @@ -1,3 +1,11 @@ +nted (1.10.18-11) unstable; urgency=medium + + [ John Paul Adrian Glaubitz ] + * New patch fix-signage-of-char-arrays.patch: fix FTBFS on + architectures where char is unsigned. (closes: #857127) + + -- Gilles Filippini <p...@debian.org> Thu, 09 Mar 2017 21:36:58 +0100 + nted (1.10.18-10) unstable; urgency=medium * New patch gcc-6.patch: fix FTBFS with GCC 6 (closes: #811791). diff -Nru nted-1.10.18/debian/patches/fix-signage-of-char-arrays.patch nted-1.10.18/debian/patches/fix-signage-of-char-arrays.patch --- nted-1.10.18/debian/patches/fix-signage-of-char-arrays.patch 1970-01-01 01:00:00.000000000 +0100 +++ nted-1.10.18/debian/patches/fix-signage-of-char-arrays.patch 2017-03-09 21:30:39.000000000 +0100 @@ -0,0 +1,49 @@ +Description: Fix signage of addoff and m_flatPos arrays +Author: John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de> +Bug-Debian: https://bugs.debian.org/857127 +Last-Update: 2017-03-08 + +--- nted-1.10.18.orig/chords/chordpainter.cpp ++++ nted-1.10.18/chords/chordpainter.cpp +@@ -35,7 +35,7 @@ const char *NedChordPainter::modies2[] = + "11", "7sus4", "13", "6add9", "-5", "7-5", "7maj5", "maj9", NULL}; + const unsigned int NedChordPainter::minor[] = {0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 0}; +-const char NedChordPainter::addoff[] = {0, 1, -1, 0, 1, -1, 0, 0, 1, -1, 0, 1, -1, 0, 1, -1, 0}; ++const signed char NedChordPainter::addoff[] = {0, 1, -1, 0, 1, -1, 0, 0, 1, -1, 0, 1, -1, 0, 1, -1, 0}; + const char *NedChordPainter::modies3[] = {"", "", "dim", "aug", "sus", "6", "7", "maj7", "9", "add9", "6", "7", "maj7", "9", + "11", "7sus4", "13", "6add9", "-5", "7-5", "7maj5", "maj9", NULL}; + const char *NedChordPainter::modies4[] = {"", "m", "dim", "aug", "sus4", "6", "7", "maj7", "9", "", "m6", "m7", "", "m9", +--- nted-1.10.18.orig/chords/chordpainter.h ++++ nted-1.10.18/chords/chordpainter.h +@@ -44,7 +44,7 @@ class NedChordPainter { + static const char *modies2[]; + private: + static const unsigned int minor[]; +- static const char addoff[]; ++ static const signed char addoff[]; + static const char *modies3[]; + static const char *modies4[]; + }; +--- nted-1.10.18.orig/staff.cpp ++++ nted-1.10.18/staff.cpp +@@ -44,7 +44,7 @@ + + const char NedStaff::m_sharpPos[7][7] = { + {8, 5, 9, 6, 3, 7, 4}, {6, 3, 7, 4, 1, 5, 2}, {7, 4, 8, 5, 2, 6, 3}, {3, 0, 4, 1, 5, 2, 6}, {9, 6, 3, 7, 4, 8, 5}, {8, 5, 9, 6, 3, 7, 4}, {6, 3, 7, 4, 1, 5, 2} }; +-const char NedStaff::m_flatPos[7][7] = { ++const signed char NedStaff::m_flatPos[7][7] = { + {4, 7, 3, 6, 2, 5, 1}, {2, 5, 1, 4, 0, 3, -1}, {3, 6, 2, 5, 1, 4, 0}, {6, 2, 5, 1, 4, 0, 3}, {5, 8, 4, 7, 3, 6, 2}, {4, 7, 3, 6, 2, 5, 1}, {2, 5, 1, 4, 0, 3, -1} }; + + NedStaff::NedStaff(NedSystem *system, double ypos, double width, int nr, bool start) : +--- nted-1.10.18.orig/staff.h ++++ nted-1.10.18/staff.h +@@ -153,7 +153,7 @@ class NedStaff { + void setLyrics(NedCommandList *command_list, NedLyricsEditor *leditor); + GList *getStaffElements(unsigned long long midi_time); + static const char m_sharpPos[7][7]; +- static const char m_flatPos[7][7]; ++ static const signed char m_flatPos[7][7]; + private: + GList *m_staffelems; + NedVoice *m_voices[VOICE_COUNT]; diff -Nru nted-1.10.18/debian/patches/series nted-1.10.18/debian/patches/series --- nted-1.10.18/debian/patches/series 2016-01-24 18:27:47.000000000 +0100 +++ nted-1.10.18/debian/patches/series 2017-03-09 21:30:39.000000000 +0100 @@ -9,3 +9,4 @@ Werror.patch fix-midi-import.patch gcc-6.patch +fix-signage-of-char-arrays.patch
