Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 138110 Details for
Bug 201772
qt4.eclass - eqmake4 enhancements
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
qt4.eclass-enhancements.patch
qt4.eclass-enhancements.patch (text/plain), 5.09 KB, created by
Przemyslaw Maciag (RETIRED)
on 2007-12-09 18:14:15 UTC
(
hide
)
Description:
qt4.eclass-enhancements.patch
Filename:
MIME Type:
Creator:
Przemyslaw Maciag (RETIRED)
Created:
2007-12-09 18:14:15 UTC
Size:
5.09 KB
patch
obsolete
>--- qt4.eclass.orig 2007-12-10 07:17:16.000000000 +0100 >+++ qt4.eclass 2007-12-10 12:40:09.000000000 +0100 >@@ -1,26 +1,34 @@ > # Copyright 2005 Gentoo Foundation > # Distributed under the terms of the GNU General Public License v2 > # $Header: /var/cvsroot/gentoo-x86/eclass/qt4.eclass,v 1.27 2007/10/03 14:59:04 caleb Exp $ >-# >-# Author Caleb Tennis <caleb@gentoo.org> >-# >-# This eclass is simple. Inherit it, and in your depend, do something like this: >-# >-# DEPEND="$(qt4_min_version 4)" >-# >-# and it handles the rest for you >-# >+ >+# @ECLASS: qt4.eclass >+# @MAINTAINER: >+# Caleb Tennis <caleb@gentoo.org> >+# @BLURB: >+# Eclass for Qt4 packages >+# @DESCRIPTION: >+# This eclass contains various functions that may be useful >+# when dealing with packages using Qt4 libraries. >+ > # 08.16.06 - Renamed qt_min_* to qt4_min_* to avoid conflicts with the qt3 eclass. > # - Caleb Tennis <caleb@gentoo.org> > > inherit eutils multilib toolchain-funcs versionator > >-IUSE="${IUSE}" >+IUSE="${IUSE} debug" > > QTPKG="x11-libs/qt-" > QT4MAJORVERSIONS="4.3 4.2 4.1 4.0" > QT4VERSIONS="4.3.2 4.3.1-r1 4.3.1 4.3.0-r2 4.3.0-r1 4.3.0 4.3.0_rc1 4.3.0_beta1 4.2.3-r1 4.2.3 4.2.2 4.2.1 4.2.0-r2 4.2.0-r1 4.2.0 4.1.4-r2 4.1.4-r1 4.1.4 4.1.3 4.1.2 4.1.1 4.1.0 4.0.1 4.0.0" > >+# @FUNCTION: qt4_min_version >+# @USAGE: [minimum version] >+# @DESCRIPTION: >+# This function should be called in package DEPENDs whenever it depends on qt4. >+# Simple example - in your depend, do something like this: >+# DEPEND="$(qt4_min_version 4.2)" >+# if package can be build with qt-4.2 or higher. > qt4_min_version() { > echo "|| (" > qt4_min_version_list "$@" >@@ -53,24 +61,76 @@ > echo "${VERSIONS}" > } > >+# @FUNCTION: qt4_pkg_setup >+# @MAINTAINER: >+# Caleb Tennis <caleb@gentoo.org> >+# Przemyslaw Maciag <troll@gentoo.org> >+# @DESCRIPTION: >+# Default pkg_setup function for packages that depends on qt4. If you have to >+# create ebuilds own pkg_setup in your ebuild, call qt4_pkg_setup in it. >+# This function uses two global vars from ebuild: >+# - QT4_BUILT_WITH_USE_CHECK - contains use flag that need to turned on in qt4 >+# - QT4_OPTIONAL_BUILT_WITH_USE_CHECK - qt4 flags that gives some functionality, >+# but can be safetly disabled in package (so qt4 don't have to be recompiled) > qt4_pkg_setup() { >+ local requiredflags="" > for x in ${QT4_BUILT_WITH_USE_CHECK}; do >- if ! built_with_use =x11-libs/qt-4* $x; then >- die "This package requires Qt4 to be built with the '${x}' use flag." >+ if ! built_with_use =x11-libs/qt-4* ${x}; then >+ requiredflags="${requiredflags} ${x}" >+ fi >+ done >+ >+ local optionalflags="" >+ for x in ${QT4_OPTIONAL_BUILT_WITH_USE_CHECK}; do >+ if use ${x} && ! built_with_use =x11-libs/qt-4* ${x}; then >+ optionalflags="${optionalflags} ${x}" > fi > done >+ >+ local diemessage="" >+ if [[ ${requiredflags} != "" ]]; then >+ eerror >+ eerror "(1) In order to compile ${PN} package first you need to build qt4" >+ eerror "with USE=\"${requiredflags}\" flag(s)" >+ eerror >+ diemessage="(1) recompile qt4 with \"${requiredflags}\" USE flag(s) ; " >+ fi >+ if [[ ${optionalflags} != "" ]]; then >+ eerror >+ eerror "(2) You are trying to compile ${PN} package with" >+ eerror "USE=\"${optionalflags}\"" >+ eerror "while qt4 is built without this particular flag(s): it will" >+ eerror "not work." >+ eerror >+ eerror "Possible solutions to this problem are:" >+ eerror "a) install package ${PN} without \"${optionalflags}\" USE flag(s)" >+ eerror "b) re-emerge qt4 with \"${optionalflags}\" USE flag(s)" >+ eerror >+ diemessage="${diemessage}(2) recompile qt4 with \"${optionalflags}\" USE flag(s) or disable them for ${PN} package\n" >+ fi >+ >+ [[ ${diemessage} != "" ]] && die "can't emerge ${PN}: ${diemessage}" > } > >+# @FUNCTION: eqmake4 >+# @USAGE: [.pro file] [additional parameters to qmake] >+# @MAINTAINER: >+# Przemyslaw Maciag <troll@gentoo.org> >+# Davide Pesavento <davidepesa@gmail.com> >+# @DESCRIPTION: >+# Runs qmake on the specified .pro file (defaults to >+# ${PN}.pro if eqmake4 was called with no argument). >+# Additional parameters are passed unmodified to qmake. > eqmake4() { > local LOGFILE="${T}/qmake-$$.out" > local projprofile="${1}" >- [ -z ${projprofile} ] && projprofile="${PN}.pro" >+ [[ -z ${projprofile} ]] && projprofile="${PN}.pro" > shift 1 > > ebegin "Processing qmake ${projprofile}" > > # file exists? >- if [ ! -f ${projprofile} ]; then >+ if [[ ! -f ${projprofile} ]]; then > echo > eerror "Project .pro file \"${projprofile}\" does not exists" > eerror "qmake cannot handle non-existing .pro files" >@@ -86,9 +146,9 @@ > > # as a workaround for broken qmake, put everything into file > if has debug ${IUSE} && use debug; then >- echo -e "$CONFIG -= release\nCONFIG += no_fixpath debug" >> ${projprofile} >+ echo -e "\nCONFIG -= release\nCONFIG += no_fixpath debug" >> ${projprofile} > else >- echo -e "$CONFIG -= debug\nCONFIG += no_fixpath release" >> ${projprofile} >+ echo -e "\nCONFIG -= debug\nCONFIG += no_fixpath release" >> ${projprofile} > fi > > /usr/bin/qmake ${projprofile} \ >@@ -110,7 +170,7 @@ > eend ${result} > > # was qmake successful? >- if [ ${result} -ne 0 ]; then >+ if [[ ${result} -ne 0 ]]; then > echo > eerror "Running qmake on \"${projprofile}\" has failed" > echo
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 201772
:
138093
|
138109
|
138110
|
138111
|
139176