[arch-commits] Commit in digikam/trunk (3 files)

[Tobias Powalowski]

    Date: Thursday, June 10, 2010 @ 12:03:35
  Author: tpowa
Revision: 82386

upgpkg: digikam 1.3.0-1
bump to latest version

Modified:
  digikam/trunk/PKGBUILD
Deleted:
  digikam/trunk/digikam-1.2.0-kde232628.patch
  digikam/trunk/libpng14.patch

-------------------------------+
 PKGBUILD                      |   14 ++++---------
 digikam-1.2.0-kde232628.patch |   11 ----------
 libpng14.patch                |   42 ----------------------------------------
 3 files changed, 5 insertions(+), 62 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-10 15:54:19 UTC (rev 82385)
+++ PKGBUILD	2010-06-10 16:03:35 UTC (rev 82386)
@@ -2,26 +2,21 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=digikam
-pkgver=1.2.0
-pkgrel=2
+pkgver=1.3.0
+pkgrel=1
 pkgdesc="Digital photo management application for kde"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://digikam.sourceforge.net"
 depends=('kdebase-runtime' 'kdegraphics-libs' 'kdepimlibs' 'lensfun' 'kdeedu-marble' 'liblqr')
-makedepends=('pkgconfig' 'cmake' 'automoc4')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
-        digikam-1.2.0-kde232628.patch)
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'doxygen')
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
 replaces=('digikamimageplugins')
 install=digikam.install
 optdepends=('kipi-plugins: for more extras and plugins')
-md5sums=('8f68022008cf1650924cc8688f176572'
-         '2cddb80ade9cd39b1509cb3ff35dd3b0')
 
 build() {
    cd ${srcdir}
-   # Fix for FS#18927 - [digikam] crashes in startup 
-   patch -Np0 -i ${srcdir}/digikam-1.2.0-kde232628.patch || return 1
 
    mkdir build
    cd build
@@ -33,3 +28,4 @@
    make all || return 1
    make DESTDIR="${pkgdir}" install || return 1
  }
+md5sums=('25d09fdab2b2450c6c6075aab3377fce')

Deleted: digikam-1.2.0-kde232628.patch
===================================================================
--- digikam-1.2.0-kde232628.patch	2010-06-10 15:54:19 UTC (rev 82385)
+++ digikam-1.2.0-kde232628.patch	2010-06-10 16:03:35 UTC (rev 82386)
@@ -1,11 +0,0 @@
---- digikam-1.2.0/digikam/ratingwidget.cpp	2010/03/30 18:15:12	1109176
-+++ digikam-1.2.0/digikam/ratingwidget.cpp	2010/03/30 18:15:25	1109177
-@@ -165,7 +165,7 @@
- void RatingWidget::setFadingValue(int value)
- {
-     d->fadingValue = value;
--    if (d->fadingValue >= 255)
-+    if (d->fadingValue >= 255 && d->fadingTimeLine)
-     {
-         d->fadingTimeLine->stop();
-     }

Deleted: libpng14.patch
===================================================================
--- libpng14.patch	2010-06-10 15:54:19 UTC (rev 82385)
+++ libpng14.patch	2010-06-10 16:03:35 UTC (rev 82386)
@@ -1,42 +0,0 @@
-diff -Nur digikam-1.1.0.orig/libs/dimg/loaders/pngloader.cpp digikam-1.1.0/libs/dimg/loaders/pngloader.cpp
---- digikam-1.1.0.orig/libs/dimg/loaders/pngloader.cpp	2009-12-21 11:20:36.000000000 +0200
-+++ digikam-1.1.0/libs/dimg/loaders/pngloader.cpp	2010-01-20 20:18:51.000000000 +0200
-@@ -105,7 +105,7 @@
-     unsigned char buf[PNG_BYTES_TO_CHECK];
- 
-     size_t membersRead = fread(buf, 1, PNG_BYTES_TO_CHECK, f);
--    if ((membersRead != PNG_BYTES_TO_CHECK) || !png_check_sig(buf, PNG_BYTES_TO_CHECK))
-+    if ((membersRead != PNG_BYTES_TO_CHECK) || png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
-     {
-         kDebug() << "Not a PNG image file.";
-         fclose(f);
-@@ -322,7 +322,7 @@
- #ifdef ENABLE_DEBUG_MESSAGES
-                     kDebug() << "PNG in PNG_COLOR_TYPE_GRAY";
- #endif
--                    png_set_gray_1_2_4_to_8(png_ptr);
-+                    png_set_expand_gray_1_2_4_to_8(png_ptr);
-                     png_set_gray_to_rgb(png_ptr);
- 
-                     if (QSysInfo::ByteOrder == QSysInfo::LittleEndian)           // Intel
-diff -Nur digikam-1.1.0.orig/libs/threadimageio/thumbnailbasic.cpp digikam-1.1.0/libs/threadimageio/thumbnailbasic.cpp
---- digikam-1.1.0.orig/libs/threadimageio/thumbnailbasic.cpp	2009-12-21 11:20:45.000000000 +0200
-+++ digikam-1.1.0/libs/threadimageio/thumbnailbasic.cpp	2010-01-20 20:19:20.000000000 +0200
-@@ -137,7 +137,7 @@
-     unsigned char buf[PNG_BYTES_TO_CHECK];
- 
-     size_t itemsRead = fread(buf, 1, PNG_BYTES_TO_CHECK, f);
--    if (itemsRead != 1 || !png_check_sig(buf, PNG_BYTES_TO_CHECK))
-+    if (itemsRead != 1 || png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK))
-     {
-         fclose(f);
-         return qimage;
-@@ -232,7 +232,7 @@
-     {
-         png_set_gray_to_rgb(png_ptr);
-         if (png_get_bit_depth(png_ptr, info_ptr) < 8)
--            png_set_gray_1_2_4_to_8(png_ptr);
-+            png_set_expand_gray_1_2_4_to_8(png_ptr);
-     }
- 
-     int sizeOfUint = sizeof(unsigned int);