diff options
| -rw-r--r-- | arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD | 210 | ||||
| -rw-r--r-- | arch/3.5.13/trinity-base/trinity-kdebase/dbusfix.patch | 11 | ||||
| -rw-r--r-- | arch/3.5.13/trinity-base/trinity-kdebase/docpath.patch | 24 |
3 files changed, 141 insertions, 104 deletions
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD index 6011214a0..cbdcca996 100644 --- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD @@ -1,135 +1,137 @@ -# Maintainer: Calvin Morrison <mutantturkey@gmail.com> +# Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com> +# Contributor: Calvin Morrison <mutantturkey@gmail.com> pkgname=trinity-kdebase pkgver=3513 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') groups=('trinity-base') pkgdesc="Trinity Desktop Enviroment base components" -depends=('hal' - 'libltdl' - 'trinity-dbus-1-qt3' - 'trinity-arts' - 'trinity-qt3' - 'trinity-pyqt3' - 'trinity-dbus-tqt-1' - 'trinity-dbus-tqt' - 'trinity-kdelibs' - 'openexr' - 'libxtst' - 'libxkbfile' - 'xorg-server' - 'xorg-xset' - 'xorg-xsetroot' - 'xorg-xprop' - 'xorg-xmessage' - 'xorg-xinit' - 'xorg-iceauth') +depends=(hal + libltdl + trinity-dbus-1-qt3 + trinity-pyqt3 + trinity-dbus-tqt-1 + trinity-dbus-tqt + trinity-kdelibs + openexr + libxtst + libxkbfile + xorg-server + xorg-xset + xorg-xsetroot + xorg-xprop + xorg-xmessage + xorg-xinit + xorg-iceauth) + #'trinity-arts' + #'trinity-qt3' + makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf') optdepends=('desktop-file-utils: Command line utilities for working with desktop entries' 'pciutils: PCI bus configuration space access library and tools' 'xscreensaver: Screen saver and locker for the X Window System') options=('libtool' '!strip') -source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/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' 'docpath.patch' 'dbusfix.patch' 'kdm-trinity' 'trinity.desktop') md5sums=('d1f7e1f94eeb46b981fe1ba144179840' + 'fc9cdbe6779bb3860e222dafa744c94e' 'c9ce810c281002440a6de8cfd8735d07' - '376d85d213cf3c04cb0912e5cccd68bd') + '376d85d213cf3c04cb0912e5cccd68bd' + '1418e45fea5a9738544cbd264c36373b') -_qtdir=/opt/qt +#_qtdir=/opt/qt _prefix="/opt/trinity" -_tdesktop() { - # create/install desktop - install -d -m755 ${pkgdir}/etc/X11/sessions - echo '[Desktop Entry]' > ${pkgdir}/etc/X11/sessions/trinity.desktop - echo 'Encoding=UTF-8' >> ${pkgdir}/etc/X11/sessions/trinity.desktop - echo 'Type=XSession' >> ${pkgdir}/etc/X11/sessions/trinity.desktop - echo "Exec=${_prefix}/bin/startkde" >> ${pkgdir}/etc/X11/sessions/trinity.desktop - echo "TryExec=${_prefix}/bin/startkde" >> ${pkgdir}/etc/X11/sessions/trinity.desktop - echo 'Name=Trinity' >> ${pkgdir}/etc/X11/sessions/trinity.desktop - echo 'Comment=The Trinity Desktop Environment. A powerful Open Source graphical desktop environment' >> ${pkgdir}/etc/X11/sessions/trinity.desktop - chmod 0755 ${pkgdir}/etc/X11/sessions/trinity.desktop -} - build() { - - msg "Setting PATH, CMAKE and Trinity Environment variables" - if [[ -r /etc/profile.d/qt3.sh ]]; then - . /etc/profile.d/qt3.sh - [[ -n $QTDIR ]] && _qtdir=$QTDIR - else - [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH - fi - export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity - export CMAKE_INCLUDE_PATH=/opt/trinity/include/dbus-1-tqt/:/opt/trinity/include/dbus-1.0/:/opt/trinity/include:/opt/trinity/include/libkrandr - export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:/opt/qt/lib:$LD_LIBRARY_PATH - export PKG_CONFIG_PATH=/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig:$PKG_CONFIG_PATH - echo $PKG_CONFIG_PATH - - patch -N ${srcdir}/kdebase/kioslave/media/mediamanager/halbackend.h < ${srcdir}/dbusfix.diff - cd $srcdir - - msg "Creating out-of-source build directory: ${srcdir}/build" - mkdir -p build - cd build - - msg "Starting cmake..." - cmake ${srcdir}/kdebase --debug-output \ - -DCMAKE_INSTALL_PREFIX=${_prefix} \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DQT_VERSION=3 \ - -DSYSCONF_INSTALL_DIR=/etc \ - -DWITH_XFIXES=ON \ - -DWITH_HAL=ON \ - -DWITH_ARTS=ON \ - -DWITH_SASL=ON \ - -DWITH_OPENEXR=ON \ - -DWITH_XCOMPOSITE=ON \ - -DWITH_XCURSOR=ON \ - -DWITH_XRANDR=ON \ - -DWITH_XRENDER=ON \ - -DWITH_XDAMAGE=ON \ - -DWITH_SHADOW=ON \ - -DWITH_XDMCP=ON \ - -DWITH_XINERAMA=ON \ - -DWITH_XEXT=ON \ - -DWITH_PAM=ON \ - -DBUILD_ALL=ON \ - -DCMAKE_INCLUDE_DIR=/opt/trinity/include/dbus-1.0:/opt/qt/include/tqt:/opt/trinity/include/dbus-1.0 - make -# -DWITH_QT3=ON \ -# -DQTDIR=/opt/qt \ -# -DQT_LIBRARY_DIRS=/opt/qt/lib \ + cd $srcdir + + msg "Setting PATH, CMAKE and Trinity Environment variables" + #if [[ -r /etc/profile.d/qt3.sh ]]; then + . /etc/profile.d/qt3.sh + # [[ -n $QTDIR ]] && _qtdir=$QTDIR + #else + # [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH + #fi + + export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix} + export CMAKE_INCLUDE_PATH=${_prefix}/include/dbus-1-tqt/:${_prefix}/include/dbus-1.0/:${_prefix}/include:${_prefix}/include/libkrandr + export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/kde3:${QTDIR}/lib:$LD_LIBRARY_PATH + export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:$PKG_CONFIG_PATH + #echo $PKG_CONFIG_PATH + + patch -N ${srcdir}/kdebase/kioslave/media/mediamanager/halbackend.h < dbusfix.patch + patch -N -d ${srcdir} -p0 < docpath.patch + + msg "Creating out-of-source build directory: ${srcdir}/build" + mkdir -p build + cd build + + msg "Starting cmake..." + cmake ${srcdir}/kdebase --debug-output \ + -DCMAKE_INSTALL_PREFIX=${_prefix} \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DQT_VERSION=3 \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DWITH_XFIXES=ON \ + -DWITH_HAL=ON \ + -DWITH_ARTS=ON \ + -DWITH_SASL=ON \ + -DWITH_OPENEXR=ON \ + -DWITH_XCOMPOSITE=ON \ + -DWITH_XCURSOR=ON \ + -DWITH_XRANDR=ON \ + -DWITH_XRENDER=ON \ + -DWITH_XDAMAGE=ON \ + -DWITH_SHADOW=ON \ + -DWITH_XDMCP=ON \ + -DWITH_XINERAMA=ON \ + -DWITH_XEXT=ON \ + -DWITH_PAM=ON \ + -DBUILD_ALL=ON \ + -DCMAKE_INCLUDE_DIR=/opt/trinity/include/dbus-1.0:/opt/qt/include/tqt:/opt/trinity/include/dbus-1.0 + make } package() { - msg "Packaging - $pkgname-$pkgver" -# cd ${srcdir}/${_svnmod} - cd ${srcdir}/build + msg "Packaging - $pkgname-$pkgver" + cd ${srcdir}/build + + make DESTDIR="$pkgdir" install + + # create/install desktop + install -d -m755 ${pkgdir}/etc/X11/sessions + # echo '[Desktop Entry]' > ${pkgdir}/etc/X11/sessions/trinity.desktop + # echo 'Encoding=UTF-8' >> ${pkgdir}/etc/X11/sessions/trinity.desktop + #echo 'Type=XSession' >> ${pkgdir}/etc/X11/sessions/trinity.desktop + #echo "Exec=${_prefix}/bin/starttrinity" >> ${pkgdir}/etc/X11/sessions/trinity.desktop + #echo "TryExec=${_prefix}/bin/starttrinity" >> ${pkgdir}/etc/X11/sessions/trinity.desktop + #echo 'Name=Trinity' >> ${pkgdir}/etc/X11/sessions/trinity.desktop + #echo 'Comment=The Trinity Desktop Environment. A powerful Open Source graphical desktop environment' >> ${pkgdir}/etc/X11/sessions/trinity.desktop + #chmod 0755 ${pkgdir}/etc/X11/sessions/trinity.desktop - make DESTDIR="$pkgdir" install + # install desktop + #[[ -f ${pkgdir}/etc/X11/sessions/trinity.desktop ]] || msg "ERROR - Install Failure: ${pkgdir}/etc/X11/sessions/trinity.desktop" + install -m755 ${srcdir}/trinity.desktop ${pkgdir}/etc/X11/sessions/trinity.desktop - # install desktop - [[ -f ${pkgdir}/etc/X11/sessions/trinity.desktop ]] || msg "ERROR - Install Failure: ${pkgdir}/etc/X11/sessions/trinity.desktop" + # set kdm directory + #_kdmdir=${_prefix}/share/config/kdm + #[[ -d ${pkgdir}/${_kdmdir} ]] || install -d -m755 ${pkgdir}/${_kdmdir} - # set kdm directory - _kdmdir=${_prefix}/share/config/kdm - [[ -d ${pkgdir}/${_kdmdir} ]] || install -d -m755 ${pkgdir}/${_kdmdir} + # install kdmrc + #[[ -f kdmrc ]] && install -m644 kdmrc ${pkgdir}/${_kdmdir} - # install kdmrc - [[ -f kdmrc ]] && install -m644 kdmrc ${pkgdir}/${_kdmdir} - # update the Xsession file - [[ -f Xsession ]] && install -m755 Xsession ${pkgdir}/${_kdmdir} + # update the Xsession file + # [[ -f Xsession ]] && install -m755 Xsession ${pkgdir}/${_kdmdir} - # create the starttrinity link - [[ -d ${pkgdir}/usr/bin ]] || mkdir -p ${pkgdir}/usr/bin - cd ${pkgdir}/usr/bin - ln -sf /opt/trinity/bin/startkde starttrinity + # create the starttrinity link + [[ -d ${pkgdir}/usr/bin ]] || mkdir -p ${pkgdir}/usr/bin + cd ${pkgdir}/usr/bin + ln -sf /opt/trinity/bin/startkde starttrinity - cd ${srcdir} - install -D -m755 kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity + # iinstall kdm rc.d script + install -D -m755 ${srcdir}/kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity } diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/dbusfix.patch b/arch/3.5.13/trinity-base/trinity-kdebase/dbusfix.patch new file mode 100644 index 000000000..8e37b4148 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdebase/dbusfix.patch @@ -0,0 +1,11 @@ +--- halbackend.h 2010-08-12 18:37:24.000000000 -0400 ++++ halbackend.h~ 2011-11-03 22:15:02.002228291 -0400 +@@ -40,7 +40,7 @@ + /* We acknowledge the the dbus API is unstable */ + #define DBUS_API_SUBJECT_TO_CHANGE + /* DBus-Qt bindings */ +-#include <dbus/connection.h> ++#include "/opt/trinity/include/dbus-1.0/dbus/connection.h" + /* HAL libraries */ + #include <libhal.h> + #include <libhal-storage.h> diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/docpath.patch b/arch/3.5.13/trinity-base/trinity-kdebase/docpath.patch new file mode 100644 index 000000000..2fd45a7ab --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-kdebase/docpath.patch @@ -0,0 +1,24 @@ +diff -u -r src/kdebase/admin/debianrules kdebase/admin/debianrules +--- src/kdebase/admin/debianrules 2012-01-05 17:41:56.000000000 +0100 ++++ kdebase/admin/debianrules 2011-08-21 09:08:23.000000000 +0200 +@@ -16,7 +16,7 @@ + + $kde_cgidir = "$kde_prefix/lib/cgi-bin"; + $kde_confdir = "$sysconfdir/trinity"; +-$kde_htmldir = "$kde_prefix/share/doc/kde/HTML"; ++$kde_htmldir = "$kde_prefix/share/doc/HTML"; + + if (defined $ENV{DEB_BUILD_OPTIONS} && + $ENV{DEB_BUILD_OPTIONS} =~ /\bnostrip\b/) { +diff -u -r src/kdebase/cmake/modules/TDESetupPaths.cmake kdebase/cmake/modules/TDESetupPaths.cmake +--- src/kdebase/cmake/modules/TDESetupPaths.cmake 2012-01-05 17:42:06.000000000 +0100 ++++ kdebase/cmake/modules/TDESetupPaths.cmake 2011-08-21 09:08:24.000000000 +0200 +@@ -41,7 +41,7 @@ + _tde_internal_setup_path( PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/trinity" "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/trinity)" ) + _tde_internal_setup_path( CONFIG_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/config" "The config file install dir" ) + _tde_internal_setup_path( DATA_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/apps" "The parent directory where applications can install their data" ) +- _tde_internal_setup_path( HTML_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/doc/kde/HTML" "The HTML install dir for documentation" ) ++ _tde_internal_setup_path( HTML_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/doc/HTML" "The HTML install dir for documentation" ) + _tde_internal_setup_path( ICON_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/icons" "The icon install dir (default ${SHARE_INSTALL_PREFIX}/share/icons/)" ) + _tde_internal_setup_path( KCFG_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/config.kcfg" "The install dir for kconfig files" ) + _tde_internal_setup_path( LOCALE_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/locale" "The install dir for translations" ) |