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

[Giovanni Scafora]

    Date: Sunday, January 31, 2010 @ 20:07:17
  Author: giovanni
Revision: 66603

Merged revisions 66602 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/digikam/trunk

........
  r66602 | giovanni | 2010-02-01 02:06:36 +0100 (lun, 01 feb 2010) | 2 lines
  
  upgpkg: digikam 1.1.0-1
      upstream release
........

Modified:
  digikam/repos/extra-x86_64/	(properties)
  digikam/repos/extra-x86_64/PKGBUILD
  digikam/repos/extra-x86_64/libpng14.patch

----------------+
 PKGBUILD       |   13 +++++++------
 libpng14.patch |   12 ++++++------
 2 files changed, 13 insertions(+), 12 deletions(-)


Property changes on: digikam/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /digikam/trunk:1-64494
   + /digikam/trunk:1-66602

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2010-02-01 01:06:36 UTC (rev 66602)
+++ extra-x86_64/PKGBUILD	2010-02-01 01:07:17 UTC (rev 66603)
@@ -2,15 +2,16 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=digikam
-pkgver=1.0.0
-pkgrel=2
+pkgver=1.1.0
+pkgrel=1
 pkgdesc="Digital photo management application for kde"
-arch=(i686 x86_64)
+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 libpng14.patch)
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+        libpng14.patch)
 replaces=('digikamimageplugins')
 install=digikam.install
 optdepends=('kipi-plugins: for more extras and plugins')
@@ -29,5 +30,5 @@
    make all|| return 1
    make DESTDIR=${pkgdir} install || return 1
  }
-md5sums=('6169deb68a3d712a0c6539b09c5f8c0c'
-         '80fddb057f635a4a8c200410d6419280')
+md5sums=('94a536e7387325c7b73ab2ac7b0a9a62'
+         'a9efe4671abc89ce46881c843b3a88b6')

Modified: extra-x86_64/libpng14.patch
===================================================================
--- extra-x86_64/libpng14.patch	2010-02-01 01:06:36 UTC (rev 66602)
+++ extra-x86_64/libpng14.patch	2010-02-01 01:07:17 UTC (rev 66603)
@@ -1,6 +1,6 @@
-diff -Nur digikam-1.0.0.orig/libs/dimg/loaders/pngloader.cpp digikam-1.0.0/libs/dimg/loaders/pngloader.cpp
---- digikam-1.0.0.orig/libs/dimg/loaders/pngloader.cpp	2009-12-21 11:20:36.000000000 +0200
-+++ digikam-1.0.0/libs/dimg/loaders/pngloader.cpp	2010-01-20 20:18:51.000000000 +0200
+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];
  
@@ -19,9 +19,9 @@
                      png_set_gray_to_rgb(png_ptr);
  
                      if (QSysInfo::ByteOrder == QSysInfo::LittleEndian)           // Intel
-diff -Nur digikam-1.0.0.orig/libs/threadimageio/thumbnailbasic.cpp digikam-1.0.0/libs/threadimageio/thumbnailbasic.cpp
---- digikam-1.0.0.orig/libs/threadimageio/thumbnailbasic.cpp	2009-12-21 11:20:45.000000000 +0200
-+++ digikam-1.0.0/libs/threadimageio/thumbnailbasic.cpp	2010-01-20 20:19:20.000000000 +0200
+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];