From 4b5ed42f5afa798a92aa3be85ecb54447b37fd51 Mon Sep 17 00:00:00 2001 From: Alexandre Rostovtsev Date: Mon, 25 Jul 2011 23:43:58 -0400 Subject: app-arch/file-roller: 3.0.2-r1 → 3.1.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump to gnome-3.1.x version. Point arithmetic patch was applied upstream. --- app-arch/file-roller/Manifest | 7 +- app-arch/file-roller/file-roller-3.0.2-r1.ebuild | 87 ---------------------- app-arch/file-roller/file-roller-3.1.1.ebuild | 84 +++++++++++++++++++++ app-arch/file-roller/file-roller-9999.ebuild | 2 +- .../file-roller-3.0.2-pointer-arithmetic.patch | 35 --------- 5 files changed, 88 insertions(+), 127 deletions(-) delete mode 100644 app-arch/file-roller/file-roller-3.0.2-r1.ebuild create mode 100644 app-arch/file-roller/file-roller-3.1.1.ebuild delete mode 100644 app-arch/file-roller/files/file-roller-3.0.2-pointer-arithmetic.patch (limited to 'app-arch') diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest index 6a70f57d..77abc27b 100644 --- a/app-arch/file-roller/Manifest +++ b/app-arch/file-roller/Manifest @@ -1,5 +1,4 @@ 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-3.0.2.tar.bz2 1996994 RMD160 751499940adb37df265bb0a492fb3c6abeca79b9 SHA1 b242c30b4f364a3c10fba9cc2d215f67e5bf5508 SHA256 a612f05c44f82328175ddca1b4a1da214d9c305797370b78435f490b250af3d1 -EBUILD file-roller-3.0.2-r1.ebuild 2406 RMD160 bdb3e56178de88f14c150281b995b686c2f7de98 SHA1 0290432e145049be4f1c35424dac35890addb15b SHA256 3e80bb19fe04e862d2e9bc4b792be934c3cc471863b6413163a3ac6469f43b6a -EBUILD file-roller-9999.ebuild 2278 RMD160 99a9d70e963d10c05b58c4dded1602b382fac551 SHA1 032513f9988822886945d31af9734267e2de0f3d SHA256 a72d89dfb2b97a9f748435f6d608e1835385ebf0ac3ef231a3ad7068d896a25b +DIST file-roller-3.1.1.tar.xz 1708696 RMD160 a084af2a6e0587802a9cfad342a50d94ee64786f SHA1 2b83b734ea07a2e67edd2e885e10a64ab33a9a2d SHA256 b66aa171c56650f5cc58de5e28cc853a94665fbf7fac267d8aaf69662a48d9a8 +EBUILD file-roller-3.1.1.ebuild 2278 RMD160 6c13fb822ff85e95d0931d5f06d1ee1184ea9a4f SHA1 b1a64bc6a3b3a5f2249c5bc66e0831ab01413940 SHA256 c709ed415a04992d7a9a8a388d4b5fe753a9b3fa1d0a1781604dc56dfe8f2493 +EBUILD file-roller-9999.ebuild 2278 RMD160 6c13fb822ff85e95d0931d5f06d1ee1184ea9a4f SHA1 b1a64bc6a3b3a5f2249c5bc66e0831ab01413940 SHA256 c709ed415a04992d7a9a8a388d4b5fe753a9b3fa1d0a1781604dc56dfe8f2493 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 deleted file mode 100644 index 6e14bc25..00000000 --- a/app-arch/file-roller/file-roller-3.0.2-r1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# 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-2.32.1.ebuild,v 1.2 2010/12/07 19:37:09 eva Exp $ - -EAPI="3" -GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" - -inherit eutils gnome2 -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi - -DESCRIPTION="Archive manager for GNOME" -HOMEPAGE="http://fileroller.sourceforge.net/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="nautilus packagekit" -if [[ ${PV} = 9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" -fi - -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/file-roller-3.1.1.ebuild b/app-arch/file-roller/file-roller-3.1.1.ebuild new file mode 100644 index 00000000..ee7ffd79 --- /dev/null +++ b/app-arch/file-roller/file-roller-3.1.1.ebuild @@ -0,0 +1,84 @@ +# 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-2.32.1.ebuild,v 1.2 2010/12/07 19:37:09 eva Exp $ + +EAPI="4" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" + +inherit eutils gnome2 +if [[ ${PV} = 9999 ]]; then + inherit gnome2-live +fi + +DESCRIPTION="Archive manager for GNOME" +HOMEPAGE="http://fileroller.sourceforge.net/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="nautilus packagekit" +if [[ ${PV} = 9999 ]]; then + KEYWORDS="" +else + KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" +fi + +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 +} + +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/file-roller-9999.ebuild b/app-arch/file-roller/file-roller-9999.ebuild index 1b36eeb2..ee7ffd79 100644 --- a/app-arch/file-roller/file-roller-9999.ebuild +++ b/app-arch/file-roller/file-roller-9999.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.32.1.ebuild,v 1.2 2010/12/07 19:37:09 eva Exp $ -EAPI="3" +EAPI="4" GCONF_DEBUG="no" GNOME2_LA_PUNT="yes" 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 deleted file mode 100644 index d535e2cd..00000000 --- a/app-arch/file-roller/files/file-roller-3.0.2-pointer-arithmetic.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 -- cgit v1.2.3-65-gdbad