[SCM] Calligra suite packaging branch, tip, updated. debian/2.4.3-2-368-g6843e2f

[Adrien Grellier]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=ff7c1b6

The following commit has been merged in the tip branch:
commit ff7c1b6ce55c4db32df9d5675c221a19a981c5c4
Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
Date:   Fri Nov 9 20:34:22 2012 +0100

    patch: Fix FTBFS phonon experimental related.
---
 debian/changelog                                   |    1 +
 ...d_videoshape_thumbnails_phononexperimental.diff |  133 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 135 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 37dd9c4..dd8261a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ calligra (1:2.5.91-1) UNRELEASED; urgency=low
 
   [ Raúl Sánchez Siles ]
   * New upstream release
+    - Added build_videoshape_thumbnails_phononexperimental.diff to fix FTBFS
 
  -- Adrien Grellier <adrien.grellier at laposte.net>  Tue, 21 Aug 2012 10:17:19 +0200
 
diff --git a/debian/patches/build_videoshape_thumbnails_phononexperimental.diff b/debian/patches/build_videoshape_thumbnails_phononexperimental.diff
new file mode 100644
index 0000000..ccc1373
--- /dev/null
+++ b/debian/patches/build_videoshape_thumbnails_phononexperimental.diff
@@ -0,0 +1,133 @@
+commit ef3d8b2b5ea9af14360074bf79d7e8c4340b68cb
+Author: C. Boemann <cbo at boemann.dk>
+Date:   Sun Nov 18 08:44:32 2012 +0100
+
+    Apply patch that fixes build of videoshape
+    
+    Thanks to Raúl Sánchez Siles
+    
+    CCMAIL: rasasi78 at gmail.com
+
+diff --git a/plugins/videoshape/CMakeLists.txt b/plugins/videoshape/CMakeLists.txt
+index a9f89ef..66c1376 100644
+--- a/plugins/videoshape/CMakeLists.txt
++++ b/plugins/videoshape/CMakeLists.txt
+@@ -1,5 +1,13 @@
+ include_directories( ${PHONON_INCLUDE_DIR} )
+ 
++if(PHONON_FOUND_EXPERIMENTAL)
++   set(SHOULD_BUILD_THUMBNAIL TRUE)
++   add_definitions( -DSHOULD_BUILD_THUMBNAIL )
++else(PHONON_FOUND_EXPERIMENTAL)
++    set(SHOULD_BUILD_THUMBNAIL FALSE)
++endif(PHONON_FOUND_EXPERIMENTAL)
++
++
+ ########### Flake Plugin library ###############
+ 
+ SET (videoshape_LIB_SRCS
+@@ -15,16 +23,20 @@ SET (videoshape_LIB_SRCS
+     VideoToolFactory.cpp
+     ChangeVideoCommand.cpp
+     SelectVideoWidget.cpp
+-    VideoThumbnailer.cpp
+ )
+ 
++if(SHOULD_BUILD_THUMBNAIL)
++    set(videoshape_LIB_SRCS ${videoshape_LIB_SRCS} VideoThumbnailer.cpp)
++endif(SHOULD_BUILD_THUMBNAIL)
++
+ kde4_add_ui_files(videoshape_LIB_SRCS forms/VideoToolWidget.ui)
+ kde4_add_plugin(videoshape ${videoshape_LIB_SRCS})
+ 
+-target_link_libraries(videoshape komain phononexperimental
++target_link_libraries(videoshape komain
+     ${KDE4_KFILE_LIBRARY}
+-    ${KDE4_PHONON_LIBRARY}
++    ${PHONON_LIBS}
+ )
++
+ install(TARGETS videoshape DESTINATION ${PLUGIN_INSTALL_DIR})
+ 
+ ########### install files ###############
+diff --git a/plugins/videoshape/VideoShape.cpp b/plugins/videoshape/VideoShape.cpp
+index ff5b4ae..d221098 100644
+--- a/plugins/videoshape/VideoShape.cpp
++++ b/plugins/videoshape/VideoShape.cpp
+@@ -27,7 +27,9 @@
+ #include <VideoEventAction.h>
+ #include <VideoCollection.h>
+ #include <VideoData.h>
++#ifdef SHOULD_BUILD_THUMBNAIL
+ #include <VideoThumbnailer.h>
++#endif
+ #include <KoShapeLoadingContext.h>
+ #include <KoOdfLoadingContext.h>
+ #include <KoShapeSavingContext.h>
+@@ -47,7 +49,9 @@ VideoShape::VideoShape()
+     , m_videoEventAction(new VideoEventAction(this))
+     , m_icon(koIconName("video-x-generic"))
+     , m_oldVideoData(0)
++#ifdef SHOULD_BUILD_THUMBNAIL
+     , m_thumbnailer(new VideoThumbnailer())
++#endif
+ {
+     setKeepAspectRatio(true);
+     addEventAction(m_videoEventAction);
+@@ -55,7 +59,9 @@ VideoShape::VideoShape()
+ 
+ VideoShape::~VideoShape()
+ {
++#ifdef SHOULD_BUILD_THUMBNAIL
+     delete m_thumbnailer;
++#endif
+ }
+ 
+ void VideoShape::paint(QPainter &painter, const KoViewConverter &converter, KoShapePaintingContext &)
+@@ -63,7 +69,7 @@ void VideoShape::paint(QPainter &painter, const KoViewConverter &converter, KoSh
+     QRectF pixelsF = converter.documentToView(QRectF(QPointF(0,0), size()));
+ 
+     VideoData *currentVideoData = videoData();
+-
++#ifdef SHOULD_BUILD_THUMBNAIL
+     if (currentVideoData && currentVideoData != m_oldVideoData) {
+         //generate thumbnails
+         m_oldVideoData = currentVideoData;
+@@ -79,6 +85,13 @@ void VideoShape::paint(QPainter &painter, const KoViewConverter &converter, KoSh
+     } else {
+         painter.drawImage(pixelsF, thumnailImage);
+     }
++#else
++    painter.fillRect(pixelsF, QColor(Qt::gray));
++    painter.setPen(QPen());
++    painter.drawRect(pixelsF);
++
++    m_icon.paint(&painter, pixelsF.toRect());
++#endif
+ }
+ 
+ void VideoShape::saveOdf(KoShapeSavingContext &context) const
+diff --git a/plugins/videoshape/VideoShape.h b/plugins/videoshape/VideoShape.h
+index 059220a..12a8545 100644
+--- a/plugins/videoshape/VideoShape.h
++++ b/plugins/videoshape/VideoShape.h
+@@ -33,7 +33,9 @@
+ class VideoCollection;
+ class VideoEventAction;
+ class VideoData;
++#ifdef SHOULD_BUILD_THUMBNAIL
+ class VideoThumbnailer;
++#endif
+ 
+ class QImage;
+ 
+@@ -76,7 +78,9 @@ signals:
+ private:
+     VideoCollection *m_videoCollection;
+     VideoEventAction *m_videoEventAction;
++#ifdef SHOULD_BUILD_THUMBNAIL
+     VideoThumbnailer *m_thumbnailer;
++#endif
+     VideoData *m_oldVideoData;
+     KIcon m_icon;
+     QRectF m_playIconArea;
diff --git a/debian/patches/series b/debian/patches/series
index 7dc314a..78ff283 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+build_videoshape_thumbnails_phononexperimental.diff
 do_not_link_blas.diff

-- 
Calligra suite packaging