diff options
27 files changed, 227 insertions, 308 deletions
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 45af8c626..e84cb5aa3 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 @@ -1,4 +1,5 @@ -# Maintainer: Calvin Morrison <mutantturkey@gmail.com> +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-dbus-1-qt3 pkgver=0.9 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 eb51423d0..e181b8928 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 @@ -1,4 +1,5 @@ -# Maintainer: calvin Morrison <mutantturkey@gmail.com> +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-dbus-tqt-1 pkgver=3513 @@ -15,34 +16,27 @@ 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') -_svnmod=dependencies/dbus-1-tqt -_builddir=build _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 + . /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:\ + 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 ${_builddir} - cd ${_builddir} + mkdir -p build + cd build msg "Starting cmake..." - cmake ${srcdir}/${_svnmod} \ + cmake ${srcdir}/dependencies/dbus-1-tqt \ -DCMAKE_INSTALL_PREFIX=${_prefix} \ -DCMAKE_VERBOSE_MAKEFILE=ON @@ -56,6 +50,6 @@ build() { package() { msg "Packaging - $pkgname-$pkgver" # cd ${srcdir}/${_svnmod} - cd ${srcdir}/${_builddir} + cd ${srcdir}/build make DESTDIR="${pkgdir}" install } diff --git a/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD index 45e6e77ac..2aca1f16c 100644 --- a/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: Calvin Morrison <mutantturkey@gmail.com> +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-pyqt3 pkgver=3.18.1 diff --git a/arch/3.5.13/trinity-extras/trinity-i18n/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-i18n/PKGBUILD index 3d19ad0c1..417343986 100644 --- a/arch/3.5.13/trinity-extras/trinity-i18n/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-i18n/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: Calvin Morrison <mutantturkey@gmail.com> +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=('trinity-i18n-af' 'trinity-i18n-ar' 'trinity-i18n-az' 'trinity-i18n-be' 'trinity-i18n-bg' 'trinity-i18n-bn' @@ -25,8 +26,6 @@ pkgname=('trinity-i18n-af' 'trinity-i18n-ar' 'trinity-i18n-az' 'trinity-i18n-tr' 'trinity-i18n-uk' 'trinity-i18n-uz' 'trinity-i18n-uz-cyrillic' 'trinity-i18n-vi' 'trinity-i18n-wa' ' trinity-i18n-zh_cn' 'trinity-i18n-zh_tw') - - pkgver=3513 pkgrel=1 arch=('i686' 'x86_64') @@ -40,7 +39,6 @@ options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kde-i18n-3.5.13.tar.gz) md5sums=('7c919c7cb85f454fed46767082a87773') -_builddir=kde-i18n _prefix=/opt/trinity build() { diff --git a/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD index 014797586..cff62b43b 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: Calvin Morrison <mutantturkey@gmail.com> +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-kdeaccessibility pkgver=3513 @@ -8,18 +9,12 @@ url='http://www.trinitydesktop.org' license=('GPL') groups=('trinity-extras') pkgdesc="Trinity accessibility tools" -depends=('trinity-kdelibs' 'trinity-arts') +depends=('trinity-kdebase') makedepends=('pkgconfig' 'autoconf' 'automake') -optdepends=() -provides=() -conflicts=() -replaces=() options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeaccessibility-3.5.13.tar.gz) -source=(http://anduin.linuxfromscratch.org/sources/trinity/kdeaccessibility-3.5.13.tar.gz) md5sums=('ce31b01c1831046fb28aab172f2423bf') -_builddir=kdeaccessibility _prefix=/opt/trinity build() { @@ -32,7 +27,7 @@ build() { #patch -N -d ${srcdir} -p0 < kdeaccessibility.patch msg "Starting automake..." - cd "$srcdir/${_builddir}" + cd "$srcdir/kdeaccessibility" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" make -f admin/Makefile.common @@ -51,6 +46,6 @@ build() { package() { msg "Packaging - $pkgname-$pkgver" - cd ${srcdir}/${_builddir} + cd ${srcdir}/kdeaccesibility make DESTDIR="${pkgdir}" install } diff --git a/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD index d0c932c1d..abe0836fa 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: Calvin Morrison <mutantturkey@gmail.com> +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-kdeaddons pkgver=3513 @@ -16,10 +17,8 @@ conflicts=() replaces=() options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeaddons-3.5.13.tar.gz) -source=(http://anduin.linuxfromscratch.org/sources/trinity/kdeaddons-3.5.13.tar.gz) md5sums=('f5fa96a5d99d1bc33600f609881eaee6') -_builddir=kdeaddons _prefix=/opt/trinity build() { @@ -32,7 +31,7 @@ build() { #patch -N -d ${srcdir} -p0 < kdeaddons.patch msg "Starting automake..." - cd "$srcdir/${_builddir}" + cd "$srcdir/kdeaddons" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" make -f admin/Makefile.common @@ -51,6 +50,6 @@ build() { package() { msg "Packaging - $pkgname-$pkgver" - cd ${srcdir}/${_builddir} + cd ${srcdir}/kdeaddons make DESTDIR="${pkgdir}" install } diff --git a/arch/3.5.13/trinity-extras/trinity-kdeadmin/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeadmin/PKGBUILD index a06f0f493..69928cf46 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdeadmin/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdeadmin/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: Calvin Morrison <mutantturkey@gmail.com> +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-kdeadmin pkgver=3513 @@ -16,10 +17,8 @@ conflicts=() replaces=() options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeadmin-3.5.13.tar.gz) -source=(http://anduin.linuxfromscratch.org/sources/trinity/kdeadmin-3.5.13.tar.gz) md5sums=('b8bbabf353070a3e730464e0ce2960e2') -_builddir=kdeadmin _prefix=/opt/trinity build() { @@ -32,7 +31,7 @@ build() { #patch -N -d ${srcdir} -p0 < kdeadmin.patch msg "Starting automake..." - cd "$srcdir/${_builddir}" + cd "$srcdir/kdeadmin" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" make -f admin/Makefile.common @@ -51,6 +50,6 @@ build() { package() { msg "Packaging - $pkgname-$pkgver" - cd ${srcdir}/${_builddir} + cd ${srcdir}/kdeadmin make DESTDIR="${pkgdir}" install } diff --git a/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD index 8006e28a1..18960152d 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Calvin Morrison <mutantturkey@gmail.com> -# PKGBUILD by Pawel "l0ner" Soltys <sh4dou@gmail.com> +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-kdeartwork pkgver=3513 @@ -13,11 +13,8 @@ depends=('trinity-kdebase' 'trinity-arts' 'xscreensaver' 'libart-lgpl' 'glproto' makedepends=('pkgconfig' 'cmake' 'imake') options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeartwork-3.5.13.tar.gz) -source=(http://anduin.linuxfromscratch.org/sources/trinity/kdeartwork-3.5.13.tar.gz) md5sums=('24f85eb3e5a9106de48a3e81d2575ffe') -_svnmod=kdeartwork - build() { msg "Setting PATH, CMAKE and Trinity Environment variables" export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity @@ -25,7 +22,7 @@ build() { 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" + _prefix="/opt/trinity" cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" @@ -33,8 +30,8 @@ build() { cd build msg "Starting cmake..." - cmake ${srcdir}/${_svnmod} \ - -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \ + cmake ${srcdir}/kdeartwork \ + -DCMAKE_INSTALL_PREFIX=${_prefix} \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_XSCREENSAVER=ON \ -DWITH_LIBART=ON \ diff --git a/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD index ba41f58d1..9cb3418d7 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: Calvin Morrison <mutantturkey@gmail.com> +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-kdeedu pkgver=3513 @@ -10,16 +11,10 @@ groups=('trinity-extras') pkgdesc="Trinity educational applications and tools" depends=('trinity-kdelibs') makedepends=('pkgconfig' 'autoconf' 'automake') -optdepends=() -provides=($pkgname) -conflicts=() -replaces=() options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeedu-3.5.13.tar.gz) -source=(http://anduin.linuxfromscratch.org/sources/trinity/kdeedu-3.5.13.tar.gz) md5sums=('37a14a67c4d00babc3015c6a31698cb0') -_builddir=kdeedu _prefix=/opt/trinity build() { @@ -32,7 +27,7 @@ build() { #patch -N -d ${srcdir} -p0 < kdeedu.patch msg "Starting automake..." - cd "$srcdir/${_builddir}" + cd "$srcdir/kdeedu" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" make -f admin/Makefile.common @@ -50,6 +45,6 @@ build() { package() { msg "Packaging - $pkgname-$pkgver" - cd ${srcdir}/${_builddir} + cd ${srcdir}/kdeedu make DESTDIR="${pkgdir}" install } diff --git a/arch/3.5.13/trinity-extras/trinity-kdegames/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdegames/PKGBUILD index e25dc7781..8a6df3f6a 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdegames/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdegames/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: Calvin Morrison <mutantturkey@gmail.com> +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-kdegames pkgver=3513 @@ -12,10 +13,8 @@ depends=('trinity-kdelibs') makedepends=('pkgconfig' 'autoconf' 'automake') options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdegames-3.5.13.tar.gz) -source=(http://anduin.linuxfromscratch.org/sources/trinity/kdegames-3.5.13.tar.gz) md5sums=('6c63e161050939f53921bfceb923a19e') -_builddir=kdegames _prefix=/opt/trinity build() { @@ -28,7 +27,7 @@ build() { #patch -N -d ${srcdir} -p0 < kdegames.patch msg "Starting automake..." - cd "$srcdir/${_builddir}" + cd "$srcdir/kdegames" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" make -f admin/Makefile.common @@ -46,6 +45,6 @@ build() { package() { msg "Packaging - $pkgname-$pkgver" - cd ${srcdir}/${_builddir} + cd ${srcdir}/kdegames make DESTDIR="${pkgdir}" install } diff --git a/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD index 8810ceab2..8f1ed8b4c 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD @@ -23,9 +23,6 @@ md5sums=('a75c254cd1060343cd04c6744bce6798' '635ed9478cb3edde4fda84f3bac85438') _prefix="/opt/trinity" build() { - msg "Patching..." - patch -p0 -i ${srcdir}/ksnapshot.patch - msg "Setting PATH, CMAKE and Trinity Environment variables" . /etc/profile.d/qt3.sh @@ -34,6 +31,9 @@ build() { export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:/usr/lib:$LD_LIBRARY_PATH export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig + msg "Patching..." + patch -p0 -i ${srcdir}/ksnapshot.patch + cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" mkdir -p build diff --git a/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD index 4c94c9af9..12e75db87 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: Calvin Morrison <mutantturkey@gmail.com> +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-kdemultimedia pkgver=3513 @@ -10,16 +11,10 @@ groups=('trinity-extras') pkgdesc="Trinity multimedia applications and tools" depends=('trinity-kdelibs' 'xine-lib' 'libvorbis' 'trinity-arts' 'alsa-lib' 'cdparanoia' 'lame' 'audiofile' 'libtheora' 'flac') makedepends=('pkgconfig' 'autoconf' 'automake') -optdepends=() -provides=($pkgname) -conflicts=() -replaces=() options=('libtool' '!strip') -source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdemultimedia-3.5.13.tar.gz) -source=(http://anduin.linuxfromscratch.org/sources/trinity/kdemultimedia-3.5.13.tar.gz) -md5sums=('6d906b8a8fd0928e01ecd600175381c0') +source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdemultimedia-3.5.13.tar.gz' 'xine_artsplugin.patch') +md5sums=('6d906b8a8fd0928e01ecd600175381c0' 'bb045d94e8dca80d73af4add43b7fc15') -_builddir=kdemultimedia _prefix=/opt/trinity build() { @@ -28,11 +23,11 @@ build() { export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig - #msg "Patching..." - #patch -N -d ${srcdir} -p0 < kdemultimedia.patch + msg "Patching..." + patch -p0 -i ${srcdir}/xine_artsplugin.patch msg "Starting automake..." - cd "$srcdir/${_builddir}" + cd "$srcdir/kdemultimedia" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" make -f admin/Makefile.common @@ -61,6 +56,6 @@ build() { package() { msg "Packaging - $pkgname-$pkgver" - cd ${srcdir}/${_builddir} + cd ${srcdir}/kdemultimedia make DESTDIR="${pkgdir}" install } diff --git a/arch/3.5.13/trinity-extras/trinity-kdemultimedia/xine_artsplugin.patch b/arch/3.5.13/trinity-extras/trinity-kdemultimedia/xine_artsplugin.patch new file mode 100644 index 000000000..36f89bcfd --- /dev/null +++ b/arch/3.5.13/trinity-extras/trinity-kdemultimedia/xine_artsplugin.patch @@ -0,0 +1,30 @@ +diff -u -r src/kdemultimedia/xine_artsplugin/xinePlayObject_impl.cpp kdemultimedia/xine_artsplugin/xinePlayObject_impl.cpp +--- src/kdemultimedia/xine_artsplugin/xinePlayObject_impl.cpp 2012-01-24 00:34:05.000000000 +0100 ++++ kdemultimedia/xine_artsplugin/xinePlayObject_impl.cpp 2011-08-13 08:18:23.000000000 +0200 +@@ -698,7 +698,7 @@ + + if (stream != 0) + { +- xine_gui_send_vo_data( stream, ++ xine_port_send_gui_data( vo_port, + XINE_GUI_SEND_EXPOSE_EVENT, + &event ); + } +@@ -714,7 +714,7 @@ + + if (stream != 0) + { +- xine_gui_send_vo_data( stream, ++ xine_port_send_gui_data( vo_port, + XINE_GUI_SEND_COMPLETION_EVENT, + &event ); + } +@@ -748,7 +748,7 @@ + { + resizeNotify(); + +- xine_gui_send_vo_data( stream, ++ xine_port_send_gui_data( vo_port, + XINE_GUI_SEND_DRAWABLE_CHANGED, + (void *)window ); + } diff --git a/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD index d7265d8d9..82d8bebab 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Calvin Morrison <mutantturkey@gmail.com> -# PKGBUILD by Pawel "l0ner" Soltys <sh4dou@gmail.com> +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-kdenetwork pkgver=3513 @@ -11,7 +11,7 @@ groups=('trinity-extras') pkgdesc="Trinity network utilities" depends=('trinity-kdebase' 'trinity-arts' - 'speex' + 'speex' 'wireless_tools' 'gsmlib-git' 'libgadu' 'meanwhile' @@ -21,11 +21,8 @@ depends=('trinity-kdebase' makedepends=('pkgconfig' 'cmake' 'imake') options=('libtool' '!strip') source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdenetwork-3.5.13.tar.gz' 'kdenetwork.patch') -source=('http://anduin.linuxfromscratch.org/sources/trinity/kdenetwork-3.5.13.tar.gz' 'kdenetwork.patch') md5sums=('349f197c9af4bf0d9b8773f26829415e' - '8abe1847df7b7449027719238a27e359') - -_svnmod=kdenetwork + 'ee468902b7c40ac1cc86cbaababa35dc') build() { msg "Setting PATH, CMAKE and Trinity Environment variables" @@ -34,9 +31,11 @@ build() { 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" + _prefix="/opt/trinity" - patch -N -d ${srcdir} -p0 < kdenetwork.patch + patch -p0 -i ${srcdir}/kdenetwork.patch + mv ${srcdir}/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc ${srcdir}/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/tqname.cc + mv ${srcdir}/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.h ${srcdir}/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/tqname.h cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" @@ -44,8 +43,8 @@ build() { cd build msg "Starting cmake..." - cmake ${srcdir}/${_svnmod} \ - -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \ + cmake ${srcdir}/kdenetwork \ + -DCMAKE_INSTALL_PREFIX=${_prefix} \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_JINGLE=ON \ -DWITH_SPEEX=ON \ diff --git a/arch/3.5.13/trinity-extras/trinity-kdenetwork/kdenetwork.patch b/arch/3.5.13/trinity-extras/trinity-kdenetwork/kdenetwork.patch index 9459677fe..7da894f5f 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdenetwork/kdenetwork.patch +++ b/arch/3.5.13/trinity-extras/trinity-kdenetwork/kdenetwork.patch @@ -32,104 +32,6 @@ diff -u -r kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot // On our copy of sigslot.h, we force single threading #define SIGSLOT_PURE_ISO -diff -u -r kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc ---- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc 2011-06-22 03:37:08.000000000 +0200 -+++ src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc 2011-12-15 22:56:58.000000000 +0100 -@@ -31,7 +31,7 @@ - #include "talk/p2p/client/sessionclient.h" - #include "talk/p2p/base/helpers.h" - #include "talk/base/logging.h" --#include "talk/xmllite/tqname.h" -+#include "talk/xmllite/qname.h" - #include "talk/xmpp/constants.h" - #include "talk/xmllite/xmlprinter.h" - #include <iostream> -diff -u -r kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc ---- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc 2011-06-22 03:37:11.000000000 +0200 -+++ src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc 2011-12-15 22:56:58.000000000 +0100 -@@ -28,7 +28,7 @@ - #include <string> - #include "talk/base/common.h" - #include "talk/xmllite/xmlelement.h" --#include "talk/xmllite/tqname.h" -+#include "talk/xmllite/qname.h" - #include "talk/xmllite/xmlconstants.h" - - //#define new TRACK_NEW -Only in src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite: tqname.cc -Only in src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite: tqname.h -diff -u -r kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc ---- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc 2011-06-22 03:37:11.000000000 +0200 -+++ src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc 2011-12-15 22:56:58.000000000 +0100 -@@ -32,7 +32,7 @@ - - #include "talk/base/common.h" - #include "talk/xmllite/xmlelement.h" --#include "talk/xmllite/tqname.h" -+#include "talk/xmllite/qname.h" - #include "talk/xmllite/xmlparser.h" - #include "talk/xmllite/xmlbuilder.h" - #include "talk/xmllite/xmlprinter.h" -diff -u -r kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h ---- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h 2011-06-22 03:37:11.000000000 +0200 -+++ src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h 2011-12-15 22:56:58.000000000 +0100 -@@ -31,7 +31,7 @@ - #include <iosfwd> - #include <string> - #include "talk/base/scoped_ptr.h" --#include "talk/xmllite/tqname.h" -+#include "talk/xmllite/qname.h" - - namespace buzz { - -diff -u -r kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h ---- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h 2011-06-22 03:37:11.000000000 +0200 -+++ src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h 2011-12-15 22:56:58.000000000 +0100 -@@ -31,7 +31,7 @@ - #include <string> - #include "talk/base/scoped_ptr.h" - #include "talk/base/stl_decl.h" --#include "talk/xmllite/tqname.h" -+#include "talk/xmllite/qname.h" - - namespace buzz { - -diff -u -r kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc ---- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc 2011-06-22 03:37:09.000000000 +0200 -+++ src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc 2011-12-15 22:56:58.000000000 +0100 -@@ -29,7 +29,7 @@ - #include "talk/base/basicdefs.h" - #include "talk/xmllite/xmlconstants.h" - #include "talk/xmllite/xmlelement.h" --#include "talk/xmllite/tqname.h" -+#include "talk/xmllite/qname.h" - #include "talk/xmpp/jid.h" - #include "talk/xmpp/constants.h" - namespace buzz { -diff -u -r kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h ---- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h 2011-06-22 03:37:09.000000000 +0200 -+++ src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h 2011-12-15 22:56:58.000000000 +0100 -@@ -29,7 +29,7 @@ - #define _CRICKET_XMPP_XMPPLIB_BUZZ_CONSTANTS_H_ - - #include <string> --#include "talk/xmllite/tqname.h" -+#include "talk/xmllite/qname.h" - #include "talk/xmpp/jid.h" - - -diff -u -r kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h ---- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h 2011-06-22 03:37:09.000000000 +0200 -+++ src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h 2011-12-15 22:56:58.000000000 +0100 -@@ -30,7 +30,7 @@ - - // also part of the API - #include "talk/xmpp/jid.h" --#include "talk/xmllite/tqname.h" -+#include "talk/xmllite/qname.h" - #include "talk/xmllite/xmlelement.h" - - diff -u -r kdenetwork/kopete/protocols/jabber/kioslave/CMakeLists.txt src/kdenetwork/kopete/protocols/jabber/kioslave/CMakeLists.txt --- kdenetwork/kopete/protocols/jabber/kioslave/CMakeLists.txt 2011-06-22 03:37:08.000000000 +0200 +++ src/kdenetwork/kopete/protocols/jabber/kioslave/CMakeLists.txt 2011-12-15 22:56:58.000000000 +0100 @@ -178,3 +80,18 @@ diff -u -r kdenetwork/kopete/protocols/sms/services/smsclient.cpp src/kdenetwork if (programName.isNull()) programName = "/usr/bin/sms_client"; +diff -u -r kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/CMakeLists.txt src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/CMakeLists.txt +--- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/CMakeLists.txt 2011-06-22 03:37:11.000000000 +0200 ++++ src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/CMakeLists.txt 2012-01-24 12:10:06.000000000 +0100 +@@ -23,6 +23,6 @@ + + tde_add_library( cricketxmllite STATIC_PIC + SOURCES +- qname.cc xmlbuilder.cc xmlconstants.cc xmlelement.cc xmlnsstack.cc ++ tqname.cc xmlbuilder.cc xmlconstants.cc xmlelement.cc xmlnsstack.cc + xmlparser.cc xmlprinter.cc + ) +Only in kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite: qname.cc +Only in kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite: qname.h +Only in src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite: tqname.cc +Only in src/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite: tqname.h diff --git a/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD index 47fb6f17e..1a5f0f154 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: Calvin Morrison <mutantturkey@gmail.com> +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-kdepim pkgver=3513 @@ -9,11 +10,9 @@ license=('GPL') groups=('trinity-extras') pkgdesc="Trinity Personal Information Management suite" depends=('trinity-kdebase' - 'trinity-arts' - 'trinity-kdelibs' 'gpgme' 'boost' - 'gnokii' + 'gnokii' 'poppler' 'trinity-libcaldav' 'trinity-libcarddav') makedepends=('pkgconfig' 'cmake' 'imake' 'fribidi') @@ -26,19 +25,13 @@ source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdepim-3.5.13.tar.gz') source=('http://anduin.linuxfromscratch.org/sources/trinity/kdepim-3.5.13.tar.gz') md5sums=('4488062d5400bdd99642fe0b72ebcf9a') -_svnmod=kdepim -trinity_prefix="/opt/trinity" +_prefix="/opt/trinity" build() { 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 + . /etc/profile.d/qt3.sh 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 @@ -50,8 +43,8 @@ build() { cd build msg "Starting cmake..." - cmake ${srcdir}/${_svnmod} \ - -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \ + cmake ${srcdir}/kdepim \ + -DCMAKE_INSTALL_PREFIX=${_prefix} \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DWITH_SASL=ON \ -DWITH_NEWDISTRLISTS=ON \ @@ -83,7 +76,7 @@ package() { msg "Packaging - $pkgname-$pkgver" cd ${srcdir}/build - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install cd ${startdir} } diff --git a/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD index 03b45de57..ace4fc543 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: Calvin Morrison <mutantturkey@gmail.com> +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-kdesdk pkgver=3513 @@ -8,7 +9,7 @@ url='http://www.trinitydesktop.org' license=('GPL') groups=('trinity-extras') pkgdesc="Trinity Software Developement Kit" -depends=('trinity-kdebase') +depends=('trinity-kdebase' 'subversion') makedepends=('pkgconfig' 'cmake' 'imake') options=('libtool' '!strip') source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdesdk-3.5.13.tar.gz' 'kdesdk.patch') @@ -16,40 +17,65 @@ source=('http://anduin.linuxfromscratch.org/sources/trinity/kdesdk-3.5.13.tar.gz md5sums=('130662f683be1a49d56a713c5ae87e46' 'a1d0b533ae427847bd84e601c587f882') -_svnmod=kdesdk - 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" - - patch -N -d ${srcdir} -p0 < kdesdk.patch - - 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 \ - -DWITH_DBSEARCHENGINE=ON \ - -DWITH_KCAL=ON \ - -DBUILD_ALL=ON - make + 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:/opt/trinity/include/kde + export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde:$LD_LIBRARY_PATH + export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig + + _prefix="/opt/trinity" + + patch -N -d ${srcdir} -p0 < kdesdk.patch + + cd $srcdir/kdesdk + + msg "Starting configure..." + + cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" + cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" + make -f admin/Makefile.common + + msg "Starting configure..." + ./configure --with-qt-dir=${QTDIR} \ + --prefix=${_prefix} \ + --enable-closure \ + --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \ + --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig \ + --with-berkeley-db \ + --with-subversion + + make + + + #msg "Starting cmake..." + #cmake ${srcdir}/kdesdk \ + # -DCMAKE_INSTALL_PREFIX=${_prefix} \ + # -DCMAKE_VERBOSE_MAKEFILE=ON \ + # -DWITH_DBSEARCHENGINE=ON \ + # -DWITH_KCAL=ON \ + # -DBUILD_ALL=ON + #make + + #--with-berkeley-db enable the dictionary plugin based on Berkeley DB IV + #--with-db-dir=DIR where the root of Berkeley DB IV is installed + #--with-db-include-dir=DIR where the includes of Berkeley DB IV are installed + #--with-db-include=FILE path to the Berkeley DB IV header file + #--with-db-lib-dir=DIR where the libs of Berkeley DB IV are installed + #--with-db-name=NAME name of the Berkeley DB IV library (default db) + + #--with-subversion enable support for subversion [default=check] + #--with-apr-config=FILE Use the given path to apr-config when determining APR configuration; defaults to "apr-config" + #--with-apu-config=FILE Use the given path to apu-config when determining APR util configuration; defaults to "apu-config" + #--with-subversion-dir=DIR where Subversion is installed + #--with-svn-include=DIR Use the given path to the subversion headers. + #--with-svn-lib=DIR + } package() { msg "Packaging - $pkgname-$pkgver" -# cd ${srcdir}/${_svnmod} - cd ${srcdir}/build - - make DESTDIR="$pkgdir/" install + cd ${srcdir}/kdesdk -# rm -r ${srcdir}/${_svnmod} + make DESTDIR="$pkgdir" install } diff --git a/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD index a84e77c1d..1de2a3b95 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: Calvin Morrison <mutantturkey@gmail.com> +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-kdetoys pkgver=3513 @@ -10,16 +11,10 @@ groups=('trinity-extras') pkgdesc="Trinity toys collection" depends=('trinity-kdelibs') makedepends=('pkgconfig' 'autoconf' 'automake') -optdepends=() -provides=($pkgname) -conflicts=() -replaces=() options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdetoys-3.5.13.tar.gz) -source=(http://anduin.linuxfromscratch.org/sources/trinity/kdetoys-3.5.13.tar.gz) md5sums=('823dd778c1e9e15972a509f4eee4434d') -_builddir=kdetoys _prefix=/opt/trinity build() { @@ -28,11 +23,8 @@ build() { export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig - #msg "Patching..." - #patch -N -d ${srcdir} -p0 < kdetoys.patch - msg "Starting automake..." - cd "$srcdir/${_builddir}" + cd "$srcdir/kdetoys" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" make -f admin/Makefile.common @@ -50,6 +42,6 @@ build() { package() { msg "Packaging - $pkgname-$pkgver" - cd ${srcdir}/${_builddir} + cd ${srcdir}/kdetoys make DESTDIR="${pkgdir}" install } diff --git a/arch/3.5.13/trinity-extras/trinity-kdeutils/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeutils/PKGBUILD index 3cffc8e2e..38633c7fd 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdeutils/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdeutils/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: Calvin Morrison <mutantturkey@gmail.com> +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-kdeutils pkgver=3513 @@ -10,16 +11,10 @@ groups=('trinity-extras') pkgdesc="Trinity TDE utilities collection" depends=('trinity-kdelibs') makedepends=('pkgconfig' 'autoconf' 'automake') -optdepends=() -provides=($pkgname) -conflicts=() -replaces=() options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeutils-3.5.13.tar.gz) -source=(http://anduin.linuxfromscratch.org/sources/trinity/kdeutils-3.5.13.tar.gz) md5sums=('e2cd6695606c5c91b3380dcc7f1a6a83') -_builddir=kdeutils _prefix=/opt/trinity build() { @@ -28,11 +23,9 @@ build() { export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig - #msg "Patching..." - #patch -N -d ${srcdir} -p0 < kdeutils.patch msg "Starting automake..." - cd "$srcdir/${_builddir}" + cd "$srcdir/kdeutils" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" make -f admin/Makefile.common @@ -52,6 +45,6 @@ build() { package() { msg "Packaging - $pkgname-$pkgver" - cd ${srcdir}/${_builddir} + cd ${srcdir}/kdeutils make DESTDIR="${pkgdir}" install } diff --git a/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD index e1b5520ef..2e3945c16 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: Calvin Morrison <mutantturkey@gmail.com> +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-kdevelop pkgver=12345 @@ -9,13 +10,11 @@ license=('GPL') groups=('trinity-extras') pkgdesc="Trinity Developement tools" depends=('trinity-kdebase') -# 'xorg' makedepends=('pkgconfig' 'cmake' 'imake') options=('libtool' '!strip') -source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdevelop-3.5.13.tar.gz) -source=(http://anduin.linuxfromscratch.org/sources/trinity/kdevelop-3.5.13.tar.gz) -md5sums=('777bd77e4f2dc6a5b5b45a370dcf6da0') -_svnmod=kdevelop +source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdevelop-3.5.13.tar.gz' 'kdevelop.patch') +md5sums=('777bd77e4f2dc6a5b5b45a370dcf6da0' + 'ab23854b1658adc1da4621cb589ec1be') build() { @@ -25,7 +24,11 @@ build() { 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" + _prefix="/opt/trinity" + + msg "Patching..." + # apply second part of Francois Andriot patch + patch -p0 -i ${srcdir}/kdevelop.patch cd $srcdir msg "Creating out-of-source build directory: ${srcdir}/build" @@ -33,8 +36,8 @@ build() { cd build msg "Starting cmake..." - cmake ${srcdir}/${_svnmod} \ - -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \ + cmake ${srcdir}/kdevelop \ + -DCMAKE_INSTALL_PREFIX=${_prefix} \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DQT_VERSION=3 \ -DWITH_QT3=ON \ diff --git a/arch/3.5.13/trinity-extras/trinity-kdevelop/kdevelop.patch b/arch/3.5.13/trinity-extras/trinity-kdevelop/kdevelop.patch new file mode 100644 index 000000000..14079908c --- /dev/null +++ b/arch/3.5.13/trinity-extras/trinity-kdevelop/kdevelop.patch @@ -0,0 +1,12 @@ +--- kdevelop/kdevdesigner/designer/listeditor.ui.h.ORI 2011-10-30 13:30:56.655489268 +0100 ++++ kdevelop/kdevdesigner/designer/listeditor.ui.h 2011-10-30 13:31:00.782489292 +0100 +@@ -30,7 +30,7 @@ + { + QListViewItem *i = new QListViewItem( listview, listview->lastItem() ); + i->setRenameEnabled( 0, TRUE ); +- tqApp->processEvents(); ++ qApp->processEvents(); + i->startRename( 0 ); + } + + diff --git a/arch/3.5.13/trinity-extras/trinity-kdewebdev/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdewebdev/PKGBUILD index 08276cd4f..49e067fd6 100644 --- a/arch/3.5.13/trinity-extras/trinity-kdewebdev/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-kdewebdev/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: Calvin Morrison <mutantturkey@gmail.com> +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-webdev pkgver=3513 @@ -12,12 +13,9 @@ depends=('trinity-kdebase') makedepends=('pkgconfig' 'cmake' 'imake') options=('libtool' '!strip') source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdewebdev-3.5.13.tar.gz' 'kdewebdev.patch') -source=('http://anduin.linuxfromscratch.org/sources/trinity/kdewebdev-3.5.13.tar.gz' 'kdewebdev.patch') md5sums=('4f56a6c4b5916615ca3615f8e8f868c6' '5ef6636db45e35d6dcda35332bdca931') -_svnmod=kdewebdev - build() { msg "Setting PATH, CMAKE and Trinity Environment variables" export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity @@ -25,7 +23,7 @@ build() { 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" + _prefix="/opt/trinity" patch -N -d ${srcdir} -p0 < kdewebdev.patch @@ -35,8 +33,8 @@ build() { cd build msg "Starting cmake..." - cmake ${srcdir}/${_svnmod} \ - -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \ + cmake ${srcdir}/kdewebdev \ + -DCMAKE_INSTALL_PREFIX=${_prefix} \ -DCMAKE_VERBOSE_MAKEFILE=ON \ -DBUILD_ALL=ON make diff --git a/arch/3.5.13/trinity-extras/trinity-libcaldav/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libcaldav/PKGBUILD index c704e5020..933a98c7d 100644 --- a/arch/3.5.13/trinity-extras/trinity-libcaldav/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-libcaldav/PKGBUILD @@ -1,5 +1,5 @@ -# Maintainer: Calvin Morrison <mutantturkey@gmail.com> -# +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-libcaldav pkgver=0.6.5 diff --git a/arch/3.5.13/trinity-extras/trinity-libcarddav/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libcarddav/PKGBUILD index 7faf86b1d..918d9a853 100644 --- a/arch/3.5.13/trinity-extras/trinity-libcarddav/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-libcarddav/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: Calvin Morrison <mutantturkey@gmail.com> +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-libcarddav pkgver=0.6.2 @@ -13,7 +14,6 @@ license=('GPL') provides=('trinity-libcarddav' 'libcarddav') conflicts=('libcarddav') replaces=('trinity-libcarddav') -# http://quickbuild.pearsoncomputing.net:58080/2056019/libcarddav_0.6.2-2debian2.tar.gz source=("http://quickbuild.pearsoncomputing.net:58080/2056019/libcarddav_${pkgver}-${_pkgsuffix}.tar.gz" "libcarddav.patch") md5sums=('42a0fe57ba4c639aad53024f6c8d5614' '63ef0b91ff27dfb7c48ca0f07866af79') diff --git a/arch/3.5.13/trinity-extras/trinity-libkdcraw/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libkdcraw/PKGBUILD index 19a59843e..6fdf2d303 100644 --- a/arch/3.5.13/trinity-extras/trinity-libkdcraw/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-libkdcraw/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: Calvin Morrison <mutantturkey@gmail.com> +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-libkdcraw pkgver=3513 @@ -15,7 +16,6 @@ options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/libraries/libkdcraw-3.5.13.tar.gz) md5sums=('770dd734dc427337a1a2e61b6b0874ae') -_builddir=libraries/libkdcraw _prefix=/opt/trinity build() { @@ -24,11 +24,8 @@ build() { export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig - #msg "Patching..." - #patch -N -d ${srcdir} -p0 < libkdcraw.patch - msg "Starting automake..." - cd "$srcdir/${_builddir}" + cd "$srcdir/libraries/libkdcraw" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" make -f admin/Makefile.common @@ -47,6 +44,6 @@ build() { package() { msg "Packaging - $pkgname-$pkgver" - cd ${srcdir}/${_builddir} + cd ${srcdir}/libraries/libkdcraw make DESTDIR="${pkgdir}" install } diff --git a/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD index cc27f6430..20dd82265 100644 --- a/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: Calvin Morrison <mutantturkey@gmail.com> +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-libkexiv2 pkgver=3513 @@ -10,15 +11,10 @@ groups=('trinity-extras') pkgdesc="Trinity exiv2 library" depends=('trinity-kdelibs' 'exiv2') makedepends=('pkgconfig' 'autoconf' 'automake') -optdepends=() -provides=($pkgname) -conflicts=() -replaces=() options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/libraries/libkexiv2-3.5.13.tar.gz) md5sums=('74b160da8ea95f25048757b5fe692f85') -_builddir=libraries/libkexiv2 _prefix=/opt/trinity build() { @@ -27,11 +23,8 @@ build() { export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig - #msg "Patching..." - #patch -N -d ${srcdir} -p0 < pkname.patch - msg "Starting automake..." - cd "$srcdir/${_builddir}" + cd "$srcdir/libraries/libkexiv2" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" make -f admin/Makefile.common @@ -49,6 +42,6 @@ build() { package() { msg "Packaging - $pkgname-$pkgver" - cd ${srcdir}/${_builddir} + cd ${srcdir}/libraries/libkexiv2 make DESTDIR="${pkgdir}" install } diff --git a/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD index 4ef6aecc8..e66eb1a4a 100644 --- a/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD +++ b/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD @@ -1,4 +1,5 @@ -# Maintainer: Calvin Morrison <mutantturkey@gmail.com> +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-libkipi pkgver=3513 @@ -10,15 +11,10 @@ groups=('trinity-extras') pkgdesc="Trinity kipi library" depends=('trinity-kdelibs') makedepends=('pkgconfig' 'autoconf' 'automake') -optdepends=() -provides=($pkgname) -conflicts=() -replaces=() options=('libtool' '!strip') source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/libraries/libkipi-3.5.13.tar.gz) md5sums=('22cb0ba7507cac99140cd1c0180cbe99') -_builddir=libraries/libkipi _prefix=/opt/trinity build() { @@ -26,12 +22,9 @@ build() { msg "Setting Trinity Environment variables" export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig - - #msg "Patching..." - #patch -N -d ${srcdir} -p0 < libkipi.patch msg "Starting automake..." - cd "$srcdir/${_builddir}" + cd "$srcdir/libraries/libkipi" cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" make -f admin/Makefile.common @@ -49,6 +42,6 @@ build() { package() { msg "Packaging - $pkgname-$pkgver" - cd ${srcdir}/${_builddir} + cd ${srcdir}/libraries/libkipi make DESTDIR="${pkgdir}" install } |