calligra 2.9.7
authorYaakov Selkowitz <yselkowi@redhat.com>
Mon, 21 Sep 2015 04:26:35 +0000 (23:26 -0500)
committerYaakov Selkowitz <yselkowi@redhat.com>
Mon, 21 Sep 2015 04:26:35 +0000 (23:26 -0500)
2.9.7-bko291374.patch [new file with mode: 0644]
calligra.cygport

diff --git a/2.9.7-bko291374.patch b/2.9.7-bko291374.patch
new file mode 100644 (file)
index 0000000..dbac0cb
--- /dev/null
@@ -0,0 +1,23 @@
+https://bugs.kde.org/show_bug.cgi?id=291374
+https://quickgit.kde.org/?p=calligra.git&a=commitdiff&h=bf47fed5
+
+--- origsrc/calligra-2.9.7/libs/main/KoFilterChain.cpp 2015-08-29 09:38:50.000000000 -0500
++++ src/calligra-2.9.7/libs/main/KoFilterChain.cpp     2015-09-20 08:57:21.004838000 -0500
+@@ -380,7 +380,7 @@ void KoFilterChain::inputFileHelper(KoDo
+         }
+         m_inputFile = m_inputTempFile->fileName();
+         // See "Note about Windows & usage of KTemporaryFile" above
+-#ifdef Q_OS_WIN
++#if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN)
+         m_inputTempFile->close();
+         m_inputTempFile->setAutoRemove(true);
+         delete m_inputTempFile;
+@@ -407,7 +407,7 @@ void KoFilterChain::outputFileHelper(boo
+         m_outputFile = m_outputTempFile->fileName();
+         // See "Note about Windows & usage of KTemporaryFile" above
+-#ifdef Q_OS_WIN
++#if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN)
+         m_outputTempFile->close();
+         m_outputTempFile->setAutoRemove(true);
+         delete m_outputTempFile;
index 7e07437ce5034f3014e130839f9d2cf533488d5e..e4a83d5fa0d6e2e73da45f4d93e051f2a5761f93 100644 (file)
@@ -1,8 +1,8 @@
 inherit kde4 python
 
 NAME="calligra"
-VERSION=2.9.4
-RELEASE=2
+VERSION=2.9.7
+RELEASE=1
 CATEGORY="Office"
 SUMMARY="KDE integrated office suite"
 HOMEPAGE="http://www.calligra-suite.org/"
@@ -15,6 +15,7 @@ PATCH_URI="
        2.9.2-cygwin-gmic.patch
        2.9.2-cygwin-postgresql.patch
        2.9.4-disable-krita-gemini.patch
+       2.9.7-bko291374.patch
 "
 
 PKG_NAMES="calligra-libs calligra-data calligra-devel calligra-flow
@@ -49,8 +50,6 @@ calligra_libs_CONTENTS="
        usr/bin/cygko*-*.dll
        usr/bin/cygkrita*.dll
        usr/bin/cygkundo2-*.dll
-       usr/bin/cyglibglobal-*.dll
-       usr/bin/cyglibkispsd-*.dll
        usr/bin/cygRtfReader-*.dll
        usr/bin/cygwordsprivate-*.dll
        usr/bin/cygpigmentcms-*.dll
@@ -164,6 +163,7 @@ calligra_flow_CONTENTS="
        usr/share/kde4/servicetypes/flow_dock.desktop
 "
 calligra_plan_SUMMARY="KDE project management application (aka KPlato)"
+calligra_plan_REQUIRES="kross-python"
 calligra_plan_CONTENTS="
        etc/postinstall/
        usr/bin/calligraplan*.exe
@@ -191,6 +191,7 @@ calligra_plan_CONTENTS="
        usr/share/kde4/servicetypes/plan_*.desktop
 "
 calligra_sheets_SUMMARY="KDE spreadsheet program (aka KSpread)"
+calligra_sheets_REQUIRES="kross-python kross-ruby"
 calligra_sheets_CONTENTS="
        etc/postinstall/
        usr/bin/calligrasheets.exe
@@ -315,6 +316,7 @@ braindump_CONTENTS="
        usr/share/kde4/servicetypes/braindump_extensions.desktop
 "
 karbon_SUMMARY="KDE SVG drawing application"
+karbon_REQUIRES="pstoedit"
 karbon_CONTENTS="
        etc/postinstall/
        usr/bin/karbon.exe
@@ -388,11 +390,10 @@ krita_CONTENTS="
 "
 okular_calligra_SUMMARY="Okular office document format plugins"
 okular_calligra_OBSOLETES="okular-odp"
+okular_calligra_REQUIRES="calligra-stage calligra-words"
 okular_calligra_CONTENTS="
        usr/lib/kde4/okularGenerator_*.dll
        usr/share/applications/kde4/okularApplication_*.desktop
-       usr/share/kde4/services/calligra/libokularGenerator_*.desktop
-       usr/share/kde4/services/calligra/okular*.desktop
        usr/share/kde4/services/libokularGenerator_*.desktop
        usr/share/kde4/services/okular*.desktop
 "
@@ -403,8 +404,6 @@ PKG_IGNORE="
        usr/lib/libbraindumpcore.dll.a
        usr/lib/libflowprivate.dll.a
        usr/lib/libkarbon*.dll.a
-       usr/lib/liblibglobal.dll.a
-       usr/lib/liblibkispsd.dll.a
 "
 
 CYGCMAKE_ARGS="-DIHAVEPATCHEDQT=YES"
This page took 0.024517 seconds and 5 git commands to generate.