xournalpp: remove (imported as editors/xournalpp)

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: xournalpp: remove (imported as editors/xournalpp)
From: Yorick Hardy <yorickhardy%gmail.com@localhost>
Date: Sat, 02 Nov 2019 16:34:17 +0000
Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Sat Nov 2 18:34:17 2019 +0200
Changeset:	979ca0e434eb1b276108e72f8e8c6a1a56e680ed

Modified Files:
	Makefile
Removed Files:
	xournalpp/DESCR
	xournalpp/Makefile
	xournalpp/PLIST
	xournalpp/distinfo
	xournalpp/patches/patch-src_control_tools_StrokeHandler.cpp
	xournalpp/patches/patch-src_util_DeviceListHelper.cpp

Log Message:
xournalpp: remove (imported as editors/xournalpp)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=979ca0e434eb1b276108e72f8e8c6a1a56e680ed

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                           |   1 -
 xournalpp/DESCR                                    |   4 -
 xournalpp/Makefile                                 |  31 ------
 xournalpp/PLIST                                    | 124 ---------------------
 xournalpp/distinfo                                 |   8 --
 .../patch-src_control_tools_StrokeHandler.cpp      |  46 --------
 .../patches/patch-src_util_DeviceListHelper.cpp    |  17 ---
 7 files changed, 231 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index d87b2d0122..45a4829cbe 100644
--- a/Makefile
+++ b/Makefile
@@ -5078,7 +5078,6 @@ SUBDIR+=	xoreos
 SUBDIR+=	xoreos-tools
 SUBDIR+=	xorgxrdp
 SUBDIR+=	xosview
-SUBDIR+=	xournalpp
 SUBDIR+=	xournalpp-git
 SUBDIR+=	xpde
 SUBDIR+=	xpdq
diff --git a/xournalpp/DESCR b/xournalpp/DESCR
deleted file mode 100644
index b99f7b7ec3..0000000000
--- a/xournalpp/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-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
deleted file mode 100644
index 5d6f6e3913..0000000000
--- a/xournalpp/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-# $NetBSD$
-
-GITHUB_PROJECT=	xournalpp
-DISTNAME=	1.0.15
-PKGNAME=	${GITHUB_PROJECT}-${DISTNAME}
-CATEGORIES=	editors
-MASTER_SITES=	${MASTER_SITE_GITHUB:=xournalpp/}
-DIST_SUBDIR=	${GITHUB_PROJECT}
-
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	https://github.com/xournalpp/xournalpp/
-COMMENT=	Handwriting notetaking software with PDF annotation support
-LICENSE=	gnu-gpl-v2
-
-WRKSRC=		${WRKDIR}/xournalpp-${PKGVERSION_NOREV}
-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/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/PLIST b/xournalpp/PLIST
deleted file mode 100644
index a0f76d31c5..0000000000
--- a/xournalpp/PLIST
+++ /dev/null
@@ -1,124 +0,0 @@
-@comment $NetBSD$
-bin/xournal-thumbnailer
-bin/xournalpp
-share/locale/cs/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/it/LC_MESSAGES/xournalpp.mo
-share/locale/nl_NL/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/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/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/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/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/settings.glade
-share/xournalpp/ui/settingsButtonConfig.glade
-share/xournalpp/ui/settingsDeviceClassConfig.glade
-share/xournalpp/ui/texdialog.glade
-share/xournalpp/ui/toolbar.ini
-share/xournalpp/ui/toolbarCustomizeDialog.glade
-share/xournalpp/ui/toolbarManageDialog.glade
-share/xournalpp/ui/xournalpp.css
diff --git a/xournalpp/distinfo b/xournalpp/distinfo
deleted file mode 100644
index fc701ea5d2..0000000000
--- a/xournalpp/distinfo
+++ /dev/null
@@ -1,8 +0,0 @@
-$NetBSD$
-
-SHA1 (xournalpp/1.0.15.tar.gz) = 6934c8de1260ca580988c421c55c2a44999a235c
-RMD160 (xournalpp/1.0.15.tar.gz) = 8f53fd4b74507e28e28a4fffa9fe4d8c5f434c45
-SHA512 (xournalpp/1.0.15.tar.gz) = 7a015c1d48e26eed313f994aa293f6d2ab711ac6970568edef4ba10dcf1551c87279daa2b361731ac58ef236e1dd59e0eebf41e4739fba9db954a718450d5b79
-Size (xournalpp/1.0.15.tar.gz) = 14938798 bytes
-SHA1 (patch-src_control_tools_StrokeHandler.cpp) = 80df57a9776a9919a95a04bf6c057dc021fc789e
-SHA1 (patch-src_util_DeviceListHelper.cpp) = 8f3534c80c79ec49dd9562c3ed4e3ff7c36b2ecb
diff --git a/xournalpp/patches/patch-src_control_tools_StrokeHandler.cpp b/xournalpp/patches/patch-src_control_tools_StrokeHandler.cpp
deleted file mode 100644
index a295967764..0000000000
--- a/xournalpp/patches/patch-src_control_tools_StrokeHandler.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD$
-
-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
-@@ -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;
- 
diff --git a/xournalpp/patches/patch-src_util_DeviceListHelper.cpp b/xournalpp/patches/patch-src_util_DeviceListHelper.cpp
deleted file mode 100644
index 5d4decf4db..0000000000
--- a/xournalpp/patches/patch-src_util_DeviceListHelper.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-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
-@@ -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;
Prev by Date: opentyrian: update patches for -Werror
Next by Date: Update nget to 0.32 for aclocal issues.
Previous by Thread: opentyrian: update patches for -Werror
Next by Thread: Update nget to 0.32 for aclocal issues.
Indexes:
Home | Main Index | Thread Index | Old Index