rpms/digikam/F-9 digikam-missing-photos.patch,1.1,1.2

Marcin Garski (mgarski) fedora-extras-commits at redhat.com
Sun Jul 6 23:27:58 UTC 2008


Author: mgarski

Update of /cvs/pkgs/rpms/digikam/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20291

Modified Files:
	digikam-missing-photos.patch 
Log Message:
- Add correct patch


digikam-missing-photos.patch:

Index: digikam-missing-photos.patch
===================================================================
RCS file: /cvs/pkgs/rpms/digikam/F-9/digikam-missing-photos.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- digikam-missing-photos.patch	6 Jul 2008 22:54:06 -0000	1.1
+++ digikam-missing-photos.patch	6 Jul 2008 23:27:08 -0000	1.2
@@ -1,20 +1,20 @@
---- digikam/utilities/cameragui/cameracontroller.cpp    2008-03-03 16:23:48.000000000 +0200
-+++ digikam/utilities/cameragui/cameracontroller.cpp    2008-03-03 17:06:28.000000000 +0200
-@@ -471,7 +471,7 @@
+--- digikam-0.9.3/digikam/utilities/cameragui/cameracontroller.cpp	2007-12-22 18:19:47.000000000 +0100
++++ digikam-0.9.3/digikam/utilities/cameragui/cameracontroller.cpp.new	2008-07-07 00:42:14.000000000 +0200
+@@ -370,7 +370,7 @@
  
-                 KUrl tempURL(dest);
-                 tempURL = tempURL.upUrl();
--                tempURL.addPath(QString(".digikam-camera-tmp1-%1").arg(getpid()));
-+                tempURL.addPath(QString(".digikam-camera-tmp1-%1").arg(getpid()).prepend(file));
+                 KURL tempURL(dest);
+                 tempURL = tempURL.upURL();
+-                tempURL.addPath( QString(".digikam-camera-tmp1-%1").arg(getpid()));
++                tempURL.addPath( QString(".digikam-camera-tmp1-%1").arg(getpid()).prepend(file));
                  QString temp = tempURL.path();
- 
+     
                  bool result = d->camera->downloadItem(folder, file, tempURL.path());
-@@ -511,7 +511,7 @@
+@@ -410,7 +410,7 @@
  
-                         KUrl tempURL2(dest);
-                         tempURL2 = tempURL2.upUrl();
--                        tempURL2.addPath(QString(".digikam-camera-tmp2-%1").arg(getpid()));
-+                        tempURL2.addPath(QString(".digikam-camera-tmp2-%1").arg(getpid()).prepend(file));
+                         KURL tempURL2(dest);
+                         tempURL2 = tempURL2.upURL();
+-                        tempURL2.addPath( QString(".digikam-camera-tmp2-%1").arg(getpid()));
++                        tempURL2.addPath( QString(".digikam-camera-tmp2-%1").arg(getpid()).prepend(file));
                          temp = tempURL2.path();
  
                          if (!jpegConvert(tempURL.path(), tempURL2.path(), file, losslessFormat))




More information about the fedora-extras-commits mailing list