From 03a00ec5dd81ecab7fd28f8e76b8a76150943f84 Mon Sep 17 00:00:00 2001 From: Caleb Tennis Date: Tue, 28 Dec 2004 18:33:46 +0000 Subject: [PATCH] Add a patch to remove rpaths --- x11-libs/qt/Manifest | 3 ++- x11-libs/qt/files/qt4-rpath.patch | 11 +++++++++++ x11-libs/qt/qt-4.0.0_beta1-r1.ebuild | 3 ++- 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 x11-libs/qt/files/qt4-rpath.patch diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest index 7972a4ec89d0..174d2e51e2f9 100644 --- a/x11-libs/qt/Manifest +++ b/x11-libs/qt/Manifest @@ -1,4 +1,4 @@ -MD5 9ede125df904f85f7f857bc098c6643a qt-4.0.0_beta1-r1.ebuild 4881 +MD5 c4a6fc290e6f2ecf58f7dd42848a7a74 qt-4.0.0_beta1-r1.ebuild 4917 MD5 6e61efd43e5e4d7d3a18031b108a331b qt-3.3.3-r1.ebuild 8034 MD5 a5c51d879fff01b6f6b8128088bbe3c4 qt-3.3.2.ebuild 6893 MD5 f769105ec9340901a442a9e9880f504d qt-2.3.2-r1.ebuild 2287 @@ -25,6 +25,7 @@ MD5 8c01ee8bb9af451f93082717ed8f4c49 files/qfontdatabase_x11.diff 1147 MD5 33d20a19eba2cb13a7eb156d4eea10db files/qt-3.3.1-mips-relax-branches.patch 688 MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16 MD5 383147673319909aa3b692646be3c3dd files/qt4b1.patch 564 +MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353 MD5 08cdd879d3418837cf4bad594dc0f91f files/45qtdir2 16 MD5 3c0e22a55628691f1789f7bf18426ba0 files/qt4b1_20041228.patch 297 MD5 037b7ee164790946df6a2d6ea89f01fc files/digest-qt-2.3.2-r1 65 diff --git a/x11-libs/qt/files/qt4-rpath.patch b/x11-libs/qt/files/qt4-rpath.patch new file mode 100644 index 000000000000..9e0bb33c52a7 --- /dev/null +++ b/x11-libs/qt/files/qt4-rpath.patch @@ -0,0 +1,11 @@ +--- mkspecs/linux-g++/qmake.conf.orig 2004-12-28 12:33:06.729910672 -0500 ++++ mkspecs/linux-g++/qmake.conf 2004-12-28 12:33:18.794076640 -0500 +@@ -57,7 +57,7 @@ + QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB + QMAKE_LFLAGS_SONAME = -Wl,-soname, + QMAKE_LFLAGS_THREAD = +-QMAKE_RPATH = -Wl,-rpath, ++QMAKE_RPATH = + + QMAKE_LIBS = + QMAKE_LIBS_DYNLOAD = -ldl diff --git a/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild b/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild index 12cbe5802cab..73e811788c52 100644 --- a/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild +++ b/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild,v 1.1 2004/12/28 17:21:02 caleb Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-4.0.0_beta1-r1.ebuild,v 1.2 2004/12/28 18:33:46 caleb Exp $ inherit eutils flag-o-matic @@ -79,6 +79,7 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/qt4b1.patch epatch ${FILESDIR}/qt4b1_20041228.patch + epatch ${FILESDIR}/qt4-rpath.patch } src_compile() { -- 2.26.2