[SCM] Calligra suite packaging branch, master, updated. debian/2.4.3-2-360-gee8ce7f
Adrien Grellier
adrien-guest at alioth.debian.org
Sat Feb 16 18:18:26 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=e552aaf
The following commit has been merged in the master branch:
commit e552aaf90948ce1e30f0dfd9caff21e18e8ebd55
Author: Adrien Grellier <adrien.grellier at laposte.net>
Date: Wed Oct 5 21:39:56 2011 +0200
remove patches include by upstream.
---
.../patches/jpeg_filter_compile_with_lcms2.patch | 103 --------------------
debian/patches/librcps_remvoe_liblib.patch | 63 ------------
.../plan-shlib-without-versioned-soname.patch | 20 ----
debian/patches/series | 4 -
...FICE_LIB_-SO-VERSION-GENERIC_CALLIGRA_LIB.patch | 23 -----
5 files changed, 0 insertions(+), 213 deletions(-)
diff --git a/debian/patches/jpeg_filter_compile_with_lcms2.patch b/debian/patches/jpeg_filter_compile_with_lcms2.patch
deleted file mode 100644
index 2ab04c7..0000000
--- a/debian/patches/jpeg_filter_compile_with_lcms2.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From: Boudewijn Rempt <boud at valdyas.org>
-Date: Sun, 18 Sep 2011 12:47:42 +0000
-Subject: krita: make jpeg filter compile both with lcms1 and lcms2
-X-Git-Url: http://quickgit.kde.org/?p=calligra.git&a=commitdiff&h=bce5ce530a3b0ef295f99bf1c1a16673267b87cf
----
-krita: make jpeg filter compile both with lcms1 and lcms2
-
-I tested both with lcms2 and lcms1 both installed and with just lcms1.
-
-CCMAIL: Adrien <adrien.grellier at laposte.net>
----
-
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -264,6 +264,7 @@
- macro_log_feature(LCMS2_FOUND "LittleCMS" "Color management engine" "http://www.littlecms.com" FALSE "2.0" "Optional replacement for LittleCMS 1.18. Can be used for color management and Krita")
- if(LCMS2_FOUND)
- set(HAVE_REQUIRED_LCMS_VERSION TRUE)
-+ set(HAVE_LCMS2 TRUE)
- set(HAVE_LCMS TRUE)
- endif(LCMS2_FOUND)
-
---- a/KoConfig.h.cmake
-+++ b/KoConfig.h.cmake
-@@ -30,7 +30,10 @@
-
- /* Defines if you have GL (Mesa, OpenGL, ...) and Qt GL support */
- #cmakedefine HAVE_OPENGL 1
--/* This file contains all the paths that change when changing the installation prefix */
-
-+/* Defines if we use lcms2 */
-+#cmakedefine HAVE_LCMS2 1
-+
-+/* This file contains all the paths that change when changing the installation prefix */
- #define CALLIGRAPREFIX "${CMAKE_INSTALL_PREFIX}"
-
---- a/krita/plugins/formats/jpeg/CMakeLists.txt
-+++ b/krita/plugins/formats/jpeg/CMakeLists.txt
-@@ -1,6 +1,10 @@
- add_subdirectory(tests)
-
--include_directories( ${KRITA_INCLUDES} ${LCMS_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/krita/image/metadata ${EXIV2_INCLUDE_DIR})
-+if(LCMS2_FOUND)
-+ include_directories( ${KRITA_INCLUDES} ${LCMS2_INCLUDE_DIR} ${CMAKE_SOURCE_DIR}/krita/image/metadata ${EXIV2_INCLUDE_DIR})
-+else(LCMS2_FOUND)
-+ include_directories( ${KRITA_INCLUDES} ${CMAKE_SOURCE_DIR}/krita/image/metadata ${EXIV2_INCLUDE_DIR} ${LCMS_INCLUDE_DIR})
-+endif(LCMS2_FOUND)
-
- set(libkritaconverter_LIB_SRCS
- kis_jpeg_converter.cc
-@@ -16,7 +20,11 @@
-
- kde4_add_plugin(kritajpegimport ${kritajpegimport_PART_SRCS})
-
--target_link_libraries(kritajpegimport kritaui jpeg ${LCMS_LIBRARIES} ${EXIV2_LIBRARIES} )
-+if(LCMS2_FOUND)
-+ target_link_libraries(kritajpegimport kritaui jpeg ${LCMS2_LIBRARIES} ${EXIV2_LIBRARIES} )
-+else(LCMS2_FOUND)
-+ target_link_libraries(kritajpegimport kritaui jpeg ${LCMS_LIBRARIES} ${EXIV2_LIBRARIES} )
-+endif(LCMS2_FOUND)
-
- install(TARGETS kritajpegimport DESTINATION ${PLUGIN_INSTALL_DIR})
-
-@@ -31,7 +39,11 @@
-
- kde4_add_plugin(kritajpegexport ${kritajpegexport_PART_SRCS})
-
--target_link_libraries(kritajpegexport kritaui jpeg ${LCMS_LIBRARIES} ${EXIV2_LIBRARIES} )
-+if(LCMS2_FOUND)
-+ target_link_libraries(kritajpegexport kritaui jpeg ${LCMS2_LIBRARIES} ${EXIV2_LIBRARIES} )
-+else(LCMS2_FOUND)
-+ target_link_libraries(kritajpegexport kritaui jpeg ${LCMS_LIBRARIES} ${EXIV2_LIBRARIES} )
-+endif(LCMS2_FOUND)
-
- install(TARGETS kritajpegexport DESTINATION ${PLUGIN_INSTALL_DIR})
-
---- a/krita/plugins/formats/jpeg/kis_jpeg_converter.cc
-+++ b/krita/plugins/formats/jpeg/kis_jpeg_converter.cc
-@@ -25,7 +25,13 @@
-
- #include <stdio.h>
- #include <stdint.h>
--#include <lcms.h>
-+
-+#include <KoConfig.h>
-+#ifdef HAVE_LCMS2
-+# include <lcms2.h>
-+#else
-+# include <lcms.h>
-+#endif
-
- extern "C" {
- #include <iccjpeg.h>
-@@ -171,7 +177,7 @@
- if (read_icc_profile(&cinfo, &profile_data, &profile_len)) {
- profile_rawdata.resize(profile_len);
- memcpy(profile_rawdata.data(), profile_data, profile_len);
-- cmsHPROFILE hProfile = cmsOpenProfileFromMem(profile_data, (DWORD)profile_len);
-+ cmsHPROFILE hProfile = cmsOpenProfileFromMem(profile_data, profile_len);
-
- if (hProfile != (cmsHPROFILE) NULL) {
- profile = KoColorSpaceRegistry::instance()->createColorProfile(modelId, Integer8BitsColorDepthID.id(), profile_rawdata);
diff --git a/debian/patches/librcps_remvoe_liblib.patch b/debian/patches/librcps_remvoe_liblib.patch
deleted file mode 100644
index c42812f..0000000
--- a/debian/patches/librcps_remvoe_liblib.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: Dag Andersen <danders at get2net.dk>
-Date: Thu, 22 Sep 2011 07:01:57 +0000
-Subject: Rename liblibrcps_plan -> librcps_plan
-X-Git-Url: http://quickgit.kde.org/?p=calligra.git&a=commitdiff&h=55c1f31299209f099799c6f6b022bffe42bb7f06
----
-Rename liblibrcps_plan -> librcps_plan
-
-CCMAIL: adrien.grellier at laposte.net
----
-
-
-Index: calligra-2.3.81/plan/plugins/schedulers/rcps/CMakeLists.txt
-===================================================================
---- calligra-2.3.81.orig/plan/plugins/schedulers/rcps/CMakeLists.txt 2011-09-11 15:34:44.000000000 +0200
-+++ calligra-2.3.81/plan/plugins/schedulers/rcps/CMakeLists.txt 2011-09-22 22:02:29.643114960 +0200
-@@ -16,7 +16,7 @@
- kplatorcpsscheduler
- kplatokernel
- koodf
-- librcps_plan
-+ rcps_plan
- # ${LIBRCPS_LIBRARIES}
- )
-
-Index: calligra-2.3.81/plan/plugins/schedulers/rcps/libs/src/CMakeLists.txt
-===================================================================
---- calligra-2.3.81.orig/plan/plugins/schedulers/rcps/libs/src/CMakeLists.txt 2011-09-18 19:18:52.996864031 +0200
-+++ calligra-2.3.81/plan/plugins/schedulers/rcps/libs/src/CMakeLists.txt 2011-09-22 22:02:29.683115157 +0200
-@@ -24,16 +24,16 @@
- endif()
-
- if(WIN32)
-- kde4_add_library(librcps_plan STATIC ${librcps_LIB_SRCS})
-+ kde4_add_library(rcps_plan STATIC ${librcps_LIB_SRCS})
- else(WIN32)
-- kde4_add_library(librcps_plan SHARED ${librcps_LIB_SRCS})
-+ kde4_add_library(rcps_plan SHARED ${librcps_LIB_SRCS})
- endif(WIN32)
-
- target_link_libraries(
-- librcps_plan
-+ rcps_plan
- ${CMAKE_THREAD_LIBS_INIT}
- )
-
--set_target_properties(librcps_plan PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} )
-+set_target_properties(rcps_plan PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} )
-
--install(TARGETS librcps_plan ${INSTALL_TARGETS_DEFAULT_ARGS})
-+install(TARGETS rcps_plan ${INSTALL_TARGETS_DEFAULT_ARGS})
-Index: calligra-2.3.81/plan/plugins/schedulers/rcps/tests/CMakeLists.txt
-===================================================================
---- calligra-2.3.81.orig/plan/plugins/schedulers/rcps/tests/CMakeLists.txt 2011-09-11 15:34:44.000000000 +0200
-+++ calligra-2.3.81/plan/plugins/schedulers/rcps/tests/CMakeLists.txt 2011-09-22 22:02:29.707115280 +0200
-@@ -9,7 +9,7 @@
-
- kde4_add_unit_test(ProjectTester TESTNAME Plan-RCPSTester ${ProjectTester_SRCS})
-
--target_link_libraries(ProjectTester ${KDE4_KDECORE_LIBS} librcps_plan planprivate kplatokernel ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY})
-+target_link_libraries(ProjectTester ${KDE4_KDECORE_LIBS} rcps_plan planprivate kplatokernel ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY})
-
-
- ########### next target ###############
diff --git a/debian/patches/plan-shlib-without-versioned-soname.patch b/debian/patches/plan-shlib-without-versioned-soname.patch
deleted file mode 100644
index 9c84a5e..0000000
--- a/debian/patches/plan-shlib-without-versioned-soname.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Dag Andersen <danders at get2net.dk>
-Date: Sun, 18 Sep 2011 11:41:25 +0000
-Subject: Version librcps_plan
-X-Git-Url: http://quickgit.kde.org/?p=calligra.git&a=commitdiff&h=460a7061258ffd56c4eca3a87cb89e33d3dc9112
----
-Version librcps_plan
-
-Correct the lintian pb shlib-without-versioned-soname
----
-
-
---- a/plan/plugins/schedulers/rcps/libs/src/CMakeLists.txt
-+++ b/plan/plugins/schedulers/rcps/libs/src/CMakeLists.txt
-@@ -34,4 +34,6 @@
- ${CMAKE_THREAD_LIBS_INIT}
- )
-
-+set_target_properties(librcps_plan PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} )
-+
- install(TARGETS librcps_plan ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/debian/patches/series b/debian/patches/series
index 561e82a..80e7dac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1 @@
-jpeg_filter_compile_with_lcms2.patch
-plan-shlib-without-versioned-soname.patch
-upstream_GENERIC_KOFFICE_LIB_-SO-VERSION-GENERIC_CALLIGRA_LIB.patch
braindump_shlib-without-versioned-soname.patch
-librcps_remvoe_liblib.patch
diff --git a/debian/patches/upstream_GENERIC_KOFFICE_LIB_-SO-VERSION-GENERIC_CALLIGRA_LIB.patch b/debian/patches/upstream_GENERIC_KOFFICE_LIB_-SO-VERSION-GENERIC_CALLIGRA_LIB.patch
deleted file mode 100644
index 5df47e4..0000000
--- a/debian/patches/upstream_GENERIC_KOFFICE_LIB_-SO-VERSION-GENERIC_CALLIGRA_LIB.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From a56abd9bb8d370c9f28d15a09b6c435fef04fdd6 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Thu, 15 Sep 2011 22:41:54 +0200
-Subject: [PATCH] GENERIC_KOFFICE_LIB_{,SO}VERSION -> GENERIC_CALLIGRA_LIB_{,SO}VERSION
-
----
- kexi/widget/dataviewcommon/CMakeLists.txt | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/kexi/widget/dataviewcommon/CMakeLists.txt b/kexi/widget/dataviewcommon/CMakeLists.txt
-index 262299e..1376aa2 100644
---- a/kexi/widget/dataviewcommon/CMakeLists.txt
-+++ b/kexi/widget/dataviewcommon/CMakeLists.txt
-@@ -29,5 +29,5 @@ target_link_libraries(
- ${QT_QT3SUPPORT_LIBRARY}
- )
-
--set_target_properties(kexidataviewcommon PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} )
-+set_target_properties(kexidataviewcommon PROPERTIES VERSION ${GENERIC_CALLIGRA_LIB_VERSION} SOVERSION ${GENERIC_CALLIGRA_LIB_SOVERSION} )
- install(TARGETS kexidataviewcommon ${INSTALL_TARGETS_DEFAULT_ARGS})
---
-1.7.1
-
--
Calligra suite packaging
More information about the pkg-kde-commits
mailing list