Am Sun, 8 Dec 2019 11:18:14 -0500
schrieb Daniel Jakots <[email protected]>:
> On Sun, 8 Dec 2019 17:12:29 +0100, Henry Jensen <[email protected]>
> wrote:
>
> > I attached the complete port, since "cvs diff -uRN" didn't create
> > diffs for the newly added files. despite it says so in the command
> > description.
>
> Did you cvs add them beforehand? If so, they should appear.
Ah, you got me. My bad! Anyway, I attached the diff now.
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/claws-mail/Makefile,v
retrieving revision 1.123
diff -u -p -u -r1.123 Makefile
--- Makefile 18 Nov 2019 19:57:44 -0000 1.123
+++ Makefile 8 Dec 2019 16:31:58 -0000
@@ -14,7 +14,7 @@ PKGNAME-spamassassin= claws-mail-spamass
PKGNAME-pdfviewer= claws-mail-pdfviewer-${V}
PKGNAME-gdata= claws-mail-gdata-${V}
-REVISION-main= 0
+REVISION-main= 1
REVISION-gdata= 0
CATEGORIES= mail news
@@ -53,7 +53,7 @@ WANTLIB += sasl2 ssl xcb xcb-render xcb-
WANTLIB-main = ${WANTLIB}
WANTLIB-main += ICE SM X11-xcb archive assuan b2 bz2 c canberra canberra-gtk
WANTLIB-main += charset cairo-gobject db dbus-1 dbus-glib-1 enchant gmp gnutls gpg-error
-WANTLIB-main += gpgme hogweed ical icalss icalvcal icudata icui18n icuuc idn2
+WANTLIB-main += gpgme gumbo hogweed ical icalss icalvcal icudata icui18n icuuc idn2
WANTLIB-main += ltdl lz4 lzma nettle notify ogg p11-kit perl rsvg-2
WANTLIB-main += startup-notification-1 ${COMPILER_LIBCXX} tasn1 unistring vorbis
WANTLIB-main += vorbisfile xcb-util xml2 zstd
@@ -89,6 +89,7 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
security/libnettle \
textproc/enchant \
textproc/libical \
+ www/gumbo \
x11/dbus-glib
LIB_DEPENDS-pdfviewer= ${LIB_DEPENDS} \
Index: patches/patch-src_plugins_litehtml_viewer_Makefile_in
===================================================================
RCS file: patches/patch-src_plugins_litehtml_viewer_Makefile_in
diff -N patches/patch-src_plugins_litehtml_viewer_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_plugins_litehtml_viewer_Makefile_in 8 Dec 2019 16:31:58 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/plugins/litehtml_viewer/Makefile.in
+--- src/plugins/litehtml_viewer/Makefile.in.orig
++++ src/plugins/litehtml_viewer/Makefile.in
+@@ -171,7 +171,7 @@ AM_V_at = $(am__v_at_@AM_V@)
+ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
+-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -iquote.@am__isrc@ -iquote$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+ am__maybe_remake_depfiles = depfiles
+ am__depfiles_remade = \
Index: patches/patch-src_plugins_litehtml_viewer_litehtml_Makefile_in
===================================================================
RCS file: patches/patch-src_plugins_litehtml_viewer_litehtml_Makefile_in
diff -N patches/patch-src_plugins_litehtml_viewer_litehtml_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_plugins_litehtml_viewer_litehtml_Makefile_in 8 Dec 2019 16:31:58 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/plugins/litehtml_viewer/litehtml/Makefile.in
+--- src/plugins/litehtml_viewer/litehtml/Makefile.in.orig
++++ src/plugins/litehtml_viewer/litehtml/Makefile.in
+@@ -154,7 +154,7 @@ AM_V_at = $(am__v_at_@AM_V@)
+ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 =
+-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -iquote.@am__isrc@ -iquote$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+ am__maybe_remake_depfiles = depfiles
+ am__depfiles_remade = ./$(DEPDIR)/liblitehtml_la-background.Plo \
Index: patches/patch-src_plugins_litehtml_viewer_litehtml_background_cpp
===================================================================
RCS file: patches/patch-src_plugins_litehtml_viewer_litehtml_background_cpp
diff -N patches/patch-src_plugins_litehtml_viewer_litehtml_background_cpp
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_plugins_litehtml_viewer_litehtml_background_cpp 8 Dec 2019 16:31:58 -0000
@@ -0,0 +1,10 @@
+$OpenBSD$
+
+Index: src/plugins/litehtml_viewer/litehtml/background.cpp
+--- src/plugins/litehtml_viewer/litehtml/background.cpp.orig
++++ src/plugins/litehtml_viewer/litehtml/background.cpp
+@@ -1,3 +1,4 @@
++#include "stddef.h"
+ #include "html.h"
+ #include "background.h"
+
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/mail/claws-mail/pkg/PLIST-main,v
retrieving revision 1.41
diff -u -p -u -r1.41 PLIST-main
--- pkg/PLIST-main 1 Jan 2019 18:01:20 -0000 1.41
+++ pkg/PLIST-main 8 Dec 2019 16:31:58 -0000
@@ -268,6 +268,8 @@ lib/claws-mail/plugins/fetchinfo.la
lib/claws-mail/plugins/fetchinfo.so
lib/claws-mail/plugins/libravatar.la
lib/claws-mail/plugins/libravatar.so
+lib/claws-mail/plugins/litehtml_viewer.la
+lib/claws-mail/plugins/litehtml_viewer.so
lib/claws-mail/plugins/mailmbox.la
lib/claws-mail/plugins/mailmbox.so
lib/claws-mail/plugins/managesieve.la
