Switch to using github source whilst xfce.org is down

2 files changed, 20 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e5719f58091d..f1f5ba4386f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xfce4-panel-compiz
 	pkgdesc = Panel for the Xfce desktop environment with fixes for Compiz
 	pkgver = 4.12.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.xfce.org/
 	arch = i686
 	arch = x86_64
@@ -9,6 +9,7 @@ pkgbase = xfce4-panel-compiz
 	license = GPL2
 	makedepends = intltool
 	makedepends = gtk-doc
+	makedepends = xfce4-dev-tools
 	depends = exo
 	depends = garcon
 	depends = libxfce4ui
@@ -17,11 +18,11 @@ pkgbase = xfce4-panel-compiz
 	depends = desktop-file-utils
 	provides = xfce4-panel=4.12.2
 	conflicts = xfce4-panel
-	source = http://archive.xfce.org/src/xfce/xfce4-panel/4.12/xfce4-panel-4.12.2.tar.bz2
+	source = https://github.com/xfce-mirror/xfce4-panel/archive/xfce4-panel-4.12.2.tar.gz
 	source = workspace-pager.patch
 	source = button-visibility.patch
 	source = scrolling-viewports.patch
-	sha256sums = 42058abb81b8f87691d3999627447de71c3285bcf055f308aab5cefab2de0ce9
+	sha256sums = 731bed1f43327fcd689f7e19167c7861ff2867ced67d59316d380b04db4798b0
 	sha256sums = 006889db18e8579033db32eeb85257b1f55b7c378881b69a7671d708304f91af
 	sha256sums = 556f7ecc22fdf024101d2e8a0416b953efaef48ff4ed649aab97d5b115a94931
 	sha256sums = 8ca306d6fa63e47008223205b6aed887c02ea313fd0db996b40218771c18224e
diff --git a/PKGBUILD b/PKGBUILD
index 54812e05f7d0..01ed87a2f6df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=xfce4-panel-compiz
 _realname=xfce4-panel
 pkgver=4.12.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Panel for the Xfce desktop environment with fixes for Compiz"
 arch=('i686' 'x86_64')
 url="http://www.xfce.org/"
@@ -13,21 +13,33 @@ license=('GPL2')
 groups=('xfce4')
 depends=('exo' 'garcon' 'libxfce4ui' 'libwnck' 'hicolor-icon-theme'
          'desktop-file-utils')
-makedepends=('intltool' 'gtk-doc')
+makedepends=('intltool' 'gtk-doc' 'xfce4-dev-tools')
 provides=("$_realname=$pkgver")
 conflicts=("$_realname")
-source=(http://archive.xfce.org/src/xfce/$_realname/${pkgver%.*}/$_realname-$pkgver.tar.bz2
+source=(https://github.com/xfce-mirror/$_realname/archive/$_realname-$pkgver.tar.gz
         workspace-pager.patch
         button-visibility.patch
         scrolling-viewports.patch)
-sha256sums=('42058abb81b8f87691d3999627447de71c3285bcf055f308aab5cefab2de0ce9'
+sha256sums=('731bed1f43327fcd689f7e19167c7861ff2867ced67d59316d380b04db4798b0'
             '006889db18e8579033db32eeb85257b1f55b7c378881b69a7671d708304f91af'
             '556f7ecc22fdf024101d2e8a0416b953efaef48ff4ed649aab97d5b115a94931'
             '8ca306d6fa63e47008223205b6aed887c02ea313fd0db996b40218771c18224e')
 
 prepare() {
+  mv $srcdir/$_realname-$_realname-$pkgver $srcdir/$_realname-$pkgver
   cd "$srcdir/$_realname-$pkgver"
 
+  ./autogen.sh \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    --libexecdir=/usr/lib \
+    --localstatedir=/var \
+    --disable-static \
+    --enable-gio-unix \
+    --enable-gtk-doc \
+    --enable-gtk3 \
+    --disable-debug
+
   # See https://bugzilla.xfce.org/show_bug.cgi?id=11697
   patch -p1 -i "$srcdir/workspace-pager.patch"
 
@@ -40,17 +52,6 @@ prepare() {
 
 build() {
   cd "$srcdir/$_realname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc \
-    --libexecdir=/usr/lib \
-    --localstatedir=/var \
-    --disable-static \
-    --enable-gio-unix \
-    --enable-gtk-doc \
-    --enable-gtk3 \
-    --disable-debug
   make
 }