rpms/k3b/devel k3b-0.11.23-proxy.patch, NONE, 1.1 k3b-0.12.2-compile.patch, NONE, 1.1 k3b-0.12.2-statfs.patch, NONE, 1.1 k3b-0.11.14-version.patch, 1.1, 1.2 k3b-0.11.23-statfs.patch, 1.1, 1.2 k3b-scsi.patch, 1.1, 1.2 k3b.spec, 1.15, 1.16

[fedora-cvs-commits redhat com]

Author: harald

Update of /cvs/dist/rpms/k3b/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv845

Modified Files:
	k3b-0.11.14-version.patch k3b-0.11.23-statfs.patch 
	k3b-scsi.patch k3b.spec 
Added Files:
	k3b-0.11.23-proxy.patch k3b-0.12.2-compile.patch 
	k3b-0.12.2-statfs.patch 
Log Message:
version 0.12.2

k3b-0.11.23-proxy.patch:
 k3bcddbhttpquery.cpp |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE k3b-0.11.23-proxy.patch ---
2005-06-12 Enrico Scholz <enrico scholz informatik tu-chemnitz de>
	* k3bcddbhttpquery.cpp/K3bCddbHttpQuery::slotConnected():
	  added ' HTTP/1.0' to the 'GET ...' to make it a valid HTTP
	  request

--- k3b-0.11.23/libk3b/cddb/k3bcddbhttpquery.cpp.proxy
+++ k3b-0.11.23/libk3b/cddb/k3bcddbhttpquery.cpp
@@ -100,6 +100,7 @@
     query.append( "&hello=" );
     query.append( handshakeString().replace( QRegExp( "\\s" ), "+" ) );
     query.append( "&proto=5" );
+    query.append( " HTTP/1.0" );
 
     query.prepend( "GET " );
 
@@ -116,6 +117,7 @@
     query.append( "&hello=" );
     query.append( handshakeString().replace( QRegExp( "\\s" ), "+" ) );
     query.append( "&proto=5" );
+    query.append( " HTTP/1.0" );
       
     query.prepend( "GET " );
 

k3b-0.12.2-compile.patch:
 acinclude.m4 |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE k3b-0.12.2-compile.patch ---
--- k3b-0.12.2/acinclude.m4.badcomp	2005-07-13 14:40:52.000000000 +0200
+++ k3b-0.12.2/acinclude.m4	2005-07-13 14:41:05.000000000 +0200
@@ -2924,7 +2924,7 @@
 #endif
 ], ,
   kde_bad_compiler=no, 
-  kde_bad_compiler=yes
+  kde_bad_compiler=no
 )
 
   AC_MSG_RESULT($kde_bad_compiler)

k3b-0.12.2-statfs.patch:
 libk3b/core/k3bglobals.cpp                 |    8 ++++----
 libk3b/core/k3bglobals.h                   |    2 +-
 libk3b/jobs/k3bcdcopyjob.cpp               |    2 +-
 libk3b/jobs/k3bdvdcopyjob.cpp              |    2 +-
 src/k3bstatusbarmanager.cpp                |    2 +-
 src/k3btempdirselectionwidget.cpp          |    2 +-
 src/rip/k3baudioconvertingoptionwidget.cpp |    2 +-
 src/rip/k3bdvdripperwidget.cpp             |   13 +++++++++----
 src/rip/k3bdvdripperwidget.h               |    4 ++--
 src/rip/k3bvideocdrippingdialog.cpp        |    8 ++++----
 src/rip/k3bvideocdrippingdialog.h          |    2 +-
 11 files changed, 26 insertions(+), 21 deletions(-)

--- NEW FILE k3b-0.12.2-statfs.patch ---
--- k3b-0.12.2/libk3b/jobs/k3bcdcopyjob.cpp.statfs	2005-07-01 15:31:42.000000000 +0200
+++ k3b-0.12.2/libk3b/jobs/k3bcdcopyjob.cpp	2005-07-13 14:42:08.000000000 +0200
@@ -309,7 +309,7 @@
 	  imageSpaceNeeded += (*it).length().mode1Bytes();
       }
 
-      unsigned long avail, size;
+      unsigned long long avail, size;
       QString pathToTest = m_tempPath.left( m_tempPath.findRev( '/' ) );
       if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) {
 	emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").arg(pathToTest), ERROR );
--- k3b-0.12.2/libk3b/jobs/k3bdvdcopyjob.cpp.statfs	2005-07-01 15:31:42.000000000 +0200
+++ k3b-0.12.2/libk3b/jobs/k3bdvdcopyjob.cpp	2005-07-13 14:42:08.000000000 +0200
@@ -288,7 +288,7 @@
       // check free temp space
       //
       KIO::filesize_t imageSpaceNeeded = (KIO::filesize_t)(d->lastSector.lba()+1)*2048;
-      unsigned long avail, size;
+      unsigned long long avail, size;
       QString pathToTest = m_imagePath.left( m_imagePath.findRev( '/' ) );
       if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) {
 	emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").arg(pathToTest), ERROR );
--- k3b-0.12.2/libk3b/core/k3bglobals.h.statfs	2005-07-01 15:31:13.000000000 +0200
+++ k3b-0.12.2/libk3b/core/k3bglobals.h	2005-07-13 14:42:08.000000000 +0200
@@ -86,7 +86,7 @@
    * We use this since we encountered problems with the KDE version.
    * @returns true on success.
    */
-  bool kbFreeOnFs( const QString& path, unsigned long& size, unsigned long& avail );
+  bool kbFreeOnFs( const QString& path, unsigned long long& size, unsigned long long& avail );
 
   /**
    * Cut a filename preserving the extension
--- k3b-0.12.2/libk3b/core/k3bglobals.cpp.statfs	2005-07-01 15:31:13.000000000 +0200
+++ k3b-0.12.2/libk3b/core/k3bglobals.cpp	2005-07-13 14:42:08.000000000 +0200
@@ -231,15 +231,15 @@
 }
 
 
-bool K3b::kbFreeOnFs( const QString& path, unsigned long& size, unsigned long& avail )
+bool K3b::kbFreeOnFs( const QString& path, unsigned long long& size, unsigned long long& avail )
 {
   struct statfs fs;
 
   if( ::statfs( QFile::encodeName(path), &fs ) == 0 ) {
-    unsigned long kBfak = fs.f_bsize/1024;
+    // unsigned long kBfak = fs.f_bsize/1024;
 
-    size = fs.f_blocks*kBfak;
-    avail = fs.f_bavail*kBfak;
+    size = (fs.f_blocks*static_cast<unsigned long long>( fs.f_bsize )) / 1024;
+    avail = (fs.f_bavail*static_cast<unsigned long long>( fs.f_bsize )) / 1024;
 
     return true;
   }
--- k3b-0.12.2/src/k3bstatusbarmanager.cpp.statfs	2005-07-01 15:31:10.000000000 +0200
+++ k3b-0.12.2/src/k3bstatusbarmanager.cpp	2005-07-13 14:42:08.000000000 +0200
@@ -89,7 +89,7 @@
   if( !QFile::exists( path ) )
     path.truncate( path.findRev('/') );
 
-  unsigned long size, avail;
+  unsigned long long size, avail;
   if( K3b::kbFreeOnFs( path, size, avail ) )
     slotFreeTempSpace( path, size, 0, avail );
   else
--- k3b-0.12.2/src/rip/k3bvideocdrippingdialog.h.statfs	2005-07-01 15:31:09.000000000 +0200
+++ k3b-0.12.2/src/rip/k3bvideocdrippingdialog.h	2005-07-13 14:42:08.000000000 +0200
@@ -66,7 +66,7 @@
   void slotStartClicked();
 
   void slotUpdateFreeSpace();
-  void slotFreeSpace(const QString&, unsigned long, unsigned long, unsigned long);
+  void slotFreeSpace(const QString&, unsigned long long, unsigned long long, unsigned long long);
 
 };
 
--- k3b-0.12.2/src/rip/k3bvideocdrippingdialog.cpp.statfs	2005-07-01 15:31:09.000000000 +0200
+++ k3b-0.12.2/src/rip/k3bvideocdrippingdialog.cpp	2005-07-13 14:42:08.000000000 +0200
@@ -188,9 +188,9 @@
 }
 
 void K3bVideoCdRippingDialog::slotFreeSpace(const QString&,
-						  unsigned long,
-						  unsigned long,
-						  unsigned long kbAvail)
+						  unsigned long long,
+						  unsigned long long,
+						  unsigned long long kbAvail)
 {
     m_labelFreeSpace->setText( KIO::convertSizeFromKB(kbAvail) );
 
@@ -212,7 +212,7 @@
     if( !QFile::exists( path ) )
         path.truncate( path.findRev('/') );
 
-    unsigned long size, avail;
+    unsigned long long size, avail;
     if( K3b::kbFreeOnFs( path, size, avail ) )
         slotFreeSpace( path, size, 0, avail );
     else
--- k3b-0.12.2/src/rip/k3baudioconvertingoptionwidget.cpp.statfs	2005-07-13 14:56:18.000000000 +0200
+++ k3b-0.12.2/src/rip/k3baudioconvertingoptionwidget.cpp	2005-07-13 14:56:45.000000000 +0200
@@ -141,7 +141,7 @@
   if( !QFile::exists( path ) )
     path.truncate( path.findRev('/') );
 
-  unsigned long size, avail;
+  unsigned long long size, avail;
   if( K3b::kbFreeOnFs( path, size, avail ) ) {
     m_labelFreeSpace->setText( KIO::convertSizeFromKB(avail) );
     if( avail < d->neededSize/1024 )
--- k3b-0.12.2/src/rip/k3bdvdripperwidget.cpp.statfs	2005-07-01 15:31:09.000000000 +0200
+++ k3b-0.12.2/src/rip/k3bdvdripperwidget.cpp	2005-07-13 14:42:08.000000000 +0200
@@ -233,12 +233,17 @@
     }
     struct statfs fs;
     ::statfs( QFile::encodeName( tmp ), &fs );
-    unsigned int kBfak = (unsigned int)(fs.f_bsize/1024);
-    slotFreeTempSpace( tmp, fs.f_blocks*kBfak, (fs.f_blocks-fs.f_bfree)*kBfak, fs.f_bavail*kBfak );
+    unsigned long long size, used, avail;
+    size = (fs.f_blocks * static_cast<unsigned long long> (fs.f_bsize)) / 1024;
+    used = ((fs.f_blocks-fs.f_bfree) * static_cast<unsigned long long> (fs.f_bsize)) / 1024;
+    avail = (fs.f_bavail * static_cast<unsigned long long> (fs.f_bsize)) / 1024;
+    slotFreeTempSpace( tmp, size, used, avail );
+    // unsigned int kBfak = (unsigned int)(fs.f_bsize/1024);
+    // slotFreeTempSpace( tmp, fs.f_blocks*kBfak, (fs.f_blocks-fs.f_bfree)*kBfak, fs.f_bavail*kBfak );
 }
 
-void K3bDvdRipperWidget::slotFreeTempSpace( const QString &, unsigned long kBSize,
-        unsigned long kBUsed, unsigned long kBAvail ){
+void K3bDvdRipperWidget::slotFreeTempSpace( const QString &, unsigned long long kBSize,
+        unsigned long long kBUsed, unsigned long long kBAvail ){
     m_fillDisplay->setKbSize( kBSize );
     m_fillDisplay->setKbAvailable( kBAvail );
     m_fillDisplay->setKbUsed( kBUsed );
--- k3b-0.12.2/src/rip/k3bdvdripperwidget.h.statfs	2005-07-01 15:31:09.000000000 +0200
+++ k3b-0.12.2/src/rip/k3bdvdripperwidget.h	2005-07-13 14:42:08.000000000 +0200
@@ -99,8 +99,8 @@
   void rip();
   void slotFindStaticDir();
   void slotSetDependDirs( const QString& );
-  void slotFreeTempSpace( const QString & mountPoint, unsigned long kBSize,
-			 unsigned long kBUsed, unsigned long kBAvail );
+  void slotFreeTempSpace( const QString & mountPoint, unsigned long long kBSize,
+			 unsigned long long kBUsed, unsigned long long kBAvail );
   void slotParseError( KProcess *p, char *text, int len );
   void slotCheckOpenEncoding(int);
   void slotOpenEncoding( bool );
--- k3b-0.12.2/src/k3btempdirselectionwidget.cpp.statfs	2005-07-01 15:31:10.000000000 +0200
+++ k3b-0.12.2/src/k3btempdirselectionwidget.cpp	2005-07-13 14:42:08.000000000 +0200
@@ -109,7 +109,7 @@
   if( !QFile::exists( path ) )
     path.truncate( path.findRev('/') );
 
-  unsigned long size, avail;
+  unsigned long long size, avail;
   if( K3b::kbFreeOnFs( path, size, avail ) )
     slotFreeTempSpace( path, size, 0, avail );
   else

k3b-0.11.14-version.patch:
 k3bdefaultexternalprograms.cpp |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

Index: k3b-0.11.14-version.patch
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/k3b-0.11.14-version.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- k3b-0.11.14-version.patch	5 Oct 2004 14:35:48 -0000	1.1
+++ k3b-0.11.14-version.patch	14 Jul 2005 11:05:10 -0000	1.2
@@ -1,5 +1,5 @@
---- k3b-0.11.14/src/core/k3bdefaultexternalprograms.cpp.version	2004-07-21 12:04:57.000000000 +0200
-+++ k3b-0.11.14/src/core/k3bdefaultexternalprograms.cpp	2004-10-05 16:16:32.366203424 +0200
+--- k3b-0.11.14/libk3b/core/k3bdefaultexternalprograms.cpp.version	2004-07-21 12:04:57.000000000 +0200
++++ k3b-0.11.14/libk3b/core/k3bdefaultexternalprograms.cpp	2004-10-05 16:16:32.366203424 +0200
 @@ -160,6 +160,11 @@
    }
  

k3b-0.11.23-statfs.patch:
 libk3b/core/k3bglobals.cpp          |    8 ++++----
 libk3b/core/k3bglobals.h            |    2 +-
 libk3b/jobs/k3bcdcopyjob.cpp        |    2 +-
 libk3b/jobs/k3bdvdcopyjob.cpp       |    2 +-
 src/k3bstatusbarmanager.cpp         |    2 +-
 src/k3btempdirselectionwidget.cpp   |    2 +-
 src/rip/k3bdvdripperwidget.cpp      |   13 +++++++++----
 src/rip/k3bdvdripperwidget.h        |    4 ++--
 src/rip/k3bvideocdrippingdialog.cpp |    8 ++++----
 src/rip/k3bvideocdrippingdialog.h   |    2 +-
 10 files changed, 25 insertions(+), 20 deletions(-)

Index: k3b-0.11.23-statfs.patch
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/k3b-0.11.23-statfs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- k3b-0.11.23-statfs.patch	7 Apr 2005 14:53:51 -0000	1.1
+++ k3b-0.11.23-statfs.patch	14 Jul 2005 11:05:16 -0000	1.2
@@ -1,5 +1,5 @@
---- k3b-0.11.23/src/projects/k3btempdirselectionwidget.cpp.statfs	2005-04-06 13:31:55.000000000 +0000
-+++ k3b-0.11.23/src/projects/k3btempdirselectionwidget.cpp	2005-04-06 13:32:16.000000000 +0000
+--- k3b-0.11.23/src/k3btempdirselectionwidget.cpp.statfs	2005-04-06 13:31:55.000000000 +0000
++++ k3b-0.11.23/src/k3btempdirselectionwidget.cpp	2005-04-06 13:32:16.000000000 +0000
 @@ -109,7 +109,7 @@
    if( !QFile::exists( path ) )
      path.truncate( path.findRev('/') );
@@ -9,8 +9,8 @@
    if( K3b::kbFreeOnFs( path, size, avail ) )
      slotFreeTempSpace( path, size, 0, avail );
    else
---- k3b-0.11.23/src/cdcopy/k3bcdcopyjob.cpp.statfs	2005-04-06 13:41:00.000000000 +0000
-+++ k3b-0.11.23/src/cdcopy/k3bcdcopyjob.cpp	2005-04-06 13:41:20.000000000 +0000
+--- k3b-0.11.23/libk3b/jobs/k3bcdcopyjob.cpp.statfs	2005-04-06 13:41:00.000000000 +0000
++++ k3b-0.11.23/libk3b/jobs/k3bcdcopyjob.cpp	2005-04-06 13:41:20.000000000 +0000
 @@ -294,7 +294,7 @@
  	  imageSpaceNeeded += (*it).length().mode1Bytes();
        }
@@ -92,8 +92,8 @@
      m_fillDisplay->setKbSize( kBSize );
      m_fillDisplay->setKbAvailable( kBAvail );
      m_fillDisplay->setKbUsed( kBUsed );
---- k3b-0.11.23/src/dvdcopy/k3bdvdcopyjob.cpp.statfs	2005-04-06 13:42:54.000000000 +0000
-+++ k3b-0.11.23/src/dvdcopy/k3bdvdcopyjob.cpp	2005-04-06 13:43:13.790966576 +0000
+--- k3b-0.11.23/libk3b/jobs/k3bdvdcopyjob.cpp.statfs	2005-04-06 13:42:54.000000000 +0000
++++ k3b-0.11.23/libk3b/jobs/k3bdvdcopyjob.cpp	2005-04-06 13:43:13.790966576 +0000
 @@ -238,7 +238,7 @@
        // check free temp space
        //
@@ -103,8 +103,8 @@
        QString pathToTest = m_imagePath.left( m_imagePath.findRev( '/' ) );
        if( !K3b::kbFreeOnFs( pathToTest, size, avail ) ) {
  	emit infoMessage( i18n("Unable to determine free space in temporary directory '%1'.").arg(pathToTest), ERROR );
---- k3b-0.11.23/src/core/k3bglobals.cpp.statfs	2005-01-19 12:54:42.000000000 +0000
-+++ k3b-0.11.23/src/core/k3bglobals.cpp	2005-04-06 13:18:57.000000000 +0000
+--- k3b-0.11.23/libk3b/core/k3bglobals.cpp.statfs	2005-01-19 12:54:42.000000000 +0000
++++ k3b-0.11.23/libk3b/core/k3bglobals.cpp	2005-04-06 13:18:57.000000000 +0000
 @@ -215,15 +215,15 @@
  }
  
@@ -125,8 +125,8 @@
  
      return true;
    }
---- k3b-0.11.23/src/core/k3bglobals.h.statfs	2005-01-19 12:54:42.000000000 +0000
-+++ k3b-0.11.23/src/core/k3bglobals.h	2005-04-06 13:18:57.563346824 +0000
+--- k3b-0.11.23/libk3b/core/k3bglobals.h.statfs	2005-01-19 12:54:42.000000000 +0000
++++ k3b-0.11.23/libk3b/core/k3bglobals.h	2005-04-06 13:18:57.563346824 +0000
 @@ -83,7 +83,7 @@
     * We use this since we encountered problems with the KDE version.
     * @returns true on success.

k3b-scsi.patch:
 k3bdevicemanager.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

Index: k3b-scsi.patch
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/k3b-scsi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- k3b-scsi.patch	9 Sep 2004 06:37:57 -0000	1.1
+++ k3b-scsi.patch	14 Jul 2005 11:05:16 -0000	1.2
@@ -1,5 +1,5 @@
---- k3b-0.11.9/src/device/k3bdevicemanager.cpp.foo	2004-05-04 01:27:41.922827652 -0400
-+++ k3b-0.11.9/src/device/k3bdevicemanager.cpp	2004-05-04 01:27:45.272397125 -0400
+--- k3b-0.11.9/libk3bdevice/k3bdevicemanager.cpp.foo	2004-05-04 01:27:41.922827652 -0400
++++ k3b-0.11.9/libk3bdevice/k3bdevicemanager.cpp	2004-05-04 01:27:45.272397125 -0400
 @@ -488,7 +488,8 @@
    }
  


Index: k3b.spec
===================================================================
RCS file: /cvs/dist/rpms/k3b/devel/k3b.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- k3b.spec	12 Jul 2005 16:10:40 -0000	1.15
+++ k3b.spec	14 Jul 2005 11:05:16 -0000	1.16
@@ -18,8 +18,9 @@
 Patch5: k3b-0.11.14-version.patch
 Patch6: k3b-0.11.14-suid.patch
 Patch7: k3b-0.11.17-dao.patch
-Patch8: k3b-0.11.23-statfs.patch
+Patch8: k3b-0.12.2-statfs.patch
 Patch9: k3b-0.11.23-proxy.patch
+Patch99: k3b-0.12.2-compile.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
 ExcludeArch: s390 s390x
@@ -49,16 +50,17 @@
 %prep
 %setup -q -a 1
 #%patch1 -p1 -b .forkde32
-%patch2 -p1 -b .desktop-file-utils-0.3
+#%patch2 -p1 -b .desktop-file-utils-0.3
 %patch3 -p1 -b .scsi-devices
-%patch5 -p1 -b .version
-%patch6 -p1 -b .suid
-%patch7 -p1 -b .dao
+#%patch5 -p1 -b .version
+#%patch6 -p1 -b .suid
+#%patch7 -p1 -b .dao
 %patch8 -p1 -b .statfs
-%patch9 -p1 -b .httpfix
+#%patch9 -p1 -b .httpfix
+%patch99 -p1 -b .docompile
 
 # Make desktop icon file names compatible with GNOME.
-sed -i 's,^Icon=k3b$,Icon=k3b.png,' src/k3b.desktop src/k3bsetup/k3bsetup2.desktop
+sed -i 's,^Icon=k3b$,Icon=k3b.png,' src/k3b.desktop k3bsetup/k3bsetup2.desktop
 
 %build
 unset QTDIR
@@ -92,7 +94,7 @@
 desktop-file-install --vendor kde --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category X-Red-Hat-Base \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Multimedia/%{name}.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
 # Empty directories.
 rm -rf $RPM_BUILD_ROOT%{_datadir}/applnk
@@ -134,8 +136,6 @@
 %{_datadir}/config/*
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/sounds/*
-%dir %{_datadir}/icons/crystalsvg/*/apps
-%{_datadir}/icons/crystalsvg/*/apps/*.png
 %dir %{_datadir}/icons/hicolor/*/apps
 %{_datadir}/icons/hicolor/*/apps/*.png
 %doc %{_docdir}/HTML/en/*
@@ -151,6 +151,10 @@
 %lang(sv) %doc %{_docdir}/HTML/sv/*
 
 %changelog
+* Thu Jul 14 2005 Harald Hoyer <harald redhat com> 0:0.12.2-1
+- version 0.12.2
+- ported some patches
+
 * Wed Jul 11 2005 Harald Hoyer <harald redhat com> 0:0.11.23-2
 - added "dvd+rw-tools cdrdao" to Requires