CVS commit: pkgsrc/x11/qt4-libs

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon Oct 28 19:37:41 UTC 2019

Modified Files:
        pkgsrc/x11/qt4-libs: distinfo
        pkgsrc/x11/qt4-libs/patches: patch-ao patch-ap

Log Message:
qt4-libs: fix build on netbsd-current, where the prototype of iconv
is no longer unusual. This mostly consists of making our local patches
only apply for older netbsd.


To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 pkgsrc/x11/qt4-libs/distinfo
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/qt4-libs/patches/patch-ao
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/qt4-libs/patches/patch-ap

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.115 pkgsrc/x11/qt4-libs/distinfo:1.116
--- pkgsrc/x11/qt4-libs/distinfo:1.115  Wed Jul  3 10:04:23 2019
+++ pkgsrc/x11/qt4-libs/distinfo        Mon Oct 28 19:37:41 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.115 2019/07/03 10:04:23 markd Exp $
+$NetBSD: distinfo,v 1.116 2019/10/28 19:37:41 maya Exp $
 
 SHA1 (qt-everywhere-opensource-src-4.8.7.tar.gz) = 76aef40335c0701e5be7bb3a9101df5d22fe3666
 RMD160 (qt-everywhere-opensource-src-4.8.7.tar.gz) = afb5e5a99388e6429faca59cb5000054feffd166
@@ -18,8 +18,8 @@ SHA1 (patch-ak) = a16e2ae20e0568f2a50eb3
 SHA1 (patch-al) = a215436a2df433e050fa48a7cc8238b5ef13b64d
 SHA1 (patch-am) = 018a5982834737ca8ceb6460dc696b6e3a70ec54
 SHA1 (patch-an) = 8aa6ceffb9acab4771d22b3184a1360227a81409
-SHA1 (patch-ao) = a63839ae22e0bf13ff40f5377df2bc36ca052d91
-SHA1 (patch-ap) = 86a2f5cce47607c8c453c63c6213d5efb48c8569
+SHA1 (patch-ao) = 981b506bdf5d9d21940880308318d6ac3f59742d
+SHA1 (patch-ap) = f18e8d0c70bfc31a91d1b8660513ece38646b79c
 SHA1 (patch-aq) = 7533741c81086cd1992d3e96a47c28d9ade27cbc
 SHA1 (patch-ar) = ba839210b42532b1797604722442841e43acbae1
 SHA1 (patch-as) = b0962c535fc2e8da08bb78b9ebcb5cd678565058

Index: pkgsrc/x11/qt4-libs/patches/patch-ao
diff -u pkgsrc/x11/qt4-libs/patches/patch-ao:1.10 pkgsrc/x11/qt4-libs/patches/patch-ao:1.11
--- pkgsrc/x11/qt4-libs/patches/patch-ao:1.10   Mon Apr  9 09:12:49 2012
+++ pkgsrc/x11/qt4-libs/patches/patch-ao        Mon Oct 28 19:37:41 2019
@@ -1,4 +1,6 @@
-$NetBSD: patch-ao,v 1.10 2012/04/09 09:12:49 adam Exp $
+$NetBSD: patch-ao,v 1.11 2019/10/28 19:37:41 maya Exp $
+
+Fix build on netbsd, which has an unusual prototype for iconv
 
 --- src/corelib/codecs/qiconvcodec.cpp.orig    2012-03-14 14:01:18.000000000 +0000
 +++ src/corelib/codecs/qiconvcodec.cpp
@@ -7,7 +9,7 @@ $NetBSD: patch-ao,v 1.10 2012/04/09 09:1
  #include <dlfcn.h>
  
 +// for __DragonFly_version
-+#if defined(__DragonFly__)
++#if defined(__DragonFly__) || defined(__NetBSD__)
 +#include <sys/param.h>
 +#endif
 +
@@ -33,7 +35,7 @@ $NetBSD: patch-ao,v 1.10 2012/04/09 09:1
      size_t inBytesLeft = len;
      // best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM
 -#ifdef GNU_LIBICONV
-+#if defined(GNU_LIBICONV) || defined(__NetBSD__)
++#if defined(GNU_LIBICONV) || (defined(__NetBSD__) && __NetBSD_Version__ < 999001700)
      // GNU doesn't disagree with POSIX :/
      const char *inBytes = chars;
  #else
@@ -42,7 +44,7 @@ $NetBSD: patch-ao,v 1.10 2012/04/09 09:1
      size_t inBytesLeft = sizeof bom;
  
 -#if defined(GNU_LIBICONV)
-+#if defined(GNU_LIBICONV) || defined(__NetBSD__)
++#if defined(GNU_LIBICONV) || (defined(__NetBSD__) && __NetBSD_Version__ < 999001700)
      const char **inBytesPtr = const_cast<const char **>(&inBytes);
  #else
      char **inBytesPtr = &inBytes;
@@ -51,7 +53,7 @@ $NetBSD: patch-ao,v 1.10 2012/04/09 09:1
      size_t inBytesLeft;
  
 -#if defined(GNU_LIBICONV)
-+#if defined(GNU_LIBICONV) || defined(__NetBSD__)
++#if defined(GNU_LIBICONV) || (defined(__NetBSD__) && __NetBSD_Version__ < 999001700)
      const char **inBytesPtr = const_cast<const char **>(&inBytes);
  #else
      char **inBytesPtr = &inBytes;
@@ -59,7 +61,7 @@ $NetBSD: patch-ao,v 1.10 2012/04/09 09:1
  #endif
      const char *codeset = empty_codeset;
      cd = iconv_open(to ? to : codeset, from ? from : codeset);
-+#elif defined(__NetBSD)
++#elif defined(__NetBSD__) && __NetBSD_Version__ < 999001700
 +    const char *codeset = 0;
  #else
      char *codeset = 0;

Index: pkgsrc/x11/qt4-libs/patches/patch-ap
diff -u pkgsrc/x11/qt4-libs/patches/patch-ap:1.2 pkgsrc/x11/qt4-libs/patches/patch-ap:1.3
--- pkgsrc/x11/qt4-libs/patches/patch-ap:1.2    Sun Oct 11 09:14:52 2009
+++ pkgsrc/x11/qt4-libs/patches/patch-ap        Mon Oct 28 19:37:41 2019
@@ -1,12 +1,22 @@
-$NetBSD: patch-ap,v 1.2 2009/10/11 09:14:52 adam Exp $
+$NetBSD: patch-ap,v 1.3 2019/10/28 19:37:41 maya Exp $
 
---- config.tests/unix/iconv/iconv.cpp.orig     2009-09-29 13:01:31.000000000 +0200
+Support NetBSD iconv variant (pre-9.99.17 and newer)
+
+--- config.tests/unix/iconv/iconv.cpp.orig     2015-05-07 14:14:42.000000000 +0000
 +++ config.tests/unix/iconv/iconv.cpp
-@@ -48,7 +48,11 @@ int main(int, char **)
+ #if defined(__sgi)
+ #error "iconv not supported on IRIX"
+ #else
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#endif
+ #include <iconv.h>
+ 
+ int main(int, char **)
  {
      iconv_t x = iconv_open("", "");
  
-+#if defined(__NetBSD__)
++#if defined(__NetBSD__) && __NetBSD_Version__ < 999001700
 +    const char *inp;
 +#else
      char *inp;