calligra 2.8.7
authorYaakov Selkowitz <yselkowi@redhat.com>
Wed, 21 Jan 2015 16:32:35 +0000 (10:32 -0600)
committerYaakov Selkowitz <yselkowi@redhat.com>
Wed, 21 Jan 2015 16:32:35 +0000 (10:32 -0600)
2.3.83-find-libkcal.patch [deleted file]
2.8.7-qml-module.patch [new file with mode: 0644]
calligra.cygport

diff --git a/2.3.83-find-libkcal.patch b/2.3.83-find-libkcal.patch
deleted file mode 100644 (file)
index 8ddcec7..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- origsrc/calligra-2.3.83/plan/plugins/filters/icalendar/CMakeLists.txt      2011-10-22 02:39:34.000000000 -0500
-+++ src/calligra-2.3.83/plan/plugins/filters/icalendar/CMakeLists.txt  2011-11-02 16:48:07.519670600 -0500
-@@ -1,6 +1,6 @@
- ##TODO revision?
--find_library(LIBKCAL_LIBRARY libkcal.so)
-+find_library(LIBKCAL_LIBRARY kcal)
- if(LIBKCAL_LIBRARY)
-     set(HAVE_LIBKCAL 1)
- endif(LIBKCAL_LIBRARY)
diff --git a/2.8.7-qml-module.patch b/2.8.7-qml-module.patch
new file mode 100644 (file)
index 0000000..cbbf840
--- /dev/null
@@ -0,0 +1,11 @@
+--- origsrc/calligra-2.8.7/krita/sketch/draganddrop/CMakeLists.txt     2014-11-30 08:01:14.000000000 -0600
++++ src/calligra-2.8.7/krita/sketch/draganddrop/CMakeLists.txt 2015-01-21 01:59:02.769861100 -0600
+@@ -17,7 +17,7 @@ include_directories(
+ qt4_automoc(${declarativedragdrop_SRCS})
+-kde4_add_library(draganddropplugin SHARED ${declarativedragdrop_SRCS})
++kde4_add_library(draganddropplugin MODULE ${declarativedragdrop_SRCS})
+ target_link_libraries(draganddropplugin ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY})
+ install(TARGETS draganddropplugin DESTINATION ${CMAKE_INSTALL_LIBDIR}/calligra/imports/org/krita/draganddrop)
index 1f66f58f62b1035bea7833ba46adbb536a0f58da..ce4dd5d3d51c2fe90f5142333ee39a3944fdb0d0 100644 (file)
@@ -1,7 +1,7 @@
 inherit kde4 python
 
 NAME="calligra"
-VERSION=2.8.6
+VERSION=2.8.7
 RELEASE=1
 CATEGORY="Office"
 SUMMARY="KDE integrated office suite"
@@ -11,8 +11,8 @@ SRC_URI="mirror://kde/stable/calligra-${VERSION}/calligra-${VERSION}.tar.xz"
 PATCH_URI="
        2.3.83-as-needed.patch
        2.3.83-cygwin-ctype.patch
-       2.3.83-find-libkcal.patch
        2.3.83-find-librcps.patch
+       2.8.7-qml-module.patch
 "
 
 PKG_NAMES="calligra-libs calligra-data calligra-devel calligra-flow
@@ -61,9 +61,7 @@ calligra_libs_CONTENTS="
        usr/lib/kde4/calligrathumbnail.dll
        usr/lib/kde4/kolcmsengine.dll
        usr/lib/kde4/kopabackgroundtool.dll
-       usr/lib/kde4/koreport_barcodeplugin.dll
-       usr/lib/kde4/koreport_mapsplugin.dll
-       usr/lib/kde4/koreport_webplugin.dll
+       usr/lib/kde4/koreport_*plugin.dll
        usr/share/doc/calligra-libs/
        usr/share/kde4/apps/formulashape/
        usr/share/kde4/apps/koproperty/
@@ -78,9 +76,7 @@ calligra_libs_CONTENTS="
        usr/share/kde4/services/kformulapart.desktop
        usr/share/kde4/services/kolcmsengine.desktop
        usr/share/kde4/services/kopabackgroundtool.desktop
-       usr/share/kde4/services/calligra/koreport_barcodeplugin.desktop
-       usr/share/kde4/services/calligra/koreport_mapsplugin.desktop
-       usr/share/kde4/services/calligra/koreport_webplugin.desktop
+       usr/share/kde4/services/calligra/koreport_*plugin.desktop
        usr/share/kde4/servicetypes/calligradb_driver.desktop
        usr/share/kde4/servicetypes/calligradocker.desktop
        usr/share/kde4/servicetypes/calligra_application.desktop
This page took 0.024763 seconds and 5 git commands to generate.