diff --git a/Automake-15.patch b/Automake-15.patch deleted file mode 100644 index 4649624..0000000 --- a/Automake-15.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- lyx-2.1.3/autogen.sh.orig 2015-02-07 16:25:07.000000000 +0100 -+++ lyx-2.1.3/autogen.sh 2015-06-21 23:37:56.961228499 +0200 -@@ -16,7 +16,7 @@ - } - - case $automake_version in -- *' '1.[8-9]*|*' '1.1[01234]*) -+ *' '1.[8-9]*|*' '1.1[012345]*) - ;; - *) - diff --git a/Fix-build-with-GNU-libstdc++-C++11-ABI.patch b/Fix-build-with-GNU-libstdc++-C++11-ABI.patch deleted file mode 100644 index fa42b8e..0000000 --- a/Fix-build-with-GNU-libstdc++-C++11-ABI.patch +++ /dev/null @@ -1,195 +0,0 @@ -diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 -index 61ea48d..a0094c1 100644 ---- a/config/lyxinclude.m4 -+++ b/config/lyxinclude.m4 -@@ -120,37 +120,65 @@ done - ])dnl - - --AC_DEFUN([LYX_PROG_CXX_WORKS], --[rm -f conftest.C --cat >conftest.C <&5 || CXX= --rm -f conftest.C conftest.o conftest.obj || true -+dnl Usage: LYX_PROG_CLANG: set lyx_cv_prog_clang to yes if the compiler is clang. -+AC_DEFUN([LYX_PROG_CLANG], -+[AC_CACHE_CHECK([whether the compiler is clang], -+ [lyx_cv_prog_clang], -+[AC_TRY_COMPILE([], [ -+#ifndef __clang__ -+ this is not clang -+#endif -+], -+[lyx_cv_prog_clang=yes ; CLANG=yes], [lyx_cv_prog_clang=no ; CLANG=no])]) - ]) - - --AC_DEFUN([LYX_PROG_CXX], --[AC_MSG_CHECKING([for a good enough C++ compiler]) --LYX_SEARCH_PROG(CXX, $CXX $CCC g++ gcc c++ CC cxx xlC cc++, [LYX_PROG_CXX_WORKS]) -+dnl Usage: LYX_LIB_STDCXX: set lyx_cv_lib_stdcxx to yes if the STL library is libstdc++. -+AC_DEFUN([LYX_LIB_STDCXX], -+[AC_CACHE_CHECK([whether STL is libstdc++], -+ [lyx_cv_lib_stdcxx], -+[AC_TRY_COMPILE([#include], [ -+#if ! defined(__GLIBCXX__) && ! defined(__GLIBCPP__) -+ this is not libstdc++ -+#endif -+], -+[lyx_cv_lib_stdcxx=yes], [lyx_cv_lib_stdcxx=no])]) -+]) - --if test -z "$CXX" ; then -- AC_MSG_ERROR([Unable to find a good enough C++ compiler]) --fi --AC_MSG_RESULT($CXX) - --AC_PROG_CXX --AC_PROG_CXXCPP -+dnl Usage: LYX_LIB_STDCXX_CXX11_ABI: set lyx_cv_lib_stdcxx_cxx11_abi to yes -+dnl if the STL library is GNU libstdc++ and the C++11 ABI is used. -+AC_DEFUN([LYX_LIB_STDCXX_CXX11_ABI], -+[AC_CACHE_CHECK([whether STL is libstdc++ using the C++11 ABI], -+ [lyx_cv_lib_stdcxx_cxx11_abi], -+[AC_TRY_COMPILE([#include], [ -+#if ! defined(_GLIBCXX_USE_CXX11_ABI) || ! _GLIBCXX_USE_CXX11_ABI -+ this is not libstdc++ using the C++11 ABI -+#endif -+], -+[lyx_cv_lib_stdcxx_cxx11_abi=yes], [lyx_cv_lib_stdcxx_cxx11_abi=no])]) -+]) -+ -+ -+AC_DEFUN([LYX_PROG_CXX], -+[AC_REQUIRE([AC_PROG_CXX]) -+AC_REQUIRE([AC_PROG_CXXCPP]) -+ -+AC_LANG_PUSH(C++) -+LYX_PROG_CLANG -+LYX_LIB_STDCXX -+LYX_LIB_STDCXX_CXX11_ABI -+AC_LANG_POP(C++) -+ -+if test $lyx_cv_lib_stdcxx = "yes" ; then -+ if test $lyx_cv_lib_stdcxx_cxx11_abi = "yes" ; then -+ AC_DEFINE(USE_GLIBCXX_CXX11_ABI, 1, [use GNU libstdc++ with C++11 ABI]) -+ fi -+else -+ if test $lyx_cv_prog_clang = "yes" ; then -+ AC_DEFINE(USE_LLVM_LIBCPP, 1, [use libc++ provided by llvm instead of GNU libstdc++]) -+ fi -+fi - - ### We might want to get or shut warnings. - AC_ARG_ENABLE(warnings, -diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake -index 71291a5..a738160 100644 ---- a/development/cmake/ConfigureChecks.cmake -+++ b/development/cmake/ConfigureChecks.cmake -@@ -112,3 +112,49 @@ check_cxx_source_compiles( - " - SIZEOF_WCHAR_T_IS_4) - -+# Check whether STL is libstdc++ -+check_cxx_source_compiles( -+ " -+ #include -+ int main() { -+ #if ! defined(__GLIBCXX__) && ! defined(__GLIBCPP__) -+ this is not libstdc++ -+ #endif -+ return(0); -+ } -+ " -+lyx_cv_lib_stdcxx) -+ -+# Check whether STL is libstdc++ with C++11 ABI -+check_cxx_source_compiles( -+ " -+ #include -+ int main() { -+ #if ! defined(_GLIBCXX_USE_CXX11_ABI) || ! _GLIBCXX_USE_CXX11_ABI -+ this is not libstdc++ using the C++11 ABI -+ #endif -+ return(0); -+ } -+ " -+USE_GLIBCXX_CXX11_ABI) -+ -+check_cxx_source_compiles( -+ " -+ #ifndef __clang__ -+ this is not clang -+ #endif -+ int main() { -+ return(0); -+ } -+ " -+lyx_cv_prog_clang) -+ -+set(USE_LLVM_LIBCPP) -+set(USE_GLIBCXX_CXX11_ABI) -+if(NOT lyx_cv_lib_stdcxx) -+ if(lyx_cv_prog_clang) -+ # use libc++ provided by llvm instead of GNU libstdc++ -+ set(USE_LLVM_LIBCPP 1) -+ endif() -+endif() -+ -diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake -index 7bbe09e..a392b51 100644 ---- a/development/cmake/config.h.cmake -+++ b/development/cmake/config.h.cmake -@@ -57,6 +57,9 @@ - #cmakedefine LYX_USE_TR1 1 - #cmakedefine LYX_USE_TR1_REGEX 1 - -+// use GNU libstdc++ with C++11 ABI -+#cmakedefine USE_GLIBCXX_CXX11_ABI 1 -+ - #cmakedefine Z_PREFIX 1 - - #cmakedefine ASPELL_FOUND 1 -diff --git a/src/support/strfwd.h b/src/support/strfwd.h -index de8588c..f39426e 100644 ---- a/src/support/strfwd.h -+++ b/src/support/strfwd.h -@@ -13,14 +13,6 @@ - #ifndef STRFWD_H - #define STRFWD_H - --// This includes does nothing but defining _LIBCPP_VERSION --// if libc++ is used (rather than libstdc++) - we first --// check if we have at least a c++03 standard before --// including the file --#if (__cplusplus > 19971L) --#include --#endif -- - #ifdef USE_WCHAR_T - - // Prefer this if possible because GNU libstdc++ has usable -@@ -36,8 +28,10 @@ namespace lyx { typedef boost::uint32_t char_type; } - - #endif - --// Forward definitions do not work with libc++ --#ifdef _LIBCPP_VERSION -+// For gcc5 with the new std::string ABI forward declarations would work in -+// principle, but I am not sure whether we want non-standard -+// "namespace __cxx11" in our sources. -+#if defined(USE_LLVM_LIBCPP) || defined(USE_GLIBCXX_CXX11_ABI) - #include - #else diff --git a/lyx-2.1.3.tar.xz b/lyx-2.1.3.tar.xz deleted file mode 100644 index d400aba..0000000 --- a/lyx-2.1.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2fd52e7e5ee372983eb6b0a7f04765cb0df6f8c1f3420081d9f7761acfc75682 -size 10778624 diff --git a/lyx-2.1.3.tar.xz.sig b/lyx-2.1.3.tar.xz.sig deleted file mode 100644 index 1cd3fee..0000000 Binary files a/lyx-2.1.3.tar.xz.sig and /dev/null differ diff --git a/lyx-2.1.2-xdg_open.patch b/lyx-2.1.4-xdg_open.patch similarity index 90% rename from lyx-2.1.2-xdg_open.patch rename to lyx-2.1.4-xdg_open.patch index 0109a00..9c34277 100644 --- a/lyx-2.1.2-xdg_open.patch +++ b/lyx-2.1.4-xdg_open.patch @@ -1,7 +1,7 @@ -diff -ur lyx-2.1.2.orig/lib/configure.py lyx-2.1.2/lib/configure.py ---- lyx-2.1.2.orig/lib/configure.py 2014-09-16 18:31:40.000000000 +0200 -+++ lyx-2.1.2/lib/configure.py 2014-09-17 13:01:46.266158060 +0200 -@@ -594,7 +594,7 @@ +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"''' @@ -10,7 +10,7 @@ diff -ur lyx-2.1.2.orig/lib/configure.py lyx-2.1.2/lib/configure.py 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) ) -@@ -633,7 +633,7 @@ +@@ -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"''']) # @@ -19,7 +19,7 @@ diff -ur lyx-2.1.2.orig/lib/configure.py lyx-2.1.2/lib/configure.py rc_entry = [r'\Format xhtml xhtml "LyXHTML" y "%%" "" "document,menu=export" "application/xhtml+xml"']) # checkEditor('a BibTeX editor', ['jabref', 'JabRef', \ -@@ -646,14 +646,14 @@ +@@ -648,14 +648,14 @@ # #checkProg('a Postscript interpreter', ['gs'], # rc_entry = [ r'\ps_command "%%"' ]) @@ -27,7 +27,7 @@ diff -ur lyx-2.1.2.orig/lib/configure.py lyx-2.1.2/lib/configure.py + 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,menu=export" "" + \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 @@ -36,9 +36,9 @@ diff -ur lyx-2.1.2.orig/lib/configure.py lyx-2.1.2/lib/configure.py '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" "" -@@ -663,14 +663,14 @@ - \Format pdf6 pdf "PDF (graphics)" "" "%%" "" "vector" "application/pdf" - \Format pdf7 pdf "PDF (cropped)" "" "%%" "" "document,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'], diff --git a/lyx-2.1.4.tar.xz b/lyx-2.1.4.tar.xz new file mode 100644 index 0000000..cbbe40a --- /dev/null +++ b/lyx-2.1.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d13548cf183f2fc241df8121420933702491a7460c78a0ef6dba0e9e438ef32a +size 10928716 diff --git a/lyx-2.1.4.tar.xz.sig b/lyx-2.1.4.tar.xz.sig new file mode 100644 index 0000000..923ceb9 Binary files /dev/null and b/lyx-2.1.4.tar.xz.sig differ diff --git a/lyx.changes b/lyx.changes index 97bcc3a..b83526f 100644 --- a/lyx.changes +++ b/lyx.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Sun Jul 26 22:28:55 UTC 2015 - cornelis@solcon.nl + +- Update to 2.1.4: + * New support for PDF forms. + * Add low-resolution PDF export format (needs an installed + ghostscript). + * Add possibility via the layout file to prevent LyX from loading + inputenc. + * support for the math commands \lvert, \rvert, \lVert, and \rVert + (bug 3538). + * Fix some missing symbols in math completer. + * Split different indices in the outliner (bug 7012). + * Clarify the function of Tools > Preferences > Look & Feel > + Save Documents Compressed by Default (bug 7822). + * Update instant previews when modifying the screen zoom factor + (bug 8258). + * Documentation and localization updates. + * Bugfixes. + * For details see for details see + http://www.lyx.org/announce/2_1_4.txt or included ANNOUNCE file +- Removed Automake-15.patch and Fix-build-with-GNU-libstdc++-C++11 + -ABI.patch, which are now included in this release. +- Updated lyx-2.1.4-xdg-open.patch +- Added ghostscript to Requires to support new low-res export. + ------------------------------------------------------------------- Mon Jun 22 13:08:54 UTC 2015 - cornelis@solcon.nl diff --git a/lyx.spec b/lyx.spec index 8ff1039..53bb931 100644 --- a/lyx.spec +++ b/lyx.spec @@ -30,7 +30,7 @@ BuildRequires: libqt4-devel BuildRequires: python BuildRequires: update-desktop-files BuildRequires: xz -Version: 2.1.3 +Version: 2.1.4 Release: 0 Summary: WYSIWYM (What You See Is What You Mean) document processor License: GPL-2.0+ @@ -42,13 +42,11 @@ 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.2-xdg_open.patch +Patch0: lyx-2.1.4-xdg_open.patch Patch1: lyx-2.1.2.2-remove-date-time.patch -# The following patches are from the 2.1.x branch, fixes build with gcc5 -Patch2: Fix-build-with-GNU-libstdc++-C++11-ABI.patch -Patch3: Automake-15.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: ImageMagick +Requires: ghostscript %if 0%{?suse_version} < 1230 Requires: texlive-latex Recommends: texlive-xetex @@ -115,11 +113,9 @@ document under "Help" on the menubar. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build -./autogen.sh +#./autogen.sh TEXMF=%{_datadir}/texmf %configure \ --without-included-boost \