Source Mage code commit list

[Julien ROZO <scm AT sourcemage.org>]

GIT changes to master grimoire by Julien ROZO <julien AT rozo.org>:

 kde4-apps/amarok2/HISTORY             |    4 +++
 kde4-apps/amarok2/PRE_BUILD           |    3 ++
 kde4-apps/amarok2/libgpod-0.7.0.patch |   36 
++++++++++++++++++++++++++++++++++
 kde4-apps/digikam4/DEPENDS            |    3 +-
 kde4-apps/digikam4/HISTORY            |    3 ++
 5 files changed, 48 insertions(+), 1 deletion(-)

New commits:
commit 594cdf24cb60123028420b68266ff2fb163ab063
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

    amarok2: PRE_BUILD, libgpod-0.7.0.patch: added, fix compilation issue 
with libgpod 0.7.0

commit 5005d293f816d7e17cedfe50a3af6e24a5c29a92
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

    digikam4: added kipi-plugins4 as mandatory, and lensfun is only optional

diff --git a/kde4-apps/amarok2/HISTORY b/kde4-apps/amarok2/HISTORY
index 4e97470..10d2ad5 100644
--- a/kde4-apps/amarok2/HISTORY
+++ b/kde4-apps/amarok2/HISTORY
@@ -1,3 +1,7 @@
+2009-04-22 Julien "_kaze_" ROZO <julien AT rozo.org>
+       * PRE_BUILD, libgpod-0.7.0.patch: added, fix compilation issue with
+         libgpod 0.7.0
+
 2009-03-05 Julien "_kaze_" ROZO <julien AT rozo.org>
        * DETAILS: updated version to 2.0.2
        * PRE_BUILD: removed, no longer needed
diff --git a/kde4-apps/amarok2/PRE_BUILD b/kde4-apps/amarok2/PRE_BUILD
new file mode 100755
index 0000000..d44088a
--- /dev/null
+++ b/kde4-apps/amarok2/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < ${SCRIPT_DIRECTORY}/libgpod-0.7.0.patch
diff --git a/kde4-apps/amarok2/libgpod-0.7.0.patch 
b/kde4-apps/amarok2/libgpod-0.7.0.patch
new file mode 100644
index 0000000..bdde4b2
--- /dev/null
+++ b/kde4-apps/amarok2/libgpod-0.7.0.patch
@@ -0,0 +1,36 @@
+diff -Naur 
amarok-2.0.2.orig/src/collection/ipodcollection/handler/IpodHandler.cpp 
amarok-2.0.2/src/collection/ipodcollection/handler/IpodHandler.cpp
+--- amarok-2.0.2.orig/src/collection/ipodcollection/handler/IpodHandler.cpp  
  2009-03-01 18:21:38.000000000 +0100
++++ amarok-2.0.2/src/collection/ipodcollection/handler/IpodHandler.cpp 
2009-04-22 21:18:51.000000000 +0200
+@@ -1339,12 +1339,17 @@
+     QFileInfo tempImageFileInfo( tempImageFile ); // get info for path
+     QString tempImagePath = tempImageFileInfo.absoluteFilePath(); // path
+ 
++#ifdef ITDB_THUMB_COVER_SMALL
+     Itdb_Thumb *thumb = NULL;
++#endif 
+     GdkPixbuf *gpixbuf = NULL;
+     QString thumbPath;
+ 
+     // pull image out of ipod
+ 
++#ifdef ITDB_THUMB_COVER_SMALL
++    // we've got libgpod 0.6.0 here
++
+     if( ipodtrack->has_artwork == 0x01 )
+     {
+         // try small first
+@@ -1406,6 +1411,14 @@
+             }
+         }
+     }
++#else
++    // libgpod 0.7.0
++
++    if( itdb_track_has_thumbnails ( ipodtrack ) )
++    {
++        gpixbuf = (GdkPixbuf*) itdb_track_get_thumbnail (ipodtrack, -1, -1 
);
++    }
++#endif
+ 
+     if(gpixbuf != NULL)
+     {
diff --git a/kde4-apps/digikam4/DEPENDS b/kde4-apps/digikam4/DEPENDS
index 02d07d0..6b07e8a 100755
--- a/kde4-apps/digikam4/DEPENDS
+++ b/kde4-apps/digikam4/DEPENDS
@@ -3,9 +3,10 @@ sub_depends qt4 SQLITE   &&
 depends  sqlite       &&
 depends  lcms        &&
 depends  kdegraphics4  &&
+depends  kipi-plugins4  &&
 depends  jasper       &&
-depends  lensfun      &&
 if [[ $VERSION == svn ]];then
 depends subversion
 fi  &&
+optional_depends  lensfun    &&
 optional_depends  libgphoto2 '' '' 'digital camera support'
diff --git a/kde4-apps/digikam4/HISTORY b/kde4-apps/digikam4/HISTORY
index 0a762b0..0b66344 100644
--- a/kde4-apps/digikam4/HISTORY
+++ b/kde4-apps/digikam4/HISTORY
@@ -1,3 +1,6 @@
+2009-04-22 Julien "_kaze_" ROZO <julien AT rozo.org>
+       * DEPENDS: added kipi-plugins4, and lensfun is only optional
+
 2009-03-17 Treeve Jelbert <treevesourcemage.org>
        * DETAILS: version 0.10.0