Hi,
First read the mail from Landry about webkit if needed [1]. I talked
with upstream about it, they told me that first they'd need to move
claws-mail to gtk3 and then it would be possible to depends on a newer
and less vulnerable webkit. So let's remove the subpackage htmlviewer
so we can get rid of it. While diving into configure, I disabled a few
things that seems useless (thus bumping main revision).
I'm not totally sure about what I did so I appreciate any review (and
test if you use claws-mail).
I also attach the quirks diff, of course, but don't care about the
py-markdown chunk, I was just too lazy to remove it from my tree etc.
[1]: https://marc.info/?l=openbsd-ports&m=148585584015126&w=2
Comments? OK?
Cheers,
Daniel
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.435
diff -u -p -r1.435 Makefile
--- Makefile 31 Jan 2017 21:53:07 -0000 1.435
+++ Makefile 2 Feb 2017 14:58:15 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-2.280
+PKGNAME = quirks-2.281
PKG_ARCH = *
MAINTAINER = Marc Espie <[email protected]>
Index: files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.447
diff -u -p -r1.447 Quirks.pm
--- files/Quirks.pm 31 Jan 2017 21:53:07 -0000 1.447
+++ files/Quirks.pm 2 Feb 2017 14:58:15 -0000
@@ -409,6 +409,7 @@ my $stem_extensions = {
'py-ripe.atlas.tools' => 'ripe.atlas.tools',
'u-boot' => 'u-boot-arm',
'ja-w3m' => 'w3m',
+ 'markdown' => 'py-markdown',
};
my $obsolete_reason = {
@@ -905,6 +906,7 @@ my $obsolete_reason = {
'rednotebook' => 5,
'py-webkitgtk' => 2,
'xombrero' => 3,
+ 'claws-mail-htmlviewe' => 2,
};
# reasons for obsolete packages
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/claws-mail/Makefile,v
retrieving revision 1.96
diff -u -p -r1.96 Makefile
--- Makefile 17 Dec 2016 20:43:36 -0000 1.96
+++ Makefile 2 Feb 2017 15:10:53 -0000
@@ -4,7 +4,6 @@ COMMENT-main= mail and news client
COMMENT-bogofilter= bogofilter plugin
COMMENT-clamav= clamav plugin
COMMENT-spamassassin= spamassassin plugin
-COMMENT-htmlviewer= fancy htmlviewer plugin
COMMENT-pdfviewer= pdfviewer plugin
COMMENT-gdata= gdata plugin
@@ -13,9 +12,9 @@ DISTNAME= claws-mail-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-bogofilter= claws-mail-bogofilter-${V}
PKGNAME-spamassassin= claws-mail-spamassassin-${V}
-PKGNAME-htmlviewer= claws-mail-htmlviewer-${V}
PKGNAME-pdfviewer= claws-mail-pdfviewer-${V}
PKGNAME-gdata= claws-mail-gdata-${V}
+REVISION-main= 0
REVISION-pdfviewer= 0
CATEGORIES= mail news
@@ -30,7 +29,7 @@ MASTER_SITES= http://www.claws-mail.org
DIST_SUBDIR= claws
-MULTI_PACKAGES= -main -bogofilter -spamassassin -htmlviewer -pdfviewer -gdata
+MULTI_PACKAGES= -main -bogofilter -spamassassin -pdfviewer -gdata
FLAVORS= jpilot ldap
FLAVOR?=
@@ -62,15 +61,6 @@ WANTLIB-gdata += gck-1 gcr-base-3 gcrypt
WANTLIB-gdata += lzma nspr4 nss3 oauth p11-kit plc4 plds4 smime3 softokn3
WANTLIB-gdata += soup-2.4 sqlite3 ssl3 xml2
-WANTLIB-htmlviewer = ${WANTLIB}
-WANTLIB-htmlviewer += EGL GL ICE SM X11-xcb Xt Xxf86vm drm enchant gbm gcrypt
-WANTLIB-htmlviewer += glapi gpg-error gstapp-1.0 gstaudio-1.0 gstbase-1.0
-WANTLIB-htmlviewer += gstfft-1.0 gstpbutils-1.0 gstreamer-1.0 gsttag-1.0
-WANTLIB-htmlviewer += gstvideo-1.0 harfbuzz-icu icudata icui18n icuuc
-WANTLIB-htmlviewer += javascriptcoregtk-1.0 jpeg lzma orc-0.4 secret-1
-WANTLIB-htmlviewer += soup-2.4 soup-gnome-2.4 sqlite3 stdc++ webkitgtk-1.0
-WANTLIB-htmlviewer += webp xcb-dri2 xcb-glx xcb-xfixes xml2 xslt
-
WANTLIB-pdfviewer = ${WANTLIB}
WANTLIB-pdfviewer += jpeg lcms2 openjp2 poppler poppler-glib tiff
@@ -91,11 +81,7 @@ LIB_DEPENDS-main= ${LIB_DEPENDS} \
audio/libcanberra,-gtk \
devel/libnotify \
security/gnutls>=2.2 \
- security/gpgme \
- x11/dbus-glib
-
-LIB_DEPENDS-htmlviewer= ${LIB_DEPENDS} \
- www/webkit>=2.0.0
+ security/gpgme
LIB_DEPENDS-pdfviewer= ${LIB_DEPENDS} \
print/poppler
@@ -107,8 +93,12 @@ LIB_DEPENDS-gdata= ${LIB_DEPENDS} \
#python tries to dlopen libpython2.7.so
CONFIGURE_ARGS+= --disable-acpi_notifier-plugin \
--disable-compface \
+ --disable-dbus \
+ --disable-fancy-plugin \
--disable-geolocation-plugin \
+ --disable-networkmanager \
--disable-python-plugin \
+ --disable-valgrind \
--enable-new-addrbook
MODULES= devel/gettext
Index: pkg/DESCR-htmlviewer
===================================================================
RCS file: pkg/DESCR-htmlviewer
diff -N pkg/DESCR-htmlviewer
--- pkg/DESCR-htmlviewer 25 Sep 2013 08:03:16 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-Claws Mail plugin for rendering HTML using WebKit.
Index: pkg/PLIST-htmlviewer
===================================================================
RCS file: pkg/PLIST-htmlviewer
diff -N pkg/PLIST-htmlviewer
--- pkg/PLIST-htmlviewer 2 Mar 2016 12:38:03 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-@comment $OpenBSD: PLIST-htmlviewer,v 1.2 2016/03/02 12:38:03 sthen Exp $
-@conflict claws-mail-htmlviewer-*
-@pkgpath mail/claws-mail-htmlviewer
-@pkgpath mail/claws-mail,-htmlviewer,compface${FLAVOR_STRING}
-lib/claws-mail/plugins/fancy.la
-lib/claws-mail/plugins/fancy.so
