This commit is contained in:
parent
f56c8dd778
commit
e7bd327ce4
29
digikam-gphoto-codeset.patch
Normal file
29
digikam-gphoto-codeset.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
--- digikam/utilities/cameragui/gpcamera.cpp
|
||||||
|
+++ digikam/utilities/cameragui/gpcamera.cpp
|
||||||
|
@@ -361,7 +361,7 @@
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
- subFolderList.append(QString(subFolder));
|
||||||
|
+ subFolderList.append(QFile::decodeName(subFolder));
|
||||||
|
}
|
||||||
|
|
||||||
|
gp_list_unref(clist);
|
||||||
|
@@ -408,7 +408,7 @@
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
- itemsList.append(cname);
|
||||||
|
+ itemsList.append(QFile::decodeName(cname));
|
||||||
|
}
|
||||||
|
|
||||||
|
gp_list_unref(clist);
|
||||||
|
@@ -461,7 +461,7 @@
|
||||||
|
|
||||||
|
GPItemInfo itemInfo;
|
||||||
|
|
||||||
|
- itemInfo.name = cname;
|
||||||
|
+ itemInfo.name = QFile::decodeName(cname);
|
||||||
|
itemInfo.folder = folder;
|
||||||
|
|
||||||
|
CameraFileInfo info;
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Aug 22 08:13:42 CEST 2007 - meissner@suse.de
|
||||||
|
|
||||||
|
- handle filename conversions correctly, if you by chance
|
||||||
|
use MTP devices with digikam.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Jul 17 11:28:17 CEST 2007 - stbinner@suse.de
|
Tue Jul 17 11:28:17 CEST 2007 - stbinner@suse.de
|
||||||
|
|
||||||
|
17
digikam.spec
17
digikam.spec
@ -30,7 +30,7 @@ License: GPL v2 or later
|
|||||||
Group: Productivity/Graphics/Viewers
|
Group: Productivity/Graphics/Viewers
|
||||||
Summary: A KDE Photo Manager
|
Summary: A KDE Photo Manager
|
||||||
Version: 0.9.2
|
Version: 0.9.2
|
||||||
Release: 9
|
Release: 28
|
||||||
%define rversion %version-final
|
%define rversion %version-final
|
||||||
URL: http://www.digikam.org/
|
URL: http://www.digikam.org/
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
@ -43,6 +43,7 @@ Patch4: digikam-gphoto-disk.patch
|
|||||||
Patch5: digikam-load.diff
|
Patch5: digikam-load.diff
|
||||||
Patch7: digikam-print.diff
|
Patch7: digikam-print.diff
|
||||||
Patch9: renamepreview.patch
|
Patch9: renamepreview.patch
|
||||||
|
Patch10: digikam-gphoto-codeset.patch
|
||||||
Requires: imlib2-loaders
|
Requires: imlib2-loaders
|
||||||
%if %suse_version > 1020
|
%if %suse_version > 1020
|
||||||
Requires: %{name}-lang = %{version}
|
Requires: %{name}-lang = %{version}
|
||||||
@ -52,11 +53,11 @@ Obsoletes: digikamimageplugins-lang <= 0.9.1
|
|||||||
|
|
||||||
%description
|
%description
|
||||||
digiKam is a simple digital photo management application for KDE, which
|
digiKam is a simple digital photo management application for KDE, which
|
||||||
makes importing and organizing digital photos easy. The photos can be
|
allows you to import and organize your digital photos easily. The
|
||||||
organized in albums, which can be sorted chronologically, by directory
|
photos can be organized in albums, which can be sorted chronologically,
|
||||||
layout, or by custom collections. An easy-to-use interface is provided
|
by directory layout, or by custom collections. An easy-to-use interface
|
||||||
that enables you to connect to your camera and preview, download, and
|
that enables you to connect to your camera and preview, download, or
|
||||||
delete your images.
|
delete your images, is provided.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -153,6 +154,7 @@ rm -rf digikam/sqlite
|
|||||||
#%patch5 -p0
|
#%patch5 -p0
|
||||||
%patch7
|
%patch7
|
||||||
%patch9
|
%patch9
|
||||||
|
%patch10
|
||||||
. /etc/opt/kde3/common_options
|
. /etc/opt/kde3/common_options
|
||||||
update_admin --no-unsermake
|
update_admin --no-unsermake
|
||||||
|
|
||||||
@ -248,6 +250,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
/opt/kde3/share/apps/digikamimageplugins/superimpose
|
/opt/kde3/share/apps/digikamimageplugins/superimpose
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Aug 22 2007 - meissner@suse.de
|
||||||
|
- handle filename conversions correctly, if you by chance
|
||||||
|
use MTP devices with digikam.
|
||||||
* Tue Jul 17 2007 - stbinner@suse.de
|
* Tue Jul 17 2007 - stbinner@suse.de
|
||||||
- don't show digikamthemedesigner within application menu
|
- don't show digikamthemedesigner within application menu
|
||||||
* Mon Jul 09 2007 - stbinner@suse.de
|
* Mon Jul 09 2007 - stbinner@suse.de
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- digikam/utilities/cameragui/cameracontroller.cpp
|
--- digikam/utilities/cameragui/cameracontroller.cpp
|
||||||
+++ digikam/utilities/cameragui/cameracontroller.cpp
|
+++ digikam/utilities/cameragui/cameracontroller.cpp
|
||||||
@@ -56,6 +56,7 @@
|
@@ -58,6 +58,7 @@
|
||||||
#include <kmessagebox.h>
|
#include <kmessagebox.h>
|
||||||
#include <kio/renamedlg.h>
|
#include <kio/renamedlg.h>
|
||||||
#include <kstandarddirs.h>
|
#include <kstandarddirs.h>
|
||||||
@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
// Local includes.
|
// Local includes.
|
||||||
|
|
||||||
@@ -1141,12 +1142,16 @@
|
@@ -1143,12 +1144,16 @@
|
||||||
|
|
||||||
// FIXME : see B.K.O #126427: with Gphoto camera, the camera folder is not
|
// FIXME : see B.K.O #126427: with Gphoto camera, the camera folder is not
|
||||||
// mounted in local and camera picture cannot be display like a preview in dialog.
|
// mounted in local and camera picture cannot be display like a preview in dialog.
|
||||||
|
Loading…
Reference in New Issue
Block a user