summaryrefslogtreecommitdiff
path: root/extra/qscintilla
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/qscintilla
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/qscintilla')
-rw-r--r--extra/qscintilla/PKGBUILD10
1 files changed, 6 insertions, 4 deletions
diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD
index 00eb07250..ae6938469 100644
--- a/extra/qscintilla/PKGBUILD
+++ b/extra/qscintilla/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 173042 2012-12-09 15:31:45Z andrea $
+# $Id: PKGBUILD 178983 2013-03-01 10:23:58Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
@@ -6,7 +6,7 @@ pkgbase=qscintilla
pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
'python-qscintilla-common')
pkgver=2.7
-pkgrel=1.1
+pkgrel=2
license=('GPL')
arch=('i686' 'x86_64' 'mips64el')
url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
@@ -17,7 +17,9 @@ md5sums=('a3857d75a2b332e0460131e0aa4cc4b5'
'8cf9c06252e2f11ab00e62848e322fd3')
build() {
- cd "${srcdir}/QScintilla-gpl-${pkgver}"
+ . /etc/profile.d/qt4.sh
+
+ cd "${srcdir}/QScintilla-gpl-${pkgver}"
patch -Np1 -i "${srcdir}/configure.py-objdir-support.diff"
cd Qt4Qt5
@@ -41,7 +43,7 @@ build() {
package_qscintilla() {
pkgdesc="A port to Qt4 of Neil Hodgson's Scintilla C++ editor class"
- depends=('qt')
+ depends=('qt4')
cd "${srcdir}/QScintilla-gpl-${pkgver}/Qt4Qt5"
make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install