diff options
Diffstat (limited to 'arch/3.5.13/trinity-base')
| -rw-r--r-- | arch/3.5.13/trinity-base/hal/PKGBUILD | 2 | ||||
| -rw-r--r-- | arch/3.5.13/trinity-base/trinity-arts/PKGBUILD | 4 | ||||
| -rw-r--r-- | arch/3.5.13/trinity-base/trinity-dbus-1-qt3/PKGBUILD | 2 | ||||
| -rw-r--r-- | arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD | 3 | ||||
| -rw-r--r-- | arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD | 6 | ||||
| -rw-r--r-- | arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD | 18 | ||||
| -rw-r--r-- | arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD | 24 | ||||
| -rw-r--r-- | arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD | 3 | ||||
| -rw-r--r-- | arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD | 3 |
9 files changed, 26 insertions, 39 deletions
diff --git a/arch/3.5.13/trinity-base/hal/PKGBUILD b/arch/3.5.13/trinity-base/hal/PKGBUILD index 2de5f1047..a2c5676c5 100644 --- a/arch/3.5.13/trinity-base/hal/PKGBUILD +++ b/arch/3.5.13/trinity-base/hal/PKGBUILD @@ -1,5 +1,7 @@ +# Maintainer: Calvin Morisson <mutantturkey@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@subpop.net> +# Contributor: Pawel "l0ner" Soltys <sh4dou@gmail.com> pkgname=hal pkgver=0.5.14 diff --git a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD index 089f41bb7..2c925fccc 100644 --- a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD @@ -14,12 +14,10 @@ depends=('audiofile' 'libvorbis' 'trinity-tqtinterface') makedepends=('pkgconfig' 'cmake') -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) -source=(http://anduin.linuxformscratch.org/sources/trinity/arts-3.5.13.tar.gz) +source=(http://mirror.ets.kth.se/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) diff --git a/arch/3.5.13/trinity-base/trinity-dbus-1-qt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-dbus-1-qt3/PKGBUILD index c9afee5b0..49698ebb8 100644 --- a/arch/3.5.13/trinity-base/trinity-dbus-1-qt3/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-dbus-1-qt3/PKGBUILD @@ -26,7 +26,7 @@ build() { make || return 1 # Libtool slay - # find $startdir/pkg -name *.la -exec rm {} \; + # find $pkgdir -name *.la -exec rm {} \; } package() { 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 c3844ce33..eb51423d0 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 @@ -12,8 +12,7 @@ depends=('trinity-tqtinterface' 'dbus') provides=('trinity-dbus-tqt-1' 'dbus-tqt-1' 'dbus-1-tqt' 'trinity-dbus-1-tqt') 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) -source=(http://anduin.linuxfromscratch.org/sources/trinity/dbus-1-tqt-3.5.13.tar.gz) +source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/dbus-1-tqt-3.5.13.tar.gz) md5sums=('a7ba1071f4bf7b5930f805b4036f8a97') _svnmod=dependencies/dbus-1-tqt 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 dca32c78e..63759a641 100644 --- a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer Calvin Morrison <mutantturkey@gmail.com> +# Maintainer: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-dbus-tqt pkgver=3513 @@ -10,12 +10,10 @@ groups=('trinity-base') pkgdesc="Trinity TQt DBus wrapper" 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) -source=(http://anduin.linuxfromscratch.org/sources/trinity/dbus-tqt-3.5.13.tar.gz) +source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/dbus-tqt-3.5.13.tar.gz) md5sums=('46ae165c068271485c827f6fc6687a9a') _svnmod=dependencies/dbus-tqt diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD index 53eafbc42..6011214a0 100644 --- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD @@ -32,8 +32,7 @@ optdepends=('desktop-file-utils: Command line utilities for working with desktop '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' 'kdm-trinity') -source=('http://anduin.linuxfromscratch.org/sources/trinity/kdebase-3.5.13.tar.gz' 'dbusfix.diff' 'kdm-trinity') +source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' 'dbusfix.diff' 'kdm-trinity') md5sums=('d1f7e1f94eeb46b981fe1ba144179840' 'c9ce810c281002440a6de8cfd8735d07' '376d85d213cf3c04cb0912e5cccd68bd') @@ -110,16 +109,9 @@ package() { # cd ${srcdir}/${_svnmod} cd ${srcdir}/build - make DESTDIR="$pkgdir/" install + 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 + # install desktop [[ -f ${pkgdir}/etc/X11/sessions/trinity.desktop ]] || msg "ERROR - Install Failure: ${pkgdir}/etc/X11/sessions/trinity.desktop" # set kdm directory @@ -137,7 +129,7 @@ package() { cd ${pkgdir}/usr/bin ln -sf /opt/trinity/bin/startkde starttrinity - cd ${startdir} - install -D -m755 ./kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity + cd ${srcdir} + install -D -m755 kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity } diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD index ffb2108b0..453599b7e 100644 --- a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD @@ -2,20 +2,19 @@ pkgname=trinity-kdelibs pkgver=3513 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') groups=('trinity-base') pkgdesc="Trinity DE core libraries" -depends=('trinity-arts' 'trinity-qt3' 'trinity-tqtinterface' 'libical' 'libxslt' 'libltdl' 'avahi' 'pam-krb5' 'taglib' 'libxcomposite') +depends=('trinity-arts' 'trinity-qt3' 'trinity-tqtinterface' 'libical' 'libxslt' 'libltdl' 'avahi' 'pam-krb5' 'taglib' 'libxcomposite' 'libcups' 'jre7-openjdk') 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' 'trinity.sh') -source=('http://anduin.linuxfromscratch.org/sources/trinity/kdelibs-3.5.13.tar.gz' 'trinity.sh') +source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdelibs-3.5.13.tar.gz' 'trinity.sh') md5sums=('f62eefb63b4ba2141b4c576f859806dd' '2de1886d632c8bc288befada5e1bc3b5') @@ -43,13 +42,14 @@ build() { msg "Starting cmake..." cmake ${srcdir}/kdelibs \ -DCMAKE_INSTALL_PREFIX=${_prefix} \ - -DCMAKE_VERBOSE_MAKEFILE=OFF \ - -DQT_VERSION=3 \ - -DWITH_QT3=ON \ - -DQTDIR=${QTDIR} \ - -DQT_LIBRARY_DIRS=${QTDIR}/lib \ - -DWITH_PAM=ON \ - -DBUILD_ALL=ON + -DCMAKE_VERBOSE_MAKEFILE=OFF +# Not needed, CMake returns that those were not used +# -DQT_VERSION=3 \ +# -DWITH_QT3=ON \ +# -DQTDIR=${QTDIR} \ +# -DQT_LIBRARY_DIRS=${QTDIR}/lib \ +# -DWITH_PAM=ON \ +# -DBUILD_ALL=ON msg "Building - $pkgname..." make @@ -65,7 +65,7 @@ package() { echo "${_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/ + install -m644 ${srcdir}/trinity.sh ${pkgdir}/etc/profile.d/ # rm -r ${srcdir}/${_svnmod} } diff --git a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD index ce4d7dc7a..74bf99169 100644 --- a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD @@ -15,8 +15,7 @@ provides=('trinity-qt3' 'qt3') conflicts=('qt3' 'qt3-enhanced') replaces=('trinity-qt3') options=(!libtool) -#source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/qt3-3.3.8.d.tar.gz) -source=(http://anduin.linuxfromscratch.org/sources/trinity/qt3-3.3.8.d.tar.gz) +source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/qt3-3.3.8.d.tar.gz) md5sums=('78dc675e84aed595375449818cbb589a') _prefix="/opt/qt" diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD index 772464b44..70767907b 100644 --- a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD @@ -14,8 +14,7 @@ makedepends=('pkgconfig' 'cmake' 'libxi' 'libxft' 'libxrandr' 'libxcursor' 'libx provides=($pkgname) #conflicts=() #replaces=() -#source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/tqtinterface-3.5.13.tar.gz) -source=(http://anduin.linuxfromscratch.org/sources/trinity/tqtinterface-3.5.13.tar.gz) +source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/tqtinterface-3.5.13.tar.gz) md5sums=('d54cc9fd0b35555298efd17c32471a2b') _prefix=/usr |