[arch-commits] Commit in notion/trunk (PKGBUILD)

[Sergej Pupykin]

    Date: Tuesday, March 24, 2020 @ 14:08:35
  Author: spupykin
Revision: 603855

upgpkg: notion 1:4.0.0-1

Modified:
  notion/trunk/PKGBUILD

----------+
 PKGBUILD |   26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-24 14:07:58 UTC (rev 603854)
+++ PKGBUILD	2020-03-24 14:08:35 UTC (rev 603855)
@@ -3,12 +3,12 @@
 # Contributor: aunoor
 
 pkgname=notion
-pkgver=20190501
+epoch=1
+pkgver=4.0.0
 pkgrel=1
-_commit=5e820d514837e12b8753a1afe9b5dd1033f449da
-_commit_doc=4875ffc1c4f8ba1d7ebe77fc3aceacc872e74c07
+_commit_doc=3c3703c60c79cc0494e664aa83fc880f1285a45b
 pkgdesc="Tabbed tiling, window manager. Fork of Ion3"
-url="http://notion.sourceforge.net"
+url="https://notionwm.net"
 arch=('x86_64')
 license=('custom:LGPL')
 depends=('glib2' 'gettext' 'lua' 'libxext' 'libsm' 'freetype2')
@@ -47,7 +47,7 @@
 	"etc/notion/xkbion.lua")
 provides=('libtu' 'libextl')
 changelog=ChangleLog
-source=("notion::git://github.com/raboof/notion#commit=${_commit}"
+source=("notion::git://github.com/raboof/notion#tag=${pkgver}"
 	"notion-doc::git://github.com/raboof/notion-doc.git#commit=${_commit_doc}")
 sha256sums=('SKIP'
             'SKIP')
@@ -66,7 +66,11 @@
 
 build() {
   cd "$srcdir"/notion
-  make INCLUDES=-I"$srcdir"/notion LUA_VERSION=5.3 PREFIX=/usr ETCDIR=/etc/notion
+  make \
+	INCLUDES="-I$srcdir/notion -I/usr/include/freetype2" \
+	LUA_VERSION=5.3 \
+	PREFIX=/usr \
+	ETCDIR=/etc/notion
 
   cd "$srcdir"/notion-doc
   make all-html all-html-onepage
@@ -74,12 +78,20 @@
 
 package() {
   cd "$srcdir"/notion
-  make DESTDIR="$pkgdir" LUA_VERSION=5.3 PREFIX=/usr ETCDIR=/etc/notion install
+  make \
+	DESTDIR="$pkgdir" \
+	LUA_VERSION=5.3 \
+	PREFIX=/usr \
+	ETCDIR=/etc/notion \
+	install
 
   # doc
   cd "$srcdir"/notion-doc
   make PREFIX="$pkgdir"/usr ETCDIR=/etc/notion install
 
+  # fix typo
+  mv "$pkgdir"/usr/share/notion/notion{,flux}.1 "$pkgdir"/usr/share/man/man1/
+
   # modules
   cp "$srcdir"/notion/mod_xinerama/*.lua "$pkgdir"/etc/notion/
   cp "$srcdir"/notion/mod_xkbevents/*.lua "$pkgdir"/etc/notion/