[SCM] Calligra suite packaging branch, experimental, updated. debian/2.4.3-2-44-g8392d0e
Raúl Sánchez Siles
kebianizao-guest at alioth.debian.org
Thu Dec 20 16:40:51 UTC 2012
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=cf268c9
The following commit has been merged in the experimental branch:
commit cf268c9d7878aad282a5df1028aba01e99ee0b19
Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
Date: Thu Dec 6 18:39:25 2012 +0100
Remove all patches since they are already included upstream.
---
debian/changelog | 2 -
...d_videoshape_thumbnails_phononexperimental.diff | 133 --------------------
debian/patches/fix_WPG_filters_build.diff | 22 ----
debian/patches/series | 2 -
4 files changed, 0 insertions(+), 159 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2064a11..39b9592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,7 @@ calligra (1:2.5.92-1) UNRELEASED; urgency=low
[ Raúl Sánchez Siles ]
* New upstream release
- - Added build_videoshape_thumbnails_phononexperimental.diff to fix FTBFS
- Removed do_not_link_blas.diff. Included upstream.
- - Added fix_WPG_filters_build.diff to fix detection of WPG libraries.
-- 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
deleted file mode 100644
index ccc1373..0000000
--- a/debian/patches/build_videoshape_thumbnails_phononexperimental.diff
+++ /dev/null
@@ -1,133 +0,0 @@
-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/fix_WPG_filters_build.diff b/debian/patches/fix_WPG_filters_build.diff
deleted file mode 100644
index dc63506..0000000
--- a/debian/patches/fix_WPG_filters_build.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-commit d84ff4edbc48cbab1395d543fda5b1d5ca10570d
-Author: Yue Liu <yue.liu at mail.com>
-Date: Sat Nov 17 17:11:12 2012 -0500
-
- fix WPG detection, patch from Raúl Sánchez Siles <rasasi78 at gmail.com>
-
-diff --git a/filters/words/CMakeLists.txt b/filters/words/CMakeLists.txt
-index aebcfa1..0c2107c 100644
---- a/filters/words/CMakeLists.txt
-+++ b/filters/words/CMakeLists.txt
-@@ -57,9 +57,9 @@ IF( NOT TINY )
- macro_log_feature(LIBWPS_FOUND "LibWPS" "Microsoft Works Document Library" "http://libwps.sourceforge.net/" FALSE "" "Required by the Words WPS import filter")
-
- add_subdirectory( applixword )
-- if(WPD_FOUND AND WPG_FOUND)
-+ if(WPD_FOUND AND LIBWPG_FOUND)
- add_subdirectory( wordperfect )
-- endif(WPD_FOUND AND WPG_FOUND)
-+ endif(WPD_FOUND AND LIBWPG_FOUND)
- if(WPD_FOUND AND LIBWPS_FOUND)
- add_subdirectory( works )
- endif(WPD_FOUND AND LIBWPS_FOUND)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 185b9d4..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-build_videoshape_thumbnails_phononexperimental.diff
-fix_WPG_filters_build.diff
--
Calligra suite packaging
More information about the pkg-kde-commits
mailing list