From: Nirbheek Chauhan Date: Fri, 19 Aug 2011 15:41:36 +0000 (+0000) Subject: Bump to 3.0.2, from gnome overlay for GNOME 3 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=bfef8cf21e39f924675f553a44aefd3fe003f2cb;p=gentoo.git Bump to 3.0.2, from gnome overlay for GNOME 3 Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64 --- diff --git a/app-arch/file-roller/ChangeLog b/app-arch/file-roller/ChangeLog index e7988d7afe5f..2ce7aa666a0c 100644 --- a/app-arch/file-roller/ChangeLog +++ b/app-arch/file-roller/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-arch/file-roller # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.298 2011/08/13 16:31:07 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.299 2011/08/19 15:41:35 nirbheek Exp $ + +*file-roller-3.0.2-r1 (19 Aug 2011) + + 19 Aug 2011; Nirbheek Chauhan + +file-roller-3.0.2-r1.ebuild, + +files/file-roller-3.0.2-pointer-arithmetic.patch, metadata.xml: + Bump to 3.0.2, from gnome overlay for GNOME 3 13 Aug 2011; Raúl Porcel file-roller-2.32.2.ebuild: alpha/ia64/sparc stable wrt #369909 diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest index 4506d83f092c..ec42f590a373 100644 --- a/app-arch/file-roller/Manifest +++ b/app-arch/file-roller/Manifest @@ -2,16 +2,29 @@ Hash: SHA1 AUX file-roller-2.10.3-use_bin_tar.patch 504 RMD160 0af7af1c83953554e58c3a2f82ae3edb2e6b7e55 SHA1 a40077b5ace4be970dae46b44aa5b8ce19a75780 SHA256 c22e742893800c4302df40af66b1eabeab700fea7326eada849f919bdd76c052 +AUX file-roller-3.0.2-pointer-arithmetic.patch 1315 RMD160 5ebb9e69c75d2ba8c926135167fb914ad23eca47 SHA1 818365abc605ba49e2e394352406ea92730e7a43 SHA256 3aca914f7d0609e8ebe54e4966edb916d05cb51f136683a7fc8bbafb3a7a77cc DIST file-roller-2.32.1.tar.bz2 1916180 RMD160 09a313112fcd621f80669645ce93af5961947b25 SHA1 48eb7e1cac561804a2f9ad4fdeef8e5cce8adc62 SHA256 a9109d9c871c022eb0553eeedc98520bad42ba3099088c16a9f7df817f60cc92 DIST file-roller-2.32.2.tar.bz2 1901661 RMD160 cbeb4f8dc83db87338735e57c4f87333c4b018f4 SHA1 38ce495a27b482f1e9983304f95959393674676e SHA256 3ddbe4e4134eab4ff8e97789a1626aec6cbc588190f2f520850d0697037e5755 +DIST file-roller-3.0.2.tar.bz2 1996994 RMD160 751499940adb37df265bb0a492fb3c6abeca79b9 SHA1 b242c30b4f364a3c10fba9cc2d215f67e5bf5508 SHA256 a612f05c44f82328175ddca1b4a1da214d9c305797370b78435f490b250af3d1 EBUILD file-roller-2.32.1.ebuild 2240 RMD160 17a8b70ffc82dc1c99b4b6ffb47bd4035f80ea11 SHA1 f08b8fdf7f5d4c25fbd77818c4cee161def5cbb5 SHA256 d7c9fc4363d6a17a261ecc5ae3a5bc6bdcc19de262d18bb01f46b44956385460 EBUILD file-roller-2.32.2.ebuild 2243 RMD160 15c90a08ddc8bf490c6db969940212720c58ed63 SHA1 0e649d401dbe9ab1129467fe3df2cb9a0f308a0e SHA256 e6ddb9da04e1df4e5aa2e30f35b878465d66c622e82fa6aeeb3f757941d18388 -MISC ChangeLog 39340 RMD160 b251122f0f7e0fbae9282368307696cab38107cb SHA1 f86c67fb0246a3e941c5120ac980f639520b997b SHA256 eddac275372d3e720922a71b25eb9a55c4225698b5eafafb7f6f6893df4e0487 -MISC metadata.xml 312 RMD160 3826a5dad37bd2c9a06bc83d820ad73fc982cbe9 SHA1 3b783bbd0a5e2ac14242664bc3b21d4753086121 SHA256 96d7fa4361428c9ed083d5a4a0294091735633b8f4a03ffa58413e417b3bfba6 +EBUILD file-roller-3.0.2-r1.ebuild 2301 RMD160 6b1e606a8ed24824809fd12c3ae1e0505bd2ae20 SHA1 4ff2e03e1370006079ee305b0d089b87acd5a961 SHA256 f0c876152d98764e8494cfeb21f6b5f66f7a7931f1eea5a298a9bd1a1b170f00 +MISC ChangeLog 39580 RMD160 3723d4a1df1e958f1581c26fc62f81f0b98d5190 SHA1 7ced16bdb4aaf7ec32bd503c8e3c31354e031401 SHA256 c59fe45babf97265d96cf2e60a9ba80b87614117920e4ca2ecd3deea8b97cd61 +MISC metadata.xml 446 RMD160 dc8e3a9c08916471d488b4012eb73f711b8521db SHA1 af8629f4c093501ee4445384e16a0dda27adb6b9 SHA256 855d22d9ec6384bbec09562c5aebd68e043a50f002ba277818e3b7755b824f50 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk5GptEACgkQuQc30/atMkA/WwCdF2etecYzNd2DfQFSFRbj0GgC -WuQAoKRQeOrpnQgPIvYNZTG82Hqsu0y9 -=WzZX +iQIcBAEBAgAGBQJOToRIAAoJEO/kOhxWD91k6BwP/R7Fg4snS40jZYP7azSiTL4/ +teBdYPosjybCpY/NPIaqj0YSkBtbuZFN4cZEb0fginDwLI5kzB/HEQOsUB3In+fO +Volez0fOMfmzQQNIAJ3CisPnnCHWFBZmtocHPqVfZVFET/LlJ1rAM5WcIQUtYlBg +i1XSAPW5dRZmHB4fUNUUAiqy4hgMwJc1aoJEuBUKeEBln7S8kdCWfyU5xPVvbBSQ +x6ldg6efAvCG/tk1auXPQHPb263YB0rnW/Hag1R1x4jG+qMEplWd/L4Kf9aGYn27 +gOJo34pVP0VSS2Zz47bcQY/eZkXdYQu9wXC6lvRLCHD4vessCi44YqfNMlwVIs6x +ZTOKjLkZcjh1gB/uUEnatRe2X7udjNGrXjgLb9swS88dYINHQ6JnRXhK2HjtbdYC +97XBqx4NOmvo9yX4B77wB+0N7ubEFOGDh0s51PSfWB3RMFNEfuWu215gRV5E06xO +VgY6ucyhbleeJhJ4dbsHgRE0Mas5rgtt9Uk3hffbN8emHf08ilTUoBiHWFjBvdft +OwrSUWqItUFqYAIE1j/LEHnZsCvh4+Npvhdn6NjKZVP+BahF6DgnaniXu8GBI1Ze +rEfZGTOX8ERUXuWxEyC7MREWXW3XOhi9Tqza9Kd3pLkdnUDaJY9EBN0AWTe+KAfC +jsrvTSTBeau2GFH8GZo9 +=8ZI7 -----END PGP SIGNATURE----- diff --git a/app-arch/file-roller/file-roller-3.0.2-r1.ebuild b/app-arch/file-roller/file-roller-3.0.2-r1.ebuild new file mode 100644 index 000000000000..f1fa22a97515 --- /dev/null +++ b/app-arch/file-roller/file-roller-3.0.2-r1.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-3.0.2-r1.ebuild,v 1.1 2011/08/19 15:41:36 nirbheek Exp $ + +EAPI="4" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" +GNOME_TARBALL_SUFFIX="bz2" + +inherit eutils gnome2 + +DESCRIPTION="Archive manager for GNOME" +HOMEPAGE="http://fileroller.sourceforge.net/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="nautilus packagekit" +KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" + +RDEPEND=">=dev-libs/glib-2.25.5:2 + >=x11-libs/gtk+-3.0.2:3 + sys-apps/file + nautilus? ( >=gnome-base/nautilus-3.0.0 ) + packagekit? ( app-admin/packagekit-base ) +" +DEPEND="${RDEPEND} + sys-devel/gettext + >=dev-util/intltool-0.40.0 + dev-util/pkgconfig + app-text/gnome-doc-utils" +# eautoreconf needs: +# gnome-base/gnome-common + +pkg_setup() { + G2CONF="${G2CONF} + --disable-dependency-tracking + --disable-scrollkeeper + --disable-run-in-place + --disable-static + --disable-deprecations + --disable-schemas-compile + --enable-magic + $(use_enable nautilus nautilus-actions) + $(use_enable packagekit)" + DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README TODO" +} + +src_prepare() { + gnome2_src_prepare + + # Use absolute path to GNU tar since star doesn't have the same + # options. On Gentoo, star is /usr/bin/tar, GNU tar is /bin/tar + epatch "${FILESDIR}"/${PN}-2.10.3-use_bin_tar.patch + + # Upstream patch to fix path parsing in 7z files, will be in next release + epatch "${FILESDIR}/${P}-pointer-arithmetic.patch" +} + +pkg_postinst() { + gnome2_pkg_postinst + + elog "${PN} is a frontend for several archiving utilities. If you want a" + elog "particular achive format support, see ${HOMEPAGE}" + elog "and install the relevant package." + elog + elog "for example:" + elog " 7-zip - app-arch/p7zip" + elog " ace - app-arch/unace" + elog " arj - app-arch/arj" + elog " cpio - app-arch/cpio" + elog " deb - app-arch/dpkg" + elog " iso - app-cdr/cdrtools" + elog " jar,zip - app-arch/zip and app-arch/unzip" + elog " lha - app-arch/lha" + elog " lzma - app-arch/xz-utils" + elog " lzop - app-arch/lzop" + elog " rar - app-arch/unrar" + elog " rpm - app-arch/rpm" + elog " unstuff - app-arch/stuffit" + elog " zoo - app-arch/zoo" +} diff --git a/app-arch/file-roller/files/file-roller-3.0.2-pointer-arithmetic.patch b/app-arch/file-roller/files/file-roller-3.0.2-pointer-arithmetic.patch new file mode 100644 index 000000000000..d535e2cd20b7 --- /dev/null +++ b/app-arch/file-roller/files/file-roller-3.0.2-pointer-arithmetic.patch @@ -0,0 +1,35 @@ +From 3d7fa24ca267e333d7406eff38ec02b519110ecc Mon Sep 17 00:00:00 2001 +From: Iain Nicol +Date: Sun, 29 May 2011 21:50:58 +0000 +Subject: Pointer arithmetic fixes for end of string access + +[bug #651416] +--- +diff --git a/src/fr-command-7z.c b/src/fr-command-7z.c +index 3f66338..5e505fa 100644 +--- a/src/fr-command-7z.c ++++ b/src/fr-command-7z.c +@@ -158,7 +158,7 @@ list__process_line (char *line, + fdata->original_path = g_strdup (fields[1]); + fdata->full_path = g_strconcat ((fdata->original_path[0] != '/') ? "/" : "", + fdata->original_path, +- (fdata->dir && (fdata->original_path[strlen (fdata->original_path - 1)] != '/')) ? "/" : "", ++ (fdata->dir && (fdata->original_path[strlen (fdata->original_path) - 1] != '/')) ? "/" : "", + NULL); + } + else if (strcmp (fields[0], "Folder") == 0) { +diff --git a/src/fr-window.c b/src/fr-window.c +index 743c8fe..db8c8c6 100644 +--- a/src/fr-window.c ++++ b/src/fr-window.c +@@ -1236,7 +1236,7 @@ fr_window_dir_exists_in_archive (FrWindow *window, + return TRUE; + } + else if (fdata->dir +- && (fdata->full_path[strlen (fdata->full_path)] != '/') ++ && (fdata->full_path[strlen (fdata->full_path) - 1] != '/') + && (strncmp (dir_name, fdata->full_path, dir_name_len - 1) == 0)) + { + return TRUE; +-- +cgit v0.9 diff --git a/app-arch/file-roller/metadata.xml b/app-arch/file-roller/metadata.xml index 706ff841f05a..d529497a7a52 100644 --- a/app-arch/file-roller/metadata.xml +++ b/app-arch/file-roller/metadata.xml @@ -1,9 +1,12 @@ -gnome - - Enable file-roller to integrate with - gnome-base/nautilus by providing entries in its context menu. - + gnome + + Enable file-roller to integrate with + gnome-base/nautilus by providing entries in its context + menu + Enable support for the distro-neutral package + manager GUI app-admin/packagekit +