[pkgsrc/trunk]: pkgsrc/x11 Define ANY, newer sip versions no longer provide it.

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dfefe1015b9f
branches:  trunk
changeset: 610426:dfefe1015b9f
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Oct 24 15:32:56 2012 +0000

description:
Define ANY, newer sip versions no longer provide it.

diffstat:

 x11/py-qt3-base/distinfo            |   4 +-
 x11/py-qt3-base/patches/patch-aa    |  11 +++++++++-
 x11/py-qt3-modules/distinfo         |   4 +-
 x11/py-qt3-modules/patches/patch-aa |  41 ++++++++++++++++++++++++++++++++++--
 4 files changed, 52 insertions(+), 8 deletions(-)

diffs (113 lines):

diff -r 337f8fd8c74a -r dfefe1015b9f x11/py-qt3-base/distinfo
--- a/x11/py-qt3-base/distinfo  Wed Oct 24 13:33:43 2012 +0000
+++ b/x11/py-qt3-base/distinfo  Wed Oct 24 15:32:56 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2009/06/17 07:11:03 hasso Exp $
+$NetBSD: distinfo,v 1.17 2012/10/24 15:32:56 joerg Exp $
 
 SHA1 (PyQt-mac-gpl-3.18.1.tar.gz) = dbfb3e5443480705c36002167e0d6303fc751a3f
 RMD160 (PyQt-mac-gpl-3.18.1.tar.gz) = db6685a6a231a7414a08674a0ea245260c234de2
@@ -6,6 +6,6 @@
 SHA1 (PyQt-x11-gpl-3.18.1.tar.gz) = 310c17bd3b0f81f8b516c5b755250171fa9c9a04
 RMD160 (PyQt-x11-gpl-3.18.1.tar.gz) = 1278b805bcd0a3e34e68a07849c052382c452096
 Size (PyQt-x11-gpl-3.18.1.tar.gz) = 819441 bytes
-SHA1 (patch-aa) = 418b159936234e82e9ec208a854d74c636933b95
+SHA1 (patch-aa) = 2d645fa20ff670f15c81d6e565f2e20b3ba110c1
 SHA1 (patch-ab) = 4f4476e7f6f81fa1eb458a5dcdbaed3d13330f91
 SHA1 (patch-ac) = 94cc4e24179d6557de35a8a019e37e5d35eca68d
diff -r 337f8fd8c74a -r dfefe1015b9f x11/py-qt3-base/patches/patch-aa
--- a/x11/py-qt3-base/patches/patch-aa  Wed Oct 24 13:33:43 2012 +0000
+++ b/x11/py-qt3-base/patches/patch-aa  Wed Oct 24 15:32:56 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.7 2009/06/17 07:11:03 hasso Exp $
+$NetBSD: patch-aa,v 1.8 2012/10/24 15:32:56 joerg Exp $
 
 --- configure.py.orig  2009-06-16 11:47:29 +0300
 +++ configure.py       2009-06-17 05:21:23 +0300
@@ -40,6 +40,15 @@
  
          if opt_qtpetag:
              pyqt_modules.append("qtpe")
+@@ -258,7 +258,7 @@ class ConfigurePyQt3(ConfigureBase):
+         }
+ 
+     def code(self, extra_include_dirs, extra_lib_dir, extra_libs):
+-        generate_code("qt", extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=extra_libs)
++        generate_code("qt", extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=extra_libs, extra_cxxflags="-DANY=void")
+ 
+         if "qtext" in pyqt_modules:
+             generate_code("qtext", extra_define=qsci_define, extra_include_dirs=[opt_qsciincdir], extra_lib_dir=opt_qscilibdir, extra_libs=["qscintilla"], sip_flags=qtext_sip_flags)
 @@ -289,7 +289,7 @@ class ConfigurePyQt3(ConfigureBase):
  
              sipconfig.inform("Creating pyuic Makefile...")
diff -r 337f8fd8c74a -r dfefe1015b9f x11/py-qt3-modules/distinfo
--- a/x11/py-qt3-modules/distinfo       Wed Oct 24 13:33:43 2012 +0000
+++ b/x11/py-qt3-modules/distinfo       Wed Oct 24 15:32:56 2012 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2009/06/17 07:11:04 hasso Exp $
+$NetBSD: distinfo,v 1.16 2012/10/24 15:32:56 joerg Exp $
 
 SHA1 (PyQt-mac-gpl-3.18.1.tar.gz) = dbfb3e5443480705c36002167e0d6303fc751a3f
 RMD160 (PyQt-mac-gpl-3.18.1.tar.gz) = db6685a6a231a7414a08674a0ea245260c234de2
@@ -6,4 +6,4 @@
 SHA1 (PyQt-x11-gpl-3.18.1.tar.gz) = 310c17bd3b0f81f8b516c5b755250171fa9c9a04
 RMD160 (PyQt-x11-gpl-3.18.1.tar.gz) = 1278b805bcd0a3e34e68a07849c052382c452096
 Size (PyQt-x11-gpl-3.18.1.tar.gz) = 819441 bytes
-SHA1 (patch-aa) = 359e145af70889251f011a8f3bc62527aa47c6bd
+SHA1 (patch-aa) = adecb861428543d49ea2c3b9e8db40c55094ec40
diff -r 337f8fd8c74a -r dfefe1015b9f x11/py-qt3-modules/patches/patch-aa
--- a/x11/py-qt3-modules/patches/patch-aa       Wed Oct 24 13:33:43 2012 +0000
+++ b/x11/py-qt3-modules/patches/patch-aa       Wed Oct 24 15:32:56 2012 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.7 2009/06/17 07:11:04 hasso Exp $
+$NetBSD: patch-aa,v 1.8 2012/10/24 15:32:56 joerg Exp $
 
---- configure.py.orig  2009-06-16 11:47:29 +0300
-+++ configure.py       2009-06-17 05:37:17 +0300
+--- configure.py.orig  2009-06-16 08:47:29.000000000 +0000
++++ configure.py
 @@ -195,7 +195,7 @@ class ConfigurePyQt3(ConfigureBase):
      """This class defines the methods to configure PyQt v3.
      """
@@ -20,6 +20,41 @@
  
          if opt_qtpetag:
              pyqt_modules.append("qtpe")
+@@ -258,27 +256,27 @@ class ConfigurePyQt3(ConfigureBase):
+         }
+ 
+     def code(self, extra_include_dirs, extra_lib_dir, extra_libs):
+-        generate_code("qt", extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=extra_libs)
++        generate_code("qt", extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=extra_libs, extra_cxxflags="-DANY=void")
+ 
+         if "qtext" in pyqt_modules:
+-            generate_code("qtext", extra_define=qsci_define, extra_include_dirs=[opt_qsciincdir], extra_lib_dir=opt_qscilibdir, extra_libs=["qscintilla"], sip_flags=qtext_sip_flags)
++            generate_code("qtext", extra_define=qsci_define, extra_include_dirs=[opt_qsciincdir], extra_lib_dir=opt_qscilibdir, extra_libs=["qscintilla"], sip_flags=qtext_sip_flags, 
extra_cxxflags="-DANY=void")
+ 
+         if "qtgl" in pyqt_modules:
+-            generate_code("qtgl", opengl=1)
++            generate_code("qtgl", opengl=1, extra_cxxflags="-DANY=void")
+ 
+         if "qtpe" in pyqt_modules:
+-            generate_code("qtpe", extra_libs=["qpe"], sip_flags=qtpe_sip_flags)
++            generate_code("qtpe", extra_libs=["qpe"], sip_flags=qtpe_sip_flags, extra_cxxflags="-DANY=void")
+ 
+         if "qtui" in pyqt_modules:
+-            generate_code("qtui", extra_libs=["qui"])
++            generate_code("qtui", extra_libs=["qui"], extra_cxxflags="-DANY=void")
+ 
+         if "qtaxcontainer" in pyqt_modules:
+-            generate_code("qtaxcontainer", extra_libs=["qaxcontainer"])
++            generate_code("qtaxcontainer", extra_libs=["qaxcontainer"], extra_cxxflags="-DANY=void")
+ 
+         # The rest don't need special handling.
+         for m in ("qtcanvas", "qtnetwork", "qtsql", "qttable", "qtxml"):
+             if m in pyqt_modules:
+-                generate_code(m)
++                generate_code(m, extra_cxxflags="-DANY=void")
+ 
+     def tools(self):
+         tool_dirs = []
 @@ -286,65 +284,6 @@ class ConfigurePyQt3(ConfigureBase):
          if qt_version >= 0x030000:
              # The Professional Edition needs special handling.