Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv28853
Modified Files:
Tag: pangocairo-branch
fontconfig2-dev-10.5.info gerbv.info qt3.info qt4-x11.info
rxvt-unicode.info wxgtk2.8.info xkeycaps.info
Log Message:
sync with HEAD (pangocairo-root-40)
Index: qt3.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/qt3.info,v
retrieving revision 1.16.2.4
retrieving revision 1.16.2.5
diff -u -d -r1.16.2.4 -r1.16.2.5
--- qt3.info 17 Oct 2007 17:36:54 -0000 1.16.2.4
+++ qt3.info 19 Jan 2008 20:28:58 -0000 1.16.2.5
@@ -190,7 +190,7 @@
# attempt to counterfix qmake's warped fileFixify logic that makes
install break
# when %p is a symlink and something exists already at -libdir or
-datadir etc
# second, better attempt at unfixifying %p:
- pushd %p; FixifiedSW=`/bin/pwd`; popd
+ pushd %p; FixifiedSW=`/bin/pwd -P`; popd
/usr/bin/find . -name Makefile -print0 | xargs -0 perl -pi -e
"s,\\$\\(INSTALL_ROOT\\)$FixifiedSW,\\$\\(INSTALL_ROOT\\)%p,g"
make
Index: rxvt-unicode.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/rxvt-unicode.info,v
retrieving revision 1.4.2.6
retrieving revision 1.4.2.7
diff -u -d -r1.4.2.6 -r1.4.2.7
--- rxvt-unicode.info 11 Dec 2007 17:36:19 -0000 1.4.2.6
+++ rxvt-unicode.info 19 Jan 2008 20:28:58 -0000 1.4.2.7
@@ -1,8 +1,8 @@
Package: rxvt-unicode
-Version: 8.7
+Version: 8.8
Revision: 1001
Source: mirror:custom:%n-%v.tar.bz2
-Source-MD5: 4d615334e5e4959cded8ba298868a113
+Source-MD5: a009fa049c4d3dddacd37f8328b6be20
CustomMirror: <<
Primary: http://dist.schmorp.de/%n/Attic
Current: http://dist.schmorp.de/%n
Index: wxgtk2.8.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/wxgtk2.8.info,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -d -r1.1.2.22 -r1.1.2.23
--- wxgtk2.8.info 4 Nov 2007 02:34:53 -0000 1.1.2.22
+++ wxgtk2.8.info 19 Jan 2008 20:28:59 -0000 1.1.2.23
@@ -1,8 +1,35 @@
+# Fingolfin notes: This packages is not at all in sync with wxmac28, which is
a pity.
+# Some obvious differences:
+# - Name: wxgtk2.8 vs. wxmac28 (not much we can do about this short of
renaming one
+# of the two and updating all dependent packages)
+# - different maintainer (OK, not really a problem, but a single maintainer
helps to keep
+# the packages in sync. At the very least it would be helpful if the
maintainers talked
+# to each other. Before that happens, we need a maintainer for this package,
though :)
+# - different versions: right now 2.8.0 vs 2.8.3, making *both* oudated ;)
+# - DocFiles of the splitoff differ
+# - one seems to use expat, the other libxml2 (?!?)
+# - wxgtk2.8 has lots and lots of --enable switches (but some of them do
nothing).
+# which wxmac28 doesn't have/use. In particular, it seems they were added
randomly
+# without a true understanding. For example, it just seems *queer* to use
+# --enable-no_rtti and --enable-no_exceptions, you never want those unless
you *must*.
+# They are probably the reason why --enable-stl doesn't work (which in turn
is for
+# some users a rather interesting option to use).
+### Maybe 'it just seems ...' , but some versions of Apple's libwx were
apparently also
+### built with -no_rtti; further those flags are NOT the reason for problems
with stl. (JFm)
+# - wxgtk2.8 seems to build some extra stuff (from contrib/) -- imo either
both or none
+# should do this. maybe contrib stuff should go into splitoffs?
+# - missing (?) cppunit dependency (one can argue about this one -- no binary
difference should be
+# caused by this. But it would be preferable to either always run the unit
tests, or never
+# (the latter achieved by patching configure?)
+
Package: wxgtk2.8
Version: 2.8.0
-Revision: 3
-Maintainer: Gnome Core Team <[EMAIL PROTECTED]>
+Revision: 4
GCC: 4.0
+Description: Cross-platform GUI API - unix/gtk version
+License: GPL
+Maintainer: Gnome Core Team <[EMAIL PROTECTED]>
+
# + cppunit1.10.2 ?, others ? Also: no evidence for expat1 from otool or from
included (during make) headers
BuildDepends: <<
atk1 (>= 1.20.0-1),
@@ -40,6 +67,7 @@
Conflicts: wxgtk, wxmac, wxmac28
Replaces: wxgtk, wxmac, wxmac28
BuildDependsOnly: True
+
PatchFile: %n.patch
PatchFile-MD5: 5e3439dfb14d3edf16b248e9995ad3f5
PatchScript: <<
@@ -49,6 +77,7 @@
perl -pi -e 's,^extern,#undef BOOL\n$&,' src/unix/displayx11.cpp
# to dispense with '--enable-monolithic' :
perl -pi -e 's,[EMAIL PROTECTED]@.*\(__WXLIB_BASE_p\)$,$& -lwx_gtk2u_adv-2.8
-lwx_gtk2u_html-2.8,' contrib/src/gizmos/Makefile.in
+ perl -pi -e
's;EXTRALIBS_OPENGL=";$&-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
;' configure
## uncomment the following to check bdeps _ (using the command :
## egrep '^\.+ /' wxgtk2.8.log|sort -u|sed -r -e 's,^\.+ ,,'|sort -u|egrep -v
'^/usr/(include|lib)/'|xargs dpkg -S 2>/dev/null|cut -f1 -d:|sort -u|xargs
## ):
@@ -56,6 +85,7 @@
<<
Source: mirror:sourceforge:wxwindows/wxWidgets-%v.tar.bz2
Source-MD5: 4bf9c66cdb7cda1d2fe51376c211b9e1
+
NoSetCPPFLAGS: true
SetCPPFLAGS: -I%p/lib/pango-ft219/include/pango-1.0
-I%p/lib/pango-ft219/include -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/lib/fontconfig2/include -I%p/include
-I%p/include/sys
NoSetLDFLAGS: true
@@ -65,6 +95,7 @@
SetCXXFLAGS: -Os
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
+
# each of the following led to errors (even with --enable-permissive)
# --with-odbc --with-sdl --enable-stl --enable-accessibility
ConfigureParams: <<
@@ -136,26 +167,27 @@
# %p/lib/libwx_gtk2u_stc-2.8.0.dylib 1.0.0 %n (>= 2.8.0-1)
# <<
Shlibs: <<
- %p/lib/libwx_baseu-2.8.0.0.0.dylib 1.0.0 %n (>= 2.8.0-1)
- %p/lib/libwx_baseu_net-2.8.0.0.0.dylib 1.0.0 %n (>= 2.8.0-1)
- %p/lib/libwx_baseu_xml-2.8.0.0.0.dylib 1.0.0 %n (>= 2.8.0-1)
- %p/lib/libwx_gtk2u_adv-2.8.0.0.0.dylib 1.0.0 %n (>= 2.8.0-1)
- %p/lib/libwx_gtk2u_aui-2.8.0.0.0.dylib 1.0.0 %n (>= 2.8.0-1)
- %p/lib/libwx_gtk2u_core-2.8.0.0.0.dylib 1.0.0 %n (>= 2.8.0-1)
- %p/lib/libwx_gtk2u_gizmos-2.8.0.0.0.dylib 1.0.0 %n (>= 2.8.0-1)
- %p/lib/libwx_gtk2u_gizmos_xrc-2.8.0.0.0.dylib 1.0.0 %n (>=
2.8.0-1)
- %p/lib/libwx_gtk2u_gl-2.8.0.0.0.dylib 1.0.0 %n (>= 2.8.0-1)
- %p/lib/libwx_gtk2u_html-2.8.0.0.0.dylib 1.0.0 %n (>= 2.8.0-1)
- %p/lib/libwx_gtk2u_media-2.8.0.0.0.dylib 1.0.0 %n (>= 2.8.0-1)
- %p/lib/libwx_gtk2u_ogl-2.8.0.0.0.dylib 1.0.0 %n (>= 2.8.0-1)
- %p/lib/libwx_gtk2u_qa-2.8.0.0.0.dylib 1.0.0 %n (>= 2.8.0-1)
- %p/lib/libwx_gtk2u_richtext-2.8.0.0.0.dylib 1.0.0 %n (>= 2.8.0-1)
- %p/lib/libwx_gtk2u_stc-2.8.0.0.0.dylib 1.0.0 %n (>= 2.8.0-1)
- %p/lib/libwx_gtk2u_xrc-2.8.0.0.0.dylib 1.0.0 %n (>= 2.8.0-1)
+ %p/lib/libwx_baseu-2.8.0.dylib 1.0.0 %n (>= 2.8.0-1)
+ %p/lib/libwx_baseu_net-2.8.0.dylib 1.0.0 %n (>= 2.8.0-1)
+ %p/lib/libwx_baseu_xml-2.8.0.dylib 1.0.0 %n (>= 2.8.0-1)
+ %p/lib/libwx_gtk2u_adv-2.8.0.dylib 1.0.0 %n (>= 2.8.0-1)
+ %p/lib/libwx_gtk2u_aui-2.8.0.dylib 1.0.0 %n (>= 2.8.0-1)
+ %p/lib/libwx_gtk2u_core-2.8.0.dylib 1.0.0 %n (>= 2.8.0-1)
+ %p/lib/libwx_gtk2u_gizmos-2.8.0.dylib 1.0.0 %n (>= 2.8.0-1)
+ %p/lib/libwx_gtk2u_gizmos_xrc-2.8.0.dylib 1.0.0 %n (>= 2.8.0-1)
+ %p/lib/libwx_gtk2u_gl-2.8.0.dylib 1.0.0 %n (>= 2.8.0-1)
+ %p/lib/libwx_gtk2u_html-2.8.0.dylib 1.0.0 %n (>= 2.8.0-1)
+ %p/lib/libwx_gtk2u_media-2.8.0.dylib 1.0.0 %n (>= 2.8.0-1)
+ %p/lib/libwx_gtk2u_ogl-2.8.0.dylib 1.0.0 %n (>= 2.8.0-1)
+ %p/lib/libwx_gtk2u_qa-2.8.0.dylib 1.0.0 %n (>= 2.8.0-1)
+ %p/lib/libwx_gtk2u_richtext-2.8.0.dylib 1.0.0 %n (>= 2.8.0-1)
+ %p/lib/libwx_gtk2u_stc-2.8.0.dylib 1.0.0 %n (>= 2.8.0-1)
+ %p/lib/libwx_gtk2u_xrc-2.8.0.dylib 1.0.0 %n (>= 2.8.0-1)
<<
DocFiles: docs/readme.txt docs/licence.txt docs/changes.txt docs/lgpl.txt
docs/gpl.txt
<<
-Description: Cross-platform GUI API - unix/gtk version
+
+Homepage: http://www.wxwidgets.org/
DescDetail: <<
In addition to common and advanced GUI facilities such as
frames, scrolling windows, toolbars, tree controls, icons,
@@ -165,7 +197,3 @@
features are not available on a platform, such as MDI and tree
controls on Unix, they are emulated.
<<
-DescPort: <<
-<<
-Homepage: http://wxWindows.org/
-License: GPL
Index: xkeycaps.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/xkeycaps.info,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- xkeycaps.info 20 Jan 2006 20:34:22 -0000 1.1
+++ xkeycaps.info 19 Jan 2008 20:28:59 -0000 1.1.2.1
@@ -23,7 +23,7 @@
mkdir -p %i/etc/app-defaults
/usr/bin/install -c -m 0444 XKeyCaps.ad %i/etc/app-defaults/XKeyCaps
<<
-DocFiles: README License xkeycaps.1.html
+DocFiles: README License
License: BSD
Description: Graphical front-end to xmodmap
Maintainer: None <[EMAIL PROTECTED]>
Index: gerbv.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/gerbv.info,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- gerbv.info 11 Dec 2007 17:36:19 -0000 1.1.2.2
+++ gerbv.info 19 Jan 2008 20:28:58 -0000 1.1.2.3
@@ -1,10 +1,14 @@
+Info3: <<
Package: gerbv
-Version: 1.0.3
+Version: 2.0.0
Revision: 10
Depends: <<
atk1-shlibs,
+# cairo-shlibs,
+# freetype219-shlibs,
glib2-shlibs (>= 2.12.0-1),
+# glitz-shlibs,
gtk+2,
gtk+2-shlibs,
libgettext3-shlibs,
@@ -17,7 +21,10 @@
BuildDepends: <<
atk1,
+# cairo (>= 1.2.0-0),
+# freetype219,
glib2-dev (>= 2.12.0-1),
+# glitz,
gtk+2-dev,
libgettext3-dev,
libiconv-dev,
@@ -28,11 +35,22 @@
<<
Source: mirror:sourceforge:gerbv/gerbv-%v.tar.gz
-Source-MD5: dc7f2c362c7e9e406133ed0a60bb17b9
+Source-MD5: 04a4664f1fd434bab2e6718cc0420deb
-DocFiles: AUTHORS ChangeLog COPYING INSTALL NEWS README TODO
+DocFiles: <<
+ AUTHORS
+ ChangeLog
+ COPYING
+ INSTALL
+ NEWS
+ README
+ README-Pick-and-Place-search_parts.txt
+ TODO
+<<
+
+# ConfigureParams: --disable-dependency-tracking --mandir=%p/share/man
--with-freetype-prefix=%p/lib/freetype219
--with-freetype-exec-prefix=%p/lib/freetype219
PKG_CONFIG_PATH="%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
+ConfigureParams: --disable-dependency-tracking --mandir=%p/share/man
--disable-cairo
-ConfigureParams: --mandir=%p/share/man
InstallScript: <<
make install DESTDIR=%d
install -d -m 755 %i/share/doc/%n
@@ -48,15 +66,16 @@
gerbv now uses GTK+2 exclusively.
-A new feature as of 0.16 is the inclusion of a scheme interpreter, which
-enables support for "project files" to provide default settings
-every time the viewer is invoked.
+gerbv includes a scheme interpreter, which enables support for "project files"
+to provide default settings every time the viewer is invoked.
<<
DescPackaging: <<
-$LastChangedRevision: 437 $ in my local SVN repository.
+$LastChangedRevision: 467 $ in my local SVN repository.
<<
License: GPL
Homepage: http://gerbv.sourceforge.net/
Maintainer: Charles Lepple <[EMAIL PROTECTED]>
+
+<<
Index: qt4-x11.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/qt4-x11.info,v
retrieving revision 1.2.2.6
retrieving revision 1.2.2.7
diff -u -d -r1.2.2.6 -r1.2.2.7
--- qt4-x11.info 21 Dec 2007 15:56:20 -0000 1.2.2.6
+++ qt4-x11.info 19 Jan 2008 20:28:58 -0000 1.2.2.7
@@ -55,6 +55,7 @@
NoSetLDFLAGS: true
CompileScript: <<
#!/bin/sh -ev
+
export CPATH=%p/include
/bin/sh ./configure-for-fink.sh "%p" "%N" -pch -verbose
make
Index: fontconfig2-dev-10.5.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/fontconfig2-dev-10.5.info,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -d -r1.3.2.2 -r1.3.2.3
--- fontconfig2-dev-10.5.info 11 Dec 2007 17:36:19 -0000 1.3.2.2
+++ fontconfig2-dev-10.5.info 19 Jan 2008 20:28:58 -0000 1.3.2.3
@@ -1,6 +1,6 @@
Package: fontconfig2-dev
Version: 2.4.1
-Revision: 5
+Revision: 101
Distribution: 10.5
Description: Font configuration library
Type: nosource
@@ -21,15 +21,58 @@
FC_ROOT="%i/lib/fontconfig2"
X11_ROOT="/usr/X11"
+ declare -a bad_files
+
+ bad_file() {
+ bad_files[${#bad_files[*]}]="$1"
+ }
+
install -d -m 755 $FC_ROOT/{bin,include,lib,lib/pkgconfig}
- /bin/ln -sfh $X11_ROOT/include/fontconfig "$FC_ROOT/include/fontconfig"
- /bin/ln -sfh $X11_ROOT/lib/pkgconfig/fontconfig.pc
"$FC_ROOT/lib/pkgconfig/fontconfig.pc"
- for file in libfontconfig.1.1.0.dylib libfontconfig.1.dylib
libfontconfig.dylib libfontconfig.la; do
- /bin/ln -sfh "$X11_ROOT/lib/$file" "$FC_ROOT/lib/$file"
+
+ for file in \
+ fcfreetype.h \
+ fcprivate.h \
+ fontconfig.h \
+ ; do
+ [ -e "$X11_ROOT/include/fontconfig/$file" ] || bad_file
"$X11_ROOT/include/fontconfig/$file"
done
- for file in fc-cache fc-cat fc-list fc-match; do
- /bin/ln -sfh "$X11_ROOT/bin/$file" "$FC_ROOT/bin/$file"
+
+ for file in \
+ include/fontconfig \
+ lib/pkgconfig/fontconfig.pc \
+ lib/libfontconfig.1.1.0.dylib \
+ lib/libfontconfig.1.dylib \
+ lib/libfontconfig.dylib \
+ lib/libfontconfig.la \
+ bin/fc-cache \
+ bin/fc-cat \
+ bin/fc-list \
+ bin/fc-match \
+ ; do
+ [ -e "$X11_ROOT/$file" ] || bad_file "$X11_ROOT/$file"
+ /bin/ln -sfh "$X11_ROOT/$file" "$FC_ROOT/$file"
done
+
+ if [ ${#bad_files[*]} -gt 0 ]; then
+ echo ""
+ echo ""
+ echo ""
+ echo "=== ERROR === ERROR === ERROR === ERROR === ERROR ===
ERROR === ERROR ==="
+ echo ""
+ echo "Your X11 installation appears to be missing one or more
required files:"
+ for file in "[EMAIL PROTECTED]"; do
+ echo " $file"
+ done
+ echo ""
+ echo "You may need to reinstall the X11User or X11SDK packages
from your"
+ echo "Leopard install media."
+ echo ""
+ echo "=== ERROR === ERROR === ERROR === ERROR === ERROR ===
ERROR === ERROR ==="
+ echo ""
+ echo ""
+ echo ""
+ exit 1
+ fi
<<
SplitOff: <<
Package: fontconfig2-shlibs
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
