Browse Source

Merge remote-tracking branch 'freebsd/master'

* freebsd/master:
  databases/memcached: add BUILD_DEPENDS as:devel/binutils
  lang/myrddin: add BUILD_DEPENDS as:devel/binutils
  net/zerotier: add BUILD_DEPENDS as:devel/binutils
  security/nflib: add BUILD_DEPENDS as:devel/binutils
  security/akmos: add BUILD_DEPENDS as:devel/binutils
  audio/ardour5: add BUILD_DEPENDS as:devel/binutils
  games/multimc: prepare for Qt5-5.15
  graphics/nomacs: prepare for Qt5-5.15
  graphics/krita: prepare for Qt5-5.15
  Update to 2.19.0.
  Update to the snapshot on 2020-05-07.
  graphics/librsvg2-rust: Update to 2.48.5
  lang/rust-nightly: Update to 1.45.0.20200530
  multimedia/kodi-devel: Update to newer snapshot
  textproc/py-sphinx: Fix build (extract) with static bsdtar(1)
  Remove expired port:
  The Wine Staging patchset (which is not enabled by default) gained one file it installs - take that into account.
master
HardenedBSD Sync Service 1 month ago
parent
commit
d56014f16e
42 changed files with 1095 additions and 209 deletions
  1. +1
    -0
      MOVED
  2. +2
    -1
      audio/ardour5/Makefile
  3. +1
    -0
      databases/memcached/Makefile
  4. +1
    -0
      emulators/wine-devel/pkg-plist
  5. +1
    -2
      games/multimc/Makefile
  6. +3
    -3
      games/multimc/distinfo
  7. +11
    -0
      games/multimc/files/patch-api_logic_Version.cpp
  8. +880
    -0
      graphics/krita/files/patch-krita-4.2.9-qt5.15
  9. +1
    -1
      graphics/librsvg2-rust/Makefile
  10. +3
    -3
      graphics/librsvg2-rust/distinfo
  11. +3
    -1
      graphics/nomacs/Makefile
  12. +10
    -0
      graphics/nomacs/files/patch-ImageLounge_plugins_PageExtractionPlugin_src_DkPageSegmentation.cpp
  13. +10
    -0
      graphics/nomacs/files/patch-ImageLounge_plugins_PaintPlugin_src_DkPaintPlugin.cpp
  14. +10
    -0
      graphics/nomacs/files/patch-ImageLounge_src_DkGui_DkThumbsWidgets.cpp
  15. +10
    -0
      graphics/nomacs/files/patch-ImageLounge_src_DkGui_DkViewPort.cpp
  16. +10
    -0
      graphics/nomacs/files/patch-ImageLounge_src_DkGui_DkWidgets.cpp
  17. +2
    -0
      lang/myrddin/Makefile
  18. +1
    -1
      lang/rust-nightly/Makefile
  19. +3
    -3
      lang/rust-nightly/distinfo
  20. +3
    -3
      multimedia/kodi-addon-inputstream.adaptive-devel/Makefile
  21. +3
    -3
      multimedia/kodi-addon-inputstream.adaptive-devel/distinfo
  22. +2
    -0
      multimedia/kodi-addon-peripheral.joystick-devel/Makefile
  23. +3
    -3
      multimedia/kodi-addon-vfs.libarchive-devel/Makefile
  24. +3
    -3
      multimedia/kodi-addon-vfs.libarchive-devel/distinfo
  25. +5
    -4
      multimedia/kodi-devel/Makefile
  26. +3
    -3
      multimedia/kodi-devel/distinfo
  27. +20
    -0
      multimedia/kodi-devel/files/patch-system_settings_freebsd.xml
  28. +5
    -2
      multimedia/kodi-devel/pkg-plist
  29. +2
    -0
      net/zerotier/Makefile
  30. +1
    -1
      ports-mgmt/portlint/Makefile
  31. +3
    -2
      ports-mgmt/portlint/src/portlint.1
  32. +67
    -28
      ports-mgmt/portlint/src/portlint.pl
  33. +2
    -0
      security/akmos/Makefile
  34. +2
    -0
      security/nflib/Makefile
  35. +3
    -0
      textproc/py-sphinx/Makefile
  36. +0
    -1
      www/Makefile
  37. +0
    -64
      www/moodle36/Makefile
  38. +0
    -3
      www/moodle36/distinfo
  39. +0
    -59
      www/moodle36/files/pkg-message.in
  40. +0
    -7
      www/moodle36/pkg-descr
  41. +2
    -5
      www/w3m/Makefile
  42. +3
    -3
      www/w3m/distinfo

+ 1
- 0
MOVED View File

@@ -15046,3 +15046,4 @@ x11/hs-X11||2020-05-26|Deprecated: Haskell libraries get pushed out of the ports
x11/hs-X11-xft||2020-05-26|Deprecated: Haskell libraries get pushed out of the ports tree
devel/rubygem-peek-redis-rails5|devel/rubygem-peek-redis-rails52|2020-05-29|Obsolete: Please use devel/rubygem-peek-redis-rails52 instead
devel/rubygem-peek-rblineprof-rails5|devel/rubygem-peek-rblineprof-rails52|2020-05-29|Obsolete, please use devel/rubygem-peek-rblineprof-rails52 instead
www/moodle36|www/moodle37|2020-05-30|Has expired: EOLed upstream

+ 2
- 1
audio/ardour5/Makefile View File

@@ -19,7 +19,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
DEPRECATED= Uses deprecated version of python
EXPIRATION_DATE= 2020-09-15

BUILD_DEPENDS= lv2>=1.14.0:audio/lv2 itstool>2.0.0:textproc/itstool
BUILD_DEPENDS= lv2>=1.14.0:audio/lv2 itstool>2.0.0:textproc/itstool \
as:devel/binutils
LIB_DEPENDS= libserd-0.so:devel/serd \
libsord-0.so:devel/sord \
libsratom-0.so:audio/sratom \

+ 1
- 0
databases/memcached/Makefile View File

@@ -16,6 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN_mips= fails to link: failed to merge target specific data of file /usr/lib/dtrace/drti.o
BROKEN_mips64= fails to link: failed to merge target specific data of file /usr/lib/dtrace/drti.o

BUILD_DEPENDS= as:devel/binutils
LIB_DEPENDS= libevent.so:devel/libevent

CONFLICTS= memcached-1.2*

+ 1
- 0
emulators/wine-devel/pkg-plist View File

@@ -818,6 +818,7 @@ include/wine/windows/sspi.h
include/wine/windows/stdole2.idl
include/wine/windows/stdole2.tlb
%%STAGING%%include/wine/windows/stdole32.idl
%%STAGING%%include/wine/windows/stdole32.tlb
include/wine/windows/stgprop.h
include/wine/windows/sti.h
include/wine/windows/storage.h

+ 1
- 2
games/multimc/Makefile View File

@@ -1,8 +1,7 @@
# $FreeBSD$

PORTNAME= multimc
DISTVERSION= 0.6.7
PORTREVISION= 1
DISTVERSION= 0.6.11
CATEGORIES= games java

MAINTAINER= me@tsundoku.ne.jp

+ 3
- 3
games/multimc/distinfo View File

@@ -1,6 +1,6 @@
TIMESTAMP = 1567432574
SHA256 (MultiMC-MultiMC5-0.6.7_GH0.tar.gz) = 3ec38a5f622048ba3926f0e20fb296d646c7848f8313143062b3e2bd273149ae
SIZE (MultiMC-MultiMC5-0.6.7_GH0.tar.gz) = 2396638
TIMESTAMP = 1590852396
SHA256 (MultiMC-MultiMC5-0.6.11_GH0.tar.gz) = 7cad736f1fe3f2887aeaa7a7f3927930e16ed815c98e4cf3a7378a99c426a775
SIZE (MultiMC-MultiMC5-0.6.11_GH0.tar.gz) = 2379632
SHA256 (MultiMC-libnbtplusplus-508eda8_GH0.tar.gz) = 14f16c8e6dc264017684774cdd9c6f149855e464895b28c29f9f55ea76d34f1a
SIZE (MultiMC-libnbtplusplus-508eda8_GH0.tar.gz) = 47406
SHA256 (MultiMC-quazip-3691d57_GH0.tar.gz) = 17a9457360053fa2c6c849c75fa760383036bd14d7d8f7bd0d958bfc2a584009

+ 11
- 0
games/multimc/files/patch-api_logic_Version.cpp View File

@@ -0,0 +1,11 @@
--- api/logic/Version.cpp.orig 2020-05-30 15:28:28 UTC
+++ api/logic/Version.cpp
@@ -78,7 +78,7 @@ void Version::parse()
// FIXME: this is bad. versions can contain a lot more separators...
QStringList parts = m_string.split('.');
- for (const auto part : parts)
+ for (const auto& part : parts)
{
m_sections.append(Section(part));
}

+ 880
- 0
graphics/krita/files/patch-krita-4.2.9-qt5.15 View File

@@ -0,0 +1,880 @@
From d5bb12ac894ab8684d647bdf1559f745092dc741 Mon Sep 17 00:00:00 2001
From: Heiko Becker <heirecka@exherbo.org>
Date: Mon, 23 Mar 2020 21:53:24 +0100
Subject: Fix build with Qt 5.15

QPainterPath is no longer included via qtransform.h (since
5.15.0-beta2, 50d2acdc93b4de2ba56eb67787e2bdcb21dd4bea in qtbase.git).
---
benchmarks/kis_stroke_benchmark.cpp | 1 +
libs/basicflakes/tools/KoCreatePathTool_p.h | 2 ++
libs/brush/kis_auto_brush.cpp | 1 +
libs/brush/kis_boundary.cc | 1 +
libs/brush/kis_brush.cpp | 1 +
libs/flake/KoClipMask.cpp | 1 +
libs/flake/KoClipMaskPainter.cpp | 1 +
libs/flake/KoConnectionShape.cpp | 1 +
libs/flake/KoGradientBackground.cpp | 1 +
libs/flake/KoHatchBackground.cpp | 1 +
libs/flake/KoOdfGradientBackground.cpp | 1 +
libs/flake/KoPathShape.cpp | 1 +
libs/flake/KoPatternBackground.cpp | 1 +
libs/flake/KoShapeManager.cpp | 1 +
libs/flake/KoShapeShadow.cpp | 1 +
libs/flake/KoSnapGuide.cpp | 1 +
libs/flake/KoSnapStrategy.cpp | 1 +
libs/flake/svg/SvgParser.cpp | 1 +
libs/flake/tests/TestKoMarkerCollection.cpp | 1 +
libs/flake/tests/TestPointMergeCommand.cpp | 1 +
libs/flake/tests/TestShapeBackgroundCommand.cpp | 1 +
libs/flake/tests/TestSnapStrategy.cpp | 1 +
libs/flake/tests/TestSvgParser.cpp | 1 +
libs/flake/tests/TestSvgText.cpp | 1 +
libs/flake/text/KoSvgTextChunkShape_p.h | 1 +
libs/flake/text/KoSvgTextShape.cpp | 1 +
libs/flake/tools/KoPathTool.cpp | 1 +
libs/global/KisHandlePainterHelper.cpp | 1 +
libs/image/brushengine/kis_paintop_settings.cpp | 1 +
libs/ui/flake/kis_shape_selection.h | 2 ++
libs/ui/kis_painting_assistants_decoration.cpp | 1 +
libs/ui/kis_selection_decoration.h | 1 +
libs/ui/tool/kis_shape_tool_helper.cpp | 2 ++
libs/ui/tool/kis_tool_paint.h | 1 +
libs/ui/widgets/kis_cie_tongue_widget.cpp | 1 +
libs/ui/widgets/kis_curve_widget.cpp | 1 +
libs/ui/widgets/kis_tone_curve_widget.cpp | 1 +
plugins/assistants/Assistants/ConcentricEllipseAssistant.cc | 1 +
plugins/assistants/Assistants/EllipseAssistant.cc | 1 +
plugins/assistants/Assistants/FisheyePointAssistant.cc | 1 +
plugins/assistants/Assistants/InfiniteRulerAssistant.cc | 1 +
plugins/assistants/Assistants/ParallelRulerAssistant.cc | 1 +
plugins/assistants/Assistants/PerspectiveAssistant.cc | 1 +
plugins/assistants/Assistants/RulerAssistant.cc | 1 +
plugins/assistants/Assistants/SplineAssistant.cc | 1 +
plugins/assistants/Assistants/VanishingPointAssistant.cc | 1 +
plugins/assistants/Assistants/kis_assistant_tool.cc | 1 +
plugins/dockers/histogram/histogramdockerwidget.cpp | 1 +
plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.cpp | 2 ++
plugins/flake/textshape/TextShape.cpp | 1 +
plugins/paintops/curvebrush/curve_brush.cpp | 2 ++
plugins/paintops/curvebrush/kis_curve_paintop.cpp | 1 +
plugins/paintops/experiment/kis_experiment_paintop.cpp | 2 ++
plugins/paintops/experiment/kis_experiment_paintop.h | 2 ++
plugins/tools/defaulttool/defaulttool/DefaultTool.cpp | 1 +
plugins/tools/defaulttool/defaulttool/SelectionDecorator.cpp | 2 ++
.../karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp | 1 +
.../tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h | 1 +
plugins/tools/svgtexttool/SvgTextTool.cpp | 1 +
plugins/tools/tool_transform2/kis_free_transform_strategy.cpp | 1 +
plugins/tools/tool_transform2/kis_liquify_paint_helper.cpp | 2 ++
plugins/tools/tool_transform2/kis_liquify_transform_strategy.cpp | 1 +
plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp | 1 +
plugins/tools/tool_transform2/kis_transform_strategy_base.cpp | 1 +
plugins/tools/tool_transform2/kis_transform_utils.cpp | 1 +
plugins/tools/tool_transform2/kis_warp_transform_strategy.cpp | 1 +
66 files changed, 75 insertions(+)

diff --git a/benchmarks/kis_stroke_benchmark.cpp b/benchmarks/kis_stroke_benchmark.cpp
index 93296b2..1a2a4cc 100644
--- benchmarks/kis_stroke_benchmark.cpp
+++ benchmarks/kis_stroke_benchmark.cpp
@@ -26,6 +26,7 @@ inline double drand48()
}
#endif
+#include <QPainterPath>
#include <QTest>
#include "kis_stroke_benchmark.h"
diff --git a/libs/basicflakes/tools/KoCreatePathTool_p.h b/libs/basicflakes/tools/KoCreatePathTool_p.h
index 3864604..48f8a0c 100644
--- libs/basicflakes/tools/KoCreatePathTool_p.h
+++ libs/basicflakes/tools/KoCreatePathTool_p.h
@@ -22,6 +22,8 @@
#ifndef KOCREATEPATHTOOL_P_H
#define KOCREATEPATHTOOL_P_H
+#include <QPainterPath>
+
#include "KoCreatePathTool.h"
#include "KoPathPoint.h"
#include "KoPathPointData.h"
diff --git a/libs/brush/kis_auto_brush.cpp b/libs/brush/kis_auto_brush.cpp
index 67289b4..a0c59ac 100644
--- libs/brush/kis_auto_brush.cpp
+++ libs/brush/kis_auto_brush.cpp
@@ -24,6 +24,7 @@
#include <kis_debug.h>
#include <math.h>
+#include <QPainterPath>
#include <QRect>
#include <QDomElement>
#include <QtConcurrentMap>
diff --git a/libs/brush/kis_boundary.cc b/libs/brush/kis_boundary.cc
index a599d8e..5695428 100644
--- libs/brush/kis_boundary.cc
+++ libs/brush/kis_boundary.cc
@@ -18,6 +18,7 @@
#include "kis_boundary.h"
#include <QPainter>
+#include <QPainterPath>
#include <QPen>
#include "KoColorSpace.h"
diff --git a/libs/brush/kis_brush.cpp b/libs/brush/kis_brush.cpp
index 8a0f787..956635d 100644
--- libs/brush/kis_brush.cpp
+++ libs/brush/kis_brush.cpp
@@ -25,6 +25,7 @@
#include <QDomElement>
#include <QFile>
+#include <QPainterPath>
#include <QPoint>
#include <QFileInfo>
#include <QBuffer>
diff --git a/libs/flake/KoClipMask.cpp b/libs/flake/KoClipMask.cpp
index 8a21648..364d731 100644
--- libs/flake/KoClipMask.cpp
+++ libs/flake/KoClipMask.cpp
@@ -21,6 +21,7 @@
#include <QRectF>
#include <QTransform>
#include <QPainter>
+#include <QPainterPath>
#include <KoShape.h>
#include "kis_algebra_2d.h"
diff --git a/libs/flake/KoClipMaskPainter.cpp b/libs/flake/KoClipMaskPainter.cpp
index 4fa456c..e7ea496 100644
--- libs/flake/KoClipMaskPainter.cpp
+++ libs/flake/KoClipMaskPainter.cpp
@@ -19,6 +19,7 @@
#include "KoClipMaskPainter.h"
#include <QPainter>
+#include <QPainterPath>
#include <QRectF>
#include "kis_assert.h"
diff --git a/libs/flake/KoConnectionShape.cpp b/libs/flake/KoConnectionShape.cpp
index e8b5c80..d8dfee3 100644
--- libs/flake/KoConnectionShape.cpp
+++ libs/flake/KoConnectionShape.cpp
@@ -34,6 +34,7 @@
#include <KoXmlNS.h>
#include <KoUnit.h>
#include <QPainter>
+#include <QPainterPath>
#include <FlakeDebug.h>
diff --git a/libs/flake/KoGradientBackground.cpp b/libs/flake/KoGradientBackground.cpp
index 3f69791..0630d68 100644
--- libs/flake/KoGradientBackground.cpp
+++ libs/flake/KoGradientBackground.cpp
@@ -31,6 +31,7 @@
#include <QSharedPointer>
#include <QBrush>
#include <QPainter>
+#include <QPainterPath>
class KoGradientBackgroundPrivate : public KoShapeBackgroundPrivate
{
diff --git a/libs/flake/KoHatchBackground.cpp b/libs/flake/KoHatchBackground.cpp
index f556f12..23a0b48 100644
--- libs/flake/KoHatchBackground.cpp
+++ libs/flake/KoHatchBackground.cpp
@@ -36,6 +36,7 @@
#include <QColor>
#include <QString>
#include <QPainter>
+#include <QPainterPath>
class KoHatchBackgroundPrivate : public KoColorBackgroundPrivate
{
diff --git a/libs/flake/KoOdfGradientBackground.cpp b/libs/flake/KoOdfGradientBackground.cpp
index 20f7aa7..3a90a8a 100644
--- libs/flake/KoOdfGradientBackground.cpp
+++ libs/flake/KoOdfGradientBackground.cpp
@@ -32,6 +32,7 @@
#include <KoOdfStylesReader.h>
#include <QPainter>
+#include <QPainterPath>
#include <QColor>
#include <QImage>
#include <qmath.h>
diff --git a/libs/flake/KoPathShape.cpp b/libs/flake/KoPathShape.cpp
index 2768a0e..9069877 100644
--- libs/flake/KoPathShape.cpp
+++ libs/flake/KoPathShape.cpp
@@ -50,6 +50,7 @@
#include <FlakeDebug.h>
#include <QPainter>
+#include <QPainterPath>
#include "kis_global.h"
diff --git a/libs/flake/KoPatternBackground.cpp b/libs/flake/KoPatternBackground.cpp
index d98ecf8..46e3f80 100644
--- libs/flake/KoPatternBackground.cpp
+++ libs/flake/KoPatternBackground.cpp
@@ -37,6 +37,7 @@
#include <QBrush>
#include <QPainter>
+#include <QPainterPath>
#include <QPointer>
class KoPatternBackgroundPrivate : public KoShapeBackgroundPrivate
diff --git a/libs/flake/KoShapeManager.cpp b/libs/flake/KoShapeManager.cpp
index 43bacd5..845c0bb 100644
--- libs/flake/KoShapeManager.cpp
+++ libs/flake/KoShapeManager.cpp
@@ -49,6 +49,7 @@
#include <QApplication>
#include <QPainter>
+#include <QPainterPath>
#include <QTimer>
#include <FlakeDebug.h>
diff --git a/libs/flake/KoShapeShadow.cpp b/libs/flake/KoShapeShadow.cpp
index 2997590..df346d7 100644
--- libs/flake/KoShapeShadow.cpp
+++ libs/flake/KoShapeShadow.cpp
@@ -32,6 +32,7 @@
#include <KoViewConverter.h>
#include <FlakeDebug.h>
#include <QPainter>
+#include <QPainterPath>
#include <QAtomicInt>
#include <QImage>
#include <QRectF>
diff --git a/libs/flake/KoSnapGuide.cpp b/libs/flake/KoSnapGuide.cpp
index da7f770..0d8e5a9 100644
--- libs/flake/KoSnapGuide.cpp
+++ libs/flake/KoSnapGuide.cpp
@@ -27,6 +27,7 @@
#include <KoCanvasBase.h>
#include <QPainter>
+#include <QPainterPath>
#include <math.h>
diff --git a/libs/flake/KoSnapStrategy.cpp b/libs/flake/KoSnapStrategy.cpp
index cab1d09..8b09b10 100644
--- libs/flake/KoSnapStrategy.cpp
+++ libs/flake/KoSnapStrategy.cpp
@@ -27,6 +27,7 @@
#include <KoViewConverter.h>
#include <QPainter>
+#include <QPainterPath>
#include <cmath>
diff --git a/libs/flake/svg/SvgParser.cpp b/libs/flake/svg/SvgParser.cpp
index 4f29f6f..44a90aa 100644
--- libs/flake/svg/SvgParser.cpp
+++ libs/flake/svg/SvgParser.cpp
@@ -31,6 +31,7 @@
#include <QColor>
#include <QPainter>
+#include <QPainterPath>
#include <QDir>
#include <KoShape.h>
diff --git a/libs/flake/tests/TestKoMarkerCollection.cpp b/libs/flake/tests/TestKoMarkerCollection.cpp
index de05a13..ac9f570 100644
--- libs/flake/tests/TestKoMarkerCollection.cpp
+++ libs/flake/tests/TestKoMarkerCollection.cpp
@@ -21,6 +21,7 @@
#include <QTest>
#include <QFileInfo>
#include <QPainter>
+#include <QPainterPath>
#include <KoMarker.h>
#include <KoMarkerCollection.h>
#include <KoPathShape.h>
diff --git a/libs/flake/tests/TestPointMergeCommand.cpp b/libs/flake/tests/TestPointMergeCommand.cpp
index ee6c647..c6b078e 100644
--- libs/flake/tests/TestPointMergeCommand.cpp
+++ libs/flake/tests/TestPointMergeCommand.cpp
@@ -23,6 +23,7 @@
#include "KoPathPoint.h"
#include "KoPathPointData.h"
#include <sdk/tests/kistest.h>
+#include <QPainterPath>
#include <QTest>
#include <FlakeDebug.h>
diff --git a/libs/flake/tests/TestShapeBackgroundCommand.cpp b/libs/flake/tests/TestShapeBackgroundCommand.cpp
index a3a44cd..a8a8c16 100644
--- libs/flake/tests/TestShapeBackgroundCommand.cpp
+++ libs/flake/tests/TestShapeBackgroundCommand.cpp
@@ -24,6 +24,7 @@
#include "KoShapePaintingContext.h"
#include "KoViewConverter.h"
+#include <QPainterPath>
#include <QTest>
void TestShapeBackgroundCommand::refCounting()
diff --git a/libs/flake/tests/TestSnapStrategy.cpp b/libs/flake/tests/TestSnapStrategy.cpp
index 8df1995..70342dc 100644
--- libs/flake/tests/TestSnapStrategy.cpp
+++ libs/flake/tests/TestSnapStrategy.cpp
@@ -18,6 +18,7 @@
*/
#include "TestSnapStrategy.h"
+#include <QPainterPath>
#include <QTest>
#include "KoSnapStrategy.h"
#include "KoPathShape.h"
diff --git a/libs/flake/tests/TestSvgParser.cpp b/libs/flake/tests/TestSvgParser.cpp
index b03ac84..f8e748b 100644
--- libs/flake/tests/TestSvgParser.cpp
+++ libs/flake/tests/TestSvgParser.cpp
@@ -19,6 +19,7 @@
#include "TestSvgParser.h"
+#include <QPainterPath>
#include <QTest>
#include <svg/SvgUtil.h>
#include <KoShapeStrokeModel.h>
diff --git a/libs/flake/tests/TestSvgText.cpp b/libs/flake/tests/TestSvgText.cpp
index d2bb6bd..da81be0 100644
--- libs/flake/tests/TestSvgText.cpp
+++ libs/flake/tests/TestSvgText.cpp
@@ -768,6 +768,7 @@ void TestSvgText::testRightToLeft()
#include <QTextLayout>
#include <QPainter>
+#include <QPainterPath>
void TestSvgText::testQtBidi()
{
diff --git a/libs/flake/text/KoSvgTextChunkShape_p.h b/libs/flake/text/KoSvgTextChunkShape_p.h
index 8c59d96..a9fd5c5 100644
--- libs/flake/text/KoSvgTextChunkShape_p.h
+++ libs/flake/text/KoSvgTextChunkShape_p.h
@@ -21,6 +21,7 @@
#include "KoSvgText.h"
#include "KoSvgTextProperties.h"
#include <KoShapeContainer_p.h>
+#include <QPainterPath>
#include <QTextCharFormat>
class SvgGraphicsContext;
diff --git a/libs/flake/text/KoSvgTextShape.cpp b/libs/flake/text/KoSvgTextShape.cpp
index 45b9459..8fd5774 100644
--- libs/flake/text/KoSvgTextShape.cpp
+++ libs/flake/text/KoSvgTextShape.cpp
@@ -48,6 +48,7 @@
#include <vector>
#include <memory>
#include <QPainter>
+#include <QPainterPath>
#include <boost/optional.hpp>
#include <text/KoSvgTextChunkShapeLayoutInterface.h>
diff --git a/libs/flake/tools/KoPathTool.cpp b/libs/flake/tools/KoPathTool.cpp
index dae2d08..ce043a4 100644
--- libs/flake/tools/KoPathTool.cpp
+++ libs/flake/tools/KoPathTool.cpp
@@ -66,6 +66,7 @@
#include <FlakeDebug.h>
#include <klocalizedstring.h>
#include <QPainter>
+#include <QPainterPath>
#include <QBitmap>
#include <QTabWidget>
diff --git a/libs/global/KisHandlePainterHelper.cpp b/libs/global/KisHandlePainterHelper.cpp
index 7d66629..24b8137 100644
--- libs/global/KisHandlePainterHelper.cpp
+++ libs/global/KisHandlePainterHelper.cpp
@@ -19,6 +19,7 @@
#include "KisHandlePainterHelper.h"
#include <QPainter>
+#include <QPainterPath>
#include "kis_algebra_2d.h"
#include "kis_painting_tweaks.h"
diff --git a/libs/image/brushengine/kis_paintop_settings.cpp b/libs/image/brushengine/kis_paintop_settings.cpp
index 87f5c53..0e43fc9 100644
--- libs/image/brushengine/kis_paintop_settings.cpp
+++ libs/image/brushengine/kis_paintop_settings.cpp
@@ -21,6 +21,7 @@
#include <QImage>
#include <QColor>
+#include <QPainterPath>
#include <QPointer>
#include <KoPointerEvent.h>
diff --git a/libs/ui/flake/kis_shape_selection.h b/libs/ui/flake/kis_shape_selection.h
index 3b2e853..805d5c6 100644
--- libs/ui/flake/kis_shape_selection.h
+++ libs/ui/flake/kis_shape_selection.h
@@ -18,6 +18,8 @@
#ifndef KIS_SHAPE_SELECTION_H
#define KIS_SHAPE_SELECTION_H
+#include <QPainterPath>
+
#include <KoShapeLayer.h>
#include <KoShapeFactoryBase.h>
#include <KoShapeUserData.h>
diff --git a/libs/ui/kis_painting_assistants_decoration.cpp b/libs/ui/kis_painting_assistants_decoration.cpp
index 11838e6..a0a684c 100644
--- libs/ui/kis_painting_assistants_decoration.cpp
+++ libs/ui/kis_painting_assistants_decoration.cpp
@@ -33,6 +33,7 @@
#include "KisViewManager.h"
#include <QPainter>
+#include <QPainterPath>
#include <QApplication>
struct KisPaintingAssistantsDecoration::Private {
diff --git a/libs/ui/kis_selection_decoration.h b/libs/ui/kis_selection_decoration.h
index ea90ebb..557328d 100644
--- libs/ui/kis_selection_decoration.h
+++ libs/ui/kis_selection_decoration.h
@@ -19,6 +19,7 @@
#ifndef _KIS_SELECTION_DECORATION_H_
#define _KIS_SELECTION_DECORATION_H_
+#include <QPainterPath>
#include <QTimer>
#include <QPolygon>
#include <QPen>
diff --git a/libs/ui/tool/kis_shape_tool_helper.cpp b/libs/ui/tool/kis_shape_tool_helper.cpp
index 4edab2a..d914ff9 100644
--- libs/ui/tool/kis_shape_tool_helper.cpp
+++ libs/ui/tool/kis_shape_tool_helper.cpp
@@ -18,6 +18,8 @@
#include "kis_shape_tool_helper.h"
+#include <QPainterPath>
+
#include <KoPathShape.h>
#include <KoShapeRegistry.h>
#include <KoShapeFactoryBase.h>
diff --git a/libs/ui/tool/kis_tool_paint.h b/libs/ui/tool/kis_tool_paint.h
index d3ea6f6..084fd10 100644
--- libs/ui/tool/kis_tool_paint.h
+++ libs/ui/tool/kis_tool_paint.h
@@ -22,6 +22,7 @@
#include "kis_tool.h"
#include <QGridLayout>
+#include <QPainterPath>
#include <QTimer>
#include <QCheckBox>
diff --git a/libs/ui/widgets/kis_cie_tongue_widget.cpp b/libs/ui/widgets/kis_cie_tongue_widget.cpp
index 79a8bfc..bbec19d 100644
--- libs/ui/widgets/kis_cie_tongue_widget.cpp
+++ libs/ui/widgets/kis_cie_tongue_widget.cpp
@@ -40,6 +40,7 @@ wavelength, and thus define the outline of the CIE "tongue" diagram.
#include <QPointF>
#include <QPainter>
+#include <QPainterPath>
#include <QFile>
#include <QTimer>
#include <QPaintEvent>
diff --git a/libs/ui/widgets/kis_curve_widget.cpp b/libs/ui/widgets/kis_curve_widget.cpp
index 1c5292d..09de36e 100644
--- libs/ui/widgets/kis_curve_widget.cpp
+++ libs/ui/widgets/kis_curve_widget.cpp
@@ -27,6 +27,7 @@
#include <QPixmap>
#include <QPainter>
+#include <QPainterPath>
#include <QPoint>
#include <QPen>
#include <QEvent>
diff --git a/libs/ui/widgets/kis_tone_curve_widget.cpp b/libs/ui/widgets/kis_tone_curve_widget.cpp
index 679fed4..6eaca4b 100644
--- libs/ui/widgets/kis_tone_curve_widget.cpp
+++ libs/ui/widgets/kis_tone_curve_widget.cpp
@@ -25,6 +25,7 @@
#include <QPointF>
#include <QPolygonF>
#include <QPainter>
+#include <QPainterPath>
#include <QPaintEvent>
#include <QImage>
#include <cmath>
diff --git a/plugins/assistants/Assistants/ConcentricEllipseAssistant.cc b/plugins/assistants/Assistants/ConcentricEllipseAssistant.cc
index 8c14b96..44078f3 100644
--- plugins/assistants/Assistants/ConcentricEllipseAssistant.cc
+++ plugins/assistants/Assistants/ConcentricEllipseAssistant.cc
@@ -23,6 +23,7 @@
#include <klocalizedstring.h>
#include "kis_debug.h"
#include <QPainter>
+#include <QPainterPath>
#include <QLinearGradient>
#include <QTransform>
#include <kis_canvas2.h>
diff --git a/plugins/assistants/Assistants/EllipseAssistant.cc b/plugins/assistants/Assistants/EllipseAssistant.cc
index 8b3b16c..09d48fd 100644
--- plugins/assistants/Assistants/EllipseAssistant.cc
+++ plugins/assistants/Assistants/EllipseAssistant.cc
@@ -23,6 +23,7 @@
#include <klocalizedstring.h>
#include "kis_debug.h"
#include <QPainter>
+#include <QPainterPath>
#include <QLinearGradient>
#include <QTransform>
diff --git a/plugins/assistants/Assistants/FisheyePointAssistant.cc b/plugins/assistants/Assistants/FisheyePointAssistant.cc
index 8338f4b..a5c0510 100644
--- plugins/assistants/Assistants/FisheyePointAssistant.cc
+++ plugins/assistants/Assistants/FisheyePointAssistant.cc
@@ -25,6 +25,7 @@
#include <klocalizedstring.h>
#include <QPainter>
+#include <QPainterPath>
#include <QLinearGradient>
#include <QTransform>
diff --git a/plugins/assistants/Assistants/InfiniteRulerAssistant.cc b/plugins/assistants/Assistants/InfiniteRulerAssistant.cc
index 4fe1907..03da329 100644
--- plugins/assistants/Assistants/InfiniteRulerAssistant.cc
+++ plugins/assistants/Assistants/InfiniteRulerAssistant.cc
@@ -25,6 +25,7 @@
#include <klocalizedstring.h>
#include <QPainter>
+#include <QPainterPath>
#include <QLinearGradient>
#include <QTransform>
diff --git a/plugins/assistants/Assistants/ParallelRulerAssistant.cc b/plugins/assistants/Assistants/ParallelRulerAssistant.cc
index 2deb3d3..405a172 100644
--- plugins/assistants/Assistants/ParallelRulerAssistant.cc
+++ plugins/assistants/Assistants/ParallelRulerAssistant.cc
@@ -25,6 +25,7 @@
#include <klocalizedstring.h>
#include <QPainter>
+#include <QPainterPath>
#include <QLinearGradient>
#include <QTransform>
diff --git a/plugins/assistants/Assistants/PerspectiveAssistant.cc b/plugins/assistants/Assistants/PerspectiveAssistant.cc
index 46007b5..bcb2669 100644
--- plugins/assistants/Assistants/PerspectiveAssistant.cc
+++ plugins/assistants/Assistants/PerspectiveAssistant.cc
@@ -24,6 +24,7 @@
#include <klocalizedstring.h>
#include <QPainter>
+#include <QPainterPath>
#include <QLinearGradient>
#include <QTransform>
diff --git a/plugins/assistants/Assistants/RulerAssistant.cc b/plugins/assistants/Assistants/RulerAssistant.cc
index 48cc15e..64f1772 100644
--- plugins/assistants/Assistants/RulerAssistant.cc
+++ plugins/assistants/Assistants/RulerAssistant.cc
@@ -23,6 +23,7 @@
#include <klocalizedstring.h>
#include <QPainter>
+#include <QPainterPath>
#include <QLinearGradient>
#include <QTransform>
diff --git a/plugins/assistants/Assistants/SplineAssistant.cc b/plugins/assistants/Assistants/SplineAssistant.cc
index 20b19dd..dfbd872 100644
--- plugins/assistants/Assistants/SplineAssistant.cc
+++ plugins/assistants/Assistants/SplineAssistant.cc
@@ -23,6 +23,7 @@
#include <klocalizedstring.h>
#include <QPainter>
+#include <QPainterPath>
#include <QLinearGradient>
#include <QTransform>
diff --git a/plugins/assistants/Assistants/VanishingPointAssistant.cc b/plugins/assistants/Assistants/VanishingPointAssistant.cc
index 3cae70d..dbc66be 100644
--- plugins/assistants/Assistants/VanishingPointAssistant.cc
+++ plugins/assistants/Assistants/VanishingPointAssistant.cc
@@ -25,6 +25,7 @@
#include <klocalizedstring.h>
#include <QPainter>
+#include <QPainterPath>
#include <QLinearGradient>
#include <QTransform>
diff --git a/plugins/assistants/Assistants/kis_assistant_tool.cc b/plugins/assistants/Assistants/kis_assistant_tool.cc
index 4cff446..37ac8ee 100644
--- plugins/assistants/Assistants/kis_assistant_tool.cc
+++ plugins/assistants/Assistants/kis_assistant_tool.cc
@@ -21,6 +21,7 @@
#include <kis_assistant_tool.h>
#include <QPainter>
+#include <QPainterPath>
#include <QXmlStreamReader>
#include <QXmlStreamWriter>
#include <QStandardPaths>
diff --git a/plugins/dockers/histogram/histogramdockerwidget.cpp b/plugins/dockers/histogram/histogramdockerwidget.cpp
index 5c8e29d..83aa432 100644
--- plugins/dockers/histogram/histogramdockerwidget.cpp
+++ plugins/dockers/histogram/histogramdockerwidget.cpp
@@ -24,6 +24,7 @@
#include <algorithm>
#include <QTime>
#include <QPainter>
+#include <QPainterPath>
#include <functional>
#include "KoChannelInfo.h"
diff --git a/plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.cpp b/plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.cpp
index 3c246c9..96d1892 100644
--- plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.cpp
+++ plugins/flake/pathshapes/enhancedpath/EnhancedPathShape.cpp
@@ -30,6 +30,8 @@
#include "EnhancedPathHandle.h"
#include "EnhancedPathFormula.h"
+#include <QPainterPath>
+
#include <KoXmlNS.h>
#include <KoXmlWriter.h>
#include <KoXmlReader.h>
diff --git a/plugins/flake/textshape/TextShape.cpp b/plugins/flake/textshape/TextShape.cpp
index c06c799..5b2fd12 100644
--- plugins/flake/textshape/TextShape.cpp
+++ plugins/flake/textshape/TextShape.cpp
@@ -57,6 +57,7 @@
#include <QApplication>
#include <QFont>
#include <QPainter>
+#include <QPainterPath>
#include <QPen>
#include <QTextLayout>
diff --git a/plugins/paintops/curvebrush/curve_brush.cpp b/plugins/paintops/curvebrush/curve_brush.cpp
index 347cc31..82bc86b 100644
--- plugins/paintops/curvebrush/curve_brush.cpp
+++ plugins/paintops/curvebrush/curve_brush.cpp
@@ -18,6 +18,8 @@
#include "curve_brush.h"
+#include <QPainterPath>
+
#include <KoColor.h>
#include <KoColorSpace.h>
diff --git a/plugins/paintops/curvebrush/kis_curve_paintop.cpp b/plugins/paintops/curvebrush/kis_curve_paintop.cpp
index 295ee55..ed68e3f 100644
--- plugins/paintops/curvebrush/kis_curve_paintop.cpp
+++ plugins/paintops/curvebrush/kis_curve_paintop.cpp
@@ -20,6 +20,7 @@
#include <cmath>
+#include <QPainterPath>
#include <QRect>
#include <kis_image.h>
diff --git a/plugins/paintops/experiment/kis_experiment_paintop.cpp b/plugins/paintops/experiment/kis_experiment_paintop.cpp
index 54764d8..7c429b4 100644
--- plugins/paintops/experiment/kis_experiment_paintop.cpp
+++ plugins/paintops/experiment/kis_experiment_paintop.cpp
@@ -22,6 +22,8 @@
#include <cmath>
+#include <QPainterPath>
+
#include <KoCompositeOpRegistry.h>
#include <kis_debug.h>
diff --git a/plugins/paintops/experiment/kis_experiment_paintop.h b/plugins/paintops/experiment/kis_experiment_paintop.h
index 19dec9b..27f4fe3 100644
--- plugins/paintops/experiment/kis_experiment_paintop.h
+++ plugins/paintops/experiment/kis_experiment_paintop.h
@@ -19,6 +19,8 @@
#ifndef KIS_EXPERIMENT_PAINTOP_H_
#define KIS_EXPERIMENT_PAINTOP_H_
+#include <QPainterPath>
+
#include <klocalizedstring.h>
#include <brushengine/kis_paintop.h>
#include <kis_types.h>
diff --git a/plugins/tools/defaulttool/defaulttool/DefaultTool.cpp b/plugins/tools/defaulttool/defaulttool/DefaultTool.cpp
index de2787f..363025e 100644
--- plugins/tools/defaulttool/defaulttool/DefaultTool.cpp
+++ plugins/tools/defaulttool/defaulttool/DefaultTool.cpp
@@ -67,6 +67,7 @@
#include <KoIcon.h>
+#include <QPainterPath>
#include <QPointer>
#include <QAction>
#include <QKeyEvent>
diff --git a/plugins/tools/defaulttool/defaulttool/SelectionDecorator.cpp b/plugins/tools/defaulttool/defaulttool/SelectionDecorator.cpp
index 2c8c7db..ab560d6 100644
--- plugins/tools/defaulttool/defaulttool/SelectionDecorator.cpp
+++ plugins/tools/defaulttool/defaulttool/SelectionDecorator.cpp
@@ -21,6 +21,8 @@
#include "SelectionDecorator.h"
+#include <QPainterPath>
+
#include <KoShape.h>
#include <KoSelection.h>
#include <KoResourcePaths.h>
diff --git a/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp b/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp
index 2a461cb..1b9d81b 100644
--- plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp
+++ plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphicShape.cpp
@@ -28,6 +28,7 @@
#include <QDebug>
#include <QColor>
+#include <QPainterPath>
#include <cmath>
#include <cstdlib>
diff --git a/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h b/plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h
index 5bf3a8d..e2329d1 100644
--- plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h
+++ plugins/tools/karbonplugins/tools/CalligraphyTool/KarbonCalligraphyTool.h
@@ -22,6 +22,7 @@
#include <KoToolBase.h>
#include <KoPathShape.h>
+#include <QPainterPath>
#include <QPointer>
#include "KarbonCalligraphyOptionWidget.h"
diff --git a/plugins/tools/svgtexttool/SvgTextTool.cpp b/plugins/tools/svgtexttool/SvgTextTool.cpp
index b735ea7..91325f5 100644
--- plugins/tools/svgtexttool/SvgTextTool.cpp
+++ plugins/tools/svgtexttool/SvgTextTool.cpp
@@ -23,6 +23,7 @@
#include "SvgTextChangeCommand.h"
#include <QLabel>
+#include <QPainterPath>
#include <QToolButton>
#include <QGridLayout>
#include <QVBoxLayout>
diff --git a/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
index 9fd5578..6f5c298 100644
--- plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
+++ plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
@@ -20,6 +20,7 @@
#include <QPointF>
#include <QPainter>
+#include <QPainterPath>
#include <QMatrix4x4>
#include <KoResourcePaths.h>
diff --git a/plugins/tools/tool_transform2/kis_liquify_paint_helper.cpp b/plugins/tools/tool_transform2/kis_liquify_paint_helper.cpp
index 93b0067..83b79d4 100644
--- plugins/tools/tool_transform2/kis_liquify_paint_helper.cpp
+++ plugins/tools/tool_transform2/kis_liquify_paint_helper.cpp
@@ -18,6 +18,8 @@
#include "kis_liquify_paint_helper.h"
+#include <QPainterPath>
+
#include "kis_algebra_2d.h"
#include "KoPointerEvent.h"
#include <brushengine/kis_paint_information.h>
diff --git a/plugins/tools/tool_transform2/kis_liquify_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_liquify_transform_strategy.cpp
index 9662880..12d569b 100644
--- plugins/tools/tool_transform2/kis_liquify_transform_strategy.cpp
+++ plugins/tools/tool_transform2/kis_liquify_transform_strategy.cpp
@@ -22,6 +22,7 @@
#include <QPointF>
#include <QPainter>
+#include <QPainterPath>
#include "KoPointerEvent.h"
diff --git a/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
index 0cff5ed..b74d986 100644
--- plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
+++ plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
@@ -20,6 +20,7 @@
#include <QPointF>
#include <QPainter>
+#include <QPainterPath>
#include <QMatrix4x4>
#include <QVector2D>
diff --git a/plugins/tools/tool_transform2/kis_transform_strategy_base.cpp b/plugins/tools/tool_transform2/kis_transform_strategy_base.cpp
index 1e7603e..0671ed5 100644
--- plugins/tools/tool_transform2/kis_transform_strategy_base.cpp
+++ plugins/tools/tool_transform2/kis_transform_strategy_base.cpp
@@ -19,6 +19,7 @@
#include "kis_transform_strategy_base.h"
#include <QImage>
+#include <QPainterPath>
#include <QTransform>
#include "KoPointerEvent.h"
diff --git a/plugins/tools/tool_transform2/kis_transform_utils.cpp b/plugins/tools/tool_transform2/kis_transform_utils.cpp
index 1fbbd52..c7792f3 100644
--- plugins/tools/tool_transform2/kis_transform_utils.cpp
+++ plugins/tools/tool_transform2/kis_transform_utils.cpp
@@ -19,6 +19,7 @@
#include "kis_transform_utils.h"
#include <cmath>
+#include <QPainterPath>
#include <QTransform>
#include <KoUnit.h>
#include "tool_transform_args.h"
diff --git a/plugins/tools/tool_transform2/kis_warp_transform_strategy.cpp b/plugins/tools/tool_transform2/kis_warp_transform_strategy.cpp
index fdad9f3..9a2dd4d 100644
--- plugins/tools/tool_transform2/kis_warp_transform_strategy.cpp
+++ plugins/tools/tool_transform2/kis_warp_transform_strategy.cpp
@@ -22,6 +22,7 @@
#include <QPointF>
#include <QPainter>
+#include <QPainterPath>
#include "kis_coordinates_converter.h"
#include "tool_transform_args.h"
--
cgit v1.1


+ 1
- 1
graphics/librsvg2-rust/Makefile View File

@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= librsvg
PORTVERSION= 2.48.4
PORTVERSION= 2.48.5
CATEGORIES= graphics gnome
MASTER_SITES= GNOME
PKGNAMESUFFIX= 2-rust

+ 3
- 3
graphics/librsvg2-rust/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1587687243
SHA256 (gnome2/librsvg-2.48.4.tar.xz) = 28b63af85ced557383d3d3ece6e1f6938720dee1ecfa40d926bf1de4747c956e
SIZE (gnome2/librsvg-2.48.4.tar.xz) = 13152572
TIMESTAMP = 1590809079
SHA256 (gnome2/librsvg-2.48.5.tar.xz) = 7a578aa129078dc853e48dbb87c9b2986c0ebbdc985cea4125a05827d0dd99eb
SIZE (gnome2/librsvg-2.48.5.tar.xz) = 15429228

+ 3
- 1
graphics/nomacs/Makefile View File

@@ -17,9 +17,11 @@ LIB_DEPENDS= libexiv2.so:graphics/exiv2 \
libquazip5.so:archivers/quazip

USES= cmake compiler:c++11-lang desktop-file-utils \
pkgconfig qt:5
dos2unix pkgconfig qt:5
USE_QT= concurrent core gui network printsupport svg widgets \
buildtools_build linguisttools_build qmake_build
DOS2UNIX_FILES= ImageLounge/plugins/PaintPlugin/src/DkPaintPlugin.cpp \
ImageLounge/src/DkGui/DkWidgets.cpp

USE_LDCONFIG= yes


+ 10
- 0
graphics/nomacs/files/patch-ImageLounge_plugins_PageExtractionPlugin_src_DkPageSegmentation.cpp View File

@@ -0,0 +1,10 @@
--- ImageLounge/plugins/PageExtractionPlugin/src/DkPageSegmentation.cpp.orig 2020-05-30 09:28:31 UTC
+++ ImageLounge/plugins/PageExtractionPlugin/src/DkPageSegmentation.cpp
@@ -29,6 +29,7 @@
#pragma warning(push, 0) // no warnings from includes - begin
#include <QDebug>
#include <QPainter>
+#include <QPainterPath>
#include <opencv2/imgproc/imgproc_c.h>
#include <opencv2/imgproc/imgproc.hpp>

+ 10
- 0
graphics/nomacs/files/patch-ImageLounge_plugins_PaintPlugin_src_DkPaintPlugin.cpp View File

@@ -0,0 +1,10 @@
--- ImageLounge/plugins/PaintPlugin/src/DkPaintPlugin.cpp.orig 2020-05-30 09:28:31 UTC
+++ ImageLounge/plugins/PaintPlugin/src/DkPaintPlugin.cpp
@@ -30,6 +30,7 @@
#include <QDebug>
#include <QMouseEvent>
+#include <QPainterPath>
namespace nmp {

+ 10
- 0
graphics/nomacs/files/patch-ImageLounge_src_DkGui_DkThumbsWidgets.cpp View File

@@ -0,0 +1,10 @@
--- ImageLounge/src/DkGui/DkThumbsWidgets.cpp.orig 2020-05-30 09:28:31 UTC
+++ ImageLounge/src/DkGui/DkThumbsWidgets.cpp
@@ -61,6 +61,7 @@
#include <QMimeData>
#include <QThreadPool>
#include <QPushButton>
+#include <QPainterPath>
#pragma warning(pop) // no warnings from includes - end
namespace nmc {

+ 10
- 0
graphics/nomacs/files/patch-ImageLounge_src_DkGui_DkViewPort.cpp View File

@@ -0,0 +1,10 @@
--- ImageLounge/src/DkGui/DkViewPort.cpp.orig 2020-05-30 09:28:31 UTC
+++ ImageLounge/src/DkGui/DkViewPort.cpp
@@ -60,6 +60,7 @@
#include <QSvgRenderer>
#include <QMenu>
#include <QtConcurrentRun>
+#include <QPainterPath>
#include <qmath.h>
#pragma warning(pop) // no warnings from includes - end

+ 10
- 0
graphics/nomacs/files/patch-ImageLounge_src_DkGui_DkWidgets.cpp View File

@@ -0,0 +1,10 @@
--- ImageLounge/src/DkGui/DkWidgets.cpp.orig 2020-05-30 09:28:31 UTC
+++ ImageLounge/src/DkGui/DkWidgets.cpp
@@ -51,6 +51,7 @@
#include <QGraphicsPixmapItem>
#include <QLabel>
#include <QPainter>
+#include <QPainterPath>
#include <QPushButton>
#include <QMouseEvent>
#include <QToolButton>

+ 2
- 0
lang/myrddin/Makefile View File

@@ -11,6 +11,8 @@ COMMENT= Myrddin Compiler
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE

BUILD_DEPENDS= as:devel/binutils

ONLY_FOR_ARCHS= amd64

USES= gmake

+ 1
- 1
lang/rust-nightly/Makefile View File

@@ -18,7 +18,7 @@ DISTINFO_FILE= ${.CURDIR}/distinfo

# Get latest from top level 'date' key in
# https://static.rust-lang.org/dist/channel-rust-nightly.toml
NIGHTLY_DATE= 2020-05-18
NIGHTLY_DATE= 2020-05-30

# See WRKSRC/src/stage0.txt for this date
BOOTSTRAPS_DATE= 2020-04-22

+ 3
- 3
lang/rust-nightly/distinfo View File

@@ -1,6 +1,6 @@
TIMESTAMP = 1589822525
SHA256 (rust/2020-05-18/rustc-nightly-src.tar.xz) = 23e7c535045d04e4c74fc64eaa84f560011fa4ee24f89d8a19c8a3e94ff0f848
SIZE (rust/2020-05-18/rustc-nightly-src.tar.xz) = 95204620
TIMESTAMP = 1590800791
SHA256 (rust/2020-05-30/rustc-nightly-src.tar.xz) = 82b8cf5892c66444c9967340571c1d5b3917d33f0e8d8d1923f9c774858e8ede
SIZE (rust/2020-05-30/rustc-nightly-src.tar.xz) = 98643276
SHA256 (rust/2020-04-22/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 502b41362ba46e37dbf7c890b76e8b420d156f998bbf96f545e0ce68ce5a5ad6
SIZE (rust/2020-04-22/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 36152976
SHA256 (rust/2020-04-22/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 3919d86ce0f932d22f69670e3e353a9b5cc9463ed586ea52406b311fb270941e

+ 3
- 3
multimedia/kodi-addon-inputstream.adaptive-devel/Makefile View File

@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= inputstream.adaptive
DISTVERSION= 2.5.6
DISTVERSION= 2.6.0
DISTVERSIONSUFFIX= -Matrix
CATEGORIES= multimedia
PKGNAMEPREFIX= kodi-addon-
@@ -13,9 +13,9 @@ COMMENT= Adaptive stream support for Kodi
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE.GPL

BUILD_DEPENDS= kodi-devel>=19.0.a20200414:multimedia/kodi-devel
BUILD_DEPENDS= kodi-devel>=19.0.a20200530:multimedia/kodi-devel
LIB_DEPENDS= libexpat.so:textproc/expat2
RUN_DEPENDS= kodi-devel>=19.0.a20200414:multimedia/kodi-devel
RUN_DEPENDS= kodi-devel>=19.0.a20200530:multimedia/kodi-devel

USES= cmake
USE_GITHUB= yes

+ 3
- 3
multimedia/kodi-addon-inputstream.adaptive-devel/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1587867985
SHA256 (peak3d-inputstream.adaptive-2.5.6-Matrix_GH0.tar.gz) = 7f0e26ec8020413803806127832412acce33ff1bc5866d41b9ccb1ff28dc75c9
SIZE (peak3d-inputstream.adaptive-2.5.6-Matrix_GH0.tar.gz) = 731366
TIMESTAMP = 1590800541
SHA256 (peak3d-inputstream.adaptive-2.6.0-Matrix_GH0.tar.gz) = 5454975e7dcf35adda54031ba00c74534bdc9db33a8ec4dae5855a4b842e1f65
SIZE (peak3d-inputstream.adaptive-2.6.0-Matrix_GH0.tar.gz) = 731726

+ 2
- 0
multimedia/kodi-addon-peripheral.joystick-devel/Makefile View File

@@ -14,6 +14,8 @@ COMMENT= Joystick support for Kodi

LICENSE= GPLv2+

BROKEN= outdated and incompatible with Kodi addon API changes

BUILD_DEPENDS= ${LOCALBASE}/include/linux/joystick.h:devel/evdev-proto \
kodi-devel>=19.0.a20200414:multimedia/kodi-devel
LIB_DEPENDS= libtinyxml.so:textproc/tinyxml \

+ 3
- 3
multimedia/kodi-addon-vfs.libarchive-devel/Makefile View File

@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= vfs.libarchive
DISTVERSION= 1.2.0
DISTVERSION= 1.3.0
DISTVERSIONSUFFIX= -Matrix
CATEGORIES= multimedia
PKGNAMEPREFIX= kodi-addon-
@@ -12,10 +12,10 @@ COMMENT= VFS addon for Kodi to access archives directly

LICENSE= GPLv2+

BUILD_DEPENDS= kodi-devel>=19.0.a20200414:multimedia/kodi-devel
BUILD_DEPENDS= kodi-devel>=19.0.a20200530:multimedia/kodi-devel
LIB_DEPENDS= liblz4.so:archivers/liblz4 \
liblzo2.so:archivers/lzo2
RUN_DEPENDS= kodi-devel>=19.0.a20200414:multimedia/kodi-devel
RUN_DEPENDS= kodi-devel>=19.0.a20200530:multimedia/kodi-devel

USES= cmake libarchive ssl
USE_GITHUB= yes

+ 3
- 3
multimedia/kodi-addon-vfs.libarchive-devel/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1586912465
SHA256 (xbmc-vfs.libarchive-1.2.0-Matrix_GH0.tar.gz) = 9eaa76d91c4c85a665dfa4db815ab8db89e4c11df2c239a7d4cbca95e86b63bf
SIZE (xbmc-vfs.libarchive-1.2.0-Matrix_GH0.tar.gz) = 54410
TIMESTAMP = 1590800535
SHA256 (xbmc-vfs.libarchive-1.3.0-Matrix_GH0.tar.gz) = 0c82ef5917a01dca78590209206538e775e73dd4be23a8ed1e9cbae6d93ec989
SIZE (xbmc-vfs.libarchive-1.3.0-Matrix_GH0.tar.gz) = 54434

+ 5
- 4
multimedia/kodi-devel/Makefile View File

@@ -1,8 +1,7 @@
# $FreeBSD$

PORTNAME= kodi
DISTVERSION= 19.0.a20200414
PORTREVISION= 2
DISTVERSION= 19.0.a20200530
CATEGORIES= multimedia
PKGNAMESUFFIX= -devel

@@ -24,6 +23,7 @@ LIB_DEPENDS= libass.so:multimedia/libass \
libcdio.so:sysutils/libcdio \
libcrossguid.so:devel/libcrossguid \
libcurl.so:ftp/curl \
libdav1d.so:multimedia/dav1d \
libdrm.so:graphics/libdrm \
libdvdnav.so:multimedia/libdvdnav \
libdvdread.so:multimedia/libdvdread \
@@ -40,6 +40,7 @@ LIB_DEPENDS= libass.so:multimedia/libass \
libpcrecpp.so:devel/pcre \
libpng.so:graphics/png \
libpostproc.so:multimedia/ffmpeg \
libspdlog.so:devel/spdlog \
libswresample.so:multimedia/ffmpeg \
libswscale.so:multimedia/ffmpeg \
libtag.so:audio/taglib \
@@ -57,7 +58,7 @@ USES= autoreconf:build cmake:noninja compiler:c++11-lang gettext gl \
USE_GITHUB= yes
GH_ACCOUNT= xbmc
GH_PROJECT= xbmc
GH_TAGNAME= 75b31098a8800da653b373cd99a025b483029cfc
GH_TAGNAME= 3b954873c3ce93c3ceb176b06388ba9ba4f2d296
USE_GL= egl gl glu
USE_GNOME= libxml2 libxslt
USE_JAVA= yes
@@ -68,7 +69,7 @@ CMAKE_ARGS= -DDVDNAV_LIBRARY="${LOCALBASE}/lib/libdvdnav.so" \
-DDVDREAD_LIBRARY="${LOCALBASE}/lib/libdvdread.so" \
-DLIBDVD_INCLUDE_DIRS="${LOCALBASE}/include"
CMAKE_OFF= ENABLE_ALSA ENABLE_DVDCSS ENABLE_INTERNAL_CROSSGUID \
ENABLE_INTERNAL_FFMPEG
ENABLE_INTERNAL_FFMPEG ENABLE_TESTING
CONFIGURE_ENV= CPU_FEATURES=" Features=0xdeadbeef<${_CPU_FEATURES:ts,}>" \
OPENSSL_CFLAGS="-I${OPENSSLINC}" \
OPENSSL_LIBS="-L${OPENSSLLIB}"

+ 3
- 3
multimedia/kodi-devel/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1586912333
SHA256 (xbmc-xbmc-19.0.a20200414-75b31098a8800da653b373cd99a025b483029cfc_GH0.tar.gz) = bfde195b270a21037e3e8f851ae0da4006dc5337c224dc70258982b52016c081
SIZE (xbmc-xbmc-19.0.a20200414-75b31098a8800da653b373cd99a025b483029cfc_GH0.tar.gz) = 50810807
TIMESTAMP = 1590800927
SHA256 (xbmc-xbmc-19.0.a20200530-3b954873c3ce93c3ceb176b06388ba9ba4f2d296_GH0.tar.gz) = a714978b294afaaea5e7c6d3e32fef47fa17a7c179cede61cb43b2bb50817174
SIZE (xbmc-xbmc-19.0.a20200530-3b954873c3ce93c3ceb176b06388ba9ba4f2d296_GH0.tar.gz) = 50146606

+ 20
- 0
multimedia/kodi-devel/files/patch-system_settings_freebsd.xml View File

@@ -0,0 +1,20 @@
--- system/settings/freebsd.xml.orig 2020-05-30 01:10:01 UTC
+++ system/settings/freebsd.xml
@@ -26,7 +26,7 @@
<requirement>HAVE_LIBVDPAU</requirement>
<visible>false</visible>
<level>3</level>
- <default>true</default>
+ <default>false</default>
<dependencies>
<dependency type="enable">
<condition setting="videoplayer.usevdpau" operator="is">true</condition> <!-- USE VDPAU -->
@@ -74,7 +74,7 @@
</dependency>
</dependencies>
<level>3</level>
- <default>true</default>
+ <default>false</default>
<control type="toggle" />
</setting>
<setting id="videoplayer.usevaapimpeg4" type="boolean" parent="videoplayer.usevaapi" label="13449" help="13450">

+ 5
- 2
multimedia/kodi-devel/pkg-plist View File

@@ -27,6 +27,11 @@ include/kodi/addon-instance/Screensaver.h
include/kodi/addon-instance/VFS.h
include/kodi/addon-instance/VideoCodec.h
include/kodi/addon-instance/Visualization.h
include/kodi/c-api/addon-instance/image_decoder.h
include/kodi/c-api/addon_base.h
include/kodi/c-api/audio_engine.h
include/kodi/c-api/filesystem.h
include/kodi/c-api/network.h
include/kodi/gui/General.h
include/kodi/gui/ListItem.h
include/kodi/gui/Window.h
@@ -57,7 +62,6 @@ include/kodi/gui/gl/GL.h
include/kodi/gui/gl/GLonDX.h
include/kodi/gui/gl/Shader.h
include/kodi/gui/renderHelper.h
include/kodi/kodi_vfs_types.h
include/kodi/libKODI_guilib.h
include/kodi/libXBMC_addon.h
include/kodi/libXBMC_pvr.h
@@ -65,7 +69,6 @@ include/kodi/platform/android/System.h
include/kodi/tools/DllHelper.h
include/kodi/versions.h
include/kodi/xbmc_addon_dll.h
include/kodi/xbmc_epg_types.h
include/kodi/xbmc_pvr_dll.h
include/kodi/xbmc_pvr_types.h
%%GBM%%lib/kodi/kodi-gbm

+ 2
- 0
net/zerotier/Makefile View File

@@ -15,6 +15,8 @@ LICENSE_FILE_BUSINESS= ${WRKSRC}/LICENSE.txt
LICENSE_FILE_MIT= ${WRKSRC}/ext/json/LICENSE.MIT
LICENSE_PERMS_BUSINESS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

BUILD_DEPENDS= as:devel/binutils

USES= gmake compiler:c++14-lang
USE_RC_SUBR= zerotier


+ 1
- 1
ports-mgmt/portlint/Makefile View File

@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= portlint
PORTVERSION= 2.18.11
PORTVERSION= 2.19.0
CATEGORIES= ports-mgmt
MASTER_SITES= # none
DISTFILES= # none

+ 3
- 2
ports-mgmt/portlint/src/portlint.1 View File

@@ -1,5 +1,5 @@
.\" $FreeBSD$
.\" $MCom: portlint/portlint.1,v 1.13 2013/07/07 22:34:01 marcus Exp $
.\" $MCom: portlint/portlint.1,v 1.14 2020/05/30 13:03:55 jclarke Exp $
.\"
.\" Copyright (c) 1997 by Jun-ichiro Hagino <itojun@itojun.org>.
.\" All Rights Reserved. Absolutely no warranty.
@@ -71,7 +71,8 @@ Show the progress report for items that are being checked.
.It Fl t
Nit pick about use of spaces.
.It Fl A
Turn on all additional checks.
Turn on all additional checks. This is equivalent to
.Fl abcmNt .
.It Fl C
Pedantic committer flag. This is equivalent to
.Fl abcmt .

+ 67
- 28
ports-mgmt/portlint/src/portlint.pl View File

@@ -15,7 +15,7 @@
# was removed.
#
# $FreeBSD$
# $MCom: portlint/portlint.pl,v 1.505 2020/03/02 22:19:11 jclarke Exp $
# $MCom: portlint/portlint.pl,v 1.510 2020/05/30 13:40:58 jclarke Exp $
#

use strict;
@@ -49,8 +49,8 @@ $portdir = '.';

# version variables
my $major = 2;
my $minor = 18;
my $micro = 11;
my $minor = 19;
my $micro = 0;

# default setting - for FreeBSD
my $portsdir = '/usr/ports';
@@ -122,7 +122,16 @@ $makeenv = $opt_M if $opt_M;
$portdir = $ARGV[0] ? $ARGV[0] : '.';

# The PORTSDIR environment variable overrides our defaults.
$portsdir = $ENV{PORTSDIR} if ( defined $ENV{'PORTSDIR'} );
# And if PORTSDIR is defined in /etc/make.conf, that will
# be checked next.
if (defined $ENV{'PORTSDIR'}) {
$portsdir = $ENV{PORTSDIR};
} else {
my $mconf_portsdir = &get_makeconf_var('PORTSDIR');
if ($mconf_portsdir ne '') {
$portsdir = $mconf_portsdir;
}
}
$ENV{'PL_SVN_IGNORE'} //= '';
my $mfile_moved = "${portsdir}/MOVED";
my $mfile_uids = "${portsdir}/UIDs";
@@ -160,7 +169,7 @@ my @varlist = qw(
ALLFILES CHECKSUM_ALGORITHMS INSTALLS_ICONS GNU_CONFIGURE
CONFIGURE_ARGS MASTER_SITE_SUBDIR LICENSE LICENSE_COMB NO_STAGE
DEVELOPER SUB_FILES SHEBANG_LANG MASTER_SITES_SUBDIRS FLAVORS
USE_PYTHON LICENSE_PERMS USE_PYQT
USE_PYTHON LICENSE_PERMS USE_PYQT USE_GITHUB USE_GITLAB
);

my %makevar;
@@ -1132,6 +1141,13 @@ sub check_depends_syntax {
print "OK: $j refers to $1, skipping checks.\n"
if ($verbose);
next;
} elsif ($j ne 'DEPENDS' && $i =~ /^\$\{([A-Z_]+DEPENDS)}\s*$/ && !$seen_depends{$1}) {
# XXX: technically we don't need this elsif block (we could remove the seen_depends check above)
# but I don't like that one can use a variable before they've declared it.
#&perror("FATAL", $file, -1, "$j points to ${dtype}DEPENDS which has not yet been defined.");
print "OK: (kinda) $j refers to $1 (which hasn't been declared yet, but it will work), skipping checks.\n"
if ($verbose);
next;
}
print "OK: checking ports listed in $j.\n" if ($verbose);
my @ks = split(/\s+/, $i);
@@ -1141,7 +1157,7 @@ sub check_depends_syntax {
last;
}
my $ok = $k;
if ($k =~ /^\$\{(\w+)\}$/) {
if ($k =~ /^\$\{([^\}]+)\}$/) {
$k = get_makevar_shallow($1);
push @ks, split(/\s+/, $k);
next;
@@ -1761,12 +1777,16 @@ sub checkmakefile {
}
}

my %seen_opts = ();
foreach my $i ((@opt, @aopt, @aropt)) {
# skip global options
next if ($i eq 'DOCS' or $i eq 'NLS' or $i eq 'EXAMPLES' or $i eq 'IPV6' or $i eq 'X11' or $i eq 'DEBUG');
my $odescr = &get_makevar("${i}_DESC");
if (!$odescr) {
&perror("FATAL", $file, -1, "OPTION $i does not have a description (${i}_DESC).");
if (!$seen_opts{$i}) {
$seen_opts{$i}++;
my $odescr = &get_makevar("${i}_DESC");
if ($odescr eq "" && $whole !~ /^${i}_DESC.?=/m) {
&perror("FATAL", $file, -1, "OPTION $i does not have a description (${i}_DESC).");
}
}
if (!grep(/^$i$/, (@mopt, @popt))) {
if ($whole !~ /\n${i}_($m)(_\w+)?(.)?=[^\n]+/ and $whole !~ /\n[-\w]+-${i}-(on|off):\n/) {
@@ -1952,9 +1972,9 @@ sub checkmakefile {
);
print "OK: checking to see if certain macros are sorted.\n" if ($verbose);
foreach my $sorted_macro (@macros_to_sort) {
while ($whole =~ /\n$sorted_macro.?=\s*(.+)\n/g) {
while ($whole =~ /\n$sorted_macro.?=\s*([^#]+)(#.*)?\n/g) {
my $lineno = &linenumber($`);
my $srex = $1;
my $srex = chomp($1);
my @smacros = sort(split / /, $srex);
if (join(" ", @smacros) ne $srex) {
&perror("WARN", $file, $lineno, "the arguments to $sorted_macro ".
@@ -3029,31 +3049,34 @@ DIST_SUBDIR EXTRACT_ONLY
}

# if DISTFILES have only single item, it is better to avoid DISTFILES
# and to use combination of DISTNAME and EXTRACT_SUFX.
# and to use combination of DISTNAME and EXTRACT_SUFX (unless USE_GITHUB
# or USE_GITLAB is set to nodefault in which case it is fine).
# example:
# DISTFILES=package-1.0.tgz
# should be
# DISTNAME= package-1.0
# EXTRACT_SUFX= .tgz
if ($distfiles =~ /^\S+$/ && $distfiles !~ /:[^\/:]+$/) {
$bogusdistfiles++;
print "OK: seen DISTFILES with single item, checking value.\n"
if ($verbose);
&perror("WARN", $file, -1, "use of DISTFILES with single file ".
"discouraged. distribution filename should be set by ".
"DISTNAME and EXTRACT_SUFX.");
if ($distfiles eq (($distname ne '') ? $distname : "$portname-$portversion") . $extractsufx) {
&perror("WARN", $file, -1, "definition of DISTFILES not necessary. ".
"DISTFILES is \${DISTNAME}/\${EXTRACT_SUFX} ".
"by default.");
}
if ($makevar{USE_GITHUB} ne 'nodefault' && $makevar{USE_GITLUB} ne 'nodefault') {
if ($distfiles =~ /^\S+$/ && $distfiles !~ /:[^\/:]+$/) {
$bogusdistfiles++;
print "OK: seen DISTFILES with single item, checking value.\n"
if ($verbose);
&perror("WARN", $file, -1, "use of DISTFILES with single file ".
"discouraged. distribution filename should be set by ".
"DISTNAME and EXTRACT_SUFX.");
if ($distfiles eq (($distname ne '') ? $distname : "$portname-$portversion") . $extractsufx) {
&perror("WARN", $file, -1, "definition of DISTFILES not necessary. ".
"DISTFILES is \${DISTNAME}/\${EXTRACT_SUFX} ".
"by default.");
}

# display advice only in certain cases.
# display advice only in certain cases.
#MICHAEL: will this work with multiple distfiles in this list? what about
# doing the same sort of thing for DISTNAME, is it needed?
if ($distfiles =~ /^\Q$i\E([\-.].+)$/) {
&perror("WARN", $file, -1, "how about \"EXTRACT_SUFX=$1\"".
", instead of DISTFILES?");
if ($distfiles =~ /^\Q$i\E([\-.].+)$/) {
&perror("WARN", $file, -1, "how about \"EXTRACT_SUFX=$1\"".
", instead of DISTFILES?");
}
}
}

@@ -3845,6 +3868,22 @@ sub get_makevar_raw {
return $result;
}

# This uses a "null" makefile to extract options from /etc/make.conf without any overrides.
sub get_makeconf_var {
my($cmd, $result);

$cmd = join(' -V ', "echo '' | make $makeenv -f -", map { "'$_'"} @_);
$result =`$cmd`;
chomp $result;

$result =~ s/\n\n/\n\0\n/g;
if (${^CHILD_ERROR_NATIVE} != 0) {
die "\nFATAL ERROR: make(1) died with status ${^CHILD_ERROR_NATIVE} and returned '$result'";
}

return $result;
}

sub is_predefined {
my($url, $file) = @_;
my($site, $site_re);

+ 2
- 0
security/akmos/Makefile View File

@@ -11,6 +11,8 @@ COMMENT= Cryptographic library with low footprint
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE

BUILD_DEPENDS= as:devel/binutils

USES= cmake compiler:c++11-lang

USE_GITHUB= yes

+ 2
- 0
security/nflib/Makefile View File

@@ -13,6 +13,8 @@ COMMENT= NTT-based fast lattice cryptography library
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/MIT_LICENSE.txt

BUILD_DEPENDS= as:devel/binutils

ONLY_FOR_ARCHS= amd64
ONLY_FOR_ARCHS_REASON= unconditionally includes amd64 assembler code


+ 3
- 0
textproc/py-sphinx/Makefile View File

@@ -50,6 +50,9 @@ CONFLICTS_INSTALL= py*-sphinx18

NO_ARCH= yes

# Upstream archive contains files with UTF-8 names (#246618)
EXTRACT_CMD= ${SETENV} LC_ALL=en_US.UTF-8 /usr/bin/bsdtar

do-test:
@cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs -o addopts=


+ 0
- 1
www/Makefile View File

@@ -410,7 +410,6 @@
SUBDIR += mongoose
SUBDIR += mongrel2
SUBDIR += moodle35
SUBDIR += moodle36
SUBDIR += moodle37
SUBDIR += moodle38
SUBDIR += morty

+ 0
- 64
www/moodle36/Makefile View File

@@ -1,64 +0,0 @@
# Created by: Javier Martin Rueda <jmrueda@diatel.upm.es>
# $FreeBSD$

PORTNAME= moodle
PORTVERSION= 3.6.10
CATEGORIES= www
MASTER_SITES= SF/moodle/Moodle/stable36/
PKGNAMESUFFIX= ${PKGORIGIN:T:S/moodle//}${PHP_PKGNAMESUFFIX}

MAINTAINER= wen@FreeBSD.org
COMMENT= Course management system based on social constructionism

LICENSE= GPLv3

CONFLICTS= moodle35-3.5.[0-9]* moodle37-3.7.[0-9]* moodle38-3.8-[0-9]*

DEPRECATED= EOLed upstream
EXPIRATION_DATE= 2020-05-30

USES= cpe php:flavors tar:tgz
USE_PHP= ctype curl dom fileinfo gd hash iconv intl json mbstring \
opcache openssl pcre session simplexml soap spl tokenizer \
xml xmlreader xmlrpc zip zlib
WRKSRC= ${WRKDIR}/moodle

OPTIONS_SINGLE= BACKEND
OPTIONS_SINGLE_BACKEND= MYSQL PGSQL MSSQL
OPTIONS_DEFINE= LDAP
OPTIONS_DEFAULT= MYSQL

MYSQL_USES= mysql
MYSQL_USE= php=mysqli
PGSQL_USE= php=pgsql
MSSQL_USE= php=mssql
LDAP_USE= php=ldap

NO_BUILD= yes
PLIST= ${WRKDIR}/plist
SUB_FILES= pkg-message
SUB_LIST= MOODLEDIR=${MOODLEDIR} \
MOODLEDATADIR=${MOODLEDATADIR}

MOODLEDIR?= www/moodle
MOODLEDATADIR?= moodledata

pre-install:
@${ECHO_CMD} "@owner ${WWWOWN}" >> ${PLIST}
@${ECHO_CMD} "@group ${WWWGRP}" >> ${PLIST}
@${ECHO_CMD} "@mode 755" >> ${PLIST}
@${ECHO} @dir ${MOODLEDATADIR} >> ${PLIST}
@${ECHO_CMD} "@mode" >> ${PLIST}
@${ECHO_CMD} "@group" >> ${PLIST}
@${ECHO_CMD} "@owner" >> ${PLIST}

# Here for safety I do not set moodle diretory 0755 permission
# It require user write config.php manually then.
@${FIND} -s -d ${WRKSRC} -type f | ${SED} "s?${WRKSRC}?${MOODLEDIR}?g" >>${PLIST}
@${FIND} -s -d ${WRKSRC} -type d | ${SED} "s?${WRKSRC}?@dir ${MOODLEDIR}?g" >> ${PLIST}

do-install:
@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${MOODLEDIR}
@${INSTALL} -d ${STAGEDIR}${PREFIX}/${MOODLEDATADIR}

.include <bsd.port.mk>

+ 0
- 3
www/moodle36/distinfo View File

@@ -1,3 +0,0 @@
TIMESTAMP = 1589251773
SHA256 (moodle-3.6.10.tgz) = cd942858f24d1382eee2fc53a7457ab1ca8de043aa5e0701e51e51923d76c607
SIZE (moodle-3.6.10.tgz) = 47830177

+ 0
- 59
www/moodle36/files/pkg-message.in View File

@@ -1,59 +0,0 @@
[
{ type: install
message: <<EOM
1) Create a user and a database for Moodle to store all
its tables in (or choose an existing database).
It doesn't matter what the database or user names are,
as this will be configured in a later step.
NOTE: this package assumes that either the phpX-pgsql,
phpX-mysql, or phpX-mssql packages are installed.

2) Add the following to your Apache configuration file
httpd.conf, and restart the server:

Alias /moodle %%PREFIX%%/%%MOODLEDIR%%/
AcceptPathInfo On
<Directory %%PREFIX%%/%%MOODLEDIR%%/>
AllowOverride None
Require all granted
</Directory>

3) Visit your Moodle site with a browser (i.e.,
http://your.server.com/moodle/), and you should
be taken to the install.php script, which will lead
you through creating a config.php file and then
setting up Moodle, creating an admin account, etc.

At one step, you will get a message saying that the
installer script was not able to automatically create
the config.php file. Just download it and copy it to
%%PREFIX%%/%%MOODLEDIR%%/config.php. Beware that it
will contain the database password in cleartext, so
set up whatever file permissions you deem more adequate.
For instance, user=root, group=www, mask=640.

4) Set up a cron task to invoke the file admin/cron.php
every five minutes or so. For instance:
*/5 * * * * fetch http://your.server.com/moodle/admin/cron.php

For more information, see the INSTALL DOCUMENTATION:

http://docs.moodle.org/en/Installing_Moodle

It may be worth reading the installation docs even if Moodle seems
to be working at first, to ensure your PHP settings and database
configuration will allow Moodle to operate properly.
EOM
}
{ type: upgrade
message: <<EOM
If you are upgrading from an earlier version of Moodle, check out
possible additional steps at:

https://docs.moodle.org/36/en/Upgrading

If you have real trouble, please visit the Moodle course
"Using Moodle" on moodle.org.
EOM
}
]

+ 0
- 7
www/moodle36/pkg-descr View File

@@ -1,7 +0,0 @@
Moodle is a course management system (CMS) - a free, Open Source software
package designed using sound pedagogical principles, to help educators
create effective online learning communities. You can use it on any
computer you have handy (including webhosts), yet it can scale from a
single-teacher site to a 40,000-student University.

WWW: http://www.moodle.org/

+ 2
- 5
www/w3m/Makefile View File

@@ -24,10 +24,10 @@ USE_HARDENING= safestack

GH_ACCOUNT= tats
GH_PROJECT= w3m
GH_TAGNAME= 4efb3ca
GH_TAGNAME= aa078ed

MAKE_JOBS_UNSAFE= yes
SNAPDATE= 20200316
SNAPDATE= 20200507

CONFLICTS?= ja-w3m-0.5.* ja-w3m-img-0.5.* w3m-img-0.5.*
GNU_CONFIGURE= yes
@@ -81,9 +81,6 @@ post-patch:
${WRKSRC}/configure
@${FIND} ${WRKSRC}/doc* -type f \! -name HISTORY \
-exec ${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' {} +
@${CP} ${WRKSRC}/doc-jp/README.func ${WRKSRC}/README.func.bak
@${ICONV_CMD} -f EUC-JP -t UTF-8 ${WRKSRC}/README.func.bak \
> ${WRKSRC}/doc-jp/README.func
@${CP} ${WRKSRC}/scripts/w3mhelp-funcdesc.ja.pl.in \
${WRKSRC}/scripts/w3mhelp-funcdesc.ja.pl.in.bak
@${ICONV_CMD} -f EUC-JP -t UTF-8 \

+ 3
- 3
www/w3m/distinfo View File

@@ -1,3 +1,3 @@
TIMESTAMP = 1584781215
SHA256 (tats-w3m-0.5.3.20200316-4efb3ca_GH0.tar.gz) = 2470802f1b09faaae452f04cdf93986185370ccf9b344c6df1f13ec512aa55d9
SIZE (tats-w3m-0.5.3.20200316-4efb3ca_GH0.tar.gz) = 2184681
TIMESTAMP = 1590844059
SHA256 (tats-w3m-0.5.3.20200507-aa078ed_GH0.tar.gz) = 5c2e9dc0408523f7b03c19040123d5ce59b226b4685d87d7bd4fe7e92f24acf8
SIZE (tats-w3m-0.5.3.20200507-aa078ed_GH0.tar.gz) = 2194480

Loading…
Cancel
Save