[arch-commits] Commit in digikam/trunk (PKGBUILD exiv2-0.14.patch showfoto.patch)
Tobias Powalowski
tpowa at archlinux.org
Sun Mar 15 17:11:54 UTC 2009
Date: Sunday, March 15, 2009 @ 13:11:54
Author: tpowa
Revision: 29995
upgpkg: digikam 0.10.0rc2-1
Modified:
digikam/trunk/PKGBUILD
Deleted:
digikam/trunk/exiv2-0.14.patch
digikam/trunk/showfoto.patch
------------------+
PKGBUILD | 53 ++++++---
exiv2-0.14.patch | 289 -----------------------------------------------------
showfoto.patch | 10 -
3 files changed, 38 insertions(+), 314 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-03-15 17:04:11 UTC (rev 29994)
+++ PKGBUILD 2009-03-15 17:11:54 UTC (rev 29995)
@@ -2,27 +2,50 @@
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
pkgname=digikam
-pkgver=0.9.5beta3
+pkgver=0.10.0rc2
pkgrel=1
pkgdesc="Digital photo management application for kde"
arch=(i686 x86_64)
license=('GPL')
url="http://digikam.sourceforge.net"
-depends=('sqlite3' 'libkipi>=0.1.6' 'libgphoto2' 'exiv2>=0.17.1' 'lcms' 'dcraw' 'libkexiv2>=0.1.7' 'jasper>=1.900.1' 'lcms' 'libkdcraw>=0.1.4')
-makedepends=('pkgconfig')
-source=(http://downloads.sourceforge.net/digikam/${pkgname}-0.9.5-beta3.tar.bz2)
+depends=('libgphoto2' 'lcms' 'kdegraphics' 'kdepimlibs' 'jasper>=1.900.1' 'lensfun')
+makedepends=('pkgconfig' 'cmake')
+source=(http://downloads.sourceforge.net/digikam/${pkgname}-0.10.0-rc2.tar.bz2)
replaces=('digikamimageplugins')
+optdepends=('kipi-plugins: for more extras and plugins')
build() {
- cd ${startdir}/src/${pkgname}-0.9.5-beta3
-
- #Optimisations which work for i686 only
- if [ "$CARCH" = "i686" ];
- then ./configure --prefix=/opt/kde --disable-debug --enable-gcc-hidden-visibility --without-included-sqlite3 --without-arts
- else ./configure --prefix=/opt/kde --disable-debug --without-included-sqlite3 --without-arts
- fi
-
- make || return 1
- make DESTDIR=${startdir}/pkg/ install
+ cd ${srcdir}/${pkgname}-0.10.0-rc2
+ cmake . -DCMAKE_INSTALL_PREFIX=/usr -DENABLE_MARBLEWIDGET=no -DWITH_MarbleWidget=no
+ make all|| return 1
+ make DESTDIR=${pkgdir} install || return 1
+ # remove conflicting files
+ rm ${pkgdir}/usr/share/icons/oxygen/128x128/apps/digikam.png
+ rm ${pkgdir}/usr/share/icons/oxygen/128x128/apps/showfoto.png
+ rm ${pkgdir}/usr/share/icons/oxygen/16x16/actions/transform-crop-and-resize.png
+ rm ${pkgdir}/usr/share/icons/oxygen/16x16/actions/view-object-histogram-linear.png
+ rm ${pkgdir}/usr/share/icons/oxygen/16x16/actions/view-object-histogram-logarithmic.png
+ rm ${pkgdir}/usr/share/icons/oxygen/16x16/apps/digikam.png
+ rm ${pkgdir}/usr/share/icons/oxygen/16x16/apps/showfoto.png
+ rm ${pkgdir}/usr/share/icons/oxygen/22x22/actions/transform-crop-and-resize.png
+ rm ${pkgdir}/usr/share/icons/oxygen/22x22/actions/view-object-histogram-linear.png
+ rm ${pkgdir}/usr/share/icons/oxygen/22x22/actions/view-object-histogram-logarithmic.png
+ rm ${pkgdir}/usr/share/icons/oxygen/22x22/apps/digikam.png
+ rm ${pkgdir}/usr/share/icons/oxygen/22x22/apps/showfoto.png
+ rm ${pkgdir}/usr/share/icons/oxygen/32x32/actions/transform-crop-and-resize.png
+ rm ${pkgdir}/usr/share/icons/oxygen/32x32/actions/view-object-histogram-linear.png
+ rm ${pkgdir}/usr/share/icons/oxygen/32x32/actions/view-object-histogram-logarithmic.png
+ rm ${pkgdir}/usr/share/icons/oxygen/32x32/apps/digikam.png
+ rm ${pkgdir}/usr/share/icons/oxygen/32x32/apps/showfoto.png
+ rm ${pkgdir}/usr/share/icons/oxygen/48x48/actions/transform-crop-and-resize.png
+ rm ${pkgdir}/usr/share/icons/oxygen/48x48/apps/digikam.png
+ rm ${pkgdir}/usr/share/icons/oxygen/48x48/apps/showfoto.png
+ rm ${pkgdir}/usr/share/icons/oxygen/64x64/apps/digikam.png
+ rm ${pkgdir}/usr/share/icons/oxygen/64x64/apps/showfoto.png
+ rm ${pkgdir}/usr/share/icons/oxygen/scalable/actions/transform-crop-and-resize.svgz
+ rm ${pkgdir}/usr/share/icons/oxygen/scalable/actions/view-object-histogram-linear.svgz
+ rm ${pkgdir}/usr/share/icons/oxygen/scalable/actions/view-object-histogram-logarithmic.svgz
+ rm ${pkgdir}/usr/share/icons/oxygen/scalable/apps/digikam.svgz
+ rm ${pkgdir}/usr/share/icons/oxygen/scalable/apps/showfoto.svgz
}
-md5sums=('a69a06c5cb37ef496e23c684a5f10d60')
+md5sums=('7e149f44b3ba743ee6f8880ba748c282')
Deleted: exiv2-0.14.patch
===================================================================
--- exiv2-0.14.patch 2009-03-15 17:04:11 UTC (rev 29994)
+++ exiv2-0.14.patch 2009-03-15 17:11:54 UTC (rev 29995)
@@ -1,289 +0,0 @@
---- trunk/extragear/graphics/digikam/libs/widgets/metadata/exifwidget.cpp 2007/03/15 09:09:21 642722
-+++ trunk/extragear/graphics/digikam/libs/widgets/metadata/exifwidget.cpp 2007/03/15 09:15:46 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"
---- trunk/extragear/graphics/digikam/libs/widgets/metadata/gpswidget.cpp 2007/03/15 09:09:21 642722
-+++ trunk/extragear/graphics/digikam/libs/widgets/metadata/gpswidget.cpp 2007/03/15 09:15:46 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)
---- trunk/extragear/graphics/digikam/libs/widgets/metadata/iptcwidget.cpp 2007/03/15 09:09:21 642722
-+++ trunk/extragear/graphics/digikam/libs/widgets/metadata/iptcwidget.cpp 2007/03/15 09:15:46 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"
---- trunk/extragear/graphics/digikam/libs/widgets/metadata/makernotewidget.cpp 2007/03/15 09:09:21 642722
-+++ trunk/extragear/graphics/digikam/libs/widgets/metadata/makernotewidget.cpp 2007/03/15 09:15:46 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"
-
Deleted: showfoto.patch
===================================================================
--- showfoto.patch 2009-03-15 17:04:11 UTC (rev 29994)
+++ showfoto.patch 2009-03-15 17:11:54 UTC (rev 29995)
@@ -1,10 +0,0 @@
---- digikam/utilities/imageeditor/canvas/dimginterface.h~ 2006-12-17 11:13:08.000000000 +0100
-+++ digikam/utilities/imageeditor/canvas/dimginterface.h 2006-12-17 11:13:08.000000000 +0100
-@@ -44,7 +44,7 @@
- class LoadingDescription;
- class DImgInterfacePrivate;
-
--class DImgInterface : public QObject
-+class DIGIKAM_EXPORT DImgInterface : public QObject
- {
- Q_OBJECT
More information about the arch-commits
mailing list