Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c6a4ee2bf071fa5459e2c60c92e0bff368eee721
commit c6a4ee2bf071fa5459e2c60c92e0bff368eee721
Author: crazy <[EMAIL PROTECTED]>
Date: Thu Dec 27 14:11:25 2007 +0100
digikam-0.9.3-1-i686
* forgot to remove unused patches
diff --git a/source/kde-extra/digikam/exiv2-0.14.patch
b/source/kde-extra/digikam/exiv2-0.14.patch
deleted file mode 100644
index 4447ea2..0000000
--- a/source/kde-extra/digikam/exiv2-0.14.patch
+++ /dev/null
@@ -1,373 +0,0 @@
-Index: digikam/libs/widgets/metadata/makernotewidget.h
-===================================================================
---- digikam/libs/widgets/metadata/makernotewidget.h (Revision 642722)
-+++ digikam/libs/widgets/metadata/makernotewidget.h (Revision 642723)
-@@ -1,10 +1,10 @@
- /* ============================================================
-- * Author: Gilles Caulier <caulier dot gilles at gmail dot com>
-- * Date : 2006-02-20
-+ * Authors: Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Date : 2006-02-20
- * Description : a widget to display non standard Exif metadata
- * used by camera makers
- *
-- * Copyright 2006 by Gilles Caulier
-+ * Copyright 2006-2007 by Gilles Caulier
- *
- * This program is free software; you can redistribute it
- * and/or modify it under the terms of the GNU General
-Index: digikam/libs/widgets/metadata/exifwidget.cpp
-===================================================================
---- digikam/libs/widgets/metadata/exifwidget.cpp (Revision 642722)
-+++ digikam/libs/widgets/metadata/exifwidget.cpp (Revision 642723)
-@@ -1,9 +1,9 @@
- /* ============================================================
-- * Author: Gilles Caulier <caulier dot gilles at gmail dot com>
-- * Date : 2006-02-20
-+ * Authors: Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Date : 2006-02-20
- * Description : a widget to display Standard Exif metadata
- *
-- * Copyright 2006 by Gilles Caulier
-+ * Copyright 2006-2007 by Gilles Caulier
- *
- * This program is free software; you can redistribute it
- * and/or modify it under the terms of the GNU General
-@@ -46,6 +46,7 @@
- #include "dmetadata.h"
- #include "metadatalistview.h"
- #include "exifwidget.h"
-+#include "exifwidget.moc"
-
- namespace Digikam
- {
-@@ -180,11 +181,10 @@
- }
- catch (Exiv2::Error& e)
- {
-- DDebug() << "Cannot parse EXIF metadata using Exiv2 ("
-- << QString::fromAscii(e.what().c_str())
-- << ")" << endl;
-- return false;
-+ DMetadata::printExiv2ExceptionError("Cannot parse EXIF metadata using
Exiv2 ", e);
- }
-+
-+ return false;
- }
-
- void ExifWidget::buildView(void)
-@@ -210,11 +210,10 @@
- }
- catch (Exiv2::Error& e)
- {
-- DDebug() << "Cannot get metadata tag title using Exiv2 ("
-- << QString::fromAscii(e.what().c_str())
-- << ")" << endl;
-- return i18n("Unknown");
-+ DMetadata::printExiv2ExceptionError("Cannot get metadata tag title
using Exiv2 ", e);
- }
-+
-+ return i18n("Unknown");
- }
-
- QString ExifWidget::getTagDescription(const QString& key)
-@@ -227,11 +226,10 @@
- }
- catch (Exiv2::Error& e)
- {
-- DDebug() << "Cannot get metadata tag description using Exiv2 ("
-- << QString::fromAscii(e.what().c_str())
-- << ")" << endl;
-- return i18n("No description available");
-+ DMetadata::printExiv2ExceptionError("Cannot get metadata tag
description using Exiv2 ", e);
- }
-+
-+ return i18n("No description available");
- }
-
- void ExifWidget::slotSaveMetadataToFile(void)
-@@ -243,4 +241,3 @@
-
- } // namespace Digikam
-
--#include "exifwidget.moc"
-Index: digikam/libs/widgets/metadata/gpswidget.h
-===================================================================
---- digikam/libs/widgets/metadata/gpswidget.h (Revision 642722)
-+++ digikam/libs/widgets/metadata/gpswidget.h (Revision 642723)
-@@ -1,9 +1,9 @@
- /* ============================================================
-- * Author: Gilles Caulier <caulier dot gilles at gmail dot com>
-- * Date : 2006-02-22
-+ * Authors: Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Date : 2006-02-22
- * Description : a tab widget to display GPS info
- *
-- * Copyright 2006 by Gilles Caulier
-+ * Copyright 2006-2007 by Gilles Caulier
- *
- * This program is free software; you can redistribute it
- * and/or modify it under the terms of the GNU General
-@@ -84,7 +84,6 @@
- private:
-
- GPSWidgetPriv *d;
--
- };
-
- } // namespace Digikam
-Index: digikam/libs/widgets/metadata/iptcwidget.cpp
-===================================================================
---- digikam/libs/widgets/metadata/iptcwidget.cpp (Revision 642722)
-+++ digikam/libs/widgets/metadata/iptcwidget.cpp (Revision 642723)
-@@ -1,9 +1,9 @@
- /* ============================================================
-- * Author: Gilles Caulier <caulier dot gilles at gmail dot com>
-- * Date : 2006-02-20
-+ * Authors: Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Date : 2006-02-20
- * Description : A widget to display IPTC metadata
- *
-- * Copyright 2006 by Gilles Caulier
-+ * Copyright 2006-2007 by Gilles Caulier
- *
- * This program is free software; you can redistribute it
- * and/or modify it under the terms of the GNU General
-@@ -44,6 +44,7 @@
- #include "ddebug.h"
- #include "dmetadata.h"
- #include "iptcwidget.h"
-+#include "iptcwidget.moc"
-
- namespace Digikam
- {
-@@ -155,11 +156,10 @@
- }
- catch (Exiv2::Error& e)
- {
-- DDebug() << "Cannot parse IPTC metadata using Exiv2 ("
-- << QString::fromAscii(e.what().c_str())
-- << ")" << endl;
-- return false;
-+ DMetadata::printExiv2ExceptionError("Cannot parse IPTC metadata using
Exiv2 ", e);
- }
-+
-+ return false;
- }
-
- void IptcWidget::buildView(void)
-@@ -184,11 +184,10 @@
- }
- catch (Exiv2::Error& e)
- {
-- DDebug() << "Cannot get metadata tag title using Exiv2 ("
-- << QString::fromAscii(e.what().c_str())
-- << ")" << endl;
-- return i18n("Unknow");
-+ DMetadata::printExiv2ExceptionError("Cannot get metadata tag title
using Exiv2 ", e);
- }
-+
-+ return i18n("Unknow");
- }
-
- QString IptcWidget::getTagDescription(const QString& key)
-@@ -201,11 +200,10 @@
- }
- catch (Exiv2::Error& e)
- {
-- DDebug() << "Cannot get metadata tag description using Exiv2 ("
-- << QString::fromAscii(e.what().c_str())
-- << ")" << endl;
-- return i18n("No description available");
-+ DMetadata::printExiv2ExceptionError("Cannot get metadata tag
description using Exiv2 ", e);
- }
-+
-+ return i18n("No description available");
- }
-
- void IptcWidget::slotSaveMetadataToFile(void)
-@@ -217,4 +215,3 @@
-
- } // namespace Digikam
-
--#include "iptcwidget.moc"
-Index: digikam/libs/widgets/metadata/exifwidget.h
-===================================================================
---- digikam/libs/widgets/metadata/exifwidget.h (Revision 642722)
-+++ digikam/libs/widgets/metadata/exifwidget.h (Revision 642723)
-@@ -1,9 +1,9 @@
- /* ============================================================
-- * Author: Gilles Caulier <caulier dot gilles at gmail dot com>
-- * Date : 2006-02-20
-+ * Authors: Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Date : 2006-02-20
- * Description : a widget to display Standard Exif metadata
- *
-- * Copyright 2006 by Gilles Caulier
-+ * Copyright 2006-2007 by Gilles Caulier
- *
- * This program is free software; you can redistribute it
- * and/or modify it under the terms of the GNU General
-Index: digikam/libs/widgets/metadata/iptcwidget.h
-===================================================================
---- digikam/libs/widgets/metadata/iptcwidget.h (Revision 642722)
-+++ digikam/libs/widgets/metadata/iptcwidget.h (Revision 642723)
-@@ -1,9 +1,9 @@
- /* ============================================================
-- * Author: Gilles Caulier <caulier dot gilles at gmail dot com>
-- * Date : 2006-02-20
-+ * Authors: Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Date : 2006-02-20
- * Description : A widget to display IPTC metadata
- *
-- * Copyright 2006 by Gilles Caulier
-+ * Copyright 2006-2007 by Gilles Caulier
- *
- * This program is free software; you can redistribute it
- * and/or modify it under the terms of the GNU General
-Index: digikam/libs/widgets/metadata/makernotewidget.cpp
-===================================================================
---- digikam/libs/widgets/metadata/makernotewidget.cpp (Revision 642722)
-+++ digikam/libs/widgets/metadata/makernotewidget.cpp (Revision 642723)
-@@ -1,10 +1,10 @@
- /* ============================================================
-- * Author: Gilles Caulier <caulier dot gilles at gmail dot com>
-- * Date : 2006-02-20
-+ * Authors: Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Date : 2006-02-20
- * Description : a widget to display non standard Exif metadata
- * used by camera makers
- *
-- * Copyright 2006 by Gilles Caulier
-+ * Copyright 2006-2007 by Gilles Caulier
- *
- * This program is free software; you can redistribute it
- * and/or modify it under the terms of the GNU General
-@@ -46,6 +46,7 @@
- #include "ddebug.h"
- #include "dmetadata.h"
- #include "makernotewidget.h"
-+#include "makernotewidget.moc"
-
- namespace Digikam
- {
-@@ -197,11 +198,10 @@
- }
- catch (Exiv2::Error& e)
- {
-- DDebug() << "Cannot parse MAKERNOTE metadata using Exiv2 ("
-- << QString::fromAscii(e.what().c_str())
-- << ")" << endl;
-- return false;
-+ DMetadata::printExiv2ExceptionError("Cannot parse MAKERNOTE metadata
using Exiv2 ", e);
- }
-+
-+ return false;
- }
-
- void MakerNoteWidget::buildView(void)
-@@ -226,11 +226,10 @@
- }
- catch (Exiv2::Error& e)
- {
-- DDebug() << "Cannot get metadata tag title using Exiv2 ("
-- << QString::fromAscii(e.what().c_str())
-- << ")" << endl;
-- return i18n("Unknown");
-+ DMetadata::printExiv2ExceptionError("Cannot get metadata tag title
using Exiv2 ", e);
- }
-+
-+ return i18n("Unknown");
- }
-
- QString MakerNoteWidget::getTagDescription(const QString& key)
-@@ -243,11 +242,10 @@
- }
- catch (Exiv2::Error& e)
- {
-- DDebug() << "Cannot get metadata tag description using Exiv2 ("
-- << QString::fromAscii(e.what().c_str())
-- << ")" << endl;
-- return i18n("No description available");
-+ DMetadata::printExiv2ExceptionError("Cannot get metadata tag
description using Exiv2 ", e);
- }
-+
-+ return i18n("No description available");
- }
-
- void MakerNoteWidget::slotSaveMetadataToFile(void)
-@@ -259,4 +257,3 @@
-
- } // namespace Digikam
-
--#include "makernotewidget.moc"
-Index: digikam/libs/widgets/metadata/gpswidget.cpp
-===================================================================
---- digikam/libs/widgets/metadata/gpswidget.cpp (Revision 642722)
-+++ digikam/libs/widgets/metadata/gpswidget.cpp (Revision 642723)
-@@ -1,9 +1,9 @@
- /* ============================================================
-- * Author: Gilles Caulier <caulier dot gilles at gmail dot com>
-- * Date : 2006-02-22
-+ * Authors: Gilles Caulier <caulier dot gilles at gmail dot com>
-+ * Date : 2006-02-22
- * Description : a tab widget to display GPS info
- *
-- * Copyright 2006 by Gilles Caulier
-+ * Copyright 2006-2007 by Gilles Caulier
- *
- * This program is free software; you can redistribute it
- * and/or modify it under the terms of the GNU General
-@@ -62,6 +62,7 @@
-
- namespace Digikam
- {
-+
- static const char* ExifGPSHumanList[] =
- {
- "GPSLatitude",
-@@ -304,11 +305,10 @@
- catch (Exiv2::Error& e)
- {
- setMetadataEmpty();
-- DDebug() << "Cannot parse EXIF metadata using Exiv2 ("
-- << QString::fromAscii(e.what().c_str())
-- << ")" << endl;
-- return false;
-+ DMetadata::printExiv2ExceptionError("Cannot parse EXIF metadata using
Exiv2 ", e);
- }
-+
-+ return false;
- }
-
- void GPSWidget::setMetadataEmpty()
-@@ -342,11 +342,10 @@
- }
- catch (Exiv2::Error& e)
- {
-- DDebug() << "Cannot get metadata tag title using Exiv2 ("
-- << QString::fromAscii(e.what().c_str())
-- << ")" << endl;
-- return i18n("Unknown");
-+ DMetadata::printExiv2ExceptionError("Cannot get metadata tag title
using Exiv2 ", e);
- }
-+
-+ return i18n("Unknown");
- }
-
- QString GPSWidget::getTagDescription(const QString& key)
-@@ -359,11 +358,10 @@
- }
- catch (Exiv2::Error& e)
- {
-- DDebug() << "Cannot get metadata tag description using Exiv2 ("
-- << QString::fromAscii(e.what().c_str())
-- << ")" << endl;
-- return i18n("No description available");
-+ DMetadata::printExiv2ExceptionError("Cannot get metadata tag
description using Exiv2 ", e);
- }
-+
-+ return i18n("No description available");
- }
-
- bool GPSWidget::decodeGPSPosition(void)
diff --git a/source/kde-extra/digikam/lcms.patch
b/source/kde-extra/digikam/lcms.patch
deleted file mode 100644
index f086a46..0000000
--- a/source/kde-extra/digikam/lcms.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- digikam/libs/lprof/lcmsprf.h 2007/06/02 15:17:33 670778
-+++ digikam/libs/lprof/lcmsprf.h 2007/08/22 07:03:07 703199
-@@ -69,6 +69,10 @@
-
- } MATN,FAR* LPMATN;
-
-+// See B.K.O #148930: compile with lcms v.1.17
-+#if (LCMS_VERSION > 116)
-+typedef LCMSBOOL BOOL;
-+#endif
-
- LPMATN cdecl MATNalloc(int Rows, int Cols);
- void cdecl MATNfree (LPMATN mat);
-
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
