diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-05-12 05:18:02 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-05-12 05:18:02 +0800 |
| commit | 3dd3c1374de44b86b1911fca2717b43c01258a79 (patch) | |
| tree | 6a6e8c9676129293f4a38ec15b36d7ae9bdb5a99 | |
| parent | bb8299a72e36e461757f67c7b3749f019a6380bc (diff) | |
| download | marcuscom-ports-3dd3c1374de44b86b1911fca2717b43c01258a79.tar marcuscom-ports-3dd3c1374de44b86b1911fca2717b43c01258a79.tar.gz marcuscom-ports-3dd3c1374de44b86b1911fca2717b43c01258a79.tar.bz2 marcuscom-ports-3dd3c1374de44b86b1911fca2717b43c01258a79.tar.lz marcuscom-ports-3dd3c1374de44b86b1911fca2717b43c01258a79.tar.xz marcuscom-ports-3dd3c1374de44b86b1911fca2717b43c01258a79.tar.zst marcuscom-ports-3dd3c1374de44b86b1911fca2717b43c01258a79.zip | |
Add back patches lost in the update to 3.6.2.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18450 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | archivers/file-roller3/files/patch-src_fr-command-tar.c | 12 | ||||
| -rw-r--r-- | archivers/file-roller3/files/patch-src_fr-command-zip.c | 38 |
2 files changed, 50 insertions, 0 deletions
diff --git a/archivers/file-roller3/files/patch-src_fr-command-tar.c b/archivers/file-roller3/files/patch-src_fr-command-tar.c new file mode 100644 index 000000000..78843a28c --- /dev/null +++ b/archivers/file-roller3/files/patch-src_fr-command-tar.c @@ -0,0 +1,12 @@ +--- src/fr-command-tar.c.orig Sun Oct 15 12:33:56 2006 ++++ src/fr-command-tar.c Mon Oct 16 19:18:03 2006 +@@ -231,6 +231,9 @@ + #if defined (__SVR4) && defined (__sun) + if (g_file_test ("/usr/sfw/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) + command = g_strdup ("/usr/sfw/bin/gtar"); ++#elif defined(__FreeBSD__) ++ if (g_file_test ("%%LOCALBASE%%/bin/gtar", G_FILE_TEST_IS_EXECUTABLE)) ++ command = g_strdup ("%%LOCALBASE%%/bin/gtar"); + #endif + if (command != NULL) + fr_process_begin_command (comm->process, command); diff --git a/archivers/file-roller3/files/patch-src_fr-command-zip.c b/archivers/file-roller3/files/patch-src_fr-command-zip.c new file mode 100644 index 000000000..5995813eb --- /dev/null +++ b/archivers/file-roller3/files/patch-src_fr-command-zip.c @@ -0,0 +1,38 @@ +--- src/fr-command-zip.c.orig 2010-11-16 08:32:18.000000000 +0000 ++++ src/fr-command-zip.c 2011-01-20 16:55:45.000000000 +0000 +@@ -186,7 +186,11 @@ fr_command_zip_list (FrCommand *comm) + { + fr_process_set_out_line_func (comm->process, list__process_line, comm); + ++#ifdef __FreeBSD__ ++ fr_process_begin_command (comm->process, "%%LOCALBASE%%/bin/unzip"); ++#else + fr_process_begin_command (comm->process, "unzip"); ++#endif + fr_process_set_begin_func (comm->process, list__begin, comm); + fr_process_add_arg (comm->process, "-ZTs"); + fr_process_add_arg (comm->process, comm->filename); +@@ -301,7 +305,11 @@ fr_command_zip_extract (FrCommand *comm + process_line__common, + comm); + ++#ifdef __FreeBSD__ ++ fr_process_begin_command (comm->process, "%%LOCALBASE%%/bin/unzip"); ++#else + fr_process_begin_command (comm->process, "unzip"); ++#endif + + if (dest_dir != NULL) { + fr_process_add_arg (comm->process, "-d"); +@@ -333,7 +341,11 @@ fr_command_zip_extract (FrCommand *comm + static void + fr_command_zip_test (FrCommand *comm) + { ++#ifdef __FreeBSD__ ++ fr_process_begin_command (comm->process, "%%LOCALBASE%%/bin/unzip"); ++#else + fr_process_begin_command (comm->process, "unzip"); ++#endif + fr_process_add_arg (comm->process, "-t"); + add_password_arg (comm, comm->password); + fr_process_add_arg (comm->process, comm->filename); |