Remove braindump, kexi, and okular plugin
authorYaakov Selkowitz <yselkowi@redhat.com>
Wed, 19 Jul 2017 00:57:41 +0000 (19:57 -0500)
committerYaakov Selkowitz <yselkowi@redhat.com>
Wed, 19 Jul 2017 00:57:41 +0000 (19:57 -0500)
Braindump is being completely dropped in Calligra 3, Kexi is now separate,
and Okular was ported to KF5.  Also, fix the build-time detection of
marblewidget, and an issue loading the SQLite3/ICU plugin.

2.9.11-cygwin-drivers.patch [new file with mode: 0644]
2.9.11-disable-apps.patch [moved from 2.9.11-disable-krita.patch with 75% similarity]
2.9.11-marblewidget.patch [new file with mode: 0644]
2.9.2-cygwin-postgresql.patch [deleted file]
calligra.cygport

diff --git a/2.9.11-cygwin-drivers.patch b/2.9.11-cygwin-drivers.patch
new file mode 100644 (file)
index 0000000..36488a7
--- /dev/null
@@ -0,0 +1,11 @@
+--- origsrc/calligra-2.9.11/libs/db/drivers/sqlite/sqliteconnection.cpp        2016-02-02 13:53:15.000000000 -0600
++++ src/calligra-2.9.11/libs/db/drivers/sqlite/sqliteconnection.cpp    2017-07-18 14:13:20.009037800 -0500
+@@ -43,7 +43,7 @@
+ #undef KexiDBDrvDbg
+ #define KexiDBDrvDbg if (0) kDebug()
+-#if defined(Q_OS_WIN)
++#if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN)
+ #define SHARED_LIB_EXTENSION ".dll"
+ #elif defined(Q_OS_MAC)
+ // #define SHARED_LIB_EXTENSION ".dylib"
similarity index 75%
rename from 2.9.11-disable-krita.patch
rename to 2.9.11-disable-apps.patch
index 6081e26d060f28a85db8a315be50e308acd0f14c..7ddc461c681fb063861c39043b0c501f52b427bd 100644 (file)
@@ -1,9 +1,11 @@
 --- origsrc/calligra-2.9.11/CMakeLists.txt     2017-02-03 14:09:13.939331900 -0600
 +++ src/calligra-2.9.11/CMakeLists.txt 2017-02-05 04:31:40.925195300 -0600
 --- origsrc/calligra-2.9.11/CMakeLists.txt     2017-02-03 14:09:13.939331900 -0600
 +++ src/calligra-2.9.11/CMakeLists.txt 2017-02-05 04:31:40.925195300 -0600
-@@ -979,6 +979,8 @@ calligra_disable_product(APP_ACTIVE "not
+@@ -979,6 +979,10 @@ calligra_disable_product(APP_ACTIVE "not
  calligra_disable_product(APP_CSTESTER "not wanted")
  calligra_disable_product(APP_DEVTOOLS "not wanted")
  calligra_disable_product(APP_GEMINI "not wanted")
  calligra_disable_product(APP_CSTESTER "not wanted")
  calligra_disable_product(APP_DEVTOOLS "not wanted")
  calligra_disable_product(APP_GEMINI "not wanted")
++calligra_disable_product(APP_BRAINDUMP "not wanted")
++calligra_disable_product(APP_KEXI "not wanted")
 +calligra_disable_product(APP_KRITA "not wanted")
 +calligra_disable_product(PART_QTQUICK "not wanted")
  
 +calligra_disable_product(APP_KRITA "not wanted")
 +calligra_disable_product(PART_QTQUICK "not wanted")
  
diff --git a/2.9.11-marblewidget.patch b/2.9.11-marblewidget.patch
new file mode 100644 (file)
index 0000000..d6465a6
--- /dev/null
@@ -0,0 +1,13 @@
+--- origsrc/calligra-2.9.11/cmake/modules/FindCalligraMarble.cmake     2016-02-02 13:53:13.000000000 -0600
++++ src/calligra-2.9.11/cmake/modules/FindCalligraMarble.cmake 2017-07-18 13:11:21.309273800 -0500
+@@ -62,8 +62,8 @@ if ( MARBLE_INCLUDE_DIR AND MARBLE_GLOBA
+    set( MARBLE_FIND_QUIETLY TRUE )
+ endif ()
+-find_path( MARBLE_INCLUDE_DIR NAMES marble/MarbleMap.h PATH_SUFFIXES marble)
+-find_file( MARBLE_GLOBAL_HEADER NAMES marble/MarbleGlobal.h PATH_SUFFIXES marble)
++find_path( MARBLE_INCLUDE_DIR NAMES marble/MarbleMap.h PATH_SUFFIXES marble marblewidget)
++find_file( MARBLE_GLOBAL_HEADER NAMES marble/MarbleGlobal.h PATH_SUFFIXES marble marblewidget)
+ find_library( MARBLE_LIBRARIES NAMES marblewidget )
+ if(MARBLE_GLOBAL_HEADER)
diff --git a/2.9.2-cygwin-postgresql.patch b/2.9.2-cygwin-postgresql.patch
deleted file mode 100644 (file)
index 14415aa..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-postgresql headers include a #define rename(x, y) which conflicts with a
-single arg rename() function declaration in Qt headers
-
---- origsrc/calligra-2.9.2/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp 2015-04-01 08:27:01.000000000 -0500
-+++ src/calligra-2.9.2/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp     2015-04-22 09:35:46.965287200 -0500
-@@ -17,7 +17,6 @@
-  * Boston, MA 02110-1301, USA.
- */
--#include "pqxxconnection.h"
- #include <QVariant>
- #include <QFile>
- #include <kdebug.h>
-@@ -25,6 +24,7 @@
- #include <db/global.h>
- #include <klocale.h>
- #include <string>
-+#include "pqxxconnection.h"
- #include "pqxxpreparedstatement.h"
- #include "pqxxconnection_p.h"
- using namespace KexiDB;
index 418823c6cd665f32888250d1172f47db890b8d27..75438455e0c261a8fbfad5d3abf64fee8304cd60 100644 (file)
@@ -2,7 +2,7 @@ inherit kde4 python
 
 NAME="calligra"
 VERSION=2.9.11
 
 NAME="calligra"
 VERSION=2.9.11
-RELEASE=3
+RELEASE=4
 CATEGORY="Office"
 SUMMARY="KDE integrated office suite"
 DESCRIPTION="Calligra Suite is a set of productivity applications for the KDE desktop."
 CATEGORY="Office"
 SUMMARY="KDE integrated office suite"
 DESCRIPTION="Calligra Suite is a set of productivity applications for the KDE desktop."
@@ -19,16 +19,20 @@ PATCH_URI="
        http://pkgs.fedoraproject.org/cgit/rpms/calligra.git/plain/0070-Plan-Guard-against-trying-to-move-a-task-into-the-sa.patch
        2.9.2-as-needed.patch
        2.3.83-find-librcps.patch
        http://pkgs.fedoraproject.org/cgit/rpms/calligra.git/plain/0070-Plan-Guard-against-trying-to-move-a-task-into-the-sa.patch
        2.9.2-as-needed.patch
        2.3.83-find-librcps.patch
-       2.9.2-cygwin-postgresql.patch
        2.9.7-bko291374.patch
        2.9.7-bko291374.patch
-       2.9.11-disable-krita.patch
+       2.9.11-disable-apps.patch
+       2.9.11-cygwin-drivers.patch
+       2.9.11-marblewidget.patch
 "
 
 PKG_NAMES="calligra-libs calligra-data calligra-devel calligra-flow
           calligra-plan calligra-sheets calligra-stage calligra-tools
 "
 
 PKG_NAMES="calligra-libs calligra-data calligra-devel calligra-flow
           calligra-plan calligra-sheets calligra-stage calligra-tools
-          calligra-words braindump karbon kexi okular-calligra"
+          calligra-words karbon" # okular-calligra
+calligra_libs_OBSOLETES="braindump"
+# REMOVE when upgrading to 3.x (okular switched to KF5)
+calligra_libs_OBSOLETES+=" okular-calligra okular-odp"
 # the entire suite, except for -devel
 # the entire suite, except for -devel
-calligra_REQUIRES="calligra-flow calligra-plan calligra-stage calligra-sheets calligra-words calligra-tools braindump karbon kexi"
+calligra_REQUIRES="calligra-flow calligra-plan calligra-stage calligra-sheets calligra-words calligra-tools karbon"
 calligra_data_SUMMARY="Calligra Suite (common data)"
 calligra_data_CONTENTS="
        etc/postinstall/
 calligra_data_SUMMARY="Calligra Suite (common data)"
 calligra_data_CONTENTS="
        etc/postinstall/
@@ -60,6 +64,7 @@ calligra_libs_CONTENTS="
        usr/lib/kde4/calligradocinfopropspage.dll
        usr/lib/kde4/calligraimagethumbnail.dll
        usr/lib/kde4/calligrathumbnail.dll
        usr/lib/kde4/calligradocinfopropspage.dll
        usr/lib/kde4/calligraimagethumbnail.dll
        usr/lib/kde4/calligrathumbnail.dll
+       usr/lib/kde4/kexidb_sqlite3*.dll
        usr/lib/kde4/kolcmsengine.dll
        usr/lib/kde4/kopabackgroundtool.dll
        usr/lib/kde4/koreport_*plugin.dll
        usr/lib/kde4/kolcmsengine.dll
        usr/lib/kde4/kopabackgroundtool.dll
        usr/lib/kde4/koreport_*plugin.dll
@@ -74,6 +79,7 @@ calligra_libs_CONTENTS="
        usr/share/kde4/services/calligra/calligra_textinlineobject_*.desktop
        usr/share/kde4/services/calligra/calligra_tool_*.desktop
        usr/share/kde4/services/calligra/calligradocinfopropspage.desktop
        usr/share/kde4/services/calligra/calligra_textinlineobject_*.desktop
        usr/share/kde4/services/calligra/calligra_tool_*.desktop
        usr/share/kde4/services/calligra/calligradocinfopropspage.desktop
+       usr/share/kde4/services/calligra/kexidb_sqlite3driver.desktop
        usr/share/kde4/services/calligra/kformulapart.desktop
        usr/share/kde4/services/calligra/kolcmsengine.desktop
        usr/share/kde4/services/calligra/kopabackgroundtool.desktop
        usr/share/kde4/services/calligra/kformulapart.desktop
        usr/share/kde4/services/calligra/kolcmsengine.desktop
        usr/share/kde4/services/calligra/kopabackgroundtool.desktop
@@ -294,22 +300,6 @@ calligra_words_CONTENTS="
        usr/share/templates/.source/TextDocument.odt
        usr/share/templates/TextDocument.desktop
 "
        usr/share/templates/.source/TextDocument.odt
        usr/share/templates/TextDocument.desktop
 "
-braindump_SUMMARY="KDE whiteboard application"
-braindump_CONTENTS="
-       etc/postinstall/
-       usr/bin/braindump.exe
-       usr/bin/cygbraindumpcore-*.dll
-       usr/lib/kde4/braindump*
-       usr/share/appdata/braindump.appdata.xml
-       usr/share/applications/kde4/braindump.desktop
-       usr/share/icons/hicolor/*/actions/stateshape.*
-       usr/share/icons/hicolor/*/actions/statetool.*
-       usr/share/icons/hicolor/*/apps/braindump.*
-       usr/share/kde4/apps/braindump/
-       usr/share/kde4/apps/stateshape/
-       usr/share/kde4/services/calligra/braindump_*.desktop
-       usr/share/kde4/servicetypes/braindump_extensions.desktop
-"
 karbon_SUMMARY="KDE SVG drawing application"
 karbon_REQUIRES="pstoedit"
 karbon_CONTENTS="
 karbon_SUMMARY="KDE SVG drawing application"
 karbon_REQUIRES="pstoedit"
 karbon_CONTENTS="
@@ -339,28 +329,6 @@ karbon_CONTENTS="
        usr/share/templates/.source/Illustration.odg
        usr/share/templates/Illustration.desktop
 "
        usr/share/templates/.source/Illustration.odg
        usr/share/templates/Illustration.desktop
 "
-kexi_REQUIRES="kate4-part"
-kexi_SUMMARY="KDE data management application"
-kexi_CONTENTS="
-       etc/postinstall/
-       usr/bin/cygkexi*-*.dll
-       usr/bin/cygkformdesigner-*.dll
-       usr/bin/kexi*.exe
-       usr/lib/kde4/kexi*
-       usr/lib/kde4/kformdesigner_*
-       usr/lib/kde4/krossmodulekexidb.dll
-       usr/share/appdata/kexi.appdata.xml
-       usr/share/applications/kde4/kexi.desktop
-       usr/share/doc/HTML/en/kexi/
-       usr/share/doc/kexi/
-       usr/share/icons/hicolor/*/apps/calligrakexi.*
-       usr/share/kde4/apps/kexi/
-       usr/share/kde4/config/kexirc
-       usr/share/kde4/services/calligra/kexi*
-       usr/share/kde4/services/calligra/kformdesigner*
-       usr/share/kde4/servicetypes/kexi*
-       usr/share/kde4/servicetypes/widgetfactory.desktop
-"
 okular_calligra_SUMMARY="Okular office document format plugins"
 okular_calligra_OBSOLETES="okular-odp"
 okular_calligra_REQUIRES="calligra-stage calligra-words"
 okular_calligra_SUMMARY="Okular office document format plugins"
 okular_calligra_OBSOLETES="okular-odp"
 okular_calligra_REQUIRES="calligra-stage calligra-words"
@@ -374,12 +342,9 @@ okular_calligra_CONTENTS="
 PKG_IGNORE="
        usr/lib/kde4/*.dll.a
        usr/lib/libRtfReader.dll.a
 PKG_IGNORE="
        usr/lib/kde4/*.dll.a
        usr/lib/libRtfReader.dll.a
-       usr/lib/libbraindumpcore.dll.a
        usr/lib/libcalligrastageprivate.dll.a
        usr/lib/libflowprivate.dll.a
        usr/lib/libkarbon*.dll.a
        usr/lib/libcalligrastageprivate.dll.a
        usr/lib/libflowprivate.dll.a
        usr/lib/libkarbon*.dll.a
-       usr/lib/libkexi*.dll.a
-       usr/lib/libkformdesigner.dll.a
        usr/lib/libkformula.dll.a
        usr/lib/libwordsprivate.dll.a
 "
        usr/lib/libkformula.dll.a
        usr/lib/libwordsprivate.dll.a
 "
This page took 0.026714 seconds and 5 git commands to generate.