From c92a9b1b4072f5bfe24a7b10601cd4fa994fecc2 Mon Sep 17 00:00:00 2001 From: Diego Elio Pettenò Date: Thu, 20 Oct 2005 11:01:46 +0000 Subject: Added patch to compile kcheckpass fine on PIC architectures when using --enable-final. See bug #107218. Package-Manager: portage-2.0.53_rc5 --- kde-base/kdebase/ChangeLog | 7 ++++++- kde-base/kdebase/files/kcheckpass-pie-final.patch | 20 ++++++++++++++++++++ kde-base/kdebase/kdebase-3.5.0_beta2.ebuild | 6 +++++- 3 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 kde-base/kdebase/files/kcheckpass-pie-final.patch (limited to 'kde-base/kdebase') diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog index c26339a7e616..85bd38d536a3 100644 --- a/kde-base/kdebase/ChangeLog +++ b/kde-base/kdebase/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdebase # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.225 2005/10/19 13:48:05 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.226 2005/10/20 10:59:45 flameeyes Exp $ + + 20 Oct 2005; Diego Pettenò + +files/kcheckpass-pie-final.patch, kdebase-3.5.0_beta2.ebuild: + Added patch to compile kcheckpass fine on PIC architectures when using + --enable-final. See bug #107218. *kdebase-3.4.3-r1 (19 Oct 2005) diff --git a/kde-base/kdebase/files/kcheckpass-pie-final.patch b/kde-base/kdebase/files/kcheckpass-pie-final.patch new file mode 100644 index 000000000000..3ae34a4d6724 --- /dev/null +++ b/kde-base/kdebase/files/kcheckpass-pie-final.patch @@ -0,0 +1,20 @@ +Index: Makefile.am +=================================================================== +--- kcheckpass/Makefile.am (revision 472230) ++++ kcheckpass/Makefile.am (revision 472231) +@@ -2,14 +2,13 @@ + ## written by Christian Esken + ## + +-INCLUDES= $(all_includes) ++INCLUDES= $(KDE_USE_FPIE) $(all_includes) + + bin_PROGRAMS = kcheckpass + + kcheckpass_SOURCES = kcheckpass.c \ + checkpass_etcpasswd.c checkpass_pam.c checkpass_shadow.c \ + checkpass_osfc2passwd.c checkpass_aix.c +-kcheckpass_CFLAGS = $(KDE_USE_FPIE) + kcheckpass_LDADD = -lkdefakes $(PASSWDLIBS) $(LIBSOCKET) + kcheckpass_LDFLAGS = $(KDE_USE_PIE) $(all_libraries) + diff --git a/kde-base/kdebase/kdebase-3.5.0_beta2.ebuild b/kde-base/kdebase/kdebase-3.5.0_beta2.ebuild index bd9eac8a1d57..47cd21ca49df 100644 --- a/kde-base/kdebase/kdebase-3.5.0_beta2.ebuild +++ b/kde-base/kdebase/kdebase-3.5.0_beta2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.0_beta2.ebuild,v 1.2 2005/10/19 13:48:05 greg_g Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.0_beta2.ebuild,v 1.3 2005/10/20 10:59:45 flameeyes Exp $ inherit kde-dist eutils @@ -43,6 +43,10 @@ src_unpack() { # Avoid using imake (kde bug 114466). epatch "${FILESDIR}/kdebase-3.5.0_beta2-noimake.patch" + # Fixes problem with PIE and kcheckpass with --enable-final on PIC plaforms + # Already applied for 3.5 RC. + epatch "${FILESDIR}/kcheckpass-pie-final.patch" + # For the noimake patch. make -f admin/Makefile.common || die } -- cgit v1.2.3-65-gdbad