Hi,
i would like an ok to commit this.
I testes it, and it works.
/Benno
Edward Lopez-Acosta(elopezaco...@gmail.com) on 2018.12.01 19:24:42 -0600:
> Minor update, nothing depends on this, maintainer CC.
> Was able to drop one patch that no longer applied and I found no ill
> effects of doing so.
>
> Lots of bug fixes including some marked critical:
> https://github.com/jaap-karssenberg/zim-desktop-wiki/blob/master/CHANGELOG.txt
>
> Builds and runs fine on amd64.
>
> Thank you.
> --
> Edward Lopez-Acosta
> diff --git Makefile Makefile
> index cf02471b2d8..e27d5c1a241 100644
> --- Makefile
> +++ Makefile
> @@ -2,9 +2,8 @@
>
> COMMENT =desktop wiki
>
> -MODPY_EGG_VERSION = 0.67
> +MODPY_EGG_VERSION = 0.68
> DISTNAME = zim-${MODPY_EGG_VERSION}
> -REVISION = 2
>
> CATEGORIES = productivity
>
> diff --git distinfo distinfo
> index 04828b47254..221c06d9f65 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (zim-0.67.tar.gz) = s3zvPUkGqiY6vMsUk5Kafqa56NEaUO2SzUN+j5P/q70=
> -SIZE (zim-0.67.tar.gz) = 2034747
> +SHA256 (zim-0.68.tar.gz) = 2RUY4BD2pulRp1MUE4tVRaTFEVH8mfUTqndooYhY3xU=
> +SIZE (zim-0.68.tar.gz) = 2044224
> diff --git patches/patch-zim_environ_py patches/patch-zim_environ_py
> deleted file mode 100644
> index b16f02c843b..000
> --- patches/patch-zim_environ_py
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -$OpenBSD: patch-zim_environ_py,v 1.1 2015/05/04 19:28:16 benno Exp $
> zim/environ.py.orig Sun Apr 26 17:10:58 2015
> -+++ zim/environ.py Sun Apr 26 17:10:58 2015
> -@@ -98,8 +98,8 @@
> - if not 'APPDATA' in environ or not environ['APPDATA']:
> - environ['APPDATA'] = environ['HOME'] + '\\Application Data'
> -
> --assert isdir(environ['HOME']), \
> --'ERROR: environment variable $HOME not set correctly value is "%s"'
> -+#assert isdir(environ['HOME']), \
> -+# 'ERROR: environment variable $HOME not set correctly value is "%s"'
> - # using our own environ here to ensure encoding
> -
> - if not 'USER' in environ or not environ['USER']:
> diff --git pkg/PLIST pkg/PLIST
> index 3d783f6c74b..925766fb6ca 100644
> --- pkg/PLIST
> +++ pkg/PLIST
> @@ -273,8 +273,6 @@ lib/python${MODPY_VERSION}/site-packages/zim/www.py
> lib/python${MODPY_VERSION}/site-packages/zim/www.pyc
> @man man/man1/zim.1
> man/zim.1
> -share/appdata/
> -share/appdata/zim.appdata.xml
> share/applications/zim.desktop
> share/icons/hicolor/16x16/apps/zim.png
> share/icons/hicolor/16x16/mimetypes/application-x-zim-notebook.png
> @@ -336,6 +334,8 @@ share/locale/tr/LC_MESSAGES/zim.mo
> share/locale/uk/LC_MESSAGES/zim.mo
> share/locale/zh_CN/LC_MESSAGES/zim.mo
> share/locale/zh_TW/LC_MESSAGES/zim.mo
> +share/metainfo/
> +share/metainfo/org.zim_wiki.Zim.metainfo.xml
> share/mime/packages/zim.xml
> share/pixmaps/
> share/pixmaps/zim.png
