[arch-commits] Commit in calligra/trunk (15 files)

Antonio Rojas arojas at archlinux.org
Tue May 31 07:28:52 UTC 2016


    Date: Tuesday, May 31, 2016 @ 09:28:52
  Author: arojas
Revision: 268763

Drop krita

Modified:
  calligra/trunk/PKGBUILD
Deleted:
  calligra/trunk/calligra-braindump.install
  calligra/trunk/calligra-extras.install
  calligra/trunk/calligra-filters.install
  calligra/trunk/calligra-flow.install
  calligra/trunk/calligra-gemini.install
  calligra/trunk/calligra-karbon.install
  calligra/trunk/calligra-kexi.install
  calligra/trunk/calligra-krita.install
  calligra/trunk/calligra-plan.install
  calligra/trunk/calligra-plugins.install
  calligra/trunk/calligra-sheets.install
  calligra/trunk/calligra-stage.install
  calligra/trunk/calligra-words.install
  calligra/trunk/calligra.install

----------------------------+
 PKGBUILD                   |   32 +++++---------------------------
 calligra-braindump.install |   12 ------------
 calligra-extras.install    |   11 -----------
 calligra-filters.install   |   12 ------------
 calligra-flow.install      |   12 ------------
 calligra-gemini.install    |   12 ------------
 calligra-karbon.install    |   12 ------------
 calligra-kexi.install      |   12 ------------
 calligra-krita.install     |   13 -------------
 calligra-plan.install      |   12 ------------
 calligra-plugins.install   |   11 -----------
 calligra-sheets.install    |   12 ------------
 calligra-stage.install     |   12 ------------
 calligra-words.install     |   12 ------------
 calligra.install           |   11 -----------
 15 files changed, 5 insertions(+), 193 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-31 07:13:33 UTC (rev 268762)
+++ PKGBUILD	2016-05-31 07:28:52 UTC (rev 268763)
@@ -14,7 +14,6 @@
          'calligra-handbook'
          'calligra-karbon'
          'calligra-kexi'
-         'calligra-krita'
          'calligra-libs'
          'calligra-plan'
          'calligra-plugins'
@@ -22,14 +21,14 @@
          'calligra-stage'
          'calligra-words')
 pkgver=2.9.11
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs4' 'eigen' 'libmarble4'
-             'lcms2' 'libmariadbclient' 'freetds' 'xbase' 'libwpg' 'opencolorio'
-             'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt4' 'libkdcraw4' 'libodfgen'
-             'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc' 'libvisio'
+             'lcms2' 'libmariadbclient' 'freetds' 'xbase' 'libwpg'
+             'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt4' 'libodfgen'
+             'openjpeg' 'kdegraphics-okular' 'pstoedit' 'libvisio'
              'libetonyek' 'libpqxx' 'libspnav' 'postgresql') # 'libqgit2'
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz" 'libwps-0.4.patch')
@@ -57,6 +56,7 @@
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DBUILD_active=OFF \
     -DWITH_Soprano=OFF \
+    -DBUILD_krita=OFF \
     -DMARBLE_INCLUDE_DIR=/usr/include/marble4 \
     -DMARBLE_GLOBAL_HEADER=/usr/include/marble4/MarbleGlobal.h \
     -DMARBLE_LIBRARIES=/usr/lib/libmarblewidget.so
@@ -70,7 +70,6 @@
               'libwps: Microsoft Works file word processor format import'
               'libvisio: Microsoft Visio import filter'
               'libetonyek: Apple Keynote import filter')
-  install=calligra-filters.install
 
   cd build/filters
   make DESTDIR="${pkgdir}" install
@@ -92,7 +91,6 @@
   pkgdesc="Plugins for the Calligra office suite"
   depends=('calligra-libs' 'calligra-filters' 'libspnav')
   optdepends=('libmarble4: map shape for Calligra')
-  install=calligra-plugins.install
 
   cd build/plugins
   make DESTDIR="${pkgdir}" install
@@ -106,7 +104,6 @@
   depends=('calligra-libs' 'kdebase-runtime' 'pstoedit')
   optdepends=('calligra-filters: import/export filters'
               'calligra-extras: extra calligra tools')
-  install=calligra-karbon.install
 
   cd build/karbon
   make DESTDIR="${pkgdir}" install
@@ -122,7 +119,6 @@
               'calligra-sheets: Spreadsheet-to-Kexi-table import plugin'
               'libmarble4: map form widget'
               'calligra-plugins: extra calligra plugins')
-  install=calligra-kexi.install
 
   cd build/kexi
   make DESTDIR="${pkgdir}" install
@@ -133,7 +129,6 @@
 package_calligra-plan() {
   pkgdesc="Calligra Project Management Component"
   depends=('calligra-words')
-  install=calligra-plan.install
 
   cd build/plan
   make DESTDIR="${pkgdir}" install
@@ -145,7 +140,6 @@
 package_calligra-stage() {
   pkgdesc="Write presentation documents"
   depends=('calligra-plugins' 'kdebase-runtime')
-  install=calligra-stage.install
 
   cd build/stage
   make DESTDIR="${pkgdir}" install
@@ -153,16 +147,6 @@
   make DESTDIR="${pkgdir}" install
 }
 
-package_calligra-krita() {
-  pkgdesc="Edit and paint images"
-  depends=('calligra-plugins' 'kdebase-runtime' 'opencolorio' 'libkdcraw4'
-           'fftw' 'glew' 'curl' 'gsl')
-  install=calligra-krita.install
-
-  cd build/krita
-  make DESTDIR="${pkgdir}" install
-}
-
 package_calligra-sheets() {
   pkgdesc="Write spreadsheet documents"
   depends=('calligra-libs' 'gsl' 'kdebase-runtime')
@@ -169,7 +153,6 @@
   optdepends=('calligra-filters: import/export filters'
               'calligra-plugins: extra calligra plugins'
               'calligra-extras: extra calligra tools')
-  install=calligra-sheets.install
 
   cd build/sheets
   make DESTDIR="${pkgdir}" install
@@ -181,7 +164,6 @@
   pkgdesc="Word Processor"
   depends=('kdebase-runtime' 'calligra-plugins')
   optdepends=('calligra-extras: extra calligra tools')
-  install=calligra-words.install
 
   cd build/words
   make DESTDIR="${pkgdir}" install
@@ -198,7 +180,6 @@
 package_calligra-braindump() {
   pkgdesc="Notes and idea gathering"
   depends=('calligra-libs' 'kdebase-runtime')
-  install=calligra-braindump.install
 
   cd build/braindump
   make DESTDIR="${pkgdir}" install
@@ -208,7 +189,6 @@
   pkgdesc="Flowchart & Diagram Editing"
   depends=('calligra-words')
   optdepends=('calligra-karbon: to export the charts in various formats')
-  install=calligra-flow.install
 
   cd build/flow
   make DESTDIR="${pkgdir}" install
@@ -220,7 +200,6 @@
   optdepends=('kdegraphics-okular')
   conflicts=('calligra-tools')
   replaces=('calligra-tools')
-  install=calligra-extras.install
 
   cd build/extras
   make DESTDIR="${pkgdir}" install
@@ -241,7 +220,6 @@
   pkgdesc="QML interface for Calligra Words and Stage"
   depends=('calligra-words' 'calligra-stage')
 #  optdepends=('libqgit2: GIT plugin')
-  install=calligra-gemini.install
 
   cd build/qtquick
   make DESTDIR="${pkgdir}" install

Deleted: calligra-braindump.install
===================================================================
--- calligra-braindump.install	2016-05-31 07:13:33 UTC (rev 268762)
+++ calligra-braindump.install	2016-05-31 07:28:52 UTC (rev 268763)
@@ -1,12 +0,0 @@
-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

Deleted: calligra-extras.install
===================================================================
--- calligra-extras.install	2016-05-31 07:13:33 UTC (rev 268762)
+++ calligra-extras.install	2016-05-31 07:28:52 UTC (rev 268763)
@@ -1,11 +0,0 @@
-post_install() {
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Deleted: calligra-filters.install
===================================================================
--- calligra-filters.install	2016-05-31 07:13:33 UTC (rev 268762)
+++ calligra-filters.install	2016-05-31 07:28:52 UTC (rev 268763)
@@ -1,12 +0,0 @@
-post_install() {
-  update-mime-database usr/share/mime &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Deleted: calligra-flow.install
===================================================================
--- calligra-flow.install	2016-05-31 07:13:33 UTC (rev 268762)
+++ calligra-flow.install	2016-05-31 07:28:52 UTC (rev 268763)
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Deleted: calligra-gemini.install
===================================================================
--- calligra-gemini.install	2016-05-31 07:13:33 UTC (rev 268762)
+++ calligra-gemini.install	2016-05-31 07:28:52 UTC (rev 268763)
@@ -1,12 +0,0 @@
-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

Deleted: calligra-karbon.install
===================================================================
--- calligra-karbon.install	2016-05-31 07:13:33 UTC (rev 268762)
+++ calligra-karbon.install	2016-05-31 07:28:52 UTC (rev 268763)
@@ -1,12 +0,0 @@
-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

Deleted: calligra-kexi.install
===================================================================
--- calligra-kexi.install	2016-05-31 07:13:33 UTC (rev 268762)
+++ calligra-kexi.install	2016-05-31 07:28:52 UTC (rev 268763)
@@ -1,12 +0,0 @@
-post_install() {
-	update-desktop-database -q
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Deleted: calligra-krita.install
===================================================================
--- calligra-krita.install	2016-05-31 07:13:33 UTC (rev 268762)
+++ calligra-krita.install	2016-05-31 07:28:52 UTC (rev 268763)
@@ -1,13 +0,0 @@
-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

Deleted: calligra-plan.install
===================================================================
--- calligra-plan.install	2016-05-31 07:13:33 UTC (rev 268762)
+++ calligra-plan.install	2016-05-31 07:28:52 UTC (rev 268763)
@@ -1,12 +0,0 @@
-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

Deleted: calligra-plugins.install
===================================================================
--- calligra-plugins.install	2016-05-31 07:13:33 UTC (rev 268762)
+++ calligra-plugins.install	2016-05-31 07:28:52 UTC (rev 268763)
@@ -1,11 +0,0 @@
-post_install() {
-    update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Deleted: calligra-sheets.install
===================================================================
--- calligra-sheets.install	2016-05-31 07:13:33 UTC (rev 268762)
+++ calligra-sheets.install	2016-05-31 07:28:52 UTC (rev 268763)
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Deleted: calligra-stage.install
===================================================================
--- calligra-stage.install	2016-05-31 07:13:33 UTC (rev 268762)
+++ calligra-stage.install	2016-05-31 07:28:52 UTC (rev 268763)
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Deleted: calligra-words.install
===================================================================
--- calligra-words.install	2016-05-31 07:13:33 UTC (rev 268762)
+++ calligra-words.install	2016-05-31 07:28:52 UTC (rev 268763)
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Deleted: calligra.install
===================================================================
--- calligra.install	2016-05-31 07:13:33 UTC (rev 268762)
+++ calligra.install	2016-05-31 07:28:52 UTC (rev 268763)
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}



More information about the arch-commits mailing list