summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdriĆ  Arrufat2017-01-10 22:42:02 +0100
committerAdriĆ  Arrufat2017-01-10 22:42:02 +0100
commiteed8f0cd9afd832d0be9a265414305f65de8dc2c (patch)
tree18cce44f667de5205c532d11b34a2593f8bf61a0
parentd1a405db88dfe9e7c58dbab100eafc1f78c785b9 (diff)
downloadaur-eed8f0cd9afd832d0be9a265414305f65de8dc2c.tar.gz
switch to official versioning
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD41
2 files changed, 18 insertions, 30 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a21bb4263a2..9ce59058164 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Mon Apr 11 06:57:45 UTC 2016
+# Tue Jan 10 21:41:50 UTC 2017
pkgbase = rhythmbox-git
pkgdesc = Music playback and management application
- pkgver = 3.3.1.r3.gc414b79
+ pkgver = 3.4.1+57+g8beff628
pkgrel = 1
url = http://www.rhythmbox.org
install = rhythmbox.install
@@ -20,6 +20,7 @@ pkgbase = rhythmbox-git
makedepends = libgpod
makedepends = libmtp
makedepends = gtk-doc
+ makedepends = yelp-tools
depends = dconf
depends = desktop-file-utils
depends = gst-plugins-base
@@ -43,7 +44,7 @@ pkgbase = rhythmbox-git
optdepends = libgpod: Portable Players - iPod plugin
optdepends = libmtp: Portable Players - MTP plugin
optdepends = python-mako: Context pane plugin
- provides = rhythmbox=3.3.1.r3.gc414b79
+ provides = rhythmbox=3.4.1+57+g8beff628
conflicts = rhythmbox
options = !emptydirs
source = rhythmbox-git::git+https://git.gnome.org/browse/rhythmbox
diff --git a/PKGBUILD b/PKGBUILD
index c942d4bc12a..c5f5afcd8f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,14 +6,14 @@
_pkgname=rhythmbox
pkgname=$_pkgname-git
-pkgver=3.3.1.r3.gc414b79
+pkgver=3.4.1+57+g8beff628
pkgrel=1
pkgdesc="Music playback and management application"
arch=(i686 x86_64)
license=(GPL2)
url=http://www.rhythmbox.org
depends=(dconf desktop-file-utils gst-plugins-base gst-plugins-good libsoup json-glib libnotify libpeas media-player-info totem-plparser tdb webkit2gtk libgudev)
-makedepends=(itstool intltool brasero gobject-introspection vala grilo libdmapsharing lirc libgpod libmtp gtk-doc)
+makedepends=(itstool intltool brasero gobject-introspection vala grilo libdmapsharing lirc libgpod libmtp gtk-doc yelp-tools)
optdepends=('gst-plugins-ugly: Extra media codecs'
'gst-plugins-bad: Extra media codecs'
'gst-libav: Extra media codecs'
@@ -32,36 +32,23 @@ source=($pkgname::git+https://git.gnome.org/browse/$_pkgname)
sha256sums=('SKIP')
pkgver() {
- cd $pkgname/
- # count the number of dots and add a 0 to the version if there's only 1
- dots=`git describe | grep -o '\.' | wc -l`
- if [ ${dots} -eq 1 ]
- then
- git describe | sed 's/^v//;s/\([^-]*-g\)/0.r\1/;s/-/./g'
- else
- git describe | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
- fi
+ cd "$srcdir/$pkgname"
+ git describe --always | sed 's|-|+|g;s|v||'
}
prepare() {
- cd $pkgname/
- # reset to the original version so that regex works
- git checkout configure.ac
- # use a different regex depending on the version
- dots=`git describe | grep -o '\.' | wc -l`
- if [ ${dots} -eq 1 ]
- then
- sed "{:q;N;s/(\[rhythmbox\],\n\t\[\([0-9]\).\([0-9]\)\],/(\[rhythmbox\],\n\t[$pkgver],/g;t q}" -i configure.ac
- else
- sed "{:q;N;s/(\[rhythmbox\],\n\t\[\([0-9]\).\([0-9]\).\([0-9]\)\],/(\[rhythmbox\],\n\t[$pkgver],/g;t q}" -i configure.ac
- fi
+ cd "$srcdir/$pkgname"
+ git submodule init
+ git config libgd.url "${srcdir}/libgd"
+ git config libglnx.url "${srcdir}/lbglnx"
+ git submodule update
+
+ NOCONFIGURE=1 ./autogen.sh
}
build() {
- cd $pkgname/
- # export CFLAGS+=" -g -O1"
- # export CXXFLAGS+=" -g -O1"
- ./autogen.sh --prefix=/usr --sysconfdir=/etc \
+ cd "$srcdir/$pkgname"
+ ./configure --prefix=/usr --sysconfdir=/etc \
--libexecdir=/usr/lib/rhythmbox \
--localstatedir=/var --disable-static \
--enable-daap --enable-python --enable-vala \
@@ -70,7 +57,7 @@ build() {
}
package() {
- cd "$pkgname"
+ cd "$srcdir/$pkgname"
make DESTDIR="$pkgdir" install
rm -r "$pkgdir/usr/lib/rhythmbox/sample-plugins"
rm -r "$pkgdir/usr/lib/rhythmbox/plugins/rbzeitgeist"