diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2007-04-12 00:39:09 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2007-04-12 00:39:09 +0000 |
| commit | 13e2994064afd62eae6fd4c381f67ab4afba7384 (patch) | |
| tree | 12ac2249d5f9d16201c5b96ab21d771afff3cf9a /x11-libs | |
| parent | Fix FreeBSD backend some more (diff) | |
| download | gentoo-2-13e2994064afd62eae6fd4c381f67ab4afba7384.tar.gz gentoo-2-13e2994064afd62eae6fd4c381f67ab4afba7384.tar.bz2 gentoo-2-13e2994064afd62eae6fd4c381f67ab4afba7384.zip | |
Stable for HPPA (bug #172746).
(Portage version: 2.1.2.2)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qt/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qt/files/qt-4.2.3-hppa-ldcw-fix.patch | 30 | ||||
| -rw-r--r-- | x11-libs/qt/qt-4.2.3-r1.ebuild | 6 |
3 files changed, 38 insertions, 4 deletions
diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog index bc50a6555cde..cd8329589f3f 100644 --- a/x11-libs/qt/ChangeLog +++ b/x11-libs/qt/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.425 2007/04/11 22:35:55 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.426 2007/04/12 00:39:09 jer Exp $ + + 12 Apr 2007; Jeroen Roovers <jer@gentoo.org> + +files/qt-4.2.3-hppa-ldcw-fix.patch, qt-4.2.3-r1.ebuild: + Stable for HPPA (bug #172746). 11 Apr 2007; Tobias Scherbaum <dertobi123@gentoo.org> qt-3.3.8-r2.ebuild, qt-4.2.3-r1.ebuild: diff --git a/x11-libs/qt/files/qt-4.2.3-hppa-ldcw-fix.patch b/x11-libs/qt/files/qt-4.2.3-hppa-ldcw-fix.patch new file mode 100644 index 000000000000..04057994037c --- /dev/null +++ b/x11-libs/qt/files/qt-4.2.3-hppa-ldcw-fix.patch @@ -0,0 +1,30 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 15_hppa_ldcw.dpatch by <lamont@bld-4.mmjgroup.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: patch from Ubuntu to properly support hppa + +@DPATCH@ +diff -urNad qt4-x11-4.1.0~/src/corelib/arch/parisc/q_ldcw.s qt4-x11-4.1.0/src/corelib/arch/parisc/q_ldcw.s +--- qt4-x11-4.1.0~/src/corelib/arch/parisc/q_ldcw.s 2006-02-03 01:50:30.000000000 +0000 ++++ qt4-x11-4.1.0/src/corelib/arch/parisc/q_ldcw.s 2006-02-03 02:00:36.000000000 +0000 +@@ -1,17 +1,7 @@ +- .SPACE $PRIVATE$ +- .SUBSPA $DATA$,QUAD=1,ALIGN=8,ACCESS=31 +- .SUBSPA $BSS$,QUAD=1,ALIGN=8,ACCESS=31,ZERO,SORT=82 +- .SPACE $TEXT$ +- .SUBSPA $LIT$,QUAD=0,ALIGN=8,ACCESS=44 +- .SUBSPA $CODE$,QUAD=0,ALIGN=8,ACCESS=44,CODE_ONLY +- .IMPORT $global$,DATA +- .IMPORT $$dyncall,MILLICODE +- .SPACE $TEXT$ +- .SUBSPA $CODE$ +- ++ .text + .align 4 + .EXPORT q_ldcw,ENTRY,PRIV_LEV=3,ARGW0=GR,RTNVAL=GR +-q_ldcw ++ .label q_ldcw + .PROC + .CALLINFO FRAME=0,CALLS,SAVE_RP + .ENTRY diff --git a/x11-libs/qt/qt-4.2.3-r1.ebuild b/x11-libs/qt/qt-4.2.3-r1.ebuild index 4d280ce49e92..1da509f7ff72 100644 --- a/x11-libs/qt/qt-4.2.3-r1.ebuild +++ b/x11-libs/qt/qt-4.2.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.3-r1.ebuild,v 1.5 2007/04/11 22:35:55 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.2.3-r1.ebuild,v 1.6 2007/04/12 00:39:09 jer Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -13,7 +13,7 @@ S=${WORKDIR}/qt-x11-${SRCTYPE}-${PV} LICENSE="|| ( QPL-1.0 GPL-2 )" SLOT="4" -KEYWORDS="~alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd" IUSE_INPUT_DEVICES="input_devices_wacom" @@ -106,10 +106,10 @@ src_unpack() { unpack ${A} cd ${S} -# epatch ${FILESDIR}/qt4-parisc-linux.diff epatch ${FILESDIR}/qt-4.1.4-sparc.patch epatch ${FILESDIR}/qt4-sqlite-configure.patch epatch ${FILESDIR}/utf8-bug-qt4-2.diff + epatch ${FILESDIR}/${P}-hppa-ldcw-fix.patch cd ${S}/mkspecs/$(qt_mkspecs_dir) # set c/xxflags and ldflags |