diff --git a/sysutils/catfish/Makefile b/sysutils/catfish/Makefile index fb76e28d41a2..d0082b0221f1 100644 --- a/sysutils/catfish/Makefile +++ b/sysutils/catfish/Makefile @@ -1,50 +1,53 @@ # Created by: jpaetzel@FreeBSD.org # $FreeBSD$ PORTNAME= catfish -PORTVERSION= 1.4.12 +PORTVERSION= 1.4.13 CATEGORIES= sysutils MASTER_SITES= XFCE/apps DIST_SUBDIR= xfce4 MAINTAINER= xfce@FreeBSD.org COMMENT= GTK search utility LICENSE= GPLv3 RUN_DEPENDS= \ + ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR} +BUILD_DEPENDS= \ ${PYTHON_PKGNAMEPREFIX}python-distutils-extra>0:devel/py-python-distutils-extra@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pexpect>0:misc/py-pexpect@${PY_FLAVOR} -BUILD_DEPENDS= ${RUN_DEPENDS} -USES= desktop-file-utils gettext-tools gnome python:2.7 tar:bz2 +USES= desktop-file-utils gettext-tools gnome python:3.4+ tar:bz2 USE_PYTHON= distutils USE_GNOME= gtk30 intltool pygobject3 NO_ARCH= yes INSTALLS_ICONS= yes OPTIONS_DEFINE= DOCS ZEITGEIST OPTIONS_DEFAULT=ZEITGEIST POLKIT OPTIONS_MULTI= PRIVILEGES OPTIONS_MULTI_PRIVILEGES= POLKIT SUDO POLKIT_DESC= Provide Polkit (pkexec) support POLKIT_RUN_DEPENDS= pkexec:sysutils/polkit SUDO_DESC= Provide sudo support SUDO_RUN_DEPENDS= sudo:security/sudo ZEITGEIST_DESC= Provide recent search suggestions ZEITGEIST_LIB_DEPENDS= libzeitgeist-2.0.so:sysutils/zeitgeist post-install: ${MV} ${STAGEDIR}${PREFIX}/share/man/man1/catfish.1 ${STAGEDIR}${PREFIX}/man/man1/catfish.1 (cd ${STAGEDIR}${PREFIX}/share && ${RMDIR} -p man/man1) ${GZIP} ${STAGEDIR}${PREFIX}/man/man1/catfish.1 .include PYDISTUTILS_INSTALLARGS= -c -O1 --prefix=${PREFIX} --root=${STAGEDIR} .include diff --git a/sysutils/catfish/distinfo b/sysutils/catfish/distinfo index 87578726d5c3..70b33fa90d17 100644 --- a/sysutils/catfish/distinfo +++ b/sysutils/catfish/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1577906751 -SHA256 (xfce4/catfish-1.4.12.tar.bz2) = c3fb30e02b217752aa493b49769be1a5fc2adde70b22aef381e6c67d5227134a -SIZE (xfce4/catfish-1.4.12.tar.bz2) = 221813 +TIMESTAMP = 1579077633 +SHA256 (xfce4/catfish-1.4.13.tar.bz2) = 58c0ea06e5f286019295545fbfd1dbca23aea74c625762bbb4c89a6f484ae839 +SIZE (xfce4/catfish-1.4.13.tar.bz2) = 221999 diff --git a/sysutils/catfish/files/patch-catfish_CatfishSearchEngine.py b/sysutils/catfish/files/patch-catfish_CatfishSearchEngine.py new file mode 100644 index 000000000000..cfd4562a1ca8 --- /dev/null +++ b/sysutils/catfish/files/patch-catfish_CatfishSearchEngine.py @@ -0,0 +1,37 @@ +--- catfish/CatfishSearchEngine.py.orig 2020-01-15 01:49:54 UTC ++++ catfish/CatfishSearchEngine.py +@@ -24,6 +24,7 @@ import logging + + import io + import os ++import platform + import re + import signal + import subprocess +@@ -649,16 +650,17 @@ class CatfishSearchMethod_Locate(CatfishSearchMethodEx + "existing": False, + "regex": False + } +- try: +- details = subprocess.check_output(["locate", "--help"]) +- details = details.decode("utf-8") +- if "--existing" in details: +- caps["existing"] = True +- if "--regex" in details or "--regexp" in details: +- caps["regex"] = True ++ if platform.system() != 'FreeBSD': ++ try: ++ details = subprocess.check_output(["locate", "--help"]) ++ details = details.decode("utf-8") ++ if "--existing" in details: ++ caps["existing"] = True ++ if "--regex" in details or "--regexp" in details: ++ caps["regex"] = True + +- except subprocess.CalledProcessError: +- pass ++ except subprocess.CalledProcessError: ++ pass + return caps + + def assemble_query(self, keywords, path): diff --git a/sysutils/catfish/pkg-plist b/sysutils/catfish/pkg-plist index 8ed62369e32f..d62f637e665f 100644 --- a/sysutils/catfish/pkg-plist +++ b/sysutils/catfish/pkg-plist @@ -1,100 +1,100 @@ bin/catfish man/man1/catfish.1.gz %%PYTHON_SITELIBDIR%%/catfish/CatfishPrefsDialog.py -%%PYTHON_SITELIBDIR%%/catfish/CatfishPrefsDialog.pyc -%%PYTHON_SITELIBDIR%%/catfish/CatfishPrefsDialog.pyo %%PYTHON_SITELIBDIR%%/catfish/CatfishSearchEngine.py -%%PYTHON_SITELIBDIR%%/catfish/CatfishSearchEngine.pyc -%%PYTHON_SITELIBDIR%%/catfish/CatfishSearchEngine.pyo %%PYTHON_SITELIBDIR%%/catfish/CatfishWindow.py -%%PYTHON_SITELIBDIR%%/catfish/CatfishWindow.pyc -%%PYTHON_SITELIBDIR%%/catfish/CatfishWindow.pyo %%PYTHON_SITELIBDIR%%/catfish/__init__.py -%%PYTHON_SITELIBDIR%%/catfish/__init__.pyc -%%PYTHON_SITELIBDIR%%/catfish/__init__.pyo +%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishPrefsDialog.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishPrefsDialog.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishSearchEngine.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishSearchEngine.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishWindow.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/catfish/__pycache__/CatfishWindow.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/catfish/__pycache__/__init__.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/catfish/__pycache__/__init__.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/catfish_lib/__init__.py %%PYTHON_SITELIBDIR%%/catfish_lib/Builder.py -%%PYTHON_SITELIBDIR%%/catfish_lib/Builder.pyc -%%PYTHON_SITELIBDIR%%/catfish_lib/Builder.pyo %%PYTHON_SITELIBDIR%%/catfish_lib/CatfishSettings.py -%%PYTHON_SITELIBDIR%%/catfish_lib/CatfishSettings.pyc -%%PYTHON_SITELIBDIR%%/catfish_lib/CatfishSettings.pyo %%PYTHON_SITELIBDIR%%/catfish_lib/PrefsDialog.py -%%PYTHON_SITELIBDIR%%/catfish_lib/PrefsDialog.pyc -%%PYTHON_SITELIBDIR%%/catfish_lib/PrefsDialog.pyo %%PYTHON_SITELIBDIR%%/catfish_lib/SudoDialog.py -%%PYTHON_SITELIBDIR%%/catfish_lib/SudoDialog.pyc -%%PYTHON_SITELIBDIR%%/catfish_lib/SudoDialog.pyo %%PYTHON_SITELIBDIR%%/catfish_lib/Thumbnailer.py -%%PYTHON_SITELIBDIR%%/catfish_lib/Thumbnailer.pyc -%%PYTHON_SITELIBDIR%%/catfish_lib/Thumbnailer.pyo %%PYTHON_SITELIBDIR%%/catfish_lib/Window.py -%%PYTHON_SITELIBDIR%%/catfish_lib/Window.pyc -%%PYTHON_SITELIBDIR%%/catfish_lib/Window.pyo -%%PYTHON_SITELIBDIR%%/catfish_lib/__init__.py -%%PYTHON_SITELIBDIR%%/catfish_lib/__init__.pyc -%%PYTHON_SITELIBDIR%%/catfish_lib/__init__.pyo +%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Builder.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Builder.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/CatfishSettings.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/CatfishSettings.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/PrefsDialog.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/PrefsDialog.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/SudoDialog.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/SudoDialog.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Thumbnailer.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Thumbnailer.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Window.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/Window.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/__init__.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/__init__.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/catfishconfig.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/catfishconfig.cpython-37.pyc +%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/helpers.cpython-37.opt-1.pyc +%%PYTHON_SITELIBDIR%%/catfish_lib/__pycache__/helpers.cpython-37.pyc %%PYTHON_SITELIBDIR%%/catfish_lib/catfishconfig.py -%%PYTHON_SITELIBDIR%%/catfish_lib/catfishconfig.pyc -%%PYTHON_SITELIBDIR%%/catfish_lib/catfishconfig.pyo %%PYTHON_SITELIBDIR%%/catfish_lib/helpers.py -%%PYTHON_SITELIBDIR%%/catfish_lib/helpers.pyc -%%PYTHON_SITELIBDIR%%/catfish_lib/helpers.pyo share/applications/org.xfce.Catfish.desktop %%DATADIR%%/ui/CatfishPreferences.ui %%DATADIR%%/ui/CatfishWindow.ui %%DATADIR%%/ui/catfish-wl-headerbar.png %%DATADIR%%/ui/catfish-wl-titlebar.png %%DATADIR%%/ui/catfish_preferences.xml %%DATADIR%%/ui/catfish_window.xml %%PORTDOCS%%%%DOCSDIR%%/README share/icons/hicolor/scalable/apps/catfish.svg share/locale/af/LC_MESSAGES/catfish.mo share/locale/ar/LC_MESSAGES/catfish.mo share/locale/be/LC_MESSAGES/catfish.mo share/locale/bg/LC_MESSAGES/catfish.mo share/locale/ca/LC_MESSAGES/catfish.mo share/locale/cs/LC_MESSAGES/catfish.mo share/locale/da/LC_MESSAGES/catfish.mo share/locale/de/LC_MESSAGES/catfish.mo share/locale/el/LC_MESSAGES/catfish.mo share/locale/en_AU/LC_MESSAGES/catfish.mo share/locale/eo/LC_MESSAGES/catfish.mo share/locale/es/LC_MESSAGES/catfish.mo share/locale/eu/LC_MESSAGES/catfish.mo share/locale/fi/LC_MESSAGES/catfish.mo share/locale/fr/LC_MESSAGES/catfish.mo share/locale/gl/LC_MESSAGES/catfish.mo share/locale/he/LC_MESSAGES/catfish.mo share/locale/hr/LC_MESSAGES/catfish.mo share/locale/hu/LC_MESSAGES/catfish.mo share/locale/hy_AM/LC_MESSAGES/catfish.mo share/locale/id/LC_MESSAGES/catfish.mo share/locale/ie/LC_MESSAGES/catfish.mo share/locale/is/LC_MESSAGES/catfish.mo share/locale/it/LC_MESSAGES/catfish.mo share/locale/ja/LC_MESSAGES/catfish.mo share/locale/ko/LC_MESSAGES/catfish.mo share/locale/ku/LC_MESSAGES/catfish.mo share/locale/lt/LC_MESSAGES/catfish.mo share/locale/lv/LC_MESSAGES/catfish.mo share/locale/ml/LC_MESSAGES/catfish.mo share/locale/ms/LC_MESSAGES/catfish.mo share/locale/nb/LC_MESSAGES/catfish.mo share/locale/nl/LC_MESSAGES/catfish.mo share/locale/nn/LC_MESSAGES/catfish.mo share/locale/pl/LC_MESSAGES/catfish.mo share/locale/pt/LC_MESSAGES/catfish.mo share/locale/pt_BR/LC_MESSAGES/catfish.mo share/locale/ru/LC_MESSAGES/catfish.mo share/locale/si/LC_MESSAGES/catfish.mo share/locale/sk/LC_MESSAGES/catfish.mo share/locale/sl/LC_MESSAGES/catfish.mo share/locale/sq/LC_MESSAGES/catfish.mo share/locale/sr/LC_MESSAGES/catfish.mo share/locale/sv/LC_MESSAGES/catfish.mo share/locale/th/LC_MESSAGES/catfish.mo share/locale/tr/LC_MESSAGES/catfish.mo share/locale/uk/LC_MESSAGES/catfish.mo share/locale/zh_CN/LC_MESSAGES/catfish.mo share/locale/zh_TW/LC_MESSAGES/catfish.mo share/metainfo/catfish.appdata.xml