Update of /cvsroot/fink/experimental/dmrrsn/10.4/x11
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14769/x11
Added Files:
kaptain.info qt3.info qt3.patch
Log Message:
preliminary versions for the 10.4/stable tree (still need work on
dependencies)
--- NEW FILE: qt3.info ---
Package: qt3
Version: 3.3.4
Revision: 123
GCC: 3.3
CustomMirror: <<
Primary: ftp://ftp.trolltech.com/qt/source
aus-AU: http://public.ftp.planetmirror.com.au/pub/trolltech/qt/source
eur-DE: ftp://ftp.fu-berlin.de/unix/X11/gui/Qt/source
eur-DE: http://wftp.tu-chemnitz.de/pub/Qt/source
eur-ES: http://sunsite.rediris.es/mirror/Qt/source
eur-GR: http://ftp.ntua.gr/pub/X11/Qt/qt/source
eur-NO: ftp://ftp.trolltech.com/qt/source
eur-RO: http://ftp.iasi.roedu.net/mirrors/ftp.trolltech.com/qt/sources
nam-US: http://ftp.silug.org/mirrors/ftp.trolltech.com/qt/source
<<
Source: mirror:custom:qt-x11-free-%v.tar.bz2
Source-MD5: 027f4e82fbe592b39d2f160bfb3a73af
SourceDirectory: qt-x11-free-%v
Description: Cross-Platform GUI application framework
Depends: %N-shlibs (>= %v-%r), %N-designer (>= %v-%r), %N-linguist (>= %v-%r),
%N-doc (>= %v-%r), pkgconfig
Suggests: libpng3, libjpeg, %N-mysql (>= %v-%r), %N-postgresql (>= %v-%r)
BuildDepends: cctools (>= 446) | cctools-single-module, cups-dev, fink (>=
0.17.3-1), freetype219, gcc3.3, libgl-dev, libpng3 (>= 1.2.5-4), libjpeg,
x11-dev
Replaces: qt, qt2, %N-doc, %N-bin, %N-dev
Conflicts: qt, qt2
Provides: %N-bin
BuildDependsOnly: true
PatchScript: <<
#!/bin/sh -ex
sed -e 's|@PREFIX@|%p|g' <%a/%n.patch | patch -p1
perl -pi -e 's|cp \-P|/bin/cp \-RL|' qmake/Makefile.unix
<<
NoSetLDFLAGS: true
CompileScript: <<
#!/bin/sh -ex
CURRENTVERSION=`dpkg -p qt3 | grep '^Version:' | cut -d' ' -f2-`
DOREMOVE=0
for BADUPGRADE in 3.2.1-1 3.2.1-11 3.2.1-12; do
if [ "$CURRENTVERSION" = "$BADUPGRADE" ]; then
DOREMOVE=1
fi
done
for file in `ls -1 /lib/ 2>/dev/null | grep -E '(qt-mt|qt3)' | grep -v
'.bad$'`; do
echo "WARNING: found suspicious file or directory \"$file\" -- moving to
\"${file}.bad\""
/bin/mv "/lib/${file}" "/lib/${file}.bad"
done
if [ "$DOREMOVE" = "1" ]; then
echo "You have a version of qt3 installed that contains a bug that makes it
impossible"
echo "to build this package. I am going to remove qt3 not to allow the
upgrade to"
echo "happen. It should get re-installed as needed when the upgrade
completes."
echo ""
echo -e "removing qt3... \c"
if dpkg -r --force-depends qt3 >/tmp/dpkg.output 2>&1; then
echo "done"
else
echo "failed!"
echo ""
echo "I was unable to remove the old qt3, this will probably cause
problems building"
echo "this package. Please remove qt3 and then retry this build."
echo ""
echo "---( dpkg output )---"
cat /tmp/dpkg.output
fi
fi
export QTDIR=`pwd`
export DYLD_LIBRARY_PATH="$QTDIR/lib:%p/lib/freetype219/lib:$DYLD_LIBRARY_PATH"
export PATH="$QTDIR/bin:%p/lib/freetype219/bin:$PATH"
export INSTALL_ROOT=""
if [ -f /usr/lib/libresolv.dylib ]; then
LIBRESOLV="-lresolv"
perl -pi -e 's,#define QT_AOUT_UNDERSCORE,,'
mkspecs/darwin-g++/qplatformdefs.h
else
LIBRESOLV=""
fi
# we have to force header/lib ordering or things get really wiggy
# looks ugly, but it's better than patching the source
echo "yes" | ./configure \
'-I$(QTDIR)/include' '-I%p/lib/freetype219/include/freetype2' \
'-L%p/lib/freetype219/lib' '-I/usr/X11R6/include' '-I%p/include' \
'-L$(QTDIR)/lib' '-L%p/lib' '-L/usr/X11R6/lib' $LIBRESOLV \
-buildkey qt3-jaguar -platform darwin-g++ -xplatform darwin-g++ \
-translationdir '%p/share/qt3/translations' \
-prefix '%p' -bindir '%p/bin' -libdir '%p/lib' -docdir
'%p/share/doc/%n' \
-datadir '%p/share/qt3' -headerdir '%p/include/qt' -plugindir
'%p/lib/qt3-plugins' \
-release -shared -no-exceptions -thread -cups -stl \
-qt-gif -plugin-imgfmt-png -plugin-imgfmt-jpeg -plugin-imgfmt-mng \
-system-libpng -system-libjpeg -system-zlib -largefile \
-sm -xinerama -xrender -xft -xkb \
-plugin-sql-sqlite -no-sql-ibase -no-sql-mysql -no-sql-odbc
-no-sql-psql
/usr/bin/find . -name Makefile -print0 | xargs -0 perl -pi -e
's,-I%p/include/qt,,g'
make symlinks src-qmake src-moc sub-src sub-tools
<<
InstallScript: <<
#!/bin/sh -ex
mkdir -p %i/share/qt3
export QTDIR=`pwd`
export DYLD_LIBRARY_PATH="$QTDIR/lib:/usr/X11R6/lib:$DYLD_LIBRARY_PATH"
export PATH="$QTDIR/bin:$PATH"
perl -pi -e 's,\$\(QTDIR\),%p,g' lib/*.la
install -d -m 0755 %i/bin
install -c -m 0755 bin/* %i/bin/
install -d -m 0755 %i/lib
install -c -m 0755 lib/* %i/lib/
install -d -m 0755 %i/lib/qt3-plugins
/bin/cp -fRL plugins/* %i/lib/qt3-plugins/
ln -sf libeditor.1.0.0.dylib %i/lib/libeditor.1.0.dylib
ln -sf libeditor.1.0.0.dylib %i/lib/libeditor.1.dylib
ln -sf libeditor.1.0.0.dylib %i/lib/libeditor.dylib
ln -sf libqt-mt.%v.dylib %i/lib/libqt-mt.3.3.dylib
ln -sf libqt-mt.%v.dylib %i/lib/libqt-mt.3.dylib
ln -sf libqt-mt.%v.dylib %i/lib/libqt-mt.dylib
ln -sf libqui.1.0.0.dylib %i/lib/libqui.1.0.dylib
ln -sf libqui.1.0.0.dylib %i/lib/libqui.1.dylib
ln -sf libqui.1.0.0.dylib %i/lib/libqui.dylib
install -d -m 0755 %i/lib/pkgconfig
install -c -m 644 %i/lib/qt-mt.pc %i/lib/pkgconfig/
install -d -m 0755 %i/share/man/man1
install -d -m 0755 %i/share/man/man3
install -c -m 644 doc/man/man1/* %i/share/man/man1/
install -c -m 644 doc/man/man3/* %i/share/man/man3/
# clean up the makefiles
make -C tutorial clean
make -C examples clean
perl -pi -e "s,^DEPENDPATH.*,,g;s,^REQUIRES.*,,g" `/usr/bin/find examples
-name "*.pro"`
for a in */*/Makefile ; do
perl -pi -e 's,^SYSCONF_MOC.*,SYSCONF_MOC = %p/bin/moc,' $a
done
# install the includes
for i in include/* include/*/*; do [ -e $i ] || rm -f $i; done
install -d -m 0755 %i/include/qt
/bin/cp -fRL include/* %i/include/qt/
# and now the docs
install -d -m 0755 %i/share/doc/%N/html
install -d -m 0755 %i/share/doc/%N/tutorial
install -d -m 0755 %i/share/doc/%N/examples
/bin/cp -fRL doc/html/* %i/share/doc/%N/html/
/bin/cp -fRL tutorial/* %i/share/doc/%N/tutorial/
/bin/cp -fRL examples/* %i/share/doc/%N/examples/
# the mkspecs
install -d -m 0755 %i/share/%N/mkspecs
/bin/cp -fRL mkspecs/* %i/share/%N/mkspecs/
# qt designer and linguist templates and phrasebooks
install -d -m 0755 %i/share/%N/templates
install -d -m 0755 %i/share/%N/phrasebooks
/bin/cp -fRL tools/designer/templates/* %i/share/%N/templates/
/bin/cp -fRL tools/linguist/phrasebooks/* %i/share/%N/phrasebooks/
install -d -m 0755 %i/share/qt3/translations
install -c -m 644 `find . -name \*.qm` %i/share/qt3/translations/
# kde icon for qt designer
/bin/mkdir -p %i/share/applnk/Development
cat >%i/share/applnk/Development/designer.desktop <<EOF
[Desktop Entry]
BinaryPattern=designer;
Name=Qt Designer
GenericName=Interface Designer
Exec=designer
Icon=designer
InitialPreference=5
MapNotify=true
MimeType=application/x-designer
Terminal=false
Encoding=UTF-8
Type=Application
EOF
cat >%i/share/applnk/Development/linguist.desktop <<EOF
[Desktop Entry]
BinaryPattern=linguist;
Name=Qt Linguist
GenericName=Translation Editor
Exec=linguist
Icon=linguist
InitialPreference=5
MapNotify=true
Terminal=false
Encoding=UTF-8
Type=Application
EOF
# remove extra junk
/bin/rm -rf \
%i/lib/README \
%i/lib/qt3-plugins/src \
%i/lib/*f.prl
/usr/bin/find %i/share/doc/%n -name \*.moc -print0 | xargs -0 rm -rf {}
>/dev/null 2>&1 || :
/usr/bin/find %i/share/doc/%n -name \*.obj -print0 | xargs -0 rm -rf {}
>/dev/null 2>&1 || :
/usr/bin/find %i/share/doc/%n/examples %i/share/doc/%n/tutorial -name Makefile
-print0 | xargs -0 rm -rf >/dev/null 2>&1 || :
/usr/bin/find %i/share/doc/%n -name \*.pro -print0 | xargs -0 perl -pi -e
's,^(CONFIG\s*.*)$,$1 thread,' >/dev/null 2>&1 || :
/usr/bin/find %i -name \*.bak -print0 | xargs -0 rm -rf >/dev/null 2>&1 || :
perl -pi -e 's,\$\(QTDIR\),%p,g' %i/lib/libqt-mt.la
install -d -m 755 %i/share/doc/installed-packages
touch %i/share/doc/installed-packages/%N
touch %i/share/doc/installed-packages/%N-dev
<<
SplitOff: <<
Package: %N-shlibs
RuntimeVars: <<
QTDIR: %p
QMAKESPEC: %p/share/qt3/mkspecs/darwin-g++
<<
Suggests: %N-designer, %N-linguist, %N-doc
Replaces: qt-shlibs, qt, qt3
Conflicts: qt-shlibs, qt
Depends: fink (>= 0.17.1-1), freetype219-shlibs, libgl-shlibs, libpng3-shlibs
(>= 1.2.5-4), libjpeg-shlibs, x11-shlibs
Shlibs: <<
%p/lib/libeditor.1*.dylib 1.0.0 %n (>= 3.3.2-1)
%p/lib/libqt-mt.3*.dylib 3.0.0 %n (>= 3.3.2-1)
%p/lib/libqui.1*.dylib 1.0.0 %n (>= 3.3.2-1)
<<
Files: <<
lib/libqt-mt.*.dylib
lib/libeditor.*.dylib
lib/libqui.*.dylib
lib/qt3-plugins/imageformats
lib/qt3-plugins/sqldrivers/libqsqlite.so
<<
<<
SplitOff2: <<
Package: %N-designer
Depends: %N-shlibs (>= %v-%r), libjpeg-shlibs, libpng3-shlibs (>= 1.2.5-4),
x11
Replaces: %N-bin, qt2
Conflicts: qt2
Files: <<
bin/designer
lib/libdesigner*
lib/qt3-plugins/designer
share/applnk/Development/designer.desktop
share/qt3/templates
<<
<<
SplitOff3: <<
Package: %N-linguist
Depends: %N-shlibs (>= %v-%r), libjpeg-shlibs, libpng3-shlibs (>= 1.2.5-4),
x11
Replaces: %N-bin, qt2
Conflicts: qt2
Files: <<
bin/l*
bin/qm2ts
share/qt3/phrasebooks
share/man/man1/lrelease.1
share/man/man1/lupdate.1
share/applnk/Development/linguist.desktop
<<
<<
SplitOff4: <<
Package: %N-dev
Depends: %N (>= %v-%r), %N-shlibs (>= %v-%r), libjpeg-shlibs, libpng3-shlibs
(>= 1.2.5-4), x11
Files: share/doc/installed-packages/%n
<<
SplitOff5: <<
Package: %N-doc
Replaces: qt-doc, qt2, qt, qt3
Conflicts: qt-doc, qt2, qt
Files: share/doc/%N
<<
PreInstScript: <<
rm -rf %p/share/qt3/mkspecs/default
<<
DocFiles: FAQ INSTALL LICENSE* MANIFEST PLATFORMS README*
License: GPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Homepage: http://www.trolltech.com/
--- NEW FILE: kaptain.info ---
Package: kaptain
Version: 0.72
Revision: 111
GCC: 3.3
Source: mirror:sourceforge:kaptain/%n-%v.tar.gz
Source-MD5: 2a3a9d6acaa74a517a088a3aba1b9696
BuildDepends: qt3 (>= 3.2.1-11), libjpeg, libpng3
Depends: qt3-shlibs (>= 3.2.1-11), libjpeg-shlibs, libpng3-shlibs
DocFiles: README ChangeLog AUTHORS INSTALL COPYING
#InfoDocs: kaptain.info
#SetCPPFlags: -Dsocklen_t=int
ConfigureParams: --infodir=%p/share/info --enable-mt
--with-extra-includes=%p/include --with-extra-libs=%p/lib --with-qt-dir=%p
--with-qt-includes=%p/include/qt --with-qt-libraries=%p/share/qt3
CompileScript: <<
./configure %c
make
<<
InstallScript: <<
make install DESTDIR=%d
mkdir -p %i/share
mv %i/man %i/share
rm %i/share/info/kaptain.info
<<
License: GPL
Description: <<
Universal graphical front-end
<<
DescDetail: <<
Kaptain is a universal graphical front-end for command line programs,
and it works wherever Qt3 is available. Someone writes a simple script
(so called grammar) which describes the possible arguments for a
command line program and Kaptain brings up a friendly dialog to
the user to set up the command line. Example grammars can be
found in /sw/share/kaptain/.
<<
DescPackaging: <<
infodoc removed due to bug in file.
<<
Maintainer: Koen van der Drift <[EMAIL PROTECTED]>
Homepage: http://kaptain.sourceforge.net
--- NEW FILE: qt3.patch ---
diff -uNr qt-x11-free-3.3.4/Makefile qt-x11-free-3.3.4-new/Makefile
--- qt-x11-free-3.3.4/Makefile 2005-01-03 11:08:00.000000000 -0500
+++ qt-x11-free-3.3.4-new/Makefile 2005-04-25 17:23:45.000000000 -0400
@@ -11,7 +11,7 @@
install: FORCE
@$(MAKE) qt.install
-all: symlinks src-qmake src-moc sub-src sub-tools sub-tutorial sub-examples
+all: symlinks src-qmake src-moc 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 -uNr qt-x11-free-3.3.4/configure qt-x11-free-3.3.4-new/configure
--- qt-x11-free-3.3.4/configure 2004-10-18 13:17:00.000000000 -0400
+++ qt-x11-free-3.3.4-new/configure 2005-04-25 17:23:45.000000000 -0400
@@ -1046,8 +1046,8 @@
[ -z "$QT_INSTALL_DATA" ] && QT_INSTALL_DATA=$QT_INSTALL_PREFIX
# default PREFIX/translations
[ -z "$QT_INSTALL_TRANSLATIONS" ] &&
QT_INSTALL_TRANSLATIONS=$QT_INSTALL_PREFIX/translations
[...2557 lines suppressed...]
--- qt-x11-free-3.3.4/tools/linguist/qm2ts/qm2ts.pro 2003-10-31
09:36:28.000000000 -0500
+++ qt-x11-free-3.3.4-new/tools/linguist/qm2ts/qm2ts.pro 2005-04-25
17:23:47.000000000 -0400
@@ -13,3 +13,6 @@
target.path=$$bins.path
INSTALLS += target
+
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
diff -uNr qt-x11-free-3.3.4/tools/qtconfig/qtconfig.pro
qt-x11-free-3.3.4-new/tools/qtconfig/qtconfig.pro
--- qt-x11-free-3.3.4/tools/qtconfig/qtconfig.pro 2004-06-08
04:08:54.000000000 -0400
+++ qt-x11-free-3.3.4-new/tools/qtconfig/qtconfig.pro 2005-04-25
17:23:47.000000000 -0400
@@ -15,4 +15,7 @@
INSTALLS += target
INCLUDEPATH += .
DBFILE = qtconfig.db
+
+CFLAGS += -mdynamic-no-pic
+CXXFLAGS += -mdynamic-no-pic
REQUIRES=full-config nocrosscompiler
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
