From 086779b73096f71ee1c2f67e4b5da9665ab0a82894f4da9962f2514ca13c9210 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Thu, 18 Jan 2024 22:12:06 +0000 Subject: [PATCH 1/9] Accepting request 1139815 from home:cornelisbb:branches:Publishing - Update to 2.4.0 RC 1 - Build Tumbleweed with Qt 6 - Swith buildsystem to cmake - Remove no longer necessary patches: * correct-shebang.patch * remove_python_shebang.patch OBS-URL: https://build.opensuse.org/request/show/1139815 OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=223 --- correct-shebang.patch | 54 ------------ lyx-2.3.7-1.tar.xz | 3 - lyx-2.3.7-1.tar.xz.sig | Bin 310 -> 0 bytes lyx-2.4.0~RC1.tar.xz | 3 + lyx-2.4.0~RC1.tar.xz.sig | Bin 0 -> 310 bytes lyx.changes | 10 +++ lyx.spec | 74 ++++++++-------- remove_python_shebang.patch | 169 ------------------------------------ 8 files changed, 52 insertions(+), 261 deletions(-) delete mode 100644 correct-shebang.patch delete mode 100644 lyx-2.3.7-1.tar.xz delete mode 100644 lyx-2.3.7-1.tar.xz.sig create mode 100644 lyx-2.4.0~RC1.tar.xz create mode 100644 lyx-2.4.0~RC1.tar.xz.sig delete mode 100644 remove_python_shebang.patch diff --git a/correct-shebang.patch b/correct-shebang.patch deleted file mode 100644 index 981fdc0..0000000 --- a/correct-shebang.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -ur a/lib/configure.py b/lib/configure.py ---- a/lib/configure.py 2020-01-12 19:58:38.000000000 +0100 -+++ b/lib/configure.py 2020-01-12 22:41:55.304000000 +0100 -@@ -1,4 +1,4 @@ --#! /usr/bin/python -+#! /usr/bin/python3 - # -*- coding: utf-8 -*- - # - # file configure.py -diff -ur a/lib/lyx2lyx/lyx2lyx b/lib/lyx2lyx/lyx2lyx ---- a/lib/lyx2lyx/lyx2lyx 2020-01-12 19:58:39.000000000 +0100 -+++ b/lib/lyx2lyx/lyx2lyx 2020-01-12 22:42:52.768000000 +0100 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /usr/bin/env python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2002-2011 The LyX Team - # Copyright (C) 2002-2007 José Matos -diff -ur a/lib/lyx2lyx/profiling.py b/lib/lyx2lyx/profiling.py ---- a/lib/lyx2lyx/profiling.py 2020-01-12 19:58:39.000000000 +0100 -+++ b/lib/lyx2lyx/profiling.py 2020-01-12 22:43:08.376000000 +0100 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#! /usr/bin/env python3 - # -*- coding: utf-8 -*- - # Copyright (C) 2004 José Matos - # -diff -ur a/lib/scripts/listerrors b/lib/scripts/listerrors ---- a/lib/scripts/listerrors 2020-01-12 19:58:39.000000000 +0100 -+++ b/lib/scripts/listerrors 2020-01-12 22:44:09.728000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - - # file listerrors - # This file is part of LyX, the document processor. -diff -ur a/lib/scripts/svg2pdftex.py b/lib/scripts/svg2pdftex.py ---- a/lib/scripts/svg2pdftex.py 2020-01-12 19:58:39.000000000 +0100 -+++ b/lib/scripts/svg2pdftex.py 2020-01-12 22:44:42.588000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - # -*- coding: utf-8 -*- - - # file svg2pdftex.py -diff -ur a/lib/scripts/svg2pstex.py b/lib/scripts/svg2pstex.py ---- a/lib/scripts/svg2pstex.py 2020-01-12 19:58:39.000000000 +0100 -+++ b/lib/scripts/svg2pstex.py 2020-01-12 22:45:07.324000000 +0100 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - # -*- coding: utf-8 -*- - - # file svg2pstex.py diff --git a/lyx-2.3.7-1.tar.xz b/lyx-2.3.7-1.tar.xz deleted file mode 100644 index 72725b3..0000000 --- a/lyx-2.3.7-1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39be8864fb86b34e88310e70fb80e5e9e296601f0856cf161aa094171718d8ed -size 16158416 diff --git a/lyx-2.3.7-1.tar.xz.sig b/lyx-2.3.7-1.tar.xz.sig deleted file mode 100644 index 1bb26014beb16e72d983b05899fef27c4e4910662d80e73e08a3c0a842d7a4db..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmV-60m=S}0W$;u0SEvc79j-wW=9)CRhI{^+Syg!dPMri`#3EH0%NinFaQb(5Z-!3 z`p5e?ErNXq{TAodwNSYSxn5SpVFd3!|E(^OcxE`9uvK0?&F3Ni5X9SS0<@xgcO;+>=JLNBUQZ9pjSSRLV^g?j-t5<^OnY zEzN{X`pRE=5O+^wG&0;w^+2Gclixp0!moz~%t7NM&zj-46;mz^$XLDDS`*ACAR>Nx zf`>L_WD^+SugWD7{#&rqvL^3s6O`2?Tyi9PqDgEF2f$+>l*Ter^S^j@>LG>xPY4i( z($K>p2aX|}&0?24n9mLTzXw@(b;eOW6?#a#>0fw9ziq@@aH Iy?7HwzJ`sD00000 diff --git a/lyx-2.4.0~RC1.tar.xz b/lyx-2.4.0~RC1.tar.xz new file mode 100644 index 0000000..08b9b69 --- /dev/null +++ b/lyx-2.4.0~RC1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17659a696dbcb9d5a82ab0ca396b9fe16abbaff00ff5702dad50dfe5ed465eda +size 17738520 diff --git a/lyx-2.4.0~RC1.tar.xz.sig b/lyx-2.4.0~RC1.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..3010c1478dd3f23516b755479c4a26f93cad15368b9edd663088575b5124b193 GIT binary patch literal 310 zcmV-60m=S}0W$;u0SEvc79j-wW=9)CRhI{^+Syg!dPMri`#3EH0%f2Wk^l+`5Z-!3 z`p5e?E$mST|70Y2-}FPjr`2z(jrCgDtml1xy{sc) zZedRe#{y#&Z00)Ikkn{cy$UcSDY?U!LFb|oN8xWO~ zb8w9QR<0XM^h1iAzT4wo=C@T=^quMRnp!%B(etHFa_lrIEb&6Gpc7)DjFTh-DO7Wl zg2(6G!oNoYRbTmnB<e#p|s%`787hkFH+)q+DEF_~tzO?wyN&QT~ZGnvdScG)vz)3B;xEe>_v%Z Ip{ur2g0hF2RsaA1 literal 0 HcmV?d00001 diff --git a/lyx.changes b/lyx.changes index 6e816c1..2506962 100644 --- a/lyx.changes +++ b/lyx.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Jan 18 21:58:03 UTC 2024 - Cor Blom + +- Update to 2.4.0 RC 1 +- Build Tumbleweed with Qt 6 +- Swith buildsystem to cmake +- Remove no longer necessary patches: + * correct-shebang.patch + * remove_python_shebang.patch + ------------------------------------------------------------------- Wed Dec 13 14:45:07 UTC 2023 - Giacomo Comes diff --git a/lyx.spec b/lyx.spec index ad0387c..6595d2e 100644 --- a/lyx.spec +++ b/lyx.spec @@ -1,7 +1,7 @@ # # spec file for package lyx # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,29 +16,24 @@ # +%if 0%{?suse_version} >= 1600 +%bcond_without qt6 +%endif + Name: lyx -Version: 2.3.7 +Version: 2.4.0~RC1 Release: 0 Summary: WYSIWYM (What You See Is What You Mean) document processor License: GPL-2.0-or-later Group: Productivity/Publishing/TeX/Frontends URL: http://www.lyx.org/ -Source: ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-%{version}-1.tar.xz +Source: http://ftp.lyx.org/pub/lyx/devel/lyx-2.4/lyx-%{version}.tar.xz Source1: lyxrc.dist Source2: lyx.keyring -Source3: ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/lyx-%{version}-1.tar.xz.sig +Source3: http://ftp.lyx.org/pub/lyx/devel/lyx-2.4/lyx-%{version}.tar.xz.sig Source4: README.SUSE -# PATCH-FIX-UPSTREAM to satisfy rpmlint - use #! /usr/bin/python as shebang -# See: https://www.lyx.org/trac/changeset/cac27076ead10684270520670adc6bd004793361/lyxgit -# Upstream also made change to python3 in master. Because 2.3.1 is compatible with both -# python2 and 3 we follow and switch to python3 -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 -BuildRequires: autoconf -BuildRequires: automake BuildRequires: bc +BuildRequires: cmake BuildRequires: enchant-devel BuildRequires: fdupes BuildRequires: file-devel @@ -51,6 +46,19 @@ BuildRequires: pkgconfig BuildRequires: python3 BuildRequires: update-desktop-files BuildRequires: zlib-devel +%if %{with qt6} +BuildRequires: qt6-gui-private-devel +BuildRequires: cmake(Qt6Concurrent) +BuildRequires: cmake(Qt6Core) +BuildRequires: cmake(Qt6Core5Compat) +BuildRequires: cmake(Qt6DBus) +BuildRequires: cmake(Qt6Gui) +BuildRequires: cmake(Qt6PrintSupport) +BuildRequires: cmake(Qt6Sql) +BuildRequires: cmake(Qt6Svg) +BuildRequires: cmake(Qt6Widgets) +BuildRequires: cmake(Qt6Xml) +%else BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) @@ -61,6 +69,7 @@ BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Svg) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) +%endif #!BuildIgnore: lyx Requires: %{name}-fonts Requires: ImageMagick @@ -144,27 +153,25 @@ A collection of Math symbol fonts for LyX. %autosetup -p1 %build -#hack for tumbleweed and for 2.3.7 only: fix build failure -#to be removed with lyx 2.4 as it already contains the fix -%if 0%{?suse_version} > 1500 -if [[ %{version} = 2.3.7 ]]; then - sed -i '/static.*zoom_/s@static @@' src/frontends/qt4/GuiView.h -fi -%endif -#./autogen.sh TEXMF=%{_datadir}/texmf -%configure \ - --enable-build-type=rel \ - --enable-qt5 \ - --without-included-boost \ - --without-aspell \ - --with-hunspell \ - --with-enchant -make %{?_smp_mflags} +%cmake -DLYX_INSTALL=ON \ + -DLYX_REQUIRE_SPELLCHECK=ON \ + -DLYX_ENCHANT=ON \ + -DLYX_HUNSPELL=ON \ + -DLYX_RELEASE=ON \ +%if %{with qt6} + -DLYX_USE_QT=QT6 \ +%else + -DLYX_USE_QT=QT5 \ +%endif + -DLYX_PACKAGE_SUFFIX=OFF \ + -DLYX_PROGRAM_SUFFIX=OFF +%cmake_build %install TEXMF=%{_datadir}/texmf -make install DESTDIR=%{buildroot} TEXMF=$TEXMF +%cmake_install TEXMF=$TEXMF +%python3_fix_shebang # some defaults install -p -m644 -D %{SOURCE1} %{buildroot}%{_datadir}/lyx/lyxrc.dist @@ -190,8 +197,6 @@ install -m 0755 -d %{buildroot}%{_fontsdir}/lyx mv %{buildroot}%{_datadir}/lyx/fonts/*.ttf %{buildroot}%{_fontsdir}/lyx/ rm -rf %{buildroot}%{_datadir}/lyx/fonts -install -p -D -m 0644 lib/appdata.xml %{buildroot}%{_datadir}/appdata/lyx.appdata.xml - install -p -D -m 0644 lib/scripts/bash_completion %{buildroot}%{_datadir}/bash-completion/completions/lyx %suse_update_desktop_file lyx Office WordProcessor @@ -217,7 +222,7 @@ install -p -D -m 0644 lib/scripts/bash_completion %{buildroot}%{_datadir}/bash-c %{_bindir}/lyxclient %{_bindir}/tex2lyx %{_datadir}/applications/lyx.desktop -%{_datadir}/appdata/lyx.appdata.xml +%{_datadir}/metainfo/org.lyx.LyX.metainfo.xml %{_datadir}/icons/hicolor/*/apps/%{name}.* %dir %{_datadir}/texmf %dir %{_datadir}/texmf/tex @@ -233,6 +238,5 @@ install -p -D -m 0644 lib/scripts/bash_completion %{buildroot}%{_datadir}/bash-c %dir %{_fontsdir}/lyx %{_fontsdir}/lyx/*.ttf %doc lib/fonts/BaKoMaFontLicense.txt -%doc lib/fonts/ReadmeBaKoMa4LyX.txt %changelog diff --git a/remove_python_shebang.patch b/remove_python_shebang.patch deleted file mode 100644 index 8c170c4..0000000 --- a/remove_python_shebang.patch +++ /dev/null @@ -1,169 +0,0 @@ ---- a/development/cmake/doc/ReplaceValues.py -+++ b/development/cmake/doc/ReplaceValues.py -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#!/usr/bin/python3 - - from __future__ import print_function - ---- a/development/cmake/po/cat.py -+++ b/development/cmake/po/cat.py -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#!/usr/bin/python3 - - from __future__ import print_function - ---- a/development/cmake/po/unix2dos.py -+++ b/development/cmake/po/unix2dos.py -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#!/usr/bin/python3 - - ############### - import sys ---- a/development/tools/gen_lfuns.py -+++ b/development/tools/gen_lfuns.py -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#!/usr/bin/python3 - # -*- coding: utf-8 -*- - - # file gen_lfuns.py ---- a/development/tools/generate_symbols_images.py -+++ b/development/tools/generate_symbols_images.py -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#!/usr/bin/python3 - # -*- coding: utf-8 -*- - - # file generate_symbols_images.py ---- a/development/tools/generate_symbols_list.py -+++ b/development/tools/generate_symbols_list.py -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#!/usr/bin/python3 - # -*- coding: utf-8 -*- - - # file generate_symbols_images.py ---- a/development/tools/mergepo.py -+++ b/development/tools/mergepo.py -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#!/usr/bin/python3 - # -*- coding: utf-8 -*- - - # file mergepo.py ---- a/development/tools/unicodesymbols.py -+++ b/development/tools/unicodesymbols.py -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#!/usr/bin/python3 - # -*- coding: utf-8 -*- - - # file unciodesymbols.py ---- a/development/tools/updatedocs.py -+++ b/development/tools/updatedocs.py -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#!/usr/bin/python3 - # -*- coding: utf-8 -*- - - # file updatedocs.py ---- a/development/tools/updatelayouts.py -+++ b/development/tools/updatelayouts.py -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#!/usr/bin/python3 - # -*- coding: utf-8 -*- - - # file updatelayouts.py ---- a/po/Makefile.in -+++ b/po/Makefile.in -@@ -14,7 +14,7 @@ VERSION = 2.3.5-1 - PACKAGE_BUGREPORT = lyx-devel@lists.lyx.org - - # ADDED FOR LYX --PYTHON = /usr/bin/python -+PYTHON = /usr/bin/python3 - - SED = /usr/bin/sed - SHELL = /bin/sh ---- a/po/lyx_pot.py -+++ b/po/lyx_pot.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - # -*- coding: utf-8 -*- - - # file lyx_pot.py ---- a/src/tex2lyx/test/runtests.py -+++ b/src/tex2lyx/test/runtests.py -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#!/usr/bin/python3 - # -*- coding: utf-8 -*- - - # file src/tex2lyx/test/runtests.py ---- a/development/autotests/keytest.py -+++ b/development/autotests/keytest.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # This script generates hundreds of random keypresses per second, - # and sends them to the lyx window ---- a/development/keystest/cache-bisect.py -+++ b/development/keystest/cache-bisect.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - # -*- coding: utf-8 -*- - - import os ---- a/development/keystest/keytest.py -+++ b/development/keystest/keytest.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # This script generates hundreds of random keypresses per second, - # and sends them to the lyx window ---- a/development/keystest/make_screenshot_html.py -+++ b/development/keystest/make_screenshot_html.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - # -*- coding: utf-8 -*- - import re - import os ---- a/lib/examples/listerrors.lyx -+++ b/lib/examples/listerrors.lyx -@@ -347,7 +347,7 @@ status open - - \begin_layout Plain Layout - --#!/usr/bin/python -tt -+#!/usr/bin/python3 -tt - \end_layout - - \begin_layout Plain Layout ---- a/lib/scripts/gnuplot2pdf.py -+++ b/lib/scripts/gnuplot2pdf.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python -+#!/usr/bin/python3 - - from subprocess import Popen, PIPE - from sys import argv, stderr, exit ---- a/src/graphics/GraphicsConverter.cpp -+++ b/src/graphics/GraphicsConverter.cpp -@@ -287,7 +287,7 @@ static void build_script(string const & - LYXERR(Debug::GRAPHICS, "build_script ... "); - typedef Graph::EdgePath EdgePath; - -- script << "#!/usr/bin/env python\n" -+ script << "#!/usr/bin/python3\n" - "# -*- coding: utf-8 -*-\n" - "import os, shutil, sys\n\n" - "def unlinkNoThrow(file):\n" From b0b209afd0a9dcdffa0087621f44f46d6fe33f93b77f838aca4929929ba7761b Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Fri, 19 Jan 2024 08:48:11 +0000 Subject: [PATCH 2/9] OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=224 --- lyx.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lyx.changes b/lyx.changes index 2506962..9979c81 100644 --- a/lyx.changes +++ b/lyx.changes @@ -2,7 +2,7 @@ Thu Jan 18 21:58:03 UTC 2024 - Cor Blom - Update to 2.4.0 RC 1 -- Build Tumbleweed with Qt 6 +- Build for Tumbleweed with Qt 6 - Swith buildsystem to cmake - Remove no longer necessary patches: * correct-shebang.patch From 3e5e5e22d109a05fe4fac40b3f318badf53744853c90fc6acac535ed2e16bac5 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Sat, 20 Jan 2024 11:50:40 +0000 Subject: [PATCH 3/9] OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=225 --- lyx.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lyx.spec b/lyx.spec index 6595d2e..7ed6ac7 100644 --- a/lyx.spec +++ b/lyx.spec @@ -150,7 +150,7 @@ BuildArch: noarch A collection of Math symbol fonts for LyX. %prep -%autosetup -p1 +%autosetup %build TEXMF=%{_datadir}/texmf From 1be74c6bd7ebd53b45ebcb80ae52eb9e13e06401a744da40aa66b147efe09a0d Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Mon, 5 Feb 2024 08:03:11 +0000 Subject: [PATCH 4/9] OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=226 --- lyx-2.4.0~RC1.tar.xz | 3 --- lyx-2.4.0~RC1.tar.xz.sig | Bin 310 -> 0 bytes lyx-2.4.0~RC2.tar.xz | 3 +++ lyx-2.4.0~RC2.tar.xz.sig | Bin 0 -> 310 bytes lyx.changes | 5 +++++ lyx.spec | 2 +- 6 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 lyx-2.4.0~RC1.tar.xz delete mode 100644 lyx-2.4.0~RC1.tar.xz.sig create mode 100644 lyx-2.4.0~RC2.tar.xz create mode 100644 lyx-2.4.0~RC2.tar.xz.sig diff --git a/lyx-2.4.0~RC1.tar.xz b/lyx-2.4.0~RC1.tar.xz deleted file mode 100644 index 08b9b69..0000000 --- a/lyx-2.4.0~RC1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:17659a696dbcb9d5a82ab0ca396b9fe16abbaff00ff5702dad50dfe5ed465eda -size 17738520 diff --git a/lyx-2.4.0~RC1.tar.xz.sig b/lyx-2.4.0~RC1.tar.xz.sig deleted file mode 100644 index 3010c1478dd3f23516b755479c4a26f93cad15368b9edd663088575b5124b193..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmV-60m=S}0W$;u0SEvc79j-wW=9)CRhI{^+Syg!dPMri`#3EH0%f2Wk^l+`5Z-!3 z`p5e?E$mST|70Y2-}FPjr`2z(jrCgDtml1xy{sc) zZedRe#{y#&Z00)Ikkn{cy$UcSDY?U!LFb|oN8xWO~ zb8w9QR<0XM^h1iAzT4wo=C@T=^quMRnp!%B(etHFa_lrIEb&6Gpc7)DjFTh-DO7Wl zg2(6G!oNoYRbTmnB<e#p|s%`787hkFH+)q+DEF_~tzO?wyN&QT~ZGnvdScG)vz)3B;xEe>_v%Z Ip{ur2g0hF2RsaA1 diff --git a/lyx-2.4.0~RC2.tar.xz b/lyx-2.4.0~RC2.tar.xz new file mode 100644 index 0000000..57dd526 --- /dev/null +++ b/lyx-2.4.0~RC2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a5d2b2840700ba33800c063640a6966a9721e9a9626ae57ef3671da479c3ef1 +size 17779204 diff --git a/lyx-2.4.0~RC2.tar.xz.sig b/lyx-2.4.0~RC2.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..ae456dedfe48fd8a22a8967d5b73f70846986dd4cf32c19a8a0c0f178f517c15 GIT binary patch literal 310 zcmV-60m=S}0W$;u0SEvc79j-wW=9)CRhI{^+Syg!dPMri`#3EH0%gEaQveDH5Z-!3 z`p5e?Evjz^{0$Z3dh8^gl$TNyQ$DiXT9lbj?v;aVSt-mGq&(%^-&L^Gw0=|L=+>I3UIp95h$6xXHaS8yysj#2t=b zu53_Ut=4N|c>r5V3e7YlgZ=A(iVE}89AE&h_`K4bSoqk z7Cl;$^h)X$Cz2RSVihO)n5gw;UzE~s{CJR^x8m_^#dsvwb@Cv$u44=Zw@kD0!AI#x ICpiAC{&kLyVE_OC literal 0 HcmV?d00001 diff --git a/lyx.changes b/lyx.changes index 9979c81..832e859 100644 --- a/lyx.changes +++ b/lyx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 5 08:02:31 UTC 2024 - Cor Blom + +- Update to 2.4.0 RC 2 + ------------------------------------------------------------------- Thu Jan 18 21:58:03 UTC 2024 - Cor Blom diff --git a/lyx.spec b/lyx.spec index 7ed6ac7..347e5b8 100644 --- a/lyx.spec +++ b/lyx.spec @@ -21,7 +21,7 @@ %endif Name: lyx -Version: 2.4.0~RC1 +Version: 2.4.0~RC2 Release: 0 Summary: WYSIWYM (What You See Is What You Mean) document processor License: GPL-2.0-or-later From 2a8d6b2d41c555e5a351e144bf2f5d96bacd3effa5a807c3e7061caf9cef560d Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Sat, 10 Feb 2024 11:20:56 +0000 Subject: [PATCH 5/9] - Update to 2.4.0 RC 3 OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=227 --- lyx-2.4.0~RC2.tar.xz | 3 --- lyx-2.4.0~RC2.tar.xz.sig | Bin 310 -> 0 bytes lyx-2.4.0~RC3.tar.xz | 3 +++ lyx-2.4.0~RC3.tar.xz.sig | Bin 0 -> 310 bytes lyx.changes | 5 +++++ lyx.spec | 2 +- 6 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 lyx-2.4.0~RC2.tar.xz delete mode 100644 lyx-2.4.0~RC2.tar.xz.sig create mode 100644 lyx-2.4.0~RC3.tar.xz create mode 100644 lyx-2.4.0~RC3.tar.xz.sig diff --git a/lyx-2.4.0~RC2.tar.xz b/lyx-2.4.0~RC2.tar.xz deleted file mode 100644 index 57dd526..0000000 --- a/lyx-2.4.0~RC2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5a5d2b2840700ba33800c063640a6966a9721e9a9626ae57ef3671da479c3ef1 -size 17779204 diff --git a/lyx-2.4.0~RC2.tar.xz.sig b/lyx-2.4.0~RC2.tar.xz.sig deleted file mode 100644 index ae456dedfe48fd8a22a8967d5b73f70846986dd4cf32c19a8a0c0f178f517c15..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmV-60m=S}0W$;u0SEvc79j-wW=9)CRhI{^+Syg!dPMri`#3EH0%gEaQveDH5Z-!3 z`p5e?Evjz^{0$Z3dh8^gl$TNyQ$DiXT9lbj?v;aVSt-mGq&(%^-&L^Gw0=|L=+>I3UIp95h$6xXHaS8yysj#2t=b zu53_Ut=4N|c>r5V3e7YlgZ=A(iVE}89AE&h_`K4bSoqk z7Cl;$^h)X$Cz2RSVihO)n5gw;UzE~s{CJR^x8m_^#dsvwb@Cv$u44=Zw@kD0!AI#x ICpiAC{&kLyVE_OC diff --git a/lyx-2.4.0~RC3.tar.xz b/lyx-2.4.0~RC3.tar.xz new file mode 100644 index 0000000..f94e353 --- /dev/null +++ b/lyx-2.4.0~RC3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c300c6fe9b4c1a8ddcd2fd30ec636fa3bcd3c42cf3c4fd1baacf56953249b8f7 +size 17780000 diff --git a/lyx-2.4.0~RC3.tar.xz.sig b/lyx-2.4.0~RC3.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..5304c106e15adfd116ad0ed0c6a0b18189e87cac4b3b7d2d121535a38b973474 GIT binary patch literal 310 zcmV-60m=S}0W$;u0SEvc79j-wW=9)CRhI{^+Syg!dPMri`#3EH0%gX_@&F165Z-!3 z`p5e?E%`ME{T=wo9dR?2od*VDK}is+$$nA3+HGBH^iOw|11Zb-cEHQsk+MHAi*m}E ze*!(y&gc`YX^kR04Ox4+dm-hUNjEjso*a;U1LDpa`??g{ol70Z^3NsQDwSbU-G^GH zY~Wk`>=aF_BoN~@EOnJ8AJO`Q-A7~pm$51Kx1nbu;A9ZDzv@8R8&*7hwd zmEd70X?hvh{Oh|_YoYK|mK)5zPpm{9YUvD_r)NcvLlEMD&#AkiC)4_I1Js7))8e)i z<-`nbPCq-EBWoI#$n`F>f6-JxEvD*_V}Y06GthDs>KDC2><{9 literal 0 HcmV?d00001 diff --git a/lyx.changes b/lyx.changes index 832e859..3de1a2c 100644 --- a/lyx.changes +++ b/lyx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 10 11:20:27 UTC 2024 - Cor Blom + +- Update to 2.4.0 RC 3 + ------------------------------------------------------------------- Mon Feb 5 08:02:31 UTC 2024 - Cor Blom diff --git a/lyx.spec b/lyx.spec index 347e5b8..15b4ccc 100644 --- a/lyx.spec +++ b/lyx.spec @@ -21,7 +21,7 @@ %endif Name: lyx -Version: 2.4.0~RC2 +Version: 2.4.0~RC3 Release: 0 Summary: WYSIWYM (What You See Is What You Mean) document processor License: GPL-2.0-or-later From 582fa33b2cd406dae686e1167aa17809b4c952e4106042250d598677c2ef7a99 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Fri, 22 Mar 2024 19:59:47 +0000 Subject: [PATCH 6/9] OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=228 --- lyx.changes | 1 - lyx.spec | 44 ++++++++++++++++++++++---------------------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/lyx.changes b/lyx.changes index 3de1a2c..6e3334f 100644 --- a/lyx.changes +++ b/lyx.changes @@ -13,7 +13,6 @@ Thu Jan 18 21:58:03 UTC 2024 - Cor Blom - Update to 2.4.0 RC 1 - Build for Tumbleweed with Qt 6 -- Swith buildsystem to cmake - Remove no longer necessary patches: * correct-shebang.patch * remove_python_shebang.patch diff --git a/lyx.spec b/lyx.spec index 15b4ccc..9963028 100644 --- a/lyx.spec +++ b/lyx.spec @@ -32,8 +32,9 @@ Source1: lyxrc.dist Source2: lyx.keyring Source3: http://ftp.lyx.org/pub/lyx/devel/lyx-2.4/lyx-%{version}.tar.xz.sig Source4: README.SUSE +BuildRequires: autoconf +BuildRequires: automake BuildRequires: bc -BuildRequires: cmake BuildRequires: enchant-devel BuildRequires: fdupes BuildRequires: file-devel @@ -48,16 +49,16 @@ BuildRequires: update-desktop-files BuildRequires: zlib-devel %if %{with qt6} BuildRequires: qt6-gui-private-devel -BuildRequires: cmake(Qt6Concurrent) -BuildRequires: cmake(Qt6Core) -BuildRequires: cmake(Qt6Core5Compat) -BuildRequires: cmake(Qt6DBus) -BuildRequires: cmake(Qt6Gui) -BuildRequires: cmake(Qt6PrintSupport) -BuildRequires: cmake(Qt6Sql) -BuildRequires: cmake(Qt6Svg) -BuildRequires: cmake(Qt6Widgets) -BuildRequires: cmake(Qt6Xml) +BuildRequires: pkgconfig(Qt6Concurrent) +BuildRequires: pkgconfig(Qt6Core) +BuildRequires: pkgconfig(Qt6Core5Compat) +BuildRequires: pkgconfig(Qt6DBus) +BuildRequires: pkgconfig(Qt6Gui) +BuildRequires: pkgconfig(Qt6PrintSupport) +BuildRequires: pkgconfig(Qt6Sql) +BuildRequires: pkgconfig(Qt6Svg) +BuildRequires: pkgconfig(Qt6Widgets) +BuildRequires: pkgconfig(Qt6Xml) %else BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Core) @@ -154,23 +155,22 @@ A collection of Math symbol fonts for LyX. %build TEXMF=%{_datadir}/texmf -%cmake -DLYX_INSTALL=ON \ - -DLYX_REQUIRE_SPELLCHECK=ON \ - -DLYX_ENCHANT=ON \ - -DLYX_HUNSPELL=ON \ - -DLYX_RELEASE=ON \ +%configure \ + --enable-build-type=rel \ + --without-included-boost \ + --without-aspell \ + --with-hunspell \ + --with-enchant \ %if %{with qt6} - -DLYX_USE_QT=QT6 \ + --enable-qt6 \ %else - -DLYX_USE_QT=QT5 \ + --enable-qt5 %endif - -DLYX_PACKAGE_SUFFIX=OFF \ - -DLYX_PROGRAM_SUFFIX=OFF -%cmake_build +make %{?_smp_mflags} %install TEXMF=%{_datadir}/texmf -%cmake_install TEXMF=$TEXMF +make install TEXMF=$TEXMF %python3_fix_shebang # some defaults From 7360e4a854ef2edc9e446c3793ad559f644fb8734abb5eb9b4bc6087e82d2d6c Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Fri, 22 Mar 2024 20:04:02 +0000 Subject: [PATCH 7/9] OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=229 --- lyx.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lyx.spec b/lyx.spec index 9963028..666e74f 100644 --- a/lyx.spec +++ b/lyx.spec @@ -162,7 +162,7 @@ TEXMF=%{_datadir}/texmf --with-hunspell \ --with-enchant \ %if %{with qt6} - --enable-qt6 \ + --enable-qt6 %else --enable-qt5 %endif From 9a8a5b60f11a67d144f68bf645dc624e29b93c7c0fbf587aedfea7340851b6e4 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Fri, 22 Mar 2024 20:20:43 +0000 Subject: [PATCH 8/9] OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=230 --- lyx.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lyx.spec b/lyx.spec index 666e74f..da7bb56 100644 --- a/lyx.spec +++ b/lyx.spec @@ -170,7 +170,7 @@ make %{?_smp_mflags} %install TEXMF=%{_datadir}/texmf -make install TEXMF=$TEXMF +%make_install TEXMF=$TEXMF %python3_fix_shebang # some defaults From 8ef9dbf7886b7c970734e512da30d38456e32c92f58aa2aef8d7fade27d57e01 Mon Sep 17 00:00:00 2001 From: Cor Blom Date: Mon, 25 Mar 2024 08:02:47 +0000 Subject: [PATCH 9/9] - Update to 2.4.0 RC 4 OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=231 --- lyx-2.4.0~RC3.tar.xz | 3 --- lyx-2.4.0~RC3.tar.xz.sig | Bin 310 -> 0 bytes lyx-2.4.0~RC4.tar.xz | 3 +++ lyx-2.4.0~RC4.tar.xz.sig | Bin 0 -> 310 bytes lyx.changes | 5 +++++ lyx.spec | 2 +- 6 files changed, 9 insertions(+), 4 deletions(-) delete mode 100644 lyx-2.4.0~RC3.tar.xz delete mode 100644 lyx-2.4.0~RC3.tar.xz.sig create mode 100644 lyx-2.4.0~RC4.tar.xz create mode 100644 lyx-2.4.0~RC4.tar.xz.sig diff --git a/lyx-2.4.0~RC3.tar.xz b/lyx-2.4.0~RC3.tar.xz deleted file mode 100644 index f94e353..0000000 --- a/lyx-2.4.0~RC3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c300c6fe9b4c1a8ddcd2fd30ec636fa3bcd3c42cf3c4fd1baacf56953249b8f7 -size 17780000 diff --git a/lyx-2.4.0~RC3.tar.xz.sig b/lyx-2.4.0~RC3.tar.xz.sig deleted file mode 100644 index 5304c106e15adfd116ad0ed0c6a0b18189e87cac4b3b7d2d121535a38b973474..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmV-60m=S}0W$;u0SEvc79j-wW=9)CRhI{^+Syg!dPMri`#3EH0%gX_@&F165Z-!3 z`p5e?E%`ME{T=wo9dR?2od*VDK}is+$$nA3+HGBH^iOw|11Zb-cEHQsk+MHAi*m}E ze*!(y&gc`YX^kR04Ox4+dm-hUNjEjso*a;U1LDpa`??g{ol70Z^3NsQDwSbU-G^GH zY~Wk`>=aF_BoN~@EOnJ8AJO`Q-A7~pm$51Kx1nbu;A9ZDzv@8R8&*7hwd zmEd70X?hvh{Oh|_YoYK|mK)5zPpm{9YUvD_r)NcvLlEMD&#AkiC)4_I1Js7))8e)i z<-`nbPCq-EBWoI#$n`F>f6-JxEvD*_V}Y06GthDs>KDC2><{9 diff --git a/lyx-2.4.0~RC4.tar.xz b/lyx-2.4.0~RC4.tar.xz new file mode 100644 index 0000000..eb43921 --- /dev/null +++ b/lyx-2.4.0~RC4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:443146f4f5fd65f9e8532edfb58fbf4eff570aa280d1fd5380260ca6ff6d9a13 +size 17785100 diff --git a/lyx-2.4.0~RC4.tar.xz.sig b/lyx-2.4.0~RC4.tar.xz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..31b9988031e87693f625c5f83b274255bf251130a4ee461b70f4048e1cfa563d GIT binary patch literal 310 zcmV-60m=S}0W$;u0SEvc79j-wW=9)CRhI{^+Syg!dPMri`#3EH0%icJ9RLam5Z-!3 z`p5e?EyITg|4_?`cncWidG3l)Y13aSQWOD&a zD_XQC{oi}I|A?-PTTYf_6L7yEsVBjD?LOO@0NZkIaJA)7tX-~9nq+Z)7GQvQ3az34 zutmIt@IkKo5;M4OHYA(W2p|Y9^RikR3TEgto5(&_zAC#Fd#8n3V)2T7NosZHMlq>RokNN^=nb-)@YdJ z$8y&Z@58SC;?mqJx*+I|+PDn8Fb$meF*Z?S0PFzXYvX2{sI7nHe>nZuz%@P6`=TNi I*D)!SdFa-WE&u=k literal 0 HcmV?d00001 diff --git a/lyx.changes b/lyx.changes index 6e3334f..6043c3c 100644 --- a/lyx.changes +++ b/lyx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 25 08:02:11 UTC 2024 - Cor Blom + +- Update to 2.4.0 RC 4 + ------------------------------------------------------------------- Sat Feb 10 11:20:27 UTC 2024 - Cor Blom diff --git a/lyx.spec b/lyx.spec index da7bb56..83226b2 100644 --- a/lyx.spec +++ b/lyx.spec @@ -21,7 +21,7 @@ %endif Name: lyx -Version: 2.4.0~RC3 +Version: 2.4.0~RC4 Release: 0 Summary: WYSIWYM (What You See Is What You Mean) document processor License: GPL-2.0-or-later