[SCM] ark packaging branch, master, updated. debian/14.12.3-1-26-gcb29390
Maximiliano Curia
maxy at moszumanska.debian.org
Sun Sep 6 19:17:19 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ark.git;a=commitdiff;h=720b021
The following commit has been merged in the master branch:
commit 720b021b22eb079df0aae49c8d6435bd07fec6fa
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Sun Sep 6 11:41:53 2015 +0200
Drop patch update_libarchive_support, upstream updated it in a different way.
---
debian/patches/series | 1 -
debian/patches/update_libarchive_support | 371 -------------------------------
2 files changed, 372 deletions(-)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9293ad0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-update_libarchive_support
diff --git a/debian/patches/update_libarchive_support b/debian/patches/update_libarchive_support
deleted file mode 100644
index ebe61f2..0000000
--- a/debian/patches/update_libarchive_support
+++ /dev/null
@@ -1,371 +0,0 @@
-Author: Maximiliano Curia <maxy at debian.org>
-Date: Thu Feb 27 11:25:38 2014 +0100
-
- Update libarchive support
-
-Index: ark-15.04.3/plugins/libarchive/libarchivehandler.cpp
-===================================================================
---- ark-15.04.3.orig/plugins/libarchive/libarchivehandler.cpp 2015-05-29 07:56:31.000000000 +0200
-+++ ark-15.04.3/plugins/libarchive/libarchivehandler.cpp 2015-07-10 12:40:52.100767803 +0200
-@@ -65,7 +65,7 @@
- static inline void cleanup(struct archive *a)
- {
- if (a) {
-- archive_read_finish(a);
-+ archive_read_free(a);
- }
- }
- };
-@@ -75,7 +75,7 @@
- static inline void cleanup(struct archive *a)
- {
- if (a) {
-- archive_write_finish(a);
-+ archive_write_free(a);
- }
- }
- };
-@@ -106,7 +106,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;
- }
-
-@@ -124,7 +124,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) {
-@@ -172,7 +172,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;
- }
-
-@@ -225,7 +225,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) {
-@@ -370,7 +370,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;
- }
-
-@@ -378,7 +378,10 @@
- return false;
- }
-
-- if (archive_read_open_filename(arch_reader.data(), QFile::encodeName(filename()), 10240) != ARCHIVE_OK) {
-+ if (ARCHIVE_OK != archive_read_open_filename(
-+ arch_reader.data(),
-+ QFile::encodeName(filename()),
-+ 10240)) {
- emit error(i18n("The source file could not be read."));
- return false;
- }
-@@ -399,33 +402,40 @@
- 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) {
-+ // Format
-+ if (filename().right(4).toUpper() == QLatin1String( ".ZIP" )) {
-+ kDebug() << "Detected zip format for new file";
-+ ret = archive_write_set_format_zip(arch_writer.data());
-+ } else {
-+ //pax_restricted is the libarchive default, let's go with that.
-+ ret = archive_write_set_format_pax_restricted(arch_writer.data());
-+ }
-+ // Filter
- if (filename().right(2).toUpper() == QLatin1String( "GZ" )) {
- kDebug() << "Detected gzip compression for new file";
-- ret = archive_write_set_compression_gzip(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());
-+ 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());
-+ 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());
-+ 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());
-+ } else if (filename().right(4).toUpper() == QLatin1String( ".ZIP" )) {
-+ // No filter for zip files
- } else {
- kDebug() << "Falling back to gzip";
-- ret = archive_write_set_compression_gzip(arch_writer.data());
-+ ret = archive_write_add_filter_gzip(arch_writer.data());
- }
-
- if (ret != ARCHIVE_OK) {
-@@ -434,36 +444,39 @@
-
- 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()))));
-+ }
-+
-+ struct archive_entry *entry;
-+ int first_entry_ret;
-+ if (!creatingNewFile) {
-+
-+ // Read first entry to have the format
-+ first_entry_ret = archive_read_next_header(arch_reader.data(), &entry);
-+ if ((ARCHIVE_OK != first_entry_ret) &&
-+ (ARCHIVE_EOF != first_entry_ret)) {
-+ 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;
- }
--
-+ 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 compression method 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 (ARCHIVE_OK != ret) {
-+ 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;
-+ }
- }
-
- ret = archive_write_open_fd(arch_writer.data(), tempFile->handle());
-@@ -509,13 +522,12 @@
- }
- }
-
-- struct archive_entry *entry;
--
- //and if we have old elements...
-- if (!creatingNewFile) {
-+ if ((!creatingNewFile) && (first_entry_ret == ARCHIVE_OK)) {
- //********** copy old elements from previous archive to new archive
-- while (archive_read_next_header(arch_reader.data(), &entry) == ARCHIVE_OK) {
-- if (m_writtenFiles.contains(QFile::decodeName(archive_entry_pathname(entry)))) {
-+ do {
-+ if (m_writtenFiles.contains(
-+ QFile::decodeName(archive_entry_pathname(entry)))) {
- archive_read_data_skip(arch_reader.data());
- kDebug() << "Entry already existing, will be refresh: ===> " << archive_entry_pathname(entry);
- continue;
-@@ -533,7 +545,8 @@
- }
-
- archive_entry_clear(entry);
-- }
-+ } while (ARCHIVE_OK == archive_read_next_header(arch_reader.data(),
-+ &entry));
- }
-
- // In the success case, we need to manually close the archive_writer before
-@@ -555,7 +568,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;
- }
-
-@@ -563,7 +576,9 @@
- return false;
- }
-
-- if (archive_read_open_filename(arch_reader.data(), QFile::encodeName(filename()), 10240) != ARCHIVE_OK) {
-+ if (ARCHIVE_OK != archive_read_open_filename(arch_reader.data(),
-+ QFile::encodeName(filename()),
-+ 10240)) {
- emit error(i18n("The source file could not be read."));
- return false;
- }
-@@ -583,50 +598,49 @@
- 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()))));
-- return false;
-- }
--
-- 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()))));
-+ int filter_code = archive_filter_code(arch_reader.data(), 0);
-+ ret = archive_write_add_filter(arch_writer.data(), filter_code);
-+ if (ARCHIVE_OK != ret) {
-+ 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;
- }
--
-- ret = archive_write_open_fd(arch_writer.data(), tempFile->handle());
-- if (ret != ARCHIVE_OK) {
-- emit error(i18nc("@info", "Opening the archive for writing failed with the following error: <message>%1</message>", QLatin1String(archive_error_string(arch_writer.data()))));
-- return false;
-- }
--
-+ int format_code;
- struct archive_entry *entry;
--
-- //********** copy old elements from previous archive to new archive
-- while (archive_read_next_header(arch_reader.data(), &entry) == ARCHIVE_OK) {
-+ bool writer_opened = false;
-+ while (ARCHIVE_OK ==
-+ (ret = archive_read_next_header(arch_reader.data(), &entry))) {
-+ int new_format = archive_format(arch_reader.data());
-+ if ((!writer_opened) || (format_code != new_format)) {
-+ format_code = new_format;
-+ 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;
-+ }
-+ }
-+ if (!writer_opened) {
-+ ret = archive_write_open_fd(arch_writer.data(), tempFile->handle());
-+ if (ret != ARCHIVE_OK) {
-+ emit error(i18nc(
-+ "@info",
-+ "Opening the archive for writing failed with the "
-+ "following error: <message>%1</message>",
-+ QLatin1String(archive_error_string(arch_writer.data()))));
-+ return false;
-+ }
-+ writer_opened = true;
-+ }
-+ // Add the old files
- if (files.contains(QFile::decodeName(archive_entry_pathname(entry)))) {
- archive_read_data_skip(arch_reader.data());
- kDebug() << "Entry to be deleted, skipping"
-@@ -634,17 +648,20 @@
- emit entryRemoved(QFile::decodeName(archive_entry_pathname(entry)));
- continue;
- }
--
- int header_response;
-- //kDebug() << "Writing entry " << fn;
-- if ((header_response = archive_write_header(arch_writer.data(), entry)) == ARCHIVE_OK) {
-+ if (ARCHIVE_OK ==
-+ (header_response = archive_write_header(arch_writer.data(),
-+ entry))) {
- //if the whole archive is extracted and the total filesize is
- //available, we use partial progress
- copyData(arch_reader.data(), arch_writer.data(), false);
- } else {
-- kDebug() << "Writing header failed with error code " << header_response;
-+ kDebug() << "Writing header failed with error code "
-+ << header_response;
- return false;
- }
-+
-+ archive_entry_clear(entry);
- }
-
- // In the success case, we need to manually close the archive_writer before
-@@ -680,7 +697,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