commit 9ec969246fac29b6cb8220cb550fbbcde074f145
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sat Apr 20 08:40:08 2019 +0200
- up to 2.3.2
- build with qt5
boost-1.69.patch | 18 ++++++++++++++++++
lyx.spec | 27 ++++++++++++++++++---------
qt-ac.patch | 22 ++++++++++++++++++++++
3 files changed, 58 insertions(+), 9 deletions(-)
---
diff --git a/lyx.spec b/lyx.spec
index 02555ff..7be41fe 100644
--- a/lyx.spec
+++ b/lyx.spec
@@ -8,17 +8,23 @@ Summary: A WYSIWYM frontend to LaTeX
Summary(pl.UTF-8): Nakładka WYSIWYM na LaTeXa
Summary(pt_BR.UTF-8): Editor de Textos para ambiente Desktop
Name: lyx
-Version: 2.2.3
+Version: 2.3.2
Release: 1
Epoch: 1
License: GPL v2+
Group: Applications/Publishing/TeX
-Source0: http://ftp.lyx.org/pub/lyx/stable/2.2.x/%{name}-%{version}.tar.xz
-# Source0-md5: 032147bf8e05040787b0fca43fd70de3
+Source0: http://ftp.lyx.org/pub/lyx/stable/2.3.x/%{name}-%{version}.tar.xz
+# Source0-md5: 7e32b2e4440f2d47053610250840080b
Source1: %{name}.desktop
Source2: %{name}.png
+Patch0: qt-ac.patch
+Patch1: boost-1.69.patch
URL: http://www.lyx.org/
-BuildRequires: QtGui-devel
+BuildRequires: Qt5Core-devel
+BuildRequires: Qt5Gui-devel
+BuildRequires: Qt5Svg-devel
+BuildRequires: Qt5Concurrent-devel
+BuildRequires: Qt5Widgets-devel
BuildRequires: aiksaurus-devel
BuildRequires: aspell-devel
BuildRequires: autoconf >= 2.59-9
@@ -27,7 +33,7 @@ BuildRequires: automake
BuildRequires: gettext-tools
BuildRequires: libstdc++-devel
BuildRequires: pkgconfig
-BuildRequires: qt4-build
+BuildRequires: qt5-build
BuildRequires: rpm-pythonprov
BuildRequires: sed >= 4.0
BuildRequires: xorg-lib-libX11-devel
@@ -70,6 +76,8 @@ selecionadas pelo editor, não pelo digitador.
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
%build
cat config/*.m4 > acinclude.m4
@@ -82,9 +90,9 @@ cat config/*.m4 > acinclude.m4
%{?debug:--enable-debug} \
--enable-nls \
%{?with_system_boost:--without-included-boost} \
- --without-included-gettext \
- --with-qt4-dir=%{_libdir}/qt4 \
- --with-frontend=qt4
+ --enable-qt5 \
+ --with-qt-dir=%{_libdir}/qt5 \
+ --with-qt-includes=%{_includedir}/qt5
%{__make} all
@@ -172,9 +180,9 @@ umask 022
%lang(uk) %{_datadir}/lyx/doc/uk
%lang(zh_CN) %{_datadir}/lyx/doc/zh_CN
%{_datadir}/lyx/autocorrect
+%{_datadir}/lyx/citeengines
%{_datadir}/lyx/encodings
%{_datadir}/lyx/examples
-%{_datadir}/lyx/external_templates
%{_datadir}/lyx/fonts/
%{_datadir}/lyx/images
%{_datadir}/lyx/kbd
@@ -189,6 +197,7 @@ umask 022
%{_datadir}/lyx/tex
%{_datadir}/lyx/ui
%{_datadir}/lyx/unicodesymbols
+%{_datadir}/lyx/xtemplates
%{_mandir}/man*/*
%{_desktopdir}/*.desktop
%{_pixmapsdir}/*
diff --git a/boost-1.69.patch b/boost-1.69.patch
new file mode 100644
index 0000000..5ff2e71
--- /dev/null
+++ b/boost-1.69.patch
@@ -0,0 +1,18 @@
+--- lyx-2.3.2/src/support/FileName.cpp~ 2018-12-09 21:04:52.000000000 +0100
++++ lyx-2.3.2/src/support/FileName.cpp 2019-04-20 08:29:31.868290965 +0200
+@@ -67,15 +67,6 @@
+ using namespace std;
+ using namespace lyx::support;
+
+-// OK, this is ugly, but it is the only workaround I found to compile
+-// with gcc (any version) on a system which uses a non-GNU toolchain.
+-// The problem is that gcc uses a weak symbol for a particular
+-// instantiation and that the system linker usually does not
+-// understand those weak symbols (seen on HP-UX, tru64, AIX and
+-// others). Thus we force an explicit instanciation of this particular
+-// template (JMarc)
+-template struct boost::detail::crc_table_t<32, 0x04C11DB7, true>;
+-
+ namespace lyx {
+ namespace support {
+
diff --git a/qt-ac.patch b/qt-ac.patch
new file mode 100644
index 0000000..c288381
--- /dev/null
+++ b/qt-ac.patch
@@ -0,0 +1,22 @@
+--- lyx-2.3.2/config/qt4.m4.orig 2018-12-09 21:04:52.000000000 +0100
++++ lyx-2.3.2/config/qt4.m4 2019-04-20 08:21:06.607279868 +0200
+@@ -34,7 +34,7 @@
+ qt_corelibs="-lQt5Core"
+ qt_guilibs="-lQt5Core -lQt5Concurrent -lQt5Gui -lQt5Svg -lQt5Widgets"
+ fi
+- for libname in $qt_corelibs '-framework QtCore'
++ for libname in $qt_corelibs
+ do
+ QT_TRY_LINK($libname)
+ if test -n "$qt_cv_libname"; then
+@@ -43,9 +43,7 @@
+ fi
+ done
+ qt_cv_libname=
+- for libname in $qt_guilibs \
+- '-framework QtCore -framework QtConcurrent -framework QtSvg -framework QtWidgets -framework QtMacExtras -framework QtGui'\
+- '-framework QtCore -framework QtGui'
++ for libname in $qt_guilibs
+ do
+ QT_TRY_LINK($libname)
+ if test -n "$qt_cv_libname"; then
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lyx.git/commitdiff/9ec969246fac29b6cb8220cb550fbbcde074f145