[patch] Patch for qt-gui-4.7.1-r1

qt-gui-4.7.1.-r1.patch (text/plain), 1.26 KB, created by Konstantin Tokarev on 2010-11-20 20:16:51 UTC

--- /Users/konstantintokarev/Gentoo/usr/portage/x11-libs/qt-gui/qt-gui-4.7.1-r1.ebuild	2010-11-10 15:03:22.000000000 +0300
+++ qt-gui-4.7.1-r2.ebuild	2010-11-20 21:33:01.000000000 +0300
@@ -128,8 +128,11 @@
 
 	qt4-build_src_install
 
-	# remove some unnecessary headers
-	rm -f "${D}${QTHEADERDIR}"/{Qt,QtGui}/{qmacstyle_mac.h,qwindowdefs_win.h} \
+	# remove Windows-related headers
+	rm -f "${D}${QTHEADERDIR}"/{Qt,QtGui}/{qwindowdefs_win.h}
+
+	# remove Mac-related headers
+	use aqua || rm -f "${D}${QTHEADERDIR}"/{Qt,QtGui}/{qmacstyle_mac.h} \
 		"${D}${QTHEADERDIR}"/QtGui/QMacStyle
 
 	# qt-creator
@@ -139,8 +142,13 @@
 	# which are located under tools/designer/src/lib/*
 	# So instead of installing both, we create the private folder
 	# and drop tools/designer/src/lib/* headers in it.
-	dodir /usr/include/qt4/QtDesigner/private/ || die
-	insinto /usr/include/qt4/QtDesigner/private/
+	if ! use aqua; then
+		dodir /usr/include/qt4/QtDesigner/private/ || die
+		insinto /usr/include/qt4/QtDesigner/private/
+	else
+		dodir /usr/lib/qt4/QtDesigner.framework/Headers/private/ || die 
+		insinto /usr/lib/qt4/QtDesigner.framework/Headers/private/
+	fi
 	doins "${S}"/tools/designer/src/lib/shared/* || die
 	doins "${S}"/tools/designer/src/lib/sdk/* || die
 	#install private headers