[SCM] Calligra suite packaging branch, master, updated. debian/2.8.5+dfsg-1-80-g78e3e28
Pino Toscano
pino at moszumanska.debian.org
Sun Sep 11 15:22:46 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=78e3e28
The following commit has been merged in the master branch:
commit 78e3e28da94f9e4f385cf32a6b94c0de1543a37d
Author: Pino Toscano <pino at debian.org>
Date: Sun Sep 11 17:22:34 2016 +0200
drop obsolete (already commented out) patches
---
debian/patches/channelFlags_logic_change.patch | 26 -------------
debian/patches/series | 3 --
.../tests-disable_convolution_failling_tests.patch | 27 --------------
.../tests-temporarily_disable_failing_tests.patch | 43 ----------------------
4 files changed, 99 deletions(-)
diff --git a/debian/patches/channelFlags_logic_change.patch b/debian/patches/channelFlags_logic_change.patch
deleted file mode 100644
index 5fa4e4d..0000000
--- a/debian/patches/channelFlags_logic_change.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: calligra/krita/image/tests/kis_layer_test.cpp
-===================================================================
---- calligra.orig/krita/image/tests/kis_layer_test.cpp 2014-07-12 18:40:22.912145877 +0200
-+++ calligra/krita/image/tests/kis_layer_test.cpp 2014-07-12 18:47:50.727436635 +0200
-@@ -63,11 +63,16 @@
- QBitArray channels(4);
- channels.fill(true);
- layer->setChannelFlags(channels);
-- QVERIFY(layer->channelFlags().count() == 4);
-- QCOMPARE(layer->channelFlags().at(0), true);
-- QCOMPARE(layer->channelFlags().at(1), true);
-- QCOMPARE(layer->channelFlags().at(2), true);
-- QCOMPARE(layer->channelFlags().at(3), true);
-+ QBitArray layerChannelFlags = layer->channelFlags();
-+ if (layerChannelFlags.isEmpty()) {
-+ layerChannelFlags =
-+ QBitArray(layer->colorSpace()->channelCount(), true);
-+ }
-+ QVERIFY(layerChannelFlags.count() == 4);
-+ QCOMPARE(layerChannelFlags.at(0), true);
-+ QCOMPARE(layerChannelFlags.at(1), true);
-+ QCOMPARE(layerChannelFlags.at(2), true);
-+ QCOMPARE(layerChannelFlags.at(3), true);
-
-
- layer->setOpacity(OPACITY_TRANSPARENT_U8);
diff --git a/debian/patches/series b/debian/patches/series
index 5385e55..abbb889 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,4 @@ add_keywords_to_desktop_files.patch
cmake-xbase64.patch
libwps-0.4.patch
no-planconvert-jar.patch
-#channelFlags_logic_change.patch
#cmake-do_not_install_removed_files.patch
-##tests-disable_convolution_failling_tests.patch
-#tests-temporarily_disable_failing_tests.patch
diff --git a/debian/patches/tests-disable_convolution_failling_tests.patch b/debian/patches/tests-disable_convolution_failling_tests.patch
deleted file mode 100644
index ae988d6..0000000
--- a/debian/patches/tests-disable_convolution_failling_tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: calligra/krita/image/tests/kis_convolution_painter_test.h
-===================================================================
---- calligra.orig/krita/image/tests/kis_convolution_painter_test.h 2014-03-04 17:39:39.740483334 +0100
-+++ calligra/krita/image/tests/kis_convolution_painter_test.h 2014-03-05 12:44:49.280182233 +0100
-@@ -36,9 +36,8 @@
- void testGaussianSmall(bool useFftw);
- void testGaussianDetails(bool useFftw);
-
--private slots:
--
-- void testIdentityConvolution();
-+ // Disabled tests, due to buggy logic (expects initialData to be equal
-+ // to the resultData after applying a kernel)
- void testSymmConvolution();
-
- void testAsymmAllChannels();
-@@ -47,6 +46,10 @@
- void testAsymmSkipBlue();
- void testAsymmSkipAlpha();
-
-+private slots:
-+
-+ void testIdentityConvolution();
-+
- void benchmarkConvolution();
- void testGaussianSpatial();
- void testGaussianFFTW();
diff --git a/debian/patches/tests-temporarily_disable_failing_tests.patch b/debian/patches/tests-temporarily_disable_failing_tests.patch
deleted file mode 100644
index 6bcdea1..0000000
--- a/debian/patches/tests-temporarily_disable_failing_tests.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- a/krita/ui/tests/CMakeLists.txt
-+++ b/krita/ui/tests/CMakeLists.txt
-@@ -93,17 +93,17 @@
- target_link_libraries(KisClipboardTest ${KDE4_KDEUI_LIBS} kritaui kritaimage ${QT_QTTEST_LIBRARY})
-
- ########### next target ###############
-
--set(freehand_stroke_test_SRCS freehand_stroke_test.cpp ${CMAKE_SOURCE_DIR}/krita/sdk/tests/stroke_testing_utils.cpp)
--kde4_add_unit_test(FreehandStrokeTest TESTNAME krita-ui-FreehandStrokeTest ${freehand_stroke_test_SRCS})
--target_link_libraries(FreehandStrokeTest ${KDE4_KDEUI_LIBS} kritaui kritaimage ${QT_QTTEST_LIBRARY})
-+#set(freehand_stroke_test_SRCS freehand_stroke_test.cpp ${CMAKE_SOURCE_DIR}/krita/sdk/tests/stroke_testing_utils.cpp)
-+#kde4_add_unit_test(FreehandStrokeTest TESTNAME krita-ui-FreehandStrokeTest ${freehand_stroke_test_SRCS})
-+#target_link_libraries(FreehandStrokeTest ${KDE4_KDEUI_LIBS} kritaui kritaimage ${QT_QTTEST_LIBRARY})
-
- ########### next target ###############
-
--set(fill_processing_visitor_test_SRCS fill_processing_visitor_test.cpp ${CMAKE_SOURCE_DIR}/krita/sdk/tests/stroke_testing_utils.cpp)
--kde4_add_unit_test(FillProcessingVisitorTest TESTNAME krita-ui-FillProcessingVisitorTest ${fill_processing_visitor_test_SRCS})
--target_link_libraries(FillProcessingVisitorTest ${KDE4_KDEUI_LIBS} kritadefaulttools kritaui kritaimage ${QT_QTTEST_LIBRARY})
-+#set(fill_processing_visitor_test_SRCS fill_processing_visitor_test.cpp ${CMAKE_SOURCE_DIR}/krita/sdk/tests/stroke_testing_utils.cpp)
-+#kde4_add_unit_test(FillProcessingVisitorTest TESTNAME krita-ui-FillProcessingVisitorTest ${fill_processing_visitor_test_SRCS})
-+#target_link_libraries(FillProcessingVisitorTest ${KDE4_KDEUI_LIBS} kritadefaulttools kritaui kritaimage ${QT_QTTEST_LIBRARY})
-
-
- ########### next target ###############
-
-@@ -155,12 +155,12 @@
- target_link_libraries(KisModelIndexConverterTest ${KDE4_KDEUI_LIBS} kritaui kritaimage ${QT_QTTEST_LIBRARY})
-
- ########### next target ###############
-
--set(kis_zoom_and_pan_test_SRCS kis_zoom_and_pan_test.cpp ../../sdk/tests/testutil.cpp)
--kde4_add_unit_test(KisZoomAndPanTest TESTNAME krita-ui-KisZoomAndPanTest ${kis_zoom_and_pan_test_SRCS})
--target_link_libraries(KisZoomAndPanTest ${KDE4_KDEUI_LIBS} kritaui kritaimage ${QT_QTTEST_LIBRARY})
--set_tests_properties(krita-ui-KisZoomAndPanTest PROPERTIES TIMEOUT 300)
-+# set(kis_zoom_and_pan_test_SRCS kis_zoom_and_pan_test.cpp ../../sdk/tests/testutil.cpp)
-+# kde4_add_unit_test(KisZoomAndPanTest TESTNAME krita-ui-KisZoomAndPanTest ${kis_zoom_and_pan_test_SRCS})
-+# target_link_libraries(KisZoomAndPanTest ${KDE4_KDEUI_LIBS} kritaui kritaimage ${QT_QTTEST_LIBRARY})
-+# set_tests_properties(krita-ui-KisZoomAndPanTest PROPERTIES TIMEOUT 300)
-
- ########### next target ###############
-
- set(kis_input_manager_test_SRCS kis_input_manager_test.cpp ../../sdk/tests/testutil.cpp)
--
Calligra suite packaging
More information about the pkg-kde-commits
mailing list