CVS commit: pkgsrc/x11

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Fri Dec 16 00:06:46 UTC 2016

Modified Files:
        pkgsrc/x11/qt4-libs: distinfo
        pkgsrc/x11/qt4-tools: Makefile
Added Files:
        pkgsrc/x11/qt4-libs/patches:
            patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp
            patch-tools_linguist_linguist_messagemodel.cpp

Log Message:
Fix portability issues with pointer ordering. Bump qt-tools for the
linguist change as it was nonsensical before.


To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 pkgsrc/x11/qt4-libs/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp \
    pkgsrc/x11/qt4-libs/patches/patch-tools_linguist_linguist_messagemodel.cpp
cvs rdiff -u -r1.67 -r1.68 pkgsrc/x11/qt4-tools/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/qt4-libs/distinfo
diff -u pkgsrc/x11/qt4-libs/distinfo:1.110 pkgsrc/x11/qt4-libs/distinfo:1.111
--- pkgsrc/x11/qt4-libs/distinfo:1.110  Tue Aug 30 07:58:27 2016
+++ pkgsrc/x11/qt4-libs/distinfo        Fri Dec 16 00:06:46 2016
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.110 2016/08/30 07:58:27 richard Exp $
+$NetBSD: distinfo,v 1.111 2016/12/16 00:06:46 joerg Exp $
 
 SHA1 (qt-everywhere-opensource-src-4.8.7.tar.gz) = 76aef40335c0701e5be7bb3a9101df5d22fe3666
 RMD160 (qt-everywhere-opensource-src-4.8.7.tar.gz) = afb5e5a99388e6429faca59cb5000054feffd166
@@ -63,6 +63,7 @@ SHA1 (patch-src_3rdparty_webkit_Source_J
 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_ThreadSafeRefCounted.h) = 2d3176beb56697d033387ab10729cfb6681d01c7
 SHA1 (patch-src_3rdparty_webkit_Source_JavaScriptCore_wtf_Threading.h) = fa7519ef6ac04cd13be085783f663c329e4a14be
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_dom_Element.cpp) = 90fd6a884f9fd058210c3011bea2ce695011d2e3
+SHA1 (patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp) = e53e7928cd68e74e6476f527b44e77979a74442d
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_DefaultLocalizationStrategy.cpp) = 0377066bd28d5eae02e8fcf200da4360c286ad84
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_MediaPlayer.cpp) = f9a1f71b4607c5f542c059873cf5735fad9ff3a1
 SHA1 (patch-src_3rdparty_webkit_Source_WebCore_platform_graphics_filters_arm_FEGaussianBlurNEON.cpp) = 51b6bddf81978fd7ae6580132a74aeaec84b724f
@@ -77,3 +78,4 @@ SHA1 (patch-src_network_ssl_qsslsocket__
 SHA1 (patch-src_network_ssl_qsslsocket__openssl__symbols__p.h) = 417846ba9edab8638cafa41a54ef60029467ef80
 SHA1 (patch-src_plugins_accessible_widgets_itemviews.cpp) = 1456fbaacef33f3b2422158d758d02990845048a
 SHA1 (patch-src_tools_bootstrap_bootstrap.pro) = ba6f4facabb621388f38ee95f31e8d6f797ae12a
+SHA1 (patch-tools_linguist_linguist_messagemodel.cpp) = abde18cad489f6ce298ab26ab1053e541c99c5e6

Index: pkgsrc/x11/qt4-tools/Makefile
diff -u pkgsrc/x11/qt4-tools/Makefile:1.67 pkgsrc/x11/qt4-tools/Makefile:1.68
--- pkgsrc/x11/qt4-tools/Makefile:1.67  Sat Mar  5 11:28:00 2016
+++ pkgsrc/x11/qt4-tools/Makefile       Fri Dec 16 00:06:46 2016
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.67 2016/03/05 11:28:00 jperkin Exp $
+# $NetBSD: Makefile,v 1.68 2016/12/16 00:06:46 joerg Exp $
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=       qt4-tools-${QTVERSION}

Added files:

Index: pkgsrc/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp
diff -u /dev/null pkgsrc/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp:1.1
--- /dev/null   Fri Dec 16 00:06:46 2016
+++ pkgsrc/x11/qt4-libs/patches/patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp      Fri Dec 16 00:06:46 2016
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement.cpp,v 1.1 2016/12/16 00:06:46 joerg Exp $
+
+Don't order pointers relative to 0.
+
+--- src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp.orig  2016-12-10 21:49:53.391056357 +0000
++++ src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
+@@ -74,7 +74,7 @@ PassRefPtr<HTMLImageElement> HTMLImageEl
+     RefPtr<HTMLImageElement> image = adoptRef(new HTMLImageElement(imgTag, document));
+     if (optionalWidth)
+         image->setWidth(*optionalWidth);
+-    if (optionalHeight > 0)
++    if (optionalHeight)
+         image->setHeight(*optionalHeight);
+     return image.release();
+ }
Index: pkgsrc/x11/qt4-libs/patches/patch-tools_linguist_linguist_messagemodel.cpp
diff -u /dev/null pkgsrc/x11/qt4-libs/patches/patch-tools_linguist_linguist_messagemodel.cpp:1.1
--- /dev/null   Fri Dec 16 00:06:46 2016
+++ pkgsrc/x11/qt4-libs/patches/patch-tools_linguist_linguist_messagemodel.cpp  Fri Dec 16 00:06:46 2016
@@ -0,0 +1,15 @@
+$NetBSD: patch-tools_linguist_linguist_messagemodel.cpp,v 1.1 2016/12/16 00:06:46 joerg Exp $
+
+Don't order pointers relative to 0.
+
+--- tools/linguist/linguist/messagemodel.cpp.orig      2016-12-13 21:07:03.441711305 +0000
++++ tools/linguist/linguist/messagemodel.cpp
+@@ -183,7 +183,7 @@ static int calcMergeScore(const DataMode
+         if (ContextItem *c = one->findContext(oc->context())) {
+             for (int j = 0; j < oc->messageCount(); ++j) {
+                 MessageItem *m = oc->messageItem(j);
+-                if (c->findMessage(m->text(), m->comment()) >= 0)
++                if (c->findMessage(m->text(), m->comment()))
+                     ++inBoth;
+             }
+         }