Bring this package up to date with the original pamac-aur package

Signed-off-by: Yoshi2889 <rick.2889@gmail.com>

2 files changed, 13 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4c071121d58e..60a9f9db437a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Jun 20 20:22:46 UTC 2016
+# Sun Jul 24 20:05:11 UTC 2016
 pkgbase = pamac-pacaur
 	pkgdesc = A Gtk3 frontend for libalpm patched to work with pacaur
 	pkgver = 4.1.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/manjaro/pamac
 	install = pamac.install
 	arch = any
@@ -20,6 +20,7 @@ pkgbase = pamac-pacaur
 	depends = gtk3>=3.18
 	depends = libnotify
 	depends = desktop-file-utils
+	depends = pacman>=5.0
 	depends = pacman<5.1
 	depends = gnutls>=3.4
 	optdepends = pacaur: needed for AUR support
@@ -27,8 +28,10 @@ pkgbase = pamac-pacaur
 	conflicts = pamac
 	options = !emptydirs
 	backup = etc/pamac.conf
-	source = pamac-4.1.0.tar.gz::https://github.com/manjaro/pamac/archive/v4.1.0.tar.gz
+	source = pamac-4.1.0-2.tar.gz::https://github.com/manjaro/pamac/archive/v4.1.0.tar.gz
+	source = preferences-dialog.patch::https://github.com/manjaro/pamac/commit/5019f66b8673ac3a30f3e3174a85412ef9d72fd0.patch
 	sha256sums = 11378b4e3580242a24e2f3988b34f6310c65d19defeb69c096390964209fcf85
+	sha256sums = d6cf41683427c434a7ee8fb3b47a7bf4824f904a7d93cacc9420f831ad33cf81
 
 pkgname = pamac-pacaur
 
diff --git a/PKGBUILD b/PKGBUILD
index d624caf927dc..21ed867b631c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,13 +8,13 @@
 pkgname=pamac-pacaur
 pkgver=4.1.0
 _pkgver=4.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A Gtk3 frontend for libalpm patched to work with pacaur"
 arch=('any')
 url="https://github.com/manjaro/pamac"
 license=('GPL3')
 depends=('glib2>=2.42' 'json-glib' 'libsoup' 'dbus-glib' 'polkit' 'vte3>=0.38' 'gtk3>=3.18'
-         'libnotify' 'desktop-file-utils' 'pacman<5.1' 'gnutls>=3.4')
+         'libnotify' 'desktop-file-utils' 'pacman>=5.0' 'pacman<5.1' 'gnutls>=3.4')
 optdepends=('pacaur: needed for AUR support')
 makedepends=('gettext' 'itstool' 'vala>=0.28')
 backup=('etc/pamac.conf')
@@ -23,15 +23,17 @@ conflicts=('pamac')
 options=(!emptydirs)
 install=pamac.install
 
-source=("pamac-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz")
-
-sha256sums=('11378b4e3580242a24e2f3988b34f6310c65d19defeb69c096390964209fcf85')
+source=("pamac-$pkgver-$pkgrel.tar.gz::https://github.com/manjaro/pamac/archive/v$_pkgver.tar.gz"
+        'preferences-dialog.patch::https://github.com/manjaro/pamac/commit/5019f66b8673ac3a30f3e3174a85412ef9d72fd0.patch')
+sha256sums=('11378b4e3580242a24e2f3988b34f6310c65d19defeb69c096390964209fcf85'
+            'd6cf41683427c434a7ee8fb3b47a7bf4824f904a7d93cacc9420f831ad33cf81')
 
 prepare() {
   # adjust version string
   cd "$srcdir/pamac-$_pkgver"
   sed -i -e "s|\"4.1.0\"|\"$pkgver-$pkgrel\"|g" src/transaction.vala 
   # patches here
+  patch -Np1 -i "$srcdir/preferences-dialog.patch"
   sed -i -e "s/yaourt/pacaur/g" src/transaction.vala
   sed -i -e "s/yaourt/pacaur/g" src/preferences_dialog.vala
   sed -i -e "s/yaourt/pacaur/g" src/manager_window.vala