From 38724585a1452569e861d07a0ab67e5ceea44b58 Mon Sep 17 00:00:00 2001 From: Yorick Hardy Date: Fri, 9 Aug 2019 23:00:46 +0200 Subject: [PATCH] xournalpp: import xournalpp-1.0.12 as wip/xournalpp Xournal++ is a handwriting notetaking software with PDF annotation support. Written in C++ with GTK3, supporting Linux (e.g. Ubuntu, Debian, Arch, Suse), macOS and Windows 10. Supports pen input from devices such as Wacom Tablets. xournalpp requires the portaudio c++ bindings, one way to achieve this is to modify the portaudio package to include the bindings (see PATCH_PORTAUDIO). --- Makefile | 1 + xournalpp/DESCR | 4 ++ xournalpp/Makefile | 31 +++++++++++ xournalpp/PATCH_PORTAUDIO | 70 ++++++++++++++++++++++++ xournalpp/PLIST | 110 ++++++++++++++++++++++++++++++++++++++ xournalpp/distinfo | 6 +++ 6 files changed, 222 insertions(+) create mode 100644 xournalpp/DESCR create mode 100644 xournalpp/Makefile create mode 100644 xournalpp/PATCH_PORTAUDIO create mode 100644 xournalpp/PLIST create mode 100644 xournalpp/distinfo diff --git a/Makefile b/Makefile index f882822a01..90ad1ae973 100644 --- a/Makefile +++ b/Makefile @@ -5064,6 +5064,7 @@ SUBDIR+= xoreos SUBDIR+= xoreos-tools SUBDIR+= xorgxrdp SUBDIR+= xosview +SUBDIR+= xournalpp SUBDIR+= xpde SUBDIR+= xpdq SUBDIR+= xpi-quick_locale_switcher diff --git a/xournalpp/DESCR b/xournalpp/DESCR new file mode 100644 index 0000000000..b99f7b7ec3 --- /dev/null +++ b/xournalpp/DESCR @@ -0,0 +1,4 @@ +Xournal++ is a handwriting notetaking software with PDF annotation +support. Written in C++ with GTK3, supporting Linux (e.g. Ubuntu, +Debian, Arch, Suse), macOS and Windows 10. Supports pen input from +devices such as Wacom Tablets. diff --git a/xournalpp/Makefile b/xournalpp/Makefile new file mode 100644 index 0000000000..664c343362 --- /dev/null +++ b/xournalpp/Makefile @@ -0,0 +1,31 @@ +# $NetBSD$ + +GITHUB_PROJECT= xournalpp +DISTNAME= 1.0.12 +PKGNAME= ${GITHUB_PROJECT}-${DISTNAME} +CATEGORIES= editors +MASTER_SITES= ${MASTER_SITE_GITHUB:=xournalpp/} +DIST_SUBDIR= ${GITHUB_PROJECT} + +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= https://github.com/xournalpp/xournalpp/ +COMMENT= Handwriting notetaking software with PDF annotation support +LICENSE= gnu-gpl-v2 + +WRKSRC= ${WRKDIR}/xournalpp-1.0.12 +USE_CMAKE= yes +USE_LANGUAGES= c c++ + +DEPENDS+= tex-amsfonts-[0-9]*:../../fonts/tex-amsfonts +DEPENDS+= tex-amsmath-[0-9]*:../../print/tex-amsmath +DEPENDS+= tex-latex-[0-9]*:../../print/tex-latex +DEPENDS+= tex-latex-bin-[0-9]*:../../print/tex-latex-bin +DEPENDS+= tex-standalone-[0-9]*:../../print/tex-standalone + +.include "../../archivers/libzip/buildlink3.mk" +.include "../../audio/libsndfile/buildlink3.mk" +.include "../../audio/portaudio-devel/buildlink3.mk" +.include "../../print/poppler-glib/buildlink3.mk" +.include "../../textproc/libxml2/buildlink3.mk" +.include "../../x11/gtk3/buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/xournalpp/PATCH_PORTAUDIO b/xournalpp/PATCH_PORTAUDIO new file mode 100644 index 0000000000..cc105fcbac --- /dev/null +++ b/xournalpp/PATCH_PORTAUDIO @@ -0,0 +1,70 @@ +cvs diff: Diffing audio/portaudio-devel +Index: audio/portaudio-devel/Makefile +=================================================================== +RCS file: /cvsroot/pkgsrc/audio/portaudio-devel/Makefile,v +retrieving revision 1.13 +diff -u -r1.13 Makefile +--- audio/portaudio-devel/Makefile 27 Apr 2017 07:14:01 -0000 1.13 ++++ audio/portaudio-devel/Makefile 9 Aug 2019 16:45:07 -0000 +@@ -14,6 +14,7 @@ + + NOT_FOR_PLATFORM= Interix-*-* + ++USE_LANGUAGES+= c c++ + USE_TOOLS+= gmake pkg-config + USE_LIBTOOL= yes + GNU_CONFIGURE= yes +@@ -21,8 +22,10 @@ + CONFIGURE_ARGS+= --includedir=${PREFIX}/include/portaudio2 + CONFIGURE_ARGS+= --without-alsa + CONFIGURE_ARGS+= --disable-mac-universal ++CONFIGURE_ARGS+= --enable-cxx + LDFLAGS+= ${LIBOSSAUDIO} + PKGCONFIG_OVERRIDE= portaudio-2.0.pc.in ++PKGCONFIG_OVERRIDE+= bindings/cpp/portaudiocpp.pc.in + WRKSRC= ${WRKDIR}/portaudio + + INSTALLATION_DIRS= include/portaudio2 lib/portaudio2 lib/pkgconfig +@@ -37,7 +40,7 @@ + SUBST_CLASSES+= pc + SUBST_STAGE.pc= pre-configure + SUBST_MESSAGE.pc= Fixing pkgconfig directory +-SUBST_FILES.pc= Makefile.in ++SUBST_FILES.pc= Makefile.in bindings/cpp/Makefile.in + SUBST_SED.pc= -e 's/$$(libdir)\/pkgconfig/$$(prefix)\/lib\/pkgconfig/g' + + CFLAGS.Darwin+= -Wno-deprecated-declarations +Index: audio/portaudio-devel/PLIST +=================================================================== +RCS file: /cvsroot/pkgsrc/audio/portaudio-devel/PLIST,v +retrieving revision 1.3 +diff -u -r1.3 PLIST +--- audio/portaudio-devel/PLIST 14 Jun 2009 17:32:20 -0000 1.3 ++++ audio/portaudio-devel/PLIST 9 Aug 2019 16:45:07 -0000 +@@ -1,4 +1,25 @@ + @comment $NetBSD: PLIST,v 1.3 2009/06/14 17:32:20 joerg Exp $ + include/portaudio2/portaudio.h ++include/portaudio2/portaudiocpp/AutoSystem.hxx ++include/portaudio2/portaudiocpp/BlockingStream.hxx ++include/portaudio2/portaudiocpp/CFunCallbackStream.hxx ++include/portaudio2/portaudiocpp/CallbackInterface.hxx ++include/portaudio2/portaudiocpp/CallbackStream.hxx ++include/portaudio2/portaudiocpp/CppFunCallbackStream.hxx ++include/portaudio2/portaudiocpp/Device.hxx ++include/portaudio2/portaudiocpp/DirectionSpecificStreamParameters.hxx ++include/portaudio2/portaudiocpp/Exception.hxx ++include/portaudio2/portaudiocpp/HostApi.hxx ++include/portaudio2/portaudiocpp/InterfaceCallbackStream.hxx ++include/portaudio2/portaudiocpp/MemFunCallbackStream.hxx ++include/portaudio2/portaudiocpp/PortAudioCpp.hxx ++include/portaudio2/portaudiocpp/SampleDataFormat.hxx ++include/portaudio2/portaudiocpp/Stream.hxx ++include/portaudio2/portaudiocpp/StreamParameters.hxx ++include/portaudio2/portaudiocpp/System.hxx ++include/portaudio2/portaudiocpp/SystemDeviceIterator.hxx ++include/portaudio2/portaudiocpp/SystemHostApiIterator.hxx + lib/pkgconfig/portaudio-2.0.pc ++lib/pkgconfig/portaudiocpp.pc + lib/portaudio2/libportaudio.la ++lib/portaudio2/libportaudiocpp.la +cvs diff: Diffing audio/portaudio-devel/patches diff --git a/xournalpp/PLIST b/xournalpp/PLIST new file mode 100644 index 0000000000..02c48d01b8 --- /dev/null +++ b/xournalpp/PLIST @@ -0,0 +1,110 @@ +@comment $NetBSD$ +bin/xournal-thumbnailer +bin/xournalpp +share/locale/cs/LC_MESSAGES/xournalpp.mo +share/locale/de/LC_MESSAGES/xournalpp.mo +share/locale/it/LC_MESSAGES/xournalpp.mo +share/locale/pl/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/xournalpp/plugins/Example/main.lua +share/xournalpp/plugins/Example/plugin.ini +share/xournalpp/plugins/Example/var_dump.lua +share/xournalpp/plugins/ToggleGrid/plugin.ini +share/xournalpp/plugins/ToggleGrid/togglegrid.lua +share/xournalpp/ui/about.glade +share/xournalpp/ui/exportSettings.glade +share/xournalpp/ui/fillTransparency.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/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/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/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_medium.svg +share/xournalpp/ui/icons/hicolor/scalable/actions/thickness_thick.svg +share/xournalpp/ui/icons/hicolor/scalable/actions/thickness_thin.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/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/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_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/tool_text.svg +share/xournalpp/ui/iconsDark/hicolor/update-icon-cache.sh +share/xournalpp/ui/images.glade +share/xournalpp/ui/main.glade +share/xournalpp/ui/pageTemplate.glade +share/xournalpp/ui/pagesize.glade +share/xournalpp/ui/pagetemplates.ini +share/xournalpp/ui/pdfpages.glade +share/xournalpp/ui/pixmaps/application-x-xojpp.svg +share/xournalpp/ui/pixmaps/application-x-xopp.svg +share/xournalpp/ui/pixmaps/application-x-xopt.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/pixmaps/xournalpp.png +share/xournalpp/ui/pixmaps/xournalpp.svg +share/xournalpp/ui/plugin.glade +share/xournalpp/ui/pluginEntry.glade +share/xournalpp/ui/settings.glade +share/xournalpp/ui/settingsButtonConfig.glade +share/xournalpp/ui/texdialog.glade +share/xournalpp/ui/toolbar.ini +share/xournalpp/ui/toolbarCustomizeDialog.glade +share/xournalpp/ui/toolbarManageDialog.glade diff --git a/xournalpp/distinfo b/xournalpp/distinfo new file mode 100644 index 0000000000..77f51da57a --- /dev/null +++ b/xournalpp/distinfo @@ -0,0 +1,6 @@ +$NetBSD$ + +SHA1 (xournalpp/1.0.12.tar.gz) = 9df25b6a9d8403d0667a17b9145c7a6c325bf2da +RMD160 (xournalpp/1.0.12.tar.gz) = a446f30fc7c9556d6d1e163f06189f7009d8e267 +SHA512 (xournalpp/1.0.12.tar.gz) = 6831da57c715bf70676fdd515f55475c72fb7b2e418157c2d110383bd7a5f37db1961b1b87b2af3a62f0d46f99310d499c113f3480025c6fa47ecec8a3153112 +Size (xournalpp/1.0.12.tar.gz) = 14694286 bytes