summaryrefslogtreecommitdiffstats
path: root/arch/3.5.13/trinity-base
diff options
context:
space:
mode:
authorRobert Xu <robxu9@gmail.com>2012-02-21 19:27:13 -0500
committerRobert Xu <robxu9@gmail.com>2012-02-21 19:27:13 -0500
commit5d7b5e6defb05f81691d286d40f67260c4733d00 (patch)
treeb2bfcca86b05179cad334dc61c5609e54ac7674d /arch/3.5.13/trinity-base
parent580ce2082fe5054c9ad0e4f666cee9b4bfb2d0b6 (diff)
parenta14ac9de2f5843036c9f452f1188979fef17ae6d (diff)
downloadtde-packaging-5d7b5e6defb05f81691d286d40f67260c4733d00.tar.gz
tde-packaging-5d7b5e6defb05f81691d286d40f67260c4733d00.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'arch/3.5.13/trinity-base')
-rw-r--r--arch/3.5.13/trinity-base/hal/PKGBUILD12
-rw-r--r--arch/3.5.13/trinity-base/hal/udev-update.patch26
-rwxr-xr-xarch/3.5.13/trinity-base/mkpkg15
-rw-r--r--arch/3.5.13/trinity-base/trinity-arts/PKGBUILD36
-rw-r--r--arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD54
-rw-r--r--arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD3
-rw-r--r--arch/3.5.13/trinity-base/trinity-kdebase-split/PKGBUILD216
-rw-r--r--arch/3.5.13/trinity-base/trinity-kdebase-split/agent-shutdown.sh13
-rw-r--r--arch/3.5.13/trinity-base/trinity-kdebase-split/agent-startup.sh19
-rw-r--r--arch/3.5.13/trinity-base/trinity-kdebase-split/arch-kdeshutdown.pngbin0 -> 5483 bytes
-rw-r--r--arch/3.5.13/trinity-base/trinity-kdebase-split/kdebase-3.5.13.tar.gzbin0 -> 29723824 bytes
-rw-r--r--arch/3.5.13/trinity-base/trinity-kdebase-split/kdm-default-face.pngbin0 -> 4325 bytes
-rw-r--r--arch/3.5.13/trinity-base/trinity-kdebase-split/kdm-trinity40
-rw-r--r--arch/3.5.13/trinity-base/trinity-kdebase-split/patches.tar.bz2bin0 -> 3671 bytes
-rw-r--r--arch/3.5.13/trinity-base/trinity-kdebase-split/trinity-kdebase-3513-5.src.tar.gzbin0 -> 18979 bytes
-rw-r--r--arch/3.5.13/trinity-base/trinity-kdebase-split/trinity-kdebase.install19
-rw-r--r--arch/3.5.13/trinity-base/trinity-kdebase-split/trinity.desktop8
-rw-r--r--arch/3.5.13/trinity-base/trinity-kdebase-split/xsession.patch (renamed from arch/3.5.13/trinity-base/trinity-kdebase/Xsession.patch)0
-rw-r--r--arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD83
-rw-r--r--arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2bin5013 -> 3671 bytes
-rw-r--r--arch/3.5.13/trinity-base/trinity-kdebase/trinity-kdebase.install6
-rw-r--r--arch/3.5.13/trinity-base/trinity-kdebase/xsession.patch28
-rw-r--r--arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD6
-rw-r--r--arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD6
-rw-r--r--arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD183
-rw-r--r--arch/3.5.13/trinity-base/trinity-qt3/qt-patches.tar.bz2bin13639 -> 13665 bytes
-rw-r--r--arch/3.5.13/trinity-base/trinity-qt3/qt3.install12
-rw-r--r--arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD30
-rw-r--r--arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.csh (renamed from arch/3.5.13/trinity-base/trinity-arts/trinity.profile.csh)0
-rw-r--r--arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.sh (renamed from arch/3.5.13/trinity-base/trinity-arts/trinity.profile.sh)0
30 files changed, 609 insertions, 206 deletions
diff --git a/arch/3.5.13/trinity-base/hal/PKGBUILD b/arch/3.5.13/trinity-base/hal/PKGBUILD
index 599b66d59..03ad188d7 100644
--- a/arch/3.5.13/trinity-base/hal/PKGBUILD
+++ b/arch/3.5.13/trinity-base/hal/PKGBUILD
@@ -16,7 +16,8 @@ options=('!libtool' '!makeflags')
install=hal.install
source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
hald
- hal.patch)
+ hal.patch
+ udev-update.patch)
# patches/hal-0.5.9-hide-diagnostic.patch
# patches/hal-remove-dell-killswitch.patch
# patches/hal-KVM-evdev.patch
@@ -32,7 +33,8 @@ source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
md5sums=('e9163df591a6f38f59fdbfe33e73bf20'
'4cdfc673ad65ddb51919f5a757f62145'
- '185dd5d6ffc703ec8395b4eb3a1ae498')
+ '185dd5d6ffc703ec8395b4eb3a1ae498'
+ 'cad3564de1708603c7a1e0facf6b1921')
# '4d4b6801a1cedca22b8bdd9db73b16fb'
# '6d87c3e63184ae3a69caafc846f538a3'
# '6507e5091ee2d11a87ae738a8e2caecb'
@@ -50,7 +52,7 @@ build() {
cd $srcdir
patch -Np1 -d ${srcdir} < hal.patch
cd "${srcdir}/${pkgname}-${pkgver}"
-# patch -Np1 -i "${srcdir}/hal-0.5.9-hide-diagnostic.patch"
+ patch -Np1 -i "${srcdir}/udev-update.patch"
# patch -Np1 -i "${srcdir}/hal-remove-dell-killswitch.patch"
# patch -Np1 -i "${srcdir}/hal-KVM-evdev.patch"
# patch -Np1 -i "${srcdir}/hal-HDAPS-blacklist.patch"
@@ -82,11 +84,11 @@ build() {
}
package() {
- cd $srcdir/${pkgname}-${pkgver}
+ cd $srcdir/${pkgname}-${pkgver}
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/etc/rc.d"
install -m755 -d "${pkgdir}/media"
- install -m755 "${srcdir}/hald" "${pkgdir}/etc/rc.d/"
+ install -m755 "${srcdir}/hald" "${pkgdir}/etc/rc.d/hal"
install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/arch/3.5.13/trinity-base/hal/udev-update.patch b/arch/3.5.13/trinity-base/hal/udev-update.patch
new file mode 100644
index 000000000..a5be64bc6
--- /dev/null
+++ b/arch/3.5.13/trinity-base/hal/udev-update.patch
@@ -0,0 +1,26 @@
+diff -ur hal-0.5.14_origin/hald/linux/blockdev.c hal-0.5.14/hald/linux/blockdev.c
+--- hal-0.5.14_origin/hald/linux/blockdev.c 2012-02-15 01:44:51.000000000 +0100
++++ hal-0.5.14/hald/linux/blockdev.c 2012-02-15 01:45:12.000000000 +0100
+@@ -1864,7 +1864,7 @@
+ char *ret;
+ char *u_stdout;
+ int u_exit_status;
+- const char *argv[] = {"/sbin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL};
++ const char *argv[] = {"/usr/bin/udevadm", "info", "--root", "--query", "name", "--path", NULL, NULL};
+ GError *g_error;
+
+ ret = NULL;
+diff -ur hal-0.5.14_origin/hald/linux/coldplug.c hal-0.5.14/hald/linux/coldplug.c
+--- hal-0.5.14_origin/hald/linux/coldplug.c 2012-02-15 01:44:51.000000000 +0100
++++ hal-0.5.14/hald/linux/coldplug.c 2012-02-15 01:45:08.000000000 +0100
+@@ -154,8 +154,8 @@
+ static gboolean
+ hal_util_init_sysfs_to_udev_map (void)
+ {
+- char *udevdb_export_argv[] = { "/sbin/udevadm", "info", "-e", NULL };
+- char *udevroot_argv[] = { "/sbin/udevadm", "info", "-r", NULL };
++ char *udevdb_export_argv[] = { "/usr/bin/udevadm", "info", "-e", NULL };
++ char *udevroot_argv[] = { "/usr/bin/udevadm", "info", "-r", NULL };
+ int udevinfo_exitcode;
+ UdevInfo *info = NULL;
+ char *p;
diff --git a/arch/3.5.13/trinity-base/mkpkg b/arch/3.5.13/trinity-base/mkpkg
new file mode 100755
index 000000000..d3403b927
--- /dev/null
+++ b/arch/3.5.13/trinity-base/mkpkg
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+#
+pkgarray="qt3 tqtinterface arts dbus-tqt kdelibs kdebase"
+arch=`uname -m`
+
+for i in $pkgarray; do
+ cd trinity-${i}
+ makepkg -sicf --noconfirm
+ cd ..
+done
+
+#mkdir binaires-$arch
+
+mv `find . -name *.tar.xz` binaries-$arch
diff --git a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD
index 6e8d65267..991f16eac 100644
--- a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=trinity-arts
pkgver=3513
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url='http://www.trinitydesktop.com'
license=('GPL')
@@ -15,21 +15,15 @@ depends=('trinity-tqtinterface'
makedepends=('pkgconfig' 'cmake')
conflicts=('kdemod3-arts' 'arts')
options=('libtool' '!emptydirs')
-source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/arts-3.5.13.tar.gz'
- 'trinity.profile.sh' 'trinity.profile.csh')
-md5sums=('109124dabb1aaa9d44eb32e43b549142'
- '72c6c4fb492c1f4b4741fad1dd70d62f'
- '915e14c6264a6b9c46a6a20b16cdcd06')
+source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/arts-3.5.13.tar.gz')
+md5sums=('109124dabb1aaa9d44eb32e43b549142')
install='trinity-arts.install'
-_prefix="/opt/trinity"
-
build() {
-
- # Do we need this?
msg "Setting PATH, CMAKE and Trinity Environment variables"
# Source the QT and KDE profile
[ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+ [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
cd $srcdir
msg "Creating out-of-source build directory: ${srcdir}/build"
@@ -38,7 +32,7 @@ build() {
msg "Starting cmake..."
cmake ${srcdir}/dependencies/arts/ \
- -DCMAKE_INSTALL_PREFIX=${_prefix}
+ -DCMAKE_INSTALL_PREFIX=${TDEDIR}
msg "Building $pkgname..."
make
@@ -49,26 +43,6 @@ package() {
msg "Packaging - $pkgname-$pkgver"
cd ${srcdir}/build
-
make DESTDIR="$pkgdir" install
- # since this is first package to provide
- # binaries, include headers and libs from trinity
- # it should contain sripts which would add
- # their location into system variables
- # this mean that this package should provide
- # /etc/ld.so.conf.d/trinity.conf - lib locations for linker
- # /etc/profile.d/trinity.sh - $PATH and other system variables for bash
- # /etc/profile.d/trinity.csh - $PATH and other system variables for csh
- # up until now it was done in the kdelibs PKGBUILD/package
-
- # Create and install ld.so.conf.d file
- install -d -m755 $pkgdir/etc/ld.so.conf.d/
- echo $_prefix/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf
- echo $_prefix/lib/kde >> $pkgdir/etc/ld.so.conf.d/trinity.conf
-
- # Install profiles
- install -D -m644 $srcdir/trinity.profile.sh $pkgdir/etc/profile.d/trinity.sh
- install -D -m644 $srcdir/trinity.profile.csh $pkgdir/etc/profile.d/trinity.csh
-
}
diff --git a/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD b/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD
index e181b8928..7b64c3544 100644
--- a/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD
@@ -16,40 +16,34 @@ options=('libtool' '!strip')
source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/dbus-1-tqt-3.5.13.tar.gz)
md5sums=('a7ba1071f4bf7b5930f805b4036f8a97')
-_prefix="/opt/trinity"
-
build() {
+ msg "Setting PATH, CMAKE and Trinity Environment variables"
+ [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+ [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
+
+ #export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix}
+ #export CMAKE_INCLUDE_PATH=${QTDIR}/include/tqt:/usr/include/dbus-1.0:${_prefix}/include:${_prefix}/include/libkrandr
+ #export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+ #export PKG_CONFIG_PATH=:${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+
+ cd $srcdir
+ msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
+ mkdir -p build
+ cd build
+
+ msg "Starting cmake..."
+ cmake ${srcdir}/dependencies/dbus-1-tqt \
+ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+ -DCMAKE_VERBOSE_MAKEFILE=ON
+
+ msg "Building - $pkgname..."
+ make
- msg "Setting PATH, CMAKE and Trinity Environment variables"
- . /etc/profile.d/qt3.sh
- export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix}
- export CMAKE_INCLUDE_PATH=${QTDIR}/include/tqt: \
- /usr/include/dbus-1.0: \
- ${_prefix}/include: \
- ${_prefix}/include/libkrandr
- export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
- export PKG_CONFIG_PATH=:${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
-
- cd $srcdir
- msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
- mkdir -p build
- cd build
-
- msg "Starting cmake..."
- cmake ${srcdir}/dependencies/dbus-1-tqt \
- -DCMAKE_INSTALL_PREFIX=${_prefix} \
- -DCMAKE_VERBOSE_MAKEFILE=ON
-
- msg "Building - $pkgname..."
- make
-# -DWITH_QT3=ON \
-# -DQTDIR=/opt/qt \
-# -DQT_LIBRARY_DIRS=/opt/qt/lib \
}
package() {
- msg "Packaging - $pkgname-$pkgver"
+ msg "Packaging - $pkgname-$pkgver"
# cd ${srcdir}/${_svnmod}
- cd ${srcdir}/build
- make DESTDIR="${pkgdir}" install
+ cd ${srcdir}/build
+ make DESTDIR="${pkgdir}" install
}
diff --git a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD
index fb68f2239..3d7f01520 100644
--- a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD
@@ -9,7 +9,7 @@ url='http://www.trinitydesktop.org'
license=('GPL')
groups=('trinity-base')
pkgdesc="Trinity TQt DBus wrapper"
-depends=('trinity-tqtinterface' 'dbus-core')
+depends=('trinity-arts' 'dbus-core')
makedepends=('pkgconfig' 'cmake')
options=('libtool' '!strip')
source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/dbus-tqt-3.5.13.tar.gz)
@@ -17,7 +17,6 @@ md5sums=('46ae165c068271485c827f6fc6687a9a')
install='trinity-dbus-tqt.install'
build() {
-
msg "Setting PATH, CMAKE and Trinity Environment variables"
# Source the QT and TDE profile
[ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase-split/PKGBUILD
new file mode 100644
index 000000000..bab5805d7
--- /dev/null
+++ b/arch/3.5.13/trinity-base/trinity-kdebase-split/PKGBUILD
@@ -0,0 +1,216 @@
+# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
+# Contributor: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=('trinity-kdebase' 'trinity-kdm' 'trinity-konsole' 'trinity-kate' 'trinity-konqueror')
+pkgver=3513
+pkgrel=6
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity-base')
+pkgdesc="Trinity Desktop Enviroment base components"
+depends=('trinity-kdelibs')
+makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf' 'smbclient'
+ 'libraw1394' 'libxtst' 'libxkbfile' 'hal')
+confilicts=('kdemod3-kdebase')
+options=('libtool')
+source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz'
+ 'patches.tar.bz2'
+ 'xsession.patch'
+ 'arch-kdeshutdown.png'
+ 'kdm-default-face.png'
+ 'agent-shutdown.sh'
+ 'agent-startup.sh'
+ 'kdm-trinity'
+ 'trinity.desktop')
+md5sums=('d1f7e1f94eeb46b981fe1ba144179840'
+ '327e4d68bd1fc4d29bdb273e81f90415'
+ '895f5d7351aa73ba1f57b0ad27081d69'
+ 'bb3004513d703d6b72ce70aa240af3a3'
+ 'e6afdd7ca60c4c59b851135785347e75'
+ '18e8d01124b19f7df2937c06e177bf7f'
+ 'c963ef6e37c9051119972a58c67f05fb'
+ '376d85d213cf3c04cb0912e5cccd68bd'
+ '1418e45fea5a9738544cbd264c36373b')
+
+build() {
+ cd $srcdir/kdebase
+
+ msg "Setting PATH, CMAKE and Trinity Environment variables"
+ # Source the QT and TDE profile
+ [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+ [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
+
+ #export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR}
+ #export CMAKE_INCLUDE_PATH=${TDEDIR}/include/dbus-1-tqt/:${TDEDIR}/include/dbus-1.0/:${TDEDIR}/include:${TDEDIR}/include/libkrandr
+ #export LD_LIBRARY_PATH=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${QTDIR}/lib:$LD_LIBRARY_PATH
+ #export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:$PKG_CONFIG_PATH
+
+ msg "Patching..."
+ for patch in $srcdir/patches/*.patch; do
+ _p=`basename $patch`
+ msg "Applying patch $_p.."
+ patch -Np0 -i $patch
+ done
+
+ #Compatibility with kde3 and kde4
+ #sed -ie 's/applications-merged/tde-applications-merged/g' applnk/CMakeLists.txt
+
+ msg "Creating out-of-source build directory: ${srcdir}/build"
+ mkdir -p ../build
+ cd ../build
+
+ msg "Starting cmake..."
+ cmake ${srcdir}/kdebase \
+ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
+ -DSYSCONF_INSTALL_DIR=/etc \
+ -DWITH_XFIXES=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 \
+ -DWITH_HAL=ON \
+ -DWITH_ARTS=ON \
+ -DWITH_SASL=ON \
+ -DWITH_OPENEXR=ON \
+ -DWITH_SAMBA=ON \
+ -DWITH_LIBUSB=ON \
+ -DWITH_LDAP=ON \
+ -DWITH_LIBRAW1394=ON \
+ -DWITH_I8K=ON \
+ -DBUILD_ALL=ON
+ make
+
+}
+
+package_trinity-kdebase() {
+ pkgname='trinity-kdebase'
+ pkgdesc='Trinity Desktop Enviroment'
+ depends=('trinity-dbus-tqt' 'hal'
+ 'libxtst' 'libraw1394')
+ #'xorg-server' 'xorg-xset' 'xorg-xsetroot' 'xorg-xprop' 'xorg-xmessage' 'xorg-xinit'
+ 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'
+ 'xorg-fonts-75dpi: X.org 75dpi fonts collection'
+ 'samba: file sharing over SMB')
+ install='trinity-kdebase.install'
+
+ msg "Packaging - $pkgname-$pkgver"
+ _splitfolders="applnk drkonqi kappfinder kcheckpass kcminit kcontrol
+ kdcop kdebugdialog kdeeject kdepasswd kdeprint kdesktop
+ kdesu kdialog kfind khelpcenter khotkeys kicker kioslave
+ klipper kmenuedit knetattach kpager kpersonalizer kreadconfig
+ krootbacking kscreensaver ksmserver ksplashml kstart ksysguard
+ ksystraycmd ktip kwin l10n kxkb nsplugins pics tqt3integration
+ tsak doc/faq doc/glossary doc/kcontrol doc/kdcop
+ doc/kdebugdialog doc/kdeprint doc/kdesu doc/kfind
+ doc/khelpcenter doc/kicker doc/kinfocenter doc/kioslave
+ doc/klipper doc/kmenuedit doc/knetattach doc/kompmgr doc/kpager
+ doc/ksplashml doc/ksysguard doc/kxkb doc/quickstart
+ doc/userguide doc/visualdict"
+ for _dir in $_splitfolders; do
+ cd ${srcdir}/build/$_dir
+ make DESTDIR="$pkgdir" install
+ done
+
+ # install X11 session file
+ install -d -m755 ${pkgdir}/etc/X11/sessions
+ install -m755 ${srcdir}/trinity.desktop ${pkgdir}/etc/X11/sessions/trinity.desktop
+
+ # create the starttrinity link
+ # do we need this? wouldn't be better to rename startkde script
+ # to starttrinity? Well, whathever.
+ ln -sf $TDEDIR/bin/startkde ${pkgdir}$TDEDIR/bin/starttrinity
+
+ # install mkpamserv script, so we can auto-generate pam.d configs in post_install()
+ install -D -m755 ${srcdir}/kdebase/mkpamserv ${pkgdir}${TDEDIR}/bin/mkpamserv
+
+ # dbus config file. I don't know if we need this, since directory listed
+ # in the config file doens't exist. Maybe this should be provided by dbus bindings?
+ # No, after riconsidering I'm not gonna provide it unless it's required.
+
+ # Install nice arch logo to use in the shutdown dialog
+ install -D -m 644 $srcdir/arch-kdeshutdown.png ${pkgdir}$TDEDIR/share/apps/ksmserver/pics/shutdownkonq.png
+
+ # add startup/shutdown agents for ssh and gpg-agent
+ install -m644 -D $srcdir/agent-startup.sh ${pkgdir}$TDEDIR/env/agent-startup.sh
+ install -m755 -D $srcdir/agent-shutdown.sh ${pkgdir}$TDEDIR/shutdown/agent-shutdown.sh
+
+ # fix kde icons for gnome by creating symlinks
+ mkdir -p ${pkgdir}$TDEDIR/share/icons/gnome/{128x128,64x64,32x32,16x16,48x48,22x22,scalable}
+ mkdir -p ${pkgdir}$TDEDIR/share/icons/crystalsvg/{128x128/apps,64x64/apps,32x32/apps,16x16/apps,48x48/apps,22x22/apps,scalable/apps}
+ cd ${pkgdir}$TDEDIR/share/icons/gnome/
+ for i in *; do
+ cd $i
+ ln -sf ../../crystalsvg/$i/apps/ apps
+ cd ..
+ done
+
+}
+
+package_trinity-kdm() {
+ pkgname='trinity-kdm'
+ pkgdesc="Trinity Display Manager"
+
+ msg "Packaging - $pkgname-$pkgver"
+ _splitfolders="kdm kdmlib doc/kdm"
+ for _dir in $_splitfolders; do
+ cd ${srcdir}/build/$_dir
+ make DESTDIR="$pkgdir" install
+ done
+
+ # update the Xsession file, this resolves problem with kdm dropping back
+ # to the login screen
+ patch -N ${pkgdir}${TDEDIR}/share/config/kdm/Xsession < ${srcdir}/xsession.patch
+
+ # install kdm rc.d script. We need this to start kdm from rc.d
+ install -D -m755 ${srcdir}/kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity
+
+ # Add image for default user avatar. This removes kdm complains about missing
+ # default avatar from kdm.log
+ install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/faces/.default.face.icon
+ install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/pics/users/arch-kdm.png
+}
+
+package_trinity-konsole() {
+ pkgname='trinity-konsole'
+ pkgdesc="Trinity - an X termnal emulator"
+
+ msg "Packaging - $pkgname-$pkgver"
+ _splitfolders="konsole doc/konsole"
+ for _dir in $_splitfolders; do
+ cd ${srcdir}/build/$_dir
+ make DESTDIR="$pkgdir" install
+ done
+}
+
+package_trinity-kate() {
+ pkgnmae='trinity-kate'
+ pkgdesc="Trinity - A fast texteditor with an Emacs-style document interface"
+
+ msg "Packaging - $pkgname-$pkgver"
+ _splitfolders="kate doc/kate doc/kwrite"
+ for _dir in $_splitfolders; do
+ cd ${srcdir}/build/$_dir
+ make DESTDIR="$pkgdir" install
+ done
+}
+
+package_trinity-konqueror() {
+ pkgname='trinity-kate'
+ pkgdesc="Trinity Swiss Army file and web browser."
+
+ msg "Packaging - $pkgname-$pkgver"
+ _splitfolders="konqueror libkonq doc/konqueror"
+ for _dir in $_splitfolders; do
+ cd ${srcdir}/build/$_dir
+ make DESTDIR="$pkgdir" install
+ done
+}
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/agent-shutdown.sh b/arch/3.5.13/trinity-base/trinity-kdebase-split/agent-shutdown.sh
new file mode 100644
index 000000000..71b056af3
--- /dev/null
+++ b/arch/3.5.13/trinity-base/trinity-kdebase-split/agent-shutdown.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+#
+# This file is executed at kde shutdown.
+# Uncomment the following lines to kill the agents
+# that were started at session startup.
+
+if [ "${GPG_AGENT_INFO}" ]; then
+ kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1
+fi
+#
+if [ "${SSH_AGENT_PID}" ]; then
+ ssh-agent -k
+fi
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/agent-startup.sh b/arch/3.5.13/trinity-base/trinity-kdebase-split/agent-startup.sh
new file mode 100644
index 000000000..88d1373a1
--- /dev/null
+++ b/arch/3.5.13/trinity-base/trinity-kdebase-split/agent-startup.sh
@@ -0,0 +1,19 @@
+# Agents startup file
+#
+# This file is sourced at kde startup, so that
+# the environment variables set here are available
+# throughout the session.
+
+# Uncomment the following lines to start gpg-agent
+# and/or ssh-agent at kde startup.
+# If you do so, do not forget to uncomment the respective
+# lines in KDEDIR/shutdown/agent-shutdown.sh to
+# properly kill the agents when the session ends.
+
+if [ -x /usr/bin/gpg-agent ]; then
+ eval "$(/usr/bin/gpg-agent --daemon)"
+fi
+#
+if [ -x /usr/bin/ssh-agent ]; then
+ eval "$(/usr/bin/ssh-agent -s)"
+fi
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/arch-kdeshutdown.png b/arch/3.5.13/trinity-base/trinity-kdebase-split/arch-kdeshutdown.png
new file mode 100644
index 000000000..30bc5ab77
--- /dev/null
+++ b/arch/3.5.13/trinity-base/trinity-kdebase-split/arch-kdeshutdown.png
Binary files differ
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/kdebase-3.5.13.tar.gz b/arch/3.5.13/trinity-base/trinity-kdebase-split/kdebase-3.5.13.tar.gz
new file mode 100644
index 000000000..cdb38cc56
--- /dev/null
+++ b/arch/3.5.13/trinity-base/trinity-kdebase-split/kdebase-3.5.13.tar.gz
Binary files differ
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/kdm-default-face.png b/arch/3.5.13/trinity-base/trinity-kdebase-split/kdm-default-face.png
new file mode 100644
index 000000000..233e69475
--- /dev/null
+++ b/arch/3.5.13/trinity-base/trinity-kdebase-split/kdm-default-face.png
Binary files differ
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/kdm-trinity b/arch/3.5.13/trinity-base/trinity-kdebase-split/kdm-trinity
new file mode 100644
index 000000000..03209b456
--- /dev/null
+++ b/arch/3.5.13/trinity-base/trinity-kdebase-split/kdm-trinity
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /opt/trinity/bin/kdm`
+case "$1" in
+ start)
+ #Check for running kdm, start when not running
+ stat_busy "Starting TDM Desktop Manager"
+ [ -z "$PID" ] && /opt/trinity/bin/kdm &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ echo $PID > /var/run/kdm.pid
+ add_daemon kdm-trinity
+ stat_done
+ fi
+ ;;
+ stop)
+ stat_busy "Stopping TDM Desktop Manager"
+ [ ! -z "$PID" ] && kill $PID &> /dev/null
+ if [ $? -gt 0 ]; then
+ stat_fail
+ else
+ rm_daemon kdm-trinity
+ stat_done
+ fi
+ ;;
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+ *)
+ echo "usage: $0 {start|stop|restart}"
+ ;;
+esac
+exit 0
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/patches.tar.bz2 b/arch/3.5.13/trinity-base/trinity-kdebase-split/patches.tar.bz2
new file mode 100644
index 000000000..0a0b90c54
--- /dev/null
+++ b/arch/3.5.13/trinity-base/trinity-kdebase-split/patches.tar.bz2
Binary files differ
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity-kdebase-3513-5.src.tar.gz b/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity-kdebase-3513-5.src.tar.gz
new file mode 100644
index 000000000..c1c6e79a0
--- /dev/null
+++ b/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity-kdebase-3513-5.src.tar.gz
Binary files differ
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity-kdebase.install b/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity-kdebase.install
new file mode 100644
index 000000000..82f34a0b0
--- /dev/null
+++ b/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity-kdebase.install
@@ -0,0 +1,19 @@
+post_install() {
+ ldconfig &> /dev/null
+ mkpamserv trinity
+ echo "Please remember that you can change your kdesu backend from su to sudo"
+ echo "by adding following lines to your ~/.trinity/share/kdesurc or to the"
+ echo "$TDEDIR/share/config/kdesurc:"
+ echo "[super-user-command]"
+ echo "super-user-command=sudo"
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ ldconfig &> /dev/null
+ rm /etc/pam.d/trinity
+}
+
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity.desktop b/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity.desktop
new file mode 100644
index 000000000..30c209f5d
--- /dev/null
+++ b/arch/3.5.13/trinity-base/trinity-kdebase-split/trinity.desktop
@@ -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
+
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/Xsession.patch b/arch/3.5.13/trinity-base/trinity-kdebase-split/xsession.patch
index 164d6c811..164d6c811 100644
--- a/arch/3.5.13/trinity-base/trinity-kdebase/Xsession.patch
+++ b/arch/3.5.13/trinity-base/trinity-kdebase-split/xsession.patch
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
index 657b674ec..10fd8260f 100644
--- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
@@ -1,31 +1,30 @@
# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
# Contributor: Calvin Morrison <mutantturkey@gmail.com>
-pkgname=trinity-kdebase
+pkgname='trinity-kdebase'
pkgver=3513
-pkgrel=4
+pkgrel=7
arch=('i686' 'x86_64')
url='http://www.trinitydesktop.org'
license=('GPL')
groups=('trinity-base')
pkgdesc="Trinity Desktop Enviroment base components"
-depends=('trinity-dbus-tqt' 'trinity-kdelibs' 'hal'
- 'xorg-server' 'xorg-xset' 'xorg-xsetroot' 'xorg-xprop' 'xorg-xmessage' 'xorg-xinit' 'xorg-iceauth'
- 'libxtst')
- # 'libltdl'
- # 'openexr'
- # 'libxkbfile'
-
-makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf')
+depends=('trinity-kdelibs' 'trinity-dbus-tqt' 'hal'
+ 'libxtst' 'libraw1394')
+ #'xorg-server' 'xorg-xset' 'xorg-xsetroot' 'xorg-xprop' 'xorg-xmessage' 'xorg-xinit'
+makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf' 'smbclient'
+ 'libxkbfile')
+confilicts=('kdemod3-kdebase')
+options=('libtool')
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'
- 'xorg-fonts-75dpi: X.org 75dpi fonts collection')
-confilicts=('kdemod3-kdebase')
-options=('libtool')
+ 'xorg-fonts-75dpi: X.org 75dpi fonts collection'
+ 'samba: file sharing over SMB')
+install='trinity-kdebase.install'
source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz'
'patches.tar.bz2'
- 'Xsession.patch'
+ 'xsession.patch'
'arch-kdeshutdown.png'
'kdm-default-face.png'
'agent-shutdown.sh'
@@ -33,7 +32,7 @@ source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz'
'kdm-trinity'
'trinity.desktop')
md5sums=('d1f7e1f94eeb46b981fe1ba144179840'
- 'bf0cc14276148d5f6bd46828367825a6'
+ '327e4d68bd1fc4d29bdb273e81f90415'
'895f5d7351aa73ba1f57b0ad27081d69'
'bb3004513d703d6b72ce70aa240af3a3'
'e6afdd7ca60c4c59b851135785347e75'
@@ -41,7 +40,6 @@ md5sums=('d1f7e1f94eeb46b981fe1ba144179840'
'c963ef6e37c9051119972a58c67f05fb'
'376d85d213cf3c04cb0912e5cccd68bd'
'1418e45fea5a9738544cbd264c36373b')
-install='trinity-kdebase.install'
build() {
cd $srcdir/kdebase
@@ -53,7 +51,7 @@ build() {
#export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR}
#export CMAKE_INCLUDE_PATH=${TDEDIR}/include/dbus-1-tqt/:${TDEDIR}/include/dbus-1.0/:${TDEDIR}/include:${TDEDIR}/include/libkrandr
- #export LD_LIBRARY_PATH=${TDEDIR}/lib:${TDEDIR}/lib/kde3:${QTDIR}/lib:$LD_LIBRARY_PATH
+ #export LD_LIBRARY_PATH=${TDEDIR}/lib:${TDEDIR}/lib/trinity:${QTDIR}/lib:$LD_LIBRARY_PATH
#export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:$PKG_CONFIG_PATH
msg "Patching..."
@@ -67,20 +65,14 @@ build() {
#sed -ie 's/applications-merged/tde-applications-merged/g' applnk/CMakeLists.txt
msg "Creating out-of-source build directory: ${srcdir}/build"
- mkdir -p build
- cd build
+ mkdir -p ../build
+ cd ../build
msg "Starting cmake..."
- cmake ${srcdir}/kdebase --debug-output \
+ cmake ${srcdir}/kdebase \
-DCMAKE_INSTALL_PREFIX=${TDEDIR} \
- -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 \
@@ -91,33 +83,46 @@ build() {
-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
+ -DWITH_HAL=ON \
+ -DWITH_ARTS=ON \
+ -DWITH_SASL=ON \
+ -DWITH_OPENEXR=ON \
+ -DWITH_SAMBA=ON \
+ -DWITH_LIBUSB=ON \
+ -DWITH_LDAP=ON \
+ -DWITH_LIBRAW1394=ON \
+ -DWITH_I8K=ON \
+ -DBUILD_ALL=ON
make
+
}
package() {
msg "Packaging - $pkgname-$pkgver"
- cd ${srcdir}/build
-
+ cd $srcdir/build
make DESTDIR="$pkgdir" install
# install X11 session file
install -d -m755 ${pkgdir}/etc/X11/sessions
install -m755 ${srcdir}/trinity.desktop ${pkgdir}/etc/X11/sessions/trinity.desktop
-
+
# update the Xsession file, this resolves problem with kdm dropping back
# to the login screen
- patch -N ${pkgdir}${TDEDIR}/share/config/kdm/Xsession < ${srcdir}/Xsession.patch
+ patch -N ${pkgdir}${TDEDIR}/share/config/kdm/Xsession < ${srcdir}/xsession.patch
+
+ # install kdm rc.d script. We need this to start kdm from rc.d
+ install -D -m755 ${srcdir}/kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity
+
+ # Add image for default user avatar. This removes kdm complains about missing
+ # default avatar from kdm.log
+ install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/faces/.default.face.icon
+ install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/pics/users/arch-kdm.png
# create the starttrinity link
# do we need this? wouldn't be better to rename startkde script
# to starttrinity? Well, whathever.
- ln -sf ${pkgdir}$TDEDIR/bin/startkde ${pkgdir}$TDEDIR/bin/starttrinity
+ ln -sf $TDEDIR/bin/startkde ${pkgdir}$TDEDIR/bin/starttrinity
- # install kdm rc.d script. We need this to start kdm from rc.d
- install -D -m755 ${srcdir}/kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity
-
# install mkpamserv script, so we can auto-generate pam.d configs in post_install()
install -D -m755 ${srcdir}/kdebase/mkpamserv ${pkgdir}${TDEDIR}/bin/mkpamserv
@@ -125,11 +130,6 @@ package() {
# in the config file doens't exist. Maybe this should be provided by dbus bindings?
# No, after riconsidering I'm not gonna provide it unless it's required.
- # Add image for default user avatar. This removes kdm complains about missing
- # default avatar from kdm.log
- install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/faces/.default.face.icon
- install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/pics/users/arch-kdm.png
-
# Install nice arch logo to use in the shutdown dialog
install -D -m 644 $srcdir/arch-kdeshutdown.png ${pkgdir}$TDEDIR/share/apps/ksmserver/pics/shutdownkonq.png
@@ -147,4 +147,5 @@ package() {
cd ..
done
+
}
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2 b/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2
index 2e74ade35..0a0b90c54 100644
--- a/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2
+++ b/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2
Binary files differ
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/trinity-kdebase.install b/arch/3.5.13/trinity-base/trinity-kdebase/trinity-kdebase.install
index fa5fdeea2..82f34a0b0 100644
--- a/arch/3.5.13/trinity-base/trinity-kdebase/trinity-kdebase.install
+++ b/arch/3.5.13/trinity-base/trinity-kdebase/trinity-kdebase.install
@@ -1,9 +1,9 @@
post_install() {
ldconfig &> /dev/null
mkpamserv trinity
- echo "Please remember that you can change your kdesu backend"
- echo "from su to sudo by adding following lines to your"
- echo "~/.trinity/share/kdesurc or to $TDEDIR/share/config/kdesurc:"
+ echo "Please remember that you can change your kdesu backend from su to sudo"
+ echo "by adding following lines to your ~/.trinity/share/kdesurc or to the"
+ echo "$TDEDIR/share/config/kdesurc:"
echo "[super-user-command]"
echo "super-user-command=sudo"
}
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/xsession.patch b/arch/3.5.13/trinity-base/trinity-kdebase/xsession.patch
new file mode 100644
index 000000000..164d6c811
--- /dev/null
+++ b/arch/3.5.13/trinity-base/trinity-kdebase/xsession.patch
@@ -0,0 +1,28 @@
+--- /mnt/archlinux/opt/trinity/share/config/kdm/Xsession 2011-12-08 13:08:43.000000000 +0100
++++ /opt/kde3/share/config/kdm/Xsession 2011-09-24 14:52:28.000000000 +0200
+@@ -43,4 +43,24 @@
+ ;;
+ esac
+ # invoke global X session script
+-. /etc/X11/Xsession
++
++
++ case $session in
++ "")
++ exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
++ ;;
++ failsafe)
++ exec ck-launch-session xterm -geometry 80x24-0-0
++ ;;
++ custom)
++ exec ck-launch-session $HOME/.xsession
++ ;;
++ default)
++ exec ck-launch-session /opt/trinity/bin/startkde
++ ;;
++ *)
++ eval exec ck-launch-session "$session"
++ ;;
++ esac
++ exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
++
diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
index aa3ba2e80..be5a03bfc 100644
--- a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
@@ -3,13 +3,13 @@
pkgname=trinity-kdelibs
pkgver=3513
-pkgrel=5
+pkgrel=6
arch=('i686' 'x86_64')
url='http://www.trinitydesktop.org'
license=('GPL')
groups=('trinity-base')
pkgdesc="Trinity DE core libraries"
-depends=('trinity-arts'
+depends=('trinity-arts' 'xorg-iceauth'
'libxslt' 'libidn' 'libart-lgpl' 'jasper'
'libxcomposite' 'libcups' 'libutempter'
'openexr' 'aspell' 'hspell')
@@ -35,7 +35,7 @@ build() {
# compiles without exporting this, since we have profiles
#export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR}
#export PATH=$PATH:${TDEDIR}/bin
- #export CMAKE_INCLUDE_PATH=/usr/include/dbus-1.0:${TDEDIR}/bin
+ #export CMAKE_INCLUDE_PATH=/usr/include/dbus-1.0
#export LD_LIBRARY_PATH=${TDEDIR}/lib:${QTDIR}/lib:${TDEDIR}/lib/trinity:$LD_LIBRARY_PATH
msg "Patching..."
diff --git a/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD
index 2aca1f16c..3dbcc58ef 100644
--- a/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD
@@ -22,12 +22,14 @@ md5sums=('f1d120495d1aaf393819e988c0a7bb7e')
build() {
cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+ [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh
+ [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh
+
msg "Starting configure..."
- . /etc/profile.d/qt3.sh
export QMAKESPEC="/opt/qt/mkspecs/default"
- echo yes | python2.7 configure.py -q /opt/qt/
+ echo yes | python2.7 configure.py -q ${QTDIR}
msg "Building ${pkgname}..."
make
diff --git a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD
index c5e79d43b..3d98aa5ee 100644
--- a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD
@@ -9,11 +9,19 @@ arch=('i686' 'x86_64')
url="http://trinitydesktop.org"
license=('GPL')
groups=('trinity-base')
-depends=('libpng' 'libjpeg' 'libxmu' 'libxcursor' 'libxinerama' 'mesa'
- 'libxft' 'libxrandr')
-makedepends=('mysql' 'postgresql' 'sqlite3' 'unixodbc' 'libmng' 'libxi')
- # cups [add for cups support, add -cups to ./configure opts]
-optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
+depends=('libpng' 'libjpeg' 'libxmu' 'libmng' 'postgresql-libs'
+ 'libxcursor' 'libxinerama' 'mesa' 'libxft' 'libxrandr'
+ 'libmysqlclient')
+makedepends=('libxi' 'postgresql' 'unixodbc' 'libcups')
+ #'mysql' 'postgresql' 'sqlite3' 'unixodbc' 'libxi' 'cups')
+ # cups - add for cups support
+ # cups is enabled by default in ./configure
+ # remove -no-cups if you want cups support in qt3
+optdepends=('cups: The CUPS Printing System - for printing support'
+ 'postgresql: A sophisticated object-relational DBMS - databse support'
+ 'unixodbc: ODBC API for linux - databse support'
+ 'mysql: A fast SQL database server - databse support')
+ #'libmysqlclient' 'postgresql-libs' 'unixodbc' 'cups')
provides=('qt3' 'qt3-enhanced')
replaces=('qt3-enhanced' 'qt3')
options=('libtool' '!emptydirs')
@@ -21,21 +29,40 @@ install='qt3.install'
source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/qt3-3.3.8.d.tar.gz'
'qt-patches.tar.bz2')
md5sums=('78dc675e84aed595375449818cbb589a'
- 'de4d95f8d236ecc85bad4876efd8fdf0')
+ '71d5f647da82d2a6f5e0e13549f1e865')
_prefix="/opt/qt3"
build() {
- msg "Patching source code..."
-
cd $srcdir/qt3
- # apply other qt patches from debian/gentoo and kde
+ msg "Patching source code..."
+ # apply qt patches from debian/gentoo and kde
for patch in $srcdir/qt-patches/*.patch; do
_p=`basename $patch`
msg "Applying patch $_p.."
patch -Np0 -i $patch
done
+ unset _p patch
+
+ # Originally this was done in a patch but probably it's a bad idea
+ # Besides we need the rpath, since we don't install qt in the default
+ # system dirs. If we would install into default /usr hierarchy
+ # we would uncomment this. See Beyond Linux From Scratch book
+ # for more info.
+ # sed -i '/QMAKE_RPATH/d' mkspecs/linux*/qmake.conf
+
+ # These are probably arch-specific. They were present in old qt3
+ # PKGBULD, they were present in kdemod3 PKGBUILD, they are present
+ # here.
+ sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
+ 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
+
+ # auto license acceptance
+ sed -i "s|read acceptance|acceptance=yes|" configure
msg "Setting enviroment variables..."
export QTDIR="${srcdir}/qt3/"
@@ -44,50 +71,42 @@ build() {
export QMAKESPEC=$QTDIR/mkspecs/linux-g++
if [ "$CARCH" = "x86_64" ]; then
- export ARCH="-64"
+ export ARCH="-64"
else unset ARCH
fi
-
- cd "${srcdir}/qt3"
-
+
+ # Remove useless to us mkspecs
rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*}
- 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
-
- # auto license acceptance
- sed -i "s|read acceptance|acceptance=yes|" configure
-
msg "Starting configure..."
- #make -C qmake || return 1
./configure \
-prefix ${_prefix} \
- -platform linux-g++${ARCH} \
-sysconfdir /etc/qt \
- -release \
- -sm \
- -nis \
- -stl \
- -no-g++-exceptions \
+ -I/usr/include/mysql \
+ -I/usr/include/postgresql/server \
+ -lpq \
+ -lmysqlclient \
+ -L/usr/lib/mysql \
+ -qt-gif \
+ -system-zlib \
+ -system-libpng \
+ -system-libjpeg \
+ -system-libmng \
+ -plugin-imgfmt-png \
+ -plugin-imgfmt-jpeg \
+ -plugin-imgfmt-mng \
+ -plugin-sql-mysql \
+ -plugin-sql-psql \
+ -plugin-sql-sqlite \
+ -plugin-sql-odbc \
+ -platform linux-g++${ARCH} \
+ -no-exceptions \
-thread \
- -shared \
-dlopen-opengl \
- -no-ipv6 \
- -system-zlib \
- -{system-lib,plugin-imgfmt-}{png,jpeg,mng} \
- -qt-gif \
- -xinerama \
- -xcursor \
- -xrender \
- -xft \
- -plugin-sql-{mysql,psql,sqlite,odbc}
+ -no-ipv6
# 64bit fixes pulled from extras/qt3 PKGBUILD
+ # this is Arch-specific
# fix /opt/qt/lib path
[ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt3/src/Makefile
[ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt3/tools/designer/designer/Makefile
@@ -98,20 +117,19 @@ build() {
msg "Building - $pkgname..."
# build sql plugins
- cd "${srcdir}"/qt3
- make -C qmake
- cd "${srcdir}"/qt3/plugins/src/sqldrivers/mysql
- "${srcdir}"/qt3/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
- cd "${srcdir}"/qt3/plugins/src/sqldrivers/psql
- "${srcdir}"/qt3/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
+ # do we need this, I don't think so.
+ #cd "${srcdir}"/qt3
+ #make -C qmake
+ #cd "${srcdir}"/qt3/plugins/src/sqldrivers/mysql
+ #"${srcdir}"/qt3/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
+ #cd "${srcdir}"/qt3/plugins/src/sqldrivers/psql
+ #"${srcdir}"/qt3/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
cd "${srcdir}"/qt3
- # fix the broken makefiles
- # sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
-
- # build rest
- make
+ # build rest, but without tutorials and examples
+ # of you want them, remove sub-tools
+ make sub-tools
}
@@ -121,24 +139,24 @@ package() {
make INSTALL_ROOT="$pkgdir" install
- msg "Cleaning package..."
-
- rm -rf "${pkgdir}"$_prefix/{phrasebooks,templates,translations}
- sed -i "s|-L${srcdir}/qt3/lib ||g" "${pkgdir}"$_prefix/lib/*.prl
- rm -f "${pkgdir}"${_prefix}/mkspecs/linux-g++$ARCH/linux-g++$ARCH
-
- # Fix issues with GCC4
- sed -i 's/\(char\*\)/const char*/g' $pkgdir$_prefix/include/*.h
- # Fix the mess we did fixing issues with GCC4
- sed -i 's/const u char/const uchar/g' $pkgdir$_prefix/include/*.h
- sed -i 's/u const char/const uchar/g' $pkgdir$_prefix/include/*.h
- sed -i 's/const const/const/g' $pkgdir$_prefix/include/*.h
- sed -i 's/uconst/ unsigned /g' $pkgdir$_prefix/include/*.h
-
- sed -ie 's/define QTIMER_H/&\n#include "qglobal.h"/g' $pkgdir$_prefix/include/qtimer.h
-
+ # install qmake
install -D -m755 qmake/qmake "${pkgdir}"$_prefix/bin/qmake
+ # install doc pages which are missed by make install
+ install -d -m755 "${pkgdir}"$_prefix/doc/
+ cp -r "${srcdir}"/qt3/doc "${pkgdir}"$_prefix/doc
+
+ # install link the apps provided by qt3 so we don't collide with
+ # qt4 and can run them.
+ ln -sf $_prefix/bin/assistant "${pkgdir}"$_prefix/bin/qt3assistant
+ ln -sf $_prefix/bin/designer "${pkgdir}"$_prefix/bin/qt3designer
+ ln -sf $_prefix/bin/linguist "${pkgdir}"$_prefix/bin/qt3linguist
+ ln -sf $_prefix/bin/lrelease "${pkgdir}"$_prefix/bin/qt3lrelease
+ ln -sf $_prefix/bin/lupdate "${pkgdir}"$_prefix/bin/qt3lupdate
+ ln -sf $_prefix/bin/moc "${pkgdir}"$_prefix/bin/qt3moc
+ ln -sf $_prefix/bin/qmake "${pkgdir}"$_prefix/bin/qt3qmake
+ ln -sf $_prefix/bin/qtconfig "${pkgdir}"$_prefix/bin/qt3config
+
# Build ld.so.conf file
install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
echo "${_prefix}/lib" >> ${pkgdir}/etc/ld.so.conf.d/qt3.conf
@@ -150,20 +168,25 @@ package() {
echo "export PATH+=:${_prefix}/bin" >> ${pkgdir}/etc/profile.d/qt3.sh
echo "export PKG_CONFIG_PATH+=:${_prefix}/pkgconfig" >> ${pkgdir}/etc/profile.d/qt3.sh
- # ln -sf $_prefix/bin/qtconfig "${pkgdir}"$_prefix/bin/qt3config
+ msg "Cleaning package..."
- # install man pages
- install -d -m755 "${pkgdir}"$_prefix/man
- cp -r "${srcdir}"/qt3/doc/man/{man1,man3} "${pkgdir}"$_prefix/man/
+ #rm -rf "${pkgdir}"$_prefix/{phrasebooks,templates,translations}
+
+ # remove any link to the compiled libraries present in
+ # $srcdir, which won't be present in non-building system.
+ sed -i "s|-L${srcdir}/qt3/lib ||g" "${pkgdir}"$_prefix/lib/*.prl
+
+ #rm -f "${pkgdir}"${_prefix}/mkspecs/linux-g++$ARCH/linux-g++$ARCH
- # libtoolslay
- find $startdir/pkg -name '*.la' -exec rm {} \;
+ # Fix issues with GCC4
+ sed -i 's/\(char\*\)/const char*/g' $pkgdir$_prefix/include/*.h
+ # Fix the mess we did fixing issues with GCC4
+ sed -i 's/const u char/const uchar/g' $pkgdir$_prefix/include/*.h
+ sed -i 's/u const char/const uchar/g' $pkgdir$_prefix/include/*.h
+ sed -i 's/const const/const/g' $pkgdir$_prefix/include/*.h
+ sed -i 's/uconst/ unsigned /g' $pkgdir$_prefix/include/*.h
- # Arch64 fix
- #if [ "$CARCH" = "x86_64" ]; then
- # [ -d $pkgdir$_prefix/mkspecs/linux-g++ ] || mkdir $pkgdir$_prefix/mkspecs/linux-g++
- # cd $pkgdir$_prefix/mkspecs/linux-g++
- # ln -s -v ../linux-g++-64/* .
- #fi
+ # missing include "qglobal.h" in include/qtimer.h fix
+ sed -ie 's/define QTIMER_H/&\n#include "qglobal.h"/g' $pkgdir$_prefix/include/qtimer.h
}
diff --git a/arch/3.5.13/trinity-base/trinity-qt3/qt-patches.tar.bz2 b/arch/3.5.13/trinity-base/trinity-qt3/qt-patches.tar.bz2
index 4794e9291..cb53bd9df 100644
--- a/arch/3.5.13/trinity-base/trinity-qt3/qt-patches.tar.bz2
+++ b/arch/3.5.13/trinity-base/trinity-qt3/qt-patches.tar.bz2
Binary files differ
diff --git a/arch/3.5.13/trinity-base/trinity-qt3/qt3.install b/arch/3.5.13/trinity-base/trinity-qt3/qt3.install
index 2a8dc4c98..b059a2caa 100644
--- a/arch/3.5.13/trinity-base/trinity-qt3/qt3.install
+++ b/arch/3.5.13/trinity-base/trinity-qt3/qt3.install
@@ -1,12 +1,20 @@
post_install() {
ldconfig &> /dev/null
+ echo "Note that the tools provided by this package (assistant, designer,"
+ echo "linguist, lrelease, lupdate, moc, qmake and qtconfig) have been"
+ echo "renamet to qt3<toolname> to ensure compatibility with Qt4 and should"
+ echo "be run through new command scheme."
+ echo ""
+ echo "In order to update PATH to include Qt3 binaries location, You should"
+ echo "reboot your system. Before you do that you can access Qt3 bin path by"
+ echo "sourcing /etc/profile.d/qt3.sh"
}
post_upgrade() {
- post_install
+ ldconfig &> /dev/null
}
post_remove() {
- post_install
+ ldconfig &> /dev/null
}
diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
index da4086888..a1f14f9a3 100644
--- a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=trinity-tqtinterface
pkgver=3513
-pkgrel=3
+pkgrel=4
arch=('i686' 'x86_64')
url="http://trinity.pearsoncomputing.net"
license=('GPL2')
@@ -14,14 +14,13 @@ makedepends=('pkgconfig' 'cmake')
conflicts=('kdemod3-tqtinterface')
makeopts=('libtool' '!emptydirs')
source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/tqtinterface-3.5.13.tar.gz'
- 'tqtpc-location.patch')
+ 'tqtpc-location.patch' 'trinity.profile.sh' 'trinity.profile.csh')
md5sums=('d54cc9fd0b35555298efd17c32471a2b'
- 'c15745c944d98cb7c4cb553f0ca421d4')
+ 'c15745c944d98cb7c4cb553f0ca421d4'
+ '72c6c4fb492c1f4b4741fad1dd70d62f'
+ '915e14c6264a6b9c46a6a20b16cdcd06')
install='trinity-tqtinterface.install'
-# istead of using prefix, we will use QTDIR from qt3 profile
-#_prefix=/opt/qt3
-
build() {
msg "Setting PATH, CMAKE and Trinity Environment variables"
# Source the QT and KDE profile
@@ -34,7 +33,7 @@ build() {
msg "Starting cmake..."
cmake "../dependencies/tqtinterface" \
- -DCMAKE_INSTALL_PREFIX=${QTDIR} \
+ -DCMAKE_INSTALL_PREFIX=/opt/trinity \
-DQT_PREFIX_DIR=${QTDIR} \
-DQT_INCLUDE_DIR=${QTDIR}/include \
-DMOC_EXECUTABLE=${QTDIR}/bin/moc \
@@ -56,4 +55,21 @@ package() {
#mkdir -p ${pkgdir}/usr/bin
#cp -Rp ${srcdir}/${_svnmod}/qtinterface/uic-tqt ${pkgdir}/usr/bin
+ # it should contain sripts which would add
+ # their location into system variables
+ # this mean that this package should provide
+ # /etc/ld.so.conf.d/trinity.conf - lib locations for linker
+ # /etc/profile.d/trinity.sh - $PATH and other system variables for bash
+ # /etc/profile.d/trinity.csh - $PATH and other system variables for csh
+ # up until now it was done in the kdelibs PKGBUILD/package
+
+ # Create and install ld.so.conf.d file
+ install -d -m755 $pkgdir/etc/ld.so.conf.d/
+ echo /opt/trinity/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf
+ echo /opt/trinity/lib/trinity >> $pkgdir/etc/ld.so.conf.d/trinity.conf
+
+ # Install profiles
+ install -D -m755 $srcdir/trinity.profile.sh $pkgdir/etc/profile.d/trinity.sh
+ install -D -m755 $srcdir/trinity.profile.csh $pkgdir/etc/profile.d/trinity.csh
+
}
diff --git a/arch/3.5.13/trinity-base/trinity-arts/trinity.profile.csh b/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.csh
index 7fc995130..7fc995130 100644
--- a/arch/3.5.13/trinity-base/trinity-arts/trinity.profile.csh
+++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.csh
diff --git a/arch/3.5.13/trinity-base/trinity-arts/trinity.profile.sh b/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.sh
index 70e503534..70e503534 100644
--- a/arch/3.5.13/trinity-base/trinity-arts/trinity.profile.sh
+++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.sh