Disable build of active and gemini components
authorYaakov Selkowitz <yselkowi@redhat.com>
Tue, 12 May 2015 16:37:11 +0000 (11:37 -0500)
committerYaakov Selkowitz <yselkowi@redhat.com>
Tue, 12 May 2015 16:37:11 +0000 (11:37 -0500)
2.9.4-disable-krita-gemini.patch [new file with mode: 0644]
calligra.cygport

diff --git a/2.9.4-disable-krita-gemini.patch b/2.9.4-disable-krita-gemini.patch
new file mode 100644 (file)
index 0000000..fee5666
--- /dev/null
@@ -0,0 +1,11 @@
+--- origsrc/calligra-2.9.4/krita/CMakeLists.txt        2015-05-03 07:08:17.000000000 -0500
++++ src/calligra-2.9.4/krita/CMakeLists.txt    2015-05-12 00:26:14.935313300 -0500
+@@ -172,7 +172,7 @@
+ install(FILES  krita.action DESTINATION ${DATA_INSTALL_DIR}/krita/actions)
+ install(FILES  krita.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/ )
+-if (${QTVERSION} VERSION_GREATER 4.7.0 AND NOT APPLE AND HAVE_OPENGL)
++if (FALSE) # (${QTVERSION} VERSION_GREATER 4.7.0 AND NOT APPLE AND HAVE_OPENGL)
+     add_subdirectory(sketch)
+     add_subdirectory(gemini)
+ endif ()
index 72d9cd898c54f3248bbade0d3ba4c47c838c2cd9..58db6e731334ffd159c00f08dae88a48033dc3d7 100644 (file)
@@ -2,17 +2,19 @@ inherit kde4 python
 
 NAME="calligra"
 VERSION=2.9.4
-RELEASE=1
+RELEASE=2
 CATEGORY="Office"
 SUMMARY="KDE integrated office suite"
 HOMEPAGE="http://www.calligra-suite.org/"
 SRC_URI="mirror://kde/stable/calligra-${VERSION}/calligra-${VERSION}.tar.xz"
 PATCH_URI="
+       http://pkgs.fedoraproject.org/cgit/calligra.git/plain/calligra-2.9.0-disable_products.patch
        2.9.2-as-needed.patch
        2.3.83-find-librcps.patch
        2.8.7-qml-module.patch
        2.9.2-cygwin-gmic.patch
        2.9.2-cygwin-postgresql.patch
+       2.9.4-disable-krita-gemini.patch
 "
 
 PKG_NAMES="calligra-libs calligra-data calligra-devel calligra-flow
@@ -169,7 +171,6 @@ calligra_plan_CONTENTS="
        usr/bin/cygkplato*-*.dll
        usr/bin/cygplan*-*.dll
        usr/bin/cygrcps_plan-*.dll
-       usr/lib/kde4/calligra_filter_*2plan.dll
        usr/lib/kde4/kplatorcpsscheduler.dll
        usr/lib/kde4/krossmoduleplan.dll
        usr/lib/kde4/plan*
@@ -185,11 +186,9 @@ calligra_plan_CONTENTS="
        usr/share/kde4/apps/plan*/
        usr/share/kde4/config/plan*
        usr/share/kde4/config.kcfg/plan*
-       usr/share/kde4/services/calligra/calligra_filter_*2plan.desktop
        usr/share/kde4/services/calligra/krossmoduleplan.desktop
        usr/share/kde4/services/calligra/plan*
        usr/share/kde4/servicetypes/plan_*.desktop
-       usr/share/mime/packages/calligra_planner_mpp.xml
 "
 calligra_sheets_SUMMARY="KDE spreadsheet program (aka KSpread)"
 calligra_sheets_CONTENTS="
@@ -263,9 +262,6 @@ calligra_tools_SUMMARY="Calligra Suite command-line tools"
 calligra_tools_CONTENTS="
        usr/bin/calligra.exe
        usr/bin/calligraconverter.exe
-       usr/bin/cstester.exe
-       usr/bin/cstrunner.exe
-       usr/bin/visualimagecompare.exe
 "
 calligra_words_SUMMARY="KDE word processor (aka KWord)"
 calligra_words_CONTENTS="
@@ -370,7 +366,6 @@ krita_CONTENTS="
        etc/postinstall/
        usr/bin/gmicparser.exe
        usr/bin/krita*.exe
-       usr/lib/calligra/imports/org/krita/
        usr/lib/kde4/krita*
        usr/lib/kde4/plugins/imageformats/kimg_kra.dll
        usr/lib/kde4/plugins/imageformats/kimg_ora.dll
@@ -379,7 +374,6 @@ krita_CONTENTS="
        usr/share/color/icc/krita/
        usr/share/doc/krita/
        usr/share/icons/hicolor/*/apps/calligrakrita.*
-       usr/share/icons/hicolor/*/apps/krita*
        usr/share/kde4/apps/krita*/
        usr/share/kde4/apps/color-schemes/Krita*
        usr/share/kde4/config/krita*
@@ -403,8 +397,6 @@ okular_calligra_CONTENTS="
 "
 # active, gemini: not working
 PKG_IGNORE="
-       ${calligra_active_CONTENTS}
-       ${calligra_gemini_CONTENTS}
        usr/lib/kde4/*.dll.a
        usr/lib/libRtfReader.dll.a
        usr/lib/libbraindumpcore.dll.a
This page took 0.023638 seconds and 5 git commands to generate.