From a6bd0dfee75b8a26e21794164c9abeeb4026b89e Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Thu, 12 Apr 2007 00:39:09 +0000 Subject: [PATCH] Stable for HPPA (bug #172746). Package-Manager: portage-2.1.2.2 --- x11-libs/qt/ChangeLog | 6 +++- x11-libs/qt/Manifest | 20 ++++++++----- .../qt/files/qt-4.2.3-hppa-ldcw-fix.patch | 30 +++++++++++++++++++ x11-libs/qt/qt-4.2.3-r1.ebuild | 6 ++-- 4 files changed, 50 insertions(+), 12 deletions(-) create mode 100644 x11-libs/qt/files/qt-4.2.3-hppa-ldcw-fix.patch 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 + +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 qt-3.3.8-r2.ebuild, qt-4.2.3-r1.ebuild: diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index f9409292a170..1bbeafcd1242 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -102,6 +102,10 @@ AUX qt-4.1.4-sparc.patch 475 RMD160 1af71a9748963bca0a24911b880d11f1384543e2 SHA MD5 838314a6c48d8f188ccd6c7d4c938a56 files/qt-4.1.4-sparc.patch 475 RMD160 1af71a9748963bca0a24911b880d11f1384543e2 files/qt-4.1.4-sparc.patch 475 SHA256 c9700bbe6b57ec448e67a77443dff534daf8093c5834c9d4ebaa8b3de29b118a files/qt-4.1.4-sparc.patch 475 +AUX qt-4.2.3-hppa-ldcw-fix.patch 986 RMD160 6435fcf447a2f13bbb9d3060a2712fcd35db622c SHA1 e199a2f8db72f798bd9b76a12c6dae3a9a436fac SHA256 fa69fc4498e9dba703f15c8bcb6c28ee3bfc62f078abae5714634b81817267d1 +MD5 8a5253bcca7dcfcd0f1189c0fcab8465 files/qt-4.2.3-hppa-ldcw-fix.patch 986 +RMD160 6435fcf447a2f13bbb9d3060a2712fcd35db622c files/qt-4.2.3-hppa-ldcw-fix.patch 986 +SHA256 fa69fc4498e9dba703f15c8bcb6c28ee3bfc62f078abae5714634b81817267d1 files/qt-4.2.3-hppa-ldcw-fix.patch 986 AUX qt-ulibc.patch 355 RMD160 9a7a01b248b7b646316cef550783569f8bdc89e2 SHA1 2f09deb7e354797ee72aa65a35c882a5ed5fd86c SHA256 6b57b1e25c1e2cebd51b8279fbcadb5e2d9bb77d19b10ea51a4f74c64bd65e2d MD5 dcd3368171f2b284381e1cbc0de6a5a5 files/qt-ulibc.patch 355 RMD160 9a7a01b248b7b646316cef550783569f8bdc89e2 files/qt-ulibc.patch 355 @@ -167,18 +171,18 @@ EBUILD qt-4.2.2.ebuild 7692 RMD160 b2a376dfbf8d337fefd875290feaff71682d1342 SHA1 MD5 d9d58ed2097ab604884c022c2eb5f108 qt-4.2.2.ebuild 7692 RMD160 b2a376dfbf8d337fefd875290feaff71682d1342 qt-4.2.2.ebuild 7692 SHA256 1d7322eec33620e1f7fae1c8a2a9fabc98ef74e1b91b0135de84c802291611e3 qt-4.2.2.ebuild 7692 -EBUILD qt-4.2.3-r1.ebuild 7742 RMD160 4adbc984cfd395c2af26a577a7e52078582d20be SHA1 64c373553221caced90f35888ed8638a17ebeb40 SHA256 8d0030b0a654fe75b4043e1c79a24da948e17054dbaada90edda5046454ee659 -MD5 502207324714af668930853868afae81 qt-4.2.3-r1.ebuild 7742 -RMD160 4adbc984cfd395c2af26a577a7e52078582d20be qt-4.2.3-r1.ebuild 7742 -SHA256 8d0030b0a654fe75b4043e1c79a24da948e17054dbaada90edda5046454ee659 qt-4.2.3-r1.ebuild 7742 +EBUILD qt-4.2.3-r1.ebuild 7742 RMD160 e34c82d37f30013ff77ad41afe1144b11bb08c45 SHA1 e93244a9d3deea48bd1f4a3487abf5236abbbfcf SHA256 611c7b11060595cb33f987bf8c07e31332e6ca1f40f770524868ad6c0600558e +MD5 f7567713b5cf670f68c3c2cc46b6f19e qt-4.2.3-r1.ebuild 7742 +RMD160 e34c82d37f30013ff77ad41afe1144b11bb08c45 qt-4.2.3-r1.ebuild 7742 +SHA256 611c7b11060595cb33f987bf8c07e31332e6ca1f40f770524868ad6c0600558e qt-4.2.3-r1.ebuild 7742 EBUILD qt-4.2.3.ebuild 7699 RMD160 27a70efaa57f9d5eff3d38205a11b60df3034807 SHA1 44d1008fd8eabb0cc5e03bb301d88dade84a124f SHA256 a675cd447e7b4b2edb3eef719d022c08b6316341b2bff6ba250df8374ff59ed9 MD5 371dc767bce4f830b97bc0155280eb95 qt-4.2.3.ebuild 7699 RMD160 27a70efaa57f9d5eff3d38205a11b60df3034807 qt-4.2.3.ebuild 7699 SHA256 a675cd447e7b4b2edb3eef719d022c08b6316341b2bff6ba250df8374ff59ed9 qt-4.2.3.ebuild 7699 -MISC ChangeLog 26235 RMD160 5b3c4f8d3553b2aef0c8a92a991265858631bd3f SHA1 4a5c500fa9c4e70032c278f67011fe04d99c9dcb SHA256 6f8cc1eb02fbe20c1a76f85de138d0fe5fd5c5d7f48afbf33ad5e8837bf5a623 -MD5 5550d194e05836b3880a6b6b68d8f7c1 ChangeLog 26235 -RMD160 5b3c4f8d3553b2aef0c8a92a991265858631bd3f ChangeLog 26235 -SHA256 6f8cc1eb02fbe20c1a76f85de138d0fe5fd5c5d7f48afbf33ad5e8837bf5a623 ChangeLog 26235 +MISC ChangeLog 26368 RMD160 23c5600421b0ab565a64cd026dfcfa084e916183 SHA1 bc63ff47b5c817ac68aafce12ee170f80838343d SHA256 19f7a1ccadb8c53360f5a78e1eafe33bbb3b75e1ec6fb62676c71b73fbb47d5a +MD5 960631fc699039d2cd1552bce9937c42 ChangeLog 26368 +RMD160 23c5600421b0ab565a64cd026dfcfa084e916183 ChangeLog 26368 +SHA256 19f7a1ccadb8c53360f5a78e1eafe33bbb3b75e1ec6fb62676c71b73fbb47d5a ChangeLog 26368 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448 MD5 512150b47a904b0240101e319856aab1 metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc metadata.xml 156 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 +## +## 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 -- 2.26.2