Hi Christian,

Christian Weisgerber wrote on Thu, Apr 19, 2018 at 06:20:27AM +0200:

> However, the dnssd/servicemodel.h patch changes an ABI.

Indeed, you are right.  That definitely requires a major bump,
which wasn't done earlier because it did not build yet.

So, here is the hopefully final patch.  I tested the full
build again, and it succeeded.

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 14:51:37 -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
 
@@ -25,8 +25,8 @@ SHARED_LIBS +=        kdecore              50.2
 SHARED_LIBS += kdefakes             50.2      # .5.0
 SHARED_LIBS += kdesu                50.2      # .5.0
 SHARED_LIBS += kdeui                50.2      # .5.0
-SHARED_LIBS += kdnssd               50.2      # .2.0
-SHARED_LIBS += khtml                50.2      # .5.0
+SHARED_LIBS += kdnssd               51.0      # .2.0
+SHARED_LIBS += khtml                51.0      # .5.0
 SHARED_LIBS += kimproxy             50.2      # .4.0
 SHARED_LIBS += kio                  50.3      # .5.0
 SHARED_LIBS += kjs                  50.2      # .2.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 14:51:37 -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,

Reply via email to