updated to version 1.4.3

3 files changed, 18 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d3dc0e5cefa..e399cce16be3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,15 @@
-# Generated by mksrcinfo v8
-# Sun Apr 23 12:47:02 UTC 2017
 pkgbase = mintlocale
-	pkgdesc = Locale selection for the Cinnamon Desktop
-	pkgver = 1.3.7
+	pkgdesc = Language and locale selection tool
+	pkgver = 1.4.3
 	pkgrel = 1
 	url = https://github.com/linuxmint/mintlocale
 	arch = any
 	license = GPL2
 	depends = python2-gobject
-	source = https://ftp.fau.de/mint/packages/pool/main/m/mintlocale/mintlocale_1.3.7.tar.xz
-	source = apt_pkg.patch
-	sha256sums = 128a617c9614458de32415ff199b61ca9728207bc4b9d1ed48ebde1e8d81b798
-	sha256sums = b065dc500075a5648a4aa15c98b701af7816d3d0ee2822330635b5fe6740d116
+	depends = python-gobject
+	depends = gksu
+	source = mintlocale-1.4.3.tar.gz::https://github.com/linuxmint/mintlocale/archive/1.4.3.tar.gz
+	sha256sums = 136b2f985ffd5bca46ae47271365b266c0dabc58f055ba4f274b0147efbd74f4
 
 pkgname = mintlocale
 
diff --git a/PKGBUILD b/PKGBUILD
index be907d75fa0f..d8407253d377 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,26 +4,26 @@
 # Contributor: Pedro Gabriel <pedrogabriel@dcc.ufmg.br>
 
 pkgname=mintlocale
-pkgver=1.3.7
+pkgver=1.4.3
 pkgrel=1
-pkgdesc="Locale selection for the Cinnamon Desktop"
+pkgdesc="Language and locale selection tool"
 arch=('any')
 url="https://github.com/linuxmint/mintlocale"
 license=('GPL2')
-depends=('python2-gobject')
-source=("https://ftp.fau.de/mint/packages/pool/main/m/${pkgname}/${pkgname}_${pkgver}.tar.xz"
-	'apt_pkg.patch')
+depends=('python2-gobject' 'python-gobject' 'gksu')
+source=("${pkgname}-${pkgver}.tar.gz::$url/archive/${pkgver}.tar.gz")
 
-sha256sums=('128a617c9614458de32415ff199b61ca9728207bc4b9d1ed48ebde1e8d81b798'
-            'b065dc500075a5648a4aa15c98b701af7816d3d0ee2822330635b5fe6740d116')
+sha256sums=('136b2f985ffd5bca46ae47271365b266c0dabc58f055ba4f274b0147efbd74f4')
 
+# Remove the im desktop file since input methods are handled differently on Arch
+# You can still use "mintlocale im" command
 prepare() {
-	cd "${srcdir}/${pkgname}"
-	find -type f -print0 | xargs -0 sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-	patch -p1 -i '../apt_pkg.patch'
+	cd $pkgname-$pkgver
+	cd usr/share/applications/
+    rm mintlocale-im.desktop
 }
 
 package() {
-	cd "${srcdir}/${pkgname}"
-	cp -r --no-preserve=owner './usr' "${pkgdir}/"
+	cd $pkgname-$pkgver
+	cp -r usr $pkgdir
 }
diff --git a/apt_pkg.patch b/apt_pkg.patch
deleted file mode 100644
index 7ad0a8fdbf0f..000000000000
--- a/apt_pkg.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- /usr/lib/linuxmint/mintlocale/mintlocale.py	2016-04-30 19:32:16.650226256 +0100
-+++ /usr/lib/linuxmint/mintlocale/mintlocale.py.new	2016-04-30 19:35:29.730222054 +0100
-@@ -13,7 +13,6 @@
- import ConfigParser
- import grp
- import locale
--import apt
- import tempfile
- import thread
- from subprocess import Popen
-@@ -512,6 +511,11 @@
-         self.accountService.connect('notify::is-loaded', self.accountservice_ready)
-         self.accountService.connect('changed::', self.accountservice_changed)
- 
-+        try:
-+            import apt_pkg
-+        except ImportError:
-+            return
-+
-         groups = grp.getgrall()
-         for group in groups:
-             (name, pw, gid, mem) = group