[116688] trunk/dports/textproc/recoll

3 Feb 2014

Revision: 116688
          https://trac.macports.org/changeset/116688
Author:   macsforever2000@macports.org
Date:     2014-02-03 08:42:25 -0800 (Mon, 03 Feb 2014)
Log Message:
-----------
recoll: Update to version 1.19.11. emoved . (#42329)

Modified Paths:
--------------
    trunk/dports/textproc/recoll/Portfile

Removed Paths:
-------------
    trunk/dports/textproc/recoll/files/patch-configure.diff
    trunk/dports/textproc/recoll/files/patch-qtgui-rclmain.diff
    trunk/dports/textproc/recoll/files/patch-recollinstall.diff

Modified: trunk/dports/textproc/recoll/Portfile
===================================================================

--- trunk/dports/textproc/recoll/Portfile	2014-02-03 14:57:16 UTC (rev 116687)
+++ trunk/dports/textproc/recoll/Portfile	2014-02-03 16:42:25 UTC (rev 116688)
@@ -5,7 +5,7 @@
 PortGroup           app 1.0
 
 name                recoll
-version             1.19.7
+version             1.19.11p1
 categories          textproc
 platforms           darwin
 license             GPL-2+
@@ -18,8 +18,8 @@
 homepage            http://www.recoll.org/
 master_sites        ${homepage}
 
-checksums           rmd160  a22658e9ce855718b2d3dfcf69bd980130f54c6a \
-                    sha256  6d647f4c17282994cefb37e068cfb571cf9de14a22087701c59ff8c78a4e0b9d
+checksums           rmd160  de98039d80174a5da6e3cdbcc8b7bc0f4407e44a \
+                    sha256  8d1d040b8de1f65f01bc0a56053a6df7677360031bf9a6779d3496ced4a61186
 
 depends_lib         port:xapian-core \
                     port:qt4-mac \
@@ -34,10 +34,7 @@
                     port:unrtf \
                     port:unzip
 
-patchfiles          patch-configure.diff \
-                    patch-recollinstall.diff \
-                    patch-qtgui-rclmain.diff \
-                    patch-sampleconf-mimeview.diff
+patchfiles          patch-sampleconf-mimeview.diff
 
 configure.args      --without-x \
                     --disable-x11mon

Deleted: trunk/dports/textproc/recoll/files/patch-configure.diff
===================================================================
--- trunk/dports/textproc/recoll/files/patch-configure.diff	2014-02-03 14:57:16 UTC (rev 116687)
+++ trunk/dports/textproc/recoll/files/patch-configure.diff	2014-02-03 16:42:25 UTC (rev 116688)
@@ -1,130 +0,0 @@
-# HG changeset patch
-# User Jean-Francois Dockes <jfd@recoll.org>
-# Date 1381233803 -7200
-# Node ID 1e6e8586ee1f058f58fef5ebba5ae49d8267bee1
-# Parent  65a7041abbe6e64f6597d5cf27690e91014a85d4
-autoconfig out things that dont work currently on mac os x
-
-diff --git a/src/configure b/src/configure
---- configure
-+++ configure
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.69 for Recoll 1.19.5.
-+# Generated by GNU Autoconf 2.69 for Recoll 1.20.0.
- #
- #
- # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
-@@ -577,8 +577,8 @@
- # Identity of this package.
- PACKAGE_NAME='Recoll'
- PACKAGE_TARNAME='recoll'
--PACKAGE_VERSION='1.19.5'
--PACKAGE_STRING='Recoll 1.19.5'
-+PACKAGE_VERSION='1.20.0'
-+PACKAGE_STRING='Recoll 1.20.0'
- PACKAGE_BUGREPORT=''
- PACKAGE_URL=''
- 
-@@ -623,6 +623,7 @@
- LIBOBJS
- RCLLIBVERSION
- RCLVERSION
-+NODYNLIB
- NOPYTHON
- NOTHREADS
- NOPIC
-@@ -1281,7 +1282,7 @@
-   # Omit some internal or obsolete options to make the list less imposing.
-   # This message is too long to be a string in the A/UX 3.1 sh.
-   cat <<_ACEOF
--\`configure' configures Recoll 1.19.5 to adapt to many kinds of systems.
-+\`configure' configures Recoll 1.20.0 to adapt to many kinds of systems.
- 
- Usage: $0 [OPTION]... [VAR=VALUE]...
- 
-@@ -1346,7 +1347,7 @@
- 
- if test -n "$ac_init_help"; then
-   case $ac_init_help in
--     short | recursive ) echo "Configuration of Recoll 1.19.5:";;
-+     short | recursive ) echo "Configuration of Recoll 1.20.0:";;
-    esac
-   cat <<\_ACEOF
- 
-@@ -1475,7 +1476,7 @@
- test -n "$ac_init_help" && exit $ac_status
- if $ac_init_version; then
-   cat <<\_ACEOF
--Recoll configure 1.19.5
-+Recoll configure 1.20.0
- generated by GNU Autoconf 2.69
- 
- Copyright (C) 2012 Free Software Foundation, Inc.
-@@ -2028,7 +2029,7 @@
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
- 
--It was created by Recoll $as_me 1.19.5, which was
-+It was created by Recoll $as_me 1.20.0, which was
- generated by GNU Autoconf 2.69.  Invocation command line was
- 
-   $ $0 $@
-@@ -2910,6 +2911,12 @@
- fi
- (cd mk; rm -f sysconf; ln -s $sys sysconf)
- 
-+# There a few Recoll users on Mac OS X and a few things are just not worth
-+# supporting
-+if test X$sys = XDarwin ; then
-+   NODYNLIB=#
-+fi
-+
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4402,6 +4409,7 @@
- #   configure --disable-python-module; make; make install;make clean
- #   configure; make; cd python/recoll; make install
- #
-+if test X$sys != XDarwin ; then
- # Check whether --enable-python-module was given.
- if test "${enable_python_module+set}" = set; then :
-   enableval=$enable_python_module; pythonEnabled=$enableval
-@@ -4414,6 +4422,9 @@
- else
-   NOPYTHON="#"
- fi
-+else
-+  NOPYTHON="#"
-+fi
- 
- # Build PIC objects for the library ?
- # Check whether --enable-pic was given.
-@@ -5826,6 +5837,7 @@
- 
- 
- 
-+
- # All object files depend on localdefs which has the cc flags. Avoid
- # changing it unless necessary
- ac_config_files="$ac_config_files mk/localdefs.new:mk/localdefs.in"
-@@ -6355,7 +6367,7 @@
- # report actual input values of CONFIG_FILES etc. instead of their
- # values after options handling.
- ac_log="
--This file was extended by Recoll $as_me 1.19.5, which was
-+This file was extended by Recoll $as_me 1.20.0, which was
- generated by GNU Autoconf 2.69.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-@@ -6417,7 +6429,7 @@
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
- ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
--Recoll config.status 1.19.5
-+Recoll config.status 1.20.0
- configured by $0, generated by GNU Autoconf 2.69,
-   with options \\"\$ac_cs_config\\"
- 

Deleted: trunk/dports/textproc/recoll/files/patch-qtgui-rclmain.diff
===================================================================
--- trunk/dports/textproc/recoll/files/patch-qtgui-rclmain.diff	2014-02-03 14:57:16 UTC (rev 116687)
+++ trunk/dports/textproc/recoll/files/patch-qtgui-rclmain.diff	2014-02-03 16:42:25 UTC (rev 116688)
@@ -1,96 +0,0 @@
-# HG changeset patch
-# User Jean-Francois Dockes <jfd@recoll.org>
-# Date 1381170223 -7200
-# Node ID 79dcd7fa03797b6b51720025b3c3276395523c38
-# Parent  7ea9fe8dc5be75557130245d7b24526a25376eb4
-replace deprecated qt action::activated() with action::triggered()
-
-diff --git a/src/qtgui/rclmain_w.cpp b/src/qtgui/rclmain_w.cpp
---- qtgui/rclmain_w.cpp
-+++ qtgui/rclmain_w.cpp
-@@ -233,51 +233,51 @@
- 	    this, SLOT(setStemLang(QAction*)));
-     connect(preferencesMenu, SIGNAL(aboutToShow()),
- 	    this, SLOT(adjustPrefsMenu()));
--    connect(fileExitAction, SIGNAL(activated() ), 
-+    connect(fileExitAction, SIGNAL(triggered() ), 
- 	    this, SLOT(fileExit() ) );
--    connect(fileToggleIndexingAction, SIGNAL(activated()), 
-+    connect(fileToggleIndexingAction, SIGNAL(triggered()), 
- 	    this, SLOT(toggleIndexing()));
--    connect(fileRebuildIndexAction, SIGNAL(activated()), 
-+    connect(fileRebuildIndexAction, SIGNAL(triggered()), 
- 	    this, SLOT(rebuildIndex()));
--    connect(fileEraseDocHistoryAction, SIGNAL(activated()), 
-+    connect(fileEraseDocHistoryAction, SIGNAL(triggered()), 
- 	    this, SLOT(eraseDocHistory()));
--    connect(fileEraseSearchHistoryAction, SIGNAL(activated()), 
-+    connect(fileEraseSearchHistoryAction, SIGNAL(triggered()), 
- 	    this, SLOT(eraseSearchHistory()));
--    connect(helpAbout_RecollAction, SIGNAL(activated()), 
-+    connect(helpAbout_RecollAction, SIGNAL(triggered()), 
- 	    this, SLOT(showAboutDialog()));
--    connect(showMissingHelpers_Action, SIGNAL(activated()), 
-+    connect(showMissingHelpers_Action, SIGNAL(triggered()), 
- 	    this, SLOT(showMissingHelpers()));
--    connect(showActiveTypes_Action, SIGNAL(activated()), 
-+    connect(showActiveTypes_Action, SIGNAL(triggered()), 
- 	    this, SLOT(showActiveTypes()));
--    connect(userManualAction, SIGNAL(activated()), 
-+    connect(userManualAction, SIGNAL(triggered()), 
- 	    this, SLOT(startManual()));
--    connect(toolsDoc_HistoryAction, SIGNAL(activated()), 
-+    connect(toolsDoc_HistoryAction, SIGNAL(triggered()), 
- 	    this, SLOT(showDocHistory()));
--    connect(toolsAdvanced_SearchAction, SIGNAL(activated()), 
-+    connect(toolsAdvanced_SearchAction, SIGNAL(triggered()), 
- 	    this, SLOT(showAdvSearchDialog()));
--    connect(toolsSpellAction, SIGNAL(activated()), 
-+    connect(toolsSpellAction, SIGNAL(triggered()), 
- 	    this, SLOT(showSpellDialog()));
--    connect(indexConfigAction, SIGNAL(activated()), 
-+    connect(indexConfigAction, SIGNAL(triggered()), 
- 	    this, SLOT(showIndexConfig()));
--    connect(indexScheduleAction, SIGNAL(activated()), 
-+    connect(indexScheduleAction, SIGNAL(triggered()), 
- 	    this, SLOT(showIndexSched()));
--    connect(queryPrefsAction, SIGNAL(activated()), 
-+    connect(queryPrefsAction, SIGNAL(triggered()), 
- 	    this, SLOT(showUIPrefs()));
--    connect(extIdxAction, SIGNAL(activated()), 
-+    connect(extIdxAction, SIGNAL(triggered()), 
- 	    this, SLOT(showExtIdxDialog()));
- 
-     if (prefs.catgToolBar && catgCMB)
- 	connect(catgCMB, SIGNAL(activated(int)), 
- 		this, SLOT(catgFilter(int)));
--    connect(toggleFullScreenAction, SIGNAL(activated()), 
-+    connect(toggleFullScreenAction, SIGNAL(triggered()), 
-             this, SLOT(toggleFullScreen()));
--    connect(actionShowQueryDetails, SIGNAL(activated()),
-+    connect(actionShowQueryDetails, SIGNAL(triggered()),
- 	    reslist, SLOT(showQueryDetails()));
-     connect(periodictimer, SIGNAL(timeout()), 
- 	    this, SLOT(periodic100()));
- 
-     restable->setRclMain(this, true);
--    connect(actionSaveResultsAsCSV, SIGNAL(activated()), 
-+    connect(actionSaveResultsAsCSV, SIGNAL(triggered()), 
- 	    restable, SLOT(saveAsCSV()));
-     connect(this, SIGNAL(docSourceChanged(RefCntr<DocSequence>)),
- 	    restable, SLOT(setDocSource(RefCntr<DocSequence>)));
-@@ -309,11 +309,11 @@
-     reslist->setRclMain(this, true);
-     connect(this, SIGNAL(docSourceChanged(RefCntr<DocSequence>)),
- 	    reslist, SLOT(setDocSource(RefCntr<DocSequence>)));
--    connect(firstPageAction, SIGNAL(activated()), 
-+    connect(firstPageAction, SIGNAL(triggered()), 
- 	    reslist, SLOT(resultPageFirst()));
--    connect(prevPageAction, SIGNAL(activated()), 
-+    connect(prevPageAction, SIGNAL(triggered()), 
- 	    reslist, SLOT(resPageUpOrBack()));
--    connect(nextPageAction, SIGNAL(activated()),
-+    connect(nextPageAction, SIGNAL(triggered()),
- 	    reslist, SLOT(resPageDownOrNext()));
-     connect(this, SIGNAL(searchReset()), 
- 	    reslist, SLOT(resetList()));

Deleted: trunk/dports/textproc/recoll/files/patch-recollinstall.diff
===================================================================
--- trunk/dports/textproc/recoll/files/patch-recollinstall.diff	2014-02-03 14:57:16 UTC (rev 116687)
+++ trunk/dports/textproc/recoll/files/patch-recollinstall.diff	2014-02-03 16:42:25 UTC (rev 116688)
@@ -1,62 +0,0 @@
-# HG changeset patch
-# User Jean-Francois Dockes <jfd@recoll.org>
-# Date 1381232776 -7200
-# Node ID 65a7041abbe6e64f6597d5cf27690e91014a85d4
-# Parent  0adf8145feafe2808202ba8c4cd73e4bac66acd8
-autoconfig out things that dont work currently on mac os x
-
-diff --git a/src/configure.ac b/src/configure.ac
---- configure.ac
-+++ configure.ac
-@@ -21,6 +21,12 @@
- fi
- (cd mk; rm -f sysconf; ln -s $sys sysconf)
- 
-+# There a few Recoll users on Mac OS X and a few things are just not worth
-+# supporting
-+if test X$sys = XDarwin ; then
-+   NODYNLIB=#
-+fi
-+
- AC_SYS_LARGEFILE
- 
- # OpenBSD needs sys/param.h for mount.h to compile
-@@ -219,6 +225,7 @@
- #   configure --disable-python-module; make; make install;make clean
- #   configure; make; cd python/recoll; make install
- #
-+if test X$sys != XDarwin ; then
- AC_ARG_ENABLE(python-module,
-     AC_HELP_STRING([--disable-python-module],
-    [Do not build the Python module.]),
-@@ -228,6 +235,9 @@
- else
-   NOPYTHON="#"
- fi
-+else
-+  NOPYTHON="#"
-+fi
- 
- # Build PIC objects for the library ?
- AC_ARG_ENABLE(pic,
-@@ -562,6 +572,7 @@
- AC_SUBST(NOPIC)
- AC_SUBST(NOTHREADS)
- AC_SUBST(NOPYTHON)
-+AC_SUBST(NODYNLIB)
- AC_SUBST(RCLVERSION)
- AC_SUBST(RCLLIBVERSION)
- 
-diff --git a/src/recollinstall.in b/src/recollinstall.in
---- recollinstall.in
-+++ recollinstall.in
-@@ -117,7 +117,8 @@
- ${INSTALL} -m 0755 index/recollindex ${bindir} || exit 1
- ${STRIP} ${bindir}/recollindex
- 
--${INSTALL} -m 0644 lib/librecoll.so.${RCLLIBVERSION} ${libdir}/recoll/ || exit 1
-+@NODYNLIB@${INSTALL} -m 0644 lib/librecoll.so.${RCLLIBVERSION} \
-+@NODYNLIB@    ${libdir}/recoll/ || exit 1
- 
- ${INSTALL} -m 0755 filters/rcl* ${datadir}/recoll/filters/ || exit 1
- for f in rclexecm.py rcllatinstops.zip;do

    

macsforever2000＠macports.org

tags

participants (1)