Browse Source

makepkg passe first test

Bachir Soussi Chiadmi 6 years ago
parent
commit
0e26e6a972
6 changed files with 28 additions and 33 deletions
  1. 6 10
      .SRCINFO
  2. 1 2
      .gitignore
  3. 21 15
      PKGBUILD
  4. 0 6
      README.md
  5. BIN
      Screenshot_stackcontents.png
  6. BIN
      Screenshot_stackdesign.png

+ 6 - 10
.SRCINFO

@@ -1,36 +1,32 @@
 # Generated by mksrcinfo v8
 # Generated by mksrcinfo v8
-# Mon Jun  5 19:20:10 UTC 2017
+# Tue Jun  6 08:36:21 UTC 2017
 pkgbase = cascade-git
 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
 	pkgrel = 1
 	url = https://figureslibres.io/gogs/bachir/Cascade
 	url = https://figureslibres.io/gogs/bachir/Cascade
 	arch = any
 	arch = any
 	license = AGPL
 	license = AGPL
+	makedepends = coreutils
 	makedepends = git
 	makedepends = git
+	makedepends = python
+	makedepends = python-setuptools
 	depends = python
 	depends = python
 	depends = python-pyqt5
 	depends = python-pyqt5
-	depends = python-pigments
 	depends = python-markdown
 	depends = python-markdown
 	depends = python-pygit2
 	depends = python-pygit2
 	depends = python-beautifulsoup4
 	depends = python-beautifulsoup4
 	depends = pandoc
 	depends = pandoc
 	depends = python-pypandoc
 	depends = python-pypandoc
 	depends = qt5-base
 	depends = qt5-base
-	depends = qt5-webkit-ng
 	depends = python-setuptools
 	depends = python-setuptools
 	depends = desktop-file-utils
 	depends = desktop-file-utils
-	provides = cascade
 	source = git+https://figureslibres.io/gogs/bachir/Cascade.git
 	source = git+https://figureslibres.io/gogs/bachir/Cascade.git
 	source = cascade.desktop
 	source = cascade.desktop
 	source = cascade.png
 	source = cascade.png
-	source = Screenshot_stackcontents.png
-	source = Screenshot_stackdesign.png
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = d1a8974b81ce913c816b6ff1bd329299
 	md5sums = d1a8974b81ce913c816b6ff1bd329299
 	md5sums = d2de8e22b3f16a03c393dc1b8878fb48
 	md5sums = d2de8e22b3f16a03c393dc1b8878fb48
-	md5sums = 0939e1477071b317704ef2d4744c5828
-	md5sums = dc30dcfb4fb085ecb5dd46416d819221
 
 
 pkgname = cascade-git
 pkgname = cascade-git
 
 

+ 1 - 2
.gitignore

@@ -1,5 +1,4 @@
 src
 src
 pkg
 pkg
-cascade
-tools.cascade
+Cascade
 cascade-git-*
 cascade-git-*

+ 21 - 15
PKGBUILD

@@ -1,27 +1,29 @@
-
 # Maintainer: Bachir Soussi Chiadmi (scbh at g-u-i dot me)
 # Maintainer: Bachir Soussi Chiadmi (scbh at g-u-i dot me)
+
 pkgname=cascade-git
 pkgname=cascade-git
-pkgver=r19.7fe30da
+pkgver=r70.6819a26
 pkgrel=1
 pkgrel=1
-pkgdesc="PyQt5 based appliaction for writing and layout printings."
+pkgdesc="PyQt5 based appliaction for writing and layout printed documents."
 arch=('any')
 arch=('any')
 url="https://figureslibres.io/gogs/bachir/Cascade"
 url="https://figureslibres.io/gogs/bachir/Cascade"
 license=('AGPL')
 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() {
 pkgver() {
-	cd "$srcdir/tools.cascade"
+	cd "$srcdir/Cascade"
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 }
 
 
+# todo : do i need to build ? i think no
 # build() {
 # build() {
 # 	# cd "$srcdir/tools.ospkit/src/"
 # 	# cd "$srcdir/tools.ospkit/src/"
 # 	# qmake
 # 	# qmake
@@ -29,10 +31,14 @@ pkgver() {
 # }
 # }
 
 
 package() {
 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"
 	mkdir -p "$pkgdir/usr/share/applications"
 	install -Dm644 cascade.desktop "$pkgdir/usr/share/applications/cascade.desktop"
 	install -Dm644 cascade.desktop "$pkgdir/usr/share/applications/cascade.desktop"
 	mkdir -p "$pkgdir/usr/share/pixmaps"
 	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
 }
 }

+ 0 - 6
README.md

@@ -3,9 +3,3 @@ Cascade arch linux package
 
 
 ## A Markup Cascading Printing software.
 ## 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.
 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)

BIN
Screenshot_stackcontents.png


BIN
Screenshot_stackdesign.png