[SCM] Calligra suite packaging branch, master, updated. debian/3.0.1+dfsg-2
Pino Toscano
pino at moszumanska.debian.org
Wed Sep 6 06:50:39 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/calligra/calligra.git;a=commitdiff;h=e153dc2
The following commit has been merged in the master branch:
commit e153dc2db10627dcce030c59666647db34305bc0
Author: Pino Toscano <pino at debian.org>
Date: Sat Aug 19 16:22:56 2017 +0200
update the patches
- upstream_fix-arm-FTBFS.patch: drop, obsolete
- upstream_Fix-compilation-of-PsCommentLexer.cpp-on-platforms-w.patch:
drop, backported from upstream
- libwps-0.4.patch: drop, applied upstream
- no-planconvert-jar.patch: drop, obsolete
---
debian/changelog | 6 +++
debian/patches/libwps-0.4.patch | 46 ----------------------
debian/patches/no-planconvert-jar.patch | 14 -------
debian/patches/series | 4 --
...tion-of-PsCommentLexer.cpp-on-platforms-w.patch | 29 --------------
debian/patches/upstream_fix-arm-FTBFS.patch | 25 ------------
6 files changed, 6 insertions(+), 118 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 713f9ac..3e90065 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ calligra (1:3.0.1+dfsg-0r1) UNRELEASED; urgency=medium
* New upstream release.
* Cleanup copyright from removed stuff, and other minor changes.
* Bring the repack suffix back to "+dfsg".
+ * Update the patches:
+ - upstream_fix-arm-FTBFS.patch: drop, obsolete
+ - upstream_Fix-compilation-of-PsCommentLexer.cpp-on-platforms-w.patch:
+ drop, backported from upstream
+ - libwps-0.4.patch: drop, applied upstream
+ - no-planconvert-jar.patch: drop, obsolete
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sat, 19 Aug 2017 15:51:55 +0200
diff --git a/debian/patches/libwps-0.4.patch b/debian/patches/libwps-0.4.patch
deleted file mode 100644
index 79595d9..0000000
--- a/debian/patches/libwps-0.4.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Last-Update: 2015-06-17
-Forwarded: no
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=788969
-Origin: http://pkgs.fedoraproject.org/cgit/calligra.git/commit/?id=124c28df44584e08b00d4dbb859362af73c41070
-From: David Tardon <dtardon at redhat.com>
-Description: adapt to libwps 0.4
-
---- a/cmake/modules/FindLibWps.cmake
-+++ b/cmake/modules/FindLibWps.cmake
-@@ -9,18 +9,18 @@
- # Redistribution and use is allowed according to the terms of the BSD license.
-
- include(LibFindMacros)
- libfind_package(LIBWPS LibWpd)
--libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.3)
-+libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.4)
-
- find_path(LIBWPS_INCLUDE_DIR
- NAMES libwps/libwps.h
- HINTS ${LIBWPS_PKGCONF_INCLUDE_DIRS} ${LIBWPS_PKGCONF_INCLUDEDIR}
-- PATH_SUFFIXES libwps-0.3
-+ PATH_SUFFIXES libwps-0.4
- )
-
- find_library(LIBWPS_LIBRARY
-- NAMES wps wps-0.3
-+ NAMES wps wps-0.4
- HINTS ${LIBWPS_PKGCONF_LIBRARY_DIRS} ${LIBWPS_PKGCONF_LIBDIR}
- )
-
- set(LIBWPS_PROCESS_LIBS LIBWPS_LIBRARY LIBWPD_LIBRARIES)
---- a/filters/words/works/import/WPSImport.cpp
-+++ b/filters/words/works/import/WPSImport.cpp
-@@ -90,9 +90,11 @@
- }
- bool isSupportedFormat(librevenge::RVNGInputStream &input)
- {
- WPSKind kind = WPS_TEXT;
-- WPSConfidence confidence = WPSDocument::isFileFormatSupported(&input, kind);
-+ WPSCreator creator = WPS_MSWORKS;
-+ bool needsEncoding = false;
-+ WPSConfidence confidence = WPSDocument::isFileFormatSupported(&input, kind, creator, needsEncoding);
- if (confidence == WPS_CONFIDENCE_NONE || kind != WPS_TEXT)
- return false;
- return true;
- }
diff --git a/debian/patches/no-planconvert-jar.patch b/debian/patches/no-planconvert-jar.patch
deleted file mode 100644
index 9ea288f..0000000
--- a/debian/patches/no-planconvert-jar.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Last-Update: 2015-09-19
-Forwarded: not-needed
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Description: do not install pre-build .JAR dropped from +DFSG tarball (prevents FTBFS).
-
---- a/filters/plan/mpxj/planconvert/CMakeLists.txt
-+++ b/filters/plan/mpxj/planconvert/CMakeLists.txt
-@@ -6,5 +6,5 @@
- "${CMAKE_BINARY_DIR}/filters/plan/mpxj/planconvert/mpxjconfig.h"
- )
-
-
--install(FILES jar/PlanConvert.jar DESTINATION ${PLANCONVERT_INSTALL_DIR})
-+#install(FILES jar/PlanConvert.jar DESTINATION ${PLANCONVERT_INSTALL_DIR})
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index cd4130b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-upstream_fix-arm-FTBFS.patch
-upstream_Fix-compilation-of-PsCommentLexer.cpp-on-platforms-w.patch
-libwps-0.4.patch
-no-planconvert-jar.patch
diff --git a/debian/patches/upstream_Fix-compilation-of-PsCommentLexer.cpp-on-platforms-w.patch b/debian/patches/upstream_Fix-compilation-of-PsCommentLexer.cpp-on-platforms-w.patch
deleted file mode 100644
index a3049d2..0000000
--- a/debian/patches/upstream_Fix-compilation-of-PsCommentLexer.cpp-on-platforms-w.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 956bb80db4f300e4f8edeaf19d24fd61eb1932b2 Mon Sep 17 00:00:00 2001
-From: "Friedrich W. H. Kossebau" <kossebau at kde.org>
-Date: Mon, 31 Aug 2015 13:47:07 +0200
-Subject: [PATCH] Fix compilation of PsCommentLexer.cpp on platforms where char
- is unsigned
-
-REVIEW: 124883
-
-Thanks Tom Hall for the fix
----
- filters/karbon/eps/PsCommentLexer.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/filters/karbon/eps/PsCommentLexer.cpp b/filters/karbon/eps/PsCommentLexer.cpp
-index 6487df6..dd928d6 100644
---- a/filters/karbon/eps/PsCommentLexer.cpp
-+++ b/filters/karbon/eps/PsCommentLexer.cpp
-@@ -63,7 +63,7 @@ const char*statetoa(State state)
-
- typedef struct {
- State oldState;
-- char c;
-+ signed char c;
- State newState;
- Action action;
- } Transition;
---
-2.9.3
-
diff --git a/debian/patches/upstream_fix-arm-FTBFS.patch b/debian/patches/upstream_fix-arm-FTBFS.patch
deleted file mode 100644
index 1b42a6a..0000000
--- a/debian/patches/upstream_fix-arm-FTBFS.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 04d61e92515f19cbd2dbb0cc06d4340ba4514a8a Mon Sep 17 00:00:00 2001
-From: Rex Dieter <rdieter at math.unl.edu>
-Date: Sat, 11 Jun 2016 09:49:41 -0500
-Subject: [PATCH] fix arm FTBFS
-
----
- libs/flake/KoSnapStrategy.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libs/flake/KoSnapStrategy.cpp b/libs/flake/KoSnapStrategy.cpp
-index fd9de8e..e644e35 100644
---- a/libs/flake/KoSnapStrategy.cpp
-+++ b/libs/flake/KoSnapStrategy.cpp
-@@ -181,7 +181,7 @@ bool ExtensionSnapStrategy::snap(const QPointF &mousePosition, KoSnapProxy * pro
- Q_ASSERT(isfinite(maxSnapDistance));
-
- const qreal maxDistance = maxSnapDistance * maxSnapDistance;
-- qreal minDistances[2] = { HUGE_VAL, HUGE_VAL };
-+ qreal minDistances[2] = { (qreal)HUGE_VAL, (qreal)HUGE_VAL };
-
- QPointF snappedPoints[2] = { mousePosition, mousePosition };
- QPointF startPoints[2];
---
-2.9.3
-
--
Calligra suite packaging
More information about the pkg-kde-commits
mailing list