Fixes for hardened-gccs, trying to solve bug #52642

Package-Manager: portage-2.0.51-r13

diff --git a/app-office/openoffice-ximian/ChangeLog b/app-office/openoffice-ximian/ChangeLog
index e7f8fdb684284626984d83775dd629d6435a960c..8adcc8723a1fbebf1bde33efaf835104aff7fd73 100644 (file)
--- a/app-office/openoffice-ximian/ChangeLog
+++ b/app-office/openoffice-ximian/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/openoffice-ximian
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.92 2005/01/16 16:30:11 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/ChangeLog,v 1.93 2005/01/16 22:59:19 suka Exp $
+
+  16 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
+  +files/1.1.3/hardened-link.patch, +files/1.1.3/pthreadlink-fix.patch,
+  openoffice-ximian-1.3.7.ebuild:
+  Try to fix build problems with hardened-gccs, patches provided by
+  Kevin F. Quinn <co@kevquinn.com> in bug #52642
 
   16 Jan 2005; Andreas Proschofsky <suka@gentoo.org>
   openoffice-ximian-1.3.7.ebuild:

diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index 577f1f1dd13c69a84191808171111f86c3c30a4b..ad6b9b8fd62423c888e27aefda6250da438e2b69 100644 (file)
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -1,7 +1,7 @@
 MD5 f881d3e35a8d3a9c27e1d29984b9d3fd openoffice-ximian-1.3.6.ebuild 16873
 MD5 26f1b4de2d99cba28eb2b09825c69475 openoffice-ximian-1.3.5-r1.ebuild 16129
-MD5 d995e05c08dfad4b92b0a055a5d9b21b openoffice-ximian-1.3.7.ebuild 17101
-MD5 d1639836ae695617618f78bc279de919 ChangeLog 22673
+MD5 7f0d46430d8cf57682f3c5b0c1c4a4c5 openoffice-ximian-1.3.7.ebuild 17275
+MD5 70594205a7c08fe16fd50daf2797fbab ChangeLog 22950
 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
 MD5 b7a3ab0336f7e514b6641e5871c1bbbb files/digest-openoffice-ximian-1.3.5-r1 437
 MD5 2595967ac130a541e50bffc75e105041 files/digest-openoffice-ximian-1.3.6 502
@@ -19,11 +19,13 @@ MD5 6ecbfeab440a03f031dbfa0631404aa0 files/1.1.3/ximian-openoffice.applications
 MD5 9abefd659e5b06ff9d9f515f312cdc4b files/1.1.3/gentoo-splash.diff 890
 MD5 24035033f41d743378e16582c2e51469 files/1.1.3/javafix.patch 1382
 MD5 d1a499cfa276614323b547e013d5c6a0 files/1.1.3/ximian-openoffice.keys 6298
+MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.3/hardened-link.patch 576
 MD5 03a4e552b53cb7fc9da8d844369ff647 files/1.1.3/gentoo-1.3.7.patch 995
 MD5 d36ed3c83eb2dc4c5f52c2cd24f023cf files/1.1.3/xooffice-wrapper-1.3 9336
 MD5 6984d0675ce2c9de20b0939a2f0b5dcb files/1.1.3/gcc34-nojava-fix.patch 455
 MD5 bf7df7ebe1373f6e2e5bd1e0425657bd files/1.1.3/gcc34-nptl-fix.patch 618
 MD5 e93f28c8afacb22bf9ac351ebd8195d2 files/1.1.3/gcc34-gnome.patch 598
+MD5 3d3555a66a2d8a66613d4e4471701eb8 files/1.1.3/pthreadlink-fix.patch 1163
 MD5 f43ca2544f6cd797bed8e5aad1e50a29 files/1.1.3/gcc34-sal-link-to-libsupc++.diff 405
 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.3/STLport-vector.patch 1472
 MD5 dd3785621235368cc28f1f85101fcac7 files/1.1.3/nojvmfwk-fix.patch 6986

diff --git a/app-office/openoffice-ximian/files/1.1.3/hardened-link.patch b/app-office/openoffice-ximian/files/1.1.3/hardened-link.patch
new file mode 100644 (file)
index 0000000..83c707d
--- /dev/null
+++ b/app-office/openoffice-ximian/files/1.1.3/hardened-link.patch
@@ -0,0 +1,14 @@
+diff -ur solenv.orig/inc/unxlngi4.mk solenv/inc/unxlngi4.mk
+--- solenv.orig/inc/unxlngi4.mk        2004-10-23 20:09:29.344518376 +0200
++++ solenv/inc/unxlngi4.mk     2004-10-23 20:09:43.084429592 +0200
+@@ -156,8 +156,8 @@
+ LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+ 
+ # linker flags for linking applications
+-LINKFLAGSAPPGUI= -Wl,-export-dynamic
+-LINKFLAGSAPPCUI= -Wl,-export-dynamic
++LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,-z,execheap
++LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,-z,execheap
+ 
+ # linker flags for linking shared libraries
+ LINKFLAGSSHLGUI= -shared

diff --git a/app-office/openoffice-ximian/files/1.1.3/pthreadlink-fix.patch b/app-office/openoffice-ximian/files/1.1.3/pthreadlink-fix.patch
new file mode 100644 (file)
index 0000000..3812210
--- /dev/null
+++ b/app-office/openoffice-ximian/files/1.1.3/pthreadlink-fix.patch
@@ -0,0 +1,32 @@
+diff -ur solenv.orig/inc/unxlngi4.mk solenv/inc/unxlngi4.mk
+--- solenv.orig/inc/unxlngi4.mk        2004-10-23 20:07:59.714144264 +0200
++++ solenv/inc/unxlngi4.mk     2004-10-23 20:08:36.190599000 +0200
+@@ -151,13 +151,13 @@
+ LINK*=$(CC)
+ 
+ # default linker flags
+-LINKFLAGSDEFS*=-z defs
++LINKFLAGSDEFS*=-Wl,-z,defs
+ LINKFLAGSRUNPATH*=-Wl,-rpath,\''$$ORIGIN'\'
+-LINKFLAGS=-O2 -Bsymbolic -z combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
++LINKFLAGS=-Wl,-O2 -Bsymbolic,-z,combreloc $(LINKFLAGSDEFS) $(LINKFLAGSRUNPATH)
+ 
+ # linker flags for linking applications
+-LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
+-LINKFLAGSAPPCUI= -Wl,-export-dynamic -Wl,--noinhibit-exec
++LINKFLAGSAPPGUI= -Wl,-export-dynamic
++LINKFLAGSAPPCUI= -Wl,-export-dynamic
+ 
+ # linker flags for linking shared libraries
+ LINKFLAGSSHLGUI= -shared
+@@ -198,8 +198,8 @@
+ 
+ LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
+ 
+-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lstdc++
+-LIBSTLPORTST=$(STATIC) -lstlport_gcc $(DYNAMIC)
++LIBSTLPORT=$(DYNAMIC) -lstlport_gcc -lpthread -lstdc++
++LIBSTLPORTST=$(STATIC) -lstlport_gcc -lpthread $(DYNAMIC)
+ 
+ #FILLUPARC=$(STATIC) -lsupc++ $(DYNAMIC)
+ 

diff --git a/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild b/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild
index 56949af70760be4d691ada8e1aa3e44fdfc4a490..dc88564813e85d216fca8c14464d5a89925e6858 100644 (file)
--- a/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild
+++ b/app-office/openoffice-ximian/openoffice-ximian-1.3.7.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/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild,v 1.4 2005/01/16 16:30:11 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-ximian/openoffice-ximian-1.3.7.ebuild,v 1.5 2005/01/16 22:59:19 suka Exp $
 
 # Notes:
 #
@@ -26,7 +26,7 @@
 
 inherit flag-o-matic eutils toolchain-funcs
 
-IUSE="gnome kde java curl zlib nptl"
+IUSE="curl gnome hardened java kde nptl zlib"
 
 OO_VER="1.1.3"
 PATCHLEVEL="OOO_1_1_3"
@@ -287,6 +287,14 @@ src_unpack() {
                use gnome && epatch ${FILESDIR}/${OO_VER}/gcc34-gnome.patch
        fi
 
+       #phtread-fix
+       epatch ${FILESDIR}/${OO_VER}/pthreadlink-fix.patch
+
+       #Fix for hardened
+       if use hardened; then
+               epatch ${FILESDIR}/${OO_VER}/hardened-link.patch
+       fi
+
        einfo "Installing / Scaling Icons"
        ${PATCHDIR}/bin/scale-icons ${S} || die
        cp -af ${ICONDIR}/* ${S} || die