Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11
In directory sc8-pr-cvs17:/tmp/cvs-serv10415/main/finkinfo/x11
Modified Files:
Tag: pangocairo-branch
appleotffonts.info wxgtk.info xlt.info xlt.patch xpad.info
xpad.patch xplanet.info xplanet.patch xv.info
Removed Files:
Tag: pangocairo-branch
wine.info
Log Message:
merge from HEAD
Index: xlt.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/xlt.patch,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- xlt.patch 19 Jul 2007 22:23:35 -0000 1.2.2.1
+++ xlt.patch 24 Jul 2007 17:36:47 -0000 1.2.2.2
@@ -1,12 +1,13 @@
diff -Nurd -x'*~' Xlt-13.0.13.orig/Makefile.am Xlt-13.0.13/Makefile.am
--- Xlt-13.0.13.orig/Makefile.am 2005-09-16 08:55:48.000000000 -0400
-+++ Xlt-13.0.13/Makefile.am 2007-06-26 12:08:48.000000000 -0400
-@@ -6,7 +6,7 @@
++++ Xlt-13.0.13/Makefile.am 2007-07-17 16:21:53.000000000 -0400
+@@ -6,7 +6,8 @@
ltconfig ltmain.sh aclocal.m4 config.h.in install-sh \
missing mkinstalldirs
-SUBDIRS = . lib doc tests scripts
+SUBDIRS = . lib doc scripts
++ACLOCAL_AMFLAGS = -I .
EXTRA_DIST = COPYING.LIB ac_find_xlt.m4 ac_find_xpm.m4 ac_find_motif.m4
Index: xplanet.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/xplanet.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- xplanet.patch 9 Feb 2006 01:53:51 -0000 1.1
+++ xplanet.patch 24 Jul 2007 17:36:47 -0000 1.1.2.1
@@ -1,11 +1,23 @@
-diff -Nurb xplanet-1.0.1/src/libdisplay/DisplayBase.h
xplanet-1.0.1-new/src/libdisplay/DisplayBase.h
---- xplanet-1.0.1/src/libdisplay/DisplayBase.h Sun Mar 16 00:39:26 2003
-+++ xplanet-1.0.1-new/src/libdisplay/DisplayBase.h Wed Apr 16 18:58:10 2003
-@@ -9,6 +9,7 @@
- #ifdef HAVE_LIBFREETYPE
- #include <ft2build.h>
- #include FT_FREETYPE_H
-+#include <freetype2/freetype/freetype.h>
- #include FT_GLYPH_H
- #endif
+diff -Nurd -x'*~'
xplanet-1.2.0.orig/src/libprojection/ProjectionIcosagnomonic.cpp
xplanet-1.2.0/src/libprojection/ProjectionIcosagnomonic.cpp
+--- xplanet-1.2.0.orig/src/libprojection/ProjectionIcosagnomonic.cpp
2005-06-14 14:10:36.000000000 -0400
++++ xplanet-1.2.0/src/libprojection/ProjectionIcosagnomonic.cpp
2007-07-17 18:18:44.000000000 -0400
+@@ -26,6 +26,19 @@
+ #define THIGH 3
+ #define RATIO (((THIGH)*sqrt(3.0)/2)/(TWIDE))
++/* signbit() appaired only in FreeBSD 5.1, so we need this hack */
++#ifndef signbit
++static int
++signbit(double x)
++{
++
++ if ((x < 0.0) || (x = -0.0))
++ return 1;
++ else
++ return 0;
++}
++#endif /* signbit */
++
+ bool
+ ProjectionIcosagnomonic::PointXY::sameSide(const PointXY& p1,
+ const PointXY& p2,
Index: xpad.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/xpad.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- xpad.patch 20 Jan 2006 20:34:22 -0000 1.1
+++ xpad.patch 24 Jul 2007 17:36:47 -0000 1.1.2.1
@@ -1,37 +1,12 @@
-diff -Nurd -x'*~' xpad-2.10.orig/configure xpad-2.10/configure
---- xpad-2.10.orig/configure 2005-10-04 20:18:53.000000000 -0400
-+++ xpad-2.10/configure 2005-10-10 12:36:07.000000000 -0400
-@@ -8308,7 +8308,7 @@
+diff -Nurd -x'*~' xpad-2.12.orig/configure xpad-2.12/configure
+--- xpad-2.12.orig/configure 2006-10-05 09:32:10.000000000 -0400
++++ xpad-2.12/configure 2007-07-23 05:00:20.000000000 -0400
+@@ -8280,7 +8280,7 @@
enable_debug=no
fi;
if test "$enable_debug" = "yes"; then
- DEBUG_CFLAGS="-ansi -Wall -Werror -g -DG_DISABLE_DEPRECATED
-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED
-DGTK_DISABLE_DEPRECATED -DGTK_MULTIHEAD_SAFE"
-+ DEBUG_CFLAGS="-Wall -Werror -g -DG_DISABLE_DEPRECATED
-DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_MULTIHEAD_SAFE"
++ DEBUG_CFLAGS="-Wall -g -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
-DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_MULTIHEAD_SAFE"
else
DEBUG_CFLAGS=""
fi
-diff -Nurd -x'*~' xpad-2.10.orig/src/xpad-pad.c xpad-2.10/src/xpad-pad.c
---- xpad-2.10.orig/src/xpad-pad.c 2005-10-04 20:06:40.000000000 -0400
-+++ xpad-2.10/src/xpad-pad.c 2005-10-10 12:30:19.000000000 -0400
-@@ -422,10 +422,6 @@
- if (!GTK_WIDGET_VISIBLE (pad->priv->toolbar))
- {
- GtkRequisition req;
-- GdkRectangle rec;
-- gint textx, texty, x, y;
-- GtkTextIter iter;
--
- if (GTK_WIDGET (pad)->window)
- gdk_window_freeze_updates (GTK_WIDGET (pad)->window);
- gtk_widget_show (pad->priv->toolbar);
-@@ -457,10 +453,6 @@
- {
- if (GTK_WIDGET_VISIBLE (pad->priv->toolbar))
- {
-- GdkRectangle rec;
-- gint textx, texty, x, y;
-- GtkTextIter iter;
--
- if (GTK_WIDGET (pad)->window)
- gdk_window_freeze_updates (GTK_WIDGET (pad)->window);
- gtk_widget_hide (pad->priv->toolbar);
Index: appleotffonts.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/appleotffonts.info,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- appleotffonts.info 25 Feb 2006 11:49:12 -0000 1.2
+++ appleotffonts.info 24 Jul 2007 17:36:46 -0000 1.2.2.1
@@ -1,10 +1,16 @@
Package: appleotffonts
Version: 0.1
-Revision: 8
+Revision: 9
Depends: xfontpath
Type: nosource
-CompileScript: echo "Nothing to do."
+CompileScript: <<
+ echo No compilation needed
+ echo
+ echo This package is created on the fly > dummy
+ echo at installation time. >> dummy
+<<
InstallScript: install -d -m 755 %d`%p/bin/xfontpath basedir`/appleotf
+DocFiles: dummy
PreRmScript: rm -f `%p/bin/xfontpath basedir`/appleotf/*
PostInstScript: <<
export LANG=C
@@ -31,7 +37,7 @@
echo "# Renamed Japanese Open Type Font files into Roma-ji filename."
fi
<<
-Description: Make Apple otf fonts available to Freetype, dvipdfmx and so on.
+Description: Make Apple otf fonts available to Freetype, dvipdfmx etc.
DescDetail: <<
With this package, you can use OTF fonts provided by Apple (along with Mac OS
X), in X11 applications.
Index: xplanet.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/xplanet.info,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- xplanet.info 9 Feb 2006 01:53:51 -0000 1.1
+++ xplanet.info 24 Jul 2007 17:36:47 -0000 1.1.2.1
@@ -1,21 +1,54 @@
Package: xplanet
-Version: 1.0.1
-Revision: 1013
+Version: 1.2.0
+Revision: 1001
Maintainer: James Gibbs <[EMAIL PROTECTED]>
#-#-#
Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: 402fe65bece7adf2fcbf1c0df1e59602
+Source-MD5: 87d62fcdf43ad1beec677bfb6e299ac1
Patch: %n.patch
#-#-#
-Depends: x11, libjpeg-shlibs, netpbm10-shlibs, libpng3-shlibs, giflib-shlibs,
libtiff-shlibs, glut-shlibs (>= 3.7-1025)
-BuildDepends: libjpeg, netpbm10, libpng3, giflib, libtiff, glut (>= 3.7-1025),
x11-dev
+Depends: <<
+ freeglut-shlibs,
+ giflib-shlibs,
+ glib2-shlibs,
+ libgettext3-shlibs,
+ libiconv,
+ libjpeg-shlibs,
+ libpng3-shlibs,
+ libtiff-shlibs,
+ netpbm10-shlibs,
+ pango1-xft2-shlibs,
+ x11
+<<
+BuildDepends: <<
+ freeglut,
+ giflib,
+ glib2-dev,
+ libgettext3-dev,
+ libiconv-dev,
+ libjpeg,
+ libpng3,
+ libtiff,
+ netpbm10,
+ pango1-xft2-dev,
+ pkgconfig,
+ x11-dev
+<<
GCC: 4.0
#-#-#
+SetCPPFLAGS: -Wall
ConfigureParams: <<
---mandir=%i/share/man --with-x --with-freetype --with-gif --with-jpeg
--with-png --with-pnm --with-tiff --with-aqua --with-animation --with-gl
--with-glut
+ --mandir=%p/share/man \
+ --with-x --with-xscreensaver \
+ --with-freetype --with-pango \
+ --without-cspice \
+ --with-aqua --without-quicktime \
+ --with-gif --with-jpeg --with-png --with-pnm --with-tiff \
+ --disable-dependency-tracking
<<
#-#-#
-DocFiles: AUTHORS ChangeLog COPYING INSTALL NEWS README README.config TODO
+InstallScript: make install DESTDIR=%d
+DocFiles: AUTHORS ChangeLog COPYING NEWS README TODO
#-#-#
Description: Earth and planet renderer
DescDetail: <<
@@ -30,12 +63,17 @@
"fink install xplanet-0.95".
<<
#-#-#
-DescPort: The patch ensures the proper freetype headers are used.
+DescPort: <<
+signbit() hack stolen from FreeBSD. It's in libSystem and appears to
+be in cmath, not sure why compiler can't find its prototype.
+<<
#-#-#
DescPackaging: <<
Builds with support for x11, openGL and aqua (see
http://xplanet.sourceforge.net/OSX/). Added support for x screensaver
module.
+
+Have to disable quicktime on OS X to avoid libstdc++ linking mess.
<<
#-#-#
DescUsage: <<
--- wine.info DELETED ---
Index: xpad.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/xpad.info,v
retrieving revision 1.2.2.8
retrieving revision 1.2.2.9
diff -u -d -r1.2.2.8 -r1.2.2.9
--- xpad.info 2 Mar 2007 19:42:03 -0000 1.2.2.8
+++ xpad.info 24 Jul 2007 17:36:47 -0000 1.2.2.9
@@ -1,6 +1,6 @@
Package: xpad
-Version: 2.10
-Revision: 1002
+Version: 2.12
+Revision: 2
Description: Virtual sticky pad system using GTK+2
DescUsage: <<
Right click to obtain configuration options and open new pads.
@@ -11,22 +11,48 @@
To change the default size of pads, edit ~/.xpad/default-style
Command-line arguments: Standard GTK+ arguments are understood.
-For more information: xpad manpage, files in /sw/share/doc/xpad/.
+For more information: xpad manpage, files in %p/share/doc/xpad
<<
DescPort: <<
Not clean under -ansi
-Remove some unused variables (now clean under -Wall)
-
No -DGTK_DISABLE_DEPRECATED (xpad-toolbar.c calls gtk_toolbar_set_icon_size)
<<
Homepage: http://xpad.sourceforge.net
License: GPL
Maintainer: Daniel Macks <[EMAIL PROTECTED]>
-BuildDepends: glitz, expat1, libpng3, cairo (>= 1.2-1), fontconfig2-dev (>=
2.3.2-13), freetype219 (>= 2.3.1-1), xft2-dev, x11-dev, gtk+2-dev (>=
2.10.0-1), atk1 (>= 1.17.0-1), glib2-dev (>= 2.12.0-11), pango1-xft2-ft219-dev
(>= 1.16.0-1), gettext-bin, gettext-tools, libgettext3-dev, libiconv-bin,
libiconv-dev, intltool (>= 0.35.5-1), pkgconfig (>= 0.21-1)
-Depends: x11, gtk+2-shlibs (>= 2.10.0-1), atk1-shlibs (>= 1.17.0-1),
glib2-shlibs (>= 2.12.0-1), pango1-xft2-ft219-shlibs (>= 1.16.0-1),
libgettext3-shlibs, libiconv
+BuildDepends: <<
+ atk1 (>= 1.17.0-1),
+ cairo (>= 1.2-1),
+ expat1,
+ fontconfig2-dev (>= 2.3.2-13),
+ freetype219 (>= 2.3.1-1),
+ gettext-bin,
+ gettext-tools,
+ glib2-dev (>= 2.12.0-11),
+ glitz,
+ gtk+2-dev (>= 2.10.0-1),
+ intltool (>= 0.35.5-1),
+ libgettext3-dev,
+ libiconv-bin,
+ libiconv-dev,
+ libpng3,
+ pango1-xft2-ft219-dev (>= 1.16.0-1),
+ pkgconfig (>= 0.21-1)
+ x11-dev,
+ xft2-dev
+<<
+Depends: <<
+ atk1-shlibs (>= 1.17.0-1),
+ glib2-shlibs (>= 2.12.0-1),
+ gtk+2-shlibs (>= 2.10.0-1),
+ libgettext3-shlibs,
+ libiconv,
+ pango1-xft2-ft219-shlibs (>= 1.16.0-1),
+ x11
+<<
Source: mirror:sourceforge:%n/%n-%v.tar.bz2
-Source-MD5: 6ab34dde0d3cbea490fb3f0a6ba13066
+Source-MD5: 2d469030c818ca03811ae0827073b59e
Patch: %n.patch
ConfigureParams: --mandir=%p/share/man --enable-debug=yes
--disable-dependency-tracking
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
InstallScript: make install DESTDIR=%d
Index: xlt.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/xlt.info,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -d -r1.2.2.1 -r1.2.2.2
--- xlt.info 19 Jul 2007 22:23:35 -0000 1.2.2.1
+++ xlt.info 24 Jul 2007 17:36:47 -0000 1.2.2.2
@@ -1,6 +1,6 @@
Package: xlt
Version: 13.0.13
-Revision: 1
+Revision: 2
Maintainer: None <[EMAIL PROTECTED]>
Depends: %N-shlibs (= %v-%r)
BuildDepends: openmotif3, x11-dev, autoconf (>= 2.60), automake1.9, libtool14
@@ -14,7 +14,10 @@
./configure %c
make
<<
-InstallScript: make install DESTDIR=%d
+InstallScript: <<
+ make install DESTDIR=%d
+ mv %i/share/aclocal/ac_find_motif.m4 %i/share/aclocal/ac_find_motif-%n.m4
+<<
DocFiles: AUTHORS ChangeLog COPYING COPYING.LIB NEWS README
BuildDependsOnly: True
SplitOff: <<
@@ -39,7 +42,10 @@
Using fink's UpdateLibTool causes compile-time failure (ltconfig and
ltmain.sh version mismatch (?)), so redo real autotools. Therefore no
-reason to avoid using them for aclocal path.
+reason to avoid using them for aclocal path. Why doesn't aclocal look
+in local dir??
+
+Rename ac_find_motif.m4 to avoid conflicts with lesstif.
Originally packaged by Matt Stephenson.
<<
Index: xv.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/xv.info,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- xv.info 19 Jun 2007 21:18:18 -0000 1.3.2.1
+++ xv.info 24 Jul 2007 17:36:47 -0000 1.3.2.2
@@ -1,7 +1,9 @@
Package: xv
+
Version: 3.10a
Revision: 24.1
-Architecture: powerpc
+# when upgrading for some other reason, switch deps to libjasper.1
+
#Maintainer: Eric Lee <[EMAIL PROTECTED]>
Maintainer: Daniel Macks <[EMAIL PROTECTED]>
BuildDepends: <<
Index: wxgtk.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/x11/wxgtk.info,v
retrieving revision 1.5.2.11
retrieving revision 1.5.2.12
diff -u -d -r1.5.2.11 -r1.5.2.12
--- wxgtk.info 14 Mar 2007 02:04:59 -0000 1.5.2.11
+++ wxgtk.info 24 Jul 2007 17:36:46 -0000 1.5.2.12
@@ -1,6 +1,9 @@
Package: wxgtk
+
+# WARNING: do not change Version without making sure you aren't breaking
wxpython-py
Version: 2.5.2.8
-Revision: 1007
+Revision: 1006
+
Maintainer: None <[EMAIL PROTECTED]>
GCC: 4.0
BuildDepends: glitz, cairo (>= 1.2-1), fontconfig2-dev (>= 2.3.2-13),
freetype219 (>= 2.3.1-1), xft2-dev, atk1 (>= 1.17.0-1), expat1, gettext-bin,
libgettext3-dev, gettext-tools, glib2-dev (>= 2.12.0-1), gtk+2-dev (>=
2.10.0-1), libgl, libiconv-dev, libjpeg, libpng3, libtiff,
pango1-xft2-ft219-dev (>= 1.16.0-1)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
