[arch-commits] Commit in digikam/trunk (PKGBUILD digikam-1.2.0-kde232628.patch)

[Giovanni Scafora]

    Date: Friday, April 2, 2010 @ 10:41:50
  Author: giovanni
Revision: 75684

upgpkg: digikam 1.2.0-2
Fixed FS18927

Added:
  digikam/trunk/digikam-1.2.0-kde232628.patch
Modified:
  digikam/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   14 +++++++++-----
 digikam-1.2.0-kde232628.patch |   11 +++++++++++
 2 files changed, 20 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-02 12:52:53 UTC (rev 75683)
+++ PKGBUILD	2010-04-02 14:41:50 UTC (rev 75684)
@@ -3,21 +3,25 @@
 
 pkgname=digikam
 pkgver=1.2.0
-pkgrel=1
+pkgrel=2
 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)
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2
+        digikam-1.2.0-kde232628.patch)
 replaces=('digikamimageplugins')
 install=digikam.install
 optdepends=('kipi-plugins: for more extras and plugins')
-md5sums=('8f68022008cf1650924cc8688f176572')
+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
@@ -26,6 +30,6 @@
      -DENABLE_MARBLEWIDGET=yes \
      -DWITH_MarbleWidget=yes \
      -DCMAKE_SKIP_RPATH=ON
-   make all|| return 1
-   make DESTDIR=${pkgdir} install || return 1
+   make all || return 1
+   make DESTDIR="${pkgdir}" install || return 1
  }

Added: digikam-1.2.0-kde232628.patch
===================================================================
--- digikam-1.2.0-kde232628.patch	                        (rev 0)
+++ digikam-1.2.0-kde232628.patch	2010-04-02 14:41:50 UTC (rev 75684)
@@ -0,0 +1,11 @@
+--- 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();
+     }