Accepting request 859999 from Publishing
- Update to 2.3.6.1: - The fix for https://www.lyx.org/trac/ticket/12056, which prevented inclusion of TeX files - Remove 0001-Store-correctly-the-window-position-with-Wayland.patch now part of release OBS-URL: https://build.opensuse.org/request/show/859999 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lyx?expand=0&rev=102
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
c50813ccf8
@ -1,98 +0,0 @@
|
||||
Index: src/frontends/qt4/GuiApplication.cpp
|
||||
===================================================================
|
||||
--- src/frontends/qt4/GuiApplication.cpp (revision dc5eda84b8bb4d4eed09047d1c55a33a8173e746)
|
||||
+++ src/frontends/qt4/GuiApplication.cpp (revision d418b6f4c8207cc84c7a3b890de5aec2c837a672)
|
||||
@@ -1112,4 +1112,27 @@
|
||||
|
||||
|
||||
+#if QT_VERSION < 0x050000
|
||||
+// Emulate platformName() for Qt4
|
||||
+
|
||||
+// FIXME: when ditching this method, remove all tests
|
||||
+// platformName() == "qt4x11"
|
||||
+// in the code
|
||||
+QString GuiApplication::platformName() const
|
||||
+{
|
||||
+# if defined(Q_WS_X11)
|
||||
+ // Note that this one does not really exist
|
||||
+ return "qt4x11";
|
||||
+# elif defined(Q_OS_MAC)
|
||||
+ return "cocoa";
|
||||
+# elif defined(Q_OS_WIN) || defined(Q_CYGWIN_WIN)
|
||||
+ return "windows";
|
||||
+# else
|
||||
+ LYXERR0("Unknown platform!");
|
||||
+ return "unknown";
|
||||
+# endif
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
+
|
||||
double GuiApplication::pixelRatio() const
|
||||
{
|
||||
Index: src/frontends/qt4/GuiApplication.h
|
||||
===================================================================
|
||||
--- src/frontends/qt4/GuiApplication.h (revision b9116e8b81f55ee795ea444ee02ff921bf82606a)
|
||||
+++ src/frontends/qt4/GuiApplication.h (revision d418b6f4c8207cc84c7a3b890de5aec2c837a672)
|
||||
@@ -155,4 +155,9 @@
|
||||
GuiView & view(int id) const;
|
||||
|
||||
+#if (QT_VERSION < 0x050000)
|
||||
+ /// Emulate platformName() for Qt4
|
||||
+ QString platformName() const;
|
||||
+#endif
|
||||
+
|
||||
/// Current ratio between physical pixels and device-independent pixels
|
||||
double pixelRatio() const;
|
||||
Index: src/frontends/qt4/GuiView.cpp
|
||||
===================================================================
|
||||
--- src/frontends/qt4/GuiView.cpp (revision 1ae510b6287d5c96c3f106909c1cc8b0711b6d57)
|
||||
+++ src/frontends/qt4/GuiView.cpp (revision d418b6f4c8207cc84c7a3b890de5aec2c837a672)
|
||||
@@ -751,10 +751,9 @@
|
||||
settings.beginGroup("views");
|
||||
settings.beginGroup(QString::number(id_));
|
||||
-#if defined(Q_WS_X11) || defined(QPA_XCB)
|
||||
- settings.setValue("pos", pos());
|
||||
- settings.setValue("size", size());
|
||||
-#else
|
||||
- settings.setValue("geometry", saveGeometry());
|
||||
-#endif
|
||||
+ if (guiApp->platformName() == "qt4x11" || guiApp->platformName() == "xcb") {
|
||||
+ settings.setValue("pos", pos());
|
||||
+ settings.setValue("size", size());
|
||||
+ } else
|
||||
+ settings.setValue("geometry", saveGeometry());
|
||||
settings.setValue("layout", saveState(0));
|
||||
settings.setValue("icon_size", toqstr(d.iconSize(iconSize())));
|
||||
@@ -796,17 +795,18 @@
|
||||
setIconSize(d.iconSize(settings.value(icon_key).toString()));
|
||||
|
||||
-#if defined(Q_WS_X11) || defined(QPA_XCB)
|
||||
- QPoint pos = settings.value("pos", QPoint(50, 50)).toPoint();
|
||||
- QSize size = settings.value("size", QSize(690, 510)).toSize();
|
||||
- resize(size);
|
||||
- move(pos);
|
||||
-#else
|
||||
- // Work-around for bug #6034: the window ends up in an undetermined
|
||||
- // state when trying to restore a maximized window when it is
|
||||
- // already maximized.
|
||||
- if (!(windowState() & Qt::WindowMaximized))
|
||||
- if (!restoreGeometry(settings.value("geometry").toByteArray()))
|
||||
- setGeometry(50, 50, 690, 510);
|
||||
-#endif
|
||||
+ if (guiApp->platformName() == "qt4x11" || guiApp->platformName() == "xcb") {
|
||||
+ QPoint pos = settings.value("pos", QPoint(50, 50)).toPoint();
|
||||
+ QSize size = settings.value("size", QSize(690, 510)).toSize();
|
||||
+ resize(size);
|
||||
+ move(pos);
|
||||
+ } else {
|
||||
+ // Work-around for bug #6034: the window ends up in an undetermined
|
||||
+ // state when trying to restore a maximized window when it is
|
||||
+ // already maximized.
|
||||
+ if (!(windowState() & Qt::WindowMaximized))
|
||||
+ if (!restoreGeometry(settings.value("geometry").toByteArray()))
|
||||
+ setGeometry(50, 50, 690, 510);
|
||||
+ }
|
||||
+
|
||||
// Make sure layout is correctly oriented.
|
||||
setLayoutDirection(qApp->layoutDirection());
|
||||
3
lyx-2.3.6.1.tar.xz
Normal file
3
lyx-2.3.6.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c6bed2633419898e01a7cc350310d7d934bf591cab7259fc2581aa4c00eafa78
|
||||
size 16242608
|
||||
BIN
lyx-2.3.6.1.tar.xz.sig
Normal file
BIN
lyx-2.3.6.1.tar.xz.sig
Normal file
Binary file not shown.
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6ff6ceae5a10138c5f8fee104eb575182e83584f6e523955fbb1d7ccb9841c98
|
||||
size 16237696
|
||||
Binary file not shown.
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 29 20:00:24 UTC 2020 - Cor Blom <cornelis@solcon.nl>
|
||||
|
||||
- Update to 2.3.6.1:
|
||||
- The fix for https://www.lyx.org/trac/ticket/12056, which prevented
|
||||
inclusion of TeX files
|
||||
- Remove 0001-Store-correctly-the-window-position-with-Wayland.patch
|
||||
now part of release
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 1 08:26:16 UTC 2020 - Cor Blom <cornelis@solcon.nl>
|
||||
|
||||
|
||||
7
lyx.spec
7
lyx.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package lyx
|
||||
#
|
||||
# Copyright (c) 2020 SUSE LLC
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: lyx
|
||||
Version: 2.3.6
|
||||
Version: 2.3.6.1
|
||||
Release: 0
|
||||
Summary: WYSIWYM (What You See Is What You Mean) document processor
|
||||
License: GPL-2.0-or-later
|
||||
@ -36,8 +36,6 @@ Patch0: correct-shebang.patch
|
||||
# PATCH-FIX-UPSTREAM remove_python_shebang.patch mcepl@suse.com
|
||||
# remove all instances of python2 shebang lines
|
||||
Patch1: remove_python_shebang.patch
|
||||
# PATCH-FIX-UPSTREAM see https://www.lyx.org/trac/ticket/11746
|
||||
Patch2: 0001-Store-correctly-the-window-position-with-Wayland.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: bc
|
||||
@ -143,7 +141,6 @@ A collection of Math symbol fonts for LyX.
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p0
|
||||
|
||||
%build
|
||||
#./autogen.sh
|
||||
|
||||
Loading…
Reference in New Issue
Block a user