Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25327
Modified Files:
kdeedu4-x11.info
Log Message:
fix building (X11 header paths)--jfm; fix Shlibs (move runtime lib into pkg
that uses it and mark as private, instead of in -dev)--dmacks
Index: kdeedu4-x11.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/kde/kdeedu4-x11.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- kdeedu4-x11.info 9 Mar 2010 13:49:21 -0000 1.9
+++ kdeedu4-x11.info 14 Aug 2010 06:36:42 -0000 1.10
@@ -1,7 +1,7 @@
Info4: <<
Package: kdeedu4-x11
Version: 4.4.1
-Revision: 1
+Revision: 2
Description: KDE4 - Edutainment software
Type: kde (x11)
License: GPL/LGPL
@@ -76,6 +76,7 @@
. %p/sbin/kde4-buildenv.sh
export
CMAKE_INCLUDE_PATH="%p/Library/Frameworks/R.framework/Headers:$CMAKE_INCLUDE_PATH"
export
CMAKE_LIBRARY_PATH="%p/Library/Frameworks/R.framework/Libraries:$CMAKE_LIBRARY_PATH"
+ export
CPATH=%p/include/pango-1.0/pango:%p/include/pango-1.0:%p/include/freetype2:%p/lib/fontconfig2/include:%p/include:/usr/X11/include
# work around eigen2 bug
case `sw_vers -productVersion` in
@@ -102,8 +103,10 @@
rm -rf %i/opt/kde4/%type_pkg[kde]/lib/libSatLib.dylib
rm -rf %i/opt/kde4/%type_pkg[kde]/lib/libanalitza.dylib
rm -rf %i/opt/kde4/%type_pkg[kde]/lib/libanalitzagui.dylib
+ rm -f %i/opt/kde4/%type_pkg[kde]/lib/libavogadro-kalzium.dylib
rm -rf %i/opt/kde4/%type_pkg[kde]/lib/libcantor_config.dylib
rm -rf %i/opt/kde4/%type_pkg[kde]/lib/libcantorlibs.dylib
+ rm -f %i/opt/kde4/%type_pkg[kde]/lib/libcompoundviewer.dylib
rm -rf %i/opt/kde4/%type_pkg[kde]/lib/libhtmesh.a
if [ -f
"%i/opt/kde4/%type_pkg[kde]/bin/radselect_bin.app/Contents/Resources/radselect_bin.icns"
]; then
@@ -431,11 +434,14 @@
ocaml,
%N-base (>= %v-%r)
<<
+ Replaces: %N-dev (<< 4.4.1-2)
Files: <<
opt/kde4/%type_pkg[kde]/bin/kalzium*
opt/kde4/%type_pkg[kde]/lib/kde4/*didyouknow*
opt/kde4/%type_pkg[kde]/lib/kde4/*kalzium*
opt/kde4/%type_pkg[kde]/lib/kde4/*Calculator*
+ opt/kde4/%type_pkg[kde]/lib/libavogadro-kalzium.0*.dylib
+ opt/kde4/%type_pkg[kde]/lib/libcompoundviewer.4*.dylib
opt/kde4/%type_pkg[kde]/share/applications/kde4/kalzium*
opt/kde4/%type_pkg[kde]/share/apps/desktoptheme/default/widgets/chalkboard*
opt/kde4/%type_pkg[kde]/share/apps/kalzium
@@ -454,6 +460,10 @@
opt/kde4/%type_pkg[kde]/share/kde4/services/*Calculator*
opt/kde4/%type_pkg[kde]/share/man/man1/kalzium*
<<
+ Shlibs: <<
+ !%p/opt/kde4/%type_pkg[kde]/lib/libavogadro-kalzium.0.dylib
+ !%p/opt/kde4/%type_pkg[kde]/lib/libcompoundviewer.4.dylib
+ <<
PostInstScript: %p/opt/kde4/%type_pkg[kde]/bin/kde4-postinst.sh || :
<<
SplitOff30: <<
@@ -629,5 +639,13 @@
<<
DescDetail: A collection of fun and educational apps for KDE.
+DescPackaging: <<
+ jfm: kalzium/libavogadro-kalzium/src/boxcontrol.cpp needs
+ x11's gl stuff (via qt4-x11's QtOpenGL/qgl.h) but doesn't pass
+ -I for it (dmacks: not sure if it's a bug in passing here or
+ in dep's publishing). CPATH for X11 fixes build; prepending
+ misc fink paths makes sure fink-supplied libs correctly mask
+ x11's ones.
+<<
<<
------------------------------------------------------------------------------
This SF.net email is sponsored by
Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
