From 7112f45ec9f7ef574a783dcff014521bf28f1ef1 Mon Sep 17 00:00:00 2001 From: "Pawel \"l0ner\" Soltys" Date: Mon, 6 Feb 2012 13:38:28 +0100 Subject: [PATCH] kdebase: fixes in patches split PKGBUILD --- .../trinity-base/trinity-kdebase/PKGBUILD | 128 ++++++++++++------ .../trinity-kdebase/patches.tar.bz2 | Bin 4810 -> 3671 bytes 2 files changed, 88 insertions(+), 40 deletions(-) diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD index 022189a58..f40f55b46 100644 --- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD +++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD @@ -1,9 +1,9 @@ # Maintainer: Pawel 'l0ner' Soltys # Contributor: Calvin Morrison -pkgname=('trinity-kdebase' 'trinity-kdm' 'trinity-kate' 'trinity-konqueror') +pkgname=('trinity-kdebase' 'trinity-kdm' 'trinity-console' 'trinity-kate' 'trinity-konqueror') pkgver=3513 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') url='http://www.trinitydesktop.org' license=('GPL') @@ -11,16 +11,14 @@ groups=('trinity-base') pkgdesc="Trinity Desktop Enviroment base components" depends=('trinity-dbus-tqt' 'trinity-kdelibs' 'hal' 'xorg-server' 'xorg-xset' 'xorg-xsetroot' 'xorg-xprop' 'xorg-xmessage' 'xorg-xinit' 'xorg-iceauth' - 'libxtst') - # 'libltdl' - # 'openexr' - # 'libxkbfile' + 'libxtst' 'libraw1394') -makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf') +makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake' 'xorg-bdftopcf' 'smbclient') 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' - 'xorg-fonts-75dpi: X.org 75dpi fonts collection') + 'xorg-fonts-75dpi: X.org 75dpi fonts collection' + 'samba: file sharing over SMB') confilicts=('kdemod3-kdebase') options=('libtool') source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' @@ -33,7 +31,7 @@ source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' 'kdm-trinity' 'trinity.desktop') md5sums=('d1f7e1f94eeb46b981fe1ba144179840' - '22160aaf726fbd1a58b2f4c5483e51fb' + '327e4d68bd1fc4d29bdb273e81f90415' '895f5d7351aa73ba1f57b0ad27081d69' 'bb3004513d703d6b72ce70aa240af3a3' 'e6afdd7ca60c4c59b851135785347e75' @@ -51,7 +49,7 @@ build() { [ "$QTDIR" = "" ] && . /etc/profile.d/qt3.sh [ "$TDEDIR" = "" ] && . /etc/profile.d/trinity.sh - export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR} + #export CMAKE_PREFIX_PATH=${QTDIR}:${TDEDIR} #export CMAKE_INCLUDE_PATH=${TDEDIR}/include/dbus-1-tqt/:${TDEDIR}/include/dbus-1.0/:${TDEDIR}/include:${TDEDIR}/include/libkrandr #export LD_LIBRARY_PATH=${TDEDIR}/lib:${TDEDIR}/lib/kde3:${QTDIR}/lib:$LD_LIBRARY_PATH #export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:$PKG_CONFIG_PATH @@ -67,19 +65,14 @@ build() { #sed -ie 's/applications-merged/tde-applications-merged/g' applnk/CMakeLists.txt msg "Creating out-of-source build directory: ${srcdir}/build" - mkdir -p build - cd build + mkdir -p ../build + cd ../build msg "Starting cmake..." - cmake ${srcdir}/kdebase --debug-output \ + cmake ${srcdir}/kdebase \ -DCMAKE_INSTALL_PREFIX=${TDEDIR} \ - -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 \ @@ -90,36 +83,50 @@ build() { -DWITH_XINERAMA=ON \ -DWITH_XEXT=ON \ -DWITH_PAM=ON \ - -DBUILD_ALL=ON \ - -DCMAKE_INCLUDE_DIR=$QTDIR/include/tqt + -DWITH_HAL=ON \ + -DWITH_ARTS=ON \ + -DWITH_SASL=ON \ + -DWITH_OPENEXR=ON \ + -DWITH_SAMBA=ON \ + -DWITH_LIBUSB=ON \ + -DWITH_LDAP=ON \ + -DWITH_LIBRAW1394=ON \ + -DWITH_I8K=ON \ + -DBUILD_ALL=ON make - #-DCMAKE_INCLUDE_DIR=/opt/trinity/include/dbus-1.0 \ - } package_trinity-kdebase() { - msg "Packaging - $pkgname-$pkgver" - cd ${srcdir}/build + pkgdesc='Trinity Desktop Enviroment' - make DESTDIR="$pkgdir" install + msg "Packaging - $pkgname-$pkgver" + _splitfolders="applnk drkonqi kappfinder kcheckpass kcminit kcontrol + kdcop kdebugdialog kdeeject kdepasswd kdeprint kdesktop + kdesu kdialog kfind khelpcenter khotkeys kicker kioslave + klipper kmenuedit knetattach kpager kpersonalizer kreadconfig + krootbacking kscreensaver ksmserver ksplashml kstart ksysguard + ksystraycmd ktip kwin l10n kxkb nsplugins pics tqt3integration + tsak doc/faq doc/glossary doc/kcontrol doc/kdcop + doc/kdebugdialog doc/kdeprint doc/kdesu doc/kfind + doc/khelpcenter doc/kicker doc/kinfocenter doc/kioslave + doc/klipper doc/kmenuedit doc/knetattach doc/kompmgr doc/kpager + doc/ksplashml doc/ksysguard doc/kxkb doc/quickstart + doc/userguide doc/visualdict" + for _dir in $_splitfolders; do + cd ${srcdir}/build/$_dir + make DESTDIR="$pkgdir" install + done # install X11 session file install -d -m755 ${pkgdir}/etc/X11/sessions install -m755 ${srcdir}/trinity.desktop ${pkgdir}/etc/X11/sessions/trinity.desktop - # update the Xsession file, this resolves problem with kdm dropping back - # to the login screen - patch -N ${pkgdir}${TDEDIR}/share/config/kdm/Xsession < ${srcdir}/Xsession.patch - # create the starttrinity link # do we need this? wouldn't be better to rename startkde script # to starttrinity? Well, whathever. ln -sf ${pkgdir}$TDEDIR/bin/startkde ${pkgdir}$TDEDIR/bin/starttrinity - # install kdm rc.d script. We need this to start kdm from rc.d - install -D -m755 ${srcdir}/kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity - # install mkpamserv script, so we can auto-generate pam.d configs in post_install() install -D -m755 ${srcdir}/kdebase/mkpamserv ${pkgdir}${TDEDIR}/bin/mkpamserv @@ -127,11 +134,6 @@ package_trinity-kdebase() { # in the config file doens't exist. Maybe this should be provided by dbus bindings? # No, after riconsidering I'm not gonna provide it unless it's required. - # Add image for default user avatar. This removes kdm complains about missing - # default avatar from kdm.log - install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/faces/.default.face.icon - install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/pics/users/arch-kdm.png - # Install nice arch logo to use in the shutdown dialog install -D -m 644 $srcdir/arch-kdeshutdown.png ${pkgdir}$TDEDIR/share/apps/ksmserver/pics/shutdownkonq.png @@ -152,11 +154,57 @@ package_trinity-kdebase() { } package_trinity-kdm() { -pkgdesc="Trinity Display Manager" + pkgdesc="Trinity Display Manager" + + msg "Packaging - $pkgname-$pkgver" + _splitfolders="kdm kdmlib doc/kdm" + for _dir in $_splitfolders; do + cd ${srcdir}/build/$_dir + make DESTDIR="$pkgdir" install + done + + # update the Xsession file, this resolves problem with kdm dropping back + # to the login screen + patch -N ${pkgdir}${TDEDIR}/share/config/kdm/Xsession < ${srcdir}/Xsession.patch + + # install kdm rc.d script. We need this to start kdm from rc.d + install -D -m755 ${srcdir}/kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity + + # Add image for default user avatar. This removes kdm complains about missing + # default avatar from kdm.log + install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/faces/.default.face.icon + install -D -m 644 $srcdir/kdm-default-face.png ${pkgdir}$TDEDIR/share/apps/kdm/pics/users/arch-kdm.png } + +package_trinity-console() { + pkgdesc="Trinity - an X termnal emulator" + + msg "Packaging - $pkgname-$pkgver" + _splitfolders="konsole doc/konsole" + for _dir in $_splitfolders; do + cd ${srcdir}/build/$_dir + make DESTDIR="$pkgdir" install + done +} + package_trinity-kate() { -pkgdesc="Trinity - A fast texteditor with an Emacs-style document interface" + pkgdesc="Trinity - A fast texteditor with an Emacs-style document interface" + + msg "Packaging - $pkgname-$pkgver" + _splitfolders="kate doc/kate doc/kwrite" + for _dir in $_splitfolders; do + cd ${srcdir}/build/$_dir + make DESTDIR="$pkgdir" install + done } + package_trinity-konqueror() { -pkgdesc="Trinity Swiss Army application, file and web browser." + pkgdesc="Trinity Swiss Army application, file and web browser." + + msg "Packaging - $pkgname-$pkgver" + _splitfolders="konqueror libkonq doc/konqueror" + for _dir in $_splitfolders; do + cd ${srcdir}/build/$_dir + make DESTDIR="$pkgdir" install + done } diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2 b/arch/3.5.13/trinity-base/trinity-kdebase/patches.tar.bz2 index 31a31d94663524db492cc0526ed902b29c603436..0a0b90c54f7017b31c81945b045f7baae162e447 100644 GIT binary patch literal 3671 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