Fix build with qt4.8, from fedora by way of gentoo

5 files changed, 34 insertions, 5 deletions

diff --git a/devel/qtscriptgenerator/Makefile b/devel/qtscriptgenerator/Makefile
index c679f8743e0..ffc105a8d1d 100644
--- a/devel/qtscriptgenerator/Makefile
+++ b/devel/qtscriptgenerator/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2012/03/03 00:12:26 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2012/03/10 20:42:31 markd Exp $
 #
 
 DISTNAME=	qtscriptgenerator-src-0.1.0
 PKGNAME=	${DISTNAME:S/-src//}
-PKGREVISION=	14
+PKGREVISION=	15
 CATEGORIES=	devel
 MASTER_SITES=	http://qtscriptgenerator.googlecode.com/files/
 
diff --git a/devel/qtscriptgenerator/PLIST b/devel/qtscriptgenerator/PLIST
index cf7848b216f..4ac34391867 100644
--- a/devel/qtscriptgenerator/PLIST
+++ b/devel/qtscriptgenerator/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/15 15:57:49 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/03/10 20:42:31 markd Exp $
 qt4/bin/generator
 qt4/plugins/script/libqtscript_core.la
 qt4/plugins/script/libqtscript_gui.la
@@ -156,7 +156,6 @@ share/doc/qtscriptgenerator/qfile.html
 share/doc/qtscriptgenerator/qfiledialog.html
 share/doc/qtscriptgenerator/qfileiconprovider.html
 share/doc/qtscriptgenerator/qfileinfo.html
-share/doc/qtscriptgenerator/qfileopenevent.html
 share/doc/qtscriptgenerator/qfilesystemwatcher.html
 share/doc/qtscriptgenerator/qfocusevent.html
 share/doc/qtscriptgenerator/qfocusframe.html
diff --git a/devel/qtscriptgenerator/distinfo b/devel/qtscriptgenerator/distinfo
index a13be3f2e9d..79bc61468f3 100644
--- a/devel/qtscriptgenerator/distinfo
+++ b/devel/qtscriptgenerator/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.2 2011/02/17 09:51:01 markd Exp $
+$NetBSD: distinfo,v 1.3 2012/03/10 20:42:31 markd Exp $
 
 SHA1 (qtscriptgenerator-src-0.1.0.tar.gz) = eeae733106369e289f257b754822bc372fd6ba75
 RMD160 (qtscriptgenerator-src-0.1.0.tar.gz) = a02ce6fea2fbc3d3a6ae9e51c6b563ef4bcd51f3
 Size (qtscriptgenerator-src-0.1.0.tar.gz) = 374223 bytes
 SHA1 (patch-aa) = 6c44dc4f44345bf6349b0d678901f174c262f6a9
 SHA1 (patch-generator_parser_rpp_pp.h) = deb9a7608ad2feea577e8445f02f41f5fda8d7a7
+SHA1 (patch-generator_typesystem_gui-common.xml) = ff3770853b75a9dbd80516e1ed10988c7cd954ec
+SHA1 (patch-generator_typesystem_gui.xml) = a72c32924b23655c7b9fcd5d9ccef180cee1b756
diff --git a/devel/qtscriptgenerator/patches/patch-generator_typesystem_gui-common.xml b/devel/qtscriptgenerator/patches/patch-generator_typesystem_gui-common.xml
new file mode 100644
index 00000000000..d14dba2fe9f
--- /dev/null
+++ b/devel/qtscriptgenerator/patches/patch-generator_typesystem_gui-common.xml
@@ -0,0 +1,14 @@
+$NetBSD: patch-generator_typesystem_gui-common.xml,v 1.1 2012/03/10 20:42:31 markd Exp $
+
+Fix build with qt4.8, from fedora by way of gentoo  
+
+--- generator/typesystem_gui-common.xml.orig	2012-02-15 22:42:52.385763112 +0000
++++ generator/typesystem_gui-common.xml
+@@ -2233,7 +2233,6 @@
+     
+                
+   </object-type>
+-  <object-type name="QFileOpenEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FileOpen"/>
+   <object-type name="QFocusEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FocusIn || %1-&gt;type() == QEvent::FocusOut">
+         <modify-function signature="reason()const">
+             <remove/>
diff --git a/devel/qtscriptgenerator/patches/patch-generator_typesystem_gui.xml b/devel/qtscriptgenerator/patches/patch-generator_typesystem_gui.xml
new file mode 100644
index 00000000000..d4b5ad31d89
--- /dev/null
+++ b/devel/qtscriptgenerator/patches/patch-generator_typesystem_gui.xml
@@ -0,0 +1,14 @@
+$NetBSD: patch-generator_typesystem_gui.xml,v 1.1 2012/03/10 20:42:31 markd Exp $
+
+Fix build with qt4.8, from fedora by way of gentoo
+
+--- generator/typesystem_gui.xml.orig	2012-02-15 22:44:29.367566923 +0000
++++ generator/typesystem_gui.xml
+@@ -2555,7 +2555,6 @@
+     
+                
+   </object-type>
+-  <object-type name="QFileOpenEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FileOpen"/>
+   <object-type name="QFocusEvent" polymorphic-id-expression="%1-&gt;type() == QEvent::FocusIn || %1-&gt;type() == QEvent::FocusOut">
+         <modify-function signature="reason()const">
+             <remove/>