pool/lyx
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update to 2.2.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Publishing/lyx?expand=0&rev=114
This commit is contained in:
Cor Blom 2016-05-24 09:10:00 +00:00 committed by Git OBS Bridge
parent 09d9eeeb1b
commit f693eed748
9 changed files with 36 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
lyx-2.1.2.2-remove-date-time.patch
View File

@ -1,49 +0,0 @@
From: Andreas Stieger <andreas.stieger@gmx.de>
Date: Wed, 21 Jan 2015 13:02:32 +0000
Subject: Remove __DATE__ and __TIME__
Upstream: no
References:
Fixes obs warning:
[ 796s] lyx.i586: W: file-contains-date-and-time /usr/bin/lyx
[ 796s] Your file uses __DATE and __TIME__ this causes the package to rebuild when
[ 796s] not needed
Index: lyx-2.1.2.2/src/LyX.cpp
===================================================================
--- lyx-2.1.2.2.orig/src/LyX.cpp
+++ lyx-2.1.2.2/src/LyX.cpp
@@ -1146,8 +1146,6 @@ int parse_version(string const &, string
{
cout << "LyX " << lyx_version
<< " (" << lyx_release_date << ")" << endl;
- cout << to_utf8(bformat(_("Built on %1$s[[date]], %2$s[[time]]"),
- from_ascii(__DATE__), from_ascii(__TIME__))) << endl;
cout << lyx_version_info << endl;
exit(0);
Index: lyx-2.1.2.2/src/frontends/qt4/GuiAbout.cpp
===================================================================
--- lyx-2.1.2.2.orig/src/frontends/qt4/GuiAbout.cpp
+++ lyx-2.1.2.2/src/frontends/qt4/GuiAbout.cpp
@@ -138,8 +138,6 @@ static QString buildinfo()
QTextStream out(&res);
out << "LyX " << lyx_version
<< " (" << lyx_release_date << ")" << endl;
- out << toqstr(bformat(_("Built on %1$s[[date]], %2$s[[time]]"),
- from_ascii(__DATE__), from_ascii(__TIME__))) << endl;
out << lyx_version_info << endl;
return res;
Index: lyx-2.1.2.2/src/tex2lyx/tex2lyx.cpp
===================================================================
--- lyx-2.1.2.2.orig/src/tex2lyx/tex2lyx.cpp
+++ lyx-2.1.2.2/src/tex2lyx/tex2lyx.cpp
@@ -565,7 +565,6 @@ int parse_version(string const &, string
{
lyxerr << "tex2lyx " << lyx_version
<< " (" << lyx_release_date << ")" << endl;
- lyxerr << "Built on " << __DATE__ << ", " << __TIME__ << endl;
lyxerr << lyx_version_info << endl;
exit(error_code);

55
lyx-2.1.4-xdg_open.patch
View File

@ -1,55 +0,0 @@
diff -ur lyx-2.1.4.orig/lib/configure.py lyx-2.1.4/lib/configure.py
--- lyx-2.1.4.orig/lib/configure.py 2015-07-24 19:55:28.000000000 +0200
+++ lyx-2.1.4/lib/configure.py 2015-07-27 00:18:24.521801009 +0200
@@ -596,7 +596,7 @@
\Format tiff tif TIFF "" "%s" "%s" "" "image/tiff"
\Format xbm xbm XBM "" "%s" "%s" "" "image/x-xbitmap"
\Format xpm xpm XPM "" "%s" "%s" "" "image/x-xpixmap"'''
- path, iv = checkViewerNoRC('a raster image viewer', ['xv', 'kview', 'gimp-remote', 'gimp'], rc_entry = [imageformats])
+ path, iv = checkViewerNoRC('a raster image viewer', ['xdg-open', 'xv', 'kview', 'gimp-remote', 'gimp'], rc_entry = [imageformats])
path, ie = checkEditorNoRC('a raster image editor', ['gimp-remote', 'gimp'], rc_entry = [imageformats])
addToRC(imageformats % \
(iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie, iv, ie) )
@@ -635,7 +635,7 @@
\Format excel xls "Excel spreadsheet" "" "" "%%" "document" "application/vnd.ms-excel"
\Format oocalc ods "OpenOffice spreadsheet" "" "" "%%" "document" "application/vnd.oasis.opendocument.spreadsheet"'''])
#
- checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'],
+ checkViewer('an HTML previewer', ['xdg-open', 'firefox', 'mozilla file://$$p$$i', 'netscape'],
rc_entry = [r'\Format xhtml xhtml "LyXHTML" y "%%" "" "document,menu=export" "application/xhtml+xml"'])
#
checkEditor('a BibTeX editor', ['jabref', 'JabRef', \
@@ -648,14 +648,14 @@
#
#checkProg('a Postscript interpreter', ['gs'],
# rc_entry = [ r'\ps_command "%%"' ])
- checkViewer('a Postscript previewer', ['kghostview', 'okular', 'qpdfview --unique', 'evince', 'gv', 'ghostview -swap', 'gsview64', 'gsview32'],
+ checkViewer('a Postscript previewer', ['xdg-open', 'kghostview', 'okular', 'qpdfview --unique', 'evince', 'gv', 'ghostview -swap', 'gsview64', 'gsview32'],
rc_entry = [r'''\Format eps eps EPS "" "%%" "" "vector" "image/x-eps"
\Format eps2 eps "EPS (uncropped)" "" "%%" "" "vector" ""
\Format eps3 eps "EPS (cropped)" "" "%%" "" "document" ""
\Format ps ps Postscript t "%%" "" "document,vector,menu=export" "application/postscript"'''])
# for xdg-open issues look here: http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg151818.html
# the MIME type is set for pdf6, because that one needs to be autodetectable by libmime
- checkViewer('a PDF previewer', ['pdfview', 'kpdf', 'okular', 'qpdfview --unique', 'evince', 'kghostview', 'xpdf', 'SumatraPDF', 'acrobat', 'acroread', 'mupdf', \
+ checkViewer('a PDF previewer', ['xdg-open', 'pdfview', 'kpdf', 'okular', 'qpdfview --unique', 'evince', 'kghostview', 'xpdf', 'SumatraPDF', 'acrobat', 'acroread', 'mupdf', \
'gv', 'ghostview', 'AcroRd32', 'gsview64', 'gsview32'],
rc_entry = [r'''\Format pdf pdf "PDF (ps2pdf)" P "%%" "" "document,vector,menu=export" ""
\Format pdf2 pdf "PDF (pdflatex)" F "%%" "" "document,vector,menu=export" ""
@@ -666,14 +666,14 @@
\Format pdf7 pdf "PDF (cropped)" "" "%%" "" "document,vector" ""
\Format pdf8 pdf "PDF (lower resolution)" "" "%%" "" "document,vector" ""'''])
#
- checkViewer('a DVI previewer', ['xdvi', 'kdvi', 'okular', 'yap', 'dviout -Set=!m'],
+ checkViewer('a DVI previewer', ['xdg-open', 'xdvi', 'kdvi', 'okular', 'yap', 'dviout -Set=!m'],
rc_entry = [r'''\Format dvi dvi DVI D "%%" "" "document,vector,menu=export" "application/x-dvi"
\Format dvi3 dvi "DVI (LuaTeX)" V "%%" "" "document,vector,menu=export" ""'''])
if dtl_tools:
# Windows only: DraftDVI
addToRC(r'\Format dvi2 dvi DraftDVI "" "" "" "vector" ""')
#
- checkViewer('an HTML previewer', ['firefox', 'mozilla file://$$p$$i', 'netscape'],
+ checkViewer('an HTML previewer', ['xdg-open', 'firefox', 'mozilla file://$$p$$i', 'netscape'],
rc_entry = [r'\Format html "html, htm" HTML H "%%" "" "document,menu=export" "text/html"'])
#
checkViewerEditor('Noteedit', ['noteedit'],

3
lyx-2.1.4.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d13548cf183f2fc241df8121420933702491a7460c78a0ef6dba0e9e438ef32a
size 10928716

BIN
lyx-2.1.4.tar.xz.sig
View File

Binary file not shown.

3
lyx-2.2.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d867986870e3f7451f0d4512c60d9c3c7682da59c6c638f18b731f4ad3fa7c80
size 14640052

BIN
lyx-2.2.0.tar.xz.sig Normal file
View File

Binary file not shown.

12
lyx.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue May 24 08:08:54 UTC 2016 - cornelis@solcon.nl
- Update to 2.2.0:
* For details see http://wiki.lyx.org/LyX/NewInLyX22
- For Leap and Tumbleweed switch to Qt5
- Removed work-around-gcc5-bug.patch, which is included in this
release
- Remove lyx-2.1.4-xdg_open.patch, let's use what lyx itself
provides instead of endlessly meintaining this patch
- Remove lyx-2.1.2.2-remove-date-time.patch, not necessary anymore
-------------------------------------------------------------------
Sat Dec 19 14:52:07 UTC 2015 - cornelis@solcon.nl

35
lyx.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package lyx
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -26,26 +26,33 @@ BuildRequires: enchant-devel
BuildRequires: fdupes
BuildRequires: file-devel
BuildRequires: hunspell-devel
%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse}
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5PrintSupport)
BuildRequires: pkgconfig(Qt5Script)
BuildRequires: pkgconfig(Qt5Sql)
BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(Qt5Xml)
%else
BuildRequires: libqt4-devel
%endif
BuildRequires: python
BuildRequires: update-desktop-files
BuildRequires: xz
Version: 2.1.4
BuildRequires: zlib-devel
Version: 2.2.0
Release: 0
Summary: WYSIWYM (What You See Is What You Mean) document processor
License: GPL-2.0+
Group: Productivity/Publishing/TeX/Frontends
Url: http://www.lyx.org/
Source: ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/lyx-%{version}.tar.xz
Source: ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/lyx-%{version}.tar.xz
Source1: lyxrc.dist
Source2: lyx.keyring
Source3: ftp://ftp.lyx.org/pub/lyx/stable/2.1.x/lyx-%{version}.tar.xz.sig
# xdg patch
# This was rejected by upstream (http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg133878.html)
Patch0: lyx-2.1.4-xdg_open.patch
Patch1: lyx-2.1.2.2-remove-date-time.patch
# PATCH-FIX-USTREAM: fix for crash on Tumbleweed (boo#943840)
Patch2: work-around-gcc5-bug.patch
Source3: ftp://ftp.lyx.org/pub/lyx/stable/2.2.x/lyx-%{version}.tar.xz.sig
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: ImageMagick
Requires: ghostscript
@ -114,14 +121,14 @@ document under "Help" on the menubar.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
#./autogen.sh
TEXMF=%{_datadir}/texmf
%configure \
%if 0%{?suse_version} > 1320 || 0%{?suse_version} == 1315 && 0%{?is_opensuse}
--enable-qt5 \
%endif
--without-included-boost \
--without-aspell \
--with-hunspell \

97
work-around-gcc5-bug.patch
View File

@ -1,97 +0,0 @@
diff -ur a/src/output_xhtml.cpp b/src/output_xhtml.cpp
--- a/src/output_xhtml.cpp 2015-07-24 19:55:28.000000000 +0200
+++ b/src/output_xhtml.cpp 2015-12-19 13:56:37.546589700 +0100
@@ -245,68 +245,66 @@
return "";
}
-StartTag fontToStartTag(html::FontTypes type)
- {
- string tag = fontToTag(type);
+string fontToAttribute(html::FontTypes type)
+{
switch(type) {
case FT_EMPH:
- return html::StartTag(tag);
case FT_BOLD:
- return html::StartTag(tag);
+ return "";
case FT_NOUN:
- return html::StartTag(tag, "class='lyxnoun'");
+ return "class='lyxnoun'";
case FT_UBAR:
- return html::StartTag(tag);
+ return "";
case FT_DBAR:
- return html::StartTag(tag, "class='dline'");
+ return "class='dline'";
case FT_SOUT:
- return html::StartTag(tag, "class='strikeout'");
+ return "class='strikeout'";
case FT_WAVE:
- return html::StartTag(tag, "class='wline'");
+ return "class='wline'";
case FT_ITALIC:
- return html::StartTag(tag);
+ return "";
case FT_UPRIGHT:
- return html::StartTag(tag, "style='font-style:normal;'");
+ return "style='font-style:normal;'";
case FT_SLANTED:
- return html::StartTag(tag, "style='font-style:oblique;'");
+ return "style='font-style:oblique;'";
case FT_SMALLCAPS:
- return html::StartTag(tag, "style='font-variant:small-caps;'");
+ return "style='font-variant:small-caps;'";
case FT_ROMAN:
- return html::StartTag(tag, "style='font-family:serif;'");
+ return "style='font-family:serif;'";
case FT_SANS:
- return html::StartTag(tag, "style='font-family:sans-serif;'");
+ return "style='font-family:sans-serif;'";
case FT_TYPE:
- return html::StartTag(tag, "style='font-family:monospace;'");
+ return "style='font-family:monospace;'";
case FT_SIZE_TINY:
case FT_SIZE_SCRIPT:
case FT_SIZE_FOOTNOTE:
- return html::StartTag(tag, "style='font-size:x-small;'");
+ return "style='font-size:x-small;'";
case FT_SIZE_SMALL:
- return html::StartTag(tag, "style='font-size:small;'");
+ return "style='font-size:small;'";
case FT_SIZE_NORMAL:
- return html::StartTag(tag, "style='font-size:normal;'");
+ return "style='font-size:normal;'";
case FT_SIZE_LARGE:
- return html::StartTag(tag, "style='font-size:large;'");
+ return "style='font-size:large;'";
case FT_SIZE_LARGER:
case FT_SIZE_LARGEST:
- return html::StartTag(tag, "style='font-size:x-large;'");
+ return "style='font-size:x-large;'";
case FT_SIZE_HUGE:
case FT_SIZE_HUGER:
- return html::StartTag(tag, "style='font-size:xx-large;'");
+ return "style='font-size:xx-large;'";
case FT_SIZE_INCREASE:
- return html::StartTag(tag, "style='font-size:larger;'");
+ return "style='font-size:larger;'";
case FT_SIZE_DECREASE:
- return html::StartTag(tag, "style='font-size:smaller;'");
+ return "style='font-size:smaller;'";
}
// kill warning
- return StartTag("");
+ return "";
}
} // end anonymous namespace
FontTag::FontTag(FontTypes type)
- : StartTag(fontToStartTag(type)), font_type_(type)
+ : StartTag(fontToTag(type), fontToAttribute(type)), font_type_(type)
{}