diff options
111 files changed, 5316 insertions, 225 deletions
diff --git a/community-testing/open-vm-tools-modules/PKGBUILD b/community-testing/open-vm-tools-modules/PKGBUILD index eb85e4e9c..7c9125ade 100644 --- a/community-testing/open-vm-tools-modules/PKGBUILD +++ b/community-testing/open-vm-tools-modules/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 42477 2011-03-16 21:51:11Z spupykin $ +# $Id: PKGBUILD 44312 2011-04-05 15:06:23Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools-modules -pkgver=2011.02.23 -_pkgsubver=368700 +pkgver=2011.03.28 +_pkgsubver=387002 pkgrel=1 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools." arch=('i686' 'x86_64') @@ -14,27 +14,25 @@ makedepends=('libdnet' 'icu' 'uriparser' 'kernel26-headers') depends=("kernel26") install=$pkgname.install source=(http://easynews.dl.sourceforge.net/sourceforge/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz) -md5sums=('488601e384daeab2c6ffd81e1a95cad7') +md5sums=('a9c72ab0b8f7778d444e69e9d3b95527') build() { -_kernver=`pacman -Q kernel26 | cut -d . -f 3 | cut -f 1 -d -` -depends=("kernel26>=2.6.${_kernver}" "kernel26<2.6.`expr ${_kernver} + 1`") - - KERNEL_VERSION="2.6.${_kernver}-ARCH" - msg "Kernel = $KERNEL_VERSION" - cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}" - sed -i 's#-lproc-3.2.7#-lproc-3.2.8#' configure - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr - (cd modules && make modules) +} + +package() { + _kernver=`pacman -Q kernel26 | cut -d . -f 3 | cut -f 1 -d -` + depends=("kernel26>=2.6.${_kernver}" "kernel26<2.6.`expr ${_kernver} + 1`") + KERNEL_VERSION="2.6.${_kernver}-ARCH" + msg "Kernel = $KERNEL_VERSION" + cd "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}" mkdir -p $pkgdir/lib/modules/$KERNEL_VERSION/misc/ for MOD in `find -type f -name '*.ko'`; do install -D -m644 $MOD $pkgdir/lib/modules/$KERNEL_VERSION/misc/ done - sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='$KERNEL_VERSION'/" $startdir/$pkgname.install } diff --git a/community-testing/open-vm-tools-modules/open-vm-tools-modules.install b/community-testing/open-vm-tools-modules/open-vm-tools-modules.install index 6ebc18c36..7f44b03ef 100644 --- a/community-testing/open-vm-tools-modules/open-vm-tools-modules.install +++ b/community-testing/open-vm-tools-modules/open-vm-tools-modules.install @@ -32,4 +32,3 @@ post_remove() { echo ">>> Remember to un-blacklist pcnet32 driver in /etc/rc.conf." echo ">>>" } - diff --git a/community-testing/open-vm-tools/PKGBUILD b/community-testing/open-vm-tools/PKGBUILD index 8dbb03d5f..4102311d9 100644 --- a/community-testing/open-vm-tools/PKGBUILD +++ b/community-testing/open-vm-tools/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 42480 2011-03-16 21:57:43Z spupykin $ +# $Id: PKGBUILD 44320 2011-04-05 15:30:39Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools -pkgver=2011.02.23 -_pkgsubver=368700 +pkgver=2011.03.28 +_pkgsubver=387002 pkgrel=1 pkgdesc="The Open Virtual Machine Tools (open-vm-tools) are the open source implementation of VMware Tools." arch=('i686' 'x86_64') @@ -24,7 +24,7 @@ source=(http://switch.dl.sourceforge.net/$pkgname/$pkgname-$pkgver-${_pkgsubver} tools.conf vmware-guestd xautostart.conf) -md5sums=('488601e384daeab2c6ffd81e1a95cad7' +md5sums=('a9c72ab0b8f7778d444e69e9d3b95527' '06f7448e274db2a911f582e276088fc9' 'b183ec265200d68431a5e4eb1b0c8cf5' '8c333a979578bdc0c3134c1dd6bb7353' @@ -36,16 +36,17 @@ md5sums=('488601e384daeab2c6ffd81e1a95cad7' build() { cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}" - -# [ $NOEXTRACT -eq 1 ] || patch -Np1 -i $srcdir/open-vm-tools-X11Bool.patch - - [ $NOEXTRACT -eq 1 ] || sed -i 's#3.2.7#3.2.8#' configure - [ $NOEXTRACT -eq 1 ] || sed -i 's#3.2.7#3.2.8#' configure.ac - - unset LDFLAGS - + [ $NOEXTRACT -eq 1 ] || { + sed -i 's#3.2.7#3.2.8#' configure configure.ac + sed -i 's#CFLAGS="$CFLAGS -Werror"##' configure configure.ac + } [ -f Makefile ] || ./configure --prefix=/usr --without-kernel-modules make +} + +package() { + cd "$srcdir/$pkgname-${pkgver}-${_pkgsubver}" + make install DESTDIR=$pkgdir install -D -m 755 scripts/common/vmware-xdg-detect-de $pkgdir/usr/bin/vmware-xdg-detect-de chmod 07755 $pkgdir/usr/bin/vmware-user-suid-wrapper diff --git a/community/blackbox/PKGBUILD b/community/blackbox/PKGBUILD index af1ff72d1..b312b37c5 100644 --- a/community/blackbox/PKGBUILD +++ b/community/blackbox/PKGBUILD @@ -1,34 +1,39 @@ -# $Id: PKGBUILD 7982 2010-01-13 18:45:53Z dgriffiths $ +# $Id: PKGBUILD 44299 2011-04-05 08:55:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: durbatuluk <dvdscripter@gmail.org> # Contributor: Steve Ponsford <sp4d@lavabit.com> pkgname=blackbox pkgver=0.70.1 -pkgrel=8 +pkgrel=9 pkgdesc="A window manager for X11" +url="http://blackboxwm.sourceforge.net/" arch=('i686' 'x86_64') -depends=('libxft' 'libxext' 'xorg-server') +depends=('gcc-libs' 'libxft' 'libxext' 'libx11') license=('MIT') options=('!libtool') source=(http://downloads.sourceforge.net/blackboxwm/$pkgname-$pkgver.tar.gz - gcc4.3.patch bbdock.patch bsetbg-feh.patch) -url="http://blackboxwm.sourceforge.net/" + gcc4.3.patch + bbdock.patch + bsetbg-feh.patch + textpropertytostring-unconditional.patch) md5sums=('2d173b95ca5e64ef478c6a5d2deee9df' 'bc7a1335d77cdeb6f85cba4d01e68e63' '69c5a5e981b087b2d8267cab996b48dd' - 'e7fb0d5bfd95820c0194ec73df66dadc') + 'e7fb0d5bfd95820c0194ec73df66dadc' + '3b92ad246f07126dd55ae9634d6e875e') build() { - cd $startdir/src/$pkgname-$pkgver + cd $srcdir/$pkgname-$pkgver - patch -Np1 -i ../gcc4.3.patch || return 1 - patch -Np0 -i ../bbdock.patch || return 1 - patch -Np0 -i ../bsetbg-feh.patch || return 1 + patch -Np1 -i ../gcc4.3.patch + patch -Np0 -i ../bbdock.patch + patch -Np0 -i ../bsetbg-feh.patch + patch -Np1 -i ../textpropertytostring-unconditional.patch ./configure --prefix=/usr --mandir=/usr/share/man - make || return 1 - make DESTDIR=$startdir/pkg install + make + make DESTDIR=$pkgdir install - install -D -m644 LICENSE $startdir/pkg/usr/share/licenses/$pkgname/LICENSE + install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE } diff --git a/community/blackbox/textpropertytostring-unconditional.patch b/community/blackbox/textpropertytostring-unconditional.patch new file mode 100644 index 000000000..ed320388a --- /dev/null +++ b/community/blackbox/textpropertytostring-unconditional.patch @@ -0,0 +1,28 @@ +Description: Declare bt::textPropertyToString unconditionally. +Author: Jakub Wilk <jwilk@debian.org> +Forwarded: no +Bug-Debian: http://bugs.debian.org/614468 +Last-Update: 2011-03-12 + +--- a/lib/Util.hh ++++ b/lib/Util.hh +@@ -25,6 +25,8 @@ + #ifndef __Util_hh + #define __Util_hh + ++#include <X11/Xutil.h> ++ + #include <limits.h> + #include <string> + +@@ -94,10 +96,8 @@ + + std::string tolower(const std::string &string); + +-#ifdef _XUTIL_H_ + std::string textPropertyToString(::Display *display, + ::XTextProperty& text_prop); +-#endif + + } // namespace bt + diff --git a/community/gambas2/PKGBUILD b/community/gambas2/PKGBUILD index 614f6f243..eeffdef55 100644 --- a/community/gambas2/PKGBUILD +++ b/community/gambas2/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 42245 2011-03-15 20:38:59Z lcarlier $ +# $Id: PKGBUILD 44283 2011-04-05 06:25:28Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Biru Ionut <ionut@archlinux.ro> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -19,8 +19,8 @@ pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2 'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl' 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') -pkgver=2.22.0 -pkgrel=4 +pkgver=2.23.0 +pkgrel=1 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net" @@ -35,11 +35,9 @@ groups=('gambas2') replaces=('gambas2') conflicts=('gambas2') source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2 - 'gambas2.desktop' 'gambas2.png' 'fix-gbi-gba-path.patch' - 'gambas2-script.install' 'gambas2-runtime.install') -md5sums=('e7ea5124405788b1965115670b8cafd9' - 'e6c2df38b29fcb6ba9ac7ba783688211' - '32672c984d8487beb13aa5b6bc6868e2' + 'fix-gbi-gba-path.patch' 'gambas2-script.install' + 'gambas2-runtime.install') +md5sums=('f777cfe187ba58c176f90a85e33a9758' '9dda03a1bbfb7e7ba8b6a4ae91b6752b' '870ff5b4b33cd75aa9c290539e6fdd5d' 'ab5667175c4945282d2f40a35d0e9e5b') @@ -122,10 +120,6 @@ package_gambas2-runtime() { install -d -m755 ${pkgdir}/usr/share/gambas2/icons install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/application-x-gambas.png \ ${pkgdir}/usr/share/gambas2/icons/application-x-gambas.png - install -D -m644 ${srcdir}/gambas2.desktop \ - ${pkgdir}/usr/share/applications/gambas2.desktop - install -D -m644 ${srcdir}/gambas2.png \ - ${pkgdir}/usr/share/pixmaps/gambas2.png } package_gambas2-devel() { @@ -182,6 +176,10 @@ package_gambas2-ide() { install -m755 gambas2/gambas2.gambas ${pkgdir}/usr/bin install -m755 gambas2-database-manager/gambas2-database-manager.gambas ${pkgdir}/usr/bin ln -s gambas2.gambas ${pkgdir}/usr/bin/gambas2 + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.desktop \ + ${pkgdir}/usr/share/applications/gambas2.desktop + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.png \ + ${pkgdir}/usr/share/pixmaps/gambas2.png } package_gambas2-examples() { diff --git a/community/gcompris/PKGBUILD b/community/gcompris/PKGBUILD index 0453a3b4a..a4f225e6f 100644 --- a/community/gcompris/PKGBUILD +++ b/community/gcompris/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 43090 2011-03-24 00:10:31Z foutrelis $ +# $Id: PKGBUILD 44294 2011-04-05 06:50:48Z foutrelis $ # Maintainer: Evangelos Foutras <foutrelis@gmail.com> # Contributor: Daniel Isenmann <daniel.isenmann [at] gmx.de> pkgname=('gcompris' 'gcompris-data') -pkgver=9.6 +pkgver=9.6.1 pkgrel=1 pkgdesc="Educational software suite comprising of numerous activities for children aged 2 to 10" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ makedepends=('texinfo' 'texi2html' 'intltool' 'gettext' 'gnuchess' 'gstreamer0.10-base-plugins') options=('!libtool') source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('4cd29386c09304f2a80753c850496d81') +md5sums=('2fb1dbb331166dd19d0a758220e4caf0') build() { cd "$srcdir/$pkgname-$pkgver" @@ -39,7 +39,7 @@ package_gcompris-data() { #arch=('any') install=gcompris-data.install - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/gcompris-$pkgver" make DESTDIR="$pkgdir" install-data # Place GCompris menu entry under Education diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD index 2800402ff..516b94be4 100644 --- a/community/intellij-idea-libs/PKGBUILD +++ b/community/intellij-idea-libs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 41163 2011-03-04 14:46:04Z stativ $ +# $Id: PKGBUILD 44325 2011-04-05 15:37:14Z stativ $ # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> pkgname=intellij-idea-libs -pkgver=10.0.2 -_pkgver=103.72 +pkgver=10.0.3 +_pkgver=103.255 pkgrel=1 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE" arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ url="http://www.jetbrains.org/" license=('apache') depends=('glibc') source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz) -md5sums=('2d9d6464562f3c5b2267867c9dc946b2') +md5sums=('0309a9583febf6d9bfc803c386efcad4') build() { cd "$srcdir" diff --git a/community/me-tv/PKGBUILD b/community/me-tv/PKGBUILD index 8d85f49c2..bb1140601 100644 --- a/community/me-tv/PKGBUILD +++ b/community/me-tv/PKGBUILD @@ -5,7 +5,7 @@ #Previous Contributor: Jeff Bailes <thepizzaking@gmail.com> pkgname=me-tv -pkgver=2.0.0 +pkgver=2.0.1 pkgrel=1 pkgdesc="A GTK desktop application for watching digital television services that use the DVB standard" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ makedepends=('intltool') install=me-tv.install source=(http://launchpad.net/${pkgname}/${pkgver:0:3}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz) options=('!emptydirs') -md5sums=('d4c614f113a34342ff29c1f5605cd14a') +md5sums=('7cda820b795f2fea522ba3de5e312483') build() { diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index 9f2032eff..2f76d6944 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 43057 2011-03-23 21:47:11Z spupykin $ +# $Id: PKGBUILD 44302 2011-04-05 08:56:05Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=shotwell -pkgver=0.9.0 +pkgver=0.9.1 pkgrel=1 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64') url="http://yorba.org/shotwell/" license=('LGPL2.1') -depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' 'libraw' 'librsvg' 'json-glib' - 'desktop-file-utils' 'gnome-vfs') +depends=('gconf' 'libgee' 'libgphoto2' 'libunique' 'libwebkit' 'libgexiv2' + 'libraw' 'librsvg' 'json-glib' 'desktop-file-utils' 'gnome-vfs') makedepends=('intltool' 'vala') install=shotwell.install source=(http://yorba.org/download/shotwell/0.9/${pkgname}-${pkgver}.tar.bz2) -md5sums=('6701d9a7c0a2f4f720fdeed1d6e54758') +md5sums=('1a98d1da59424a67b310cc39e8ad3368') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/vifm/PKGBUILD b/community/vifm/PKGBUILD index abf5a134b..47d3b9c0c 100644 --- a/community/vifm/PKGBUILD +++ b/community/vifm/PKGBUILD @@ -1,23 +1,20 @@ -# $Id: PKGBUILD 40937 2011-03-01 23:43:56Z jelle $ +# $Id: PKGBUILD 44342 2011-04-05 23:27:31Z jelle $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=vifm pkgver=0.5 -pkgrel=3 +pkgrel=4 pkgdesc="Ncurses based file manager with vi like keybindings" arch=('i686' 'x86_64') url="http://vifm.sourceforge.net/" license=('GPL') depends=('ncurses') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 ncurses58.patch) -options=(!strip) +source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 ncurses.patch) build() { cd ${srcdir}/$pkgname-$pkgver - patch -Np1 -i $srcdir/ncurses58.patch + patch -Np1 -i $srcdir/ncurses.patch - export CFLAGS="$CFLAGS -g" - export CXXFLAGS="$CXXFLAGS -g" - ./configure --prefix=/usr --enable-debug + ./configure --prefix=/usr make } package() @@ -26,18 +23,4 @@ package() make DESTDIR=${pkgdir} install } md5sums=('76818f02d6acd4997d1f41db932438aa' - '1a525adddc0424c23ed9a4aa31c0164a') -md5sums=('76818f02d6acd4997d1f41db932438aa' - '4b2007548083f3dc828074706ce16024') -md5sums=('76818f02d6acd4997d1f41db932438aa' - 'd2575f3ec9ead5ee0561b5ceaa23a35a') -md5sums=('76818f02d6acd4997d1f41db932438aa' - '38cbc3a963346babae2f6c6edb7dec3b') -md5sums=('76818f02d6acd4997d1f41db932438aa' - 'd56abb4654d344c1997eee0f5e2d5133') -md5sums=('76818f02d6acd4997d1f41db932438aa' - '97837d528f4287b3f01d370a823b32d4') -md5sums=('76818f02d6acd4997d1f41db932438aa' - '97f633c0afa003de34ba17b9eb68112d') -md5sums=('76818f02d6acd4997d1f41db932438aa' - '49a1e1f299afd18e336cf85dcd5d67e2') + 'ad7c6b70678409d122426b9ed62386c0') diff --git a/community/vifm/ncurses.patch b/community/vifm/ncurses.patch new file mode 100644 index 000000000..841772e3d --- /dev/null +++ b/community/vifm/ncurses.patch @@ -0,0 +1,126 @@ +--- vifm-pkgbuild/src/vifm-0.5/src/visual.c ++++ vifm/src/visual.c +@@ -229,7 +229,7 @@ + /* tbrown */ + case 2: /* ascii Ctrl B */ + case KEY_PPAGE: +- while (view->list_pos > (view->top_line - view->window_rows -1)) ++ while (view->list_pos > (view->top_line - view->window_rows -1) && view->list_pos) + { + select_up_one(view,start_pos); + } +--- vifm-pkgbuild/src/vifm-0.5/src/ui.h ++++ vifm/src/ui.h +@@ -57,7 +57,7 @@ + typedef struct + { + char *name; +- uintmax_t size; ++ off_t size; + mode_t mode; + uid_t uid; + gid_t gid; +--- vifm-pkgbuild/src/vifm-0.5/src/ui.c ++++ vifm/src/ui.c +@@ -181,9 +181,9 @@ + werase(lborder); + + if (curr_stats.number_of_windows == 1) +- lwin.title = newwin(0, screen_x -2, 0, 1); +- else +- lwin.title = newwin(0, screen_x/2 -1, 0, 1); ++ lwin.title = newwin(1, screen_x -2, 0, 1); ++ else ++ lwin.title = newwin(1, screen_x/2 -1, 0, 1); + + wattrset(lwin.title, A_BOLD); + wbkgdset(lwin.title, COLOR_PAIR(BORDER_COLOR)); +@@ -211,7 +211,7 @@ + werase(mborder); + + if (curr_stats.number_of_windows == 1) +- rwin.title = newwin(0, screen_x -2 , 0, 1); ++ rwin.title = newwin(1, screen_x -2 , 0, 1); + else + rwin.title = newwin(1, screen_x/2 -1 , 0, screen_x/2 +1); + +@@ -224,7 +224,7 @@ + if (curr_stats.number_of_windows == 1) + rwin.win = newwin(screen_y - 3, screen_x -2 , 1, 1); + else +- rwin.win = newwin(screen_y - 3, screen_x/2 -2 , 1, screen_x/2 +1); ++ rwin.win = newwin(screen_y - 3, screen_x/2 -1 , 1, screen_x/2 +1); + + keypad(rwin.win, TRUE); + wattrset(rwin.win, A_BOLD); +--- vifm-pkgbuild/src/vifm-0.5/src/filelist.c ++++ vifm/src/filelist.c +@@ -54,7 +54,7 @@ + int u = 0; + double d = num; + +- while(d > 1024.0 && u < (sizeof(units)/sizeof(*units))) ++ while(d >= 1024.0 && u < (sizeof(units)/sizeof(*units))) + { + d /= 1024.0; + ++u; +--- vifm-pkgbuild/src/vifm-0.5/src/file_info.c ++++ vifm/src/file_info.c +@@ -34,21 +34,36 @@ + #include "menus.h" + #include "status.h" + ++/* ++#ifndef OFF_T_MAX ++# define OFF_T_MAX TYPE_MAXIMUM(off_t) ++#endif ++ ++#ifndef OFF_T_MIN ++# define OFF_T_MIN TYPE_MINIMUM(off_t) ++#endif ++ ++uintmax_t ++unsigned_file_size(off_t size) ++{ ++ return size + (size < 0) * ((uintmax_t) OFF_T_MAX - OFF_T_MIN + 1); ++} ++*/ + + void +-describe_file_size (char* str, int str_size, int num) ++describe_file_size (char* str, int str_size, off_t num) + { + + const char* units[] = { " B", "KB", "MB", "GB", "TB", "PB" }; + int u = 0; +- double d = num; +- +- while(d > 1024.0 && u < (sizeof(units)/sizeof(*units))) +- { +- d /= 1024.0; ++ off_t d = num; ++ ++ while(d >= 1024.0 && u < 6) ++ { ++ d = (d / 1024); + ++u; + } +- snprintf(str, str_size, " %.1f %s", d, units[u]); ++ snprintf(str, str_size, " %zu %s", d, units[u]); + } + + void +--- vifm-pkgbuild/src/vifm-0.5/src/commands.c ++++ vifm/src/commands.c +@@ -504,9 +504,9 @@ + show_error_msg("Memory Error", "Unable to allocate memory"); + return NULL; + } +- strcat(expanded, "\""); ++ strcat(expanded, "\'"); + strcat(expanded, other_view->curr_dir); +- strcat(expanded, "\""); ++ strcat(expanded, "\'"); + len = strlen(expanded); + } + break; diff --git a/community/widelands/PKGBUILD b/community/widelands/PKGBUILD index a461e2041..31b9a3139 100644 --- a/community/widelands/PKGBUILD +++ b/community/widelands/PKGBUILD @@ -1,32 +1,30 @@ -# $Id: PKGBUILD 23368 2010-08-10 09:00:13Z lcarlier $ +# $Id: PKGBUILD 44278 2011-04-05 06:00:24Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Arkham <arkham at archlinux dot us> # Contributor: Christoph Zeiler <rabyte*gmail> pkgname=widelands -pkgver=15 -_realver=build15 -pkgrel=3 +pkgver=16rc1 +_realver=build16-rc1 +_brokenver=build16-rc2 # How could they fuck this up!? +pkgrel=1 pkgdesc="A realtime strategy game with emphasis on economy and transport" arch=('i686' 'x86_64') url="http://widelands.org/" license=('GPL') -depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua') +depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'ggz-client-libs' 'lua' 'glew' 'python2') makedepends=('cmake' 'boost') -source=(http://launchpad.net/$pkgname/build15/$_realver/+download/$pkgname-$_realver-src.tar.bz2 - widelands-build15-gcc-4.5-patch +source=(http://launchpad.net/$pkgname/build16/$_realver/+download/$pkgname-$_realver-src.tar.bz2 $pkgname.desktop $pkgname.png $pkgname.sh) -md5sums=('5b2e2d0913272f66055e424f91360b1d' - '61fbc78aeb3c177a76264f255b435c77' +md5sums=('dde77c66156ad522877616df165d5c6a' '15820bf099fd6f16251fe70a75c534bb' '3dfda7e9ca76ca00dd98d745d0ceb328' '7cae50aba5ed0cd2cfeea79124637b46') build() { - cd $srcdir/$pkgname-$_realver-src - patch -Np1 -i ../widelands-build15-gcc-4.5-patch + cd $srcdir/$pkgname-$_brokenver-src mkdir -p build/compile && cd build/compile @@ -39,7 +37,7 @@ build() { } package() { - cd $srcdir/$pkgname-$_realver-src/build/compile + cd $srcdir/$pkgname-$_brokenver-src/build/compile make DESTDIR="$pkgdir" install diff --git a/core/tzdata/PKGBUILD b/core/tzdata/PKGBUILD index 2815732c9..631c3f3b5 100644 --- a/core/tzdata/PKGBUILD +++ b/core/tzdata/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 114729 2011-03-15 19:46:03Z andyrtr $ +# $Id: PKGBUILD 117841 2011-04-04 18:27:28Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=tzdata -pkgver=2011d +pkgver=2011e pkgrel=1 -_tzcode=2011d -_tzdata=2011d +_tzcode=2011e +_tzdata=2011e pkgdesc="Sources for time zone and daylight saving time data" arch=('i686' 'x86_64') url="http://www.twinsun.com/tz/tz-link.htm" @@ -17,8 +17,8 @@ options=('!emptydirs') source=(ftp://elsie.nci.nih.gov/pub/tzcode${_tzcode}.tar.gz \ ftp://elsie.nci.nih.gov/pub/${pkgname}${_tzdata}.tar.gz \ Makefile.patch) -md5sums=('95095242ee368e6a7e107f154590ac11' - '03c5793502b7c41985edd73146bf7e36' +md5sums=('fbfc05dbf9ebcfe7c4bba18549870173' + '044a07072300a0ee72b046e5a9a4ec90' 'a64ed97d1fc03c66ee8612c0d9f40507') build() { diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index 5f64aaaa7..56cf91437 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 109960 2011-02-14 14:00:15Z tpowa $ +# $Id: PKGBUILD 118043 2011-04-05 07:31:37Z jgc $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> @@ -14,7 +14,7 @@ groups=('base') # older initscripts versions required start_udev options=(!makeflags !libtool) makedepends=('glibc' 'coreutils' 'util-linux' 'pciutils' 'libusb-compat' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection') -source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2 +source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2 80-drivers.rules 81-arch.rules load-modules.sh @@ -26,7 +26,7 @@ md5sums=('4db27d73fdbe94f47fd89fdd105c2dfb' '2e808ee78d237c478b57af2a68d43769') build() { - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgbase-$pkgver ./configure --sysconfdir=/etc --with-rootlibdir=/lib --libexecdir=/lib/udev\ --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system make @@ -42,7 +42,7 @@ package_udev() { conflicts=('pcmcia-cs' 'hotplug' 'initscripts<2009.07') replaces=('devfsd') - cd $srcdir/$pkgname-$pkgver + cd $srcdir/$pkgbase-$pkgver make DESTDIR=${pkgdir} install # Replace original 80-drivers.rules with custom one. install -D -m644 $srcdir/80-drivers.rules $pkgdir/lib/udev/rules.d/80-drivers.rules @@ -106,7 +106,7 @@ package_udev-compat() { pkgdesc="The userspace dev tools (udev) - additional rules for older kernels" depends=('udev') groups=('') - cd $srcdir/$pkgname-$pkgver - install -d -m755 ${pkgdir}/lib/${pkgname}/rules.d - install -D -m644 ${srcdir}/${pkgname}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules + cd $srcdir/$pkgbase-$pkgver + install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d + install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules } diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD index cc9bf71af..53c319592 100644 --- a/extra/avahi/PKGBUILD +++ b/extra/avahi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113561 2011-03-09 18:23:43Z bisson $ +# $Id: PKGBUILD 118159 2011-04-05 16:56:06Z bisson $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=avahi -pkgver=0.6.29 +pkgver=0.6.30 pkgrel=1 pkgdesc='A multicast/unicast DNS-SD framework' arch=('i686' 'x86_64') @@ -29,7 +29,7 @@ options=('!libtool') source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz avahi-daemon-dbus.patch gnome-nettool.png) -sha1sums=('af13ae6fdb3cd61b2eafa25a108773156d88b362' +sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06' '41e9f23efa0b5a5f7b0f14a86cfb0677ece84c61' 'cf56387c88aed246b9f435efc182ef44de4d52f3') @@ -41,6 +41,7 @@ build() { # pygtk requires python2; make it explicit in case other python are installed: FS#21865 PYTHON=python2 \ + PKG_CONFIG_PATH=/opt/qt/lib/pkgconfig \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD index 852ac5af2..df465a5ac 100644 --- a/extra/lirc/PKGBUILD +++ b/extra/lirc/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 117640 2011-04-04 14:38:36Z jgc $ +# $Id: PKGBUILD 118055 2011-04-05 07:55:00Z jgc $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgbase=lirc pkgname=('lirc' 'lirc-utils') pkgver=0.9.0 pkgrel=1 +epoch=1 _kernver=2.6.37-ARCH arch=('i686' 'x86_64') url="http://www.lirc.org/" diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD index 175b2eee5..dac3886c4 100644 --- a/extra/mysql/PKGBUILD +++ b/extra/mysql/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 115418 2011-03-17 21:33:02Z andrea $ +# $Id: PKGBUILD 118056 2011-04-05 09:37:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgbase=mysql pkgname=('libmysqlclient' 'mysql-clients' 'mysql') -pkgver=5.5.10 -pkgrel=2 +pkgver=5.5.11 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL') url="http://www.mysql.com/" @@ -14,20 +14,12 @@ makedepends=('cmake' 'openssl' 'tcp_wrappers' 'zlib') options=('!libtool') source=("http://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQL-5.5/${pkgbase}-${pkgver}.tar.gz" 'mysqld' - 'my.cnf' - 'fix-mysql-home.patch' - 'fix-embedded-crash.patch') -md5sums=('ee604aff531ff85abeb10cf332c1355a' + 'my.cnf') +md5sums=('befa4e0d0aa95be6c8f6f143ae3b0641' '2234207625baa29b2ff7d7b4f088abce' - '1c949c0dbea5206af0db14942d9927b6' - '56fe8b724ca7ae73b9f96cdf4cca1220' - 'b2b7ed0289a6d8cce17a68512c0286cc') + '1c949c0dbea5206af0db14942d9927b6') build() { - cd "${srcdir}"/${pkgbase}-${pkgver} - patch -Np1 -i ${srcdir}/fix-mysql-home.patch - patch -Np1 -i ${srcdir}/fix-embedded-crash.patch - cd "${srcdir}" mkdir build cd build diff --git a/gnome-unstable/accountsservice/PKGBUILD b/gnome-unstable/accountsservice/PKGBUILD index 8f40e7405..237c3ca39 100644 --- a/gnome-unstable/accountsservice/PKGBUILD +++ b/gnome-unstable/accountsservice/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 115733 2011-03-20 21:02:51Z ibiru $ +# $Id: PKGBUILD 118186 2011-04-05 19:20:06Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=accountsservice -pkgver=0.6.6 +pkgver=0.6.8 pkgrel=1 pkgdesc="D-Bus interface for user account query and manipulation" arch=(i686 x86_64) @@ -11,13 +11,14 @@ depends=('dbus-glib' 'polkit') makedepends=('intltool' 'gobject-introspection') options=('!libtool') source=(http://cgit.freedesktop.org/accountsservice/snapshot/${pkgname}-${pkgver}.tar.bz2) -md5sums=('15ce9d4f6157d0bc4e4b4565b1deddca') +md5sums=('beeece0cb3a0eb88f551ad5e37accf8f') build() { cd "$srcdir/$pkgname-$pkgver" ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/accountsservice \ + --with-systemdsystemunitdir=/lib/systemd/system \ --localstatedir=/var --disable-static make } diff --git a/gnome-unstable/at-spi2-atk/PKGBUILD b/gnome-unstable/at-spi2-atk/PKGBUILD index 22c6cba3e..64c56d592 100644 --- a/gnome-unstable/at-spi2-atk/PKGBUILD +++ b/gnome-unstable/at-spi2-atk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 116857 2011-03-25 22:44:20Z heftig $ +# $Id: PKGBUILD 117977 2011-04-05 06:31:48Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-atk -pkgver=1.91.93 +pkgver=2.0.0 pkgrel=1 pkgdesc="A GTK+ module that bridges ATK to D-Bus at-spi" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ makedepends=('intltool') install=at-spi2-atk.install options=('!libtool') groups=('gnome') -source=(http://download.gnome.org/sources/${pkgname}/1.91/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('9b9afc7631f780748fedd22f5b3980b611ffe55f7e177952452c322e131e8fa7') +source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('1c846f1ef11485c49af8eb3850ee379ea5e775a1fc981c99291e6f5d110acc52') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/at-spi2-core/PKGBUILD b/gnome-unstable/at-spi2-core/PKGBUILD index 3c08b0155..2151c5a6c 100644 --- a/gnome-unstable/at-spi2-core/PKGBUILD +++ b/gnome-unstable/at-spi2-core/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 116855 2011-03-25 22:44:04Z heftig $ +# $Id: PKGBUILD 117972 2011-04-05 06:30:35Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=at-spi2-core -pkgver=1.91.93 +pkgver=2.0.0 pkgrel=1 pkgdesc="Protocol definitions and daemon for D-Bus at-spi" arch=('i686' 'x86_64') @@ -11,8 +11,8 @@ depends=('dbus-core' 'glib2' 'libxtst') makedepends=('intltool' 'gobject-introspection') options=('!libtool') groups=('gnome') -source=(http://download.gnome.org/sources/${pkgname}/1.91/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('e06fa4e17ebafb203126051000d2274f1ccaa7e04bff248f4524ac2411b29582') +source=(http://download.gnome.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('29bff48785301653ba8899978169f803370bc4b29f160db82d6a4410c4624389') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/atk/PKGBUILD b/gnome-unstable/atk/PKGBUILD index 65fdf0298..ab3e4aeb7 100644 --- a/gnome-unstable/atk/PKGBUILD +++ b/gnome-unstable/atk/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 109673 2011-02-11 18:32:19Z heftig $ +# $Id: PKGBUILD 118010 2011-04-05 06:45:40Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=atk -pkgver=1.33.6 +pkgver=2.0.0 pkgrel=1 pkgdesc="A library providing a set of interfaces for accessibility" arch=(i686 x86_64) @@ -11,7 +11,7 @@ makedepends=('pkgconfig' 'gobject-introspection') options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) url='http://www.gtk.org/' -sha256sums=('e61c9a7bb2605a6ba698285f5593590c90818592f3d122101b9d42697fd2b0b6') +sha256sums=('5dbdc35f7f5b3f0748039bb3faa7cd5e45ec3d337a539772bc73acd0dfb55afd') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/avahi/PKGBUILD b/gnome-unstable/avahi/PKGBUILD index 91634de32..2cd51fe07 100644 --- a/gnome-unstable/avahi/PKGBUILD +++ b/gnome-unstable/avahi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 113566 2011-03-09 18:25:47Z bisson $ +# $Id: PKGBUILD 118164 2011-04-05 16:57:59Z bisson $ # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=avahi -pkgver=0.6.29 +pkgver=0.6.30 pkgrel=2 pkgdesc='A multicast/unicast DNS-SD framework' arch=('i686' 'x86_64') @@ -30,7 +30,7 @@ options=('!libtool') source=(http://www.avahi.org/download/avahi-${pkgver}.tar.gz avahi-daemon-dbus.patch gnome-nettool.png) -sha1sums=('af13ae6fdb3cd61b2eafa25a108773156d88b362' +sha1sums=('5b77443537600a00770e4c77e3c443eeb5861d06' '41e9f23efa0b5a5f7b0f14a86cfb0677ece84c61' 'cf56387c88aed246b9f435efc182ef44de4d52f3') diff --git a/gnome-unstable/brasero/PKGBUILD b/gnome-unstable/brasero/PKGBUILD index 943a02bbc..f3d87e97e 100644 --- a/gnome-unstable/brasero/PKGBUILD +++ b/gnome-unstable/brasero/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 116730 2011-03-25 15:33:26Z ibiru $ +# $Id: PKGBUILD 117967 2011-04-05 06:28:22Z heftig $ # Maintainer: Allan McRae <allan@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=brasero -pkgver=2.91.93 +pkgver=3.0.0 pkgrel=1 pkgdesc="A disc burning application for Gnome" arch=('i686' 'x86_64') url="http://www.gnome.org/projects/brasero" license=('GPL') options=('!libtool' '!emptydirs') -depends=('gstreamer0.10-base-plugins' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info' 'libcanberra' 'dvd+rw-tools' 'dconf') +depends=('gtk3' 'gstreamer0.10-base-plugins' 'totem-plparser' 'cdrkit' 'cdrdao' 'desktop-file-utils' 'hicolor-icon-theme' 'shared-mime-info' 'libcanberra' 'dvd+rw-tools' 'dconf' 'libsm') makedepends=('gtk-doc' 'intltool' 'libburn' 'libisofs' 'nautilus' 'gobject-introspection' 'gconf') optdepends=('libburn: alternative back-end' 'libisofs: libburn back-end' @@ -21,7 +21,7 @@ optdepends=('libburn: alternative back-end' replaces=('nautilus-cd-burner') install=brasero.install source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('911c86a8ebba240881fbb7e1f125e4c1400c7b655ee4f2f9fa1a1227e05af5fc') +sha256sums=('aff1e900d6c68096e43a80443c8c367374fb980986d2f823d229606605a410e3') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/cheese/PKGBUILD b/gnome-unstable/cheese/PKGBUILD index b7dfeffed..ef3354084 100644 --- a/gnome-unstable/cheese/PKGBUILD +++ b/gnome-unstable/cheese/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 116759 2011-03-25 20:26:22Z ibiru $ +# $Id: PKGBUILD 117987 2011-04-05 06:35:35Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=cheese -pkgver=2.91.93 +pkgver=3.0.0 pkgrel=1 pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others" arch=(i686 x86_64) @@ -14,8 +14,8 @@ groups=('gnome-extra') options=('!libtool' '!emptydirs') url="http://www.gnome.org/projects/cheese/" install=cheese.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.91/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('f956ec749d26e1f9594ebe3d056d9fd046dd5181718b03d87513a9ab01baa6a0') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('006df646d7141d455b95621fe99ef351aa88754239d28a27b2f57887449a8746') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/clutter-gst/PKGBUILD b/gnome-unstable/clutter-gst/PKGBUILD index 4499ca632..76dc16593 100644 --- a/gnome-unstable/clutter-gst/PKGBUILD +++ b/gnome-unstable/clutter-gst/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 109705 2011-02-11 20:56:09Z heftig $ +# $Id: PKGBUILD 118181 2011-04-05 18:32:42Z ibiru $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> pkgname=clutter-gst -pkgver=1.0.0 +pkgver=1.3.8 pkgrel=1 pkgdesc="GStreamer bindings for clutter" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ depends=('clutter' 'gstreamer0.10-base') makedepends=('gobject-introspection' 'gtk-doc') options=('!libtool') source=(http://clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -sha256sums=('ae6ec048b570157130e9f9069f2495caf0da9eefa8d7f3b1789f3346fb16f696') +sha256sums=('376c069bed2a6b374d96615b7196cb5f6ee4bbbd94243f92b64dee3ec56aec28') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/gnome-unstable/clutter-gtk/PKGBUILD b/gnome-unstable/clutter-gtk/PKGBUILD index e3664f0ab..becd8d5c6 100644 --- a/gnome-unstable/clutter-gtk/PKGBUILD +++ b/gnome-unstable/clutter-gtk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 109702 2011-02-11 20:46:33Z heftig $ +# $Id: PKGBUILD 118087 2011-04-05 12:00:37Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=clutter-gtk -pkgver=0.91.8 +pkgver=1.0.0 pkgrel=1 pkgdesc="GTK clutter widget" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('LGPL') depends=('clutter' 'gtk3') makedepends=('gobject-introspection' 'gtk-doc') source=(http://www.clutter-project.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('1516ac98b9f0436d7806f02153810fae31f961446311e06805f574ac1aaa969e') +sha256sums=('5d395218e30e2971dbf9ca69e564036e6b6316e2d995b93fef11c0195f136cdb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/clutter/PKGBUILD b/gnome-unstable/clutter/PKGBUILD index 03a2e3994..f42b91829 100644 --- a/gnome-unstable/clutter/PKGBUILD +++ b/gnome-unstable/clutter/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 117665 2011-04-04 15:15:13Z ibiru $ +# $Id: PKGBUILD 118176 2011-04-05 18:06:09Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=clutter -pkgver=1.6.12 +pkgver=1.6.14 pkgrel=1 pkgdesc="A GObject based library for creating fast, visually rich graphical user interfaces" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ license=('LGPL') depends=('gdk-pixbuf2' 'json-glib' 'atk' 'pango' 'mesa' 'libxcomposite' 'libxi') makedepends=('gobject-introspection' 'gtk-doc') source=(http://www.clutter-project.org/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('21c3eb0633f839a223192dbc26aaf924bed98caad302ee0bb3ee2b067d09462d') +sha256sums=('0564e57ca8eb24e76014627c0bb28a80a6c01b620ba14bc4198365562549576d') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/dconf/PKGBUILD b/gnome-unstable/dconf/PKGBUILD index 89972bfb7..e650eba4c 100644 --- a/gnome-unstable/dconf/PKGBUILD +++ b/gnome-unstable/dconf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 116096 2011-03-22 18:35:51Z ibiru $ +# $Id: PKGBUILD 118171 2011-04-05 17:33:39Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=dconf pkgver=0.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="A low-level configuration system." arch=(i686 x86_64) url="http://live.gnome.org/dconf" @@ -11,12 +11,15 @@ depends=('glib2') makedepends=('vala' 'gobject-introspection' 'gtk3') optdepends=('gtk3: for dconf-editor') install=dconf.install -source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('84efc95cb62b6637b2131e110ff447908be739c2185d69bebb300293b561dfd9') +source=(http://download.gnome.org/sources/${pkgname}/0.7/${pkgname}-${pkgver}.tar.bz2 + load-enum.patch) +sha256sums=('84efc95cb62b6637b2131e110ff447908be739c2185d69bebb300293b561dfd9' + '8ead56b2897b18c97b9b72b81bd6e9f9249e28743b05a2653bbf4e6af7d9f7cc') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/load-enum.patch" ./configure --prefix=/usr \ --libexecdir=/usr/lib/dconf make diff --git a/gnome-unstable/dconf/load-enum.patch b/gnome-unstable/dconf/load-enum.patch new file mode 100644 index 000000000..949de1e00 --- /dev/null +++ b/gnome-unstable/dconf/load-enum.patch @@ -0,0 +1,22 @@ +From 0d00a6ad3385e08eff0c50efe970af8d5d63c536 Mon Sep 17 00:00:00 2001 +From: Robert Ancell <robert.ancell@canonical.com> +Date: Tue, 29 Mar 2011 05:50:12 +0000 +Subject: editor: Load *.enums.xml as well as *.gschema.xml. This was stopping some enums from being loaded. + +Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=636880 +--- +diff --git a/editor/dconf-schema.vala b/editor/dconf-schema.vala +index 2b34e28..c2654b5 100644 +--- a/editor/dconf-schema.vala ++++ b/editor/dconf-schema.vala +@@ -371,7 +371,7 @@ public class SchemaList + while ((info = i.next_file (null)) != null) { + string name = info.get_name(); + +- if (!name.has_suffix(".gschema.xml")) ++ if (!name.has_suffix(".gschema.xml") && !name.has_suffix(".enums.xml")) + continue; + + string path = Path.build_filename(dir, name, null); +-- +cgit v0.9 diff --git a/gnome-unstable/eog/PKGBUILD b/gnome-unstable/eog/PKGBUILD index 6a0c31433..83d6f0204 100644 --- a/gnome-unstable/eog/PKGBUILD +++ b/gnome-unstable/eog/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 116238 2011-03-22 20:34:48Z heftig $ +# $Id: PKGBUILD 117962 2011-04-05 06:26:50Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=eog -pkgver=2.91.92 +pkgver=3.0.0 pkgrel=1 pkgdesc="Eye of Gnome: An image viewing and cataloging program" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ groups=('gnome-extra') options=('!emptydirs' '!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('047119ac7152037acec3090f710e4a6f21e55103030805c44da6a46dcb275934') +sha256sums=('785ee969dbd17c52b2b18c42464247703fa9511d84381e88c81830d7ac7f24a7') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/epiphany/PKGBUILD b/gnome-unstable/epiphany/PKGBUILD index 025ee5a82..1ad8e9631 100644 --- a/gnome-unstable/epiphany/PKGBUILD +++ b/gnome-unstable/epiphany/PKGBUILD @@ -1,20 +1,22 @@ -# $Id: PKGBUILD 116342 2011-03-22 22:23:16Z ibiru $ +# $Id: PKGBUILD 117992 2011-04-05 06:37:18Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=epiphany -pkgver=2.91.92 +pkgver=3.0.0 pkgrel=1 install=epiphany.install pkgdesc="A GNOME3 web browser based on the WebKit rendering engine." arch=('i686' 'x86_64') license=('GPL') -depends=('libsoup-gnome' 'gsettings-desktop-schemas' 'libwebkit3' 'nss' 'iso-codes' 'dconf' 'gobject-introspection') +depends=('libsoup-gnome' 'gsettings-desktop-schemas' 'libwebkit3' 'nss' + 'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils' + 'hicolor-icon-theme') makedepends=('intltool' 'networkmanager' 'gnome-doc-utils' 'startup-notification') options=('!libtool' '!emptydirs') groups=('gnome') url="http://www.gnome.org/projects/epiphany/" -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.91/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('16bfb56af1723db458aa3c9942218480407ed199e78dbba33af483bcf417db1c') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('9407220e21e95008b0c5b0a0383d1bdc56a932c40a4486ea4f996ba47eeae7bb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/glibmm/PKGBUILD b/gnome-unstable/glibmm/PKGBUILD index 89dc095e1..989a02410 100644 --- a/gnome-unstable/glibmm/PKGBUILD +++ b/gnome-unstable/glibmm/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 116649 2011-03-24 13:45:12Z ibiru $ +# $Id: PKGBUILD 118216 2011-04-05 22:43:03Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase=glibmm pkgname=('glibmm' 'glibmm-docs') -pkgver=2.27.99 -pkgrel=1 +pkgver=2.28.0 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL') makedepends=('glib2' 'libsigc++2.0' 'pkgconfig' 'mm-common') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.27/${pkgname}-${pkgver}.tar.bz2) +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) options=('!libtool') url="http://gtkmm.sourceforge.net/" -sha256sums=('d079bb42fa378dc88a9e964274b05f222d243b44eaaa85a04893a9bb85459194') +sha256sums=('b1b99868896b028354141e3b2470d98799283e90154550e12614f692db17a5a3') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -24,12 +24,12 @@ package_glibmm() { pkgdesc="Glib-- (glibmm) is a C++ interface for glib" depends=('glib2' 'libsigc++2.0') cd "${srcdir}/${pkgbase}-${pkgver}" -# sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile + sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile make DESTDIR="${pkgdir}" install } package_glibmm-docs() { pkgdesc="Developer documentation for glibmm" cd "${srcdir}/${pkgbase}-${pkgver}/docs" - # make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" install } diff --git a/gnome-unstable/gnome-control-center/PKGBUILD b/gnome-unstable/gnome-control-center/PKGBUILD index 3666cefdd..3480f0f2b 100644 --- a/gnome-unstable/gnome-control-center/PKGBUILD +++ b/gnome-unstable/gnome-control-center/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117166 2011-03-29 05:52:41Z heftig $ +# $Id: PKGBUILD 118137 2011-04-05 13:11:44Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center -pkgver=2.91.93 +pkgver=3.0.0 pkgrel=1 pkgdesc="The Control Center for GNOME" arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ groups=('gnome') install=gnome-control-center.install license=('GPL') options=('!libtool' '!emptydirs') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.91/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('e98b3377bccfaebc34ae018d9f80be23f809c0911f18a99fa08d4b6d3918d7f0') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.0/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('a6ae1b58f639b3df20464bfb4e64616815c85514ff7e7e748b213a2a4e2ab87b') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -33,4 +33,3 @@ package() { gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gnome-control-center-2.0 ${pkgdir}/etc/gconf/schemas/*.schemas rm -f ${pkgdir}/etc/gconf/schemas/*.schemas } -sha256sums=('c95d041cab41b6ea954ae7bc46087d763c9f259b700486381bff9046d59276df') diff --git a/gnome-unstable/gnome-panel/PKGBUILD b/gnome-unstable/gnome-panel/PKGBUILD index 982e23bdf..9478eac96 100644 --- a/gnome-unstable/gnome-panel/PKGBUILD +++ b/gnome-unstable/gnome-panel/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 117392 2011-04-01 13:09:57Z heftig $ +# $Id: PKGBUILD 117997 2011-04-05 06:40:59Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnome-panel -pkgver=2.91.94 +pkgver=3.0.0 pkgrel=1 arch=('i686' 'x86_64') license=('GPL') @@ -14,7 +14,7 @@ install=gnome-panel.install groups=('gnome') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('74681f4f422ec8c6390b7b675681b59630a7936ed36965227687f8ee0db4ca4d') +sha256sums=('8259828333cda1c9a4ee01cb0290474dc2eb0aea9020690285b23e6ddc2669cf') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/gnome-shell/646333.patch b/gnome-unstable/gnome-shell/646333.patch new file mode 100644 index 000000000..fb2a817a3 --- /dev/null +++ b/gnome-unstable/gnome-shell/646333.patch @@ -0,0 +1,25 @@ +From cbb8bdd48f2b05f8718448b596c4c2da2f34e54b Mon Sep 17 00:00:00 2001 +From: Maxim Ermilov <zaspire@rambler.ru> +Date: Tue, 5 Apr 2011 05:20:44 +0400 +Subject: [PATCH] extensionSystem: add missing import + +https://bugzilla.gnome.org/show_bug.cgi?id=646333 +--- + js/ui/extensionSystem.js | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js +index eb82bc3..9dd3a47 100644 +--- a/js/ui/extensionSystem.js ++++ b/js/ui/extensionSystem.js +@@ -3,6 +3,7 @@ + const GLib = imports.gi.GLib; + const Gio = imports.gi.Gio; + const St = imports.gi.St; ++const Shell = imports.gi.Shell; + + const Config = imports.misc.config; + +-- +1.7.4.2 + diff --git a/gnome-unstable/gnome-shell/PKGBUILD b/gnome-unstable/gnome-shell/PKGBUILD index 7f585dbeb..1c26ea8df 100644 --- a/gnome-unstable/gnome-shell/PKGBUILD +++ b/gnome-unstable/gnome-shell/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 117935 2011-04-04 21:51:01Z heftig $ +# $Id: PKGBUILD 118211 2011-04-05 22:11:23Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Flamelab <panosfilip@gmail.com pkgname=gnome-shell -pkgver=3.0.0 -pkgrel=1 +pkgver=3.0.0.1 +pkgrel=2 pkgdesc="The next generation GNOME Shell" arch=('i686' 'x86_64') url="http://live.gnome.org/GnomeShell" @@ -15,11 +15,17 @@ makedepends=('intltool' 'gnome-doc-utils') options=('!libtool' '!emptydirs') install=gnome-shell.install groups=(gnome) -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -sha256sums=('3036f9e2b738fef4fd457b6d1ddf78d68d7a56235072a19168ae643a164b1a2f') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*.*}/$pkgname-$pkgver.tar.bz2 + 646333.patch) +sha256sums=('468eaee2a4b43e425e53c12f6ea98f834ad7b3c8b7d8cf493c65b4a67f82be33' + '42fd08d1ca81c8bcc2848f301463b2c7b28299e8b3a508d2a3f24cb5a9bba3ed') build() { cd "${srcdir}/${pkgname}-${pkgver}" + + # https://bugzilla.gnome.org/show_bug.cgi?id=646333 + patch -Np1 -i "$srcdir/646333.patch" + ./configure --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/gnome-shell \ --localstatedir=/var --disable-static \ diff --git a/gnome-unstable/metacity/PKGBUILD b/gnome-unstable/metacity/PKGBUILD new file mode 100644 index 000000000..14e5d12a0 --- /dev/null +++ b/gnome-unstable/metacity/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 118084 2011-04-05 11:18:53Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=metacity +pkgver=2.34.0 +pkgrel=1 +pkgdesc="A window manager for GNOME2" +arch=(i686 x86_64) +license=('GPL') +depends=('startup-notification' 'gconf' 'zenity' 'libcanberra' 'libgtop' 'libwnck' 'libsm') +makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils' 'gnome-common') +url="http://www.gnome.org" +groups=('gnome') +options=('!libtool' '!emptydirs') +install=metacity.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('e316beff76658c98e21ddf4e7eaba12cd761b35002dc38701441db6740a6d698') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --libexecdir=/usr/lib/metacity \ + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain metacity ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/gnome-unstable/metacity/metacity.install b/gnome-unstable/metacity/metacity.install new file mode 100644 index 000000000..2eb1e5094 --- /dev/null +++ b/gnome-unstable/metacity/metacity.install @@ -0,0 +1,17 @@ +pkgname=metacity + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} diff --git a/gnome-unstable/network-manager-applet/PKGBUILD b/gnome-unstable/network-manager-applet/PKGBUILD index 63c5c1e17..6e45943c9 100644 --- a/gnome-unstable/network-manager-applet/PKGBUILD +++ b/gnome-unstable/network-manager-applet/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 115713 2011-03-19 18:39:08Z heftig $ +# $Id: PKGBUILD 118020 2011-04-05 06:52:04Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@archlinux.org> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -6,7 +6,7 @@ # Contributor: Will Rea <sillywilly@gmail.com> pkgname=network-manager-applet -pkgver=0.8.997 +pkgver=0.8.998 pkgrel=1 pkgdesc="GNOME frontends to NetWorkmanager" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ optdepends=('gnome-bluetooth: for PAN/DUN support') options=('!libtool') install=network-manager-applet.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -sha256sums=('ff41efbea99009f43b03415bfa0a384c8859c8bf5418a75f243f952abec2d2e8') +sha256sums=('0a16e2ae00312062d4cd140d811227b84ac69e7d9487f6a84810f3d461894a82') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/networkmanager-openvpn/PKGBUILD b/gnome-unstable/networkmanager-openvpn/PKGBUILD index 6727b1a3e..1d501ff0f 100644 --- a/gnome-unstable/networkmanager-openvpn/PKGBUILD +++ b/gnome-unstable/networkmanager-openvpn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 115745 2011-03-21 07:10:05Z heftig $ +# $Id: PKGBUILD 118022 2011-04-05 06:52:18Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-openvpn -pkgver=0.8.995 -pkgrel=2 +pkgver=0.8.998 +pkgrel=1 pkgdesc="NetworkManager VPN plugin for OpenVPN" arch=('i686' 'x86_64') license=('GPL') @@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') install=networkmanager-openvpn.install options=('!libtool') source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.8/NetworkManager-openvpn-${pkgver}.tar.bz2) -sha256sums=('571119ec3981de1a02991305fde5f519d16d45ed922bc53457a4e7a18ee31783') +sha256sums=('8c95cf23b5f6abc07f3b7383bb47a4be32d6232046b2a89d5259cc96e9c25d3c') build() { cd "${srcdir}/NetworkManager-openvpn-${pkgver}" diff --git a/gnome-unstable/networkmanager-pptp/PKGBUILD b/gnome-unstable/networkmanager-pptp/PKGBUILD index 85d508981..89f4012a4 100644 --- a/gnome-unstable/networkmanager-pptp/PKGBUILD +++ b/gnome-unstable/networkmanager-pptp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 115750 2011-03-21 11:16:32Z heftig $ +# $Id: PKGBUILD 118030 2011-04-05 06:53:52Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-pptp -pkgver=0.8.995 -pkgrel=2 +pkgver=0.8.998 +pkgrel=1 pkgdesc="NetworkManager VPN plugin for pptp " arch=('i686' 'x86_64') license=('GPL') @@ -14,7 +14,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-pptp.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.8/NetworkManager-pptp-${pkgver}.tar.bz2) -sha256sums=('2c47c039280af32e98669fba66affca65cae027bf1df51b2005e969e009ea12a') +sha256sums=('2cc2093dd2d81b0c4f82d44a8589f8c867c6b88ef0d8801631bd417f8480b9b9') build() { cd "${srcdir}/NetworkManager-pptp-${pkgver}" diff --git a/gnome-unstable/networkmanager-vpnc/PKGBUILD b/gnome-unstable/networkmanager-vpnc/PKGBUILD index 0e02cd37d..d655e0d51 100644 --- a/gnome-unstable/networkmanager-vpnc/PKGBUILD +++ b/gnome-unstable/networkmanager-vpnc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 115754 2011-03-21 11:16:56Z heftig $ +# $Id: PKGBUILD 118033 2011-04-05 06:54:12Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=networkmanager-vpnc -pkgver=0.8.996 -pkgrel=2 +pkgver=0.8.998 +pkgrel=1 pkgdesc="NetworkManager VPN plugin for vpnc" arch=('i686' 'x86_64') license=('GPL') @@ -15,7 +15,7 @@ optdepends=('network-manager-applet: GNOME frontends to NetWorkmanager') options=('!libtool') install=networkmanager-vpnc.install source=(http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.8/NetworkManager-vpnc-${pkgver}.tar.bz2) -sha256sums=('c74a5a59c4bf960081c6d1d6dfe3f0712cc697b8cccaa90a250241bb2fbc079d') +sha256sums=('996ae3b504ad49433955baa6467f828fd161a7fbe16c7080fdcab7f7c5b92fc6') build() { cd "${srcdir}/NetworkManager-vpnc-${pkgver}" diff --git a/gnome-unstable/networkmanager/PKGBUILD b/gnome-unstable/networkmanager/PKGBUILD index d752a7888..fb2c07498 100644 --- a/gnome-unstable/networkmanager/PKGBUILD +++ b/gnome-unstable/networkmanager/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 116378 2011-03-23 00:13:02Z heftig $ +# $Id: PKGBUILD 118015 2011-04-05 06:49:05Z heftig $ # Maintainer: Jan de Groot <jgc@archlinxu.org> # Contri-butor: Wael Nasreddine <gandalf@siemens-mobiles.org> # Contributor: Tor Krill <tor@krill.nu> @@ -6,8 +6,8 @@ # Contributor: Valentine Sinitsyn <e_val@inbox.ru> pkgname=networkmanager -pkgver=0.8.997 -pkgrel=2 +pkgver=0.8.998 +pkgrel=1 pkgdesc="Network Management daemon" arch=('i686' 'x86_64') license=('GPL') @@ -24,7 +24,7 @@ backup=('etc/NetworkManager/NetworkManager.conf') install=networkmanager.install source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.8/NetworkManager-${pkgver}.tar.bz2 NetworkManager.conf disable_set_hostname.patch) -sha256sums=('332cdd94f480099d23f39d56b3aee9925e435ffe91d088a9476d9b8b3586887a' +sha256sums=('239271e7cd93272776bb9297bfc5214ab910d3d9a7c1862b2625b90719014a82' '44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21' '1e4586991bc96ef004dc520c794047a336c54433e0bd4edc3879fb6e7ab0e553') diff --git a/gnome-unstable/tomboy/PKGBUILD b/gnome-unstable/tomboy/PKGBUILD new file mode 100644 index 000000000..51612dc2f --- /dev/null +++ b/gnome-unstable/tomboy/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 118031 2011-04-05 06:53:56Z ibiru $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=tomboy +pkgver=1.6.0 +pkgrel=1 +pkgdesc="Desktop note-taking application for Linux and Unix" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org/projects/tomboy/" +depends=('gtk2' 'gtkspell' 'ndesk-dbus-glib' 'mono-addins' 'gnome-sharp') +makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils') +options=('!libtool' '!emptydirs' '!makeflags') +groups=('gnome-extra') +install=tomboy.install +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/1.6/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('df68f0a087eaf582c408cf9915b7e6460bb020fcdea74b9bed63154d151108e5') + +build() { + export MONO_SHARED_DIR="${srcdir}/.wabi" + mkdir -p "${MONO_SHARED_DIR}" + + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc \ + --localstatedir=/var --disable-scrollkeeper \ + --disable-update-mimedb + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 install + + install -m755 -d "${pkgdir}/usr/share/gconf/schemas" + gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain tomboy ${pkgdir}/etc/gconf/schemas/*.schemas + rm -f ${pkgdir}/etc/gconf/schemas/*.schemas +} diff --git a/gnome-unstable/tomboy/tomboy.install b/gnome-unstable/tomboy/tomboy.install new file mode 100644 index 000000000..f8e2e4a07 --- /dev/null +++ b/gnome-unstable/tomboy/tomboy.install @@ -0,0 +1,25 @@ +pkgname=tomboy + +post_install() { + usr/sbin/gconfpkg --install ${pkgname} + + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-mime-database usr/share/mime +} + +pre_upgrade() { + pre_remove $1 +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + usr/sbin/gconfpkg --uninstall ${pkgname} +} + +post_remove() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-mime-database usr/share/mime +} diff --git a/gnome-unstable/yelp/PKGBUILD b/gnome-unstable/yelp/PKGBUILD index 4d9cd0b99..0f8306650 100644 --- a/gnome-unstable/yelp/PKGBUILD +++ b/gnome-unstable/yelp/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 116167 2011-03-22 19:52:13Z ibiru $ +# $Id: PKGBUILD 118005 2011-04-05 06:42:54Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=yelp -pkgver=2.91.92 +pkgver=3.0.0 pkgrel=1 pkgdesc="A help browser for GNOME" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ options=('!emptydirs' '!libtool') url="http://www.gnome.org" install=yelp.install source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -sha256sums=('228b6bba0702d2df831aca9ec90af52df7f15c6c94187fbb77b20a77074c9735') +sha256sums=('3061eb1ffba89d3724c4c80b9b1520de583fe032c2001ed2fcf455c0a5f3ffa1') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/zenity/PKGBUILD b/gnome-unstable/zenity/PKGBUILD index 9795e3ec0..65951d226 100644 --- a/gnome-unstable/zenity/PKGBUILD +++ b/gnome-unstable/zenity/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 111583 2011-02-27 19:39:54Z ibiru $ +# $Id: PKGBUILD 117982 2011-04-05 06:34:01Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=zenity -pkgver=2.91.90 +pkgver=3.0.0 pkgrel=1 pkgdesc="Display graphical dialog boxes from shell scripts" arch=(i686 x86_64) @@ -12,7 +12,7 @@ makedepends=('intltool' 'gtk-doc') groups=('gnome-extra') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('fb3b0d29ae7105170224c2400327f638fdf9789189c6167ecddc0c941fc9c996') +sha256sums=('b1965b6704e80665c551261b9895a06322aba3f9776f8e5dd8141c7e8aca5131') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/staging/kdeaccessibility/PKGBUILD b/staging/kdeaccessibility/PKGBUILD new file mode 100644 index 000000000..d342f92e5 --- /dev/null +++ b/staging/kdeaccessibility/PKGBUILD @@ -0,0 +1,98 @@ +# $Id: PKGBUILD 118070 2011-04-05 10:08:11Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdeaccessibility +pkgname=('kdeaccessibility-colorschemes' + 'kdeaccessibility-iconthemes' + 'kdeaccessibility-jovie' + 'kdeaccessibility-kaccessible' + 'kdeaccessibility-kmag' + 'kdeaccessibility-kmousetool' + 'kdeaccessibility-kmouth') +pkgver=4.6.2 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://accessibility.kde.org' +license=('GPL' 'FDL') +groups=('kde' 'kdeaccessibility') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime' + 'speech-dispatcher' 'docbook-xsl') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('5e8e92a312b2c995602a66cc775009839122053d') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Opentts=OFF + make +} + +package_kdeaccessibility-colorschemes() { + pkgdesc='KDE Accessibility color schemes' + cd $srcdir/build/ColorSchemes + make DESTDIR=$pkgdir install +} + +package_kdeaccessibility-iconthemes() { + pkgdesc='KDE Accessibility icon themes' + cd $srcdir/build/IconThemes + make DESTDIR=$pkgdir install +} + +package_kdeaccessibility-jovie() { + pkgdesc='A text to speech application' + depends=('kdebase-runtime' 'speech-dispatcher') + replaces=('kdeaccessibility-kttsd') + install='kdeaccessibility.install' + cd $srcdir/build/jovie + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/jovie + make DESTDIR=$pkgdir install +} + +package_kdeaccessibility-kaccessible() { + pkgdesc='Provides accessibility services like focus tracking and a screenreader' + depends=('kdebase-runtime' 'speech-dispatcher') + install='kdeaccessibility.install' + cd $srcdir/build/kaccessible + make DESTDIR=$pkgdir install +} + +package_kdeaccessibility-kmag() { + pkgdesc='Screen Magnifier' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kmag/" + install='kdeaccessibility.install' + cd $srcdir/build/kmag + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmag + make DESTDIR=$pkgdir install +} + +package_kdeaccessibility-kmousetool() { + pkgdesc='Clicks the mouse for you, reducing the effects of RSI' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kmousetool/" + install='kdeaccessibility.install' + cd $srcdir/build/kmousetool + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmousetool + make DESTDIR=$pkgdir install +} + +package_kdeaccessibility-kmouth() { + pkgdesc='Speech Synthesizer Frontend' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kmouth/" + install='kdeaccessibility.install' + cd $srcdir/build/kmouth + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmouth + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeaccessibility/kdeaccessibility.install b/staging/kdeaccessibility/kdeaccessibility.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeaccessibility/kdeaccessibility.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/kdeadmin/PKGBUILD b/staging/kdeadmin/PKGBUILD new file mode 100644 index 000000000..cef42cdd0 --- /dev/null +++ b/staging/kdeadmin/PKGBUILD @@ -0,0 +1,80 @@ +# $Id: PKGBUILD 118071 2011-04-05 10:08:14Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdeadmin +pkgname=('kdeadmin-kcron' + 'kdeadmin-ksystemlog' + 'kdeadmin-kuser' + 'kdeadmin-system-config-printer-kde') +pkgver=4.6.2 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeadmin') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python' + 'system-config-printer-common' 'python2-qt' 'docbook-xsl') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'syslog-path.patch') +sha1sums=('33d756b1cef42d272b617bfba400e9116b34f311' + '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') + +build() { + cd ${srcdir}/${pkgbase}-${pkgver} + patch -p1 -i ${srcdir}/syslog-path.patch + + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DBUILD_kpackage=OFF \ + -DBUILD_knetworkconf=OFF \ + -DBUILD_lilo-config=OFF \ + -DBUILD_strigi-analyzer=OFF + make +} + +package_kdeadmin-kcron() { + pkgdesc='Configure and schedule tasks' + depends=('kdelibs') + cd $srcdir/build/kcron + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcron + make DESTDIR=$pkgdir install +} + +package_kdeadmin-ksystemlog() { + pkgdesc='System log viewer tool' + depends=('kdebase-runtime') + url="http://kde.org/applications/system/ksystemlog/" + cd $srcdir/build/ksystemlog + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ksystemlog + make DESTDIR=$pkgdir install +} + +package_kdeadmin-kuser() { + pkgdesc='User Manager' + depends=('kdepim-runtime') + url="http://kde.org/applications/system/kuser/" + install='kdeadmin.install' + cd $srcdir/build/kuser + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kuser + make DESTDIR=$pkgdir install +} + +package_kdeadmin-system-config-printer-kde() { + pkgdesc='Configure local and remote Printers' + depends=('kdebindings-python' 'system-config-printer-common' 'python2-qt') + url="http://kde.org/applications/system/printerapplet/" + cd $srcdir/build/system-config-printer-kde + make DESTDIR=$pkgdir install + + # Use the python2 executable + find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' +} diff --git a/staging/kdeadmin/kdeadmin.install b/staging/kdeadmin/kdeadmin.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeadmin/kdeadmin.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/kdeadmin/syslog-path.patch b/staging/kdeadmin/syslog-path.patch new file mode 100644 index 000000000..8a9142bf6 --- /dev/null +++ b/staging/kdeadmin/syslog-path.patch @@ -0,0 +1,11 @@ +--- kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h~ 2011-01-27 14:24:29.840000005 +0100 ++++ kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h 2011-01-27 14:24:53.803333335 +0100 +@@ -39,7 +39,7 @@ + SystemConfiguration() : + GenericLogModeConfiguration( + QLatin1String( SYSTEM_LOG_MODE_ID ), +- QStringList() << QLatin1String( "/var/log/syslog" ), ++ QStringList() << QLatin1String( "/var/log/messages.log" ), + QList<int>() << INFORMATION_LOG_LEVEL_ID + ) { + diff --git a/staging/kdeartwork/PKGBUILD b/staging/kdeartwork/PKGBUILD new file mode 100644 index 000000000..1959308a1 --- /dev/null +++ b/staging/kdeartwork/PKGBUILD @@ -0,0 +1,102 @@ +# $Id: PKGBUILD 118072 2011-04-05 10:08:17Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdeartwork +pkgname=('kdeartwork-aurorae' + 'kdeartwork-colorschemes' + 'kdeartwork-desktopthemes' + 'kdeartwork-emoticons' + 'kdeartwork-iconthemes' + 'kdeartwork-kscreensaver' + 'kdeartwork-sounds' + 'kdeartwork-styles' + 'kdeartwork-wallpapers' + 'kdeartwork-weatherwallpapers') +pkgver=4.6.2 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeartwork') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' + 'docbook-xsl' 'kdegraphics-libs') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('2a264081e50f2d2d78d98080db8f013f3148f9b2') + +build() { + cd $srcdir + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdeartwork-aurorae() { + pkgdesc='An Aurorae theme based on the Oxygen plasma theme' + cd $srcdir/build/aurorae + make DESTDIR=$pkgdir install +} + +package_kdeartwork-colorschemes() { + pkgdesc='KDE color schemes' + cd $srcdir/build/ColorSchemes + make DESTDIR=$pkgdir install +} + +package_kdeartwork-desktopthemes() { + pkgdesc='KDE desktop themes' + cd $srcdir/build/desktopthemes + make DESTDIR=$pkgdir install +} + +package_kdeartwork-emoticons() { + pkgdesc='KDE emoticons' + cd $srcdir/build/emoticons + make DESTDIR=$pkgdir install +} + +package_kdeartwork-iconthemes() { + pkgdesc='KDE icon themes' + cd $srcdir/build/IconThemes + make DESTDIR=$pkgdir install +} + +package_kdeartwork-kscreensaver() { + pkgdesc='KDE screensaver' + depends=('kdebase-workspace' 'kdegraphics-libs') + cd $srcdir/build/kscreensaver + make DESTDIR=$pkgdir install +} + +package_kdeartwork-sounds() { + pkgdesc='KDE sounds' + cd $srcdir/build/sounds + make DESTDIR=$pkgdir install +} + +package_kdeartwork-styles() { + pkgdesc='KDE styles' + depends=('kdebase-workspace') + cd $srcdir/build/styles + make DESTDIR=$pkgdir install + cd $srcdir/build/kwin-styles + make DESTDIR=$pkgdir install +} + +package_kdeartwork-wallpapers() { + pkgdesc='KDE wallpapers' + cd $srcdir/build/wallpapers + make DESTDIR=$pkgdir install + cd $srcdir/build/HighResolutionWallpapers + make DESTDIR=$pkgdir install +} + +package_kdeartwork-weatherwallpapers() { + pkgdesc='KDE weather wallpapers' + cd $srcdir/build/WeatherWallpapers + make DESTDIR=$pkgdir install +} diff --git a/staging/kdebase-runtime/PKGBUILD b/staging/kdebase-runtime/PKGBUILD new file mode 100644 index 000000000..654c6103f --- /dev/null +++ b/staging/kdebase-runtime/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 118064 2011-04-05 10:07:49Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=kdebase-runtime +pkgver=4.6.2 +pkgrel=1 +pkgdesc="KDE Base Runtime Environment" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL') +depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons' + 'xorg-xauth' 'hicolor-icon-theme') +makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'xine-lib' + 'docbook-xsl') +optdepends=('htdig: to build the search index in khelpcenter' + 'rarian: needed by khelpcenter' + 'gdb: drkonq crash handler') +install="${pkgname}.install" +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('d939d78f82e8c9d1257552abac08e4da1ff28c51') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd "$srcdir/build" + make DESTDIR="$pkgdir" install + rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme" + ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/" +} diff --git a/staging/kdebase-runtime/kdebase-runtime.install b/staging/kdebase-runtime/kdebase-runtime.install new file mode 100644 index 000000000..3f06b8deb --- /dev/null +++ b/staging/kdebase-runtime/kdebase-runtime.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdebase-workspace/PKGBUILD b/staging/kdebase-workspace/PKGBUILD new file mode 100644 index 000000000..e30f73a9a --- /dev/null +++ b/staging/kdebase-workspace/PKGBUILD @@ -0,0 +1,71 @@ +# $Id: PKGBUILD 118067 2011-04-05 10:07:59Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=kdebase-workspace +pkgver=4.6.2 +pkgrel=1 +pkgdesc="KDE Base Workspace" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde') +# note on libxdamage: +# not detected by namcap because libgl depends on it +# but nvidia providing libgl does not depend on libxdamage +depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'qimageblitz' 'libqalculate' + 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage' 'libxklavier' 'libdmtx') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'networkmanager' 'bluez' + 'docbook-xsl' 'python2' 'kdebindings-python') +replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') +conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde' 'kdebase-kinfocenter') +install="${pkgname}.install" +backup=('usr/share/config/kdm/kdmrc' + 'etc/pam.d/kde' + 'etc/pam.d/kde-np' + 'etc/pam.d/kscreensaver') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" + 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' + 'fixpath.patch' 'terminate-server.patch') +sha1sums=('63efb68733f347d0b7d24a7a061c5a0e3f84dee7' + '8c2bdefb23a03b753b78d16944d03fa3939d2d99' + '5db3a245201bd4a50e65aa2ef583cf5490e4f646' + 'f7b38af38549242a240f1a90ab9964ca8a366129' + '603cc79c4d2b4eae62bb5f244aeecb3a778b5516' + '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' + 'd7b5883f7e65c6839b1f65f94d58026673dd0226' + 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + patch -p0 -i ${srcdir}/kdm-zsh-profile.patch + patch -p0 -i ${srcdir}/fixpath.patch + patch -p0 -i ${srcdir}/terminate-server.patch + + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Xmms=OFF \ + -DWITH_Googlegadgets=OFF \ + -DWITH_PolkitQt=OFF + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + + install -D -m755 ${srcdir}/kdm ${pkgdir}/etc/rc.d/kdm + install -D -m644 ${srcdir}/kde.pam ${pkgdir}/etc/pam.d/kde + install -D -m644 ${srcdir}/kde-np.pam ${pkgdir}/etc/pam.d/kde-np + install -D -m644 ${srcdir}/kscreensaver.pam ${pkgdir}/etc/pam.d/kscreensaver + install -d -m755 ${pkgdir}/usr/share/xsessions/ + ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop ${pkgdir}/usr/share/xsessions/ + install -d -m755 ${pkgdir}/etc/kde/{env,shutdown} + + install -d -g 135 -o 135 ${pkgdir}/var/lib/kdm +} diff --git a/staging/kdebase-workspace/fixpath.patch b/staging/kdebase-workspace/fixpath.patch new file mode 100644 index 000000000..be2b8383e --- /dev/null +++ b/staging/kdebase-workspace/fixpath.patch @@ -0,0 +1,34 @@ +--- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100 ++++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100 +@@ -34,22 +34,6 @@ + MALLOC_CHECK_=2 + export MALLOC_CHECK_ + +-# in case we have been started with full pathname spec without being in PATH +-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'` +-if [ -n "$bindir" ]; then +- qbindir=`$bindir/kde4-config --qt-binaries` +- if [ -n "$qbindir" ]; then +- case $PATH in +- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;; +- *) PATH=$qbindir:$PATH; export PATH;; +- esac +- fi +- case $PATH in +- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;; +- *) PATH=$bindir:$PATH; export PATH;; +- esac +-fi +- + # Boot sequence: + # + # kdeinit is used to fork off processes which improves memory usage +@@ -206,7 +190,7 @@ + # For anything else (that doesn't set env vars, or that needs a window manager), + # better use the Autostart folder. + +-libpath=`kde4-config --path lib | tr : '\n'` ++libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/') + + for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do + for file in "$prefix"*.sh; do diff --git a/staging/kdebase-workspace/kde-np.pam b/staging/kdebase-workspace/kde-np.pam new file mode 100644 index 000000000..81eeef47b --- /dev/null +++ b/staging/kdebase-workspace/kde-np.pam @@ -0,0 +1,7 @@ +#%PAM-1.0 +auth required pam_nologin.so +auth required pam_permit.so +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so +session required pam_limits.so
\ No newline at end of file diff --git a/staging/kdebase-workspace/kde.pam b/staging/kdebase-workspace/kde.pam new file mode 100644 index 000000000..1a259390f --- /dev/null +++ b/staging/kdebase-workspace/kde.pam @@ -0,0 +1,7 @@ +#%PAM-1.0 +auth required pam_unix.so +auth required pam_nologin.so +account required pam_unix.so +password required pam_unix.so +session required pam_unix.so +session required pam_limits.so
\ No newline at end of file diff --git a/staging/kdebase-workspace/kdebase-workspace.install b/staging/kdebase-workspace/kdebase-workspace.install new file mode 100644 index 000000000..3a1b2404a --- /dev/null +++ b/staging/kdebase-workspace/kdebase-workspace.install @@ -0,0 +1,23 @@ +post_install() { + groupadd -g 135 kdm &>/dev/null + useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null + chown -R 135:135 var/lib/kdm &>/dev/null + xdg-icon-resource forceupdate --theme hicolor &>/dev/null +} + +post_upgrade() { + getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null + getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null + chown -R 135:135 var/lib/kdm &>/dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_remove() { + if getent passwd kdm >/dev/null 2>&1; then + userdel kdm + fi + if getent group kdm >/dev/null 2>&1; then + groupdel kdm + fi + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/staging/kdebase-workspace/kdm b/staging/kdebase-workspace/kdm new file mode 100644 index 000000000..799d58f4b --- /dev/null +++ b/staging/kdebase-workspace/kdm @@ -0,0 +1,36 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=$(pidof -o %PPID /usr/bin/kdm) +case "$1" in + start) + stat_busy "Starting KDE Desktop Manager" + [ -z "$PID" ] && /usr/bin/kdm &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon kdm + stat_done + fi + ;; + stop) + stat_busy "Stopping KDE Desktop Manager" + [ ! -z "$PID" ] && kill $PID &> /dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon kdm + stat_done + fi + ;; + restart) + $0 stop + sleep 3 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/staging/kdebase-workspace/kdm-zsh-profile.patch b/staging/kdebase-workspace/kdm-zsh-profile.patch new file mode 100644 index 000000000..779456b39 --- /dev/null +++ b/staging/kdebase-workspace/kdm-zsh-profile.patch @@ -0,0 +1,11 @@ +--- kdm/kfrontend/genkdmconf.c 2008-02-13 09:40:49.000000000 +0000 ++++ kdm/kfrontend/genkdmconf.c 2008-05-16 12:47:36.000000000 +0000 +@@ -662,7 +662,7 @@ + " [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc\n" + " zhome=${ZDOTDIR:-$HOME}\n" + " # zshenv is always sourced automatically.\n" +-" [ -f $zdir/zprofile ] && . $zdir/zprofile\n" ++" [ -f /etc/profile ] && . /etc/profile\n" + " [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n" + " [ -f $zdir/zlogin ] && . $zdir/zlogin\n" + " [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n" diff --git a/staging/kdebase-workspace/kscreensaver.pam b/staging/kdebase-workspace/kscreensaver.pam new file mode 100644 index 000000000..b4d80c21f --- /dev/null +++ b/staging/kdebase-workspace/kscreensaver.pam @@ -0,0 +1 @@ +auth required pam_unix_auth.so diff --git a/staging/kdebase-workspace/terminate-server.patch b/staging/kdebase-workspace/terminate-server.patch new file mode 100644 index 000000000..094591317 --- /dev/null +++ b/staging/kdebase-workspace/terminate-server.patch @@ -0,0 +1,11 @@ +--- kdm/config.def 2009-08-27 10:17:39.000000000 +0200 ++++ kdm/config.def 2009-10-31 00:40:21.000000000 +0100 +@@ -1448,7 +1448,7 @@ + + Key: TerminateServer + Type: bool +-Default: false ++Default: true + User: core + Instance: #:*/! + Merge: xdm diff --git a/staging/kdebase/PKGBUILD b/staging/kdebase/PKGBUILD new file mode 100644 index 000000000..5a04c2341 --- /dev/null +++ b/staging/kdebase/PKGBUILD @@ -0,0 +1,129 @@ +# $Id: PKGBUILD 118068 2011-04-05 10:08:03Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdebase +pkgname=('kdebase-dolphin' + 'kdebase-kdepasswd' + 'kdebase-kdialog' + 'kdebase-keditbookmarks' + 'kdebase-kfind' + 'kdebase-konqueror' + 'kdebase-konsole' + 'kdebase-kwrite' + 'kdebase-lib' + 'kdebase-plasma') +pkgver=4.6.2 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdebase') +makedepends=('kdebase-workspace' 'pkgconfig' 'cmake' 'automoc4' 'docbook-xsl') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('e9e46a6b4f5580996a1484da6d2ef17f418eec69') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdebase-dolphin() { + pkgdesc='File Manager' + depends=('kdebase-runtime' 'kdebase-lib') + optdepends=('ruby: servicemenu installation') + url="http://kde.org/applications/system/dolphin/" + cd $srcdir/build/dolphin + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/dolphin + make DESTDIR=$pkgdir install +} + +package_kdebase-kdepasswd() { + pkgdesc='Change Password' + depends=('kdebase-runtime' 'kdebase-lib') + cd $srcdir/build/kdepasswd + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kdepasswd + make DESTDIR=$pkgdir install +} + +package_kdebase-kdialog() { + pkgdesc='A utility for displaying dialog boxes from shell scripts' + depends=('kdebase-runtime') + cd $srcdir/build/kdialog + make DESTDIR=$pkgdir install +} + +package_kdebase-keditbookmarks() { + pkgdesc='Bookmark Organizer and Editor' + depends=('kdebase-runtime') + cd $srcdir/build/keditbookmarks + make DESTDIR=$pkgdir install +} + +package_kdebase-kfind() { + pkgdesc='Find Files/Folders' + depends=('kdebase-runtime' 'kdebase-lib') + url="http://kde.org/applications/utilities/kfind/" + install='kdebase.install' + cd $srcdir/build/kfind + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kfind + make DESTDIR=$pkgdir install +} + +package_kdebase-konqueror() { + pkgdesc='KDE File Manager & Web Browser' + depends=('kdebase-dolphin' 'kdebase-keditbookmarks') + optdepends=('kwebkitpart: to enable webkit engine') + url="http://kde.org/applications/internet/konqueror/" + install='kdebase.install' + conflicts=('kdebase-nsplugins') + replaces=('kdebase-nsplugins') + for i in konqueror doc/konqueror nsplugins; do + cd $srcdir/build/${i} + make DESTDIR=$pkgdir install + done +} + +package_kdebase-konsole() { + pkgdesc='Terminal' + depends=('kdebase-runtime') + url="http://kde.org/applications/system/konsole/" + cd $srcdir/build/konsole + make DESTDIR=$pkgdir install + cd $srcdir/build/konsole/doc/manual + make DESTDIR=$pkgdir install +} + +package_kdebase-kwrite() { + pkgdesc='Text Editor' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kwrite/" + cd $srcdir/build/kwrite + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kwrite + make DESTDIR=$pkgdir install +} + +package_kdebase-lib() { + pkgdesc='KDE libraries for the basic desktop applications' + groups=() + depends=('kdelibs') + cd $srcdir/build/lib + make DESTDIR=$pkgdir install +} + +package_kdebase-plasma() { + pkgdesc='Display the contents of folders (User´s home folder as default)' + depends=('kdebase-workspace' 'kdebase-lib') + cd $srcdir/build/plasma + make DESTDIR=$pkgdir install +} diff --git a/staging/kdebase/kdebase.install b/staging/kdebase/kdebase.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdebase/kdebase.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/kdebindings/PKGBUILD b/staging/kdebindings/PKGBUILD new file mode 100644 index 000000000..b2266cf92 --- /dev/null +++ b/staging/kdebindings/PKGBUILD @@ -0,0 +1,71 @@ +# $Id: PKGBUILD 107102 2011-01-21 11:16:03Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdebindings +pkgname=('kdebindings-csharp' + 'kdebindings-python' + 'kdebindings-ruby' + 'kdebindings-smoke') +pkgver=4.6.2 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'python2-qt' 'kdepim-runtime' 'mono' + 'kdegraphics-okular' 'qwt' 'docbook-xsl' 'boost' 'qscintilla' 'ruby') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('eff4b5785b09958fffe4e23583f5af75c796aa9e') + +build() { + export MONO_SHARED_DIR="${srcdir}/build/.mono" + mkdir -p "$MONO_SHARED_DIR" + + cd ${srcdir}/build + + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DRUBY_SITE_LIB_DIR="/usr/lib/ruby/site_ruby/1.9.1" \ + -DRUBY_SITE_ARCH_DIR="/usr/lib/ruby/site_ruby/1.9.1/${CARCH}-linux" \ + -DBUILD_falcon=OFF \ + -DBUILD_java=OFF \ + -DBUILD_php=OFF \ + -DWITH_PolkitQt=OFF + make +} + +package_kdebindings-csharp() { + pkgdesc='KDE bindings for mono' + depends=('kdebindings-smoke' 'mono') + export MONO_SHARED_DIR="${srcdir}/build/.mono" + mkdir -p "$MONO_SHARED_DIR" + cd $srcdir/build/csharp + make DESTDIR=$pkgdir install +} + +package_kdebindings-python() { + pkgdesc='KDE bindings for python' + depends=('kdepim-runtime' 'python2-qt' 'qscintilla') + cd $srcdir/build/python + make DESTDIR=$pkgdir install + + # Use the python2 executable + find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' +} + +package_kdebindings-ruby() { + pkgdesc='KDE Bindings for ruby' + depends=('kdebindings-smoke' 'ruby') + cd $srcdir/build/ruby + make DESTDIR=$pkgdir install +} + +package_kdebindings-smoke() { + pkgdesc='Language independent library for Qt and KDE bindings' + depends=('qscintilla' 'kdegraphics-okular' 'kdepim-runtime') + cd $srcdir/build/smoke + make DESTDIR=$pkgdir install + cd $srcdir/build/generator/smokebase + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeedu/PKGBUILD b/staging/kdeedu/PKGBUILD new file mode 100644 index 000000000..4de1a090c --- /dev/null +++ b/staging/kdeedu/PKGBUILD @@ -0,0 +1,276 @@ +# $Id: PKGBUILD 118069 2011-04-05 10:08:07Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdeedu +pkgname=('kdeedu-blinken' + 'kdeedu-cantor' + 'kdeedu-data' + 'kdeedu-kalgebra' + 'kdeedu-kalzium' + 'kdeedu-kanagram' + 'kdeedu-kbruch' + 'kdeedu-kgeography' + 'kdeedu-khangman' + 'kdeedu-kig' + 'kdeedu-kiten' + 'kdeedu-klettres' + 'kdeedu-kmplot' + 'kdeedu-kstars' + 'kdeedu-ktouch' + 'kdeedu-kturtle' + 'kdeedu-kwordquiz' + 'kdeedu-libkdeedu' + 'kdeedu-marble' + 'kdeedu-parley' + 'kdeedu-rocs' + 'kdeedu-step') +pkgver=4.6.2 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeedu') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'ocaml' 'facile' 'cfitsio' 'gpsd' + 'kdebase-runtime' 'libqalculate' 'gsl' 'boost' 'libindi' 'r' 'libspectre' + 'python2' 'docbook-xsl' 'avogadro') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('7c94a10f5c17237dcd5c348a8ac129973934cf05') + +build() { + cd $srcdir + mkdir build + cd build + # rpath is needed for cantor to find R + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdeedu-blinken() { + pkgdesc='A memory enhancement game' + depends=('kdebase-runtime' 'kdeedu-libkdeedu') + install='kdeedu.install' + cd $srcdir/build/blinken + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/blinken + make DESTDIR=$pkgdir install +} + +package_kdeedu-cantor() { + pkgdesc='KDE Frontend to Mathematical Software' + depends=('kdeedu-libkdeedu' 'libspectre') + optdepends=('kdeedu-kalgebra: backend' + 'maxima: backend' + 'r: backend') + install='kdeedu.install' + cd $srcdir/build/cantor + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/cantor + make DESTDIR=$pkgdir install +} + +package_kdeedu-data() { + pkgdesc='Data for KDE Educational Software' + groups=() + cd $srcdir/build/data + make DESTDIR=$pkgdir install +} + +package_kdeedu-kalgebra() { + pkgdesc='Math Expression Solver and Plotter' + depends=('kdebase-runtime') + install='kdeedu.install' + cd $srcdir/build/kalgebra + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kalgebra + make DESTDIR=$pkgdir install +} + +package_kdeedu-kalzium() { + pkgdesc='KDE Periodic Table of Elements' + depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'avogadro') + install='kdeedu.install' + cd $srcdir/build/kalzium + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kalzium + make DESTDIR=$pkgdir install +} + +package_kdeedu-kanagram() { + pkgdesc='KDE Letter Order Game' + depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data') + install='kdeedu.install' + cd $srcdir/build/kanagram + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kanagram + make DESTDIR=$pkgdir install +} + +package_kdeedu-kbruch() { + pkgdesc='Practice exercises with fractions' + depends=('kdelibs' 'kdebase-runtime') + install='kdeedu.install' + cd $srcdir/build/kbruch + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kbruch + make DESTDIR=$pkgdir install +} + +package_kdeedu-kgeography() { + pkgdesc='A Geography Learning Program' + depends=('kdebase-runtime') + install='kdeedu.install' + cd $srcdir/build/kgeography + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kgeography + make DESTDIR=$pkgdir install +} + +package_kdeedu-khangman() { + pkgdesc='KDE Hangman Game' + depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data') + install='kdeedu.install' + cd $srcdir/build/khangman + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/khangman + make DESTDIR=$pkgdir install +} + +package_kdeedu-kig() { + pkgdesc='Explore Geometric Constructions' + depends=('kdebase-runtime' 'boost-libs' 'python2') + install='kdeedu.install' + cd $srcdir/build/kig + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kig + make DESTDIR=$pkgdir install + + # Use the python2 executable + sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' ${pkgdir}/usr/bin/pykig.py +} + +package_kdeedu-kiten() { + pkgdesc='Japanese Reference and Study Tool' + depends=('kdebase-runtime') + install='kdeedu.install' + cd $srcdir/build/kiten + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kiten + make DESTDIR=$pkgdir install +} + +package_kdeedu-klettres() { + pkgdesc='a KDE program to learn the alphabet' + depends=('kdebase-runtime') + install='kdeedu.install' + cd $srcdir/build/klettres + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/klettres + make DESTDIR=$pkgdir install +} + +package_kdeedu-kmplot() { + pkgdesc='Function Plotter' + depends=('kdebase-runtime') + install='kdeedu.install' + cd $srcdir/build/kmplot + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmplot + make DESTDIR=$pkgdir install +} + +package_kdeedu-kstars() { + pkgdesc='Desktop Planetarium' + depends=('kdebase-runtime' 'libindi') + install='kdeedu.install' + cd $srcdir/build/kstars + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kstars + make DESTDIR=$pkgdir install +} + +package_kdeedu-ktouch() { + pkgdesc='Touch Typing Tutor' + depends=('kdebase-runtime') + install='kdeedu.install' + cd $srcdir/build/ktouch + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ktouch + make DESTDIR=$pkgdir install +} + +package_kdeedu-kturtle() { + pkgdesc='Educational Programming Environment' + depends=('kdebase-runtime') + install='kdeedu.install' + cd $srcdir/build/kturtle + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kturtle + make DESTDIR=$pkgdir install +} + +package_kdeedu-kwordquiz() { + pkgdesc='A flashcard and vocabulary learning program' + depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data') + install='kdeedu.install' + cd $srcdir/build/kwordquiz + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kwordquiz + make DESTDIR=$pkgdir install +} + +package_kdeedu-libkdeedu() { + pkgdesc='Support library for KDE Educational Software' + groups=() + depends=('kdelibs') + install='kdeedu.install' + cd $srcdir/build/libkdeedu + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKDEEdu.cmake \ + $pkgdir/usr/share/apps/cmake/modules/FindKDEEdu.cmake +} + +package_kdeedu-marble() { + pkgdesc='Desktop Globe' + depends=('kdebase-runtime' 'gpsd') + install='kdeedu.install' + cd $srcdir/build/marble + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/marble + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindMarbleWidget.cmake \ + $pkgdir/usr/share/apps/cmake/modules/FindMarbleWidget.cmake +} + +package_kdeedu-parley() { + pkgdesc='Vocabulary Trainer' + depends=('kdebase-runtime' 'kdeedu-libkdeedu' 'kdeedu-data' 'kdebindings-python') + install='kdeedu.install' + cd $srcdir/build/parley + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/parley + make DESTDIR=$pkgdir install +} + +package_kdeedu-rocs() { + pkgdesc='Graph Theory Tool for Professors and Students.' + depends=('kdebase-runtime' 'kdeedu-libkdeedu') + install='kdeedu.install' + cd $srcdir/build/rocs + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/rocs + make DESTDIR=$pkgdir install +} + +package_kdeedu-step() { + pkgdesc='Simulate physics experiments' + depends=('kdebase-runtime' 'gsl' 'libqalculate') + install='kdeedu.install' + cd $srcdir/build/step + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/step + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeedu/kdeedu.install b/staging/kdeedu/kdeedu.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeedu/kdeedu.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/kdegames/PKGBUILD b/staging/kdegames/PKGBUILD new file mode 100644 index 000000000..c3cc8f1f9 --- /dev/null +++ b/staging/kdegames/PKGBUILD @@ -0,0 +1,515 @@ +# $Id: PKGBUILD 118073 2011-04-05 10:08:20Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdegames +pkgname=('kdegames-bomber' + 'kdegames-bovo' + 'kdegames-granatier' + 'kdegames-kajongg' + 'kdegames-kapman' + 'kdegames-katomic' + 'kdegames-kbattleship' + 'kdegames-kblackbox' + 'kdegames-kblocks' + 'kdegames-kbounce' + 'kdegames-kbreakout' + 'kdegames-kdiamond' + 'kdegames-kfourinline' + 'kdegames-kgoldrunner' + 'kdegames-kigo' + 'kdegames-killbots' + 'kdegames-kiriki' + 'kdegames-kjumpingcube' + 'kdegames-klines' + 'kdegames-klickety' + 'kdegames-kmahjongg' + 'kdegames-kmines' + 'kdegames-knetwalk' + 'kdegames-kolf' + 'kdegames-kollision' + 'kdegames-konquest' + 'kdegames-kpatience' + 'kdegames-kreversi' + 'kdegames-kshisen' + 'kdegames-ksirk' + 'kdegames-kspaceduel' + 'kdegames-ksquares' + 'kdegames-ksudoku' + 'kdegames-ktron' + 'kdegames-ktuberling' + 'kdegames-kubrick' + 'kdegames-libkdegames' + 'kdegames-libkmahjongg' + 'kdegames-lskat' + 'kdegames-palapeli') +pkgver=4.6.2 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegames') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime' 'ggz-client-libs' + 'twisted' 'kdebindings-python' 'docbook-xsl') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('91ec7347488504931b4019182a3f2b91a60d8065') + +build() { + cd $srcdir + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_OpenAL=OFF + make +} + +package_kdegames-bomber() { + pkgdesc='Arcade Bombing Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/bomber/" + install='kdegames.install' + cd $srcdir/build/bomber + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/bomber + make DESTDIR=$pkgdir install +} + +package_kdegames-bovo() { + pkgdesc='Five-in-a-row Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/bovo/" + install='kdegames.install' + cd $srcdir/build/bovo + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/bovo + make DESTDIR=$pkgdir install +} + +package_kdegames-granatier() { + pkgdesc='Granatier' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/granatier/" + install='kdegames.install' + cd $srcdir/build/granatier + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/granatier + make DESTDIR=$pkgdir install +} + +package_kdegames-kajongg() { + pkgdesc='The ancient Chinese board game for 4 players' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdebindings-python' 'twisted') + install='kdegames.install' + cd $srcdir/build/kajongg + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kajongg + make DESTDIR=$pkgdir install + + # Use the python2 executable + find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' +} + +package_kdegames-kapman() { + pkgdesc='Eat pills escaping ghosts' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kapman/" + install='kdegames.install' + cd $srcdir/build/kapman + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kapman + make DESTDIR=$pkgdir install +} + +package_kdegames-katomic() { + pkgdesc='Sokoban-like Logic Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/katomic/" + install='kdegames.install' + cd $srcdir/build/katomic + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/katomic + make DESTDIR=$pkgdir install +} + +package_kdegames-kbattleship() { + pkgdesc='Battleship Game' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs') + url="http://kde.org/applications/games/kbattleship/" + install='kdegames-kbattleship.install' + cd $srcdir/build/kbattleship + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kbattleship + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/${pkgbase}-${pkgver}/kbattleship/src/module.dsc \ + $pkgdir/usr/share/ggz/kbattleship.dsc +} + +package_kdegames-kblackbox() { + pkgdesc='Blackbox Logic Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kblackbox/" + install='kdegames.install' + cd $srcdir/build/kblackbox + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kblackbox + make DESTDIR=$pkgdir install +} + +package_kdegames-kblocks() { + pkgdesc='Falling Blocks Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kblocks/" + install='kdegames.install' + cd $srcdir/build/kblocks + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kblocks + make DESTDIR=$pkgdir install +} + +package_kdegames-kbounce() { + pkgdesc='Ball Bouncing Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kbounce/" + install='kdegames.install' + cd $srcdir/build/kbounce + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kbounce + make DESTDIR=$pkgdir install +} + +package_kdegames-kbreakout() { + pkgdesc='Breakout-like Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kbreakout/" + install='kdegames.install' + cd $srcdir/build/kbreakout + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kbreakout + make DESTDIR=$pkgdir install +} + +package_kdegames-kdiamond() { + pkgdesc='Three-in-a-row game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kdiamond/" + install='kdegames.install' + cd $srcdir/build/kdiamond + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kdiamond + make DESTDIR=$pkgdir install +} + +package_kdegames-kfourinline() { + pkgdesc='Four-in-a-row Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kfourinline/" + install='kdegames.install' + cd $srcdir/build/kfourinline + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kfourinline + make DESTDIR=$pkgdir install +} + +package_kdegames-kgoldrunner() { + pkgdesc='A game of action and puzzle-solving' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kgoldrunner/" + install='kdegames.install' + cd $srcdir/build/kgoldrunner + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kgoldrunner + make DESTDIR=$pkgdir install +} + +package_kdegames-kigo() { + pkgdesc='Go Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'gnugo') + url="http://kde.org/applications/games/kigo/" + install='kdegames.install' + cd $srcdir/build/kigo + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kigo + make DESTDIR=$pkgdir install +} + +package_kdegames-killbots() { + pkgdesc='Killbots' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/killbots/" + install='kdegames.install' + cd $srcdir/build/killbots + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/killbots + make DESTDIR=$pkgdir install +} + +package_kdegames-kiriki() { + pkgdesc='Yahtzee-like Dice Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kiriki/" + install='kdegames.install' + cd $srcdir/build/kiriki + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kiriki + make DESTDIR=$pkgdir install +} + +package_kdegames-kjumpingcube() { + pkgdesc='Territory Capture Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kjumpingcube/" + install='kdegames.install' + cd $srcdir/build/kjumpingcube + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kjumpingcube + make DESTDIR=$pkgdir install +} + +package_kdegames-klickety() { + pkgdesc='Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + replaces=('kdegames-ksame') + conflicts=('kdegames-ksame') + url="http://kde.org/applications/games/ksame/" + install='kdegames.install' + cd $srcdir/build/klickety + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/klickety + make DESTDIR=$pkgdir install +} + +package_kdegames-klines() { + pkgdesc='Tactical Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/klines/" + install='kdegames.install' + cd $srcdir/build/klines + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/klines + make DESTDIR=$pkgdir install +} + +package_kdegames-kmahjongg() { + pkgdesc='Mahjongg Solitaire' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg') + url="http://kde.org/applications/games/kmahjongg/" + install='kdegames.install' + cd $srcdir/build/kmahjongg + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmahjongg + make DESTDIR=$pkgdir install +} + +package_kdegames-kmines() { + pkgdesc='Minesweeper-like Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kmines/" + install='kdegames.install' + cd $srcdir/build/kmines + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmines + make DESTDIR=$pkgdir install +} + +package_kdegames-knetwalk() { + pkgdesc='Network Construction Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/knetwalk/" + install='kdegames.install' + cd $srcdir/build/knetwalk + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/knetwalk + make DESTDIR=$pkgdir install +} + +package_kdegames-kolf() { + pkgdesc='Miniature Golf' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kolf/" + install='kdegames.install' + cd $srcdir/build/kolf + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kolf + make DESTDIR=$pkgdir install +} + +package_kdegames-kollision() { + pkgdesc='A simple ball dodging game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kollision/" + install='kdegames.install' + cd $srcdir/build/kollision + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kollision + make DESTDIR=$pkgdir install +} + +package_kdegames-konquest() { + pkgdesc='Galactic Strategy Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/konquest/" + install='kdegames.install' + cd $srcdir/build/konquest + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/konquest + make DESTDIR=$pkgdir install +} + +package_kdegames-kpatience() { + pkgdesc='Patience Card Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kpatience/" + install='kdegames.install' + replaces=('kdegames-kpat') + cd $srcdir/build/kpat + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kpat + make DESTDIR=$pkgdir install +} + +package_kdegames-kreversi() { + pkgdesc='Reversi Board Game' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs') + url="http://kde.org/applications/games/kreversi/" + install='kdegames-kreversi.install' + cd $srcdir/build/kreversi + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kreversi + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/${pkgbase}-${pkgver}/kreversi/module.dsc \ + $pkgdir/usr/share/ggz/kreversi.dsc +} + +package_kdegames-kshisen() { + pkgdesc='Shisen-Sho Mahjongg-like Tile Game' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg') + url="http://kde.org/applications/games/kshisen/" + install='kdegames.install' + cd $srcdir/build/kshisen + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kshisen + make DESTDIR=$pkgdir install +} + +package_kdegames-ksirk() { + pkgdesc='World Domination Strategy Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/ksirk/" + install='kdegames.install' + cd $srcdir/build/ksirk + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ksirk + make DESTDIR=$pkgdir install +} + +package_kdegames-kspaceduel() { + pkgdesc='Space Arcade Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kspaceduel/" + install='kdegames.install' + cd $srcdir/build/kspaceduel + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kspaceduel + make DESTDIR=$pkgdir install +} + +package_kdegames-ksquares() { + pkgdesc='Connect the dots to create squares' + depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs') + url="http://kde.org/applications/games/ksquares/" + install='kdegames-ksquares.install' + cd $srcdir/build/ksquares + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ksquares + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/${pkgbase}-${pkgver}/ksquares/src/module.dsc \ + $pkgdir/usr/share/ggz/ksquares.dsc +} + +package_kdegames-ksudoku() { + pkgdesc='KSudoku, Sudoku game & more for KDE' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/ksudoku/" + install='kdegames.install' + cd $srcdir/build/ksudoku + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ksudoku + make DESTDIR=$pkgdir install +} + +package_kdegames-ktron() { + pkgdesc='Tron-like Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/ktron/" + install='kdegames.install' + cd $srcdir/build/ktron + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ktron + make DESTDIR=$pkgdir install +} + +package_kdegames-ktuberling() { + pkgdesc='Picture Game for Children' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/ktuberling/" + install='kdegames.install' + cd $srcdir/build/ktuberling + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ktuberling + make DESTDIR=$pkgdir install +} + +package_kdegames-kubrick() { + pkgdesc='A 3-D game based on Rubik´s Cube' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/kubrick/" + install='kdegames.install' + cd $srcdir/build/kubrick + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kubrick + make DESTDIR=$pkgdir install +} + +package_kdegames-libkdegames() { + pkgdesc='KDE game library' + groups=() + depends=('kdelibs') + cd $srcdir/build/libkdegames + make DESTDIR=$pkgdir install + for i in $srcdir/${pkgbase}-${pkgver}/cmake/modules/*.cmake; do + install -D -m644 $i $pkgdir/usr/share/apps/cmake/modules/$(basename $i) + done +} + +package_kdegames-libkmahjongg() { + pkgdesc='Library used for loading and rendering of Mahjongg tilesets' + groups=() + depends=('kdelibs') + cd $srcdir/build/libkmahjongg + make DESTDIR=$pkgdir install +} + +package_kdegames-lskat() { + pkgdesc='Card Game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/lskat/" + install='kdegames.install' + cd $srcdir/build/lskat + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/lskat + make DESTDIR=$pkgdir install +} + +package_kdegames-palapeli() { + pkgdesc='Jigsaw puzzle game' + depends=('kdebase-runtime' 'kdegames-libkdegames') + url="http://kde.org/applications/games/palapeli/" + install='kdegames-palapeli.install' + cd $srcdir/build/palapeli + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/palapeli + make DESTDIR=$pkgdir install +} diff --git a/staging/kdegames/kdegames-kbattleship.install b/staging/kdegames/kdegames-kbattleship.install new file mode 100644 index 000000000..ae4e089cb --- /dev/null +++ b/staging/kdegames/kdegames-kbattleship.install @@ -0,0 +1,22 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + ggz-config -i -f -m usr/share/ggz/kbattleship.dsc >& /dev/null +} + +pre_remove() { + if [ -f usr/share/ggz/kbattleship.dsc ]; then + ggz-config -r -m usr/share/ggz/kbattleship.dsc >& /dev/null + fi +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/staging/kdegames/kdegames-kreversi.install b/staging/kdegames/kdegames-kreversi.install new file mode 100644 index 000000000..4623e6e49 --- /dev/null +++ b/staging/kdegames/kdegames-kreversi.install @@ -0,0 +1,22 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + ggz-config -i -f -m usr/share/ggz/kreversi.dsc >& /dev/null +} + +pre_remove() { + if [ -f usr/share/ggz/kreversi.dsc ]; then + ggz-config -r -m usr/share/ggz/kreversi.dsc >& /dev/null + fi +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/staging/kdegames/kdegames-ksquares.install b/staging/kdegames/kdegames-ksquares.install new file mode 100644 index 000000000..5a619897d --- /dev/null +++ b/staging/kdegames/kdegames-ksquares.install @@ -0,0 +1,22 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + ggz-config -i -f -m usr/share/ggz/ksquares.dsc >& /dev/null +} + +pre_remove() { + if [ -f usr/share/ggz/ksquares.dsc ]; then + ggz-config -r -m usr/share/ggz/ksquares.dsc >& /dev/null + fi +} + +pre_upgrade() { + pre_remove +} + +post_upgrade() { + post_install +} + +post_remove() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} diff --git a/staging/kdegames/kdegames-palapeli.install b/staging/kdegames/kdegames-palapeli.install new file mode 100644 index 000000000..ce5c32e1b --- /dev/null +++ b/staging/kdegames/kdegames-palapeli.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/staging/kdegames/kdegames.install b/staging/kdegames/kdegames.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdegames/kdegames.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/kdegraphics/PKGBUILD b/staging/kdegraphics/PKGBUILD new file mode 100644 index 000000000..1b11c9ab2 --- /dev/null +++ b/staging/kdegraphics/PKGBUILD @@ -0,0 +1,141 @@ +# $Id: PKGBUILD 118092 2011-04-05 12:11:35Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdegraphics +pkgname=('kdegraphics-gwenview' + 'kdegraphics-kamera' + 'kdegraphics-kcolorchooser' + 'kdegraphics-kgamma' + 'kdegraphics-kolourpaint' + 'kdegraphics-kruler' + 'kdegraphics-ksnapshot' + 'kdegraphics-libs' + 'kdegraphics-okular') +pkgver=4.6.2 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdegraphics') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'qimageblitz' 'sane' 'lcms' + 'libxxf86vm' 'poppler-qt' 'libspectre' 'chmlib' 'djvulibre' + 'ebook-tools' 'kdebase-runtime' 'docbook-xsl') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('9c9f31c88c1c9e6dcaa7fb177847402d874ffc94') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdegraphics-gwenview() { + pkgdesc='A simple image viewer' + depends=('kdebase-runtime' 'kdegraphics-libs') + url="http://kde.org/applications/graphics/gwenview/" + replaces=('gwenview' 'gwenview-i18n') + install='kdegraphics.install' + cd $srcdir/build/gwenview + make DESTDIR=$pkgdir install + cd $srcdir/build/gwenview/doc + make DESTDIR=$pkgdir install +} + +package_kdegraphics-kamera() { + pkgdesc='Configure Kamera' + depends=('kdelibs' 'libgphoto2') + cd $srcdir/build/kamera + make DESTDIR=$pkgdir install + cd $srcdir/build/kamera/doc + make DESTDIR=$pkgdir install +} + +package_kdegraphics-kcolorchooser() { + pkgdesc='Color Chooser' + depends=('kdebase-runtime') + url="http://kde.org/applications/graphics/kcolorchooser/" + install='kdegraphics.install' + cd $srcdir/build/kcolorchooser + make DESTDIR=$pkgdir install +} + +package_kdegraphics-kgamma() { + pkgdesc='A monitor calibration tool' + # note on libxxf86vm: + # not detected by namcap because libgl depends on it + # but nvidia providing libgl does not depend on libxxf86vm + depends=('kdebase-runtime' 'libxxf86vm') + install='kdegraphics.install' + cd $srcdir/build/kgamma + make DESTDIR=$pkgdir install + cd $srcdir/build/kgamma/doc + make DESTDIR=$pkgdir install +} + +package_kdegraphics-kolourpaint() { + pkgdesc='Paint Program' + depends=('kdebase-runtime' 'qimageblitz' 'kdegraphics-libs') + url="http://kde.org/applications/graphics/kolourpaint/" + install='kdegraphics.install' + cd $srcdir/build/kolourpaint + make DESTDIR=$pkgdir install + cd $srcdir/build/kolourpaint/doc + make DESTDIR=$pkgdir install +} + +package_kdegraphics-kruler() { + pkgdesc='Screen Ruler' + depends=('kdebase-runtime') + url="http://kde.org/applications/graphics/kruler/" + install='kdegraphics.install' + cd $srcdir/build/kruler + make DESTDIR=$pkgdir install + cd $srcdir/build/kruler/doc + make DESTDIR=$pkgdir install +} + +package_kdegraphics-ksnapshot() { + pkgdesc='Screen Capture Program' + depends=('kdebase-runtime' 'kdegraphics-libs') + url="http://kde.org/applications/graphics/ksnapshot/" + install='kdegraphics.install' + cd $srcdir/build/ksnapshot + make DESTDIR=$pkgdir install + cd $srcdir/build/ksnapshot/doc + make DESTDIR=$pkgdir install +} + +package_kdegraphics-libs() { + pkgdesc='Support library for KDE Graphics Software' + groups=() + depends=('kdelibs' 'sane' 'lcms') + conflicts=('kdegraphics-ksaneplugin' 'kdegraphics-strigi-analyzer' + 'kdegraphics-svgpart' 'kdegraphics-thumbnailers') + replaces=('libkexiv2' 'libkdcraw' 'kdegraphics-ksaneplugin' + 'kdegraphics-strigi-analyzer' 'kdegraphics-svgpart' 'kdegraphics-thumbnailers') + install='kdegraphics.install' + for i in libs ksaneplugin strigi-analyzer svgpart thumbnailers; do + cd $srcdir/build/${i} + make DESTDIR=$pkgdir install + done + install -D -m644 $srcdir/${pkgbase}-${pkgver}/cmake/modules/FindKSane.cmake \ + $pkgdir/usr/share/apps/cmake/modules/FindKSane.cmake +} + +package_kdegraphics-okular() { + pkgdesc='Document Viewer' + depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre' + 'ebook-tools' 'libspectre') + url="http://kde.org/applications/graphics/okular/" + install='kdegraphics.install' + cd $srcdir/build/okular + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/okular + make DESTDIR=$pkgdir install +} diff --git a/staging/kdegraphics/kdegraphics.install b/staging/kdegraphics/kdegraphics.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdegraphics/kdegraphics.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 new file mode 100644 index 000000000..eb84d4b50 --- /dev/null +++ b/staging/kdelibs/PKGBUILD @@ -0,0 +1,62 @@ +# $Id: PKGBUILD 118061 2011-04-05 10:07:38Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=kdelibs +pkgver=4.6.2 +pkgrel=1 +pkgdesc="KDE Core Libraries" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'heimdal' + 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee' + 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils' + 'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor' + 'docbook-xsl') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' + 'hspell') +replaces=('arts' 'kdelibs-experimental') +install='kdelibs.install' +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" + 'kde-applications-menu.patch' 'archlinux-menu.patch' 'abs-syntax-highlight.patch') +sha1sums=('b4794a9a69492ce4725abd9eb5d00d3a50e46603' + '86ee8c8660f19de8141ac99cd6943964d97a1ed7' + '63a850ab4196b9d06934f2b4a13acd9f7739bc67' + 'd994f262356af5b9e4e9619646e471bd98c91efb') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + # avoid file conflict with gnome-menu + patch -p1 -i $srcdir/kde-applications-menu.patch + # add Archlinux menu entry + patch -p1 -i $srcdir/archlinux-menu.patch + # add syntax highlightning for PKGBUILD and .install files + patch -p1 -i $srcdir/abs-syntax-highlight.patch + + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DKDE_DISTRIBUTION_TEXT='Arch Linux' \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \ + -DKDE_DEFAULT_HOME='.kde4' \ + -DWITH_FAM=OFF \ + -DKAUTH_BACKEND=PolkitQt-1 + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install + + # cert bundle seems to be hardcoded + # link it to the one from ca-certificates + rm -f $pkgdir/usr/share/apps/kssl/ca-bundle.crt + ln -sf /etc/ssl/certs/ca-certificates.crt $pkgdir/usr/share/apps/kssl/ca-bundle.crt +} diff --git a/staging/kdelibs/abs-syntax-highlight.patch b/staging/kdelibs/abs-syntax-highlight.patch new file mode 100644 index 000000000..477479a9b --- /dev/null +++ b/staging/kdelibs/abs-syntax-highlight.patch @@ -0,0 +1,12 @@ +diff -Nura kdelibs-4.3.0.orig/kate/syntax/data/bash.xml kdelibs-4.3.0/kate/syntax/data/bash.xml +--- kdelibs-4.3.0.orig/kate/syntax/data/bash.xml 2009-04-15 12:26:37.000000000 +0200 ++++ kdelibs-4.3.0/kate/syntax/data/bash.xml 2009-07-30 13:24:01.000000000 +0200 +@@ -8,7 +8,7 @@ + <!ENTITY noword "(?![\w$+-])"> <!-- no word, $, + or - following --> + <!ENTITY pathpart "([\w_@.%*?+-]|\\ )"> <!-- valid character in a file name --> + ]> +-<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL"> ++<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD;*.install" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL"> + + <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl) + Changes by Matthew Woehlke (mw_triad@users.sourceforge.net) diff --git a/staging/kdelibs/archlinux-menu.patch b/staging/kdelibs/archlinux-menu.patch new file mode 100644 index 000000000..546784fa2 --- /dev/null +++ b/staging/kdelibs/archlinux-menu.patch @@ -0,0 +1,22 @@ +--- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000 +0000 ++++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077 +0000 +@@ -16,11 +16,19 @@ + </DefaultLayout> + <Layout> + <Merge type="menus"/> ++ <Menuname>Arch Linux</Menuname> + <Menuname>Applications</Menuname> + <Merge type="files"/> + </Layout> + + <Menu> ++ <Name>Arch Linux</Name> ++ <Directory>Archlinux.directory</Directory> ++ <Include> ++ <Category>Archlinux</Category> ++ </Include> ++ </Menu> ++ <Menu> + <Name>Applications</Name> + <Directory>kde-unknown.directory</Directory> + <OnlyUnallocated/> diff --git a/staging/kdelibs/kde-applications-menu.patch b/staging/kdelibs/kde-applications-menu.patch new file mode 100644 index 000000000..4b513298a --- /dev/null +++ b/staging/kdelibs/kde-applications-menu.patch @@ -0,0 +1,22 @@ +--- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000 ++++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000 +@@ -69,7 +69,7 @@ + if (WIN32) + install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus ) + else (WIN32) +-install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus ) ++install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu ) + endif (WIN32) + install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} ) + install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update ) +--- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000 +0000 ++++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572 +0000 +@@ -302,7 +302,7 @@ + if (!m_trackId.isEmpty()) + g_vfolder->setTrackId(m_trackId); + +- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true); ++ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true); + + KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false); + entry->setLayoutInfo(kdeMenu->layoutList); diff --git a/staging/kdelibs/kdelibs.install b/staging/kdelibs/kdelibs.install new file mode 100644 index 000000000..ce5c32e1b --- /dev/null +++ b/staging/kdelibs/kdelibs.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/staging/kdemultimedia/PKGBUILD b/staging/kdemultimedia/PKGBUILD new file mode 100644 index 000000000..afdc0a8a1 --- /dev/null +++ b/staging/kdemultimedia/PKGBUILD @@ -0,0 +1,114 @@ +# $Id: PKGBUILD 118074 2011-04-05 10:08:23Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdemultimedia +pkgname=('kdemultimedia-dragonplayer' + 'kdemultimedia-ffmpegthumbs' + 'kdemultimedia-juk' + 'kdemultimedia-kioslave' + 'kdemultimedia-kmix' + 'kdemultimedia-kscd' + 'kdemultimedia-mplayerthumbs') +pkgver=4.6.2 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdemultimedia') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime' 'tunepimp' + 'ffmpeg' 'mplayer' 'docbook-xsl' 'pulseaudio' 'libmusicbrainz3') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'mplayerthumbs.config' + 'kmix-locale-pulseaudio.patch') +sha1sums=('4447d26488e3b97c43580d86ad47cee77ff98578' + 'ba016fa2563c14ffcba852c62506b66bfc6ee683' + '5aa443ace9f4b1906c227664b4e50bace666cf99') + +build() { + cd ${srcdir}/${pkgbase}-${pkgver} + patch -Np0 -i ${srcdir}/kmix-locale-pulseaudio.patch + + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_Xine=OFF + make +} + +package_kdemultimedia-dragonplayer() { + pkgdesc='Video Player' + depends=('kdebase-runtime') + url="http://kde.org/applications/multimedia/dragonplayer/" + install='kdemultimedia.install' + cd $srcdir/build/dragonplayer + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/dragonplayer + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-ffmpegthumbs() { + pkgdesc='Video Files (ffmpegthumbs)' + depends=('kdebase-runtime' 'ffmpeg') + install='kdemultimedia.install' + cd $srcdir/build/ffmpegthumbs + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-juk() { + pkgdesc='Music Player' + depends=('kdebase-runtime' 'tunepimp') + url="http://kde.org/applications/multimedia/juk" + install='kdemultimedia.install' + cd $srcdir/build/juk + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/juk + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-kioslave() { + pkgdesc='Audio CD Browser' + depends=('kdelibs' 'libmusicbrainz3' 'cdparanoia') + conflicts=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc') + replaces=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc') + for i in kioslave doc/kioslave libkcddb libkcompactdisc; do + cd $srcdir/build/${i} + make DESTDIR=$pkgdir install + done +} + +package_kdemultimedia-kmix() { + pkgdesc='Sound Mixer' + depends=('kdebase-runtime') + url="http://kde.org/applications/multimedia/kmix" + install='kdemultimedia.install' + cd $srcdir/build/kmix + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmix + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-kscd() { + pkgdesc='CD Player' + depends=('kdebase-runtime' 'libmusicbrainz3') + url="http://kde.org/applications/multimedia/kscd" + install='kdemultimedia.install' + cd $srcdir/build/kscd + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcontrol/cddbretrieval + make DESTDIR=$pkgdir install +} + +package_kdemultimedia-mplayerthumbs() { + pkgdesc='Video Files (MPlayerThumbs)' + depends=('kdebase-runtime' 'mplayer') + replaces=('mplayerthumbs') + conflicts=('mplayerthumbs') + cd $srcdir/build/mplayerthumbs + make DESTDIR=$pkgdir install + install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs +} diff --git a/staging/kdemultimedia/kdemultimedia.install b/staging/kdemultimedia/kdemultimedia.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdemultimedia/kdemultimedia.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/kdemultimedia/kmix-locale-pulseaudio.patch b/staging/kdemultimedia/kmix-locale-pulseaudio.patch new file mode 100644 index 000000000..88be8dbde --- /dev/null +++ b/staging/kdemultimedia/kmix-locale-pulseaudio.patch @@ -0,0 +1,1117 @@ +Index: kmix/apps/kmix.cpp +=================================================================== +--- kmix/apps/kmix.cpp (revision 1226955) ++++ kmix/apps/kmix.cpp (revision 1226956) +@@ -78,8 +78,6 @@ + m_dockWidget(), + m_dontSetDefaultCardOnStart (false) + { +- _cornerLabelNew = 0; +- + setObjectName( QLatin1String("KMixWindow" )); + // disable delete-on-close because KMix might just sit in the background waiting for cards to be plugged in + setAttribute(Qt::WA_DeleteOnClose, false); +@@ -184,16 +182,29 @@ + + void KMixWindow::initActionsAfterInitMixer() + { ++ bool isPulseAudio = false; + // Add "launch_pavucontrol" to menu, if Pulseaudio backend is in use + foreach( Mixer* mixer, Mixer::mixers() ) + { +- if ( mixer->getDriverName() == "PulseAudio") { ++ if ( mixer->getDriverName() == "PulseAudio") ++ { ++ isPulseAudio = true; + KAction* action = actionCollection()->addAction( "launch_pavucontrol" ); + action->setText( i18n( "Audio setup (&Pulseaudio)" ) ); + connect(action, SIGNAL(triggered(bool) ), SLOT( slotPavucontrolExec() )); + break; + } + } ++ ++ if (! isPulseAudio ) ++ { ++ QPixmap cornerNewPM = KIconLoader::global()->loadIcon( "tab-new", KIconLoader::Toolbar, KIconLoader::SizeSmall ); ++ QPushButton* _cornerLabelNew = new QPushButton(); ++ _cornerLabelNew->setIcon(cornerNewPM); ++ //cornerLabelNew->setSizePolicy(QSizePolicy()); ++ m_wsMixers->setCornerWidget(_cornerLabelNew, Qt::TopLeftCorner); ++ connect ( _cornerLabelNew, SIGNAL( clicked() ), SLOT (newView() ) ); ++ } + } + + void KMixWindow::initPrefDlg() +@@ -210,15 +221,10 @@ + m_wsMixers = new KTabWidget(); + m_wsMixers->setDocumentMode(true); + setCentralWidget(m_wsMixers); +- m_wsMixers->setTabsClosable(true); ++ m_wsMixers->setTabsClosable(false); + connect (m_wsMixers, SIGNAL(tabCloseRequested(int)), SLOT(saveAndCloseView(int)) ); + + QPixmap cornerNewPM = KIconLoader::global()->loadIcon( "tab-new", KIconLoader::Toolbar, KIconLoader::SizeSmall ); +- _cornerLabelNew = new QPushButton(); +- _cornerLabelNew->setIcon(cornerNewPM); +- //cornerLabelNew->setSizePolicy(QSizePolicy()); +- m_wsMixers->setCornerWidget(_cornerLabelNew, Qt::TopLeftCorner); +- connect ( _cornerLabelNew, SIGNAL( clicked() ), SLOT (newView() ) ); + + connect( m_wsMixers, SIGNAL( currentChanged ( int ) ), SLOT( newMixerShown(int)) ); + +@@ -516,6 +522,7 @@ + addMixerWidget(mixer->id(), guiprof, -1); + } + else { ++ // did exist => remove and insert new guiprof at old position + int indexOfTab = m_wsMixers->indexOf(kmw); + if ( indexOfTab != -1 ) m_wsMixers->removeTab(indexOfTab); + delete kmw; +@@ -676,9 +683,9 @@ + m_wsMixers->removeTab(idx); + delete kmw; + +- if ( m_wsMixers->count() < 2 ) { +- m_wsMixers->setTabsClosable(false); +- } ++ bool isPulseAudio = kmw->mixer()->getDriverName() == "PulseAudio"; ++ m_wsMixers->setTabsClosable(!isPulseAudio && m_wsMixers->count() > 1); ++ + saveViewConfig(); + } + kDebug() << "Exit"; +@@ -874,9 +881,9 @@ + if ( kmw->getGuiprof()->getId() == m_defaultCardOnStart ) { + m_wsMixers->setCurrentWidget(kmw); + } +- if ( m_wsMixers->count() > 1 ) { +- m_wsMixers->setTabsClosable(true); +- } ++ ++ bool isPulseAudio = mixer->getDriverName() == "PulseAudio"; ++ m_wsMixers->setTabsClosable(!isPulseAudio && m_wsMixers->count() > 1); + m_dontSetDefaultCardOnStart = false; + + +Index: kmix/apps/kmix.h +=================================================================== +--- kmix/apps/kmix.h (revision 1226955) ++++ kmix/apps/kmix.h (revision 1226956) +@@ -116,7 +116,6 @@ + Qt::Orientation m_toplevelOrientation; + + KTabWidget *m_wsMixers; +- QPushButton* _cornerLabelNew; + + KMixPrefDlg *m_prefDlg; + KMixDockWidget *m_dockWidget; +Index: kmix/gui/viewbase.cpp +=================================================================== +--- kmix/gui/viewbase.cpp (revision 1226956) ++++ kmix/gui/viewbase.cpp (revision 1226957) +@@ -226,34 +226,35 @@ + + // Check the guiprofile... if it is not the fallback GUIProfile, then + // make sure that we add a specific entry for any devices not present. +- if ( 0 != _guiprof && GUIProfile::fallbackProfile(_mixer) != _guiprof ) { ++ if ( 0 != _guiprof && GUIProfile::fallbackProfile(_mixer) != _guiprof ) // TODO colin/cesken IMO calling GUIProfile::fallbackProfile(_mixer) is wrong, as it ALWAYS creates a new Object. fallbackProfile() would need to cache the created fallback profiles so this should make any sense. ++ { + kDebug(67100) << "Dynamic mixer " << _mixer->id() << " is NOT using Fallback GUIProfile. Checking to see if new controls are present"; + + QList<QString> new_mix_devices; + MixSet ms = _mixer->getMixSet(); + for (int i=0; i < ms.count(); ++i) ++ { + new_mix_devices.append("^" + ms[i]->id() + "$"); ++ kDebug(67100) << "new_mix_devices.append => " << ms[i]->id(); ++ } + ++ GUIProfile::ControlSet& ctlSet = _guiprof->getControls(); ++ + // std::vector<ProfControl*>::const_iterator itEnd = _guiprof->_controls.end(); + // for ( std::vector<ProfControl*>::const_iterator it = _guiprof->_controls.begin(); it != itEnd; ++it) + // new_mix_devices.removeAll((*it)->id); + // TODO Please check this change, Colin +- foreach ( ProfControl* pctl, _guiprof->getControls() ) { ++ foreach ( ProfControl* pctl, ctlSet ) { + new_mix_devices.removeAll(pctl->id); + } + + + if ( new_mix_devices.count() > 0 ) { + kDebug(67100) << "Found " << new_mix_devices.count() << " new controls. Adding to GUIProfile"; ++ QString sctlMatchAll("*"); + while ( new_mix_devices.count() > 0 ) { +- QString sctlMatchAll("*"); + QString new_mix_devices0 = new_mix_devices.takeAt(0); +- ProfControl* ctl = new ProfControl(new_mix_devices0, sctlMatchAll); +-// ctl->id = new_mix_devices.takeAt(0); +-// ctl->setSubcontrols(QString("*")); +-// ctl->tab = (_guiprof->tabs())[0]->name(); // Use the first tab... not ideal but should work most of the time; +-// ctl->show = "simple"; +- _guiprof->getControls().push_back(ctl); ++ ctlSet.push_back(new ProfControl(new_mix_devices0, sctlMatchAll)); + } + _guiprof->setDirty(); + } +Index: kmix/gui/viewbase.cpp +=================================================================== +--- kmix/gui/viewbase.cpp (revision 1226957) ++++ kmix/gui/viewbase.cpp (revision 1226958) +@@ -33,6 +33,7 @@ + #include <kactioncollection.h> + #include <ktoggleaction.h> + #include <kstandardaction.h> ++#include <kmessagebox.h> + // KMix + #include "dialogviewconfiguration.h" + #include "gui/guiprofile.h" +@@ -43,7 +44,7 @@ + + + ViewBase::ViewBase(QWidget* parent, const char* id, Mixer* mixer, Qt::WFlags f, ViewBase::ViewFlags vflags, GUIProfile *guiprof, KActionCollection *actionColletion) +- : QWidget(parent, f), _actions(actionColletion), _vflags(vflags), _guiprof(guiprof) ++ : QWidget(parent, f), _popMenu(NULL), _actions(actionColletion), _vflags(vflags), _guiprof(guiprof) + { + setObjectName(id); + m_viewId = id; +@@ -73,9 +74,11 @@ + } + } + } +- QAction *action = _localActionColletion->addAction("toggle_channels"); +- action->setText(i18n("&Channels")); +- connect(action, SIGNAL(triggered(bool) ), SLOT(configureView())); ++ if ( !_mixer->isDynamic() ) { ++ QAction *action = _localActionColletion->addAction("toggle_channels"); ++ action->setText(i18n("&Channels")); ++ connect(action, SIGNAL(triggered(bool) ), SLOT(configureView())); ++ } + connect ( _mixer, SIGNAL(controlChanged()), this, SLOT(refreshVolumeLevels()) ); + connect ( _mixer, SIGNAL(controlsReconfigured(const QString&)), this, SLOT(controlsReconfigured(const QString&)) ); + } +@@ -95,7 +98,7 @@ + + bool ViewBase::isValid() const + { +- return ( _mixSet->count() > 0 || _mixer->dynamic() ); ++ return ( _mixSet->count() > 0 || _mixer->isDynamic() ); + } + + void ViewBase::setIcons (bool on) { KMixToolBox::setIcons (_mdws, on ); } +@@ -170,6 +173,8 @@ + { + QAction *a; + ++ if ( _popMenu ) ++ delete _popMenu; + _popMenu = new KMenu( this ); + _popMenu->addTitle( KIcon( QLatin1String( "kmix" ) ), i18n("Device Settings" )); + +@@ -222,44 +227,8 @@ + + void ViewBase::setMixSet() + { +- if ( _mixer->dynamic()) { ++ if ( _mixer->isDynamic() ) { + +- // Check the guiprofile... if it is not the fallback GUIProfile, then +- // make sure that we add a specific entry for any devices not present. +- if ( 0 != _guiprof && GUIProfile::fallbackProfile(_mixer) != _guiprof ) // TODO colin/cesken IMO calling GUIProfile::fallbackProfile(_mixer) is wrong, as it ALWAYS creates a new Object. fallbackProfile() would need to cache the created fallback profiles so this should make any sense. +- { +- kDebug(67100) << "Dynamic mixer " << _mixer->id() << " is NOT using Fallback GUIProfile. Checking to see if new controls are present"; +- +- QList<QString> new_mix_devices; +- MixSet ms = _mixer->getMixSet(); +- for (int i=0; i < ms.count(); ++i) +- { +- new_mix_devices.append("^" + ms[i]->id() + "$"); +- kDebug(67100) << "new_mix_devices.append => " << ms[i]->id(); +- } +- +- GUIProfile::ControlSet& ctlSet = _guiprof->getControls(); +- +-// std::vector<ProfControl*>::const_iterator itEnd = _guiprof->_controls.end(); +-// for ( std::vector<ProfControl*>::const_iterator it = _guiprof->_controls.begin(); it != itEnd; ++it) +-// new_mix_devices.removeAll((*it)->id); +- // TODO Please check this change, Colin +- foreach ( ProfControl* pctl, ctlSet ) { +- new_mix_devices.removeAll(pctl->id); +- } +- +- +- if ( new_mix_devices.count() > 0 ) { +- kDebug(67100) << "Found " << new_mix_devices.count() << " new controls. Adding to GUIProfile"; +- QString sctlMatchAll("*"); +- while ( new_mix_devices.count() > 0 ) { +- QString new_mix_devices0 = new_mix_devices.takeAt(0); +- ctlSet.push_back(new ProfControl(new_mix_devices0, sctlMatchAll)); +- } +- _guiprof->setDirty(); +- } +- } +- + // We need to delete the current MixDeviceWidgets so we can redraw them + while (!_mdws.isEmpty()) { + QWidget* mdw = _mdws.last(); +@@ -280,6 +249,8 @@ + */ + void ViewBase::configureView() { + ++ Q_ASSERT( !_mixer->isDynamic() ); ++ + DialogViewConfiguration* dvc = new DialogViewConfiguration(0, *this); + dvc->show(); + // !! The dialog is modal. Does it delete itself? +@@ -302,6 +273,10 @@ + kDebug(67100) << "KMixToolBox::loadView() grp=" << grp.toAscii(); + + static char guiComplexity[3][20] = { "simple", "extended", "all" }; ++ ++ // Certain bits are not saved for dynamic mixers (e.g. PulseAudio) ++ bool dynamic = _mixer->isDynamic(); ++ + for ( int tries = 0; tries < 3; tries++ ) + { + bool atLeastOneControlIsShown = false; +@@ -315,12 +290,12 @@ + Workaround: If found, write back correct group name. + */ + MixDeviceWidget* mdw = (MixDeviceWidget*)qmdw; +- QString devgrp; +- devgrp.sprintf( "%s.%s.%s", grp.toAscii().data(), mdw->mixDevice()->mixer()->id().toAscii().data(), mdw->mixDevice()->id().toAscii().data() ); ++ MixDevice* md = mdw->mixDevice(); ++ ++ QString devgrp = QString("%1.%2.%3").arg(grp).arg(md->mixer()->id()).arg(md->id()); + KConfigGroup devcg = config->group( devgrp ); + +- QString buggyDevgrp; +- buggyDevgrp.sprintf( "%s.%s.%s", grp.toAscii().data(), view->id().toAscii().data(), mdw->mixDevice()->id().toAscii().data() ); ++ QString buggyDevgrp = QString("%1.%2.%3").arg(grp).arg(view->id()).arg(md->id()); + KConfigGroup buggyDevgrpCG = config->group( buggyDevgrp ); + if ( buggyDevgrpCG.exists() ) { + buggyDevgrpCG.copyTo(&devcg); +@@ -335,7 +310,7 @@ + } + + bool mdwEnabled = false; +- if ( devcg.hasKey("Show") ) ++ if ( !dynamic && devcg.hasKey("Show") ) + { + mdwEnabled = ( true == devcg.readEntry("Show", true) ); + //kDebug() << "Load devgrp" << devgrp << "show=" << mdwEnabled; +@@ -382,20 +357,23 @@ + QString grp = "View."; + grp += view->id(); + // KConfigGroup cg = config->group( grp ); +- kDebug(67100) << "KMixToolBox::saveView() grp=" << grp.toAscii(); ++ kDebug(67100) << "KMixToolBox::saveView() grp=" << grp; + ++ // Certain bits are not saved for dynamic mixers (e.g. PulseAudio) ++ bool dynamic = _mixer->isDynamic(); ++ + for (int i=0; i < view->_mdws.count(); ++i ){ + QWidget *qmdw = view->_mdws[i]; + if ( qmdw->inherits("MixDeviceWidget") ) + { + MixDeviceWidget* mdw = (MixDeviceWidget*)qmdw; ++ MixDevice* md = mdw->mixDevice(); + + //kDebug(67100) << " grp=" << grp.toAscii(); + //kDebug(67100) << " mixer=" << view->id().toAscii(); + //kDebug(67100) << " mdwPK=" << mdw->mixDevice()->id().toAscii(); + +- QString devgrp; +- devgrp.sprintf( "%s.%s.%s", grp.toAscii().data(), mdw->mixDevice()->mixer()->id().toAscii().data(), mdw->mixDevice()->id().toAscii().data() ); ++ QString devgrp = QString("%1.%2.%3").arg(grp).arg(md->mixer()->id()).arg(md->id()); + KConfigGroup devcg = config->group( devgrp ); + + if ( mdw->inherits("MDWSlider") ) +@@ -403,15 +381,19 @@ + // only sliders have the ability to split apart in mutliple channels + devcg.writeEntry( "Split", ! mdw->isStereoLinked() ); + } +- devcg.writeEntry( "Show" , mdw->isVisibleTo(view) ); +-kDebug() << "Save devgrp" << devgrp << "show=" << mdw->isVisibleTo(view); ++ if ( !dynamic ) { ++ devcg.writeEntry( "Show" , mdw->isVisibleTo(view) ); ++ kDebug() << "Save devgrp" << devgrp << "show=" << mdw->isVisibleTo(view); ++ } + + } // inherits MixDeviceWidget + } // for all MDW's + +- kDebug(67100) << "GUIProfile is dirty: " << guiProfile()->isDirty(); +- if ( guiProfile()->isDirty() ) { +- guiProfile()->writeProfile(); ++ if ( !dynamic ) { ++ // We do not save GUIProfiles (as they cannot be customised) for dynamic mixers (e.g. PulseAudio) ++ kDebug(67100) << "GUIProfile is dirty: " << guiProfile()->isDirty(); ++ if ( guiProfile()->isDirty() ) ++ guiProfile()->writeProfile(); + } + } + +Index: kmix/gui/mdwslider.cpp +=================================================================== +--- kmix/gui/mdwslider.cpp (revision 1226957) ++++ kmix/gui/mdwslider.cpp (revision 1226958) +@@ -86,10 +86,14 @@ + KToggleAction *taction = _mdwActions->add<KToggleAction>( "stereo" ); + taction->setText( i18n("&Split Channels") ); + connect( taction, SIGNAL( triggered(bool) ), SLOT( toggleStereoLinked() ) ); +- KAction *action = _mdwActions->add<KToggleAction>( "hide" ); +- action->setText( i18n("&Hide") ); +- connect( action, SIGNAL( triggered(bool) ), SLOT( setDisabled() ) ); + ++ KAction *action; ++ if ( ! m_mixdevice->mixer()->isDynamic() ) { ++ action = _mdwActions->add<KToggleAction>( "hide" ); ++ action->setText( i18n("&Hide") ); ++ connect( action, SIGNAL( triggered(bool) ), SLOT( setDisabled() ) ); ++ } ++ + if( m_mixdevice->playbackVolume().hasSwitch() ) { + taction = _mdwActions->add<KToggleAction>( "mute" ); + taction->setText( i18n("&Muted") ); +@@ -129,8 +133,8 @@ + #ifdef __GNUC__ + #warning GLOBAL SHORTCUTS ARE NOW ASSIGNED TO ALL CONTROLS, as enableGlobalShortcut(), has not been committed + #endif +- if ( ! mixDevice()->isEthereal() ) { +- // virtual / ethereal controls won't get shortcuts ++ if ( ! mixDevice()->mixer()->isDynamic() ) { ++ // virtual / dynamic controls won't get shortcuts + b->setGlobalShortcut(dummyShortcut); // -<- enableGlobalShortcut() is not there => use workaround + // b->enableGlobalShortcut(); + connect( b, SIGNAL( triggered(bool) ), SLOT( increaseVolume() ) ); +@@ -143,8 +147,8 @@ + #ifdef __GNUC__ + #warning GLOBAL SHORTCUTS ARE NOW ASSIGNED TO ALL CONTROLS, as enableGlobalShortcut(), has not been committed + #endif +- if ( ! mixDevice()->isEthereal() ) { +- // virtual / ethereal controls won't get shortcuts ++ if ( ! mixDevice()->mixer()->isDynamic() ) { ++ // virtual / dynamic controls won't get shortcuts + b->setGlobalShortcut(dummyShortcut); // -<- enableGlobalShortcut() is not there => use workaround + // b->enableGlobalShortcut(); + connect( b, SIGNAL( triggered(bool) ), SLOT( decreaseVolume() ) ); +@@ -157,8 +161,8 @@ + #ifdef __GNUC__ + #warning GLOBAL SHORTCUTS ARE NOW ASSIGNED TO ALL CONTROLS, as enableGlobalShortcut(), has not been committed + #endif +- if ( ! mixDevice()->isEthereal() ) { +- // virtual / ethereal controls won't get shortcuts ++ if ( ! mixDevice()->mixer()->isDynamic() ) { ++ // virtual / dynamic controls won't get shortcuts + b->setGlobalShortcut(dummyShortcut); // -<- enableGlobalShortcut() is not there => use workaround + // b->enableGlobalShortcut(); + connect( b, SIGNAL( triggered(bool) ), SLOT( toggleMuted() ) ); +Index: kmix/gui/viewdockareapopup.h +=================================================================== +--- kmix/gui/viewdockareapopup.h (revision 1226957) ++++ kmix/gui/viewdockareapopup.h (revision 1226958) +@@ -24,7 +24,6 @@ + #include "viewbase.h" + + class QGridLayout; +-class QPushButton; + class QWidget; + + class Mixer; +@@ -48,8 +47,6 @@ + + protected: + KMixWindow *_dock; +- //MixDevice *_dockDevice; +- QPushButton *_showPanelBox; + + void wheelEvent ( QWheelEvent * e ); + virtual void _setMixSet(); +Index: kmix/gui/viewsliders.cpp +=================================================================== +--- kmix/gui/viewsliders.cpp (revision 1226957) ++++ kmix/gui/viewsliders.cpp (revision 1226958) +@@ -148,7 +148,7 @@ + { + const MixSet& mixset = _mixer->getMixSet(); + +- if ( _mixer->dynamic() ) { ++ if ( _mixer->isDynamic() ) { + // We will be recreating our sliders, so make sure we trash all the separators too. + qDeleteAll(_separators); + _separators.clear(); +Index: kmix/gui/guiprofile.cpp +=================================================================== +--- kmix/gui/guiprofile.cpp (revision 1226957) ++++ kmix/gui/guiprofile.cpp (revision 1226958) +@@ -158,8 +158,12 @@ + { + GUIProfile* guiprof = 0; + +- if ( mixer == 0 || profileName.isEmpty() ) { ++ if ( mixer == 0 || profileName.isEmpty() ) + return 0; ++ ++ if ( mixer->isDynamic() ) { ++ kDebug(67100) << "GUIProfile::find() Not loading GUIProfile for Dynamic Mixer (e.g. PulseAudio)"; ++ return 0; + } + + QString requestedProfileName; +Index: kmix/gui/viewbase.h +=================================================================== +--- kmix/gui/viewbase.h (revision 1226957) ++++ kmix/gui/viewbase.h (revision 1226958) +@@ -133,7 +133,7 @@ + + ViewFlags _vflags; + GUIProfile* _guiprof; +- KActionCollection *_localActionColletion; ++ KActionCollection *_localActionColletion; + + virtual void _setMixSet() = 0; + +Index: kmix/gui/viewdockareapopup.cpp +=================================================================== +--- kmix/gui/viewdockareapopup.cpp (revision 1226957) ++++ kmix/gui/viewdockareapopup.cpp (revision 1226958) +@@ -88,8 +88,8 @@ + { + // kDebug(67100) << "ViewDockAreaPopup::setMixSet()\n"; + +- if ( _mixer->dynamic() ) { +- // Our _layoutMDW now should only contain spacer widgets from the QSpacerItems's in add() below. ++ if ( _mixer->isDynamic() ) { ++ // Our _layoutMDW now should only contain spacer widgets from the QSpacerItem's in add() below. + // We need to trash those too otherwise all sliders gradually migrate away from the edge :p + QLayoutItem *li; + while ( ( li = _layoutMDW->takeAt(0) ) ) +@@ -114,9 +114,9 @@ + QString matchAllPlaybackAndTheCswitch("pvolume,pswitch,cswitch"); + ProfControl *pctl = new ProfControl( dummyMatchAll, matchAllPlaybackAndTheCswitch); + MixDeviceWidget *mdw = new MDWSlider( +- md, // only 1 device. This is actually _dockDevice ++ md, // only 1 device. + true, // Show Mute LED +- false, // Show Record LED ++ false, // Show Record LED + false, // Small + Qt::Vertical, // Direction: only 1 device, so doesn't matter + this, // parent +@@ -128,10 +128,10 @@ + _layoutMDW->addWidget( mdw, 0, 1 ); + + // Add button to show main panel +- _showPanelBox = new QPushButton( i18n("Mixer"), this ); +- _showPanelBox->setObjectName( QLatin1String("MixerPanel" )); +- connect ( _showPanelBox, SIGNAL( clicked() ), SLOT( showPanelSlot() ) ); +- _layoutMDW->addWidget( _showPanelBox, 1, 0, 1, 3 ); ++ QPushButton *pb = new QPushButton( i18n("Mixer"), this ); ++ pb->setObjectName( QLatin1String("MixerPanel" )); ++ connect ( pb, SIGNAL( clicked() ), SLOT( showPanelSlot() ) ); ++ _layoutMDW->addWidget( pb, 1, 0, 1, 3 ); + + return mdw; + } +Index: kmix/core/mixdevice.h +=================================================================== +--- kmix/core/mixdevice.h (revision 1226957) ++++ kmix/core/mixdevice.h (revision 1226958) +@@ -157,15 +157,6 @@ + _artificial = artificial; + } + +- bool isEthereal() const +- { +- return _ethereal; +- } +- void setEthereal(bool _ethereal) +- { +- this->_ethereal = _ethereal; +- } +- + void setControlProfile(ProfControl* control); + ProfControl* controlProfile(); + +@@ -191,14 +182,12 @@ + int _enumCurrentId; + QList<QString> _enumValues; // A MixDevice, that is an ENUM, has these _enumValues + +- //bool _doNotRestore; + // A virtual control. It will not be saved/restored and/or doesn't get shortcuts +- // Actually we discriminate those "virtual" controls in artificial controls and ethereal controls: ++ // Actually we discriminate those "virtual" controls in artificial controls and dynamic controls: + // Type Shortcut Restore + // Artificial: yes no Virtual::GlobalMaster or Virtual::CaptureGroup_3 (controls that are constructed artificially from other controls) +- // Ethereal : no no Controls that come and go, like Pulse Stream controls ++ // Dynamic : no no Controls that come and go, like Pulse Stream controls + bool _artificial; +- bool _ethereal; + MixSet *_moveDestinationMixSet; + QString _iconName; + +Index: kmix/core/mixer.cpp +=================================================================== +--- kmix/core/mixer.cpp (revision 1226957) ++++ kmix/core/mixer.cpp (revision 1226958) +@@ -748,7 +748,7 @@ + m_dynamic = dynamic; + } + +-bool Mixer::dynamic() ++bool Mixer::isDynamic() + { + return m_dynamic; + } +Index: kmix/core/mixer.h +=================================================================== +--- kmix/core/mixer.h (revision 1226957) ++++ kmix/core/mixer.h (revision 1226958) +@@ -164,7 +164,7 @@ + + /// Says if we are dynamic (e.g. widgets can come and go) + virtual void setDynamic( bool dynamic = true ); +- virtual bool dynamic(); ++ virtual bool isDynamic(); + + virtual bool moveStream( const QString id, const QString& destId ); + +Index: kmix/core/mixdevice.cpp +=================================================================== +--- kmix/core/mixdevice.cpp (revision 1226957) ++++ kmix/core/mixdevice.cpp (revision 1226958) +@@ -23,6 +23,7 @@ + #include <klocale.h> + + #include "core/mixdevice.h" ++#include "core/mixer.h" + #include "gui/guiprofile.h" + #include "core/volume.h" + +@@ -96,14 +97,12 @@ + + MixDevice::MixDevice( Mixer* mixer, const QString& id, const QString& name, const QString& iconName, MixSet* moveDestinationMixSet ) + { +- // doNotRestore is superseded by the more generic concepts isEthereal(), isArtificial() + init(mixer, id, name, iconName, moveDestinationMixSet); + } + + void MixDevice::init( Mixer* mixer, const QString& id, const QString& name, const QString& iconName, MixSet* moveDestinationMixSet ) + { + _artificial = false; +- _ethereal = false; + _mixer = mixer; + _id = id; + if( name.isEmpty() ) +@@ -117,9 +116,10 @@ + _moveDestinationMixSet = moveDestinationMixSet; + if ( _id.contains(' ') ) { + // The key is used in the config file. It MUST NOT contain spaces +- kError(67100) << "MixDevice::setId(\"" << id << "\") . Invalid key - it might not contain spaces" << endl; ++ kError(67100) << "MixDevice::setId(\"" << id << "\") . Invalid key - it must not contain spaces" << endl; + _id.replace(' ', '_'); + } ++ kDebug(67100) << "MixDevice::init() _id=" << _id; + } + + void MixDevice::addPlaybackVolume(Volume &playbackVol) +@@ -216,11 +216,10 @@ + */ + void MixDevice::read( KConfig *config, const QString& grp ) + { +- if ( isEthereal() || isArtificial() ) { ++ if ( _mixer->isDynamic() || isArtificial() ) { + kDebug(67100) << "MixDevice::read(): This MixDevice does not permit volume restoration (i.e. because it is handled lower down in the audio stack). Ignoring."; + } else { +- QString devgrp; +- devgrp.sprintf( "%s.Dev%s", grp.toAscii().data(), _id.toAscii().data() ); ++ QString devgrp = QString("%1.Dev%2").arg(grp).arg(_id); + KConfigGroup cg = config->group( devgrp ); + //kDebug(67100) << "MixDevice::read() of group devgrp=" << devgrp; + +@@ -264,11 +263,10 @@ + */ + void MixDevice::write( KConfig *config, const QString& grp ) + { +- if (isEthereal() || isArtificial()) { ++ if (_mixer->isDynamic() || isArtificial()) { + kDebug(67100) << "MixDevice::write(): This MixDevice does not permit volume saving (i.e. because it is handled lower down in the audio stack). Ignoring."; + } else { +- QString devgrp; +- devgrp.sprintf( "%s.Dev%s", grp.toAscii().data(), _id.toAscii().data() ); ++ QString devgrp = QString("%1.Dev%2").arg(grp).arg(_id); + KConfigGroup cg = config->group(devgrp); + // kDebug(67100) << "MixDevice::write() of group devgrp=" << devgrp; + +Index: kmix/apps/kmix.cpp +=================================================================== +--- kmix/apps/kmix.cpp (revision 1226957) ++++ kmix/apps/kmix.cpp (revision 1226958) +@@ -182,21 +182,20 @@ + + void KMixWindow::initActionsAfterInitMixer() + { +- bool isPulseAudio = false; +- // Add "launch_pavucontrol" to menu, if Pulseaudio backend is in use ++ // Only show the new tab widget if some of the mixers are not Dynamic. ++ // The GUI that then pops up could then make a new mixer from a dynamic one, ++ // if mixed dynamic and non-dynamic mixers were allowed, but this is generally not the case. ++ bool allDynamic = true; + foreach( Mixer* mixer, Mixer::mixers() ) + { +- if ( mixer->getDriverName() == "PulseAudio") ++ if ( !mixer->isDynamic() ) + { +- isPulseAudio = true; +- KAction* action = actionCollection()->addAction( "launch_pavucontrol" ); +- action->setText( i18n( "Audio setup (&Pulseaudio)" ) ); +- connect(action, SIGNAL(triggered(bool) ), SLOT( slotPavucontrolExec() )); ++ allDynamic = false; + break; + } + } + +- if (! isPulseAudio ) ++ if (! allDynamic ) + { + QPixmap cornerNewPM = KIconLoader::global()->loadIcon( "tab-new", KIconLoader::Toolbar, KIconLoader::SizeSmall ); + QPushButton* _cornerLabelNew = new QPushButton(); +@@ -339,8 +338,11 @@ + + // The following loop is necessary for the case that the user has hidden all views for a Mixer instance. + // Otherwise we would not save the Meta information (step -2- below for that mixer. +- foreach ( Mixer* mixer, Mixer::mixers() ) +- mixerViews[mixer->id()]; // just insert a map entry ++ // We also do not save dynamic mixers (e.g. PulseAudio) ++ foreach ( Mixer* mixer, Mixer::mixers() ) { ++ if ( !mixer->isDynamic() ) ++ mixerViews[mixer->id()]; // just insert a map entry ++ } + + // -1- Save the views themselves + for ( int i=0; i<m_wsMixers->count() ; ++i ) { +@@ -351,8 +353,10 @@ + // Otherwise the user will be confused afer re-plugging the card (as the config was not saved). + mw->saveConfig( KGlobal::config().data() ); + // add the view to the corresponding mixer list, so we can save a views-per-mixer list below +- QStringList& qsl = mixerViews[mw->mixer()->id()]; +- qsl.append(mw->getGuiprof()->getId()); ++ if ( !mw->mixer()->isDynamic() ) { ++ QStringList& qsl = mixerViews[mw->mixer()->id()]; ++ qsl.append(mw->getGuiprof()->getId()); ++ } + } + } + +@@ -539,22 +543,29 @@ + continue; // OK, this mixer already has a profile => skip it + } + // No TAB YET => This should mean KMix is just started, or the user has just plugged in a card +- bool profileListHasKey = pconfig.hasKey( mixer->id() ); // <<< SHOULD be before the following line +- QStringList profileList = pconfig.readEntry( mixer->id(), QStringList() ); ++ bool profileListHasKey = false; ++ QStringList profileList; ++ bool aProfileWasAddedSucesufully = false; + +- bool aProfileWasAddedSucesufully = false; +- foreach ( QString profileId, profileList) +- { +- // This handles the profileList form the kmixrc +- kDebug() << "Now searching for profile: " << profileId ; +- GUIProfile* guiprof = GUIProfile::find(mixer, profileId, true, false); // ### Card specific profile ### +- if ( guiprof != 0 ) { +- addMixerWidget(mixer->id(), guiprof, -1); +- aProfileWasAddedSucesufully = true; ++ if ( !mixer->isDynamic() ) { ++ // We do not support save profiles for dynamic mixers (i.e. PulseAudio) ++ ++ profileListHasKey = pconfig.hasKey( mixer->id() ); // <<< SHOULD be before the following line ++ profileList = pconfig.readEntry( mixer->id(), QStringList() ); ++ ++ foreach ( QString profileId, profileList) ++ { ++ // This handles the profileList form the kmixrc ++ kDebug() << "Now searching for profile: " << profileId ; ++ GUIProfile* guiprof = GUIProfile::find(mixer, profileId, true, false); // ### Card specific profile ### ++ if ( guiprof != 0 ) { ++ addMixerWidget(mixer->id(), guiprof, -1); ++ aProfileWasAddedSucesufully = true; ++ } ++ else { ++ kError() << "Cannot load profile " << profileId << " . It was removed by the user, or the KMix config file is defective."; ++ } + } +- else { +- kError() << "Cannot load profile " << profileId << " . It was removed by the user, or the KMix config file is defective."; +- } + } + + // The we_need_a_fallback case is a bit tricky. Please ask the author (cesken) before even considering to change the code. +@@ -568,11 +579,17 @@ + + // Lets try a bunch of fallback strategies: + GUIProfile* guiprof = 0; ++ if ( !mixer->isDynamic() ) { ++ // We know that GUIProfile::find() will return 0 if the mixer is dynamic, so don't bother checking. ++ kDebug() << "Attempting to find a card-specific GUI Profile for the mixer " << mixer->id(); + guiprof = GUIProfile::find(mixer, QString("default"), false, false); // ### Card specific profile ### +- if ( guiprof == 0 ) { +- guiprof = GUIProfile::find(mixer, QString("default"), false, true); // ### Card unspecific profile ### ++ if ( guiprof == 0 ) { ++ kDebug() << "Not found. Attempting to find a generic GUI Profile for the mixer " << mixer->id(); ++ guiprof = GUIProfile::find(mixer, QString("default"), false, true); // ### Card unspecific profile ### ++ } + } + if ( guiprof == 0) { ++ kDebug() << "Using fallback GUI Profile for the mixer " << mixer->id(); + // This means there is neither card specific nor card unspecific profile + // This is the case for some backends (as they don't ship profiles). + guiprof = GUIProfile::fallbackProfile(mixer); +@@ -683,8 +700,7 @@ + m_wsMixers->removeTab(idx); + delete kmw; + +- bool isPulseAudio = kmw->mixer()->getDriverName() == "PulseAudio"; +- m_wsMixers->setTabsClosable(!isPulseAudio && m_wsMixers->count() > 1); ++ m_wsMixers->setTabsClosable(!kmw->mixer()->isDynamic() && m_wsMixers->count() > 1); + + saveViewConfig(); + } +@@ -882,8 +898,7 @@ + m_wsMixers->setCurrentWidget(kmw); + } + +- bool isPulseAudio = mixer->getDriverName() == "PulseAudio"; +- m_wsMixers->setTabsClosable(!isPulseAudio && m_wsMixers->count() > 1); ++ m_wsMixers->setTabsClosable(!mixer->isDynamic() && m_wsMixers->count() > 1); + m_dontSetDefaultCardOnStart = false; + + +@@ -1071,12 +1086,6 @@ + KMessageBox::information( 0, m_hwInfoString, i18n("Mixer Hardware Information") ); + } + +-void KMixWindow::slotPavucontrolExec() +-{ +- QStringList args("pavucontrol"); +- forkExec(args); +-} +- + void KMixWindow::slotKdeAudioSetupExec() + { + QStringList args; +@@ -1133,6 +1142,12 @@ + m_defaultCardOnStart = kmw->getGuiprof()->getId(); + // As switching the tab does NOT mean switching the master card, we do not need to update dock icon here. + // It would lead to unnecesary flickering of the (complete) dock area. ++ ++ // We only show the "Configure Channels..." menu item if the mixer is not dynamic ++ ViewBase* view = kmw->currentView(); ++ QAction* action = actionCollection()->action( "toggle_channels_currentview" ); ++ if (view && action) ++ action->setVisible( !view->getMixer()->isDynamic() ); + } + } + +Index: kmix/apps/kmix.h +=================================================================== +--- kmix/apps/kmix.h (revision 1226957) ++++ kmix/apps/kmix.h (revision 1226958) +@@ -136,7 +136,6 @@ + private slots: + void saveConfig(); + void slotHWInfo(); +- void slotPavucontrolExec(); + void slotKdeAudioSetupExec(); + void slotConfigureCurrentView(); + void slotSelectMaster(); +Index: kmix/kmixui.rc +=================================================================== +--- kmix/kmixui.rc (revision 1226957) ++++ kmix/kmixui.rc (revision 1226958) +@@ -17,7 +17,6 @@ + <Action name="toggle_channels_currentview" append="save_merge"/> + <Action name="select_master" append="save_merge"/> + <Action name="launch_kdesoundsetup" append="save_merge"/> +- <Action name="launch_pavucontrol" append="save_merge"/> + </Menu> + <Menu name="help" append="about_merge"><text>&Help</text> + <Action name="hwinfo"/> +Index: kmix/backends/mixer_backend.cpp +=================================================================== +--- kmix/backends/mixer_backend.cpp (revision 1226957) ++++ kmix/backends/mixer_backend.cpp (revision 1226958) +@@ -48,7 +48,7 @@ + bool Mixer_Backend::openIfValid() { + bool valid = false; + int ret = open(); +- if ( ret == 0 && (m_mixDevices.count() > 0 || _mixer->dynamic())) { ++ if ( ret == 0 && (m_mixDevices.count() > 0 || _mixer->isDynamic())) { + valid = true; + // A better ID is now calculated in mixertoolbox.cpp, and set via setID(), + // but we want a somehow usable fallback just in case. +@@ -139,7 +139,7 @@ + return m_mixDevices.at(0); // Backend has NOT set a recommended master. Evil backend => lets help out. + } //first device (if exists) + else { +- if ( !_mixer->dynamic()) { ++ if ( !_mixer->isDynamic()) { + // This should never ever happen, as KMix doe NOT accept soundcards without controls + kError(67100) << "Mixer_Backend::recommendedMaster(): returning invalid master. This is a bug in KMix. Please file a bug report stating how you produced this." << endl; + } +Index: kmix/backends/mixer_pulse.cpp +=================================================================== +--- kmix/backends/mixer_pulse.cpp (revision 1226957) ++++ kmix/backends/mixer_pulse.cpp (revision 1226958) +@@ -36,6 +36,8 @@ + #define KMIXPA_APP_CAPTURE 3 + #define KMIXPA_WIDGET_MAX KMIXPA_APP_CAPTURE + ++#define KMIXPA_EVENT_KEY "sink-input-by-media-role:event" ++ + static unsigned int refcount = 0; + static pa_glib_mainloop *s_mainloop = NULL; + static pa_context *s_context = NULL; +@@ -189,7 +191,7 @@ + + devinfo s; + s.index = s.device_index = i->index; +- s.name = QString(i->name).replace(' ', '_'); ++ s.name = QString::fromUtf8(i->name).replace(' ', '_'); + s.description = QString::fromUtf8(i->description); + s.icon_name = QString::fromUtf8(pa_proplist_gets(i->proplist, PA_PROP_DEVICE_ICON_NAME)); + s.volume = i->volume; +@@ -242,7 +244,7 @@ + + devinfo s; + s.index = s.device_index = i->index; +- s.name = QString(i->name).replace(' ', '_'); ++ s.name = QString::fromUtf8(i->name).replace(' ', '_'); + s.description = QString::fromUtf8(i->description); + s.icon_name = QString::fromUtf8(pa_proplist_gets(i->proplist, PA_PROP_DEVICE_ICON_NAME)); + s.volume = i->volume; +@@ -307,26 +309,28 @@ + + const char *t; + if ((t = pa_proplist_gets(i->proplist, "module-stream-restore.id"))) { +- if (strcmp(t, "sink-input-by-media-role:event") == 0) { ++ if (strcmp(t, KMIXPA_EVENT_KEY) == 0) { + kWarning(67100) << "Ignoring sink-input due to it being designated as an event and thus handled by the Event slider"; + return; + } + } + +- QString prefix = QString("%1: ").arg(i18n("Unknown Application")); ++ QString appname = i18n("Unknown Application"); + if (clients.contains(i->client)) +- prefix = QString("%1: ").arg(clients[i->client]); ++ appname = clients[i->client]; + ++ QString prefix = QString("%1: ").arg(appname); ++ + devinfo s; + s.index = i->index; + s.device_index = i->sink; + s.description = prefix + QString::fromUtf8(i->name); +- s.name = QString("stream:") + i->index; ++ s.name = QString("stream:") + QString::number(i->index); //appname.replace(' ', '_').toLower(); + s.icon_name = getIconNameFromProplist(i->proplist); + s.volume = i->volume; + s.channel_map = i->channel_map; + s.mute = !!i->mute; +- s.stream_restore_rule = t; ++ s.stream_restore_rule = QString::fromUtf8(t); + + translateMasksAndMaps(s); + +@@ -370,22 +374,24 @@ + return; + } + +- QString prefix = QString("%1: ").arg(i18n("Unknown Application")); ++ QString appname = i18n("Unknown Application"); + if (clients.contains(i->client)) +- prefix = QString("%1: ").arg(clients[i->client]); ++ appname = clients[i->client]; + ++ QString prefix = QString("%1: ").arg(appname); ++ + devinfo s; + s.index = i->index; + s.device_index = i->source; + s.description = prefix + QString::fromUtf8(i->name); +- s.name = QString("stream:") + i->index; ++ s.name = QString("stream:") + QString::number(i->index); //appname.replace(' ', '_').toLower(); + s.icon_name = getIconNameFromProplist(i->proplist); + //s.volume = i->volume; + s.volume = captureDevices[i->source].volume; + s.channel_map = i->channel_map; + //s.mute = !!i->mute; + s.mute = captureDevices[i->source].mute; +- s.stream_restore_rule = pa_proplist_gets(i->proplist, "module-stream-restore.id"); ++ s.stream_restore_rule = QString::fromUtf8(pa_proplist_gets(i->proplist, "module-stream-restore.id")); + + translateMasksAndMaps(s); + +@@ -407,7 +413,7 @@ + } + + +-static devinfo create_role_devinfo(const char* name) { ++static devinfo create_role_devinfo(QString name) { + + Q_ASSERT(s_RestoreRules.contains(name)); + +@@ -436,9 +442,10 @@ + + if (eol > 0) { + dec_outstanding(c); ++ + // Special case: ensure that our media events exists. + // On first login by a new users, this wont be in our database so we should create it. +- if (!outputRoles.contains(PA_INVALID_INDEX)) { ++ if (!s_RestoreRules.contains(KMIXPA_EVENT_KEY)) { + // Create a fake rule + restoreRule rule; + rule.channel_map.channels = 1; +@@ -447,37 +454,56 @@ + rule.volume.values[0] = PA_VOLUME_NORM; + rule.mute = false; + rule.device = ""; +- s_RestoreRules["sink-input-by-media-role:event"] = rule; ++ s_RestoreRules[KMIXPA_EVENT_KEY] = rule; ++ kDebug(67100) << "Initialising restore rule for new user: " << i18n("Event Sounds"); ++ } + +- devinfo s = create_role_devinfo("sink-input-by-media-role:event"); +- outputRoles[s.index] = s; +- kDebug(67100) << "Initialising restore rule for new user: " << s.description; ++ if (s_mixers.contains(KMIXPA_APP_PLAYBACK)) { ++ // If we have rules, it will be created below... but if no rules ++ // then we add it here. ++ if (!outputRoles.contains(PA_INVALID_INDEX)) { ++ devinfo s = create_role_devinfo(KMIXPA_EVENT_KEY); ++ outputRoles[s.index] = s; + +- if (s_mixers.contains(KMIXPA_APP_PLAYBACK)) + s_mixers[KMIXPA_APP_PLAYBACK]->addWidget(s.index); ++ } ++ ++ s_mixers[KMIXPA_APP_PLAYBACK]->triggerUpdate(); + } + +- if (s_mixers.contains(KMIXPA_APP_PLAYBACK)) +- s_mixers[KMIXPA_APP_PLAYBACK]->triggerUpdate(); + return; + } + +- kDebug(67100) << "Got some info about restore rule: " << i->name << i->device; ++ ++ QString name = QString::fromUtf8(i->name); ++ kDebug(67100) << QString("Got some info about restore rule: '%1' (Device: %2)").arg(name).arg(i->device ? i->device : "None"); + restoreRule rule; + rule.channel_map = i->channel_map; + rule.volume = i->volume; + rule.mute = !!i->mute; + rule.device = i->device; +- s_RestoreRules[i->name] = rule; + +- // We only want to know about Sound Events for now... +- if (strcmp(i->name, "sink-input-by-media-role:event") == 0) { +- devinfo s = create_role_devinfo(i->name); +- bool is_new = !outputRoles.contains(s.index); +- outputRoles[s.index] = s; ++ if (rule.channel_map.channels < 1 && name == KMIXPA_EVENT_KEY) { ++ // Stream restore rules may not have valid volumes/channel maps (as these are optional) ++ // but we need a valid volume+channelmap for our events sounds so fix it up. ++ rule.channel_map.channels = 1; ++ rule.channel_map.map[0] = PA_CHANNEL_POSITION_MONO; ++ rule.volume.channels = 1; ++ rule.volume.values[0] = PA_VOLUME_NORM; ++ } + +- if (is_new && s_mixers.contains(KMIXPA_APP_PLAYBACK)) +- s_mixers[KMIXPA_APP_PLAYBACK]->addWidget(s.index); ++ s_RestoreRules[name] = rule; ++ ++ if (s_mixers.contains(KMIXPA_APP_PLAYBACK)) { ++ // We only want to know about Sound Events for now... ++ if (name == KMIXPA_EVENT_KEY) { ++ devinfo s = create_role_devinfo(name); ++ bool is_new = !outputRoles.contains(s.index); ++ outputRoles[s.index] = s; ++ ++ if (is_new) ++ s_mixers[KMIXPA_APP_PLAYBACK]->addWidget(s.index); ++ } + } + } + +@@ -788,7 +814,6 @@ + Volume v(dev.chanMask, PA_VOLUME_NORM, PA_VOLUME_MUTED, true, false); + setVolumeFromPulse(v, dev); + MixDevice* md = new MixDevice( _mixer, dev.name, dev.description, dev.icon_name, ms); +- md->setEthereal(true); + md->addPlaybackVolume(v); + md->setMuted(dev.mute); + m_mixDevices.append(md); +@@ -1095,10 +1120,10 @@ + { + restoreRule &rule = s_RestoreRules[iter->stream_restore_rule]; + pa_ext_stream_restore_info info; +- info.name = iter->stream_restore_rule.toAscii().constData(); ++ info.name = iter->stream_restore_rule.toUtf8().constData(); + info.channel_map = rule.channel_map; + info.volume = genVolumeForPulse(*iter, md->playbackVolume()); +- info.device = rule.device.isEmpty() ? NULL : rule.device.toAscii().constData(); ++ info.device = rule.device.isEmpty() ? NULL : rule.device.toUtf8().constData(); + info.mute = (md->isMuted() ? 1 : 0); + + pa_operation* o; +@@ -1153,13 +1178,13 @@ + + // Lookup the stream index. + uint32_t stream_index = PA_INVALID_INDEX; +- const char* stream_restore_rule = NULL; ++ QString stream_restore_rule = ""; + devmap::iterator iter; + devmap *map = get_widget_map(m_devnum); + for (iter = map->begin(); iter != map->end(); ++iter) { + if (iter->name == id) { + stream_index = iter->index; +- stream_restore_rule = iter->stream_restore_rule.isEmpty() ? NULL : iter->stream_restore_rule.toAscii().constData(); ++ stream_restore_rule = iter->stream_restore_rule; + break; + } + } +@@ -1171,12 +1196,12 @@ + + if (destId.isEmpty()) { + // We want to remove any specific device in the stream restore rule. +- if (!stream_restore_rule || !s_RestoreRules.contains(stream_restore_rule)) { ++ if (stream_restore_rule.isEmpty() || !s_RestoreRules.contains(stream_restore_rule)) { + kWarning(67100) << "Mixer_PULSE::moveStream(): Trying to set Automatic on a stream with no rule"; + } else { + restoreRule &rule = s_RestoreRules[stream_restore_rule]; + pa_ext_stream_restore_info info; +- info.name = stream_restore_rule; ++ info.name = stream_restore_rule.toUtf8().constData(); + info.channel_map = rule.channel_map; + info.volume = rule.volume; + info.device = NULL; +@@ -1192,12 +1217,12 @@ + } else { + pa_operation* o; + if (KMIXPA_APP_PLAYBACK == m_devnum) { +- if (!(o = pa_context_move_sink_input_by_name(s_context, stream_index, destId.toAscii().constData(), NULL, NULL))) { ++ if (!(o = pa_context_move_sink_input_by_name(s_context, stream_index, destId.toUtf8().constData(), NULL, NULL))) { + kWarning(67100) << "pa_context_move_sink_input_by_name() failed"; + return false; + } + } else { +- if (!(o = pa_context_move_source_output_by_name(s_context, stream_index, destId.toAscii().constData(), NULL, NULL))) { ++ if (!(o = pa_context_move_source_output_by_name(s_context, stream_index, destId.toUtf8().constData(), NULL, NULL))) { + kWarning(67100) << "pa_context_move_source_output_by_name() failed"; + return false; + } diff --git a/staging/kdemultimedia/mplayerthumbs.config b/staging/kdemultimedia/mplayerthumbs.config new file mode 100644 index 000000000..761a17953 --- /dev/null +++ b/staging/kdemultimedia/mplayerthumbs.config @@ -0,0 +1,2 @@ +[MPlayerThumbsCfg] +backend=0 diff --git a/staging/kdenetwork/PKGBUILD b/staging/kdenetwork/PKGBUILD new file mode 100644 index 000000000..47d24b7e4 --- /dev/null +++ b/staging/kdenetwork/PKGBUILD @@ -0,0 +1,114 @@ +# $Id: PKGBUILD 118075 2011-04-05 10:08:27Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdenetwork +pkgname=('kdenetwork-filesharing' + 'kdenetwork-kdnssd' + 'kdenetwork-kget' + 'kdenetwork-kopete' + 'kdenetwork-kppp' + 'kdenetwork-krdc' + 'kdenetwork-krfb') +pkgver=4.6.2 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdenetwork') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' + 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn' + 'ppp' 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu' + 'telepathy-qt4' 'docbook-xsl' 'libktorrent') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('6865c074b87a201b876d11b86a2f14aff5f45abb') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \ + -DWITH_Xmms=OFF \ + -DWITH_LibMeanwhile=OFF + make +} + +package_kdenetwork-filesharing() { + pkgdesc='Konqueror properties dialog plugin to share a directory with the local network' + depends=('kdelibs' 'smbclient') + install='kdenetwork.install' + cd $srcdir/build/filesharing + make DESTDIR=$pkgdir install +} + +package_kdenetwork-kdnssd() { + pkgdesc='Monitors the network for DNS-SD services' + depends=('kdelibs') + cd $srcdir/build/kdnssd + make DESTDIR=$pkgdir install +} + +package_kdenetwork-kget() { + pkgdesc='Download Manager' + depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent') + optdepends=('python2: YouTube plugin') + url="http://kde.org/applications/internet/kget/" + install='kdenetwork.install' + cd $srcdir/build/kget + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kget + make DESTDIR=$pkgdir install + + # Use the python2 executable + find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' +} + +package_kdenetwork-kopete() { + pkgdesc='Instant Messenger' + depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn' + 'libidn' 'qimageblitz' 'v4l-utils' 'libgadu') + url="http://kde.org/applications/internet/kopete/" + install='kdenetwork.install' + cd $srcdir/build/kopete + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kopete + make DESTDIR=$pkgdir install +} + +package_kdenetwork-kppp() { + pkgdesc='Internet Dial-Up Tool' + depends=('kdebase-runtime' 'ppp') + url="http://kde.org/applications/internet/kppp/" + install='kdenetwork.install' + cd $srcdir/build/kppp + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kppp + make DESTDIR=$pkgdir install +} + +package_kdenetwork-krdc() { + pkgdesc='Remote Desktop Client' + depends=('kdebase-runtime' 'libvncserver' 'rdesktop' 'telepathy-qt4') + optdepends=('kdebase-keditbookmarks: to edit bookmarks') + url="http://kde.org/applications/internet/krdc/" + cd $srcdir/build/krdc + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/krdc + make DESTDIR=$pkgdir install +} + +package_kdenetwork-krfb() { + pkgdesc='Desktop Sharing' + # note on libxdamage: + # not detected by namcap because libgl depends on it + # but nvidia providing libgl does not depend on libxdamage + depends=('kdebase-runtime' 'libvncserver' 'libxdamage') + cd $srcdir/build/krfb + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/krfb + make DESTDIR=$pkgdir install +} diff --git a/staging/kdenetwork/kdenetwork.install b/staging/kdenetwork/kdenetwork.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdenetwork/kdenetwork.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/kdepimlibs/PKGBUILD b/staging/kdepimlibs/PKGBUILD new file mode 100644 index 000000000..67acd0465 --- /dev/null +++ b/staging/kdepimlibs/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 118062 2011-04-05 10:07:41Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=kdepimlibs +pkgver=4.6.2 +pkgrel=1 +pkgdesc="KDE PIM Libraries" +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL') +depends=('kdelibs' 'gpgme' 'akonadi' 'libical' ) +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap' + 'docbook-xsl') +install='kdepimlibs.install' +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +sha1sums=('f3c78688203b90efabdd8961783e8f4d16d9c57c') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package() { + cd $srcdir/build + make DESTDIR=$pkgdir install +} diff --git a/staging/kdepimlibs/kdepimlibs.install b/staging/kdepimlibs/kdepimlibs.install new file mode 100644 index 000000000..99262607c --- /dev/null +++ b/staging/kdepimlibs/kdepimlibs.install @@ -0,0 +1,11 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/staging/kdeplasma-addons/PKGBUILD b/staging/kdeplasma-addons/PKGBUILD new file mode 100644 index 000000000..df0b64ffc --- /dev/null +++ b/staging/kdeplasma-addons/PKGBUILD @@ -0,0 +1,603 @@ +# $Id: PKGBUILD 118076 2011-04-05 10:08:32Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdeplasma-addons +pkgname=('kdeplasma-addons-applets-bball' + 'kdeplasma-addons-applets-binary-clock' + 'kdeplasma-addons-applets-blackboard' + 'kdeplasma-addons-applets-bookmarks' + 'kdeplasma-addons-applets-bubblemon' + 'kdeplasma-addons-applets-calculator' + 'kdeplasma-addons-applets-charselect' + 'kdeplasma-addons-applets-comic' + 'kdeplasma-addons-applets-community' + 'kdeplasma-addons-applets-dict' + 'kdeplasma-addons-applets-eyes' + 'kdeplasma-addons-applets-fifteenpuzzle' + 'kdeplasma-addons-applets-filewatcher' + 'kdeplasma-addons-applets-frame' + 'kdeplasma-addons-applets-fuzzy-clock' + 'kdeplasma-addons-applets-incomingmsg' + 'kdeplasma-addons-applets-kdeobservatory' + 'kdeplasma-addons-applets-kimpanel' + 'kdeplasma-addons-applets-knowledgebase' + 'kdeplasma-addons-applets-kolourpicker' + 'kdeplasma-addons-applets-konqprofiles' + 'kdeplasma-addons-applets-konsoleprofiles' + 'kdeplasma-addons-applets-lancelot' + 'kdeplasma-addons-applets-leavenote' + 'kdeplasma-addons-applets-life' + 'kdeplasma-addons-applets-luna' + 'kdeplasma-addons-applets-magnifique' + 'kdeplasma-addons-applets-mediaplayer' + 'kdeplasma-addons-applets-microblog' + 'kdeplasma-addons-applets-news' + 'kdeplasma-addons-applets-notes' + 'kdeplasma-addons-applets-nowplaying' + 'kdeplasma-addons-applets-paste' + 'kdeplasma-addons-applets-pastebin' + 'kdeplasma-addons-applets-plasmaboard' + 'kdeplasma-addons-applets-previewer' + 'kdeplasma-addons-applets-qalculate' + 'kdeplasma-addons-applets-rememberthemilk' + 'kdeplasma-addons-applets-rssnow' + 'kdeplasma-addons-applets-showdashboard' + 'kdeplasma-addons-applets-showdesktop' + 'kdeplasma-addons-applets-social-news' + 'kdeplasma-addons-applets-spellcheck' + 'kdeplasma-addons-applets-systemloadviewer' + 'kdeplasma-addons-applets-timer' + 'kdeplasma-addons-applets-unitconverter' + 'kdeplasma-addons-applets-weather' + 'kdeplasma-addons-applets-weatherstation' + 'kdeplasma-addons-applets-webslice' + 'kdeplasma-addons-containments' + 'kdeplasma-addons-libs' + 'kdeplasma-addons-runners-audioplayercontrol' + 'kdeplasma-addons-runners-browserhistory' + 'kdeplasma-addons-runners-characters' + 'kdeplasma-addons-runners-contacts' + 'kdeplasma-addons-runners-converter' + 'kdeplasma-addons-runners-datetime' + 'kdeplasma-addons-runners-events' + 'kdeplasma-addons-runners-katesessions' + 'kdeplasma-addons-runners-konquerorsessions' + 'kdeplasma-addons-runners-konsolesessions' + 'kdeplasma-addons-runners-kopete' + 'kdeplasma-addons-runners-mediawiki' + 'kdeplasma-addons-runners-spellchecker' + 'kdeplasma-addons-wallpapers-mandelbrot' + 'kdeplasma-addons-wallpapers-marble' + 'kdeplasma-addons-wallpapers-pattern' + 'kdeplasma-addons-wallpapers-virus' + 'kdeplasma-addons-wallpapers-weather') +pkgver=4.6.2 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL') +groups=('kde' 'kdeplasma-addons') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdegraphics-libs' + 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'docbook-xsl' 'boost') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('f888908e937453c9799c6ad71c514a5227e13700') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdeplasma-addons-applets-bball() { + pkgdesc='A bouncy ball for plasma' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/bball + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-binary-clock() { + pkgdesc='Time displayed in binary format' + depends=('kdebase-workspace') + cd $srcdir/build/applets/binary-clock + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-blackboard() { + pkgdesc='Black Board' + depends=('kdebase-workspace') + cd $srcdir/build/applets/blackboard + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-bookmarks() { + pkgdesc='Quick Access to the Bookmarks' + depends=('kdebase-workspace') + cd $srcdir/build/applets/bookmarks + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-bubblemon() { + pkgdesc='A pretty bubble that monitors your system.' + depends=('kdebase-workspace') + cd $srcdir/build/applets/bubblemon + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-calculator() { + pkgdesc='Calculate simple sums' + depends=('kdebase-workspace') + cd $srcdir/build/applets/calculator + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-charselect() { + pkgdesc='View, select, and copy characters from a font collection' + depends=('kdebase-workspace') + cd $srcdir/build/applets/charselect + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-comic() { + pkgdesc='View comic strips from the Internet' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/comic + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-community() { + pkgdesc='Communicate using the Social Desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/community + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-dict() { + pkgdesc='Look up the meaning of words and their translation into different languages' + depends=('kdebase-workspace') + cd $srcdir/build/applets/dict + make DESTDIR=$pkgdir install + # FIXME + # /usr/share/icons/oxygen/scalable/apps/accessories-dictionary.svgz + rm -rf $pkgdir/usr/share/icons +} + +package_kdeplasma-addons-applets-eyes() { + pkgdesc='XEyes clone' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/eyes + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-fifteenpuzzle() { + pkgdesc='Put the pieces in order' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/fifteenPuzzle + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-filewatcher() { + pkgdesc='Watch for changes in specified files' + depends=('kdebase-workspace') + cd $srcdir/build/applets/fileWatcher + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-frame() { + pkgdesc='Display your favorite pictures' + depends=('kdebase-workspace' 'kdegraphics-libs') + cd $srcdir/build/applets/frame + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-fuzzy-clock() { + pkgdesc='Time displayed in a less precise format' + depends=('kdebase-workspace') + cd $srcdir/build/applets/fuzzy-clock + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-incomingmsg() { + pkgdesc='Notification of new messages' + depends=('kdebase-workspace') + cd $srcdir/build/applets/incomingmsg + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-kdeobservatory() { + pkgdesc='Visualize the KDE ecosystem' + depends=('kdebase-workspace' 'qwt') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/kdeobservatory + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-kimpanel() { + pkgdesc='A generic input method panel for Oriental languages' + depends=('kdebase-workspace') + optdepends=('scim: SCIM backend' + 'fcitx: FCITX backend') + cd $srcdir/build/applets/kimpanel + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-knowledgebase() { + pkgdesc='Opendesktop Knowledgebase' + depends=('kdebase-workspace') + cd $srcdir/build/applets/knowledgebase + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-kolourpicker() { + pkgdesc='Pick a color from the desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/kolourpicker + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-konqprofiles() { + pkgdesc='List and launch Konqueror profiles' + depends=('kdebase-workspace') + cd $srcdir/build/applets/konqprofiles + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-konsoleprofiles() { + pkgdesc='List and launch Konsole profiles' + depends=('kdebase-workspace') + cd $srcdir/build/applets/konsoleprofiles + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-lancelot() { + pkgdesc='Launcher to start applications' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + replaces=('lancelot') + provides=('lancelot') + conflicts=('lancelot') + install='kdeplasma-addons-applets-lancelot.install' + cd $srcdir/build/applets/lancelot + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-leavenote() { + pkgdesc='Leave notes for users while they are away' + depends=('kdebase-workspace') + cd $srcdir/build/applets/leavenote + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-life() { + pkgdesc='Life' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/life + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-luna() { + pkgdesc='Display moon phases for your location' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/luna + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-magnifique() { + pkgdesc='A magnification glass for the Plasma desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/magnifique + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-mediaplayer() { + pkgdesc='Widget that can play video and sound' + depends=('kdebase-workspace') + cd $srcdir/build/applets/mediaplayer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-microblog() { + pkgdesc='Update and view your microblog status.' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/microblog + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-news() { + pkgdesc='Show news from various sources' + depends=('kdebase-workspace') + cd $srcdir/build/applets/news + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-notes() { + pkgdesc='Desktop sticky notes' + depends=('kdebase-workspace') + cd $srcdir/build/applets/notes + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-nowplaying() { + pkgdesc='Displays currently playing audio' + depends=('kdebase-workspace') + cd $srcdir/build/applets/nowplaying + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-paste() { + pkgdesc='Paste text snippets' + depends=('kdebase-workspace') + cd $srcdir/build/applets/paste + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-pastebin() { + pkgdesc='Paste text/images to a remote server' + depends=('kdebase-workspace') + cd $srcdir/build/applets/pastebin + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-plasmaboard() { + pkgdesc='A virtual, on-screen keyboard' + depends=('kdebase-workspace') + cd $srcdir/build/applets/plasmaboard + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-previewer() { + pkgdesc='Preview This File' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/previewer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-qalculate() { + pkgdesc='A powerful mathematical equation solver' + depends=('kdebase-workspace') + install='kdeplasma-addons-applets.install' + cd $srcdir/build/applets/qalculate + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-rememberthemilk() { + pkgdesc='Remember The Milk Todo list applet' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/rememberthemilk + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-rssnow() { + pkgdesc='Show news from various sources' + depends=('kdebase-workspace') + cd $srcdir/build/applets/rssnow + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-showdashboard() { + pkgdesc='Show the Plasma widget dashboard above other windows' + depends=('kdebase-workspace') + cd $srcdir/build/applets/showdashboard + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-showdesktop() { + pkgdesc='Show the Plasma desktop' + depends=('kdebase-workspace') + cd $srcdir/build/applets/showdesktop + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-social-news() { + pkgdesc='Stay informed with the Social Desktop' + replaces=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities') + conflicts=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities') + depends=('kdebase-workspace') + cd $srcdir/build/applets/social-news + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-spellcheck() { + pkgdesc='Fast spell checking' + depends=('kdebase-workspace') + cd $srcdir/build/applets/spellcheck + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-systemloadviewer() { + pkgdesc='Tiny CPU/RAM/Swap monitor' + depends=('kdebase-workspace') + cd $srcdir/build/applets/systemloadviewer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-timer() { + pkgdesc='Countdown over a specified time period' + depends=('kdebase-workspace') + cd $srcdir/build/applets/timer + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-unitconverter() { + pkgdesc='Plasmoid for converting units' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/unitconverter + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-weather() { + pkgdesc='Displays Weather information' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/weather + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-weatherstation() { + pkgdesc='Weather reports with an LCD display style' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/weatherstation + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-applets-webslice() { + pkgdesc='Show a part of a webpage' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/applets/webslice + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-containments() { + pkgdesc='Activities types for Plasma shells' + depends=('kdebase-workspace') + cd $srcdir/build/containments + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-libs() { + pkgdesc='Plasma Addon Library' + depends=('kdebase-workspace') + groups=() + replaces=('kdeplasma-addons-dataengines') + provides=('kdeplasma-addons-dataengines') + conflicts=('kdeplasma-addons-dataengines') + cd $srcdir/build/libs + make DESTDIR=$pkgdir install + cd $srcdir/build/dataengines + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-audioplayercontrol() { + pkgdesc='Allows to control MPRIS audio players (it is able to search through Amarok´s collection, too)' + depends=('kdebase-workspace') + cd $srcdir/build/runners/audioplayercontrol + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-browserhistory() { + pkgdesc='Searches in Konqueror´s history' + depends=('kdebase-workspace') + cd $srcdir/build/runners/browserhistory + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-characters() { + pkgdesc='special Characters' + depends=('kdebase-workspace') + cd $srcdir/build/runners/characters + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-contacts() { + pkgdesc='Finds entries in your address book' + depends=('kdebase-workspace') + cd $srcdir/build/runners/contacts + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-converter() { + pkgdesc='Convert values to different units' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/runners/converter + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-datetime() { + pkgdesc='The current date and time, locally or in any timezone' + depends=('kdebase-workspace') + cd $srcdir/build/runners/datetime + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-events() { + pkgdesc='Calendar Events runner' + depends=('kdebase-workspace') + cd $srcdir/build/runners/events + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-katesessions() { + pkgdesc='Matches Kate Sessions' + depends=('kdebase-workspace') + cd $srcdir/build/runners/katesessions + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-konquerorsessions() { + pkgdesc='Matches Konqueror Sessions' + depends=('kdebase-workspace') + cd $srcdir/build/runners/konquerorsessions + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-konsolesessions() { + pkgdesc='Matches Konsole Sessions' + depends=('kdebase-workspace') + cd $srcdir/build/runners/konsolesessions + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-kopete() { + pkgdesc='Kopete Contact runner' + depends=('kdebase-workspace') + cd $srcdir/build/runners/kopete + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-mediawiki() { + pkgdesc='Search on Wikitravel' + depends=('kdebase-workspace') + cd $srcdir/build/runners/mediawiki + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-runners-spellchecker() { + pkgdesc='Check the spelling of a word' + depends=('kdebase-workspace') + cd $srcdir/build/runners/spellchecker + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-mandelbrot() { + pkgdesc='Mandelbrot' + depends=('kdebase-workspace') + cd $srcdir/build/wallpapers/mandelbrot + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-marble() { + pkgdesc='Globe' + depends=('kdebase-workspace' 'kdeedu-marble') + cd $srcdir/build/wallpapers/marble + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-pattern() { + pkgdesc='Pattern' + depends=('kdebase-workspace') + cd $srcdir/build/wallpapers/pattern + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-virus() { + pkgdesc='Virus' + depends=('kdebase-workspace') + cd $srcdir/build/wallpapers/virus + make DESTDIR=$pkgdir install +} + +package_kdeplasma-addons-wallpapers-weather() { + pkgdesc='Weather' + depends=('kdebase-workspace' 'kdeplasma-addons-libs') + cd $srcdir/build/wallpapers/weather + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install b/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install new file mode 100644 index 000000000..ce5c32e1b --- /dev/null +++ b/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/staging/kdeplasma-addons/kdeplasma-addons-applets.install b/staging/kdeplasma-addons/kdeplasma-addons-applets.install new file mode 100644 index 000000000..c4ef46ba8 --- /dev/null +++ b/staging/kdeplasma-addons/kdeplasma-addons-applets.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
\ No newline at end of file diff --git a/staging/kdeplasma-applets-networkmanagement/PKGBUILD b/staging/kdeplasma-applets-networkmanagement/PKGBUILD new file mode 100644 index 000000000..a27add6c9 --- /dev/null +++ b/staging/kdeplasma-applets-networkmanagement/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 105813 2011-01-12 00:25:58Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Jakub Schmidtke <sjakub-at-gmail.com> + +pkgname=kdeplasma-applets-networkmanagement +pkgver=git20110405 +_commit=947e4de8b211b7c29ead108a2c3618a4af9dafe1 +pkgrel=1 +pkgdesc="KDE control panel and widget network connections" +arch=('i686' 'x86_64') +url="http://www.kde.org/" +license=('GPL') +depends=('kdebase-workspace' 'networkmanager') +makedepends=('cmake' 'python2' 'automoc4' 'mobile-broadband-provider-info') +optdepends=('mobile-broadband-provider-info: allow to add new mobile connection') +install=${pkgname}.install +source=("${pkgname}-${_commit}.tar.gz"::"http://quickgit.kde.org/?p=networkmanagement.git&a=snapshot&h=${_commit}") +md5sums=('17315e3dc3604ee59cf7b5777806f1b7') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../networkmanagement \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d + make +} + +package() { + cd ${srcdir}/build + make DESTDIR=${pkgdir} install +} diff --git a/staging/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install b/staging/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeplasma-applets-networkmanagement/kdeplasma-applets-networkmanagement.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/kdesdk/PKGBUILD b/staging/kdesdk/PKGBUILD new file mode 100644 index 000000000..2faafaa5a --- /dev/null +++ b/staging/kdesdk/PKGBUILD @@ -0,0 +1,243 @@ +# $Id: PKGBUILD 118077 2011-04-05 10:08:34Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdesdk +pkgname=('kdesdk-cervisia' + 'kdesdk-dolphin-plugins' + 'kdesdk-kapptemplate' + 'kdesdk-kate' + 'kdesdk-kcachegrind' + 'kdesdk-kdeaccounts-plugin' + 'kdesdk-kdepalettes' + 'kdesdk-kioslave' + 'kdesdk-kmtrace' + 'kdesdk-kompare' + 'kdesdk-kpartloader' + 'kdesdk-kprofilemethod' + 'kdesdk-kstartperf' + 'kdesdk-kuiviewer' + 'kdesdk-lokalize' + 'kdesdk-okteta' + 'kdesdk-poxml' + 'kdesdk-scripts' + 'kdesdk-strigi-analyzer' + 'kdesdk-umbrello') +pkgver=4.6.2 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdesdk') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'subversion' + 'docbook-xsl' 'antlr2' 'kdebase-konqueror') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2" + 'fix-python2-path.patch') +sha1sums=('d246f5571aa772d4a4d0538456b142799c17c146' + 'd05ca0231869c484fd3861955d960a60aff7dcfb') + +build() { + cd ${srcdir}/${pkgbase}-${pkgver} + + # Fix python2 path + patch -Np1 -i ${srcdir}/fix-python2-path.patch + sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ + -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + $(find . -name '*.py') + + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdesdk-cervisia() { + pkgdesc='CVS Frontend' + depends=('kdebase-runtime') + url="http://kde.org/applications/development/cervisia/" + install='kdesdk.install' + cd $srcdir/build/cervisia + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/cervisia + make DESTDIR=$pkgdir install +} + +package_kdesdk-dolphin-plugins() { + pkgdesc='Extra Dolphin plugins' + depends=('kdebase-dolphin' 'subversion' 'git' 'kdesdk-kompare') + install='kdesdk.install' + cd $srcdir/build/dolphin-plugins/git + make DESTDIR=$pkgdir install + cd $srcdir/build/dolphin-plugins/svn + make DESTDIR=$pkgdir install +} + +package_kdesdk-kapptemplate() { + pkgdesc='KDE Template Generator' + depends=('kdebase-runtime') + url="http://kde.org/applications/development/kapptemplate/" + install='kdesdk.install' + cd $srcdir/build/kapptemplate + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kapptemplate + make DESTDIR=$pkgdir install +} + +package_kdesdk-kate() { + pkgdesc='Advanced Text Editor' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kate/" + install='kdesdk-kate.install' + cd $srcdir/build/kate + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kate + make DESTDIR=$pkgdir install +} + +package_kdesdk-kcachegrind() { + pkgdesc='Visualization of Performance Profiling Data' + depends=('kdebase-runtime' 'python2') + optdepends=('php: PHP support') + url="http://kde.org/applications/development/kcachegrind/" + install='kdesdk.install' + cd $srcdir/build/kcachegrind + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcachegrind + make DESTDIR=$pkgdir install +} + +package_kdesdk-kdeaccounts-plugin() { + pkgdesc='KDE Repository Accounts' + depends=('kdepim-runtime') + cd $srcdir/build/kdeaccounts-plugin + make DESTDIR=$pkgdir install +} + +package_kdesdk-kdepalettes() { + pkgdesc='Palettes for the Gimp that match the KDE standard color palette' + optdepends=('gimp') + install -D -m644 $srcdir/${pkgbase}-${pkgver}/kdepalettes/KDE_Gimp \ + $pkgdir/usr/share/gimp/2.0/palettes/KDE.gpl +} + +package_kdesdk-kioslave() { + pkgdesc='KDED Subversion Module' + depends=('kdebase-runtime' 'subversion') + cd $srcdir/build/kioslave + make DESTDIR=$pkgdir install +} + +package_kdesdk-kmtrace() { + pkgdesc='A KDE tool to assist with malloc debugging using glibc´s "mtrace" functionality' + depends=('kdebase-runtime') + cd $srcdir/build/kmtrace + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kmtrace + make DESTDIR=$pkgdir install +} + +package_kdesdk-kompare() { + pkgdesc='Diff/Patch Frontend' + depends=('kdebase-runtime') + url="http://kde.org/applications/development/kompare/" + install='kdesdk.install' + cd $srcdir/build/kompare + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kompare + make DESTDIR=$pkgdir install +} + +package_kdesdk-kpartloader() { + pkgdesc='A test application for KParts' + depends=('kdebase-runtime') + install='kdesdk.install' + cd $srcdir/build/kpartloader + make DESTDIR=$pkgdir install +} + +package_kdesdk-kprofilemethod() { + pkgdesc='Macros helping to profile' + cd $srcdir/build/kprofilemethod + make DESTDIR=$pkgdir install +} + +package_kdesdk-kstartperf() { + pkgdesc='Startup time measurement tool for KDE applications' + depends=('kdebase-runtime') + cd $srcdir/build/kstartperf + make DESTDIR=$pkgdir install +} + +package_kdesdk-kuiviewer() { + pkgdesc='Qt Designer UI File Viewer' + depends=('kdebase-runtime') + url="http://kde.org/applications/development/kuiviewer/" + install='kdesdk.install' + cd $srcdir/build/kuiviewer + make DESTDIR=$pkgdir install +} + +package_kdesdk-lokalize() { + pkgdesc='Computer-Aided Translation System' + depends=('kdebase-runtime' 'kdebindings-python') + url="http://kde.org/applications/development/lokalize/" + optdepends=('translate-toolkit: enable extra python script') + install='kdesdk.install' + cd $srcdir/build/lokalize + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/lokalize + make DESTDIR=$pkgdir install +} + +package_kdesdk-okteta() { + pkgdesc='Hex Editor' + depends=('kdebase-runtime') + replaces=('kdeutils-okteta') + conflicts=('kdeutils-okteta') + url="http://kde.org/applications/utilities/okteta" + install='kdesdk-okteta.install' + cd $srcdir/build/okteta + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/okteta + make DESTDIR=$pkgdir install +} + +package_kdesdk-poxml() { + pkgdesc='Translates DocBook XML files using gettext po files' + depends=('qt' 'antlr2') + cd $srcdir/build/poxml + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/poxml + make DESTDIR=$pkgdir install +} + +package_kdesdk-scripts() { + pkgdesc='KDE SDK scripts' + depends=('python2') + cd $srcdir/build/scripts + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/scripts + make DESTDIR=$pkgdir install +} + +package_kdesdk-strigi-analyzer() { + pkgdesc='Strigi-Analyzer for KDE SDK' + depends=('kdelibs') + cd $srcdir/build/strigi-analyzer + make DESTDIR=$pkgdir install +} + +package_kdesdk-umbrello() { + pkgdesc='UML Modeller' + depends=('kdebase-runtime') + url="http://kde.org/applications/development/umbrello/" + install='kdesdk.install' + cd $srcdir/build/umbrello + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/umbrello + make DESTDIR=$pkgdir install +} diff --git a/staging/kdesdk/fix-python2-path.patch b/staging/kdesdk/fix-python2-path.patch new file mode 100644 index 000000000..c2c0745d1 --- /dev/null +++ b/staging/kdesdk/fix-python2-path.patch @@ -0,0 +1,64 @@ +--- kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree~ 2010-11-24 11:53:38.586666671 +0100 ++++ kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree 2010-11-24 11:53:38.623333337 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # _*_ coding: latin1 _*_ + + # +--- kdesdk-4.5.80/lokalize/scripts/msgmerge.py~ 2010-11-24 11:22:42.120000002 +0100 ++++ kdesdk-4.5.80/lokalize/scripts/msgmerge.py 2010-11-24 11:22:42.146666670 +0100 +@@ -114,7 +114,7 @@ + print >>sys.stderr, "Execution failed:", e + + cmd='%s/odf/xliffmerge.py -i %s -t %s -o %s' % (ourPath,xliffpathname,xlifftemplatepathname,xliffpathname) +- if os.name!='nt': cmd='python '+cmd ++ if os.name!='nt': cmd='python2 '+cmd + else: cmd=cmd.replace('/','\\') + os.system(cmd) + +--- kdesdk-4.5.80/lokalize/scripts/xliff2odf.py~ 2010-11-24 11:24:10.853333336 +0100 ++++ kdesdk-4.5.80/lokalize/scripts/xliff2odf.py 2010-11-24 11:24:10.883333336 +0100 +@@ -42,7 +42,7 @@ + xliff2odf.convertxliff(xliffinput, translatedodfpathname, odf) + + ourpath=([p for p in sys.path if os.path.exists(p+'/xliff2odf.py')]+[''])[0] +- os.system('python "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId())) ++ os.system('python2 "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId())) + + try: convert() + except: print 'error occured' +--- kdesdk-4.5.80/scripts/rename_source_files~ 2010-11-24 11:45:41.040000004 +0100 ++++ kdesdk-4.5.80/scripts/rename_source_files 2010-11-24 11:45:41.093333336 +0100 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python2 + # + # Copyright David Faure <faure@kde.org>, License LGPL v2 + # +--- kdesdk-4.5.80/scripts/svn2log.sh~ 2010-11-24 11:46:24.863333337 +0100 ++++ kdesdk-4.5.80/scripts/svn2log.sh 2010-11-24 11:46:24.896666669 +0100 +@@ -17,6 +17,6 @@ + svn cat svn://anonsvn.kde.org/home/kde/trunk/kde-common/accounts > /tmp/accounts.$PPID + + echo "Creating changelog..."; +-svn log -v --xml $1 | python $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8 ++svn log -v --xml $1 | python2 $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8 + + rm /tmp/accounts.$PPID +--- kdesdk-4.5.80/scripts/kde_generate_export_header~ 2010-11-24 11:48:49.696666669 +0100 ++++ kdesdk-4.5.80/scripts/kde_generate_export_header 2010-11-24 11:48:49.753333338 +0100 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python2 + + import os, sys, string + +--- kdesdk-4.5.80/scripts/reviewboarddiff~ 2010-11-24 11:49:37.686666670 +0100 ++++ kdesdk-4.5.80/scripts/reviewboarddiff 2010-11-24 11:49:37.740000003 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # encoding: utf-8 + # + # Generates reviewboard compatible diffs from git-svn repositories. diff --git a/staging/kdesdk/kdesdk-kate.install b/staging/kdesdk/kdesdk-kate.install new file mode 100644 index 000000000..a60d358ce --- /dev/null +++ b/staging/kdesdk/kdesdk-kate.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdesdk/kdesdk-okteta.install b/staging/kdesdk/kdesdk-okteta.install new file mode 100644 index 000000000..3f06b8deb --- /dev/null +++ b/staging/kdesdk/kdesdk-okteta.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/kdesdk/kdesdk.install b/staging/kdesdk/kdesdk.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdesdk/kdesdk.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/kdetoys/PKGBUILD b/staging/kdetoys/PKGBUILD new file mode 100644 index 000000000..69db214e6 --- /dev/null +++ b/staging/kdetoys/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 118078 2011-04-05 10:08:37Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdetoys +pkgname=('kdetoys-amor' + 'kdetoys-kteatime' + 'kdetoys-ktux') +pkgver=4.6.2 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdetoys') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'docbook-xsl') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('4619d2124abe0887ce5aca24f1333419f7cd88c5') + +build() { + cd $srcdir + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdetoys-amor() { + pkgdesc='On-Screen Creature' + depends=('kdebase-runtime') + install='kdetoys.install' + cd $srcdir/build/amor + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/amor + make DESTDIR=$pkgdir install +} + +package_kdetoys-kteatime() { + pkgdesc='Tea Cooker' + depends=('kdebase-runtime') + install='kdetoys.install' + cd $srcdir/build/kteatime + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kteatime + make DESTDIR=$pkgdir install +} + +package_kdetoys-ktux() { + pkgdesc='KTux' + depends=('kdebase-workspace' ) + install='kdetoys.install' + cd $srcdir/build/ktux + make DESTDIR=$pkgdir install +} diff --git a/staging/kdetoys/kdetoys.install b/staging/kdetoys/kdetoys.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdetoys/kdetoys.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/kdeutils/PKGBUILD b/staging/kdeutils/PKGBUILD new file mode 100644 index 000000000..983aa3156 --- /dev/null +++ b/staging/kdeutils/PKGBUILD @@ -0,0 +1,180 @@ +# $Id: PKGBUILD 118079 2011-04-05 10:08:41Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdeutils +pkgname=('kdeutils-ark' + 'kdeutils-filelight' + 'kdeutils-kcalc' + 'kdeutils-kcharselect' + 'kdeutils-kdf' + 'kdeutils-kfloppy' + 'kdeutils-kgpg' + 'kdeutils-kremotecontrol' + 'kdeutils-ktimer' + 'kdeutils-kwallet' + 'kdeutils-printer-applet' + 'kdeutils-superkaramba' + 'kdeutils-sweeper') +pkgver=4.6.2 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdeutils') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace' + 'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz' + 'docbook-xsl' 'qjson') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('621d77f8f75bdd867316768f48ea257829f7def1') + +build() { + cd ${srcdir} + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdeutils-ark() { + pkgdesc='Archiving Tool' + depends=('kdebase-runtime' 'kdebase-lib' 'libarchive') + optdepends=('p7zip' 'zip' 'unzip' 'unrar') + url="http://kde.org/applications/utilities/ark/" + cd $srcdir/build/ark + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ark + make DESTDIR=$pkgdir install +} + +package_kdeutils-filelight() { + pkgdesc='View disk usage information' + depends=('kdebase-runtime' 'qimageblitz') + replaces=('filelight') + conflicts=('filelight') + install='kdeutils.install' + url="http://methylblue.com/filelight/" + cd $srcdir/build/filelight + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/filelight + make DESTDIR=$pkgdir install +} + +package_kdeutils-kcalc() { + pkgdesc='Scientific Calculator' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kcalc/" + cd $srcdir/build/kcalc + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcalc + make DESTDIR=$pkgdir install +} + +package_kdeutils-kcharselect() { + pkgdesc='Character Selector' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kcharselect/" + cd $srcdir/build/kcharselect + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcharselect + make DESTDIR=$pkgdir install +} + +package_kdeutils-kdf() { + pkgdesc='View Disk Usage' + depends=('kdebase-runtime') + url="http://kde.org/applications/system/kdiskfree/" + install='kdeutils.install' + cd $srcdir/build/kdf + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kdf + make DESTDIR=$pkgdir install +} + +package_kdeutils-kfloppy() { + pkgdesc='Floppy Formatter' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kfloppy/" + install='kdeutils.install' + cd $srcdir/build/kfloppy + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kfloppy + make DESTDIR=$pkgdir install +} + +package_kdeutils-kgpg() { + pkgdesc='A GnuPG frontend' + depends=('kdepim-runtime' 'kde-agent') + url="http://kde.org/applications/utilities/kgpg" + install='kdeutils.install' + cd $srcdir/build/kgpg + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kgpg + make DESTDIR=$pkgdir install +} + +package_kdeutils-kremotecontrol() { + pkgdesc='Configure your remote controls for use with applications' + replaces=('kdeutils-kdelirc') + conflicts=('kdeutils-kdelirc') + depends=('kdebase-workspace') + url="http://kde.org/applications/utilities/kremotecontrol" + install='kdeutils.install' + cd $srcdir/build/kremotecontrol + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kcontrol/kremotecontrol + make DESTDIR=$pkgdir install +} + +package_kdeutils-ktimer() { + pkgdesc='Countdown Launcher' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/ktimer" + install='kdeutils.install' + cd $srcdir/build/ktimer + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/ktimer + make DESTDIR=$pkgdir install +} + +package_kdeutils-kwallet() { + pkgdesc='Wallet Management Tool' + depends=('kdebase-runtime') + url="http://kde.org/applications/system/kwalletmanager/" + install='kdeutils.install' + cd $srcdir/build/kwallet + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kwallet + make DESTDIR=$pkgdir install +} + +package_kdeutils-printer-applet() { + pkgdesc='System tray icon for managing print jobs' + depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common') + url="http://kde.org/applications/system/printerapplet/" + cd $srcdir/build/printer-applet + make DESTDIR=$pkgdir install + + # Use the python2 executable + find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' +} + +package_kdeutils-superkaramba() { + pkgdesc='An engine for cool desktop eyecandy' + depends=('kdebase-runtime' 'kdebindings-python' 'qimageblitz') + url="http://kde.org/applications/utilities/superkaramba" + install='kdeutils.install' + cd $srcdir/build/superkaramba + make DESTDIR=$pkgdir install +} + +package_kdeutils-sweeper() { + pkgdesc='System Cleaner' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/sweeper/" + cd $srcdir/build/sweeper + make DESTDIR=$pkgdir install +} diff --git a/staging/kdeutils/kdeutils.install b/staging/kdeutils/kdeutils.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdeutils/kdeutils.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/kdewebdev/PKGBUILD b/staging/kdewebdev/PKGBUILD new file mode 100644 index 000000000..e0a90a5c9 --- /dev/null +++ b/staging/kdewebdev/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 118080 2011-04-05 10:08:44Z andrea $ +# Maintainer: Pierre Schmitz <pierre@archlinux.de> + +pkgbase=kdewebdev +pkgname=('kdewebdev-kfilereplace' + 'kdewebdev-kimagemapeditor' + 'kdewebdev-klinkstatus' + 'kdewebdev-kommander') +pkgver=4.6.2 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.kde.org' +license=('GPL' 'LGPL' 'FDL') +groups=('kde' 'kdewebdev') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime' + 'docbook-xsl' 'boost') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2") +sha1sums=('80f709845fb871919fbb2c293d1cc8f40160509b') + +build() { + cd $srcdir + mkdir build + cd build + cmake ../${pkgbase}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ + -DCMAKE_INSTALL_PREFIX=/usr + make +} + +package_kdewebdev-kfilereplace() { + pkgdesc='Search & Replace Tool' + depends=('kdebase-runtime') + url="http://kde.org/applications/utilities/kfilereplace/" + install='kdewebdev.install' + cd $srcdir/build/kfilereplace + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kfilereplace + make DESTDIR=$pkgdir install +} + +package_kdewebdev-kimagemapeditor() { + pkgdesc='HTML Image Map Editor' + depends=('kdebase-runtime') + install='kdewebdev.install' + cd $srcdir/build/kimagemapeditor + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/kimagemapeditor + make DESTDIR=$pkgdir install +} + +package_kdewebdev-klinkstatus() { + pkgdesc='Link Checker' + depends=('kdepim-runtime' 'tidyhtml') + install='kdewebdev.install' + cd $srcdir/build/klinkstatus + make DESTDIR=$pkgdir install + cd $srcdir/build/doc/klinkstatus + make DESTDIR=$pkgdir install +} + +package_kdewebdev-kommander() { + pkgdesc='Executor for Kommander dialogs' + depends=('kdebase-runtime') + cd $srcdir/build/kommander + make DESTDIR=$pkgdir install +} diff --git a/staging/kdewebdev/kdewebdev.install b/staging/kdewebdev/kdewebdev.install new file mode 100644 index 000000000..e70c054ec --- /dev/null +++ b/staging/kdewebdev/kdewebdev.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/strigi/PKGBUILD b/staging/strigi/PKGBUILD new file mode 100644 index 000000000..cad570d70 --- /dev/null +++ b/staging/strigi/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 118083 2011-04-05 10:45:28Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> + +pkgname=strigi +pkgver=git20110405 +pkgrel=1 +pkgdesc="Fast crawling desktop search engine with Qt4 GUI" +arch=('i686' 'x86_64') +url="http://www.vandenoever.info/software/strigi/" +license=('GPL2') +depends=('qt' 'clucene' 'bzip2' 'exiv2' 'libxml2') +makedepends=('cmake' 'pkg-config') +source=("ftp://ftp.archlinux.org/other/kde/${pkgname}-${pkgver}.tar.bz2") +md5sums=('dcc88c925c5ad264429ba841cab19b65') +options=('!libtool') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DENABLE_INOTIFY=ON \ + -DENABLE_LOG4CXX=OFF \ + -DENABLE_FAM=OFF + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/testing/eventlog/ChangeLog b/testing/eventlog/ChangeLog new file mode 100644 index 000000000..d90a881d4 --- /dev/null +++ b/testing/eventlog/ChangeLog @@ -0,0 +1,15 @@ +2011-04-05 Stéphane Gaudreault <stephane@archlinux.org> + + * Rebuild of old package + * Tidy up PKGBUILD + +2010-07-10 Dan McGee <dan@archlinux.org> + + * Updated PKGBUILD to be in line with standard style + * Upstream update + +2009-01-03 Eric Belanger <eric@archlinux.org> + + * eventlog 0.2.9-1 + * Upstream update + * Added ChangeLog diff --git a/testing/eventlog/PKGBUILD b/testing/eventlog/PKGBUILD new file mode 100644 index 000000000..638fe3703 --- /dev/null +++ b/testing/eventlog/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 118142 2011-04-05 15:32:10Z stephane $ +# Maintainer: Eric Belanger <eric@archlinux.org> +# Contributor: Judd Vinet <jvinet@zeroflux.org> + +pkgname=eventlog +pkgver=0.2.12 +pkgrel=2 +pkgdesc="API to format and send structured log messages" +arch=('i686' 'x86_64') +url="http://www.balabit.com/support/community/products/" +license=('BSD') +depends=('glibc') +options=('!libtool') +changelog=ChangeLog +source=(http://www.balabit.com/downloads/files/eventlog/${pkgver%.*}/eventlog_${pkgver}.tar.gz) +md5sums=('3d6ebda8a161d36cb40d09328f78786b') +sha1sums=('3e35a634e7de029ab9d36995a085bfcb00ed6a4d') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/testing/lirc/PKGBUILD b/testing/lirc/PKGBUILD index 1044223f1..1008b2723 100644 --- a/testing/lirc/PKGBUILD +++ b/testing/lirc/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 117645 2011-04-04 14:50:26Z jgc $ +# $Id: PKGBUILD 118049 2011-04-05 07:45:38Z jgc $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgbase=lirc pkgname=('lirc' 'lirc-utils') pkgver=0.9.0 pkgrel=2 +epoch=1 _kernver=2.6.38-ARCH arch=('i686' 'x86_64') url="http://www.lirc.org/" |