Switch to official xfce git now that gtk3 branch is merged.

2 files changed, 17 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d12fded44aa6..46dc55a39ea8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,13 @@
-# Generated by mksrcinfo v8
-# Wed Dec 26 03:55:37 UTC 2018
 pkgbase = xfburn-git
-	pkgdesc = A simple CD/DVD burning tool based on libburnia libraries
-	pkgver = 0.5.6dev.r1573.71e78418
+	pkgdesc = A simple CD/DVD burning tool based on libburnia libraries (git checkout)
+	pkgver = 0.6.1+4+gcc3a8cd
 	pkgrel = 1
 	url = http://goodies.xfce.org/projects/applications/xfburn
 	arch = x86_64
+	arch = i686
+	arch = armv7h
+	arch = armv6h
+	arch = aarch64
 	groups = xfce4-goodies
 	license = GPL
 	makedepends = intltool
@@ -18,12 +20,10 @@ pkgbase = xfburn-git
 	depends = gst-plugins-base-libs
 	depends = libgudev
 	depends = desktop-file-utils
-	provides = xfburn=0.5.6
+	provides = xfburn=0.6.1
 	conflicts = xfburn
-	source = xfburn::git+https://gitlab.com/Katana-Steel/xfburn#branch=road-to-gtk3
-	source = https://archive.xfce.org/src/apps/xfburn/0.5/xfburn-0.5.5.tar.bz2
+	source = git://git.xfce.org/apps/xfburn
 	sha256sums = SKIP
-	sha256sums = aa173aa8a6c0887a4b236aee3753760e943f3e2be99af1f2d5343a6df345ade1
 
 pkgname = xfburn-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 2bd75eed17ec..a82507e937d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,46 +2,32 @@
 
 _pkgname=xfburn
 pkgname=${_pkgname}-git
-_pkgver=0.5.5
-pkgver=0.5.6dev.r1573.71e78418
+pkgver=0.6.1+4+gcc3a8cd
 pkgrel=1
-pkgdesc="A simple CD/DVD burning tool based on libburnia libraries"
-arch=('x86_64')
+pkgdesc="A simple CD/DVD burning tool based on libburnia libraries (git checkout)"
+arch=('x86_64' 'i686' 'armv7h' 'armv6h' 'aarch64')
 url="http://goodies.xfce.org/projects/applications/xfburn"
 license=('GPL')
 groups=('xfce4-goodies')
 depends=('libburn' 'libisofs' 'gtk3' 'libxfce4ui' 'exo' 'gst-plugins-base-libs'
          'libgudev' 'desktop-file-utils')
 makedepends=('intltool' 'git')
-provides=("${_pkgname}=${pkgver%%dev*}")
+provides=("${_pkgname}=${pkgver%%+*}")
 conflicts=("${_pkgname}")
-source=("${_pkgname}::git+https://gitlab.com/Katana-Steel/xfburn#branch=road-to-gtk3"
-        "https://archive.xfce.org/src/apps/xfburn/${_pkgver%.*}/${_pkgname}-${_pkgver}.tar.bz2")
-sha256sums=('SKIP'
-            'aa173aa8a6c0887a4b236aee3753760e943f3e2be99af1f2d5343a6df345ade1')
+source=("git://git.xfce.org/apps/${_pkgname}")
+sha256sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/${_pkgname}"
-  printf "%s.%s.%sdev.r%s.%s" \
-         "$( grep -m 1 "xfburn_version_major" configure.ac.in | sed 's:.*\[\([0-9][0-9]*\)\].*:\1:' )" \
-         "$( grep -m 1 "xfburn_version_minor" configure.ac.in | sed 's:.*\[\([0-9][0-9]*\)\].*:\1:' )" \
-         "$( grep -m 1 "xfburn_version_micro" configure.ac.in | sed 's:.*\[\([0-9][0-9]*\)\].*:\1:' )" \
-         "$( git rev-list --count HEAD )" \
-         "$( git show-ref HEAD | sed -e 's:[\ ].*::' | cut -c1-8 )"
-}
-
-prepare() {
-  cd "${srcdir}/${_pkgname}"
-  NOCONFIGURE=1 ./autogen.sh
+  cd "${_pkgname}"
+  git describe --long --tags | sed -r "s:^${_pkgname}.::;s/^v//;s/-/+/g"
 }
 
 build() {
   cd "${srcdir}/${_pkgname}"
-  ./configure \
+  ./autogen.sh \
     --prefix=/usr \
     --enable-gstreamer \
     --disable-debug
-  cp "${srcdir}/${_pkgname}-${_pkgver}"/docs/xfburn.1 ./docs/xfburn.1
   make
 }