From 31416859638d756d88136e4e0eb78027c16ac17f Mon Sep 17 00:00:00 2001 From: root Date: Sun, 24 Mar 2013 00:48:02 -0700 Subject: Sun Mar 24 00:47:57 PDT 2013 --- community/gambas3/PKGBUILD | 16 ++++---- .../gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch | 45 ---------------------- community/gambas3/uninstall-with-XDG_UTILS.patch | 13 ------- .../00fec992f5c760f546a1db933fb08325fc9cccbf.patch | 25 ++++++++++++ community/libpinyin/PKGBUILD | 14 ++++--- community/meteorjs/PKGBUILD | 38 ++++++++++++------ community/meteorjs/node010.patch | 11 ++++++ community/pdf2djvu/PKGBUILD | 4 +- 8 files changed, 82 insertions(+), 84 deletions(-) delete mode 100644 community/gambas3/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch delete mode 100644 community/gambas3/uninstall-with-XDG_UTILS.patch create mode 100644 community/libpinyin/00fec992f5c760f546a1db933fb08325fc9cccbf.patch create mode 100644 community/meteorjs/node010.patch (limited to 'community') diff --git a/community/gambas3/PKGBUILD b/community/gambas3/PKGBUILD index 273129d0a..bbcdb0c64 100644 --- a/community/gambas3/PKGBUILD +++ b/community/gambas3/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 85767 2013-03-06 23:21:50Z lcarlier $ +# $Id: PKGBUILD 86854 2013-03-23 07:25:46Z bpiotrowski $ # Maintainer: Laurent Carlier # Contributor : sebikul @@ -16,19 +16,19 @@ _components=('gambas3-gb-args' 'gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-xml' 'gambas3-gb-web') pkgname=(${_components[@]} 'gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples') pkgver=3.4.0 -pkgrel=4 +pkgrel=6 pkgdesc="A free development environment based on a Basic interpreter." arch=('i686' 'x86_64') url="http://gambas.sourceforge.net/" license=('GPL2') groups=('gambas3') -makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' - 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' - 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' 'librsvg' +makedepends=('intltool' 'mariadb' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' + 'zlib' 'mesa' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' + 'postgresql-libs' 'libmariadbclient' 'unixodbc' 'sqlite2' 'sqlite' 'librsvg' 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit' 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring' 'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm' - 'gmime' 'glu') + 'gmime') options=(!emptydirs) source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" fix-xfce4-terminal.patch) @@ -153,7 +153,7 @@ package_gambas3-gb-db-form() { } package_gambas3-gb-db-mysql() { - depends=('gambas3-gb-db' 'libmysqlclient') + depends=('gambas3-gb-db' 'libmariadbclient') pkgdesc="MySQL database access component" cd ${srcdir}/fakeinstall @@ -335,7 +335,7 @@ package_gambas3-gb-gsl() { } package_gambas3-gb-gtk-opengl() { - depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext' 'glu') + depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext') pkgdesc="GTK+ toolkit OpenGL component" cd ${srcdir}/fakeinstall diff --git a/community/gambas3/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch b/community/gambas3/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch deleted file mode 100644 index 61224b9b0..000000000 --- a/community/gambas3/gambas3-3.3.4-fix-ftbfs-with-llvm-3.2.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -upr gambas3-3.3.4.orig/gb.jit/src/jit_codegen.cpp gambas3-3.3.4/gb.jit/src/jit_codegen.cpp ---- gambas3-3.3.4.orig/gb.jit/src/jit_codegen.cpp 2012-09-25 17:04:41.000000000 +0300 -+++ gambas3-3.3.4/gb.jit/src/jit_codegen.cpp 2012-12-25 03:55:54.000000000 +0200 -@@ -3614,7 +3614,7 @@ void TryExpression::codegen(){ - create_gep(temp_errcontext1, TARGET_BITS, 0, TARGET_BITS, 0)); - - llvm::Function* f = llvm::cast(get_global_function(_setjmp, 'i', "p")); -- f->addFnAttr(llvm::Attribute::ReturnsTwice); -+ f->addFnAttr(llvm::Attributes::ReturnsTwice); - - llvm::Value* setjmp_return = builder->CreateCall(f, jmpbuf); - -@@ -3665,7 +3665,7 @@ void LargeTryExpression::codegen(){ - create_gep(temp_errcontext2, TARGET_BITS, 0, TARGET_BITS, 0)); - - llvm::Function* f = llvm::cast(get_global_function(_setjmp, 'i', "p")); -- f->addFnAttr(llvm::Attribute::ReturnsTwice); -+ f->addFnAttr(llvm::Attributes::ReturnsTwice); - - llvm::Value* setjmp_return = builder->CreateCall(f, jmpbuf); - -diff -upr gambas3-3.3.4.orig/gb.jit/src/jit_gambas_pass.cpp gambas3-3.3.4/gb.jit/src/jit_gambas_pass.cpp ---- gambas3-3.3.4.orig/gb.jit/src/jit_gambas_pass.cpp 2012-09-25 17:04:41.000000000 +0300 -+++ gambas3-3.3.4/gb.jit/src/jit_gambas_pass.cpp 2012-12-25 03:38:36.000000000 +0200 -@@ -25,7 +25,7 @@ - - #include "llvm/Pass.h" - #include "llvm/Function.h" --#include "llvm/Support/IRBuilder.h" -+#include "llvm/IRBuilder.h" - #include "llvm/Support/raw_ostream.h" - - #include "main.h" -diff -upr gambas3-3.3.4.orig/gb.jit/src/jit.h gambas3-3.3.4/gb.jit/src/jit.h ---- gambas3-3.3.4.orig/gb.jit/src/jit.h 2012-09-25 17:04:41.000000000 +0300 -+++ gambas3-3.3.4/gb.jit/src/jit.h 2012-12-25 03:38:23.000000000 +0200 -@@ -39,7 +39,7 @@ - #include "llvm/Support/TargetSelect.h" - #include "llvm/Support/ManagedStatic.h" - #include "llvm/Support/raw_ostream.h" --#include "llvm/Support/IRBuilder.h" -+#include "llvm/IRBuilder.h" - #include "llvm/Support/DynamicLibrary.h" - #include "llvm/Support/CFG.h" - #include "llvm/PassManager.h" diff --git a/community/gambas3/uninstall-with-XDG_UTILS.patch b/community/gambas3/uninstall-with-XDG_UTILS.patch deleted file mode 100644 index 0b7b9b8d7..000000000 --- a/community/gambas3/uninstall-with-XDG_UTILS.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nur gambas3-3.4.0/main/Makefile.am gambas3-3.4.0b/main/Makefile.am ---- gambas3-3.4.0/main/Makefile.am 2013-02-03 19:20:59.000000000 +0000 -+++ gambas3-3.4.0b/main/Makefile.am 2013-02-21 15:28:16.941250567 +0000 -@@ -27,5 +27,7 @@ - uninstall-local: - @rm -f $(DESTDIR)$(bindir)/gbr$(GAMBAS_VERSION) - @rm -rf $(DESTDIR)$(gblibdir)/info -- @xdg-mime uninstall $(srcdir)/mime/application-x-gambas3.xml; -- @xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3; -+ @if test x"$(XDG_UTILS)" != x; then \ -+ xdg-mime uninstall $(srcdir)/mime/application-x-gambas3.xml; \ -+ xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3; \ -+ fi diff --git a/community/libpinyin/00fec992f5c760f546a1db933fb08325fc9cccbf.patch b/community/libpinyin/00fec992f5c760f546a1db933fb08325fc9cccbf.patch new file mode 100644 index 000000000..c895adf4c --- /dev/null +++ b/community/libpinyin/00fec992f5c760f546a1db933fb08325fc9cccbf.patch @@ -0,0 +1,25 @@ +From 00fec992f5c760f546a1db933fb08325fc9cccbf Mon Sep 17 00:00:00 2001 +From: Peng Wu +Date: Sat, 23 Mar 2013 09:52:46 +0800 +Subject: [PATCH] fixes import dict + +--- + src/storage/phrase_large_table2.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/storage/phrase_large_table2.h b/src/storage/phrase_large_table2.h +index 368d03d..34bb12d 100644 +--- a/src/storage/phrase_large_table2.h ++++ b/src/storage/phrase_large_table2.h +@@ -133,7 +133,7 @@ static inline int reduce_tokens(const PhraseTokens tokens, + } + + /* the following line will be removed in future after code are verified. */ +- assert(0 == num || 1 == num); ++ assert(0 <= num && num <= 3); + + return num; + } +-- +1.8.1.5 + diff --git a/community/libpinyin/PKGBUILD b/community/libpinyin/PKGBUILD index 08c377e9d..12b2c07a0 100644 --- a/community/libpinyin/PKGBUILD +++ b/community/libpinyin/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 86670 2013-03-21 01:28:41Z fyan $ +# $Id: PKGBUILD 86857 2013-03-23 08:32:34Z fyan $ # Maintainer: Felix Yan # Contributor: Yangtse # Contributor: WU Jun pkgname=libpinyin pkgver=0.8.93 -pkgrel=1 -pkgdesc="Library to deal with pinyin." +pkgrel=2 +pkgdesc="Library to deal with pinyin" arch=('i686' 'x86_64') url="https://github.com/libpinyin/libpinyin" license=('GPL') depends=('db' 'glib2') options=(!libtool) source=("https://github.com/libpinyin/libpinyin/archive/${pkgver}.tar.gz" - "http://downloads.sourceforge.net/libpinyin/model5.text.tar.gz") + "http://downloads.sourceforge.net/libpinyin/model5.text.tar.gz" + "https://github.com/epico/libpinyin/commit/00fec992f5c760f546a1db933fb08325fc9cccbf.patch") noextract=("model5.text.tar.gz") build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../00fec992f5c760f546a1db933fb08325fc9cccbf.patch + cp "${srcdir}/model5.text.tar.gz" "${srcdir}/${pkgname}-${pkgver}/data/" sed -i '/wget.*model5\.text\.tar\.gz/ d' ${srcdir}/${pkgname}-${pkgver}/data/Makefile.am @@ -30,4 +33,5 @@ package() { make DESTDIR="${pkgdir}" install } md5sums=('1d9a768496c8a4368d3488639cadd554' - 'a83812e2d3be5695be54f95d9d7a3aa0') + 'a83812e2d3be5695be54f95d9d7a3aa0' + '2163a85183c36f69d65d19b2bc9e2c9b') diff --git a/community/meteorjs/PKGBUILD b/community/meteorjs/PKGBUILD index 76a775371..26ec54615 100644 --- a/community/meteorjs/PKGBUILD +++ b/community/meteorjs/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 86490 2013-03-18 11:33:33Z mtorromeo $ +# $Id: PKGBUILD 86868 2013-03-23 12:46:57Z mtorromeo $ # Maintainer: Massimiliano Torromeo # Contributor: Parth Buch # Contributor: Tom Vincent pkgname=meteorjs pkgver=0.5.9 -pkgrel=1 +pkgrel=2 pkgdesc="Open-source platform for building top-quality web apps in a fraction of the time." arch=('i686' 'x86_64') url="https://github.com/meteor/meteor" @@ -14,7 +14,8 @@ depends=('nodejs' 'mongodb') options=('!strip') sha256sums=('43e228e09c66bc167108c2a8375e23e472d19e82b216ad0875efed94073ef5ba' - 'a3ac659c52b652676da0530f2148025e0f8bfa84bccf63431c20eb72d3bc5cb7') + 'a3ac659c52b652676da0530f2148025e0f8bfa84bccf63431c20eb72d3bc5cb7' + 'af74a9bd6fa7c8c556f7ed17e76983ff416309b02c0e86c97d1606236f2dd39e') if [ "$CARCH" = "x86_64" ]; then _arch="amd64" @@ -23,19 +24,31 @@ else sha256sums[0]='f28ca14d923e19e1035adff506cac8f839c1ec97410d4617a2c2a20cc733d879' fi -source=("http://d3sqy0vbqsdhku.cloudfront.net/meteor_$pkgver-1_$_arch.deb" meteor) +source=("http://d3sqy0vbqsdhku.cloudfront.net/meteor_$pkgver-1_$_arch.deb" meteor node010.patch) + +build() { + [ -d build ] && rm -rf build + mkdir build + tar xf data.tar.gz -C build ./usr/lib/meteor + cd build/usr/lib/meteor + + patch -p0 -i "$srcdir/node010.patch" + + # rebuild fibers + cd lib/node_modules/fibers/ + rm -rf bin/* + PATH="/usr/lib/node_modules/npm/bin/node-gyp-bin:$PATH" node build.js + rm -rf build +} package() { - tar xf data.tar.gz -C "$pkgdir" ./usr/lib/meteor + cp -a "$srcdir/build/"* "$pkgdir" + cd "$pkgdir/usr/lib/meteor" - install -Dm644 "$pkgdir/usr/lib/meteor/LICENSE.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt" + install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt" install -Dm755 "$srcdir/meteor" "$pkgdir/usr/bin/meteor" - cd "$pkgdir/usr/lib/meteor" - rm -rf LICENSE.txt lib/node lib/dtrace lib/node_modules/npm share include \ - lib/node_modules/mongodb/node_modules/bson/build/Release/obj.target/bson.node \ - lib/node_modules/websocket/build/Release/obj.target/xor.node \ - lib/node_modules/websocket/build/Release/obj.target/validation.node + rm -rf LICENSE.txt lib/node lib/dtrace lib/node_modules/npm share include # mongodb links rm -rf mongodb @@ -49,4 +62,7 @@ package() { ln -s /usr/bin/node bin/node ln -s /usr/bin/node-waf bin/node-waf ln -s /usr/bin/npm bin/npm + + # remove build dirs + find -type d -name build -exec rm -rf {} + } diff --git a/community/meteorjs/node010.patch b/community/meteorjs/node010.patch new file mode 100644 index 000000000..8b252399d --- /dev/null +++ b/community/meteorjs/node010.patch @@ -0,0 +1,11 @@ +--- lib/node_modules/connect/lib/middleware/static.js.orig 2013-03-23 13:30:36.479309260 +0100 ++++ lib/node_modules/connect/lib/middleware/static.js 2013-03-23 13:30:13.661917828 +0100 +@@ -126,7 +126,7 @@ + if (!root && ~path.indexOf('..')) return utils.forbidden(res); + + // join / normalize from optional root dir +- path = normalize(join(root, path)); ++ path = normalize(join(root || '', path)); + + // malicious path + if (root && 0 != path.indexOf(root)) return fn diff --git a/community/pdf2djvu/PKGBUILD b/community/pdf2djvu/PKGBUILD index a032ac75e..92ef3dedd 100644 --- a/community/pdf2djvu/PKGBUILD +++ b/community/pdf2djvu/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 82217 2013-01-12 08:15:31Z andrea $ +# $Id: PKGBUILD 86853 2013-03-23 07:25:44Z bpiotrowski $ # Contributor: Paulo Matias # Maintainer: Jelle van der Waa pkgname=pdf2djvu pkgver=0.7.16 -pkgrel=1 +pkgrel=2 pkgdesc="Creates DjVu files from PDF files" arch=('i686' 'x86_64') url="http://pdf2djvu.googlecode.com" -- cgit v1.2.3-54-g00ecf