tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

macports: 1.16.2 fixes

Browse Source
This commit is contained in:
Jean-Francois Dockes
2011-11-28 08:30:41 +01:00
parent fb9df2adba
commit 243bea8e44
6 changed files with 112 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packaging/macports/README.txt
+1 -1
View File
@@ -7,7 +7,7 @@ To use/test the port out of the official macports tree:
(inserting before ensures it's used before the macports one)
- The port should leave under category/portname (ie: textproc/
- The port should live under category/portname (ie: textproc/
- After you create or update your Portfile, use the MacPorts portindex
command in the local repository's directory to create or update the index
packaging/macports/textproc/recoll/Portfile
+24 -13
View File
@@ -2,21 +2,24 @@
# $Id$
PortSystem 1.0
PortGroup app 1.0
name recoll
version 1.15.9
version 1.16.2
categories textproc
platforms darwin
license GPL
maintainers recoll.org:jfd
description Desktop full text search
long_description Recoll is a desktop search tool based on Xapian
homepage http://www.recoll.org
master_sites http://www.recoll.org
license GPL-2+
maintainers dockes.org:jf openmaintainer
checksums md5 93755266553f4a403d1b9293212aae16 \
sha1 0281286c2fc6a00dcade3eb1d4abb16e478f5d6e \
rmd160 aa5421a242505ecd7e8b3324713adc397eec7a09
description Desktop full text search
long_description Recoll is a desktop search tool based on Xapian
homepage http://www.recoll.org/
master_sites ${homepage}
checksums sha1 40c18a958eeecbb70cbdf14fa7319b54525537fa \
rmd160 fb598b9c637cab49734547a41f2e8ec232f89dbe
depends_lib port:xapian-core \
port:qt4-mac \
@@ -26,10 +29,18 @@ depends_lib port:xapian-core \
depends_run port:antiword \
port:catdoc \
port:libxslt \
port:libxslt \
port:poppler \
port:unrtf \
port:unzip
patchfiles patch-configure.diff patch-sampleconf-mimeview.diff
configure.args --without-x --disable-x11mon
patchfiles patch-configure.diff \
patch-sampleconf-mimeview.diff
configure.args --without-x \
--disable-x11mon
build.args CC=${configure.cc} CXX=${configure.cxx}
# g++-4.2: -E, -S, -save-temps and -M options are not allowed with multiple -arch flags
universal_variant no
packaging/macports/textproc/recoll/files/patch-configure.diff
+8 -168
View File
@@ -1,171 +1,11 @@
--- configure.orig 2011-06-06 10:05:13.000000000 +0200
+++ configure 2011-06-06 10:04:15.000000000 +0200
@@ -4341,12 +4341,8 @@
done
-##### Look for iconv. We look for libiconv in ${libdir}, /opt/local/lib,
-##### /usr/local/lib then in libc (Linux, solaris). Note that there is no
-##### way to find libiconv in /usr/local if one exists in ${libdir} (can't
-##### do because the link will always succeed in this case so that if we
-##### put /usr/local/lib in front in this case, we may end up with using it
-##### even if no libiconv in there. We'd need a --with-libiconv= option
+##### Look for iconv. This can exist in either libc (ie: Linux, solaris) or
+##### libiconv. We'd need a --with-libiconv= option
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4355,112 +4351,70 @@
--- configure.orig 2011-10-11 06:25:31.000000000 -0500
+++ configure 2011-11-27 20:02:11.000000000 -0600
@@ -4366,7 +4366,7 @@
LIBICONV=""
S_LDFLAGS=$LDFLAGS
-
+S_CPPFLAGS=$CPPFLAGS
for dir in ${libdir} /opt/local/lib /usr/local/lib ;do
+ CPPFLAGS="$S_CPPFLAGS -I$dir/../include"
+
S_CPPFLAGS=$CPPFLAGS
-for dir in ${libdir} /opt/local/lib /usr/local/lib ;do
+for dir in ${libdir} ;do
CPPFLAGS="$S_CPPFLAGS -I$dir/../include"
LDFLAGS="$S_LDFLAGS -L$dir"
- unset ac_cv_lib_iconv_iconv_open
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -liconv" >&5
-$as_echo_n "checking for iconv_open in -liconv... " >&6; }
-if ${ac_cv_lib_iconv_iconv_open+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-liconv $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char iconv_open ();
+#include <stdlib.h>
+#include <iconv.h>
int
main ()
{
-return iconv_open ();
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
;
return 0;
}
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
- ac_cv_lib_iconv_iconv_open=yes
-else
- ac_cv_lib_iconv_iconv_open=no
+ LIBICONV="-L$dir";INCICONV=-I$dir/../include
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_iconv_open" >&5
-$as_echo "$ac_cv_lib_iconv_iconv_open" >&6; }
-if test "x$ac_cv_lib_iconv_iconv_open" = xyes; then :
- LIBICONV="-L$dir -liconv";INCICONV=-I$dir/../include
-fi
-
if test A"$LIBICONV" != A ; then
break
fi
-done
-if test A"$LIBICONV" = A; then
- dir=${libdir}
- LDFLAGS="$S_LDFLAGS -L$dir"
- unset ac_cv_lib_iconv_iconv_open
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv_open in -lc" >&5
-$as_echo_n "checking for iconv_open in -lc... " >&6; }
-if ${ac_cv_lib_c_iconv_open+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ LDFLAGS="$S_LDFLAGS -L$dir -liconv"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char iconv_open ();
+#include <stdlib.h>
+#include <iconv.h>
int
main ()
{
-return iconv_open ();
+iconv_t cd = iconv_open("","");
+ iconv(cd,NULL,NULL,NULL,NULL);
+ iconv_close(cd);
;
return 0;
}
_ACEOF
if ac_fn_cxx_try_link "$LINENO"; then :
- ac_cv_lib_c_iconv_open=yes
-else
- ac_cv_lib_c_iconv_open=no
+ LIBICONV="-L$dir -liconv";INCICONV=-I$dir/../include
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_iconv_open" >&5
-$as_echo "$ac_cv_lib_c_iconv_open" >&6; }
-if test "x$ac_cv_lib_c_iconv_open" = xyes; then :
- LIBICONV=NONE;INCICONV=-I/usr/include
-fi
+ if test A"$LIBICONV" != A ; then
+ break
+ fi
-fi
+done
LDFLAGS=$S_LDFLAGS
+CPPFLAGS=$S_CPPFLAGS
+
if test A"$LIBICONV" = A ; then
as_fn_error $? "Cannot find iconv_open anywhere. Please install iconv" "$LINENO" 5
exit 1
fi
-if test A"$LIBICONV" = ANONE ; then
- LIBICONV=""
-fi
-#echo LIBICONV $LIBICONV
-#echo INCICONV $INCICONV
+echo LIBICONV $LIBICONV
+echo INCICONV $INCICONV
CPPFLAGS="$CPPFLAGS $INCICONV"
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for type of inbuf parameter to iconv" >&5
@@ -4494,6 +4448,7 @@
fi
+############# Putenv
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for type of string parameter to putenv" >&5
$as_echo_n "checking for type of string parameter to putenv... " >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4523,6 +4478,7 @@
fi
+
#### Look for Xapian
# Extract the first word of "xapian-config", so it can be a program name with args.
set dummy xapian-config; ac_word=$2
packaging/macports/textproc/recoll/files/patch-sampleconf-mimeview.diff
+63 -56
View File
@@ -1,5 +1,5 @@
--- sampleconf/mimeview 2011-06-06 10:13:07.000000000 +0200
+++ sampleconf/mimeview.mac 2011-06-06 10:13:17.000000000 +0200
--- sampleconf/mimeview 2011-10-11 08:44:09.000000000 +0200
+++ sampleconf/mimeview.mac 2011-11-27 17:55:42.000000000 +0100
@@ -2,7 +2,8 @@
## ##########################################
@@ -10,63 +10,61 @@
# Mime types which we should not uncompress if they are found gzipped or
# bzipped because the native viewer knows how to handle. These would be
@@ -11,63 +12,70 @@
@@ -11,74 +12,71 @@
[view]
# Pseudo entry used if the 'use desktop' preference is set in the GUI
-application/x-all = xdg-open %f
+application/x-all = open %f
+
+[view]
application/x-kword = kword %f
application/x-abiword = abiword %f
-application/msword = openoffice %f
-application/ogg = xmms %f
-application/pdf = xpdf %f
-application/postscript = gv %f
-application/vnd.ms-excel = openoffice %f
-application/vnd.ms-powerpoint = openoffice %f
-application/pdf = okular %f
-application/postscript = okular %f
-application/x-dvi = okular %f
+application/pdf = open %f
+application/postscript = open %f
+application/x-dvi = open %f
+
+application/x-lyx = lyx %f
+application/x-scribus = scribus %f
+
application/x-lyx = lyx %f
application/x-scribus = scribus %f
-application/msword = libreoffice %f
-application/vnd.ms-excel = libreoffice %f
-application/vnd.ms-powerpoint = libreoffice %f
+application/msword = open %f
+application/vnd.ms-excel = open %f
+application/vnd.ms-powerpoint = open %f
+
application/vnd.openxmlformats-officedocument.wordprocessingml.document = \
- openoffice %f
- libreoffice %f
+ open %f
application/vnd.openxmlformats-officedocument.wordprocessingml.template = \
- openoffice %f
- libreoffice %f
+ open %f
application/vnd.openxmlformats-officedocument.presentationml.template = \
- openoffice %f
- libreoffice %f
+ open %f
application/vnd.openxmlformats-officedocument.presentationml.presentation = \
- openoffice %f
- libreoffice %f
+ open %f
application/vnd.openxmlformats-officedocument.spreadsheetml.sheet = \
- openoffice %f
- libreoffice %f
+ open %f
application/vnd.openxmlformats-officedocument.spreadsheetml.template =\
- openoffice %f
-application/vnd.sun.xml.calc = openoffice %f
-application/vnd.sun.xml.calc.template = openoffice %f
-application/vnd.sun.xml.draw = openoffice %f
-application/vnd.sun.xml.draw.template = openoffice %f
-application/vnd.sun.xml.impress = openoffice %f
-application/vnd.sun.xml.impress.template = openoffice %f
-application/vnd.sun.xml.math = openoffice %f
-application/vnd.sun.xml.writer = openoffice %f
-application/vnd.sun.xml.writer.global = openoffice %f
-application/vnd.sun.xml.writer.template = openoffice %f
-application/vnd.wordperfect = openoffice %f
- libreoffice %f
-application/vnd.sun.xml.calc = libreoffice %f
-application/vnd.sun.xml.calc.template = libreoffice %f
-application/vnd.sun.xml.draw = libreoffice %f
-application/vnd.sun.xml.draw.template = libreoffice %f
-application/vnd.sun.xml.impress = libreoffice %f
-application/vnd.sun.xml.impress.template = libreoffice %f
-application/vnd.sun.xml.math = libreoffice %f
-application/vnd.sun.xml.writer = libreoffice %f
-application/vnd.sun.xml.writer.global = libreoffice %f
-application/vnd.sun.xml.writer.template = libreoffice %f
-application/vnd.wordperfect = libreoffice %f
+ open %f
+application/vnd.sun.xml.calc = open %f
+application/vnd.sun.xml.calc.template = open %f
@@ -79,23 +77,31 @@
+application/vnd.sun.xml.writer.global = open %f
+application/vnd.sun.xml.writer.template = open %f
+application/vnd.wordperfect = open %f
+
application/x-chm = kchmviewer %f
-application/x-dvi = xdvi %f
-application/x-fsdirectory = rox %f
-application/x-flac = xmms %f
-application/x-fsdirectory = dolphin %f
+application/x-fsdirectory = open %f
application/x-gnuinfo = xterm -e "info -f %f"
-application/x-lyx = lyx %f
-application/x-scribus = scribus %f
-application/x-tex = gnuclient -q %f
-text/x-tex = gnuclient -q %f
-audio/mpeg = xmms %f
-image/jpeg = xv %f
-image/png = xv %f
-image/tiff = xv %f
-image/gif = xv %f
+
-application/x-flac = rhythmbox %f
-audio/mpeg = rhythmbox %f
-application/ogg = rhythmbox %f
-
-image/jpeg = gwenview %f
-image/png = gwenview %f
-image/tiff = gwenview %f
-image/gif = gwenview %f
-image/svg+xml = inkview %f
-image/vnd.djvu = djview %f
-image/x-xcf = gimp %f
-image/bmp = gwenview %f
-image/x-ms-bmp = gwenview %f
-image/x-xpmi = gwenview %f
-
-# Or firefox -remote "openFile(%u)"
-application/x-tex = emacsclient %f
-text/x-tex = emacsclient %f
-text/html = firefox %u
+application/x-flac = open %f
+audio/mpeg = open %f
+application/ogg = open %f
@@ -104,20 +110,21 @@
+image/png = open %f
+image/tiff = open %f
+image/gif = open %f
+
image/svg+xml = inkview %f
image/vnd.djvu = djview %f
-# Or firefox -remote "openFile(%u)"
-text/html = firefox %u
+image/svg+xml = open %f
+image/vnd.djvu = open %f
+image/x-xcf = open %f
+image/bmp = open %f
+image/x-ms-bmp = open %f
+image/x-xpmi = open %f
+
+application/x-tex = open %f
+text/x-tex = open %f
+text/html = open %u
text/html|gnuinfo = rclshowinfo %F %(title)
-text/plain = gnuclient -q %f
-text/x-c = gnuclient -q %f
-text/x-c+ = gnuclient -q %f
-text/x-c++ = gnuclient -q %f
-text/plain = emacsclient %f
-text/x-c = emacsclient %f
-text/x-c+ = emacsclient %f
-text/x-c++ = emacsclient %f
-text/x-html-sidux-man = konqueror %f
-text/x-html-aptosid-man = iceweasel %f
+text/plain = open %f