Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors
In directory vz-cvs-3.sog:/tmp/cvs-serv22062
Modified Files:
lyx-10.4.info lyx-10.5.info lyx-10.6.info
Log Message:
New upstream
Index: lyx-10.6.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/lyx-10.6.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- lyx-10.6.info 9 Dec 2010 15:43:27 -0000 1.6
+++ lyx-10.6.info 19 May 2011 19:00:42 -0000 1.7
@@ -1,13 +1,13 @@
Info2: <<
Package: lyx%type_pkg[-ui]
Type: -ui ( -x11 -mac )
-Version: 1.6.8
+Version: 1.6.10
Revision: 41
Distribution: 10.6
-Source: ftp://ftp.devel.lyx.org/pub/lyx/stable/lyx-%v.tar.bz2
-Source-MD5: 90d1ffbf5e84c731ae296d83e0c319b1
+Source: ftp://ftp.devel.lyx.org/pub/%{ni}/stable/%{ni}-%v.tar.bz2
+Source-MD5: 6b286595302020adf8545796e5ea5c89
Depends: <<
-qt4%type_pkg[-ui]-core-shlibs, qt4%type_pkg[-ui]-gui-shlibs,
+qt4-base%type_pkg[-ui]-qtcore-shlibs, qt4-base%type_pkg[-ui]-qtgui-shlibs,
aspell, libiconv,
freetype219-shlibs, aspell-shlibs, libgettext8-shlibs, expat1-shlibs,
(%type_pkg[-ui] = -x11) glib2-shlibs,
@@ -15,23 +15,24 @@
boost1.41.cmake-shlibs
<<
BuildDepends: <<
-qt4%type_pkg[-ui], expat1, libgettext8-dev, gettext-bin, gettext-tools,
+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),
(%type_pkg[-ui] = -x11) glib2-dev,
(%type_pkg[-ui] = -x11) x11-dev,
aiksaurus-dev,
-boost1.41.cmake
+boost1.41.cmake, pkgconfig
<<
-Conflicts: (%type_pkg[-ui] = -x11) lyx-qt
-Replaces: (%type_pkg[-ui] = -x11) lyx-qt
-Provides: lyx
+Conflicts: (%type_pkg[-ui] = -x11) lyx-qt, lyx2%type_pkg[-ui]
+Replaces: (%type_pkg[-ui] = -x11) lyx-qt, lyx2%type_pkg[-ui]
+Provides: lyx1, 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,-framework,QuickTime
-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: %{ni}.patch
Index: lyx-10.5.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/lyx-10.5.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- lyx-10.5.info 9 Dec 2010 15:43:27 -0000 1.17
+++ lyx-10.5.info 19 May 2011 19:00:42 -0000 1.18
@@ -1,13 +1,13 @@
Info2: <<
Package: lyx%type_pkg[-ui]
Type: -ui ( -x11 -mac )
-Version: 1.6.8
+Version: 1.6.10
Revision: 21
Distribution: 10.5
-Source: ftp://ftp.devel.lyx.org/pub/lyx/stable/lyx-%v.tar.bz2
-Source-MD5: 90d1ffbf5e84c731ae296d83e0c319b1
+Source: ftp://ftp.devel.lyx.org/pub/%{ni}/stable/%{ni}-%v.tar.bz2
+Source-MD5: 6b286595302020adf8545796e5ea5c89
Depends: <<
-qt4%type_pkg[-ui]-core-shlibs, qt4%type_pkg[-ui]-gui-shlibs,
+qt4-base%type_pkg[-ui]-qtcore-shlibs, qt4-base%type_pkg[-ui]-qtgui-shlibs,
aspell, libiconv,
freetype219-shlibs, aspell-shlibs, libgettext8-shlibs, expat1-shlibs,
(%type_pkg[-ui] = -x11) glib2-shlibs,
@@ -15,7 +15,7 @@
boost1.41.cmake-shlibs
<<
BuildDepends: <<
-qt4%type_pkg[-ui], expat1, libgettext8-dev, gettext-bin, gettext-tools,
+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),
(%type_pkg[-ui] = -x11) glib2-dev,
@@ -23,15 +23,16 @@
aiksaurus-dev,
boost1.41.cmake
<<
-Conflicts: (%type_pkg[-ui] = -x11) lyx-qt
-Replaces: (%type_pkg[-ui] = -x11) lyx-qt
-Provides: lyx
+Conflicts: (%type_pkg[-ui] = -x11) lyx-qt, lyx2%type_pkg[-ui]
+Replaces: (%type_pkg[-ui] = -x11) lyx-qt, lyx2%type_pkg[-ui]
+Provides: lyx1, 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,-framework,QuickTime
-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: %{ni}.patch
@@ -153,8 +154,6 @@
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.
-10.4 -> 10.5 also forces this due to the 10.4 package rolling its own
-boost.
Prior versions by Jeffrey Whitaker
<<
Homepage: http://www.lyx.org
Index: lyx-10.4.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/editors/lyx-10.4.info,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- lyx-10.4.info 9 Dec 2010 15:43:27 -0000 1.17
+++ lyx-10.4.info 19 May 2011 19:00:42 -0000 1.18
@@ -1,35 +1,38 @@
Info2: <<
Package: lyx%type_pkg[-ui]
Type: -ui ( -x11 -mac )
-Version: 1.6.8
+Version: 1.6.10
Revision: 1
Distribution: 10.4
-Source: ftp://ftp.devel.lyx.org/pub/lyx/stable/lyx-%v.tar.bz2
-Source-MD5: 90d1ffbf5e84c731ae296d83e0c319b1
+Source: ftp://ftp.devel.lyx.org/pub/%{ni}/stable/%{ni}-%v.tar.bz2
+Source-MD5: 6b286595302020adf8545796e5ea5c89
Depends: <<
-qt4%type_pkg[-ui]-core-shlibs, qt4%type_pkg[-ui]-gui-shlibs,
+qt4-base%type_pkg[-ui]-qtcore-shlibs, qt4-base%type_pkg[-ui]-qtgui-shlibs,
aspell, libiconv,
freetype219-shlibs, aspell-shlibs, libgettext8-shlibs, expat1-shlibs,
(%type_pkg[-ui] = -x11) glib2-shlibs,
-aiksaurus-shlibs
+aiksaurus-shlibs,
+boost1.41.cmake-shlibs
<<
BuildDepends: <<
-qt4%type_pkg[-ui], expat1, libgettext8-dev, gettext-bin, gettext-tools,
+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),
(%type_pkg[-ui] = -x11) glib2-dev,
(%type_pkg[-ui] = -x11) x11-dev,
-aiksaurus-dev
+aiksaurus-dev,
+boost1.41.cmake
<<
-Conflicts: (%type_pkg[-ui] = -x11) lyx-qt
-Replaces: (%type_pkg[-ui] = -x11) lyx-qt
-Provides: lyx
+Conflicts: (%type_pkg[-ui] = -x11) lyx-qt, lyx2%type_pkg[-ui]
+Replaces: (%type_pkg[-ui] = -x11) lyx-qt, lyx2%type_pkg[-ui]
+Provides: lyx1, 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,-framework,QuickTime
-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/X11R6/lib -lX11
PatchFile: %{ni}.patch
@@ -48,7 +51,7 @@
(%type_pkg[-ui] = -x11) --with-packaging=posix \
(%type_pkg[-ui] = -mac) --with-packaging=macosx \
--with-aspell --disable-dependency-tracking \
---disable-static --enable-shared \
+--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
<<
@@ -137,8 +140,7 @@
fonts in ~/.fonts, so that lyx-qt will find them.
Patch to prevent BusError when new file is opened with keyboard
shortcut.
-We let it roll its own boost because it seems not to get along
-with Fink's boost packages for some reason.
+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.
@@ -152,8 +154,6 @@
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.
-10.4 -> 10.5 also forces this due to the 10.4 package rolling its own
-boost.
Prior versions by Jeffrey Whitaker
<<
Homepage: http://www.lyx.org
------------------------------------------------------------------------------
What Every C/C++ and Fortran developer Should Know!
Read this article and learn how Intel has extended the reach of its
next-generation tools to help Windows* and Linux* C/C++ and Fortran
developers boost performance applications - including clusters.
http://p.sf.net/sfu/intel-dev2devmay
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
