diff options
| -rw-r--r-- | net-news/blam/ChangeLog | 15 | ||||
| -rw-r--r-- | net-news/blam/Manifest | 50 | ||||
| -rw-r--r-- | net-news/blam/blam-1.8.4.ebuild | 47 | ||||
| -rw-r--r-- | net-news/blam/files/blam-1.6.0-gecko-fix.diff | 15 | ||||
| -rw-r--r-- | net-news/blam/files/blam-1.6.1-mono-1.1.7-compat-v2.diff | 21 | ||||
| -rw-r--r-- | net-news/blam/files/blam-1.6.1-mono-1.1.7-compat.diff | 14 | ||||
| -rw-r--r-- | net-news/blam/files/blam-1.8.2-64-bit-int.diff | 12 | ||||
| -rw-r--r-- | net-news/blam/files/blam-1.8.2-mono-1.1.17-fix.diff | 42 | ||||
| -rw-r--r-- | net-news/blam/files/blam-1.8.2-seamonkey.patch | 72 | ||||
| -rw-r--r-- | net-news/blam/files/digest-blam-1.8.4 | 3 |
10 files changed, 85 insertions, 206 deletions
diff --git a/net-news/blam/ChangeLog b/net-news/blam/ChangeLog index 2b582cbc7b1a..5399911eac30 100644 --- a/net-news/blam/ChangeLog +++ b/net-news/blam/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for net-news/blam -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-news/blam/ChangeLog,v 1.41 2007/01/27 13:10:47 armin76 Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-news/blam/ChangeLog,v 1.42 2008/01/08 02:40:46 rbu Exp $ + +*blam-1.8.4 (08 Jan 2008) + + 08 Jan 2008; Robert Buchholz <rbu@gentoo.org> + -files/blam-1.6.0-gecko-fix.diff, + -files/blam-1.6.1-mono-1.1.7-compat.diff, + -files/blam-1.6.1-mono-1.1.7-compat-v2.diff, + -files/blam-1.8.2-64-bit-int.diff, -files/blam-1.8.2-mono-1.1.17-fix.diff, + -files/blam-1.8.2-seamonkey.patch, +blam-1.8.4.ebuild: + Version bump by security for untrusted search path vulnerability + (CVE-2005-4790, bug #199841). Cleaning up old patches. 27 Jan 2007; Raúl Porcel <armin76@gentoo.org> -blam-1.6.1-r2.ebuild, -blam-1.8.0.ebuild, -blam-1.8.2-r2.ebuild: diff --git a/net-news/blam/Manifest b/net-news/blam/Manifest index dec360266e44..00733254068b 100644 --- a/net-news/blam/Manifest +++ b/net-news/blam/Manifest @@ -1,27 +1,6 @@ -AUX blam-1.6.0-gecko-fix.diff 614 RMD160 3432e9c1da6dd756760ef87abff55f24e3858088 SHA1 8a3a3c9a3338d58974ade7e89b6eccc7da8707a8 SHA256 bb36cf5b3a66e189d29c54758e73d72db1e62097d471a669879d5b98aee3af9b -MD5 00f43721ad68695ca3870578cce4a220 files/blam-1.6.0-gecko-fix.diff 614 -RMD160 3432e9c1da6dd756760ef87abff55f24e3858088 files/blam-1.6.0-gecko-fix.diff 614 -SHA256 bb36cf5b3a66e189d29c54758e73d72db1e62097d471a669879d5b98aee3af9b files/blam-1.6.0-gecko-fix.diff 614 -AUX blam-1.6.1-mono-1.1.7-compat-v2.diff 768 RMD160 098bcf231fdce36d9cde437a45df1fa05755a050 SHA1 8bca81bf652d382d640f6332939102a023688f14 SHA256 87f69351fc39b9d01c8e9472aa8a14b559e21d51f4d48f73306efad0ff5b7188 -MD5 bc93c8091228ce883de5381bcd35c801 files/blam-1.6.1-mono-1.1.7-compat-v2.diff 768 -RMD160 098bcf231fdce36d9cde437a45df1fa05755a050 files/blam-1.6.1-mono-1.1.7-compat-v2.diff 768 -SHA256 87f69351fc39b9d01c8e9472aa8a14b559e21d51f4d48f73306efad0ff5b7188 files/blam-1.6.1-mono-1.1.7-compat-v2.diff 768 -AUX blam-1.6.1-mono-1.1.7-compat.diff 609 RMD160 214072177f031531181778bb2f9136886fac53ca SHA1 cf77155437aa0041551e221df0b5fef6ce7e5dc2 SHA256 833b672a353a00e19fc46b8dc82c313562857002c06a642304f1eeab88e09f45 -MD5 4d50c34081dae158dfee08c8f011571a files/blam-1.6.1-mono-1.1.7-compat.diff 609 -RMD160 214072177f031531181778bb2f9136886fac53ca files/blam-1.6.1-mono-1.1.7-compat.diff 609 -SHA256 833b672a353a00e19fc46b8dc82c313562857002c06a642304f1eeab88e09f45 files/blam-1.6.1-mono-1.1.7-compat.diff 609 -AUX blam-1.8.2-64-bit-int.diff 525 RMD160 37b0f5475fc38c97e73d0f4e4990f80f4b5994a9 SHA1 cc236305b85542fd714e72ba99464fb07f52cf72 SHA256 faebeae583dae6be4fb5c67a1d55f2609c6c407034b1714c5117a4265a62d6f8 -MD5 922cbea4975b2d4de2215d887bcf11e7 files/blam-1.8.2-64-bit-int.diff 525 -RMD160 37b0f5475fc38c97e73d0f4e4990f80f4b5994a9 files/blam-1.8.2-64-bit-int.diff 525 -SHA256 faebeae583dae6be4fb5c67a1d55f2609c6c407034b1714c5117a4265a62d6f8 files/blam-1.8.2-64-bit-int.diff 525 -AUX blam-1.8.2-mono-1.1.17-fix.diff 1816 RMD160 79fc7e9762c63fae3990e3e311b9c750d750c13c SHA1 f734b3972a40de3bcff8e80510e3812f4cde7f2f SHA256 72ef41792879a8947b0831607027c7ac412b3b7b4eb562964a788ad75e830dfe -MD5 59516d30ffa5db406d53a4a03ab884ab files/blam-1.8.2-mono-1.1.17-fix.diff 1816 -RMD160 79fc7e9762c63fae3990e3e311b9c750d750c13c files/blam-1.8.2-mono-1.1.17-fix.diff 1816 -SHA256 72ef41792879a8947b0831607027c7ac412b3b7b4eb562964a788ad75e830dfe files/blam-1.8.2-mono-1.1.17-fix.diff 1816 -AUX blam-1.8.2-seamonkey.patch 2872 RMD160 91d7482ef77db641f2a8d80f699ce93a4b0e8b83 SHA1 791f6ea4262b3a4c7c9694c230a66447a2f4168b SHA256 db2f41ff480153b1bb8b79e4f66e3e4ef74ea5f56556c41961041acf8c71f9f7 -MD5 5a11db48fad0ce43be9c20a1ec4e58ed files/blam-1.8.2-seamonkey.patch 2872 -RMD160 91d7482ef77db641f2a8d80f699ce93a4b0e8b83 files/blam-1.8.2-seamonkey.patch 2872 -SHA256 db2f41ff480153b1bb8b79e4f66e3e4ef74ea5f56556c41961041acf8c71f9f7 files/blam-1.8.2-seamonkey.patch 2872 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX blam-1.8.4_pre2-gtk-sharp-2.10-compat.diff 1139 RMD160 fbba3c0717b825613e0fe5ad2eabc84d32518a86 SHA1 635154dfadc60d5122c3581ccf7eb639914d75ac SHA256 a3075a97240abc63e02581358f3a6a2f4500111175b8ab9ccc697e34d8cb7f74 MD5 9aa53d69f67b70905653b9842e984e6a files/blam-1.8.4_pre2-gtk-sharp-2.10-compat.diff 1139 RMD160 fbba3c0717b825613e0fe5ad2eabc84d32518a86 files/blam-1.8.4_pre2-gtk-sharp-2.10-compat.diff 1139 @@ -30,19 +9,34 @@ AUX blam-1.8.4_pre2-remove-funky-non-printable.diff 821 RMD160 89145f6d4a5cb1357 MD5 d476f0419a9741a1bf895f76748aace1 files/blam-1.8.4_pre2-remove-funky-non-printable.diff 821 RMD160 89145f6d4a5cb1357973264d850bb1d5b3153d0e files/blam-1.8.4_pre2-remove-funky-non-printable.diff 821 SHA256 c3fc97ff7f7a8e118a58ca1805fc9fc6925ee55e981ea7b7150bed75cf41c7e4 files/blam-1.8.4_pre2-remove-funky-non-printable.diff 821 +DIST blam-1.8.4.tar.gz 636444 RMD160 ce7162da9869c22b12321564b7f0bbf3e7e1449c SHA1 69acefe92464b51eb2516254bbd0b71bafd8cd0e SHA256 544de2b443fdd1aa5693e6c04479b83837e759d3c9c684171b4117627c0effc3 DIST blam-1.8.4pre2.tar.gz 748770 RMD160 4bb6696d9381800845f31c5fe01870692c0d6152 SHA1 a9034e9b54d9d58f33f00c2fd2a7817f9bac6680 SHA256 2d4f8292de62f4d672a98b60653c482884ddb59c65a97335fb2ef242536edb0e +EBUILD blam-1.8.4.ebuild 1185 RMD160 bc8c57a9db73a4f8363e145c3c3380d10e57f6f5 SHA1 553e5794152e50a59521cdf9e29a43469b364cc9 SHA256 c8669cc2a18491a098291828ce8ce399d980f30a2295612c59921623d75173fd +MD5 ad1fd2e095f4693321e289328a995ef4 blam-1.8.4.ebuild 1185 +RMD160 bc8c57a9db73a4f8363e145c3c3380d10e57f6f5 blam-1.8.4.ebuild 1185 +SHA256 c8669cc2a18491a098291828ce8ce399d980f30a2295612c59921623d75173fd blam-1.8.4.ebuild 1185 EBUILD blam-1.8.4_pre2.ebuild 1474 RMD160 a14c48b7d0bd1fb1e65edb1f47be6c158dba8f1a SHA1 a010aa02b2b0c15ceddbe814d9f02ae863fb8f68 SHA256 a1f3f0e1b85c2c666d3a9a622b2cc0a533397868c253e09abb3078c76786ee46 MD5 91cedc833d6097f95acae252d24368fb blam-1.8.4_pre2.ebuild 1474 RMD160 a14c48b7d0bd1fb1e65edb1f47be6c158dba8f1a blam-1.8.4_pre2.ebuild 1474 SHA256 a1f3f0e1b85c2c666d3a9a622b2cc0a533397868c253e09abb3078c76786ee46 blam-1.8.4_pre2.ebuild 1474 -MISC ChangeLog 6322 RMD160 bd1f8cdfe14b6634c6d4ecbc37915a848b81085e SHA1 e290351535373225c11e6a7d7e8e0d0c98227c78 SHA256 9db0b5d8c1fbf71a8c03a20f8d64937b314241658a34d3d57bb71728b5115906 -MD5 c80866cd94aa6d9b4977fefd1ad1388c ChangeLog 6322 -RMD160 bd1f8cdfe14b6634c6d4ecbc37915a848b81085e ChangeLog 6322 -SHA256 9db0b5d8c1fbf71a8c03a20f8d64937b314241658a34d3d57bb71728b5115906 ChangeLog 6322 +MISC ChangeLog 6779 RMD160 9d208cca3c1209dc1772636533d40b7e05648bed SHA1 e5674930802e84447b702cfaca69f7c00d6114cf SHA256 0d94bc3318114b6dacc0e0e2619d82f0977d648e5c962afc40d444ca282d2b7b +MD5 13ea41e0768f9c5777c38a9f317301fa ChangeLog 6779 +RMD160 9d208cca3c1209dc1772636533d40b7e05648bed ChangeLog 6779 +SHA256 0d94bc3318114b6dacc0e0e2619d82f0977d648e5c962afc40d444ca282d2b7b ChangeLog 6779 MISC metadata.xml 222 RMD160 aafa4baf96cfa37bca8b5af9961b253e8d54deeb SHA1 0adada1945fd52cf6649dbafddd2e4ebd84e3543 SHA256 2291d7f74fb8845472f5527edd49d2004d0626025dfc6622cbe6a8fe22dc846d MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222 RMD160 aafa4baf96cfa37bca8b5af9961b253e8d54deeb metadata.xml 222 SHA256 2291d7f74fb8845472f5527edd49d2004d0626025dfc6622cbe6a8fe22dc846d metadata.xml 222 +MD5 e74e49f1e7c35f779c7378dd649a13cb files/digest-blam-1.8.4 232 +RMD160 8444a69994939ba6e89ebd085fb787570f3476a2 files/digest-blam-1.8.4 232 +SHA256 25d1d22ad8a18cbaac5707a340a19f4b720b1d5bf45ede9532fd49bea188f279 files/digest-blam-1.8.4 232 MD5 46977fe13c647221de046062502c0d6c files/digest-blam-1.8.4_pre2 244 RMD160 59ec61d8b285ec439a981a494fbcaf55db1ad6c3 files/digest-blam-1.8.4_pre2 244 SHA256 aa31e3983906381941e474176eb8bc6e27c7c00787a70680f3e6575200c7f7ef files/digest-blam-1.8.4_pre2 244 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.7 (GNU/Linux) + +iD8DBQFHguKxyZx3L/ph1soRApJxAJ9Y9BdjtLScVtD4GbkauHmXLqaHdACfXqJz +No7DK7mMWasBKmB/PNvPli0= +=aXFN +-----END PGP SIGNATURE----- diff --git a/net-news/blam/blam-1.8.4.ebuild b/net-news/blam/blam-1.8.4.ebuild new file mode 100644 index 000000000000..4ac90eee3e29 --- /dev/null +++ b/net-news/blam/blam-1.8.4.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-news/blam/blam-1.8.4.ebuild,v 1.1 2008/01/08 02:40:46 rbu Exp $ + +inherit mono eutils autotools + +DESCRIPTION="A RSS aggregator written in C#" +HOMEPAGE="http://www.cmartin.tk/blam.html" +SRC_URI="http://www.cmartin.tk/blam/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +RDEPEND=">=dev-lang/mono-1.1.17 + >=dev-dotnet/gtk-sharp-2.8.2 + >=dev-dotnet/gconf-sharp-2.8.2 + >=dev-dotnet/glade-sharp-2.8.2 + >=dev-dotnet/gecko-sharp-0.11-r1 + >=gnome-base/libgnomeui-2.2 + >=gnome-base/gconf-2.4" +DEPEND="${RDEPEND} + sys-devel/gettext + >=dev-util/pkgconfig-0.19 + >=dev-util/intltool-0.25" + +# Disable parallel builds +MAKEOPTS="$MAKEOPTS -j1" + +src_unpack() { + unpack ${A} + cd "${S}" + + if [[ "$(get_libdir)" != "lib" ]] ; then + sed -i -e 's:$(prefix)/lib/blam:$(libdir)/blam:' \ + -e "s:@prefix@/lib:@prefix@/$(get_libdir):" \ + "${S}"/{,lib,libblam,src}/Makefile.{in,am} "${S}"/blam.in || die + fi + + eautomake +} + +src_install() { + make DESTDIR="${D}" install || die + dodoc AUTHORS ChangeLog INSTALL NEWS README TODO +} diff --git a/net-news/blam/files/blam-1.6.0-gecko-fix.diff b/net-news/blam/files/blam-1.6.0-gecko-fix.diff deleted file mode 100644 index a12350274359..000000000000 --- a/net-news/blam/files/blam-1.6.0-gecko-fix.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff -aur blam-1.6.0/libblam/blam-gecko-utils.cpp blam-1.6.0-gecko-fix/libblam/blam-gecko-utils.cpp ---- blam-1.6.0/libblam/blam-gecko-utils.cpp 2004-10-23 10:10:52.000000000 -0400 -+++ blam-1.6.0-gecko-fix/libblam/blam-gecko-utils.cpp 2004-10-25 10:43:04.752486280 -0400 -@@ -31,11 +31,8 @@ - #include <nsEmbedString.h> - #include <nsIPrefService.h> - #include <nsIServiceManager.h> --#include <nsIWindowWatcher.h> --#include <nsIIOService.h> - #include <nsISupportsPrimitives.h> - #include <nsILocalFile.h> --#include <nsIURI.h> - - #if defined (HAVE_CHROME_NSICHROMEREGISTRYSEA_H) - #include <chrome/nsIChromeRegistrySea.h> diff --git a/net-news/blam/files/blam-1.6.1-mono-1.1.7-compat-v2.diff b/net-news/blam/files/blam-1.6.1-mono-1.1.7-compat-v2.diff deleted file mode 100644 index e91b041ed103..000000000000 --- a/net-news/blam/files/blam-1.6.1-mono-1.1.7-compat-v2.diff +++ /dev/null @@ -1,21 +0,0 @@ -diff -aur blam-1.6.1-orig/src/FeedUpdater.cs blam-1.6.1/src/FeedUpdater.cs ---- blam-1.6.1-orig/src/FeedUpdater.cs 2004-10-20 20:21:46.000000000 -0400 -+++ blam-1.6.1/src/FeedUpdater.cs 2005-05-07 11:23:01.000000000 -0400 -@@ -22,9 +22,14 @@ - string lastModified; - string eTag; - -- WebRequest req = WebRequest.Create(channel.Url); -- req.Headers.Add("If-Modified-Since", channel.LastModified); -- req.Headers.Add("If-None-Match", channel.ETag); -+ HttpWebRequest req = (HttpWebRequest) WebRequest.Create(channel.Url); -+ if (channel.LastModified != "") { -+ req.IfModifiedSince = DateTime.Parse(channel.LastModified); -+ } -+ -+ if (channel.ETag != "") { -+ req.Headers.Add("If-None-Match", channel.ETag); -+ } - - req.Timeout = 20000; - WebResponse res = null; diff --git a/net-news/blam/files/blam-1.6.1-mono-1.1.7-compat.diff b/net-news/blam/files/blam-1.6.1-mono-1.1.7-compat.diff deleted file mode 100644 index 4bd31bb9f9e2..000000000000 --- a/net-news/blam/files/blam-1.6.1-mono-1.1.7-compat.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff -aur blam-1.6.1-orig/src/FeedUpdater.cs blam-1.6.1/src/FeedUpdater.cs ---- blam-1.6.1-orig/src/FeedUpdater.cs 2004-10-20 20:21:46.000000000 -0400 -+++ blam-1.6.1/src/FeedUpdater.cs 2005-05-05 20:49:17.000000000 -0400 -@@ -22,8 +22,8 @@ - string lastModified; - string eTag; - -- WebRequest req = WebRequest.Create(channel.Url); -- req.Headers.Add("If-Modified-Since", channel.LastModified); -+ HttpWebRequest req = (HttpWebRequest) WebRequest.Create(channel.Url); -+ req.IfModifiedSince = DateTime.Parse(channel.LastModified); - req.Headers.Add("If-None-Match", channel.ETag); - - req.Timeout = 20000; diff --git a/net-news/blam/files/blam-1.8.2-64-bit-int.diff b/net-news/blam/files/blam-1.8.2-64-bit-int.diff deleted file mode 100644 index cc019e89bd9e..000000000000 --- a/net-news/blam/files/blam-1.8.2-64-bit-int.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN blam-1.8.2.orig/src/egg-sharp.cs blam-1.8.2/src/egg-sharp.cs ---- blam-1.8.2.orig/src/egg-sharp.cs 2005-12-05 15:02:00.000000000 +0000 -+++ blam-1.8.2/src/egg-sharp.cs 2005-12-05 15:02:50.000000000 +0000 -@@ -168,7 +168,7 @@ - [StructLayout(LayoutKind.Sequential)] - internal struct XClientMessageEvent { - internal XEventName type; -- internal int serial; -+ internal IntPtr serial; - internal bool send_event; - internal IntPtr display; - internal IntPtr window; diff --git a/net-news/blam/files/blam-1.8.2-mono-1.1.17-fix.diff b/net-news/blam/files/blam-1.8.2-mono-1.1.17-fix.diff deleted file mode 100644 index a515829b62ed..000000000000 --- a/net-news/blam/files/blam-1.8.2-mono-1.1.17-fix.diff +++ /dev/null @@ -1,42 +0,0 @@ -diff -aur --exclude=Makefile.in --exclude=Makefile blam-1.8.2-orig/src/Application.cs blam-1.8.2/src/Application.cs ---- blam-1.8.2-orig/src/Application.cs 2005-06-19 04:27:08.000000000 -0700 -+++ blam-1.8.2/src/Application.cs 2006-10-28 08:06:41.000000000 -0700 -@@ -371,6 +371,11 @@ - } - } - -+ public void OnDeleteEvent (object obj, DeleteEventArgs args) -+ { -+ QuitActivated (null, null); -+ } -+ - public void QuitActivated(object obj, EventArgs args) - { - SaveWindowState(); -Only in blam-1.8.2/src/: Defines.cs -diff -aur --exclude=Makefile.in --exclude=Makefile blam-1.8.2-orig/src/Dialogs.cs blam-1.8.2/src/Dialogs.cs ---- blam-1.8.2-orig/src/Dialogs.cs 2005-06-19 04:29:31.000000000 -0700 -+++ blam-1.8.2/src/Dialogs.cs 2006-10-28 08:09:02.000000000 -0700 -@@ -45,7 +45,7 @@ - about.Hide(); - } - -- public void OnDelete(object obj, EventArgs args) -+ public void OnDelete(object obj, DeleteEventArgs args) - { - aboutBox = null; - } -Only in blam-1.8.2/src/: blam.exe -Only in blam-1.8.2/src/: blam.exe.mdb -diff -aur --exclude=Makefile.in --exclude=Makefile blam-1.8.2-orig/src/blam.glade blam-1.8.2/src/blam.glade ---- blam-1.8.2-orig/src/blam.glade 2004-10-23 06:00:02.000000000 -0700 -+++ blam-1.8.2/src/blam.glade 2006-10-28 08:11:42.000000000 -0700 -@@ -19,7 +19,7 @@ - <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property> - <property name="gravity">GDK_GRAVITY_NORTH_WEST</property> - <signal name="key_press_event" handler="MainWindowKeyPressed" last_modification_time="Thu, 08 Jan 2004 16:30:13 GMT"/> -- <signal name="delete_event" handler="QuitActivated" last_modification_time="Sun, 11 Jan 2004 00:01:56 GMT"/> -+ <signal name="delete_event" handler="OnDeleteEvent" last_modification_time="Sun, 11 Jan 2004 00:01:56 GMT"/> - - <child> - <widget class="GtkVBox" id="vbox1"> diff --git a/net-news/blam/files/blam-1.8.2-seamonkey.patch b/net-news/blam/files/blam-1.8.2-seamonkey.patch deleted file mode 100644 index 841eaaef6adf..000000000000 --- a/net-news/blam/files/blam-1.8.2-seamonkey.patch +++ /dev/null @@ -1,72 +0,0 @@ -From: Daniel Drake <dsd@gentoo.org> - -http://bugzilla.gnome.org/show_bug.cgi?id=346566 - -Index: blam-1.8.2/configure.in -=================================================================== ---- blam-1.8.2.orig/configure.in -+++ blam-1.8.2/configure.in -@@ -70,7 +70,7 @@ AC_MSG_CHECKING([which mozilla to use]) - - MOZILLA= - AC_ARG_WITH([mozilla], -- AC_HELP_STRING([--with-mozilla@<:@=mozilla|firefox|thunderbird@:>@], -+ AC_HELP_STRING([--with-mozilla@<:@=mozilla|seamonkey|firefox|thunderbird@:>@], - [Whether to use mozilla, firefox or thunderbird gtkmozembed (default: mozilla)]), - [MOZILLA="$withval"]) - -@@ -78,6 +78,8 @@ dnl try to autodetect: if mozilla exists - if test "x$MOZILLA" = "x"; then - if pkg-config --exists mozilla-gtkmozembed; then - MOZILLA=mozilla -+ elif pkg-config --exists seamonkey-gtkmozembed; then -+ MOZILLA=seamonkey - elif pkg-config --exists firefox-gtkmozembed; then - MOZILLA=firefox - elif pkg-config --exists thunderbird-gtkmozembed; then -@@ -85,7 +87,7 @@ if test "x$MOZILLA" = "x"; then - else - AC_MSG_ERROR([no mozilla installation found]) - fi --elif test "x$with_mozilla" != "xmozilla" -a "x$with_mozilla" != "xfirefox" -a "x$with_mozilla" != "xthunderbird"; then -+elif test "x$with_mozilla" != "xmozilla" -a "x$with_mozilla" != "xfirefox" -a "x$with_mozilla" != "xthunderbird" -a "x$with_mozilla" != "xseamonkey"; then - AC_MSG_ERROR([unknown mozilla name ($MOZILLA)]) - fi - -@@ -95,6 +97,7 @@ AC_MSG_RESULT([$MOZILLA]) - - case "$MOZILLA" in - mozilla) min_version=1.7 flavour=mozilla ;; -+seamonkey) min_version=1.0 flavour=mozilla ;; - firefox) min_version=0.10 flavour=toolkit ;; - thunderbird) min_version=0.8 flavour=toolkit ;; - esac -@@ -205,6 +208,12 @@ dnl changed from nsIXULChromeRegistry in - AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/chrome/nsIChromeRegistrySea.h], - [AC_DEFINE([HAVE_CHROME_NSICHROMEREGISTRYSEA_H], [1], [Define if nsIChromeRegistrySea.h exists])]) - -+ -+dnl do_GetService moved here in recent mozilla code -+ -+AC_CHECK_FILE([$MOZILLA_INCLUDE_ROOT/xpcom/nsServiceManagerUtils.h], -+ [AC_DEFINE([HAVE_XPCOM_NSSERVICEMANAGERUTILS_H], [1], [Define if nsServiceManagerUtils.h exists])]) -+ - MOZILLA_WARN_CXXFLAGS="-Wall -Wconversion -Wpointer-arith -Wcast-align -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor" - AC_SUBST(MOZILLA_WARN_CXXFLAGS) - -Index: blam-1.8.2/libblam/blam-gecko-utils.cpp -=================================================================== ---- blam-1.8.2.orig/libblam/blam-gecko-utils.cpp -+++ blam-1.8.2/libblam/blam-gecko-utils.cpp -@@ -29,6 +29,11 @@ - #include <nsEmbedString.h> - #include <nsIPrefService.h> - #include <nsIServiceManager.h> -+#include <nsCOMPtr.h> -+ -+#if defined(HAVE_XPCOM_NSSERVICEMANAGERUTILS_H) -+#include <nsServiceManagerUtils.h> -+#endif - - #if defined (HAVE_CHROME_NSICHROMEREGISTRYSEA_H) - #include <chrome/nsIChromeRegistrySea.h> diff --git a/net-news/blam/files/digest-blam-1.8.4 b/net-news/blam/files/digest-blam-1.8.4 new file mode 100644 index 000000000000..398631951b96 --- /dev/null +++ b/net-news/blam/files/digest-blam-1.8.4 @@ -0,0 +1,3 @@ +MD5 0dab8064061cee73c51b8954b10e83e6 blam-1.8.4.tar.gz 636444 +RMD160 ce7162da9869c22b12321564b7f0bbf3e7e1449c blam-1.8.4.tar.gz 636444 +SHA256 544de2b443fdd1aa5693e6c04479b83837e759d3c9c684171b4117627c0effc3 blam-1.8.4.tar.gz 636444 |