Attachment 1224 Details for Bug 1493 – tdelibs 3.5.13.2 : add XZ kioslave

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] tdelibs 3.5.13.2 : add XZ kioslave

tdelibs-3.5.13.2-add_xz_kioslave.patch (text/plain), 15.33 KB, created by Francois Andriot on 2013-05-07 16:34:05 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Francois Andriot

Created: 2013-05-07 16:34:05 CDT

Size: 15.33 KB

patch

obsolete

>--- trinity-tdelibs-3.5.13.2~pre55+9977a7c4/CMakeLists.txt.ORI	2013-05-07 23:14:35.374014289 +0200
>+++ trinity-tdelibs-3.5.13.2~pre55+9977a7c4/CMakeLists.txt	2013-05-07 23:14:40.108916663 +0200
>@@ -81,6 +81,7 @@
> OPTION( WITH_INOTIFY "Enable inotify support for kio" ON )
> OPTION( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} )
> OPTION( WITH_SUDO_KDESU_BACKEND "Use sudo as backend for kdesu (default is su)" OFF )
>+OPTION( WITH_LZMA "Enable support for LZMA/XZ" ${WITH_ALL_OPTIONS} )
> 
> OPTION( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} )
> OPTION( WITH_HSPELL "Enable hspell support" ${WITH_ALL_OPTIONS} )
>@@ -652,6 +653,16 @@
> endif( KDEINIT_USE_XFT )
> 
> 
>+##### check for lzma/xz #########################
>+
>+if( WITH_LZMA )
>+  pkg_search_module( LZMA liblzma )
>+  if( NOT LZMA_FOUND )
>+    message(FATAL_ERROR "\nLZMA are requested, but not found on your system" )
>+  endif( NOT LZMA_FOUND )
>+endif( WITH_LZMA )
>+
>+
> ##### check for libart ##########################
> 
> if( WITH_LIBART )
>diff -Nuar trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kioslave.OLD/xz/CMakeLists.txt trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kioslave/xz/CMakeLists.txt
>--- trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kioslave.OLD/xz/CMakeLists.txt	1970-01-01 01:00:00.000000000 +0100
>+++ trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kioslave/xz/CMakeLists.txt	2013-05-07 19:56:40.435702237 +0200
>@@ -0,0 +1,41 @@
>+#################################################
>+#
>+#  (C) 2010 Serghei Amelian
>+#  serghei (DOT) amelian (AT) gmail.com
>+#
>+#  Improvements and feedback are welcome
>+#
>+#  This file is released under GPL >= 2
>+#
>+#################################################
>+
>+include_directories(
>+  ${TQT_INCLUDE_DIRS}
>+  ${CMAKE_BINARY_DIR}/kdecore
>+  ${CMAKE_SOURCE_DIR}/kdecore
>+  ${CMAKE_SOURCE_DIR}/kio/kio
>+)
>+
>+link_directories(
>+  ${TQT_LIBRARY_DIRS}
>+)
>+
>+
>+##### other data ################################
>+
>+install( FILES kxzfilter.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
>+
>+
>+##### kxzfilter ###############################
>+
>+set( target kxzfilter )
>+
>+set( ${target}_SRCS
>+  kxzfilter.cpp
>+)
>+
>+tde_add_kpart( ${target} AUTOMOC
>+  SOURCES ${${target}_SRCS}
>+  LINK kio-shared ${LZMA_LIBRARIES}
>+  DESTINATION ${PLUGIN_INSTALL_DIR}
>+)
>diff -Nuar trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kioslave.OLD/CMakeLists.txt trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kioslave/CMakeLists.txt
>--- trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kioslave.OLD/CMakeLists.txt	2013-05-07 19:57:20.219890461 +0200
>+++ trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kioslave/CMakeLists.txt	2013-05-07 19:57:47.369336565 +0200
>@@ -14,5 +14,6 @@
> add_subdirectory( ftp )
> add_subdirectory( gzip )
> add_subdirectory( bzip2 )
>+tde_conditional_add_subdirectory( WITH_LZMA xz )
> add_subdirectory( metainfo )
> add_subdirectory( iso )
>diff -Nuar trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kioslave.OLD/xz/kxzfilter.cpp trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kioslave/xz/kxzfilter.cpp
>--- trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kioslave.OLD/xz/kxzfilter.cpp	1970-01-01 01:00:00.000000000 +0100
>+++ trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kioslave/xz/kxzfilter.cpp	2013-05-07 19:56:40.435702237 +0200
>@@ -0,0 +1,190 @@
>+/* This file is part of the KDE libraries
>+   Copyright (C) 2007-2008 Per Ãyvind Karlsen <peroyvind@mandriva.org>
>+
>+   Based on kbzip2filter:
>+   Copyright (C) 2000-2005 David Faure <faure@kde.org>
>+
>+   This library is free software; you can redistribute it and/or
>+   modify it under the terms of the GNU Library General Public
>+   License as published by the Free Software Foundation; either
>+   version 2 of the License, or (at your option) any later version.
>+
>+   This library is distributed in the hope that it will be useful,
>+   but WITHOUT ANY WARRANTY; without even the implied warranty of
>+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>+   Library General Public License for more details.
>+
>+   You should have received a copy of the GNU Library General Public License
>+   along with this library; see the file COPYING.LIB.  If not, write to
>+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
>+   Boston, MA 02110-1301, USA.
>+*/
>+
>+#include "kxzfilter.h"
>+#include <klibloader.h>
>+
>+//#include <config-compression.h>
>+#define HAVE_XZ_SUPPORT 1
>+#if HAVE_XZ_SUPPORT
>+extern "C" {
>+	#include <lzma.h>
>+}
>+
>+#include <kdebug.h>
>+
>+#include <qiodevice.h>
>+
>+// #define DEBUG_XZ
>+
>+class KXzFilterFactory : public KLibFactory
>+{
>+public:
>+    KXzFilterFactory() : KLibFactory() {}
>+    virtual ~KXzFilterFactory(){}
>+    TQObject *createObject( TQObject *, const char *, const char*, const TQStringList & )
>+    {
>+        return new KXzFilter;
>+    }
>+};
>+
>+K_EXPORT_COMPONENT_FACTORY( kxzfilter, KXzFilterFactory )
>+
>+
>+class KXzFilter::Private
>+{
>+public:
>+    Private()
>+    : isInitialized(false)
>+    {
>+        memset(&zStream, 0, sizeof(zStream));
>+        mode = 0;
>+    }
>+
>+    lzma_stream zStream;
>+    int mode;
>+    bool isInitialized;
>+};
>+
>+KXzFilter::KXzFilter()
>+    :d(new Private)
>+{
>+}
>+
>+
>+KXzFilter::~KXzFilter()
>+{
>+    delete d;
>+}
>+
>+void KXzFilter::init( int mode )
>+{
>+    if (d->isInitialized) {
>+        terminate();
>+    }
>+  
>+    lzma_ret result;
>+    d->zStream.next_in = 0;
>+    d->zStream.avail_in = 0;
>+    if ( mode == IO_ReadOnly )
>+    {
>+	/* We set the memlimit for decompression to 100MiB which should be
>+	 * more than enough to be sufficient for level 9 which requires 65 MiB.
>+	 */
>+        result = lzma_auto_decoder(&d->zStream, 100<<20, 0);
>+    	//kdDebug(7131) << "lzma_auto_decoder returned " << result;
>+    } else if ( mode == IO_WriteOnly ) {
>+        result = lzma_easy_encoder(&d->zStream, LZMA_PRESET_DEFAULT, LZMA_CHECK_CRC32);
>+    	//kdDebug(7131) << "lzma_easy_encoder returned " << result;
>+    } else
>+        kdWarning(7131) << "Unsupported mode " << mode << ". Only IO_ReadOnly and IO_WriteOnly supported";
>+    d->mode = mode;
>+    d->isInitialized = true;
>+}
>+
>+int KXzFilter::mode() const
>+{
>+    return d->mode;
>+}
>+
>+void KXzFilter::terminate()
>+{
>+    if (d->mode == IO_ReadOnly || d->mode == IO_WriteOnly) {
>+        lzma_end(&d->zStream);
>+    } else {
>+        kdWarning(7131) << "Unsupported mode " << d->mode << ". Only IO_ReadOnly and IO_WriteOnly supported";
>+    }
>+    d->isInitialized = false;
>+}
>+
>+
>+void KXzFilter::reset()
>+{
>+    //kdDebug(7131) << "KXzFilter::reset";
>+    // liblzma doesn't have a reset call...
>+    terminate();
>+    init( d->mode );
>+}
>+
>+void KXzFilter::setOutBuffer( char * data, uint maxlen )
>+{
>+    d->zStream.avail_out = maxlen;
>+    d->zStream.next_out = (uint8_t *)data;
>+}
>+
>+void KXzFilter::setInBuffer( const char *data, unsigned int size )
>+{
>+    d->zStream.avail_in = size;
>+    d->zStream.next_in = (uint8_t *)const_cast<char *>(data);
>+}
>+
>+int KXzFilter::inBufferAvailable() const
>+{
>+    return d->zStream.avail_in;
>+}
>+
>+int KXzFilter::outBufferAvailable() const
>+{
>+    return d->zStream.avail_out;
>+}
>+
>+KXzFilter::Result KXzFilter::uncompress()
>+{
>+    //kdDebug(7131) << "Calling lzma_code with avail_in=" << inBufferAvailable() << " avail_out =" << outBufferAvailable();
>+    lzma_ret result = lzma_code(&d->zStream, LZMA_RUN);
>+    if ( result != LZMA_OK )
>+    {
>+        kdDebug(7131) << "lzma_code returned " << result;
>+        kdDebug(7131) << "KXzFilter::uncompress " << ( result == LZMA_STREAM_END ? END : ERROR );
>+    }
>+
>+    switch (result) {
>+        case LZMA_OK:
>+                return OK;
>+        case LZMA_STREAM_END:
>+                return END;
>+        default:
>+                return ERROR;
>+    }
>+}
>+
>+KXzFilter::Result KXzFilter::compress( bool finish )
>+{
>+    //kdDebug(7131) << "Calling lzma_code with avail_in=" << inBufferAvailable() << " avail_out=" << outBufferAvailable();
>+    lzma_ret result = lzma_code(&d->zStream, finish ? LZMA_FINISH : LZMA_RUN );
>+
>+    switch (result) {
>+        case LZMA_OK:
>+                return OK;
>+                break;
>+        case LZMA_STREAM_END:
>+                kdDebug(7131) << "  lzma_code returned " << result;
>+                return END;
>+		break;
>+        default:
>+                kdDebug(7131) << "  lzma_code returned " << result;
>+                return ERROR;
>+                break;
>+    }
>+}
>+
>+#endif  /* HAVE_XZ_SUPPORT */
>diff -Nuar trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kioslave.OLD/xz/kxzfilter.desktop trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kioslave/xz/kxzfilter.desktop
>--- trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kioslave.OLD/xz/kxzfilter.desktop	1970-01-01 01:00:00.000000000 +0100
>+++ trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kioslave/xz/kxzfilter.desktop	2013-05-07 19:56:40.435702237 +0200
>@@ -0,0 +1,86 @@
>+[Desktop Entry]
>+Type=Service
>+Name=XZ Filter
>+Name[af]=XZ Filter
>+Name[ar]=ÙÙØªØ± XZ
>+Name[az]=XZ Filtri
>+Name[be]=Ð¤ÑÐ»ÑÑÑ XZ
>+Name[bg]=Ð¤Ð¸Ð»ÑÑÑ XZ
>+Name[bn]=à¦à¦¿-à¦à¦¿à¦ª (XZ) à¦«à¦¿à¦²à§à¦à¦¾à¦°
>+Name[br]=Sil XZ
>+Name[ca]=Filtre XZ
>+Name[cs]=Filtr XZ
>+Name[csb]=Filter XZ
>+Name[cy]=Hidl XZ
>+Name[da]=XZ-filter
>+Name[de]=XZ-Filter
>+Name[el]=Î¦Î¯Î»ÏÏÎ¿ XZ
>+Name[eo]=XZ-filtrilo
>+Name[es]=Filtro XZ
>+Name[et]=XZ filter
>+Name[eu]=XZ iragazkia
>+Name[fa]=Ù¾Ø§ÙØ§ÛÛ XZ
>+Name[fi]=XZ-suodin
>+Name[fr]=Filtre XZ
>+Name[fy]=XZ-filter
>+Name[ga]=Scagaire XZ
>+Name[gl]=Filtro XZ
>+Name[he]=××¡× × XZ
>+Name[hi]=XZ à¤«à¤¼à¤¿à¤²à¥à¤à¤°
>+Name[hr]=XZ filtar
>+Name[hu]=XZ szÅ±rÅ
>+Name[id]=Filter XZ
>+Name[is]=XZ sÃa
>+Name[it]=Filtro XZ
>+Name[ja]=XZ ãã£ã«ã¿
>+Name[ka]=XZ á¤ááá¢á á
>+Name[kk]=XZ ÑÒ¯Ð·Ð³ÑÑÑ
>+Name[km]=ááááá XZ
>+Name[ko]=XZ ê±°ë¥´ê°
>+Name[lb]=XZ-Filter
>+Name[lt]=XZ filtras
>+Name[lv]=XZ Filtrs
>+Name[mk]=XZ ÑÐ¸Ð»ÑÐµÑ
>+Name[mn]=XZ-Filter
>+Name[ms]=Penapis XZ
>+Name[mt]=Filtru XZ
>+Name[nb]=XZ-filter
>+Name[nds]=XZ-Filter
>+Name[ne]=XZ à¤«à¤¿à¤²à¥à¤à¤°
>+Name[nl]=XZ-filter
>+Name[nn]=XZ-filter
>+Name[nso]=Sesekodi sa XZ
>+Name[pa]=XZ à¨«à¨¿à¨²à¨à¨°
>+Name[pl]=Filtr XZ
>+Name[pt]=Filtro XZ
>+Name[pt_BR]=Filtro XZ
>+Name[ro]=Filtru XZ
>+Name[ru]=Ð¤Ð¸Ð»ÑÑÑ XZ
>+Name[rw]=Muyunguruzi XZ 
>+Name[se]=XZ-filter
>+Name[sk]=XZ filter
>+Name[sl]=Filter za XZ
>+Name[sq]=Filteri XZ
>+Name[sr]=XZ ÑÐ¸Ð»ÑÐµÑ
>+Name[sr@Latn]=XZ filter
>+Name[ss]=Sisefo se XZ 
>+Name[sv]=XZ-filter
>+Name[ta]=XZ à®µà®à®¿à®à®à¯à®à®¿
>+Name[te]=à°à°¿à°à°¿à°ªà± à°à°²à°¨à°¿
>+Name[tg]=Ð¢Ð°ÑÐ¾Ð²Ð¸ÑÐ¸ XZ
>+Name[th]=à¸à¸±à¸§à¸à¸£à¸à¸ XZ
>+Name[tr]=XZ Filtresi
>+Name[tt]=XZ SÃ¶zgeÃ§e
>+Name[uk]=Ð¤ÑÐ»ÑÑÑ XZ
>+Name[uz]=XZ-filter
>+Name[uz@cyrillic]=XZ-ÑÐ¸Ð»ÑÐµÑ
>+Name[ven]=Filithara ya XZ
>+Name[vi]=Bá» lá»c XZ
>+Name[wa]=Passete XZ
>+Name[xh]=Isihluzi se XZ
>+Name[zh_CN]=XZ è¿æ»¤ç¨åº
>+Name[zh_HK]=XZ éæ¿¾å¨
>+Name[zh_TW]=XZ éæ¿¾å¨
>+Name[zu]=Ihluzo le-XZ
>+X-KDE-Library=kxzfilter
>+ServiceTypes=KDECompressionFilter,application/x-xz,application/x-txz,application/x-lzma
>diff -Nuar trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kioslave.OLD/xz/kxzfilter.h trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kioslave/xz/kxzfilter.h
>--- trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kioslave.OLD/xz/kxzfilter.h	1970-01-01 01:00:00.000000000 +0100
>+++ trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kioslave/xz/kxzfilter.h	2013-05-07 19:56:40.435702237 +0200
>@@ -0,0 +1,61 @@
>+/* This file is part of the KDE libraries
>+   Copyright (C) 2007-2008 Per Ãyvind Karlsen <peroyvind@mandriva.org>
>+
>+   Based on kbzip2filter:
>+   Copyright (C) 2000 David Faure <faure@kde.org>
>+
>+   This library is free software; you can redistribute it and/or
>+   modify it under the terms of the GNU Library General Public
>+   License as published by the Free Software Foundation; either
>+   version 2 of the License, or (at your option) any later version.
>+
>+   This library is distributed in the hope that it will be useful,
>+   but WITHOUT ANY WARRANTY; without even the implied warranty of
>+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
>+   Library General Public License for more details.
>+
>+   You should have received a copy of the GNU Library General Public License
>+   along with this library; see the file COPYING.LIB.  If not, write to
>+   the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
>+   Boston, MA 02110-1301, USA.
>+*/
>+
>+#ifndef KXZFILTER_H
>+#define KXZFILTER_H
>+
>+//#include <config-compression.h>
>+#define HAVE_XZ_SUPPORT 1
>+#if HAVE_XZ_SUPPORT
>+
>+#include "kfilterbase.h"
>+
>+/**
>+ * Internal class used by KFilterDev
>+ * @internal
>+ */
>+class KXzFilter : public KFilterBase
>+{
>+public:
>+    KXzFilter();
>+    virtual ~KXzFilter();
>+
>+    virtual void init( int );
>+    virtual int mode() const;
>+    virtual void terminate();
>+    virtual void reset();
>+    virtual bool readHeader() { return true; } // lzma handles it by itself ! Cool !
>+    virtual bool writeHeader( const TQCString & ) { return true; }
>+    virtual void setOutBuffer( char * data, uint maxlen );
>+    virtual void setInBuffer( const char * data, uint size );
>+    virtual int  inBufferAvailable() const;
>+    virtual int  outBufferAvailable() const;
>+    virtual Result uncompress();
>+    virtual Result compress( bool finish );
>+private:
>+    class Private;
>+    Private* const d;
>+};
>+
>+#endif
>+
>+#endif // KXZFILTER_H
>--- trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kio/magic.ORI	2013-05-07 21:12:45.166723545 +0200
>+++ trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kio/magic	2013-05-07 21:19:20.349106647 +0200
>@@ -484,6 +484,9 @@
> # ACE archive
> 7      string        **ACE**     application/x-ace
> 
>+# XZ
>+0	string           \0fd\037\07a\058\05a\000             application/x-xz
>+
> 
> #------------------------------------------------------------------------------
> # frame:  file(1) magic for FrameMaker files
>--- trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kdecore/kurl.cpp.ORI	2013-05-07 21:52:49.777818299 +0200
>+++ trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kdecore/kurl.cpp	2013-05-07 21:53:05.768458028 +0200
>@@ -1456,6 +1456,10 @@
>      return true;
>   if (m_strRef_encoded.startsWith("zip:"))
>      return true;
>+  if (m_strRef_encoded.startsWith("lzma:"))
>+     return true;
>+  if (m_strRef_encoded.startsWith("xz:"))
>+     return true;
>   if ( m_strProtocol == "error" ) // anything that starts with error: has suburls
>      return true;
>   return false;
>--- trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kdecore/kdebug.areas.ORI	2013-05-07 22:03:00.005110000 +0200
>+++ trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kdecore/kdebug.areas	2013-05-07 22:03:46.491068977 +0200
>@@ -289,6 +289,7 @@
> 7126        kio_devices
> 7127        kio_fish
> 7128        kio_svn
>+7131        kio_xz
> 
> # kdesdk
> 8100        kompare
>--- trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kio/tests/kfiltertest.cpp.ORI	2013-05-07 22:24:58.919079810 +0200
>+++ trinity-tdelibs-3.5.13.2~pre55+9977a7c4/kio/tests/kfiltertest.cpp	2013-05-07 22:27:33.602489423 +0200
>@@ -94,11 +94,14 @@
>     getcwd( currentdir, PATH_MAX );
>     TQString pathgz = TQFile::decodeName(currentdir) + "/test.gz";
>     TQString pathbz2 = TQFile::decodeName(currentdir) + "/test.bz2";
>+    TQString pathxz = TQFile::decodeName(currentdir) + "/test.xz";
> 
>     kdDebug() << " -- test_block_write gzip -- " << endl;
>     test_block_write(pathgz);
>     kdDebug() << " -- test_block_write bzip2 -- " << endl;
>     test_block_write(pathbz2);
>+    kdDebug() << " -- test_block_write xz -- " << endl;
>+    test_block_write(pathxz);
> 
>     kdDebug() << " -- test_block gzip -- " << endl;
>     test_block(pathgz);
>@@ -114,5 +117,12 @@
>     kdDebug() << " -- test_textstream bzip2 -- " << endl;
>     test_textstream(pathbz2);
> 
>+    kdDebug() << " -- test_block xz -- " << endl;
>+    test_block(pathxz);
>+    kdDebug() << " -- test_getch xz -- " << endl;
>+    test_getch(pathxz);
>+    kdDebug() << " -- test_textstream xz -- " << endl;
>+    test_textstream(pathxz);
>+
>     return 0;
> }

Actions: View | Diff

Attachments on bug 1493: 1209 | 1223 | 1224