* [gentoo-commits] proj/gnome:gnome-next commit in: app-arch/file-roller/files/, app-arch/file-roller/
@ 2011-07-20 6:44 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-07-20 6:44 UTC (permalink / raw
To: gentoo-commits
commit: dfc5d33fb8cf8cd6d93203ca8f37686053ed6236
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Wed Jul 20 04:25:31 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Wed Jul 20 05:18:08 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=dfc5d33f
app-arch/file-roller: 3.0.2 → 3.0.2-r1
Fix nautilus dependency (a gtk3 file-roller plugin will not work with a
gtk2 nautilus). Add an upstream patch to fix pointer arithmetic in path
parsing in 7z files.
---
...er-3.0.2.ebuild => file-roller-3.0.2-r1.ebuild} | 5 ++-
app-arch/file-roller/file-roller-9999.ebuild | 2 +-
.../file-roller-3.0.2-pointer-arithmetic.patch | 35 ++++++++++++++++++++
3 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/app-arch/file-roller/file-roller-3.0.2.ebuild b/app-arch/file-roller/file-roller-3.0.2-r1.ebuild
similarity index 92%
rename from app-arch/file-roller/file-roller-3.0.2.ebuild
rename to app-arch/file-roller/file-roller-3.0.2-r1.ebuild
index 9bccd68..6e14bc2 100644
--- a/app-arch/file-roller/file-roller-3.0.2.ebuild
+++ b/app-arch/file-roller/file-roller-3.0.2-r1.ebuild
@@ -26,7 +26,7 @@ fi
RDEPEND=">=dev-libs/glib-2.25.5:2
>=x11-libs/gtk+-3.0.2:3
sys-apps/file
- nautilus? ( >=gnome-base/nautilus-2.22.2 )
+ nautilus? ( >=gnome-base/nautilus-3.0.0 )
packagekit? ( app-admin/packagekit-base )
"
DEPEND="${RDEPEND}
@@ -57,6 +57,9 @@ 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() {
diff --git a/app-arch/file-roller/file-roller-9999.ebuild b/app-arch/file-roller/file-roller-9999.ebuild
index 9bccd68..1b36eeb 100644
--- a/app-arch/file-roller/file-roller-9999.ebuild
+++ b/app-arch/file-roller/file-roller-9999.ebuild
@@ -26,7 +26,7 @@ fi
RDEPEND=">=dev-libs/glib-2.25.5:2
>=x11-libs/gtk+-3.0.2:3
sys-apps/file
- nautilus? ( >=gnome-base/nautilus-2.22.2 )
+ nautilus? ( >=gnome-base/nautilus-3.0.0 )
packagekit? ( app-admin/packagekit-base )
"
DEPEND="${RDEPEND}
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 0000000..d535e2c
--- /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 <iainn@src.gnome.org>
+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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: app-arch/file-roller/files/, app-arch/file-roller/
@ 2011-07-26 8:29 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-07-26 8:29 UTC (permalink / raw
To: gentoo-commits
commit: 4b5ed42f5afa798a92aa3be85ecb54447b37fd51
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Jul 26 03:43:58 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Jul 26 03:43:58 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4b5ed42f
app-arch/file-roller: 3.0.2-r1 → 3.1.1
Bump to gnome-3.1.x version. Point arithmetic patch was applied upstream.
---
...er-3.0.2-r1.ebuild => 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 $
-EAPI="3"
+EAPI="4"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
@@ -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 release
- epatch "${FILESDIR}/${P}-pointer-arithmetic.patch"
}
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 $
-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 d535e2c..0000000
--- 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 <iainn@src.gnome.org>
-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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/gnome:gnome-next commit in: app-arch/file-roller/files/, app-arch/file-roller/
@ 2011-08-20 11:01 Alexandre Restovtsev
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Restovtsev @ 2011-08-20 11:01 UTC (permalink / raw
To: gentoo-commits
commit: f539e39a534521d566e1fd852632d478791dd9d0
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sat Aug 20 08:51:51 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Aug 20 09:12:40 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=f539e39a
app-arch/file-roller: 3.1.1 → 3.1.2
Version bump. Provide Gentoo archiver package names for file-roller's
packagekit support.
---
...oller-3.1.1.ebuild => file-roller-3.1.2.ebuild} | 3 ++
app-arch/file-roller/file-roller-9999.ebuild | 3 ++
app-arch/file-roller/files/3.1.2-packages.match | 28 ++++++++++++++++++++
3 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/app-arch/file-roller/file-roller-3.1.1.ebuild b/app-arch/file-roller/file-roller-3.1.2.ebuild
similarity index 94%
rename from app-arch/file-roller/file-roller-3.1.1.ebuild
rename to app-arch/file-roller/file-roller-3.1.2.ebuild
index ee7ffd7..76f8ebf 100644
--- a/app-arch/file-roller/file-roller-3.1.1.ebuild
+++ b/app-arch/file-roller/file-roller-3.1.2.ebuild
@@ -57,6 +57,9 @@ 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
+
+ # File providing Gentoo package names for various archivers
+ cp -f "${FILESDIR}/3.1.2-packages.match" data/packages.match || die
}
pkg_postinst() {
diff --git a/app-arch/file-roller/file-roller-9999.ebuild b/app-arch/file-roller/file-roller-9999.ebuild
index ee7ffd7..76f8ebf 100644
--- a/app-arch/file-roller/file-roller-9999.ebuild
+++ b/app-arch/file-roller/file-roller-9999.ebuild
@@ -57,6 +57,9 @@ 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
+
+ # File providing Gentoo package names for various archivers
+ cp -f "${FILESDIR}/3.1.2-packages.match" data/packages.match || die
}
pkg_postinst() {
diff --git a/app-arch/file-roller/files/3.1.2-packages.match b/app-arch/file-roller/files/3.1.2-packages.match
new file mode 100644
index 0000000..be34bc6
--- /dev/null
+++ b/app-arch/file-roller/files/3.1.2-packages.match
@@ -0,0 +1,28 @@
+[Package Matches]
+arj=app-arch/arj
+binutils=sys-devel/binutils
+bzip2=app-arch/bzip2
+cpio=app-arch/cpio
+genisoimage=virtual/cdrtools
+gzip=app-arch/gzip
+lha=app-arch/lha
+lrzip=app-arch/lrzip
+lzip=app-arch/lzip
+lzma=app-arch/xz-utils
+lzop=app-arch/lzop
+ncompress=app-arch/ncompress
+p7zip=app-arch/p7zip
+p7zip-full=
+p7zip-rar=
+rar=app-arch/rar
+rpm=app-arch/rpm
+rzip=app-arch/rzip
+tar=app-arch/tar
+unace=app-arch/unace
+unalz=
+unrar=app-arch/unrar
+unstaff=
+unzip=app-arch/unzip
+xz=app-arch/xz-utils
+zip=app-arch/zip
+zoo=app-arch/zoo
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-08-20 11:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-20 11:01 [gentoo-commits] proj/gnome:gnome-next commit in: app-arch/file-roller/files/, app-arch/file-roller/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2011-07-26 8:29 Alexandre Restovtsev
2011-07-20 6:44 Alexandre Restovtsev
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox