Package: brahms
Version: 1.02-kde3-3
Severity: normal
Tags: patch
When building 'brahms' on amd64/unstable with gcc-4.0,
I get the following error:
g++ -DHAVE_CONFIG_H -I. -I. -I../.. -I/usr/include/kde -I/usr/include/qt3
-I/usr/X11R6/include -I/usr/include/kde/arts -I../../brahms -I../../brahms/arts
-I../../brahms/alsa -I/usr/include/glib-1.2 -I/usr/lib/glib/include -O2
-Wno-deprecated -fno-exceptions -fno-check-new -DQT_CLEAN_NAMESPACE
-DEXAMPLES_DIR=\"/usr/share/apps/artsbuilder/examples\"
-Wp,-MD,.deps/pasteSelection.pp -c pasteSelection.cpp -fPIC -DPIC -o
.libs/pasteSelection.o
/bin/sh ../../libtool --mode=compile --tag=CXX g++ -DHAVE_CONFIG_H -I. -I.
-I../.. -I/usr/include/kde -I/usr/include/qt3 -I/usr/X11R6/include
-I/usr/include/kde/arts -I../../brahms -I../../brahms/arts -I../../brahms/alsa
-I/usr/include/glib-1.2 -I/usr/lib/glib/include -O2 -Wno-deprecated
-fno-exceptions -fno-check-new -DQT_CLEAN_NAMESPACE
-DEXAMPLES_DIR=/usr/share/apps/artsbuilder/examples -c player.cpp
g++ -DHAVE_CONFIG_H -I. -I. -I../.. -I/usr/include/kde -I/usr/include/qt3
-I/usr/X11R6/include -I/usr/include/kde/arts -I../../brahms -I../../brahms/arts
-I../../brahms/alsa -I/usr/include/glib-1.2 -I/usr/lib/glib/include -O2
-Wno-deprecated -fno-exceptions -fno-check-new -DQT_CLEAN_NAMESPACE
-DEXAMPLES_DIR=\"/usr/share/apps/artsbuilder/examples\" -Wp,-MD,.deps/player.pp
-c player.cpp -fPIC -DPIC -o .libs/player.o
player.h:69: error: 'Track' has not been declared
player.cpp: In member function 'void Player::programChange(int)':
player.cpp:791: error: invalid conversion from 'Track*' to 'int'
player.cpp:791: error: initializing argument 1 of 'void
Player::programChange(int)'
player.cpp: At global scope:
player.cpp:794: error: prototype for 'void Player::programChange(Track*)' does
not match any in class 'Player'
player.h:69: error: candidates are: void Player::programChange(int*)
player.cpp:789: error: void Player::programChange(int)
make[4]: *** [player.lo] Error 1
make[4]: Leaving directory `/brahms-1.02-kde3/brahms/core'
With the attached patch 'brahms' can be compiled
on amd64 using gcc-4.0.
Regards
Andreas Jochens
diff -urN ../tmp-orig/brahms-1.02-kde3/brahms/addons/Riemann/harmony.cpp
./brahms/addons/Riemann/harmony.cpp
--- ../tmp-orig/brahms-1.02-kde3/brahms/addons/Riemann/harmony.cpp
2002-01-07 00:35:46.000000000 +0100
+++ ./brahms/addons/Riemann/harmony.cpp 2005-06-20 17:02:38.000000000 +0200
@@ -45,7 +45,7 @@
void Harmony::analyse() {
// cout << endl << "ANALYSE: " << endl << sKey[_base_key] << " (" <<
sGenus[_base_gen] << ") " << sKey[_key] << " (" << sGenus[_genus] << ") : " <<
_chord;
- for (Key s=UNDEFKEY; s<KEY; ((int) s)++) {
+ for (Key s=UNDEFKEY; s<KEY; (Key)(((int) s) + 1)) {
_maj[s] = 0;
_min[s] = 0;
_dim[s] = 0;
@@ -72,7 +72,7 @@
Key mykey = UNDEFKEY;
Genus mygen = UNDEFGEN;
- for (Key k=GES; k<KEY; ((int)k)++) {
+ for (Key k=GES; k<KEY; (Key)(((int)k) + 1)) {
if (max < _maj[k]) { max = _maj[k]; mykey = k; mygen = MAJOR; }
if (max < _min[k]) { max = _min[k]; mykey = k; mygen = MINOR; }
if (max < _dim[k]) { max = _dim[k]; mykey = k; mygen = DIMINISHED; }
diff -urN ../tmp-orig/brahms-1.02-kde3/brahms/addons/Riemann/riemannEvent.cpp
./brahms/addons/Riemann/riemannEvent.cpp
--- ../tmp-orig/brahms-1.02-kde3/brahms/addons/Riemann/riemannEvent.cpp
2002-01-07 00:35:46.000000000 +0100
+++ ./brahms/addons/Riemann/riemannEvent.cpp 2005-06-20 17:02:38.000000000
+0200
@@ -72,14 +72,14 @@
Key RiemannEvent::key(const char * k) {
Key key = UNDEFKEY;
- for (Key i=UNDEFKEY; i<KEY; ((int) i)++)
+ for (Key i=UNDEFKEY; i<KEY; i = (Key)(((int)i) + 1))
if (strcmp(k, sKey[i])==0) key = i;
return key;
}
Genus RiemannEvent::genus(const char * g) {
Genus genus = UNDEFGEN;
- for (Genus i=UNDEFGEN; i<GENUS; ((int) i)++)
+ for (Genus i=UNDEFGEN; i<GENUS; (Key)(((int)i) + 1))
if (strcmp(g, sGenus[i])==0) genus = i;
return genus;
}
diff -urN ../tmp-orig/brahms-1.02-kde3/brahms/core/player.h
./brahms/core/player.h
--- ../tmp-orig/brahms-1.02-kde3/brahms/core/player.h 2002-01-07
00:35:47.000000000 +0100
+++ ./brahms/core/player.h 2005-06-20 17:17:02.000000000 +0200
@@ -7,6 +7,7 @@
class Part;
class PrProgress;
class SongIterator;
+class Track;
class AlsaManager;
diff -urN
../tmp-orig/brahms-1.02-kde3/brahms/presentations/kde/qtScoreSymbols.cpp
./brahms/presentations/kde/qtScoreSymbols.cpp
--- ../tmp-orig/brahms-1.02-kde3/brahms/presentations/kde/qtScoreSymbols.cpp
2002-01-07 00:35:46.000000000 +0100
+++ ./brahms/presentations/kde/qtScoreSymbols.cpp 2005-06-20
17:02:38.000000000 +0200
@@ -17,7 +17,7 @@
rows = int(total/cols);
if (cols*rows<total) rows++;
- button = new (QPushButton *) [total];
+ button = new QPushButton * [total];
setCaption(name);
// KIconLoader *loader = KGlobal::iconLoader();
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
