[pkg-kde-commits] rev 2928 - people/dato/packages/trunk/amarok/debian/patches

[Adeodato Simó]

Author: adeodato
Date: 2006-01-17 20:46:04 +0000 (Tue, 17 Jan 2006)
New Revision: 2928

Modified:
   people/dato/packages/trunk/amarok/debian/patches/disable_no_undefined.patch
   people/dato/packages/trunk/amarok/debian/patches/gmo_files_at_build_time.patch
   people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch
Log:
Refresh patches.

Modified: people/dato/packages/trunk/amarok/debian/patches/disable_no_undefined.patch
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/disable_no_undefined.patch	2006-01-17 20:43:00 UTC (rev 2927)
+++ people/dato/packages/trunk/amarok/debian/patches/disable_no_undefined.patch	2006-01-17 20:46:04 UTC (rev 2928)
@@ -1,6 +1,6 @@
---- admin/acinclude.m4.in
+--- admin/acinclude.m4.in.orig
 +++ admin/acinclude.m4.in
-@@ -1665,15 +1665,6 @@
+@@ -1689,15 +1689,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""

Modified: people/dato/packages/trunk/amarok/debian/patches/gmo_files_at_build_time.patch
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/gmo_files_at_build_time.patch	2006-01-17 20:43:00 UTC (rev 2927)
+++ people/dato/packages/trunk/amarok/debian/patches/gmo_files_at_build_time.patch	2006-01-17 20:46:04 UTC (rev 2928)
@@ -1,6 +1,6 @@
---- admin/cvs.sh
+--- admin/cvs.sh.orig
 +++ admin/cvs.sh
-@@ -196,7 +196,7 @@
+@@ -204,7 +204,7 @@
  ###
  ### Then make messages
  ###

Modified: people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch	2006-01-17 20:43:00 UTC (rev 2927)
+++ people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch	2006-01-17 20:46:04 UTC (rev 2928)
@@ -1,4 +1,4 @@
---- amarok/src/loader/loader.cpp
+--- amarok/src/loader/loader.cpp.orig
 +++ amarok/src/loader/loader.cpp
 @@ -66,7 +66,7 @@
                      // this argument cannot be passed to the running amarokapp
@@ -9,7 +9,7 @@
                      proc.setCommunication( 0 ); //show everything
                      proc.addArgument( arg );
                      proc.start();
-@@ -141,7 +141,7 @@
+@@ -146,7 +146,7 @@
       if( !QApplication::isSessionRestored() && isSplashEnabled() )
          m_splash = new Splash;
  
@@ -18,7 +18,7 @@
  
      m_proc = new QProcess( args, this );
      m_proc->setCommunication( QProcess::Stdout );
---- amarok/src/socketserver.cpp
+--- amarok/src/socketserver.cpp.orig
 +++ amarok/src/socketserver.cpp
 @@ -193,23 +193,23 @@
  
@@ -48,35 +48,35 @@
  
      resize( sizeHint() + QSize(20,0) );
      // Center the widget on screen
---- amarok/src/amarokcore/main.cpp
+--- amarok/src/amarokcore/main.cpp.orig
 +++ amarok/src/amarokcore/main.cpp
-@@ -77,6 +77,8 @@
+@@ -82,6 +82,8 @@
      aboutData.addCredit( "Stefan Siegel", I18N_NOOP( "Patches, Bugfixes" ), "kde at sdas.de" );
      aboutData.addCredit( "Whitehawk Stormchaser", I18N_NOOP( "Tester, patches" ), "zerokode at gmx.net" );
-
+ 
 +    argv[0] = qstrdup( "amarok" );
 +
      KApplication::disableAutoDcopRegistration();
-
+ 
      App::initCliArgs( argc, argv );
---- amarok/src/amarokcore/crashhandler.cpp
+--- amarok/src/amarokcore/crashhandler.cpp.orig
 +++ amarok/src/amarokcore/crashhandler.cpp
-@@ -125,7 +125,7 @@
+@@ -130,7 +130,7 @@
              QCString gdb;
              gdb  = "gdb --nw -n --batch -x ";
              gdb += temp.name().latin1();
 -            gdb += " amarokapp ";
 +            gdb += " /usr/lib/amarok/amarokapp ";
              gdb += QCString().setNum( ::getppid() );
-
+ 
              QString bt = runCommand( gdb );
-@@ -137,7 +137,7 @@
+@@ -142,7 +142,7 @@
              bt.stripWhiteSpace();
-
+ 
              /// analyze usefulness
 -            const QString fileCommandOutput = runCommand( "file `which amarokapp`" );
 +            const QString fileCommandOutput = runCommand( "file /usr/lib/amarok/amarokapp" );
-
+ 
              if( fileCommandOutput.find( "not stripped", false ) == -1 )
                  subject += "[___stripped]"; //same length as below
 @@ -173,7 +173,7 @@