diff --git a/graphics/xournalpp/Makefile b/graphics/xournalpp/Makefile index a44662c984b2..83f991f7d166 100644 --- a/graphics/xournalpp/Makefile +++ b/graphics/xournalpp/Makefile @@ -1,6 +1,6 @@ PORTNAME= xournalpp DISTVERSIONPREFIX= v -DISTVERSION= 1.2.3 +DISTVERSION= 1.2.3-20240830 CATEGORIES= graphics MAINTAINER= yuri@FreeBSD.org @@ -20,6 +20,7 @@ LIB_DEPENDS= libgtksourceview-4.so:x11-toolkits/gtksourceview4 \ USES= cmake compiler:c++11-lang gettext-tools gnome lua pkgconfig tex xorg desktop-file-utils shared-mime-info USE_GITHUB= yes +GH_TAGNAME= d435ef5 USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 librsvg2 libxml2 pango USE_XORG= x11 xext xi USE_TEX= latex:build diff --git a/graphics/xournalpp/distinfo b/graphics/xournalpp/distinfo index 02db3134ab40..2c4f54090d20 100644 --- a/graphics/xournalpp/distinfo +++ b/graphics/xournalpp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1709573336 -SHA256 (xournalpp-xournalpp-v1.2.3_GH0.tar.gz) = 8817abd1794760c2a3be3a35e56a5588a51e517bc591384fa321994d50e14e7c -SIZE (xournalpp-xournalpp-v1.2.3_GH0.tar.gz) = 16708613 +TIMESTAMP = 1725058302 +SHA256 (xournalpp-xournalpp-v1.2.3-20240830-d435ef5_GH0.tar.gz) = e906155ee1f46483fcfa4b7a6295c2659017794d0233a7f540b5540f6d00b321 +SIZE (xournalpp-xournalpp-v1.2.3-20240830-d435ef5_GH0.tar.gz) = 16927629 diff --git a/graphics/xournalpp/files/patch-CMakeLists.txt b/graphics/xournalpp/files/patch-CMakeLists.txt deleted file mode 100644 index 1adee6476114..000000000000 --- a/graphics/xournalpp/files/patch-CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ ---- CMakeLists.txt.orig 2023-10-14 09:09:56 UTC -+++ CMakeLists.txt -@@ -138,6 +138,10 @@ endif () - endif () - endif () - -+if (UNIX AND NOT APPLE AND NOT CYGWIN) -+ set(INSTALL_DESKTOP_FILES true) -+endif() -+ - find_package(ZLIB REQUIRED) - find_package(Threads REQUIRED) - -@@ -329,7 +333,7 @@ install(DIRECTORY resources - ) - - # Install desktop shortcuts for Linux --if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") -+if (${INSTALL_DESKTOP_FILES}) - message("Installing desktop files") - - # Install icons diff --git a/graphics/xournalpp/pkg-plist b/graphics/xournalpp/pkg-plist index 29b96a6bca24..376deefb1840 100644 --- a/graphics/xournalpp/pkg-plist +++ b/graphics/xournalpp/pkg-plist @@ -28,6 +28,7 @@ share/locale/id/LC_MESSAGES/xournalpp.mo share/locale/it/LC_MESSAGES/xournalpp.mo share/locale/ja/LC_MESSAGES/xournalpp.mo share/locale/ko/LC_MESSAGES/xournalpp.mo +share/locale/ml_IN/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 @@ -36,6 +37,7 @@ share/locale/pt_PT/LC_MESSAGES/xournalpp.mo share/locale/ro/LC_MESSAGES/xournalpp.mo share/locale/ru/LC_MESSAGES/xournalpp.mo share/locale/si_LK/LC_MESSAGES/xournalpp.mo +share/locale/sl_SI/LC_MESSAGES/xournalpp.mo share/locale/sv/LC_MESSAGES/xournalpp.mo share/locale/ta_IN/LC_MESSAGES/xournalpp.mo share/locale/th/LC_MESSAGES/xournalpp.mo @@ -50,6 +52,8 @@ share/man/man1/xournalpp.1.gz share/metainfo/com.github.xournalpp.xournalpp.appdata.xml share/mime/packages/com.github.xournalpp.xournalpp.xml share/thumbnailers/com.github.xournalpp.xournalpp.thumbnailer +%%DATADIR%%/palettes/xournal.gpl +%%DATADIR%%/palettes/xournalpp.gpl %%DATADIR%%/plugins/ColorCycle/main.lua %%DATADIR%%/plugins/ColorCycle/plugin.ini %%DATADIR%%/plugins/Example/main.lua @@ -57,8 +61,12 @@ share/thumbnailers/com.github.xournalpp.xournalpp.thumbnailer %%DATADIR%%/plugins/Example/var_dump.lua %%DATADIR%%/plugins/Export/main.lua %%DATADIR%%/plugins/Export/plugin.ini +%%DATADIR%%/plugins/FitToContent/main.lua +%%DATADIR%%/plugins/FitToContent/plugin.ini %%DATADIR%%/plugins/HighlightPosition/main.lua %%DATADIR%%/plugins/HighlightPosition/plugin.ini +%%DATADIR%%/plugins/ImageActions/main.lua +%%DATADIR%%/plugins/ImageActions/plugin.ini %%DATADIR%%/plugins/LayerActions/main.lua %%DATADIR%%/plugins/LayerActions/plugin.ini %%DATADIR%%/plugins/MigrateFontSizes/dialog.glade @@ -68,12 +76,13 @@ share/thumbnailers/com.github.xournalpp.xournalpp.thumbnailer %%DATADIR%%/plugins/QuickScreenshot/plugin.ini %%DATADIR%%/plugins/ToggleGrid/plugin.ini %%DATADIR%%/plugins/ToggleGrid/togglegrid.lua +%%DATADIR%%/plugins/luapi_application.def.lua %%DATADIR%%/resources/default_template.tex %%DATADIR%%/resources/legacy_template.tex %%DATADIR%%/ui/README.md %%DATADIR%%/ui/about.glade +%%DATADIR%%/ui/backgroundSelection.glade %%DATADIR%%/ui/exportSettings.glade -%%DATADIR%%/ui/fillOpacity.glade %%DATADIR%%/ui/goto.glade %%DATADIR%%/ui/iconsColor-dark/hicolor/24x24/actions/xopp-page-spinner.svg %%DATADIR%%/ui/iconsColor-dark/hicolor/index.theme @@ -104,21 +113,25 @@ share/thumbnailers/com.github.xournalpp.xournalpp.thumbnailer %%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-edit-paste.svg %%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-edit-redo.svg %%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-edit-undo.svg +%%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-fill-opacity.svg %%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-fill.svg %%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-floating-toolbox.svg %%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-fullscreen.svg %%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-go-to.svg %%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-hand.svg +%%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-line-style-dash-dot-with-pen.svg %%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-line-style-dash-dot.svg +%%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-line-style-dash-with-pen.svg %%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-line-style-dash.svg +%%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-line-style-dot-with-pen.svg %%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-line-style-dot.svg +%%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-line-style-plain-with-pen.svg %%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-line-style-plain.svg %%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-object-play.svg %%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-object-select.svg %%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-page-add.svg %%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-page-annotated-next.svg %%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-page-delete.svg -%%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-pen-fill-opacity.svg %%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-presentation-mode.svg %%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-select-lasso.svg %%DATADIR%%/ui/iconsColor-dark/hicolor/scalable/actions/xopp-select-multilayer-lasso.svg @@ -159,9 +172,13 @@ share/thumbnailers/com.github.xournalpp.xournalpp.thumbnailer %%DATADIR%%/ui/iconsColor-light/hicolor/scalable/actions/xopp-draw-line.svg %%DATADIR%%/ui/iconsColor-light/hicolor/scalable/actions/xopp-draw-rect.svg %%DATADIR%%/ui/iconsColor-light/hicolor/scalable/actions/xopp-draw-spline.svg +%%DATADIR%%/ui/iconsColor-light/hicolor/scalable/actions/xopp-line-style-dash-dot-with-pen.svg %%DATADIR%%/ui/iconsColor-light/hicolor/scalable/actions/xopp-line-style-dash-dot.svg +%%DATADIR%%/ui/iconsColor-light/hicolor/scalable/actions/xopp-line-style-dash-with-pen.svg %%DATADIR%%/ui/iconsColor-light/hicolor/scalable/actions/xopp-line-style-dash.svg +%%DATADIR%%/ui/iconsColor-light/hicolor/scalable/actions/xopp-line-style-dot-with-pen.svg %%DATADIR%%/ui/iconsColor-light/hicolor/scalable/actions/xopp-line-style-dot.svg +%%DATADIR%%/ui/iconsColor-light/hicolor/scalable/actions/xopp-line-style-plain-with-pen.svg %%DATADIR%%/ui/iconsColor-light/hicolor/scalable/actions/xopp-line-style-plain.svg %%DATADIR%%/ui/iconsColor-light/hicolor/scalable/actions/xopp-presentation-mode.svg %%DATADIR%%/ui/iconsColor-light/hicolor/scalable/actions/xopp-select-pdf-text-area.svg @@ -204,21 +221,25 @@ share/thumbnailers/com.github.xournalpp.xournalpp.thumbnailer %%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-edit-paste.svg %%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-edit-redo.svg %%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-edit-undo.svg +%%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-fill-opacity.svg %%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-fill.svg %%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-floating-toolbox.svg %%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-fullscreen.svg %%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-go-to.svg %%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-hand.svg +%%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-line-style-dash-dot-with-pen.svg %%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-line-style-dash-dot.svg +%%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-line-style-dash-with-pen.svg %%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-line-style-dash.svg +%%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-line-style-dot-with-pen.svg %%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-line-style-dot.svg +%%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-line-style-plain-with-pen.svg %%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-line-style-plain.svg %%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-object-play.svg %%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-object-select.svg %%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-page-add.svg %%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-page-annotated-next.svg %%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-page-delete.svg -%%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-pen-fill-opacity.svg %%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-presentation-mode.svg %%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-select-lasso.svg %%DATADIR%%/ui/iconsLucide-dark/hicolor/scalable/actions/xopp-select-pdf-text-area.svg @@ -276,21 +297,25 @@ share/thumbnailers/com.github.xournalpp.xournalpp.thumbnailer %%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-edit-paste.svg %%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-edit-redo.svg %%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-edit-undo.svg +%%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-fill-opacity.svg %%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-fill.svg %%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-floating-toolbox.svg %%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-fullscreen.svg %%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-go-to.svg %%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-hand.svg +%%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-line-style-dash-dot-with-pen.svg %%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-line-style-dash-dot.svg +%%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-line-style-dash-with-pen.svg %%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-line-style-dash.svg +%%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-line-style-dot-with-pen.svg %%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-line-style-dot.svg +%%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-line-style-plain-with-pen.svg %%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-line-style-plain.svg %%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-object-play.svg %%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-object-select.svg %%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-page-add.svg %%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-page-annotated-next.svg %%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-page-delete.svg -%%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-pen-fill-opacity.svg %%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-presentation-mode.svg %%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-select-lasso.svg %%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-select-pdf-text-area.svg @@ -321,13 +346,13 @@ share/thumbnailers/com.github.xournalpp.xournalpp.thumbnailer %%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-toolbars-manage.svg %%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-transparent.svg %%DATADIR%%/ui/iconsLucide-light/hicolor/scalable/actions/xopp-zoom-slider.svg -%%DATADIR%%/ui/images.glade %%DATADIR%%/ui/latexSettings.glade %%DATADIR%%/ui/main.glade +%%DATADIR%%/ui/mainmenubar.xml +%%DATADIR%%/ui/pageFormat.glade %%DATADIR%%/ui/pageTemplate.glade -%%DATADIR%%/ui/pagesize.glade %%DATADIR%%/ui/pagetemplates.ini -%%DATADIR%%/ui/pdfpages.glade +%%DATADIR%%/ui/paletteSettings.glade %%DATADIR%%/ui/pixmaps/application-x-xojpp.svg %%DATADIR%%/ui/pixmaps/application-x-xopp.svg %%DATADIR%%/ui/pixmaps/application-x-xopt.svg @@ -339,10 +364,12 @@ share/thumbnailers/com.github.xournalpp.xournalpp.thumbnailer %%DATADIR%%/ui/plugin.glade %%DATADIR%%/ui/pluginEntry.glade %%DATADIR%%/ui/renameLayerDialog.glade +%%DATADIR%%/ui/selectOpacity.glade %%DATADIR%%/ui/settings.glade %%DATADIR%%/ui/settingsButtonConfig.glade %%DATADIR%%/ui/settingsDeviceClassConfig.glade %%DATADIR%%/ui/settingsLanguageConfig.glade +%%DATADIR%%/ui/sidebar.ui %%DATADIR%%/ui/texdialog.glade %%DATADIR%%/ui/toolbar.ini %%DATADIR%%/ui/toolbarCustomizeDialog.glade