editors/xournalpp: update to xournalpp-1.1.0

Pkgsrc changes:

* Xournal++ has its own smoothing/averaging options available, so the
  Bezier curve patch for NetBSD and OpenBSD is not needed anymore.
* Enable the velocity Gaussian averaging option by default on NetBSD
  and OpenBSD to avoid the "stepping" seen with raw input.


Changelog:

== 1.1.0

This is a new major version of Xournal++ with many new features, improvements,
and bug fixes thanks to over one year's worth of contributions from the
community.

* **Breaking changes**:
    * Xournal++ now follows the [XDG Base Directory
      Specification](https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html)
      (#1101, #1384). The configuration files will now be stored in an
      appropriate platform-specific user data folder. Old configuration files
      will be copied automatically if the new user data folder does not exist.
    * For users that have non-default DPI settings, text elements in old
      documents may be displayed with incorrect sizes/positions. A new plugin is
      included to fix the positioning of these text elements. See the relevant
      bug in the "Text tool" section below.
    * The old input system has been removed, which may affect some users.
    * Windows: The installer has been updated, fixing many issues such as:
      incorrectly set up registry keys, missing uninstaller entry, missing
      entries in Open With context menu in Explorer, missing icons, etc. (#2606,
      #2585, #2387, #2141, #2036, #1903, #2666, #3215). When upgrading from
      1.0.18, you **must not run the uninstaller**; instead, run the updated
      installer, which will clean up files from the old install and fix the
      registry key entries. **If you are downgrading from 1.1.0 to 1.0.18 or
      older, you must run the uninstaller first.**
    * Linux: Support for Ubuntu 16.04 (and older distros) has been dropped.
      Please use a distro from 2018 or later, such as Ubuntu 18.04 or Debian
      Buster. The dependency versions have been updated accordingly.
    * Linux: The thumbnailer program has been renamed from `xournal-thumbnailer`
      to `xournalpp-thumbnailer` in order to fix tab completion (#1752).
    * Linux: Xournal++ now has a hard dependency on `librsvg`. This should not affect
      end-users, only maintainers and packagers.
    * The code has been updated to use C++17 (#1485) and must now be compiled
      using a supported compiler version, such as GCC 7 or Clang 5 (or newer).
    * MacOS: Dropped support for macOS High Sierra; minimal version is now Catalina (#2989)
* Document viewing
    * Changed page selection system to now select the current page during
      scrolling (#1613, #1184).
    * Improved page load performance and memory consumption with new page
      preload mechanism (#2603).
    * Fixed a bug where scrolling would not work with zoom fit enabled until the
    zoom level changes (#2541).
    * Fixed some bugs that prevented documents from being displayed on ARM and
      32-bit devices (#2576).
    * Fixed vim-style `hjlk` keybindings being inconsistent with the arrow keys
      (#2712).
    * Added a shortcut for the default tool (#2872) and changed shortcuts for
      page deletion and layer navigation (#2766)
    * Fixed various issues related to zooming and scrolling (#2435, #2743,
      #2023, #1830, #2821)
    * Fixed zoom slider tick marks being set to the wrong values when DPI
      calibration setting is different from the default (#2923)
    * Fixed a freeze caused by scrolling between pages of different size (#2770,
      #3099).
* Document export
    * Added a "progressive mode" option to PDF file export dialog. This will
      render layers from bottom to top, exporting a new page every time a layer
      is rendered (#2589, #2609).
    * Simplified background rendering to improve compatibility of exported SVGs
      (#2598).
    * Made line spacing equal in export and on view when pango version >= 1.48.5 is
      available (#2182)
    * Updated the Cairo version on Windows to fix a bug that created corrupt PDF
      files on export (#2871)
    * Fixed a crash that occurs when closing the application before export
      finishes (#3159).
* Sidebar preview panel
    * Added new "Layerstack Preview" tab that shows all layers up to the current
      layer (#2795).
    * Changed sidebar colors to be dark when using a dark theme (#2726).
    * Changed layer previews to only show background in background layer (#2674)
    * Moved close button from the bottom to the top to improve usability
      (#2727).
    * Fixed button tooltips not reflecting the page/layer tabs (#2776).
    * Fixed a bug where the buttons would be enabled/disabled inconsistently
      (#2776).
* Audio playback
    * Added seeking functionality during playback (#1520)
    * Fixed crashes caused by race conditions in the audio system
    * Fixed bug where gaps in the audio stream could appear while recording
    * Added an error message popup which displays when a recording fails to load
      or play (#1573)
* Input System
    * Removed the old input system and touch workaround, both of which have been
      deprecated (#2308).
    * Added a `Mouse+Keyboard` device class for handling e.g. wireless USB
      mouse/keyboard receivers (#1769, #1785).
    * Added Preference settings for minimum pressure level and pressure
      multiplier (#2622).
    * Added an experimental stroke smoothing / input stabilization feature
      (#2512, #2856, #2863).
    * Added a touchpad pinch gesture for zooming (#2651).
    * Added a Preferences setting to ignore the first few pen input events when
      starting a new stroke (#1854).
    * Reimplemented zoom gestures for better compatibility (#1528)
    * Improved tool handling (#2339)
    * Fixed a bug where the touchscreen could not be used to pan and zoom when
      touch drawing is enabled (#2435).
    * Fixed a bug where two-finger zoom would be triggered even when zoom
      gestures are disabled (#2510).
    * Fixed touch drawing not working with the pen tool (#2123).
* LaTeX tool
    * Reworked LaTeX tool implementation (#1952).
    * Added a new tab in the Preferences window for LaTeX configuration.
    * Added a `global template file` setting for custom LaTeX template files
      to be used when rendering LaTeX formulas (#1188).
    * Added a button in the Preferences window for testing LaTeX setup.
    * Fixed a bug where closing the dialog before the initial render would crash
      the application (#2728, #2798).
    * Fixed a bug where line breaks would not be saved correctly (#2849).
    * Windows: Fixed a bug where long user names would break the LaTeX tool
      (#3046).
* Spline tool
    * Added cubic splines as a drawing tool (#1688, #1798, #1861).
    * Click to add anchor points (knots) and drag to create non-trivial
      tangents. Backspace key, arrow keys, s and Shift+s allow to delete/modifiy
      the last set knot/its tangent. Escape key and double click exit the spline
      drawing mode.
* Snapping
    * Added snapping for vertical space (#2011)
    * Added snapping for moving and resizing selections (#1972, #2011)
    * Added snapping for recognized shapes (optional setting; #2011)
    * Added a Preferences settings to preserve line width while resizing a
      selection (#2011)
    * Added a Preferences setting to change the snap grid size (#1920).
    * Fixed a bug in the grid snapping tolerance (#2779).
* Selections
    * Added ability to mirror selected elements when scaling in a negative
      direction (#2723).
    * Added `Edit > Arrange` menu items and the corresponding actions for
      rearranging selected elements (#2794).
    * Changed element selection to not automatically rearrange items (#1680).
      Instead, rearranging must be performed with the newly added menu entries.
    * Fixed some bugs where selections would not be copied correctly (#2277,
      #2090, #2733) and would cause strokes to become invalid/missing when
      saving (#2857, #2464).
    * Fixed a bug in the Select Object algorithm (#2478)
* Pen and eraser tools
    * Added Preferences settings to configure the radius, color, and border of
      the cursor highlight when `Highlight cursor position` is enabled (#1891,
      #1898).
    * Added a new "no cursor" cursor type and changed "Big pen" checkbox in
      Preferences into a combo box (#2111).
    * Renamed "fill transparency" to "fill opacity" to avoid confusion (#2590).
    * Added thick/thin settings to default tool preferences (#2611).
    * Added ability to change line styles of existing strokes (#2641).
    * Changed name of "Draw Circle" to "Draw Ellipse" (#2708).
    * Changed name of "Ruler" to "Draw Line" (#2959).
    * Improved circle drawing controls (#2707).
    * Improved the accuracy of the eraser tool (#1818).
    * Changed pen/highlighter cursor to be in the shape of a circle with the
      approximate stroke size (#1945, #1513).
    * Fixed a cursor update bug (#1954).
    * Fixed strange behavior of color switches when temporarily using the eraser
      (#2004, #1546, #1712).
* Text tool
    * Added support for text edit blinking to be enabled/disabled through
      standard GTK configuration settings (#2170).
    * Fixed several serious bugs and user experience issues with IME pre-edit
      strings (#2789, #2788, #2826, #2851).
    * Fixed a bug where the font button would not be updated when editing a text
      field (#2620).
    * Fixed a bug where text elements would not be displayed at the correct
      positions when an image is used as the page background (#2725).
    * Fixed a bug where text would be displayed with an incorrect size when DPI
      is set to a non-default value. A plugin for migrating documents with wrong
      font sizes has been added (#2724).
    * Fixed a bug where selected text would be highlighted incorrectly (#3131).
* Toolbars
    * Added a print button to the default toolbar (#1921).
    * Added a menu toggle item for showing/hiding the toolbar, bound to F9
      (#2112).
    * Added a vertical mode for the pagespinner tool (#2624).
    * Added color indicators to toolbars when customizing the toolbars (#2726).
    * Improved appearance of the floating toolbar (#2726).
    * Fixed a crash that occurs when the application is closed with the toolbar
      customization dialog open (#1189).
    * Fixed multiple bugs involving the toolbar customizer (#2860).
* Plugins
    * Extended plugin API with many new features and functions, including page
      and layer operations (#2406, #2950).
    * Added a Lua plugin for taking a screenshot and saving it to a file
      (#2086, #2787).
    * Added a Lua plugin for cycling though a color list (#1835, #2251).
    * Added Lua plugin support for MacOS (#2986)
    * Allow using the system Lua package path (#2968)
* Paper backgrounds
    * Added an isometric paper background type (#1994).
    * Changed background types to use lighter line colors when a dark background
      is set. The colors can be set in `pagetemplates.ini` (#2055, #2352).
    * Fixed the confusing behavior of the `Apply to current/all pages` buttons
      used to change the page backgrounds (#2730).
    * Fixed cloned background images not loading correctly (#3170).
* Packaging changes
    * AppImage: Fixed AppImages not running on more recent Linux distros
      (#2600).
    * Linux: Fixed an issue with dock icons not appearing correctly in some
      desktop environments (#2881, #1791).
    * Debian packages: added man pages (#2701)
    * The `lua-lgi` package has been added to the list of `Recommended`
      dependencies. It is useful for creating GUI in Lua plugins.
    * Streamlined and updated package metadata (#3094).
* Misc
    * Updated author information and About dialog appearance (#3209)
    * New action icons (#3154) and new application icon (#2557).
    * Changed the error dialog for missing PDF backgrounds to display the full
      path of the missing PDF (#3140).
    * Changed default key binding of middle mouse button from nothing to hand
      tool (#3121).
    * Changed the `Help > Help` menu item to point to the new website
      [www.xournalpp.github.io](www.xournalpp.github.io), which replaces the
      User Manual wiki.
    * Added a setting in the Preferences window for selecting the language
      (#2188). Simplified language translation file names (#3166, #3201).
    * Added a feature to allow the user to modify the locale directory via the
      TEXTDOMAINDIR environment variable (#2600, #2845).
    * Added support for more export options in command line and GUI (#2449)
    * Added a command line option to create a xopp file (#1919).
    * Added the `Journal > Rename Layer` menu entry to rename layers (#2321).
    * Added the `Journal > Append New PDF Pages` menu entry to append PDF pages
      that are not in the current annotation file (#2146)
    * Improved look of the Preferences window (#2592).
    * Improved Print Dialog verbosity and error handling (#3002)
    * Fixed a bug where the `Autoloading Journals` option would only autoload
      annotation files with `.pdf.xopp` or `.pdf.xoj` extensions. (#2911,
      #3217).
    * Fixed bugs in element cloning, which previously could have caused elements
      to become invalid (#2733, #2720, #2464).
    * Fixed a bug where the thumbnailer would not correctly render previews in
      file managers that sandbox their thumbnailers (#2738).
    * Fixed a bug where some error message dialogs would not display the message
      correctly (#3214).
    * Fixed keyboard shortcuts not working when the menubar is hidden (#2324)
    * Fixed the undo operation for moving objects across page borders (#3068)
    * Updated the translation files.
    * Non-visible refactoring and code cleanup (#1279, #2150, #1944, #2199,
      #2213, #2252, etc.)
    * MacOS: Fixed the startup crash on BigSur and removed the integration
      of Xournal++ into the Mac Menu Bar (#2836, #2976)
    * Windows: Fixed a crash that occurs when closing the application (#2218).

7 files changed, 191 insertions, 216 deletions

diff --git a/editors/xournalpp/Makefile b/editors/xournalpp/Makefile
index 5828b070d23..054fa3b0076 100644
--- a/editors/xournalpp/Makefile
+++ b/editors/xournalpp/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2021/06/10 11:06:21 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2021/07/22 12:10:46 yhardy Exp $
 
-DISTNAME=	xournalpp-1.0.20
-PKGREVISION=	7
+DISTNAME=	xournalpp-1.1.0
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GITHUB:=xournalpp/}
 GITHUB_PROJECT=	xournalpp
@@ -21,6 +20,7 @@ BUILD_TARGET=	translations xournalpp
 # C++11
 GCC_REQD+=	4.7
 
+BUILD_DEPENDS+=	help2man-[0-9]*:../../converters/help2man
 DEPENDS+=	tex-amsfonts-[0-9]*:../../fonts/tex-amsfonts
 DEPENDS+=	tex-amsmath-[0-9]*:../../print/tex-amsmath
 DEPENDS+=	tex-latex-[0-9]*:../../print/tex-latex
@@ -31,6 +31,7 @@ DEPENDS+=	tex-standalone-[0-9]*:../../print/tex-standalone
 .include "../../audio/libsndfile/buildlink3.mk"
 .include "../../audio/portaudio/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .include "../../lang/lua53/buildlink3.mk"
 .include "../../print/poppler-glib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/editors/xournalpp/PLIST b/editors/xournalpp/PLIST
index 15b4fd6e1a5..908d70b8830 100644
--- a/editors/xournalpp/PLIST
+++ b/editors/xournalpp/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2020/04/26 14:06:32 nia Exp $
-bin/xournal-thumbnailer
+@comment $NetBSD: PLIST,v 1.3 2021/07/22 12:10:46 yhardy Exp $
 bin/xournalpp
+bin/xournalpp-thumbnailer
 share/applications/com.github.xournalpp.xournalpp.desktop
 share/icons/hicolor/scalable/apps/com.github.xournalpp.xournalpp.svg
 share/icons/hicolor/scalable/mimetypes/application-x-xojpp.svg
@@ -8,120 +8,159 @@ share/icons/hicolor/scalable/mimetypes/application-x-xopp.svg
 share/icons/hicolor/scalable/mimetypes/application-x-xopt.svg
 share/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xopp.svg
 share/icons/hicolor/scalable/mimetypes/gnome-mime-application-x-xopt.svg
+share/locale/ar/LC_MESSAGES/xournalpp.mo
+share/locale/ca/LC_MESSAGES/xournalpp.mo
 share/locale/cs/LC_MESSAGES/xournalpp.mo
+share/locale/da/LC_MESSAGES/xournalpp.mo
 share/locale/de/LC_MESSAGES/xournalpp.mo
-share/locale/es_ES/LC_MESSAGES/xournalpp.mo
-share/locale/fi_FI/LC_MESSAGES/xournalpp.mo
-share/locale/fr_FR/LC_MESSAGES/xournalpp.mo
-share/locale/hr_HR/LC_MESSAGES/xournalpp.mo
+share/locale/el/LC_MESSAGES/xournalpp.mo
+share/locale/es/LC_MESSAGES/xournalpp.mo
+share/locale/eu/LC_MESSAGES/xournalpp.mo
+share/locale/fi/LC_MESSAGES/xournalpp.mo
+share/locale/fr/LC_MESSAGES/xournalpp.mo
+share/locale/gl/LC_MESSAGES/xournalpp.mo
+share/locale/he/LC_MESSAGES/xournalpp.mo
+share/locale/hi/LC_MESSAGES/xournalpp.mo
+share/locale/hu/LC_MESSAGES/xournalpp.mo
+share/locale/id/LC_MESSAGES/xournalpp.mo
 share/locale/it/LC_MESSAGES/xournalpp.mo
-share/locale/nl_NL/LC_MESSAGES/xournalpp.mo
+share/locale/ja/LC_MESSAGES/xournalpp.mo
+share/locale/ko/LC_MESSAGES/xournalpp.mo
+share/locale/nl/LC_MESSAGES/xournalpp.mo
+share/locale/no/LC_MESSAGES/xournalpp.mo
 share/locale/pl/LC_MESSAGES/xournalpp.mo
-share/locale/ru_RU/LC_MESSAGES/xournalpp.mo
-share/locale/tlh_AA/LC_MESSAGES/xournalpp.mo
+share/locale/pt_BR/LC_MESSAGES/xournalpp.mo
+share/locale/pt_PT/LC_MESSAGES/xournalpp.mo
+share/locale/ro/LC_MESSAGES/xournalpp.mo
+share/locale/ru/LC_MESSAGES/xournalpp.mo
+share/locale/sv/LC_MESSAGES/xournalpp.mo
+share/locale/th/LC_MESSAGES/xournalpp.mo
+share/locale/tr/LC_MESSAGES/xournalpp.mo
+share/locale/vi/LC_MESSAGES/xournalpp.mo
 share/locale/zh/LC_MESSAGES/xournalpp.mo
 share/locale/zh_HK/LC_MESSAGES/xournalpp.mo
 share/locale/zh_TW/LC_MESSAGES/xournalpp.mo
+share/man/man1/xournalpp-thumbnailer.1.gz
+share/man/man1/xournalpp.1.gz
 share/metainfo/com.github.xournalpp.xournalpp.appdata.xml
 share/mime/packages/com.github.xournalpp.xournalpp.xml
 share/mimelnk/application/x-xojpp.desktop
 share/mimelnk/application/x-xopp.desktop
 share/mimelnk/application/x-xopt.desktop
 share/thumbnailers/com.github.xournalpp.xournalpp.thumbnailer
+share/xournalpp/plugins/ColorCycle/main.lua
+share/xournalpp/plugins/ColorCycle/plugin.ini
 share/xournalpp/plugins/Example/main.lua
 share/xournalpp/plugins/Example/plugin.ini
 share/xournalpp/plugins/Example/var_dump.lua
+share/xournalpp/plugins/LayerActions/main.lua
+share/xournalpp/plugins/LayerActions/plugin.ini
+share/xournalpp/plugins/MigrateFontSizes/dialog.glade
+share/xournalpp/plugins/MigrateFontSizes/main.lua
+share/xournalpp/plugins/MigrateFontSizes/plugin.ini
+share/xournalpp/plugins/QuickScreenshot/main.lua
+share/xournalpp/plugins/QuickScreenshot/plugin.ini
 share/xournalpp/plugins/ToggleGrid/plugin.ini
 share/xournalpp/plugins/ToggleGrid/togglegrid.lua
+share/xournalpp/resources/default_template.tex
+share/xournalpp/resources/legacy_template.tex
+share/xournalpp/ui/README.md
 share/xournalpp/ui/about.glade
 share/xournalpp/ui/exportSettings.glade
-share/xournalpp/ui/fillTransparency.glade
+share/xournalpp/ui/fillOpacity.glade
 share/xournalpp/ui/goto.glade
-share/xournalpp/ui/icons/hicolor/24x24/actions/pageSpinner.png
-share/xournalpp/ui/icons/hicolor/icon-theme.cache
-share/xournalpp/ui/icons/hicolor/index.theme
-share/xournalpp/ui/icons/hicolor/scalable/actions/addPage.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/arrow-draw.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/audio-playback-pause.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/audio-playback-stop.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/audio-record.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/centerPage.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/circle-draw.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/coordinate-system-draw.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/customize_toolbars.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/default.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/delPage.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/fill.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/floating_toolbox.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/fullscreen.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/goto.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/grid_snapping.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/hand.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/lasso.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/layer.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/line-style-dash-dot.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/line-style-dash.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/line-style-dot.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/line-style-plain.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/manage_toolbars.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/nextAnnotatedPage.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/object-play.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/object-select.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/presentation-mode.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/rect-draw.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/rect-select.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/ruler.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/shape_recognizer.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/showpairedpages.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/sidebar-page-preview.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/sidebar_bookmarks.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/sidebar_index.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/snapping.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/stretch.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/thickness_fine.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/thickness_medium.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/thickness_thick.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/thickness_very_fine.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/thickness_very_thick.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/tool_camera.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/tool_eraser.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/tool_highlighter.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/tool_image.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/tool_math_tex.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/tool_pencil.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/tool_text.svg
-share/xournalpp/ui/icons/hicolor/scalable/actions/transparent.svg
-share/xournalpp/ui/icons/hicolor/update-icon-cache.sh
-share/xournalpp/ui/iconsDark/hicolor/icon-theme.cache
-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_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/iconsColor-dark/hicolor/24x24/actions/xopp-page-spinner.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/index.theme
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-audio-playback-pause.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-audio-playback-stop.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-audio-record.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-audio-seek-backwards.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-audio-seek-forwards.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-combo-drawing-type.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-combo-layer.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-combo-selection.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-default.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-document-new.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-document-open.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-document-save.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-draw-arrow.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-draw-coordinate-system.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-draw-ellipse.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-draw-line.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-draw-rect.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-draw-spline.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-edit-copy.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-edit-cut.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-edit-paste.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-edit-redo.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-edit-undo.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-fill.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-floating-toolbox.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-fullscreen.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-go-to.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-hand.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-line-style-dash-dot.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-line-style-dash.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-line-style-dot.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-line-style-plain.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-object-play.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-object-select.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-page-add.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-page-annotated-next.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-page-delete.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-presentation-mode.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-select-lasso.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-select-rect.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-shape-recognizer.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-show-paired-pages.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-sidebar-index.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-sidebar-layer.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-sidebar-layerstack.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-sidebar-page-preview.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-snapping-grid.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-snapping-rotation.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-spacer.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-thickness-fine.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-thickness-finer.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-thickness-medium.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-thickness-thick.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-thickness-thicker.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-tool-eraser.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-tool-highlighter.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-tool-image.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-tool-math-tex.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-tool-pencil.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-tool-text.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-toolbars-customize.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-toolbars-manage.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-transparent.svg
+share/xournalpp/ui/iconsColor-dark/hicolor/scalable/actions/xopp-zoom-slider.svg
+share/xournalpp/ui/iconsColor-light/hicolor/index.theme
+share/xournalpp/ui/iconsColor-light/hicolor/scalable/actions/xopp-combo-drawing-type.svg
+share/xournalpp/ui/iconsColor-light/hicolor/scalable/actions/xopp-combo-layer.svg
+share/xournalpp/ui/iconsColor-light/hicolor/scalable/actions/xopp-draw-arrow.svg
+share/xournalpp/ui/iconsColor-light/hicolor/scalable/actions/xopp-draw-coordinate-system.svg
+share/xournalpp/ui/iconsColor-light/hicolor/scalable/actions/xopp-draw-ellipse.svg
+share/xournalpp/ui/iconsColor-light/hicolor/scalable/actions/xopp-draw-line.svg
+share/xournalpp/ui/iconsColor-light/hicolor/scalable/actions/xopp-draw-rect.svg
+share/xournalpp/ui/iconsColor-light/hicolor/scalable/actions/xopp-draw-spline.svg
+share/xournalpp/ui/iconsColor-light/hicolor/scalable/actions/xopp-line-style-dash-dot.svg
+share/xournalpp/ui/iconsColor-light/hicolor/scalable/actions/xopp-line-style-dash.svg
+share/xournalpp/ui/iconsColor-light/hicolor/scalable/actions/xopp-line-style-dot.svg
+share/xournalpp/ui/iconsColor-light/hicolor/scalable/actions/xopp-line-style-plain.svg
+share/xournalpp/ui/iconsColor-light/hicolor/scalable/actions/xopp-presentation-mode.svg
+share/xournalpp/ui/iconsColor-light/hicolor/scalable/actions/xopp-sidebar-layer.svg
+share/xournalpp/ui/iconsColor-light/hicolor/scalable/actions/xopp-sidebar-layerstack.svg
+share/xournalpp/ui/iconsColor-light/hicolor/scalable/actions/xopp-snapping-rotation.svg
+share/xournalpp/ui/iconsColor-light/hicolor/scalable/actions/xopp-thickness-fine.svg
+share/xournalpp/ui/iconsColor-light/hicolor/scalable/actions/xopp-thickness-finer.svg
+share/xournalpp/ui/iconsColor-light/hicolor/scalable/actions/xopp-thickness-medium.svg
+share/xournalpp/ui/iconsColor-light/hicolor/scalable/actions/xopp-thickness-thick.svg
+share/xournalpp/ui/iconsColor-light/hicolor/scalable/actions/xopp-thickness-thicker.svg
+share/xournalpp/ui/iconsColor-light/hicolor/scalable/actions/xopp-tool-math-tex.svg
+share/xournalpp/ui/iconsColor-light/hicolor/scalable/actions/xopp-tool-text.svg
 share/xournalpp/ui/images.glade
+share/xournalpp/ui/latexSettings.glade
 share/xournalpp/ui/main.glade
 share/xournalpp/ui/pageTemplate.glade
 share/xournalpp/ui/pagesize.glade
@@ -132,15 +171,16 @@ share/xournalpp/ui/pixmaps/application-x-xopp.svg
 share/xournalpp/ui/pixmaps/application-x-xopt.svg
 share/xournalpp/ui/pixmaps/com.github.xournalpp.xournalpp.png
 share/xournalpp/ui/pixmaps/com.github.xournalpp.xournalpp.svg
-share/xournalpp/ui/pixmaps/default.svg
 share/xournalpp/ui/pixmaps/gnome-mime-application-x-xopp.svg
 share/xournalpp/ui/pixmaps/gnome-mime-application-x-xopt.svg
 share/xournalpp/ui/pixmaps/xopt.svg
 share/xournalpp/ui/plugin.glade
 share/xournalpp/ui/pluginEntry.glade
+share/xournalpp/ui/renameLayerDialog.glade
 share/xournalpp/ui/settings.glade
 share/xournalpp/ui/settingsButtonConfig.glade
 share/xournalpp/ui/settingsDeviceClassConfig.glade
+share/xournalpp/ui/settingsLanguageConfig.glade
 share/xournalpp/ui/texdialog.glade
 share/xournalpp/ui/toolbar.ini
 share/xournalpp/ui/toolbarCustomizeDialog.glade
diff --git a/editors/xournalpp/distinfo b/editors/xournalpp/distinfo
index ade0dce00fc..cff466a9f0d 100644
--- a/editors/xournalpp/distinfo
+++ b/editors/xournalpp/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2021/01/13 21:59:59 mef Exp $
+$NetBSD: distinfo,v 1.7 2021/07/22 12:10:46 yhardy Exp $
 
-SHA1 (xournalpp-1.0.20.tar.gz) = cc05e95fd15af717ee7b30449c40b242955efdf8
-RMD160 (xournalpp-1.0.20.tar.gz) = 035c5734c92a88c42430a7a4eec0a03e23f7f4c0
-SHA512 (xournalpp-1.0.20.tar.gz) = c73783d5e40262b2c6f7f6be372839c73a19ab25fc258a7524660654526a3a35a6ba16ba282f793e7982ff97d006703c103fdd579fc16a3e636bf6daf94fe346
-Size (xournalpp-1.0.20.tar.gz) = 14895705 bytes
-SHA1 (patch-CMakeLists.txt) = 3ead1546fe20e7481e93f2976c3e7b98c0a7699f
+SHA1 (xournalpp-1.1.0.tar.gz) = 339bf9d0548148f1d8c0f9d1ed91f7615a8805c4
+RMD160 (xournalpp-1.1.0.tar.gz) = b007b5ed880e17acad87db6c75c8c24c397ff5df
+SHA512 (xournalpp-1.1.0.tar.gz) = 823d2561caa45bd7deb994bd71df0df35b6f279e04c4e8bb5d3f05f2fff2a68af8ea572f42095a9f28da5b2fdbe6b9b465aeca758d36ab29a24c62ea68c99c56
+Size (xournalpp-1.1.0.tar.gz) = 15037204 bytes
+SHA1 (patch-CMakeLists.txt) = 18c8d997593a72b34fa13517a9a3b337cbfd4824
 SHA1 (patch-po_CMakeLists.txt) = 897b4f9507b48be394409deda8170fe7d39f008c
-SHA1 (patch-src_control_tools_StrokeHandler.cpp) = 9e8d3d3f173ef1e84137a728646e807228184872
-SHA1 (patch-src_util_DeviceListHelper.cpp) = 8f3534c80c79ec49dd9562c3ed4e3ff7c36b2ecb
+SHA1 (patch-src_control_settings_Settings.cpp) = d981d5254488f4cfd138cf5413f7ac485b8322fe
+SHA1 (patch-src_util_DeviceListHelper.cpp) = 19e57e0c95d8b885da5d4b9087ef804fb2c6ab57
diff --git a/editors/xournalpp/patches/patch-CMakeLists.txt b/editors/xournalpp/patches/patch-CMakeLists.txt
index 62a661b83aa..69773b5eccf 100644
--- a/editors/xournalpp/patches/patch-CMakeLists.txt
+++ b/editors/xournalpp/patches/patch-CMakeLists.txt
@@ -1,30 +1,21 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2019/11/10 21:42:15 nia Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2021/07/22 12:10:46 yhardy Exp $
 
 Find pkgsrc lua with pkg-config.
 
 Unconditionally install desktop files and make dependencies explicit.
 
---- CMakeLists.txt.orig	2019-10-15 17:47:34.000000000 +0000
+--- CMakeLists.txt.orig	2021-07-18 21:18:39.000000000 +0000
 +++ CMakeLists.txt
-@@ -50,7 +50,7 @@ else ()
- endif ()
+@@ -15,7 +15,7 @@ set (PROJECT_STRING "${PROJECT_NAME} ${P
+ set (PROJECT_URL "https://github.com/xournalpp/xournalpp")
  
- ## For touch workaround, may need to be disabled for a Wayland Build
--if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-+if (TRUE)
-     set (xournalpp_LDFLAGS ${xournalpp_LDFLAGS} "-lX11 -lXi")
- endif ()
- 
-@@ -130,7 +130,7 @@ if (MacIntegration_FOUND)
- endif ()
- 
- # Plugins / scripting
--pkg_check_modules (Lua "lua5.3")
-+pkg_check_modules (Lua "lua-5.3")
- if (NOT Lua_FOUND)
- 	pkg_check_modules (Lua "lua >= 5.3")
- endif()
-@@ -238,7 +238,7 @@ install (DIRECTORY plugins
+ ## CMAKE_Variables
+-set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/find" "${PROJECT_SOURCE_DIR}/cmake/include")
++set (CMAKE_MODULE_PATH "/tmp/pkgsrc/editors/xournalpp/work/.buildlink/cmake-Modules" "${PROJECT_SOURCE_DIR}/cmake/find" "${PROJECT_SOURCE_DIR}/cmake/include")
+ set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ set(CMAKE_CXX_EXTENSIONS OFF)
+@@ -273,7 +273,7 @@ install (DIRECTORY resources
  )
  
  # Install desktop shortcuts for Linux
diff --git a/editors/xournalpp/patches/patch-src_control_settings_Settings.cpp b/editors/xournalpp/patches/patch-src_control_settings_Settings.cpp
new file mode 100644
index 00000000000..b36090f4d7e
--- /dev/null
+++ b/editors/xournalpp/patches/patch-src_control_settings_Settings.cpp
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_control_settings_Settings.cpp,v 1.1 2021/07/22 12:10:46 yhardy 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. Make the stroke stabilizer
+default to "on" in this case.
+
+--- src/control/settings/Settings.cpp.orig	2021-07-18 21:18:39.000000000 +0000
++++ src/control/settings/Settings.cpp
+@@ -183,8 +183,13 @@ void Settings::loadDefault() {
+     /**
+      * Stabilizer related settings
+      */
++#if defined(__NetBSD__) || defined(__OpenBSD__)
++    this->stabilizerAveragingMethod = StrokeStabilizer::AveragingMethod::VELOCITY_GAUSSIAN;
++    this->stabilizerPreprocessor = StrokeStabilizer::Preprocessor::NONE;
++#else
+     this->stabilizerAveragingMethod = StrokeStabilizer::AveragingMethod::NONE;
+     this->stabilizerPreprocessor = StrokeStabilizer::Preprocessor::NONE;
++#endif
+     this->stabilizerBuffersize = 20;
+     this->stabilizerSigma = 0.5;
+     this->stabilizerDeadzoneRadius = 1.3;
diff --git a/editors/xournalpp/patches/patch-src_control_tools_StrokeHandler.cpp b/editors/xournalpp/patches/patch-src_control_tools_StrokeHandler.cpp
deleted file mode 100644
index 1afbc3a908a..00000000000
--- a/editors/xournalpp/patches/patch-src_control_tools_StrokeHandler.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-$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	2020-04-15 19:03:39.000000000 +0000
-+++ src/control/tools/StrokeHandler.cpp
-@@ -115,9 +115,36 @@ bool StrokeHandler::onMotionNotifyEvent(
- 	}
- 	else
- 	{
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
-+		if (pointCount > 1)
-+#else
- 		if (pointCount > 0)
-+#endif
- 		{
- 			Point prevPoint(stroke->getPoint(pointCount - 1));
-+#if defined(__NetBSD__) || defined(__OpenBSD__)
-+			double length, prevLength, t, x, y;
-+			Point pprevPoint(stroke->getPoint(pointCount - 2));
-+
-+			// treat this point as an end point
-+			// treat the previous point as a control point and recalculate the "actual" point
-+			prevLength = prevPoint.lineLengthTo(pprevPoint);
-+			length = prevLength + currentPoint.lineLengthTo(prevPoint);
-+			if (length != 0)
-+			{
-+				t = prevLength/length;
-+				// Bezier curve fitting
-+				x = (1-t)*(1-t)*pprevPoint.x + 2*t*(1-t)*prevPoint.x + t*t*currentPoint.x;
-+				y = (1-t)*(1-t)*pprevPoint.y + 2*t*(1-t)*prevPoint.y + t*t*currentPoint.y;
-+				
-+				prevPoint = Point(x,y,prevPoint.z);
-+				stroke->deletePointsFrom(pointCount-1);
-+				stroke->addPoint(prevPoint);
-+				stroke->addPoint(currentPoint);
-+				currentPoint = prevPoint;
-+				prevPoint = pprevPoint;
-+			}
-+#endif
- 
- 			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
diff --git a/editors/xournalpp/patches/patch-src_util_DeviceListHelper.cpp b/editors/xournalpp/patches/patch-src_util_DeviceListHelper.cpp
index 52291b80581..73617765593 100644
--- a/editors/xournalpp/patches/patch-src_util_DeviceListHelper.cpp
+++ b/editors/xournalpp/patches/patch-src_util_DeviceListHelper.cpp
@@ -1,17 +1,16 @@
-$NetBSD: patch-src_util_DeviceListHelper.cpp,v 1.1 2019/11/02 14:44:15 nia Exp $
+$NetBSD: patch-src_util_DeviceListHelper.cpp,v 1.2 2021/07/22 12:10:46 yhardy Exp $
 
 This check seems to skip devices that are reasonable to include (on NetBSD), so rather
 list all devices and let the user manage them.
 
---- src/util/DeviceListHelper.cpp.orig	2019-08-13 08:34:36.000000000 +0000
+--- src/util/DeviceListHelper.cpp.orig	2021-07-18 21:18:39.000000000 +0000
 +++ src/util/DeviceListHelper.cpp
-@@ -31,7 +31,8 @@ void addDevicesToList(std::vector<InputD
- 			devList = devList->next;
- 			continue;
- 		}
--		if (gdk_device_get_vendor_id(dev) == nullptr && gdk_device_get_product_id(dev) == nullptr)
-+		// if (gdk_device_get_vendor_id(dev) == nullptr && gdk_device_get_product_id(dev) == nullptr)
-+		if (gdk_device_get_device_type(dev) == GDK_DEVICE_TYPE_MASTER)
- 		{
- 			// Skip core pointer
- 			devList = devList->next;
+@@ -26,7 +26,7 @@ void addDevicesToList(std::vector<InputD
+             devList = devList->next;
+             continue;
+         }
+-        if (gdk_device_get_vendor_id(dev) == nullptr && gdk_device_get_product_id(dev) == nullptr) {
++        if (gdk_device_get_device_type(dev) == GDK_DEVICE_TYPE_MASTER) {
+             // Skip core pointer
+             devList = devList->next;
+             continue;