diff options
Diffstat (limited to 'community')
-rw-r--r-- | community/blackbox/PKGBUILD | 31 | ||||
-rw-r--r-- | community/blackbox/textpropertytostring-unconditional.patch | 28 | ||||
-rw-r--r-- | community/gambas2/PKGBUILD | 22 | ||||
-rw-r--r-- | community/gcompris/PKGBUILD | 8 | ||||
-rw-r--r-- | community/intellij-idea-libs/PKGBUILD | 8 | ||||
-rw-r--r-- | community/me-tv/PKGBUILD | 4 | ||||
-rw-r--r-- | community/shotwell/PKGBUILD | 10 | ||||
-rw-r--r-- | community/vifm/PKGBUILD | 29 | ||||
-rw-r--r-- | community/vifm/ncurses.patch | 126 | ||||
-rw-r--r-- | community/widelands/PKGBUILD | 22 |
10 files changed, 213 insertions, 75 deletions
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 |