Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 327827 | Differences between
and this patch

Collapse All | Expand All

(-)x11-libs/qt-core/qt-core-4.7.0_beta2.ebuild (-27 / +39 lines)
Lines 19-36 Link Here
19
PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[glib=,qt3support] )"
19
PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[glib=,qt3support] )"
20
20
21
pkg_setup() {
21
pkg_setup() {
22
	QT4_TARGET_DIRECTORIES="
22
	if tc-is-cross-compiler; then #don't build moc,rcc,uic when crosscompiling qt-core #TODO: build for target while using native one for xcompilation
23
		src/tools/bootstrap
23
 		QT4_TARGET_DIRECTORIES="
24
		src/tools/moc
24
			src/tools/bootstrap
25
		src/tools/rcc
25
 			src/corelib
26
		src/tools/uic
26
 			src/xml
27
		src/corelib
27
 			src/network
28
		src/xml
28
 			src/plugins/codecs"
29
		src/network
29
 	else
30
		src/plugins/codecs
30
		QT4_TARGET_DIRECTORIES="
31
		tools/linguist/lconvert
31
			src/tools/bootstrap
32
		tools/linguist/lrelease
32
			src/tools/moc
33
		tools/linguist/lupdate"
33
			src/tools/rcc
34
			src/tools/uic
35
			src/corelib
36
			src/xml
37
			src/network
38
			src/plugins/codecs
39
			tools/linguist/lconvert
40
			tools/linguist/lrelease
41
			tools/linguist/lupdate"
42
	fi
34
43
35
	QT4_EXTRACT_DIRECTORIES="
44
	QT4_EXTRACT_DIRECTORIES="
36
		include/Qt
45
		include/Qt
Lines 43-54 Link Here
43
		src/plugins/plugins.pro
52
		src/plugins/plugins.pro
44
		src/plugins/qpluginbase.pri
53
		src/plugins/qpluginbase.pri
45
		src/src.pro
54
		src/src.pro
46
		src/3rdparty/des
55
		src/3rdparty
47
		src/3rdparty/harfbuzz
48
		src/3rdparty/md4
49
		src/3rdparty/md5
50
		src/3rdparty/sha1/
51
		src/3rdparty/easing
52
		src/declarative
56
		src/declarative
53
		src/gui
57
		src/gui
54
		src/script
58
		src/script
Lines 62-67 Link Here
62
}
66
}
63
67
64
src_prepare() {
68
src_prepare() {
69
	if tc-is-cross-compiler; then #don't build qmake when crosscompiling qt-core #TODO: build for target while using native one for xcompilation
70
 		skip_qmake_build_patch
71
 		symlink_binaries_to_buildtree
72
 	fi
73
65
	# Don't pre-strip, bug 235026
74
	# Don't pre-strip, bug 235026
66
	for i in kr jp cn tw ; do
75
	for i in kr jp cn tw ; do
67
		echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
76
		echo "CONFIG+=nostrip" >> "${S}"/src/plugins/codecs/${i}/${i}.pro
Lines 103-109 Link Here
103
}
112
}
104
113
105
src_install() {
114
src_install() {
106
	dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die
115
	tc-is-cross-compiler || dobin "${S}"/bin/{qmake,moc,rcc,uic,lconvert,lrelease,lupdate} || die #crosscompilation does not build these tools
107
116
108
	install_directories src/{corelib,xml,network,plugins/codecs}
117
	install_directories src/{corelib,xml,network,plugins/codecs}
109
118
Lines 114-127 Link Here
114
		insinto ${QTHEADERDIR}/QtCore/private
123
		insinto ${QTHEADERDIR}/QtCore/private
115
		find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} \;
124
		find "${S}"/src/corelib -type f -name "*_p.h" -exec doins {} \;
116
	fi
125
	fi
117
	# use freshly built libraries
126
118
	local DYLD_FPATH=
127
	if ! tc-is-cross-compiler; then #lrelease is not build
119
	[[ -d "${S}"/lib/QtCore.framework ]] \
128
	  # use freshly built libraries
120
		&& DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done)
129
	  local DYLD_FPATH=
121
	DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
130
	  [[ -d "${S}"/lib/QtCore.framework ]] \
122
	LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts || die
131
		  && DYLD_FPATH=$(for x in "${S}/lib/"*.framework; do echo -n ":$x"; done)
123
	insinto ${QTTRANSDIR}
132
	  DYLD_LIBRARY_PATH="${S}/lib${DYLD_FPATH}" \
124
	doins translations/*.qm || die
133
	  LD_LIBRARY_PATH="${S}/lib" "${S}"/bin/lrelease translations/*.ts || die
134
	  insinto ${QTTRANSDIR}
135
	  doins translations/*.qm || die
136
	fi
125
137
126
	setqtenv
138
	setqtenv
127
	fix_library_files
139
	fix_library_files

Return to bug 327827