Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11
In directory vz-cvs-3.sog:/tmp/cvs-serv11331/10.4/stable/main/finkinfo/x11
Modified Files:
libxaw3dxft.info
Added Files:
libxaw3dxft-api-tokens.patch
Log Message:
Patch libxaw3dxft to use the prior API tokens (thanks, dmacks!)
Update xtide so that it can build against this version.
--- NEW FILE: libxaw3dxft-api-tokens.patch ---
diff -Nurd -x'*~' libXaw3dXft-1.6.2.orig/configure.ac
libXaw3dXft-1.6.2/configure.ac
--- libXaw3dXft-1.6.2.orig/configure.ac 2012-02-25 08:11:37.000000000 -0500
+++ libXaw3dXft-1.6.2/configure.ac 2012-08-08 19:20:56.000000000 -0400
@@ -43,27 +43,55 @@
[XAW_I18N=$enableval], [XAW_I18N=yes])
if test "x$XAW_I18N" = xyes; then
XAW3D_CPPFLAGS="${XAW3D_CPPFLAGS} -DXAW_INTERNATIONALIZATION"
+ DEF_I18N_SUPPORT="#define XAW_INTERNATIONALIZATION"
+else
+ DEF_I18N_SUPPORT="/* #undef XAW_INTERNATIONALIZATION */"
fi
AM_CONDITIONAL(XAW_INTERNATIONALIZATION, [test "x$XAW_I18N" = xyes])
+AC_SUBST(DEF_I18N_SUPPORT)
AC_ARG_ENABLE([multiplane-bitmaps],
[AS_HELP_STRING([--enable-multiplane-bitmaps], dnl
- [enable XPM support])],
- [XAW3D_CPPFLAGS="${XAW3D_CPPFLAGS} -DXAW_MULTIPLANE_PIXMAPS" dnl
- PKG_CHECK_MODULES(XPM, xpm)])
+ [enable XPM support (default: no)])],
+ [XAW_MULTIPLANE=$enableval], [XAW_MULTIPLANE=no])
+if test "x$XAW_MULTIPLANE" = xyes; then
+ PKG_CHECK_MODULES(XPM, xpm)
+ XAW3D_CPPFLAGS="${XAW3D_CPPFLAGS} -DXAW_MULTIPLANE_PIXMAPS"
+ DEF_XPM_SUPPORT="#define XAW_MULTIPLANE_PIXMAPS"
+else
+ DEF_XPM_SUPPORT="/* #undef XAW_MULTIPLANE_PIXMAPS */"
+fi
+AC_SUBST(DEF_XPM_SUPPORT)
AC_ARG_ENABLE([gray-stipples],
[AS_HELP_STRING([--enable-gray-stipples], dnl
- [enable gray stipples])], [XAW3D_CPPFLAGS="${XAW3D_CPPFLAGS}
-DXAW_GRAY_BLKWHT_STIPPLES"])
+ [enable gray stipples (default: no)])],
+ [XAW_STIPPLES=$enableval], [XAW_STIPPLES=no])
+if test "x$XAW_SCROLLBARS" = xyes; then
+ XAW3D_CPPFLAGS="${XAW3D_CPPFLAGS} -DXAW_GRAY_BLKWHT_STIPPLES"
+ DEF_GRAY_STIPPLES="#define XAW_GRAY_BLKWHT_STIPPLES"
+else
+ DEF_GRAY_STIPPLES="/* #undef XAW_GRAY_BLKWHT_STIPPLES */"
+fi
+AC_SUBST(DEF_GRAY_STIPPLES)
AC_ARG_ENABLE([arrow-scrollbars],
[AS_HELP_STRING([--enable-arrow-scrollbars], dnl
- [enable arrow scrollbars])], [XAW3D_CPPFLAGS="${XAW3D_CPPFLAGS}
-DXAW_ARROW_SCROLLBARS"])
+ [enable arrow scrollbars (default: no)])],
+ [XAW_SCROLLBARS=$enableval], [XAW_SCROLLBARS=no])
+if test "x$XAW_SCROLLBARS" = xyes; then
+ XAW3D_CPPFLAGS="${XAW3D_CPPFLAGS} -DXAW_ARROW_SCROLLBARS"
+ DEF_ARROW_SCROLLBARS="#define XAW_ARROW_SCROLLBARS"
+else
+ DEF_ARROW_SCROLLBARS="/* #undef XAW_ARROW_SCROLLBARS */"
+fi
+AC_SUBST(DEF_ARROW_SCROLLBARS)
AC_SUBST(XAW3D_CPPFLAGS)
AC_CONFIG_FILES([Makefile
include/Makefile
+ include/X11/Xaw3d/Xaw3dP.h
src/Makefile
xaw3d.pc])
diff -Nurd -x'*~' libXaw3dXft-1.6.2.orig/include/Makefile.am
libXaw3dXft-1.6.2/include/Makefile.am
--- libXaw3dXft-1.6.2.orig/include/Makefile.am 2012-02-25 15:59:53.000000000
-0500
+++ libXaw3dXft-1.6.2/include/Makefile.am 2012-08-08 16:21:33.000000000
-0400
@@ -85,4 +85,8 @@
EXTRA_DIST = \
X11/Xaw3d/Template.h \
- X11/Xaw3d/TemplateP.h
\ No newline at end of file
+ X11/Xaw3d/TemplateP.h \
+ X11/Xaw3d/Xaw3dP.h.in
+
+BUILT_SOURCES = X11/Xaw3d/Xaw3dP.h
+X11/Xaw3d/Xaw3dP.h: X11/Xaw3d/Xaw3dP.h.in
diff -Nurd -x'*~' libXaw3dXft-1.6.2.orig/include/X11/Xaw3d/Xaw3dP.h
libXaw3dXft-1.6.2/include/X11/Xaw3d/Xaw3dP.h
--- libXaw3dXft-1.6.2.orig/include/X11/Xaw3d/Xaw3dP.h 2012-02-26
09:23:32.000000000 -0500
+++ libXaw3dXft-1.6.2/include/X11/Xaw3d/Xaw3dP.h 1969-12-31
19:00:00.000000000 -0500
@@ -1,79 +0,0 @@
-/*
- * Xaw3dP.h
- *
- * Global definitions and declarations. Not for public consumption.
- */
-
-/*********************************************************************
-Copyright (C) 1992 Kaleb Keithley
-Copyright (C) 2000, 2003 David J. Hawkey Jr.
-
- All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and
-its documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and
-that both that copyright notice and this permission notice appear in
-supporting documentation, and that the names of the copyright holders
-not be used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-
-THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
-SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
-RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
-CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-*********************************************************************/
-
-#ifndef _Xaw3dP_h
-#define _Xaw3dP_h
-
-#include <X11/IntrinsicP.h>
-
-/* These are set during the build to reflect capability and options. */
-/* I18n support */
-/* XPM support */
-/* gray stipples */
-/* arrow scrollbars */
-
-#ifndef XtX
-#define XtX(w) (((RectObj)w)->rectangle.x)
-#endif
-#ifndef XtY
-#define XtY(w) (((RectObj)w)->rectangle.y)
-#endif
-#ifndef XtWidth
-#define XtWidth(w) (((RectObj)w)->rectangle.width)
-#endif
-#ifndef XtHeight
-#define XtHeight(w) (((RectObj)w)->rectangle.height)
-#endif
-#ifndef XtBorderWidth
-#define XtBorderWidth(w) (((RectObj)w)->rectangle.border_width)
-#endif
-
-#ifdef XAW_GRAY_BLKWHT_STIPPLES
-extern unsigned long
-grayPixel(
- unsigned long,
- Display *,
- Screen *
-);
-#else
-#define grayPixel(p, dpy, scn) (p)
-#endif
-
-#ifdef XAW_MULTIPLANE_PIXMAPS
-extern Pixmap
-stipplePixmap(
- Widget,
- Pixmap,
- Colormap,
- Pixel,
- unsigned int
-);
-#endif
-
-#endif /* _Xaw3dP_h */
diff -Nurd -x'*~' libXaw3dXft-1.6.2.orig/include/X11/Xaw3d/Xaw3dP.h.in
libXaw3dXft-1.6.2/include/X11/Xaw3d/Xaw3dP.h.in
--- libXaw3dXft-1.6.2.orig/include/X11/Xaw3d/Xaw3dP.h.in 1969-12-31
19:00:00.000000000 -0500
+++ libXaw3dXft-1.6.2/include/X11/Xaw3d/Xaw3dP.h.in 2012-08-08
16:23:06.000000000 -0400
@@ -0,0 +1,79 @@
+/*
+ * Xaw3dP.h
+ *
+ * Global definitions and declarations. Not for public consumption.
+ */
+
+/*********************************************************************
+Copyright (C) 1992 Kaleb Keithley
+Copyright (C) 2000, 2003 David J. Hawkey Jr.
+
+ All Rights Reserved
+
+Permission to use, copy, modify, and distribute this software and
+its documentation for any purpose and without fee is hereby granted,
+provided that the above copyright notice appear in all copies and
+that both that copyright notice and this permission notice appear in
+supporting documentation, and that the names of the copyright holders
+not be used in advertising or publicity pertaining to distribution
+of the software without specific, written prior permission.
+
+THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*********************************************************************/
+
+#ifndef _Xaw3dP_h
+#define _Xaw3dP_h
+
+#include <X11/IntrinsicP.h>
+
+/* These are set during the build to reflect capability and options. */
+@DEF_I18N_SUPPORT@
+@DEF_XPM_SUPPORT@
+@DEF_GRAY_STIPPLES@
+@DEF_ARROW_SCROLLBARS@
+
+#ifndef XtX
+#define XtX(w) (((RectObj)w)->rectangle.x)
+#endif
+#ifndef XtY
+#define XtY(w) (((RectObj)w)->rectangle.y)
+#endif
+#ifndef XtWidth
+#define XtWidth(w) (((RectObj)w)->rectangle.width)
+#endif
+#ifndef XtHeight
+#define XtHeight(w) (((RectObj)w)->rectangle.height)
+#endif
+#ifndef XtBorderWidth
+#define XtBorderWidth(w) (((RectObj)w)->rectangle.border_width)
+#endif
+
+#ifdef XAW_GRAY_BLKWHT_STIPPLES
+extern unsigned long
+grayPixel(
+ unsigned long,
+ Display *,
+ Screen *
+);
+#else
+#define grayPixel(p, dpy, scn) (p)
+#endif
+
+#ifdef XAW_MULTIPLANE_PIXMAPS
+extern Pixmap
+stipplePixmap(
+ Widget,
+ Pixmap,
+ Colormap,
+ Pixel,
+ unsigned int
+);
+#endif
+
+#endif /* _Xaw3dP_h */
Index: libxaw3dxft.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/x11/libxaw3dxft.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- libxaw3dxft.info 9 Jun 2012 20:12:04 -0000 1.2
+++ libxaw3dxft.info 9 Aug 2012 03:24:47 -0000 1.3
@@ -1,26 +1,39 @@
Package: libxaw3dxft
Version: 1.6.2
-Revision: 2
+Revision: 3
BuildDependsOnly: true
Source: mirror:sourceforge:sf-xpaint/libXaw3dXft-%v.tar.bz2
Source-MD5: 75ad45c8fcb4df5faf55e986ccbcfe83
SourceDirectory: libXaw3dXft-%v
-BuildDepends: x11-dev, fink-package-precedence, fontconfig2-dev, freetype219,
xft2-dev, pkgconfig
+BuildDepends: <<
+ x11-dev,
+ fink-package-precedence,
+ fontconfig2-dev,
+ freetype219,
+ xft2-dev,
+ pkgconfig,
+ automake1.11,
+ autoconf2.6,
+ util-macros
+<<
Depends: x11, x11-shlibs, %n-shlibs (= %v-%r)
Conflicts: xaw3d-static, xaw3d
Replaces: xaw3d-static, xaw3d
PatchFile: %n.patch
PatchFile-MD5: f30ad12fdb084be5259233a6a5476155
+PatchFile2: %n-api-tokens.patch
+PatchFile2-MD5: 98c58f496ee110dc7cc08ed645aedca1
PatchScript: <<
%{default_script}
perl -pi -e 's/-lXft\s+-lfontconfig//' xaw3d.pc.in
<<
-ConfigureParams: --enable-arrow-scrollbars --disable-static
+ConfigureParams: --enable-arrow-scrollbars --disable-static
--disable-silent-rules
Compilescript: <<
+ autoreconf -fi
%{default_script}
fink-package-precedence .
<<
@@ -28,13 +41,13 @@
InstallScript: <<
make install DESTDIR=%D
<<
-DocFiles: COPYING README
+DocFiles: src/README.XAW3d COPYING README
SplitOff: <<
Package: %N-shlibs
Depends: x11, fontconfig2-shlibs, freetype219-shlibs, xft2-shlibs
Files: lib/libXaw3d.*.dylib
Shlibs: %p/lib/libXaw3d.8.dylib 9.0.0 %n (>= 1.6.2-1)
- DocFiles: COPYING README
+ DocFiles: src/README.XAW3d COPYING README
<<
Description: Athena widget set with 3D look
License: OSI-Approved
@@ -42,6 +55,10 @@
Maintainer: Alexander Hansen <alexkhan...@users.sf.net>
DescPackaging: <<
Tries to redefine Pixel, so we patch that out.
+
+1.6.2-3: Put the prior API tokens back via PatchFile2 so that it "looks" the
same
+as prior xaw3d for packages that build against it.
+
<<
DescDetail: <<
Updated Xaw3D from the xpaint project at Sourceforge.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
