Date: Thursday, September 1, 2011 @ 05:26:49 Author: andrea Revision: 136757
Moved to AUR Added: calligra/trunk/PKGBUILD calligra/trunk/calligra-braindump.install calligra/trunk/calligra-filters.install calligra/trunk/calligra-flow.install calligra/trunk/calligra-karbon.install calligra/trunk/calligra-kexi.install calligra/trunk/calligra-kplato.install calligra/trunk/calligra-krita.install calligra/trunk/calligra-stage.install calligra/trunk/calligra-tables.install calligra/trunk/calligra-tools.install calligra/trunk/calligra-words.install calligra/trunk/calligra.install Modified: digikam/trunk/PKGBUILD digikam/trunk/fix-libusb-linkage.patch Deleted: calligra/kde-unstable/ fam/ -------------------------------------------+ calligra/trunk/PKGBUILD | 280 ++++++++++++++++++++++++++++ calligra/trunk/calligra-braindump.install | 12 + calligra/trunk/calligra-filters.install | 11 + calligra/trunk/calligra-flow.install | 12 + calligra/trunk/calligra-karbon.install | 12 + calligra/trunk/calligra-kexi.install | 11 + calligra/trunk/calligra-kplato.install | 12 + calligra/trunk/calligra-krita.install | 13 + calligra/trunk/calligra-stage.install | 12 + calligra/trunk/calligra-tables.install | 12 + calligra/trunk/calligra-tools.install | 12 + calligra/trunk/calligra-words.install | 12 + calligra/trunk/calligra.install | 11 + digikam/trunk/PKGBUILD | 3 digikam/trunk/fix-libusb-linkage.patch | 64 ------ 15 files changed, 426 insertions(+), 63 deletions(-) Added: calligra/trunk/PKGBUILD =================================================================== --- calligra/trunk/PKGBUILD (rev 0) +++ calligra/trunk/PKGBUILD 2011-09-01 09:26:49 UTC (rev 136757) @@ -0,0 +1,280 @@ +# $Id$ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Maintainer: Andrea Scarpino <and...@archlinux.org> + +pkgbase=calligra +pkgname=('calligra-filters' + 'calligra-interfaces' + 'calligra-libs' + 'calligra-plugins' + 'calligra-pics' + 'calligra-servicetypes' + 'calligra-templates' + 'calligra-tools' + 'calligra-karbon' + 'calligra-kexi' + 'calligra-kounavail' + 'calligra-kplato' + 'calligra-stage' + 'calligra-krita' + 'calligra-tables' + 'calligra-words' + 'calligra-handbook' + 'calligra-thesaurus-doc' + 'calligra-braindump' + 'calligra-flow') +pkgver=2.3.74 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.calligra-suite.org' +license=('FDL1.2' 'GPL2' 'LGPL') +makedepends=('kdepimlibs' 'eigen2' 'freetds' 'kdegraphics-okular' 'libgsf' + 'libwpd' 'libwpg' 'pstoedit' 'glew' 'gsl' 'cmake' 'automoc4' + 'boost' 'libkdcraw' 'libpqxx' 'fftw' 'opengtl' 'kdeedu-marble') +groups=('calligra') +source=("http://download.kde.org/unstable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") +md5sums=('c29b4712b1992ce2ea7834b7cfe1fff8') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_mobile=OFF + make +} + +package_calligra-filters() { + pkgdesc="Filters for the Calligra office suite" + optdepends=('libgsf: Microsoft Word document importer' + 'libwpd: WordPerfect document importer' + 'libwpg: Corel WordPerfect Graphics image importer' + 'pstoedit: Karbon EPS import filter' + 'libkdcraw: support for raw images') + conflicts=('koffice-filters') + replaces=('koffice-filters') + install=calligra-filters.install + + cd "${srcdir}"/build/filters + make DESTDIR="${pkgdir}" install +} + +package_calligra-interfaces() { + pkgdesc="Interfaces for the Calligra office suite" + depends=('calligra-libs') + conflicts=('koffice-interfaces') + replaces=('koffice-interfaces') + + cd "${srcdir}"/build/interfaces + make DESTDIR="${pkgdir}" install +} + +package_calligra-libs() { + pkgdesc="Libraries for the Calligra office suite" + depends=('kdepimlibs' 'lcms2' 'calligra-servicetypes') + conflicts=('koffice-libs') + replaces=('koffice-libs') + + cd "${srcdir}"/build/libs + make DESTDIR="${pkgdir}" install +} + +package_calligra-plugins() { + pkgdesc="Plugins for the Calligra office suite" + depends=('calligra-libs') + conflicts=('koffice-plugins' 'koffice-kchart') + replaces=('koffice-plugins' 'koffice-kchart') + + cd "${srcdir}"/build/plugins + make DESTDIR="${pkgdir}" install +} + +package_calligra-pics() { + pkgdesc="Icons for the Calligra office suite" + depends=('calligra-libs') + conflicts=('koffice-pics') + replaces=('koffice-pics') + install=calligra.install + + cd "${srcdir}"/build/pics + make DESTDIR="${pkgdir}" install +} + +package_calligra-servicetypes() { + pkgdesc="Servicetypes for the Calligra office suite" + conflicts=('koffice-servicetypes') + replaces=('koffice-servicetypes') + install=calligra.install + + cd "${srcdir}"/build/servicetypes + make DESTDIR="${pkgdir}" install +} + +package_calligra-templates() { + pkgdesc="Templates for the Calligra office suite" + conflicts=('koffice-templates') + replaces=('koffice-templates') + + cd "${srcdir}"/build/templates + make DESTDIR="${pkgdir}" install +} + +package_calligra-tools() { + pkgdesc="Tools for the Calligra office suite" + depends=('calligra-libs') + conflicts=('koffice-tools') + replaces=('koffice-tools') + install=calligra-tools.install + + cd "${srcdir}"/build/tools + make DESTDIR="${pkgdir}" install +} + +#### package common files done ##### + +#### package apps and their docs ##### + +package_calligra-karbon() { + pkgdesc="Create scalable vector drawings" + depends=('calligra-libs' 'calligra-templates') + conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc') + replaces=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc') + install=calligra-karbon.install + + cd "${srcdir}"/build/karbon + make DESTDIR="${pkgdir}" install +} + +package_calligra-kexi() { + pkgdesc="Develop desktop database applications" + depends=('calligra-libs' 'calligra-templates' 'kdeedu-marble') + conflicts=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc') + replaces=('koffice-kexi' 'koffice-kexi-doc' 'calligra-kexi-doc') + install=calligra-kexi.install + + cd "${srcdir}"/build/kexi + make DESTDIR="${pkgdir}" install + cd "${srcdir}"/build/doc/kexi + make DESTDIR="${pkgdir}" install +} + +package_calligra-kounavail() { + pkgdesc="Unavailable Calligra Document" + depends=('calligra-libs') + conflicts=('koffice-kounavail') + replaces=('koffice-kounavail') + + cd "${srcdir}"/build/kounavail + make DESTDIR="${pkgdir}" install +} + +package_calligra-kplato() { + pkgdesc="Calligra Project Management Component" + depends=('calligra-words') + conflicts=('koffice-kplato') + replaces=('koffice-kplato') + install=calligra-kplato.install + + cd "${srcdir}"/build/kplato + make DESTDIR="${pkgdir}" install +} + +package_calligra-stage() { + pkgdesc="Write presentation documents" + depends=('calligra-libs' 'calligra-templates') + optdepends=('calligra-filters: import/export filters') + conflicts=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc') + replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc') + install=calligra-stage.install + + cd "${srcdir}"/build/stage + make DESTDIR="${pkgdir}" install + + cd "${srcdir}"/build/doc/stage + make DESTDIR="${pkgdir}" install +} + +package_calligra-krita() { + pkgdesc="Edit and paint images" + depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'glew' + 'qimageblitz' 'poppler-qt' 'openexr' 'opengtl') + optdepends=('calligra-filters: import/export filters') + conflicts=('koffice-krita' 'calligra-krita-doc') + replaces=('koffice-krita' 'calligra-krita-doc') + install=calligra-krita.install + + cd "${srcdir}"/build/krita + make DESTDIR="${pkgdir}" install + + cd "${srcdir}"/build/doc/krita + make DESTDIR="${pkgdir}" install +} + +package_calligra-tables() { + pkgdesc="Write spreadsheet documents" + depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'gsl') + optdepends=('calligra-filters: import/export filters') + conflicts=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc') + replaces=('koffice-kspread' 'koffice-kspread-doc' 'calligra-tables-doc') + install=calligra-tables.install + + cd "${srcdir}"/build/tables + make DESTDIR="${pkgdir}" install + + cd "${srcdir}"/build/doc/tables + make DESTDIR="${pkgdir}" install +} + +package_calligra-words() { + pkgdesc="Word Processor" + depends=('calligra-libs' 'calligra-templates' 'calligra-plugins' 'calligra-pics' + 'calligra-kounavail') + optdepends=('calligra-filters: import/export filters') + conflicts=('koffice-kword') + replaces=('koffice-kword') + install=calligra-words.install + + cd "${srcdir}"/build/words + make DESTDIR="${pkgdir}" install +} + +package_calligra-handbook() { + pkgdesc="Documentation for Calligra" + conflicts=('koffice-handbook') + replaces=('koffice-handbook') + + cd "${srcdir}"/build/doc/calligra + make DESTDIR="${pkgdir}" install +} + +package_calligra-thesaurus-doc() { + pkgdesc="Documentation for Thesaurus" + conflicts=('koffice-thesaurus-doc') + replaces=('koffice-thesaurus-doc') + + cd "${srcdir}"/build/doc/thesaurus + make DESTDIR="${pkgdir}" install +} + +package_calligra-braindump() { + pkgdesc="Notes and idea gathering" + install=calligra-braindump.install + + cd "${srcdir}"/build/braindump + make DESTDIR="${pkgdir}" install +} + +package_calligra-flow() { + pkgdesc="Flowchart & Diagram Editing" + install=calligra-flow.install + conflicts=('calligra-flow-doc') + replaces=('calligra-flow-doc') + + cd "${srcdir}"/build/flow + make DESTDIR="${pkgdir}" install +} + +##### package apps done ##### Property changes on: calligra/trunk/PKGBUILD ___________________________________________________________________ Added: svn:keywords + Id Added: calligra/trunk/calligra-braindump.install =================================================================== --- calligra/trunk/calligra-braindump.install (rev 0) +++ calligra/trunk/calligra-braindump.install 2011-09-01 09:26:49 UTC (rev 136757) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} \ No newline at end of file Added: calligra/trunk/calligra-filters.install =================================================================== --- calligra/trunk/calligra-filters.install (rev 0) +++ calligra/trunk/calligra-filters.install 2011-09-01 09:26:49 UTC (rev 136757) @@ -0,0 +1,11 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Added: calligra/trunk/calligra-flow.install =================================================================== --- calligra/trunk/calligra-flow.install (rev 0) +++ calligra/trunk/calligra-flow.install 2011-09-01 09:26:49 UTC (rev 136757) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Added: calligra/trunk/calligra-karbon.install =================================================================== --- calligra/trunk/calligra-karbon.install (rev 0) +++ calligra/trunk/calligra-karbon.install 2011-09-01 09:26:49 UTC (rev 136757) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} \ No newline at end of file Added: calligra/trunk/calligra-kexi.install =================================================================== --- calligra/trunk/calligra-kexi.install (rev 0) +++ calligra/trunk/calligra-kexi.install 2011-09-01 09:26:49 UTC (rev 136757) @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Added: calligra/trunk/calligra-kplato.install =================================================================== --- calligra/trunk/calligra-kplato.install (rev 0) +++ calligra/trunk/calligra-kplato.install 2011-09-01 09:26:49 UTC (rev 136757) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} \ No newline at end of file Added: calligra/trunk/calligra-krita.install =================================================================== --- calligra/trunk/calligra-krita.install (rev 0) +++ calligra/trunk/calligra-krita.install 2011-09-01 09:26:49 UTC (rev 136757) @@ -0,0 +1,13 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} \ No newline at end of file Added: calligra/trunk/calligra-stage.install =================================================================== --- calligra/trunk/calligra-stage.install (rev 0) +++ calligra/trunk/calligra-stage.install 2011-09-01 09:26:49 UTC (rev 136757) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Added: calligra/trunk/calligra-tables.install =================================================================== --- calligra/trunk/calligra-tables.install (rev 0) +++ calligra/trunk/calligra-tables.install 2011-09-01 09:26:49 UTC (rev 136757) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Added: calligra/trunk/calligra-tools.install =================================================================== --- calligra/trunk/calligra-tools.install (rev 0) +++ calligra/trunk/calligra-tools.install 2011-09-01 09:26:49 UTC (rev 136757) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Added: calligra/trunk/calligra-words.install =================================================================== --- calligra/trunk/calligra-words.install (rev 0) +++ calligra/trunk/calligra-words.install 2011-09-01 09:26:49 UTC (rev 136757) @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Added: calligra/trunk/calligra.install =================================================================== --- calligra/trunk/calligra.install (rev 0) +++ calligra/trunk/calligra.install 2011-09-01 09:26:49 UTC (rev 136757) @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Modified: digikam/trunk/PKGBUILD =================================================================== --- digikam/trunk/PKGBUILD 2011-09-01 08:20:58 UTC (rev 136756) +++ digikam/trunk/PKGBUILD 2011-09-01 09:26:49 UTC (rev 136757) @@ -15,7 +15,8 @@ 'cmake' 'automoc4' 'doxygen') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" 'fix-libusb-linkage.patch') -md5sums=('7b1ab69fc2fb36a45dc3ca38b01d42d8') +md5sums=('7b1ab69fc2fb36a45dc3ca38b01d42d8' + 'e0e4f2ab6c6e8f00470ef893f62c4231') build() { cd "${srcdir}"/${pkgname}-${pkgver} Modified: digikam/trunk/fix-libusb-linkage.patch =================================================================== --- digikam/trunk/fix-libusb-linkage.patch 2011-09-01 08:20:58 UTC (rev 136756) +++ digikam/trunk/fix-libusb-linkage.patch 2011-09-01 09:26:49 UTC (rev 136757) @@ -53,68 +53,8 @@ MESSAGE(STATUS "") MESSAGE(STATUS " digiKam will be compiled without GPhoto2 support.") MESSAGE(STATUS "") -diff --git a/README b/README -index c362aff..73984c8 100644 ---- a/README -+++ b/README -@@ -9,7 +9,7 @@ DIGIKAM - MANAGE YOUR PHOTOGRAPHS LIKE A PROFESSIONAL WITH THE POWER OF OPEN SOU - and/or delete them. - - The digiKam built-in image editor makes the common photo correction -- a simple task. The image editor is extensible via plugins and, -+ a simple task. The image editor is extensible via plugins and, - since the digikamimageplugins project has been merged to digiKam core - since release 0.9.2, all useful image editor plugins are available - in the base installation. -@@ -49,7 +49,7 @@ IRC channel from irc.freenode.org server: #digikam - IMPORTANT : the bug reports and wishlist entries are hosted by the KDE bug report - system which can be reached from the standard KDE help menu of digiKam. - A mail will automatically be sent to the digiKam development mailing list. --There is no need to contact directly the digiKam mailing list for a bug report -+There is no need to contact directly the digiKam mailing list for a bug report - or a devel wish. - - The current bugs and devel wishes reported to the bugzilla servers can be seen -@@ -104,8 +104,9 @@ Optional : - - libkdepimlibs >= 4.4.x http://pim.kde.org To support KAddressBook entries. - liblensfun >= 0.2.5 http://lensfun.berlios.de To support LensCorrection editor. If no external libray is found, internal version is used instead. plugin. --libgphoto2 >= 2.4.0 http://www.gphoto.org To support Gphoto2 Cameras. --liblqr-1 >= 0.4.1 http://liblqr.wikidot.com For Liquid Rescale tool. If no external libray is found, internal version is used instead. -+libgphoto2 >= 2.4.0 http://www.gphoto.org To support Gphoto2 Cameras. -+libusb >= 1.0.0 http://www.libusb.org Required by Gphoto2 as linking dependency. See details in B.K.O #268267 -+liblqr-1 >= 0.4.1 http://liblqr.wikidot.com For Liquid Rescale tool. If no external libray is found, internal version is used instead. - - Note : all library dependencies require development and binary packages installed on your - computer to compile digiKam. -@@ -119,12 +120,12 @@ Video thumbs support under Linux : please install "mplayerthumbs" package. - - -- INSTALLATION -------------------------------------------------------- - --In order to compile, especially when QT3/Qt4 are installed at the same time, -+In order to compile, especially when QT3/Qt4 are installed at the same time, - just use something like that: - - # export VERBOSE=1 - # export QTDIR=/usr/lib/qt4 --# export PATH=$QTDIR/bin:$PATH -+# export PATH=$QTDIR/bin:$PATH - # cmake . - # make - # sudo make install -@@ -152,7 +153,7 @@ Note: To know KDE install path on your computer, use 'kde-config --prefix' comma - - -- DONATE MONEY -------------------------------------------------------- - --If you love digiKam, you can help developers to buy new photo devices to test -+If you love digiKam, you can help developers to buy new photo devices to test - and implement new features. Thanks in advance for your generous donations. - - For more information, look at this url : http://www.digikam.org/?q=donation -diff --git a/digikam/CMakeLists.txt b/digikam/CMakeLists.txt -index 80fa0ee..c15f0b2 100644 ---- a/digikam/CMakeLists.txt -+++ b/digikam/CMakeLists.txt +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt @@ -281,6 +281,12 @@ TARGET_LINK_LIBRARIES(digikam cameragui )