From 7fbe351fd5e54b5b9babe0c778c2ad85a33f56e3 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 27 May 2003 12:45:52 +0000 Subject: [PATCH] fix boost compilation with gcc 3.3 ; fix dependency problems in patch ; fix writing of color entries in qt prefs (bug 1069) ; make sorting order in POTFILES locale-independent git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@7050 a592a061-630c-0410-9148-cb99ea01b6c8 --- boost/ChangeLog | 4 ++++ boost/boost/config/compiler/gcc.hpp | 2 +- config/ChangeLog | 5 +++++ config/relyx_configure.ac | 2 ++ config/relyx_configure.in | 2 ++ po/ChangeLog | 5 +++++ po/Makefile.in.in | 2 +- po/POTFILES.in | 1 + src/frontends/qt2/ChangeLog | 5 +++++ src/frontends/qt2/QPrefs.C | 22 +++++++++++----------- src/frontends/xforms/ChangeLog | 5 +++++ src/frontends/xforms/forms/Makefile.am | 2 +- status.13x | 12 +++++++++++- 13 files changed, 54 insertions(+), 15 deletions(-) diff --git a/boost/ChangeLog b/boost/ChangeLog index 499ffb0d8d..1d6bbc5752 100644 --- a/boost/ChangeLog +++ b/boost/ChangeLog @@ -1,3 +1,7 @@ +2003-05-26 Jean-Marc Lasgouttes + + * boost/config/compiler/gcc.hpp: accept gcc 3.3 as valid compiler + 2003-03-31 Adrian Bunk * boost/integer_traits.hpp: compilation fix for NetBSD diff --git a/boost/boost/config/compiler/gcc.hpp b/boost/boost/config/compiler/gcc.hpp index f8dc97f703..93e4e94e6b 100644 --- a/boost/boost/config/compiler/gcc.hpp +++ b/boost/boost/config/compiler/gcc.hpp @@ -50,7 +50,7 @@ #endif // // last known and checked version is 3.2: -#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 2)) +#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3)) # if defined(BOOST_ASSERT_CONFIG) # error "Unknown compiler version - please run the configure tests and report the results" # else diff --git a/config/ChangeLog b/config/ChangeLog index 4313465680..13d46f4e66 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,8 @@ +2003-05-26 Jean-Marc Lasgouttes + + * relyx_configure.ac: + * relyx_configure.in: add AM_MAINTAINER_MODE here too. + 2003-05-06 Jean-Marc Lasgouttes * configure.in (VERSION): diff --git a/config/relyx_configure.ac b/config/relyx_configure.ac index 4e0c64a5af..dcc4fe9f65 100644 --- a/config/relyx_configure.ac +++ b/config/relyx_configure.ac @@ -7,6 +7,8 @@ AC_CONFIG_AUX_DIR(../../config) dnl PACKAGE=reLyX dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX +AM_MAINTAINER_MODE + AC_ARG_WITH(version-suffix, [ --with-version-suffix[=] install lyx files as lyx], [lyxname="lyx$withval" diff --git a/config/relyx_configure.in b/config/relyx_configure.in index 41946e7588..d3f9cc5acb 100644 --- a/config/relyx_configure.in +++ b/config/relyx_configure.in @@ -7,6 +7,8 @@ AC_EXEEXT dnl PACKAGE=reLyX dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX +AM_MAINTAINER_MODE + AC_ARG_WITH(version-suffix, [ --with-version-suffix[=] install lyx files as lyx], [lyxname="lyx$withval" diff --git a/po/ChangeLog b/po/ChangeLog index fe8441c723..9537d39c63 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,8 @@ +2003-05-27 Jean-Marc Lasgouttes + + * Makefile.in.in (POTFILES.in): make sure that the sorting order + is fixed. + 2003-04-30 Jean-Marc Lasgouttes * *.po: remerge. diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 2802a8808c..89b68d225f 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -201,7 +201,7 @@ ${srcdir}/POTFILES.in: $(POTFILE_IN_DEPS) && ( cd $(top_srcdir); \ grep -l "_(\".*\")" `find src -name \*.[hHC] -print` |\ sed -e '/xforms.forms/d' | \ - sort | uniq ) > $@-t \ + LC_COLLATE=C sort | uniq ) > $@-t \ && mv $@-t $@ diff --git a/po/POTFILES.in b/po/POTFILES.in index 5fc56ca9c0..a28e96c823 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -157,6 +157,7 @@ src/insets/insettheorem.C src/insets/insettoc.C src/insets/inseturl.C src/insets/insetwrap.C +src/ispell.C src/kbsequence.C src/language.C src/lengthcommon.C diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index dfa4d31a90..0da827e530 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,8 @@ +2003-04-29 Jean-Marc Lasgouttes + + * QPrefs.C (apply): only set colors if they are different from + their original values (bug 1069) + 2003-05-26 John Levon * Toolbar_pimpl.C: work around Qt 3.1.2 bug with combo box diff --git a/src/frontends/qt2/QPrefs.C b/src/frontends/qt2/QPrefs.C index 2af067bde5..e670897d31 100644 --- a/src/frontends/qt2/QPrefs.C +++ b/src/frontends/qt2/QPrefs.C @@ -269,19 +269,19 @@ void QPrefs::apply() QListBoxItem * ib(colmod->lyxObjectsLB->item(i)); QColorItem * ci(static_cast(ib)); - ostringstream ostr; - - ostr << '#' << std::setbase(16) << setfill('0') - << setw(2) << ci->color().red() - << setw(2) << ci->color().green() - << setw(2) << ci->color().blue(); - - string newhex(STRCONV(ostr.str())); - - LColor::color col(dialog_->colors_[i]); + LColor::color const col(dialog_->colors_[i]); + QColor const qcol(toqstr(lcolor.getX11Name(col))); // FIXME: dubious, but it's what xforms does - if (lcolor.getX11Name(col) != newhex) { + if (qcol != ci->color()) { + ostringstream ostr; + + ostr << '#' << std::setbase(16) << setfill('0') + << setw(2) << ci->color().red() + << setw(2) << ci->color().green() + << setw(2) << ci->color().blue(); + + string newhex(STRCONV(ostr.str())); controller().setColor(col, newhex); } } diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 21504bd6f3..dc8b58f695 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,8 @@ +2003-05-26 Jean-Marc Lasgouttes + + * forms/Makefile.am (EXTRA_DIST): do not forget to distribute + c_str.sed. + 2003-04-09 Angus Leeming * FormAboutlyx.C: diff --git a/src/frontends/xforms/forms/Makefile.am b/src/frontends/xforms/forms/Makefile.am index e81a8a7c4f..93cc4841ec 100644 --- a/src/frontends/xforms/forms/Makefile.am +++ b/src/frontends/xforms/forms/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/config/common.am -EXTRA_DIST = fdfixc.sed fdfixh.sed fdfix.sh README $(SRCS) +EXTRA_DIST = fdfixc.sed fdfixh.sed c_str.sed fdfix.sh README $(SRCS) noinst_LTLIBRARIES = libfdesign.la diff --git a/status.13x b/status.13x index 2c011da279..0868a3a0a3 100644 --- a/status.13x +++ b/status.13x @@ -25,4 +25,14 @@ What's new ** Bug fixes -A Qt 3.1.2 bug with the environment combo box is worked around now [bug #1136] +- work around a Qt 3.1.2 bug with the environment combo box [bug #1136] + +- do not write in preference file the colors which are still at their + default value [bug #1069, Qt only] + +- it was not possible to view the french versions of the Extended and + Customization manual. + +- add missing c_str.sed file in the distribution + +- hopefully really fix problems with patch requiring aclocal-1.6