summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorerik-pro2019-01-18 10:44:25 +0300
committererik-pro2019-01-18 11:37:31 +0300
commita801abbdf9dbdf3a4628c841a1152a230f245c72 (patch)
tree354786bae01e6300c4cb33283f030913863235b0
parent0eb625c9269bacbee13b974ca20f0ed27269f15d (diff)
downloadaur-a801abbdf9dbdf3a4628c841a1152a230f245c72.tar.gz
cleaned up pkgbuild and improved pkgver
-rw-r--r--.SRCINFO14
-rw-r--r--PKGBUILD23
-rw-r--r--orca-git.install11
3 files changed, 15 insertions, 33 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 53f617e3a9e..5d7c57d5099 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,13 @@
pkgbase = orca-git
pkgdesc = Screen reader for individuals who are blind or visually impaired (development version)
- pkgver = r8671+g65086715d
- pkgrel = 2
- url = https://gitlab.gnome.org/GNOME/orca.git
- install = orca-git.install
+ pkgver = 3_31_4.r2.g95154f3a9
+ pkgrel = 1
+ url = https://wiki.gnome.org/Projects/Orca
arch = any
license = LGPL
makedepends = git
- makedepends = gnome-common
- makedepends = pkgconfig
makedepends = itstool
makedepends = intltool
- makedepends = gnome-doc-utils
makedepends = yelp-tools
depends = gtk3
depends = at-spi2-atk
@@ -22,11 +18,11 @@ pkgbase = orca-git
depends = liblouis
depends = brltty
depends = xorg-xmodmap
- depends = hicolor-icon-theme
depends = gsettings-desktop-schemas
+ depends = gst-plugins-base
+ depends = gst-plugins-good
provides = orca
conflicts = orca
- options = !libtool
source = orca-git::git+https://gitlab.gnome.org/GNOME/orca.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index f9f292a7220..98f90012175 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,45 +3,42 @@
# Contributor: William Rea <sillywilly@gmail.com>
pkgname=orca-git
-pkgver=r8737+ga8748b197
+pkgver=3_31_4.r2.g95154f3a9
pkgrel=1
pkgdesc="Screen reader for individuals who are blind or visually impaired (development version)"
arch=(any)
license=('LGPL')
-url="https://gitlab.gnome.org/GNOME/orca.git"
-source=(${pkgname}::'git+https://gitlab.gnome.org/GNOME/orca.git')
-install=orca-git.install
-options=('!libtool')
+url="https://wiki.gnome.org/Projects/Orca"
depends=('gtk3'
'at-spi2-atk'
- 'python-atspi' # -git
+ 'python-atspi'
'python-dbus'
'python-xdg'
'speech-dispatcher'
'liblouis'
'brltty'
'xorg-xmodmap'
- 'hicolor-icon-theme'
- 'gsettings-desktop-schemas')
+ 'gsettings-desktop-schemas'
+ 'gst-plugins-base'
+ 'gst-plugins-good')
makedepends=('git'
- 'gnome-common'
- 'pkgconfig'
'itstool'
'intltool'
- 'gnome-doc-utils'
'yelp-tools')
provides=('orca')
conflicts=('orca')
+source=(${pkgname}::'git+https://gitlab.gnome.org/GNOME/orca.git')
md5sums=('SKIP')
pkgver() {
cd ${pkgname}
- echo r$(git rev-list --count HEAD)+g$(git rev-parse --short HEAD)
+ # cutting off 'ORCA_' prefix that presents in the git tag
+ printf "%s" "$(git describe --long | sed 's/^ORCA_//;s/\([^-]*-g\)/r\1/;s/-/./g')"
}
build() {
cd "${srcdir}/${pkgname}"
- PYTHON=/usr/bin/python ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+ ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var
make
}
diff --git a/orca-git.install b/orca-git.install
deleted file mode 100644
index 806fc7c0ec3..00000000000
--- a/orca-git.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}