From 9d9e8242213551c2a7cd27930dace1d4dacf38e2 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Wed, 3 Feb 2010 08:01:20 +0100 Subject: [PATCH] none --- .hgignore | 6 ++- .hgtags | 18 ------- src/ChangeLog | 140 ++++++++++++++++++++++++++++++++++++++++++++++++-- src/VERSION | 2 +- src/configure | 8 ++- 5 files changed, 148 insertions(+), 26 deletions(-) diff --git a/.hgignore b/.hgignore index 011146d3..3377c450 100644 --- a/.hgignore +++ b/.hgignore @@ -68,8 +68,12 @@ src/qt4gui/sort.ui src/qt4gui/ssearchb.ui src/qt4gui/uiprefs.ui src/qt4gui/viewaction.ui -src/qtgui/recoll.pro +src/qtgui/.moc/* +src/qtgui/.ui/* +src/qtgui/Makefile src/qtgui/i18n/*.qm +src/qtgui/recoll +src/qtgui/recoll.pro src/query/alldeps src/recollinstall src/sampleconf/recoll.conf diff --git a/.hgtags b/.hgtags index 1ddd50b0..e7fb271b 100644 --- a/.hgtags +++ b/.hgtags @@ -4,17 +4,11 @@ 08f9ad818cb32459f6db286a427f8272b84d92e3 RECOLL-1_02 09b3a24a6173422f0df1aa39779d97c19525482b RECOLL-1_2_0 0cb7e71bae23c58bbab35bc00bd0d65c2d47bc13 RECOLL_1_6_2 -0d0fec69b4e43b1cc3ebbf9e271d8a67cdfa4a4f MAPSTRMAPSTRSTR -0fccf51c690564c1a544383783ced75e5a266ac9 RECOLL-1_3_1pre3 -17eefeb77500a22c4a3187805ca2fbfff7532adb RECOLL_1_9_1cjk1 -17eefeb77500a22c4a3187805ca2fbfff7532adb RECOLL_1_9_1cjk2 -1d040e634db3cf80db5391587742e4319b3e9dbe RECOLL_1_12_1exp4 2321044edfb958b0e954f46093d5a97746a7dc6a RECOLL_1_11_0 2bc00fbf6f7410d4415f2b0f0071a0af44e19a05 RECOLL_1_11_1 2dfd16f6a9a400334a8be45fa37e7136b3dea15f RECOLL-1_1_0 315da01fb1a5136d4fd37ab9885c7d9acec094ce RECOLL-1_3_1 316be4674f61763a58ed73024a9c84e2c43e010c RECOLL_1_11_2 -33a7fbc42386b629c1a044fb55b91604e21906d1 RECOLL_1_12_1exp5 3d3b528e42cdabf5ea4a87f71ee5b98718d38346 XAPIAN_0_8_5 408a2650e9638b6467414bc051bc96289c4ddae3 RECOLL-0_6 44d2b5d58ac672e445c3bfdc853c9b2ee4a068de RECOLL_1_7_1 @@ -22,10 +16,8 @@ 47c04f4507d05db54e32c7fd68df14a03c38a3a6 RECOLL-1_04 4ab20caea1427d5f74817b41dfe2034a2e273b6b RECOLL-1_4_3 4c957598f6fd9fdac32f08846c4a767782747332 RECOLL-1_0_6 -50553b4f8d29c5bc2612e2c2cf2e1bcd494dd99c T1_2 581a47458445db967058750eb7a2ae77ce70ffb4 RECOLL_1_12_0 615a70a64b94c700969023fccd2020deeec7c769 RECOLL_1_9_0 -624a100107be28fcf9cdab1c2198f8612382658f RECOLL_1_9_1cjk 63299d3c48a0247462da7d0086db51bcc6557b4c XAPIAN_0_8_3 6334369f13f19344a575c397b7b3b8f8eb271c9d RECOLL_1_10_4 6551cb55fa9810f1ae062929a280729b38b6aedc RECOLL_1_10_3 @@ -35,15 +27,10 @@ 76128d18110ef949c7a30a85752323abf0712587 RECOLL_1_13_0 76128d18110ef949c7a30a85752323abf0712587 RECOLL_1_13_00 76128d18110ef949c7a30a85752323abf0712587 RECOLL_1_13_01 -76128d18110ef949c7a30a85752323abf0712587 RECOLL_20091214 -7756d792699dd8bd1b80ebf3482fe8fc30151de8 RECOLL_1_11_1exp -7756d792699dd8bd1b80ebf3482fe8fc30151de8 RECOLL_1_11_1exp1 -7756d792699dd8bd1b80ebf3482fe8fc30151de8 RECOLL_1_11_1exp2 7e0aab848f91b37ecd7cd4b44c5532f9b8f3a995 RECOLL-1_0_10 7e0c3c6c72c9604bc000fcfdd373b5a15bfb834a RECOLL_1_12_4 813c82bcc95168a87c85e55a32d2cd4e752a8e68 RECOLL_1_8_1 817cdab71c1c95977be1ed3c19f50c81c8a26df5 RECOLL_1_8_0 -82a8924fff4e5521e8961b5b723fa724d36042db MERGED_TO_TRUNK_20061130 86db72b8149526693df1325cd507b75844d906c2 RECOLL_1_11_4 8731b62606fee53410e364259e20c641693c77ee RECOLL-1_5_3 8731b62606fee53410e364259e20c641693c77ee RECOLL-1_5_4 @@ -52,7 +39,6 @@ 8731b62606fee53410e364259e20c641693c77ee RECOLL-1_5_7 8731b62606fee53410e364259e20c641693c77ee RECOLL-1_5_8 88649af9a0acb7b30e006ef6f5d468e594107324 RECOLL-1_0_7 -89efa1c78c3c3bf9224b6294643d4d898ddf1b28 RECOLL-1_3_1pre2 916d6e831996321f158c89bc907c2eb1231c9697 RECOLL_1_7_2 9583ff723edfb2c865ee975bffe66361a9fb7186 RECOLL_1_7_3 983d0984e972fed6c15e024654ac851c9af0fe40 RECOLL-1_2_3 @@ -61,7 +47,6 @@ 9c5262b1e2b8cb2e0940c994973c6dd517da7b8f RECOLL_1_7_5 9c57d53ad305b8246c51f166a591a2861e15e9c4 RECOLL_1_10_0 a0bde5fbc55b5f59376ed64604ef22f7403cf2e3 RECOLL-1_0_5 -a3f25963b2da2df6f40d8f11224505c89f7697e1 RECOLL_1_11_1exp3 a44bf0c6a08118a357d2e808c9828e46a1038ca7 RECOLL-1_0_14 a4deac6ede774ec325e52dad5a2f65445b35bb6c RECOLL-1_2_1 aa96f79453e14ea77e00db731de0809825e80014 RECOLL_1_12_1 @@ -80,8 +65,6 @@ c28ce98d3e458635192aaaf4867e91cce9270c7e RECOLL_1_7_6 c2f3b36a7169413ee5a3ea5f54e8f907046bf48f RECOLL-1_2_2 d5ccf5480db1a0e1006fbe45c0c99b89550d763b RECOLL-1_03 dd11cd309adcd9937d7c57ad51fe6136821f9b9d RECOLL_1_11_3 -dd4f283c9753eb83691639de5c4a9ae3de252094 BEFORE_Dijon20061215 -ddb66052e3e88b046663c4f32e45e2e00dd6e626 RECOLL-1_4_0pre1 e42dca990bea2b3156524f9428fbe31d39022396 RECOLL_1_7_0 e648af00d2f57eecccc5e491824b589debc81069 RECOLL-1_5_10 e648af00d2f57eecccc5e491824b589debc81069 RECOLL-1_5_9 @@ -89,7 +72,6 @@ e66dba4d628c32b6d031a4d73365de5078088e8a RECOLL-1_0_13 ee3b9b5923845cc2ad7013f12910c3671e8db83b RECOLL-1_0_15 eef792b97ce858277b83ded972666573bfb9170d RECOLL-1_3_2 f247e019bf08179d4d6aba8b1c661fb61d5f9f65 RECOLL_1_6_0 -f27aa43e32efee4eccaf016c863d10f4c580abc3 UNAC_1_7_0 f4dafb4bd9cbc7095c6daf818c2f5a279de02647 RECOLL-1_5_11 f86a13484788e8ab1724927f0d564192ff9fcb1e RECOLL_1_6_1 fa3ad0590138b9e95a54e145ad0228702c80ab79 RECOLL-0_5 diff --git a/src/ChangeLog b/src/ChangeLog index 01269b8f..dd186d2d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,10 +1,140 @@ -2010-01-29 21:05 Israel G. Lugo +2010-02-02 15:33 +0100 Jean-Francois Dockes (d11da0283f03 [tip]) - * configure.ac: Rename without-gui to disable-qtgui and make it - affect only the creation of the GUI. New option disable-x11mon to - provide separate control over X11 session monitoring. + * src/common/textsplit.cpp, src/common/textsplit.h, + src/query/plaintorich.cpp, src/query/recollq.cpp, + src/query/wasatorcl.cpp, src/rcldb/rcldb.cpp, + src/rcldb/searchdata.cpp, src/rcldb/stoplist.cpp, + src/rcldb/stoplist.h: + cosmetics: use derived class for actual splitter instead of callback -2010-01-28 18:22 +0100 Jean-Francois Dockes (45e7ec5e16c5 [tip]) +2010-02-02 10:24 +0100 Jean-Francois Dockes (a8caf709bcd3) + + * src/qt4gui/rclmain.ui, src/qtgui/rclmain.ui, + src/qtgui/rclmain_w.cpp: + QT GUI: define accelerators for res list page movements + +2010-02-02 08:20 +0100 Jean-Francois Dockes (ec31e285a553) + + * src/qtgui/reslist.cpp, src/query/reslistpager.h: + Qt GUI: ensure that new page size is taken into account ASAP (no + need for restarting app) + +2010-02-01 17:51 +0100 Jean-Francois Dockes (db953bb94c7f) + + * src/qt4gui/rclmain.ui, src/qtgui/preview_w.cpp, + src/qtgui/rclmain.ui, src/qtgui/rclmain_w.cpp, + src/qtgui/rclmain_w.h: + QT GUI: add fullscreen mode + +2010-02-01 10:31 +0100 Jean-Francois Dockes (1eda55ae3be9) + + * src/mk/manifest.txt: new file. + * src/excludefile, src/makesrcdist.sh, src/mk/manifest.txt: + Making a source dist: check the new list against old reference + + other checks + +2010-01-31 19:53 +0100 Israel G. Lugo (74d4e25d43c2) + + * src/recollinstall.in: + Install recollq and its manpage when in cmdline mode. Don't install + the recoll.1 manpage when in cmdline mode. + +2010-01-31 19:47 +0100 Jean-Francois Dockes (c88b0ef40512) + + * src/common/autoconfig.h.in: + use 3-arg version of ac_define as the 1-arg one is being obsoleted + +2010-01-31 19:45 +0100 Jean-Francois Dockes (1960435ccb68) + + * src/configure.ac: + Dispense with the x11-monitoring when neither fam nor inotify are + configured + +2010-01-31 19:35 +0100 Jean-Francois Dockes (08e6abfc5fdf) + + * src/configure.ac: + use 3-arg version of ac_define as the 1-arg one is being obsoleted + +2010-01-31 19:34 +0100 Jean-Francois Dockes (c0add9dd8ad4) + + * website/download.html: + none + +2010-01-30 17:47 +0100 Jean-Francois Dockes (5ed138ff2230) + + * src/qtgui/spell_w.cpp, src/qtgui/spell_w.h: + QT GUI: fix small problems in newly native qt4 term expander + +2010-01-30 17:31 +0100 Jean-Francois Dockes (6ecf959a8e01) + + * src/qt4gui/spell.ui: new file. + * src/qt4gui/recollmain.ui: deleted file. + * .hgignore, src/qt4gui/recollmain.ui, src/qt4gui/spell.ui, + src/qt4gui/uifrom3, src/qtgui/spell_w.cpp, src/qtgui/spell_w.h: + QT GUI: converted the qt4 term expander dialog to native qt4 + +2010-01-30 14:09 +0100 Jean-Francois Dockes (df8a91aaff88) + + * src/qt4gui/rclmain.ui: new file. + * .hgignore, src/qt4gui/rclmain.ui, src/qt4gui/uifrom3, + src/qtgui/confgui/confguiindex.h, src/qtgui/rclmain_w.cpp, + src/qtgui/rclmain_w.h: + Qt GUI: made the Qt4 main window native Qt4 (no more use of + Q3MainWindow) + +2010-01-30 08:23 +0100 Jean-Francois Dockes (ed18703563b7) + + * .hgignore, src/ChangeLog, website/BUGS.html, website/devel.html, + website/doc.html, website/download.html, website/index.html.en: + none + +2010-01-30 08:23 +0100 Jean-Francois Dockes (22044a3b2e2c) + + * src/qtgui/rclmain_w.h: + Qt 4.6.1 Uic bug: change qt version test from == to <= as bug still + here in 4.6.2 + +2010-01-30 08:21 +0100 Jean-Francois Dockes (b1cb8c664953) + + * src/common/autoconfig.h.in, src/configure, src/configure.ac, + src/index/recollindex.cpp, src/utils/x11mon.cpp: + Renamed WITHOUT_X11 to DISABLE_X11MON for clarification + +2010-01-30 08:18 +0100 Israel G. Lugo (be03b72e1258) + + * src/configure.ac: + Rename option without-gui to disable-qtgui. New option disable- + x11mon. Separate control of creation of the gui and X11 session + monitoring. + +2010-01-29 19:00 +0100 Jean-Francois Dockes (d95c21312a15) + + * src/kde/kioslave/recoll/CMakeLists.txt: + KIO slave: fixed CMakeList to configure Recoll with --enable-pic + +2010-01-29 17:22 +0100 Jean-Francois Dockes (266941720a99) + + * src/python/README.txt: new file. + * src/configure, src/configure.ac, src/doc/user/usermanual.sgml, + src/lib/Makefile, src/lib/mkMake, src/mk/commondefs, + src/mk/localdefs.in, src/php/00README.txt, src/python/README.txt, + src/python/recoll/setup.py: + Implemented configure --enable-pic flag to build the main lib with + position-independant objects. This avoids having to edit localdefs + by hand to build the new php extension, and voids the need for the + Python module to recompile Recoll source files. + +2010-01-29 15:47 +0100 Jean-Francois Dockes (69c42078b8d3) + + * src/php/00README.txt: new file. + * src/php/00README.txt, src/php/recoll/make.sh, + src/php/recoll/recoll.cpp: + PHP extension by Wenqiang Song : make ready for external use. + - added minimal doc + - fixed build script to work around php/libtool issue + - have the module default to Query Language (instead of AND) + +2010-01-28 18:22 +0100 Jean-Francois Dockes (45e7ec5e16c5) * .hgignore, website/usermanual/README-dir.txt: new file. * packaging/debian/changelog, packaging/debian/compat, diff --git a/src/VERSION b/src/VERSION index 86658e43..d1dd6511 100644 --- a/src/VERSION +++ b/src/VERSION @@ -1 +1 @@ -1.13.02 +1.13.03 diff --git a/src/configure b/src/configure index 1e0f94f2..7f3ef96c 100755 --- a/src/configure +++ b/src/configure @@ -3643,7 +3643,8 @@ _ACEOF # Can't use Solaris standard 'file' command, it doesn't support -i if test X$sys != XSunOS -o X$fileProg != X/usr/bin/file; then - cat >>confdefs.h <<\_ACEOF + +cat >>confdefs.h <<\_ACEOF #define USE_SYSTEM_FILE_COMMAND 1 _ACEOF @@ -5015,6 +5016,11 @@ else enableX11mon="yes" fi + +if test X$withInotify = Xno -a X$withFam = Xno ; then + enableX11mon=no +fi + if test "$enableX11mon" = "yes" ; then ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS'