Update catfish to 1.4.12

6 files changed, 12 insertions, 37 deletions

diff --git a/sysutils/catfish/Makefile b/sysutils/catfish/Makefile
index 79a95f08a3a1..fb76e28d41a2 100644
--- a/sysutils/catfish/Makefile
+++ b/sysutils/catfish/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	catfish
-PORTVERSION=	1.4.11
+PORTVERSION=	1.4.12
 CATEGORIES=	sysutils
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
diff --git a/sysutils/catfish/distinfo b/sysutils/catfish/distinfo
index c5c6d5a49933..87578726d5c3 100644
--- a/sysutils/catfish/distinfo
+++ b/sysutils/catfish/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1576939366
-SHA256 (xfce4/catfish-1.4.11.tar.bz2) = 617baf9309e3cdfb20c8357ac786eb26f30e6fd4280d4534d3cdd742c7ffcd85
-SIZE (xfce4/catfish-1.4.11.tar.bz2) = 220603
+TIMESTAMP = 1577906751
+SHA256 (xfce4/catfish-1.4.12.tar.bz2) = c3fb30e02b217752aa493b49769be1a5fc2adde70b22aef381e6c67d5227134a
+SIZE (xfce4/catfish-1.4.12.tar.bz2) = 221813
diff --git a/sysutils/catfish/files/patch-catfish_CatfishWindow.py b/sysutils/catfish/files/patch-catfish_CatfishWindow.py
index 6121c1d8535f..c9ee6b6dacab 100644
--- a/sysutils/catfish/files/patch-catfish_CatfishWindow.py
+++ b/sysutils/catfish/files/patch-catfish_CatfishWindow.py
@@ -1,14 +1,6 @@
---- catfish/CatfishWindow.py.orig	2019-07-27 11:21:22 UTC
+--- catfish/CatfishWindow.py.orig	2020-01-01 18:26:21 UTC
 +++ catfish/CatfishWindow.py
-@@ -22,6 +22,7 @@ import logging
- import mimetypes
- import os
- import subprocess
-+import sys
- import time
- from locale import gettext as _
- from shutil import copy2, rmtree
-@@ -738,9 +739,15 @@ class CatfishWindow(Window):
+@@ -822,9 +822,15 @@ class CatfishWindow(Window):
          self.update_index_unlock.set_sensitive(False)
  
          if SudoDialog.prefer_pkexec():
diff --git a/sysutils/catfish/files/patch-catfish__lib_SudoDialog.py b/sysutils/catfish/files/patch-catfish__lib_SudoDialog.py
index 84829a94cce0..b9404c4ece48 100644
--- a/sysutils/catfish/files/patch-catfish__lib_SudoDialog.py
+++ b/sysutils/catfish/files/patch-catfish__lib_SudoDialog.py
@@ -1,14 +1,6 @@
---- catfish_lib/SudoDialog.py.orig	2019-07-27 11:21:22 UTC
+--- catfish_lib/SudoDialog.py.orig	2020-01-01 17:46:05 UTC
 +++ catfish_lib/SudoDialog.py
-@@ -18,6 +18,7 @@
- 
- from gi.repository import Gtk, GdkPixbuf
- import os
-+import sys
- 
- from locale import gettext as _
- 
-@@ -316,7 +317,11 @@ class SudoDialog(Gtk.Dialog):
+@@ -314,7 +314,11 @@ class SudoDialog(Gtk.Dialog):
          Return True if successful.
          '''
          # Set the pexpect variables and spawn the process.
diff --git a/sysutils/catfish/files/patch-catfish__lib_catfishconfig.py b/sysutils/catfish/files/patch-catfish__lib_catfishconfig.py
index 7a0e12220ece..5be228f07005 100644
--- a/sysutils/catfish/files/patch-catfish__lib_catfishconfig.py
+++ b/sysutils/catfish/files/patch-catfish__lib_catfishconfig.py
@@ -1,4 +1,4 @@
---- catfish_lib/catfishconfig.py.orig	2019-08-11 17:51:09 UTC
+--- catfish_lib/catfishconfig.py.orig	2020-01-01 18:29:00 UTC
 +++ catfish_lib/catfishconfig.py
 @@ -17,6 +17,7 @@
  #   with this program.  If not, see <https://www.gnu.org/licenses/>.
@@ -17,6 +17,6 @@
 +    __locate_db_path__ = '/var/lib/mlocate/mlocate.db'
 +elif 'bsd' in sys.platform or sys.platform.startswith('dragonfly'):
 +    __locate_db_path__ = '/var/db/locate.database'
- __license__ = 'GPL-3+'
- __version__ = '1.4.9'
- 
+ __license__ = 'GPL-2+'
+ __version__ = '1.4.12'
+ __url__ = 'https://docs.xfce.org/apps/catfish/start'
diff --git a/sysutils/catfish/pkg-plist b/sysutils/catfish/pkg-plist
index d5a33798c3dd..8ed62369e32f 100644
--- a/sysutils/catfish/pkg-plist
+++ b/sysutils/catfish/pkg-plist
@@ -1,8 +1,5 @@
 bin/catfish
 man/man1/catfish.1.gz
-%%PYTHON_SITELIBDIR%%/catfish/AboutCatfishDialog.py
-%%PYTHON_SITELIBDIR%%/catfish/AboutCatfishDialog.pyc
-%%PYTHON_SITELIBDIR%%/catfish/AboutCatfishDialog.pyo
 %%PYTHON_SITELIBDIR%%/catfish/CatfishPrefsDialog.py
 %%PYTHON_SITELIBDIR%%/catfish/CatfishPrefsDialog.pyc
 %%PYTHON_SITELIBDIR%%/catfish/CatfishPrefsDialog.pyo
@@ -15,9 +12,6 @@ man/man1/catfish.1.gz
 %%PYTHON_SITELIBDIR%%/catfish/__init__.py
 %%PYTHON_SITELIBDIR%%/catfish/__init__.pyc
 %%PYTHON_SITELIBDIR%%/catfish/__init__.pyo
-%%PYTHON_SITELIBDIR%%/catfish_lib/AboutDialog.py
-%%PYTHON_SITELIBDIR%%/catfish_lib/AboutDialog.pyc
-%%PYTHON_SITELIBDIR%%/catfish_lib/AboutDialog.pyo
 %%PYTHON_SITELIBDIR%%/catfish_lib/Builder.py
 %%PYTHON_SITELIBDIR%%/catfish_lib/Builder.pyc
 %%PYTHON_SITELIBDIR%%/catfish_lib/Builder.pyo
@@ -46,11 +40,8 @@ man/man1/catfish.1.gz
 %%PYTHON_SITELIBDIR%%/catfish_lib/helpers.pyc
 %%PYTHON_SITELIBDIR%%/catfish_lib/helpers.pyo
 share/applications/org.xfce.Catfish.desktop
-%%DATADIR%%/ui/AboutCatfishDialog.ui
 %%DATADIR%%/ui/CatfishPreferences.ui
-%%DATADIR%%/ui/CatfishPreferences.ui~
 %%DATADIR%%/ui/CatfishWindow.ui
-%%DATADIR%%/ui/about_catfish_dialog.xml
 %%DATADIR%%/ui/catfish-wl-headerbar.png
 %%DATADIR%%/ui/catfish-wl-titlebar.png
 %%DATADIR%%/ui/catfish_preferences.xml