summaryrefslogtreecommitdiff
path: root/extra/scribus
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-03-02 18:00:18 +0100
committerMichał Masłowski <mtjm@mtjm.eu>2013-03-02 18:02:35 +0100
commitbae1d2619114abb36d636273329ed6d3ae157055 (patch)
tree9a9c785204458547c0fc6b6b10357abd379a0fdd /extra/scribus
parentf3a6a3f3b315c15fe04bb44a40020c3842c8ef21 (diff)
parent98aa0004e23472ee63753fded33cd55d8b942f36 (diff)
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts: community/bitcoin/PKGBUILD community/canorus/PKGBUILD community/celt-0.7/PKGBUILD community/djview4/PKGBUILD community/erlang-sdl/PKGBUILD community/erlang/PKGBUILD community/fcitx-mozc/PKGBUILD community/glitz/PKGBUILD community/gmerlin/PKGBUILD community/gmic/PKGBUILD community/goldendict/PKGBUILD community/google-gadgets/PKGBUILD community/highlight/PKGBUILD community/jack2/PKGBUILD community/kvirc/PKGBUILD community/launchy/PKGBUILD community/mplayer2/PKGBUILD community/mumble/PKGBUILD community/mupdf/PKGBUILD community/projectm/PKGBUILD community/psimedia/PKGBUILD community/pyqt3/PKGBUILD community/qps/PKGBUILD community/qstardict/PKGBUILD community/qsynergy/PKGBUILD community/synergy/PKGBUILD community/units/PKGBUILD community/yagf/PKGBUILD extra/automoc4/PKGBUILD extra/avahi/PKGBUILD extra/avidemux/PKGBUILD extra/bzflag/PKGBUILD extra/cagibi/PKGBUILD extra/cairo/PKGBUILD extra/calligra/PKGBUILD extra/cmake/PKGBUILD extra/dssi/PKGBUILD extra/ffmpeg/PKGBUILD extra/glu/PKGBUILD extra/graphviz/PKGBUILD extra/hylafax/PKGBUILD extra/kdesdk/PKGBUILD extra/libbluedevil/PKGBUILD extra/liblastfm/PKGBUILD extra/liborigin2/PKGBUILD extra/libpng/PKGBUILD extra/libqzeitgeist/PKGBUILD extra/libx11/PKGBUILD extra/mesa/PKGBUILD extra/mpg123/PKGBUILD extra/mtr/PKGBUILD extra/mysql/PKGBUILD extra/netpbm/PKGBUILD extra/nspr/PKGBUILD extra/polkit-qt/PKGBUILD extra/poppler/PKGBUILD extra/prison/PKGBUILD extra/pyqt/PKGBUILD extra/qimageblitz/PKGBUILD extra/qscintilla/PKGBUILD extra/qsynth/PKGBUILD extra/qt-assistant-compat/PKGBUILD extra/qt-gstreamer/PKGBUILD extra/qt/PKGBUILD extra/qtwebkit/PKGBUILD extra/qwt/PKGBUILD extra/samba/PKGBUILD extra/sane/PKGBUILD extra/smplayer/PKGBUILD extra/soprano/PKGBUILD extra/texmacs/PKGBUILD extra/tomcat-native/PKGBUILD extra/transmission/PKGBUILD extra/wpa_supplicant_gui/PKGBUILD libre/lame-libre/PKGBUILD libre/linux-libre/PKGBUILD libre/mesa-demos-libre/PKGBUILD
Diffstat (limited to 'extra/scribus')
-rw-r--r--extra/scribus/PKGBUILD9
-rw-r--r--extra/scribus/scribus.install6
2 files changed, 6 insertions, 9 deletions
diff --git a/extra/scribus/PKGBUILD b/extra/scribus/PKGBUILD
index 195391d4f..51f2f93a6 100644
--- a/extra/scribus/PKGBUILD
+++ b/extra/scribus/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 175912 2013-01-24 08:14:06Z remy $
+# $Id: PKGBUILD 178994 2013-03-01 10:25:10Z andrea $
# Contributor: Ronald van Haren <ronald.archlinux.org>
# Contributor: tobias <tobias@archlinux.org>
# Contributor: Ben <ben@benmazer.net>
@@ -6,20 +6,19 @@
pkgname=scribus
pkgver=1.4.2
-pkgrel=1
+pkgrel=2
pkgdesc="A desktop publishing program"
arch=('i686' 'x86_64' 'mips64el')
url="http://www.scribus.net"
license=('GPL')
install=scribus.install
-depends=('libcups>=1.3.11' 'lcms>=1.18' 'qt' 'ghostscript>=8.70' \
+depends=('libcups>=1.3.11' 'lcms2' 'qt4' 'ghostscript>=8.70' \
'libart-lgpl>=2.3.20' 'python2' 'libxml2>=2.7.3' 'cairo' \
'desktop-file-utils' 'shared-mime-info' \
'hyphen' 'aspell' 'boost-libs')
-makedepends=('cmake' 'boost')
+makedepends=('cmake' 'boost' 'mesa')
options=(!libtool)
source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-md5sums=('5c2a6bb7107e67a0083e32275bdb1a13')
sha1sums=('6e67e98fa315a2890d9cbb12eed49ecebb7f11cb')
build() {
diff --git a/extra/scribus/scribus.install b/extra/scribus/scribus.install
index 0598e46ed..52a6286ac 100644
--- a/extra/scribus/scribus.install
+++ b/extra/scribus/scribus.install
@@ -1,8 +1,6 @@
-
post_install() {
- echo "update desktop mime database..."
- update-mime-database usr/share/mime > /dev/null 2>&1
- update-desktop-database -q > /dev/null 2>&1
+ update-mime-database usr/share/mime &> /dev/null
+ update-desktop-database -q
}
post_upgrade() {
post_install $1