[LyX master] Do not error out if -geometry is used with QPA_XCB defined.

[Richard Kimberly Heck]

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 88e739b44b5c4a23c5e64cf470c0fb49a7bcbd6c
Author: Richard Kimberly Heck <rikiheck at lyx.org>
Date:   Fri Feb 9 20:33:18 2024 -0500

    Do not error out if -geometry is used with QPA_XCB defined.

diff --git a/src/LyX.cpp b/src/LyX.cpp
index d077771b8d..20201f41d7 100644
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -1365,9 +1365,14 @@ int parse_import(string const & type, string const & file, string & batch)
 int parse_geometry(string const & arg1, string const &, string &)
 {
 	geometryArg = arg1;
+#if !defined(QPA_XCB)
 	// don't remove "-geometry", it will be pruned out later in the
 	// frontend if need be.
 	return -1;
+#else
+	// but that is only done if QPA_XCB is not defined.
+	return 0;
+#endif
 }
 
 

commit 3fefd64eae3fef3ea72bf244cb72049b1d6c34a3
Author: Richard Kimberly Heck <rikiheck at lyx.org>
Date:   Fri Feb 9 20:34:03 2024 -0500

    Back to devel again

diff --git a/configure.ac b/configure.ac
index d8c922ad37..8c4f1bfbe1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT([LyX],[2.4.0~RC3],[lyx-devel at lists.lyx.org],[lyx])
+AC_INIT([LyX],[2.4.0~devel],[lyx-devel at lists.lyx.org],[lyx])
 AC_PRESERVE_HELP_ORDER
 # Use ISO format only. The frontend needs to parse this
 AC_SUBST(LYX_DATE, ["2024-02-09"])

commit c34b0e179dd8a15bba4b73f5905d2bbe57f49d6e
Author: Richard Kimberly Heck <rikiheck at lyx.org>
Date:   Fri Feb 9 19:57:05 2024 -0500

    RC3

diff --git a/configure.ac b/configure.ac
index 6996bc2317..d8c922ad37 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
-AC_INIT([LyX],[2.4.0~devel],[lyx-devel at lists.lyx.org],[lyx])
+AC_INIT([LyX],[2.4.0~RC3],[lyx-devel at lists.lyx.org],[lyx])
 AC_PRESERVE_HELP_ORDER
 # Use ISO format only. The frontend needs to parse this
-AC_SUBST(LYX_DATE, ["2024-02-04"])
+AC_SUBST(LYX_DATE, ["2024-02-09"])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])

-----------------------------------------------------------------------

Summary of changes:
 configure.ac | 2 +-
 src/LyX.cpp  | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The LyX Source Repository