Update of /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17114/10.3/unstable/crypto/finkinfo
Modified Files:
mozilla.info mozilla.patch
Log Message:
Fix XPCOM Glue error during package installation (cause:
DYLD_LIBRARY_PATH is cleared by sudo)
Index: mozilla.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/mozilla.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mozilla.patch 16 Jun 2005 17:20:49 -0000 1.3
+++ mozilla.patch 15 Dec 2005 18:42:47 -0000 1.4
@@ -386,10 +386,16 @@
+
diff -Naur mozilla-1.7.2.old/fink/update-mozilla-chrome
mozilla-1.7.2.new/fink/update-mozilla-chrome
--- mozilla-1.7.2.old/fink/update-mozilla-chrome Thu Jan 1 09:00:00 1970
-+++ mozilla-1.7.2.new/fink/update-mozilla-chrome Fri Aug 20 20:07:48 2004
-@@ -0,0 +1,24 @@
++++ mozilla-1.7.2.new/fink/update-mozilla-chrome Thu Dec 15 18:39:38 2005
+@@ -0,0 +1,30 @@
+#!/bin/sh -e
+
++if [ "$UID" -ne "0" ]; then
++ exec sudo -H "$0" "$@"
++ echo "Could not switch to root...aborting $0"
++ exit 0
++fi
++
+ulimit -s unlimited || true
+
[EMAIL PROTECTED]@/lib/mozilla
@@ -407,8 +413,8 @@
+rm -f ${MOZILLA_FIVE_HOME}/component.reg
+rm -f ${MOZILLA_FIVE_HOME}/components/*.dat
+
-+sudo -H ${MOZILLA_FIVE_HOME}/regxpcom || true
-+sudo -H ${MOZILLA_FIVE_HOME}/regchrome || true
++${MOZILLA_FIVE_HOME}/regxpcom || true
++${MOZILLA_FIVE_HOME}/regchrome || true
+
+exit 0
+
Index: mozilla.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/mozilla.info,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- mozilla.info 7 Dec 2005 17:14:53 -0000 1.14
+++ mozilla.info 15 Dec 2005 18:42:47 -0000 1.15
@@ -1,6 +1,6 @@
Package: mozilla
Version: 1.7.5
-Revision: 3
+Revision: 4
GCC: 3.3
Source: mirror:custom:mozilla/releases/%n%v/source/%n-source-%v.tar.bz2
Source-MD5: e5994f3e801cd834966367c6a12f8aeb
@@ -20,7 +20,7 @@
SetCXX: g++ -I%p/lib/freetype2/include -I%p/lib/freetype2/include/freetype2
PatchScript: sed 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
CompileScript: <<
-#! /bin/sh
+#!/bin/sh -ev
export PATH="%p/lib/freetype2/bin:${PATH}"
./configure %c
make -w
@@ -36,7 +36,7 @@
grep 'inspector' dist/bin/chrome/installed-chrome.txt
>fink/chrome.d/00dom-inspector
<<
InstallScript: <<
-#!/bin/sh
+#!/bin/sh -ev
make install DESTDIR=%d
@@ -284,7 +284,6 @@
<<
SplitOff7: <<
Package: %N-dev
-# Depends: %N-shlibs (>= %v-%r), libidl2-shlibs, pkgconfig
Depends: %N-shlibs (>= %v-%r), gettext, glib2-shlibs, libiconv,
libidl2-shlibs, pkgconfig
Conflicts: firefox-dev
Replaces: firefox-dev, %N (<< 1.1.0-4)
@@ -295,7 +294,6 @@
<<
SplitOff8: <<
Package: %N-browser
-# Depends: %N-shlibs (>= %v-%r), libjpeg-shlibs, libpng3-shlibs,
libmng2-shlibs, gtk+2
Depends: %N-shlibs (>= %v-%r), atk1-shlibs, freetype2-hinting-shlibs |
freetype2-shlibs, gettext, glib2-shlibs, gnome-vfs2-ssl-shlibs |
gnome-vfs2-shlibs, gtk+2-shlibs, libbonobo2-shlibs, libiconv, libjpeg-shlibs,
libpng3-shlibs, orbit2-shlibs, pango1-xft2-shlibs, x11-shlibs, libmng2-shlibs
Replaces: %N (<< 1.1.0-4)
Conflicts: %N-browser-xft2
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
