From 75a4a592e5ccda30715f93563d741b83e0dcf39e Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 25 Apr 2011 13:37:00 +0000 Subject: Slackware 13.37 Mon Apr 25 13:37:00 UTC 2011 Slackware 13.37 x86_64 stable is released! Thanks to everyone who pitched in on this release: the Slackware team, the folks producing upstream code, and linuxquestions.org for providing a great forum for collaboration and testing. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. As always, thanks to the Slackware community for testing, suggestions, and feedback. :-) Have fun! --- extra/source/kde3-compat/qt3/doinst.sh | 9 -- extra/source/kde3-compat/qt3/profile.d/qt.csh | 22 --- extra/source/kde3-compat/qt3/profile.d/qt.sh | 23 --- extra/source/kde3-compat/qt3/qt-x11.diff | 11 -- extra/source/kde3-compat/qt3/qt.mysql.h.diff | 11 -- extra/source/kde3-compat/qt3/qt.x86.cflags.diff | 11 -- extra/source/kde3-compat/qt3/qt3.SlackBuild | 192 ------------------------ extra/source/kde3-compat/qt3/slack-desc | 19 --- 8 files changed, 298 deletions(-) delete mode 100644 extra/source/kde3-compat/qt3/doinst.sh delete mode 100755 extra/source/kde3-compat/qt3/profile.d/qt.csh delete mode 100755 extra/source/kde3-compat/qt3/profile.d/qt.sh delete mode 100644 extra/source/kde3-compat/qt3/qt-x11.diff delete mode 100644 extra/source/kde3-compat/qt3/qt.mysql.h.diff delete mode 100644 extra/source/kde3-compat/qt3/qt.x86.cflags.diff delete mode 100755 extra/source/kde3-compat/qt3/qt3.SlackBuild delete mode 100644 extra/source/kde3-compat/qt3/slack-desc (limited to 'extra/source/kde3-compat/qt3') diff --git a/extra/source/kde3-compat/qt3/doinst.sh b/extra/source/kde3-compat/qt3/doinst.sh deleted file mode 100644 index d57fb0319..000000000 --- a/extra/source/kde3-compat/qt3/doinst.sh +++ /dev/null @@ -1,9 +0,0 @@ -## This was causing problems compiling KDE for unknown reasons. -## So, we'll symlink the libraries into /opt/kde3 again... -# Add QT library directory to /etc/ld.so.conf: -if ! grep /opt/kde3/lib etc/ld.so.conf 1> /dev/null 2> /dev/null ; then - echo "/opt/kde3/lib" >> etc/ld.so.conf -fi -if [ -x /sbin/ldconfig ]; then - /sbin/ldconfig 2> /dev/null -fi diff --git a/extra/source/kde3-compat/qt3/profile.d/qt.csh b/extra/source/kde3-compat/qt3/profile.d/qt.csh deleted file mode 100755 index 490877c4f..000000000 --- a/extra/source/kde3-compat/qt3/profile.d/qt.csh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/csh -# Environment path variables for the Qt package: -if ( ! $?QTDIR ) then - # It's best to use the generic directory to avoid - # compiling in a version-containing path: - if ( -d /opt/kde3/lib/qt3 ) then - setenv QTDIR /opt/kde3/lib/qt3 - else - # Find the newest Qt directory and set $QTDIR to that: - foreach qtd ( /opt/kde3/lib/qt-* ) - if ( -d $qtd ) then - setenv QTDIR $qtd - endif - end - endif -endif -set path = ( $path $QTDIR/bin /opt/kde3/bin ) -if ( $?CPLUS_INCLUDE_PATH ) then - setenv CPLUS_INCLUDE_PATH $QTDIR/include:$CPLUS_INCLUDE_PATH -else - setenv CPLUS_INCLUDE_PATH $QTDIR/include -endif diff --git a/extra/source/kde3-compat/qt3/profile.d/qt.sh b/extra/source/kde3-compat/qt3/profile.d/qt.sh deleted file mode 100755 index c4e23bb59..000000000 --- a/extra/source/kde3-compat/qt3/profile.d/qt.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# Environment variables for the Qt package. -# -# It's best to use the generic directory to avoid -# compiling in a version-containing path: -if [ -d /opt/kde3/lib/qt3 ]; then - QTDIR=/opt/kde3/lib/qt3 -else - # Find the newest Qt directory and set $QTDIR to that: - for qtd in /opt/kde3/lib/qt-* ; do - if [ -d $qtd ]; then - QTDIR=$qtd - fi - done -fi -if [ ! "$CPLUS_INCLUDE_PATH" = "" ]; then - CPLUS_INCLUDE_PATH=$QTDIR/include:$CPLUS_INCLUDE_PATH -else - CPLUS_INCLUDE_PATH=$QTDIR/include -fi -PATH="$PATH:$QTDIR/bin:/opt/kde3/bin" -export QTDIR -export CPLUS_INCLUDE_PATH diff --git a/extra/source/kde3-compat/qt3/qt-x11.diff b/extra/source/kde3-compat/qt3/qt-x11.diff deleted file mode 100644 index 74453f21f..000000000 --- a/extra/source/kde3-compat/qt3/qt-x11.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/kernel/qgif.h.orig Tue Mar 19 02:31:42 2002 -+++ ./src/kernel/qgif.h Sun Mar 24 22:14:19 2002 -@@ -47,7 +47,7 @@ - #endif // QT_H - - #ifndef QT_BUILTIN_GIF_READER --#define QT_BUILTIN_GIF_READER 0 -+#define QT_BUILTIN_GIF_READER 1 - #endif - - bool qt_builtin_gif_reader(); diff --git a/extra/source/kde3-compat/qt3/qt.mysql.h.diff b/extra/source/kde3-compat/qt3/qt.mysql.h.diff deleted file mode 100644 index 2d6fca5ac..000000000 --- a/extra/source/kde3-compat/qt3/qt.mysql.h.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/sql/drivers/mysql/qsql_mysql.h.orig 2002-04-15 03:05:53.000000000 -0700 -+++ ./src/sql/drivers/mysql/qsql_mysql.h 2002-10-14 14:59:36.000000000 -0700 -@@ -46,7 +46,7 @@ - #include - #endif - --#include -+#include - - #ifdef QT_PLUGIN - #define Q_EXPORT_SQLDRIVER_MYSQL diff --git a/extra/source/kde3-compat/qt3/qt.x86.cflags.diff b/extra/source/kde3-compat/qt3/qt.x86.cflags.diff deleted file mode 100644 index 880037c23..000000000 --- a/extra/source/kde3-compat/qt3/qt.x86.cflags.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./mkspecs/linux-g++/qmake.conf.orig Fri Apr 26 00:48:00 2002 -+++ ./mkspecs/linux-g++/qmake.conf Tue May 7 12:05:04 2002 -@@ -18,7 +18,7 @@ - QMAKE_CFLAGS_DEPS = -M - QMAKE_CFLAGS_WARN_ON = -Wall -W - QMAKE_CFLAGS_WARN_OFF = -w --QMAKE_CFLAGS_RELEASE = -O2 -+QMAKE_CFLAGS_RELEASE = -O2 -march=i486 -mtune=i686 - QMAKE_CFLAGS_DEBUG = -g - QMAKE_CFLAGS_SHLIB = -fPIC - QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses diff --git a/extra/source/kde3-compat/qt3/qt3.SlackBuild b/extra/source/kde3-compat/qt3/qt3.SlackBuild deleted file mode 100755 index d32d283ea..000000000 --- a/extra/source/kde3-compat/qt3/qt3.SlackBuild +++ /dev/null @@ -1,192 +0,0 @@ -#!/bin/sh -# Copyright 2006, 2007, 2008 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Build with NODEVEL= after building the other deps to get rid of -# the .so, include, and other files not needed for runtime. - -PKGNAM=qt3 -VERSION=${VERSION:-3.3.8b} -ARCH=${ARCH:-x86_64} -NUMJOBS=${NUMJOBS:-" -j7 "} -BUILD=${BUILD:-opt2} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-${PKGNAM} -rm -rf $PKG -mkdir -p $TMP $PKG - -# Don't build a devel package (but put a devel SYSTEM on this machine...) -NODEVEL=true - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -fi - -#cd $TMP -# I have *many* times tried building this package in /tmp, and it always -# ends up with a "/tmp" directory embedded in some wrong place. Hopefully -# the next time I see this comment I'll remember that and not make the -# same mistake again just for the sake of doing things "right" (but having -# the package come out wrong...) -#rm -rf ${PKGNAM}-${VERSION} -mkdir -p /opt/kde3/lib${LIBDIRSUFFIX} -cd /opt/kde3/lib${LIBDIRSUFFIX} -rm -rf qt-3* qt3 qt-3.* qt3-* -tar xvf $CWD/qt-x11-free-$VERSION.tar.bz2 || exit 1 -mv qt-x11-free-$VERSION qt3 -cd qt3 - -if [ $ARCH = "i486" ]; then - zcat $CWD/qt.x86.cflags.diff.gz | patch -p1 || exit 1 -fi - -zcat $CWD/qt-x11.diff.gz | patch -p1 || exit 1 -zcat $CWD/qt.mysql.h.diff.gz | patch -p1 || exit 1 - -# Make sure ownerships and permissions are sane: -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -QTDIR=/opt/kde3/lib${LIBDIRSUFFIX}/qt3 - -# And here's what we are currently using. The "yes" agrees to the GPL, so don't run this script if you -# don't agree. :-) -echo "yes" | CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" ./configure \ - -prefix /opt/kde3/lib${LIBDIRSUFFIX}/qt3-${VERSION} \ - -release \ - -system-zlib \ - -system-libpng \ - -qt-imgfmt-png \ - -system-libmng \ - -qt-imgfmt-mng \ - -system-libjpeg \ - -qt-imgfmt-jpeg \ - -qt-gif \ - -thread \ - -stl \ - -no-g++-exceptions \ - -xft \ - -plugin-sql-mysql \ - -plugin-style-cde \ - -plugin-style-compact \ - -qt-style-motif \ - -plugin-style-motifplus \ - -plugin-style-platinum \ - -plugin-style-sgi \ - -plugin-style-windows \ - -enable-opengl - -# We're using '-i' to work around a bug where the build tries to strip html files. -# Build the important stuff: -make $NUMJOBS -i -make install || exit 1 -make $NUMJOBS -i symlinks sub-src sub-tools -make install || exit 1 -make install INSTALL_ROOT=$PKG || exit 1 -# Link the shared libraries into /opt/kde3/lib. -( cd /opt/kde3/lib${LIBDIRSUFFIX} - for file in qt3/lib/*.so* ; do - ln -sf $file . - done -) - -# Leave these out so as not to interfere with Qt4: -if [ -z "$NODEVEL" ]; then - # Add man pages: - mkdir -p $PKG/usr/man - cp -a doc/man/* $PKG/usr/man - find $PKG/usr/man -type f -exec gzip -9 "{}" \; -fi - -if [ $ARCH = "i486" ]; then - # Put this back as shipped: - ( cd $PKG/opt/kde3/lib/qt3-${VERSION} - zcat $CWD/qt.x86.cflags.diff.gz | patch -p1 -R ) -fi - -mkdir -p $PKG/etc/profile.d -cat $CWD/profile.d/qt.sh | sed -e "s#/lib#/lib${LIBDIRSUFFIX}#" \ - > $PKG/etc/profile.d/qt.sh -cat $CWD/profile.d/qt.csh | sed -e "s#/lib#/lib${LIBDIRSUFFIX}#" \ - > $PKG/etc/profile.d/qt.csh -chmod 755 $PKG/etc/profile.d/* - -# Strip binaries: -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -# Put a ton of links to more "normal" places. I'd just use a prefix of /usr, but it -# creates a ton of new (and ambiguously named) /usr directories... - -mkdir -p $PKG/opt/kde3/bin -( cd $PKG/opt/kde3/bin - for file in assistant designer linguist lrelease lupdate moc qm2ts qmake qtconfig uic ; do - ln -sf /opt/kde3/lib${LIBDIRSUFFIX}/qt3/bin/$file . - done -) - -sed -i -e "s#/lib\$#/lib${LIBDIRSUFFIX}#" \ - $PKG/opt/kde3/lib${LIBDIRSUFFIX}/qt3-$VERSION/lib/pkgconfig/qt-mt.pc || exit 1 -mkdir -p $PKG/opt/kde3/lib${LIBDIRSUFFIX}/pkgconfig -( cd $PKG/opt/kde3/lib${LIBDIRSUFFIX}/pkgconfig - ln -sf /opt/kde3/lib${LIBDIRSUFFIX}/qt3/lib/pkgconfig/qt-mt.pc . -) - -# Add a documentation directory: -mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION -cp -a \ - FAQ INSTALL LICENSE.GPL* LICENSE.QPL MANIFEST PLATFORMS README* changes* \ - $PKG/usr/doc/${PKGNAM}-$VERSION - -# Put the actual file tree in /opt/kde3/lib/qt3: -mv $PKG/opt/kde3/lib${LIBDIRSUFFIX}/qt3-${VERSION} $PKG/opt/kde3/lib${LIBDIRSUFFIX}/qt3 -( cd $PKG/opt/kde3/lib${LIBDIRSUFFIX} ; ln -sf qt3 qt3-${VERSION}) - -( cd $PKG/opt/kde3/lib${LIBDIRSUFFIX} - for file in qt3/lib/*.so* ; do - ln -sf $file . - done -) - -# This much documentation isn't needed for the compat qt3 package -- look in the -# source if you need it. -rm -rf $PKG/opt/kde3/lib${LIBDIRSUFFIX}/qt3/doc - -mkdir -p $PKG/install -zcat $CWD/doinst.sh.gz | sed -e "s#/lib#/lib${LIBDIRSUFFIX}#" \ - > $PKG/install/doinst.sh -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz - diff --git a/extra/source/kde3-compat/qt3/slack-desc b/extra/source/kde3-compat/qt3/slack-desc deleted file mode 100644 index dc7ea57e6..000000000 --- a/extra/source/kde3-compat/qt3/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -qt3: Qt3 (a multi-platform C++ graphical user interface toolkit, version 3) -qt3: -qt3: Qt is a complete and well-developed object-oriented framework for -qt3: developing graphical user interface (GUI) applications using C++. -qt3: -qt3: This release is free only for development of free software for the X -qt3: Window System. If you use Qt for developing commercial or other -qt3: non-free software, you must have a professional license. Please see -qt3: http://www.trolltech.com/purchase.html for information on how to -qt3: obtain a professional license. -qt3: -- cgit v1.2.3-65-gdbad