Hi Christian,
Christian Weisgerber wrote on Tue, Apr 17, 2018 at 06:52:14PM +0200:
> Here are three further tentative fixes for x11/kde4/libs. There
> are additional problems still, but I'm going to take a break now.
Actually, you did *all* the work required and merely missed the fact
that you were successful.
With just one tiny patch that i already committed to kdelibs-3,
kdelibs-4 now builds, too. Again, i did not test at run time but
as jasper@ agreed, that will get tested when people fix the dozens
of large applications using this. It may be helpful to get this
in soon, after the delay we already had and in pleasant anticipation
of the imminent strike... err, i intended to say: hackathon.
I don't think bumping the shared object major is required. The
patch only changes *unused* bits in a constant that confused the
type checking of the compiler. Even if a program passes the other
value to a library or vice versa, everything should still work as
expected.
OK?
Ingo
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/kde4/libs/Makefile,v
retrieving revision 1.82
diff -u -p -r1.82 Makefile
--- Makefile 14 Nov 2017 20:09:11 -0000 1.82
+++ Makefile 19 Apr 2018 00:43:48 -0000
@@ -12,7 +12,7 @@ PKGNAME-langlist = kde4-langlist-$V
PKG_ARCH-en_US = *
PKG_ARCH-langlist = *
PKGSPEC-main = kdelibs-${MODKDE4_SPEC}
-REVISION-main = 11
+REVISION-main = 12
REVISION-en_US = 0
REVISION-langlist = 0
Index: patches/patch-khtml_dom_dom2_traversal_h
===================================================================
RCS file: patches/patch-khtml_dom_dom2_traversal_h
diff -N patches/patch-khtml_dom_dom2_traversal_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-khtml_dom_dom2_traversal_h 19 Apr 2018 00:43:48 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: khtml/dom/dom2_traversal.h
+--- khtml/dom/dom2_traversal.h.orig
++++ khtml/dom/dom2_traversal.h
+@@ -214,7 +214,7 @@ class KHTML_EXPORT NodeFilter (public)
+ *
+ */
+ enum ShowCode {
+- SHOW_ALL = 0xFFFFFFFF,
++ SHOW_ALL = 0x00007FFF,
+ SHOW_ELEMENT = 0x00000001,
+ SHOW_ATTRIBUTE = 0x00000002,
+ SHOW_TEXT = 0x00000004,
