net-misc/mugshot: Patch to prevent browser crashes

svn path=/sunrise/; revision=2893

diff --git a/net-misc/mugshot/ChangeLog b/net-misc/mugshot/ChangeLog
index 5f046453fc865b15680e0e7d350b5739a2f4418f..ec5a1915ed8d1cc41ce91dd290f0cfd883380431 100644 (file)
--- a/net-misc/mugshot/ChangeLog
+++ b/net-misc/mugshot/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Feb 2007; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
+  mugshot-1.1.32.ebuild, +files/mugshot-1.1.32-libxpcom.patch,
+  files/mugshot-1.1.32-use-firefox.patch:
+  Patch to prevent browser crashes
+
   02 Feb 2007; Alexandre Rostovtsev (tetromino) <tetromino@gmail.com>
   -mugshot-1.1.30.ebuild, -files/mugshot-1.1.30-use-firefox.patch,
   +mugshot-1.1.32.ebuild, +files/mugshot-1.1.32-use-firefox.patch:

diff --git a/net-misc/mugshot/Manifest b/net-misc/mugshot/Manifest
index e380a314e91ef4fbdf252287b101feeb24603559..fc3cbbdd1b47a322047ab08363848bab50cd4673 100644 (file)
--- a/net-misc/mugshot/Manifest
+++ b/net-misc/mugshot/Manifest
@@ -6,19 +6,23 @@ AUX mugshot-1.1.26-firefox-update.sh 809 RMD160 34e8d0f95c91ca9c94338ea0d637e2c7
 MD5 73ccc232a47542aed0fae8c9d43f1c9c files/mugshot-1.1.26-firefox-update.sh 809
 RMD160 34e8d0f95c91ca9c94338ea0d637e2c77d9bc392 files/mugshot-1.1.26-firefox-update.sh 809
 SHA256 afa2230aa865ffc8a86cc88988101fab7f5fd76c7495769449d4d96bccedc121 files/mugshot-1.1.26-firefox-update.sh 809
-AUX mugshot-1.1.32-use-firefox.patch 3498 RMD160 6598b1078ae85d53739cc89924345be23a895d29 SHA1 aec618ba4c01aaf38d5daab9ee4e6ecdedfa16bb SHA256 e0b95075b98e8d622d47539ef084418e0a0fa6b6289176e6c09b41115b757813
-MD5 f4d93c0a1fc6098de0fd3907d51080e8 files/mugshot-1.1.32-use-firefox.patch 3498
-RMD160 6598b1078ae85d53739cc89924345be23a895d29 files/mugshot-1.1.32-use-firefox.patch 3498
-SHA256 e0b95075b98e8d622d47539ef084418e0a0fa6b6289176e6c09b41115b757813 files/mugshot-1.1.32-use-firefox.patch 3498
+AUX mugshot-1.1.32-libxpcom.patch 2120 RMD160 42969dddb06dd2a7e5045cfc39059d249f4e16de SHA1 9d3b60a27cb677f5a0c39ad6e6de408ca3cfc645 SHA256 de420ab62374d238ab40708f47d945321a987fca4696a957831a6ae8c8c287be
+MD5 18f4b3518748e633fe8b5db246ff018e files/mugshot-1.1.32-libxpcom.patch 2120
+RMD160 42969dddb06dd2a7e5045cfc39059d249f4e16de files/mugshot-1.1.32-libxpcom.patch 2120
+SHA256 de420ab62374d238ab40708f47d945321a987fca4696a957831a6ae8c8c287be files/mugshot-1.1.32-libxpcom.patch 2120
+AUX mugshot-1.1.32-use-firefox.patch 3519 RMD160 0d388e8c09a2da49157eb207ec192d92fa01157e SHA1 548d067d555dc7875d5754046b48f4b24967aec4 SHA256 1bc4d10d51a4199556fb6108a767572e2e132503646a923fd307585f5b62d850
+MD5 fa3b60786fd21e1a199f36a301dbdf71 files/mugshot-1.1.32-use-firefox.patch 3519
+RMD160 0d388e8c09a2da49157eb207ec192d92fa01157e files/mugshot-1.1.32-use-firefox.patch 3519
+SHA256 1bc4d10d51a4199556fb6108a767572e2e132503646a923fd307585f5b62d850 files/mugshot-1.1.32-use-firefox.patch 3519
 DIST mugshot-1.1.32.tar.gz 785713 RMD160 f92679d78f155688e6d5e3b3ec8f2163484a23ce SHA1 772517d2deba4fa2da888869bf54304c3d7b1cc1 SHA256 396bdf70aa4643c40589d8253cf1500b1a4a36beacf574885463883fc0022aeb
-EBUILD mugshot-1.1.32.ebuild 1854 RMD160 e31fcb35871d827c712876366d402530ab6e26c6 SHA1 6a01eb19015d6ef1fe9b4528fbd6aba51791968e SHA256 c938b46fc075a23acd50f5ee41386325e5750d1e3448ce9616631b21db3d58a1
-MD5 4e21a60a0bf270b527c08ec78325f5b5 mugshot-1.1.32.ebuild 1854
-RMD160 e31fcb35871d827c712876366d402530ab6e26c6 mugshot-1.1.32.ebuild 1854
-SHA256 c938b46fc075a23acd50f5ee41386325e5750d1e3448ce9616631b21db3d58a1 mugshot-1.1.32.ebuild 1854
-MISC ChangeLog 1233 RMD160 634b0c14750d0100181d602003f5579af055e2a2 SHA1 63b300904c0482328e0514e0a675d6537fe98881 SHA256 96ac9fa7157af5d15282e97ab69eb198735a6eb18d9d7573feb02ffad6bd102c
-MD5 8d577d32beed7ad690be7fb0feaa256f ChangeLog 1233
-RMD160 634b0c14750d0100181d602003f5579af055e2a2 ChangeLog 1233
-SHA256 96ac9fa7157af5d15282e97ab69eb198735a6eb18d9d7573feb02ffad6bd102c ChangeLog 1233
+EBUILD mugshot-1.1.32.ebuild 1896 RMD160 8fb3a4fd098af2ad4c1bfc825a36207ca4aa9076 SHA1 770ab546c6c3aba90b4a9f6101b5ec29468b5a5c SHA256 149b2f7f6da564355ee2af12fa2c0e6b7fef58b3c4747abad5b1a85bcb0ef9a2
+MD5 61e597de011917de251ce23f4a88c496 mugshot-1.1.32.ebuild 1896
+RMD160 8fb3a4fd098af2ad4c1bfc825a36207ca4aa9076 mugshot-1.1.32.ebuild 1896
+SHA256 149b2f7f6da564355ee2af12fa2c0e6b7fef58b3c4747abad5b1a85bcb0ef9a2 mugshot-1.1.32.ebuild 1896
+MISC ChangeLog 1444 RMD160 be35c2549cea1a40768ea4dc7feb6e91ee4d0e0b SHA1 6122b1077c50a985decdd11c365d6576c9758478 SHA256 e11c1f73fc4851c340581955a1215814f9ca77f14d5f545253004b492ec64560
+MD5 1972a6e3788c427092ca8e984b8083ea ChangeLog 1444
+RMD160 be35c2549cea1a40768ea4dc7feb6e91ee4d0e0b ChangeLog 1444
+SHA256 e11c1f73fc4851c340581955a1215814f9ca77f14d5f545253004b492ec64560 ChangeLog 1444
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170

diff --git a/net-misc/mugshot/files/mugshot-1.1.32-libxpcom.patch b/net-misc/mugshot/files/mugshot-1.1.32-libxpcom.patch
new file mode 100644 (file)
index 0000000..349d1cc
--- /dev/null
+++ b/net-misc/mugshot/files/mugshot-1.1.32-libxpcom.patch
@@ -0,0 +1,59 @@
+diff -ru mugshot-1.1.32.orig/configure.ac mugshot-1.1.32/configure.ac
+--- mugshot-1.1.32.orig/configure.ac   2007-02-01 19:09:36.000000000 -0500
++++ mugshot-1.1.32/configure.ac        2007-02-02 15:28:19.800967622 -0500
+@@ -369,6 +369,8 @@
+ 
+ have_full_gecko=false
+ sdk_includes_nspr=false
++sdk_includes_xpcom_core=false
++sdk_includes_xpcom=false
+ 
+ if test "x$with_gecko_sdk" != x -a "x$with_gecko_sdk" != xyes -a "x$with_gecko_sdk" != xno ; then
+    GECKO_IDLDIR="$with_gecko_sdk/idl"
+@@ -378,6 +380,14 @@
+    if test -f "$GECKO_INCLUDEDIR/nspr.h" ; then
+        sdk_includes_nspr=true
+    fi
++
++   if test -f "$with_gecko_sdk/lib/libxpcom.so" ; then
++       sdk_includes_xpcom=true
++       if test -f "$with_gecko_sdk/lib/libxpcom_core.so" ; then
++           sdk_includes_xpcom_core=true
++       fi
++   fi
++
+ fi
+ 
+ if test "x$with_gecko_idl" != x -a "x$with_gecko_idl" != xyes -a "x$with_gecko_idl" != xno ; then
+@@ -486,12 +496,29 @@
+     fi
+ fi
+ 
+-PKG_CHECK_MODULES(LIBHIPPOFIREFOX, gobject-2.0 dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED $NSPR_PACKAGES gtk+-2.0)
++if $sdk_includes_xpcom ; then
++    if $sdk_includes_xpcom_core ; then
++        XPCOM_LIBS="-L $with_gecko_sdk/lib -xpcom_core"
++    else
++        XPCOM_LIBS="-L $with_gecko_sdk/lib -lxpcom"
++    fi
++else
++    for pkg in firefox-xpcom xpcom ; do
++        if test "x$XPCOM_PACKAGES" = x ; then
++            PKG_CHECK_EXISTS($pkg, XPCOM_PACKAGES=$pkg)
++        fi
++    done
++    if test "x$XPCOM_PACKAGES" = x ; then
++        AC_MSG_ERROR([Can't find xpcom])
++    fi
++fi
++
++PKG_CHECK_MODULES(LIBHIPPOFIREFOX, gobject-2.0 dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED $NSPR_PACKAGES $XPCOM_PACKAGES gtk+-2.0)
+ 
+ # Should have -lxpcom here, but that upsets libtool for unknown reasons. Or
+ # should we use -lxpcomglue instead? We don't actually link to anything private, though
+ # we use some private interfaces
+-LIBHIPPOFIREFOX_LIBS="$LIBHIPPOFIREFOX_LIBS $NSPR_LIBS"
++LIBHIPPOFIREFOX_LIBS="$LIBHIPPOFIREFOX_LIBS $NSPR_LIBS $XPCOM_LIBS"
+ 
+ #### define absolute path to srcdir for debugging-only code
+ ABSOLUTE_TOP_SRCDIR=`cd ${srcdir} && pwd`

diff --git a/net-misc/mugshot/files/mugshot-1.1.32-use-firefox.patch b/net-misc/mugshot/files/mugshot-1.1.32-use-firefox.patch
index 59bccfbcb225bb86ee5dc4b0d0ebb1b9a3f25e69..8b3c51c9e15ebf2f002eab82861d0968680120da 100644 (file)
--- a/net-misc/mugshot/files/mugshot-1.1.32-use-firefox.patch
+++ b/net-misc/mugshot/files/mugshot-1.1.32-use-firefox.patch
@@ -17,18 +17,18 @@ diff -ru mugshot-1.1.32.orig/configure.ac mugshot-1.1.32/configure.ac
  AC_ARG_WITH(gecko_sdk, 
        AC_HELP_STRING([--with-gecko-sdk=DIR],
                       [Path to Gecko SDK]))
-@@ -370,6 +379,8 @@
- have_full_gecko=false
- sdk_includes_nspr=false
+@@ -372,6 +381,8 @@
+ sdk_includes_xpcom_core=false
+ sdk_includes_xpcom=false
  
 +if test "x$firefox" = xtrue ; then
 +
  if test "x$with_gecko_sdk" != x -a "x$with_gecko_sdk" != xyes -a "x$with_gecko_sdk" != xno ; then
     GECKO_IDLDIR="$with_gecko_sdk/idl"
     GECKO_INCLUDEDIR="$with_gecko_sdk/include"
-@@ -493,6 +504,10 @@
+@@ -520,6 +531,10 @@
  # we use some private interfaces
- LIBHIPPOFIREFOX_LIBS="$LIBHIPPOFIREFOX_LIBS $NSPR_LIBS"
+ LIBHIPPOFIREFOX_LIBS="$LIBHIPPOFIREFOX_LIBS $NSPR_LIBS $XPCOM_LIBS"
  
 +else
 +    AM_CONDITIONAL(HAVE_FULL_GECKO, false)
@@ -37,7 +37,7 @@ diff -ru mugshot-1.1.32.orig/configure.ac mugshot-1.1.32/configure.ac
  #### define absolute path to srcdir for debugging-only code
  ABSOLUTE_TOP_SRCDIR=`cd ${srcdir} && pwd`
  AC_DEFINE_UNQUOTED(ABSOLUTE_TOP_SRCDIR, "$ABSOLUTE_TOP_SRCDIR", [full path to srcdir])
-@@ -506,14 +521,15 @@
+@@ -533,14 +548,15 @@
  echo "
  
          Mugshot $VERSION

diff --git a/net-misc/mugshot/mugshot-1.1.32.ebuild b/net-misc/mugshot/mugshot-1.1.32.ebuild
index 5e0eb0450a9588d8eb8aa4fcf82b937a47b551cf..420320c3783fa4a9bf115aa0538287f61d494e8d 100644 (file)
--- a/net-misc/mugshot/mugshot-1.1.32.ebuild
+++ b/net-misc/mugshot/mugshot-1.1.32.ebuild
@@ -33,6 +33,7 @@ src_unpack() {
        # configure looks in the wrong place for xpidl
        sed -e 's:bin/xpidl:xpidl:' -i configure.ac
        epatch "${FILESDIR}/${PN}-1.1.22-as-needed.patch"
+       epatch "${FILESDIR}/${P}-libxpcom.patch"
        epatch "${FILESDIR}/${P}-use-firefox.patch"
        eautoreconf
        use firefox && sed -e "s:GET_LIBDIR:$(get_libdir):" \