Ticket #40701: macports-recoll-1.19.7.diff

File macports-recoll-1.19.7.diff, 27.8 KB (added by medoc92 (Jean-Francois Dockes), 11 years ago)

  • Portfile 

    diff -ruN macports-release-recoll/Portfile recoll/Portfile
    old new  
    11# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
    2 # $Id: Portfile 96038 2012-07-30 02:14:11Z dports@macports.org $
     2# $Id$
    33
    44PortSystem          1.0
    55PortGroup           app 1.0
    66
    77name                recoll
    8 version             1.17.2
    9 revision        1
     8version             1.19.7
    109categories          textproc
    1110platforms           darwin
    1211license             GPL-2+
    … …  
    1918homepage            http://www.recoll.org/
    2019master_sites        ${homepage}
    2120
    22 checksums           rmd160  be6752c9a36cd9708ab49bbf1eba445f0eb8f623 \
    23                     sha256  8fa0419ca78bdeca4a18e36d252a9e8254112653499c47b407b178c9f2e58a2a
     21checksums           rmd160  a22658e9ce855718b2d3dfcf69bd980130f54c6a \
     22                    sha256  6d647f4c17282994cefb37e068cfb571cf9de14a22087701c59ff8c78a4e0b9d
    2423
    2524depends_lib         port:xapian-core \
    2625                    port:qt4-mac \
    … …  
    3534                    port:unrtf \
    3635                    port:unzip
    3736
    38 patchfiles          patch-configure.diff \
    39                     patch-sampleconf-mimeview.diff
     37patchfiles         patch-configure.diff \
     38                   patch-recollinstall.diff \
     39                   patch-qtgui-rclmain.diff     \
     40                   patch-sampleconf-mimeview.diff
    4041
    4142configure.args      --without-x \
    4243                    --disable-x11mon

  • files/patch-configure.diff 

    diff -ruN macports-release-recoll/files/patch-configure.diff recoll/files/patch-configure.diff
    old new  
    1 --- configure.orig      2012-05-19 08:10:35.000000000 +0200
    2 +++ configure   2012-05-19 08:10:47.000000000 +0200
    3 @@ -4409,7 +4409,7 @@
    4  LIBICONV=""
    5  S_LDFLAGS=$LDFLAGS
    6  S_CPPFLAGS=$CPPFLAGS
    7 -for dir in ${libdir} /opt/local/lib /usr/local/lib ;do
    8 +for dir in ${libdir} ;do
    9    CPPFLAGS="$S_CPPFLAGS -I$dir/../include"
     1# HG changeset patch
     2# User Jean-Francois Dockes <jfd@recoll.org>
     3# Date 1381233803 -7200
     4# Node ID 1e6e8586ee1f058f58fef5ebba5ae49d8267bee1
     5# Parent  65a7041abbe6e64f6597d5cf27690e91014a85d4
     6autoconfig out things that dont work currently on mac os x
     7
     8diff --git a/src/configure b/src/configure
     9--- configure
     10+++ configure
     11@@ -1,6 +1,6 @@
     12 #! /bin/sh
     13 # Guess values for system-dependent variables and create Makefiles.
     14-# Generated by GNU Autoconf 2.69 for Recoll 1.19.5.
     15+# Generated by GNU Autoconf 2.69 for Recoll 1.20.0.
     16 #
     17 #
     18 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
     19@@ -577,8 +577,8 @@
     20 # Identity of this package.
     21 PACKAGE_NAME='Recoll'
     22 PACKAGE_TARNAME='recoll'
     23-PACKAGE_VERSION='1.19.5'
     24-PACKAGE_STRING='Recoll 1.19.5'
     25+PACKAGE_VERSION='1.20.0'
     26+PACKAGE_STRING='Recoll 1.20.0'
     27 PACKAGE_BUGREPORT=''
     28 PACKAGE_URL=''
     29 
     30@@ -623,6 +623,7 @@
     31 LIBOBJS
     32 RCLLIBVERSION
     33 RCLVERSION
     34+NODYNLIB
     35 NOPYTHON
     36 NOTHREADS
     37 NOPIC
     38@@ -1281,7 +1282,7 @@
     39   # Omit some internal or obsolete options to make the list less imposing.
     40   # This message is too long to be a string in the A/UX 3.1 sh.
     41   cat <<_ACEOF
     42-\`configure' configures Recoll 1.19.5 to adapt to many kinds of systems.
     43+\`configure' configures Recoll 1.20.0 to adapt to many kinds of systems.
     44 
     45 Usage: $0 [OPTION]... [VAR=VALUE]...
     46 
     47@@ -1346,7 +1347,7 @@
     48 
     49 if test -n "$ac_init_help"; then
     50   case $ac_init_help in
     51-     short | recursive ) echo "Configuration of Recoll 1.19.5:";;
     52+     short | recursive ) echo "Configuration of Recoll 1.20.0:";;
     53    esac
     54   cat <<\_ACEOF
     55 
     56@@ -1475,7 +1476,7 @@
     57 test -n "$ac_init_help" && exit $ac_status
     58 if $ac_init_version; then
     59   cat <<\_ACEOF
     60-Recoll configure 1.19.5
     61+Recoll configure 1.20.0
     62 generated by GNU Autoconf 2.69
     63 
     64 Copyright (C) 2012 Free Software Foundation, Inc.
     65@@ -2028,7 +2029,7 @@
     66 This file contains any messages produced by compilers while
     67 running configure, to aid debugging if configure makes a mistake.
     68 
     69-It was created by Recoll $as_me 1.19.5, which was
     70+It was created by Recoll $as_me 1.20.0, which was
     71 generated by GNU Autoconf 2.69.  Invocation command line was
     72 
     73   $ $0 $@
     74@@ -2910,6 +2911,12 @@
     75 fi
     76 (cd mk; rm -f sysconf; ln -s $sys sysconf)
     77 
     78+# There a few Recoll users on Mac OS X and a few things are just not worth
     79+# supporting
     80+if test X$sys = XDarwin ; then
     81+   NODYNLIB=#
     82+fi
     83+
     84 ac_ext=c
     85 ac_cpp='$CPP $CPPFLAGS'
     86 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
     87@@ -4402,6 +4409,7 @@
     88 #   configure --disable-python-module; make; make install;make clean
     89 #   configure; make; cd python/recoll; make install
     90 #
     91+if test X$sys != XDarwin ; then
     92 # Check whether --enable-python-module was given.
     93 if test "${enable_python_module+set}" = set; then :
     94   enableval=$enable_python_module; pythonEnabled=$enableval
     95@@ -4414,6 +4422,9 @@
     96 else
     97   NOPYTHON="#"
     98 fi
     99+else
     100+  NOPYTHON="#"
     101+fi
     102 
     103 # Build PIC objects for the library ?
     104 # Check whether --enable-pic was given.
     105@@ -5826,6 +5837,7 @@
     106 
     107 
     108 
     109+
     110 # All object files depend on localdefs which has the cc flags. Avoid
     111 # changing it unless necessary
     112 ac_config_files="$ac_config_files mk/localdefs.new:mk/localdefs.in"
     113@@ -6355,7 +6367,7 @@
     114 # report actual input values of CONFIG_FILES etc. instead of their
     115 # values after options handling.
     116 ac_log="
     117-This file was extended by Recoll $as_me 1.19.5, which was
     118+This file was extended by Recoll $as_me 1.20.0, which was
     119 generated by GNU Autoconf 2.69.  Invocation command line was
     120 
     121   CONFIG_FILES    = $CONFIG_FILES
     122@@ -6417,7 +6429,7 @@
     123 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
     124 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
     125 ac_cs_version="\\
     126-Recoll config.status 1.19.5
     127+Recoll config.status 1.20.0
     128 configured by $0, generated by GNU Autoconf 2.69,
     129   with options \\"\$ac_cs_config\\"
    10130 
    11    LDFLAGS="$S_LDFLAGS -L$dir"

  • files/patch-qtgui-rclmain.diff 

    diff -ruN macports-release-recoll/files/patch-qtgui-rclmain.diff recoll/files/patch-qtgui-rclmain.diff
    old new  
     1# HG changeset patch
     2# User Jean-Francois Dockes <jfd@recoll.org>
     3# Date 1381170223 -7200
     4# Node ID 79dcd7fa03797b6b51720025b3c3276395523c38
     5# Parent  7ea9fe8dc5be75557130245d7b24526a25376eb4
     6replace deprecated qt action::activated() with action::triggered()
     7
     8diff --git a/src/qtgui/rclmain_w.cpp b/src/qtgui/rclmain_w.cpp
     9--- qtgui/rclmain_w.cpp
     10+++ qtgui/rclmain_w.cpp
     11@@ -233,51 +233,51 @@
     12            this, SLOT(setStemLang(QAction*)));
     13     connect(preferencesMenu, SIGNAL(aboutToShow()),
     14            this, SLOT(adjustPrefsMenu()));
     15-    connect(fileExitAction, SIGNAL(activated() ),
     16+    connect(fileExitAction, SIGNAL(triggered() ),
     17            this, SLOT(fileExit() ) );
     18-    connect(fileToggleIndexingAction, SIGNAL(activated()),
     19+    connect(fileToggleIndexingAction, SIGNAL(triggered()),
     20            this, SLOT(toggleIndexing()));
     21-    connect(fileRebuildIndexAction, SIGNAL(activated()),
     22+    connect(fileRebuildIndexAction, SIGNAL(triggered()),
     23            this, SLOT(rebuildIndex()));
     24-    connect(fileEraseDocHistoryAction, SIGNAL(activated()),
     25+    connect(fileEraseDocHistoryAction, SIGNAL(triggered()),
     26            this, SLOT(eraseDocHistory()));
     27-    connect(fileEraseSearchHistoryAction, SIGNAL(activated()),
     28+    connect(fileEraseSearchHistoryAction, SIGNAL(triggered()),
     29            this, SLOT(eraseSearchHistory()));
     30-    connect(helpAbout_RecollAction, SIGNAL(activated()),
     31+    connect(helpAbout_RecollAction, SIGNAL(triggered()),
     32            this, SLOT(showAboutDialog()));
     33-    connect(showMissingHelpers_Action, SIGNAL(activated()),
     34+    connect(showMissingHelpers_Action, SIGNAL(triggered()),
     35            this, SLOT(showMissingHelpers()));
     36-    connect(showActiveTypes_Action, SIGNAL(activated()),
     37+    connect(showActiveTypes_Action, SIGNAL(triggered()),
     38            this, SLOT(showActiveTypes()));
     39-    connect(userManualAction, SIGNAL(activated()),
     40+    connect(userManualAction, SIGNAL(triggered()),
     41            this, SLOT(startManual()));
     42-    connect(toolsDoc_HistoryAction, SIGNAL(activated()),
     43+    connect(toolsDoc_HistoryAction, SIGNAL(triggered()),
     44            this, SLOT(showDocHistory()));
     45-    connect(toolsAdvanced_SearchAction, SIGNAL(activated()),
     46+    connect(toolsAdvanced_SearchAction, SIGNAL(triggered()),
     47            this, SLOT(showAdvSearchDialog()));
     48-    connect(toolsSpellAction, SIGNAL(activated()),
     49+    connect(toolsSpellAction, SIGNAL(triggered()),
     50            this, SLOT(showSpellDialog()));
     51-    connect(indexConfigAction, SIGNAL(activated()),
     52+    connect(indexConfigAction, SIGNAL(triggered()),
     53            this, SLOT(showIndexConfig()));
     54-    connect(indexScheduleAction, SIGNAL(activated()),
     55+    connect(indexScheduleAction, SIGNAL(triggered()),
     56            this, SLOT(showIndexSched()));
     57-    connect(queryPrefsAction, SIGNAL(activated()),
     58+    connect(queryPrefsAction, SIGNAL(triggered()),
     59            this, SLOT(showUIPrefs()));
     60-    connect(extIdxAction, SIGNAL(activated()),
     61+    connect(extIdxAction, SIGNAL(triggered()),
     62            this, SLOT(showExtIdxDialog()));
     63 
     64     if (prefs.catgToolBar && catgCMB)
     65        connect(catgCMB, SIGNAL(activated(int)),
     66                this, SLOT(catgFilter(int)));
     67-    connect(toggleFullScreenAction, SIGNAL(activated()),
     68+    connect(toggleFullScreenAction, SIGNAL(triggered()),
     69             this, SLOT(toggleFullScreen()));
     70-    connect(actionShowQueryDetails, SIGNAL(activated()),
     71+    connect(actionShowQueryDetails, SIGNAL(triggered()),
     72            reslist, SLOT(showQueryDetails()));
     73     connect(periodictimer, SIGNAL(timeout()),
     74            this, SLOT(periodic100()));
     75 
     76     restable->setRclMain(this, true);
     77-    connect(actionSaveResultsAsCSV, SIGNAL(activated()),
     78+    connect(actionSaveResultsAsCSV, SIGNAL(triggered()),
     79            restable, SLOT(saveAsCSV()));
     80     connect(this, SIGNAL(docSourceChanged(RefCntr<DocSequence>)),
     81            restable, SLOT(setDocSource(RefCntr<DocSequence>)));
     82@@ -309,11 +309,11 @@
     83     reslist->setRclMain(this, true);
     84     connect(this, SIGNAL(docSourceChanged(RefCntr<DocSequence>)),
     85            reslist, SLOT(setDocSource(RefCntr<DocSequence>)));
     86-    connect(firstPageAction, SIGNAL(activated()),
     87+    connect(firstPageAction, SIGNAL(triggered()),
     88            reslist, SLOT(resultPageFirst()));
     89-    connect(prevPageAction, SIGNAL(activated()),
     90+    connect(prevPageAction, SIGNAL(triggered()),
     91            reslist, SLOT(resPageUpOrBack()));
     92-    connect(nextPageAction, SIGNAL(activated()),
     93+    connect(nextPageAction, SIGNAL(triggered()),
     94            reslist, SLOT(resPageDownOrNext()));
     95     connect(this, SIGNAL(searchReset()),
     96            reslist, SLOT(resetList()));

  • files/patch-recollinstall.diff 

    diff -ruN macports-release-recoll/files/patch-recollinstall.diff recoll/files/patch-recollinstall.diff
    old new  
     1# HG changeset patch
     2# User Jean-Francois Dockes <jfd@recoll.org>
     3# Date 1381232776 -7200
     4# Node ID 65a7041abbe6e64f6597d5cf27690e91014a85d4
     5# Parent  0adf8145feafe2808202ba8c4cd73e4bac66acd8
     6autoconfig out things that dont work currently on mac os x
     7
     8diff --git a/src/configure.ac b/src/configure.ac
     9--- configure.ac
     10+++ configure.ac
     11@@ -21,6 +21,12 @@
     12 fi
     13 (cd mk; rm -f sysconf; ln -s $sys sysconf)
     14 
     15+# There a few Recoll users on Mac OS X and a few things are just not worth
     16+# supporting
     17+if test X$sys = XDarwin ; then
     18+   NODYNLIB=#
     19+fi
     20+
     21 AC_SYS_LARGEFILE
     22 
     23 # OpenBSD needs sys/param.h for mount.h to compile
     24@@ -219,6 +225,7 @@
     25 #   configure --disable-python-module; make; make install;make clean
     26 #   configure; make; cd python/recoll; make install
     27 #
     28+if test X$sys != XDarwin ; then
     29 AC_ARG_ENABLE(python-module,
     30     AC_HELP_STRING([--disable-python-module],
     31    [Do not build the Python module.]),
     32@@ -228,6 +235,9 @@
     33 else
     34   NOPYTHON="#"
     35 fi
     36+else
     37+  NOPYTHON="#"
     38+fi
     39 
     40 # Build PIC objects for the library ?
     41 AC_ARG_ENABLE(pic,
     42@@ -562,6 +572,7 @@
     43 AC_SUBST(NOPIC)
     44 AC_SUBST(NOTHREADS)
     45 AC_SUBST(NOPYTHON)
     46+AC_SUBST(NODYNLIB)
     47 AC_SUBST(RCLVERSION)
     48 AC_SUBST(RCLLIBVERSION)
     49 
     50diff --git a/src/recollinstall.in b/src/recollinstall.in
     51--- recollinstall.in
     52+++ recollinstall.in
     53@@ -117,7 +117,8 @@
     54 ${INSTALL} -m 0755 index/recollindex ${bindir} || exit 1
     55 ${STRIP} ${bindir}/recollindex
     56 
     57-${INSTALL} -m 0644 lib/librecoll.so.${RCLLIBVERSION} ${libdir}/recoll/ || exit 1
     58+@NODYNLIB@${INSTALL} -m 0644 lib/librecoll.so.${RCLLIBVERSION} \
     59+@NODYNLIB@    ${libdir}/recoll/ || exit 1
     60 
     61 ${INSTALL} -m 0755 filters/rcl* ${datadir}/recoll/filters/ || exit 1
     62 for f in rclexecm.py rcllatinstops.zip;do

  • files/patch-sampleconf-mimeview.diff 

    diff -ruN macports-release-recoll/files/patch-sampleconf-mimeview.diff recoll/files/patch-sampleconf-mimeview.diff
    old new  
    1 --- sampleconf/mimeview 2012-05-04 09:49:33.000000000 +0200
    2 +++ sampleconf/mimeview.mac     2012-05-19 08:05:00.000000000 +0200
     1--- sampleconf/mimeview 2013-09-30 18:45:06.000000000 +0200
     2+++ sampleconf/mimeview.mac     2013-09-30 18:45:06.000000000 +0200
    33@@ -2,7 +2,8 @@
    44 
    55 ## ##########################################
    66 # External viewers, launched by the recoll GUI when you click on a result
    77-# 'edit' link
    88+# 'Open' link - MAC version
    9 +# On the MAC, we basically use "open" for everything...
     9+# On the MAC, we use "open" for everything...
    1010 
    1111 # Mime types which we should not uncompress if they are found gzipped or
    1212 # bzipped because the native viewer knows how to handle. These would be
    13 @@ -11,82 +12,79 @@
     13@@ -16,20 +17,17 @@
     14 #    search string
     15 #  - For pages of CHM and EPUB documents where we can choose to open the
     16 #    parent document instead of a temporary html file.
     17-xallexcepts = application/pdf application/postscript application/x-dvi \
     18- text/html|gnuinfo text/html|chm text/html|epub \
     19- application/x-fsdirectory|parentopen inode/directory|parentopen
     20+#xallexcepts = application/pdf application/postscript application/x-dvi \
     21+#            text/html|gnuinfo text/html|chm text/html|epub
    1422 
    1523 [view]
    1624 # Pseudo entry used if the 'use desktop' preference is set in the GUI
    17 -application/x-all = xdg-open %f
     25-application/x-all = xdg-open %u
    1826+application/x-all = open %f
    1927 
    20  application/x-kword = kword %f
    21  application/x-abiword = abiword %f
    22  
    23 -application/pdf  = okular %f
    24 -application/postscript = okular %f
    25 -application/x-dvi = okular %f
    26 +application/pdf  = open %f
    27 +application/postscript = open %f
    28 +application/x-dvi = open %f
    29  
    30  application/x-lyx = lyx %f
    31  application/x-scribus = scribus %f
    32  
    33 -application/msword = libreoffice %f
    34 -application/vnd.ms-excel = libreoffice %f
    35 -application/vnd.ms-powerpoint = libreoffice %f
    36 +application/msword = open %f
    37 +application/vnd.ms-excel = open %f
    38 +application/vnd.ms-powerpoint = open %f
    39  
    40  application/vnd.openxmlformats-officedocument.wordprocessingml.document = \
    41 - libreoffice %f
    42 + open %f
    43  application/vnd.openxmlformats-officedocument.wordprocessingml.template = \
    44 - libreoffice %f
    45 + open %f
    46  application/vnd.openxmlformats-officedocument.presentationml.template = \
    47 - libreoffice %f
    48 + open %f
    49  application/vnd.openxmlformats-officedocument.presentationml.presentation = \
    50 - libreoffice %f
    51 + open %f
    52  application/vnd.openxmlformats-officedocument.spreadsheetml.sheet = \
    53 - libreoffice %f
    54 + open %f
    55  application/vnd.openxmlformats-officedocument.spreadsheetml.template =\
    56 - libreoffice %f
    57 -application/vnd.sun.xml.calc = libreoffice %f
    58 -application/vnd.sun.xml.calc.template = libreoffice %f
    59 -application/vnd.sun.xml.draw = libreoffice %f
    60 -application/vnd.sun.xml.draw.template = libreoffice %f
    61 -application/vnd.sun.xml.impress = libreoffice %f
    62 -application/vnd.sun.xml.impress.template = libreoffice %f
    63 -application/vnd.sun.xml.math = libreoffice %f
    64 -application/vnd.sun.xml.writer = libreoffice %f
    65 -application/vnd.sun.xml.writer.global = libreoffice %f
    66 -application/vnd.sun.xml.writer.template = libreoffice %f
    67 -application/vnd.wordperfect = libreoffice %f
    68 + open %f
    69 +application/vnd.sun.xml.calc = open %f
    70 +application/vnd.sun.xml.calc.template = open %f
    71 +application/vnd.sun.xml.draw = open %f
    72 +application/vnd.sun.xml.draw.template = open %f
    73 +application/vnd.sun.xml.impress = open %f
    74 +application/vnd.sun.xml.impress.template = open %f
    75 +application/vnd.sun.xml.math = open %f
    76 +application/vnd.sun.xml.writer = open %f
    77 +application/vnd.sun.xml.writer.global = open %f
    78 +application/vnd.sun.xml.writer.template = open %f
    79 +application/vnd.wordperfect = open %f
     28 application/epub+zip = ebook-viewer %f
     29-# Open the parent epub document for epub parts instead of opening them as
     30-# html documents. This is almost always what we want.
     31-text/html|epub = ebook-viewer %F;ignoreipath=1
     32-
     33-application/x-gnote = gnote %f
     34+# If you want to open the parent epub document for epub parts instead of
     35+# opening them as html documents:
     36+#text/html|epub = ebook-viewer %F;ignoreipath=1
     37 
     38 application/x-mobipocket-ebook = ebook-viewer %f
     39 
     40@@ -76,13 +74,9 @@
     41 application/vnd.wordperfect = libreoffice %f
     42 text/rtf = libreoffice %f
    8043 
    81  application/x-chm = kchmviewer %f
     44+application/x-chm = kchmviewer %f
    8245 application/x-dia-diagram = dia %f
    83 -application/x-fsdirectory = dolphin %f
    84 +application/x-fsdirectory = open %f
     46-
     47 application/x-fsdirectory = dolphin %f
     48-inode/directory = dolphin %f
     49-application/x-fsdirectory|parentopen = dolphin --select %(childurl) %f
     50-inode/directory|parentopen = dolphin --select %(childurl) %f
     51-
    8552 application/x-gnuinfo = xterm -e "info -f %f"
    8653 application/x-gnumeric = gnumeric %f
    8754 
    88 -application/x-flac = rhythmbox %f
    89 -audio/mpeg = rhythmbox %f
    90 -application/ogg = rhythmbox %f
    91 -
    92 -image/jpeg = gwenview %f
    93 -image/png = gwenview %f
    94 -image/tiff = gwenview %f
    95 -image/gif  = gwenview %f
    96 -image/svg+xml = inkview %f
    97 -image/vnd.djvu = djview %f
    98 -image/x-xcf = gimp %f
    99 -image/bmp = gwenview %f
    100 -image/x-ms-bmp = gwenview %f
    101 -image/x-xpmi = gwenview %f
    102 +application/x-flac = open %f
    103 +audio/mpeg = open %f
    104 +application/ogg = open %f
    105 +
    106 +image/jpeg = open %f
    107 +image/png = open %f
    108 +image/tiff = open %f
    109 +image/gif  = open %f
    110 +image/svg+xml = open %f
    111 +image/vnd.djvu = open %f
    112 +image/x-xcf = open %f
    113 +image/bmp = open %f
    114 +image/x-ms-bmp = open %f
    115 +image/x-xpmi = open %f
    116  
     55@@ -102,11 +96,6 @@
     56 image/x-ms-bmp = gwenview %f
     57 image/x-xpmi = gwenview %f
     58 
     59-# Opening mail messages not always works.
     60-#  - Thunderbird will only open a single-message file if it has an .emf
     61-#    extension
     62-#  - "sylpheed %f" seems to work ok as of version 3.3
     63-#  - "kmail --view %u" works
    11764 message/rfc822 = thunderbird -file %f
    11865 text/x-mail = thunderbird -file %f
    119  
    120 -application/x-tex = emacsclient  %f
    121 -text/x-tex = emacsclient  %f
    122 -# Or firefox -remote "openFile(%u)"
    123 -text/html = firefox %u
    124 +application/x-tex = open %f
    125 +text/x-tex = open %f
    126 +text/html = open %u
    127  text/html|gnuinfo = rclshowinfo %F %(title)
    128 -text/plain = emacsclient  %f
    129 -text/x-c = emacsclient  %f
    130 -text/x-c+ = emacsclient  %f
    131 -text/x-c++ = emacsclient  %f
    132 -text/x-html-sidux-man = konqueror %f
    133 -text/x-html-aptosid-man = iceweasel %f
    134 +text/plain = open %f
    135 +text/x-c = open %f
    136 +text/x-c+ = open %f
    137 +text/x-c++ = open %f
    138  text/x-chm-html = openchm %f %i
    139 -text/x-ini = emacsclient  %f
    140 -text/x-man = xterm -u8 -e "groff -T ascii -man %f | more"
    141 +text/x-ini = open  %f
    142 +#text/x-man = xterm -u8 -e "groff -T ascii -man %f | more"
     66 application/x-mimehtml = thunderbird -file %f
     67@@ -119,11 +108,11 @@
     68 application/x-tar = ark %f
     69 application/zip = ark %f
     70 
     71-application/x-awk = emacsclient --no-wait %f
     72-application/x-perl = emacsclient --no-wait %f
     73-text/x-perl = emacsclient --no-wait %f
     74-application/x-shellscript = emacsclient --no-wait %f
     75-text/x-shellscript = emacsclient --no-wait %f
     76+application/x-awk = emacsclient  %f
     77+application/x-perl = emacsclient  %f
     78+text/x-perl = emacsclient  %f
     79+application/x-shellscript = emacsclient  %f
     80+text/x-shellscript = emacsclient  %f
     81 
     82 # Or firefox -remote "openFile(%u)"
     83 text/html = firefox %u
     84@@ -135,41 +124,39 @@
     85 
     86 application/x-webarchive = konqueror %f
     87 text/x-fictionbook = ebook-viewer %f
     88-application/x-tex = emacsclient --no-wait  %f
     89-application/xml = emacsclient --no-wait  %f
     90-text/xml = emacsclient --no-wait  %f
     91-text/x-tex = emacsclient --no-wait  %f
     92-text/plain = emacsclient --no-wait  %f
     93-text/x-awk = emacsclient --no-wait  %f
     94-text/x-c = emacsclient --no-wait  %f
     95-text/x-c+ = emacsclient --no-wait  %f
     96-text/x-c++ = emacsclient --no-wait  %f
     97+application/x-tex = emacsclient  %f
     98+application/xml = emacsclient  %f
     99+text/xml = emacsclient  %f
     100+text/x-tex = emacsclient  %f
     101+text/plain = emacsclient  %f
     102+text/x-awk = emacsclient  %f
     103+text/x-c = emacsclient  %f
     104+text/x-c+ = emacsclient  %f
     105+text/x-c++ = emacsclient  %f
     106 text/x-csv = libreoffice %f
     107 text/x-html-sidux-man = konqueror %f
     108 text/x-html-aptosid-man = iceweasel %f
     109 
     110-application/x-chm = kchmviewer %f
     111 # Html pages inside a chm have a chm rclaptg set by the filter. Kchmviewer
     112 # knows how to use the ipath (which is the internal chm path) to open the
     113 # file at the right place
     114 text/html|chm = kchmviewer --url %i %F
     115 
     116-text/x-ini = emacsclient --no-wait %f
     117+text/x-ini = emacsclient %f
     118 text/x-man = xterm -u8 -e "groff -T ascii -man %f | more"
    143119 text/x-python = idle %f
     120-text/x-gaim-log = emacsclient --no-wait  %f
     121-text/x-purple-html-log = emacsclient --no-wait  %f
     122-text/x-purple-log = emacsclient --no-wait  %f
     123+text/x-gaim-log = emacsclient  %f
     124+text/x-purple-html-log = emacsclient  %f
     125+text/x-purple-log = emacsclient  %f
     126 
     127 # The video types will usually be handled by the desktop default, but they
     128 # need entries here to get an "Open" link
     129-video/3gpp = vlc %f
     130-video/mp2p = vlc %f
     131-video/mp2t = vlc %f
     132-video/mp4 = vlc %f
     133-video/mpeg = vlc %f
     134-video/quicktime = vlc %f
     135-video/x-matroska = vlc %f
     136-video/x-ms-asf = vlc %f
     137-video/x-msvideo = vlc %f
     138-
     139+video/3gpp = open %f
     140+video/mp2p = open %f
     141+video/mp2t = open %f
     142+video/mp4 = open %f
     143+video/mpeg = open %f
     144+video/quicktime = open %f
     145+video/x-matroska = open %f
     146+video/x-ms-asf = open %f
     147+video/x-msvideo = open %f

  • files/sampleconf-mimeview.diff 

    diff -ruN macports-release-recoll/files/sampleconf-mimeview.diff recoll/files/sampleconf-mimeview.diff
    old new  
     1--- sampleconf/mimeview 2013-09-30 18:45:06.222313401 +0200
     2+++ sampleconf/mimeview.mac     2013-09-30 18:45:06.222313401 +0200
     3@@ -2,7 +2,8 @@
     4 
     5 ## ##########################################
     6 # External viewers, launched by the recoll GUI when you click on a result
     7-# 'edit' link
     8+# 'Open' link - MAC version
     9+# On the MAC, we use "open" for everything...
     10 
     11 # Mime types which we should not uncompress if they are found gzipped or
     12 # bzipped because the native viewer knows how to handle. These would be
     13@@ -16,20 +17,17 @@
     14 #    search string
     15 #  - For pages of CHM and EPUB documents where we can choose to open the
     16 #    parent document instead of a temporary html file.
     17-xallexcepts = application/pdf application/postscript application/x-dvi \
     18- text/html|gnuinfo text/html|chm text/html|epub \
     19- application/x-fsdirectory|parentopen inode/directory|parentopen
     20+#xallexcepts = application/pdf application/postscript application/x-dvi \
     21+#            text/html|gnuinfo text/html|chm text/html|epub
     22 
     23 [view]
     24 # Pseudo entry used if the 'use desktop' preference is set in the GUI
     25-application/x-all = xdg-open %u
     26+application/x-all = open %f
     27 
     28 application/epub+zip = ebook-viewer %f
     29-# Open the parent epub document for epub parts instead of opening them as
     30-# html documents. This is almost always what we want.
     31-text/html|epub = ebook-viewer %F;ignoreipath=1
     32-
     33-application/x-gnote = gnote %f
     34+# If you want to open the parent epub document for epub parts instead of
     35+# opening them as html documents:
     36+#text/html|epub = ebook-viewer %F;ignoreipath=1
     37 
     38 application/x-mobipocket-ebook = ebook-viewer %f
     39 
     40@@ -76,13 +74,9 @@
     41 application/vnd.wordperfect = libreoffice %f
     42 text/rtf = libreoffice %f
     43 
     44+application/x-chm = kchmviewer %f
     45 application/x-dia-diagram = dia %f
     46-
     47 application/x-fsdirectory = dolphin %f
     48-inode/directory = dolphin %f
     49-application/x-fsdirectory|parentopen = dolphin --select %(childurl) %f
     50-inode/directory|parentopen = dolphin --select %(childurl) %f
     51-
     52 application/x-gnuinfo = xterm -e "info -f %f"
     53 application/x-gnumeric = gnumeric %f
     54 
     55@@ -102,11 +96,6 @@
     56 image/x-ms-bmp = gwenview %f
     57 image/x-xpmi = gwenview %f
     58 
     59-# Opening mail messages not always works.
     60-#  - Thunderbird will only open a single-message file if it has an .emf
     61-#    extension
     62-#  - "sylpheed %f" seems to work ok as of version 3.3
     63-#  - "kmail --view %u" works
     64 message/rfc822 = thunderbird -file %f
     65 text/x-mail = thunderbird -file %f
     66 application/x-mimehtml = thunderbird -file %f
     67@@ -119,11 +108,11 @@
     68 application/x-tar = ark %f
     69 application/zip = ark %f
     70 
     71-application/x-awk = emacsclient --no-wait %f
     72-application/x-perl = emacsclient --no-wait %f
     73-text/x-perl = emacsclient --no-wait %f
     74-application/x-shellscript = emacsclient --no-wait %f
     75-text/x-shellscript = emacsclient --no-wait %f
     76+application/x-awk = emacsclient  %f
     77+application/x-perl = emacsclient  %f
     78+text/x-perl = emacsclient  %f
     79+application/x-shellscript = emacsclient  %f
     80+text/x-shellscript = emacsclient  %f
     81 
     82 # Or firefox -remote "openFile(%u)"
     83 text/html = firefox %u
     84@@ -135,41 +124,39 @@
     85 
     86 application/x-webarchive = konqueror %f
     87 text/x-fictionbook = ebook-viewer %f
     88-application/x-tex = emacsclient --no-wait  %f
     89-application/xml = emacsclient --no-wait  %f
     90-text/xml = emacsclient --no-wait  %f
     91-text/x-tex = emacsclient --no-wait  %f
     92-text/plain = emacsclient --no-wait  %f
     93-text/x-awk = emacsclient --no-wait  %f
     94-text/x-c = emacsclient --no-wait  %f
     95-text/x-c+ = emacsclient --no-wait  %f
     96-text/x-c++ = emacsclient --no-wait  %f
     97+application/x-tex = emacsclient  %f
     98+application/xml = emacsclient  %f
     99+text/xml = emacsclient  %f
     100+text/x-tex = emacsclient  %f
     101+text/plain = emacsclient  %f
     102+text/x-awk = emacsclient  %f
     103+text/x-c = emacsclient  %f
     104+text/x-c+ = emacsclient  %f
     105+text/x-c++ = emacsclient  %f
     106 text/x-csv = libreoffice %f
     107 text/x-html-sidux-man = konqueror %f
     108 text/x-html-aptosid-man = iceweasel %f
     109 
     110-application/x-chm = kchmviewer %f
     111 # Html pages inside a chm have a chm rclaptg set by the filter. Kchmviewer
     112 # knows how to use the ipath (which is the internal chm path) to open the
     113 # file at the right place
     114 text/html|chm = kchmviewer --url %i %F
     115 
     116-text/x-ini = emacsclient --no-wait %f
     117+text/x-ini = emacsclient %f
     118 text/x-man = xterm -u8 -e "groff -T ascii -man %f | more"
     119 text/x-python = idle %f
     120-text/x-gaim-log = emacsclient --no-wait  %f
     121-text/x-purple-html-log = emacsclient --no-wait  %f
     122-text/x-purple-log = emacsclient --no-wait  %f
     123+text/x-gaim-log = emacsclient  %f
     124+text/x-purple-html-log = emacsclient  %f
     125+text/x-purple-log = emacsclient  %f
     126 
     127 # The video types will usually be handled by the desktop default, but they
     128 # need entries here to get an "Open" link
     129-video/3gpp = vlc %f
     130-video/mp2p = vlc %f
     131-video/mp2t = vlc %f
     132-video/mp4 = vlc %f
     133-video/mpeg = vlc %f
     134-video/quicktime = vlc %f
     135-video/x-matroska = vlc %f
     136-video/x-ms-asf = vlc %f
     137-video/x-msvideo = vlc %f
     138-
     139+video/3gpp = open %f
     140+video/mp2p = open %f
     141+video/mp2t = open %f
     142+video/mp4 = open %f
     143+video/mpeg = open %f
     144+video/quicktime = open %f
     145+video/x-matroska = open %f
     146+video/x-ms-asf = open %f
     147+video/x-msvideo = open %f