[SCM] ark packaging branch, kubuntu_wily_archive, updated. debian/4.14.2-1-20-g1ad4a26
Jonathan Riddell
jriddell-guest at moszumanska.debian.org
Mon Jul 13 08:38:34 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ark.git;a=commitdiff;h=1ad4a26
The following commit has been merged in the kubuntu_wily_archive branch:
commit 1ad4a2671a006a2839e6ecf00b4182077575bdb9
Author: Jonathan Riddell <jr at jriddell.org>
Date: Mon Jul 13 10:38:30 2015 +0200
Remove Debian patch use_libarchive_for_zip_files, it causes problems LP: #1404239
---
debian/changelog | 2 +
debian/patches/series | 1 -
debian/patches/use_libarchive_for_zip_files | 246 ----------------------------
3 files changed, 2 insertions(+), 247 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c301bec..e33d400 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
ark (4:15.04.3-0ubuntu1) UNRELEASED; urgency=medium
* New upstream release
+ * Remove Debian patch use_libarchive_for_zip_files, it causes problems
+ LP: #1404239
-- Jonathan Riddell <jriddell at ubuntu.com> Thu, 02 Jul 2015 16:54:44 +0000
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3a9a3d1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-use_libarchive_for_zip_files
diff --git a/debian/patches/use_libarchive_for_zip_files b/debian/patches/use_libarchive_for_zip_files
deleted file mode 100644
index 264a77f..0000000
--- a/debian/patches/use_libarchive_for_zip_files
+++ /dev/null
@@ -1,246 +0,0 @@
-commit 17ef504d8b63a864cd7d1ef7d4400027f4ec78db
-Author: Maximiliano Curia <maxy at debian.org>
-Date: Thu Feb 27 11:25:38 2014 +0100
-
- Use libarchive for zip files.
-
-Index: ark/plugins/clizipplugin/CMakeLists.txt
-===================================================================
---- ark.orig/plugins/clizipplugin/CMakeLists.txt 2014-07-08 20:53:00.738303670 +0200
-+++ ark/plugins/clizipplugin/CMakeLists.txt 2014-07-08 20:53:00.734303843 +0200
-@@ -1,6 +1,6 @@
- ########### next target ###############
-
--set(SUPPORTED_CLIZIP_MIMETYPES "application/x-java-archive;application/zip;")
-+set(SUPPORTED_CLIZIP_MIMETYPES "application/x-java-archive;")
-
- set(kerfuffle_clizip_SRCS cliplugin.cpp)
-
-Index: ark/plugins/libarchive/CMakeLists.txt
-===================================================================
---- ark.orig/plugins/libarchive/CMakeLists.txt 2014-07-08 20:53:00.738303670 +0200
-+++ ark/plugins/libarchive/CMakeLists.txt 2014-07-08 20:53:00.734303843 +0200
-@@ -2,7 +2,7 @@
-
- ########### next target ###############
- set(SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES "application/x-deb;application/x-cd-image;application/x-bcpio;application/x-cpio;application/x-cpio-compressed;application/x-sv4cpio;application/x-sv4crc;")
--set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "application/x-tar;application/x-compressed-tar;application/x-bzip-compressed-tar;application/x-tarz;application/x-xz-compressed-tar;application/x-lzma-compressed-tar;")
-+set(SUPPORTED_LIBARCHIVE_READWRITE_MIMETYPES "application/x-tar;application/x-compressed-tar;application/x-bzip-compressed-tar;application/x-tarz;application/x-xz-compressed-tar;application/x-lzma-compressed-tar;application/zip;")
- if(HAVE_LIBARCHIVE_RPM_SUPPORT)
- set(SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES "${SUPPORTED_LIBARCHIVE_READONLY_MIMETYPES}application/x-rpm;application/x-source-rpm;")
- endif(HAVE_LIBARCHIVE_RPM_SUPPORT)
-Index: ark/plugins/libarchive/libarchivehandler.cpp
-===================================================================
---- ark.orig/plugins/libarchive/libarchivehandler.cpp 2014-07-08 20:53:00.738303670 +0200
-+++ ark/plugins/libarchive/libarchivehandler.cpp 2014-07-08 20:53:39.836599226 +0200
-@@ -50,7 +50,7 @@
- static inline void cleanup(struct archive *a)
- {
- if (a) {
-- archive_read_finish(a);
-+ archive_read_free(a);
- }
- }
- };
-@@ -60,7 +60,7 @@
- static inline void cleanup(struct archive *a)
- {
- if (a) {
-- archive_write_finish(a);
-+ archive_write_free(a);
- }
- }
- };
-@@ -91,7 +91,7 @@
- return false;
- }
-
-- if (archive_read_support_compression_all(arch_reader.data()) != ARCHIVE_OK) {
-+ if (archive_read_support_filter_all(arch_reader.data()) != ARCHIVE_OK) {
- return false;
- }
-
-@@ -109,7 +109,7 @@
- m_extractedFilesSize = 0;
-
- struct archive_entry *aentry;
-- int result;
-+ int result = ARCHIVE_OK;
-
- while (!m_abortOperation && (result = archive_read_next_header(arch_reader.data(), &aentry)) == ARCHIVE_OK) {
- if (!m_emitNoEntries) {
-@@ -157,7 +157,7 @@
- return false;
- }
-
-- if (archive_read_support_compression_all(arch.data()) != ARCHIVE_OK) {
-+ if (archive_read_support_filter_all(arch.data()) != ARCHIVE_OK) {
- return false;
- }
-
-@@ -210,7 +210,7 @@
- // retry with renamed entry, fire an overwrite query again
- // if the new entry also exists
- retry:
-- const bool entryIsDir = S_ISDIR(archive_entry_mode(entry));
-+ const bool entryIsDir = (archive_entry_filetype(entry) == AE_IFDIR);
-
- //we skip directories if not preserving paths
- if (!preservePaths && entryIsDir) {
-@@ -356,7 +356,7 @@
- return false;
- }
-
-- if (archive_read_support_compression_all(arch_reader.data()) != ARCHIVE_OK) {
-+ if (archive_read_support_filter_all(arch_reader.data()) != ARCHIVE_OK) {
- return false;
- }
-
-@@ -376,33 +376,39 @@
- return false;
- }
-
-- //pax_restricted is the libarchive default, let's go with that.
-- archive_write_set_format_pax_restricted(arch_writer.data());
--
-- int ret;
-+ int ret = ARCHIVE_OK;
- if (creatingNewFile) {
- if (filename().right(2).toUpper() == QLatin1String( "GZ" )) {
- kDebug() << "Detected gzip compression for new file";
-- ret = archive_write_set_compression_gzip(arch_writer.data());
-+ //pax_restricted is the libarchive default, let's go with that.
-+ archive_write_set_format_pax_restricted(arch_writer.data());
-+ ret = archive_write_add_filter_gzip(arch_writer.data());
- } else if (filename().right(3).toUpper() == QLatin1String( "BZ2" )) {
- kDebug() << "Detected bzip2 compression for new file";
-- ret = archive_write_set_compression_bzip2(arch_writer.data());
-+ archive_write_set_format_pax_restricted(arch_writer.data());
-+ ret = archive_write_add_filter_bzip2(arch_writer.data());
- #ifdef HAVE_LIBARCHIVE_XZ_SUPPORT
- } else if (filename().right(2).toUpper() == QLatin1String( "XZ" )) {
- kDebug() << "Detected xz compression for new file";
-- ret = archive_write_set_compression_xz(arch_writer.data());
-+ archive_write_set_format_pax_restricted(arch_writer.data());
-+ ret = archive_write_add_filter_xz(arch_writer.data());
- #endif
- #ifdef HAVE_LIBARCHIVE_LZMA_SUPPORT
- } else if (filename().right(4).toUpper() == QLatin1String( "LZMA" )) {
- kDebug() << "Detected lzma compression for new file";
-- ret = archive_write_set_compression_lzma(arch_writer.data());
-+ archive_write_set_format_pax_restricted(arch_writer.data());
-+ ret = archive_write_add_filter_lzma(arch_writer.data());
- #endif
- } else if (filename().right(3).toUpper() == QLatin1String( "TAR" )) {
- kDebug() << "Detected no compression for new file (pure tar)";
-- ret = archive_write_set_compression_none(arch_writer.data());
-+ ret = archive_write_set_format_pax_restricted(arch_writer.data());
-+ } else if (filename().right(3).toUpper() == QLatin1String( "ZIP" )) {
-+ kDebug() << "Detected zip format for new file";
-+ ret = archive_write_set_format_zip(arch_writer.data());
- } else {
- kDebug() << "Falling back to gzip";
-- ret = archive_write_set_compression_gzip(arch_writer.data());
-+ archive_write_set_format_pax_restricted(arch_writer.data());
-+ ret = archive_write_add_filter_gzip(arch_writer.data());
- }
-
- if (ret != ARCHIVE_OK) {
-@@ -412,31 +418,14 @@
- return false;
- }
- } else {
-- switch (archive_compression(arch_reader.data())) {
-- case ARCHIVE_COMPRESSION_GZIP:
-- ret = archive_write_set_compression_gzip(arch_writer.data());
-- break;
-- case ARCHIVE_COMPRESSION_BZIP2:
-- ret = archive_write_set_compression_bzip2(arch_writer.data());
-- break;
--#ifdef HAVE_LIBARCHIVE_XZ_SUPPORT
-- case ARCHIVE_COMPRESSION_XZ:
-- ret = archive_write_set_compression_xz(arch_writer.data());
-- break;
--#endif
--#ifdef HAVE_LIBARCHIVE_LZMA_SUPPORT
-- case ARCHIVE_COMPRESSION_LZMA:
-- ret = archive_write_set_compression_lzma(arch_writer.data());
-- break;
--#endif
-- case ARCHIVE_COMPRESSION_NONE:
-- ret = archive_write_set_compression_none(arch_writer.data());
-- break;
-- default:
-- emit error(i18n("The compression type '%1' is not supported by Ark.", QLatin1String(archive_compression_name(arch_reader.data()))));
-+ int format_code = archive_format(arch_reader.data());
-+ ret = archive_write_set_format(arch_writer.data(), format_code);
-+ if (ret != ARCHIVE_OK) {
-+ emit error(i18nc("@info", "Setting the format failed with the following error: <message>%1</message>", QLatin1String(archive_error_string(arch_writer.data()))));
- return false;
- }
--
-+ int filter_code = archive_filter_code(arch_reader.data(), 0);
-+ ret = archive_write_add_filter(arch_writer.data(), filter_code);
- if (ret != ARCHIVE_OK) {
- emit error(i18nc("@info", "Setting the compression method failed with the following error: <message>%1</message>", QLatin1String(archive_error_string(arch_writer.data()))));
- return false;
-@@ -534,7 +523,7 @@
- return false;
- }
-
-- if (archive_read_support_compression_all(arch_reader.data()) != ARCHIVE_OK) {
-+ if (archive_read_support_filter_all(arch_reader.data()) != ARCHIVE_OK) {
- return false;
- }
-
-@@ -553,35 +542,15 @@
- return false;
- }
-
-- //pax_restricted is the libarchive default, let's go with that.
-- archive_write_set_format_pax_restricted(arch_writer.data());
--
- int ret;
-- switch (archive_compression(arch_reader.data())) {
-- case ARCHIVE_COMPRESSION_GZIP:
-- ret = archive_write_set_compression_gzip(arch_writer.data());
-- break;
-- case ARCHIVE_COMPRESSION_BZIP2:
-- ret = archive_write_set_compression_bzip2(arch_writer.data());
-- break;
--#ifdef HAVE_LIBARCHIVE_XZ_SUPPORT
-- case ARCHIVE_COMPRESSION_XZ:
-- ret = archive_write_set_compression_xz(arch_writer.data());
-- break;
--#endif
--#ifdef HAVE_LIBARCHIVE_LZMA_SUPPORT
-- case ARCHIVE_COMPRESSION_LZMA:
-- ret = archive_write_set_compression_lzma(arch_writer.data());
-- break;
--#endif
-- case ARCHIVE_COMPRESSION_NONE:
-- ret = archive_write_set_compression_none(arch_writer.data());
-- break;
-- default:
-- emit error(i18n("The compression type '%1' is not supported by Ark.", QLatin1String(archive_compression_name(arch_reader.data()))));
-+ int format_code = archive_format(arch_reader.data());
-+ ret = archive_write_set_format(arch_writer.data(), format_code);
-+ if (ret != ARCHIVE_OK) {
-+ emit error(i18nc("@info", "Setting the format failed with the following error: <message>%1</message>", QLatin1String(archive_error_string(arch_writer.data()))));
- return false;
- }
--
-+ int filter_code = archive_filter_code(arch_reader.data(), 0);
-+ ret = archive_write_add_filter(arch_writer.data(), filter_code);
- if (ret != ARCHIVE_OK) {
- emit error(i18nc("@info", "Setting the compression method failed with the following error: <message>%1</message>", QLatin1String(archive_error_string(arch_writer.data()))));
- return false;
-@@ -648,7 +617,7 @@
- }
-
- e[Size] = (qlonglong)archive_entry_size(aentry);
-- e[IsDirectory] = S_ISDIR(archive_entry_mode(aentry));
-+ e[IsDirectory] = (archive_entry_filetype(aentry) == AE_IFDIR);
-
- if (archive_entry_symlink(aentry)) {
- e[Link] = QLatin1String( archive_entry_symlink(aentry) );
--
ark packaging
More information about the pkg-kde-commits
mailing list