From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qld2M-0002kH-V6 for garchives@archives.gentoo.org; Tue, 26 Jul 2011 08:30:47 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 18DD121C228; Tue, 26 Jul 2011 08:29:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D05FA21C228 for ; Tue, 26 Jul 2011 08:29:34 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 12B552AC00D for ; Tue, 26 Jul 2011 08:29:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 746998003F for ; Tue, 26 Jul 2011 08:29:33 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <4b5ed42f5afa798a92aa3be85ecb54447b37fd51.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:gnome-next commit in: app-arch/file-roller/files/, app-arch/file-roller/ X-VCS-Repository: proj/gnome X-VCS-Files: app-arch/file-roller/file-roller-3.0.2-r1.ebuild app-arch/file-roller/file-roller-3.1.1.ebuild app-arch/file-roller/file-roller-9999.ebuild app-arch/file-roller/files/file-roller-3.0.2-pointer-arithmetic.patch X-VCS-Directories: app-arch/file-roller/files/ app-arch/file-roller/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 4b5ed42f5afa798a92aa3be85ecb54447b37fd51 Date: Tue, 26 Jul 2011 08:29:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: c746127efc8e6df71abcf230f5df70c6 commit: 4b5ed42f5afa798a92aa3be85ecb54447b37fd51 Author: Alexandre Rostovtsev gmail com> AuthorDate: Tue Jul 26 03:43:58 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Tue Jul 26 03:43:58 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D4b5ed42f app-arch/file-roller: 3.0.2-r1 =E2=86=92 3.1.1 Bump to gnome-3.1.x version. Point arithmetic patch was applied upstream. --- ...er-3.0.2-r1.ebuild =3D> file-roller-3.1.1.ebuild} | 5 +-- app-arch/file-roller/file-roller-9999.ebuild | 2 +- .../file-roller-3.0.2-pointer-arithmetic.patch | 35 --------------= ------ 3 files changed, 2 insertions(+), 40 deletions(-) diff --git a/app-arch/file-roller/file-roller-3.0.2-r1.ebuild b/app-arch/= file-roller/file-roller-3.1.1.ebuild similarity index 94% rename from app-arch/file-roller/file-roller-3.0.2-r1.ebuild rename to app-arch/file-roller/file-roller-3.1.1.ebuild index 6e14bc2..ee7ffd7 100644 --- a/app-arch/file-roller/file-roller-3.0.2-r1.ebuild +++ b/app-arch/file-roller/file-roller-3.1.1.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 $ =20 -EAPI=3D"3" +EAPI=3D"4" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" =20 @@ -57,9 +57,6 @@ 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 relea= se - epatch "${FILESDIR}/${P}-pointer-arithmetic.patch" } =20 pkg_postinst() { diff --git a/app-arch/file-roller/file-roller-9999.ebuild b/app-arch/file= -roller/file-roller-9999.ebuild index 1b36eeb..ee7ffd7 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 $ =20 -EAPI=3D"3" +EAPI=3D"4" GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" =20 diff --git a/app-arch/file-roller/files/file-roller-3.0.2-pointer-arithme= tic.patch b/app-arch/file-roller/files/file-roller-3.0.2-pointer-arithmet= ic.patch deleted file mode 100644 index d535e2c..0000000 --- a/app-arch/file-roller/files/file-roller-3.0.2-pointer-arithmetic.pat= ch +++ /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 =3D g_strdup (fields[1]); - fdata->full_path =3D g_strconcat ((fdata->original_path[0] !=3D '/') = ? "/" : "", - fdata->original_path, -- (fdata->dir && (fdata->original_path[strlen (fdata->original_path= - 1)] !=3D '/')) ? "/" : "", -+ (fdata->dir && (fdata->original_path[strlen (fdata->original_path= ) - 1] !=3D '/')) ? "/" : "", - NULL); - } - else if (strcmp (fields[0], "Folder") =3D=3D 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 *windo= w, - return TRUE; - } - else if (fdata->dir -- && (fdata->full_path[strlen (fdata->full_path)] !=3D '/') -+ && (fdata->full_path[strlen (fdata->full_path) - 1] !=3D '/') - && (strncmp (dir_name, fdata->full_path, dir_name_len - 1) =3D=3D 0= )) - { - return TRUE; --- -cgit v0.9