diff options
author | willemw12 | 2016-07-24 10:51:28 +0200 |
---|---|---|
committer | willemw12 | 2016-07-24 10:51:28 +0200 |
commit | ed6843a939abbe1ca15e54093ec472eb53d4f970 (patch) | |
tree | d1220e11242b40d4f8c0bc2b3d45de8c5e3390c1 | |
parent | a4236bed68befd5250e13c00bd54689f0e01a27e (diff) | |
download | aur-ed6843a939abbe1ca15e54093ec472eb53d4f970.tar.gz |
Fix illegal bool conversion...
Remove installpri.patch.
Don't move icons to oxygen folder.
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 23 |
2 files changed, 13 insertions, 14 deletions
@@ -1,7 +1,7 @@ pkgbase = edyuk-svn pkgdesc = Fully-featured Qt4 IDE pkgver = r1053 - pkgrel = 2 + pkgrel = 3 url = http://www.edyuk.org install = edyuk-svn.install arch = i686 @@ -12,9 +12,7 @@ pkgbase = edyuk-svn provides = edyuk conflicts = edyuk source = edyuk-svn::svn+http://edyuk.svn.sf.net/svnroot/edyuk/trunk - source = installpri.patch md5sums = SKIP - md5sums = 66ce655bc8ad981f724150b06aea9ae4 pkgname = edyuk-svn @@ -4,7 +4,7 @@ _pkgname=edyuk pkgname=$_pkgname-svn pkgver=r1053 -pkgrel=2 +pkgrel=3 pkgdesc="Fully-featured Qt4 IDE" arch=('i686' 'x86_64') url="http://www.edyuk.org" @@ -14,23 +14,25 @@ makedepends=('subversion') provides=($_pkgname) conflicts=($_pkgname) install=$pkgname.install -source=($pkgname::svn+http://edyuk.svn.sf.net/svnroot/edyuk/trunk - installpri.patch) -md5sums=('SKIP' - '66ce655bc8ad981f724150b06aea9ae4') +source=($pkgname::svn+http://edyuk.svn.sf.net/svnroot/edyuk/trunk) +md5sums=('SKIP') pkgver() { cd $pkgname + local ver="$(svnversion)" printf "r%s" "${ver//[[:alpha:]]}" } -build() { +prepare() { cd $pkgname - # Fix path to Qt mkspecs directory - # Fix directory for icons on KDE4 - patch -Np0 -i ../installpri.patch + sed -i 's|return m_handle ? m_handle->document() : false|return m_handle ? m_handle->document() != 0 : false|' \ + 3rdparty/qcodeedit2/lib/document/qdocumentline.cpp +} + +build() { + cd $pkgname qmake-qt4 make @@ -57,7 +59,6 @@ package() { # it causes firefox and thunderbird (with kparts plugin) to crash when launched rm -r "$pkgdir/usr/share/mime/" - # Cannot install in a directory path that contains a symlink (/usr/share/icons/default.kde4) - mv "$pkgdir/usr/share/icons/"{default.kde4,oxygen} + #mv "$pkgdir/usr/share/icons/"{default.kde,oxygen} } |