From 464f7afd438eb00456cb139d4105e74741763ae6e6bd487a0cc4f2151fc2eb3f Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 27 Apr 2007 14:48:55 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lyx?expand=0&rev=2 --- SuSEconfig.lyx | 21 ---------------- autogen.diff | 20 --------------- boost_regex.diff | 49 ------------------------------------ debugstream.diff | 11 -------- lyx-1.4.2.tar.bz2 | 3 --- lyx-1.5.0beta2.tar.bz2 | 3 +++ lyx.changes | 12 +++++++++ lyx.spec | 32 ++++++++++++----------- strict-aliasing-punning.diff | 10 ++++++++ 9 files changed, 43 insertions(+), 118 deletions(-) delete mode 100644 SuSEconfig.lyx delete mode 100644 autogen.diff delete mode 100644 boost_regex.diff delete mode 100644 debugstream.diff delete mode 100644 lyx-1.4.2.tar.bz2 create mode 100644 lyx-1.5.0beta2.tar.bz2 create mode 100644 strict-aliasing-punning.diff diff --git a/SuSEconfig.lyx b/SuSEconfig.lyx deleted file mode 100644 index 11e4c1e..0000000 --- a/SuSEconfig.lyx +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -# get system wide LANG setting: -if [ -f /etc/sysconfig/lang ] ; then - . /etc/sysconfig/lang - export LANG=$RC_LANG -fi - -if [ -z "$LANG" ]; then - export LANG="C" -fi - -if test -x "/usr/share/lyx/configure"; then - echo "Running LyX configure script ..." - PWD=`pwd` - cd /usr/share/lyx - LANG=$LANG ./configure > /dev/null - cd $PWD -else - echo "Can not execute LyX configure script!" -fi diff --git a/autogen.diff b/autogen.diff deleted file mode 100644 index bd13268..0000000 --- a/autogen.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- autogen.sh -+++ autogen.sh -@@ -17,7 +17,7 @@ - } - - case $automake_version in -- *' '1.9*) -+ *' '1.9*|*\ 1.[1-9][0-9]*|*\ [2-9]*) - ;; - *) - -@@ -38,7 +38,7 @@ - } - - case $autoversion in -- *' '2.5[2-9]) -+ *' '2.5[2-9]|*' '2.6[0-9]) - EXTRA_ACINCLUDE_FILES="lyxinclude25x.m4" - ;; - *) diff --git a/boost_regex.diff b/boost_regex.diff deleted file mode 100644 index 5f180db..0000000 --- a/boost_regex.diff +++ /dev/null @@ -1,49 +0,0 @@ ---- src/frontends/controllers/biblio.C.orig 2005-03-21 14:31:22.000000000 +0000 -+++ src/frontends/controllers/biblio.C 2006-07-11 12:02:27.000000000 +0000 -@@ -376,13 +376,14 @@ - // Note that '[' and '\' must be escaped. - // This is a limitation of boost::regex, but all other chars in BREs - // are assumed literal. -- boost::RegEx reg("[].|*?+(){}^$\\[\\\\]"); -+ boost::regex reg("[].|*?+(){}^$\\[\\\\]"); - - // $& is a perl-like expression that expands to all of the current match - // The '$' must be prefixed with the escape character '\' for - // boost to treat it as a literal. - // Thus, to prefix a matched expression with '\', we use: -- return reg.Merge(expr, "\\\\$&"); -+ regex_replace(expr, reg, "\\\\$&"); -+ return expr; - } - - -@@ -409,14 +410,14 @@ - - // Attempts to find a match for the current RE - // somewhere in data. -- return regex_.Search(data); -+ return regex_search(data, regex_); - } - - bool validRE() const { return regex_.error_code() == 0; } - - private: - InfoMap const map_; -- mutable boost::RegEx regex_; -+ mutable boost::regex regex_; - }; - - } // namespace anon ---- src/support/filetools.C 2006/07/11 09:33:19 1.1 -+++ src/support/filetools.C 2006/07/11 10:35:39 -@@ -610,8 +610,8 @@ - RTemp = "./" + path; - - // Normalise paths like /foo//bar ==> /foo/bar -- boost::RegEx regex("/{2,}"); -- RTemp = regex.Merge(RTemp, "/"); -+ boost::regex e("/{2,}"); -+ regex_replace(RTemp, e, "/"); - - while (!RTemp.empty()) { - // Split by next / diff --git a/debugstream.diff b/debugstream.diff deleted file mode 100644 index 43088ab..0000000 --- a/debugstream.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- src/support/debugstream.h 2006/07/11 09:02:54 1.1 -+++ src/support/debugstream.h 2006/07/11 09:03:08 -@@ -14,7 +14,7 @@ - - #include - --#include -+#include - - #ifdef DEBUG - # define TEMPORARY_DEBUG_MACRO DEBUG diff --git a/lyx-1.4.2.tar.bz2 b/lyx-1.4.2.tar.bz2 deleted file mode 100644 index 6570923..0000000 --- a/lyx-1.4.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:54de255a4ef947726b6ce7067cf149804cee82fc8d27f6749cd4c927be21b782 -size 6874598 diff --git a/lyx-1.5.0beta2.tar.bz2 b/lyx-1.5.0beta2.tar.bz2 new file mode 100644 index 0000000..a3f8b76 --- /dev/null +++ b/lyx-1.5.0beta2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a64043e994592825346db800491bccbc226e5198914a849435bff6cdcbd2c55 +size 8176131 diff --git a/lyx.changes b/lyx.changes index 7ece1d2..87a7247 100644 --- a/lyx.changes +++ b/lyx.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Apr 27 15:31:11 CEST 2007 - bg@suse.de + +- update to version 1.5.0beta2, notably: + o merge with CJK version + o initial unicode support + o qt4 frontend + o http://www.lyx.org/announce/1_5_0_beta2.txt +- use included boost (which is newer than our system boost, and + unfortunately not compatible) +- use TeXLive + ------------------------------------------------------------------- Sat Oct 21 14:38:18 CEST 2006 - schwab@suse.de diff --git a/lyx.spec b/lyx.spec index 4a3faec..3e7c531 100644 --- a/lyx.spec +++ b/lyx.spec @@ -1,7 +1,7 @@ # -# spec file for package lyx (Version 1.4.2) +# spec file for package lyx (Version 1.5.0beta2) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -12,19 +12,17 @@ Name: lyx #!BuildIgnore: lyx -BuildRequires: ImageMagick aspell-devel boost-devel gv ispell libdrm-devel libjpeg-devel lprng qt3-devel sgmltool te_ams te_latex te_web update-desktop-files +BuildRequires: ImageMagick aspell-devel boost-devel gv ispell libdrm-devel libjpeg-devel libqt4-devel lprng python sgmltool texlive-devel texlive-latex update-desktop-files License: GNU Library General Public License v. 2.0 and 2.1 (LGPL) Group: Productivity/Publishing/TeX/Frontends -Requires: tetex te_latex ImageMagick free-ttf-fonts +Requires: texlive-latex ImageMagick free-ttf-fonts Autoreqprov: on -Version: 1.4.2 -Release: 14 +Version: 1.5.0beta2 +Release: 1 Summary: LaTeX-Based WYSIWYG Editor URL: http://www.lyx.org/ Source: lyx-%{version}.tar.bz2 -Patch: debugstream.diff -Patch1: boost_regex.diff -Patch5: autogen.diff +Patch: strict-aliasing-punning.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -43,8 +41,6 @@ Authors: %prep %setup -q -n %{name}-%{version} %patch -%patch1 -%patch5 %build %{?suse_update_config:%{suse_update_config -f config}} @@ -56,9 +52,8 @@ export PATH=$QTDIR/bin:$PATH %configure \ --with-texmf=/usr/lib/teTeX/texmf \ --with-extra-inc=/usr/X11R6/include/X11 \ - --without-included-boost \ --with-aspell \ - --with-frontend=qt \ + --with-frontend=qt4 \ --with-qt-dir=$QTDIR \ --with-qt-libraries=$QTDIR/%{_lib} \ --with-qt-includes=$QTDIR/include @@ -101,7 +96,16 @@ ln -s /usr/share/lyx/tex $RPM_BUILD_ROOT/usr/share/texmf/tex/latex/lyx %doc %{_mandir}/man1/lyxclient.1.gz %doc %{_mandir}/man1/tex2lyx.1.gz -%changelog -n lyx +%changelog +* Fri Apr 27 2007 - bg@suse.de +- update to version 1.5.0beta2, notably: + o merge with CJK version + o initial unicode support + o qt4 frontend + o http://www.lyx.org/announce/1_5_0_beta2.txt +- use included boost (which is newer than our system boost, and + unfortunately not compatible) +- use TeXLive * Sat Oct 21 2006 - schwab@suse.de - Fix bogus version check. * Mon Jul 17 2006 - bg@suse.de diff --git a/strict-aliasing-punning.diff b/strict-aliasing-punning.diff new file mode 100644 index 0000000..a6c16d8 --- /dev/null +++ b/strict-aliasing-punning.diff @@ -0,0 +1,10 @@ +--- ./boost/libs/iostreams/src/Makefile.am 2007/04/27 11:17:24 1.1 ++++ ./boost/libs/iostreams/src/Makefile.am 2007/04/27 11:18:10 +@@ -8,6 +8,7 @@ + + AM_CPPFLAGS += \ + $(PCH_FLAGS) \ ++ -fno-strict-aliasing \ + -DBOOST_USER_CONFIG="" \ + $(BOOST_INCLUDES) +