rev 3150 - people/dato/packages/trunk/amarok/debian/patches

[Adeodato Simó]

Author: adeodato
Date: 2006-02-19 16:43:31 +0000 (Sun, 19 Feb 2006)
New Revision: 3150

Modified:
   people/dato/packages/trunk/amarok/debian/patches/disable-final.diff
   people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch
Log:
Refreshing patches for 1.4.


Modified: people/dato/packages/trunk/amarok/debian/patches/disable-final.diff
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/disable-final.diff	2006-02-19 16:26:12 UTC (rev 3149)
+++ people/dato/packages/trunk/amarok/debian/patches/disable-final.diff	2006-02-19 16:43:31 UTC (rev 3150)
@@ -6,5 +6,5 @@
  
 +KDE_OPTIONS = nofinal
  
- bin_PROGRAMS = amarokapp
+ lib_LTLIBRARIES = libamarok.la
  

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-02-19 16:26:12 UTC (rev 3149)
+++ people/dato/packages/trunk/amarok/debian/patches/some-binaries-in-usr-lib.patch	2006-02-19 16:43:31 UTC (rev 3150)
@@ -48,10 +48,10 @@
  
      resize( sizeHint() + QSize(20,0) );
      // Center the widget on screen
---- amarok/src/amarokcore/main.cpp.orig
-+++ amarok/src/amarokcore/main.cpp
-@@ -82,6 +82,8 @@
-     aboutData.addCredit( "Stefan Siegel", I18N_NOOP( "Patches, Bugfixes" ), "kde at sdas.de" );
+--- amarok/src/main.cpp.orig
++++ amarok/src/main.cpp
+@@ -91,6 +91,8 @@
+     aboutData.addCredit( "Sven Krohlas", I18N_NOOP( "roKymoter (sven423)" ), "sven at asbest-online.de" );
      aboutData.addCredit( "Whitehawk Stormchaser", I18N_NOOP( "Tester, patches" ), "zerokode at gmx.net" );
  
 +    argv[0] = qstrdup( "amarok" );
@@ -61,7 +61,7 @@
      App::initCliArgs( argc, argv );
 --- amarok/src/amarokcore/crashhandler.cpp.orig
 +++ amarok/src/amarokcore/crashhandler.cpp
-@@ -130,7 +130,7 @@
+@@ -134,7 +134,7 @@
              QCString gdb;
              gdb  = "gdb --nw -n --batch -x ";
              gdb += temp.name().latin1();
@@ -70,21 +70,21 @@
              gdb += QCString().setNum( ::getppid() );
  
              QString bt = runCommand( gdb );
-@@ -142,7 +142,7 @@
-             bt.stripWhiteSpace();
+@@ -147,7 +147,7 @@
  
              /// analyze usefulness
+             bool useful = true;
 -            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 @@
-             //TODO -O optimization can rearrange execution and stuff so show a warning for the developer
+@@ -182,7 +182,7 @@
              //TODO pass the CXXFLAGS used with the email
  
--            body += "==== file `which amarokapp` =======\n";
-+            body += "==== file /usr/lib/amarok/amarokapp =======\n";
-             body += fileCommandOutput + "\n\n";
-             body += "==== (gdb) bt =====================\n";
-             body += bt + "\n\n";
+             if( useful ) {
+-                body += "==== file `which amarokapp` =======\n";
++                body += "==== file /usr/lib/amarok/amarokapp =======\n";
+                 body += fileCommandOutput + "\n\n";
+                 body += "==== (gdb) bt =====================\n";
+                 body += bt + "\n\n";