From b9943dc1b3307aa080a3ed1ede51c7d5d4c53c38 Mon Sep 17 00:00:00 2001 From: jasper Date: Mon, 25 Apr 2016 14:04:50 +0000 Subject: [PATCH] update to file-roller-3.20.1 --- x11/gnome/file-roller/Makefile | 11 ++--- x11/gnome/file-roller/distinfo | 4 +- .../file-roller/patches/patch-configure_ac | 17 -------- .../patches/patch-src_commands_rpm2cpio_c | 15 ------- .../patches/patch-src_fr-command-cpio_c | 24 ----------- .../patches/patch-src_fr-command-rpm_c | 24 ----------- x11/gnome/file-roller/pkg/PLIST | 42 ++++++++++++++++++- 7 files changed, 46 insertions(+), 91 deletions(-) delete mode 100644 x11/gnome/file-roller/patches/patch-configure_ac delete mode 100644 x11/gnome/file-roller/patches/patch-src_commands_rpm2cpio_c delete mode 100644 x11/gnome/file-roller/patches/patch-src_fr-command-cpio_c delete mode 100644 x11/gnome/file-roller/patches/patch-src_fr-command-rpm_c diff --git a/x11/gnome/file-roller/Makefile b/x11/gnome/file-roller/Makefile index d9f76c0f473..e20efca7953 100644 --- a/x11/gnome/file-roller/Makefile +++ b/x11/gnome/file-roller/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.116 2016/03/18 23:12:20 naddy Exp $ +# $OpenBSD: Makefile,v 1.117 2016/04/25 14:04:50 jasper Exp $ COMMENT= archive manager utility for GNOME GNOME_PROJECT= file-roller -GNOME_VERSION= 3.16.4 +GNOME_VERSION= 3.20.1 CATEGORIES= archivers @@ -17,10 +17,9 @@ WANTLIB += freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-3 harfbuzz WANTLIB += json-glib-1.0 lzma m magic nautilus-extension epoxy lzo2 WANTLIB += notify pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 -WANTLIB += png pthread pthread-stubs xcb xcb-render xcb-shm z +WANTLIB += png pthread pthread-stubs xcb xcb-render xcb-shm z intl iconv MODULES= devel/dconf \ - devel/gettext \ x11/gnome RUN_DEPENDS= archivers/gcpio \ @@ -47,8 +46,4 @@ CONFIGURE_ENV= CPIO=${LOCALBASE}/bin/gcpio post-install: rm ${PREFIX}/lib/nautilus/extensions-3.0/*.{a,la} -# XXX: Remove when patch-configure_ac is merged -AUTOCONF_VERSION= 2.69 -CONFIGURE_STYLE= autoconf - .include diff --git a/x11/gnome/file-roller/distinfo b/x11/gnome/file-roller/distinfo index a2803e3f9ef..a2d89ff3528 100644 --- a/x11/gnome/file-roller/distinfo +++ b/x11/gnome/file-roller/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome/file-roller-3.16.4.tar.xz) = VFWYCyycfrBj0tZVYK56sufwGyCOo5R+FRaAIxx6QYU= -SIZE (gnome/file-roller-3.16.4.tar.xz) = 1412224 +SHA256 (gnome/file-roller-3.20.1.tar.xz) = yLPbWa4S0O/eLo4o0MtHVQj/wzvwiqUZT79fcCtqozM= +SIZE (gnome/file-roller-3.20.1.tar.xz) = 1430248 diff --git a/x11/gnome/file-roller/patches/patch-configure_ac b/x11/gnome/file-roller/patches/patch-configure_ac deleted file mode 100644 index 80d5243c995..00000000000 --- a/x11/gnome/file-roller/patches/patch-configure_ac +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-configure_ac,v 1.1 2015/04/16 11:14:58 jasper Exp $ - -https://bugzilla.gnome.org/show_bug.cgi?id=747984 - ---- configure.ac.orig Mon Apr 13 20:52:16 2015 -+++ configure.ac Thu Apr 16 12:52:47 2015 -@@ -243,6 +243,10 @@ AC_SUBST(LIBARCHIVE_LIBS) - AC_SUBST(LIBARCHIVE_CFLAGS) - AM_CONDITIONAL(ENABLE_LIBARCHIVE, test x"$enable_libarchive" = xyes) - -+AC_ARG_VAR([CPIO], [Path to the `cpio` command]) -+AC_PATH_PROGS(CPIO, gcpio cpio) -+AC_DEFINE_UNQUOTED(CPIO_PATH, "${CPIO}", [Path to cpio]) -+ - dnl ****************************** - - IT_PROG_INTLTOOL([0.40.0]) diff --git a/x11/gnome/file-roller/patches/patch-src_commands_rpm2cpio_c b/x11/gnome/file-roller/patches/patch-src_commands_rpm2cpio_c deleted file mode 100644 index 7f69814231d..00000000000 --- a/x11/gnome/file-roller/patches/patch-src_commands_rpm2cpio_c +++ /dev/null @@ -1,15 +0,0 @@ -$OpenBSD: patch-src_commands_rpm2cpio_c,v 1.3 2015/04/16 11:14:58 jasper Exp $ - -https://bugzilla.gnome.org/show_bug.cgi?id=747984 - ---- src/commands/rpm2cpio.c.orig Wed Aug 13 07:21:20 2014 -+++ src/commands/rpm2cpio.c Thu Apr 16 12:07:11 2015 -@@ -127,7 +127,7 @@ main (int argc, char **argv) - archive_command = "bzip2 -dc"; - fclose (stream); - -- command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | cpio %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str); -+ command = g_strdup_printf ("sh -c \"dd if=%s ibs=%u skip=1 2>/dev/null | %s | " CPIO_PATH " %s\"", g_shell_quote (filename), offset, archive_command, cpio_args->str); - - return system (command); - } diff --git a/x11/gnome/file-roller/patches/patch-src_fr-command-cpio_c b/x11/gnome/file-roller/patches/patch-src_fr-command-cpio_c deleted file mode 100644 index 1c6af081463..00000000000 --- a/x11/gnome/file-roller/patches/patch-src_fr-command-cpio_c +++ /dev/null @@ -1,24 +0,0 @@ -$OpenBSD: patch-src_fr-command-cpio_c,v 1.6 2015/04/16 11:14:58 jasper Exp $ - -https://bugzilla.gnome.org/show_bug.cgi?id=747984 - ---- src/fr-command-cpio.c.orig Wed Aug 13 07:21:20 2014 -+++ src/fr-command-cpio.c Thu Apr 16 13:01:44 2015 -@@ -168,7 +168,7 @@ fr_command_cpio_list (FrCommand *comm) - - fr_process_begin_command (comm->process, "sh"); - fr_process_add_arg (comm->process, "-c"); -- fr_process_add_arg_concat (comm->process, "cpio -itv < ", comm->e_filename, NULL); -+ fr_process_add_arg_concat (comm->process, CPIO_PATH " -itv < ", comm->e_filename, NULL); - fr_process_end_command (comm->process); - - return TRUE; -@@ -233,7 +233,7 @@ fr_command_cpio_get_capabilities (FrArchive *archive, - FrArchiveCap capabilities; - - capabilities = FR_ARCHIVE_CAN_STORE_MANY_FILES; -- if (_g_program_is_available ("cpio", check_command)) -+ if (_g_program_is_available (CPIO_PATH, check_command)) - capabilities |= FR_ARCHIVE_CAN_READ; - - return capabilities; diff --git a/x11/gnome/file-roller/patches/patch-src_fr-command-rpm_c b/x11/gnome/file-roller/patches/patch-src_fr-command-rpm_c deleted file mode 100644 index 0688849e5e1..00000000000 --- a/x11/gnome/file-roller/patches/patch-src_fr-command-rpm_c +++ /dev/null @@ -1,24 +0,0 @@ -$OpenBSD: patch-src_fr-command-rpm_c,v 1.7 2015/04/16 11:14:58 jasper Exp $ - -https://bugzilla.gnome.org/show_bug.cgi?id=747984 - ---- src/fr-command-rpm.c.orig Wed Aug 13 07:21:20 2014 -+++ src/fr-command-rpm.c Thu Apr 16 12:08:29 2015 -@@ -234,7 +234,7 @@ fr_command_rpm_get_capabilities (FrArchive *archive, - FrArchiveCap capabilities; - - capabilities = FR_ARCHIVE_CAN_STORE_MANY_FILES; -- if (_g_program_is_available ("cpio", check_command)) -+ if (_g_program_is_available (CPIO_PATH, check_command)) - capabilities |= FR_ARCHIVE_CAN_READ; - - return capabilities; -@@ -245,7 +245,7 @@ static const char * - fr_command_rpm_get_packages (FrArchive *archive, - const char *mime_type) - { -- return PACKAGES ("cpio,rpm"); -+ return PACKAGES (CPIO_PATH ",rpm"); - } - - diff --git a/x11/gnome/file-roller/pkg/PLIST b/x11/gnome/file-roller/pkg/PLIST index c117e6b3652..ca9999c39e8 100644 --- a/x11/gnome/file-roller/pkg/PLIST +++ b/x11/gnome/file-roller/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.28 2015/04/14 06:55:06 jasper Exp $ +@comment $OpenBSD: PLIST,v 1.29 2016/04/25 14:04:50 jasper Exp $ @conflict nautilus-file-roller-* @pkgpath x11/gnome/file-roller,-main @pkgpath x11/gnome/file-roller,-nautilus @@ -278,6 +278,26 @@ share/help/ja/file-roller/supported-formats.page share/help/ja/file-roller/test-integrity.page share/help/ja/file-roller/troubleshooting-archive-open.page share/help/ja/file-roller/troubleshooting-password.page +share/help/ko/file-roller/ +share/help/ko/file-roller/archive-create.page +share/help/ko/file-roller/archive-edit.page +share/help/ko/file-roller/archive-extract-advanced-options.page +share/help/ko/file-roller/archive-extract.page +share/help/ko/file-roller/archive-open.page +share/help/ko/file-roller/archive-view.page +share/help/ko/file-roller/figures/ +share/help/ko/file-roller/figures/file-roller-3-12.png +share/help/ko/file-roller/figures/file-roller-icon.png +share/help/ko/file-roller/figures/file-roller-open-recent.png +share/help/ko/file-roller/index.page +share/help/ko/file-roller/introduction.page +share/help/ko/file-roller/keyboard-shortcuts.page +share/help/ko/file-roller/legal.xml +share/help/ko/file-roller/password-protection.page +share/help/ko/file-roller/supported-formats.page +share/help/ko/file-roller/test-integrity.page +share/help/ko/file-roller/troubleshooting-archive-open.page +share/help/ko/file-roller/troubleshooting-password.page share/help/pt_BR/file-roller/ share/help/pt_BR/file-roller/archive-create.page share/help/pt_BR/file-roller/archive-edit.page @@ -339,6 +359,26 @@ share/help/sl/file-roller/supported-formats.page share/help/sl/file-roller/test-integrity.page share/help/sl/file-roller/troubleshooting-archive-open.page share/help/sl/file-roller/troubleshooting-password.page +share/help/sv/file-roller/ +share/help/sv/file-roller/archive-create.page +share/help/sv/file-roller/archive-edit.page +share/help/sv/file-roller/archive-extract-advanced-options.page +share/help/sv/file-roller/archive-extract.page +share/help/sv/file-roller/archive-open.page +share/help/sv/file-roller/archive-view.page +share/help/sv/file-roller/figures/ +share/help/sv/file-roller/figures/file-roller-3-12.png +share/help/sv/file-roller/figures/file-roller-icon.png +share/help/sv/file-roller/figures/file-roller-open-recent.png +share/help/sv/file-roller/index.page +share/help/sv/file-roller/introduction.page +share/help/sv/file-roller/keyboard-shortcuts.page +share/help/sv/file-roller/legal.xml +share/help/sv/file-roller/password-protection.page +share/help/sv/file-roller/supported-formats.page +share/help/sv/file-roller/test-integrity.page +share/help/sv/file-roller/troubleshooting-archive-open.page +share/help/sv/file-roller/troubleshooting-password.page share/help/te/ share/help/te/file-roller/ share/help/te/file-roller/archive-create.page