Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

10 files changed, 93 insertions, 50 deletions

diff --git a/arch/3.5.13/trinity-base/hal/PKGBUILD b/arch/3.5.13/trinity-base/hal/PKGBUILD
index 2de5f1047..4302f938e 100644
--- a/arch/3.5.13/trinity-base/hal/PKGBUILD
+++ b/arch/3.5.13/trinity-base/hal/PKGBUILD
@@ -1,5 +1,7 @@
+# Maintainer: Calvin Morisson <mutantturkey@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
+# Contributor: Pawel "l0ner" Soltys <sh4dou@gmail.com>
 
 pkgname=hal
 pkgver=0.5.14
@@ -29,7 +31,7 @@ source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
 #        patches/hal-ignore-internal-dm-devices.patch
 
 md5sums=('e9163df591a6f38f59fdbfe33e73bf20'
-         '277e96ac130d7bfce0b30f0b80db8782'
+         '4cdfc673ad65ddb51919f5a757f62145'
          '185dd5d6ffc703ec8395b4eb3a1ae498')
 #         '4d4b6801a1cedca22b8bdd9db73b16fb'
 #         '6d87c3e63184ae3a69caafc846f538a3'
@@ -46,7 +48,7 @@ md5sums=('e9163df591a6f38f59fdbfe33e73bf20'
 
 build() {
    cd $srcdir
-  patch -Np1 -d ${srcdir} < videodev.patch
+  patch -Np1 -d ${srcdir} < hal.patch
   cd "${srcdir}/${pkgname}-${pkgver}"
 #  patch -Np1 -i "${srcdir}/hal-0.5.9-hide-diagnostic.patch"
 #  patch -Np1 -i "${srcdir}/hal-remove-dell-killswitch.patch"
diff --git a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD
index 089f41bb7..2c925fccc 100644
--- a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD
@@ -14,12 +14,10 @@ depends=('audiofile'
          'libvorbis'
          'trinity-tqtinterface')
 makedepends=('pkgconfig' 'cmake')
-provides=('trinity-arts')
 conflicts=('trinity-arts')
 replaces=('trinity-arts')
 options=('libtool' '!strip')
-#source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/arts-3.5.13.tar.gz)
-source=(http://anduin.linuxformscratch.org/sources/trinity/arts-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/arts-3.5.13.tar.gz)
 md5sums=('109124dabb1aaa9d44eb32e43b549142')
 
 # set Qt location (not needed if profile.d/q3.sh present, set prefix (not used)
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 c9afee5b0..45af8c626 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
@@ -2,13 +2,13 @@
 
 pkgname=trinity-dbus-1-qt3
 pkgver=0.9
-pkgrel=8
+pkgrel=9
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/DBusBindings"
 license=('GPL')
 groups=('trinity-base')
 pkgdesc="Trinity D-Bus/Qt3 bindings."
-depends=('dbus' 'trinity-qt3' 'networkmanager')
+depends=('trinity-qt3')
 provides=('trinity-dbus-1-qt3' 'dbus-1-qt3')
 conflicts=('dbus-1-qt3')
 replaces=('dbus-1-qt3')
@@ -22,11 +22,11 @@ build() {
    . /etc/profile.d/qt3.sh
    msg "Starting configure..."
    ./configure --prefix=$QTDIR
-   msg "Building #{pkgname}..."
+   msg "Building ${pkgname}..."
    make || return 1
 
    # Libtool slay
-   #     find $startdir/pkg -name *.la -exec rm {} \;
+   #     find $pkgdir -name *.la -exec rm {} \;
 }
 
 package() {
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 c3844ce33..eb51423d0 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
@@ -12,8 +12,7 @@ depends=('trinity-tqtinterface' 'dbus')
 provides=('trinity-dbus-tqt-1' 'dbus-tqt-1' 'dbus-1-tqt' 'trinity-dbus-1-tqt')
 makedepends=('pkgconfig' 'cmake')
 options=('libtool' '!strip')
-#source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/dbus-1-tqt-3.5.13.tar.gz)
-source=(http://anduin.linuxfromscratch.org/sources/trinity/dbus-1-tqt-3.5.13.tar.gz)
+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
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 dca32c78e..63759a641 100644
--- a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer Calvin Morrison <mutantturkey@gmail.com>
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
 
 pkgname=trinity-dbus-tqt
 pkgver=3513
@@ -10,12 +10,10 @@ groups=('trinity-base')
 pkgdesc="Trinity TQt DBus wrapper"
 depends=('trinity-tqtinterface')
 makedepends=('pkgconfig' 'cmake')
-provides=('trinity-dbus-tqt')
 conflicts=('trinity-dbus-tqt')
 replaces=('trinity-dbus-tqt')
 options=('libtool' '!strip')
-#source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/dbus-tqt-3.5.13.tar.gz)
-source=(http://anduin.linuxfromscratch.org/sources/trinity/dbus-tqt-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/dbus-tqt-3.5.13.tar.gz)
 md5sums=('46ae165c068271485c827f6fc6687a9a')
 
 _svnmod=dependencies/dbus-tqt
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
index 53eafbc42..6011214a0 100644
--- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
@@ -32,8 +32,7 @@ optdepends=('desktop-file-utils: Command line utilities for working with desktop
         '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.its.uidaho.edu/pub/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' 'dbusfix.diff' 'kdm-trinity')
-source=('http://anduin.linuxfromscratch.org/sources/trinity/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' 'dbusfix.diff' 'kdm-trinity')
 md5sums=('d1f7e1f94eeb46b981fe1ba144179840'
          'c9ce810c281002440a6de8cfd8735d07'
          '376d85d213cf3c04cb0912e5cccd68bd')
@@ -110,16 +109,9 @@ package() {
 #   cd ${srcdir}/${_svnmod}
   cd ${srcdir}/build
 
-  make DESTDIR="$pkgdir/" install
+  make DESTDIR="$pkgdir" install
 
-  cd ${startdir}
-
-  # install desktop and update kdmrc and Xsession
-#   [[ -f trinity.desktop ]] && {
-#     install -d -m755 ${pkgdir}/etc/X11/sessions
-#     install -m644 trinity.desktop ${pkgdir}/etc/X11/sessions
-#   }
-  _tdesktop
+  # install desktop 
   [[ -f ${pkgdir}/etc/X11/sessions/trinity.desktop ]] || msg "ERROR - Install Failure: ${pkgdir}/etc/X11/sessions/trinity.desktop"
 
   # set kdm directory
@@ -137,7 +129,7 @@ package() {
   cd ${pkgdir}/usr/bin
   ln -sf /opt/trinity/bin/startkde starttrinity
 
-  cd ${startdir}
-  install -D -m755 ./kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity	
+  cd ${srcdir}
+  install -D -m755 kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity	
 
 }
diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
index ffb2108b0..acafc86b2 100644
--- a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
@@ -1,23 +1,24 @@
 # Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+# Contributor: Pawel 'l0ner' Soltys <pwslts@gmail.com>
 
 pkgname=trinity-kdelibs
 pkgver=3513
-pkgrel=2
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-base')
 pkgdesc="Trinity DE core libraries"
-depends=('trinity-arts' 'trinity-qt3' 'trinity-tqtinterface' 'libical' 'libxslt' 'libltdl' 'avahi' 'pam-krb5' 'taglib' 'libxcomposite')
-makedepends=('pkgconfig' 'cmake' 'autoconf' )
+depends=('trinity-arts' 'trinity-qt3' 'trinity-tqtinterface' 'libical' 'libxslt' 'libltdl' 'avahi' 'pam-krb5' 'taglib' 'libxcomposite' 'libcups' 'alsa-lib' 'libart-lgpl' 'libidn' 'openssl' 'libtiff' 'jasper' 'openexr' 'aspell' 'hspell') 
+makedepends=('pkgconfig' 'cmake')
 provides=('trinity-kdelibs' 'kdelibs3')
 conflicts=('trinity-kdelibs' 'kdelibs3')
 replaces=('trinity-kdelibs')
 options=('libtool' '!strip' '!makeflags')
-#source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdelibs-3.5.13.tar.gz' 'trinity.sh')
-source=('http://anduin.linuxfromscratch.org/sources/trinity/kdelibs-3.5.13.tar.gz' 'trinity.sh')
+source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdelibs-3.5.13.tar.gz' 'trinity.sh' 'docpath.patch')
 md5sums=('f62eefb63b4ba2141b4c576f859806dd'
-         '2de1886d632c8bc288befada5e1bc3b5')
+         '2de1886d632c8bc288befada5e1bc3b5'
+         'd20badec5a1a7f01f0c957db8b9b8def')
 
 _builddir=build
 _prefix="/opt/trinity"
@@ -35,6 +36,9 @@ build() {
    export CMAKE_INCLUDE_PATH=${QTDIR}/include/tqt:/usr/include/dbus-1.0:${_prefix}/bin
    export LD_LIBRARY_PATH=${_prefix}/lib:${QTDIR}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
 
+   msg "Patching..."
+   patch -N -d ${srcdir} -p0 < ${srcdir}/docpath.patch
+
    cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
    mkdir -p ${_builddir}
@@ -44,12 +48,28 @@ build() {
    cmake ${srcdir}/kdelibs \
     -DCMAKE_INSTALL_PREFIX=${_prefix} \
     -DCMAKE_VERBOSE_MAKEFILE=OFF \
-    -DQT_VERSION=3 \
-    -DWITH_QT3=ON \
-    -DQTDIR=${QTDIR} \
-    -DQT_LIBRARY_DIRS=${QTDIR}/lib \
-    -DWITH_PAM=ON \
-    -DBUILD_ALL=ON
+    -DWITH_ARTS=ON \
+    -DWITH_ALSA=ON \
+    -DWITH_LIBART=ON \
+    -DWITH_LIBIDN=ON \
+    -DWITH_SSL=ON \
+    -DWITH_CUPS=ON \
+    -DWITH_LUA=OFF \
+    -DWITH_TIFF=ON \
+    -DWITH_JASPER=ON \
+    -DWITH_OPENEXR=ON \
+    -DWITH_UTEMPTER=OFF \
+    -DWITH_AVAHI=ON \
+    -DWITH_ASPELL=ON \
+    -DWITH_HSPELL=ON
+
+# Not needed, CMake returns that those were not used
+#    -DQT_VERSION=3 \
+#    -DWITH_QT3=ON \
+#    -DQTDIR=${QTDIR} \
+#    -DQT_LIBRARY_DIRS=${QTDIR}/lib \
+#    -DWITH_PAM=ON \
+#    -DBUILD_ALL=ON
 
    msg "Building - $pkgname..."
    make
@@ -65,7 +85,7 @@ package() {
    echo "${_prefix}/lib" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
 
    install -d -m755 ${pkgdir}/etc/profile.d/
-   install -m644 ${startdir}/trinity.sh ${pkgdir}/etc/profile.d/
+   install -m644 ${srcdir}/trinity.sh ${pkgdir}/etc/profile.d/
 
    #   rm -r ${srcdir}/${_svnmod}
 }
diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/docpath.patch b/arch/3.5.13/trinity-base/trinity-kdelibs/docpath.patch
new file mode 100644
index 000000000..aeb5e95f1
--- /dev/null
+++ b/arch/3.5.13/trinity-base/trinity-kdelibs/docpath.patch
@@ -0,0 +1,36 @@
+diff -r -u kdelibs/admin/debianrules src/kdelibs/admin/debianrules
+--- kdelibs/admin/debianrules	2011-08-21 06:15:36.000000000 +0200
++++ src/kdelibs/admin/debianrules	2012-01-04 15:28:20.000000000 +0100
+@@ -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 -r -u kdelibs/cmake/modules/TDESetupPaths.cmake src/kdelibs/cmake/modules/TDESetupPaths.cmake
+--- kdelibs/cmake/modules/TDESetupPaths.cmake	2011-08-21 06:15:37.000000000 +0200
++++ src/kdelibs/cmake/modules/TDESetupPaths.cmake	2012-01-04 15:28:49.000000000 +0100
+@@ -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" )
+diff -r -u kdelibs/kdecore/kstandarddirs.cpp src/kdelibs/kdecore/kstandarddirs.cpp
+--- kdelibs/kdecore/kstandarddirs.cpp	2011-08-21 06:15:32.000000000 +0200
++++ src/kdelibs/kdecore/kstandarddirs.cpp	2012-01-04 15:30:24.000000000 +0100
+@@ -1030,7 +1030,7 @@
+     if (!strcmp(type, "html-bundle"))
+ 	return "share/doc-bundle/HTML/";
+     if (!strcmp(type, "html"))
+-	return "share/doc/kde/HTML/";
++	return "share/doc/HTML/";
+     if (!strcmp(type, "icon"))
+ 	return "share/icons/";
+     if (!strcmp(type, "config"))
diff --git a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD
index ce4d7dc7a..0f803979d 100644
--- a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD
@@ -2,21 +2,19 @@
 
 pkgname=trinity-qt3
 pkgver=3884
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://trinitydesktop.org"
 license=('GPL')
 groups=('trinity-base')
 pkgdesc="The Qt3 gui toolkit - with Trinity upstream"
-depends=('libjpeg-turbo' 'libmng' 'libmysqlclient' 'libpng' 'libxmu'  'libxcursor' 'libxinerama' 'libxft' 'libxrandr' 'mesa' 'postgresql-libs' 'unixodbc')
+depends=('libjpeg-turbo' 'libmng' 'libmysqlclient' 'libpng' 'libxmu'  'libxcursor' 'libxinerama' 'libxft' 'libxrandr' 'mesa' 'postgresql-libs')
 makedepends=('cups' 'libxi' 'mysql' 'postgresql' 'unixodbc' 'sqlite3')
-# optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
 provides=('trinity-qt3' 'qt3')
 conflicts=('qt3' 'qt3-enhanced')
 replaces=('trinity-qt3')
 options=(!libtool)
-#source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/qt3-3.3.8.d.tar.gz)
-source=(http://anduin.linuxfromscratch.org/sources/trinity/qt3-3.3.8.d.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/qt3-3.3.8.d.tar.gz)
 md5sums=('78dc675e84aed595375449818cbb589a')
 
 _prefix="/opt/qt"
@@ -39,16 +37,17 @@ build() {
 
    rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*}
 
+   # auto license acceptance
+   sed -i "s|read acceptance|acceptance=yes|" configure
+
    msg "Starting configure..."
    #make -C qmake || return 1
    ./configure \
       -prefix ${_prefix} \
-      -fast \
       -sysconfdir /etc/qt \
       -thread \
       -shared \
       -system-zlib \
-      -platform linux-g++$ARCH \
       -system-lib{png,jpeg,mng} \
       -qt-gif \
       -cups
diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
index 772464b44..70767907b 100644
--- a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
@@ -14,8 +14,7 @@ makedepends=('pkgconfig' 'cmake' 'libxi' 'libxft' 'libxrandr' 'libxcursor' 'libx
 provides=($pkgname)
 #conflicts=()
 #replaces=()
-#source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/tqtinterface-3.5.13.tar.gz)
-source=(http://anduin.linuxfromscratch.org/sources/trinity/tqtinterface-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/tqtinterface-3.5.13.tar.gz)
 md5sums=('d54cc9fd0b35555298efd17c32471a2b')
 
 _prefix=/usr