updated to version 1.5.4 and updated the corresponding patches

5 files changed, 31 insertions, 124 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e8e57cfdd920..b9579388a03b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -16,11 +16,9 @@ pkgbase = mintlocale
 	source = mintlocale-1.5.4.tar.xz::http://packages.linuxmint.com/pool/main/m/mintlocale/mintlocale_1.5.4.tar.xz
 	source = im_apt_check.patch
 	source = install_remove_apt_check.patch
-	source = mintlocale_apt_check.patch
 	sha256sums = 04e289e5f57fe916385171b264ba99c41c1dc9466afa26965dbb92ace4376995
-	sha256sums = 3f59e0144e906e2e1b75ba429a1eeb0bc12986fdccf98d2da4692bed80741c8e
-	sha256sums = 5ab364fc1756e0e91b97de81d48316ba6df77a938f5eee3ea7deaefb093e72e7
-	sha256sums = d3861405dcac12bf0637f47ef22c910f3f06e0d9545022191ecafbac818b9fd2
+	sha256sums = 21778d62b28e677cfb8d7784c5b486ff373534de6e6fb5603e2c8bd268abef7b
+	sha256sums = 4b8bc562521564022ae657ce1db7c3170d4184f955150bd9e51b871c73f4a996
 
 pkgname = mintlocale
 
diff --git a/PKGBUILD b/PKGBUILD
index 8731cb59fad8..5cc00b1fb780 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -24,12 +24,10 @@ depends=('accountsservice'
 #        "mintlocale_apt_check.patch")
 source=("${pkgname}-${pkgver}.tar.xz::${url}/${pkgname}_${pkgver}.tar.xz"
         "im_apt_check.patch"
-        "install_remove_apt_check.patch"
-        "mintlocale_apt_check.patch")
+        "install_remove_apt_check.patch")
 sha256sums=('04e289e5f57fe916385171b264ba99c41c1dc9466afa26965dbb92ace4376995'
-            '3f59e0144e906e2e1b75ba429a1eeb0bc12986fdccf98d2da4692bed80741c8e'
-            '5ab364fc1756e0e91b97de81d48316ba6df77a938f5eee3ea7deaefb093e72e7'
-            'd3861405dcac12bf0637f47ef22c910f3f06e0d9545022191ecafbac818b9fd2')
+            '21778d62b28e677cfb8d7784c5b486ff373534de6e6fb5603e2c8bd268abef7b'
+            '4b8bc562521564022ae657ce1db7c3170d4184f955150bd9e51b871c73f4a996')
 
 ## Packaging via Linuxmint repository
 prepare() {
@@ -46,7 +44,7 @@ prepare() {
   #Patching "install_remove.py" file
   patch -Np1 -i ../install_remove_apt_check.patch
   #Patching "mintlocale.py" file
-  patch -Np1 -i ../mintlocale_apt_check.patch
+  #patch -Np1 -i ../mintlocale_apt_check.patch
 
 }
 
diff --git a/im_apt_check.patch b/im_apt_check.patch
index cf46c6210442..16b1a526f086 100644
--- a/im_apt_check.patch
+++ b/im_apt_check.patch
@@ -1,22 +1,18 @@
 --- a/usr/lib/linuxmint/mintlocale/im.py
 +++ b/usr/lib/linuxmint/mintlocale/im.py
-@@ -1,9 +1,7 @@
+@@ -1,10 +1,8 @@
  #!/usr/bin/python3
+ 
 -import apt
  import codecs
  import gettext
  import locale
--import mintcommon
+-import mintcommon.aptdaemon
  import os
  
  try:
-@@ -14,10 +12,18 @@
- import gi
- gi.require_version('Gtk', '3.0')
- gi.require_version('AccountsService', '1.0')
-+gi.require_version('XApp', '1.0')
- from gi.repository import GdkX11
- from gi.repository import Gtk, GObject, Gio, AccountsService, GLib, Gdk, GdkPixbuf, XApp
+@@ -19,6 +17,13 @@
+ from gi.repository import Gtk, GObject, Gdk, XApp
  
  from ImConfig.ImConfig import ImConfig
 +
@@ -25,74 +21,18 @@
 +
 +if IS_DEBIAN:
 +    import apt
-+    import mintcommon
++    import mintcommon.aptdaemon
  
  # i18n
  APP = 'mintlocale'
-@@ -37,7 +43,8 @@
+@@ -38,7 +43,8 @@
          self.app = app
          self.packages = []
          self.missing_packages = []
--        self.apt = mintcommon.APT(self.app.window)
+-        self.apt = mintcommon.aptdaemon.APT(self.app.window)
 +        if IS_DEBIAN:
-+        	self.apt = mintcommon.APT(self.app.window)
++            self.apt = mintcommon.aptdaemon.APT(self.app.window)
          self.button = button
          self.button.connect('clicked', self.install)
          self.button.set_sensitive(False)
-@@ -58,24 +65,27 @@
-                         self.packages.append(line)
- 
-     def install(self, widget):
--        if len(self.missing_packages) > 0:
--            self.app.lock_ui()
--            if self.app.cache_updated:
--                self.apt.set_finished_callback(self.on_install_finished)
--                self.apt.set_cancelled_callback(self.on_install_finished)
--                self.apt.install_packages(self.missing_packages)
--            else:
--                self.apt.set_finished_callback(self.on_update_finished)
--                self.apt.update_cache()
--
--    def on_update_finished(self, transaction=None, exit_state=None):
--        self.app.cache_updated = True
--        self.apt.set_finished_callback(self.on_install_finished)
--        self.apt.set_cancelled_callback(self.on_install_finished)
--        self.apt.install_packages(self.missing_packages)
--
--    def on_install_finished(self, transaction=None, exit_state=None):
--        self.app.check_input_methods()
-+    	if IS_DEBIAN:
-+    		if len(self.missing_packages) > 0:
-+    			self.app.lock_ui()
-+    			if self.app.cache_updated:
-+    				self.apt.set_finished_callback(self.on_install_finished)
-+    				self.apt.set_cancelled_callback(self.on_install_finished)
-+    				self.apt.install_packages(self.missing_packages)
-+    			else:
-+    				self.apt.set_finished_callback(self.on_update_finished)
-+    				self.apt.update_cache()
-+
-+    if IS_DEBIAN:
-+    	def on_update_finished(self, transaction=None, exit_state=None):
-+    		self.app.cache_updated = True
-+    		self.apt.set_finished_callback(self.on_install_finished)
-+    		self.apt.set_cancelled_callback(self.on_install_finished)
-+    		self.apt.install_packages(self.missing_packages)
-+
-+    if IS_DEBIAN:
-+    	def on_install_finished(self, transaction=None, exit_state=None):
-+        	self.app.check_input_methods()
- 
-     def update_status(self, cache):
-         self.missing_packages = []
-@@ -105,7 +115,8 @@
-             self.locale_path='/etc/locale.conf'
- 
-         # Prepare the APT cache
--        self.cache = apt.Cache()
-+        if IS_DEBIAN:
-+        	self.cache = apt.Cache()
-         self.cache_updated = False
- 
-         # load our glade ui file in
 
diff --git a/install_remove_apt_check.patch b/install_remove_apt_check.patch
index 77fe384e7b45..43d9375cc15f 100644
--- a/install_remove_apt_check.patch
+++ b/install_remove_apt_check.patch
@@ -1,50 +1,48 @@
 --- a/usr/lib/linuxmint/mintlocale/install_remove.py
 +++ b/usr/lib/linuxmint/mintlocale/install_remove.py
-@@ -2,18 +2,23 @@
+@@ -2,15 +2,21 @@
  
  import os
  import gettext
 -import apt_pkg
  import subprocess
- import tempfile
  import locale
  import codecs
--import mintcommon
+-import mintcommon.aptdaemon
  
  import gi
  gi.require_version('Gtk', '3.0')
- gi.require_version('XApp', '1.0')
- from gi.repository import GdkX11
- from gi.repository import Gtk, GdkPixbuf, XApp
+ from gi.repository import Gtk, Gdk, GdkPixbuf
 +
-+# Used to detect Debian derivatives (we don't want to show APT features in other distros)
-+IS_DEBIAN = os.path.exists("/etc/debian_version")
-+
-+if IS_DEBIAN:
-+    import apt_pkg
-+    import mintcommon
+++
+++# Used to detect Debian derivatives (we don't want to show APT features in other distros)
+++IS_DEBIAN = os.path.exists("/etc/debian_version")
+++
+++if IS_DEBIAN:
+++    import apt_pkg
+++    import mintcommon.aptdaemon
  
  # i18n
  APP = 'mintlocale'
-@@ -56,8 +61,9 @@
+@@ -53,8 +59,9 @@
                      else:
                          self.language_packs.append(LanguagePack(category, language, dependency, package))
  
 -        apt_pkg.init()
 -        self.cache = apt_pkg.Cache(None)
 +        if IS_DEBIAN:
-+        	apt_pkg.init()
-+        	self.cache = apt_pkg.Cache(None)
++            apt_pkg.init()
++            self.cache = apt_pkg.Cache(None)
          self.cache_updated = False
  
  
-@@ -130,7 +136,8 @@
+@@ -134,7 +141,8 @@
          return (language_code, country_code, language_label)
  
      def build_lang_list(self):
 -        self.cache = apt_pkg.Cache(None)
-+    	if IS_DEBIAN:
-+    		self.cache = apt_pkg.Cache(None)
++        if IS_DEBIAN:
++            self.cache = apt_pkg.Cache(None)
  
          self.builder.get_object('button_install').set_sensitive(False)
          self.builder.get_object('button_remove').set_sensitive(False)
diff --git a/mintlocale_apt_check.patch b/mintlocale_apt_check.patch
deleted file mode 100644
index 7570f6fd5cf6..000000000000
--- a/mintlocale_apt_check.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/usr/lib/linuxmint/mintlocale/mintlocale.py
-+++ b/usr/lib/linuxmint/mintlocale/mintlocale.py
-@@ -8,7 +8,6 @@
- import tempfile
- import subprocess
- import codecs
--import mintcommon
- 
- try:
-     import configparser
-@@ -18,6 +17,7 @@
- import gi
- gi.require_version('Gtk', '3.0')
- gi.require_version('AccountsService', '1.0')
-+gi.require_version('XApp', '1.0')
- from gi.repository import GdkX11
- from gi.repository import Gtk, Gio, AccountsService, GLib, GdkPixbuf, XApp
- 
-@@ -28,6 +28,7 @@
- 
- if IS_DEBIAN:
-     import apt
-+    import mintcommon
- 
- # i18n
- APP = 'mintlocale'
-