Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3c5e405d9d009bf39548bd6535effa6659cb9467
commit 3c5e405d9d009bf39548bd6535effa6659cb9467
Author: crazy <cr...@frugalware.org>
Date: Mon Mar 29 12:41:58 2010 +0200
digikam-1.2.0-1-x86_64
* Version bump
* added patch to fix libjpeg6 compile error
diff --git a/source/kde-extra/digikam/FrugalBuild
b/source/kde-extra/digikam/FrugalBuild
index 103f3f5..e060989 100644
--- a/source/kde-extra/digikam/FrugalBuild
+++ b/source/kde-extra/digikam/FrugalBuild
@@ -3,7 +3,7 @@
# Contributor: Bence Nagy <nagybe...@tipogral.hu>
pkgname=digikam
-pkgver=1.1.0
+pkgver=1.2.0
pkgrel=1
pkgdesc="Digital photo management application for kde"
_F_sourceforge_ext=".tar.bz2"
@@ -16,6 +16,8 @@ options=('scriptlet')
conflicts=('digikamimageplugins')
replaces=('digikamimageplugins')
provides=('digikamimageplugins')
-sha1sums=('5ee482ff209c0a29b898e57278d62c428b743ba5')
+source=($source libjpeg6-compile.fix.patch)
+sha1sums=('7f12caf737a05043c7a9a5291a448684e5a4e2e6' \
+ 'dd0d7fa456e6c9b35ff272d617eedc1f1f1e0532')
# optimization OK
diff --git a/source/kde-extra/digikam/libjpeg6-compile.fix.patch
b/source/kde-extra/digikam/libjpeg6-compile.fix.patch
new file mode 100644
index 0000000..55eff1b
--- /dev/null
+++ b/source/kde-extra/digikam/libjpeg6-compile.fix.patch
@@ -0,0 +1,15 @@
+diff -Naur digikam-1.2.0/libs/jpegutils/libjpeg-62/transupp.cpp
digikam-1.2.0-p/libs/jpegutils/libjpeg-62/transupp.cpp
+--- digikam-1.2.0/libs/jpegutils/libjpeg-62/transupp.cpp 2010-03-29
00:18:42.000000000 +0200
++++ digikam-1.2.0-p/libs/jpegutils/libjpeg-62/transupp.cpp 2010-03-29
12:23:37.292190855 +0200
+@@ -16,9 +16,10 @@
+ * it's helpful to let it call jround_up() and jcopy_block_row().
+ */
+ #define JPEG_INTERNALS
+-
++extern "C" {
+ #include "jinclude.h"
+ #include "jpeglib.h"
++}
+ #include "transupp.h" /* My own external interface */
+
+ namespace Digikam
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
