TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

kdebase: added fix for doc location, fixed triity.desktop not installing

Browse Source
pull/3/head
Pawel "l0ner" Soltys 13 years ago
parent 4f17b0ecaf
commit 9782bc548b
3 changed files with 141 additions and 104 deletions
Show Stats Download Patch File Download Diff File

124
arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
Unescape View File

@ -1,75 +1,68 @@
# Maintainer: Calvin Morrison <mutantturkey@gmail.com> # Maintainer: Pawel 'l0ner' Soltys <pwslts@gmail.com>
# Contributor: Calvin Morrison <mutantturkey@gmail.com>
pkgname=trinity-kdebase pkgname=trinity-kdebase
pkgver=3513 pkgver=3513
pkgrel=1 pkgrel=2
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url='http://www.trinitydesktop.org' url='http://www.trinitydesktop.org'
license=('GPL') license=('GPL')
groups=('trinity-base') groups=('trinity-base')
pkgdesc="Trinity Desktop Enviroment base components" pkgdesc="Trinity Desktop Enviroment base components"
depends=('hal' depends=(hal
'libltdl' libltdl
'trinity-dbus-1-qt3' trinity-dbus-1-qt3
'trinity-arts' trinity-pyqt3
'trinity-qt3' trinity-dbus-tqt-1
'trinity-pyqt3' trinity-dbus-tqt
'trinity-dbus-tqt-1' trinity-kdelibs
'trinity-dbus-tqt' openexr
'trinity-kdelibs' libxtst
'openexr' libxkbfile
'libxtst' xorg-server
'libxkbfile' xorg-xset
'xorg-server' xorg-xsetroot
'xorg-xset' xorg-xprop
'xorg-xsetroot' xorg-xmessage
'xorg-xprop' xorg-xinit
'xorg-xmessage' xorg-iceauth)
'xorg-xinit' #'trinity-arts'
'xorg-iceauth') #'trinity-qt3'
makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf') makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf')
optdepends=('desktop-file-utils: Command line utilities for working with desktop entries' optdepends=('desktop-file-utils: Command line utilities for working with desktop entries'
'pciutils: PCI bus configuration space access library and tools' 'pciutils: PCI bus configuration space access library and tools'
'xscreensaver: Screen saver and locker for the X Window System') 'xscreensaver: Screen saver and locker for the X Window System')
options=('libtool' '!strip') 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' md5sums=('d1f7e1f94eeb46b981fe1ba144179840'
'fc9cdbe6779bb3860e222dafa744c94e'
'c9ce810c281002440a6de8cfd8735d07' 'c9ce810c281002440a6de8cfd8735d07'
'376d85d213cf3c04cb0912e5cccd68bd') '376d85d213cf3c04cb0912e5cccd68bd'
'1418e45fea5a9738544cbd264c36373b')
_qtdir=/opt/qt #_qtdir=/opt/qt
_prefix="/opt/trinity" _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() { build() {
cd $srcdir
msg "Setting PATH, CMAKE and Trinity Environment variables" msg "Setting PATH, CMAKE and Trinity Environment variables"
if [[ -r /etc/profile.d/qt3.sh ]]; then #if [[ -r /etc/profile.d/qt3.sh ]]; then
. /etc/profile.d/qt3.sh . /etc/profile.d/qt3.sh
[[ -n $QTDIR ]] && _qtdir=$QTDIR # [[ -n $QTDIR ]] && _qtdir=$QTDIR
else #else
[[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH # [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
fi #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 CMAKE_PREFIX_PATH=${QTDIR}:${_prefix}
export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:/opt/qt/lib:$LD_LIBRARY_PATH export CMAKE_INCLUDE_PATH=${_prefix}/include/dbus-1-tqt/:${_prefix}/include/dbus-1.0/:${_prefix}/include:${_prefix}/include/libkrandr
export PKG_CONFIG_PATH=/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig:$PKG_CONFIG_PATH export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/kde3:${QTDIR}/lib:$LD_LIBRARY_PATH
echo $PKG_CONFIG_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 < ${srcdir}/dbusfix.diff
cd $srcdir 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" msg "Creating out-of-source build directory: ${srcdir}/build"
mkdir -p build mkdir -p build
@ -99,37 +92,46 @@ build() {
-DBUILD_ALL=ON \ -DBUILD_ALL=ON \
-DCMAKE_INCLUDE_DIR=/opt/trinity/include/dbus-1.0:/opt/qt/include/tqt:/opt/trinity/include/dbus-1.0 -DCMAKE_INCLUDE_DIR=/opt/trinity/include/dbus-1.0:/opt/qt/include/tqt:/opt/trinity/include/dbus-1.0
make make
# -DWITH_QT3=ON \
# -DQTDIR=/opt/qt \
# -DQT_LIBRARY_DIRS=/opt/qt/lib \
} }
package() { package() {
msg "Packaging - $pkgname-$pkgver" msg "Packaging - $pkgname-$pkgver"
# cd ${srcdir}/${_svnmod}
cd ${srcdir}/build cd ${srcdir}/build
make DESTDIR="$pkgdir" install 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
# install desktop # install desktop
[[ -f ${pkgdir}/etc/X11/sessions/trinity.desktop ]] || msg "ERROR - Install Failure: ${pkgdir}/etc/X11/sessions/trinity.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
# set kdm directory # set kdm directory
_kdmdir=${_prefix}/share/config/kdm #_kdmdir=${_prefix}/share/config/kdm
[[ -d ${pkgdir}/${_kdmdir} ]] || install -d -m755 ${pkgdir}/${_kdmdir} #[[ -d ${pkgdir}/${_kdmdir} ]] || install -d -m755 ${pkgdir}/${_kdmdir}
# install kdmrc # install kdmrc
[[ -f kdmrc ]] && install -m644 kdmrc ${pkgdir}/${_kdmdir} #[[ -f kdmrc ]] && install -m644 kdmrc ${pkgdir}/${_kdmdir}
# update the Xsession file # update the Xsession file
[[ -f Xsession ]] && install -m755 Xsession ${pkgdir}/${_kdmdir} # [[ -f Xsession ]] && install -m755 Xsession ${pkgdir}/${_kdmdir}
# create the starttrinity link # create the starttrinity link
[[ -d ${pkgdir}/usr/bin ]] || mkdir -p ${pkgdir}/usr/bin [[ -d ${pkgdir}/usr/bin ]] || mkdir -p ${pkgdir}/usr/bin
cd ${pkgdir}/usr/bin cd ${pkgdir}/usr/bin
ln -sf /opt/trinity/bin/startkde starttrinity ln -sf /opt/trinity/bin/startkde starttrinity
cd ${srcdir} # iinstall kdm rc.d script
install -D -m755 kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity install -D -m755 ${srcdir}/kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity
} }

11
arch/3.5.13/trinity-base/trinity-kdebase/dbusfix.patch
Unescape View File

@ -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>

24
arch/3.5.13/trinity-base/trinity-kdebase/docpath.patch
Unescape View File

@ -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" )
Write Preview
Loading…
Cancel
Save