- update to file-roller-3.6.0
This commit is contained in:
parent
6bd5101fae
commit
b54051f4fe
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.71 2012/09/01 14:36:59 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.72 2012/09/28 09:10:40 jasper Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
@ -6,14 +6,11 @@ COMMENT-main= archive manager utility for GNOME
|
||||
COMMENT-nautilus= file-roller plugin for nautilus
|
||||
|
||||
GNOME_PROJECT= file-roller
|
||||
GNOME_VERSION= 3.4.2
|
||||
GNOME_VERSION= 3.6.0
|
||||
|
||||
PKGNAME-main= ${DISTNAME}
|
||||
PKGNAME-nautilus= nautilus-${DISTNAME}
|
||||
|
||||
REVISION-main= 1
|
||||
REVISION-nautilus= 0
|
||||
|
||||
CATEGORIES= archivers
|
||||
|
||||
# GPLv2
|
||||
@ -28,7 +25,9 @@ WANTLIB += cairo-gobject drm expat fontconfig freetype gdk-3 gdk_pixbuf-2.0
|
||||
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
|
||||
WANTLIB += gtk-3 m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
|
||||
WANTLIB += pixman-1 png pthread-stubs xcb xcb-render xcb-shm
|
||||
WANTLIB += z ffi stdc++
|
||||
WANTLIB += z ffi stdc++ pthread
|
||||
WANTLIB += ICE SM atk-bridge-2.0 atspi dbus-1 harfbuzz icudata
|
||||
WANTLIB += icule icuuc
|
||||
|
||||
MODULES= devel/dconf \
|
||||
devel/gettext \
|
||||
@ -36,7 +35,7 @@ MODULES= devel/dconf \
|
||||
|
||||
MULTI_PACKAGES= -main -nautilus
|
||||
|
||||
WANTLIB-main= ${WANTLIB} c pthread
|
||||
WANTLIB-main= ${WANTLIB} bz2 c lzma archive json-glib-1.0 notify
|
||||
RUN_DEPENDS-main= archivers/gcpio \
|
||||
archivers/gtar \
|
||||
archivers/p7zip \
|
||||
@ -46,7 +45,10 @@ RUN_DEPENDS-main= archivers/gcpio \
|
||||
archivers/zip \
|
||||
sysutils/cdrtools \
|
||||
${RUN_DEPENDS}
|
||||
LIB_DEPENDS-main= x11/gtk+3
|
||||
LIB_DEPENDS-main= archivers/libarchive \
|
||||
devel/json-glib \
|
||||
devel/libnotify \
|
||||
x11/gtk+3
|
||||
|
||||
WANTLIB-nautilus= ${WANTLIB} nautilus-extension
|
||||
LIB_DEPENDS-nautilus= x11/gnome/nautilus
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (gnome/file-roller-3.4.2.tar.xz) = cIWjUcVRcXGLv1ubYUp7lgbvuMvS60TMbFOFRURNDN0=
|
||||
SIZE (gnome/file-roller-3.4.2.tar.xz) = 1548788
|
||||
SHA256 (gnome/file-roller-3.6.0.tar.xz) = AXcXiMZzstsyP64e7nZs6zNC2BWk8suoObZiwupWkY0=
|
||||
SIZE (gnome/file-roller-3.6.0.tar.xz) = 1480492
|
||||
|
@ -1,10 +1,10 @@
|
||||
$OpenBSD: patch-configure,v 1.1 2012/09/11 07:03:50 ajacoutot Exp $
|
||||
$OpenBSD: patch-configure,v 1.2 2012/09/28 09:10:40 jasper Exp $
|
||||
|
||||
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
|
||||
|
||||
--- configure.orig Mon May 14 21:10:26 2012
|
||||
+++ configure Tue Sep 11 08:51:14 2012
|
||||
@@ -13011,6 +13011,9 @@ else
|
||||
--- configure.orig Mon Sep 24 21:08:13 2012
|
||||
+++ configure Fri Sep 28 10:03:47 2012
|
||||
@@ -13408,6 +13408,9 @@ else
|
||||
fi
|
||||
|
||||
;;
|
||||
|
@ -1,22 +0,0 @@
|
||||
$OpenBSD: patch-src_fr-command-7z_c,v 1.3 2011/09/12 07:26:20 ajacoutot Exp $
|
||||
|
||||
Fix a crasher possible with 7z files.
|
||||
|
||||
--- src/fr-command-7z.c.orig Tue Mar 1 19:51:35 2011
|
||||
+++ src/fr-command-7z.c Mon May 23 10:20:44 2011
|
||||
@@ -129,6 +129,7 @@ list__process_line (char *line,
|
||||
}
|
||||
else {
|
||||
fdata = p7z_comm->fdata;
|
||||
+ if (fdata->full_path) {
|
||||
if (fdata->dir)
|
||||
fdata->name = dir_name_from_path (fdata->full_path);
|
||||
else
|
||||
@@ -136,6 +137,7 @@ list__process_line (char *line,
|
||||
fdata->path = remove_level_from_path (fdata->full_path);
|
||||
fr_command_add_file (comm, fdata);
|
||||
p7z_comm->fdata = NULL;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
return;
|
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-src_fr-command-cpio_c,v 1.4 2011/09/12 07:26:20 ajacoutot Exp $
|
||||
--- src/fr-command-cpio.c.orig Tue Mar 1 19:51:35 2011
|
||||
+++ src/fr-command-cpio.c Mon May 23 10:20:44 2011
|
||||
@@ -240,7 +240,7 @@ fr_command_cpio_get_capabilities (FrCommand *comm,
|
||||
FrCommandCap capabilities;
|
||||
$OpenBSD: patch-src_fr-command-cpio_c,v 1.5 2012/09/28 09:10:40 jasper Exp $
|
||||
--- src/fr-command-cpio.c.orig Fri Sep 28 10:03:27 2012
|
||||
+++ src/fr-command-cpio.c Fri Sep 28 10:03:36 2012
|
||||
@@ -233,7 +233,7 @@ fr_command_cpio_get_capabilities (FrArchive *archive,
|
||||
FrArchiveCap capabilities;
|
||||
|
||||
capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
|
||||
- if (is_program_available ("cpio", check_command))
|
||||
+ if (is_program_available ("gcpio", check_command))
|
||||
capabilities |= FR_COMMAND_CAN_READ;
|
||||
capabilities = FR_ARCHIVE_CAN_STORE_MANY_FILES;
|
||||
- if (_g_program_is_available ("cpio", check_command))
|
||||
+ if (_g_program_is_available ("gcpio", check_command))
|
||||
capabilities |= FR_ARCHIVE_CAN_READ;
|
||||
|
||||
return capabilities;
|
||||
|
@ -1,17 +1,17 @@
|
||||
$OpenBSD: patch-src_fr-command-rpm_c,v 1.5 2011/09/12 07:26:20 ajacoutot Exp $
|
||||
--- src/fr-command-rpm.c.orig Mon May 23 19:35:02 2011
|
||||
+++ src/fr-command-rpm.c Tue Jun 21 16:26:52 2011
|
||||
@@ -241,7 +241,7 @@ fr_command_rpm_get_capabilities (FrCommand *comm,
|
||||
FrCommandCap capabilities;
|
||||
$OpenBSD: patch-src_fr-command-rpm_c,v 1.6 2012/09/28 09:10:40 jasper Exp $
|
||||
--- src/fr-command-rpm.c.orig Fri Sep 28 09:59:36 2012
|
||||
+++ src/fr-command-rpm.c Fri Sep 28 09:59:57 2012
|
||||
@@ -234,7 +234,7 @@ fr_command_rpm_get_capabilities (FrArchive *archive,
|
||||
FrArchiveCap capabilities;
|
||||
|
||||
capabilities = FR_COMMAND_CAN_ARCHIVE_MANY_FILES;
|
||||
- if (is_program_available ("cpio", check_command))
|
||||
+ if (is_program_available ("gcpio", check_command))
|
||||
capabilities |= FR_COMMAND_CAN_READ;
|
||||
capabilities = FR_ARCHIVE_CAN_STORE_MANY_FILES;
|
||||
- if (_g_program_is_available ("cpio", check_command))
|
||||
+ if (_g_program_is_available ("gcpio", check_command))
|
||||
capabilities |= FR_ARCHIVE_CAN_READ;
|
||||
|
||||
return capabilities;
|
||||
@@ -252,7 +252,7 @@ static const char *
|
||||
fr_command_rpm_get_packages (FrCommand *comm,
|
||||
@@ -245,7 +245,7 @@ static const char *
|
||||
fr_command_rpm_get_packages (FrArchive *archive,
|
||||
const char *mime_type)
|
||||
{
|
||||
- return PACKAGES ("cpio,rpm");
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user