[Lunar-commits] <moonbase> digikam4: Adding a patch to fix build if libjpeg-turbo is installed which uses

Dennis `stumbles` Veatch stumbles at lunar-linux.org
Sat Sep 3 13:46:12 CEST 2011


commit 2787848f509ca827941fb7adabf7abbbce692dce
Author: Dennis `stumbles` Veatch <stumbles at lunar-linux.org>
Date:   Sat Sep 3 07:46:12 2011 -0400

    digikam4: Adding a patch to fix build if libjpeg-turbo is installed which uses
    
    jconfig.h to contain its version instead of jpeglib.h.
---
 kde4/apps/digikam4/BUILD   |    5 +++++
 kde4/apps/digikam4/DETAILS |    3 +++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/kde4/apps/digikam4/BUILD b/kde4/apps/digikam4/BUILD
index 0bf5697..de41132 100644
--- a/kde4/apps/digikam4/BUILD
+++ b/kde4/apps/digikam4/BUILD
@@ -1,5 +1,10 @@
 (
 
+# Accounting for the different file used to determine jpeg version.
+  if module_installed libjpeg-turbo ; then
+    patch_it $SOURCE2 0
+  fi &&
+
   source /etc/profile.d/qt4.rc  &&
   source /etc/profile.d/kde4.rc &&
 
diff --git a/kde4/apps/digikam4/DETAILS b/kde4/apps/digikam4/DETAILS
index cf0a36b..5a843aa 100644
--- a/kde4/apps/digikam4/DETAILS
+++ b/kde4/apps/digikam4/DETAILS
@@ -1,9 +1,12 @@
           MODULE=digikam4
          VERSION=1.9.0
           SOURCE=digikam-$VERSION.tar.bz2
+         SOURCE2=digikam-1.9.0-turbojpeg.patch
       SOURCE_URL=$SFORGE_URL/digikam
+     SOURCE2_URL=$PATCH_URL
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/digikam-$VERSION
       SOURCE_VFY=sha1:3958c47756e816b3ab8709fcbf41a945bcd4903c
+     SOURCE2_VFY=sha1:d96a79db699cb29d9be4f4ce13ae4500a4652cf0
    MODULE_PREFIX=${KDE4_INSTALL_DIR:-/usr}
         WEB_SITE=http://www.digikam.org
          ENTERED=20090318


More information about the Lunar-commits mailing list