summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD25
-rw-r--r--setup.py.patch19
3 files changed, 16 insertions, 39 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 924f9b93b75..3ee46ff6bcd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = leo
pkgdesc = Outliner, Editor, and Personal Information Manager written in 100% Python
- pkgver = 6.2.1
+ pkgver = 6.3
pkgrel = 1
url = http://leoeditor.com
arch = any
@@ -23,12 +23,11 @@ pkgbase = leo
depends = python-black
depends = python-asttokens
optdepends = python-pyenchant: spellchecking support
- source = leo-6.2.1.tar.gz::https://github.com/leo-editor/leo-editor/archive/v6.2.1.tar.gz
- source = setup.py.patch
+ provides = leo-editor
+ source = leo-6.3.tar.gz::https://github.com/leo-editor/leo-editor/archive/v6.3.tar.gz
source = leo.xml
- sha256sums = 95ae6334e1c1ead096bae7695c1c0a0b8c6992a83ea6c88166f94dd750fc68ae
- sha256sums = SKIP
- sha256sums = SKIP
+ sha256sums = 6a39af710fa53caaf0cda947a0dcb37ba0f6aed9ffe2018954b2e81b3d57725f
+ sha256sums = 630852279324b0d9acf656c4684f16777d64f49b4062bd101c5cddbfc33c82cb
pkgname = leo
diff --git a/PKGBUILD b/PKGBUILD
index ef1393aaac5..8333fc80300 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,13 @@
# Contributor: David Scholl <djscholl at gmail dot com>
pkgname=leo
-pkgver=6.2.1
+pkgver=6.3
pkgrel=1
pkgdesc="Outliner, Editor, and Personal Information Manager written in 100% Python"
arch=('any')
url="http://leoeditor.com"
license=('MIT' 'BSD')
+provides=('leo-editor')
depends=('desktop-file-utils'
'shared-mime-info'
'python-pyqt5'
@@ -27,23 +28,19 @@ depends=('desktop-file-utils'
makedepends=('python-setuptools' 'gendesk')
optdepends=('python-pyenchant: spellchecking support')
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/leo-editor/leo-editor/archive/v${pkgver}.tar.gz"
- 'setup.py.patch'
'leo.xml')
-sha256sums=('95ae6334e1c1ead096bae7695c1c0a0b8c6992a83ea6c88166f94dd750fc68ae'
- 'SKIP'
- 'SKIP')
-
-prepare() {
- cd "${pkgname}-editor-${pkgver}"
- patch -Np1 -i ../setup.py.patch
-}
+sha256sums=('6a39af710fa53caaf0cda947a0dcb37ba0f6aed9ffe2018954b2e81b3d57725f'
+ '630852279324b0d9acf656c4684f16777d64f49b4062bd101c5cddbfc33c82cb')
build() {
cd "${pkgname}-editor-${pkgver}"
python setup.py build
- gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" \
- --mimetypes=application/x-leo-outline --exec="$pkgname" \
- --categories=TextEditor\;Development --icon "$pkgname"
+ gendesk -f -n --pkgname "$pkgname" \
+ --pkgdesc "$pkgdesc" \
+ --mimetypes=application/x-leo-outline \
+ --exec="$pkgname" \
+ --categories=TextEditor\;Development \
+ --icon "$pkgname"
}
package() {
@@ -53,4 +50,4 @@ package() {
install -Dm644 leo.desktop "${pkgdir}/usr/share/applications/leo.desktop"
install -Dm644 "$srcdir/leo.xml" "${pkgdir}/usr/share/mime/packages/leo.xml"
install -Dm644 "leo/Icons/application-x-leo-outline.png" "${pkgdir}/usr/share/pixmaps/leo.png"
-} \ No newline at end of file
+}
diff --git a/setup.py.patch b/setup.py.patch
deleted file mode 100644
index 816cbaf278e..00000000000
--- a/setup.py.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- leo-editor-6.1/setup.py
-+++ leo-editor-6.1/setup.py
-@@ -113,7 +113,6 @@
- 'meta', # for livecode.py plugin, which is enabled by default
- 'nbformat', # for Jupyter notebook integration
- 'pylint', 'pyflakes', 'black', # coding syntax standards
-- 'setupext-janitor >= 1.1', # extend `setup.py clean` #1055,#1255
- 'pyshortcuts >= 1.7', # desktop integration (#1243)
- 'sphinx', # rST plugin
- 'windows-curses; platform_system=="Windows"', # for console mode on Windows
-@@ -165,7 +164,7 @@
- setup_requires=setup_requires,
- install_requires=user_requires,
- entry_points=define_entry_points(),
-- cmdclass={'clean': janitor.CleanCommand}, # clean more than setuptools, #1055
-+ cmdclass=cmd_classes, # clean more than setuptools, #1055
- python_requires='>=3.6',
- )
-