rpms/kdebindings/devel kdebindings-4.2.0-qt45.patch, NONE, 1.1 kdebindings.spec, 1.177, 1.178

Than Ngo than at fedoraproject.org
Wed Feb 25 23:00:17 UTC 2009 

Author: than

Update of /cvs/extras/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10076

Modified Files:
	kdebindings.spec 
Added Files:
	kdebindings-4.2.0-qt45.patch 
Log Message:
fix build issue again qt-4.5


kdebindings-4.2.0-qt45.patch:

--- NEW FILE kdebindings-4.2.0-qt45.patch ---
diff -Nur kdebindings-4.2.0/kalyptus/kalyptus kdebindings-4.2.0-work/kalyptus/kalyptus
--- kdebindings-4.2.0/kalyptus/kalyptus	2009-01-01 17:24:38.000000000 +0100
+++ kdebindings-4.2.0-work/kalyptus/kalyptus	2009-02-25 18:04:33.000000000 +0100
@@ -502,7 +502,7 @@
 		$p =~ s/Q_SIGNALS/signals/;
 		$p =~ s/Q_SLOTS/slots/;
 		$p =~ s/ASYNC/void/;
-		$p =~ s/[A-Z_0-9]*_EXPORT_DEPRECATED//;
+		# $p =~ s/[A-Z_0-9]*_EXPORT_DEPRECATED//;
 		$p =~ s/[A-Z_0-9]*_EXPORT\s/ /;
 		$p =~ s/EXPORT_DOCKCLASS//;
 		$p =~ s/DLL_IMP_EXP_KMDICLASS//;
@@ -595,6 +595,7 @@
 				     $p =~ m/^#\s*if\s+defined\s*\(Q_OS_/ or
 				     $p =~ m/^#\s*if\s+defined\(Q_CC_/ or
 				     $p =~ m/^#\s*if\s+defined\(QT_THREAD_SUPPORT/ or
+				     $p =~ m/^#\s*if\s+QT_VERSION\s+>=\s+0x040600/ or
 				     $p =~ m/^#\s*else/ or
 				     $p =~ m/^#\s*if\s+defined\(Q_FULL_TEMPLATE_INSTANTIATION/ or
 				     $p =~ m/^#\s*ifdef\s+QT_WORKSPACE_WINDOWMODE/ or
@@ -821,7 +822,7 @@
 	my $skipBlock = 0;
 	my $isDeprecated = 0;
 	
-	if ( $decl =~ s/KDE_DEPRECATED// || $decl =~ s/QT_DEPRECATED// ) {
+	if ( $decl =~ s/KDE_\w*DEPRECATED// || $decl =~ s/QT_DEPRECATED// || $decl =~ s/[A-Z_0-9]*_EXPORT_DEPRECATED//) {
 		$isDeprecated = 1;
 	}
 	# Doc comment
diff -Nur kdebindings-4.2.0/kalyptus/kalyptusCxxToSmoke.pm kdebindings-4.2.0-work/kalyptus/kalyptusCxxToSmoke.pm
--- kdebindings-4.2.0/kalyptus/kalyptusCxxToSmoke.pm	2009-01-21 11:25:10.000000000 +0100
+++ kdebindings-4.2.0-work/kalyptus/kalyptusCxxToSmoke.pm	2009-02-25 18:04:33.000000000 +0100
@@ -435,6 +435,7 @@
 			|| $className eq 'QMapData'
 			|| $className eq 'QMapData::Node'
 			|| $className eq 'QMap::iterator'
+			|| $className eq 'QMetaObjectExtraData'
 			|| $className eq 'QMutex'
 			|| $className eq 'QMutexLocker'
 			|| $className eq 'QObjectData'
@@ -849,7 +850,7 @@
 				|| ($name eq 'd')
 				|| $name eq 'qHash' 
 				|| ($classNode->{astNodeName} eq 'Tab' and $name eq 'type')
-				|| ($name eq 'staticMetaObject')
+				|| ($classNode->{astNodeName} eq 'QObject' and $name eq 'staticMetaObject')
 
 				|| ($className eq 'Wt::WImage' and $name eq 'noAreas_')
 				|| ($className eq 'Wt::WImage' and $name eq 'loaded')
diff -Nur kdebindings-4.2.0/smoke/qt/header_list kdebindings-4.2.0-work/smoke/qt/header_list
--- kdebindings-4.2.0/smoke/qt/header_list	2009-01-21 11:25:10.000000000 +0100
+++ kdebindings-4.2.0-work/smoke/qt/header_list	2009-02-25 18:04:34.000000000 +0100
@@ -1,3 +1,5 @@
+qpixmapfilter.h
+qtextdocumentwriter.h
 qabstracteventdispatcher.h
 qabstractfileengine.h
 qabstractitemmodel.h
@@ -318,17 +320,21 @@
 qdbusargument.h
 qdbusconnection.h
 qdbusconnectioninterface.h
+qdbuscontext.h
+qdbuspendingcall.h
+qdbuspendingreply.h
 qdbuserror.h
 qdbusextratypes.h
 qdbusinterface.h
 qdbusmacros.h
 qdbusmessage.h
 qdbusmetatype.h
+qdbuspendingcall.h
+qdbuspendingreply.h
 qdbusreply.h
 qdbusserver.h
 qcryptographichash.h
 qdiriterator.h
-qdbuscontext.h
 qaccessible2.h
 qcolumnview.h
 qfileiconprovider.h
diff -Nur kdebindings-4.2.0/smoke/qtwebkit/classlist kdebindings-4.2.0-work/smoke/qtwebkit/classlist
--- kdebindings-4.2.0/smoke/qtwebkit/classlist	2008-06-03 11:34:11.000000000 +0200
+++ kdebindings-4.2.0-work/smoke/qtwebkit/classlist	2009-02-25 18:04:34.000000000 +0100
@@ -1,9 +1,15 @@
-QWebHitTestResult
+QWebDatabase
 QWebFrame
-QWebHistoryItem
 QWebHistory
 QWebHistoryInterface
+QWebHistoryItem
+QWebHitTestResult
 QWebPage
+QWebPage::ExtensionOption
+QWebPage::ExtensionReturn
+QWebPage::ChooseMultipleFilesExtensionOption
+QWebPage::ChooseMultipleFilesExtensionReturn
 QWebPluginFactory
+QWebSecurityOrigin
 QWebSettings
 QWebView
diff -Nur kdebindings-4.2.0/smoke/qtwebkit/header_list kdebindings-4.2.0-work/smoke/qtwebkit/header_list
--- kdebindings-4.2.0/smoke/qtwebkit/header_list	2009-01-21 11:25:11.000000000 +0100
+++ kdebindings-4.2.0-work/smoke/qtwebkit/header_list	2009-02-25 18:04:34.000000000 +0100
@@ -269,7 +269,6 @@
 qwindowsxpstyle.h
 qwmatrix.h
 qworkspace.h
-qx11embed_x11.h
 qx11info_x11.h
 qabstractsocket.h
 qftp.h
@@ -313,6 +312,7 @@
 qsvgwidget.h
 qdom.h
 qxml.h
+qxmlstream.h
 qdbusabstractadaptor.h
 qdbusabstractinterface.h
 qdbusargument.h
@@ -345,4 +345,5 @@
 qsslkey.h
 qsslsocket.h
 qsvggenerator.h
+qx11embed_x11.h
 qxmlstream.h
diff -Nur kdebindings-4.2.0/smoke/qtwebkit/qtwebkit_header_list kdebindings-4.2.0-work/smoke/qtwebkit/qtwebkit_header_list
--- kdebindings-4.2.0/smoke/qtwebkit/qtwebkit_header_list	2008-06-03 11:34:11.000000000 +0200
+++ kdebindings-4.2.0-work/smoke/qtwebkit/qtwebkit_header_list	2009-02-25 18:04:34.000000000 +0100
@@ -1,8 +1,11 @@
+qwebdatabase.h
 qwebframe.h
 qwebhistory.h
 qwebhistoryinterface.h
 qwebkitglobal.h
 qwebpage.h
 qwebpluginfactory.h
+qwebsecurityorigin.h
 qwebsettings.h
 qwebview.h
+


Index: kdebindings.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- kdebindings.spec	25 Feb 2009 10:41:15 -0000	1.177
+++ kdebindings.spec	25 Feb 2009 22:59:47 -0000	1.178
@@ -22,13 +22,15 @@
 
 Name: kdebindings
 Version: 4.2.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: KDE bindings to non-C++ languages
 
 Group: User Interface/Desktops
 License: GPLv2
 URL: http://developer.kde.org/language-bindings/
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+Patch0: kdebindings-4.2.0-qt45.patch
+
 # upstream patches
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -159,7 +161,7 @@
 
 %prep
 %setup -q
-
+%patch0 -p1 -b .qt45
 
 %build
 mkdir -p %{_target_platform}
@@ -299,6 +301,9 @@
 
 
 %changelog
+* Wed Feb 25 2009 Than Ngo <than at redhat.com> - 4.2.0-7
+- fix build issue again qt-4.5
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

More information about the fedora-extras-commits mailing list