Fix: Simplify PKGBUILD and dependencies

2 files changed, 25 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c2dde8581261..fc162530a921 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,23 @@
 pkgbase = redshiftgui-bin
 	pkgdesc = Monitor color adjustment tool
 	pkgver = 0.2.4
-	pkgrel = 1
+	pkgrel = 2
 	url = http://github.com/maoserr/redshiftgui
 	arch = x86_64
 	arch = i686
 	license = GPL2
 	depends = gtk2
 	depends = curl
-	depends = libxcb
-	depends = libxrandr
-	depends = libxxf86vm
 	depends = libsm
 	replaces = redshiftgui
-	source = https://github.com/maoserr/redshiftgui/releases/download/0.2.4-Arch64/RedshiftGUI-0.2.4-Linux-i686.tar.gz
-	source = redshiftgui.sh
-	sha256sums = 4d34de7b9bf106569bd7b87f2cd96640e60f723cf27e37e89219c8ea5b14cb2d
-	sha256sums = df03e192fe32bda2ea546be85faf51c030ae8dd46c40aad229e39b6b296897b5
+	source_x86_64 = https://github.com/maoserr/redshiftgui/releases/download/0.2.4-Arch64/RedshiftGUI-0.2.4-Linux-x86_64.tar.gz
+	source_x86_64 = redshiftgui.sh
+	sha256sums_x86_64 = 1170e8d8eca1b7b936ffb5e70763259b3f15db810bf2d05b3b0221d8e35bbb27
+	sha256sums_x86_64 = df03e192fe32bda2ea546be85faf51c030ae8dd46c40aad229e39b6b296897b5
+	source_i686 = https://github.com/maoserr/redshiftgui/releases/download/0.2.4-Arch64/RedshiftGUI-0.2.4-Linux-i686.tar.gz
+	source_i686 = redshiftgui.sh
+	sha256sums_i686 = 4d34de7b9bf106569bd7b87f2cd96640e60f723cf27e37e89219c8ea5b14cb2d
+	sha256sums_i686 = df03e192fe32bda2ea546be85faf51c030ae8dd46c40aad229e39b6b296897b5
 
 pkgname = redshiftgui-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index ac32089ac7fe..6dfb61b44cdc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,31 @@
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Maintainer: hashhar <hashhar_dev AT outlook DOT com>
+# Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: maoserr
 
 pkgname=redshiftgui-bin
 pkgver=0.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc='Monitor color adjustment tool'
 arch=('x86_64' 'i686')
 url='http://github.com/maoserr/redshiftgui'
 license=('GPL2')
-depends=('gtk2' 'curl' 'libxcb' 'libxrandr' 'libxxf86vm' 'libsm')
+depends=('gtk2' 'curl' 'libsm')
 replaces=('redshiftgui')
-if [[ $CARCH = x86_64 ]]; then
-  source=("https://github.com/maoserr/redshiftgui/releases/download/$pkgver-Arch64/RedshiftGUI-$pkgver-Linux-x86_64.tar.gz"
-          'redshiftgui.sh')
-  sha256sums=('1170e8d8eca1b7b936ffb5e70763259b3f15db810bf2d05b3b0221d8e35bbb27'
-              'df03e192fe32bda2ea546be85faf51c030ae8dd46c40aad229e39b6b296897b5')
-else
-  source=("https://github.com/maoserr/redshiftgui/releases/download/$pkgver-Arch64/RedshiftGUI-$pkgver-Linux-i686.tar.gz"
-          'redshiftgui.sh')
-  sha256sums=('4d34de7b9bf106569bd7b87f2cd96640e60f723cf27e37e89219c8ea5b14cb2d'
-              'df03e192fe32bda2ea546be85faf51c030ae8dd46c40aad229e39b6b296897b5')
-fi
+source_x86_64=("https://github.com/maoserr/redshiftgui/releases/download/${pkgver}-Arch64/RedshiftGUI-${pkgver}-Linux-x86_64.tar.gz"
+               'redshiftgui.sh')
+sha256sums_x86_64=('1170e8d8eca1b7b936ffb5e70763259b3f15db810bf2d05b3b0221d8e35bbb27'
+                   'df03e192fe32bda2ea546be85faf51c030ae8dd46c40aad229e39b6b296897b5')
+source_i686=("https://github.com/maoserr/redshiftgui/releases/download/${pkgver}-Arch64/RedshiftGUI-${pkgver}-Linux-i686.tar.gz"
+             'redshiftgui.sh')
+sha256sums_i686=('4d34de7b9bf106569bd7b87f2cd96640e60f723cf27e37e89219c8ea5b14cb2d'
+                 'df03e192fe32bda2ea546be85faf51c030ae8dd46c40aad229e39b6b296897b5')
 
 package() {
   cd "RedshiftGUI-${pkgver}-Linux-${CARCH}"
-  install -Dm755 bin/redshiftgui "$pkgdir/usr/bin/redshiftgui.elf"
-  install -Dm755 "$srcdir/redshiftgui.sh" "$pkgdir/usr/bin/redshiftgui"
-  install -d "$pkgdir/usr/share"
-  mv share/* "$pkgdir/usr/share/"
+  install -Dm755 bin/redshiftgui "${pkgdir}/usr/bin/redshiftgui.elf"
+  install -Dm755 "${srcdir}/redshiftgui.sh" "${pkgdir}/usr/bin/redshiftgui"
+  install -d "${pkgdir}/usr/share"
+  mv share/* "${pkgdir}/usr/share/"
 }
 
 # vim:set ts=2 sw=2 et: