diff options
author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
---|---|---|
committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /sidplayer | |
parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'sidplayer')
-rw-r--r-- | sidplayer/sidplayer-1.5.0/gcc3.patch | 69 | ||||
-rw-r--r-- | sidplayer/sidplayer-1.5.0/gcc34.patch | 40 | ||||
-rw-r--r-- | sidplayer/sidplayer-1.5.0/use-external-libsidplay.patch | 20 |
3 files changed, 129 insertions, 0 deletions
diff --git a/sidplayer/sidplayer-1.5.0/gcc3.patch b/sidplayer/sidplayer-1.5.0/gcc3.patch index e69de29bb2..b94e26a18a 100644 --- a/sidplayer/sidplayer-1.5.0/gcc3.patch +++ b/sidplayer/sidplayer-1.5.0/gcc3.patch @@ -0,0 +1,69 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- sidplayer/sidplayer.cpp~gcc3 2003-09-26 20:28:51.000000000 +0200 ++++ sidplayer/sidplayer.cpp 2004-02-12 19:24:33.000000000 +0100 +@@ -83,8 +83,8 @@ + //============================================================================================ + + Sidplayer::Sidplayer( int argc, char **argv, QPEApplication *app, +- QWidget *parent, const char *name, WFlags f ) +- : TabbedDialog( parent, name, f ), ++ QWidget *parent, const char *name, WFlags flags ) ++ : TabbedDialog( parent, name, flags ), + application( app ), + selectedSong( 1 ), + totalSongs( 1 ), +@@ -710,7 +710,7 @@ + + //-------------------------------------------------------------------------------------------- + +-void Sidplayer::updateListeningMileageLabel( bool forceUpdate = false ) ++void Sidplayer::updateListeningMileageLabel( bool forceUpdate ) + { + static int oldSecondsTotal = 0; + int secondsTotal = myEmuEngine.getSecondsTotal(); +--- sidplayer/sidplayer_file.cpp~gcc3 2003-09-25 21:56:57.000000000 +0200 ++++ sidplayer/sidplayer_file.cpp 2004-02-12 19:24:33.000000000 +0100 +@@ -249,7 +249,7 @@ + } + } + +-void Sidplayer::populateFileView( const QString &directory, const QString &selectThis = "" ) ++void Sidplayer::populateFileView( const QString &directory, const QString &selectThis ) + { + QDir dir( directory ); + +--- sidplayer/sidplayer_list.cpp~gcc3 2003-07-09 21:49:28.000000000 +0200 ++++ sidplayer/sidplayer_list.cpp 2004-02-12 19:24:33.000000000 +0100 +@@ -172,7 +172,7 @@ + setAllPlaylistViewItemsOddFlag(); + } + +-void Sidplayer::insertDir_( QString dirpath = "" ) ++void Sidplayer::insertDir_( QString dirpath ) + { + if ( dirpath == "" ) + dirpath = currentDir; +@@ -225,7 +225,7 @@ + setAllPlaylistViewItemsOddFlag(); + } + +-void Sidplayer::insertDirRecursive_( QString dirpath = "" ) ++void Sidplayer::insertDirRecursive_( QString dirpath ) + { + if ( dirpath == "" ) + dirpath = currentDir; +--- sidplayer/volumebarwidget.cpp~gcc3 2003-07-09 22:35:48.000000000 +0200 ++++ sidplayer/volumebarwidget.cpp 2004-02-12 19:28:54.000000000 +0100 +@@ -18,7 +18,7 @@ + + #include <iostream> + +-VolumeBarWidget::VolumeBarWidget( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ) ++VolumeBarWidget::VolumeBarWidget( QWidget *parent, const char *name, WFlags f ) + : QWidget( parent, name, f ) + { + getVolume(); diff --git a/sidplayer/sidplayer-1.5.0/gcc34.patch b/sidplayer/sidplayer-1.5.0/gcc34.patch index e69de29bb2..00598a103c 100644 --- a/sidplayer/sidplayer-1.5.0/gcc34.patch +++ b/sidplayer/sidplayer-1.5.0/gcc34.patch @@ -0,0 +1,40 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- sidplayer/sidplayer.h~gcc34.patch 2004-05-16 20:54:24.000000000 +0200 ++++ sidplayer/sidplayer.h 2004-05-16 20:54:24.000000000 +0200 +@@ -36,7 +36,7 @@ + + #define SHUTDOWN_TIMER_TIMEOUT 10 // 2 would probably be also long enough + +- ++static bool evenFlag = 0; + extern bool sidEmuFastForwardReplay( int ); + + +--- sidplayer/sidplayer_list.cpp~gcc34.patch 2004-05-16 20:54:24.000000000 +0200 ++++ sidplayer/sidplayer_list.cpp 2004-05-16 20:55:40.000000000 +0200 +@@ -23,9 +23,6 @@ + #include <qpe/config.h> + + +-static bool evenFlag; // This global flag is used to toggle between even and odd list entries +- // when generating list items (i.e. when populating a list). +- + PlaylistItem::PlaylistItem( QListView *parent, QListViewItem *after, const QFileInfo &fi, + const QString &name, + const QString &author, +--- sidplayer/sidplayer_file.cpp~gcc34.patch 2004-05-16 20:54:24.000000000 +0200 ++++ sidplayer/sidplayer_file.cpp 2004-05-16 20:56:01.000000000 +0200 +@@ -24,9 +24,6 @@ + #endif + + +-static bool evenFlag; // This global flag is used to toggle between even and odd list entries +- // when generating list items (i.e. when populating a list). +- + FileItem::FileItem( QListView *parent, const QFileInfo &fi, int type ) + : ItemBase( parent ), + fileInfo( fi ) diff --git a/sidplayer/sidplayer-1.5.0/use-external-libsidplay.patch b/sidplayer/sidplayer-1.5.0/use-external-libsidplay.patch index e69de29bb2..7c00079299 100644 --- a/sidplayer/sidplayer-1.5.0/use-external-libsidplay.patch +++ b/sidplayer/sidplayer-1.5.0/use-external-libsidplay.patch @@ -0,0 +1,20 @@ + +# +# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher +# + +--- sidplayer/sidplayer.h~use-external-libsidplay 2003-09-26 00:28:31.000000000 +0200 ++++ sidplayer/sidplayer.h 2004-02-12 18:16:19.000000000 +0100 +@@ -13,9 +13,9 @@ + + #include "tabbeddialog.h" + +-#include "libsidplay/src/player.h" +-#include "libsidplay/src/fformat.h" +-#include "libsidplay/src/myendian.h" ++#include <player.h> ++#include <fformat.h> ++#include <myendian.h> + #include "audiodrv.h" + + #include <qpe/qpeapplication.h> |