Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/editors
In directory
sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16322/10.7/stable/main/finkinfo/editors
Modified Files:
lyx2.info
Log Message:
Fix changes for 10.7+ packaging that rendered it unable to build.
While I'm at it, how about using pkgconfig to find the Qt stuff?
Index: lyx2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/editors/lyx2.info,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- lyx2.info 27 Jan 2013 23:10:48 -0000 1.12
+++ lyx2.info 5 Feb 2013 04:12:35 -0000 1.13
@@ -55,8 +55,6 @@
(%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-mine%type_pkg[-ui]/include \
---with-qt4-libraries=%p/lib/qt4-mine%type_pkg[-ui]/lib \
(%type_pkg[-ui] = -mac) --without-x \
(%type_pkg[-ui] = -x11) --with-packaging=posix \
(%type_pkg[-ui] = -mac) --with-packaging=macosx \
@@ -70,7 +68,8 @@
#!/bin/sh -ev
export PYTHON=/usr/bin/python
export CCACHE_DISABLE=1
- export QT4DIR=%p/lib/qt4-mine%type_pkg[-ui]
+ export QT4DIR=%p/lib/qt4%type_pkg[-ui]
+ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:%p/lib/qt4%type_pkg[-ui]/lib/pkgconfig
%{default_script}
fink-package-precedence .
<<
------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
