Hi ports --
The easiest way to deal with the drawpile fallout from the newer
libmicrohttpd is to just update it. The attached does this.
Here is the news covering all the changes: https://drawpile.net/news/
Note too this is supposed to be the last C++ version; future versions
will be written in Rust.
Please test with the libmicrohttpd update (see my previous email).
Run tests OK on my machine with the new libmicrohttpd.
OK?
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/drawpile/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile 28 May 2022 06:20:01 -0000 1.29
+++ Makefile 1 Jun 2022 23:30:15 -0000
@@ -1,7 +1,6 @@
COMMENT = collaborative drawing program
-DISTNAME = drawpile-2.1.17
+DISTNAME = drawpile-2.1.20
CATEGORIES = graphics x11
-REVISION = 0
HOMEPAGE = https://drawpile.net/
MAINTAINER = Brian Callahan <bcal...@openbsd.org>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/drawpile/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo 20 May 2020 15:43:22 -0000 1.18
+++ distinfo 1 Jun 2022 23:30:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (drawpile-2.1.17.tar.gz) = 7n97qB5vGpw8MidfhDZNEHE8JOwEDajLSxPD6muwkIY=
-SIZE (drawpile-2.1.17.tar.gz) = 2521585
+SHA256 (drawpile-2.1.20.tar.gz) = ovRei3SChUKI63t/nbCWHHnwEpq5IhYoD9uURX4ND6k=
+SIZE (drawpile-2.1.20.tar.gz) = 2631090
Index: patches/patch-src_desktop_bundled_QtColorWidgets_color_wheel_cpp
===================================================================
RCS file: patches/patch-src_desktop_bundled_QtColorWidgets_color_wheel_cpp
diff -N patches/patch-src_desktop_bundled_QtColorWidgets_color_wheel_cpp
--- patches/patch-src_desktop_bundled_QtColorWidgets_color_wheel_cpp 11 Mar
2022 19:22:15 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-Index: src/desktop/bundled/QtColorWidgets/color_wheel.cpp
---- src/desktop/bundled/QtColorWidgets/color_wheel.cpp.orig
-+++ src/desktop/bundled/QtColorWidgets/color_wheel.cpp
-@@ -25,6 +25,7 @@
- #include <QtMath>
- #include <QMouseEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QLineF>
- #include <QDragEnterEvent>
- #include <QMimeData>
Index: patches/patch-src_desktop_widgets_popupmessage_h
===================================================================
RCS file: patches/patch-src_desktop_widgets_popupmessage_h
diff -N patches/patch-src_desktop_widgets_popupmessage_h
--- patches/patch-src_desktop_widgets_popupmessage_h 11 Mar 2022 19:22:15
-0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-Index: src/desktop/widgets/popupmessage.h
---- src/desktop/widgets/popupmessage.h.orig
-+++ src/desktop/widgets/popupmessage.h
-@@ -20,6 +20,7 @@
- #define POPUPMESSAGE_H
-
- #include <QWidget>
-+#include <QPainterPath>
-
- class QTextDocument;
- class QTimer;
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/drawpile/pkg/PLIST,v
retrieving revision 1.21
diff -u -p -r1.21 PLIST
--- pkg/PLIST 11 Mar 2022 19:22:15 -0000 1.21
+++ pkg/PLIST 1 Jun 2022 23:30:15 -0000
@@ -1,5 +1,5 @@
bin/drawpile
-@bin bin/drawpile-2.1.17
+@bin bin/drawpile-2.1.20
@bin bin/drawpile-srv
@man man/man1/drawpile-srv.1
share/applications/net.drawpile.drawpile.desktop
@@ -18,8 +18,10 @@ share/drawpile/drawpile/i18n/
share/drawpile/drawpile/i18n/drawpile_cs.qm
share/drawpile/drawpile/i18n/drawpile_de.qm
share/drawpile/drawpile/i18n/drawpile_fi.qm
+share/drawpile/drawpile/i18n/drawpile_fr.qm
share/drawpile/drawpile/i18n/drawpile_it.qm
share/drawpile/drawpile/i18n/drawpile_ja.qm
+share/drawpile/drawpile/i18n/drawpile_pt.qm
share/drawpile/drawpile/i18n/drawpile_ru.qm
share/drawpile/drawpile/i18n/drawpile_uk.qm
share/drawpile/drawpile/i18n/drawpile_vi.qm
@@ -45,7 +47,7 @@ share/drawpile/drawpile/theme/dark/
share/drawpile/drawpile/theme/dark/application-exit.svg
share/drawpile/drawpile/theme/dark/application-menu.svg
share/drawpile/drawpile/theme/dark/color-picker.svg
-share/drawpile/drawpile/theme/dark/configure-shortcuts.svg
+share/drawpile/drawpile/theme/dark/configure.svg
share/drawpile/drawpile/theme/dark/cursor-arrow.svg
share/drawpile/drawpile/theme/dark/document-export.svg
share/drawpile/drawpile/theme/dark/document-new.svg
@@ -97,6 +99,7 @@ share/drawpile/drawpile/theme/dark/irc-u
share/drawpile/drawpile/theme/dark/layer-visible-off.svg
share/drawpile/drawpile/theme/dark/layer-visible-on.svg
share/drawpile/drawpile/theme/dark/list-add.svg
+share/drawpile/drawpile/theme/dark/list-remove.svg
share/drawpile/drawpile/theme/dark/media-playback-pause.svg
share/drawpile/drawpile/theme/dark/media-playback-start.svg
share/drawpile/drawpile/theme/dark/media-record.svg
@@ -123,7 +126,7 @@ share/drawpile/drawpile/theme/light/
share/drawpile/drawpile/theme/light/application-exit.svg
share/drawpile/drawpile/theme/light/application-menu.svg
share/drawpile/drawpile/theme/light/color-picker.svg
-share/drawpile/drawpile/theme/light/configure-shortcuts.svg
+share/drawpile/drawpile/theme/light/configure.svg
share/drawpile/drawpile/theme/light/cursor-arrow.svg
share/drawpile/drawpile/theme/light/document-export.svg
share/drawpile/drawpile/theme/light/document-new.svg
@@ -175,6 +178,7 @@ share/drawpile/drawpile/theme/light/irc-
share/drawpile/drawpile/theme/light/layer-visible-off.svg
share/drawpile/drawpile/theme/light/layer-visible-on.svg
share/drawpile/drawpile/theme/light/list-add.svg
+share/drawpile/drawpile/theme/light/list-remove.svg
share/drawpile/drawpile/theme/light/media-playback-pause.svg
share/drawpile/drawpile/theme/light/media-playback-start.svg
share/drawpile/drawpile/theme/light/media-record.svg
