diff options
| author |   Johannes Huber <johu@gentoo.org> | 2015-08-19 17:23:12 +0200 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2015-08-19 17:23:22 +0200 |
| commit | 8659a2124a109741fa611d39f5329e4f59b04840 (patch) | |
| tree | 2e16ce51f0a4fe9a1572d7fbe2f3c5def30a4725 /app-office/calligra/files | |
| parent | app-office/calligra-l10n: Version bump (diff) | |
| download | gentoo-8659a2124a109741fa611d39f5329e4f59b04840.tar.gz gentoo-8659a2124a109741fa611d39f5329e4f59b04840.tar.bz2 gentoo-8659a2124a109741fa611d39f5329e4f59b04840.zip | |
app-office/calligra: Version bump
Thanks for contributions by Alex Xu (Hello71) <alex_y_xu@yahoo.ca>, Jon
<j.scruggs@gmail.com>, Tamas Jantvik <tsjk@hotmail.com>.
Gentoo-Bug: 543068
Gentoo-Bug: 549940
Reported-by: Alexandre <alexandre.guimaraes@campus.ul.pt>
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'app-office/calligra/files')
| -rw-r--r-- | app-office/calligra/files/calligra-2.9.6-ghns-linking.patch | 11 | ||||
| -rw-r--r-- | app-office/calligra/files/calligra-2.9.6-version.patch | 24 |
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 |