Update of /cvsroot/fink/dists/10.2/unstable/main/finkinfo/x11
In directory sc8-pr-cvs1:/tmp/cvs-serv5780
Added Files:
aterm-0.4.2-3.info qt2-2.3.2-5.info qt2-2.3.2-5.patch
rox-1.2.0-2.info rox-1.2.0-2.patch wxgtk-2.3.4-2.info
wxgtk-2.3.4-2.patch wxmac-2.3.4-2.info wxmac-2.3.4-2.patch
Removed Files:
aterm-0.4.2-2.info qt2-2.3.2-4.info qt2-2.3.2-4.patch
rox-1.2.0-1.info rox-1.2.0-1.patch wxgtk-2.3.4-1.info
wxgtk-2.3.4-1.patch wxmac-2.3.4-1.info wxmac-2.3.4-1.patch
Log Message:
libpng -> libpng3
--- NEW FILE: aterm-0.4.2-3.info ---
Package: aterm
Version: 0.4.2
Revision: 3
Depends: x11, libjpeg-shlibs, libpng3-shlibs, imlib
BuildDepends: libjpeg, libpng3, libtiff, netpbm, glib, gtk+, giflib, dlcompat-dev
Source: mirror:sourceforge:%n/%n-%v.tar.gz
ConfigureParams: --enable-utmp --enable-wtmp --enable-xgetdefault --enable-fading
--enable-background-image --with-term=vt100 --disable-afterstep-lib
--mandir=%p/share/man
InstallScript: make install DESTDIR=%d
DocFiles: ChangeLog doc/BUGS doc/ChangeLog.rxvt doc/FAQ doc/README* doc/TODO
doc/aterm.html doc/atermRef.html
Description: Afterstep XVT - a VT102 emulator
DescDetail: <<
Aterm is a colour vt102 terminal emulator, based on rxvt 2.4.8 with some
additions of fast transparency, intended as an xterm replacement for users
who do not require features such as Tektronix 4014 emulation and
toolkit-style configurability. As a result, aterm uses much less swap space
-- a significant advantage on a machine serving many X sessions. It was
created with AfterStep Window Manager users in mind, but is not tied to any
libraries, and can be used anywhere.
<<
License: GPL
Maintainer: Paul Swenson <[EMAIL PROTECTED]>
Homepage: http://aterm.sourceforge.net/
--- NEW FILE: qt2-2.3.2-5.info ---
Package: qt2
Version: 2.3.2
Revision: 5
Source: ftp://ftp.trolltech.com/qt/source/qt-x11-%v.tar.gz
Source-MD5: 8b74c7bd9ff0c4752a009f2e5a6482e4
SourceDirectory: qt-%v
GCC: 3.1
Conflicts: qt3, qt3-bin, qt3-doc, qt-bin, qt-doc, qt-shlibs, qt3-dev, qt3-designer,
qt3-linguist
Replaces: qt3, qt3-bin, qt3-doc, qt-bin, qt-doc, qt-shlibs, qt3-dev, qt3-designer,
qt3-linguist
Depends: x11, libpng3-shlibs, libjpeg-shlibs, %N-shlibs (= %v-%r)
BuildDepends: libjpeg, libpng3, fink (>= 0.10.0)
BuildDependsOnly: true
PatchScript: sed 's|@PREFIX@|%p|g' <%a/%f.patch | patch -p1
CompileScript: <<
#!/bin/sh
export QTDIR=`pwd`
export DYLD_LIBRARY_PATH="$QTDIR/lib:%p/lib:$DYLD_LIBRARY_PATH"
export PATH="$QTDIR/bin:$PATH"
if [ -f /usr/X11R6/lib/libfontconfig.dylib ]; then
FONTCONFIG="-lfontconfig"
else
FONTCONFIG=
fi
echo yes | ./configure -platform darwin-c++ -shared -system-zlib -system-libpng
-system-jpeg -gif -xft -sm -I/usr/X11R6/include/freetype2 -I%p/include -L%p/lib
$FONTCONFIG
make PREFIX=%p
<<
InstallScript: <<
( export QTDIR=`pwd`; export
DYLD_LIBRARY_PATH="$QTDIR/lib:%p/lib:$DYLD_LIBRARY_PATH"; export
PATH="$QTDIR/bin:$PATH"; make install INSTALLPREFIX=%d PREFIX=%p )
mkdir -p %i/share/doc/%n-%v
cp -R doc/html %i/share/doc/%n-%v/html
cp -R examples tutorial extensions tools %i/share/doc/%n-%v/
cp ANNOUNCE FAQ INSTALL LICENSE* MANIFEST PLATFORMS PORTING README* changes*
%i/share/doc/%n-%v/
mkdir -p %i/etc/profile.d
install -m 755 qt.sh %i/etc/profile.d/
install -m 755 qt.csh %i/etc/profile.d/
<<
SplitOff: <<
Package: %N-shlibs
Conflicts: qt-shlibs, qt
Replaces: qt-shlibs, qt
Description: Shared libraries for the QT application framework
Files: lib/libqt.%v.dylib lib/libqt.2.dylib lib/libqutil.1.0.0.dylib
lib/libqutil.1.dylib
PreInstScript: <<
if [ "$1" = "install" ]; then
while true; do
echo
echo "This is the Qt Free Edition."
echo
echo "You are licensed to use this software under the terms of either"
echo "the Q Public License (QPL) or the GNU General Public License
(GPL)."
echo
echo "Type 'yes' to accept this license offer."
echo "Type 'no' to decline this license offer."
echo
echo "Do you accept the terms of either license?"
read acceptance
if [ "$acceptance" = "yes" -o "$acceptance" = "YES" ]; then
break
elif [ "$acceptance" = "no" -o "$acceptance" = "NO" ]; then
echo
echo "You are not licensed to use this software."
echo
exit 1
fi
done
fi
<<
<<
Description: Cross-Platform GUI application framework
DescPort: <<
Uses a custom configure script. The patch adds config files to build
static or shared libraries on Darwin. This package builds and uses
shared libraries.
No thread support.
OpenGL support is built when libGL is installed. That is the
case with Xtools and post-4.1 CVS versions of XFree86. It will not
build OpenGL support with XFree86 4.1.0.
The man pages are not usable when the package is built on a HFS+
filesystem (or any other not case-sensitive filesystem).
<<
DescPackaging: <<
Installs the files in <prefix>/lib, which you can set as your
$QTDIR. Binaries, headers, libraries and manpages are also linked
from the standard directories, so they are found without additional
measures.
This package is based on Christoph Pfisterer's qt 2.3.1 package, but
has been updated for newer fink guidelines.
<<
License: GPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Homepage: http://www.trolltech.com/
--- NEW FILE: qt2-2.3.2-5.patch ---
diff -uNbr qt-2.3.2/Makefile qt-patched/Makefile
--- qt-2.3.2/Makefile Mon Oct 29 09:24:08 2001
+++ qt-patched/Makefile Sat May 11 00:50:15 2002
@@ -4,11 +4,32 @@
# Read PORTING for instructions how to port Qt to a new platform.
SHELL=/bin/sh
[EMAIL PROTECTED]@
+INSTALLPREFIX=
+INSTALL=install
[EMAIL PROTECTED]@/lib
init: FORCE
@$(MAKE) QTDIR=`pwd` all
-all: symlinks src-moc src-mt sub-src sub-tools sub-tutorial sub-examples
+install: all
+ $(INSTALL) -m 755 -d $(INSTALLPREFIX)/$(PREFIX)/bin
+ $(INSTALL) -m 755 bin/* $(INSTALLPREFIX)/$(PREFIX)/bin/
+ $(INSTALL) -m 755 -d $(INSTALLPREFIX)/$(PREFIX)/include
+ $(INSTALL) -m 644 include/* $(INSTALLPREFIX)/$(PREFIX)/include/
+ $(INSTALL) -m 755 -d $(INSTALLPREFIX)/$(FINAL_LIB_DIR)
+ $(INSTALL) -m 755 lib/libqt.2.3.2.dylib $(INSTALLPREFIX)/$(FINAL_LIB_DIR)/
+ $(INSTALL) -m 755 lib/libqutil.1.0.0.dylib $(INSTALLPREFIX)/$(FINAL_LIB_DIR)/
+ pushd $(INSTALLPREFIX)/$(PREFIX)/lib; \
+ ln -s libqt.2.3.2.dylib libqt.2.dylib; \
+ ln -s libqt.2.3.2.dylib libqt.dylib; \
+ ln -s libqutil.1.0.0.dylib libqutil.1.dylib; \
+ ln -s libqutil.1.0.0.dylib libqutil.dylib; \
+ popd
+ $(INSTALL) -m 755 -d $(INSTALLPREFIX)/$(PREFIX)/share/man/man3
+ $(INSTALL) -m 644 doc/man/man3/* $(INSTALLPREFIX)/$(PREFIX)/share/man/man3/
+
+all: symlinks src-moc src-mt sub-src sub-tools
@echo
@echo "The Qt library is now built in ./lib"
@echo "The Qt examples are built in the directories in ./examples"
diff -uNbr qt-2.3.2/configs/darwin-c++-shared qt-patched/configs/darwin-c++-shared
--- qt-2.3.2/configs/darwin-c++-shared Wed Dec 31 19:00:00 1969
+++ qt-patched/configs/darwin-c++-shared Sat May 11 00:13:57 2002
@@ -0,0 +1,97 @@
+# Compiling
+INTERFACE_DECL_PATH = .
+SYSCONF_CXX = c++
+SYSCONF_CC = cc
+DASHCROSS =
+
+# Compiling with support libraries
+SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include
+SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include
+SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include
+
+# Compiling YACC output
+SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
+
+# Linking with support libraries
+SYSCONF_RPATH_X11 =
+SYSCONF_RPATH_QT =
+SYSCONF_RPATH_OPENGL =
+
+# Linking with support libraries
+# X11
+SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib
+SYSCONF_LIBS_X11 = -lXext -lX11
+# Qt, Qt+OpenGL
+SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
+SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX)
+SYSCONF_LIBS_QT_OPENGL =
+# OpenGL
+SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
+SYSCONF_LIBS_OPENGL = -lGLU -lGL -lXmu
+# Yacc
+SYSCONF_LIBS_YACC =
+
+# Linking applications
+SYSCONF_LINK = c++
+SYSCONF_LFLAGS =
+SYSCONF_LIBS =
+
+# Link flags for shared objects
+SYSCONF_LFLAGS_SHOBJ =
+
+# Flags for threading
+SYSCONF_CFLAGS_THREAD = -pthread -D_THREAD_SAFE
+SYSCONF_CXXFLAGS_THREAD = -pthread -D_THREAD_SAFE
+SYSCONF_LFLAGS_THREAD = -pthread
+SYSCONF_LIBS_THREAD =
+
+# Meta-object compiler
+SYSCONF_MOC = $(QTDIR)/bin/moc
+
+# UI compiler
+SYSCONF_UIC = $(QTDIR)/bin/uic
+
+# Linking shared libraries
+# - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2
+# - Place target in $(DESTDIR) - which has a trailing /
+# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
+#
+SYSCONF_LINK_SHLIB = c++
+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).$(VER_MAJ).$(VER_MIN).$(VER_PATCH).dylib
+SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -dynamiclib
-compatibility_version $(VER_MAJ).$(VER_MIN) \
+ -current_version
$(VER_MAJ).$(VER_MIN).$(VER_PATCH) \
+ -install_name
$(PREFIX)/lib/lib$(TARGET).$(VER_MAJ).dylib \
+ $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
+ $(OBJECTS) $(OBJMOC) $(LIBS) && \
+ mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
+ cd $(DESTDIR) && \
+ rm -f lib$(TARGET).dylib
lib$(TARGET).$(VER_MAJ).dylib; \
+ ln -s $(SYSCONF_LINK_TARGET_SHARED)
lib$(TARGET).dylib; \
+ ln -s $(SYSCONF_LINK_TARGET_SHARED)
lib$(TARGET).$(VER_MAJ).dylib
+
+# Linking static libraries
+# - Build the $(TARGET) library, eg. lib$(TARGET).a
+# - Place target in $(DESTDIR) - which has a trailing /
+#
+SYSCONF_AR = ar cq
+SYSCONF_RANLIB = ranlib
+SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a
+SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
+ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC)
$(OBJECTS) $(OBJMOC) ; \
+ $(SYSCONF_RANLIB)
$(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) \
+# Compiling application source
+SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2
+SYSCONF_CFLAGS = -pipe -fno-exceptions -O2
+# Default link type (static linking is still be used where required)
+SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_SHARED)
+SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_SHARED)
+# Compiling library source
+SYSCONF_CXXFLAGS_LIB = -fno-common
+SYSCONF_CFLAGS_LIB = -fno-common
+# Compiling shared-object source
+SYSCONF_CXXFLAGS_SHOBJ = -dynamic
+SYSCONF_CFLAGS_SHOBJ = -dynamic
+# Linking Qt
+SYSCONF_LIBS_QTLIB = $(SYSCONF_CXXFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT)
+# Linking Qt applications
+SYSCONF_LIBS_QTAPP = $(SYSCONF_LFLAGS_X11) $(SYSCONF_CXXFLAGS_X11) $(QT_LIBS_MT)
$(QT_LIBS_OPT) $(SYSCONF_LIBS_X11)
diff -uNbr qt-2.3.2/configs/darwin-c++-static qt-patched/configs/darwin-c++-static
--- qt-2.3.2/configs/darwin-c++-static Wed Dec 31 19:00:00 1969
+++ qt-patched/configs/darwin-c++-static Fri May 10 20:57:46 2002
@@ -0,0 +1,95 @@
+# Compiling
+INTERFACE_DECL_PATH = .
+SYSCONF_CXX = c++
+SYSCONF_CC = cc
+DASHCROSS =
+
+# Compiling with support libraries
+SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include
+SYSCONF_CXXFLAGS_QT = -I$(QTDIR)/include
+SYSCONF_CXXFLAGS_OPENGL = -I/usr/X11R6/include
+
+# Compiling YACC output
+SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
+
+# Linking with support libraries
+SYSCONF_RPATH_X11 =
+SYSCONF_RPATH_QT =
+SYSCONF_RPATH_OPENGL =
+
+# Linking with support libraries
+# X11
+SYSCONF_LFLAGS_X11 = -L/usr/X11R6/lib
+SYSCONF_LIBS_X11 = -lXext -lX11
+# Qt, Qt+OpenGL
+SYSCONF_LFLAGS_QT = -L$(QTDIR)/lib
+SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX)
+SYSCONF_LIBS_QT_OPENGL =
+# OpenGL
+SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
+SYSCONF_LIBS_OPENGL = -lGLU -lGL -lXmu
+# Yacc
+SYSCONF_LIBS_YACC =
+
+# Linking applications
+SYSCONF_LINK = c++
+SYSCONF_LFLAGS =
+SYSCONF_LIBS =
+
+# Link flags for shared objects
+SYSCONF_LFLAGS_SHOBJ = -shared
+
+# Flags for threading
+SYSCONF_CFLAGS_THREAD = -pthread -D_THREAD_SAFE
+SYSCONF_CXXFLAGS_THREAD = -pthread -D_THREAD_SAFE
+SYSCONF_LFLAGS_THREAD = -pthread
+SYSCONF_LIBS_THREAD =
+
+# Meta-object compiler
+SYSCONF_MOC = $(QTDIR)/bin/moc
+
+# UI compiler
+SYSCONF_UIC = $(QTDIR)/bin/uic
+
+# Linking shared libraries
+# - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2
+# - Place target in $(DESTDIR) - which has a trailing /
+# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
+#
+SYSCONF_LINK_SHLIB = c++
+SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
+SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \
+ $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
+ $(OBJECTS) $(OBJMOC) $(LIBS) && \
+ mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
+ cd $(DESTDIR) && \
+ rm -f lib$(TARGET).dylib
lib$(TARGET).dylib.$(VER_MAJ) lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN); \
+ ln -s $(SYSCONF_LINK_TARGET_SHARED)
lib$(TARGET).dylib; \
+ ln -s $(SYSCONF_LINK_TARGET_SHARED)
lib$(TARGET).dylib.$(VER_MAJ); \
+ ln -s $(SYSCONF_LINK_TARGET_SHARED)
lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN)
+
+# Linking static libraries
+# - Build the $(TARGET) library, eg. lib$(TARGET).a
+# - Place target in $(DESTDIR) - which has a trailing /
+#
+SYSCONF_AR = ar cq
+SYSCONF_RANLIB = ranlib
+SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a
+SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
+ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC)
$(OBJECTS) $(OBJMOC) ; \
+ $(SYSCONF_RANLIB)
$(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) \
+# Compiling application source
+SYSCONF_CXXFLAGS = -pipe -fno-exceptions -O2
+SYSCONF_CFLAGS = -pipe -fno-exceptions -O2
+SYSCONF_LINK_LIB = $(SYSCONF_LINK_LIB_STATIC)
+SYSCONF_LINK_TARGET = $(SYSCONF_LINK_TARGET_STATIC)
+# Compiling library source
+SYSCONF_CXXFLAGS_LIB =
+SYSCONF_CFLAGS_LIB =
+# Compiling shared-object source
+SYSCONF_CXXFLAGS_SHOBJ = -fPIC
+SYSCONF_CFLAGS_SHOBJ = -fPIC
+# Linking Qt
+SYSCONF_LIBS_QTLIB = $(SYSCONF_CXXFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT)
+# Linking Qt applications
+SYSCONF_LIBS_QTAPP = $(SYSCONF_LFLAGS_X11) $(SYSCONF_CXXFLAGS_X11) $(QT_LIBS_MT)
$(QT_LIBS_OPT) $(SYSCONF_LIBS_X11)
diff -uNbr qt-2.3.2/configure qt-patched/configure
--- qt-2.3.2/configure Mon Oct 29 09:24:18 2001
+++ qt-patched/configure Fri May 10 20:57:46 2002
@@ -6,7 +6,7 @@
#
# To remove the need for the first test, do this:
-# QTDIR=`pwd` export QTDIR
+QTDIR=`pwd` export QTDIR
relpath=`dirname $0`
relpath=`(cd $relpath; pwd)`
@@ -1317,7 +1317,7 @@
fi
[ "x$SM" = "xyes" ] && QT_LIBS="${QT_LIBS} -lSM -lICE"
-[ "x$XFT" = "xyes" ] && QT_LIBS="${QT_LIBS} -lXft"
+[ "x$XFT" = "xyes" ] && QT_LIBS="${QT_LIBS} -lXft -lXrender"
if [ -z "$EMB" -o "$SHARED" = no ]
then
[ "x$LIBPNG" = "xyes" ] && QT_MODOBJ=$QT_MODOBJ' $(PNG_OBJECTS)'
diff -uNbr qt-2.3.2/include/qglobal.h qt-patched/include/qglobal.h
--- qt-2.3.2/include/qglobal.h Mon Oct 29 09:21:15 2001
+++ qt-patched/include/qglobal.h Fri May 10 20:57:46 2002
@@ -73,6 +73,8 @@
#if defined(macintosh)
#define _OS_MAC_
+#elif defined(__APPLE__)
+#define _OS_DARWIN_
#elif defined(MSDOS) || defined(_MSDOS) || defined(__MSDOS__)
#define _OS_MSDOS_
#elif defined(OS2) || defined(_OS2) || defined(__OS2__)
diff -uNbr qt-2.3.2/qt.csh qt-patched/qt.csh
--- qt-2.3.2/qt.csh Wed Dec 31 19:00:00 1969
+++ qt-patched/qt.csh Fri May 10 22:42:30 2002
@@ -0,0 +1,3 @@
+# qt.csh
+
+setenv QTDIR @PREFIX@
diff -uNbr qt-2.3.2/qt.sh qt-patched/qt.sh
--- qt-2.3.2/qt.sh Wed Dec 31 19:00:00 1969
+++ qt-patched/qt.sh Fri May 10 22:42:37 2002
@@ -0,0 +1,4 @@
+# qt.sh
+
[EMAIL PROTECTED]@
+export QTDIR
diff -uNbr qt-2.3.2/src/network/qsocketdevice_unix.cpp
qt-patched/src/network/qsocketdevice_unix.cpp
--- qt-2.3.2/src/network/qsocketdevice_unix.cpp Mon Oct 29 09:21:14 2001
+++ qt-patched/src/network/qsocketdevice_unix.cpp Fri May 10 20:57:46 2002
@@ -114,7 +114,7 @@
# define SOCKLEN_T socklen_t
#elif defined(BSD4_4)
// BSD 4.4
-# if defined(_OS_FREEBSD_) && __FreeBSD_version < 400000
+# if (defined(_OS_FREEBSD_) && __FreeBSD_version < 400000) || defined(_OS_DARWIN_)
// FreeBSD 4.0 and higher
# define SOCKLEN_T int
# else
diff -uNbr qt-2.3.2/src/tools/qglobal.h qt-patched/src/tools/qglobal.h
--- qt-2.3.2/src/tools/qglobal.h Mon Oct 29 09:21:15 2001
+++ qt-patched/src/tools/qglobal.h Fri May 10 20:57:46 2002
@@ -73,6 +73,8 @@
#if defined(macintosh)
#define _OS_MAC_
+#elif defined(__APPLE__)
+#define _OS_DARWIN_
#elif defined(MSDOS) || defined(_MSDOS) || defined(__MSDOS__)
#define _OS_MSDOS_
#elif defined(OS2) || defined(_OS2) || defined(__OS2__)
--- NEW FILE: rox-1.2.0-2.info ---
Package: rox
Version: 1.2.0
Revision: 2
Maintainer: Dave Vasilevsky <[EMAIL PROTECTED]>
##
License: GPL
Homepage: http://rox.sourceforge.net
Source: mirror:sourceforge:rox/rox-%v.tgz
##
##
Depends: gtk+-shlibs, gdk-pixbuf-shlibs, glib-shlibs, libpng3-shlibs, libxml2-shlibs,
x11, rox-base
BuildDepends: gtk+, gdk-pixbuf, glib, libpng3, libxml2, libjpeg, libtiff, netpbm,
audiofile, esound, orbit-dev, giflib, imlib, gdbm, gmp, gnome-libs-dev, expat,
tcltk-dev, dlcompat-dev
##
Patch: %f.patch
SetCFLAGS: -I%p/include/libxml2/libxml -D__DARWIN__
SetCPPFLAGS: -no-cpp-precomp
##
CompileScript: ROX-Filer/AppRun --compile
InstallScript: ./install.sh "%p" "%i"
##
DocFiles: ROX-Filer/Help/*
##
##
Description: RISC OS-like file manager
DescDetail: <<
ROX-Filer is a small, fast and powerful filer for Linux and Unix systems.
Some useful features:
- Lets applications be stored in their own directories, just like
OS X bundles.
- Save files by dragging and dropping their icons, instead of using
a separate file browser/Finder and save dialog.
- Store configuration files in a 'Choices' directory, instead of in
dot-files -- no more hidden files, no more crowding of your home
directory.
<<
Source-MD5: c6af7baf9958ca43d5a175a868dc0503
--- NEW FILE: rox-1.2.0-2.patch ---
diff -Naur rox-1.2.0/ROX-Filer/AppRun rox-new/ROX-Filer/AppRun
--- rox-1.2.0/ROX-Filer/AppRun 2001-08-28 11:40:50.000000000 -0400
+++ rox-new/ROX-Filer/AppRun 2002-04-10 11:02:52.000000000 -0400
@@ -5,7 +5,7 @@
APP_DIR=`dirname $0`
APP_DIR=`cd "$APP_DIR";pwd`; export APP_DIR
-ARCH=`uname -m`
+ARCH=`uname -m | sed "s/[[:space:]]/_/"`
case $ARCH in
i?86) ARCH=ix86 ;;
esac
@@ -34,8 +34,8 @@
"$@" \
&& make clean && make && echo Done >&2 && exit 0
echo Compile failed >&2
- echo Press Return... >&2
- read WAIT
+# echo Press Return... >&2
+# read WAIT
exit 1
esac
diff -Naur rox-1.2.0/ROX-Filer/src/global.h rox-new/ROX-Filer/src/global.h
--- rox-1.2.0/ROX-Filer/src/global.h 2001-12-26 15:33:21.000000000 -0500
+++ rox-new/ROX-Filer/src/global.h 2002-04-10 08:59:39.000000000 -0400
@@ -119,7 +119,7 @@
#define SHOW(var, fmt) (g_print("[ " #var " = '%" #fmt "' ]\n", var))
-#include <tree.h>
+#include <libxml/tree.h>
/* For very old versions of libxml... */
#ifndef xmlChildrenNode
diff -Naur rox-1.2.0/ROX-Filer/src/mount.c rox-new/ROX-Filer/src/mount.c
--- rox-1.2.0/ROX-Filer/src/mount.c 2002-01-02 10:36:04.000000000 -0500
+++ rox-new/ROX-Filer/src/mount.c 2002-04-10 11:30:53.000000000 -0400
@@ -79,7 +79,9 @@
fstab_mounts = g_hash_table_new(g_str_hash, g_str_equal);
#ifdef DO_MOUNT_POINTS
+#ifndef __DARWIN__
fstab_time = read_time(THE_FSTAB);
+#endif
read_table();
#endif
}
@@ -90,8 +92,12 @@
#ifdef DO_MOUNT_POINTS
time_t time;
+#ifdef __DARWIN__
+ if (1)
+#else
time = read_time(THE_FSTAB);
if (force || time != fstab_time)
+#endif
{
fstab_time = time;
read_table();
diff -Naur rox-1.2.0/install.sh rox-new/install.sh
--- rox-1.2.0/install.sh 2002-04-10 08:15:19.000000000 -0400
+++ rox-new/install.sh 2002-04-10 11:07:42.000000000 -0400
@@ -49,78 +49,89 @@
umask 022
-cat << EOF
-
-**************************************************************************
+PREFIX="$1"
+INSTALL_PREFIX="$2"
-Where would you like to install the filer?
-Normally, you should choose (1) if you have root access, or (2) if not.
+#cat << EOF
+#
+#**************************************************************************
+#
+#Where would you like to install the filer?
+#Normally, you should choose (1) if you have root access, or (2) if not.
+#
+#1) Inside /usr/local
+#2) Inside my home directory
+#3) Inside /usr
+#4) Specify paths manually
+#
+#Enter 1, 2, 3 or 4:
+#EOF
+#printf ">>> "
+#
+#read REPLY
+#echo
+#
+#case $REPLY in
+# 1) APPDIR=/usr/local/apps
+# BINDIR=/usr/local/bin
+# MANDIR=/usr/local/man
+# ;;
+# 2) APPDIR=${HOME}/Apps
+# BINDIR=${HOME}/bin
+# if [ ! -d ${HOME}/man ]; then
+# MANDIR=""
+# else
+# MANDIR=${HOME}/man
+# fi
+# ;;
+# 3) APPDIR=/usr/apps
+# BINDIR=/usr/bin
+# MANDIR=/usr/man
+# ;;
+# 4) echo "Where should the ROX-Filer application go?"
+# get_dir "/usr/local/apps"
+# APPDIR="$DIR"
+# echo
+# echo "Where should the launcher script go?"
+# get_dir "/usr/local/bin"
+# BINDIR="$DIR"
+# echo
+# echo "Where should the manual page go?"
+# get_dir "/usr/local/man"
+# MANDIR="$DIR"
+# ;;
+# *) die "Invalid choice!";;
+#esac
+APPDIR="$INSTALL_PREFIX/share"
+R_APPDIR="$PREFIX/share"
-1) Inside /usr/local
-2) Inside my home directory
-3) Inside /usr
-4) Specify paths manually
+BINDIR="$INSTALL_PREFIX/bin"
+R_BINDIR="$PREFIX/bin"
-Enter 1, 2, 3 or 4:
-EOF
-printf ">>> "
-
-read REPLY
-echo
-
-case $REPLY in
- 1) APPDIR=/usr/local/apps
- BINDIR=/usr/local/bin
- MANDIR=/usr/local/man
- ;;
- 2) APPDIR=${HOME}/Apps
- BINDIR=${HOME}/bin
- if [ ! -d ${HOME}/man ]; then
- MANDIR=""
- else
- MANDIR=${HOME}/man
- fi
- ;;
- 3) APPDIR=/usr/apps
- BINDIR=/usr/bin
- MANDIR=/usr/man
- ;;
- 4) echo "Where should the ROX-Filer application go?"
- get_dir "/usr/local/apps"
- APPDIR="$DIR"
- echo
- echo "Where should the launcher script go?"
- get_dir "/usr/local/bin"
- BINDIR="$DIR"
- echo
- echo "Where should the manual page go?"
- get_dir "/usr/local/man"
- MANDIR="$DIR"
- ;;
- *) die "Invalid choice!";;
-esac
+MANDIR="$INSTALL_PREFIX/share/man"
+R_MANDIR="$PREFIX/share/man"
cat << EOF
The application directory will be:
- $APPDIR/ROX-Filer
+ $R_APPDIR/ROX-Filer
The launcher script will be:
- $BINDIR/rox
+ $R_BINDIR/rox
EOF
if [ -n "$MANDIR" ]; then
echo "The manual pages will be:"
- echo " $MANDIR/man1/rox.1"
- echo " $MANDIR/man1/ROX-Filer.1"
+ echo " $R_MANDIR/man1/rox.1"
+ echo " $R_MANDIR/man1/ROX-Filer.1"
else
echo "The manual page will not be installed."
fi
echo
-echo "OK?"
-confirm_or_die
-echo
+#echo "OK?"
+#confirm_or_die
+#echo
if [ -n "$MANDIR" ]; then
echo "Installing manpage..."
@@ -135,13 +146,13 @@
endir "$APPDIR"
(cd ROX-Filer/src; make clean) > /dev/null
-if [ -d "$APPDIR/ROX-Filer" ]; then
- echo "ROX-Filer is already installed - delete the existing"
- echo "copy?"
- confirm_or_die
- echo Deleting...
- rm -rf "$APPDIR/ROX-Filer"
-fi
+#if [ -d "$APPDIR/ROX-Filer" ]; then
+# echo "ROX-Filer is already installed - delete the existing"
+# echo "copy?"
+# confirm_or_die
+# echo Deleting...
+# rm -rf "$APPDIR/ROX-Filer"
+#fi
cp -r ROX-Filer "$APPDIR"
echo "Installing launcher script..."
@@ -149,21 +160,21 @@
cat > "$BINDIR/rox" << EOF
#!/bin/sh
-exec $APPDIR/ROX-Filer/AppRun "\$@"
+exec $R_APPDIR/ROX-Filer/AppRun "\$@"
EOF
[ $? -eq 0 ] || die "Failed to install 'rox' script"
chmod a+x "$BINDIR/rox"
cat << EOF
Script installed. You can run the filer by simply typing 'rox'
-Make sure that $BINDIR is in your PATH though - if it isn't then
+Make sure that $R_BINDIR is in your PATH though - if it isn't then
you must use
- \$ $BINDIR/rox
+ \$ $R_BINDIR/rox
to run it instead.
EOF
if [ ! -n "$CHOICESPATH" ]; then
- CHOICESPATH=${HOME}/Choices:/usr/local/share/Choices:/usr/share/Choices
+ CHOICESPATH=${HOME}/Library/Choices:/sw/share/Choices
fi
cat << EOF
@@ -171,9 +182,8 @@
ROX-Filer requires some icons and other defaults. These should be
installed where it can find them. By default, it looks in
- \${HOME}/Choices (${HOME}/Choices in your case)
- /usr/local/share/Choices
- /usr/share/Choices
+ \${HOME}/Library/Choices (${HOME}/Library/Choices in your case)
+ /sw/share/Choices
in that order. You can choose a different search path by setting
the CHOICESPATH environment variable before running the filer. These
files are supplied in the 'rox-base' package. Make sure you have the
@@ -203,11 +213,12 @@
if [ -n "$REPORT" ]; then
echo
echo $REPORT
- echo "Please download and install the latest version of the rox-base package"
- echo "from http://rox.sourceforge.net before using the filer!"
- echo
- echo "Continue?"
- confirm_or_die
+ die "Please get the newest version of rox-base."
+# echo "Please download and install the latest version of the rox-base package"
+# echo "from http://rox.sourceforge.net before using the filer!"
+# echo
+# echo "Continue?"
+# confirm_or_die
fi
cat << EOF
--- NEW FILE: wxgtk-2.3.4-2.info ---
Package: wxgtk
Version: 2.3.4
Revision: 2
Maintainer: Sylvain Cuaz <[EMAIL PROTECTED]>
GCC: 3.1
BuildDepends: libpng3, libjpeg, libtiff, glib, gtk+, freetype2, freetype |
freetype-hinting, libgl
Depends: %N-shlibs (= %v-%r)
Conflicts: wxmac
Replaces: wxmac
Source: mirror:sourceforge:wxwindows/wxGTK-%v.tar.bz2
SourceDirectory: wxGTK-%v
SetCPPFLAGS: -no-cpp-precomp -I/usr/X11R6/include
ConfigureParams: --with-gtk --with-freetype --with-opengl
PatchScript: <<
sed 's|@PREFIX@|%p|g' < %a/%f.patch | patch -p1
chmod 755 distrib/mac/shared-ld-sh
<<
CompileScript: mkdir build ; (cd build; ../configure %c ; make)
InstallScript: (cd build; make install prefix=%i)
DocFiles: CHANGES-GTK.txt CHANGES.txt COPYING.LIB INSTALL.txt LICENCE.txt
README-GTK.txt README.txt TODO.txt
BuildDependsOnly: True
SplitOff: <<
Package: %N-shlibs
Replaces: %N
Depends: freetype2-shlibs, libpng3-shlibs, libjpeg-shlibs, libtiff-shlibs,
freetype-shlibs | freetype-hinting-shlibs, glib-shlibs, gtk+-shlibs, libgl-shlibs
Files: lib/libwx_gtk-2.3.2.0.0.dylib lib/libwx_gtk_gl-2.3.2.0.0.dylib
lib/libwx_gtk-2.3.2.dylib lib/libwx_gtk_gl-2.3.2.dylib
Shlibs: <<
%p/lib/libwx_gtk-2.3.2.dylib 2.3.0 (>= 2.3.4-1)
%p/lib/libwx_gtk_gl-2.3.2.dylib 2.3.0 (>= 2.3.4-1)
<<
DocFiles: COPYING.LIB LICENCE.txt
<<
Description: Cross-platform (unix,windows,mac) GUI API - unix version
DescDetail: <<
In addition to common and advanced GUI facilities such as
frames, scrolling windows, toolbars, tree controls, icons,
device contexts, printing, splitter windows and so on, there are
wrappers for common file operations, and facilities for writing
TCP/IP applications, thread handling, and more. Where certain
features are not available on a platform, such as MDI and tree
controls on Unix, they are emulated.
<<
DescPort: <<
the ConfigureParam (--with-gtk) prevents it from detecting MacOS X.
patch to configure to permit proper detection of
freetype headers, and linking of libiconv.
added -install_name to linker flags so
DYLD_LIBRARY_PATH does not need to be set manually.
Pulled the shared-ld-sh script from the wxMac distribution, for use here.
<<
Homepage: http://wxWindows.org/
License: GPL
--- NEW FILE: wxgtk-2.3.4-2.patch ---
diff -ru wxMac-2.3.4/configure.in wxMac-2.3.4-patched/configure.in
--- wxMac-2.3.4/configure.in Wed Nov 27 09:15:32 2002
+++ wxMac-2.3.4-patched/configure.in Sun Dec 15 12:41:29 2002
@@ -2684,6 +2684,17 @@
;;
*-*-darwin* )
+ dnl Under Mac OS X, the naming conventions for shared libraries
+ dnl are different: the number precedes the suffix.
+
+
WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
+
WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
+
+ WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${WX_CURRENT}.${SO_SUFFIX}"
+ WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}"
+ WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${SO_SUFFIX}"
+ WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
+
dnl Under Mac OS X, we should build real frameworks instead of simple
dnl dynamic shared libraries (in order to embed the resources)
if test "$wxUSE_MAC" = 1; then
@@ -2820,8 +2831,8 @@
dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress
-flat_namespace -o"
PIC_FLAG="-dynamic -fPIC"
- SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version
${WX_VERSION}"
- SONAME_FLAGS_GL=${SONAME_FLAGS}
+ SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version
${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1}"
+ SONAME_FLAGS_GL="-compatibility_version ${WX_RELEASE} -current_version
${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1_GL}"
;;
*-*-aix* )
diff -ru wxMac-2.3.4/configure wxMac-2.3.4-patched/configure
--- wxMac-2.3.4/configure Wed Nov 27 09:15:31 2002
+++ wxMac-2.3.4-patched/configure Sun Dec 15 13:01:36 2002
@@ -9594,15 +9594,6 @@
esac
-case "${host}" in
-
- powerpc-*-darwin* )
- INSTALL_PROGRAM="cp -fp"
- INSTALL_DATA="cp -fp"
- ;;
- *)
- ;;
-esac
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -15799,6 +15790,15 @@
;;
*-*-darwin* )
+
+
WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
+
WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
+
+ WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${WX_CURRENT}.${SO_SUFFIX}"
+ WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}"
+ WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${SO_SUFFIX}"
+ WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
+
if test "$wxUSE_MAC" = 1; then
WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.r"
WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.rsrc"
@@ -15973,8 +15973,8 @@
CXXFLAGS="$CXXFLAGS -fno-common"
SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace
-o"
PIC_FLAG="-dynamic -fPIC"
- SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version
${WX_VERSION}"
- SONAME_FLAGS_GL=${SONAME_FLAGS}
+ SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version
${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1}"
+ SONAME_FLAGS_GL="-compatibility_version ${WX_RELEASE} -current_version
${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1_GL}"
;;
*-*-aix* )
@@ -21723,7 +21723,7 @@
fi
-LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK $LIBS"
+LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK -liconv $LIBS"
have_cos=0
have_floor=0
diff -ruN wxGTK-2.3.4/distrib/mac/shared-ld-sh
wxGTK-2.3.4-patched/distrib/mac/shared-ld-sh
--- wxGTK-2.3.4/distrib/mac/shared-ld-sh Wed Dec 31 19:00:00 1969
+++ wxGTK-2.3.4-patched/distrib/mac/shared-ld-sh Sat Dec 14 19:45:03 2002
@@ -0,0 +1,87 @@
+#!/bin/sh
+#-----------------------------------------------------------------------------
+#-- Name: distrib/mac/shared-ld-sh
+#-- Purpose: Link a mach-o dynamic shared library for Darwin / Mac OS X
+#-- Author: Gilles Depeyrot
+#-- Modified by:
+#-- Created: 05.05.2002
+#-- RCS-ID: $Id: shared-ld-sh,v 1.2 2002/05/08 17:13:13 GD Exp $
+#-- Copyright: (c) 2002 Gilles Depeyrot
+#-- Licence: wxWindows licence
+#-----------------------------------------------------------------------------
+
+verbose=0
+args=""
+objects=""
+
+while test $# -gt 0; do
+ case $1 in
+
+ -v)
+ verbose=1
+ ;;
+
+ -o|-compatibility_version|-current_version|-framework|-undefined|-install_name)
+ # collect these options and values
+ args="$args $1 $2"
+ shift
+ ;;
+
+ -l*|-L*|-flat_namespace)
+ # collect these options
+ args="$args $1"
+ ;;
+
+ -dynamiclib)
+ # skip these options
+ ;;
+
+ -*)
+ echo "shared-ld: unhandled option '$1'"
+ exit 1
+ ;;
+
+ *.o)
+ # collect object files
+ objects="$objects $1"
+ ;;
+
+ *)
+ echo "shared-ld: unhandled argument '$1'"
+ exit 1
+ ;;
+
+ esac
+ shift
+done
+
+#
+# Link one module containing all the others
+#
+if test $verbose = 1; then
+ echo "c++ -r -keep_private_externs -nostdlib $objects -o master.$$.o"
+fi
+c++ -r -keep_private_externs -nostdlib $objects -o master.$$.o
+status=$?
+if test $status != 0; then
+ exit $status
+fi
+
+#
+# Link the shared library from the single module created
+#
+if test $verbose = 1; then
+ echo "cc -dynamiclib master.$$.o $args"
+fi
+c++ -dynamiclib master.$$.o $args
+status=$?
+if test $status != 0; then
+ exit $status
+fi
+
+#
+# Remove intermediate module
+#
+rm -f master.$$.o
+
+exit 0
--- NEW FILE: wxmac-2.3.4-2.info ---
Package: wxmac
Version: 2.3.4
Revision: 2
GCC: 3.1
Conflicts: wxgtk
Replaces: wxgtk
Source: mirror:sourceforge:wxwindows/wxMac-%v.tar.gz
Depends: %N-shlibs (= %v-%r)
BuildDepends: freetype | freetype-hinting, libpng3, libjpeg, libtiff
BuildDependsOnly: True
SourceDirectory: wxMAC-%v
ConfigureParams: --with-freetype --with-opengl
PatchScript: sed 's|@PREFIX@|%p|g' < %a/%f.patch | patch -p1
CompileScript: mkdir build
(cd build; ../configure %c; make)
InstallScript: (cd build; make install prefix=%i)
SplitOff: <<
Package: %N-shlibs
Depends: libpng3-shlibs, libtiff-shlibs, freetype-shlibs | freetype-hinting-shlibs
Files: lib/libwx_mac-2.3.*.dylib lib/libwx_mac_gl-2.3.*.dylib
Shlibs: <<
%p/lib/libwx_mac-2.3.2.dylib 2.3.0 (>= 2.3.4-1)
%p/lib/libwx_mac_gl-2.3.2.dylib 2.3.0 (>= 2.3.4-1)
<<
DocFiles: docs/licence.txt docs/licendoc.txt
<<
DocFiles: docs/licence.txt docs/licendoc.txt
Description: Cross-platform (unix,windows,mac) GUI API - mac version
DescDetail: <<
In addition to common and advanced GUI facilities such as
frames, scrolling windows, toolbars, tree controls, icons,
device contexts, printing, splitter windows and so on, there are
wrappers for common file operations, and facilities for writing
TCP/IP applications, thread handling, and more. Where certain
features are not available on a platform, such as MDI and tree
controls on Unix, they are emulated.
<<
DescPort: patch to configure to permit proper detection of
freetype headers, and linking of libiconv.
License: GPL
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Homepage: http://www.wxwindows.org
--- NEW FILE: wxmac-2.3.4-2.patch ---
diff -ru wxMac-2.3.4/configure.in wxMac-2.3.4-patched/configure.in
--- wxMac-2.3.4/configure.in Wed Nov 27 09:15:32 2002
+++ wxMac-2.3.4-patched/configure.in Sun Dec 15 12:41:29 2002
@@ -2684,6 +2684,17 @@
;;
*-*-darwin* )
+ dnl Under Mac OS X, the naming conventions for shared libraries
+ dnl are different: the number precedes the suffix.
+
+
WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
+
WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
+
+ WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${WX_CURRENT}.${SO_SUFFIX}"
+ WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}"
+ WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${SO_SUFFIX}"
+ WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
+
dnl Under Mac OS X, we should build real frameworks instead of simple
dnl dynamic shared libraries (in order to embed the resources)
if test "$wxUSE_MAC" = 1; then
@@ -2820,8 +2831,8 @@
dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress
-flat_namespace -o"
PIC_FLAG="-dynamic -fPIC"
- SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version
${WX_VERSION}"
- SONAME_FLAGS_GL=${SONAME_FLAGS}
+ SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version
${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1}"
+ SONAME_FLAGS_GL="-compatibility_version ${WX_RELEASE} -current_version
${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1_GL}"
;;
*-*-aix* )
diff -ru wxMac-2.3.4/configure wxMac-2.3.4-patched/configure
--- wxMac-2.3.4/configure Wed Nov 27 09:15:31 2002
+++ wxMac-2.3.4-patched/configure Sun Dec 15 13:01:36 2002
@@ -9594,15 +9594,6 @@
esac
-case "${host}" in
-
- powerpc-*-darwin* )
- INSTALL_PROGRAM="cp -fp"
- INSTALL_DATA="cp -fp"
- ;;
- *)
- ;;
-esac
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -15799,6 +15790,15 @@
;;
*-*-darwin* )
+
+
WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
+
WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
+
+ WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${WX_CURRENT}.${SO_SUFFIX}"
+ WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}"
+ WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${SO_SUFFIX}"
+ WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
+
if test "$wxUSE_MAC" = 1; then
WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.r"
WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.rsrc"
@@ -15973,8 +15973,8 @@
CXXFLAGS="$CXXFLAGS -fno-common"
SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace
-o"
PIC_FLAG="-dynamic -fPIC"
- SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version
${WX_VERSION}"
- SONAME_FLAGS_GL=${SONAME_FLAGS}
+ SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version
${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1}"
+ SONAME_FLAGS_GL="-compatibility_version ${WX_RELEASE} -current_version
${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1_GL}"
;;
*-*-aix* )
@@ -21723,7 +21723,7 @@
fi
-LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK $LIBS"
+LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK -liconv $LIBS"
have_cos=0
have_floor=0
diff -ru wxMac-2.3.4/distrib/mac/shared-ld-sh
wxMac-2.3.4-patched/distrib/mac/shared-ld-sh
--- wxMac-2.3.4/distrib/mac/shared-ld-sh Wed May 8 13:13:13 2002
+++ wxMac-2.3.4-patched/distrib/mac/shared-ld-sh Sun Dec 15 13:02:27 2002
@@ -21,7 +21,7 @@
verbose=1
;;
- -o|-compatibility_version|-current_version|-framework|-undefined)
+ -o|-compatibility_version|-current_version|-framework|-undefined|-install_name)
# collect these options and values
args="$args $1 $2"
shift
--- aterm-0.4.2-2.info DELETED ---
--- qt2-2.3.2-4.info DELETED ---
--- qt2-2.3.2-4.patch DELETED ---
--- rox-1.2.0-1.info DELETED ---
--- rox-1.2.0-1.patch DELETED ---
--- wxgtk-2.3.4-1.info DELETED ---
--- wxgtk-2.3.4-1.patch DELETED ---
--- wxmac-2.3.4-1.info DELETED ---
--- wxmac-2.3.4-1.patch DELETED ---
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
