Timothy Pearson 13 years ago
commit 19bc61f5b7

@ -0,0 +1,80 @@
# $Id$
# Maintainer: David C. Rankin <drankinatty@gmail.com>
#
# All modifications and uses of this file are licensed under
# the software for which this file was made for, should the software
# be under an Open Source License, at least version 1.9, defined
# by the Open Source Initiative. In other cases, this file is automatically
# released to the Public Domain.
#
pkgname=trinity-arts
pkgver=3513
pkgrel=1
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL')
groups=('trinity-base')
pkgdesc="Trinity - arts"
depends=('audiofile'
'alsa-lib'
'libmad'
'libvorbis'
'trinity-tqtinterface')
makedepends=('pkgconfig' 'cmake' 'autoconf')
provides=('trinity-arts')
conflicts=('trinity-arts')
replaces=('trinity-arts')
options=('libtool' '!strip')
source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/arts-3.5.13.tar.gz)
md5sums=('109124dabb1aaa9d44eb32e43b549142')
# set Qt location (not needed if profile.d/q3.sh present, set prefix (not used)
_qtdir=/opt/qt
_prefix=${_qtdir}
build() {
msg "Setting PATH, CMAKE and Trinity Environment variables"
if [[ -r /etc/profile.d/qt3.sh ]]; then
. /etc/profile.d/qt3.sh
[[ -n $QTDIR ]] && _qtdir=$QTDIR
else
[[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
fi
# exports not required with /opt/qt/include in the right place
# export CMAKE_PREFIX_PATH=$QTDIR
# export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt
trinity_prefix="/opt/trinity"
cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p build
cd build
msg "Starting cmake..."
cmake ${srcdir}/dependencies/arts/ \
-DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
-DQT_VERSION=3 || return 1
# -DQT_VERSION=3 \
# -DWITH_QT3=ON \
# -DQT_LIBRARY_DIRS=/opt/qt/lib
make VERBOSE=1
}
package() {
msg "Packaging - $pkgname-$pkgver"
# cd ${srcdir}/${_svnmod}
cd ${srcdir}/build
make DESTDIR="$pkgdir/" install
# rm -r ${srcdir}/${_svnmod}
}

@ -0,0 +1,31 @@
# $Id$
# Maintainer: David C. Rankin <drankinatty@gmail.com>
pkgname=trinity-dbus-1-qt3
pkgver=0.9
pkgrel=8
arch=('i686' 'x86_64')
pkgdesc="DBUS/Qt3 bindings."
url="http://www.freedesktop.org/wiki/Software/DBusBindings"
license=('GPL')
groups=('trinity-base')
pkgdesc="Trinity - dbus-1-qt3"
depends=('dbus' 'trinity-qt3' 'networkmanager')
provides=('trinity-dbus-1-qt3' 'dbus-1-qt3')
conflicts=('dbus-1-qt3')
replaces=('dbus-1-qt3')
options=('libtool' '!strip')
source=(http://people.freedesktop.org/~krake/dbus-1-qt3/${pkgname#*trinity-}-${pkgver}.tar.gz)
md5sums=('8ca3d13c372126aa9b0e16beb0a9d82d')
build() {
cd $srcdir/${pkgname#*trinity-}-$pkgver
. /etc/profile.d/qt3.sh
./configure --prefix=$QTDIR
make || return 1
make DESTDIR="$pkgdir/" install
# Libtool slay
# find $startdir/pkg -name *.la -exec rm {} \;
}

@ -0,0 +1,61 @@
pkgname=trinity-dbus-tqt-1
pkgver=3513
pkgrel=1
arch=('i686' 'x86_64')
url='http://www.trinitydesktop.org'
license=('GPL')
groups=('trinity-base')
pkgdesc="Trinity - kdebase"
depends=('trinity-tqtinterface')
makedepends=('pkgconfig' 'cmake')
options=('libtool' '!strip')
source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/dbus-1-tqt-3.5.13.tar.gz)
md5sums=('a7ba1071f4bf7b5930f805b4036f8a97')
_svnmod=dependencies/dbus-1-tqt
_qtdir=/opt/qt
_prefix="/opt/trinity"
build() {
msg "Setting PATH, CMAKE and Trinity Environment variables"
if [[ -r /etc/profile.d/qt3.sh ]]; then
. /etc/profile.d/qt3.sh
[[ -n $QTDIR ]] && _qtdir=$QTDIR
else
[[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
fi
export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:\
/usr/include/dbus-1.0:\
/opt/trinity/include:\
/opt/trinity/include/libkrandr
export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p build
cd build
msg "Starting cmake..."
cmake ${srcdir}/${_svnmod} \
-DCMAKE_INSTALL_PREFIX=${_prefix} \
-DCMAKE_VERBOSE_MAKEFILE=ON
make
# -DWITH_QT3=ON \
# -DQTDIR=/opt/qt \
# -DQT_LIBRARY_DIRS=/opt/qt/lib \
}
package() {
msg "Packaging - $pkgname-$pkgver"
# cd ${srcdir}/${_svnmod}
cd ${srcdir}/build
make DESTDIR="$pkgdir/" install
cd ${startdir}
}

@ -0,0 +1,65 @@
pkgname=trinity-dbus-tqt
pkgver=3513
pkgrel=1
arch=('i686' 'x86_64')
url='http://www.trinitydesktop.org'
license=('GPL')
groups=('trinity')
pkgdesc="Trinity - kdebase"
depends=('trinity-tqtinterface')
makedepends=('pkgconfig' 'cmake')
provides=('trinity-dbus-tqt')
conflicts=('trinity-dbus-tqt')
replaces=('trinity-dbus-tqt')
options=('libtool' '!strip')
source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/dbus-tqt-3.5.13.tar.gz)
md5sums=('46ae165c068271485c827f6fc6687a9a')
_svnmod=dependencies/dbus-tqt
_qtdir=/opt/qt
_prefix="/opt/trinity"
build() {
msg "Setting PATH, CMAKE and Trinity Environment variables"
if [[ -r /etc/profile.d/qt3.sh ]]; then
. /etc/profile.d/qt3.sh
[[ -n $QTDIR ]] && _qtdir=$QTDIR
else
[[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
fi
export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:\
/usr/include/dbus-1.0:\
/opt/trinity/include:\
/opt/trinity/include/libkrandr
export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p build
cd build
msg "Starting cmake..."
cmake ${srcdir}/${_svnmod} \
-DCMAKE_INSTALL_PREFIX=${_prefix} \
-DCMAKE_VERBOSE_MAKEFILE=ON
make
# -DWITH_QT3=ON \
# -DQTDIR=/opt/qt \
# -DQT_LIBRARY_DIRS=/opt/qt/lib \
}
package() {
msg "Packaging - $pkgname-$pkgver"
# cd ${srcdir}/${_svnmod}
cd ${srcdir}/build
make DESTDIR="$pkgdir/" install
cd ${startdir}
}

@ -0,0 +1,131 @@
# $Id$
# Maintainer: David C. Rankin <drankinatty@gmail.com>
#
# All modifications and uses of this file are licensed under
# the software for which this file was made for, should the software
# be under an Open Source License, at least version 1.9, defined
# by the Open Source Initiative. In other cases, this file is automatically
# released to the Public Domain.
#
pkgname=trinity-kdebase
pkgver=3513
pkgrel=1
arch=('i686' 'x86_64')
url='http://www.trinitydesktop.org'
license=('GPL')
groups=('trinity-base')
pkgdesc="Trinity - kdebase"
depends=('hal' 'trinity-dbus-1-qt3' 'trinity-arts' 'trinity-qt3' 'trinity-pyqt3' 'trinity-dbus-tqt-1' 'trinity-dbus-tqt' 'trinity-kdelibs')
makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf')
optdepends=('desktop-file-utils: Command line utilities for working with desktop entries'
'pciutils: PCI bus configuration space access library and tools'
'xscreensaver: Screen saver and locker for the X Window System')
options=('libtool' '!strip')
source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' 'dbusfix.diff')
md5sums=('d1f7e1f94eeb46b981fe1ba144179840'
'c9ce810c281002440a6de8cfd8735d07')
_qtdir=/opt/qt
_prefix="/opt/trinity"
_tdesktop() {
# create/install desktop
install -d -m755 ${pkgdir}/etc/X11/sessions
echo '[Desktop Entry]' > ${pkgdir}/etc/X11/sessions/trinity.desktop
echo 'Encoding=UTF-8' >> ${pkgdir}/etc/X11/sessions/trinity.desktop
echo 'Type=XSession' >> ${pkgdir}/etc/X11/sessions/trinity.desktop
echo "Exec=${_prefix}/bin/startkde" >> ${pkgdir}/etc/X11/sessions/trinity.desktop
echo "TryExec=${_prefix}/bin/startkde" >> ${pkgdir}/etc/X11/sessions/trinity.desktop
echo 'Name=Trinity' >> ${pkgdir}/etc/X11/sessions/trinity.desktop
echo 'Comment=The Trinity Desktop Environment. A powerful Open Source graphical desktop environment' >> ${pkgdir}/etc/X11/sessions/trinity.desktop
chmod 0755 ${pkgdir}/etc/X11/sessions/trinity.desktop
}
build() {
msg "Setting PATH, CMAKE and Trinity Environment variables"
if [[ -r /etc/profile.d/qt3.sh ]]; then
. /etc/profile.d/qt3.sh
[[ -n $QTDIR ]] && _qtdir=$QTDIR
else
[[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
fi
export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
export CMAKE_INCLUDE_PATH=/opt/trinity/include/dbus-1-tqt/:/opt/trinity/include/dbus-1.0/:/opt/trinity/include:/opt/trinity/include/libkrandr
export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:/opt/qt/lib:$LD_LIBRARY_PATH
export PKG_CONFIG_PATH=/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig:$PKG_CONFIG_PATH
echo $PKG_CONFIG_PATH
patch -N ${srcdir}/kdebase/kioslave/media/mediamanager/halbackend.h < ${srcdir}/dbusfix.diff
cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p build
cd build
msg "Starting cmake..."
cmake ${srcdir}/kdebase --debug-output \
-DCMAKE_INSTALL_PREFIX=${_prefix} \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DQT_VERSION=3 \
-DSYSCONF_INSTALL_DIR=/etc \
-DWITH_XFIXES=ON \
-DWITH_HAL=ON \
-DWITH_ARTS=ON \
-DWITH_SASL=ON \
-DWITH_OPENEXR=ON \
-DWITH_XCOMPOSITE=ON \
-DWITH_XCURSOR=ON \
-DWITH_XRANDR=ON \
-DWITH_XRENDER=ON \
-DWITH_XDAMAGE=ON \
-DWITH_SHADOW=ON \
-DWITH_XDMCP=ON \
-DWITH_XINERAMA=ON \
-DWITH_XEXT=ON \
-DWITH_PAM=ON \
-DBUILD_ALL=ON \
-DCMAKE_INCLUDE_DIR=/opt/trinity/include/dbus-1.0:/opt/qt/include/tqt:/opt/trinity/include/dbus-1.0
make
# -DWITH_QT3=ON \
# -DQTDIR=/opt/qt \
# -DQT_LIBRARY_DIRS=/opt/qt/lib \
}
package() {
msg "Packaging - $pkgname-$pkgver"
# cd ${srcdir}/${_svnmod}
cd ${srcdir}/build
make DESTDIR="$pkgdir/" install
cd ${startdir}
# install desktop and update kdmrc and Xsession
# [[ -f trinity.desktop ]] && {
# install -d -m755 ${pkgdir}/etc/X11/sessions
# install -m644 trinity.desktop ${pkgdir}/etc/X11/sessions
# }
_tdesktop
[[ -f ${pkgdir}/etc/X11/sessions/trinity.desktop ]] || msg "ERROR - Install Failure: ${pkgdir}/etc/X11/sessions/trinity.desktop"
# set kdm directory
_kdmdir=${_prefix}/share/config/kdm
[[ -d ${pkgdir}/${_kdmdir} ]] || install -d -m755 ${pkgdir}/${_kdmdir}
# install kdmrc
[[ -f kdmrc ]] && install -m644 kdmrc ${pkgdir}/${_kdmdir}
# update the Xsession file
[[ -f Xsession ]] && install -m755 Xsession ${pkgdir}/${_kdmdir}
# create the starttrinity link
[[ -d ${pkgdir}/usr/bin ]] || mkdir -p ${pkgdir}/usr/bin
cd ${pkgdir}/usr/bin
ln -sf /opt/trinity/bin/startkde starttrinity
cd ${startdir}
# rm -r ${srcdir}/${_svnmod}
}

@ -0,0 +1,11 @@
--- halbackend.h 2010-08-12 18:37:24.000000000 -0400
+++ halbackend.h~ 2011-11-03 22:15:02.002228291 -0400
@@ -40,7 +40,7 @@
/* We acknowledge the the dbus API is unstable */
#define DBUS_API_SUBJECT_TO_CHANGE
/* DBus-Qt bindings */
-#include <dbus/connection.h>
+#include "/opt/trinity/include/dbus-1.0/dbus/connection.h"
/* HAL libraries */
#include <libhal.h>
#include <libhal-storage.h>

@ -0,0 +1,8 @@
[Desktop Entry]
Encoding=UTF-8
Type=XSession
Exec=/opt/trinity/bin/startkde
TryExec=/opt/trinity/bin/startkde
Name=Trinity
Comment=The Trinity Desktop Environment. A powerful Open Source graphical desktop environment

@ -0,0 +1,81 @@
# $Id$
# Maintainer: David C. Rankin <drankinatty@gmail.com>
#
# All modifications and uses of this file are licensed under
# the software for which this file was made for, should the software
# be under an Open Source License, at least version 1.9, defined
# by the Open Source Initiative. In other cases, this file is automatically
# released to the Public Domain.
#
pkgname=trinity-kdelibs
pkgver=3513
pkgrel=1
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL')
groups=('trinity-base')
pkgdesc="Trinity - kdelibs"
depends=('libical'
'libxslt'
'avahi'
'pam-krb5'
'taglib'
'trinity-arts')
makedepends=('pkgconfig' 'cmake' 'autoconf' )
provides=('trinity-kdelibs' 'kdelibs3')
conflicts=('trinity-kdelibs' 'kdelibs3')
replaces=('trinity-kdelibs')
options=('libtool' '!strip' '!makeflags')
source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdelibs-3.5.13.tar.gz)
md5sums=('f62eefb63b4ba2141b4c576f859806dd')
qtdir=/opt/qt
trinity_prefix="/opt/trinity"
build() {
msg "Setting PATH, CMAKE and Trinity Environment variables"
if [[ -r /etc/profile.d/qt3.sh ]]; then
. /etc/profile.d/qt3.sh
[[ -n $QTDIR ]] && _qtdir=$QTDIR
else
[[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
fi
export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/bin
export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/qt/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p build
cd build
msg "Starting cmake..."
cmake ${srcdir}/kdelibs \
-DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
-DCMAKE_VERBOSE_MAKEFILE=OFF \
-DQT_VERSION=3 \
-DWITH_QT3=ON \
-DQTDIR=/opt/qt \
-DQT_LIBRARY_DIRS=/opt/qt/lib \
-DWITH_PAM=ON \
-DBUILD_ALL=ON
make
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
make DESTDIR="$pkgdir/" install
install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
echo "${trinity_prefix}/lib" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
install -d -m755 ${pkgdir}/etc/profile.d/
install -m644 ${startdir}/trinity.sh ${pkgdir}/etc/profile.d/
# rm -r ${srcdir}/${_svnmod}
}

@ -0,0 +1,11 @@
post_install() {
ldconfig &> /dev/null
}
post_upgrade() {
post_install
}
post_remove() {
post_install
}

@ -0,0 +1,14 @@
export KDEDIR=/opt/trinity
export KDEDIRS=$KDEDIR:/usr
export PATH=$KDEDIR/bin:$PATH
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$KDEDIR/lib/pkgconfig
if [ ! -z $XDG_DATA_DIRS ]; then
export XDG_DATA_DIRS=$XDG_DATA_DIRS:$KDEDIR/share
else
export XDG_DATA_DIRS=$KDEDIR/share
fi
if [ ! -z $XDG_CONFIG_DIRS ]; then
export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:$KDEDIR/etc/xdg
else
export XDG_CONFIG_DIRS=$KDEDIR/etc/xdg
fi

@ -0,0 +1,41 @@
# $Id$
# Maintainer: David C. Rankin <drankinatty@gmail.com>
#
# All modifications and uses of this file are licensed under
# the software for which this file was made for, should the software
# be under an Open Source License, at least version 1.9, defined
# by the Open Source Initiative. In other cases, this file is automatically
# released to the Public Domain.
#
pkgname=trinity-pyqt3
pkgver=3.18.1
pkgrel=1
pkgdesc="A set of Python bindings for the Qt3 toolkit"
arch=('i686' 'x86_64')
url="http://www.riverbankcomputing.com/software/pyqt/intro"
groups=('trinity-base')
depends=('python2-sip' 'qscintilla-qt3' 'trinity-qt3')
license=('GPL')
provides=('trinity-pyqt3' 'pyqt3')
conflicts=('pyqt3')
replaces=('trinity-pyqt3')
source=("http://www.riverbankcomputing.com/static/Downloads/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz")
md5sums=('f1d120495d1aaf393819e988c0a7bb7e')
build() {
cd ${srcdir}/PyQt-x11-gpl-${pkgver}
. /etc/profile.d/qt3.sh
export QMAKESPEC="/opt/qt/mkspecs/default"
echo yes | python2.7 configure.py -q /opt/qt/
make
}
package() {
cd ${srcdir}/PyQt-x11-gpl-${pkgver}
make DESTDIR=${pkgdir} install
}

@ -1,6 +1,6 @@
# Maintainer: Calvin Morrison <MutantTurkey@gmail.com>
pkgname=trinity-qt3
pkgver=20110919
pkgver=3884
pkgrel=1
pkgdesc="The Qt3 gui toolkit - with Trinity upstream"
_prefix="/opt/qt"
@ -8,7 +8,7 @@ arch=('i686' 'x86_64')
license=('GPL')
url="http://trinitydesktop.org"
# install=qt.install
groups=('trinity')
groups=('trinity-base')
depends=('libjpeg-turbo' 'libmng' 'libmysqlclient' 'libpng' 'libxmu' 'libxcursor' 'libxinerama' 'libxft' 'libxrandr' 'mesa' 'postgresql-libs' 'unixodbc')
makedepends=('cups' 'libxi' 'mysql' 'postgresql' 'unixodbc' 'sqlite3')
optdepends=()
@ -16,30 +16,13 @@ optdepends=()
provides=('trinity-qt3' 'qt3')
conflicts=('qt3' 'qt3-enhanced')
replaces=('trinity-qt3')
_prefix="opt/qt3"
source=()
_prefix="opt/qt"
source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/qt3-3.3.8.d.tar.gz)
md5sums=('78dc675e84aed595375449818cbb589a')
options=(!libtool)
_gitroot="http://scm.trinitydesktop.org/scm/git/tde"
_gitname="tde/main/dependencies/qt3"
build() {
cd "$srcdir"
msg "Connecting to GIT server...."
if [ -d $_gitname ] ; then
cd $_gitname && git pull origin
msg "The local files are updated."
else
git clone $_gitroot
fi
msg "GIT checkout done or server timeout"
msg "Starting make..."
export QTDIR="${srcdir}/"$_gitname
export QTDIR="${srcdir}/qt3/"
export PATH=${QTDIR}/bin:${PATH}
export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
export QMAKESPEC=$QTDIR/mkspecs/linux-g++
@ -49,14 +32,10 @@ build() {
else unset ARCH
fi
cd "$srcdir/$_gitname"
cd "${srcdir}/qt3"
rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*}
msg "Starting configure..."
#make -C qmake || return 1
./configure -prefix ${_prefix} \
@ -72,10 +51,10 @@ fi
}
package() {
cd "$srcdir/$_gitname"
cd "$srcdir/qt3"
# Build and install qt.profile
echo "export QTDIR=${_prefix}" > ${srcdir}/qt.profile
echo "export QTDIR=/${_prefix}" > ${srcdir}/qt.profile
echo "export QT_XFT=true" >> ${srcdir}/qt.profile
echo 'export PATH=$PATH:$QTDIR/bin' >> ${srcdir}/qt.profile
echo 'export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$QTDIR/pkgconfig' >> ${srcdir}/qt.profile

@ -0,0 +1,79 @@
# $Id$
# Maintainer: David C. Rankin <drankinatty@gmail.com>
#
# All modifications and uses of this file are licensed under
# the software for which this file was made for, should the software
# be under an Open Source License, at least version 1.9, defined
# by the Open Source Initiative. In other cases, this file is automatically
# released to the Public Domain.
#
pkgname=trinity-tqtinterface
pkgver=3513
pkgrel=1
arch=('i686' 'x86_64')
url="http://trinity.pearsoncomputing.net"
license=('GPL2')
groups=('trinity-base')
pkgdesc="Trinity - tqtinterface"
depends=('python2-sip'
'trinity-qt3'
'trinity-pyqt3')
makedepends=(
'pkgconfig'
'cmake'
'autoconf'
'libxi'
'libxft'
'libxrandr'
'libxcursor'
'libxinerama'
'mesa')
provides=('trinity-tqtinterface')
conflicts=('trinity-tqtinterface')
replaces=('trinity-tqtinterface')
source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/tqtinterface-3.5.13.tar.gz)
md5sums=('d54cc9fd0b35555298efd17c32471a2b')
_qtdir=/opt/qt
_prefix=/opt/trinity
build() {
msg "Setting PATH, CMAKE and Trinity Environment variables"
if [[ -r /etc/profile.d/qt3.sh ]]; then
. /etc/profile.d/qt3.sh
else
[[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
fi
echo $PATH
cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p build
cd build
msg "Starting cmake..."
cmake "../dependencies/tqtinterface" -DCMAKE_INSTALL_PREFIX=${_prefix} -DQT_PREFIX_DIR=/opt/qt/ -DQT_LIBRARY_DIRS=/opt/qt/lib -DQT_INCLUDE_DIR=/opt/qt/include -DQT_VERSION=3 -DMOC_EXECUTABLE=${_qtdir}/bin/moc || return 1
# -DQT_INCLUDE_DIR=${_prefix}/include/tqt/Qt
# -DWITH_QT3=ON \
# -DQT_LIBRARY_DIRS=/opt/qt/lib \
# -DCMAKE_SKIP_RPATH=ON || return 1
make
}
package() {
msg "Packaging - $pkgname-$pkgver"
# cd ${_svnmod}
cd ${srcdir}/build
make DESTDIR="$pkgdir/" install
# include uic-tqt in package
# cd ${srcdir}
# mkdir -p ${pkgdir}/usr/bin
# cp -Rp ${srcdir}/${_svnmod}/qtinterface/uic-tqt ${pkgdir}/usr/bin
# rm -r ${srcdir}/${_svnmod}
}

@ -0,0 +1,67 @@
# $Id$
# Maintainer: David C. Rankin <drankinatty@gmail.com>
#
# All modifications and uses of this file are licensed under
# the software for which this file was made for, should the software
# be under an Open Source License, at least version 1.9, defined
# by the Open Source Initiative. In other cases, this file is automatically
# released to the Public Domain.
#
pkgname=trinity-amarok
pkgver=3513
pkgrel=1
arch=('i686' 'x86_64')
url='http://www.trinitydesktop.org'
license=('GPL')
groups=('trinity-extras')
pkgdesc="Trinity - Amarok music player "
depends=('trinity-kdebase' 'libifp' 'libmtp' 'libnjb' 'python-daap')
makedepends=('pkgconfig' 'cmake' 'imake')
options=('libtool' '!strip')
source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/amarok-3.5.13.tar.gz)
md5sums=('7145ebee38f104bef6cfaf56e7f81959')
_svnmod=applications/amarok
build() {
msg "Setting PATH, CMAKE and Trinity Environment variables"
export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include
export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig
trinity_prefix="/opt/trinity"
cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p build
cd build
# Baho additions
CFLAGS=${CFLAGS}" -fpermissive"
CXXFLAGS=${CXXFLAGS}" -fpermissive"
msg "Starting cmake..."
cmake ${srcdir}/${_svnmod} \
-DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DQT_VERSION=3 \
-DWITH_IFP=ON \
-DWITH_NJB=ON \
-DWITH_MTP=ON \
-DWITH_DAAP=ON \
-DBUILD_ALL=ON
make
}
package() {
msg "Packaging - $pkgname-$pkgver"
# cd ${srcdir}/${_svnmod}
cd ${srcdir}/build
make DESTDIR="$pkgdir/" install
# rm -r ${srcdir}/${_svnmod}
}

@ -0,0 +1,63 @@
# $Id$
# Maintainer: David C. Rankin <drankinatty@gmail.com>
#
# All modifications and uses of this file are licensed under
# the software for which this file was made for, should the software
# be under an Open Source License, at least version 1.9, defined
# by the Open Source Initiative. In other cases, this file is automatically
# released to the Public Domain.
#
pkgname=trinity-gtk-qt-engine
pkgver=3513
pkgrel=1
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL')
groups=('trinity-extras')
pkgdesc="Trinity - Qt wrapper for GTK, makes gtk2 apps look pretty under TDE"
depends=('trinity-kdebase')
makedepends=('pkgconfig' 'cmake' 'imake')
options=('libtool' '!strip')
source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/gtk-qt-engine-3.5.13.tar.gz)
md5sums=('96da675949ef8743d4fe91531f734030')
_svnmod=applications/gtk-qt-engine
build() {
msg "Setting PATH, CMAKE and Trinity Environment variables"
export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr
export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
trinity_prefix="/opt/trinity"
cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p build
cd build
msg "Starting cmake..."
cmake ${srcdir}/${_svnmod} \
-DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DQT_VERSION=3 \
-DWITH_QT3=ON \
-DQTDIR=/opt/qt \
-DQT_DOCDIR=/opt/qt/man \
-DQT_LIBRARY_DIRS=/opt/qt/lib \
-DBUILD_ALL=ON
make
}
package() {
msg "Packaging - $pkgname-$pkgver"
# cd ${srcdir}/${_svnmod}
cd ${srcdir}/build
make DESTDIR="$pkgdir/" install
# rm -r ${srcdir}/${_svnmod}
}

@ -0,0 +1,10 @@
--- kdegraphics/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h
+++ kdegraphics/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h 2011-05-08 11:47:20.000000000 -0500
@@ -56,6 +56,7 @@
#ifndef _GSMARTPOINTER_H_
#define _GSMARTPOINTER_H_
+#include <cstddef>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif

@ -0,0 +1,89 @@
# $Id$
# Maintainer: David C. Rankin <drankinatty@gmail.com>
#
# All modifications and uses of this file are licensed under
# the software for which this file was made for, should the software
# be under an Open Source License, at least version 1.9, defined
# by the Open Source Initiative. In other cases, this file is automatically
# released to the Public Domain.
#
pkgname=trinity-kdegraphics
pkgver=3513
pkgrel=1.0
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL')
groups=('trinity-extras')
pkgdesc="Trinity - kdegraphics"
depends=('trinity-kdebase' 'libart-lgpl' 'libgphoto2' 'libtiff' 'openexr' 't1lib')
makedepends=('pkgconfig' 'cmake' 'imake' 'fribidi')
# 'poppler-qt'
optdepends=('xscreensaver: Screen saver and locker for the X Window System')
provides=('trinity-kdegraphics')
conflicts=('trinity-kdegraphics')
replaces=('trinity-kdegraphics')
options=('libtool' '!strip')
source=('GSmartPointer.h.patch' 'http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdegraphics-3.5.13.tar.gz')
md5sums=('7b93c9bdf1208df453c9838519fab109' 'a75c254cd1060343cd04c6744bce6798')
_svnmod=kdegraphics
trinity_prefix="/opt/trinity"
build() {
# patch for gcc-4.6
if grep -q cstddef ${srcdir}/kdegraphics/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h; then
msg "Patch for GCC 4.6 - Previously Applied"
else
msg "Applying Patch for GCC 4.6"
patch -p0 -i ${srcdir}/GSmartPointer.h.patch || return 1
fi
msg "Setting PATH, CMAKE and Trinity Environment variables"
export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
if [[ -r /etc/profile.d/qt3.sh ]]; then
. /etc/profile.d/qt3.sh
[[ -n $QTDIR ]] && _qtdir=$QTDIR
else
[[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
fi
export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr:/usr/include
export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p build
cd build
msg "Starting cmake..."
cmake ${srcdir}/${_svnmod} \
-DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DQT_VERSION=3 \
-DCMAKE_CXX_FLAGS="-fpermissive" \
-DWITH_T1LIB=ON \
-DWITH_LIBPAPER=ON \
-DWITH_TIFF=ON \
-DWITH_OPENEXR=ON \
-DWITH_PAM=ON \
-DBUILD_ALL=ON
make
# -DWITH_PDF=ON \ (waiting on poppler-qt3)
# -DWITH_QT3=ON \
# -DQTDIR=/opt/qt \
# -DQT_LIBRARY_DIRS=/opt/qt/lib \
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
make DESTDIR="$pkgdir/" install
cd ${startdir}
}

@ -0,0 +1,60 @@
# $Id$
# Maintainer: David C. Rankin <drankinatty@gmail.com>
#
# All modifications and uses of this file are licensed under
# the software for which this file was made for, should the software
# be under an Open Source License, at least version 1.9, defined
# by the Open Source Initiative. In other cases, this file is automatically
# released to the Public Domain.
#
pkgname=trinity-kdevelop
pkgver=12345
pkgrel=1.0
arch=('i686' 'x86_64')
url='http://www.kde.org'
license=('GPL')
groups=('trinity-extras')
pkgdesc="Trinity - kdevelop"
depends=('trinity-kdebase')
# 'xorg'
makedepends=('pkgconfig' 'cmake' 'imake')
options=('libtool' '!strip')
source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdevelop-3.5.13.tar.gz)
md5sums=('777bd77e4f2dc6a5b5b45a370dcf6da0')
_svnmod=kdevelop
build() {
msg "Setting PATH, CMAKE and Trinity Environment variables"
export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr
export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
trinity_prefix="/opt/trinity"
cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p build
cd build
msg "Starting cmake..."
cmake ${srcdir}/${_svnmod} \
-DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DQT_VERSION=3 \
-DWITH_QT3=ON \
-DQTDIR=/opt/qt \
-DQT_DOCDIR=/opt/qt/man \
-DQT_LIBRARY_DIRS=/opt/qt/lib \
-DBUILD_ALL=ON
make
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
make DESTDIR="$pkgdir/" install
}

@ -0,0 +1,68 @@
# $Id$
# Maintainer: David C. Rankin <drankinatty@gmail.com>
#
# All modifications and uses of this file are licensed under
# the software for which this file was made for, should the software
# be under an Open Source License, at least version 1.9, defined
# by the Open Source Initiative. In other cases, this file is automatically
# released to the Public Domain.
#
pkgname=trinity-kpowersave
pkgver=3513
pkgrel=1
arch=('i686' 'x86_64')
url='http://www.trinitydesktop.org'
license=('GPL')
groups=('trinity-extras')
pkgdesc="Trinity - kpowersave"
depends=('xscreensaver'
'libxss'
'trinity-kdebase')
makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake')
options=('libtool' '!strip')
source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/kpowersave-3.5.13.tar.gz)
md5sums=('c887eb282fd035655b370f133ce58664')
_svnmod=applications/kpowersave
build() {
msg "Setting PATH, CMAKE and Trinity Environment variables"
export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr
export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
# patch for inactivity.cpp
# patch -p0 -i ${srcdir}/kpowersave-app-inactivity.cpp.patch || return 1
trinity_prefix="/opt/trinity"
cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p build
cd build
msg "Starting cmake..."
cmake ${srcdir}/${_svnmod} \
-DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DQT_VERSION=3 \
-DWITH_QT3=ON \
-DQTDIR=/opt/qt \
-DQT_DOCDIR=/opt/qt/man \
-DQT_LIBRARY_DIRS=/opt/qt/lib \
-DBUILD_ALL=ON
make
}
package() {
msg "Packaging - $pkgname-$pkgver"
# cd ${srcdir}/${_svnmod}
cd ${srcdir}/build
make DESTDIR="$pkgdir/" install
# rm -r ${srcdir}/${_svnmod}
}

@ -0,0 +1,11 @@
--- kpowersave/src/inactivity.cpp
+++ kpowersave/src/inactivity.cpp 2011-03-12 18:40:52.000000000 -0600
@@ -325,7 +325,7 @@
blacklisted_running = false;
}
else {
- if (pids.contains(QRegExp::QRegExp("[0-9]"))) {
+ if (pids.contains(QRegExp("[0-9]"))) {
kdDebug() << "BLACKLISTED IS RUNNING" << endl;
blacklisted_running = true;
blacklisted_running_last = idleTime;

@ -0,0 +1,64 @@
# $Id$
# Maintainer: David C. Rankin <drankinatty@gmail.com>
#
# All modifications and uses of this file are licensed under
# the software for which this file was made for, should the software
# be under an Open Source License, at least version 1.9, defined
# by the Open Source Initiative. In other cases, this file is automatically
# released to the Public Domain.
#
pkgname=trinity-qtcurve
pkgver=3513
pkgrel=1
arch=('i686' 'x86_64')
url='http://www.trinitydesktop.org'
license=('GPL')
groups=('trinity-extras')
pkgdesc="Trinity - Trinity style QtCurve"
depends=('trinity-kdebase')
makedepends=('pkgconfig' 'cmake' 'imake')
options=('libtool' '!strip')
source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/kde-style-qtcurve-3.5.13.tar.gz')
_svnmod=applications/kde-style-qtcurve
md5sums=('98133893b9c6736804d4dfc134a3a256')
build() {
msg "Setting PATH, CMAKE and Trinity Environment variables"
export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr
export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
# cd ${srcdir}/${_svnmod}
trinity_prefix="/opt/trinity"
cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p build
cd build
msg "Starting cmake..."
cmake ${srcdir}/${_svnmod} \
-DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DQT_VERSION=3 \
-DWITH_QT3=ON \
-DQTDIR=/opt/qt \
-DQT_DOCDIR=/opt/qt/man \
-DQT_LIBRARY_DIRS=/opt/qt/lib \
-DBUILD_ALL=ON
make
}
package() {
msg "Packaging - $pkgname-$pkgver"
# cd ${srcdir}/${_svnmod}
cd ${srcdir}/build
make DESTDIR="$pkgdir/" install
# rm -r ${srcdir}/${_svnmod}
}

@ -1,47 +0,0 @@
#!/bin/bash
IP_ADDRESS_1=97.64.229.82
IP_ADDRESS_2=97.64.229.83
STATUS_1=0
STATUS_2=0
CURDATE=$('date')
netcat -z ${IP_ADDRESS_1} 80
if [ $? -eq 0 ]
then
STATUS_1=1
else
sleep 5
netcat -z ${IP_ADDRESS_1} 80
if [ $? -eq 0 ]
then
STATUS_1=1
else
echo "Interface 1 is DOWN"
fi
fi
netcat -z ${IP_ADDRESS_2} 80
if [ $? -eq 0 ]
then
STATUS_2=1
else
sleep 5
netcat -z ${IP_ADDRESS_2} 80
if [ $? -eq 0 ]
then
STATUS_2=1
else
echo "Interface 2 is DOWN"
fi
fi
if [[ STATUS_1 == 0 ]]; then
mail -s "[SERVICE FAILURE NOTIFICATION] pearsoncomputing.net" kb9vqf@pearsoncomputing.net < "The network interface ${IP_ADDRESS_1}:80 failed to respond on ${CURDATE}"
fi
if [[ STATUS_2 == 0 ]]; then
mail -s "[SERVICE FAILURE NOTIFICATION] pearsoncomputing.net" kb9vqf@pearsoncomputing.net < "The network interface ${IP_ADDRESS_2}:80 failed to respond on ${CURDATE}"
fi

@ -1,276 +0,0 @@
# $Id$
# Maintainer: David C. Rankin <drankinatty@gmail.com>
#
# All modifications and uses of this file are licensed under
# the software for which this file was made for, should the software
# be under an Open Source License, at least version 1.9, defined
# by the Open Source Initiative. In other cases, this file is automatically
# released to the Public Domain.
#
pkgname=trinity-qt3
pkgver=3.3.8b
pkgrel=1
pkgdesc="The Qt3 gui toolkit - with Trinity patch."
_prefix="opt/qt"
_patchver=3.3.8c
arch=(i686 x86_64)
license=('GPL')
url="http://www.trolltech.com/products/qt/index.html"
pkgfqn=qt-x11-free-${pkgver}
# install=qt.install
groups=('trinity-bld')
depends=('libjpeg-turbo'
'libmng'
'libmysqlclient'
'libpng'
'libxmu'
'libxcursor'
'libxinerama'
'libxft'
'libxrandr'
'mesa'
'postgresql-libs'
'unixodbc')
makedepends=('cups' 'libxi' 'mysql' 'postgresql' 'unixodbc' 'sqlite3')
optdepends=()
# optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
provides=('trinity-qt3' 'qt3')
conflicts=('qt3' 'qt3-enhanced')
replaces=('trinity-qt3')
# 'ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.gz'
# ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.8b.tar.gz
source=(ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.gz
qt3-png14.patch
qt-patches.tar.bz2
qt3-png14.patch
eastern_asian_languagues.diff
qt-odbc.patch
gcc46-arch.diff
qt3_3.3.8c.arch.diff)
# 'qt.profile'
# 'qt-copy-kde-patches.tar.bz2'
# 'utf8-bug-qt3.diff'
# 'mysql.patch'
# 'qt-font-default-subst.diff'
options=(!libtool)
md5sums=('9f05b4125cfe477cc52c9742c3c09009'
'1dc671df42b9030dbdf68bb61cd3375e'
'2f00e5c0c1e2c2a23dddc982cd79f3e0'
'1dc671df42b9030dbdf68bb61cd3375e'
'616f1f3029cf8375256ad6a406de3549'
'2178ca88dfd75a230918593b30eb0dbe'
'445d6937ad197fa31e1a8e4668d3caa6'
'd763bdc087786a45e5e5eec84f5c9896')
# gcc46.diff
# 'e77192301879b05a4b8ebc35d5c5702b'
# qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/
# other qt-patches come from fedora and gentoo
build() {
unset QMAKESPEC
export QTDIR=${srcdir}/$pkgfqn
export PATH=${QTDIR}/bin:${PATH}
export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
export QMAKESPEC=$QTDIR/mkspecs/linux-g++
export CPATH=/usr/include/postgresql/server:/usr/include/mysql
cd ${QTDIR}
# cd ${srcdir}/$pkgfqn
# apply other qt patches and one security fix from debian/gentoo
for i in ../qt-patches/*; do
patch -Np1 -i $i || return 1
done
# fix CJK font/chars select error (FS#11245)
patch -p1 -i ${srcdir}/eastern_asian_languagues.diff || return 1
# fix build problem against new unixODBC
patch -p1 -i ${srcdir}/qt-odbc.patch || return 1
patch -p0 -i ${srcdir}/qt3-png14.patch || return 1
# patch for gcc 4.6
patch -p1 -i ${srcdir}/gcc46-arch.diff || return 1
# patch for qt3_3.3.8c
patch -p0 -i ${srcdir}/qt3_3.3.8c.arch.diff || return 1
# start compiling qt
# baho additions
# # remove runtime library search not needed when installed into /usr
# sed -i '/QMAKE_RPATH/d' mkspecs/linux*/qmake.conf
sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
rm -rf doc/html examples tutorial
sed -i "s|sub-tutorial sub-examples||" Makefile
sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf
sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf
sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf
sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix
sed -i "s|read acceptance|acceptance=yes|" configure
# remove unwanted mkspecs
rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*}
# set arch if x86_64 build
if [ "$CARCH" = "x86_64" ]; then
export ARCH="-64"
else unset ARCH
fi
# ./configure -prefix /opt/qt -platform linux-g++$ARCH \
# -system-zlib -qt-gif -release -shared -sm -nis -thread -stl \
# -system-lib{png,jpeg,mng} \
# -no-g++-exceptions -plugin-sql-{mysql,psql,sqlite,odbc}
msg "Starting configure..."
./configure -prefix ${_prefix} \
-sysconfdir /etc/qt \
-qt-gif \
-system-zlib \
-system-libjpeg \
-plugin-imgfmt-jpeg \
-system-libmng \
-plugin-imgfmt-mng \
-system-libpng \
-plugin-imgfmt-png \
-plugin-sql-mysql \
-plugin-sql-psql \
-plugin-sql-sqlite \
-plugin-sql-odbc \
-no-exceptions \
-thread \
-no-tablet
#-platform linux-g++ \
## remove custom locations from Baho's /usr install experiment
# -docdir ${_prefix}/share/doc/qt \
# -headerdir ${_prefix}/include/qt \
# -plugindir ${_prefix}/lib/qt/plugins \
# -datadir ${_prefix}/share/qt \
# -translationdir ${_prefix}/share/qt/translations \
# fix /opt/qt/lib path
[ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/src/Makefile
[ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/designer/Makefile
[ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/editor/Makefile
[ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/assistant/lib/Makefile
[ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/uilib/Makefile
# bahoo make
# make sub-tools
cd ${QTDIR}
make -C qmake || return 1
cd ${QTDIR}/plugins/src/sqldrivers/mysql
${QTDIR}/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
cd ${QTDIR}/plugins/src/sqldrivers/psql
${QTDIR}/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
cd ${QTDIR}
# fix the broken makefiles
#sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
make || return 1
}
package() {
msg "Packaging - $pkgname-$pkgver"
cd ${QTDIR}
pkgver=${_patchver}
make INSTALL_ROOT=${pkgdir} install
## Original Qt Build
rm -rf ${pkgdir}${_prefix}/{phrasebooks,templates,translations}
sed -i "s|-L${QTDIR}/lib ||g" ${pkgdir}${_prefix}/lib/*.prl
install -D -m755 qmake/qmake ${pkgdir}${_prefix}/bin/qmake
# Build and install qt.profile
echo "export QTDIR=${_prefix}" > ${srcdir}/qt.profile
echo "export QT_XFT=true" >> ${srcdir}/qt.profile
echo 'export PATH=$PATH:$QTDIR/bin' >> ${srcdir}/qt.profile
echo 'export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$QTDIR/pkgconfig' >> ${srcdir}/qt.profile
install -D -m755 ${srcdir}/qt.profile ${pkgdir}/etc/profile.d/qt3.sh
ln -sf ${_prefix}/bin/qtconfig ${pkgdir}${_prefix}/bin/qt3config
rm -f ${pkgdir}${_prefix}/mkspecs/linux-g++$ARCH/linux-g++$ARCH
# install man pages
mkdir -p ${pkgdir}${_prefix}/man
cp -r ${QTDIR}/doc/man/{man1,man3} ${pkgdir}${_prefix}/man/
# Uncomment to install examples
# cp -v -r ${QTDIR}/examples ${pkgdir}${_prefix}/share/doc/qt
install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
echo "${_prefix}/lib" > ${pkgdir}/etc/ld.so.conf.d/qt3.conf
}
## Baho Additions
# ln -v -sf libqt-mt.so ${pkgdir}${_prefix}/lib/libqt.so
# ln -v -snf ../../bin ${pkgdir}${_prefix}/share/qt/bin
# ln -v -snf ../../include/qt ${pkgdir}${_prefix}/share/qt/include
# ln -v -snf ../../lib ${pkgdir}${_prefix}/share/qt/lib
# rm ${pkgdir}${_prefix}/share/qt/mkspecs/linux-g++/linux-g++
# ln -v -snf ../linux-g++ ${pkgdir}${_prefix}/share/qt/mkspecs/linux-g++/linux-g++
# cp -v -r doc/man ${pkgdir}${_prefix}/share
# # Don't do examples
# cp -v -r examples ${pkgdir}${_prefix}/share/doc/qt
# # Build qt.profile
# echo "export QTDIR=${_prefix}" > ${srcdir}/qt.profile
# echo "export QT_XFT=true" >> ${srcdir}/qt.profile
# echo 'export PATH=$PATH:$QTDIR/bin' >> ${srcdir}/qt.profile
# echo 'export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$QTDIR/pkgconfig' >> ${srcdir}/qt.profile
#
# install -D -m755 ${srcdir}/qt.profile ${pkgdir}/etc/profile.d/qt3.sh
# ln -sf ${_prefix}/bin/qtconfig ${pkgdir}${_prefix}/bin/qt3config
## scraps
# apply qt patches from kde.org
# for i in ../qt-copy-kde-patches/*; do
# patch -Np0 -i $i || return 1
# done
# fix utf8 bug
# patch -Np0 -i ../utf8-bug-qt3.diff || return 1
# fix asia fonts
# patch -Np0 -i ../qt-font-default-subst.diff || return 1
# fix segfaults on exit when using mysql DB driver
# patch -Np0 -i ../mysql.patch || return 1
# # fix /opt/qt/lib path
# [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/src/Makefile
# [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/designer/designer/Makefile
# [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/designer/editor/Makefile
# [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/assistant/lib/Makefile
# [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/designer/uilib/Makefile
#
# cd ${srcdir}/$pkgfqn
# make -C qmake || return 1
# cd ${srcdir}/$pkgfqn/plugins/src/sqldrivers/mysql
# ${srcdir}/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
# cd ${srcdir}/$pkgfqn/plugins/src/sqldrivers/psql
# ${srcdir}/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
#
# cd ${srcdir}/$pkgfqn
# # fix the broken makefiles
# #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
# make || return 1
# make INSTALL_ROOT=${pkgdir} install
# rm -rf ${pkgdir}/opt/qt/{phrasebooks,templates,translations}
# sed -i "s|-L${srcdir}/$pkgfqn/lib ||g" ${pkgdir}/opt/qt/lib/*.prl
# install -D -m755 qmake/qmake ${pkgdir}/opt/qt/bin/qmake
# install -D -m755 ${srcdir}/qt.profile ${pkgdir}/etc/profile.d/qt3.sh
# ln -sf /opt/qt/bin/qtconfig ${pkgdir}/opt/qt/bin/qt3config
# rm -f ${pkgdir}/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH
#
# # install man pages
# mkdir -p ${pkgdir}/opt/qt/man
# cp -r ${srcdir}/$pkgfqn/doc/man/{man1,man3} ${pkgdir}/opt/qt/man/
#
# install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
# echo '/opt/qt/lib' > ${pkgdir}/etc/ld.so.conf.d/qt3.conf
# }

@ -1,39 +0,0 @@
--- qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-01-15 21:09:13.000000000 +0200
+++ qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-03-10 11:34:22.000000000 +0200
@@ -966,20 +966,22 @@
#ifdef Q_WS_X11
if (script == QFont::Han) {
- // modify script according to locale
- static QFont::Script defaultHan = QFont::UnknownScript;
- if (defaultHan == QFont::UnknownScript) {
- QCString locale = setlocale(LC_ALL, NULL);
- if (locale.contains("ko"))
- defaultHan = QFont::Han_Korean;
- else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
- defaultHan = QFont::Han_TraditionalChinese;
- else if (locale.contains("zh"))
- defaultHan = QFont::Han_SimplifiedChinese;
- else
- defaultHan = QFont::Han_Japanese;
- }
- script = defaultHan;
+ // modify script according to locale
+ static QFont::Script defaultHan;
+ QCString locale = setlocale(LC_ALL, NULL);
+
+ if (locale.contains("ko"))
+ defaultHan = QFont::Han_Korean;
+ else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
+ defaultHan = QFont::Han_TraditionalChinese;
+ else if (locale.contains("zh"))
+ defaultHan = QFont::Han_SimplifiedChinese;
+ else if (locale.contains("ja"))
+ defaultHan = QFont::Han_Japanese;
+ else
+ defaultHan = QFont::Han; // don't change
+
+ script = defaultHan;
}
#endif

@ -1,61 +0,0 @@
diff -Naur --label qt-x11-free-3.3.8b qt-x11-free-3.3.8b qt-x11-free-3.3.8b/src/tools/qmap.h
--- qt-x11-free-3.3.8b
+++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-05-10 08:47:27.000000000 -0500
@@ -50,6 +50,7 @@
#endif // QT_H
#ifndef QT_NO_STL
+#include <cstddef>
#include <iterator>
#include <map>
#endif
@@ -107,7 +108,7 @@
#endif
typedef T value_type;
#ifndef QT_NO_STL
- typedef ptrdiff_t difference_type;
+ typedef std::ptrdiff_t difference_type;
#else
typedef int difference_type;
#endif
@@ -223,7 +224,7 @@
#endif
typedef T value_type;
#ifndef QT_NO_STL
- typedef ptrdiff_t difference_type;
+ typedef std::ptrdiff_t difference_type;
#else
typedef int difference_type;
#endif
@@ -604,7 +605,7 @@
typedef value_type& reference;
typedef const value_type& const_reference;
#ifndef QT_NO_STL
- typedef ptrdiff_t difference_type;
+ typedef std::ptrdiff_t difference_type;
#else
typedef int difference_type;
#endif
diff -Naur --label qt-x11-free-3.3.8b qt-x11-free-3.3.8b qt-x11-free-3.3.8b/src/tools/qvaluelist.h
--- qt-x11-free-3.3.8b
+++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-05-10 08:46:46.000000000 -0500
@@ -50,6 +50,7 @@
#ifndef QT_NO_STL
#include <iterator>
#include <list>
+#include <cstddef>
#endif
//#define QT_CHECK_VALUELIST_RANGE
diff -Naur --label qt-x11-free-3.3.8b qt-x11-free-3.3.8b qt-x11-free-3.3.8b/src/tools/qvaluevector.h
--- qt-x11-free-3.3.8b
+++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h 2011-05-10 08:46:46.000000000 -0500
@@ -244,7 +244,7 @@
typedef const value_type& const_reference;
typedef size_t size_type;
#ifndef QT_NO_STL
- typedef ptrdiff_t difference_type;
+ typedef std::ptrdiff_t difference_type;
#else
typedef int difference_type;
#endif

@ -1,47 +0,0 @@
--- src/sql/drivers/mysql/qsql_mysql.cpp
+++ src/sql/drivers/mysql/qsql_mysql.cpp
@@ -37,7 +37,6 @@
#include "qsql_mysql.h"
#include <private/qsqlextension_p.h>
-#include <qapplication.h>
#include <qdatetime.h>
#include <qvaluevector.h>
#include <qsqlrecord.h>
@@ -341,14 +340,6 @@ int QMYSQLResult::numRowsAffected()
}
/////////////////////////////////////////////////////////
-static void qServerEnd()
-{
-#ifndef Q_NO_MYSQL_EMBEDDED
-# if MYSQL_VERSION_ID >= 40000
- mysql_server_end();
-# endif // MYSQL_VERSION_ID
-#endif // Q_NO_MYSQL_EMBEDDED
-}
static void qServerInit()
{
@@ -366,9 +357,7 @@ static void qServerInit()
qWarning( "QMYSQLDriver::qServerInit: unable to start server." );
# endif
}
- qAddPostRoutine(qServerEnd);
init = TRUE;
-
# endif // MYSQL_VERSION_ID
#endif // Q_NO_MYSQL_EMBEDDED
}
@@ -411,6 +400,11 @@ QMYSQLDriver::~QMYSQLDriver()
QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this );
delete ext;
}
+#ifndef Q_NO_MYSQL_EMBEDDED
+# if MYSQL_VERSION_ID > 40000
+ mysql_server_end();
+# endif
+#endif
}
bool QMYSQLDriver::hasFeature( DriverFeature f ) const

@ -1,77 +0,0 @@
--- src/kernel/qfontdatabase_x11.cpp
+++ src/kernel/qfontdatabase_x11.cpp
@@ -1589,15 +1589,6 @@ QFontEngine *loadEngine( QFont::Script s
if (script == QFont::Latin)
// add Euro character
FcCharSetAddChar(cs, 0x20ac);
- if (script == QFont::Han_SimplifiedChinese)
- FcCharSetAddChar(cs, 0x3400);
- if (script == QFont::Han_TraditionalChinese){
- FcCharSetAddChar(cs, 0x3435);
- FcCharSetAddChar(cs, 0xE000);
- FcCharSetAddChar(cs, 0xF6B1);
- }
- if (script == QFont::MiscellaneousSymbols)
- FcCharSetAddChar(cs, 0x2714);
FcPatternAddCharSet(pattern, FC_CHARSET, cs);
FcCharSetDestroy(cs);
}
@@ -1813,7 +1804,11 @@ static QFontEngine *loadFontConfigFont(c
FcPatternPrint(pattern);
#endif
+ // XftFontMatch calls the right ConfigSubstitute variants, but as we use
+ // FcFontMatch/Sort here we have to do it manually.
FcConfigSubstitute(0, pattern, FcMatchPattern);
+ XftDefaultSubstitute(QPaintDevice::x11AppDisplay(), QPaintDevice::x11AppScreen(), pattern);
+
// qDebug("1: pattern contains:");
// FcPatternPrint(pattern);
@@ -1847,10 +1842,6 @@ static QFontEngine *loadFontConfigFont(c
value.u.s = (const FcChar8 *)cs.data();
FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue);
}
-#ifdef FONT_MATCH_DEBUG
- printf("final pattern contains:\n");
- FcPatternPrint(pattern);
-#endif
}
if (script != QFont::Unicode) {
@@ -1860,19 +1851,15 @@ static QFontEngine *loadFontConfigFont(c
if (script == QFont::Latin)
// add Euro character
FcCharSetAddChar(cs, 0x20ac);
- if (script == QFont::Han_SimplifiedChinese)
- FcCharSetAddChar(cs, 0x3400);
- if (script == QFont::Han_TraditionalChinese) {
- FcCharSetAddChar(cs, 0x3435);
- FcCharSetAddChar(cs, 0xE000);
- FcCharSetAddChar(cs, 0xF6B1);
- }
- if (script == QFont::MiscellaneousSymbols)
- FcCharSetAddChar(cs, 0x2714);
FcPatternAddCharSet(pattern, FC_CHARSET, cs);
FcCharSetDestroy(cs);
}
+#ifdef FONT_MATCH_DEBUG
+ printf("final pattern contains:\n");
+ FcPatternPrint(pattern);
+#endif
+
QFontEngine *fe = 0;
for( int jj = (FcGetVersion() >= 20392 ? 0 : 1); jj < 2; ++jj ) {
--- src/kernel/qfontdatabase.cpp
+++ src/kernel/qfontdatabase.cpp
@@ -554,7 +554,7 @@ static const unsigned short sample_chars
// GeometricSymbols,
{ 0x2500, 0x0 },
// MiscellaneousSymbols,
- { 0x2640, 0x0 },
+ { 0x2640, 0x2714, 0x0 },
// EnclosedAndSquare,
{ 0x2460, 0x0 },
// Braille,

@ -1,19 +0,0 @@
diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp
--- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig 2009-02-24 11:32:27.000000000 +0100
+++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp 2009-02-24 11:33:43.000000000 +0100
@@ -57,13 +57,13 @@
#endif
// newer platform SDKs use SQLLEN instead of SQLINTEGER
-#ifdef SQLLEN
+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
# define QSQLLEN SQLLEN
#else
# define QSQLLEN SQLINTEGER
#endif
-#ifdef SQLULEN
+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
# define QSQLULEN SQLULEN
#else
# define QSQLULEN SQLUINTEGER

@ -1,33 +0,0 @@
--- src/kernel/qpngio.cpp.orig 2010-01-16 22:02:41.000000000 +0100
+++ src/kernel/qpngio.cpp 2010-01-16 22:03:56.000000000 +0100
@@ -159,7 +159,7 @@
image.setColor( i, qRgba(c,c,c,0xff) );
}
if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
- const int g = info_ptr->trans_values.gray;
+ const int g = info_ptr->trans_color.gray;
if (g < ncols) {
image.setAlphaBuffer(TRUE);
image.setColor(g, image.color(g) & RGB_MASK);
@@ -187,7 +187,7 @@
info_ptr->palette[i].red,
info_ptr->palette[i].green,
info_ptr->palette[i].blue,
- info_ptr->trans[i]
+ info_ptr->trans_alpha[i]
)
);
i++;
@@ -321,9 +321,9 @@
png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)
if (image.depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
QRgb trans = 0xFF000000 | qRgb(
- (info_ptr->trans_values.red << 8 >> bit_depth)&0xff,
- (info_ptr->trans_values.green << 8 >> bit_depth)&0xff,
- (info_ptr->trans_values.blue << 8 >> bit_depth)&0xff);
+ (info_ptr->trans_color.red << 8 >> bit_depth)&0xff,
+ (info_ptr->trans_color.green << 8 >> bit_depth)&0xff,
+ (info_ptr->trans_color.blue << 8 >> bit_depth)&0xff);
for (uint y=0; y<height; y++) {
for (uint x=0; x<info_ptr->width; x++) {
if (((uint**)jt)[y][x] == trans) {

@ -1,72 +0,0 @@
--- include/qobject.h 2008-01-15 13:09:13.000000000 -0600
+++ include/qobject.h 2011-01-01 18:33:19.715656496 -0600
@@ -101,8 +101,11 @@
QObject *child( const char *objName, const char *inheritsClass = 0, bool recursiveSearch = TRUE ); //### const in 4.0
const QObjectList *children() const { return childObjects; }
+ QObjectList childrenListObject();
+ const QObjectList childrenListObject() const;
static const QObjectList *objectTrees();
+ static const QObjectList objectTreesListObject();
QObjectList *queryList( const char *inheritsClass = 0,
const char *objName = 0,
--- src/kernel/qobject.cpp 2008-01-15 13:09:13.000000000 -0600
+++ src/kernel/qobject.cpp 2011-01-01 18:28:16.191270264 -0600
@@ -360,6 +360,30 @@
}
}
+/*! \internal
+ TQt compatibility function
+*/
+QObjectList QObject::childrenListObject() {
+ if (children()) return *(children());
+ else return QObjectList();
+}
+
+/*! \internal
+ TQt compatibility function
+*/
+const QObjectList QObject::childrenListObject() const {
+ if (children()) return *(children());
+ else return QObjectList();
+}
+
+/*! \internal
+ TQt compatibility function
+*/
+const QObjectList QObject::objectTreesListObject() {
+ if (objectTrees()) return *(objectTrees());
+ else return QObjectList();
+}
+
/*****************************************************************************
QObject member functions
--- src/kernel/qobject.h 2008-01-15 13:09:13.000000000 -0600
+++ src/kernel/qobject.h 2011-01-01 18:33:19.715656496 -0600
@@ -101,8 +101,11 @@
QObject *child( const char *objName, const char *inheritsClass = 0, bool recursiveSearch = TRUE ); //### const in 4.0
const QObjectList *children() const { return childObjects; }
+ QObjectList childrenListObject();
+ const QObjectList childrenListObject() const;
static const QObjectList *objectTrees();
+ static const QObjectList objectTreesListObject();
QObjectList *queryList( const char *inheritsClass = 0,
const char *objName = 0,
--- src/tools/qglobal.h 2008-01-15 21:09:13.000000000 +0200
+++ src/tools/qglobal.h 2011-03-15 00:28:11.221711757 +0200
@@ -41,7 +41,7 @@
#ifndef QGLOBAL_H
#define QGLOBAL_H
-#define QT_VERSION_STR "3.3.8b"
+#define QT_VERSION_STR "3.3.8c"
/*
QT_VERSION is (major << 16) + (minor << 8) + patch.
*/

@ -1,101 +0,0 @@
--- src/codecs/qutfcodec.cpp
+++ src/codecs/qutfcodec.cpp
@@ -154,6 +154,7 @@
class QUtf8Decoder : public QTextDecoder {
uint uc;
+ uint min_uc;
int need;
bool headerDone;
public:
@@ -167,8 +168,9 @@
result.setLength( len ); // worst case
QChar *qch = (QChar *)result.unicode();
uchar ch;
+ int error = -1;
for (int i=0; i<len; i++) {
- ch = *chars++;
+ ch = chars[i];
if (need) {
if ( (ch&0xc0) == 0x80 ) {
uc = (uc << 6) | (ch & 0x3f);
@@ -182,6 +184,8 @@
*qch++ = QChar(high);
*qch++ = QChar(low);
headerDone = TRUE;
+ } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
+ *qch++ = QChar::replacement;
} else {
if (headerDone || QChar(uc) != QChar::byteOrderMark)
*qch++ = uc;
@@ -190,6 +194,7 @@
}
} else {
// error
+ i = error;
*qch++ = QChar::replacement;
need = 0;
}
@@ -200,12 +205,21 @@
} else if ((ch & 0xe0) == 0xc0) {
uc = ch & 0x1f;
need = 1;
+ error = i;
+ min_uc = 0x80;
} else if ((ch & 0xf0) == 0xe0) {
uc = ch & 0x0f;
need = 2;
+ error = i;
+ min_uc = 0x800;
} else if ((ch&0xf8) == 0xf0) {
uc = ch & 0x07;
need = 3;
+ error = i;
+ min_uc = 0x10000;
+ } else {
+ // error
+ *qch++ = QChar::replacement;
}
}
}
--- src/tools/qstring.cpp
+++ src/tools/qstring.cpp
@@ -5805,6 +5805,7 @@
result.setLength( len ); // worst case
QChar *qch = (QChar *)result.unicode();
uint uc = 0;
+ uint min_uc = 0;
int need = 0;
int error = -1;
uchar ch;
@@ -5822,6 +5823,12 @@
unsigned short low = uc%0x400 + 0xdc00;
*qch++ = QChar(high);
*qch++ = QChar(low);
+ } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
+ // overlong seqence, UTF16 surrogate or BOM
+ i = error;
+ qch = addOne(qch, result);
+ *qch++ = QChar(0xdbff);
+ *qch++ = QChar(0xde00+((uchar)utf8[i]));
} else {
*qch++ = uc;
}
@@ -5844,14 +5851,17 @@
uc = ch & 0x1f;
need = 1;
error = i;
+ min_uc = 0x80;
} else if ((ch & 0xf0) == 0xe0) {
uc = ch & 0x0f;
need = 2;
error = i;
+ min_uc = 0x800;
} else if ((ch&0xf8) == 0xf0) {
uc = ch & 0x07;
need = 3;
error = i;
+ min_uc = 0x10000;
} else {
// Error
qch = addOne(qch, result);

@ -1,12 +0,0 @@
post_install() {
post_remove
}
post_upgrade() {
post_remove
}
post_remove() {
# this can be removed in future versions
sed -e '/\/opt\/qt\/lib/d' -i etc/ld.so.conf
}

@ -1,4 +0,0 @@
export QTDIR=/opt/qt
export QT_XFT=true
export PATH=$PATH:$QTDIR/bin
export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig

@ -0,0 +1,79 @@
diff -up amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp
--- amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp.gcc43 2007-12-17 09:53:19.000000000 -0600
+++ amarok-1.4.8/amarok/src/metadata/mp4/mp4file.cpp 2008-02-21 21:05:18.000000000 -0600
@@ -30,6 +30,7 @@ email : aumuell@reserv.at
#include <audioproperties.h>
#include <stdint.h>
+#include <cstdlib>
#define MP4V2_HAS_WRITE_BUG 1
diff -up amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp
--- amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp.gcc43 2007-12-17 09:53:19.000000000 -0600
+++ amarok-1.4.8/amarok/src/metadata/mp4/taglib_mp4filetyperesolver.cpp 2008-02-21 21:05:18.000000000 -0600
@@ -24,6 +24,7 @@
#include "taglib_mp4filetyperesolver.h"
#include "mp4file.h"
+#include <cstring>
TagLib::File *MP4FileTypeResolver::createFile(const char *fileName,
bool readProperties,
diff -up amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp
--- amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp.gcc43 2007-12-17 09:53:19.000000000 -0600
+++ amarok-1.4.8/amarok/src/metadata/mp4/mp4tag.cpp 2008-02-21 21:05:18.000000000 -0600
@@ -24,6 +24,8 @@ email : andrew.leadbetter
#include <tag.h>
#include <stdint.h>
+#include <cstdlib>
+#include <cstring>
using namespace TagLib;
diff -up amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp.gcc43 amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp
--- amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp.gcc43 2007-12-17 09:53:19.000000000 -0600
+++ amarok-1.4.8/amarok/src/metadata/mp4/mp4properties.cpp 2008-02-21 21:05:18.000000000 -0600
@@ -30,6 +30,7 @@ email : andrew.leadbetter
#endif
#include <stdint.h>
+#include <cstring>
#ifndef UINT64_TO_DOUBLE
#define UINT64_TO_DOUBLE(a) ((double)((int64_t)(a)))
diff -up amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp.gcc43 amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp
--- amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp.gcc43 2007-12-17 09:53:18.000000000 -0600
+++ amarok-1.4.8/amarok/src/engine/helix/hxplayercontrol.cpp 2008-02-21 21:07:10.000000000 -0600
@@ -15,6 +15,8 @@
the alsa guys
***************************************************************************/
+#include <cstdlib>
+#include <cstring>
#include <sys/time.h>
#include <sys/types.h>
#include <sys/wait.h>
diff -up amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h.gcc43 amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h
--- amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h.gcc43 2007-12-17 09:53:18.000000000 -0600
+++ amarok-1.4.8/amarok/src/engine/helix/helix-sp/helix-sp.h 2008-02-21 21:07:54.000000000 -0600
@@ -23,6 +23,7 @@ class HelixSimplePlayerAudioStreamInfoRe
#include <limits.h>
#include <sys/param.h>
#include <pthread.h>
+#include <cstring>
#include <vector>
#include <config.h>
#include <iostream>
diff -up amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp.gcc43 amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp
--- amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp.gcc43 2007-12-17 09:53:18.000000000 -0600
+++ amarok-1.4.8/amarok/src/engine/helix/helix-engine.cpp 2008-02-21 21:09:38.000000000 -0600
@@ -15,6 +15,7 @@
#include <climits>
#include <cmath>
#include <stdarg.h>
+#include <cstring>
#include <config.h>

@ -0,0 +1,302 @@
# If Trinity is built in a specific prefix, we move all directories under it
%if "%{_prefix}" != "/usr"
%define _variant .opt
%endif
# Basic package informations
%define kdecomp amarok
%define version 1.4.10
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
%define _variant .opt
%define _docdir %{_prefix}/share/doc
%endif
# TDE 3.5.13 specific building variables
BuildRequires: cmake >= 2.8
%define tde_docdir %{_docdir}/kde
%define tde_includedir %{_includedir}/kde
%define tde_libdir %{_libdir}/trinity
# TODO:
# Rio Karma support : libkarma
%if 0%{?fedora} > 0 && 0%{?fedora} < 9
# define to include konquisidebar support for kde3 desktop
%define konq 1
%endif
# No Xine support on older RHEL
%if 0%{?rhel} && 0%{?rhel} <= 5
%define _with_xine %{nil}
%else
%define _with_xine 1
%endif
Name: trinity-%{kdecomp}
Summary: A drop-down terminal emulator.
Version: %{version}
Release: %{release}%{?dist}%{?_variant}
Group: Applications/Multimedia
License: GPLv2+
Url: http://amarok.kde.org
Source0: amarok-3.5.13.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# RedHat / Fedora legacy patches
Patch1: amarok-1.4.8-gcc43.patch
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
BuildRequires: esound-devel
BuildRequires: gettext
BuildRequires: trinity-kdelibs-devel
%if 0%{?konq}
BuildRequires: trinity-kdebase-devel
%else
Obsoletes: %{name}-konqueror < %{version}-%{release}
%endif
BuildRequires: taglib-devel
BuildRequires: libifp-devel
# Ipod
BuildRequires: libgpod-devel
BuildRequires: libmp4v2-devel
# MTP players
BuildRequires: libmtp-devel
BuildRequires: libmusicbrainz-devel
# Creative Nomad Jukebox
BuildRequires: libnjb-devel
BuildRequires: libtool
%if 0%{?fedora} > 4 || 0%{?rhel} > 4
BuildRequires: libtool-ltdl-devel
%endif
BuildRequires: libtunepimp-devel
BuildRequires: libusb-devel
BuildRequires: libvisual-devel
BuildRequires: mysql-devel
BuildRequires: postgresql-devel
BuildRequires: ruby-devel ruby
BuildRequires: SDL-devel
BuildRequires: taglib-devel
BuildRequires: xine-lib-devel
BuildRequires: sqlite-devel
# not used anymore, in favor of libvisual ? -- Rex
#%{?fedora:BuildRequires: xmms-devel}
BuildRequires: dbus-devel
BuildRequires: dbus-tqt-devel
# For dir ownership and some default plugins (lyrics), -ruby subpkg? -- Rex
Requires: ruby
# To open the selected browser, works with Patch2
Requires: xdg-utils
Requires(post): xdg-utils
Requires(postun): xdg-utils
Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
Obsoletes: amarok-devel < %{version}-%{release}
%if 0%{?fedora} > 6 && 0%{?fedora} < 9
# need to keep this around for previous releases, so not to break multilib compat.
Provides: amarok-devel = %{version}-%{release}
%endif
# engines, etc...
# old, obsolete ones: arts, akode
Obsoletes: amarok-arts < 1.3, amarok-akode < 1.3
%if 0%{?_with_xine}
# xine-lib
Provides: %{name}-engine-xine = %{version}-%{release}
%endif
%description
Amarok is a multimedia player with:
- fresh playlist concept, very fast to use, with drag and drop
- plays all formats supported by the various engines
- audio effects, like reverb and compressor
- compatible with the .m3u and .pls formats for playlists
- nice GUI, integrates into the KDE look, but with a unique touch
%package konqueror
Summary: Amarok konqueror (service menus, sidebar) support
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
%description konqueror
%{summary}.
%package visualisation
Summary: Visualisation plugins for Amarok
Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
# No plugins by default, we need libvisual-plugins
Requires: libvisual-plugins
%description visualisation
Amarok can use visualisation plugins from different origins.
Right now, only xmms is supported, which means that you can
use any of xmms' visualisation plugins with Amarok.
%prep
%setup -q -n applications/amarok
%patch1 -p1 -b .gcc43
%build
unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}"
export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
%__mkdir_p build
cd build
%cmake \
-DWITH_LIBVISUAL=ON \
-DWITH_KONQSIDEBAR=OFF \
-DWITH_XINE=ON \
-DWITH_YAUAP=ON \
-DWITH_IPOD=ON \
-DWITH_IFP=ON \
-DWITH_NJB=ON \
-DWITH_MTP=ON \
-DWITH_RIOKARMA=OFF \
-DWITH_DAAP=ON \
-DBUILD_ALL=ON \
..
%__make %{?_smp_mflags}
%install
rm -fr $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT -C build
# desktop files
desktop-file-install --vendor "" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
--delete-original \
$RPM_BUILD_ROOT%{_datadir}/applications/kde/amarok.desktop
# unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
%if ! 0%{?konq}
rm -f $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/*.desktop
%endif
# HTML
for lang_dir in $RPM_BUILD_ROOT%{_docdir}/HTML/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
[ "$lang" == "en" ] && d=en/%{name} || d=$lang
echo "%lang($lang) %doc %{_docdir}/HTML/$d" >> %{name}.lang
fi
done
%post
/sbin/ldconfig
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
xdg-desktop-menu forceupdate 2> /dev/null || :
%postun
/sbin/ldconfig
xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
xdg-desktop-menu forceupdate 2> /dev/null || :
%clean
rm -fr $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS ChangeLog README
%{_bindir}/amarok
%{_bindir}/amarokapp
%{_bindir}/amarokcollectionscanner
%{_bindir}/amarok_proxy.rb
%{_datadir}/apps/amarok/
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/applications/kde/*.desktop
%{_datadir}/servicetypes/*.desktop
%{_datadir}/apps/profiles/amarok.profile.xml
%{_datadir}/config/amarokrc
%{_datadir}/config.kcfg/*.kcfg
%{_datadir}/services/amarokitpc.protocol
%{_datadir}/services/amaroklastfm.protocol
%{_datadir}/services/amarokpcast.protocol
# -libs ? -- Rex
%{_libdir}/libamarok.*
# -ruby ? -- Rex
%{_libdir}/ruby_lib/*
# DAAP
%{_bindir}/amarok_daapserver.rb
%{tde_libdir}/libamarok_daap-mediadevice.*
%{_datadir}/services/amarok_daap-mediadevice.desktop
# Mass-storage
%{_datadir}/services/amarok_massstorage-device.desktop
%{tde_libdir}/libamarok_massstorage-device.*
# NFS
%{_datadir}/services/amarok_nfs-device.desktop
%{tde_libdir}/libamarok_nfs-device.*
# SMB
%{_datadir}/services/amarok_smb-device.desktop
%{tde_libdir}/libamarok_smb-device.*
# IPod
%{_datadir}/services/amarok_ipod-mediadevice.desktop
%{tde_libdir}/libamarok_ipod-mediadevice.*
# VFAT
%{_datadir}/services/amarok_generic-mediadevice.desktop
%{tde_libdir}/libamarok_generic-mediadevice.*
# iRiver
%{_datadir}/services/amarok_ifp-mediadevice.desktop
%{tde_libdir}/libamarok_ifp-mediadevice.*
# Creative Zen
%{_datadir}/services/amarok_njb-mediadevice.desktop
%{tde_libdir}/libamarok_njb-mediadevice.*
# MTP players
%{_datadir}/services/amarok_mtp-mediadevice.desktop
%{tde_libdir}/libamarok_mtp-mediadevice.*
# Rio Karma
#%{_datadir}/services/amarok_riokarma-mediadevice.desktop
#%{tde_libdir}/libamarok_riokarma-mediadevice.*
# Void engine (noop)
%{_datadir}/services/amarok_void-engine_plugin.desktop
%{tde_libdir}/libamarok_void-engine_plugin.*
# Xine engine
%{_datadir}/services/amarok_xine-engine.desktop
%{tde_libdir}/libamarok_xine-engine.*
## Gstreamer engine
#%{_datadir}/services/amarok_gst10engine_plugin.desktop
#%{tde_libdir}/libamarok_gst10engine_plugin.*
# YAUAP
%{_datadir}/services/amarok_yauap-engine_plugin.desktop
%{tde_libdir}/libamarok_yauap-engine_plugin.*
%{tde_docdir}/HTML/*/amarok
%{_datadir}/locale/*/LC_MESSAGES/amarok.mo
%if 0%{?konq}
%files konqueror
%defattr(-,root,root,-)
%{_datadir}/apps/konqueror/servicemenus/*.desktop
%{tde_libdir}/konqsidebar_universalamarok.*
%{_datadir}/apps/konqsidebartng/*/amarok.desktop
%endif
%files visualisation
%defattr(-,root,root,-)
%{_bindir}/amarok_libvisual
%changelog
* Wed Nov 09 2011 Francois Andriot <francois.andriot@free.fr> - 1.4.10-1
- Initial build for TDE 3.5.13 on RHEL 5, RHEL 6, Fedora 15, Fedora 16
- Spec file based on Fedora 8 'amarok-1.4.10-1'

@ -0,0 +1,187 @@
# Default version for this component
%define kdecomp kaffeine
%define version 0.8.6
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
%define _variant .opt
%define _docdir %{_prefix}/share/doc
%endif
# TDE 3.5.13 specific building variables
BuildRequires: autoconf automake libtool m4
%define tde_docdir %{_docdir}/kde
%define tde_includedir %{_includedir}/kde
%define tde_libdir %{_libdir}/trinity
Name: trinity-%{kdecomp}
Summary: sudo frontend for Trinity
Version: %{?version}
Release: %{?release}%{?dist}%{?_variant}
License: GPLv2+
Summary: Xine-based media player
Group: Applications/Multimedia
URL: http://kaffeine.sourceforge.net/
Source0: kaffeine-3.5.13.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gettext
BuildRequires: trinity-kdelibs-devel
BuildRequires: cdparanoia-devel cdparanoia
BuildRequires: libvorbis-devel
BuildRequires: xine-lib-devel
BuildRequires: libxcb-devel
BuildRequires: libXext-devel libXinerama-devel libXtst-devel
BuildRequires: libcdio-devel
# dvb
BuildRequires: glibc-kernheaders
BuildRequires: gstreamer-devel >= 0.10, gstreamer-plugins-base-devel >= 0.10
Requires: %{name}-libs = %{version}-%{release}
%description
Kaffeine is a xine-based media player for KDE. It plays back CDs,
and VCDs, and can decode all (local or streamed) multimedia formats
supported by xine-lib.
Additionally, Kaffeine is fully integrated in KDE, it supports drag
and drop and provides an editable playlist, a bookmark system, a
Konqueror plugin, OSD and much more.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: trinity-kdelibs-devel
%description devel
%{summary}.
%package libs
Summary: %{name} runtime libraries
Group: System Environment/Libraries
# helps multilib upgrades
Obsoletes: %{name} < %{version}-%{release}
# include to be paranoid, installing libs-only is still mostly untested -- Rex
Requires: %{name} = %{version}-%{release}
%description libs
%{summary}.
%prep
%setup -q -n applications/kaffeine
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
sed -i admin/acinclude.m4.in \
-e "s,/usr/include/tqt,%{_includedir}/tqt,g"
%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
%__make -f admin/Makefile.common
%build
unset QTDIR || : ; source /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}"
export LDFLAGS="-L%{_libdir} -I%{_includedir}"
# easier than patching, and using
# --with-extra-includes=%{_includedir}/cdda below -- Rex
#CPPFLAGS="-I%{_includedir}/cdda"; export CPPFLAGS
%configure \
--disable-rpath \
--enable-new-ldflags \
--disable-debug --disable-warnings \
--disable-dependency-tracking --disable-final \
--with-gstreamer \
--without-lame \
--with-extra-includes=%{_includedir}/tqt
%__make %{?_smp_mflags}
%install
export PATH="%{_bindir}:${PATH}"
%__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=$RPM_BUILD_ROOT
## File lists
# locale's
%find_lang %{kdecomp}
# HTML (1.0)
HTML_DIR=$(kde-config --expandvars --install html)
if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
if [ -d $lang_dir ]; then
lang=$(basename $lang_dir)
echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
# replace absolute symlinks with relative ones
pushd $lang_dir
for i in *; do
[ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
done
popd
fi
done
fi
# Unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
rm -f $RPM_BUILD_ROOT%{_datadir}/mimelnk/application/x-mplayer2.desktop
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database >& /dev/null ||:
%postun
touch --no-create %{_datadir}/icons/hicolor ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
update-desktop-database >& /dev/null ||:
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files -f %{kdecomp}.lang
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{_bindir}/kaffeine
%{_libdir}/libkaffeinepart.so
%{tde_libdir}/lib*.*
%{_datadir}/appl*/*/*.desktop
%{_datadir}/apps/gstreamerpart/
%{_datadir}/apps/kaffeine/
%{_datadir}/apps/konqueror/servicemenus/*.desktop
%{_datadir}/apps/profiles/
%{_datadir}/icons/hicolor/*/*/*
%{_datadir}/mimelnk/*/*.desktop
%{_datadir}/service*/*.desktop
%{_docdir}/HTML/en/kaffeine
%files libs
%defattr(-,root,root,-)
%{_libdir}/lib*.so.*
%files devel
%defattr(-,root,root,-)
%{_includedir}/kaffeine/
%{_libdir}/lib*.so
%exclude %{_libdir}/libkaffeinepart.so
%changelog
* Wed Nov 09 2011 Francois Andriot <francois.andriot@free.fr> - 0.8.6-1
- Spec file based on Fedora 8 'kaffeine-0.8.6-3'

@ -0,0 +1,10 @@
--- knetworkmanager8/knetworkmanager-0.8/src/CMakeLists.txt.ORI 2011-11-11 15:06:49.854247242 -0500
+++ knetworkmanager8/knetworkmanager-0.8/src/CMakeLists.txt 2011-11-11 15:06:58.662060747 -0500
@@ -18,6 +18,7 @@
${CMAKE_BINARY_DIR}
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
+ ${DBUS_INCLUDE_DIRS}
${DBUS_TQT_INCLUDE_DIRS}
${NM_UTIL_INCLUDE_DIRS}
)

@ -0,0 +1,22 @@
--- knetworkmanager9/CMakeLists.txt.ORI 2011-11-11 13:36:01.462536187 -0500
+++ knetworkmanager9/CMakeLists.txt 2011-11-11 13:36:10.762446937 -0500
@@ -63,7 +63,7 @@
##### source directories ########################
-add_subdirectory( knetworkmanager-0.8 )
+add_subdirectory( knetworkmanager-0.9 )
##### write configure files #####################
--- knetworkmanager9/knetworkmanager-0.9/src/dbus/CMakeLists.txt.ORI 2011-11-11 13:39:32.866229477 -0500
+++ knetworkmanager9/knetworkmanager-0.9/src/dbus/CMakeLists.txt 2011-11-11 13:39:48.169042904 -0500
@@ -18,7 +18,7 @@
##### knm_dbus (static) #########################
-set( INTROSPECTIONPATH "${CMAKE_SOURCE_DIR}/knetworkmanager-0.8/introspection" )
+set( INTROSPECTIONPATH "${CMAKE_SOURCE_DIR}/knetworkmanager-0.9/introspection" )
# options:
# p - generate proxy files

@ -0,0 +1,33 @@
diff -Nuar knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.cpp knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.cpp
--- knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.cpp 2011-11-11 20:45:47.964680619 +0100
+++ knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.cpp 2011-11-11 20:51:32.689072955 +0100
@@ -432,14 +432,15 @@
, _wireless_setting(wireless_setting)
{
txtPSK->setText(_security_setting->getPSK());
- connect(txtPSK, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotPSKChanged(const TQString&)));
+ connect(txtPSK, TQT_SIGNAL(lostFocus()), this, TQT_SLOT(slotPSKChanged()));
}
void
-WirelessSecurityWPAPSKImpl::slotPSKChanged(const TQString& psk)
+WirelessSecurityWPAPSKImpl::slotPSKChanged()
{
if (_wireless_setting)
{
+ TQString psk = txtPSK->text();
_security_setting->setPSK(psk);
}
}
diff -Nuar knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.h knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.h
--- knetworkmanager9/knetworkmanager-0.9/src.ORI//knetworkmanager-connection_setting_wireless_security_widget.h 2011-11-11 20:45:47.962680657 +0100
+++ knetworkmanager9/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.h 2011-11-11 20:46:21.640030856 +0100
@@ -145,7 +145,7 @@
TQCString String2Hex(TQByteArray bytes, int final_len) const;
public slots:
- void slotPSKChanged(const TQString&);
+ void slotPSKChanged();
private:
WirelessSecurity* _security_setting;

@ -0,0 +1,149 @@
# Default version for this component
%define kdecomp knetworkmanager
%if 0%{?fedora} >= 15
%define version 0.9
%else
%define version 0.8
%endif
%define release 2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
%define _variant .opt
%define _docdir %{_prefix}/share/doc
%endif
# TDE 3.5.13 specific building variables
BuildRequires: cmake >= 2.8
%define tde_docdir %{_docdir}/kde
%define tde_libdir %{_libdir}/trinity
Name: trinity-%{kdecomp}
Version: %{?version}
Release: %{?release}%{?dist}%{?_variant}
Summary: Trinity applet for Network Manager
Group: Applications/Internet
License: GPLv2+
URL: http://en.opensuse.org/Projects/KNetworkManager
%if "%{?version}" == "0.9"
Source0: %{kdecomp}9-3.5.13.tar.gz
%else
Source0: %{kdecomp}8-3.5.13.tar.gz
%endif
Patch0: knetworkmanager-3.5.13-missing_includes.patch
Patch1: knetworkmanager-3.5.13-wpa_passphrase_lag.patch
# For knetworkmanager 0.9 only !
Patch10: knetworkmanager-3.5.13-subdir_version.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: NetworkManager-gnome
Requires: kde-filesystem
BuildRequires: desktop-file-utils
BuildRequires: dbus-1-tqt-devel
BuildRequires: dbus-tqt-devel
BuildRequires: NetworkManager-glib-devel
%description
KNetworkManager is a system tray applet for controlling network
connections on systems that use the NetworkManager daemon.
%package devel
Summary: Common data shared among the MySQL GUI Suites
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
Development headers for knetworkmanager
%prep
%if "%{?version}" == "0.9"
%setup -q -n applications/%{kdecomp}9
%else
%setup -q -n applications/%{kdecomp}8
%endif
%if "%{?version}" == "0.9"
%patch10 -p1
%endif
cd knetworkmanager-0.*/src
%patch0 -p3
#patch1 -p3
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{_libdir}/pkgconfig"
export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
export LD_LIBRARY_PATH="%{_libdir}"
# Missing TDE macros
%__mkdir_p cmake
%__ln_s %{_datadir}/cmake cmake/modules
%__mkdir build
cd build
%cmake ..
%__make %{?_smp_mflags}
%install
%__rm -rf $RPM_BUILD_ROOT
%__make install DESTDIR=%{?buildroot} -C build
%clean
%__rm -rf $RPM_BUILD_ROOT
%post
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%postun
/sbin/ldconfig
touch --no-create %{_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%post devel
/sbin/ldconfig
%postun devel
/sbin/ldconfig
%files
%defattr(-,root,root,-)
%{_bindir}/knetworkmanager
%{_libdir}/*.la
%{_libdir}/*.so
%{_sysconfdir}/dbus-1/system.d/knetworkmanager.conf
%{_datadir}/applications/kde/knetworkmanager.desktop
%{_datadir}/apps/knetworkmanager
%{_datadir}/icons/*/*/apps/knetworkmanager*
%{_datadir}/servicetypes/knetworkmanager_plugin.desktop
%{_datadir}/servicetypes/knetworkmanager_vpnplugin.desktop
%files devel
%defattr(-,root,root,-)
%{_includedir}/*.h
%{tde_libdir}/*.la
%{tde_libdir}/*.so
%changelog
* Sat Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-2 / 0.9-2
- Remove faulty patch for WPA authentication
* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 0.8-1 / 0.9-1
- Initial build

@ -3,9 +3,11 @@ dependencies/libcaldav
dependencies/libcarddav
dependencies/tqtinterface
dependencies/dbus-tqt
dependencies/dbus-1-tqt
dependencies/arts
trinity-desktop
trinity-settings
#trinity-settings
trinity-live
kdelibs
kdebase
kdebindings
@ -39,7 +41,7 @@ applications/filelight
applications/kdiff3
#applications/kuickshow
#applications/basket
applications/katapult
#applications/katapult
#compizconfig-backend-kconfig
applications/kbookreader
applications/kdbusnotification
@ -49,3 +51,6 @@ applications/kdesudo
applications/digikam
applications/konversation
applications/ksensors
applications/amarok
applications/kaffeine
applications/knetworkmanager

@ -0,0 +1,139 @@
diff -Nuar arts.ORI/artsc/CMakeLists.txt arts.PATCHED/artsc/CMakeLists.txt
--- arts.ORI/artsc/CMakeLists.txt 2011-06-12 07:57:03.000000000 +0200
+++ arts.PATCHED/artsc/CMakeLists.txt 2011-11-14 21:53:12.000000000 +0100
@@ -43,6 +43,7 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
+ ${CMAKE_SOURCE_DIR}/artsc
${CMAKE_BINARY_DIR}/mcop
${CMAKE_SOURCE_DIR}/mcop
${CMAKE_BINARY_DIR}/flow
@@ -64,7 +65,7 @@
tde_add_library( artsdsp SHARED
SOURCES artsdsp.c
VERSION 0.0.0
- LINK artsc-shared
+ LINK artsc-shared dl
DESTINATION ${LIB_INSTALL_DIR}
)
diff -Nuar arts.ORI/CMakeLists.txt arts.PATCHED/CMakeLists.txt
--- arts.ORI/CMakeLists.txt 2011-03-28 04:09:15.000000000 +0200
+++ arts.PATCHED/CMakeLists.txt 2011-11-14 21:53:46.000000000 +0100
@@ -33,6 +33,7 @@
option( WITH_AUDIOFILE "Enable audiofile (wav) support" ON )
option( WITH_VORBIS "Enable Ogg/Vorbis support" ON )
option( WITH_MAD "Enable MAD mp3 decoder support" ON )
+option( WITH_ESOUND "Enable ESOUND support" OFF )
##### paths setup ###############################
@@ -58,6 +59,8 @@
check_include_file( "malloc.h" HAVE_MALLOC_H )
check_include_file( "memory.h" HAVE_MEMORY_H )
check_include_file( "dlfcn.h" HAVE_DLFCN_H )
+check_include_file( "sys/soundcard.h" HAVE_SYS_SOUNDCARD_H )
+check_include_file( "pthread.h" HAVE_LIBPTHREAD )
##### check for system libraries ################
@@ -145,6 +148,21 @@
endif( WITH_ALSA )
+##### check for esound #######################
+
+set( HAVE_LIBESD 0 )
+if( WITH_ESOUND )
+
+ pkg_search_module( ESOUND esound )
+ if( ESOUND_FOUND )
+ set( HAVE_LIBESD 1 )
+ else( ESOUND_FOUND )
+ message(FATAL_ERROR "\nESOUND support is requested, but `libesd` not found" )
+ endif( ESOUND_FOUND )
+
+endif( WITH_ESOUND )
+
+
##### check for glib/gthread modules ############
pkg_search_module( GLIB2 glib-2.0 )
diff -Nuar arts.ORI/config.h.cmake arts.PATCHED/config.h.cmake
--- arts.ORI/config.h.cmake 2010-10-12 03:53:06.000000000 +0200
+++ arts.PATCHED/config.h.cmake 2011-11-14 22:00:50.000000000 +0100
@@ -23,8 +23,14 @@
#cmakedefine HAVE_LIBAUDIOFILE 1
+#cmakedefine HAVE_LIBESD 1
+
#cmakedefine HAVE_LIBASOUND2 1
#cmakedefine HAVE_ALSA_ASOUNDLIB_H 1
#cmakedefine HAVE_SND_PCM_RESUME 1
#cmakedefine ALSA_PCM_OLD_SW_PARAMS_API 1
#cmakedefine ALSA_PCM_OLD_HW_PARAMS_API 1
+
+#cmakedefine HAVE_SYS_SOUNDCARD_H 1
+#cmakedefine HAVE_LIBPTHREAD 1
+#define HAVE_IOCTL_INT_ULONGINT_DOTS 3
diff -Nuar arts.ORI/flow/CMakeLists.txt arts.PATCHED/flow/CMakeLists.txt
--- arts.ORI/flow/CMakeLists.txt 2011-10-04 04:01:15.000000000 +0200
+++ arts.PATCHED/flow/CMakeLists.txt 2011-11-14 21:53:12.000000000 +0100
@@ -15,6 +15,7 @@
include_directories(
${CMAKE_BINARY_DIR}
+ ${CMAKE_SOURCE_DIR}/artsc
${CMAKE_BINARY_DIR}/mcop
${CMAKE_SOURCE_DIR}/mcop
${CMAKE_CURRENT_BINARY_DIR}
diff -Nuar arts.ORI/mcop/CMakeLists.txt arts.PATCHED/mcop/CMakeLists.txt
--- arts.ORI/mcop/CMakeLists.txt 2010-10-12 03:53:05.000000000 +0200
+++ arts.PATCHED/mcop/CMakeLists.txt 2011-11-14 22:04:29.000000000 +0100
@@ -12,11 +12,11 @@
configure_file( arts_export.h.in arts_export.h )
if( NOT EXTENSION_DIR )
- set( EXTENSION_DIR ${CMAKE_INSTALL_PREFIX}/lib )
+ set( EXTENSION_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
endif( NOT EXTENSION_DIR )
if( NOT DTRADER_DIR )
- set( DTRADER_DIR ${CMAKE_INSTALL_PREFIX}/lib/mcop )
+ set( DTRADER_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/mcop )
endif( NOT DTRADER_DIR )
add_definitions(
@@ -66,6 +66,6 @@
tde_add_library( ${target} SHARED
SOURCES ${${target}_SRCS}
VERSION 1.0.0
- LINK ltdlc-static
+ LINK ltdlc-static ${ESOUND_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}
)
diff -Nuar arts.ORI/mcop_mt/CMakeLists.txt arts.PATCHED/mcop_mt/CMakeLists.txt
--- arts.ORI/mcop_mt/CMakeLists.txt 2010-10-12 03:53:05.000000000 +0200
+++ arts.PATCHED/mcop_mt/CMakeLists.txt 2011-11-14 21:53:12.000000000 +0100
@@ -11,6 +11,11 @@
include_directories(
${CMAKE_BINARY_DIR}
+ ${CMAKE_BINARY_DIR}/flow
+ ${CMAKE_BINARY_DIR}/mcop
+ ${CMAKE_SOURCE_DIR}/flow
+ ${CMAKE_SOURCE_DIR}/mcop
+ ${GLIB2_INCLUDE_DIRS}
)
@@ -19,6 +24,6 @@
tde_add_library( mcop_mt SHARED
SOURCES threads_posix.cc
VERSION 1.0.0
- LINK artsflow-shared
+ LINK artsflow-shared pthread
DESTINATION ${LIB_INSTALL_DIR}
)

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 2
%define release 3
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -29,6 +29,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: arts-%{version}.tar.gz
# TDE 3.5.13: Re-enable lost OSS support
Patch0: arts-3.5.13-enable_oss.patch
BuildRequires: tqtinterface-devel
BuildRequires: audiofile-devel
BuildRequires: alsa-lib-devel
@ -70,6 +73,7 @@ Development files for %{name}
%prep
%setup -q -n dependencies/arts
%patch0 -p1
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@ -79,9 +83,15 @@ cd build
%cmake \
-DINCLUDE_INSTALL_DIR=%{_includedir}/arts \
-DPKGCONFIG_INSTALL_DIR=%{_libdir}/pkgconfig \
-DWITH_ALSA=ON \
-DWITH_AUDIOFILE=ON \
-DWITH_VORBIS=ON \
-DWITH_MAD=OFF \
-DWITH_ESOUND=ON \
..
#cp -f /tmp/config.h .
%__make %{?_smp_mflags}
%install
@ -121,6 +131,9 @@ cd build
%changelog
* Mon Nov 14 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
- Enables OSS and ESD support
* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Add missing BuildRequires

@ -0,0 +1,87 @@
# Default version for this component
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 1
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
%define _variant .opt
%endif
# TDE 3.5.13 specific building variables
BuildRequires: cmake >= 2.8
BuildRequires: qt3-devel >= 3.3.8d
Requires: qt3 >= 3.3.8d
Name: dbus-1-tqt
Version: %{?version}
Release: %{?release}%{?dist}%{?_variant}
License: GPL
Summary: Dbus TQT Interface
Group: System Environment/Libraries
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}.tar.gz
# Fix for a nasty memleak in knetworkmanager
Patch0: dbus1tqt-3.5.13-memory_leak.patch
BuildRequires: gcc-c++
BuildRequires: dbus-devel
BuildRequires: tqtinterface-devel
%description
Dbus TQT Interface
%package devel
Requires: %{name}
Summary: %{name} - Development files
Group: Development/Libraries
%description devel
Development files for %{name}
%prep
%setup -q -n dependencies/%{name}
#patch0 -p1
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
%__mkdir build
cd build
%cmake ..
%__make %{?_smp_mflags}
%install
%__rm -rf %{?buildroot}
%__mkdir_p %{?buildroot}%{_includedir}
%__make install DESTDIR=%{?buildroot} -C build
%clean
%__rm -rf %{?buildroot}
%files
%{_bindir}/dbusxml2qt3
%{_libdir}/*.so.*
%files devel
%{_includedir}/*.h
%{_libdir}/*.so
%{_libdir}/*.la
%{_libdir}/pkgconfig/*.pc
%changelog
* Tue Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5, Fedora 15 and Fedora 16

@ -0,0 +1,16 @@
--- dbus-1-tqt/tqdbusconnection.cpp.ORI 2011-11-11 20:37:57.684881138 +0100
+++ dbus-1-tqt/tqdbusconnection.cpp 2011-11-11 20:40:33.910795465 +0100
@@ -285,7 +285,12 @@
dbus_message_unref(msg);
- return TQT_DBusMessage::fromDBusMessage(reply);
+ TQT_DBusMessage mess = TQT_DBusMessage::fromDBusMessage(reply);
+
+ /* XXX fromDbusMessage do a ref(), avoid leaking */
+ dbus_message_unref(reply);
+
+ return mess;
}
void TQT_DBusConnection::flush() const

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 1
%define release 2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -31,9 +31,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}.tar.gz
BuildRequires: gcc-c++
BuildRequires: dbus-qt-devel
BuildRequires: dbus-devel
BuildRequires: tqtinterface-devel
Provides: dbus-qt
%description
Dbus TQT Interface
@ -42,6 +44,7 @@ Dbus TQT Interface
Requires: %{name}
Summary: %{name} - Development files
Group: Development/Libraries
Provides: dbus-qt-devel
%description devel
Development files for %{name}
@ -78,6 +81,9 @@ cd build
%{_libdir}/pkgconfig/*.pc
%changelog
* Tue Nov 07 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Updates BuildRequires
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15

@ -5,6 +5,7 @@ cd "$( dirname "$0" )"
while [ $# -gt 0 ]; do
case "$1" in
"--auto") AUTO=1;;
"--version") REQVERSION="$2"; shift;;
*) COMP="$1";;
esac
shift
@ -12,6 +13,7 @@ done
clear
cat <<EOF
$(< /etc/redhat-release) $(uname -m)
This script generates RPM of TDE from source tarball.
Please choose a TDE component to build.
@ -38,14 +40,20 @@ VERSION=$( awk '{ if ($1 == "'${COMP}'") { print $2; } }' components.txt )
# If no version is set in text file, get version number from source tarball name
if [ -z "${VERSION}" ]; then
set $( cd "${COMP}"; echo ${COMP##*/}*.tar.gz)
if [ -n "${REQVERSION}" ]; then
set $( cd "${COMP}"; echo ${COMP##*/}*-${REQVERSION}.tar.gz)
else
set $( cd "${COMP}"; echo ${COMP##*/}*.tar.gz)
fi
if [ $# -gt 1 ]; then
select VERSION in $*; do break; done
elif [ -r "${COMP}/$1" ]; then
VERSION="$1"
elif [ "${COMP}" = "trinity-live" ]; then
VERSION="3.5.13"
else
echo "No source tarball found for '${COMP}' !"
continue
exit 0
fi
VERSION="${VERSION##${COMP##*/}-}"
VERSION="${VERSION%%.tar.gz}"
@ -57,7 +65,12 @@ fi
# Chooses a spec file (if many)
set $( cd "${COMP}"; echo *.spec )
if [ $# -gt 1 ]; then
select SPEC in $*; do break; done
if [ -n "${REQVERSION}" ]; then
set $( cd "${COMP}"; echo *-${REQVERSION}.spec )
SPEC="$1"
else
select SPEC in $*; do break; done
fi
elif [ -r "${COMP}/$1" ]; then
SPEC="$1"
else
@ -85,6 +98,8 @@ if [ "$(rpm -q --qf '%{arch}' kernel)" = "i686" ]; then
ARGS="${ARGS} --target=i686"
fi
LOGFILE=/tmp/log.${COMP##*/}
set -x
(
rpmbuild -ba \
@ -93,6 +108,18 @@ rpmbuild -ba \
--define "version ${VERSION:-3.5.13}" \
$ARGS \
${COMP}/${SPEC} || exit 1
) 2>&1 | tee /tmp/log
) 2>&1 | tee ${LOGFILE}
RET=$?
set +x
if [ ${RET} -gt 0 ]; then
exit ${RET}
fi
if grep -q "error: Failed build dependencies:" ${LOGFILE}; then
# DEPS=$( sed -n -e "/.* is needed by .*/ s/^[ \t]*\([a-zA-Z2-9_-]*\) .*/\1/p" ${LOGFILE} )
set $( grep " is needed by " ${LOGFILE} | cut -d " " -f1 )
exit 2
fi

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 2
%define release 3
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -46,6 +46,9 @@ AutoReq: no
Source0: kde-i18n-%{version}.tar.gz
# [zh_TW] Updated translations, thanks to Wei-Lun Chao !
Source1: kde-i18n-zh_TW-3.5.10.tar.bz2
# TDE 3.5.12: Translate 'kdesu' message was modified in 'kdebase' package
Patch0: kde-i18n-kdesu.patch
@ -619,6 +622,7 @@ Requires: kde-filesystem
%prep
%setup -q -n kde-i18n
%__cp -f %{SOURCE1} .
for l in %{KDE_LANGS}; do
for f in kde-i18n-${l}-*.tar.bz2; do
@ -701,476 +705,414 @@ popd
find %{buildroot}%{_docdir}/HTML -size 0 -exec rm -f {} \;
# See http://fedoraproject.org/wiki/Languages (???)
rm -f %{buildroot}%{_datadir}/locale/*/flag.png
# And also the 'desktop.entry' (???)
rm -f %{buildroot}%{_datadir}/locale/*/entry.desktop
%__rm -f %{buildroot}%{_datadir}/locale/*/flag.png
# Removes conflict with KDE4
%if "%{?_prefix}" == "/usr"
%__rm -f %{buildroot}%{_datadir}/locale/*/entry.desktop
%endif
# remove obsolete KDE 3 application data translations
rm -rf %{buildroot}%{_datadir}/apps
%__rm -rf %{buildroot}%{_datadir}/apps
%clean
rm -rf %{buildroot}
%__rm -rf %{buildroot}
%if "%( grep -w af <<< '%{KDE_LANGS}' )" != ""
%files Afrikaans
%defattr(-,root,root,-)
%lang(af) %{_datadir}/locale/af/LC_MESSAGES/*
%lang(af) %{_datadir}/locale/af/charset
%lang(af) %{_datadir}/locale/af/*
%lang(af) %{_docdir}/HTML/af/
%endif
%if "%( grep -w ar <<< '%{KDE_LANGS}' )" != ""
%files Arabic
%defattr(-,root,root,-)
%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/*
%lang(ar) %{_datadir}/locale/ar/charset
%lang(ar) %{_datadir}/locale/ar/*
%endif
%if "%( grep -w az <<< '%{KDE_LANGS}' )" != ""
%files Azerbaijani
%defattr(-,root,root,-)
%lang(az) %{_datadir}/locale/az/LC_MESSAGES/*
%lang(az) %{_datadir}/locale/az/charset
%lang(az) %{_datadir}/locale/az/*
%endif
%if "%( grep -w be <<< '%{KDE_LANGS}' )" != ""
%files Belarusian
%defattr(-,root,root,-)
%lang(be) %{_datadir}/locale/be/LC_MESSAGES/*
%lang(be) %{_datadir}/locale/be/charset
%lang(be) %{_datadir}/locale/be/*
%endif
%if "%( grep -w bg <<< '%{KDE_LANGS}' )" != ""
%files Bulgarian
%defattr(-,root,root,-)
%lang(bg) %{_datadir}/locale/bg/LC_MESSAGES/*
%lang(bg) %{_datadir}/locale/bg/charset
%lang(bg) %{_datadir}/locale/bg/*
%endif
%if "%( grep -w bn <<< '%{KDE_LANGS}' )" != ""
%files Bengali
%defattr(-,root,root,-)
%lang(bn) %{_datadir}/locale/bn/LC_MESSAGES/*
%lang(bn) %{_datadir}/locale/bn/charset
%lang(bn) %{_datadir}/locale/bn/*
%endif
%if "%( grep -w bo <<< '%{KDE_LANGS}' )" != ""
%files Tibetan
%defattr(-,root,root,-)
%lang(bo) %{_datadir}/locale/bo/LC_MESSAGES/*
%lang(bo) %{_datadir}/locale/bo/charset
%lang(bo) %{_datadir}/locale/bo/*
%endif
%if "%( grep -w br <<< '%{KDE_LANGS}' )" != ""
%files Breton
%defattr(-,root,root,-)
%lang(br) %{_datadir}/locale/br/LC_MESSAGES/*
%lang(br) %{_datadir}/locale/br/charset
%lang(br) %{_datadir}/locale/br/*
%endif
%if "%( grep -w bs <<< '%{KDE_LANGS}' )" != ""
%files Bosnian
%defattr(-,root,root,-)
%lang(bs) %{_datadir}/locale/bs/LC_MESSAGES/*
%lang(bs) %{_datadir}/locale/bs/charset
%lang(bs) %{_datadir}/locale/bs/*
%endif
%if "%( grep -w ca <<< '%{KDE_LANGS}' )" != ""
%files Catalan
%defattr(-,root,root,-)
%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/*
%lang(ca) %{_datadir}/locale/ca/charset
%lang(ca) %{_datadir}/locale/ca/*
%lang(ca) %{_docdir}/HTML/ca/
%endif
%if "%( grep -w cs <<< '%{KDE_LANGS}' )" != ""
%files Czech
%defattr(-,root,root,-)
%lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/*
%lang(cs) %{_datadir}/locale/cs/charset
%lang(cs) %{_datadir}/locale/cs/*
%lang(cs) %{_docdir}/HTML/cs/
%endif
%if "%( grep -w cy <<< '%{KDE_LANGS}' )" != ""
%files Welsh
%defattr(-,root,root,-)
%lang(cy) %{_datadir}/locale/cy/LC_MESSAGES/*
%lang(cy) %{_datadir}/locale/cy/charset
%lang(cy) %{_datadir}/locale/cy/*
%endif
%if "%( grep -w da <<< '%{KDE_LANGS}' )" != ""
%files Danish
%defattr(-,root,root,-)
%lang(da) %{_datadir}/locale/da/LC_MESSAGES/*
%lang(da) %{_datadir}/locale/da/charset
%lang(da) %{_datadir}/locale/da/da.compendium
%lang(da) %{_datadir}/locale/da/*
%lang(da) %{_docdir}/HTML/da/
%endif
%if "%( grep -w de <<< '%{KDE_LANGS}' )" != ""
%files German
%defattr(-,root,root,-)
%lang(de) %{_datadir}/locale/de/LC_MESSAGES/*
%lang(de) %{_datadir}/locale/de/charset
%lang(de) %{_datadir}/locale/de/*
%lang(de) %{_docdir}/HTML/de/
%endif
%if "%( grep -w el <<< '%{KDE_LANGS}' )" != ""
%files Greek
%defattr(-,root,root,-)
%lang(el) %{_datadir}/locale/el/LC_MESSAGES/*
%lang(el) %{_datadir}/locale/el/charset
%lang(el) %{_datadir}/locale/el/*
%endif
%if "%( grep -w en_GB <<< '%{KDE_LANGS}' )" != ""
%files British
%defattr(-,root,root,-)
%lang(en_GB) %{_datadir}/locale/en_GB/LC_MESSAGES/*
%lang(en_GB) %{_datadir}/locale/en_GB/charset
%lang(en_GB) %{_datadir}/locale/en_GB/*
%lang(en_GB) %{_docdir}/HTML/en_GB/
%endif
%if "%( grep -w eo <<< '%{KDE_LANGS}' )" != ""
%files Esperanto
%defattr(-,root,root,-)
%lang(eo) %{_datadir}/locale/eo/LC_MESSAGES/*
%lang(eo) %{_datadir}/locale/eo/charset
%lang(eo) %{_datadir}/locale/eo/*
%endif
%if "%( grep -w es <<< '%{KDE_LANGS}' )" != ""
%files Spanish
%defattr(-,root,root,-)
%lang(es) %{_datadir}/locale/es/LC_MESSAGES/*
%lang(es) %{_datadir}/locale/es/charset
%lang(es) %{_datadir}/locale/es/*
%lang(es) %{_docdir}/HTML/es/
%endif
%if "%( grep -w et <<< '%{KDE_LANGS}' )" != ""
%files Estonian
%defattr(-,root,root,-)
%lang(et) %{_datadir}/locale/et/LC_MESSAGES/*
%lang(et) %{_datadir}/locale/et/charset
%lang(et) %{_datadir}/locale/et/*
%lang(et) %{_docdir}/HTML/et/
%endif
%if "%( grep -w eu <<< '%{KDE_LANGS}' )" != ""
%files Basque
%defattr(-,root,root,-)
%lang(eu) %{_datadir}/locale/eu/LC_MESSAGES/*
%lang(eu) %{_datadir}/locale/eu/charset
%lang(eu) %{_datadir}/locale/eu/*
%endif
%if "%( grep -w fa <<< '%{KDE_LANGS}' )" != ""
%files Farsi
%defattr(-,root,root,-)
%lang(fa) %{_datadir}/locale/fa/LC_MESSAGES/*
%lang(fa) %{_datadir}/locale/fa/charset
%lang(fa) %{_datadir}/locale/fa/*
%endif
%if "%( grep -w fi <<< '%{KDE_LANGS}' )" != ""
%files Finnish
%defattr(-,root,root,-)
%lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/*
%lang(fi) %{_datadir}/locale/fi/charset
%lang(fi) %{_datadir}/locale/fi/*
%lang(fi) %{_docdir}/HTML/fi/
%endif
%if "%( grep -w fo <<< '%{KDE_LANGS}' )" != ""
%files Faroese
%defattr(-,root,root,-)
%lang(fo) %{_datadir}/locale/fo/LC_MESSAGES/*
%lang(fo) %{_datadir}/locale/fo/charset
%lang(fo) %{_datadir}/locale/fo/*
%endif
%if "%( grep -w fr <<< '%{KDE_LANGS}' )" != ""
%files French
%defattr(-,root,root,-)
%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/*
%lang(fr) %{_datadir}/locale/fr/charset
%lang(fr) %{_datadir}/locale/fr/nbsp_gui_fr.txt
%lang(fr) %{_datadir}/locale/fr/relecture_*
%lang(fr) %{_datadir}/locale/fr/*
%lang(fr) %{_docdir}/HTML/fr/
%endif
%if "%( grep -w fy <<< '%{KDE_LANGS}' )" != ""
%files Frisian
%defattr(-,root,root,-)
%lang(fy) %{_datadir}/locale/fy/LC_MESSAGES/*
%lang(fy) %{_datadir}/locale/fy/charset
%lang(fy) %{_datadir}/locale/fy/*
%endif
%if "%( grep -w ga <<< '%{KDE_LANGS}' )" != ""
%files Irish
%defattr(-,root,root,-)
%lang(ga) %{_datadir}/locale/ga/LC_MESSAGES/*
%lang(ga) %{_datadir}/locale/ga/charset
%lang(ga) %{_datadir}/locale/ga/*
%endif
%if "%( grep -w gl <<< '%{KDE_LANGS}' )" != ""
%files Galician
%defattr(-,root,root,-)
%lang(gl) %{_datadir}/locale/gl/LC_MESSAGES/*
%lang(gl) %{_datadir}/locale/gl/charset
%lang(gl) %{_datadir}/locale/gl/*
%endif
%if "%( grep -w he <<< '%{KDE_LANGS}' )" != ""
%files Hebrew
%defattr(-,root,root,-)
%lang(he) %{_datadir}/locale/he/LC_MESSAGES/*
%lang(he) %{_datadir}/locale/he/charset
%lang(he) %{_datadir}/locale/he/*
%lang(he) %{_docdir}/HTML/he/
%endif
%if "%( grep -w hi <<< '%{KDE_LANGS}' )" != ""
%files Hindi
%defattr(-,root,root,-)
%lang(hi) %{_datadir}/locale/hi/LC_MESSAGES/*
%lang(hi) %{_datadir}/locale/hi/charset
%lang(hi) %{_datadir}/locale/hi/*
%endif
%if "%( grep -w hr <<< '%{KDE_LANGS}' )" != ""
%files Croatian
%defattr(-,root,root,-)
%lang(hr) %{_datadir}/locale/hr/LC_MESSAGES/*
%lang(hr) %{_datadir}/locale/hr/charset
%lang(hr) %{_datadir}/locale/hr/*
%lang(hr) %{_docdir}/HTML/hr/
%endif
%if "%( grep -w hu <<< '%{KDE_LANGS}' )" != ""
%files Hungarian
%defattr(-,root,root,-)
%lang(hu) %{_datadir}/locale/hu/LC_MESSAGES/*
%lang(hu) %{_datadir}/locale/hu/charset
%lang(hu) %{_datadir}/locale/hu/*
%lang(hu) %{_docdir}/HTML/hu/
%endif
%if "%( grep -w id <<< '%{KDE_LANGS}' )" != ""
%files Indonesian
%defattr(-,root,root,-)
%lang(id) %{_datadir}/locale/id/LC_MESSAGES/*
%lang(id) %{_datadir}/locale/id/charset
%lang(id) %{_datadir}/locale/id/*
%lang(id) %{_docdir}/HTML/id/
%endif
%if "%( grep -w is <<< '%{KDE_LANGS}' )" != ""
%files Icelandic
%defattr(-,root,root,-)
%lang(is) %{_datadir}/locale/is/LC_MESSAGES/*
%lang(is) %{_datadir}/locale/is/charset
%lang(is) %{_datadir}/locale/is/*
%endif
%if "%( grep -w it <<< '%{KDE_LANGS}' )" != ""
%files Italian
%defattr(-,root,root,-)
%lang(it) %{_datadir}/locale/it/LC_MESSAGES/*
%lang(it) %{_datadir}/locale/it/charset
%lang(it) %{_datadir}/locale/it/*
%lang(it) %{_docdir}/HTML/it/
%endif
%if "%( grep -w ja <<< '%{KDE_LANGS}' )" != ""
%files Japanese
%defattr(-,root,root,-)
%lang(ja) %{_datadir}/locale/ja/LC_MESSAGES/*
%lang(ja) %{_datadir}/locale/ja/charset
%lang(ja) %{_datadir}/locale/ja/*
%lang(ja) %{_docdir}/HTML/ja/
%endif
%if "%( grep -w ko <<< '%{KDE_LANGS}' )" != ""
%files Korean
%defattr(-,root,root,-)
%lang(ko) %{_datadir}/locale/ko/LC_MESSAGES/*
%lang(ko) %{_datadir}/locale/ko/charset
%lang(ko) %{_datadir}/locale/ko/*
%lang(ko) %{_docdir}/HTML/ko/
%endif
%if "%( grep -w ku <<< '%{KDE_LANGS}' )" != ""
%files Kurdish
%defattr(-,root,root,-)
%lang(ku) %{_datadir}/locale/ku/LC_MESSAGES/*
%lang(ku) %{_datadir}/locale/ku/charset
%lang(ku) %{_datadir}/locale/ku/*
%lang(ku) %{_docdir}/HTML/ku/
%endif
%if "%( grep -w lao <<< '%{KDE_LANGS}' )" != ""
%files Lao
%defattr(-,root,root,-)
%lang(lo) %{_datadir}/locale/lo/LC_MESSAGES/*
%lang(lo) %{_datadir}/locale/lo/charset
%lang(lo) %{_datadir}/locale/lo/*
%lang(lo) %{_docdir}/HTML/lo/
%endif
%if "%( grep -w lt <<< '%{KDE_LANGS}' )" != ""
%files Lithuanian
%defattr(-,root,root,-)
%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
%lang(lt) %{_datadir}/locale/lt/charset
%lang(lt) %{_datadir}/locale/lt/*
%endif
%if "%( grep -w lv <<< '%{KDE_LANGS}' )" != ""
%files Latvian
%defattr(-,root,root,-)
%lang(lv) %{_datadir}/locale/lv/LC_MESSAGES/*
%lang(lv) %{_datadir}/locale/lv/charset
%lang(lv) %{_datadir}/locale/lv/*
%endif
%if "%( grep -w mi <<< '%{KDE_LANGS}' )" != ""
%files Maori
%defattr(-,root,root,-)
%lang(mi) %{_datadir}/locale/mi/LC_MESSAGES/*
%lang(mi) %{_datadir}/locale/mi/charset
%lang(mi) %{_datadir}/locale/mi/*
%endif
%if "%( grep -w mk <<< '%{KDE_LANGS}' )" != ""
%files Macedonian
%defattr(-,root,root,-)
%lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/*
%lang(mk) %{_datadir}/locale/mk/charset
%lang(mk) %{_datadir}/locale/mk/*
%endif
%if "%( grep -w mt <<< '%{KDE_LANGS}' )" != ""
%files Maltese
%defattr(-,root,root,-)
%lang(mt) %{_datadir}/locale/mt/LC_MESSAGES/*
%lang(mt) %{_datadir}/locale/mt/charset
%lang(mt) %{_datadir}/locale/mt/*
%endif
%if "%( grep -w nl <<< '%{KDE_LANGS}' )" != ""
%files Dutch
%defattr(-,root,root,-)
%lang(nl) %{_datadir}/locale/nl/LC_MESSAGES/*
%lang(nl) %{_datadir}/locale/nl/charset
%lang(nl) %{_datadir}/locale/nl/*
%lang(nl) %{_docdir}/HTML/nl/
%endif
%if "%( grep -w nb <<< '%{KDE_LANGS}' )" != ""
%files Norwegian
%defattr(-,root,root,-)
%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
%lang(nb) %{_datadir}/locale/nb/charset
%lang(nb) %{_datadir}/locale/nb/README
%lang(nb) %{_datadir}/locale/nb/*
#%lang(nb) %{_docdir}/HTML/nb/
%endif
%if "%( grep -w nn <<< '%{KDE_LANGS}' )" != ""
%files Norwegian-Nynorsk
%defattr(-,root,root,-)
%lang(nn) %{_datadir}/locale/nn/LC_MESSAGES/*
%lang(nn) %{_datadir}/locale/nn/charset
%lang(nn) %{_datadir}/locale/nn/*
#%lang(nn) %{_docdir}/HTML/nn/
%endif
%if "%( grep -w oc <<< '%{KDE_LANGS}' )" != ""
%files Occitan
%defattr(-,root,root,-)
%lang(oc) %{_datadir}/locale/oc/LC_MESSAGES/*
%lang(oc) %{_datadir}/locale/oc/charset
%lang(oc) %{_datadir}/locale/oc/*
%endif
%if "%( grep -w pa <<< '%{KDE_LANGS}' )" != ""
%files Punjabi
%defattr(-,root,root,-)
%lang(pa) %{_datadir}/locale/pa/LC_MESSAGES/*
%lang(pa) %{_datadir}/locale/pa/charset
%lang(pa) %{_datadir}/locale/pa/*
%endif
%if "%( grep -w pl <<< '%{KDE_LANGS}' )" != ""
%files Polish
%defattr(-,root,root,-)
%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/*
%lang(pl) %{_datadir}/locale/pl/charset
%lang(pl) %{_datadir}/locale/pl/*
%lang(pl) %{_docdir}/HTML/pl/
%endif
%if "%( grep -w pt <<< '%{KDE_LANGS}' )" != ""
%files Portuguese
%defattr(-,root,root,-)
%lang(pt) %{_datadir}/locale/pt/LC_MESSAGES/*
%lang(pt) %{_datadir}/locale/pt/charset
%lang(pt) %{_datadir}/locale/pt/*
%lang(pt) %{_docdir}/HTML/pt/
%endif
%if "%( grep -w pt_BR <<< '%{KDE_LANGS}' )" != ""
%files Brazil
%defattr(-,root,root,-)
%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/*
%lang(pt_BR) %{_datadir}/locale/pt_BR/charset
%lang(pt_BR) %{_datadir}/locale/pt_BR/*
%lang(pt_BR) %{_docdir}/HTML/pt_BR/
%endif
%if "%( grep -w ro <<< '%{KDE_LANGS}' )" != ""
%files Romanian
%defattr(-,root,root,-)
%lang(ro) %{_datadir}/locale/ro/LC_MESSAGES/*
%lang(ro) %{_datadir}/locale/ro/charset
%lang(ro) %{_datadir}/locale/ro/*
%lang(ro) %{_docdir}/HTML/ro/
%endif
%if "%( grep -w ru <<< '%{KDE_LANGS}' )" != ""
%files Russian
%defattr(-,root,root,-)
%lang(ru) %{_datadir}/locale/ru/LC_MESSAGES/*
%lang(ru) %{_datadir}/locale/ru/charset
%lang(ru) %{_datadir}/locale/ru/*
%lang(ru) %{_docdir}/HTML/ru/
%endif
%if "%( grep -w sk <<< '%{KDE_LANGS}' )" != ""
%files Slovak
%defattr(-,root,root,-)
%lang(sk) %{_datadir}/locale/sk/LC_MESSAGES/*
%lang(sk) %{_datadir}/locale/sk/charset
%lang(sk) %{_datadir}/locale/sk/*
%lang(sk) %{_docdir}/HTML/sk/
%endif
%if "%( grep -w sl <<< '%{KDE_LANGS}' )" != ""
%files Slovenian
%defattr(-,root,root,-)
%lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
%lang(sl) %{_datadir}/locale/sl/charset
%lang(sl) %{_datadir}/locale/sl/*
%lang(sl) %{_docdir}/HTML/sl/
%endif
%if "%( grep -w sr <<< '%{KDE_LANGS}' )" != ""
%files Serbian
%defattr(-,root,root,-)
%lang(sr) %{_datadir}/locale/sr/LC_MESSAGES/*
%lang(sr) %{_datadir}/locale/sr/charset
%lang(sr) %{_datadir}/locale/sr/*
%lang(sr) %{_docdir}/HTML/sr/
%endif
%if "%( grep -w sv <<< '%{KDE_LANGS}' )" != ""
%files Swedish
%defattr(-,root,root,-)
%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/*
%lang(sv) %{_datadir}/locale/sv/charset
%lang(sv) %{_datadir}/locale/sv/*
%lang(sv) %{_docdir}/HTML/sv/
%endif
%if "%( grep -w ta <<< '%{KDE_LANGS}' )" != ""
%files Tamil
%defattr(-,root,root,-)
%lang(ta) %{_datadir}/locale/ta/LC_MESSAGES/*
%lang(ta) %{_datadir}/locale/ta/charset
%lang(ta) %{_datadir}/locale/ta/*
%endif
%if "%( grep -w tg <<< '%{KDE_LANGS}' )" != ""
%files Tajik
%defattr(-,root,root,-)
%lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
%lang(tg) %{_datadir}/locale/tg/charset
%lang(tg) %{_datadir}/locale/tg/*
%endif
%if "%( grep -w th <<< '%{KDE_LANGS}' )" != ""
%files Thai
%defattr(-,root,root,-)
%lang(th) %{_datadir}/locale/th/LC_MESSAGES/*
%lang(th) %{_datadir}/locale/th/charset
%lang(th) %{_datadir}/locale/th/*
%endif
%if "%( grep -w tr <<< '%{KDE_LANGS}' )" != ""
%files Turkish
%defattr(-,root,root,-)
%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
%lang(tr) %{_datadir}/locale/tr/charset
%lang(tr) %{_datadir}/locale/tr/*
%lang(tr) %{_docdir}/HTML/tr/
%endif
@ -1178,56 +1120,53 @@ rm -rf %{buildroot}
%files Ukrainian
%defattr(-,root,root,-)
%lang(uk) %{_docdir}/HTML/uk/
%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
%lang(uk) %{_datadir}/locale/uk/charset
%lang(uk) %{_datadir}/locale/uk/*
%endif
%if "%( grep -w ven <<< '%{KDE_LANGS}' )" != ""
%files Venda
%defattr(-,root,root,-)
%lang(ven) %{_datadir}/locale/ven/LC_MESSAGES/*
%lang(ven) %{_datadir}/locale/ven/charset
%lang(ven) %{_datadir}/locale/ven/*
%endif
%if "%( grep -w vi <<< '%{KDE_LANGS}' )" != ""
%files Vietnamese
%defattr(-,root,root,-)
%lang(vi) %{_datadir}/locale/vi/LC_MESSAGES/*
%lang(vi) %{_datadir}/locale/vi/charset
%lang(vi) %{_datadir}/locale/vi/*
%endif
%if "%( grep -w wa <<< '%{KDE_LANGS}' )" != ""
%files Walloon
%defattr(-,root,root,-)
%lang(wa) %{_datadir}/locale/wa/LC_MESSAGES/*
%lang(wa) %{_datadir}/locale/wa/charset
%lang(wa) %{_datadir}/locale/wa/*
%endif
%if "%( grep -w xh <<< '%{KDE_LANGS}' )" != ""
%files Xhosa
%defattr(-,root,root,-)
%lang(xh) %{_datadir}/locale/xh/LC_MESSAGES/*
%lang(xh) %{_datadir}/locale/xh/charset
%lang(xh) %{_datadir}/locale/xh/*
%lang(xh) %{_docdir}/HTML/xh/
%endif
%if "%( grep -w zh_CN <<< '%{KDE_LANGS}' )" != ""
%files Chinese
%defattr(-,root,root,-)
%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
%lang(zh_CN) %{_datadir}/locale/zh_CN/charset
%lang(zh_CN) %{_datadir}/locale/zh_CN/*
%lang(zh_CN) %{_docdir}/HTML/zh_CN/
%endif
%if "%( grep -w zh_TW <<< '%{KDE_LANGS}' )" != ""
%files Chinese-Big5
%defattr(-,root,root,-)
%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/*
%lang(zh_TW) %{_datadir}/locale/zh_TW/charset
%lang(zh_TW) %{_datadir}/locale/zh_TW/*
%lang(zh_TW) %{_docdir}/HTML/zh_TW/
%endif
%changelog
* Fri Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
- Re-adds missing files 'entry.desktop'
- Updates zh_TW translation, thanks to Wei-Lun Chao
* Tue Nov 01 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Add missing french translations for TDE 3.5.13

Binary file not shown.

@ -0,0 +1,13 @@
Index: ui/k_new_mnu.cpp
===================================================================
--- ui/k_new_mnu.cpp (revision 1259264)
+++ ui/k_new_mnu.cpp (working copy)
@@ -3502,6 +3502,8 @@
descr, "system:/media/" + name, nId++, -1 );
++it; // skip separator
+ ++it;
+ ++it;
}
}

@ -0,0 +1,10 @@
--- kdebase/kioslave/media/mediamanager/CMakeLists.txt.ORI 2011-11-08 15:00:40.248406596 -0500
+++ kdebase/kioslave/media/mediamanager/CMakeLists.txt 2011-11-08 15:00:56.417996538 -0500
@@ -20,6 +20,7 @@
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
${HAL_INCLUDE_DIRS}
+ ${DBUS_TQT_INCLUDE_DIRS}
)
link_directories(

@ -0,0 +1,5 @@
#%PAM-1.0
auth include system-auth
account include system-auth
password include system-auth
session include system-auth

@ -0,0 +1,15 @@
#%PAM-1.0
auth required pam_env.so
auth required pam_permit.so
auth include postlogin
account required pam_nologin.so
account include system-auth
password include system-auth
session required pam_selinux.so close
session required pam_loginuid.so
session optional pam_console.so
session required pam_selinux.so open
session optional pam_keyinit.so force revoke
session required pam_namespace.so
session include system-auth
session include postlogin

@ -0,0 +1,18 @@
#%PAM-1.0
auth [success=done ignore=ignore default=bad] pam_selinux_permit.so
auth required pam_env.so
auth substack system-auth
-auth optional pam_gnome_keyring.so
auth include postlogin
account required pam_nologin.so
account include system-auth
password include system-auth
session required pam_selinux.so close
session required pam_loginuid.so
session optional pam_console.so
session required pam_selinux.so open
session optional pam_keyinit.so force revoke
session required pam_namespace.so
-session optional pam_gnome_keyring.so auto_start
session include system-auth
session include postlogin

@ -0,0 +1,5 @@
#%PAM-1.0
auth include system-auth
account include system-auth
password include system-auth
session include system-auth

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 3
%define release 7
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -49,16 +49,47 @@ Source5: pamd.kscreensaver-trinity%{?dist}
# TDE for RHEL/Fedora specific patches
# [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box
## [kdebase/kdesu] Remove 'ignore' button on 'kdesu' dialog box
Patch3: kdebase-3.5.13-kdesu-noignorebutton.patch
# [kdebase/kdesktop] Modifies "open terminal here" on desktop
## [kdebase/kdesktop] Modifies "open terminal here" on desktop
Patch5: kdebase-3.5.12-desktop-openterminalhere.patch
# [kdebase/kioslave] Forces HAL backend to use HAL mount options
## [kdebase/kioslave] Forces HAL backend to use HAL mount options
Patch6: kdebase-3.5.12-halmountoptions.patch
# [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession'
## [kdebase/kdm/kfrontend] Global Xsession file is '/etc/X11/xinit/Xsession'
Patch7: kdebase-3.5.13-genkdmconf_Xsession_location.patch
# [kdebase/startkde] Hardcoded path '/usr/lib/xxx' in startkde, not suitable for x86_64
## [kdebase/startkde] Hardcoded path '/usr/lib/xxx' in startkde, not suitable for x86_64
Patch8: kdebase-3.5.13-startkde_ldpreload.patch
## [kdebase/kioslave/media/mediamanager] FTBFS missing dbus-tqt includes
Patch9: kdebase-3.5.13-mediamanager_ftbfs.patch
## [kdebase/kicker/kicker/ui]
Patch10: kdebase-3.5.12-kickoff_unstable.patch
## [kdebase/startkde] Sets default Start Icon in 'kickerrc'
Patch11: kdebase-3.5.13-startkde_icon.patch
# Fedora 15 Theme: "Lovelock"
%if 0%{?fedora} == 15
Requires: lovelock-backgrounds-single
%define tde_bg /usr/share/backgrounds/lovelock/default/standard/lovelock.png
%endif
# Fedora 16 Theme: "Verne"
%if 0%{?fedora} == 16
Requires: verne-backgrounds-single
%define tde_bg /usr/share/backgrounds/verne/default/standard/verne.png
%endif
# RHEL 5 Theme
%if 0%{?rhel} == 5
Requires: desktop-backgrounds-basic
%define tde_bg /usr/share/backgrounds/images/default.jpg
%endif
# RHEL 6 Theme
%if 0%{?rhel} == 6
Requires: redhat-logos
%define tde_bg /usr/share/backgrounds/default.png
%endif
BuildRequires: tqtinterface-devel
BuildRequires: trinity-arts-devel
@ -70,7 +101,8 @@ BuildRequires: imake
BuildRequires: xorg-x11-proto-devel
BuildRequires: OpenEXR-devel
BuildRequires: libsmbclient-devel
BuildRequires: dbus-devel dbus-qt-devel
BuildRequires: dbus-devel
BuildRequires: dbus-tqt-devel
BuildRequires: lm_sensors-devel
BuildRequires: libfontenc-devel
BuildRequires: hal-devel
@ -112,6 +144,10 @@ Requires: kde-settings-kdm
%endif
Requires: redhat-menus
# Required for Fedora LiveCD
Provides: service(graphical-login)
%description
Core applications for the Trinity K Desktop Environment. Included are: kdm
(replacement for xdm), kwin (window manager), konqueror (filemanager,
@ -180,7 +216,26 @@ Protocol handlers (KIOslaves) for personal information management, including:
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
cd kicker/kicker
%patch10 -p0
cd -
%patch11 -p1
# Applies an optional distro-specific graphical theme
%if "%{?tde_bg}" != ""
# KDM Background
%__sed -i "kdm/kfrontend/genkdmconf.c" \
-e 's,"Wallpaper=isadora.png\n","Wallpaper=%{tde_bg}\n",'
# TDE user default background
%__sed -i "kpersonalizer/keyecandypage.cpp" \
-e 's,#define DEFAULT_WALLPAPER "isadora.png",#define DEFAULT_WALLPAPER "%{tde_bg}",'
%__sed -i "startkde" \
-e 's,/usr/share/wallpapers/isadora.png.desktop,%{tde_bg},' \
-e 's,Wallpaper=isadora.png,Wallpaper=%{tde_bg},'
%endif
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
@ -231,19 +286,19 @@ cd build
# Adds a GDM/KDM/XDM session called 'TDE'
%if "%{?_prefix}" != "/usr"
%__mkdir_p "%{?buildroot}%{_usr}/share/xsessions"
install -m 644 "%{?buildroot}%{_datadir}/apps/kdm/sessions/tde.desktop" "%{?buildroot}%{_usr}/share/xsessions/tde.desktop"
%__install -m 644 "%{?buildroot}%{_datadir}/apps/kdm/sessions/tde.desktop" "%{?buildroot}%{_usr}/share/xsessions/tde.desktop"
%endif
# Modifies 'startkde' to set KDEDIR and KDEHOME hardcoded specific for TDE
sed -i "%{?buildroot}%{_bindir}/startkde" \
%__sed -i "%{?buildroot}%{_bindir}/startkde" \
-e '/^echo "\[startkde\] Starting startkde.".*/ s,$,\nexport KDEDIR=%{_prefix}\nexport KDEHOME=~/.trinity,'
# Renames '/etc/ksysguarddrc' to avoid conflict with KDE4 'ksysguard'
mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysguarddrc.tde
%__mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysguarddrc.tde
# TDE 3.5.12: add script "plasma-desktop" to avoid conflict with KDE4
%if "%{?_prefix}" != "/usr"
%__cp -f "%{SOURCE1}" "%{?buildroot}%{_bindir}"
%__install -m 755 "%{SOURCE1}" "%{?buildroot}%{_bindir}"
%endif
# PAM configuration files
@ -253,6 +308,19 @@ mv -f %{?buildroot}%{_sysconfdir}/ksysguarddrc %{?buildroot}%{_sysconfdir}/ksysg
%__install -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
%__install -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/kscreensaver-trinity"
# KDM configuration for RHEL/Fedora
%__sed -i "%{?buildroot}%{_datadir}/config/kdm/kdmrc" \
%if 0%{?fedora} >= 16
-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
%else
-e "s/^#*MinShowUID=.*/MinShowUID=500/"
%endif
# Moves the XDG configuration files to TDE directory
%__mkdir_p "%{?buildroot}%{_prefix}/etc"
%__mv -f "%{?buildroot}%{_sysconfdir}/xdg" "%{?buildroot}%{_prefix}/etc"
%clean
%__rm -rf %{?buildroot}
@ -454,14 +522,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_datadir}/sounds/*
%{tde_libdir}/*
%{_libdir}/libkdeinit_*.*
%{_sysconfdir}/xdg/menus/applications-merged/kde-essential.menu
%if 0%{?fedora} >= 15 && "%{?_prefix}" != "/usr"
%exclude %{_sysconfdir}/xdg/menus/kde-information.menu
%else
%{_sysconfdir}/xdg/menus/kde-information.menu
%endif
%{_sysconfdir}/xdg/menus/kde-screensavers.menu
%{_sysconfdir}/xdg/menus/kde-settings.menu
%{_prefix}/etc/xdg/menus/applications-merged/kde-essential.menu
%{_prefix}/etc/xdg/menus/kde-information.menu
%{_prefix}/etc/xdg/menus/kde-screensavers.menu
%{_prefix}/etc/xdg/menus/kde-settings.menu
/usr/share/xsessions/*.desktop
# Remove conflicts with redhat-menus
%if "%{?_prefix}" != "/usr"
@ -519,6 +583,21 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%{_datadir}/cmake/*.cmake
%changelog
* Sun Nov 13 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-7
- Add distribution-specific start button icon
* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6
- Add graphical theme for RHEL 5, RHEL 6, Fedora 15, Fedora 16
- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE
* Fri Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5
- Add "service(graphical-login)"
- Add kickoff menu fix [TDE Bug #508]
- kdmrc: sets "MinShowUID=500"
* Tue Nov 08 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4
- Fix FTBFS with dbus-tqt
* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
- Add missing BuildRequires

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 2
%define release 3
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -145,6 +145,13 @@ cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf
%{tde_libdir}
EOF
# Moves the XDG configuration files to TDE directory
%__install -p -D -m644 \
"%{?buildroot}%{_sysconfdir}/xdg/menus/applications.menu" \
"%{?buildroot}%{_prefix}/etc/xdg/menus/kde-applications.menu"
%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
%clean
%__rm -rf %{?buildroot}
@ -258,8 +265,8 @@ EOF
%endif
%{_sysconfdir}/ld.so.conf.d/trinity.conf
# Provided by 'redhat-menus' package
%exclude %{_sysconfdir}/xdg/menus/applications.menu
# Avoid conflict with 'redhat-menus' package
%{_prefix}/etc/xdg/menus/kde-applications.menu
# New in TDE 3.5.13
%{_bindir}/kdetcompmgr
@ -285,6 +292,9 @@ EOF
%changelog
* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE
* Thu Nov 03 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Add missing BuildRequires

@ -1,264 +0,0 @@
# Default version for this component
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 0
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
%define _variant .opt
%define _docdir %{_prefix}/share/doc
%endif
# TDE 3.5.13 specific variables
BuildRequires: cmake >= 2.8
%define tde_docdir %{_docdir}/kde
%define tde_libdir %{_libdir}/trinity
Name: trinity-kdelibs
Version: %{version}
Release: %{?release}%{?dist}%{?_variant}
License: GPL
Summary: Trinity KDE Libraries
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Source0: kdelibs-%{version}.tar.gz
Prefix: %{_prefix}
BuildRequires: libtool
BuildRequires: tqtinterface-devel
BuildRequires: trinity-arts-devel
BuildRequires: qt3-devel
BuildRequires: avahi-devel avahi-qt3-devel
#BuildRequires: lua-devel
BuildRequires: krb5-devel libxslt-devel cups-devel libart_lgpl-devel pcre-devel
BuildRequires: libutempter-devel
BuildRequires: bzip2-devel
BuildRequires: openssl-devel
Requires: tqtinterface
Requires: trinity-arts
Requires: qt3
Requires: avahi avahi-qt3
%if "%{?_prefix}" == "/usr"
Obsoletes: kdelibs3
%endif
%description
Libraries for the Trinity K Desktop Environment
%package devel
Requires: %{name}
Summary: %{name} - Development files
%if "%{?_prefix}" == "/usr"
Obsoletes: kdelibs3-devel
%endif
%description devel
Development files for %{name}
%package apidocs
Requires: %{name}
Summary: %{name} - API documentation
%description apidocs
This package includes the KDE 3 API documentation in HTML
format for easy browsing
%prep
%setup -q -n kdelibs
# Gets the cmake modules in current build directory
%__mkdir_p cmake/modules
%__cp -f %{_datadir}/cmake/*.* cmake/modules
%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
export PATH="%{_bindir}:${PATH}"
export LD_LIBRARY_PATH="%{_libdir}"
export PKG_CONFIG_PATH="%{_libdir}/pkgconfig"
export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt"
%__mkdir build
cd build
%cmake \
-DWITH_ARTS=ON \
-DWITH_ALSA=ON \
-DWITH_LIBART=ON \
-DWITH_LIBIDN=OFF \
-DWITH_SSL=ON \
-DWITH_CUPS=ON \
-DWITH_LUA=OFF \
-DWITH_TIFF=ON \
-DWITH_JASPER=ON \
-DWITH_OPENEXR=ON \
-DWITH_UTEMPTER=ON \
-DWITH_AVAHI=ON \
-DWITH_ASPELL=OFF \
-DWITH_HSPELL=OFF \
..
%__make %{?_smp_mflags}
%install
%__rm -rf %{?buildroot}
%__mkdir_p %{?buildroot}
%make_install -C build
%__mkdir_p %{?buildroot}%{_sysconfdir}/ld.so.conf.d
cat <<EOF >%{?buildroot}%{_sysconfdir}/ld.so.conf.d/trinity.conf
%if "%{?_prefix}" != "/usr"
%{_libdir}
%endif
%{_libdir}/trinity
EOF
%clean
%__rm -rf %{?buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc README
%doc COPYING.LIB
%{_bindir}/artsmessage
%{_bindir}/cupsdconf
%{_bindir}/cupsdoprint
%{_bindir}/dcop
%{_bindir}/dcopclient
%{_bindir}/dcopfind
%{_bindir}/dcopobject
%{_bindir}/dcopquit
%{_bindir}/dcopref
%{_bindir}/dcopserver
%{_bindir}/dcopserver_shutdown
%{_bindir}/dcopstart
%{_bindir}/filesharelist
%{_bindir}/fileshareset
%{_bindir}/imagetops
%{_bindir}/kab2kabc
%{_bindir}/kaddprinterwizard
%{_bindir}/kbuildsycoca
%{_bindir}/kcmshell
%{_bindir}/kconf_update
%{_bindir}/kcookiejar
%{_bindir}/kde-config
%{_bindir}/kde-menu
%{_bindir}/kded
%{_bindir}/kdeinit
%{_bindir}/kdeinit_shutdown
%{_bindir}/kdeinit_wrapper
%{_bindir}/kdesu_stub
%{_bindir}/kdontchangethehostname
%{_bindir}/kdostartupconfig
%{_bindir}/kfile
%{_bindir}/kfmexec
%{_bindir}/khotnewstuff
%{_bindir}/kinstalltheme
%{_bindir}/kio_http_cache_cleaner
%{_bindir}/kio_uiserver
%{_bindir}/kioexec
%{_bindir}/kioslave
%{_bindir}/klauncher
%{_bindir}/kmailservice
%{_bindir}/kmimelist
%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
%{_bindir}/ksendbugmail
%{_bindir}/kshell
%{_bindir}/kstartupconfig
%{_bindir}/ktelnetservice
%{_bindir}/ktradertest
%{_bindir}/kwrapper
%{_bindir}/lnusertemp
%{_bindir}/make_driver_db_cups
%{_bindir}/make_driver_db_lpr
%{_bindir}/meinproc
%{_bindir}/networkstatustestservice
%{_bindir}/start_kdeinit
%{_bindir}/start_kdeinit_wrapper
%attr(4755,root,root) %{_bindir}/kgrantpty
%{_libdir}/lib*.so.*
%{_libdir}/libkdeinit_*.so
%{_libdir}/lib*.la
%{tde_libdir}/
%{_datadir}/applications/kde/*.desktop
%{_datadir}/autostart/kab2kabc.desktop
%{_datadir}/applnk/kio_iso.desktop
%{_datadir}/apps/*
%exclude %{_datadir}/apps/ksgmltools2/
%config(noreplace) %{_datadir}/config/*
%{_datadir}/emoticons/*
%{_datadir}/icons/default.kde
%{_datadir}/mimelnk/magic
%{_datadir}/mimelnk/*/*.desktop
%{_datadir}/services/*
%{_datadir}/servicetypes/*
%{_datadir}/icons/crystalsvg/
%{tde_docdir}/HTML/en/kspell
# remove conflicts with kdelibs-4
%if "%{?_prefix}" != "/usr"
%{_bindir}/checkXML
%{_bindir}/ksvgtopng
%{_bindir}/kunittestmodrunner
%{_bindir}/preparetips
%{_datadir}/icons/hicolor/index.theme
%{_datadir}/locale/all_languages
%{tde_docdir}/HTML/en/common/*
%else
%exclude %{_bindir}/checkXML
%exclude %{_bindir}/ksvgtopng
%exclude %{_bindir}/kunittestmodrunner
%exclude %{_bindir}/preparetips
%exclude %{_datadir}/config/colors
%exclude %{_datadir}/config/kdebug.areas
%exclude %{_datadir}/config/kdebugrc
%exclude %{_datadir}/config/ksslcalist
%exclude %{_datadir}/config/ui/ui_standards.rc
%exclude %{_datadir}/icons/hicolor/index.theme
%exclude %{_datadir}/locale/all_languages
%exclude %{tde_docdir}/HTML/en/common/*
%endif
%{_sysconfdir}/ld.so.conf.d/trinity.conf
# Provided by 'redhat-menus' package
%exclude %{_sysconfdir}/xdg/menus/applications.menu
# New in TDE 3.5.13
%{_bindir}/kdetcompmgr
%files devel
%defattr(-,root,root,-)
%{_bindir}/dcopidl*
%{_bindir}/kconfig_compiler
%{_bindir}/makekdewidgets
%{_datadir}/apps/ksgmltools2/
%{_includedir}/
%{_libdir}/lib*.so
%{_libdir}/lib*.a
%exclude %{_libdir}/libkdeinit_*.so
# New in TDE 3.5.13
%{_datadir}/cmake/kdelibs.cmake
%files apidocs
%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}/
#%{tde_docdir}/HTML/en/kdelibs*
%changelog
* Wed Sep 02 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13pre.svn20110902-0.el6
- Import to GIT
- Built with future TDE version (3.5.13 + cmake + QT3.3.8d)

@ -1,19 +0,0 @@
*** configure.in.in.ORI 2011-09-10 21:38:57.805533683 +0200
--- configure.in.in 2011-09-10 21:39:08.687283728 +0200
***************
*** 542,548 ****
if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
LIB_ARTS="-lartskde"
ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`]
! ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts"
AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk])
else
build_arts="no"
--- 542,548 ----
if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then
LIB_ARTS="-lartskde"
ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`]
! ARTS_CFLAGS="-I$ARTS_PREFIX/include"
AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk])
else
build_arts="no"

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 2
%define release 3
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -223,6 +223,13 @@ for dir in k* ; do
done
done
# Moves the XDG configuration files to TDE directory
%__install -p -D -m644 \
"%{?buildroot}%{_sysconfdir}/xdg/menus/applications-merged/kde-multimedia-music.menu" \
"%{?buildroot}%{_prefix}/etc/xdg/menus/applications-merged/trinity-multimedia-music.menu"
%__rm -rf "%{?buildroot}%{_sysconfdir}/xdg"
%post
/sbin/ldconfig
@ -351,7 +358,7 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%exclude %{_datadir}/icons/crystalsvg/*/*/juk*
%exclude %{_datadir}/icons/hicolor/*/apps/juk.png
/etc/xdg/menus/applications-merged/*
%{_prefix}/etc/xdg/menus/applications-merged/*
%{_libdir}/mcop/*
%{_libdir}/libkdeinit_*.so
#%{_libdir}/liboggarts.so
@ -404,6 +411,9 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
%exclude %{_libdir}/libyafxplayer.so
%changelog
* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
- Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE
* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Updates BuildRequires

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 1
%define release 2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -257,6 +257,11 @@ install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk
install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_sysconfdir}/lisarc
install -p -m 0755 -D %{SOURCE5} %{buildroot}%{_initrddir}/lisa
# RHEL 5: Avoids conflict with 'kdenetwork'
%if 0%{?rhel} == 5
%__mv -f %{buildroot}%{_sysconfdir}/lisarc %{buildroot}%{_sysconfdir}/lisarc.tde
%endif
%post
/sbin/chkconfig --add lisa ||:
for f in crystalsvg hicolor locolor ; do
@ -264,6 +269,9 @@ for f in crystalsvg hicolor locolor ; do
gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||:
done
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
if [ -r %{_sysconfdir}/lisarc.tde ] && [ ! -r %{_sysconfdir}/lisarc ]; then
cp -f %{_sysconfdir}/lisarc.tde %{_sysconfdir}/lisarc
fi
%postun
for f in crystalsvg hicolor locolor ; do
@ -433,7 +441,7 @@ done
%else
%attr(4755,root,root) %{_bindir}/kppp
%endif
%config(noreplace) %{_sysconfdir}/lisarc
%config(noreplace) %{_sysconfdir}/lisarc*
%config(noreplace) %{_initrddir}/lisa
%{_libdir}/libkdeinit_*.so
%{tde_libdir}/*
@ -465,6 +473,9 @@ done
%changelog
* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Removes conflict on file 'lisarc' for RHEL 5
* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial release for RHEL 6, RHEL 5 and Fedora 15

@ -0,0 +1,31 @@
--- kdeutils/klaptopdaemon/acpi.cpp.ORI 2011-11-11 17:44:28.515033721 +0100
+++ kdeutils/klaptopdaemon/acpi.cpp 2011-11-11 17:50:52.703492308 +0100
@@ -178,7 +178,7 @@
proc << kdesu;
proc << "-u";
proc << "root";
- proc << "dpkg-statoverride --update --add root root 6755 "+helper;
+ proc << "chown root "+helper+"; chmod +s "+helper;
proc.start(KProcess::Block); // run it sync so has_acpi below sees the results
}
} else {
--- kdeutils/klaptopdaemon/apm.cpp.ORI 2011-11-11 17:45:11.515912373 +0100
+++ kdeutils/klaptopdaemon/apm.cpp 2011-11-11 17:51:07.095195808 +0100
@@ -166,7 +166,7 @@
proc << kdesu;
proc << "-u";
proc << "root";
- proc << TQString("dpkg-statoverride --update --add root root 6755 ")+apm_name;
+ proc << TQString("chown root ")+apm_name+TQString("; chmod +s ")+apm_name;
proc.start(KProcess::Block); // run it sync so has_apm below sees the results
}
} else {
@@ -200,7 +200,7 @@
proc << kdesu;
proc << "-u";
proc << "root";
- proc << "dpkg-statoverride --update --add root root 6755 "+helper;
+ proc << "chown root "+helper+"; chmod +s "+helper;
proc.start(KProcess::Block); // run it sync so has_acpi below sees the results
}
} else {

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 2
%define release 3
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -41,7 +41,11 @@ BuildRequires: trinity-arts
BuildRequires: trinity-kdelibs
# RedHat / Fedora legacy patches
Patch1: kdf-3.0.2-label.patch
Patch1: kdf-3.0.2-label.patch
# TDE 3.5.13 RHEL/Fedora patches
## [kdeutils/klaptodaemon] removes dpkg commands
Patch2: kdeutils-3.5.13-klaptopdaemon_dpkg_command.patch
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
@ -112,6 +116,7 @@ More Utilities for the K Desktop Environment:
%setup -q -n kdeutils
%patch1 -p1 -b .label
%patch2 -p1
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@ -342,6 +347,9 @@ done
%changelog
* Fri Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
- Removes 'dpkg' commands inside klaptopdaemon
* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Updates BuildRequires

@ -0,0 +1,36 @@
[trinity-3.5.13-fedora]
name=trinity-3.5.13-fedora
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/$basearch
enabled=1
gpgcheck=0
[trinity-3.5.13-fedora-noarch]
name=trinity-3.5.13-fedora-noarch
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/RPMS/noarch
enabled=1
gpgcheck=0
[trinity-3.5.13-fedora-source]
name=trinity-3.5.13-fedora-source
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-3.5.13/SRPMS
enabled=1
gpgcheck=0
[trinity-extras-fedora]
name=trinity-extras-fedora
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras/RPMS/$basearch
enabled=1
gpgcheck=0
[trinity-extras-fedora-noarch]
name=trinity-extras-fedora-noarch
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras/RPMS/noarch
enabled=1
gpgcheck=0
[trinity-extras-fedora-source]
name=trinity-extras-fedora-source
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/f$releasever/trinity-extras/SRPMS
enabled=1
gpgcheck=0

@ -0,0 +1,36 @@
[trinity-3.5.13-rhel]
name=trinity-3.5.13-rhel
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/$basearch
enabled=1
gpgcheck=0
[trinity-3.5.13-rhel-noarch]
name=trinity-3.5.13-rhel-noarch
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/RPMS/noarch
enabled=1
gpgcheck=0
[trinity-3.5.13-rhel-source]
name=trinity-3.5.13-f16-source
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-3.5.13/SRPMS
enabled=1
gpgcheck=0
[trinity-extras-rhel]
name=trinity-extras-rhel
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras/RPMS/$basearch
enabled=1
gpgcheck=0
[trinity-extras-rhel-noarch]
name=trinity-extras-rhel-noarch
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras/RPMS/noarch
enabled=1
gpgcheck=0
[trinity-extras-rhel-source]
name=trinity-extras-rhel-source
baseurl=http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity/rpm/el$releasever/trinity-extras/SRPMS
enabled=1
gpgcheck=0

@ -2,7 +2,7 @@
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 1
%define release 2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@ -25,6 +25,9 @@ Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Source0: trinity-3.5.13-fedora.repo
Source1: trinity-3.5.13-rhel.repo
Requires: trinity-kdeaccessibility >= %{version}
Requires: trinity-kdeaddons >= %{version}
Requires: trinity-kdeadmin >= %{version}
@ -40,6 +43,8 @@ Requires: trinity-kdenetwork >= %{version}
Requires: trinity-kdepim >= %{version}
Requires: trinity-kdeutils >= %{version}
Requires: trinity-kdetoys >= %{version}
Requires: trinity-repo >= %{version}
Requires: hal
%description
The TDE project aims to keep the KDE3.5 computing style alive, as well as
@ -86,6 +91,25 @@ Requires: %{name}-extras == %{version}
%description all
%{summary}
%package -n trinity-repo
Group: User Interface/Desktops
Summary: Yum configuration files for Trinity
%description -n trinity-repo
%{summary}
%prep
%build
%install
%__rm -rf %{?buildroot}
%__mkdir_p %{?buildroot}%{_sysconfdir}/yum.repos.d
%if 0%{?fedora}
%__install -m 644 %{SOURCE0} %{?buildroot}%{_sysconfdir}/yum.repos.d
%else
%__install -m 644 %{SOURCE1} %{?buildroot}%{_sysconfdir}/yum.repos.d
%endif
%files
@ -94,3 +118,10 @@ Requires: %{name}-extras == %{version}
%files extras
%files all
%files -n trinity-repo
%{_sysconfdir}/yum.repos.d/*.repo
%changelog
* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Add 'repo' package

@ -0,0 +1,113 @@
# Copied from 'fedora-live-kde-base.ks'
%include fedora-live-base.ks
repo --name=trinity --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-3.5.13/RPMS/$basearch
repo --name=trinity-noarch --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-3.5.13/RPMS/noarch
repo --name=trinity-extras --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-extras/RPMS/$basearch
repo --name=trinity-extras-noarch --baseurl=http://trinity.mangafrance.com/f$releasever/trinity-extras/RPMS/noarch
%packages
### The KDE-Desktop
trinity-desktop
hal
# TDE is missing a Network Applet, so we use Gnome...
NetworkManager-gnome
### fixes
# make sure alsaunmute is there
alsa-utils
# make sure gnome-packagekit doesn't end up the KDE live images
-gnome-packagekit*
%end
%post
# create /etc/sysconfig/desktop (needed for installation)
cat > /etc/sysconfig/desktop <<EOF
DESKTOP="KDE"
DISPLAYMANAGER="/opt/trinity/bin/kdm"
EOF
# make oxygen-gtk the default GTK+ 2 theme for root (see #683855, #689070)
cat > /root/.gtkrc-2.0 << EOF
include "/usr/share/themes/oxygen-gtk/gtk-2.0/gtkrc"
include "/etc/gtk-2.0/gtkrc"
gtk-theme-name="oxygen-gtk"
EOF
# add initscript
cat >> /etc/rc.d/init.d/livesys << EOF
if [ -e /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ] ; then
# use image also for kdm
mkdir -p /usr/share/apps/kdm/faces
cp /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png /usr/share/apps/kdm/faces/fedora.face.icon
fi
# make liveuser use KDE
echo "/opt/trinity/bin/startkde" > /home/liveuser/.xsession
chmod a+x /home/liveuser/.xsession
chown liveuser:liveuser /home/liveuser/.xsession
# set up autologin for user liveuser
sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /opt/trinity/share/config/kdm/kdmrc
sed -i 's/#AutoLoginUser=fred/AutoLoginUser=liveuser/' /opt/trinity/share/config/kdm/kdmrc
# set up user liveuser as default user and preselected user
sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /opt/trinity/share/config/kdm/kdmrc
sed -i 's/#DefaultUser=johndoe/DefaultUser=liveuser/' /opt/trinity/share/config/kdm/kdmrc
# add liveinst.desktop to favorites menu
mkdir -p /home/liveuser/.trinity/share/config/
# show liveinst.desktop on desktop and in menu
sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop
# chmod +x ~/Desktop/liveinst.desktop to disable KDE's security warning
chmod +x /usr/share/applications/liveinst.desktop
# copy over the icons for liveinst to hicolor
cp /usr/share/icons/gnome/16x16/apps/system-software-install.png /usr/share/icons/hicolor/16x16/apps/
cp /usr/share/icons/gnome/22x22/apps/system-software-install.png /usr/share/icons/hicolor/22x22/apps/
cp /usr/share/icons/gnome/24x24/apps/system-software-install.png /usr/share/icons/hicolor/24x24/apps/
cp /usr/share/icons/gnome/32x32/apps/system-software-install.png /usr/share/icons/hicolor/32x32/apps/
cp /usr/share/icons/gnome/48x48/apps/system-software-install.png /usr/share/icons/hicolor/48x48/apps/
cp /usr/share/icons/gnome/256x256/apps/system-software-install.png /usr/share/icons/hicolor/256x256/apps/
touch /usr/share/icons/hicolor/
# Create user Desktop directory
mkdir -p /home/liveuser/Desktop
mkdir -p /home/liveuser/Documents
# make sure to set the right permissions and selinux contexts
chown -R liveuser:liveuser /home/liveuser/
restorecon -R /home/liveuser/
# don't use prelink on a running KDE live image
sed -i 's/PRELINKING=yes/PRELINKING=no/' /etc/sysconfig/prelink
EOF
# Sets 'nm-applet' to run automatically
mkdir -p /home/liveuser/.trinity/Autostart
cat <<EOF >/home/liveuser/.trinity/Autostart/nm-applet
#!/bin/sh
# Waits until kicker is started, so that
# nm-applet can dock correctly.
while ! pidof kicker; do
sleep 1
done
sleep 3
/usr/bin/nm-applet
EOF
chmod +x /home/liveuser/.trinity/Autostart/nm-applet
%end

@ -0,0 +1,89 @@
# fedora-livecd-tde.ks
#
# Description:
# - Fedora Livecd Spin with the Trinity Desktop Environment (TDE)
# - Based on 'fedora-livecd-kde.ks' provided by Fedora 15
#
# Maintainer(s):
# - Francois Andriot <francois.andriot@free.fr>
%include fedora-live-tde-base.ks
%include fedora-live-minimization.ks
# 3rd party for VLC
#repo --name=atrpms --baseurl=http://dl.atrpms.net/f$releasever-$basearch/atrpms/stable
%packages
# Additional packages that are not default in trinity-desktop but useful
trinity-desktop-extras
trinity-live-openbox
# Some TDE applications
trinity-amarok
#trinity-digikam
trinity-dolphin
trinity-gwenview
trinity-k3b
trinity-kaffeine
trinity-kbookreader
#trinity-knetworkmanager
trinity-konversation
trinity-ksensors
trinity-kstreamripper
trinity-yakuake
# Some TDE translations
trinity-kde-i18n-French
#trinity-kde-i18n-German
trinity-kde-i18n-Spanish
trinity-kde-i18n-Chinese-Big5
# 3rd party stuff
#vlc
# Fedora stuff
fuse
liveusb-creator
#wlassistant
#wicd
#wicd-gtk
### more desktop stuff
fedora-icon-theme
adwaita-cursor-theme
adwaita-gtk2-theme
adwaita-gtk3-theme
# use yum-presto by default
yum-presto
### space issues
# fonts (we make no bones about admitting we're english-only)
wqy-microhei-fonts # a compact CJK font, to replace:
-un-core-dotum-fonts # Korean
-vlgothic-fonts # Japanese
-wqy-zenhei-fonts # Chinese
-paratype-pt-sans-fonts # Cyrillic (already supported by DejaVu), huge
#-stix-fonts # mathematical symbols
# remove input methods to free space
-@input-methods
-scim*
-m17n*
-ibus*
-iok
# save some space (from @base)
-make
-nss_db
## avoid serious bugs by omitting broken stuff
%end
%post
%end

@ -0,0 +1,84 @@
# Default version for this component
%if "%{?version}" == ""
%define version 3.5.13
%endif
%define release 1
%define _datadir %{_usr}/share
Name: trinity-live
Version: %{version}
Release: %{?release}%{?dist}
License: GPL
Summary: Trinity Spins
Group: Applications/System
Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
Prefix: %{_prefix}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Requires: fedora-kickstarts
Requires: livecd-tools
Source0: fedora-live-tde-base.ks
Source1: fedora-livecd-tde.ks
%description
This package contains the Trinity configuration file to build a Fedora
LiveCD containing Fedora.
%package openbox
Summary: bootstrap 'openbox' script that runs TDE's kwin
Requires: trinity-kdebase
BuildArch: noarch
Group: Applications/System
%description openbox
There is a bug in 'firstboot' that prevents it to invoke 'openbox' correctly.
The provided script redirects 'openbox' to 'kwin'.
It is used on the Fedora TDE LiveCD.
%prep
%build
cat <<EOF >openbox
#!/bin/sh
# This script is used by 'firstboot' only.
# It allows to run TDE's kwin instead of openbox.
export PATH=%{_bindir}:\${PATH}
export HOME=/root
rm -rf \${HOME}/.DCOPserver*
rpm -e trinity-live-openbox
exec kwin \$@
EOF
%install
%__rm -rf %{?buildroot}
%__mkdir_p %{?buildroot}%{_datadir}/spin-kickstarts
%__install -m 644 %{SOURCE0} %{?buildroot}%{_datadir}/spin-kickstarts
%__install -m 644 %{SOURCE1} %{?buildroot}%{_datadir}/spin-kickstarts
# Openbox
%__mkdir_p "%{?buildroot}/usr/local/bin"
%__install -m 755 openbox "%{?buildroot}/usr/local/bin"
%files
%{_datadir}/spin-kickstarts/fedora-live-tde-base.ks
%{_datadir}/spin-kickstarts/fedora-livecd-tde.ks
%files openbox
/usr/local/bin/openbox
%changelog
* Wed Nov 09 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1
- Initial build
Loading…
Cancel
Save