diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/opencv/PKGBUILD | 31 | ||||
| -rw-r--r-- | extra/qwt/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/raptor/PKGBUILD | 8 | ||||
| -rw-r--r-- | extra/xfce4-eyes-plugin/PKGBUILD | 42 | ||||
| -rw-r--r-- | extra/xfce4-eyes-plugin/xfce4-eyes-plugin.install | 6 | ||||
| -rw-r--r-- | extra/xfdesktop/PKGBUILD | 16 | ||||
| -rw-r--r-- | extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch | 36 |
7 files changed, 60 insertions, 85 deletions
diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index 4dbcb64b7..8490915a6 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 178140 2013-02-16 22:48:58Z ioni $ +# $Id: PKGBUILD 179299 2013-03-04 22:18:11Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgbase=opencv pkgname=('opencv' 'opencv-docs' 'opencv-samples') _realname=OpenCV -pkgver=2.4.3 -pkgrel=5 +pkgver=2.4.4 +pkgrel=1 pkgdesc="Open Source Computer Vision Library" arch=('i686' 'x86_64') license=('BSD') @@ -14,7 +14,8 @@ url="http://opencv.org/" depends=('jasper' 'gstreamer0.10-base' 'intel-tbb' 'libcl' 'xine-lib' 'libdc1394' 'openexr' 'gtkglext') makedepends=('cmake' 'python2-numpy' 'mesa' - 'opencl-headers' 'eigen2') + 'opencl-headers' 'eigen2' + 'texlive-bin' 'python2-sphinx') # for docs optdepends=('opencv-docs' 'opencv-samples' 'eigen2' @@ -22,7 +23,7 @@ optdepends=('opencv-docs' source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2" 'pkgconfig.patch' 'fsh.patch') -md5sums=('c0a5af4ff9d0d540684c0bf00ef35dbe' +md5sums=('bb7272c102a801a9f9ee01db6e7ad8e9' 'cb916260b5ec594fe7a0cc2e54fc569f' '35256e3ccace373feba8131d1540a0de') @@ -33,6 +34,7 @@ _cmakeopts=('-D WITH_OPENCL=ON' '-D ENABLE_SSE=OFF' '-D ENABLE_SSE2=OFF' '-D ENABLE_SSE3=OFF' + '-D BUILD_DOCS=ON' '-D BUILD_PACKAGE=OFF' '-D BUILD_WITH_DEBUG_INFO=OFF' '-D BUILD_TESTS=OFF' @@ -49,12 +51,16 @@ build() { # fix pkg-config mess # see https://bugs.archlinux.org/task/32430 + # and http://code.opencv.org/issues/1925 patch -Np1 -i "$srcdir/pkgconfig.patch" - # fix another upstream mess + # fix another upstream mess that they won't fix # see http://code.opencv.org/issues/2512 patch -Np1 -i "$srcdir/fsh.patch" + # python2 compatibility for generating docs + sed -i 's/sphinx-build/sphinx-build2/' cmake/OpenCVDetectPython.cmake + cmake ${_cmakeopts[@]} . make @@ -72,11 +78,10 @@ package_opencv() { cd "$pkgdir/usr/share" # separate docs package; also be -R friendly - [ -d doc/$pkgname ] && mv doc/$pkgname "$srcdir/opencv-doc" \ - && rm -r doc + [[ -d doc ]] && mv doc "$srcdir/opencv-doc" # separate samples package - [ -d $pkgname/samples ] && mv $pkgname/samples "$srcdir/opencv-samples" + [[ -d $pkgname/samples ]] && mv $pkgname/samples "$srcdir/opencv-samples" } package_opencv-docs() { @@ -85,10 +90,14 @@ package_opencv-docs() { unset optdepends options=('docs') + # PDFs are not being generated for some reason as of 2.4.4 + # even after adding latex and sphinx deps + # when previously without them there were a couple of good docs installed + cd "$srcdir" - mkdir -p "$pkgdir/usr/share/doc" - cp -r opencv-doc "$pkgdir/usr/share/doc/opencv" + # doc dir now includes opencv subdir (looks like they finally listened) + cp -r opencv-doc "$pkgdir/usr/share/doc" # install license file #install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ diff --git a/extra/qwt/PKGBUILD b/extra/qwt/PKGBUILD index 3e14cf1c7..6ea145189 100644 --- a/extra/qwt/PKGBUILD +++ b/extra/qwt/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 179088 2013-03-03 09:38:46Z andrea $ +# $Id: PKGBUILD 179293 2013-03-04 21:34:48Z andrea $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=qwt pkgver=6.0.2 -pkgrel=1 +pkgrel=2 pkgdesc="Qt Widgets for Technical Applications" arch=('i686' 'x86_64') url="http://qwt.sourceforge.net/" @@ -37,7 +37,7 @@ package() { # needed by qmake (FS#30407) install -d "${pkgdir}"/usr/share/qt4/mkspecs/features/ - install -m644 qwtconfig.pri qwt.prf \ + install -m644 qwtconfig.pri qwt.prf qwtfunctions.pri \ "${pkgdir}"/usr/share/qt4/mkspecs/features/ # move man pages diff --git a/extra/raptor/PKGBUILD b/extra/raptor/PKGBUILD index c87ffb225..47f2f3ed3 100644 --- a/extra/raptor/PKGBUILD +++ b/extra/raptor/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 175875 2013-01-23 00:13:12Z eric $ +# $Id: PKGBUILD 179134 2013-03-04 08:06:34Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: eric <eric@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=raptor -pkgver=2.0.8 -pkgrel=3 +pkgver=2.0.9 +pkgrel=1 pkgdesc="A C library that parses RDF/XML/N-Triples into RDF triples" arch=('i686' 'x86_64') url="http://librdf.org/raptor" @@ -33,4 +33,4 @@ package() { cd "${srcdir}"/raptor2-${pkgver} make prefix="${pkgdir}"/usr install } -md5sums=('ac60858b875aab8fa7917f21a1237aa9') +md5sums=('4ceb9316488b0ea01acf011023cf7fff') diff --git a/extra/xfce4-eyes-plugin/PKGBUILD b/extra/xfce4-eyes-plugin/PKGBUILD index 055380203..d6a099d7d 100644 --- a/extra/xfce4-eyes-plugin/PKGBUILD +++ b/extra/xfce4-eyes-plugin/PKGBUILD @@ -1,32 +1,38 @@ -# $Id: PKGBUILD 157855 2012-04-30 04:20:22Z foutrelis $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> +# $Id: PKGBUILD 179295 2013-03-04 21:35:04Z foutrelis $ +# Maintainer: +# Contributor: AndyRTR <andyrtr@archlinux.org> # Contributor: Aurelien Foret <orelien@chez.com> pkgname=xfce4-eyes-plugin -pkgver=4.4.1 -pkgrel=3 +pkgver=4.4.2 +pkgrel=1 pkgdesc="A rolling eyes (following mouse pointer) plugin for the Xfce panel" -arch=(i686 x86_64) +arch=('i686' 'x86_64') +url="http://goodies.xfce.org/projects/panel-plugins/xfce4-eyes-plugin" license=('GPL2') -url="http://xfce-goodies.berlios.de/" groups=('xfce4-goodies') -depends=('xfce4-panel' 'libxfcegui4' 'hicolor-icon-theme') +depends=('xfce4-panel' 'hicolor-icon-theme') makedepends=('intltool' 'perlxml') -install=${pkgname}.install -source=(http://archive.xfce.org/src/panel-plugins/${pkgname}/4.4/${pkgname}-${pkgver}.tar.bz2) -md5sums=('dcbf6ea9035d379d168b479be0d09f14') +options=('!libtool') +install=$pkgname.install +source=(http://archive.xfce.org/src/panel-plugins/$pkgname/4.4/$pkgname-$pkgver.tar.bz2) +sha256sums=('dad102fedd0d9e6df45338a018387b2aacaf24b05eb798275be0dfc05ffa3021') build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --disable-static + cd "$srcdir/$pkgname-$pkgver" + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --localstatedir=/var \ + --disable-static make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfce4-eyes-plugin/xfce4-eyes-plugin.install b/extra/xfce4-eyes-plugin/xfce4-eyes-plugin.install index 21b79d2d4..e4f8fd06c 100644 --- a/extra/xfce4-eyes-plugin/xfce4-eyes-plugin.install +++ b/extra/xfce4-eyes-plugin/xfce4-eyes-plugin.install @@ -3,9 +3,11 @@ post_install() { } post_upgrade() { - post_install $1 + post_install } post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + post_install } + +# vim:set ts=2 sw=2 et: diff --git a/extra/xfdesktop/PKGBUILD b/extra/xfdesktop/PKGBUILD index 463787925..1b999453e 100644 --- a/extra/xfdesktop/PKGBUILD +++ b/extra/xfdesktop/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170256 2012-11-06 11:49:29Z foutrelis $ +# $Id: PKGBUILD 179291 2013-03-04 21:25:21Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> pkgname=xfdesktop -pkgver=4.10.0 -pkgrel=5 +pkgver=4.10.1 +pkgrel=1 pkgdesc="A desktop manager for Xfce" arch=('i686' 'x86_64') url="http://www.xfce.org/" @@ -16,18 +16,12 @@ conflicts=('xfce4-menueditor') replaces=('xfce4-menueditor') options=('!libtool') install=xfdesktop.install -source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2 - add-backgrounds-xfce-to-search-path.patch) -sha256sums=('897ae6ee435dcc89809ad70c15c5d15347d1cf4fc8033238b17dcc47836c2d7b' - 'fcb27e24abfd50c5555fe01ae946a2bc5a133d3f5cee076eef517ccc5f668dd5') +source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2) +sha256sums=('2883fe381e1b967d179fdf5ece5ac2566a3ffdb94f4cf139c7fb44567f17d4ad') build() { cd "$srcdir/$pkgname-$pkgver" - # Add backgrounds/xfce/ to the single image list in the settings app - # https://bugzilla.xfce.org/show_bug.cgi?id=8799 - patch -Np1 -i "$srcdir/add-backgrounds-xfce-to-search-path.patch" - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch b/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch deleted file mode 100644 index c48aeac33..000000000 --- a/extra/xfdesktop/add-backgrounds-xfce-to-search-path.patch +++ /dev/null @@ -1,36 +0,0 @@ -@@ -, +, @@ - settings app. (Bug #8799) ---- - settings/main.c | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) ---- a/settings/main.c -+++ a/settings/main.c -@@ -688,6 +688,7 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel) - xfconf_channel_set_string(panel->channel, prop_image, image_file); - xfconf_channel_set_string(panel->channel, prop_last, image_file); - -+ /* Add all backdrops in xfce4/backdrops/ */ - backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA, - "xfce4/backdrops/"); - for(i = 0; backdrop_dirs[i]; ++i) { -@@ -696,6 +697,19 @@ xfdesktop_settings_dialog_populate_image_list(AppearancePanel *panel) - if(tmp) - image_file_iter = tmp; - } -+ g_strfreev(backdrop_dirs); -+ -+ /* Add all backdrops in backgrounds/xfce/ */ -+ backdrop_dirs = xfce_resource_lookup_all(XFCE_RESOURCE_DATA, -+ "backgrounds/xfce/"); -+ for(i = 0; backdrop_dirs[i]; ++i) { -+ tmp = xfdesktop_image_list_add_dir(ls, backdrop_dirs[i], -+ image_file); -+ if(tmp) -+ image_file_iter = tmp; -+ } -+ g_strfreev(backdrop_dirs); -+ - - if(!image_file_iter) - image_file_iter = xfdesktop_settings_image_treeview_add(GTK_TREE_MODEL(ls), image_file); --- |