summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBachir Soussi Chiadmi2017-06-06 10:36:59 +0200
committerBachir Soussi Chiadmi2017-06-06 10:36:59 +0200
commit0e26e6a972373fe793b712b6fe3a99218612ebce (patch)
tree3388497862d03e7d0e2a87a4697b99c76080eddb
parentb2ede324bfc2ff42a6eb99eb223b93dd091fa193 (diff)
downloadaur-0e26e6a972373fe793b712b6fe3a99218612ebce.tar.gz
makepkg passe first test
-rw-r--r--.SRCINFO16
-rw-r--r--.gitignore3
-rw-r--r--PKGBUILD36
-rw-r--r--README.md6
-rw-r--r--Screenshot_stackcontents.pngbin220075 -> 0 bytes
-rw-r--r--Screenshot_stackdesign.pngbin124043 -> 0 bytes
6 files changed, 28 insertions, 33 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7fa01887852..cb79d9ec22c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,36 +1,32 @@
# Generated by mksrcinfo v8
-# Mon Jun 5 19:20:10 UTC 2017
+# Tue Jun 6 08:36:21 UTC 2017
pkgbase = cascade-git
- pkgdesc = PyQt5 based appliaction for writing and layout printings.
- pkgver = r19.7fe30da
+ pkgdesc = PyQt5 based appliaction for writing and layout printed documents.
+ pkgver = r70.6819a26
pkgrel = 1
url = https://figureslibres.io/gogs/bachir/Cascade
arch = any
license = AGPL
+ makedepends = coreutils
makedepends = git
+ makedepends = python
+ makedepends = python-setuptools
depends = python
depends = python-pyqt5
- depends = python-pigments
depends = python-markdown
depends = python-pygit2
depends = python-beautifulsoup4
depends = pandoc
depends = python-pypandoc
depends = qt5-base
- depends = qt5-webkit-ng
depends = python-setuptools
depends = desktop-file-utils
- provides = cascade
source = git+https://figureslibres.io/gogs/bachir/Cascade.git
source = cascade.desktop
source = cascade.png
- source = Screenshot_stackcontents.png
- source = Screenshot_stackdesign.png
md5sums = SKIP
md5sums = d1a8974b81ce913c816b6ff1bd329299
md5sums = d2de8e22b3f16a03c393dc1b8878fb48
- md5sums = 0939e1477071b317704ef2d4744c5828
- md5sums = dc30dcfb4fb085ecb5dd46416d819221
pkgname = cascade-git
diff --git a/.gitignore b/.gitignore
index 8476a10e77f..03992ae01f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
src
pkg
-cascade
-tools.cascade
+Cascade
cascade-git-*
diff --git a/PKGBUILD b/PKGBUILD
index 6e71bd67063..6a0fc9e007b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,29 @@
-
# Maintainer: Bachir Soussi Chiadmi (scbh at g-u-i dot me)
+
pkgname=cascade-git
-pkgver=r19.7fe30da
+pkgver=r70.6819a26
pkgrel=1
-pkgdesc="PyQt5 based appliaction for writing and layout printings."
+pkgdesc="PyQt5 based appliaction for writing and layout printed documents."
arch=('any')
url="https://figureslibres.io/gogs/bachir/Cascade"
license=('AGPL')
-depends=('python' 'python-pyqt5' 'python-pigments' 'python-markdown' 'python-pygit2' 'python-beautifulsoup4' 'pandoc' 'python-pypandoc' 'qt5-base' 'qt5-webkit-ng' 'python-setuptools' 'desktop-file-utils')
-# pip package, how to do that ?
-# 'sass' 'pyphen' 'pygments-stye-monokailight' 'pygments-stye-monokai-hcb'
+depends=('python' 'python-pyqt5' 'python-markdown' 'python-pygit2' 'python-beautifulsoup4' 'pandoc' 'python-pypandoc' 'qt5-base' 'python-setuptools' 'desktop-file-utils')
-makedepends=('git')
-provides=('cascade')
-source=('git+https://figureslibres.io/gogs/bachir/Cascade.git' 'cascade.desktop' 'cascade.png' 'Screenshot_stackcontents.png' 'Screenshot_stackdesign.png')
-md5sums=('SKIP' 'd1a8974b81ce913c816b6ff1bd329299' 'd2de8e22b3f16a03c393dc1b8878fb48' '0939e1477071b317704ef2d4744c5828' 'dc30dcfb4fb085ecb5dd46416d819221')
-conflicts=("")
+# needs custom build of 'qt5-webkit-ng'
+# pip package, how to do that ?
+# 'sass' 'pyphen' 'python-pigments' 'pygments-stye-monokailight' 'pygments-stye-monokai-hcb'
+makedepends=('coreutils' 'git' 'python' 'python-setuptools')
+# provides=('cascade')
+source=('git+https://figureslibres.io/gogs/bachir/Cascade.git' 'cascade.desktop' 'cascade.png')
+md5sums=('SKIP' 'd1a8974b81ce913c816b6ff1bd329299' 'd2de8e22b3f16a03c393dc1b8878fb48')
+# conflicts=("")
pkgver() {
- cd "$srcdir/tools.cascade"
+ cd "$srcdir/Cascade"
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
+# todo : do i need to build ? i think no
# build() {
# # cd "$srcdir/tools.ospkit/src/"
# # qmake
@@ -29,10 +31,14 @@ pkgver() {
# }
package() {
- mkdir -p "$pkgdir/usr/local/bin"
- install "$srcdir/tools.cascade/src/OSPKit" "$pkgdir/usr/bin/ospkit"
+ # mkdir -p "$pkgdir/usr/local/bin"
+ # install "$srcdir/tools.cascade/src/OSPKit" "$pkgdir/usr/bin/ospkit"
+ # todo how to install all python files of the app ??
mkdir -p "$pkgdir/usr/share/applications"
install -Dm644 cascade.desktop "$pkgdir/usr/share/applications/cascade.desktop"
mkdir -p "$pkgdir/usr/share/pixmaps"
- install -Dm644 ospkit.png "$pkgdir/usr/share/pixmaps/cascade.png"
+ install -Dm644 cascade.png "$pkgdir/usr/share/pixmaps/cascade.png"
+
+ cd "$srcdir/Cascade"
+ python setup.py install --root="$pkgdir/" --optimize=1
}
diff --git a/README.md b/README.md
index 4c64eb866f7..d3ca74af942 100644
--- a/README.md
+++ b/README.md
@@ -3,9 +3,3 @@ Cascade arch linux package
## A Markup Cascading Printing software.
PyQt5 application for printing layout. Write your contents with markdown, make your design with scss and js within the same app.
-
-## Contents Stack
-![Contents Stack](Screenshot_stackcontents.png)
-
-## Design Stack
-![Design Stack](Screenshot_stackdesign.png)
diff --git a/Screenshot_stackcontents.png b/Screenshot_stackcontents.png
deleted file mode 100644
index 943849dbfd9..00000000000
--- a/Screenshot_stackcontents.png
+++ /dev/null
Binary files differ
diff --git a/Screenshot_stackdesign.png b/Screenshot_stackdesign.png
deleted file mode 100644
index 0155c79328e..00000000000
--- a/Screenshot_stackdesign.png
+++ /dev/null
Binary files differ