Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/editors
In directory vz-cvs-3.sog:/tmp/cvs-serv26259/10.7/stable/main/finkinfo/editors
Modified Files:
lyx.info lyx2.info
Log Message:
New boost1.46.cmake from submissions:
https://sourceforge.net/tracker/?func=detail&atid=414256&aid=3436035&group_id=17203
Update Conflicts/Replaces in other boost packages.
Switch lyx and lyx2 to use boost1.46.1.cmake
Index: lyx2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/editors/lyx2.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lyx2.info 12 Sep 2011 21:18:42 -0000 1.1
+++ lyx2.info 21 Nov 2011 21:45:58 -0000 1.2
@@ -2,7 +2,7 @@
Package: lyx2%type_pkg[-ui]
Type: -ui ( -x11 -mac )
Version: 2.0.1
-Revision: 51
+Revision: 52
Source: ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/lyx-%v.tar.gz
Source-MD5: d382a4b8a37c4821ea3184b2cceac645
Depends: <<
@@ -11,15 +11,15 @@
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
+boost1.46.1.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),
+freetype219, fink (>= 0.30.0),
(%type_pkg[-ui] = -x11) glib2-dev,
(%type_pkg[-ui] = -x11) x11-dev,
-boost1.41.cmake, pth2-dev, pkgconfig
+boost1.46.1.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]
@@ -32,7 +32,7 @@
<<
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
+SetLDFLAGS: -Wl,-framework,AppKit -Wl,-framework,Carbon -Wl,-framework,OpenGL
-Wl,-framework,AGL -L/usr/X11/lib -lX11
PatchFile: lyx.patch
PatchFile-MD5: 21f0b994568a271f66c7c6da1bfbf114
@@ -63,9 +63,8 @@
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
+ %{default_script}
+ fink-package-precedence .
<<
InstallScript: <<
#!/bin/sh -ev
Index: lyx.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/editors/lyx.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lyx.info 18 Sep 2011 00:36:04 -0000 1.1
+++ lyx.info 21 Nov 2011 21:45:58 -0000 1.2
@@ -2,7 +2,7 @@
Package: lyx%type_pkg[-ui]
Type: -ui ( -x11 -mac )
Version: 1.6.10
-Revision: 51
+Revision: 52
Distribution: 10.7
Source: ftp://ftp.devel.%{ni}.org/pub/%{ni}/stable/%{ni}-%v.tar.bz2
Source-MD5: 6b286595302020adf8545796e5ea5c89
@@ -12,16 +12,17 @@
freetype219-shlibs, aspell-shlibs, libgettext8-shlibs, expat1-shlibs,
(%type_pkg[-ui] = -x11) glib2-shlibs,
aiksaurus-shlibs,
-boost1.41.cmake-shlibs
+boost1.46.1.cmake-shlibs
<<
BuildDepends: <<
qt4-base%type_pkg[-ui], expat1, libgettext8-dev, gettext-bin, gettext-tools,
libiconv-dev, latex-xft-fonts, aspell-dev, automake1.11,
-freetype219, fink (>= 0.24.12),
+freetype219, fink (>= 0.30.0),
(%type_pkg[-ui] = -x11) glib2-dev,
(%type_pkg[-ui] = -x11) x11-dev,
aiksaurus-dev,
-boost1.41.cmake, pkgconfig
+boost1.46.1.cmake, pkgconfig,
+fink-package-precedence
<<
Conflicts: (%type_pkg[-ui] = -x11) %{ni}-qt, %{ni}2%type_pkg[-ui]
Replaces: (%type_pkg[-ui] = -x11) %{ni}-qt, %{ni}2%type_pkg[-ui]
@@ -35,7 +36,7 @@
GCC: 4.0
UpdatePoMakefile: true
-SetLDFLAGS: -Wl,-framework,AppKit -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
+SetLDFLAGS: -Wl,-framework,AppKit -Wl,-framework,OpenGL -Wl,-framework,AGL
-L/usr/X11/lib -lX11
SetCXX: llvm-g++
SetCC: llvm-gcc
@@ -61,10 +62,10 @@
(%type_pkg[-ui] = -mac) --without-x \
(%type_pkg[-ui] = -x11) --with-packaging=posix \
(%type_pkg[-ui] = -mac) --with-packaging=macosx \
---with-aspell --disable-dependency-tracking \
---disable-static --enable-shared --without-included-boost \
(%type_pkg[-ui] = -x11) --x-libraries=/usr/X11R6/lib \
-(%type_pkg[-ui] = -x11) --x-includes=/usr/X11R6/include
+(%type_pkg[-ui] = -x11) --x-includes=/usr/X11R6/include \
+--with-aspell --enable-dependency-tracking \
+--disable-static --enable-shared --without-included-boost
<<
CompileScript: <<
#!/bin/sh -ev
@@ -72,9 +73,8 @@
export CCACHE_DISABLE=1
export QT4DIR=%p/lib/qt4%type_pkg[-ui]
export OBJC="llvm-gcc -ObjC"
- ./configure %c
- # some bits don't compile with -O2.
- make
+ %{default_script}
+ fink-package-precedence .
<<
InstallScript: <<
#!/bin/sh -ev
@@ -150,13 +150,11 @@
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.
+fonts in ~/.fonts, so that LyX will find them.
Patch to prevent BusError when new file is opened with keyboard
shortcut.
-Uses Fink's boost as of 1.6.5-22 and later.
-
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.
@@ -166,7 +164,8 @@
lyx-10.7 patch contains fixes for 10.7 which are common to both
lyx and lyx2: C++ constructions that aren't compatible with the strict
-syntx requirements of clang.
+syntax requirements of clang (even though we don't use clang on lyx
+for other reasons)
lyx-1.6.patch contains fixes specific to lyx.
@@ -176,10 +175,15 @@
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.
+force a rebuild for a 10.4 -> 10.5, 10.5 -> 10.6, or 10.6->10.7 update.
+
+Uses Fink's boost as of 1.6.5-22 and later.
+
Prior versions by Jeffrey Whitaker
<<
Homepage: http://www.lyx.org
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure
contains a definitive record of customers, application performance,
security threats, fraudulent activity, and more. Splunk takes this
data and makes sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-novd2d
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
