Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
albator
13 years ago
commit
46e357bd6d
@ -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
|
||||||
|
}
|
||||||
@ -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
|
|
||||||
Binary file not shown.
@ -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
|
|
||||||
Binary file not shown.
@ -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
|
|
||||||
Loading…
Reference in new issue