Sat Jan 7 23:14:43 UTC 2012

6 files changed, 218 insertions, 4 deletions

diff --git a/staging/k9copy/PKGBUILD b/staging/k9copy/PKGBUILD
new file mode 100644
index 000000000..0c3b120ee
--- /dev/null
+++ b/staging/k9copy/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 146218 2012-01-06 05:17:15Z eric $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com>
+
+pkgname=k9copy
+pkgver=2.3.8
+pkgrel=2
+pkgdesc="A small utility which allows the copy of DVD under Linux"
+arch=('i686' 'x86_64')
+url="http://k9copy.sourceforge.net"
+license=('GPL')
+depends=('kdebase-runtime' 'libmpeg2' 'xine-lib' 'dvd+rw-tools' 'dvdauthor')
+makedepends=('automoc4' 'cmake')
+install=k9copy.install
+source=("http://downloads.sourceforge.net/project/${pkgname}/k9copy-kde4/${pkgver}/${pkgname}-${pkgver}-Source.tar.gz")
+md5sums=('584f6cc50f28befbeb0d5c1ec9476456')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}-Source"
+
+  sed -i -e "s:Name=k9copy:Name=K9copy:g" k9copy.desktop k9copy_assistant.desktop
+
+  cmake -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}-Source"
+
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/k9copy/k9copy.install b/staging/k9copy/k9copy.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/staging/k9copy/k9copy.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/staging/kdelibs/PKGBUILD b/staging/kdelibs/PKGBUILD
index 77e597a01..019a971bf 100644
--- a/staging/kdelibs/PKGBUILD
+++ b/staging/kdelibs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 145132 2011-12-17 10:04:41Z andrea $
+# $Id: PKGBUILD 145730 2011-12-29 13:52:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdelibs
 pkgver=4.7.4
-pkgrel=2
+pkgrel=5
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
@@ -18,10 +18,13 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
 replaces=('kdelibs-experimental')
 install='kdelibs.install'
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
-        'kde-applications-menu.patch' 'archlinux-menu.patch')
+        'kde-applications-menu.patch' 'archlinux-menu.patch'
+        'fix-knotify-filepath.patch' 'kdelibs-4.7.4-xinelib12x.patch')
 sha1sums=('78b25e93a8c70ccc1e0f117cce960fe4e1deb8d8'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
-          '63a850ab4196b9d06934f2b4a13acd9f7739bc67')
+          '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+          '3312f6005aa56a9b992c74008fe5b314f1c8ffba'
+          '9cb83cb7f6394549354c6837977f9e9529127041')
 
 build() {
        cd "${srcdir}"/${pkgname}-${pkgver}
@@ -31,6 +34,11 @@ build() {
        # add Archlinux menu entry
        patch -p1 -i "${srcdir}"/archlinux-menu.patch
 
+       # https://bugs.kde.org/show_bug.cgi?id=285028
+       patch -p1 -i "${srcdir}"/fix-knotify-filepath.patch
+
+       patch -p1 -i "${srcdir}"/kdelibs-4.7.4-xinelib12x.patch
+
        cd "${srcdir}"
        mkdir build
        cd build
diff --git a/staging/kdelibs/fix-knotify-filepath.patch b/staging/kdelibs/fix-knotify-filepath.patch
new file mode 100644
index 000000000..2cd995e97
--- /dev/null
+++ b/staging/kdelibs/fix-knotify-filepath.patch
@@ -0,0 +1,13 @@
+diff --git a/knotify/config/knotifyconfigactionswidget.cpp b/knotify/config/knotifyconfigactionswidget.cpp
+index 88d18b6..0e76658 100644
+--- a/knotify/config/knotifyconfigactionswidget.cpp
++++ b/knotify/config/knotifyconfigactionswidget.cpp
+@@ -128,7 +128,7 @@ void KNotifyConfigActionsWidget::slotPlay(  )
+ 	KUrl soundURL = m_ui.Sound_select->url();
+ 	if ( soundURL.isRelative() )
+ 	{
+-		QString soundString = soundURL.toLocalFile();
++		QString soundString = m_ui.Sound_select->text();
+ 		// we need a way to get the application name in order to ba able to do this :
+ 		/*QString search = QString("%1/sounds/%2").arg(config->appname).arg(soundFile);
+ 		search = KGlobal::mainComponent().dirs()->findResource("data", search);
diff --git a/staging/kdelibs/kdelibs-4.7.4-xinelib12x.patch b/staging/kdelibs/kdelibs-4.7.4-xinelib12x.patch
new file mode 100644
index 000000000..bdcd39a6c
--- /dev/null
+++ b/staging/kdelibs/kdelibs-4.7.4-xinelib12x.patch
@@ -0,0 +1,32 @@
+From de5da56d10a47ff8fdf55c0818e9e776dcfa01f9 Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gentoo.org>
+Date: Thu, 5 Jan 2012 10:06:05 +0100
+Subject: [PATCH] Fix FindXine.cmake module with >=xine-lib-1.2.
+
+---
+ cmake/modules/FindXine.cmake |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/modules/FindXine.cmake b/cmake/modules/FindXine.cmake
+index 37c58c6..d71969a 100644
+--- a/cmake/modules/FindXine.cmake
++++ b/cmake/modules/FindXine.cmake
+@@ -36,13 +36,13 @@ find_library(XINE_LIBRARY NAMES xine
+   ${PC_LIBXINE_LIBRARY_DIRS}
+  )
+ 
+-find_program(XINECONFIG_EXECUTABLE NAMES xine-config 
++find_program(XINECONFIG_EXECUTABLE NAMES pkg-config
+    HINTS
+    ${PC_LIBXINE_PREFIX}/bin
+ )
+ 
+ if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE)
+-   exec_program(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET)
++   exec_program(${XINECONFIG_EXECUTABLE} ARGS --modversion libxine RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET)
+    if("${XINE_VERSION}" VERSION_GREATER "1.1.0")   #if (... VERSION_GREATER) is new since cmake 2.6.2
+       set(XINE_VERSION_OK TRUE)
+       string(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION})
+-- 
+1.7.8.2
+
diff --git a/staging/opencv/PKGBUILD b/staging/opencv/PKGBUILD
new file mode 100644
index 000000000..99620b4cd
--- /dev/null
+++ b/staging/opencv/PKGBUILD
@@ -0,0 +1,119 @@
+# $Id: PKGBUILD 146240 2012-01-06 22:16:16Z eric $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Tobias Powalowski <tpowa@archlinux.org>
+
+pkgbase=opencv
+pkgname=('opencv' 'opencv-docs' 'opencv-samples')
+_realname=OpenCV
+pkgver=2.3.1_a
+_realver=2.3.1
+pkgrel=3
+pkgdesc="Open Source Computer Vision Library"
+arch=('i686' 'x86_64')
+license=('BSD')
+url="http://opencv.willowgarage.com/"
+depends=('jasper' 'gstreamer0.10-base' 'openexr'
+         'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils')
+makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2')
+optdepends=('opencv-docs'
+            'opencv-samples'
+            'eigen2'
+            'python2-numpy: Python 2.x interface')
+options=('!libtool')
+source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${_realver}a.tar.bz2")
+md5sums=('82e4b6bfa349777233eea09b075e931e')
+
+_cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
+            '-D CMAKE_INSTALL_PREFIX=/usr'
+            '-D CMAKE_SKIP_RPATH=ON'
+            '-D BUILD_TESTS=OFF'
+            '-D ENABLE_SSE=ON'
+            '-D ENABLE_SSE2=ON'
+            '-D ENABLE_SSE3=OFF'
+            '-D ENABLE_SSSE3=OFF'
+            '-D ENABLE_SSE41=OFF'
+            '-D ENABLE_SSE42=OFF'
+            '-D BUILD_EXAMPLES=ON'
+            '-D INSTALL_C_EXAMPLES=ON'
+            '-D INSTALL_PYTHON_EXAMPLES=ON'
+            '-D WITH_XINE=ON'
+            '-D WITH_QT=OFF'
+            '-D WITH_QT_OPENGL=OFF'
+            '-D WITH_UNICAP=OFF'
+            '-D WITH_PVAPI=OFF'
+            '-D WITH_OPENNI=OFF'
+            '-D WITH_TBB=OFF'
+            '-D WITH_IPP=OFF'
+            '-D WITH_CUDA=OFF'
+            '-D USE_FAST_MATH=ON')
+
+build() {
+  cd "$srcdir/$_realname-$_realver"
+
+  # x64, i.e "Athlon64" and upwards, can use SSE3
+  [ $CARCH = x86_64 ] && \
+    _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON}
+
+  cmake ${_cmakeopts[@]} .
+
+  make
+}
+
+package_opencv() {
+  cd "$srcdir/$_realname-$_realver"
+
+  make DESTDIR="$pkgdir" install
+
+  # install license file
+  install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  cd "$pkgdir/usr/share"
+
+  # prepare FSH-friendly dirs
+  if [ -d OpenCV ]; then
+    mv opencv/samples OpenCV/
+    rm -r opencv
+    mv OpenCV opencv
+  fi
+
+  # separate docs package; also be -R friendly
+  [ -d opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc"
+
+  # separate samples package
+  [ -d opencv/samples ] && mv opencv/samples "$srcdir/opencv-samples"
+}
+
+package_opencv-docs() {
+  pkgdesc+=" (documentation)"
+  unset depends
+  unset optdepends
+  options=('docs')
+
+  cd "$srcdir"
+
+  mkdir -p "$pkgdir/usr/share/doc"
+  cp -r opencv-doc "$pkgdir/usr/share/doc/opencv"
+
+  # install license file
+  install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_opencv-samples() {
+  pkgdesc+=" (samples)"
+  depends=('bash')
+  unset optdepends
+  unset options
+
+  cd "$srcdir"
+
+  mkdir -p "$pkgdir/usr/share/opencv"
+  cp -r opencv-samples "$pkgdir/usr/share/opencv/samples"
+
+  # install license file
+  install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et: