summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authornot_anonymous2017-01-22 10:38:19 -0700
committernot_anonymous2017-01-22 10:38:19 -0700
commit310ac5e6f1bf70b77fa218aef2328aa30d763a22 (patch)
treedf42898888d756dc926c908521839f72d9cdbb06
parent8cffe1bff3e9194cce7749f2803870fe9b0c4bf9 (diff)
downloadaur-kochmorse-git.tar.gz
Updated
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD46
-rw-r--r--kochmorse.install11
3 files changed, 26 insertions, 43 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7e67c5c3d0d..2fafb4df13f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,8 @@
pkgbase = kochmorse-git
- pkgdesc = A simple morse tutor using the Koch method - GIT version.
- pkgver = 3.1.0
+ pkgdesc = A simple (Ham Radio) morse tutor using the Koch method - GIT version.
+ pkgver = 3.2.2.r6.g5ceff39
pkgrel = 1
url = https://github.com/hmatuschek/kochmorse
- install = kochmorse.install
arch = i686
arch = x86_64
license = GPL
@@ -11,10 +10,13 @@ pkgbase = kochmorse-git
makedepends = git
depends = qt5-svg
depends = portaudio
- depends = libxkbcommon-x11
- depends = desktop-file-utils
+ optdepends = hamradio-menus: XDG compliant menuing
provides = kochmorse
conflicts = kochmorse
+ conflicts = kochmorse-py
+ source = kochmorse::git+https://github.com/hmatuschek/kochmorse.git#branch=master
+ md5sums = SKIP
+ sha256sums = SKIP
pkgname = kochmorse-git
diff --git a/PKGBUILD b/PKGBUILD
index 6f60c16e068..e6e2e6275f5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,55 +2,47 @@
pkgname=kochmorse-git
_pkgname=kochmorse
-pkgver=3.1.0
+_author=hmatuschek
+pkgver=3.2.2.r6.g5ceff39
pkgrel=1
-pkgdesc="A simple morse tutor using the Koch method - GIT version."
+pkgdesc="A simple (Ham Radio) morse tutor using the Koch method - GIT version."
arch=('i686' 'x86_64')
-url="https://github.com/hmatuschek/kochmorse"
+url="https://github.com/$_author/$_pkgname"
license=('GPL')
-depends=('qt5-svg' 'portaudio' 'libxkbcommon-x11' 'desktop-file-utils')
+depends=('qt5-svg' 'portaudio')
+optdepends=('hamradio-menus: XDG compliant menuing')
makedepends=('cmake' 'git')
provides=('kochmorse')
-conflicts=('kochmorse')
-install=$_pkgname.install
-
-_gitroot=https://github.com/hmatuschek/kochmorse.git
-_gitname=master
+conflicts=('kochmorse' 'kochmorse-py')
+source=("$_pkgname::git+$url.git#branch=master")
pkgver() {
- cd "$srcdir/${_gitname}-build"
+ cd "$_pkgname"
git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
prepare() {
- cd "$srcdir"
- msg "Connecting to GIT server...."
-
- if [[ -d "$_gitname" ]]; then
- cd "$_gitname" && git pull origin
- msg "The local files are updated."
- else
- git clone "$_gitroot" "$_gitname"
- fi
-
- msg "GIT checkout done or server timeout"
- msg "Starting build..."
+ cd "$_pkgname"
+ msg "Preparing sources..."
- rm -rf "$srcdir/$_gitname-build"
- git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
+ sed -i -e s:'Teaching;':'Application;HamRadio': shared/$_pkgname.desktop
+ sed -i '$ a X-DCOP-ServiceType=none' shared/$_pkgname.desktop
+ sed -i '$ a X-KDE-SubstituteUID=false' shared/$_pkgname.desktop
}
build() {
- cd "$srcdir/${_gitname}-build"
+ cd "$_pkgname"
msg "Starting build..."
- cmake -DCMAKE_INSTALL_PREFIX=/usr
+ cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RELEASE -DPORTAUDIO_INCLUDE_DIRS=/usr/include
make
}
package() {
- cd "$srcdir/$_gitname-build"
+ cd "$_pkgname"
msg "Starting packaging..."
make DESTDIR="$pkgdir/" install
}
+md5sums=('SKIP')
+sha256sums=('SKIP')
diff --git a/kochmorse.install b/kochmorse.install
deleted file mode 100644
index 2eaa60550d5..00000000000
--- a/kochmorse.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}