diff options
author | nia <nia@pkgsrc.org> | 2020-04-26 14:06:32 +0000 |
---|---|---|
committer | nia <nia@pkgsrc.org> | 2020-04-26 14:06:32 +0000 |
commit | 7f986bd090dec1ce1330b778ab73ae4dc9f2ad22 (patch) | |
tree | 8333f579fd7b3f763891b39a9e49193bc49224ac /editors | |
parent | 58be087921b1f703fd79c5d2aba955a7e93f2982 (diff) | |
download | pkgsrc-7f986bd090dec1ce1330b778ab73ae4dc9f2ad22.tar.gz |
xournalpp: Update to 1.0.18. Patch from Yorick Hardy.
## 1.0.18
* Fixed a crash occurring when recent file entries are invalid (#1730, thanks to
@iczero)
* Fixed translations not being built correctly, causing packaging issues (#1596)
* Fixed background PDF outlines not being saved in exported PDF (only available
when compiled with Cairo 1.16 or newer)
* Fixed a deadlock occurring when a second PDF with an outline is opened (#1582).
* Fixed the settings file being written to when it is parsed (#1074, thanks to
@Guldoman)
* Fixed dark mode icons not loading properly (#1767, thanks to @badshah400)
* Added missing dark mode icons (#1765, thanks to @badshah400)
* Fixed crash in `Export As ...` on some page range options (#1790)
* Fixed crash caused by custom colors in toolbar being "too close" (#1659)
* Windows: Fixed the LaTeX tool always failing to find kpsewhich (#1738). Note
that to make this work properly, a console window will now flash briefly
before Xournal++ starts.
Diffstat (limited to 'editors')
-rw-r--r-- | editors/xournalpp/Makefile | 5 | ||||
-rw-r--r-- | editors/xournalpp/PLIST | 15 | ||||
-rw-r--r-- | editors/xournalpp/distinfo | 13 | ||||
-rw-r--r-- | editors/xournalpp/patches/patch-src_control_tools_StrokeHandler.cpp | 38 |
4 files changed, 57 insertions, 14 deletions
diff --git a/editors/xournalpp/Makefile b/editors/xournalpp/Makefile index c7ac78543aa..bf07742ca5d 100644 --- a/editors/xournalpp/Makefile +++ b/editors/xournalpp/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2020/04/03 10:30:32 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2020/04/26 14:06:32 nia Exp $ -DISTNAME= xournalpp-1.0.17 -PKGREVISION= 4 +DISTNAME= xournalpp-1.0.18 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_GITHUB:=xournalpp/} GITHUB_PROJECT= xournalpp diff --git a/editors/xournalpp/PLIST b/editors/xournalpp/PLIST index 83db4a472d3..15b4fd6e1a5 100644 --- a/editors/xournalpp/PLIST +++ b/editors/xournalpp/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2019/10/16 13:34:08 nia Exp $ +@comment $NetBSD: PLIST,v 1.2 2020/04/26 14:06:32 nia Exp $ bin/xournal-thumbnailer bin/xournalpp share/applications/com.github.xournalpp.xournalpp.desktop @@ -97,17 +97,28 @@ share/xournalpp/ui/iconsDark/hicolor/index.theme share/xournalpp/ui/iconsDark/hicolor/scalable/actions/arrow-draw.svg share/xournalpp/ui/iconsDark/hicolor/scalable/actions/audio-playback-pause.svg share/xournalpp/ui/iconsDark/hicolor/scalable/actions/audio-playback-stop.svg +share/xournalpp/ui/iconsDark/hicolor/scalable/actions/audio-seek-backwards.svg +share/xournalpp/ui/iconsDark/hicolor/scalable/actions/audio-seek-forwards.svg share/xournalpp/ui/iconsDark/hicolor/scalable/actions/circle-draw.svg share/xournalpp/ui/iconsDark/hicolor/scalable/actions/coordinate-system-draw.svg share/xournalpp/ui/iconsDark/hicolor/scalable/actions/fill.svg share/xournalpp/ui/iconsDark/hicolor/scalable/actions/grid_snapping.svg +share/xournalpp/ui/iconsDark/hicolor/scalable/actions/line-style-dash-dot.svg +share/xournalpp/ui/iconsDark/hicolor/scalable/actions/line-style-dash.svg +share/xournalpp/ui/iconsDark/hicolor/scalable/actions/line-style-dot.svg +share/xournalpp/ui/iconsDark/hicolor/scalable/actions/line-style-plain.svg +share/xournalpp/ui/iconsDark/hicolor/scalable/actions/presentation-mode.svg share/xournalpp/ui/iconsDark/hicolor/scalable/actions/rect-draw.svg share/xournalpp/ui/iconsDark/hicolor/scalable/actions/ruler.svg share/xournalpp/ui/iconsDark/hicolor/scalable/actions/shape_recognizer.svg share/xournalpp/ui/iconsDark/hicolor/scalable/actions/snapping.svg +share/xournalpp/ui/iconsDark/hicolor/scalable/actions/thickness_fine.svg share/xournalpp/ui/iconsDark/hicolor/scalable/actions/thickness_medium.svg share/xournalpp/ui/iconsDark/hicolor/scalable/actions/thickness_thick.svg -share/xournalpp/ui/iconsDark/hicolor/scalable/actions/thickness_thin.svg +share/xournalpp/ui/iconsDark/hicolor/scalable/actions/thickness_very_fine.svg +share/xournalpp/ui/iconsDark/hicolor/scalable/actions/thickness_very_thick.svg +share/xournalpp/ui/iconsDark/hicolor/scalable/actions/tool_highlighter.svg +share/xournalpp/ui/iconsDark/hicolor/scalable/actions/tool_math_tex.svg share/xournalpp/ui/iconsDark/hicolor/scalable/actions/tool_text.svg share/xournalpp/ui/iconsDark/hicolor/update-icon-cache.sh share/xournalpp/ui/images.glade diff --git a/editors/xournalpp/distinfo b/editors/xournalpp/distinfo index 405d515edf9..232c52c1d97 100644 --- a/editors/xournalpp/distinfo +++ b/editors/xournalpp/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.4 2020/02/20 17:09:43 nia Exp $ +$NetBSD: distinfo,v 1.5 2020/04/26 14:06:32 nia Exp $ -SHA1 (xournalpp-1.0.17.tar.gz) = 532461588c146a90f173252621a96d57f799e206 -RMD160 (xournalpp-1.0.17.tar.gz) = 65b18e3ef7a0cf02cc2b313c7b2e619116487434 -SHA512 (xournalpp-1.0.17.tar.gz) = cc3568ce22fd42f0e8458f1428c102d2fc18a9650d8c5968cadd6693fc19374780beb3c7f6206f2f494439296a883b2a5160da37e3a0e10d6fe3654084967ab9 -Size (xournalpp-1.0.17.tar.gz) = 14885382 bytes +SHA1 (xournalpp-1.0.18.tar.gz) = 935cb3550bb44f6b3cf4da274b65ce275e983695 +RMD160 (xournalpp-1.0.18.tar.gz) = 7dfd02c8b316d3d81d315e532e0d847266876110 +SHA512 (xournalpp-1.0.18.tar.gz) = 90568a2674a18ff711ecef5f1a66ea1c5746d7f1fde271b36342d9bf48e096e63075cf7fd8b69e39e144273a4d1b922c415eee929eba94b2fa515a0bb481815a +Size (xournalpp-1.0.18.tar.gz) = 14892343 bytes SHA1 (patch-CMakeLists.txt) = 3ead1546fe20e7481e93f2976c3e7b98c0a7699f -SHA1 (patch-src_control_tools_StrokeHandler.cpp) = 80df57a9776a9919a95a04bf6c057dc021fc789e +SHA1 (patch-po_CMakeLists.txt) = 897b4f9507b48be394409deda8170fe7d39f008c +SHA1 (patch-src_control_tools_StrokeHandler.cpp) = 9e8d3d3f173ef1e84137a728646e807228184872 SHA1 (patch-src_util_DeviceListHelper.cpp) = 8f3534c80c79ec49dd9562c3ed4e3ff7c36b2ecb diff --git a/editors/xournalpp/patches/patch-src_control_tools_StrokeHandler.cpp b/editors/xournalpp/patches/patch-src_control_tools_StrokeHandler.cpp index 28ef327a8c4..1afbc3a908a 100644 --- a/editors/xournalpp/patches/patch-src_control_tools_StrokeHandler.cpp +++ b/editors/xournalpp/patches/patch-src_control_tools_StrokeHandler.cpp @@ -1,12 +1,12 @@ -$NetBSD: patch-src_control_tools_StrokeHandler.cpp,v 1.1 2019/11/02 14:44:15 nia Exp $ +$NetBSD: patch-src_control_tools_StrokeHandler.cpp,v 1.2 2020/04/26 14:06:32 nia Exp $ On NetBSD, absolute coordinate changes are reported as an X value followed by a Y value, which (when moving quickly) leads to a "stepping" effect. Using a Bezier curve fitting for the points yields a smooth curve in most cases, and does not seem to adversely affect the user experience (even with a conventional mouse). ---- ./src/control/tools/StrokeHandler.cpp.orig 2019-09-10 05:47:36.000000000 +0000 -+++ ./src/control/tools/StrokeHandler.cpp +--- src/control/tools/StrokeHandler.cpp.orig 2020-04-15 19:03:39.000000000 +0000 ++++ src/control/tools/StrokeHandler.cpp @@ -115,9 +115,36 @@ bool StrokeHandler::onMotionNotifyEvent( } else @@ -44,3 +44,35 @@ the user experience (even with a conventional mouse). Stroke lastSegment; +@@ -154,6 +181,15 @@ void StrokeHandler::onButtonReleaseEvent + Control* control = xournal->getControl(); + Settings* settings = control->getSettings(); + ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ // Since we omit the last point (treat it as a control point), ++ // the stroke may be empty -- i.e. has only one point -- ++ // and we can make it "non-empty" by duplicating the point. ++ if(stroke->getPointCount() == 1) { ++ stroke->addPoint(stroke->getPoint(0)); ++ } ++#endif ++ + if (settings->getStrokeFilterEnabled()) // Note: For shape tools see BaseStrokeHandler which has a slightly + // different version of this filter. See //! + { +@@ -192,6 +228,15 @@ void StrokeHandler::onButtonReleaseEvent + this->lastStrokeTime = pos.timestamp; + } + ++#if defined(__NetBSD__) || defined(__OpenBSD__) ++ if (stroke->getPointCount() > 0) ++ { ++ // The last segment was never drawn, so it will "pop up" if we repaint. ++ // Visually it was never there, so remove it. ++ stroke->deletePoint(stroke->getPointCount()-1); ++ } ++#endif ++ + // Backward compatibility and also easier to handle for me;-) + // I cannot draw a line with one point, to draw a visible line I need two points, + // twice the same Point is also OK |