diff options
author | Daniel Gryniewicz <dang@gentoo.org> | 2006-05-21 23:35:50 +0000 |
---|---|---|
committer | Daniel Gryniewicz <dang@gentoo.org> | 2006-05-21 23:35:50 +0000 |
commit | 704719604e2d9cfcf63aa30e3bf5c8ac5149da88 (patch) | |
tree | 7343b72f3b9afe84f7d4bc85f615e9dbf0db7fc8 /gnome-base | |
parent | Stable on amd64. (diff) | |
download | historical-704719604e2d9cfcf63aa30e3bf5c8ac5149da88.tar.gz historical-704719604e2d9cfcf63aa30e3bf5c8ac5149da88.tar.bz2 historical-704719604e2d9cfcf63aa30e3bf5c8ac5149da88.zip |
Add upstream patch to fix bug #133880
Package-Manager: portage-2.1_rc1-r3
Diffstat (limited to 'gnome-base')
-rw-r--r-- | gnome-base/gnome-mount/ChangeLog | 9 | ||||
-rw-r--r-- | gnome-base/gnome-mount/Manifest | 25 | ||||
-rw-r--r-- | gnome-base/gnome-mount/files/digest-gnome-mount-0.4-r3 | 3 | ||||
-rw-r--r-- | gnome-base/gnome-mount/files/gnome-mount-0.4-fix-segv-on-no-media.patch | 48 | ||||
-rw-r--r-- | gnome-base/gnome-mount/gnome-mount-0.4-r3.ebuild | 39 |
5 files changed, 116 insertions, 8 deletions
diff --git a/gnome-base/gnome-mount/ChangeLog b/gnome-base/gnome-mount/ChangeLog index 3839c1bc1fd3..c5f81a1e64f3 100644 --- a/gnome-base/gnome-mount/ChangeLog +++ b/gnome-base/gnome-mount/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for gnome-base/gnome-mount # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/ChangeLog,v 1.8 2006/05/17 02:33:30 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/ChangeLog,v 1.9 2006/05/21 23:35:50 dang Exp $ + +*gnome-mount-0.4-r3 (21 May 2006) + + 21 May 2006; Daniel Gryniewicz <dang@gentoo.org> + +files/gnome-mount-0.4-fix-segv-on-no-media.patch, + +gnome-mount-0.4-r3.ebuild: + Add upstream patch to fix bug #133880 *gnome-mount-0.4-r2 (17 May 2006) diff --git a/gnome-base/gnome-mount/Manifest b/gnome-base/gnome-mount/Manifest index 0dad7989509d..17d2ba2fdf96 100644 --- a/gnome-base/gnome-mount/Manifest +++ b/gnome-base/gnome-mount/Manifest @@ -1,6 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX gnome-mount-0.4-fix-segv-on-no-media.patch 2028 RMD160 20a53ba84af5cd6434b702b80a6ed306820a5311 SHA1 a696b92642108e00bbc23f1e8cf6810961361f7b SHA256 1f55612af18786a7a9275765ab2c6bd4ea3f47654b6c5c890607833af0ff3197 size 2028 +MD5 513dc3798c037e4d3ddf19ec0fb2b8fe files/gnome-mount-0.4-fix-segv-on-no-media.patch 2028 +RMD160 20a53ba84af5cd6434b702b80a6ed306820a5311 files/gnome-mount-0.4-fix-segv-on-no-media.patch 2028 +SHA256 1f55612af18786a7a9275765ab2c6bd4ea3f47654b6c5c890607833af0ff3197 files/gnome-mount-0.4-fix-segv-on-no-media.patch 2028 AUX gnome-mount-0.4-hal-mountable.patch 564 RMD160 e4cc5e3901738f0d15e51df2603586dbfa7c69b5 SHA1 91d5e00d8138be5a9be0b4585f8535e236b29f05 SHA256 889921c0867d0855d5b343a7e61b0c4a07202f81ce87cb5320842d68f875bd13 size 564 MD5 cbbc2b9e3b351a389b877bbb0423e34b files/gnome-mount-0.4-hal-mountable.patch 564 RMD160 e4cc5e3901738f0d15e51df2603586dbfa7c69b5 files/gnome-mount-0.4-hal-mountable.patch 564 @@ -14,10 +18,14 @@ EBUILD gnome-mount-0.4-r2.ebuild 928 RMD160 f3e42debaf5ff8b50b9ef5ecd98c3e837a1d MD5 8bd044bdf0d00887e0e3da13fa6bf382 gnome-mount-0.4-r2.ebuild 928 RMD160 f3e42debaf5ff8b50b9ef5ecd98c3e837a1d56b2 gnome-mount-0.4-r2.ebuild 928 SHA256 ab3c526a7785d7cab7959950ef1a59f65b8ff5dc78f9c94754b511dfab4e3267 gnome-mount-0.4-r2.ebuild 928 -MISC ChangeLog 1315 RMD160 18cf62609439730f517f1033ae119f93bb85911c SHA1 0aec4fb2e091111c53f9eb12e4a580feecbeaf8e SHA256 8574811ebea83dd9391ba9b04c222161026115a8577ad5c7ec8d134d2fca8f19 size 1315 -MD5 bb409cc14e3f96d6d20ccc7a6c770b00 ChangeLog 1315 -RMD160 18cf62609439730f517f1033ae119f93bb85911c ChangeLog 1315 -SHA256 8574811ebea83dd9391ba9b04c222161026115a8577ad5c7ec8d134d2fca8f19 ChangeLog 1315 +EBUILD gnome-mount-0.4-r3.ebuild 1006 RMD160 18fbfc9cb5ca2aebad3121c96977fc48ff37a2ec SHA1 5be9b2625575fdecb4b2302f532b0117eda88573 SHA256 c962d298d89b3b454eabe45d585f19ee05762c615178aa05123e6ec50a4ef6ee size 1006 +MD5 e831f937604f12e534659b5a07a36b48 gnome-mount-0.4-r3.ebuild 1006 +RMD160 18fbfc9cb5ca2aebad3121c96977fc48ff37a2ec gnome-mount-0.4-r3.ebuild 1006 +SHA256 c962d298d89b3b454eabe45d585f19ee05762c615178aa05123e6ec50a4ef6ee gnome-mount-0.4-r3.ebuild 1006 +MISC ChangeLog 1525 RMD160 6a519a1b50163f5646c2366e1ddf075849ec2db2 SHA1 30fe1a1b4b51a780feebfd5fa1979ec61d988bd3 SHA256 77a76f3e9948172e4ca51dcb37726174082008e10e7b40176aa527ac9b87c89c size 1525 +MD5 75a58ee3f982e6c39b0bc892efed35c9 ChangeLog 1525 +RMD160 6a519a1b50163f5646c2366e1ddf075849ec2db2 ChangeLog 1525 +SHA256 77a76f3e9948172e4ca51dcb37726174082008e10e7b40176aa527ac9b87c89c ChangeLog 1525 MISC metadata.xml 206 RMD160 61d950942f566dfc272d4f115fa2fb390fbbe301 SHA1 3f059bf106cd99ac3eb9aab89e0708f5fa86ddf9 SHA256 91b15066df76a399233847c54c04eca1d95ab2b73fdef41207dfeb17dbb38193 size 206 MD5 8f804bac2d3835f24ed9a73034f969a1 metadata.xml 206 RMD160 61d950942f566dfc272d4f115fa2fb390fbbe301 metadata.xml 206 @@ -28,10 +36,13 @@ SHA256 f10621810bfe345f1c0576989c8f938017419cd5cd3c96f320d412831afadde7 files/di MD5 76c05d7960a8436e6bc7d220bef1f23c files/digest-gnome-mount-0.4-r2 247 RMD160 38b79354b5e9ed2371393b9c9c45d5e228d2d665 files/digest-gnome-mount-0.4-r2 247 SHA256 f10621810bfe345f1c0576989c8f938017419cd5cd3c96f320d412831afadde7 files/digest-gnome-mount-0.4-r2 247 +MD5 76c05d7960a8436e6bc7d220bef1f23c files/digest-gnome-mount-0.4-r3 247 +RMD160 38b79354b5e9ed2371393b9c9c45d5e228d2d665 files/digest-gnome-mount-0.4-r3 247 +SHA256 f10621810bfe345f1c0576989c8f938017419cd5cd3c96f320d412831afadde7 files/digest-gnome-mount-0.4-r3 247 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3-ecc0.1.6 (GNU/Linux) -iD8DBQFEaouHomPajV0RnrERArweAJ47L9rY+gaxfIivn+8opFyuHA3PuACfdIgO -Q19Bp9NdXNJAHoPaja1nty4= -=BQB1 +iD8DBQFEcPlZomPajV0RnrERAsucAKCAHRY/XHfYORTqrDxk5RGCuTOZrQCeM7N0 +U/uaekO5Rr/shRzNI8ZyKlw= +=lFbA -----END PGP SIGNATURE----- diff --git a/gnome-base/gnome-mount/files/digest-gnome-mount-0.4-r3 b/gnome-base/gnome-mount/files/digest-gnome-mount-0.4-r3 new file mode 100644 index 000000000000..8b49c8a43c9e --- /dev/null +++ b/gnome-base/gnome-mount/files/digest-gnome-mount-0.4-r3 @@ -0,0 +1,3 @@ +MD5 75f260ea6b0ec3c5e0af3c722fbd9568 gnome-mount-0.4.tar.gz 364546 +RMD160 a4f28e3111bfcfce2101cbf53f9c57f63d9ba2be gnome-mount-0.4.tar.gz 364546 +SHA256 fa9456c0cd1adeda962721fed955914bdc23723a403bebf31bd95a1f54211dd8 gnome-mount-0.4.tar.gz 364546 diff --git a/gnome-base/gnome-mount/files/gnome-mount-0.4-fix-segv-on-no-media.patch b/gnome-base/gnome-mount/files/gnome-mount-0.4-fix-segv-on-no-media.patch new file mode 100644 index 000000000000..5c1c3e433b42 --- /dev/null +++ b/gnome-base/gnome-mount/files/gnome-mount-0.4-fix-segv-on-no-media.patch @@ -0,0 +1,48 @@ +diff --exclude-from=/home/dang/.diffrc -u -ruN gnome-mount-0.4.orig/src/gnome-mount.c gnome-mount-0.4/src/gnome-mount.c +--- gnome-mount-0.4.orig/src/gnome-mount.c 2006-02-24 00:14:23.000000000 -0500 ++++ gnome-mount-0.4/src/gnome-mount.c 2006-05-21 19:26:17.000000000 -0400 +@@ -238,7 +238,8 @@ + /* #define MOUNT_ERROR_DIALOG_RESPONSE_INSTALL_DRIVER 10 see below */ + + static void +-show_error_dialog_mount (LibHalVolume *volume, const char *error_name, const char *error_detail, ++show_error_dialog_mount (LibHalVolume *volume, LibHalDrive *drive, ++ const char *error_name, const char *error_detail, + const char *fstype_requested) + { + GtkWidget *w; +@@ -266,7 +267,10 @@ + 0, + _("Cannot mount volume")); + +- volume_name = libhal_volume_get_label (volume); ++ if (volume != NULL) ++ volume_name = libhal_volume_get_label (volume); ++ else ++ volume_name = NULL; + + if (strcmp (error_name, "org.freedesktop.Hal.Device.Volume.PermissionDenied") == 0) { + gtk_message_dialog_format_secondary_text ( +@@ -289,8 +293,8 @@ + volume_name != NULL ? + _("The volume '%s' uses the <i>%s</i> file system which is not supported by your system.") : + _("The volume uses the <i>%s</i> file system which is not supported by your system."), +- volume_name != NULL ? volume_name : fstype_requested, +- volume_name != NULL ? fstype_requested : ""); ++ volume_name != NULL ? volume_name : (fstype_requested != NULL ? fstype_requested : ""), ++ volume_name != NULL ? (fstype_requested != NULL ? fstype_requested : "") : ""); + + /* some day.. :-) + gtk_dialog_add_buttons (GTK_DIALOG (w), +@@ -463,9 +467,9 @@ + + notify_parent (FALSE); + +- show_error_dialog_mount (volume, error.name, error.message, ++ show_error_dialog_mount (volume, drive, error.name, error.message, + (fstype != NULL && strlen (fstype) > 0) ? +- fstype : libhal_volume_get_fstype (volume)); ++ fstype : (volume != NULL ? libhal_volume_get_fstype (volume) : NULL)); + + dbus_error_free (&error); + goto out; diff --git a/gnome-base/gnome-mount/gnome-mount-0.4-r3.ebuild b/gnome-base/gnome-mount/gnome-mount-0.4-r3.ebuild new file mode 100644 index 000000000000..019b5f5ae25f --- /dev/null +++ b/gnome-base/gnome-mount/gnome-mount-0.4-r3.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-mount/gnome-mount-0.4-r3.ebuild,v 1.1 2006/05/21 23:35:50 dang Exp $ + +inherit eutils gnome2 + +DESCRIPTION="Wrapper for (un)mounting and ejecting disks" +HOMEPAGE="http://freedesktop.org/~david/" +SRC_URI="http://freedesktop.org/~david/dist/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug" + +RDEPEND=">=gnome-base/libgnomeui-2.13 + >=sys-apps/dbus-0.60 + >=sys-apps/hal-0.5.7-r1 + >=x11-libs/gtk+-2.8 + gnome-base/gnome-keyring + >=gnome-base/libglade-2 + >=gnome-base/gconf-2" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + >=dev-util/intltool-0.29" + +DOCS="AUTHORS ChangeLog COPYING HACKING INSTALL NEWS README TODO" + +src_unpack() { + unpack ${A} + cd ${S} + + # Patch for bug #133549 + epatch ${FILESDIR}/${P}-hal-mountable.patch + + # Patch for bug #133880 + epatch ${FILESDIR}/${P}-fix-segv-on-no-media.patch +} |