From kde-commits Tue Dec 31 23:04:12 2013 From: Andrius da Costa Ribas Date: Tue, 31 Dec 2013 23:04:12 +0000 To: kde-commits Subject: [emerge/kde-4.12] portage/kdeapps/calligra: Add 2.7.90 (2.8 beta 1) tarball target for Calligra. (+p Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=138853106729890 Git commit bc0197215b54a6d51131c2c86c863c9b7492f2fd by Andrius da Costa Rib= as. Committed on 31/12/2013 at 22:36. Pushed by andriusr into branch 'kde-4.12'. Add 2.7.90 (2.8 beta 1) tarball target for Calligra. (+patches) M +10 -1 portage/kdeapps/calligra/calligra-20120805.py A +77 -0 portage/kdeapps/calligra/patches/2.7.90/deduplicate-includes= -where-moc-fails-due-to-long-commandline.patch A +20 -0 portage/kdeapps/calligra/patches/2.7.90/gsl-cblas-link-fix.p= atch A +18 -0 portage/kdeapps/calligra/patches/2.7.90/rng2cpp-fix.patch http://commits.kde.org/emerge/bc0197215b54a6d51131c2c86c863c9b7492f2fd diff --git a/portage/kdeapps/calligra/calligra-20120805.py b/portage/kdeapp= s/calligra/calligra-20120805.py index 6959c73..992abbd 100644 --- a/portage/kdeapps/calligra/calligra-20120805.py +++ b/portage/kdeapps/calligra/calligra-20120805.py @@ -4,7 +4,16 @@ class subinfo( info.infoclass ): def setTargets( self ): self.svnTargets['gitHEAD'] =3D "[git]kde:calligra" self.svnTargets['2.8'] =3D "[git]kde:calligra|calligra/2.8" - self.defaultTarget =3D '2.8' + = + for ver in ['2.7.90']: + self.targets[ver] =3D "http://download.kde.org/unstable/callig= ra-" + ver + "/calligra-" + ver + ".tar.xz" + self.targetInstSrc[ver] =3D 'calligra-' + ver + self.targetDigests['2.7.90'] =3D 'bc689b9644c0adfafa2cccd840a0abbd= bf098ef8' + self.patchToApply['2.7.90'] =3D [ ('patches/2.7.90/rng2cpp-fix.pat= ch', 1), + ('patches/2.7.90/deduplicate-inclu= des-where-moc-fails-due-to-long-commandline.patch', 1), + ('patches/2.7.90/gsl-cblas-link-fi= x.patch', 1) ] + = + self.defaultTarget =3D '2.7.90' self.shortDescription =3D "The Calligra Suite of Applications" = def setDependencies( self ): diff --git a/portage/kdeapps/calligra/patches/2.7.90/deduplicate-includes-w= here-moc-fails-due-to-long-commandline.patch b/portage/kdeapps/calligra/pat= ches/2.7.90/deduplicate-includes-where-moc-fails-due-to-long-commandline.pa= tch new file mode 100644 index 0000000..a70c146 --- /dev/null +++ b/portage/kdeapps/calligra/patches/2.7.90/deduplicate-includes-where-mo= c-fails-due-to-long-commandline.patch @@ -0,0 +1,77 @@ +diff -Nru -x '*~' calligra-2.7.90.orig/CMakeLists.txt calligra-2.7.90/CMak= eLists.txt +--- calligra-2.7.90.orig/CMakeLists.txt 2013-12-01 16:24:21.000000000 -0200 ++++ calligra-2.7.90/CMakeLists.txt 2013-12-31 18:20:37.171479600 -0200 +@@ -864,6 +864,25 @@ + ${CMAKE_SOURCE_DIR}/filters/libodfreader + ) + = ++ ++####################################################### ++#### Utility macro to remove duplicated includes #### ++#### #### ++#### On Windows duplicated include path may #### ++#### cause too long command line for the compiler #### ++#### and also for moc. #### ++#### #### ++#### Other platforms may also benefit from this. #### ++#### #### ++#### CMake >=3D 2.8.8 do not do this automatically. #### ++####################################################### ++ ++macro(remove_duplicated_include_directories) ++ get_directory_property(dupdirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} = INCLUDE_DIRECTORIES) ++ list(REMOVE_DUPLICATES dupdirs) ++ set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES "${dupdirs}") ++endmacro() ++ + ######################################### + ########################################## + ## Detect which products can be compile ## +diff -Nru -x '*~' calligra-2.7.90.orig/krita/image/CMakeLists.txt calligra= -2.7.90/krita/image/CMakeLists.txt +--- calligra-2.7.90.orig/krita/image/CMakeLists.txt 2013-12-01 16:24:22.00= 0000000 -0200 ++++ calligra-2.7.90/krita/image/CMakeLists.txt 2013-12-31 19:00:08.8230635= 00 -0200 +@@ -51,6 +51,8 @@ + ${KOMAIN_INCLUDES} + ) + = ++remove_duplicated_include_directories() ++ + if(HAVE_VC) + include_directories(${Vc_INCLUDE_DIR}) + ko_compile_for_all_implementations(__per_arch_circle_mask_generator_obj= s kis_brush_mask_applicator_factories.cpp) +diff -Nru -x '*~' calligra-2.7.90.orig/krita/ui/CMakeLists.txt calligra-2.= 7.90/krita/ui/CMakeLists.txt +--- calligra-2.7.90.orig/krita/ui/CMakeLists.txt 2013-12-01 16:24:25.00000= 0000 -0200 ++++ calligra-2.7.90/krita/ui/CMakeLists.txt 2013-12-31 18:28:36.129919400 = -0200 +@@ -18,6 +18,8 @@ + ${CMAKE_SOURCE_DIR}/krita/image/metadata + ${EXIV2_INCLUDE_DIR} ) + = ++remove_duplicated_include_directories() ++ + add_subdirectory( tests ) + = + = +diff -Nru -x '*~' calligra-2.7.90.orig/sheets/shape/CMakeLists.txt calligr= a-2.7.90/sheets/shape/CMakeLists.txt +--- calligra-2.7.90.orig/sheets/shape/CMakeLists.txt 2013-12-01 16:24:26.0= 00000000 -0200 ++++ calligra-2.7.90/sheets/shape/CMakeLists.txt 2013-12-31 18:40:51.050343= 100 -0200 +@@ -6,6 +6,8 @@ + ${TEXTLAYOUT_INCLUDES} + ) + = ++remove_duplicated_include_directories() ++ + ########### Flake Plugin library ############### + = + SET (tableshape_LIB_SRCS +diff -Nru -x '*~' calligra-2.7.90.orig/stage/part/CMakeLists.txt calligra-= 2.7.90/stage/part/CMakeLists.txt +--- calligra-2.7.90.orig/stage/part/CMakeLists.txt 2013-12-01 16:24:26.000= 000000 -0200 ++++ calligra-2.7.90/stage/part/CMakeLists.txt 2013-12-31 18:21:42.51449990= 0 -0200 +@@ -2,6 +2,8 @@ + = + include_directories( ${KOMAIN_INCLUDES} ${KOPAGEAPP_INCLUDES} ${Boost_INC= LUDE_DIR}) + = ++remove_duplicated_include_directories() ++ + if(KDE4_BUILD_TESTS) + # only with this definition will the STAGE_TEST_EXPORT macro do somet= hing + add_definitions(-DCOMPILING_TESTS) diff --git a/portage/kdeapps/calligra/patches/2.7.90/gsl-cblas-link-fix.pat= ch b/portage/kdeapps/calligra/patches/2.7.90/gsl-cblas-link-fix.patch new file mode 100644 index 0000000..7344174 --- /dev/null +++ b/portage/kdeapps/calligra/patches/2.7.90/gsl-cblas-link-fix.patch @@ -0,0 +1,20 @@ +diff -Nru -x '*~' calligra-2.7.90.orig/sheets/plugins/solver/CMakeLists.tx= t calligra-2.7.90/sheets/plugins/solver/CMakeLists.txt +--- calligra-2.7.90.orig/sheets/plugins/solver/CMakeLists.txt 2013-12-01 1= 6:24:26.000000000 -0200 ++++ calligra-2.7.90/sheets/plugins/solver/CMakeLists.txt 2013-12-31 20:03:= 51.616997100 -0200 +@@ -27,11 +27,14 @@ + = + target_link_libraries( sheetssolver + ${GSL_LIBRARIES} +- calligrasheetscommon ++ calligrasheetscommon + ) + = +-install(TARGETS sheetssolver DESTINATION ${PLUGIN_INSTALL_DIR}) ++if(WIN32) ++ target_link_libraries( sheetssolver ${GSL_CBLAS_LIBRARIES} ) ++endif(WIN32) + = ++install(TARGETS sheetssolver DESTINATION ${PLUGIN_INSTALL_DIR}) + = + ########### install files ############### + = diff --git a/portage/kdeapps/calligra/patches/2.7.90/rng2cpp-fix.patch b/po= rtage/kdeapps/calligra/patches/2.7.90/rng2cpp-fix.patch new file mode 100644 index 0000000..4d9639b --- /dev/null +++ b/portage/kdeapps/calligra/patches/2.7.90/rng2cpp-fix.patch @@ -0,0 +1,18 @@ +diff -Nru -x '*~' calligra-2.7.90.orig/libs/odf/writeodf/CMakeLists.txt ca= lligra-2.7.90/libs/odf/writeodf/CMakeLists.txt +--- calligra-2.7.90.orig/libs/odf/writeodf/CMakeLists.txt 2013-12-01 16:24= :25.000000000 -0200 ++++ calligra-2.7.90/libs/odf/writeodf/CMakeLists.txt 2013-12-28 14:06:59.0= 32923400 -0200 +@@ -1,13 +1,9 @@ + set(RNGFILE ${CMAKE_SOURCE_DIR}/devtools/scripts/OpenDocument-v1.2-cs01-s= chema-calligra.rng) + set(RNGHEADERDIR ${CMAKE_BINARY_DIR}/libs/odf/writeodf) + if (WIN32) +- find_program(RNG2CCP_EXECUTABLE rng2cpp +- ${CMAKE_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE} +- ${CMAKE_BINARY_DIR}/bin +- ) + add_custom_command( + OUTPUT ${RNGHEADERDIR}/writeodf.h +- COMMAND ${RNG2CCP_EXECUTABLE} ++ COMMAND rng2cpp + ARGS ${RNGFILE} ${RNGHEADERDIR} + DEPENDS rng2cpp ${RNGFILE} + WORKING_DIRECTORY ${RNGHEADERDIR}