Use libmagic for mime type determination

This relates to Bug 656, Bug 661, and others
(cherry picked from commit 8066e87c6c)

kio/CMakeLists.txt

@@ -35,8 +35,6 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES magic DESTINATION ${MIME_INSTALL_DIR} )
-
 install( FILES
     application.desktop kurifilterplugin.desktop
     kcomprfilter.desktop kscan.desktop kdatatool.desktop

kio/Makefile.am

@@ -34,13 +34,10 @@ libkio_la_LIBADD = kssl/libkssl.la kio/libkiocore.la \
 	../kwallet/client/libkwalletclient.la \
 	$(LIBZ) $(LIBFAM) $(LIBVOLMGT) $(ACL_LIBS) $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/dcop/libDCOP.la $(LIB_X11)
 
-kde_mime_DATA = magic
 kde_servicetypes_DATA = application.desktop kurifilterplugin.desktop \
                         kcomprfilter.desktop kscan.desktop kdatatool.desktop \
                         kfileplugin.desktop kcmodule.desktop
 
-EXTRA_DIST = $(kde_mime_DATA)
-
 update_DATA = kioslave.upd
 update_SCRIPTS = useragent.pl proxytype.pl
 updatedir = $(kde_datadir)/kconf_update

kio/kio/CMakeLists.txt

@@ -115,5 +115,5 @@ endif( USE_POSIX_ACL )
 
 tde_add_library( ${target} STATIC_PIC AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK ${GAMIN_LIBRARIES}
+  LINK magic ${GAMIN_LIBRARIES}
 )

kio/kio/kmimemagic.h

@@ -43,7 +43,7 @@ class KMimeMagic; // see below (read this one first)
  * It contains the mimetype and the encoding of
  * the file or buffer read.
  */
-class KIO_EXPORT_DEPRECATED KMimeMagicResult
+class KIO_EXPORT KMimeMagicResult
 {
 public:
   KMimeMagicResult() { m_iAccuracy = 100; }
@@ -98,7 +98,7 @@ protected:
  *
  * The result is contained in the class KMimeMagicResult.
  */
-class KIO_EXPORT_DEPRECATED KMimeMagic
+class KIO_EXPORT KMimeMagic
 {
 public:
   /**

mimetypes/video/x-flv.desktop

@@ -0,0 +1,67 @@
+[Desktop Entry]
+Type=MimeType
+MimeType=video/x-flv
+Icon=video
+Comment=Flash Video
+Comment[ar]=ملف فيديو Flash
+Comment[be]=Відэафайл Flash
+Comment[bg]=Flash видео файл
+Comment[br]=Video Flash
+Comment[bs]=Flash video
+Comment[ca]=Vídeo Flash
+Comment[cs]=Video ve formátu Flash
+Comment[csb]=Film w fòrmace Flash
+Comment[cy]=Fideo Flash
+Comment[el]=Βίντεο Flash
+Comment[eo]=Flash-video
+Comment[es]=Vídeo de Flash
+Comment[et]=Flash videofail
+Comment[eu]=Flash bideoa
+Comment[fa]=ویدیو Flash
+Comment[fi]=Flash-video
+Comment[fr]=Vidéo Flash
+Comment[fy]=Flash Fideo
+Comment[ga]=Físeán Flash
+Comment[gl]=Vídeo Theroa
+Comment[he]=סרט Flash
+Comment[hr]=Flash video
+Comment[hu]=Flash-videó
+Comment[id]=Video Flash
+Comment[is]=Flash kvikmynd
+Comment[it]=Video Flash
+Comment[ja]=Flash ビデオ
+Comment[ka]=Flash ვიდეოფაილი
+Comment[kk]=Flash бейнефайлы
+Comment[km]=Flash វីដេអូ
+Comment[lb]=Flash-Video
+Comment[mk]=Flash-видео
+Comment[mn]=Flash Видео
+Comment[ms]=Video Flash
+Comment[nb]=Flash-video
+Comment[nds]=Flash-Video
+Comment[nl]=Flash-video
+Comment[nn]=Flash-video
+Comment[pa]=Flash ਵੀਡਿਓ
+Comment[pl]=Film w formacie Flash
+Comment[pt]=Vídeo Flash
+Comment[pt_BR]=Vídeo Flash
+Comment[ro]=Fişier video Flash
+Comment[ru]=Видеофайл Flash
+Comment[rw]=Flash Inyerekanamashusho
+Comment[se]=Flash-video
+Comment[sk]=Video Flash
+Comment[sl]=Video Flash
+Comment[sr]=Flash видео
+Comment[sr@Latn]=Flash video
+Comment[sv]=Flash-video
+Comment[tg]=Видеофайли Flash
+Comment[th]=วิดีโอ Flash
+Comment[tr]=Flash Video Dosyası
+Comment[uk]=Відео Flash
+Comment[uz]=Flash video
+Comment[uz@cyrillic]=Flash видео
+Comment[vi]=Ảnh động Flash
+Comment[wa]=Videyo Flash
+Comment[zh_CN]=Flash 文件
+Comment[zh_HK]=Flash 視像檔
+Comment[zh_TW]=Flash 視頻檔案