From kde-release-team  Tue May 12 16:13:12 2009
From: Helio Chissini de Castro <helio () kde ! org>
Date: Tue, 12 May 2009 16:13:12 +0000
To: kde-release-team
Subject: Re: kdebase runtime ioslave freeze exemption request
Message-Id: <200905121313.12891.helio () kde ! org>
X-MARC-Message: https://marc.info/?l=kde-release-team&m=124214485707072
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--Boundary-00=_YAaCKkV8z09Df+j"

--Boundary-00=_YAaCKkV8z09Df+j
Content-Type: Text/Plain;
  charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Em Segunda-feira 11 de maio 2009, =C3=A0s 19:55:05, voc=C3=AA escreveu:
> I haven't checked the documentaton, but for the code:
> > Index: kioslave/man/kio_man.cpp
> > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> > --- kioslave/man/kio_man.cpp    (revis=C3=A3o 966710)
> > +++ kioslave/man/kio_man.cpp    (c=C3=B3pia de trabalho)
> > @@ -70,6 +70,10 @@
> >          pos -=3D 4;
> >      else if ( name->indexOf(".bz", -3) !=3D -1 )
> >          pos -=3D 3;
> > +    else if ( name->indexOf(".lzma", -5) !=3D -1 )
> > +        pos -=3D 5;
> > +    else if ( name->indexOf(".xz", -3) !=3D -1 )
> > +        pos -=3D 3;
> > =20
> >      if ( pos > 0 )
> >          pos =3D name->lastIndexOf('.', pos-1);
> > @@ -1317,6 +1321,10 @@
> >             end -=3D 2;
> >         else if ( len >=3D 4 && strcmp( end-3, ".bz2" ) =3D=3D 0 )
> >             end -=3D 4;
> > +    else if ( len >=3D 4 && strcmp( end-4, ".lzma" ) =3D=3D 0 )
>
> You meant len >=3D5

=46ixed in new patch


> > +        end -=3D 5;
> > +    else if ( len >=3D 3 && strcmp( end-2, ".xz" ) =3D=3D 0 )
> > +        end -=3D 3;
> > =20
> >         while ( end >=3D begin && *end !=3D '.' )
> >             end--;
>
> And check for identation problems.

=46ixed in new patch attached

=2D-=20
Helio Chissini de Castro
KDE Developer
Brasil/South America Primary Contact

--Boundary-00=_YAaCKkV8z09Df+j
Content-Type: text/x-patch;
  charset="UTF-8";
  name="kdebase-runtime-lzma-ioslave-trunk.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="kdebase-runtime-lzma-ioslave-trunk.patch"

Index: doc/kioslave/xz/index.docbook
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- doc/kioslave/xz/index.docbook	(revis=C3=A3o 0)
+++ doc/kioslave/xz/index.docbook	(revis=C3=A3o 0)
@@ -0,0 +1,37 @@
+<?xml version=3D"1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1/=
/EN"
+"dtd/kdex.dtd" [
+<!ENTITY % addindex "IGNORE">
+<!ENTITY % English "INCLUDE" > <!-- change language only here -->
+]>
+=09
+<article lang=3D"&language;" id=3D"xz">
+<title>xz / lzma</title>
+<articleinfo>
+<authorgroup>
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+</articleinfo>
+
+<para>Xz is a compression program</para>
+
+<para>The xz kioslave is not directly usable, and is intended for use
+as a filter.  For example, the tar kioslave can filter a file through
+the xz kioslave, in order to display the contents of a <literal
+role=3D"extension">tar.lzma</literal> or <literal role=3D"extension">tar.xz
+</literal> file directly in a &konqueror; window.</para>
+
+<para>If you click on a file compressed with a <literal
+role=3D"extension">.lzma</literal> or <literal role=3D"extension">tar.xz
+</literal> in &konqueror;, this kioslave is used to
+uncompress it and display it as a normal (uncompressed) file.</para>
+
+<para>If you are a developer, and would like to use the xz filter,
+you can find documentation on using kioslaves at <ulink
+url=3D"http://developer.kde.org">http://developer.kde.org</ulink></para>
+
+<para> See the manual: <ulink url=3D"man:/xz">xz</ulink>.
+</para>
+
+</article>
Index: doc/kioslave/xz/CMakeLists.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- doc/kioslave/xz/CMakeLists.txt	(revis=C3=A3o 0)
+++ doc/kioslave/xz/CMakeLists.txt	(revis=C3=A3o 0)
@@ -0,0 +1,3 @@
+########### install files ###############
+kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}=
/en SUBDIR kioslave/xz)
+

Mudan=C3=A7as de propriedades em: doc/kioslave/xz/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
   + native

Index: kioslave/filter/xz.protocol
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- kioslave/filter/xz.protocol	(revis=C3=A3o 0)
+++ kioslave/filter/xz.protocol	(revis=C3=A3o 0)
@@ -0,0 +1,11 @@
+[Protocol]
+exec=3Dkio_filter
+protocol=3Dxz
+archiveMimetype=3Dapplication/x-xz
+determineMimetypeFromExtension=3Dfalse
+input=3Dstream
+output=3Dstream
+reading=3Dtrue
+source=3Dfalse
+DocPath=3Dkioslave/xz.html
+Icon=3Dpackage-x-generic
Index: kioslave/filter/lzma.protocol
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- kioslave/filter/lzma.protocol	(revis=C3=A3o 0)
+++ kioslave/filter/lzma.protocol	(revis=C3=A3o 0)
@@ -0,0 +1,11 @@
+[Protocol]
+exec=3Dkio_filter
+protocol=3Dlzma
+archiveMimetype=3Dapplication/x-lzma
+determineMimetypeFromExtension=3Dtrue
+input=3Dstream
+output=3Dstream
+reading=3Dtrue
+source=3Dfalse
+DocPath=3Dkioslave/xz.html
+Icon=3Dpackage-x-generic
Index: kioslave/filter/CMakeLists.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- kioslave/filter/CMakeLists.txt	(revis=C3=A3o 966970)
+++ kioslave/filter/CMakeLists.txt	(c=C3=B3pia de trabalho)
@@ -2,6 +2,9 @@
 macro_optional_find_package(BZip2)
 macro_log_feature(BZIP2_FOUND "BZip2" "A high-quality data compressor" "ht=
tp://www.bzip.org" FALSE "" "Provides the ability to read and write bzip2 c=
ompressed data files in the filter kioslave.")
=20
+macro_optional_find_package(LibLZMA)
+macro_log_feature(LIBLZMA_FOUND "LZMA/XZ" "A very high compression ratio d=
ata compressor" "http://tukaani.org/xz/" FALSE "" "Provides the ability to =
read and write xz compressed data files.")
+
 ########### next target ###############
=20
 set(kio_filter_PART_SRCS filter.cc )
@@ -22,3 +25,6 @@
 install( FILES bzip.protocol bzip2.protocol  DESTINATION  ${SERVICES_INSTA=
LL_DIR} )
 endif(BZIP2_FOUND)
=20
+if(LIBLZMA_FOUND)
+install( FILES lzma.protocol xz.protocol  DESTINATION  ${SERVICES_INSTALL_=
DIR} )
+endif(LIBLZMA_FOUND)
Index: kioslave/info/kde-info2html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- kioslave/info/kde-info2html	(revis=C3=A3o 966970)
+++ kioslave/info/kde-info2html	(c=C3=B3pia de trabalho)
@@ -39,6 +39,10 @@
 #   March 9 2003      Add support for browsing by file. by Luis Pedro Coel=
ho
 #   June  11 2003     Update the layout of the sides to the new infopagesl=
ayout.
 #                     by Sven Leiber <s.leiber@web.de>
+#   July  22 2008     Add support for lzma.
+#                     by Per =C3=98yvind Karlsen <peroyvind@mandriva.org>
+#   January 8 2009    Update lzma support for new xz tool and format.
+#                     by Per =C3=98yvind Karlsen <peroyvind@mandriva.org>
 #
 #-------------------------------------------------------
=20
@@ -147,6 +151,10 @@
 	if ($DirFileName =3D~ m/.info.bz2$/ ) {
 		open DIR, "-|", "bzcat", $DirFileName;
 	}
+	elsif ($DirFileName =3D~ m/.info.(lzma|xz)$/ ) {
+		open DIR, "-|", "xzcat", $DirFileName;
+	}
+
 	elsif ($DirFileName =3D~ m/.info.gz$/ ) {
 		open DIR, "-|", "gzip", "-dc", $DirFileName;
 	}
@@ -256,6 +264,9 @@
 			if ($infofile =3D~ m/.info.bz2$/ ) {
 				open INFOFILE, "-|", "bzcat", "$dir/$infofile";
 			}
+			elsif ($infofile =3D~ m/.info.(lzma|xz)$/ ) {
+				open INFOFILE, "-|", "xzcat", "$dir/$infofile";
+			}
 			elsif ($infofile =3D~ m/.info.gz$/ ) {
 				open INFOFILE, "-|", "gzip", "-dc", "$dir/$infofile";
 			}
@@ -434,6 +445,8 @@
     open FH1, "-|", "gunzip", "-q", "-d", "-c", $FileName || &DieFileNotFo=
und($FileName);
   } elsif ($FileName =3D~ /\.bz2$/) {
     open FH1, "-|", "bunzip2", "-q", "-d", "-c", $FileName || &DieFileNotF=
ound($FileName);
+  } elsif ($FileName =3D~ /\.(lzma|xz)$/) {
+    open FH1, "-|", "unxz", "-q", "-d", "-c", $FileName || &DieFileNotFoun=
d($FileName);
   } else {
     open(FH1, $FileName) || &DieFileNotFound($FileName);
   }
@@ -480,6 +493,8 @@
     open FH, "-|", "gunzip", "-q", "-d", "-c", $FileName || &DieFileNotFou=
nd($FileName);
   } elsif ($FileName =3D~ /\.bz2$/) {
     open FH, "-|", "bunzip2", "-q", "-d", "-c", $FileName || &DieFileNotFo=
und($FileName);
+  } elsif ($FileName =3D~ /\.(lzma|xz)$/) {
+    open FH, "-|", "unxz", "-q", "-d", "-c", $FileName || &DieFileNotFound=
($FileName);
   } else {
     open FH, $FileName || &DieFileNotFound($FileName);
   }
@@ -776,6 +791,8 @@
     open FH2, "-|", "gunzip", "-q", "-d", "-c", $FileName || &DieFileNotFo=
und($FileName);
   } elsif ($FileName =3D~ /\.bz2$/) {
     open FH2, "-|", "bunzip2", "-q", "-d", "-c", $FileName || &DieFileNotF=
ound($FileName);
+  } elsif ($FileName =3D~ /\.(lzma|xz)$/) {
+    open FH2, "-|", "unxz", "-q", "-d", "-c", $FileName || &DieFileNotFoun=
d($FileName);
   } else {
     open FH2, $FileName || &DieFileNotFound($FileName);
   }
@@ -1005,17 +1022,23 @@
     foreach my $Name ($File, $Alt) {
         my $gzName  =3D $Name . '.gz';
         my $bz2Name =3D $Name . '.bz2';
+        my $lzmaName =3D $Name . '.lzma';
+        my $xzName =3D $Name . '.xz';
=20
         foreach (@info2html::config::INFODIR) {
             return "$_/$Name"    if -e "$_/$Name";
             return "$_/$gzName"  if -e "$_/$gzName";
             return "$_/$bz2Name" if -e "$_/$bz2Name";
+            return "$_/$lzmaName" if -e "$_/$lzmaName";
+            return "$_/$xzName" if -e "$_/$xzName";
         }
         next unless $ENV{INFOPATH};
         foreach my $i (split(/:/, $ENV{INFOPATH})) {
             return "$i/$Name"    if -e "$i/$Name";
             return "$i/$gzName"  if -e "$i/$gzName";
             return "$i/$bz2Name" if -e "$i/$bz2Name";
+            return "$i/$lzmaName" if -e "$i/$lzmaName";
+            return "$i/$xzName" if -e "$i/$xzName";
         }
     }
     return "";
Index: kioslave/man/kio_man.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- kioslave/man/kio_man.cpp	(revis=C3=A3o 966970)
+++ kioslave/man/kio_man.cpp	(c=C3=B3pia de trabalho)
@@ -70,6 +70,10 @@
         pos -=3D 4;
     else if ( name->indexOf(".bz", -3) !=3D -1 )
         pos -=3D 3;
+    else if ( name->indexOf(".lzma", -5) !=3D -1 )
+        pos -=3D 5;
+    else if ( name->indexOf(".xz", -3) !=3D -1 )
+        pos -=3D 3;
=20
     if ( pos > 0 )
         pos =3D name->lastIndexOf('.', pos-1);
@@ -1317,6 +1321,10 @@
 	    end -=3D 2;
 	else if ( len >=3D 4 && strcmp( end-3, ".bz2" ) =3D=3D 0 )
 	    end -=3D 4;
+	else if ( len >=3D 5 && strcmp( end-4, ".lzma" ) =3D=3D 0 )
+	    end -=3D 5;
+	else if ( len >=3D 3 && strcmp( end-2, ".xz" ) =3D=3D 0 )
+	    end -=3D 3;
=20
 	while ( end >=3D begin && *end !=3D '.' )
 	    end--;
Index: nepomuk/strigibackend/sopranoindexwriter.cpp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=2D-- nepomuk/strigibackend/sopranoindexwriter.cpp	(revis=C3=A3o 966970)
+++ nepomuk/strigibackend/sopranoindexwriter.cpp	(c=C3=B3pia de trabalho)
@@ -90,7 +90,9 @@
             if ( QFile::exists( archivePath ) ) {
                 if ( archivePath.endsWith( QLatin1String( ".tar" ) ) ||
                      archivePath.endsWith( QLatin1String( ".tar.gz" ) ) ||
=2D                     archivePath.endsWith( QLatin1String( ".tar.bz2" ) )=
 ) {
+                     archivePath.endsWith( QLatin1String( ".tar.bz2" ) ) ||
+                     archivePath.endsWith( QLatin1String( ".tar.lzma" ) ) =
||
+                     archivePath.endsWith( QLatin1String( ".tar.xz" ) ) ) {
                     uri.setScheme( "tar" );
                 }
                 else if ( archivePath.endsWith( QLatin1String( ".zip" ) ) =
) {

--Boundary-00=_YAaCKkV8z09Df+j
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
release-team mailing list
release-team@kde.org
https://mail.kde.org/mailman/listinfo/release-team

--Boundary-00=_YAaCKkV8z09Df+j--