Hi,
Theo de Raadt wrote on Wed, Apr 18, 2018 at 07:03:55PM -0600:
> Ingo Schwarze <[email protected]> wrote:
>> 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.
> I urge you to always crank numbers, because it is free.
>
> What isn't free, is some reasoning which things it isn't required,
> and then 40 years in the wilderness.
>
> About 20 years ago, there was a very small #define change that made a
> pile of libraries incompatible in a subtle way, and people were ready to
> kill each other. If the libraries had just been cranked (in the same
> way we aggressively crank libc), we wouldn't even have noticed the
> problem.
You are right, and in principle i know, sorry for being lazy.
I actually *tried* cranking the number, and it blew up somehow
during packaging because i must have done something wrong on the
first try, i don't know what. So i thought i could get the patch
out earlier in a situation where the bump isn't really mandatory.
Anyway, now i cleaned out everything and rebuilt everything
again from scratch (kdelibs take some time building...)
Little surprise: building and packaging works once you do it right.
So here is the safer patch with the bump.
Yours,
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 02:29:27 -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
@@ -26,7 +26,7 @@ SHARED_LIBS += kdefakes 50.2
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 += 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 02:29:27 -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,
