summaryrefslogtreecommitdiff
path: root/community
diff options
context:
space:
mode:
Diffstat (limited to 'community')
-rw-r--r--community/activity-log-manager/PKGBUILD20
-rw-r--r--community/activity-log-manager/activity-log-manager.install2
-rw-r--r--community/activity-log-manager/fix-build.patch12
-rw-r--r--community/apitrace/PKGBUILD6
-rw-r--r--community/dispcalgui/PKGBUILD11
-rw-r--r--community/electricsheep/PKGBUILD4
-rw-r--r--community/go/PKGBUILD18
-rw-r--r--community/julia/PKGBUILD14
-rw-r--r--community/libx86emu/PKGBUILD6
-rw-r--r--community/processing/PKGBUILD12
-rw-r--r--community/pymol/PKGBUILD16
-rw-r--r--community/pymol/apbstools_tcltk8.6.patch72
-rw-r--r--community/the_silver_searcher/PKGBUILD6
-rw-r--r--community/vagrant/PKGBUILD7
14 files changed, 114 insertions, 92 deletions
diff --git a/community/activity-log-manager/PKGBUILD b/community/activity-log-manager/PKGBUILD
index d0334dd68..fab5f01d4 100644
--- a/community/activity-log-manager/PKGBUILD
+++ b/community/activity-log-manager/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 94510 2013-07-25 21:57:24Z bgyorgy $
+# $Id: PKGBUILD 111089 2014-05-13 13:23:00Z bgyorgy $
# Maintainer: Balló György <ballogyor+arch at gmail dot com>
# Contributor: Ner0
pkgname=activity-log-manager
pkgver=0.9.7
-pkgrel=1
+pkgrel=2
pkgdesc="A graphical user interface which lets you easily control what gets logged by Zeitgeist"
arch=('i686' 'x86_64')
url="https://launchpad.net/activity-log-manager"
@@ -13,11 +13,13 @@ depends=('gtk3' 'libgee06' 'zeitgeist' 'hicolor-icon-theme' 'xdg-utils')
makedepends=('vala' 'intltool')
install=$pkgname.install
source=(https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.xz
- http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20130725.tar.gz)
+ http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20130725.tar.gz
+ fix-build.patch)
md5sums=('d886be32db0fa351aaf0eb59912ee377'
- 'f7a284bca152011500cb845aebad8d14')
+ 'f7a284bca152011500cb845aebad8d14'
+ '243c71b429e12172691dcb748055247d')
-build() {
+prepare() {
cd "$srcdir/$pkgname-$pkgver"
# Install language files
@@ -25,14 +27,20 @@ build() {
mv -f -t po ../po/*
printf "%s\n" po/*.po | sed -e 's/po\///g' -e 's/\.po//g' >po/LINGUAS
+ # Regenerate C files
rm src/activity_log_manager_vala.stamp
+ # Fix build
+ patch -Np1 -i ../fix-build.patch
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
make
}
package() {
cd "$srcdir/$pkgname-$pkgver"
-
make DESTDIR="$pkgdir" install
}
diff --git a/community/activity-log-manager/activity-log-manager.install b/community/activity-log-manager/activity-log-manager.install
index 2c455e952..17ca8f78a 100644
--- a/community/activity-log-manager/activity-log-manager.install
+++ b/community/activity-log-manager/activity-log-manager.install
@@ -1,5 +1,5 @@
post_install() {
- xdg-icon-resource forceupdate
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
}
post_upgrade() {
diff --git a/community/activity-log-manager/fix-build.patch b/community/activity-log-manager/fix-build.patch
new file mode 100644
index 000000000..71724f421
--- /dev/null
+++ b/community/activity-log-manager/fix-build.patch
@@ -0,0 +1,12 @@
+diff -Naur activity-log-manager-0.9.7.orig/src/unified-privacy.vala activity-log-manager-0.9.7/src/unified-privacy.vala
+--- activity-log-manager-0.9.7.orig/src/unified-privacy.vala 2013-07-10 08:28:23.000000000 +0200
++++ activity-log-manager-0.9.7/src/unified-privacy.vala 2014-05-13 15:15:51.042857849 +0200
+@@ -291,7 +291,7 @@
+ // Add/Remove buttons
+ var exception_toolbar = new Toolbar();
+ exception_toolbar.toolbar_style = ToolbarStyle.ICONS;
+- exception_toolbar.icon_size = 1;
++ exception_toolbar.icon_size = Gtk.IconSize.MENU;
+ exception_toolbar.icon_size_set = true;
+ exception_toolbar.visible = true;
+
diff --git a/community/apitrace/PKGBUILD b/community/apitrace/PKGBUILD
index 43622bdca..6909f78bb 100644
--- a/community/apitrace/PKGBUILD
+++ b/community/apitrace/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 89930 2013-05-05 19:53:46Z lcarlier $
+# $Id: PKGBUILD 111076 2014-05-13 08:12:14Z lcarlier $
# Maintainer: Laurent Carlier <lordheavym@gmail.com>
# Contributor: Luca Bennati <lucak3 AT gmail DOT com>
# Contributor: Glaucous <glakke1 at gmail dot com>
pkgname=apitrace
-pkgver=4.0
+pkgver=5.0
pkgrel=1
pkgdesc="Graphics API Tracing"
arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ license=('custom')
makedepends=('cmake' 'mesa' 'libgl' 'python2' 'qtwebkit' 'qjson')
optdepends=('qtwebkit: GUI support' 'qjson: GUI support')
source=("https://github.com/apitrace/apitrace/archive/${pkgver}.zip")
-md5sums=('5b2e212d91d2f184d8608c712eab69a0')
+md5sums=('2a60e8a4c90f841dc95fe659ba26607e')
build() {
cd ${srcdir}/apitrace-*
diff --git a/community/dispcalgui/PKGBUILD b/community/dispcalgui/PKGBUILD
index fbcda9c93..a4d47425e 100644
--- a/community/dispcalgui/PKGBUILD
+++ b/community/dispcalgui/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 110033 2014-04-23 13:36:22Z tredaelli $
+# $Id: PKGBUILD 111078 2014-05-13 10:46:13Z tredaelli $
# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
# Contributor: Cedric Girard <girard.cedric@gmail.com>
# Contributor: foxbunny <bg.branko@gmail.com>
pkgname=dispcalgui
-pkgver=2.0.0.0
+pkgver=2.1.0.0
pkgrel=1
pkgdesc="A GUI frontend for several utilities from the open source color management system Argyll CMS"
arch=('i686' 'x86_64')
@@ -15,16 +15,15 @@ depends=('argyllcms' 'wxpython' 'hicolor-icon-theme' 'desktop-file-utils' 'pytho
optdepends=('gksu: For running as root')
install=${pkgname}.install
source=("http://downloads.sourceforge.net/project/dispcalgui/release/${pkgver}/dispcalGUI-${pkgver}.tar.gz")
-md5sums=('5740301fb4f7e72a57b4eab6a4ee405a')
+md5sums=('4d47ce34946e5b0b8bf2658a572e6bd6')
prepare() {
- cd "${srcdir}"/dispcalGUI-${pkgver}
-# patch -p1 -i "$srcdir"/dispcalGUI-1.5.3.1-wxgtk3.patch
+ cd dispcalGUI-${pkgver}
find . -name "*.py" -exec sed -i 's!/usr/bin/env python!/usr/bin/env python2!g' {} +
}
package() {
- cd "${srcdir}"/dispcalGUI-${pkgver}
+ cd dispcalGUI-${pkgver}
python2 setup.py install --root="${pkgdir}" --optimize=1
#udev rules are shipped with argyllcms
rm -rf "${pkgdir}"/etc/udev/
diff --git a/community/electricsheep/PKGBUILD b/community/electricsheep/PKGBUILD
index 776295bd7..7f6d1c6c3 100644
--- a/community/electricsheep/PKGBUILD
+++ b/community/electricsheep/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 106099 2014-02-22 21:08:18Z eric $
+# $Id: PKGBUILD 111101 2014-05-13 21:14:09Z eric $
# Maintainer: Eric Bélanger <eric@archlinux.org>
pkgname=electricsheep
@@ -45,7 +45,7 @@ prepare() {
build() {
cd ${pkgname}-${pkgver}
./autogen.sh
- CPPFLAGS+="-I/usr/include/lua5.1" ./configure --prefix=/usr
+ CPPFLAGS+=" -I/usr/include/lua5.1" ./configure --prefix=/usr
sed -i 's|-I /usr/include/libavutil||' MSVC/SettingsGUI/Makefile
make CXXFLAGS+="-DUSE_NEW_FFMPEG_API=1" GLEE_LIBS="-lGLee"
}
diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD
index f7adacbff..7ad91da1a 100644
--- a/community/go/PKGBUILD
+++ b/community/go/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 109996 2014-04-22 20:02:26Z arodseth $
+# $Id: PKGBUILD 111080 2014-05-13 11:01:57Z arodseth $
# Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Rémy Oudompheng <remy@archlinux.org>
@@ -11,8 +11,8 @@
pkgname=go
epoch=2
-pkgver=1.2.1
-pkgrel=5
+pkgver=1.2.2
+pkgrel=1
pkgdesc='Compiler and tools for the Go programming language from Google'
arch=('x86_64' 'i686')
url='http://golang.org/'
@@ -25,13 +25,14 @@ optdepends=('mercurial: for fetching sources from mercurial repositories'
'bzr: for fetching sources from bazaar repositories'
'subversion: for fetching sources from subversion repositories')
install="$pkgname.install"
-source=("$pkgname-$pkgver::hg+https://code.google.com/p/$pkgname#branch=release-branch.$pkgname${pkgver/.1}")
+source=("$pkgname-$pkgver::hg+https://code.google.com/p/$pkgname#tag=$pkgname$pkgver")
md5sums=('SKIP')
build() {
- export GOROOT="$srcdir/$pkgname-$pkgver"
- cd "$GOROOT/src"
+ cd "$srcdir/$pkgname-$pkgver/src"
+ export GOROOT="$srcdir/$pkgname-$pkgver"
+ export GOBIN="$GOROOT/bin"
export GOPATH="$srcdir/"
export GOROOT_FINAL=/usr/lib/go
@@ -84,6 +85,7 @@ check() {
fi
export GOROOT="$srcdir/$pkgname-$pkgver"
+ export GOBIN="$GOROOT/bin"
export PATH="$srcdir/$pkgname-$pkgver/bin:$PATH"
# TestSimpleMulticastListener will fail in standard chroot
@@ -92,9 +94,11 @@ check() {
package() {
cd "$pkgname-$pkgver"
+
export GOROOT="$srcdir/$pkgname-$pkgver"
+ export GOBIN="$GOROOT/bin"
- install -Dm755 $srcdir/godoc $pkgdir/usr/bin/godoc
+ install -Dm755 "$srcdir/godoc" "$pkgdir/usr/bin/godoc"
install -Dm644 LICENSE \
"$pkgdir/usr/share/licenses/go/LICENSE"
diff --git a/community/julia/PKGBUILD b/community/julia/PKGBUILD
index 913601797..ebb9e558e 100644
--- a/community/julia/PKGBUILD
+++ b/community/julia/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 110532 2014-05-02 16:17:06Z arodseth $
+# $Id: PKGBUILD 111098 2014-05-13 18:30:47Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Lex Black <autumn-wind at web dot de>
# Contributor: Michael Jakl <jakl.michael@gmail.com>
@@ -6,21 +6,21 @@
pkgname=julia
pkgver=0.3.0_prerelease
-pkgrel=4
+pkgrel=5
pkgdesc='High-level, high-performance, dynamic programming language'
arch=('x86_64' 'i686')
url='http://julialang.org'
license=('GPL')
-depends=('arpack' 'fftw' 'git' 'gmp' 'libunwind' 'mpfr' 'pcre' 'readline' 'zlib' 'llvm') # 'suitesparse' 'utf8proc' (AUR) 'intel-mkl' (AUR)
-makedepends=('gcc-fortran')
+depends=('arpack' 'fftw' 'git' 'gmp' 'libunwind' 'mpfr' 'pcre' 'readline' 'zlib')
+makedepends=('gcc-fortran' 'python2' 'libuv')
optdepends=('gnuplot: If using the Gaston Package from julia')
options=('!emptydirs' 'staticlibs')
-source=("git://github.com/JuliaLang/julia.git#commit=7bb10f8372")
+source=("git://github.com/JuliaLang/julia.git#commit=3985890")
sha256sums=('SKIP')
build() {
make -C "$pkgname" prefix=/usr sysconfdir=/etc \
- USE_SYSTEM_LLVM=1 \
+ USE_SYSTEM_LLVM=0 \
USE_SYSTEM_LIBUNWIND=1 \
USE_SYSTEM_READLINE=1 \
USE_SYSTEM_PCRE=1 \
@@ -47,7 +47,7 @@ build() {
package() {
make -C "$pkgname" DESTDIR="$pkgdir" \
prefix=/usr sysconfdir=/etc \
- USE_SYSTEM_LLVM=1 \
+ USE_SYSTEM_LLVM=0 \
USE_SYSTEM_LIBUNWIND=1 \
USE_SYSTEM_READLINE=1 \
USE_SYSTEM_PCRE=1 \
diff --git a/community/libx86emu/PKGBUILD b/community/libx86emu/PKGBUILD
index 9602b8aee..3e2fe7324 100644
--- a/community/libx86emu/PKGBUILD
+++ b/community/libx86emu/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 107049 2014-03-11 19:41:14Z arodseth $
+# $Id: PKGBUILD 111085 2014-05-13 12:20:38Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Kaiting Chen <kaitocracy@gmail.com>
# Contributor: Gergely Imreh <imrehgATgmailDOTcom>
pkgname=libx86emu
-pkgver=1.1.21.5
+pkgver=1.1.21.6
pkgrel=1
pkgdesc='x86 emulation library'
arch=('x86_64' 'i686')
@@ -13,7 +13,7 @@ license=('BSD')
depends=('glibc')
makedepends=('rpmextract')
source=("http://download.opensuse.org/source/factory/repo/oss/suse/src/$pkgname-${pkgver%.*.*}-${pkgver#*.*.}.src.rpm")
-sha256sums=('d639b118788e1fb880f96a12548e434b210a3eb47b850b9162f2e682b824c03f')
+sha256sums=('220465fd4380c1a91dbd394a67301b409efaa255af54a33ddfc0d4fc9f583582')
prepare() {
# Wish they would just provide a normal $pkgname-$pkgver.tar.gz...
diff --git a/community/processing/PKGBUILD b/community/processing/PKGBUILD
index d85d20907..393ba8c6e 100644
--- a/community/processing/PKGBUILD
+++ b/community/processing/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 109634 2014-04-17 07:36:16Z fyan $
+# $Id: PKGBUILD 111103 2014-05-13 21:14:49Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
pkgname=processing
-pkgver=2.1.2
+pkgver=2.2
pkgrel=1
arch=('x86_64' 'i686')
pkgdesc='Programming environment for creating images, animations and interactions'
@@ -15,13 +15,13 @@ options=('!strip')
if [[ $CARCH == "x86_64" ]]; then
source=("http://download.$pkgname.org/$pkgname-$pkgver-linux64.tgz"
"$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png")
- sha256sums=('4e43fd3f9527e243438bb3ddf75c37afb4004f71144a53d0347732bdab0eb439'
- '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
+ sha256sums=('262756a040def3e23a32db2838b313193918cb15cafccc6e9fbd88358d5d8832'
+ '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
else
source=("http://download.$pkgname.org/$pkgname-$pkgver-linux32.tgz"
"$pkgname.png::http://wiki.$pkgname.org/skins/${pkgname}skin/${pkgname}_wiki_logo.png")
- sha256sums=('917329ff5f960632e149cd79822e9ea4016bc575e31f90ff6bf009b87ccfceb1'
- '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
+ sha256sums=('89bf7739ba97f8150c3a6e3c02e3602ed70d93aba29def8f4eddc755fc5d5ae0'
+ '019ae700333409acbc628779747ab8f153f6647de25e4de3a9bd4a42d0d8056a')
fi
prepare() {
diff --git a/community/pymol/PKGBUILD b/community/pymol/PKGBUILD
index 9ac1f602c..805645ad4 100644
--- a/community/pymol/PKGBUILD
+++ b/community/pymol/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 107720 2014-03-18 18:03:37Z arcanis $
+# $Id: PKGBUILD 111108 2014-05-13 21:33:30Z arcanis $
# Maintainer: Evgeniy Alekseev <arcanis dot arch at gmail dot com>
# Contributor: graysky
# Contributor: Tomasz Żok <tomasz dot zok at gmail dot com>
pkgname=pymol
-pkgver=1.7.0.0
-pkgrel=3
+pkgver=1.7.1.3
+pkgrel=1
pkgdesc="Molecular visualization system on an Open Source foundation"
arch=('i686' 'x86_64')
url="http://pymol.org/"
@@ -16,14 +16,14 @@ source=("http://downloads.sourceforge.net/project/pymol/pymol/1.7/pymol-v${pkgve
"${pkgname}-38899.patch"
"apbstools_tcltk8.6.patch")
install="${pkgname}.install"
-md5sums=('36fc735f6104e59802f109d0d25b6676'
+md5sums=('414e57a76d8e6e58540b743c1c2fb5ee'
'1f8152c4604ba2939b24e25a022937ca'
- 'a3c1544017762613bebc3f5763a434a9')
+ 'c48bf253e59ff97c14114cd285a4f1e1')
prepare() {
# create desktop file
gendesk -f --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" --name="PyMOL" --categories="Science;Chemistry"
-
+
# suppress non-zero exit code that breaks makepkg
sed -i '/sys.exit/ s,2,0,' "${srcdir}/pymol/setup.py"
# change python to python2
@@ -31,14 +31,12 @@ prepare() {
sed -i "s|python|python2|g" "${srcdir}/pymol/test/run"
sed -i "s|python|python2|g" "${srcdir}/pymol/test/show"
sed -i "s|python|python2|g" "${srcdir}/pymol/modules/pmg_tk/startup/apbs_tools.py"
-
# fix FS#38899
patch -p0 -i "${pkgname}-38899.patch"
mv "${srcdir}/${pkgname}/modules/web" "${srcdir}/${pkgname}/modules/pymolweb"
-
# fix FS#39526
cd "${srcdir}/${pkgname}"
- patch -p0 -i "${srcdir}/apbstools_tcltk8.6.patch"
+ #patch -p0 -i "${srcdir}/apbstools_tcltk8.6.patch"
}
build() {
diff --git a/community/pymol/apbstools_tcltk8.6.patch b/community/pymol/apbstools_tcltk8.6.patch
index f7ec535d0..abd8ea470 100644
--- a/community/pymol/apbstools_tcltk8.6.patch
+++ b/community/pymol/apbstools_tcltk8.6.patch
@@ -1,176 +1,176 @@
---- modules/pmg_tk/startup/apbs_tools.py.orig 2013-08-16 20:29:27.000000000 -0400
-+++ modules/pmg_tk/startup/apbs_tools.py 2013-08-16 20:31:35.000000000 -0400
-@@ -560,7 +560,8 @@
+--- modules/pmg_tk/startup/apbs_tools.py.orig 2014-05-14 01:07:32.000000000 +0400
++++ modules/pmg_tk/startup/apbs_tools.py 2014-05-14 01:15:35.090032827 +0400
+@@ -612,7 +612,8 @@
# Set up the Main page
page = self.notebook.add('Main')
group = Pmw.Group(page,tag_text='Main options')
- group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
+ #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+ group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
++ group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
self.selection = Pmw.EntryField(group.interior(),
labelpos='w',
label_text='Selection to use: ',
-@@ -606,7 +607,8 @@
+@@ -658,7 +659,8 @@
page = self.notebook.add('Configuration')
group = Pmw.Group(page,tag_text='Dielectric Constants')
- group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
+ #group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+ group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
++ group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
group.grid(column=0, row=0)
self.interior_dielectric = Pmw.EntryField(group.interior(),labelpos='w',
label_text = 'Protein Dielectric:',
-@@ -625,7 +627,8 @@
+@@ -677,7 +679,8 @@
#entry.pack(side='left',fill='both',expand=1,padx=4) # side-by-side
entry.pack(fill='x',expand=1,padx=4,pady=1) # vertical
group = Pmw.Group(page,tag_text='Other')
- group.pack(fill='both',expand=1, padx=4, pady=5)
+ #group.pack(fill='both',expand=1, padx=4, pady=5)
-+ group.grid(padx=4, pady=5, sticky=(N, S, E, W))
++ group.grid(padx=4, pady=5, sticky=(N, S, E, W))
group.grid(column=1, row=1,columnspan=4)
self.max_mem_allowed = Pmw.EntryField(group.interior(),labelpos='w',
label_text = 'Maximum Memory Allowed (MB):',
-@@ -683,7 +686,8 @@
+@@ -735,7 +738,8 @@
group = Pmw.Group(page,tag_text='Ions')
- group.pack(fill='both',expand=1, padx=4, pady=5)
+ #group.pack(fill='both',expand=1, padx=4, pady=5)
-+ group.grid(padx=4, pady=5, sticky=(N, S, E, W))
++ group.grid(padx=4, pady=5, sticky=(N, S, E, W))
group.grid(column=0, row=1, )
self.ion_plus_one_conc = Pmw.EntryField(group.interior(),
labelpos='w',
-@@ -742,7 +746,8 @@
+@@ -794,7 +798,8 @@
entry.pack(fill='x',expand=1,padx=4)
group = Pmw.Group(page,tag_text = 'Coarse Mesh Length')
- group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
+ #group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+ group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
++ group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
group.grid(column = 1, row = 0)
for coord in 'x y z'.split():
setattr(self,'grid_coarse_%s'%coord,Pmw.EntryField(group.interior(),
-@@ -757,7 +762,8 @@
+@@ -809,7 +814,8 @@
group = Pmw.Group(page,tag_text = 'Fine Mesh Length')
- group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
+ #group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+ group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
++ group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
group.grid(column = 2, row = 0)
for coord in 'x y z'.split():
setattr(self,'grid_fine_%s'%coord,Pmw.EntryField(group.interior(),
-@@ -772,7 +778,8 @@
+@@ -824,7 +830,8 @@
group = Pmw.Group(page,tag_text = 'Grid Center')
- group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
+ #group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+ group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
++ group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
group.grid(column = 3, row = 0)
for coord in 'x y z'.split():
setattr(self,'grid_center_%s'%coord,Pmw.EntryField(group.interior(),
-@@ -786,7 +793,8 @@
+@@ -838,7 +845,8 @@
getattr(self,'grid_center_%s'%coord).pack(fill='x', expand=1, padx=4, pady=1)
group = Pmw.Group(page,tag_text = 'Grid Points')
- group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
+ #group.pack(fill = 'both', expand = 1, padx = 4, pady = 5)
-+ group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
++ group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
group.grid(column = 4, row = 0)
for coord in 'x y z'.split():
setattr(self,'grid_points_%s'%coord,Pmw.EntryField(group.interior(),
-@@ -804,7 +812,8 @@
+@@ -856,7 +864,8 @@
page.grid_columnconfigure(5,weight=1)
page = self.notebook.add('Program Locations')
group = Pmw.Group(page,tag_text='Locations')
- group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
+ #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+ group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
++ group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
def quickFileValidation(s):
if s == '': return Pmw.PARTIAL
elif os.path.isfile(s): return Pmw.OK
-@@ -867,7 +876,8 @@
+@@ -955,7 +964,8 @@
page = self.notebook.add('Temp File Locations')
group = Pmw.Group(page,tag_text='Locations')
- group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
+ #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+ group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
++ group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
self.pymol_generated_pqr_filename = Pmw.EntryField(group.interior(),
labelpos = 'w',
label_pyclass = FileDialogButtonClassFactory.get(self.setPymolGeneratedPqrFilename),
-@@ -915,17 +925,20 @@
+@@ -1003,17 +1013,20 @@
page = self.notebook.add('Visualization (1)')
group = VisualizationGroup(page,tag_text='Visualization',visgroup_num=1)
self.visualization_group_1 = group
- group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
+ #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+ group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
++ group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
page = self.notebook.add('Visualization (2)')
group = VisualizationGroup(page,tag_text='Visualization',visgroup_num=2)
self.visualization_group_2 = group
- group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
+ #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+ group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
++ group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
# Create a couple of other empty pages
page = self.notebook.add('About')
group = Pmw.Group(page, tag_text='About PyMOL APBS Tools')
- group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
+ #group.pack(fill = 'both', expand = 1, padx = 10, pady = 5)
-+ group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
++ group.grid(padx = 10, pady = 5, sticky=(N, S, E, W))
text = """This plugin integrates PyMOL (http://PyMOL.org/) with APBS (http://www.poissonboltzmann.org/apbs/).
Documentation may be found at
-@@ -2158,7 +2171,8 @@
+@@ -2271,7 +2284,8 @@
self.update_buttonbox = Pmw.ButtonBox(self.mm_group.interior(), padx=0)
self.update_buttonbox.pack(side=LEFT)
self.update_buttonbox.add('Update',command=self.refresh)
- self.mm_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=TOP)
+ #self.mm_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=TOP)
-+ self.mm_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
++ self.mm_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
self.ms_group = Pmw.Group(self.interior(),tag_text='Molecular Surface')
self.ms_buttonbox = Pmw.ButtonBox(self.ms_group.interior(), padx=0)
-@@ -2209,7 +2223,8 @@
+@@ -2322,7 +2336,8 @@
bars = (self.mol_surf_low,self.mol_surf_middle,self.mol_surf_high)
Pmw.alignlabels(bars)
for bar in bars: bar.pack(side=LEFT)
- self.ms_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
+ #self.ms_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
-+ self.ms_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
++ self.ms_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
self.fl_group = Pmw.Group(self.interior(),tag_text='Field Lines')
self.fl_buttonbox = Pmw.ButtonBox(self.fl_group.interior(), padx=0)
-@@ -2224,7 +2239,8 @@
+@@ -2337,7 +2352,8 @@
text = """Follows same coloring as surface.""",
)
label.pack()
- self.fl_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=TOP)
+ #self.fl_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=TOP)
-+ self.fl_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
++ self.fl_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
self.pi_group = Pmw.Group(self.interior(),tag_text='Positive Isosurface')
self.pi_buttonbox = Pmw.ButtonBox(self.pi_group.interior(), padx=0)
-@@ -2243,7 +2259,8 @@
+@@ -2356,7 +2372,8 @@
entryfield_validate = {'validator' : 'real', 'min':0}
)
self.pos_surf_val.pack(side=LEFT)
- self.pi_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
+ #self.pi_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
-+ self.pi_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
++ self.pi_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
self.ni_group = Pmw.Group(self.interior(),tag_text='Negative Isosurface')
self.ni_buttonbox = Pmw.ButtonBox(self.ni_group.interior(), padx=0)
-@@ -2262,7 +2279,8 @@
+@@ -2375,7 +2392,8 @@
entryfield_validate = {'validator' : 'real', 'max':0}
)
self.neg_surf_val.pack(side=LEFT)
- self.ni_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
+ #self.ni_group.pack(fill = 'both', expand = 1, padx = 4, pady = 5, side=LEFT)
-+ self.ni_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
++ self.ni_group.grid(padx = 4, pady = 5, sticky=(N, S, E, W))
diff --git a/community/the_silver_searcher/PKGBUILD b/community/the_silver_searcher/PKGBUILD
index b25f68b16..8c2d3aac7 100644
--- a/community/the_silver_searcher/PKGBUILD
+++ b/community/the_silver_searcher/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 110246 2014-04-27 19:31:42Z arodseth $
+# $Id: PKGBUILD 111083 2014-05-13 12:15:17Z arodseth $
# Maintainer: Alexander Rødseth <rodseth@gmail.com>
# Contributor: Jeff Horelick <jdhore1@gmail.com>
# Contributor: skydrome <skydrome@i2pmail.org>
pkgname=the_silver_searcher
-pkgver=0.21.1
+pkgver=0.22.0
pkgrel=1
pkgdesc='Code searching tool similar to Ack, but faster'
url='https://github.com/ggreer/the_silver_searcher'
@@ -12,7 +12,7 @@ license=('Apache')
depends=('pcre' 'zlib' 'xz')
makedepends=('git')
arch=('x86_64' 'i686')
-source=("git://github.com/ggreer/$pkgname.git#commit=ac1e7e4b0cdd37e64f9af7256b8a4568c5546ec2")
+source=("git://github.com/ggreer/$pkgname.git#tag=$pkgver")
md5sums=('SKIP')
prepare() {
diff --git a/community/vagrant/PKGBUILD b/community/vagrant/PKGBUILD
index cfe4ac628..ad0e6541c 100644
--- a/community/vagrant/PKGBUILD
+++ b/community/vagrant/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 110860 2014-05-08 17:45:19Z jsteel $
+# $Id: PKGBUILD 111096 2014-05-13 17:47:05Z jsteel $
# Maintainer: Jonathan Steel <jsteel at aur.archlinux.org>
# Contributor: Ido Rosen <ido@kernel.org>
# Contributor: Brett Hoerner <brett@bretthoerner.com>
@@ -10,7 +10,7 @@
# Contributor: Steven Nance <steven@devtrw.com>
pkgname=vagrant
-pkgver=1.6.1
+pkgver=1.6.2
pkgrel=1
pkgdesc="Build and distribute virtualized development environments"
arch=('i686' 'x86_64')
@@ -18,9 +18,10 @@ url="http://vagrantup.com"
license=('MIT')
options=('!emptydirs')
depends=('ruby' 'curl' 'lzo2' 'libidn' 'rtmpdump')
+makedepends=('git')
source=(http://github.com/mitchellh/$pkgname/archive/v$pkgver.tar.gz
http://pkgbuild.com/~jsteel/aur/$pkgname/substrate_archlinux_$CARCH.zip)
-md5sums=('6dea6bea9055df3ab2d43de6b522e003')
+md5sums=('99ee5b69d9e3966a8ed081e46d1844ba')
[[ $CARCH == i686 ]] && md5sums[3]='c04042b24de56d18a041bc005e5ecaa4'
[[ $CARCH == x86_64 ]] && md5sums[3]='53d8a137e0b50fee8509a7d1c15fd33b'
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-08-01 21:48:26 +0000