summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-office/calligra/files')
-rw-r--r--app-office/calligra/files/calligra-2.9.6-ghns-linking.patch11
-rw-r--r--app-office/calligra/files/calligra-2.9.6-version.patch24
2 files changed, 35 insertions, 0 deletions
diff --git a/app-office/calligra/files/calligra-2.9.6-ghns-linking.patch b/app-office/calligra/files/calligra-2.9.6-ghns-linking.patch
new file mode 100644
index 000000000000..b150972b146a
--- /dev/null
+++ b/app-office/calligra/files/calligra-2.9.6-ghns-linking.patch
@@ -0,0 +1,11 @@
+--- calligra-2.9.6/libs/widgets/CMakeLists.txt.orig 2015-08-09 21:35:06.673116594 +0200
++++ calligra-2.9.6/libs/widgets/CMakeLists.txt 2015-08-09 21:47:31.458881310 +0200
+@@ -102,7 +102,7 @@
+ target_link_libraries(kowidgets kotext pigmentcms kowidgetutils ${KDE4_KIO_LIBS})
+
+ if(GHNS)
+- target_link_libraries(kowidgets {KDE4_KNEWSTUFF3_LIBS})
++ target_link_libraries(kowidgets ${KDE4_KNEWSTUFF3_LIBS})
+ endif ()
+
+ target_link_libraries(kowidgets LINK_INTERFACE_LIBRARIES kotext pigmentcms kowidgetutils ${KDE4_KDEUI_LIBS})
diff --git a/app-office/calligra/files/calligra-2.9.6-version.patch b/app-office/calligra/files/calligra-2.9.6-version.patch
new file mode 100644
index 000000000000..277d65ff71d5
--- /dev/null
+++ b/app-office/calligra/files/calligra-2.9.6-version.patch
@@ -0,0 +1,24 @@
+From: Boudewijn Rempt <boud@valdyas.org>
+Date: Thu, 09 Jul 2015 06:14:05 +0000
+Subject: Update to 2.9.6
+X-Git-Url: http://quickgit.kde.org/?p=calligra.git&a=commitdiff&h=8d47cbdc81bbc3853837c6fc342d5b2dc77c3c0a
+---
+Update to 2.9.6
+---
+
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,10 +27,10 @@
+
+ # define common versions of Calligra applications, used to generate calligraversion.h
+ # update these version for every release:
+-set(CALLIGRA_VERSION_STRING "2.9.5")
++set(CALLIGRA_VERSION_STRING "2.9.6")
+ set(CALLIGRA_VERSION_MAJOR 2)
+ set(CALLIGRA_STABLE_VERSION_MINOR 9)
+-set(CALLIGRA_VERSION_RELEASE 5) # 89 for Alpha, increase for next test releases, set 0 for first Stable, etc.
++set(CALLIGRA_VERSION_RELEASE 6) # 89 for Alpha, increase for next test releases, set 0 for first Stable, etc.
+ #set(CALLIGRA_ALPHA 1) # uncomment only for Pre-Alpha and Alpha
+ #set(CALLIGRA_BETA 1) # uncomment only for Beta
+ #set(CALLIGRA_RC 1) # uncomment only for RC