cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update file-roller to 2.28.0

Browse Source
This commit is contained in:
jasper 2009-10-12 19:01:08 +00:00
parent f8aaa99d4c
commit b3f3a176f1
5 changed files with 84 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
x11/gnome/file-roller/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.28 2009/09/10 15:30:21 naddy Exp $ # $OpenBSD: Makefile,v 1.29 2009/10/12 19:01:08 jasper Exp $
COMMENT= archive manager for GNOME COMMENT= archive manager for GNOME
GNOME_PROJECT= file-roller GNOME_PROJECT= file-roller
GNOME_VERSION= 2.24.3 GNOME_VERSION= 2.28.0
PKGNAME= ${DISTNAME}p9
CATEGORIES= archivers CATEGORIES= archivers
@ -14,17 +13,12 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \ WANTLIB += ORBit-2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext
Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr \ WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1
Xrender art_lgpl_2 atk-1.0 avahi-client avahi-common \ WANTLIB += dbus-glib-1 expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
avahi-glib bonobo-2 bonobo-activation \ WANTLIB += gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 gthread-2.0
bonoboui-2 c cairo crypto dbus-1 dbus-glib-1 expat \ WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
fontconfig freetype gailutil gdk-x11-2.0 gdk_pixbuf-2.0 \ WANTLIB += pcre pixman-1 png pthread pthread-stubs xcb z
gio-2.0 glade-2.0 glib-2.0 glitz gmodule-2.0 gnome-2 \
gnome-keyring gnomecanvas-2 gnomevfs-2 gobject-2.0 \
gthread-2.0 gtk-x11-2.0 m pango-1.0 pangocairo-1.0 \
pangoft2-1.0 pcre pixman-1 png popt pthread ssl util \
xml2 z pthread-stubs xcb
MODULES= devel/gettext \ MODULES= devel/gettext \
x11/gnome \ x11/gnome \
@ -36,8 +30,7 @@ RUN_DEPENDS= ::archivers/gtar \
::archivers/zip \ ::archivers/zip \
::archivers/gcpio \ ::archivers/gcpio \
:rpm2cpio-*|rpm-*:converters/rpm2cpio :rpm2cpio-*|rpm-*:converters/rpm2cpio
LIB_DEPENDS= gnomeui-2.>=1800::x11/gnome/libgnomeui \ LIB_DEPENDS= nautilus-extension.>=1::x11/gnome/nautilus
nautilus-extension.>=1::x11/gnome/nautilus
USE_X11= Yes USE_X11= Yes
MODGNOME_HELP_FILES= Yes MODGNOME_HELP_FILES= Yes

10
x11/gnome/file-roller/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gnome/file-roller-2.24.3.tar.bz2) = ICZLE80nxlQsgoklbXaMnA== MD5 (gnome/file-roller-2.28.0.tar.bz2) = 3LDIh9XSh6KOu1wOppvt+g==
RMD160 (gnome/file-roller-2.24.3.tar.bz2) = SUu1IMhsuB1UM3CnxiF4O4pC7w4= RMD160 (gnome/file-roller-2.28.0.tar.bz2) = IJnVbnZE8+70h5YgwM/T3A9ZFAo=
SHA1 (gnome/file-roller-2.24.3.tar.bz2) = r7oI9bCUFFBqQt1dhnl0g5Lfp6M= SHA1 (gnome/file-roller-2.28.0.tar.bz2) = 9/wUNcKDhqMHPWqGIJ9uFdQFEpY=
SHA256 (gnome/file-roller-2.24.3.tar.bz2) = wVlWtTSLQGb04kS+ENtvTvgC0xYQPR2HDFbUNH603KE= SHA256 (gnome/file-roller-2.28.0.tar.bz2) = SZ/oNbKXcg9OQFS0qzSj+2GcNGDF2oKxUZ2bhqovOsI=
SIZE (gnome/file-roller-2.24.3.tar.bz2) = 1484687 SIZE (gnome/file-roller-2.28.0.tar.bz2) = 1735875

35
x11/gnome/file-roller/patches/patch-src_fr-command-7z_c
View File

@ -1,29 +1,22 @@
$OpenBSD: patch-src_fr-command-7z_c,v 1.1 2008/11/23 00:11:18 jasper Exp $ $OpenBSD: patch-src_fr-command-7z_c,v 1.2 2009/10/12 19:01:08 jasper Exp $
Fix a crasher possible with 7z files. Fix a crasher possible with 7z files.
--- src/fr-command-7z.c.orig Sun Nov 23 01:01:39 2008 --- src/fr-command-7z.c.orig Mon Oct 12 20:49:39 2009
+++ src/fr-command-7z.c Sun Nov 23 01:05:32 2008 +++ src/fr-command-7z.c Mon Oct 12 20:50:18 2009
@@ -125,13 +125,15 @@ list__process_line (char *line, @@ -130,6 +130,7 @@ list__process_line (char *line,
if (strcmp (line, "") == 0) { }
if (p7z_comm->fdata != NULL) { else {
fdata = p7z_comm->fdata; fdata = p7z_comm->fdata;
- if (fdata->dir)
- fdata->name = dir_name_from_path (fdata->full_path);
- else
- fdata->name = g_strdup (file_name_from_path (fdata->full_path));
- fdata->path = remove_level_from_path (fdata->full_path);
- fr_command_add_file (comm, fdata);
- p7z_comm->fdata = NULL;
+ if (fdata->full_path) { + if (fdata->full_path) {
+ if (fdata->dir) if (fdata->dir)
+ fdata->name = dir_name_from_path (fdata->full_path); fdata->name = dir_name_from_path (fdata->full_path);
+ else else
+ fdata->name = g_strdup (file_name_from_path (fdata->full_path)); @@ -137,6 +138,7 @@ list__process_line (char *line,
+ fdata->path = remove_level_from_path (fdata->full_path); fdata->path = remove_level_from_path (fdata->full_path);
+ fr_command_add_file (comm, fdata); fr_command_add_file (comm, fdata);
+ p7z_comm->fdata = NULL; p7z_comm->fdata = NULL;
+ } + }
} }
return;
} }
return;

29
x11/gnome/file-roller/patches/patch-src_fr-command-rpm_c
View File

@ -1,21 +1,12 @@
$OpenBSD: patch-src_fr-command-rpm_c,v 1.1 2008/12/27 10:50:54 ajacoutot Exp $ $OpenBSD: patch-src_fr-command-rpm_c,v 1.2 2009/10/12 19:01:08 jasper Exp $
--- src/fr-command-rpm.c.orig Sat Dec 27 11:27:49 2008 --- src/fr-command-rpm.c.orig Mon Oct 12 20:50:28 2009
+++ src/fr-command-rpm.c Sat Dec 27 11:28:06 2008 +++ src/fr-command-rpm.c Mon Oct 12 20:51:03 2009
@@ -175,7 +175,7 @@ fr_command_rpm_list (FrCommand *comm) @@ -232,7 +232,7 @@ fr_command_rpm_get_capabilities (FrCommand *comm,
FrCommandCap capabilities;
fr_process_begin_command (comm->process, "sh"); capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
fr_process_add_arg (comm->process, "-c"); - if (is_program_in_path ("cpio"))
- fr_process_add_arg_concat (comm->process, "rpm2cpio ", comm->e_filename, " | cpio -itv", NULL); + if (is_program_in_path ("gcpio"))
+ fr_process_add_arg_concat (comm->process, "rpm2cpio ", comm->e_filename, " | gcpio -itv", NULL); capabilities |= FR_COMMAND_CAN_READ;
fr_process_end_command (comm->process);
fr_process_start (comm->process);
}
@@ -200,7 +200,7 @@ fr_command_rpm_extract (FrCommand *comm,
cmd = g_string_new ("rpm2cpio "); return capabilities;
g_string_append (cmd, comm->e_filename);
- g_string_append (cmd, " | cpio -idu ");
+ g_string_append (cmd, " | gcpio -idu ");
for (scan = file_list; scan; scan = scan->next) {
char *filename = g_shell_quote (scan->data);
g_string_append (cmd, filename);

58
x11/gnome/file-roller/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.11 2009/06/07 09:27:37 ajacoutot Exp $ @comment $OpenBSD: PLIST,v 1.12 2009/10/12 19:01:08 jasper Exp $
%%SHARED%% %%SHARED%%
@bin bin/file-roller @bin bin/file-roller
lib/nautilus/ lib/nautilus/
@ -7,18 +7,9 @@ lib/nautilus/extensions-2.0/libnautilus-fileroller.a
lib/nautilus/extensions-2.0/libnautilus-fileroller.la lib/nautilus/extensions-2.0/libnautilus-fileroller.la
libexec/file-roller/ libexec/file-roller/
libexec/file-roller/isoinfo.sh libexec/file-roller/isoinfo.sh
@bin libexec/file-roller/rpm2cpio
share/applications/file-roller.desktop share/applications/file-roller.desktop
share/file-roller/ share/file-roller/
share/file-roller/glade/
share/file-roller/glade/add-options.glade
share/file-roller/glade/batch-add-files.glade
share/file-roller/glade/batch-password.glade
share/file-roller/glade/delete.glade
share/file-roller/glade/new.glade
share/file-roller/glade/open-with.glade
share/file-roller/glade/password.glade
share/file-roller/glade/properties.glade
share/file-roller/glade/update.glade
share/file-roller/icons/ share/file-roller/icons/
share/file-roller/icons/hicolor/ share/file-roller/icons/hicolor/
share/file-roller/icons/hicolor/16x16/ share/file-roller/icons/hicolor/16x16/
@ -31,6 +22,16 @@ share/file-roller/icons/hicolor/24x24/actions/
share/file-roller/icons/hicolor/24x24/actions/add-files-to-archive.png share/file-roller/icons/hicolor/24x24/actions/add-files-to-archive.png
share/file-roller/icons/hicolor/24x24/actions/add-folder-to-archive.png share/file-roller/icons/hicolor/24x24/actions/add-folder-to-archive.png
share/file-roller/icons/hicolor/24x24/actions/extract-archive.png share/file-roller/icons/hicolor/24x24/actions/extract-archive.png
share/file-roller/ui/
share/file-roller/ui/add-options.ui
share/file-roller/ui/batch-add-files.ui
share/file-roller/ui/batch-password.ui
share/file-roller/ui/delete.ui
share/file-roller/ui/new.ui
share/file-roller/ui/open-with.ui
share/file-roller/ui/password.ui
share/file-roller/ui/properties.ui
share/file-roller/ui/update.ui
share/gnome/help/file-roller/ share/gnome/help/file-roller/
share/gnome/help/file-roller/C/ share/gnome/help/file-roller/C/
share/gnome/help/file-roller/C/figures/ share/gnome/help/file-roller/C/figures/
@ -57,6 +58,14 @@ share/gnome/help/file-roller/ca/figures/file-roller_main_window.png
share/gnome/help/file-roller/ca/figures/file-roller_rightarrow.png share/gnome/help/file-roller/ca/figures/file-roller_rightarrow.png
share/gnome/help/file-roller/ca/figures/file-roller_uparrow.png share/gnome/help/file-roller/ca/figures/file-roller_uparrow.png
share/gnome/help/file-roller/ca/file-roller.xml share/gnome/help/file-roller/ca/file-roller.xml
share/gnome/help/file-roller/cs/
share/gnome/help/file-roller/cs/figures/
share/gnome/help/file-roller/cs/figures/file-roller_home.png
share/gnome/help/file-roller/cs/figures/file-roller_leftarrow.png
share/gnome/help/file-roller/cs/figures/file-roller_main_window.png
share/gnome/help/file-roller/cs/figures/file-roller_rightarrow.png
share/gnome/help/file-roller/cs/figures/file-roller_uparrow.png
share/gnome/help/file-roller/cs/file-roller.xml
share/gnome/help/file-roller/de/ share/gnome/help/file-roller/de/
share/gnome/help/file-roller/de/figures/ share/gnome/help/file-roller/de/figures/
share/gnome/help/file-roller/de/figures/file-roller_home.png share/gnome/help/file-roller/de/figures/file-roller_home.png
@ -65,6 +74,22 @@ share/gnome/help/file-roller/de/figures/file-roller_main_window.png
share/gnome/help/file-roller/de/figures/file-roller_rightarrow.png share/gnome/help/file-roller/de/figures/file-roller_rightarrow.png
share/gnome/help/file-roller/de/figures/file-roller_uparrow.png share/gnome/help/file-roller/de/figures/file-roller_uparrow.png
share/gnome/help/file-roller/de/file-roller.xml share/gnome/help/file-roller/de/file-roller.xml
share/gnome/help/file-roller/el/
share/gnome/help/file-roller/el/figures/
share/gnome/help/file-roller/el/figures/file-roller_home.png
share/gnome/help/file-roller/el/figures/file-roller_leftarrow.png
share/gnome/help/file-roller/el/figures/file-roller_main_window.png
share/gnome/help/file-roller/el/figures/file-roller_rightarrow.png
share/gnome/help/file-roller/el/figures/file-roller_uparrow.png
share/gnome/help/file-roller/el/file-roller.xml
share/gnome/help/file-roller/en_GB/
share/gnome/help/file-roller/en_GB/figures/
share/gnome/help/file-roller/en_GB/figures/file-roller_home.png
share/gnome/help/file-roller/en_GB/figures/file-roller_leftarrow.png
share/gnome/help/file-roller/en_GB/figures/file-roller_main_window.png
share/gnome/help/file-roller/en_GB/figures/file-roller_rightarrow.png
share/gnome/help/file-roller/en_GB/figures/file-roller_uparrow.png
share/gnome/help/file-roller/en_GB/file-roller.xml
share/gnome/help/file-roller/es/ share/gnome/help/file-roller/es/
share/gnome/help/file-roller/es/figures/ share/gnome/help/file-roller/es/figures/
share/gnome/help/file-roller/es/figures/file-roller_home.png share/gnome/help/file-roller/es/figures/file-roller_home.png
@ -164,6 +189,7 @@ share/locale/af/LC_MESSAGES/file-roller.mo
share/locale/am/LC_MESSAGES/file-roller.mo share/locale/am/LC_MESSAGES/file-roller.mo
share/locale/ar/LC_MESSAGES/file-roller.mo share/locale/ar/LC_MESSAGES/file-roller.mo
share/locale/as/LC_MESSAGES/file-roller.mo share/locale/as/LC_MESSAGES/file-roller.mo
share/locale/ast/LC_MESSAGES/file-roller.mo
share/locale/az/LC_MESSAGES/file-roller.mo share/locale/az/LC_MESSAGES/file-roller.mo
share/locale/be/LC_MESSAGES/file-roller.mo share/locale/be/LC_MESSAGES/file-roller.mo
share/locale/be@latin/LC_MESSAGES/file-roller.mo share/locale/be@latin/LC_MESSAGES/file-roller.mo
@ -173,6 +199,7 @@ share/locale/bn_IN/LC_MESSAGES/file-roller.mo
share/locale/br/LC_MESSAGES/file-roller.mo share/locale/br/LC_MESSAGES/file-roller.mo
share/locale/bs/LC_MESSAGES/file-roller.mo share/locale/bs/LC_MESSAGES/file-roller.mo
share/locale/ca/LC_MESSAGES/file-roller.mo share/locale/ca/LC_MESSAGES/file-roller.mo
share/locale/ca@valencia/LC_MESSAGES/file-roller.mo
share/locale/cs/LC_MESSAGES/file-roller.mo share/locale/cs/LC_MESSAGES/file-roller.mo
share/locale/cy/LC_MESSAGES/file-roller.mo share/locale/cy/LC_MESSAGES/file-roller.mo
share/locale/da/LC_MESSAGES/file-roller.mo share/locale/da/LC_MESSAGES/file-roller.mo
@ -203,11 +230,15 @@ share/locale/is/LC_MESSAGES/file-roller.mo
share/locale/it/LC_MESSAGES/file-roller.mo share/locale/it/LC_MESSAGES/file-roller.mo
share/locale/ja/LC_MESSAGES/file-roller.mo share/locale/ja/LC_MESSAGES/file-roller.mo
share/locale/ka/LC_MESSAGES/file-roller.mo share/locale/ka/LC_MESSAGES/file-roller.mo
share/locale/kk/
share/locale/kk/LC_MESSAGES/
share/locale/kk/LC_MESSAGES/file-roller.mo
share/locale/kn/LC_MESSAGES/file-roller.mo share/locale/kn/LC_MESSAGES/file-roller.mo
share/locale/ko/LC_MESSAGES/file-roller.mo share/locale/ko/LC_MESSAGES/file-roller.mo
share/locale/ku/LC_MESSAGES/file-roller.mo share/locale/ku/LC_MESSAGES/file-roller.mo
share/locale/lt/LC_MESSAGES/file-roller.mo share/locale/lt/LC_MESSAGES/file-roller.mo
share/locale/lv/LC_MESSAGES/file-roller.mo share/locale/lv/LC_MESSAGES/file-roller.mo
share/locale/mai/LC_MESSAGES/file-roller.mo
share/locale/mg/LC_MESSAGES/file-roller.mo share/locale/mg/LC_MESSAGES/file-roller.mo
share/locale/mk/LC_MESSAGES/file-roller.mo share/locale/mk/LC_MESSAGES/file-roller.mo
share/locale/ml/LC_MESSAGES/file-roller.mo share/locale/ml/LC_MESSAGES/file-roller.mo
@ -222,8 +253,6 @@ share/locale/oc/LC_MESSAGES/file-roller.mo
share/locale/or/LC_MESSAGES/file-roller.mo share/locale/or/LC_MESSAGES/file-roller.mo
share/locale/pa/LC_MESSAGES/file-roller.mo share/locale/pa/LC_MESSAGES/file-roller.mo
share/locale/pl/LC_MESSAGES/file-roller.mo share/locale/pl/LC_MESSAGES/file-roller.mo
share/locale/ps/
share/locale/ps/LC_MESSAGES/
share/locale/ps/LC_MESSAGES/file-roller.mo share/locale/ps/LC_MESSAGES/file-roller.mo
share/locale/pt/LC_MESSAGES/file-roller.mo share/locale/pt/LC_MESSAGES/file-roller.mo
share/locale/pt_BR/LC_MESSAGES/file-roller.mo share/locale/pt_BR/LC_MESSAGES/file-roller.mo
@ -263,7 +292,10 @@ share/omf/file-roller/
share/omf/file-roller/file-roller-C.omf share/omf/file-roller/file-roller-C.omf
share/omf/file-roller/file-roller-bg.omf share/omf/file-roller/file-roller-bg.omf
share/omf/file-roller/file-roller-ca.omf share/omf/file-roller/file-roller-ca.omf
share/omf/file-roller/file-roller-cs.omf
share/omf/file-roller/file-roller-de.omf share/omf/file-roller/file-roller-de.omf
share/omf/file-roller/file-roller-el.omf
share/omf/file-roller/file-roller-en_GB.omf
share/omf/file-roller/file-roller-es.omf share/omf/file-roller/file-roller-es.omf
share/omf/file-roller/file-roller-fi.omf share/omf/file-roller/file-roller-fi.omf
share/omf/file-roller/file-roller-fr.omf share/omf/file-roller/file-roller-fr.omf