Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/net
In directory vz-cvs-3.sog:/tmp/cvs-serv25991/10.4-EOL/net
Modified Files:
valknut.info
Log Message:
move the qt4 version to stable
Index: valknut.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/net/valknut.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- valknut.info 11 Jul 2011 04:08:34 -0000 1.1
+++ valknut.info 16 Jul 2011 22:08:06 -0000 1.2
@@ -1,32 +1,41 @@
Info2: <<
Package: valknut%type_pkg[-qttoolkit]
-Version: 0.3.22
-Revision: 1
-Distribution: (%type_raw[-qttoolkit] = -aqua) 10.4, (%type_raw[-qttoolkit] =
-aqua) 10.5
+Version: 0.4.9
+Revision: 3
+# x86_64 is not allowed until Qt3Support is removed as a dependency.
+Architecture: powerpc, i386
Description: Direct Connect protocol QT client
Type: -qttoolkit (-aqua -x11)
License: GPL
Maintainer: Hanspeter Niederstrasser <nie...@users.sourceforge.net>
Depends: <<
bzip2-shlibs,
- dclib4-shlibs (>= 0.3.22-1),
+ dclib5-shlibs (>= 0.3.23-1),
+ (%type_raw[-qttoolkit] = -x11) expat1-shlibs,
(%type_raw[-qttoolkit] = -x11) freetype219-shlibs (>= 2.3.7-7),
+ (%type_raw[-qttoolkit] = -x11) glib2-shlibs,
+ (%type_raw[-qttoolkit] = -x11) libgettext8-shlibs,
libiconv,
- libpng3-shlibs,
+ (%type_raw[-qttoolkit] = -x11) libpng3-shlibs,
libxml2-shlibs,
- (%type_raw[-qttoolkit] = -x11) qt3-shlibs,
- (%type_raw[-qttoolkit] = -aqua) qt3mac-shlibs,
+ (%type_raw[-qttoolkit] = -x11) qt4-x11-core-shlibs,
+ (%type_raw[-qttoolkit] = -x11) qt4-x11-gui-shlibs,
+ (%type_raw[-qttoolkit] = -aqua) qt4-mac-core-shlibs,
+ (%type_raw[-qttoolkit] = -aqua) qt4-mac-gui-shlibs,
(%type_raw[-qttoolkit] = -x11) x11
<<
BuildDepends: <<
bzip2-dev,
- dclib4 (>= 0.3.22-1),
+ dclib5 (>= 0.3.23-1),
(%type_raw[-qttoolkit] = -x11) freetype219 (>= 2.3.7-7),
+ (%type_raw[-qttoolkit] = -x11) expat1,
+ (%type_raw[-qttoolkit] = -x11) glib2-dev,
+ (%type_raw[-qttoolkit] = -x11) libgettext8-dev,
libiconv-dev,
- libpng3,
+ (%type_raw[-qttoolkit] = -x11) libpng3,
libxml2,
- (%type_raw[-qttoolkit] = -x11) qt3,
- (%type_raw[-qttoolkit] = -aqua) qt3mac,
+ (%type_raw[-qttoolkit] = -x11) qt4-x11,
+ (%type_raw[-qttoolkit] = -aqua) qt4-mac,
pkgconfig,
system-openssl-dev,
(%type_raw[-qttoolkit] = -x11) x11-dev,
@@ -39,25 +48,32 @@
<<
Replaces: dcgui-qt, dcgui-qt-ssl, valknut, valknut-ssl
Source: mirror:sourceforge:wxdcgui/%{ni}-%v.tar.bz2
-Source-MD5: 984469870dc70c4ee696d84967f22a60
+Source-MD5: c25d68c447cb9deb4262befdde9fccea
PatchScript: <<
### fix the order of SSL flags to make sure we link to system-openssl
- /usr/bin/perl -pi -e 's,\$\(all_libraries\)
\$\(DCLIB_LIBS\),\$\(LDFLAGS\) \$\(all_libraries\) \$\(DCLIB_LIBS\),g;'
valknut/Makefile.in
+ # Add $(LDFLAGS) early into $(valknut_LDFLAGS)
+ /usr/bin/perl -pi -e 's,\$\(QTCORE_LIBS\)
\$\(QTGUI_LIBS\),\$\(LDFLAGS\) \$\(QTCORE_LIBS\) \$\(QTGUI_LIBS\),g;'
valknut/Makefile.in
<<
SetLDFLAGS: -L%p/lib/system-openssl/lib
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
ConfigureParams: <<
- (%type_raw[-qttoolkit] = -aqua) --with-qt-dir=%p/lib/qt3mac \
- (%type_raw[-qttoolkit] = -aqua) --with-qt-includes=%p/lib/qt3mac/include \
- (%type_raw[-qttoolkit] = -aqua) --enable-mac \
- (%type_raw[-qttoolkit] = -aqua) --enable-osx \
- (%type_raw[-qttoolkit] = -x11) --with-qt-dir=%p/lib/qt3 \
- (%type_raw[-qttoolkit] = -x11) --with-qt-includes=%p/include/qt \
- --disable-dependency-tracking
+ (%type_raw[-qttoolkit] = -aqua) --enable-frameworks \
+ (%type_raw[-qttoolkit] = -aqua) --with-framework-dir=%p/lib/qt4-mac/lib
\
+ --disable-dependency-tracking
<<
GCC: 4.0
CompileScript: <<
#!/bin/sh -ev
- export PATH=%p/lib/xmkmf/bin:$PATH
+ if [ "%type_raw[-qttoolkit]" == "-x11" ]; then
+ export QT4_INSTALL_PATH=%p/lib/qt4-x11
+ export CPPFLAGS="-I%p/lib/qt4-x11/include $CPPFLAGS"
+ fi
+ if [ "%type_raw[-qttoolkit]" == "-aqua" ]; then
+ export QT4_INSTALL_PATH=%p/lib/qt4-mac
+ export CPPFLAGS="-I%p/lib/qt4-mac/include $CPPFLAGS"
+ export LDFLAGS="-F%p/lib/qt4-mac/lib $LDFLAGS"
+ fi
+ export PKG_CONFIG_PATH=${QT4_INSTALL_PATH}/lib/pkgconfig:$PKG_CONFIG_PATH
+ export PATH=${QT4_INSTALL_PATH}/bin:%p/lib/xmkmf/bin:$PATH
./configure %c
/usr/bin/make -w
<<
@@ -97,7 +113,7 @@
DescUsage: <<
For Aqua Version:
-----------------
-Double click the Application in /Applications/Fink
+Double click the Valknut icon in /Applications/Fink
For X11 Version:
----------------
------------------------------------------------------------------------------
AppSumo Presents a FREE Video for the SourceForge Community by Eric
Ries, the creator of the Lean Startup Methodology on "Lean Startup
Secrets Revealed." This video shows you how to validate your ideas,
optimize your ideas and identify your business strategy.
http://p.sf.net/sfu/appsumosfdev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
