summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Spangenberger2015-12-14 19:21:42 -0500
committerJesse Spangenberger2015-12-14 19:21:42 -0500
commitca6312fc652a53933aaabee4eac4aceb8bf9d263 (patch)
tree2d3590fab6ed541464bce0e8eb25b1a27ca8bfde
parentd4c67d00da7985bbfaf3032ddff73aabea809d68 (diff)
parenteae9bcc3fd58d1d11b742b3386a24c863161539a (diff)
downloadaur-ca6312fc652a53933aaabee4eac4aceb8bf9d263.tar.gz
Merge branch 'master' of ssh+git://aur.archlinux.org/notepadqq-git
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
2 files changed, 5 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 82ecb4b608bc..585ee14bc65c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,8 +10,8 @@ pkgbase = notepadqq-git
arch = x86_64
license = GPL3
makedepends = git
- makedepends = qt5-svg
- depends = qt5-webkit
+ makedepends = qt5-svg>5.2
+ depends = qt5-webkit>5.2
depends = hicolor-icon-theme
depends = desktop-file-utils
provides = notepadqq
diff --git a/PKGBUILD b/PKGBUILD
index ba4c5652ee6e..72cb24c1a462 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@ pkgdesc="A Linux clone of Notepad++"
arch=('i686' 'x86_64')
url="http://notepadqq.altervista.org/wp/"
license=('GPL3')
-depends=('qt5-webkit' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('git' 'qt5-svg')
+depends=('qt5-webkit>5.2' 'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('git' 'qt5-svg>5.2')
provides=('notepadqq')
conflicts=('notepadqq-bin' 'notepadqq' 'notepadqq-common')
install=${_pkgname}.install
@@ -28,7 +28,7 @@ pkgver() {
build() {
cd "${srcdir}/${_pkgname}"
- ./configure --qmake-path qmake-qt5 --prefix "${pkgdir}/usr"
+ ./configure --prefix "${pkgdir}/usr"
make
}