Merge pull request #3 from Ray-V/TDE-bug-2043-patch-1

Added files via upload
pull/2/head
Justin_U 9 years ago
commit 6fb14fec30

@ -0,0 +1,46 @@
--- konq-plugins/arkplugin/arkplugin.cpp-original 2015-09-23 04:07:12.000000000 +0100
+++ konq-plugins/arkplugin/arkplugin.cpp 2016-03-09 17:43:02.427341264 +0000
@@ -304,10 +304,7 @@
if ( havegz )
m_archiveMimeTypes << "application/x-tgz";
if ( havebz2 )
- {
m_archiveMimeTypes << "application/x-tbz";
- m_archiveMimeTypes << "application/x-tbz2";
- }
if ( havelzop )
m_archiveMimeTypes << "application/x-tzo";
if ( havelzma )
@@ -379,14 +376,14 @@
if ( !TDEStandardDirs::findExe( "lzma" ).isNull() )
{
havelzma = true;
- m_archiveMimeTypes << "application/x-lzma";
+ m_extractMimeTypes << "application/x-lzma";
}
bool havexz = false;
if ( !TDEStandardDirs::findExe( "xz" ).isNull() )
{
havexz = true;
- m_archiveMimeTypes << "application/x-xz";
+ m_extractMimeTypes << "application/x-xz";
}
if ( !TDEStandardDirs::findExe( "tar" ).isNull() )
@@ -395,14 +392,11 @@
if ( havegz )
m_extractMimeTypes << "application/x-tgz";
if ( havebz2 )
- {
m_extractMimeTypes << "application/x-tbz";
- m_extractMimeTypes << "application/x-tbz2";
- }
if ( havelzop )
m_extractMimeTypes << "application/x-tzo";
if ( havelzma )
- m_extractMimeTypes << "application/x-lzma";
+ m_extractMimeTypes << "application/x-tlz";
if ( havexz )
m_extractMimeTypes << "application/x-txz";
}

@ -131,7 +131,7 @@ echo "Extracting the source archive(s) for $PRGNAM..."
bsdtar -xvf ${SOURCE}
cd ${PRGNAM}
patch -p0 < $SRCDIR/arkplugin-diffs-1
chown -R root:root .
chmod -R u+w,go+r-w,a+rX-st .

Loading…
Cancel
Save