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

@@ -1,3 +1,7 @@
+2003-05-26  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* boost/config/compiler/gcc.hpp: accept gcc 3.3 as valid compiler
+
 2003-03-31  Adrian Bunk  <bunk@fs.tum.de>
 
 	* boost/integer_traits.hpp: compilation fix for NetBSD

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

config/ChangeLog

@@ -1,3 +1,8 @@
+2003-05-26  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* relyx_configure.ac: 
+	* relyx_configure.in: add AM_MAINTAINER_MODE here too.
+
 2003-05-06  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* configure.in (VERSION): 

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[=<version>]  install lyx files as lyx<version>],
   [lyxname="lyx$withval"

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[=<version>]  install lyx files as lyx<version>],
   [lyxname="lyx$withval"

po/ChangeLog

@@ -1,3 +1,8 @@
+2003-05-27  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* Makefile.in.in (POTFILES.in): make sure that the sorting order
+	is fixed.
+
 2003-04-30  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* *.po: remerge.

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 $@
 
 

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

src/frontends/qt2/ChangeLog

@@ -1,3 +1,8 @@
+2003-04-29  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* QPrefs.C (apply): only set colors if they are different from
+	their original values (bug 1069)
+
 2003-05-26  John Levon  <levon@movementarian.org>
 
 	* Toolbar_pimpl.C: work around Qt 3.1.2 bug with combo box

src/frontends/qt2/QPrefs.C

@@ -269,19 +269,19 @@ void QPrefs::apply()
 		QListBoxItem * ib(colmod->lyxObjectsLB->item(i));
 		QColorItem * ci(static_cast<QColorItem*>(ib));
 
-		ostringstream ostr;
+		LColor::color const col(dialog_->colors_[i]);
-
+		QColor const qcol(toqstr(lcolor.getX11Name(col)));
-		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]);
 
 		// 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);
 		}
 	}

src/frontends/xforms/ChangeLog

@@ -1,3 +1,8 @@
+2003-05-26  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
+
+	* forms/Makefile.am (EXTRA_DIST): do not forget to distribute
+	c_str.sed. 
+
 2003-04-09  Angus Leeming  <leeming@lyx.org>
 
 	* FormAboutlyx.C:

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
 

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