Add rpath stuff, bug #100597. Fix epiphany/galeon/etc segfaulting at startup.

(Portage version: 2.0.52-r1)

3 files changed, 73 insertions, 0 deletions

diff --git a/www-client/mozilla/files/digest-mozilla-1.7.12-r1 b/www-client/mozilla/files/digest-mozilla-1.7.12-r1
new file mode 100644
index 000000000000..93b4ddc41e35
--- /dev/null
+++ b/www-client/mozilla/files/digest-mozilla-1.7.12-r1
@@ -0,0 +1,7 @@
+MD5 f1ad6adbbc0510eb76d352c94c801fac mozilla-1.7.12-source.tar.bz2 30446836
+MD5 64ba4c6e3b52568468c4f6680ec7e679 ipc-1.1.3.tar.gz 102593
+MD5 50c369ce6d6fcb2d275cd30319a601ff enigmail-0.92.0.tar.gz 377123
+MD5 b4355a5746dde47cf0a7981df1dff998 moz_libart_lgpl-2.3.10p1.tar.bz2 103063
+MD5 7960994910bda4c14a52bc119f9ceefc mozilla-jslibmath-alpha.patch 625
+MD5 855fcb4f3e40bbcc608113ceb11e2ceb mozilla-1.7.12-gtk2xft.patch.bz2 40416
+MD5 a120cd14ade242622387f76875ca9c39 mozilla-1.7.10-nsplugins-v2.patch 1968
diff --git a/www-client/mozilla/files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch b/www-client/mozilla/files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch
new file mode 100644
index 000000000000..43fd152a745d
--- /dev/null
+++ b/www-client/mozilla/files/mozilla-1.7.12-gtk2xft-invalidate-pango_context.patch
@@ -0,0 +1,19 @@
+--- mozilla/gfx/src/gtk/nsFontMetricsXft.cpp	2005-09-26 20:39:02.000000000 +0200
++++ mozilla.az/gfx/src/gtk/nsFontMetricsXft.cpp	2005-09-26 20:34:34.000000000 +0200
+@@ -2775,10 +2779,14 @@ FreeGlobals(void)
+     NS_IF_RELEASE(gFontEncodingProperties);
+     NS_IF_RELEASE(gCharsetManager);
+     gCTLEnabled = PR_FALSE;
+-    if (gPangoContext)
++    if (gPangoContext) {
+         g_object_unref(gPangoContext);
+-    if (gPangoAttrList)
++        gPangoContext = nsnull;
++    }
++    if (gPangoAttrList) {
+         pango_attr_list_unref(gPangoAttrList);
++        gPangoAttrList = nsnull;
++    }
+ 
+     gFontXftMaps.Clear();
+ 
diff --git a/www-client/mozilla/files/mozilla-1.7.12-rpath.patch b/www-client/mozilla/files/mozilla-1.7.12-rpath.patch
new file mode 100644
index 000000000000..405339578f8b
--- /dev/null
+++ b/www-client/mozilla/files/mozilla-1.7.12-rpath.patch
@@ -0,0 +1,47 @@
+--- 1/config/rules.mk	2005-07-28 01:45:18.000000000 +0000
++++ 2/config/rules.mk	2005-07-28 01:45:21.000000000 +0000
+@@ -507,5 +507,10 @@
+ # 
+ ifeq ($(OS_ARCH),Linux)
+ ifdef IS_COMPONENT
++DSO_LDOPTS += -Wl,-rpath,#RPATH_FIXER
++OS_LDFLAGS += -Wl,-rpath,#RPATH_FIXER
+ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic
++else
++DSO_LDOPTS += -Wl,-rpath,#RPATH_FIXER
++OS_LDFLAGS += -Wl,-rpath,#RPATH_FIXER
+ endif
+--- 1/nsprpub/config/rules.mk	2003-09-16 02:00:28.000000000 +0000
++++ 2/nsprpub/config/rules.mk	2005-07-30 04:00:21.000000000 +0000
+@@ -87,6 +87,9 @@
+ endif
+ endif
+ 
++DSO_LDOPTS += -Wl,-rpath,#RPATH_FIXER
++OS_LDFLAGS += -Wl,-rpath,#RPATH_FIXER
++
+ #
+ # This makefile contains rules for building the following kinds of
+ # libraries:
+--- 1/security/coreconf/rules.mk	2005-07-31 16:31:37.000000000 +0000
++++ 2/security/coreconf/rules.mk	2005-07-31 16:37:27.000000000 +0000
+@@ -349,7 +349,7 @@
+ ifdef XP_OS2_VACPP
+ 	$(MKSHLIB) $(DLLFLAGS) $(LDFLAGS) $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
+ else
+-	$(MKSHLIB) -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
++	$(MKSHLIB) -Wl,-rpath,#RPATH_FIXER -o $@ $(OBJS) $(SUB_SHLOBJS) $(LD_LIBS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS)
+ endif
+ 	chmod +x $@
+ ifeq ($(OS_TARGET),Darwin)
+--- 1/security/coreconf/rules.mk	2005-08-01 11:40:54.000000000 +0000
++++ 2/security/coreconf/rules.mk	2005-08-01 11:50:31.000000000 +0000
+@@ -291,7 +291,7 @@
+ ifdef XP_OS2_VACPP
+ 	$(MKPROG) -Fe$@ $(CFLAGS) $(OBJS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
+ else
+-	$(MKPROG) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
++	$(MKPROG) -Wl,-rpath,#RPATH_FIXER -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS) $(EXTRA_LIBS) $(EXTRA_SHARED_LIBS) $(OS_LIBS)
+ endif
+ endif
+