Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/editors
In directory vz-cvs-3.sog:/tmp/cvs-serv5522
Added Files:
lyx-10.7.patch lyx.patch lyx2.info
Log Message:
Works on 10.7
--- NEW FILE: lyx2.info ---
Info2: <<
Package: lyx2%type_pkg[-ui]
Type: -ui ( -x11 -mac )
Version: 2.0.1
Revision: 51
Source: ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/lyx-%v.tar.gz
Source-MD5: d382a4b8a37c4821ea3184b2cceac645
Depends: <<
qt4-base%type_pkg[-ui]-qtcore-shlibs, qt4-base%type_pkg[-ui]-qtgui-shlibs,
aspell, libiconv,
freetype219-shlibs, libhunspell-shlibs, hunspell, aspell-shlibs, enchant,
enchant1-shlibs,
libgettext8-shlibs, expat1-shlibs,
(%type_pkg[-ui] = -x11) glib2-shlibs,
boost1.41.cmake-shlibs, pth2-shlibs
<<
BuildDepends: <<
qt4-base%type_pkg[-ui], expat1, libgettext8-dev, gettext-bin, gettext-tools,
libiconv-dev, latex-xft-fonts, libhunspell, aspell-dev, enchant1-dev,
automake1.11,
freetype219, fink (>= 0.24.12),
(%type_pkg[-ui] = -x11) glib2-dev,
(%type_pkg[-ui] = -x11) x11-dev,
boost1.41.cmake, pth2-dev, pkgconfig
<<
Conflicts: (%type_pkg[-ui] = -x11) lyx-qt, lyx%type_pkg[-ui]
Replaces: (%type_pkg[-ui] = -x11) lyx-qt, lyx%type_pkg[-ui]
Provides: lyx2, lyx-editor
Recommends: <<
tetex | ptex | texlive,
imagemagick | imagemagick-nox,
gv | kghostview | evince | launch ,
gv | kghostview | kpdf | xpdf | evince | launch
<<
GCC: 4.0
UpdatePoMakefile: true
SetLDFLAGS: -Wl,-framework,AppKit -Wl,-framework,Carbon -Wl,-framework,OpenGL
-Wl,-framework,AGL
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
-L/usr/X11/lib -lX11
PatchFile: lyx.patch
PatchFile-MD5: 21f0b994568a271f66c7c6da1bfbf114
PatchFile2: lyx-10.7.patch
PatchFile2-MD5: 9e257efb83e4d7f379aeda9a06734c84
PatchScript: <<
sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1
patch -p1 < %{PatchFile2}
ln -s %p/share/automake-1.11/mkinstalldirs mkinstalldirs
<<
ConfigureParams: <<
(%type_pkg[-ui] = -mac) --prefix='%i/Applications/LyX.app' \
(%type_pkg[-ui] = -x11) --mandir='${prefix}/share/man' \
--with-frontend=qt4 \
--with-qt4-includes=%p/lib/qt4%type_pkg[-ui]/include \
--with-qt4-libraries=%p/lib/qt4%type_pkg[-ui]/lib \
(%type_pkg[-ui] = -mac) --without-x \
(%type_pkg[-ui] = -x11) --with-packaging=posix \
(%type_pkg[-ui] = -mac) --with-packaging=macosx \
--with-aspell --without-included-boost \
(%type_pkg[-ui] = -x11) --x-libraries=/usr/X11R6/lib \
(%type_pkg[-ui] = -x11) --x-includes=/usr/X11R6/include \
--enable-threads
<<
CompileScript: <<
#!/bin/sh -ev
export PYTHON=/usr/bin/python
export CCACHE_DISABLE=1
export QT4DIR=%p/lib/qt4%type_pkg[-ui]
./configure %c
# some bits don't compile with -O2.
make
<<
InstallScript: <<
#!/bin/sh -ev
export PYTHON=/usr/bin/python
if [ "%type_pkg[-ui]" == "-x11" ]; then
make install DESTDIR=%d
mkdir -p %i/etc/texmf.local/tex/latex
cp -R %i/share/lyx/tex %i/etc/texmf.local/tex/latex/lyx
pushd %i/share/lyx
ln -s %p/share/lyx/lyxrc.example preferences
popd
mv %i/bin/lyx %i/bin/lyxx
cp lyx.sh %i/bin/lyx
chmod 755 %i/bin/lyx
else
make install-strip
find %i/Applications/LyX.app \( -name '*.pyc' -o -name '*.pyo' \) -delete;
pushd %i/Applications/LyX.app/Contents/Resources/lyx2lyx
%p/share/automake-1.11/py-compile *.py
popd
pushd %i/Applications/LyX.app/Contents/Resources/scripts
%p/share/automake-1.11/py-compile *.py
fi
<<
License: GPL
DocFiles: INSTALL COPYING NEWS README UPGRADING ANNOUNCE
PostInstScript: <<
if [ "%type_pkg[-ui]" == "-x11" ]; then
echo "Configuring LyX for your system..."
(cd %p/share/lyx; ./configure.py)
if [ -f %p/bin/mktexlsr ]; then %p/bin/mktexlsr %p/etc/texmf.local; fi
else
if ! test -e /Applications/Fink; then
/usr/bin/install -d -m 755 /Applications/Fink
fi
/bin/ln -s '%p/Applications/LyX.app' /Applications/Fink/
(cd %p/Applications/LyX.app/Contents/Resources ; ./configure.py)
fi
<<
PostRmScript: <<
if [ -f %p/bin/mktexlsr ]; then %p/bin/mktexlsr %p/etc/texmf.local; fi
if [ "%type_raw[-ui]" == "-mac" ]; then
/bin/rm -f '/Applications/Fink/LyX.app'
fi
<<
Description: Wordprocessor utilizing LaTeX
DescDetail: <<
LyX is a modern approach of writing documents with a computer
which breaks with the tradition of the obsolete typewriter
concept. It is designed for people who want a professional
output with a minimum of time and effort, without becoming specia-
lists in typesetting. Compared to common word processors LyX
will increase the productivity a lot, since most of the type-
setting will be done by the computer, not the author. With LyX
the author can concentrate on the contents of his writing,
since the computer will take care of the look.
<<
DescUsage: <<
If you're using a non-Fink TeX distro, you'll want to run
/path/to/mktexlsr %p/etc/texmf.local
after installation of the package, and also after removing it,
to integrate its style and class files with your TeX setup.
Since LyX is highly configurable at runtime, we've moved to
having recommended rather than mandatory dependencies on
Imagemagick, TeX, and Postscript and PDF viewers. Some users
may already have non-Fink options for these and so we won't
force extra packages upon them.
<<
DescPort: <<
Thanks to Ronald Florence for his instructions on getting
lyx-1.3.2 to compile (http://www.18james.com/lyx_on_osx.html)
lyx is a wrapper script that sets up symlinks to latex-xft fonts
fonts in ~/.fonts, so that lyx-qt will find them.
Patch to prevent BusError when new file is opened with keyboard
shortcut.
Since we pretty much have to set the prefix to build the .app
bundle we have to reconstitute the python modules by hand in the
Aqua version or the validator gripes.
Symlink to the real mkinstalldirs as a simple workaround to the
Makefile trying to find one in %b rather than %b/config.
clang doesn't like some of the C++ code, so we fix the issues via
lyx-10.7 patch.
<<
DescPackaging: <<
Uses by-hand installation of the app bundle rather than AppBundles
so that the -mac and -x11 packages can be described in one .info file.
The -mac and -x11 variants don't have any files that overlap, so they
don't conflict/replace each other.
Since we're using the system's python to avoid extra dependencies, we
force a rebuild for a 10.4 -> 10.5 or 10.5 -> 10.6 update.
Prior versions by Jeffrey Whitaker
<<
Homepage: http://www.lyx.org
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
<<
--- NEW FILE: lyx-10.7.patch ---
diff -Nurd lyx-2.0.1/src/insets/InsetTabular.cpp
lyx-2.0.1.patched/src/insets/InsetTabular.cpp
--- lyx-2.0.1/src/insets/InsetTabular.cpp 2011-08-05 12:10:46.000000000
-0400
+++ lyx-2.0.1.patched/src/insets/InsetTabular.cpp 2011-09-12
12:01:24.000000000 -0400
@@ -188,62 +188,6 @@
};
-template <class T>
-string const write_attribute(string const & name, T const & t)
-{
- string const s = tostr(t);
- return s.empty() ? s : " " + name + "=\"" + s + "\"";
-}
-
-template <>
-string const write_attribute(string const & name, string const & t)
-{
- return t.empty() ? t : " " + name + "=\"" + t + "\"";
-}
-
-
-template <>
-string const write_attribute(string const & name, docstring const & t)
-{
- return t.empty() ? string() : " " + name + "=\"" + to_utf8(t) + "\"";
-}
-
-
-template <>
-string const write_attribute(string const & name, bool const & b)
-{
- // we write only true attribute values so we remove a bit of the
- // file format bloat for tabulars.
- return b ? write_attribute(name, convert<string>(b)) : string();
-}
-
-
-template <>
-string const write_attribute(string const & name, int const & i)
-{
- // we write only true attribute values so we remove a bit of the
- // file format bloat for tabulars.
- return i ? write_attribute(name, convert<string>(i)) : string();
-}
-
-
-template <>
-string const write_attribute(string const & name, Tabular::idx_type const & i)
-{
- // we write only true attribute values so we remove a bit of the
- // file format bloat for tabulars.
- return i ? write_attribute(name, convert<string>(i)) : string();
-}
-
-
-template <>
-string const write_attribute(string const & name, Length const & value)
-{
- // we write only the value if we really have one same reson as above.
- return value.zero() ? string() : write_attribute(name,
value.asString());
-}
-
-
string const tostr(LyXAlignment const & num)
{
switch (num) {
@@ -310,6 +254,62 @@
}
+template <class T>
+string const write_attribute(string const & name, T const & t)
+{
+ string const s = tostr(t);
+ return s.empty() ? s : " " + name + "=\"" + s + "\"";
+}
+
+template <>
+string const write_attribute(string const & name, string const & t)
+{
+ return t.empty() ? t : " " + name + "=\"" + t + "\"";
+}
+
+
+template <>
+string const write_attribute(string const & name, docstring const & t)
+{
+ return t.empty() ? string() : " " + name + "=\"" + to_utf8(t) + "\"";
+}
+
+
+template <>
+string const write_attribute(string const & name, bool const & b)
+{
+ // we write only true attribute values so we remove a bit of the
+ // file format bloat for tabulars.
+ return b ? write_attribute(name, convert<string>(b)) : string();
+}
+
+
+template <>
+string const write_attribute(string const & name, int const & i)
+{
+ // we write only true attribute values so we remove a bit of the
+ // file format bloat for tabulars.
+ return i ? write_attribute(name, convert<string>(i)) : string();
+}
+
+
+template <>
+string const write_attribute(string const & name, Tabular::idx_type const & i)
+{
+ // we write only true attribute values so we remove a bit of the
+ // file format bloat for tabulars.
+ return i ? write_attribute(name, convert<string>(i)) : string();
+}
+
+
+template <>
+string const write_attribute(string const & name, Length const & value)
+{
+ // we write only the value if we really have one same reson as above.
+ return value.zero() ? string() : write_attribute(name,
value.asString());
+}
+
+
// I would have liked a fromstr template a lot better. (Lgb)
bool string2type(string const str, LyXAlignment & num)
{
diff -Nurd lyx-2.0.1/src/support/strfwd.h lyx-2.0.1.patched/src/support/strfwd.h
--- lyx-2.0.1/src/support/strfwd.h 2010-11-17 17:11:33.000000000 -0500
+++ lyx-2.0.1.patched/src/support/strfwd.h 2011-09-11 15:56:28.000000000
-0400
@@ -10,6 +10,8 @@
// Free Software Foundation; either version 2, or (at your option)
// any later version.
+#include <string>
+
#ifndef STRFWD_H
#define STRFWD_H
--- NEW FILE: lyx.patch ---
--- lyx/lyx.sh.orig Wed Sep 24 14:34:33 2003
+++ lyx/lyx.sh Wed Sep 24 14:34:25 2003
@@ -0,0 +1,15 @@
+#!/bin/sh
+# make symlinks in ~/.fonts for latex-xft-fonts.
+# if they are not already there.
+export QT_XFT=TRUE
+for file in @PREFIX@/lib/X11/fonts/latex-xft-fonts/*ttf; do
+ if [ ! -d ~/.fonts ]; then
+ mkdir ~/.fonts
+ fi
+ symlink=~/.fonts/`basename $file`
+ if [ -f $file ] && [ ! -L $symlink ] && [ ! -f $symlink ] ; then
+ ln -s $file $symlink
+ fi
+done
+# launch lyx
+@PREFIX@/bin/lyxx $@
------------------------------------------------------------------------------
Doing More with Less: The Next Generation Virtual Desktop
What are the key obstacles that have prevented many mid-market businesses
from deploying virtual desktops? How do next-generation virtual desktops
provide companies an easier-to-deploy, easier-to-manage and more affordable
virtual desktop model.http://www.accelacomm.com/jaw/sfnl/114/51426474/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
