summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Wegener <swegener@gentoo.org>2004-09-04 01:38:15 +0000
committerSven Wegener <swegener@gentoo.org>2004-09-04 01:38:15 +0000
commit2cde269538eb437e86f15d48b3aee80eb03432b9 (patch)
tree6d7cc94648ca17223192b617b5708cc9f4e009a2 /media-sound/orpheus
parentRemove older versions of x11-plugins/wmnetselect. (diff)
downloadhistorical-2cde269538eb437e86f15d48b3aee80eb03432b9.tar.gz
historical-2cde269538eb437e86f15d48b3aee80eb03432b9.tar.bz2
historical-2cde269538eb437e86f15d48b3aee80eb03432b9.zip
Fixed the gcc-3.4 patch
Diffstat (limited to 'media-sound/orpheus')
-rw-r--r--media-sound/orpheus/Manifest8
-rw-r--r--media-sound/orpheus/files/1.5-gcc34.patch14
2 files changed, 12 insertions, 10 deletions
diff --git a/media-sound/orpheus/Manifest b/media-sound/orpheus/Manifest
index 59e50b35fd98..0dbd0ac7e918 100644
--- a/media-sound/orpheus/Manifest
+++ b/media-sound/orpheus/Manifest
@@ -11,11 +11,11 @@ MD5 fb24e10c417c43c6d78d208574f36979 files/digest-orpheus-1.2 63
MD5 23ce16fe49a7f4f015d46bd86ce7edf2 files/digest-orpheus-1.3 63
MD5 3146a03673af811a8055cc38753d273a files/digest-orpheus-1.4 63
MD5 fa0df30aebd90a38b5816d42237e0372 files/digest-orpheus-1.5 63
-MD5 adffbe5fcc0f119e137add4474562ed4 files/1.5-gcc34.patch 1442
+MD5 8a5d258c9488ec265c5b8005714062a3 files/1.5-gcc34.patch 1505
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
-iD8DBQFBORilI1lqEGTUzyQRAkqQAKDLATIDjVWBHo+5Ix/o0jG174Ay8gCgwOro
-UOx04rX7wd3nlekYqGQIJL4=
-=Z6+/
+iD8DBQFBOR8hI1lqEGTUzyQRArrpAKDHhy047PDDndLbb1R84njumA8LtgCgyDIZ
+kHDyoZqUrESO0+gkH6VrUK4=
+=3LT3
-----END PGP SIGNATURE-----
diff --git a/media-sound/orpheus/files/1.5-gcc34.patch b/media-sound/orpheus/files/1.5-gcc34.patch
index ba6c7f5af4bd..fbbe3d900664 100644
--- a/media-sound/orpheus/files/1.5-gcc34.patch
+++ b/media-sound/orpheus/files/1.5-gcc34.patch
@@ -11,14 +11,15 @@ diff -Naur old/src/mixerctl.cc new/src/mixerctl.cc
channels.insert(ct);
}
diff -Naur old/src/uitext.cc new/src/uitext.cc
---- old/src/uitext.cc 2004-09-04 01:48:30.955457434 +0200
-+++ new/src/uitext.cc 2004-09-04 02:42:30.689719181 +0200
-@@ -577,14 +577,14 @@
+--- old/src/uitext.cc 2004-09-04 03:36:50.928930920 +0200
++++ new/src/uitext.cc 2004-09-04 03:45:23.183056456 +0200
+@@ -577,14 +577,16 @@
autosavepl = !autosavepl;
break;
case 41:
- if(++((int) playmode) == PlayMode_size)
-+ if(((int) playmode + 1) == PlayMode_size)
++ playmode = (PlayMode) (playmode + 1);
++ if(playmode == PlayMode_size)
playmode = Normal;
break;
case 42:
@@ -26,11 +27,12 @@ diff -Naur old/src/uitext.cc new/src/uitext.cc
break;
case 43:
- if(++((int) sortorder) == SortOrder_size)
-+ if(((int) sortorder + 1) == SortOrder_size)
++ sortorder = (SortOrder) (sortorder + 1);
++ if(sortorder == SortOrder_size)
sortorder = byFileName;
break;
case 44:
-@@ -719,7 +719,7 @@
+@@ -719,7 +721,7 @@
while(!finished) {
m.clear();