From 484e0468b658db674b7a100906ff2257a8ef52ec Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Sun, 20 Sep 2020 16:46:17 +0000 Subject: MFH: r549047 graphics/xournalpp: Update 1.0.18 -> 1.0.18.20200819; Fix build failure on 13-CURRENT with clang-11 Failure on 13: error: cannot initialize return object of type 'bool' with an rvalue of type 'nullptr_t' Reported by: fallout Approved by: ports-secteam (fluffy) --- graphics/xournalpp/Makefile | 4 ++-- graphics/xournalpp/distinfo | 6 +++--- graphics/xournalpp/pkg-plist | 38 +++++++++++++++++++++++++++++++++++--- 3 files changed, 40 insertions(+), 8 deletions(-) diff --git a/graphics/xournalpp/Makefile b/graphics/xournalpp/Makefile index 95724cbe4831..a01f77bf8cdf 100644 --- a/graphics/xournalpp/Makefile +++ b/graphics/xournalpp/Makefile @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xournalpp -DISTVERSION= 1.0.18 -PORTREVISION= 2 +DISTVERSION= 1.0.18.20200819 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org @@ -18,6 +17,7 @@ LIB_DEPENDS= libpoppler-glib.so:graphics/poppler-glib \ USES= cmake compiler:c++11-lang gettext-tools gnome pkgconfig xorg USE_GITHUB= yes +GH_TAGNAME= cdebec61151f968e6fafb2074be182aff970b0af USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 libxml2 pango USE_XORG= x11 xi USE_TEX= latex diff --git a/graphics/xournalpp/distinfo b/graphics/xournalpp/distinfo index 1d5fb89e5b28..e3f0acdcefbd 100644 --- a/graphics/xournalpp/distinfo +++ b/graphics/xournalpp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1587084091 -SHA256 (xournalpp-xournalpp-1.0.18_GH0.tar.gz) = f13178f67fc5c4eed566a09a16cbee80655a6bb7ab4425b4bc3962e8b608c215 -SIZE (xournalpp-xournalpp-1.0.18_GH0.tar.gz) = 14892343 +TIMESTAMP = 1600539245 +SHA256 (xournalpp-xournalpp-1.0.18.20200819-cdebec61151f968e6fafb2074be182aff970b0af_GH0.tar.gz) = aa3dc888fbd047a2518714a62993cc70e27aba948f53f3dd8813050dda531e2d +SIZE (xournalpp-xournalpp-1.0.18.20200819-cdebec61151f968e6fafb2074be182aff970b0af_GH0.tar.gz) = 15355181 diff --git a/graphics/xournalpp/pkg-plist b/graphics/xournalpp/pkg-plist index 144c1d1a8e9d..09b51f24cb12 100644 --- a/graphics/xournalpp/pkg-plist +++ b/graphics/xournalpp/pkg-plist @@ -1,36 +1,66 @@ -bin/xournal-thumbnailer bin/xournalpp +bin/xournalpp-thumbnailer +share/locale/af_ZA/LC_MESSAGES/xournalpp.mo +share/locale/ar_SA/LC_MESSAGES/xournalpp.mo +share/locale/ca_ES/LC_MESSAGES/xournalpp.mo share/locale/cs/LC_MESSAGES/xournalpp.mo +share/locale/cs_CZ/LC_MESSAGES/xournalpp.mo +share/locale/da_DK/LC_MESSAGES/xournalpp.mo share/locale/de/LC_MESSAGES/xournalpp.mo +share/locale/de_DE/LC_MESSAGES/xournalpp.mo +share/locale/el_GR/LC_MESSAGES/xournalpp.mo +share/locale/en_US/LC_MESSAGES/xournalpp.mo share/locale/es_ES/LC_MESSAGES/xournalpp.mo +share/locale/eu_ES/LC_MESSAGES/xournalpp.mo share/locale/fi_FI/LC_MESSAGES/xournalpp.mo share/locale/fr_FR/LC_MESSAGES/xournalpp.mo +share/locale/he_IL/LC_MESSAGES/xournalpp.mo +share/locale/hi_IN/LC_MESSAGES/xournalpp.mo share/locale/hr_HR/LC_MESSAGES/xournalpp.mo +share/locale/hu_HU/LC_MESSAGES/xournalpp.mo share/locale/it/LC_MESSAGES/xournalpp.mo +share/locale/it_IT/LC_MESSAGES/xournalpp.mo +share/locale/ja_JP/LC_MESSAGES/xournalpp.mo +share/locale/ko_KR/LC_MESSAGES/xournalpp.mo share/locale/nl_NL/LC_MESSAGES/xournalpp.mo +share/locale/no_NO/LC_MESSAGES/xournalpp.mo share/locale/pl/LC_MESSAGES/xournalpp.mo +share/locale/pl_PL/LC_MESSAGES/xournalpp.mo +share/locale/pt_BR/LC_MESSAGES/xournalpp.mo +share/locale/pt_PT/LC_MESSAGES/xournalpp.mo +share/locale/ro_RO/LC_MESSAGES/xournalpp.mo share/locale/ru_RU/LC_MESSAGES/xournalpp.mo +share/locale/sr_SP/LC_MESSAGES/xournalpp.mo +share/locale/sv_SE/LC_MESSAGES/xournalpp.mo share/locale/tlh_AA/LC_MESSAGES/xournalpp.mo +share/locale/tr_TR/LC_MESSAGES/xournalpp.mo +share/locale/uk_UA/LC_MESSAGES/xournalpp.mo +share/locale/vi_VN/LC_MESSAGES/xournalpp.mo share/locale/zh/LC_MESSAGES/xournalpp.mo +share/locale/zh_CN/LC_MESSAGES/xournalpp.mo share/locale/zh_HK/LC_MESSAGES/xournalpp.mo share/locale/zh_TW/LC_MESSAGES/xournalpp.mo %%DATADIR%%/plugins/Example/main.lua %%DATADIR%%/plugins/Example/plugin.ini %%DATADIR%%/plugins/Example/var_dump.lua +%%DATADIR%%/plugins/QuickScreenshot/main.lua +%%DATADIR%%/plugins/QuickScreenshot/plugin.ini %%DATADIR%%/plugins/ToggleGrid/plugin.ini %%DATADIR%%/plugins/ToggleGrid/togglegrid.lua +%%DATADIR%%/resources/default_template.tex %%DATADIR%%/ui/about.glade %%DATADIR%%/ui/exportSettings.glade %%DATADIR%%/ui/fillTransparency.glade %%DATADIR%%/ui/goto.glade %%DATADIR%%/ui/icons/hicolor/24x24/actions/pageSpinner.png -%%DATADIR%%/ui/icons/hicolor/icon-theme.cache %%DATADIR%%/ui/icons/hicolor/index.theme %%DATADIR%%/ui/icons/hicolor/scalable/actions/addPage.svg %%DATADIR%%/ui/icons/hicolor/scalable/actions/arrow-draw.svg %%DATADIR%%/ui/icons/hicolor/scalable/actions/audio-playback-pause.svg %%DATADIR%%/ui/icons/hicolor/scalable/actions/audio-playback-stop.svg %%DATADIR%%/ui/icons/hicolor/scalable/actions/audio-record.svg +%%DATADIR%%/ui/icons/hicolor/scalable/actions/audio-seek-backwards.svg +%%DATADIR%%/ui/icons/hicolor/scalable/actions/audio-seek-forwards.svg %%DATADIR%%/ui/icons/hicolor/scalable/actions/centerPage.svg %%DATADIR%%/ui/icons/hicolor/scalable/actions/circle-draw.svg %%DATADIR%%/ui/icons/hicolor/scalable/actions/coordinate-system-draw.svg @@ -63,6 +93,7 @@ share/locale/zh_TW/LC_MESSAGES/xournalpp.mo %%DATADIR%%/ui/icons/hicolor/scalable/actions/sidebar_bookmarks.svg %%DATADIR%%/ui/icons/hicolor/scalable/actions/sidebar_index.svg %%DATADIR%%/ui/icons/hicolor/scalable/actions/snapping.svg +%%DATADIR%%/ui/icons/hicolor/scalable/actions/spline-draw.svg %%DATADIR%%/ui/icons/hicolor/scalable/actions/stretch.svg %%DATADIR%%/ui/icons/hicolor/scalable/actions/thickness_fine.svg %%DATADIR%%/ui/icons/hicolor/scalable/actions/thickness_medium.svg @@ -78,7 +109,6 @@ share/locale/zh_TW/LC_MESSAGES/xournalpp.mo %%DATADIR%%/ui/icons/hicolor/scalable/actions/tool_text.svg %%DATADIR%%/ui/icons/hicolor/scalable/actions/transparent.svg %%DATADIR%%/ui/icons/hicolor/update-icon-cache.sh -%%DATADIR%%/ui/iconsDark/hicolor/icon-theme.cache %%DATADIR%%/ui/iconsDark/hicolor/index.theme %%DATADIR%%/ui/iconsDark/hicolor/scalable/actions/arrow-draw.svg %%DATADIR%%/ui/iconsDark/hicolor/scalable/actions/audio-playback-pause.svg @@ -98,6 +128,7 @@ share/locale/zh_TW/LC_MESSAGES/xournalpp.mo %%DATADIR%%/ui/iconsDark/hicolor/scalable/actions/ruler.svg %%DATADIR%%/ui/iconsDark/hicolor/scalable/actions/shape_recognizer.svg %%DATADIR%%/ui/iconsDark/hicolor/scalable/actions/snapping.svg +%%DATADIR%%/ui/iconsDark/hicolor/scalable/actions/spline-draw.svg %%DATADIR%%/ui/iconsDark/hicolor/scalable/actions/thickness_fine.svg %%DATADIR%%/ui/iconsDark/hicolor/scalable/actions/thickness_medium.svg %%DATADIR%%/ui/iconsDark/hicolor/scalable/actions/thickness_thick.svg @@ -108,6 +139,7 @@ share/locale/zh_TW/LC_MESSAGES/xournalpp.mo %%DATADIR%%/ui/iconsDark/hicolor/scalable/actions/tool_text.svg %%DATADIR%%/ui/iconsDark/hicolor/update-icon-cache.sh %%DATADIR%%/ui/images.glade +%%DATADIR%%/ui/latexSettings.glade %%DATADIR%%/ui/main.glade %%DATADIR%%/ui/pageTemplate.glade %%DATADIR%%/ui/pagesize.glade -- cgit v1.2.3