From f8de04b474a6ab365bb357cea36bfe0aee5cb88d Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Mon, 6 Feb 2012 23:52:39 +0100 Subject: arts, dbus-tqt-1, dbus-tqt, pyqt3, tqtinterface: minor fixups --- arch/3.5.13/trinity-base/trinity-arts/PKGBUILD | 36 ++------------- .../trinity-base/trinity-arts/trinity.profile.csh | 21 --------- .../trinity-base/trinity-arts/trinity.profile.sh | 14 ------ .../trinity-base/trinity-dbus-tqt-1/PKGBUILD | 54 ++++++++++------------ arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD | 1 - .../trinity-kdebase/trinity-kdebase.install | 6 +-- arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD | 6 ++- .../trinity-base/trinity-tqtinterface/PKGBUILD | 28 ++++++++--- .../trinity-tqtinterface/trinity.profile.csh | 21 +++++++++ .../trinity-tqtinterface/trinity.profile.sh | 14 ++++++ 10 files changed, 93 insertions(+), 108 deletions(-) delete mode 100644 arch/3.5.13/trinity-base/trinity-arts/trinity.profile.csh delete mode 100644 arch/3.5.13/trinity-base/trinity-arts/trinity.profile.sh create mode 100644 arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.csh create mode 100644 arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.sh (limited to '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-arts/trinity.profile.csh b/arch/3.5.13/trinity-base/trinity-arts/trinity.profile.csh deleted file mode 100644 index 7fc995130..000000000 --- a/arch/3.5.13/trinity-base/trinity-arts/trinity.profile.csh +++ /dev/null @@ -1,21 +0,0 @@ -setenv TDEDIR /opt/trinity -setenv TDEDIRS /usr:$TDEDIR -setenv PATH $PATH:$TDEDIR/bin - -if ( ! $?PKG_CONFIG_PATH ) then - setenv PKG_CONFIG_PATH $TDEDIR/lib/pkgconfig -else - setenv PKG_CONFIG_PATH $TDEDIR/lib/pkgconfig:$PKG_CONFIG_PATH -endif - -if ( ! $?XDG_DATA_DIRS ) then - setenv XDG_DATA_DIRS $TDEDIR/share -else - setenv XDG_DATA_DIRS $TDEDIR/share:$XDG_DATA_DIRS -endif - -if ( ! $?XDG_CONFIG_DIRS ) then - setenv XDG_CONFIG_DIRS $TDEDIR/etc/xdg -else - setenv XDG_CONFIG_DIRS $TDEDIR/etc/xdg:$XDG_CONFIG_DIRS -endif diff --git a/arch/3.5.13/trinity-base/trinity-arts/trinity.profile.sh b/arch/3.5.13/trinity-base/trinity-arts/trinity.profile.sh deleted file mode 100644 index 70e503534..000000000 --- a/arch/3.5.13/trinity-base/trinity-arts/trinity.profile.sh +++ /dev/null @@ -1,14 +0,0 @@ -export TDEDIR=/opt/trinity -export TDEDIRS=$TDEDIR -export PATH=$PATH:$TDEDIR/bin -export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$TDEDIR/lib/pkgconfig -if [ ! -z $XDG_DATA_DIRS ]; then - export XDG_DATA_DIRS=$XDG_DATA_DIRS:$TDEDIR/share -else - export XDG_DATA_DIRS=$TDEDIR/share -fi -if [ ! -z $XDG_CONFIG_DIRS ]; then - export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:$TDEDIR/etc/xdg -else - export XDG_CONFIG_DIRS=$TDEDIR/etc/xdg -fi \ No newline at end of file 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 9236fba9d..3d7f01520 100644 --- a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD @@ -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/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-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-tqtinterface/PKGBUILD b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD index 8d6647d14..2a12c76d5 100644 --- a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD @@ -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/trinity - 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=${_prefix} \ + -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 $TDEDIR/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf + echo $TDEDIR/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-tqtinterface/trinity.profile.csh b/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.csh new file mode 100644 index 000000000..7fc995130 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.csh @@ -0,0 +1,21 @@ +setenv TDEDIR /opt/trinity +setenv TDEDIRS /usr:$TDEDIR +setenv PATH $PATH:$TDEDIR/bin + +if ( ! $?PKG_CONFIG_PATH ) then + setenv PKG_CONFIG_PATH $TDEDIR/lib/pkgconfig +else + setenv PKG_CONFIG_PATH $TDEDIR/lib/pkgconfig:$PKG_CONFIG_PATH +endif + +if ( ! $?XDG_DATA_DIRS ) then + setenv XDG_DATA_DIRS $TDEDIR/share +else + setenv XDG_DATA_DIRS $TDEDIR/share:$XDG_DATA_DIRS +endif + +if ( ! $?XDG_CONFIG_DIRS ) then + setenv XDG_CONFIG_DIRS $TDEDIR/etc/xdg +else + setenv XDG_CONFIG_DIRS $TDEDIR/etc/xdg:$XDG_CONFIG_DIRS +endif diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.sh b/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.sh new file mode 100644 index 000000000..70e503534 --- /dev/null +++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/trinity.profile.sh @@ -0,0 +1,14 @@ +export TDEDIR=/opt/trinity +export TDEDIRS=$TDEDIR +export PATH=$PATH:$TDEDIR/bin +export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$TDEDIR/lib/pkgconfig +if [ ! -z $XDG_DATA_DIRS ]; then + export XDG_DATA_DIRS=$XDG_DATA_DIRS:$TDEDIR/share +else + export XDG_DATA_DIRS=$TDEDIR/share +fi +if [ ! -z $XDG_CONFIG_DIRS ]; then + export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:$TDEDIR/etc/xdg +else + export XDG_CONFIG_DIRS=$TDEDIR/etc/xdg +fi \ No newline at end of file -- cgit v1.2.3