Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 228267 Details for
Bug 171271
New ebuild: app-misc/recoll-1.16.0
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
new x11mon configure option, fix installation of cmdline tool
recoll-1.13.04-gentoo1.patch (text/plain), 4.08 KB, created by
Israel G. Lugo
on 2010-04-18 13:34:34 UTC
(
hide
)
Description:
new x11mon configure option, fix installation of cmdline tool
Filename:
MIME Type:
Creator:
Israel G. Lugo
Created:
2010-04-18 13:34:34 UTC
Size:
4.08 KB
patch
obsolete
>diff -dur recoll-1.13.04/ChangeLog recoll-1.13.04-gentoo1/ChangeLog >--- recoll-1.13.04/ChangeLog 2010-01-30 07:58:57.000000000 +0000 >+++ recoll-1.13.04-gentoo1/ChangeLog 2010-04-18 13:41:37.000000000 +0100 >@@ -1,3 +1,14 @@ >+2010-04-18 13:41 Israel G. Lugo <israel.lugo@lugosys.com> >+ >+ * * recollinstall.in: Install recollq and its manpage when in cmdline >+ mode. Don't install the recoll.1 manpage when in cmdline mode. >+ >+2010-04-18 13:34 Israel G. Lugo <israel.lugo@lugosys.com> >+ >+ * 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. >+ > 2009-12-07 17:43 dockes > > * qtgui/preview_w.cpp, qtgui/preview_w.h: reimplemented >diff -dur recoll-1.13.04/configure.ac recoll-1.13.04-gentoo1/configure.ac >--- recoll-1.13.04/configure.ac 2010-03-22 15:38:00.000000000 +0000 >+++ recoll-1.13.04-gentoo1/configure.ac 2010-04-18 13:34:09.000000000 +0100 >@@ -278,13 +278,12 @@ > # If QMAKESPEC is not set and needed, the qmake test at the previous test > # will have failed, and we tell the user to check his environment. > # >-AC_ARG_WITH(gui, >- AC_HELP_STRING([--without-gui], >- [Disable the QT user interface and auxiliary x11 uses.]), >- withQT=$withval, withQT="yes") >+AC_ARG_ENABLE(qtgui, >+ AC_HELP_STRING([--disable-qtgui], >+ [Disable the QT-based graphical user interface.]), >+ enableQT=$enableval, enableQT="yes") > >-if test "$withQT" != "yes" ; then >- AC_DEFINE(WITHOUT_X11) >+if test "$enableQT" != "yes" ; then > NOQTMAKE="#" > NOCMDLINE="" > else >@@ -362,11 +361,15 @@ > > > ### X11: this is needed for the session monitoring code (in recollindex -m) >-# We disable it if without-gui has been specified, but it could be separated >-if test "$withQT" = "yes" ; then >+AC_ARG_ENABLE(x11mon, >+ AC_HELP_STRING([--disable-x11mon], >+ [Disable recollindex support for X11 session monitoring.]), >+ enableX11mon=$enableval, enableX11mon="yes") >+if test "$enableX11mon" = "yes" ; then > AC_PATH_XTRA > X_LIBX11=-lX11 > else >+ AC_DEFINE(WITHOUT_X11, 1, [No X11 session monitoring support]) > X_LIBX11="" > fi > #echo X_CFLAGS "'$X_CFLAGS'" X_PRE_LIBS "'$X_PRE_LIBS'" X_LIBS \ >diff -dur recoll-1.13.04/recollinstall.in recoll-1.13.04-gentoo1/recollinstall.in >--- recoll-1.13.04/recollinstall.in 2010-02-12 10:16:11.000000000 +0000 >+++ recoll-1.13.04-gentoo1/recollinstall.in 2010-04-18 13:40:06.000000000 +0100 >@@ -60,7 +60,6 @@ > ${bindir} \ > ${mandir}/man1 \ > ${mandir}/man5 \ >- ${datadir}/applications \ > ${datadir}/icons \ > ${datadir}/recoll/doc \ > ${datadir}/recoll/examples \ >@@ -73,23 +72,32 @@ > test -d $d || mkdir -p $d || exit 1 > done > >+@NOQTMAKE@test -d ${datadir}/applications \ >+@NOQTMAKE@ || mkdir -p ${datadir}/applications || exit 1 >+ >+ > # Use the xdg utilies to install the desktop file and icon? Couldn't find > # out how to get this to work sanely. So keep the old way > #PATH=$PATH:desktop/xdg-utils-1.0.1/scripts > #export PATH > #xdg-desktop-menu install desktop/recoll-searchgui.desktop > #xdg-icon-resource install --size 48 desktop/recoll.png >-${INSTALL} -m 0444 desktop/recoll-searchgui.desktop ${datadir}/applications >+@NOQTMAKE@${INSTALL} -m 0444 desktop/recoll-searchgui.desktop ${datadir}/applications > ${INSTALL} -m 0444 desktop/recoll.png ${datadir}/icons/hicolor/48x48/apps > ${INSTALL} -m 0444 desktop/recoll.png ${datadir}/pixmaps/ > > ${INSTALL} -m 0444 doc/user/usermanual.html doc/user/docbook.css \ > ${datadir}/recoll/doc >-${INSTALL} -m 0444 doc/man/recoll.1 doc/man/recollindex.1 ${mandir}/man1/ >+@NOQTMAKE@${INSTALL} -m 0444 doc/man/recoll.1 ${mandir}/man1/ >+@NOCMDLINE@${INSTALL} -m 0444 doc/man/recollq.1 ${mandir}/man1/ >+${INSTALL} -m 0444 doc/man/recollindex.1 ${mandir}/man1/ > ${INSTALL} -m 0444 doc/man/recoll.conf.5 ${mandir}/man5/ > > @NOQTMAKE@${INSTALL} -m 0755 ${RECOLLPROG} ${bindir} || exit 1 > @NOQTMAKE@${STRIP} ${bindir}/recoll >+@NOCMDLINE@${INSTALL} -m 0755 query/recollq ${bindir} || exit 1 >+@NOCMDLINE@${STRIP} ${bindir}/recollq >+ > ${INSTALL} -m 0755 index/recollindex ${bindir} || exit 1 > ${STRIP} ${bindir}/recollindex >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 171271
:
113595
|
118446
|
138189
|
144986
|
166596
|
166598
|
181846
|
183148
|
206807
|
210592
|
210639
|
211547
|
211548
|
211594
|
211605
|
217947
|
217948
| 228267 |
228269
|
238331
|
260272
|
272949
|
277845