summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeverin Glöckner2020-03-16 06:08:55 +0100
committerSeverin Glöckner2020-03-16 06:08:55 +0100
commit9a35b94bd4ff25a5831f6fd578cb806cca2e79e2 (patch)
treebbbd53e08377a8e927fd15e9e533e4a2a57e05d6
parent47da7df79bfb2b63fc06350588ec31b7b93b8a44 (diff)
downloadaur-9a35b94bd4ff25a5831f6fd578cb806cca2e79e2.tar.gz
update to v2.4, switching to python3 and Qt5
-rw-r--r--.SRCINFO19
-rw-r--r--PKGBUILD36
-rw-r--r--ninja-ide.desktop10
3 files changed, 42 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 367aa73ec3b7..9dd95ddbc82c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,19 @@
pkgbase = ninja-ide
pkgdesc = Cross-platform IDE focused on Python application development
- pkgver = 2.3
- pkgrel = 4
- url = http://ninja-ide.org/
+ pkgver = 2.4
+ pkgrel = 1
+ url = http://ninja-ide.org
arch = any
license = GPL3
- depends = python2-setuptools
- depends = python2-pyqt
- depends = python2-pyinotify
- source = ninja-ide-2.3.zip::https://github.com/ninja-ide/ninja-ide/archive/v2.3.zip
+ makedepends = python-setuptools
+ depends = python
+ depends = python-pyqt5
+ depends = qt5-declarative
+ source = https://github.com/ninja-ide/ninja-ide/releases/download/v2.4/ninja-ide-2.4.zip
source = ninja-ide.desktop
source = remove-qtwebkit.patch
- sha256sums = 463a801040afca7fae12c8d9935e907dc99d744544b42808ce59737b5609e975
- sha256sums = 6cabe8ba0c1589feb4919f9de6e4b8bc0a692f5cb8c630f1e9c661aa19f22fdb
+ sha256sums = aca3bc5991d97f4bff04f2ba4775d053e9127fed56927dcc949ea3d309bb7cf3
+ sha256sums = 1d9863a8a4afb04bad1f66682d335aef6b9adcdb6f9e99055c0cb27543fddcd2
sha256sums = ba0d32eb194bcdfebf96e2f8a276c19f8aeadd28961fc135504d8715db5ee52c
pkgname = ninja-ide
diff --git a/PKGBUILD b/PKGBUILD
index 1f0129f4701c..f9ea877ce02c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,55 @@
# $Id: PKGBUILD 210977 2017-02-07 23:59:02Z bgyorgy $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
+# Maintainer: Severin Glöckner <severin.gloeckner@stud.htwk-leipzig.de>
+# Contributor: Angel Velasquez <angvp@archlinux.org>
# Contributor: Evangelos Foutras <evangelos@foutrelis.com>
# Contributor: helq <linuxero789@gmail.com>
# Contributor: Jesus Jerez <jhuss@archlinux.org.ve>
# Contributor: DobleD <dobled@dobled.info>
pkgname=ninja-ide
-pkgver=2.3
-pkgrel=4
+pkgver=2.4
+pkgrel=1
pkgdesc="Cross-platform IDE focused on Python application development"
arch=('any')
-url="http://ninja-ide.org/"
+url="http://ninja-ide.org"
license=('GPL3')
-depends=('python2-setuptools' 'python2-pyqt' 'python2-pyinotify')
-source=($pkgname-$pkgver.zip::https://github.com/ninja-ide/ninja-ide/archive/v$pkgver.zip
+depends=('python' 'python-pyqt5' 'qt5-declarative')
+makedepends=('python-setuptools')
+source=(https://github.com/ninja-ide/ninja-ide/releases/download/v$pkgver/$pkgname-$pkgver.zip
ninja-ide.desktop
remove-qtwebkit.patch)
-sha256sums=('463a801040afca7fae12c8d9935e907dc99d744544b42808ce59737b5609e975'
- '6cabe8ba0c1589feb4919f9de6e4b8bc0a692f5cb8c630f1e9c661aa19f22fdb'
+sha256sums=('aca3bc5991d97f4bff04f2ba4775d053e9127fed56927dcc949ea3d309bb7cf3'
+ '1d9863a8a4afb04bad1f66682d335aef6b9adcdb6f9e99055c0cb27543fddcd2'
'ba0d32eb194bcdfebf96e2f8a276c19f8aeadd28961fc135504d8715db5ee52c')
prepare() {
cd $pkgname-$pkgver
# Remove qtwebkit dependency
- patch -Np1 -i ../remove-qtwebkit.patch
+ # patch -Np1 -i ../remove-qtwebkit.patch
+
+ # This was missed in the v2.4 backport
+ sed -r "s/(print) ('.+')$/\1\(\2\)/" \
+ -i "ninja_tests/core/examples/file_for_tests.py"
+
+ # Work around not being prepared for python 3.8
+ sed -e "s/_ast.Num/_ast.Constant/" \
+ -e "/_ast.Str/ s/^/#/" \
+ -i ninja_ide/tools/introspection.py \
+ ninja_ide/tools/completion/analyzer.py
}
package() {
cd $pkgname-$pkgver
- python2 setup.py install --root="$pkgdir" -O1
+ python setup.py install --root="$pkgdir" -O1
install -Dm644 "$srcdir/$pkgname.desktop" \
"$pkgdir/usr/share/applications/$pkgname.desktop"
install -Dm644 ninja_ide/img/icon.png \
- "$pkgdir/usr/share/pixmaps/$pkgname.png"
+ "$pkgdir/usr/share/icons/hicolor/128x128/apps/$pkgname.png"
+ install -Dm644 icon.png \
+ "$pkgdir/usr/share/icons/hicolor/256x256/apps/$pkgname.png"
}
# vim:set ts=2 sw=2 et:
diff --git a/ninja-ide.desktop b/ninja-ide.desktop
index 35b4cc0913fb..f4147ee74736 100644
--- a/ninja-ide.desktop
+++ b/ninja-ide.desktop
@@ -1,10 +1,14 @@
[Desktop Entry]
+Version=1.1
Name=Ninja IDE
-Comment=A Python IDE
-Exec=ninja-ide
+GenericName=Python IDE
+Comment=Code with Python like a ninja
+Comment[de]=Programmiere mit Python wie ein Ninja
+Exec=ninja-ide %F
Icon=ninja-ide
Terminal=false
Type=Application
-Categories=Development;
+Categories=Development;IDE;Qt;
StartupNotify=true
+Keywords=Python
MimeType=application/x-python;application/x-ninja-ide;