diff options
| author | root <root@rshg054.dnsready.net> | 2012-08-06 00:02:23 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-08-06 00:02:23 +0000 |
| commit | 5cb978c42b6c6444161fa41121ea5f07579404bc (patch) | |
| tree | 8df32941b47d164ce5c0d12f082337989195a3a7 | |
| parent | 9b4356a4ce894946739f7fff9411f62be0fbc122 (diff) | |
Mon Aug 6 00:02:23 UTC 2012
39 files changed, 1081 insertions, 125 deletions
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD index 7226f50af..d5a02216e 100644 --- a/community/nodejs/PKGBUILD +++ b/community/nodejs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 74366 2012-07-25 20:56:41Z bpiotrowski $ +# $Id: PKGBUILD 74783 2012-08-04 07:34:52Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: James Campos <james.r.campos@gmail.com> @@ -8,7 +8,7 @@ # Contributor: TIanyi Cui <tianyicui@gmail.com> pkgname=nodejs -pkgver=0.8.4 +pkgver=0.8.5 pkgrel=1 pkgdesc='Evented I/O for V8 javascript' arch=('i686' 'x86_64') @@ -19,7 +19,7 @@ checkdepends=('curl') # curl used for check() optdepends=('openssl: TLS support') options=('!emptydirs') source=("http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz") -md5sums=('ea44c0fa7a5f268bedfbea0ae1884db5') +md5sums=('815b71e801fcecae43b3dc08737f5097') build() { cd node-v${pkgver} @@ -56,9 +56,6 @@ package() { cp -r doc/api/*.html \ ${pkgdir}/usr/share/doc/nodejs - # compress man pages - find $pkgdir/usr/lib/node_modules/npm/man -type f | xargs gzip -9 - install -D -m644 LICENSE \ ${pkgdir}/usr/share/licenses/nodejs/LICENSE } diff --git a/core/libimobiledevice/HOME-segfault.patch b/core/libimobiledevice/HOME-segfault.patch new file mode 100644 index 000000000..e48e6cb42 --- /dev/null +++ b/core/libimobiledevice/HOME-segfault.patch @@ -0,0 +1,14 @@ +The patch fixes segfault when both $XDG_CONFIG_HOME and $HOME are unset +Signed-off-by: Maxim Mikityanskiy <maxtram95@gmail.com> +--- src/userpref.c.orig 2012-06-04 17:04:57.387303630 +0300 ++++ src/userpref.c 2012-06-04 17:06:05.741301627 +0300 +@@ -125,6 +125,9 @@ + const char *cdir = getenv("XDG_CONFIG_HOME"); + if (!cdir) { + cdir = getenv("HOME"); ++ if (!cdir) { ++ cdir="/root"; ++ } + strcpy(__config_dir, cdir); + strcat(__config_dir, DIR_SEP_S); + strcat(__config_dir, ".config"); diff --git a/core/libimobiledevice/PKGBUILD b/core/libimobiledevice/PKGBUILD new file mode 100644 index 000000000..5e85bd7b9 --- /dev/null +++ b/core/libimobiledevice/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 164735 2012-08-04 10:06:26Z tomegun $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: Gabriel Martinez < reitaka at gmail dot com > + +pkgname=libimobiledevice +pkgver=1.1.4 +pkgrel=2 +pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux" +url="http://libimobiledevice.org/" +arch=('i686' 'x86_64') +license=('GPL2' 'LGPL2.1') +depends=('usbmuxd' 'gnutls' 'libgcrypt') +options=('!libtool') +source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2 + HOME-segfault.patch) + +build() { + cd "$pkgname-$pkgver" + + patch -p0 < "$srcdir/HOME-segfault.patch" + + PYTHON=/usr/bin/python2 ./configure --prefix=/usr + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} +md5sums=('3f28cbc6a2e30d34685049c0abde5183' + '0de709dbf8e79d0b00cca06f5e61d57c') diff --git a/extra/blas/Makefile.blas b/extra/blas/Makefile.blas index 0c6cd06d6..7126cbb19 100644 --- a/extra/blas/Makefile.blas +++ b/extra/blas/Makefile.blas @@ -137,6 +137,33 @@ ALLOBJ=$(SBLAS1) $(SBLAS2) $(SBLAS3) $(DBLAS1) $(DBLAS2) $(DBLAS3) \ $(CBLAS1) $(CBLAS2) $(CBLAS3) $(ZBLAS1) \ $(ZBLAS2) $(ZBLAS3) $(ALLBLAS) +$(BLASLIB): $(ALLOBJ) + $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) + $(RANLIB) $@ + +single: $(SBLAS1) $(ALLBLAS) $(SBLAS2) $(SBLAS3) + $(ARCH) $(ARCHFLAGS) $(BLASLIB) $(SBLAS1) $(ALLBLAS) \ + $(SBLAS2) $(SBLAS3) + $(RANLIB) $(BLASLIB) + +double: $(DBLAS1) $(ALLBLAS) $(DBLAS2) $(DBLAS3) + $(ARCH) $(ARCHFLAGS) $(BLASLIB) $(DBLAS1) $(ALLBLAS) \ + $(DBLAS2) $(DBLAS3) + $(RANLIB) $(BLASLIB) + +complex: $(CBLAS1) $(CB1AUX) $(ALLBLAS) $(CBLAS2) $(CBLAS3) + $(ARCH) $(ARCHFLAGS) $(BLASLIB) $(CBLAS1) $(CB1AUX) \ + $(ALLBLAS) $(CBLAS2) $(CBLAS3) + $(RANLIB) $(BLASLIB) + +complex16: $(ZBLAS1) $(ZB1AUX) $(ALLBLAS) $(ZBLAS2) $(ZBLAS3) + $(ARCH) $(ARCHFLAGS) $(BLASLIB) $(ZBLAS1) $(ZB1AUX) \ + $(ALLBLAS) $(ZBLAS2) $(ZBLAS3) + $(RANLIB) $(BLASLIB) + +FRC: + @FRC=$(FRC) + clean: rm -f *.o libblas.a libblas.so* @@ -145,5 +172,7 @@ static: $(ALLOBJ) ranlib libblas.a shared: $(ALLOBJ) - cc $(CFLAGS) -shared -Wl,-soname,libblas.so.3 -o libblas.so.3.4.0 $(ALLOBJ) -lm -lgfortran -lc + cc $(CFLAGS) -shared -Wl,-soname,libblas.so.3 -o libblas.so.3.4.1 $(ALLOBJ) -lm -lgfortran -lc +#.f.o: +# $(FORTRAN) $(OPTS) -c $< -o $@ diff --git a/extra/blas/PKGBUILD b/extra/blas/PKGBUILD index 94dd1c408..b5b65cbc5 100755 --- a/extra/blas/PKGBUILD +++ b/extra/blas/PKGBUILD @@ -5,7 +5,7 @@ # Contributor: Jason Taylor <jftaylor21@gmail.com> pkgname=blas -pkgver=3.4.0 +pkgver=3.4.1 pkgrel=1 url="http://www.netlib.org/blas" makedepends=('gcc-fortran') @@ -16,8 +16,8 @@ license=("custom") source=(http://www.netlib.org/lapack/lapack-${pkgver}.tgz Makefile.blas LICENSE.blas) -sha1sums=('910109a931524f8dcc2734ce23fe927b00ca199f' - '85996f56c13991fc69481c0e88ef905a0dcefb49' +sha1sums=('c115223ac1bac9ab971aae865d3e95442bc979bc' + 'f9eb47d6713894eaaffbf2d9b2942a777e3f5ef9' '2491a151a37f0162b25fc4e4e9a8ac444b574a76') build() { @@ -29,8 +29,8 @@ build() { pushd BLAS/SRC make clean - FFLAGS="${CFLAGS/-O?/-O0}" make dcabs1.o - FFLAGS="${CFLAGS} -fPIC" CFLAGS="${CFLAGS} -fPIC" make shared +# FFLAGS="${CFLAGS/-O?/-O0}" make dcabs1.o + FFLAGS="${CFLAGS} -fPIC" CFLAGS="${CFLAGS} -fPIC" CXXFLAGS="${CXXFLAGS} -fPIC" make shared cp libblas.so.${pkgver} "${srcdir}/lapack-${pkgver}/" popd diff --git a/extra/fuse/PKGBUILD b/extra/fuse/PKGBUILD index c16e6d78d..2f57928fe 100644 --- a/extra/fuse/PKGBUILD +++ b/extra/fuse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 157796 2012-04-29 15:29:44Z dreisner $ +# $Id: PKGBUILD 164767 2012-08-04 18:59:21Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Tom Gundersen <teg@jklm.no> # Contributor: Mark Rosenstand <mark@archlinux.org> pkgname=fuse -pkgver=2.9.0 +pkgver=2.9.1 pkgrel=1 pkgdesc="A library that makes it possible to implement a filesystem in a userspace program." arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ backup=(etc/fuse.conf) source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz 'fuse.conf') options=(!libtool) -sha1sums=('e64396d516cca55995e0a8f8dd75456fd9d9d21d' +sha1sums=('ed9e8ab740576a038856109cc587d52a387b223f' '3b42e37a741d4651099225987dc40e7f02a716ad') build() { diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD index 7c1de7797..415e603af 100644 --- a/extra/icedtea-web-java7/PKGBUILD +++ b/extra/icedtea-web-java7/PKGBUILD @@ -4,13 +4,15 @@ pkgbase=icedtea-web-java7 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc') pkgver=1.2.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit') -source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz) -sha256sums=('134efcd429086a643ba03ec6e4da991527c3e5dfcd6ed6680a83824ad3f0cfd6') +source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz + fix_firefox_crash.diff) +sha256sums=('134efcd429086a643ba03ec6e4da991527c3e5dfcd6ed6680a83824ad3f0cfd6' + '9391182fe8631c9eaea93e0e5a1daf0e42658963596fe4fcbe1ba1afaf775af3') _javaver=7 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk @@ -18,6 +20,9 @@ _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk build() { cd "${srcdir}"/icedtea-web* + # fix firefox crash - https://bugs.archlinux.org/task/30969 + patch -RNp1 -i ${srcdir}/fix_firefox_crash.diff + . /etc/profile.d/jre.sh . /etc/profile.d/jdk.sh diff --git a/extra/icedtea-web-java7/fix_firefox_crash.diff b/extra/icedtea-web-java7/fix_firefox_crash.diff new file mode 100644 index 000000000..cd02aba0a --- /dev/null +++ b/extra/icedtea-web-java7/fix_firefox_crash.diff @@ -0,0 +1,228 @@ + +# HG changeset patch +# User Adam Domurad <adomurad@redhat.com> +# Date 1340899207 14400 +# Node ID a49edd57b1b332b431222b1c225189fe51676193 +# Parent d65bd94e0ba9b7c8b9051c7d471b55c2c74ea3f4 +Fixes invalid plugin table error that sometimes occurs. +The invalid plugin table error was happening when the API that was +being compiled with had a larger size than that of the browser. +The plugin now only checks if the minimal subset it uses exists. + +diff -r d65bd94e0ba9 -r a49edd57b1b3 plugin/icedteanp/IcedTeaNPPlugin.cc +--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Jun 08 13:44:25 2012 -0400 ++++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Jun 28 12:00:07 2012 -0400 +@@ -2022,105 +2022,48 @@ + PLUGIN_DEBUG ("plugin_data_destroy return\n"); + } + +-// FACTORY FUNCTIONS +- +-// Provides the browser with pointers to the plugin functions that we +-// implement and initializes a local table with browser functions that +-// we may wish to call. Called once, after browser startup and before +-// the first plugin instance is created. +-// The field 'initialized' is set to true once this function has +-// finished. If 'initialized' is already true at the beginning of +-// this function, then it is evident that NP_Initialize has already +-// been called. There is no need to call this function more than once and +-// this workaround avoids any duplicate calls. +-NPError +-NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable) ++static bool ++initialize_browser_functions(const NPNetscapeFuncs* browserTable) + { +- PLUGIN_DEBUG ("NP_Initialize\n"); +- +- if ((browserTable == NULL) || (pluginTable == NULL)) ++#if MOZILLA_VERSION_COLLAPSED < 1090100 ++#define NPNETSCAPEFUNCS_LAST_FIELD_USED (browserTable->pluginthreadasynccall) ++#else ++#define NPNETSCAPEFUNCS_LAST_FIELD_USED (browserTable->setvalueforurl) ++#endif ++ ++ //Determine the size in bytes, as a difference of the address past the last used field ++ //And the browser table address ++ size_t usedSize = (char*)(1 + &NPNETSCAPEFUNCS_LAST_FIELD_USED) - (char*)browserTable; ++ ++ // compare the reported size versus the size we required ++ if (browserTable->size < usedSize) + { +- PLUGIN_ERROR ("Browser or plugin function table is NULL."); +- +- return NPERR_INVALID_FUNCTABLE_ERROR; ++ return false; + } + +- // Ensure that the major version of the plugin API that the browser +- // expects is not more recent than the major version of the API that +- // we've implemented. +- if ((browserTable->version >> 8) > NP_VERSION_MAJOR) +- { +- PLUGIN_ERROR ("Incompatible version."); +- +- return NPERR_INCOMPATIBLE_VERSION_ERROR; +- } +- +- // Ensure that the plugin function table we've received is large +- // enough to store the number of functions that we may provide. +- if (pluginTable->size < sizeof (NPPluginFuncs)) +- { +- PLUGIN_ERROR ("Invalid plugin function table."); +- +- return NPERR_INVALID_FUNCTABLE_ERROR; +- } +- +- // Ensure that the browser function table is large enough to store +- // the number of browser functions that we may use. +- if (browserTable->size < sizeof (NPNetscapeFuncs)) +- { +- fprintf (stderr, "ERROR: Invalid browser function table. Some functionality may be restricted.\n"); +- } +- +- // Store in a local table the browser functions that we may use. +- browser_functions.size = browserTable->size; +- browser_functions.version = browserTable->version; +- browser_functions.geturlnotify = browserTable->geturlnotify; +- browser_functions.geturl = browserTable->geturl; +- browser_functions.posturlnotify = browserTable->posturlnotify; +- browser_functions.posturl = browserTable->posturl; +- browser_functions.requestread = browserTable->requestread; +- browser_functions.newstream = browserTable->newstream; +- browser_functions.write = browserTable->write; +- browser_functions.destroystream = browserTable->destroystream; +- browser_functions.status = browserTable->status; +- browser_functions.uagent = browserTable->uagent; +- browser_functions.memalloc = browserTable->memalloc; +- browser_functions.memfree = browserTable->memfree; +- browser_functions.memflush = browserTable->memflush; +- browser_functions.reloadplugins = browserTable->reloadplugins; +- browser_functions.getJavaEnv = browserTable->getJavaEnv; +- browser_functions.getJavaPeer = browserTable->getJavaPeer; +- browser_functions.getvalue = browserTable->getvalue; +- browser_functions.setvalue = browserTable->setvalue; +- browser_functions.invalidaterect = browserTable->invalidaterect; +- browser_functions.invalidateregion = browserTable->invalidateregion; +- browser_functions.forceredraw = browserTable->forceredraw; +- browser_functions.getstringidentifier = browserTable->getstringidentifier; +- browser_functions.getstringidentifiers = browserTable->getstringidentifiers; +- browser_functions.getintidentifier = browserTable->getintidentifier; +- browser_functions.identifierisstring = browserTable->identifierisstring; +- browser_functions.utf8fromidentifier = browserTable->utf8fromidentifier; +- browser_functions.intfromidentifier = browserTable->intfromidentifier; +- browser_functions.createobject = browserTable->createobject; +- browser_functions.retainobject = browserTable->retainobject; +- browser_functions.releaseobject = browserTable->releaseobject; +- browser_functions.invoke = browserTable->invoke; +- browser_functions.invokeDefault = browserTable->invokeDefault; +- browser_functions.evaluate = browserTable->evaluate; +- browser_functions.getproperty = browserTable->getproperty; +- browser_functions.setproperty = browserTable->setproperty; +- browser_functions.removeproperty = browserTable->removeproperty; +- browser_functions.hasproperty = browserTable->hasproperty; +- browser_functions.hasmethod = browserTable->hasmethod; +- browser_functions.releasevariantvalue = browserTable->releasevariantvalue; +- browser_functions.setexception = browserTable->setexception; +- browser_functions.pluginthreadasynccall = browserTable->pluginthreadasynccall; +-#if MOZILLA_VERSION_COLLAPSED >= 1090100 +- browser_functions.getvalueforurl = browserTable->getvalueforurl; +- browser_functions.setvalueforurl = browserTable->setvalueforurl; +-#endif +- +- // Return to the browser the plugin functions that we implement. ++ //Ensure any unused fields are NULL ++ memset(&browser_functions, 0, sizeof(NPNetscapeFuncs)); ++ //Copy fields according to given size ++ memcpy(&browser_functions, browserTable, browserTable->size); ++ ++ return true; ++} ++ ++/* Set the plugin table to the correct contents, taking care not to write past ++ * the provided object space */ ++static bool ++initialize_plugin_table(NPPluginFuncs* pluginTable) ++{ ++#define NPPLUGINFUNCS_LAST_FIELD_USED (pluginTable->getvalue) ++ ++ //Determine the size in bytes, as a difference of the address past the last used field ++ //And the browser table address ++ size_t usedSize = (char*)(1 + &NPPLUGINFUNCS_LAST_FIELD_USED) - (char*)pluginTable; ++ ++ // compare the reported size versus the size we required ++ if (pluginTable->size < usedSize) ++ return false; ++ + pluginTable->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR; + pluginTable->size = sizeof (NPPluginFuncs); + +@@ -2150,6 +2093,68 @@ + pluginTable->getvalue = NPP_GetValueProcPtr (ITNP_GetValue); + #endif + ++ return true; ++} ++ ++// FACTORY FUNCTIONS ++ ++// Provides the browser with pointers to the plugin functions that we ++// implement and initializes a local table with browser functions that ++// we may wish to call. Called once, after browser startup and before ++// the first plugin instance is created. ++// The field 'initialized' is set to true once this function has ++// finished. If 'initialized' is already true at the beginning of ++// this function, then it is evident that NP_Initialize has already ++// been called. There is no need to call this function more than once and ++// this workaround avoids any duplicate calls. ++NPError ++NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable) ++{ ++ PLUGIN_DEBUG ("NP_Initialize\n"); ++ ++ if ((browserTable == NULL) || (pluginTable == NULL)) ++ { ++ PLUGIN_ERROR ("Browser or plugin function table is NULL."); ++ ++ return NPERR_INVALID_FUNCTABLE_ERROR; ++ } ++ ++ // Ensure that the major version of the plugin API that the browser ++ // expects is not more recent than the major version of the API that ++ // we've implemented. ++ if ((browserTable->version >> 8) > NP_VERSION_MAJOR) ++ { ++ PLUGIN_ERROR ("Incompatible version."); ++ ++ return NPERR_INCOMPATIBLE_VERSION_ERROR; ++ } ++ ++ // Copy into a global table (browser_functions) the browser functions that we may use. ++ // If the browser functions needed change, update NPNETSCAPEFUNCS_LAST_FIELD_USED ++ // within this function ++ bool browser_functions_supported = initialize_browser_functions(browserTable); ++ ++ // Check if everything we rely on is supported ++ if ( !browser_functions_supported ) ++ { ++ PLUGIN_ERROR ("Invalid browser function table."); ++ ++ return NPERR_INVALID_FUNCTABLE_ERROR; ++ } ++ ++ // Return to the browser the plugin functions that we implement. ++ // If the plugin functions needed change, update NPPLUGINFUNCS_LAST_FIELD_USED ++ // within this function ++ bool plugin_functions_supported = initialize_plugin_table(pluginTable); ++ ++ // Check if everything we rely on is supported ++ if ( !plugin_functions_supported ) ++ { ++ PLUGIN_ERROR ("Invalid plugin function table."); ++ ++ return NPERR_INVALID_FUNCTABLE_ERROR; ++ } ++ + // Re-setting the above tables multiple times is OK (as the + // browser may change its function locations). However + // anything beyond this point should only run once. + diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD index 5ae3498ad..1d90a13db 100644 --- a/extra/icedtea-web/PKGBUILD +++ b/extra/icedtea-web/PKGBUILD @@ -1,22 +1,28 @@ -# $Id: PKGBUILD 164517 2012-08-01 14:21:31Z andyrtr $ +# $Id: PKGBUILD 164729 2012-08-04 08:45:39Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=icedtea-web pkgname=('icedtea-web' 'icedtea-web-doc') pkgver=1.2.1 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://icedtea.classpath.org/wiki/IcedTea-Web" license=('GPL2') makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit') -source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz) -sha256sums=('134efcd429086a643ba03ec6e4da991527c3e5dfcd6ed6680a83824ad3f0cfd6') +source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz + fix_firefox_crash.diff) +sha256sums=('134efcd429086a643ba03ec6e4da991527c3e5dfcd6ed6680a83824ad3f0cfd6' + '9391182fe8631c9eaea93e0e5a1daf0e42658963596fe4fcbe1ba1afaf775af3') - _javaver=6 - _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk +_javaver=6 +_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk build() { cd "$srcdir/$pkgname-$pkgver" + + # fix firefox crash - https://bugs.archlinux.org/task/30969 + patch -RNp1 -i ${srcdir}/fix_firefox_crash.diff + ./configure --prefix=/usr/lib/jvm/java-6-openjdk \ --datarootdir=/usr/share make diff --git a/extra/icedtea-web/fix_firefox_crash.diff b/extra/icedtea-web/fix_firefox_crash.diff new file mode 100644 index 000000000..cd02aba0a --- /dev/null +++ b/extra/icedtea-web/fix_firefox_crash.diff @@ -0,0 +1,228 @@ + +# HG changeset patch +# User Adam Domurad <adomurad@redhat.com> +# Date 1340899207 14400 +# Node ID a49edd57b1b332b431222b1c225189fe51676193 +# Parent d65bd94e0ba9b7c8b9051c7d471b55c2c74ea3f4 +Fixes invalid plugin table error that sometimes occurs. +The invalid plugin table error was happening when the API that was +being compiled with had a larger size than that of the browser. +The plugin now only checks if the minimal subset it uses exists. + +diff -r d65bd94e0ba9 -r a49edd57b1b3 plugin/icedteanp/IcedTeaNPPlugin.cc +--- a/plugin/icedteanp/IcedTeaNPPlugin.cc Fri Jun 08 13:44:25 2012 -0400 ++++ b/plugin/icedteanp/IcedTeaNPPlugin.cc Thu Jun 28 12:00:07 2012 -0400 +@@ -2022,105 +2022,48 @@ + PLUGIN_DEBUG ("plugin_data_destroy return\n"); + } + +-// FACTORY FUNCTIONS +- +-// Provides the browser with pointers to the plugin functions that we +-// implement and initializes a local table with browser functions that +-// we may wish to call. Called once, after browser startup and before +-// the first plugin instance is created. +-// The field 'initialized' is set to true once this function has +-// finished. If 'initialized' is already true at the beginning of +-// this function, then it is evident that NP_Initialize has already +-// been called. There is no need to call this function more than once and +-// this workaround avoids any duplicate calls. +-NPError +-NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable) ++static bool ++initialize_browser_functions(const NPNetscapeFuncs* browserTable) + { +- PLUGIN_DEBUG ("NP_Initialize\n"); +- +- if ((browserTable == NULL) || (pluginTable == NULL)) ++#if MOZILLA_VERSION_COLLAPSED < 1090100 ++#define NPNETSCAPEFUNCS_LAST_FIELD_USED (browserTable->pluginthreadasynccall) ++#else ++#define NPNETSCAPEFUNCS_LAST_FIELD_USED (browserTable->setvalueforurl) ++#endif ++ ++ //Determine the size in bytes, as a difference of the address past the last used field ++ //And the browser table address ++ size_t usedSize = (char*)(1 + &NPNETSCAPEFUNCS_LAST_FIELD_USED) - (char*)browserTable; ++ ++ // compare the reported size versus the size we required ++ if (browserTable->size < usedSize) + { +- PLUGIN_ERROR ("Browser or plugin function table is NULL."); +- +- return NPERR_INVALID_FUNCTABLE_ERROR; ++ return false; + } + +- // Ensure that the major version of the plugin API that the browser +- // expects is not more recent than the major version of the API that +- // we've implemented. +- if ((browserTable->version >> 8) > NP_VERSION_MAJOR) +- { +- PLUGIN_ERROR ("Incompatible version."); +- +- return NPERR_INCOMPATIBLE_VERSION_ERROR; +- } +- +- // Ensure that the plugin function table we've received is large +- // enough to store the number of functions that we may provide. +- if (pluginTable->size < sizeof (NPPluginFuncs)) +- { +- PLUGIN_ERROR ("Invalid plugin function table."); +- +- return NPERR_INVALID_FUNCTABLE_ERROR; +- } +- +- // Ensure that the browser function table is large enough to store +- // the number of browser functions that we may use. +- if (browserTable->size < sizeof (NPNetscapeFuncs)) +- { +- fprintf (stderr, "ERROR: Invalid browser function table. Some functionality may be restricted.\n"); +- } +- +- // Store in a local table the browser functions that we may use. +- browser_functions.size = browserTable->size; +- browser_functions.version = browserTable->version; +- browser_functions.geturlnotify = browserTable->geturlnotify; +- browser_functions.geturl = browserTable->geturl; +- browser_functions.posturlnotify = browserTable->posturlnotify; +- browser_functions.posturl = browserTable->posturl; +- browser_functions.requestread = browserTable->requestread; +- browser_functions.newstream = browserTable->newstream; +- browser_functions.write = browserTable->write; +- browser_functions.destroystream = browserTable->destroystream; +- browser_functions.status = browserTable->status; +- browser_functions.uagent = browserTable->uagent; +- browser_functions.memalloc = browserTable->memalloc; +- browser_functions.memfree = browserTable->memfree; +- browser_functions.memflush = browserTable->memflush; +- browser_functions.reloadplugins = browserTable->reloadplugins; +- browser_functions.getJavaEnv = browserTable->getJavaEnv; +- browser_functions.getJavaPeer = browserTable->getJavaPeer; +- browser_functions.getvalue = browserTable->getvalue; +- browser_functions.setvalue = browserTable->setvalue; +- browser_functions.invalidaterect = browserTable->invalidaterect; +- browser_functions.invalidateregion = browserTable->invalidateregion; +- browser_functions.forceredraw = browserTable->forceredraw; +- browser_functions.getstringidentifier = browserTable->getstringidentifier; +- browser_functions.getstringidentifiers = browserTable->getstringidentifiers; +- browser_functions.getintidentifier = browserTable->getintidentifier; +- browser_functions.identifierisstring = browserTable->identifierisstring; +- browser_functions.utf8fromidentifier = browserTable->utf8fromidentifier; +- browser_functions.intfromidentifier = browserTable->intfromidentifier; +- browser_functions.createobject = browserTable->createobject; +- browser_functions.retainobject = browserTable->retainobject; +- browser_functions.releaseobject = browserTable->releaseobject; +- browser_functions.invoke = browserTable->invoke; +- browser_functions.invokeDefault = browserTable->invokeDefault; +- browser_functions.evaluate = browserTable->evaluate; +- browser_functions.getproperty = browserTable->getproperty; +- browser_functions.setproperty = browserTable->setproperty; +- browser_functions.removeproperty = browserTable->removeproperty; +- browser_functions.hasproperty = browserTable->hasproperty; +- browser_functions.hasmethod = browserTable->hasmethod; +- browser_functions.releasevariantvalue = browserTable->releasevariantvalue; +- browser_functions.setexception = browserTable->setexception; +- browser_functions.pluginthreadasynccall = browserTable->pluginthreadasynccall; +-#if MOZILLA_VERSION_COLLAPSED >= 1090100 +- browser_functions.getvalueforurl = browserTable->getvalueforurl; +- browser_functions.setvalueforurl = browserTable->setvalueforurl; +-#endif +- +- // Return to the browser the plugin functions that we implement. ++ //Ensure any unused fields are NULL ++ memset(&browser_functions, 0, sizeof(NPNetscapeFuncs)); ++ //Copy fields according to given size ++ memcpy(&browser_functions, browserTable, browserTable->size); ++ ++ return true; ++} ++ ++/* Set the plugin table to the correct contents, taking care not to write past ++ * the provided object space */ ++static bool ++initialize_plugin_table(NPPluginFuncs* pluginTable) ++{ ++#define NPPLUGINFUNCS_LAST_FIELD_USED (pluginTable->getvalue) ++ ++ //Determine the size in bytes, as a difference of the address past the last used field ++ //And the browser table address ++ size_t usedSize = (char*)(1 + &NPPLUGINFUNCS_LAST_FIELD_USED) - (char*)pluginTable; ++ ++ // compare the reported size versus the size we required ++ if (pluginTable->size < usedSize) ++ return false; ++ + pluginTable->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR; + pluginTable->size = sizeof (NPPluginFuncs); + +@@ -2150,6 +2093,68 @@ + pluginTable->getvalue = NPP_GetValueProcPtr (ITNP_GetValue); + #endif + ++ return true; ++} ++ ++// FACTORY FUNCTIONS ++ ++// Provides the browser with pointers to the plugin functions that we ++// implement and initializes a local table with browser functions that ++// we may wish to call. Called once, after browser startup and before ++// the first plugin instance is created. ++// The field 'initialized' is set to true once this function has ++// finished. If 'initialized' is already true at the beginning of ++// this function, then it is evident that NP_Initialize has already ++// been called. There is no need to call this function more than once and ++// this workaround avoids any duplicate calls. ++NPError ++NP_Initialize (NPNetscapeFuncs* browserTable, NPPluginFuncs* pluginTable) ++{ ++ PLUGIN_DEBUG ("NP_Initialize\n"); ++ ++ if ((browserTable == NULL) || (pluginTable == NULL)) ++ { ++ PLUGIN_ERROR ("Browser or plugin function table is NULL."); ++ ++ return NPERR_INVALID_FUNCTABLE_ERROR; ++ } ++ ++ // Ensure that the major version of the plugin API that the browser ++ // expects is not more recent than the major version of the API that ++ // we've implemented. ++ if ((browserTable->version >> 8) > NP_VERSION_MAJOR) ++ { ++ PLUGIN_ERROR ("Incompatible version."); ++ ++ return NPERR_INCOMPATIBLE_VERSION_ERROR; ++ } ++ ++ // Copy into a global table (browser_functions) the browser functions that we may use. ++ // If the browser functions needed change, update NPNETSCAPEFUNCS_LAST_FIELD_USED ++ // within this function ++ bool browser_functions_supported = initialize_browser_functions(browserTable); ++ ++ // Check if everything we rely on is supported ++ if ( !browser_functions_supported ) ++ { ++ PLUGIN_ERROR ("Invalid browser function table."); ++ ++ return NPERR_INVALID_FUNCTABLE_ERROR; ++ } ++ ++ // Return to the browser the plugin functions that we implement. ++ // If the plugin functions needed change, update NPPLUGINFUNCS_LAST_FIELD_USED ++ // within this function ++ bool plugin_functions_supported = initialize_plugin_table(pluginTable); ++ ++ // Check if everything we rely on is supported ++ if ( !plugin_functions_supported ) ++ { ++ PLUGIN_ERROR ("Invalid plugin function table."); ++ ++ return NPERR_INVALID_FUNCTABLE_ERROR; ++ } ++ + // Re-setting the above tables multiple times is OK (as the + // browser may change its function locations). However + // anything beyond this point should only run once. + diff --git a/extra/lapack/Makefile.lapack b/extra/lapack/Makefile.lapack index 3443d7000..a56436723 100644 --- a/extra/lapack/Makefile.lapack +++ b/extra/lapack/Makefile.lapack @@ -1,4 +1,4 @@ -include ../make.inc + include ../make.inc ####################################################################### # This is the makefile to create a library for LAPACK. @@ -135,10 +135,12 @@ SLASRC = \ ssbtrd.o sspcon.o sspev.o sspevd.o sspevx.o sspgst.o \ sspgv.o sspgvd.o sspgvx.o ssprfs.o sspsv.o sspsvx.o ssptrd.o \ ssptrf.o ssptri.o ssptrs.o sstegr.o sstein.o sstev.o sstevd.o sstevr.o \ - sstevx.o ssycon.o ssyev.o ssyevd.o ssyevr.o ssyevx.o ssygs2.o \ + sstevx.o \ + ssycon.o ssyev.o ssyevd.o ssyevr.o ssyevx.o ssygs2.o \ ssygst.o ssygv.o ssygvd.o ssygvx.o ssyrfs.o ssysv.o ssysvx.o \ ssytd2.o ssytf2.o ssytrd.o ssytrf.o ssytri.o ssytri2.o ssytri2x.o \ - ssyswapr.o ssytrs.o ssytrs2.o ssyconv.o stbcon.o \ + ssyswapr.o ssytrs.o ssytrs2.o ssyconv.o \ + stbcon.o \ stbrfs.o stbtrs.o stgevc.o stgex2.o stgexc.o stgsen.o \ stgsja.o stgsna.o stgsy2.o stgsyl.o stpcon.o stprfs.o stptri.o \ stptrs.o \ @@ -208,9 +210,11 @@ CLASRC = \ cptcon.o cpteqr.o cptrfs.o cptsv.o cptsvx.o cpttrf.o cpttrs.o cptts2.o \ crot.o cspcon.o cspmv.o cspr.o csprfs.o cspsv.o \ cspsvx.o csptrf.o csptri.o csptrs.o csrscl.o cstedc.o \ - cstegr.o cstein.o csteqr.o csycon.o csymv.o \ - csyr.o csyrfs.o csysv.o csysvx.o csytf2.o csytrf.o csytri.o csytri2.o csytri2x.o \ - csyswapr.o csytrs.o csytrs2.o csyconv.o ctbcon.o ctbrfs.o ctbtrs.o ctgevc.o ctgex2.o \ + cstegr.o cstein.o csteqr.o \ + csycon.o csymv.o \ + csyr.o csyrfs.o csysv.o csysvx.o csytf2.o csytrf.o csytri.o csytri2.o csytri2x.o \ + csyswapr.o csytrs.o csytrs2.o csyconv.o \ + ctbcon.o ctbrfs.o ctbtrs.o ctgevc.o ctgex2.o \ ctgexc.o ctgsen.o ctgsja.o ctgsna.o ctgsy2.o ctgsyl.o ctpcon.o \ ctprfs.o ctptri.o \ ctptrs.o ctrcon.o ctrevc.o ctrexc.o ctrrfs.o ctrsen.o ctrsna.o \ @@ -283,12 +287,13 @@ DLASRC = \ dsbtrd.o dspcon.o dspev.o dspevd.o dspevx.o dspgst.o \ dspgv.o dspgvd.o dspgvx.o dsprfs.o dspsv.o dspsvx.o dsptrd.o \ dsptrf.o dsptri.o dsptrs.o dstegr.o dstein.o dstev.o dstevd.o dstevr.o \ - dstevx.o dsycon.o dsyev.o dsyevd.o dsyevr.o \ + dstevx.o \ + dsycon.o dsyev.o dsyevd.o dsyevr.o \ dsyevx.o dsygs2.o dsygst.o dsygv.o dsygvd.o dsygvx.o dsyrfs.o \ dsysv.o dsysvx.o \ dsytd2.o dsytf2.o dsytrd.o dsytrf.o dsytri.o dsytri2.o dsytri2x.o \ - dsyswapr.o dsytrs.o dsytrs2.o dsyconv.o dtbcon.o \ - dtbrfs.o dtbtrs.o dtgevc.o dtgex2.o dtgexc.o dtgsen.o \ + dsyswapr.o dsytrs.o dsytrs2.o dsyconv.o \ + dtbcon.o dtbrfs.o dtbtrs.o dtgevc.o dtgex2.o dtgexc.o dtgsen.o \ dtgsja.o dtgsna.o dtgsy2.o dtgsyl.o dtpcon.o dtprfs.o dtptri.o \ dtptrs.o \ dtrcon.o dtrevc.o dtrexc.o dtrrfs.o dtrsen.o dtrsna.o dtrsyl.o \ @@ -359,9 +364,11 @@ ZLASRC = \ zptcon.o zpteqr.o zptrfs.o zptsv.o zptsvx.o zpttrf.o zpttrs.o zptts2.o \ zrot.o zspcon.o zspmv.o zspr.o zsprfs.o zspsv.o \ zspsvx.o zsptrf.o zsptri.o zsptrs.o zdrscl.o zstedc.o \ - zstegr.o zstein.o zsteqr.o zsycon.o zsymv.o \ - zsyr.o zsyrfs.o zsysv.o zsysvx.o zsytf2.o zsytrf.o zsytri.o zsytri2.o zsytri2x.o \ - zsyswapr.o zsytrs.o zsytrs2.o zsyconv.o ztbcon.o ztbrfs.o ztbtrs.o ztgevc.o ztgex2.o \ + zstegr.o zstein.o zsteqr.o \ + zsycon.o zsymv.o \ + zsyr.o zsyrfs.o zsysv.o zsysvx.o zsytf2.o zsytrf.o zsytri.o zsytri2.o zsytri2x.o \ + zsyswapr.o zsytrs.o zsytrs2.o zsyconv.o \ + ztbcon.o ztbrfs.o ztbtrs.o ztgevc.o ztgex2.o \ ztgexc.o ztgsen.o ztgsja.o ztgsna.o ztgsy2.o ztgsyl.o ztpcon.o \ ztprfs.o ztptri.o \ ztptrs.o ztrcon.o ztrevc.o ztrexc.o ztrrfs.o ztrsen.o ztrsna.o \ @@ -391,14 +398,57 @@ ZXLASRC = zgesvxx.o zgerfsx.o zla_gerfsx_extended.o zla_geamv.o \ zla_lin_berr.o zlarscl2.o zlascl2.o zla_wwaddw.o endif +ALLOBJ = $(SLASRC) $(DLASRC) $(DSLASRC) $(CLASRC) $(ZLASRC) $(ZCLASRC) \ + $(SCLAUX) $(DZLAUX) $(ALLAUX) + +ifdef USEXBLAS +ALLXOBJ = $(SXLASRC) $(DXLASRC) $(CXLASRC) $(ZXLASRC) +endif + all: ../$(LAPACKLIB) +../$(LAPACKLIB): $(ALLOBJ) $(ALLXOBJ) + $(ARCH) $(ARCHFLAGS) $@ $(ALLOBJ) $(ALLXOBJ) + $(RANLIB) $@ + +single: $(SLASRC) $(DSLASRC) $(SXLASRC) $(SCLAUX) $(ALLAUX) + $(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(SLASRC) $(DSLASRC) \ + $(SXLASRC) $(SCLAUX) $(ALLAUX) $(ALLXAUX) + $(RANLIB) ../$(LAPACKLIB) + +complex: $(CLASRC) $(ZCLASRC) $(CXLASRC) $(SCLAUX) $(ALLAUX) + $(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(CLASRC) $(ZCLASRC) \ + $(CXLASRC) $(SCLAUX) $(ALLAUX) $(ALLXAUX) + $(RANLIB) ../$(LAPACKLIB) + +double: $(DLASRC) $(DSLASRC) $(DXLASRC) $(DZLAUX) $(ALLAUX) + $(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(DLASRC) $(DSLASRC) \ + $(DXLASRC) $(DZLAUX) $(ALLAUX) $(ALLXAUX) + $(RANLIB) ../$(LAPACKLIB) + +complex16: $(ZLASRC) $(ZCLASRC) $(ZXLASRC) $(DZLAUX) $(ALLAUX) + $(ARCH) $(ARCHFLAGS) ../$(LAPACKLIB) $(ZLASRC) $(ZCLASRC) \ + $(ZXLASRC) $(DZLAUX) $(ALLAUX) $(ALLXAUX) + $(RANLIB) ../$(LAPACKLIB) + +$(ALLAUX): $(FRC) +$(SCLAUX): $(FRC) +$(DZLAUX): $(FRC) +$(SLASRC): $(FRC) +$(CLASRC): $(FRC) +$(DLASRC): $(FRC) +$(ZLASRC): $(FRC) +$(ZCLASRC): $(FRC) +$(DSLASRC): $(FRC) ifdef USEXBLAS -ALLXOBJ=$(SXLASRC) $(DXLASRC) $(CXLASRC) $(ZXLASRC) $(ALLXAUX) +$(SXLASRC): $(FRC) +$(CXLASRC): $(FRC) +$(DXLASRC): $(FRC) +$(ZXLASRC): $(FRC) endif -ALLOBJ=$(SLASRC) $(DLASRC) $(DSLASRC) $(CLASRC) $(ZLASRC) $(ZCLASRC) \ - $(SCLAUX) $(DZLAUX) $(ALLAUX) +FRC: + @FRC=$(FRC) clean: rm -f *.o liblapack* @@ -408,4 +458,4 @@ static: $(ALLOBJ) $(ALLXOBJ) ranlib liblapack.a shared: $(ALLOBJ) $(ALLXOBJ) - cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.4.0 $(ALLOBJ) -L.. -lblas -lm -lgfortran -lc + cc $(CFLAGS) -shared -Wl,-soname,liblapack.so.3 -o liblapack.so.3.4.1 $(ALLOBJ) -L.. -lblas -lm -lgfortran -lc diff --git a/extra/lapack/PKGBUILD b/extra/lapack/PKGBUILD index cef5ff2f7..df8aa17cd 100644 --- a/extra/lapack/PKGBUILD +++ b/extra/lapack/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 147948 2012-01-28 21:21:33Z ronald $ +# $Id: PKGBUILD 164763 2012-08-04 18:50:35Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Jason Taylor <jftaylor21@gmail.com> pkgname=lapack -pkgver=3.4.0 +pkgver=3.4.1 pkgrel=1 url="http://www.netlib.org/lapack" pkgdesc="Linear Algebra PACKage" @@ -52,3 +52,5 @@ package() { "${pkgdir}/usr/share/licenses/lapack/" } +sha1sums=('c115223ac1bac9ab971aae865d3e95442bc979bc' + '4ea739a743e2de248ad150873137432261d5b630') diff --git a/extra/latex2rtf/PKGBUILD b/extra/latex2rtf/PKGBUILD index a9796f0b5..ffdbb3d13 100644 --- a/extra/latex2rtf/PKGBUILD +++ b/extra/latex2rtf/PKGBUILD @@ -1,25 +1,35 @@ -# $Id: PKGBUILD 119963 2011-04-17 22:11:07Z remy $ +# $Id: PKGBUILD 164721 2012-08-04 06:54:39Z remy $ # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=latex2rtf -pkgver=2.1.0 +pkgver=2.2.1c pkgrel=1 pkgdesc="LaTeX to RTF converter" arch=('i686' 'x86_64') url="http://latex2rtf.sourceforge.net/" license=('GPL') depends=('glibc' 'imagemagick' 'ghostscript') +checkdepends=( + 'texlive-bin' + 'texlive-core' + 'texlive-latexextra' # for a4wide package +) source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('31e6280312b56c2c38cf6a3fddff21a9910c7d6f') +sha1sums=('3fd5874de8988cf45f8862d2b3db8ed13a04caa4') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - make PREFIX=/usr + cd "${srcdir}/${pkgname}-2.2.1" + make +} + +check() { + cd "${srcdir}/${pkgname}-2.2.1" + make check } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make PREFIX=${pkgdir}/usr MAN_INSTALL=${pkgdir}/usr/share/man/man1 install + cd "${srcdir}/${pkgname}-2.2.1" + make DESTDIR=${pkgdir}/usr install sed -i -e 's|error "no input file specified"| echo "error: no input file specified"|' ${pkgdir}/usr/bin/latex2png } diff --git a/extra/lyx/PKGBUILD b/extra/lyx/PKGBUILD index 5ca0a390f..87fc70c20 100644 --- a/extra/lyx/PKGBUILD +++ b/extra/lyx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163711 2012-07-18 01:05:51Z ibiru $ +# $Id: PKGBUILD 164769 2012-08-04 19:30:05Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=lyx -pkgver=2.0.3 -pkgrel=4 +pkgver=2.0.4 +pkgrel=1 pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end" arch=('i686' 'x86_64') url="http://www.lyx.org" @@ -18,7 +18,7 @@ source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz backup=('etc/lyx/lyxrc.dist') install=lyx.install options=('emptydirs') -sha1sums=('109dae0ef22a7d8944964b32ee380ad170b0665f' +sha1sums=('4d384060553c74912e13f98e1788a6f978c58c2e' 'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad' '56416642cc3da2a13b87b84e6b87c1a239f3d09a') diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD index bcf8fbb80..73d430778 100644 --- a/extra/miro/PKGBUILD +++ b/extra/miro/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163155 2012-07-08 09:31:52Z ibiru $ +# $Id: PKGBUILD 164751 2012-08-04 17:46:43Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=miro -pkgver=5.0.1 -pkgrel=2 +pkgver=5.0.2 +pkgrel=1 pkgdesc="The free and open source internet TV platform" arch=('i686' 'x86_64') url="http://www.getmiro.com" @@ -18,7 +18,7 @@ makedepends=('pkg-config' 'boost') install=miro.install source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz" 'ffmpeg.patch') -sha1sums=('d8e08c691958c250c990b45f2c8448c478d0f0fa' +sha1sums=('67babcf76cc08b72b8f55d425b1372ae0a979805' 'ce0f42be2a0a3ac99f07b5abfabf0975928c841c') build() { diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD index f8af21be8..3e8184e81 100644 --- a/extra/nasm/PKGBUILD +++ b/extra/nasm/PKGBUILD @@ -1,17 +1,19 @@ -# $Id: PKGBUILD 153792 2012-03-19 18:12:16Z stephane $ +# $Id: PKGBUILD 164757 2012-08-04 18:04:50Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> -pkgbase=nasm -pkgname=('nasm' 'nasm-doc') -pkgver=2.10 +pkgname=nasm +pkgver=2.10.03 pkgrel=1 -arch=('i686' 'x86_64') +pkgdesc="An 80x86 assembler designed for portability and modularity" url="http://www.nasm.us" license=('BSD') +arch=('i686' 'x86_64') +depends=('glibc') makedepends=('ghostscript') -source=(http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgbase}-${pkgver}.tar.bz2) -sha1sums=('acdcae5366230e2e19b2ad36f952df0232c80950') +source=(http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('78a8de9ba02da7c2ba8c583a57901ff6856ad6c6') +install=nasm.install build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -19,24 +21,10 @@ build() { make everything } -package_nasm() { - pkgdesc="An 80x86 assembler designed for portability and modularity" - depends=('glibc') - install=nasm.install - +package() { cd "${srcdir}/${pkgbase}-${pkgver}" make INSTALLROOT="${pkgdir}" install install_rdf - install -d "${pkgdir}"/usr/share/info + install -dm755 "${pkgdir}"/usr/share/info install -m644 doc/info/* "${pkgdir}"/usr/share/info/ install -D -m644 LICENSE "${pkgdir}"/usr/share/licenses/nasm/LICENSE } - -package_nasm-doc() { - pkgdesc="An 80x86 assembler designed for portability and modularity (manuals)" - - cd "${srcdir}/${pkgbase}-${pkgver}/doc" - install -d "${pkgdir}"/usr/share/doc/nasm/html - install -m644 html/* "${pkgdir}"/usr/share/doc/nasm/html/ - install -m644 nasmdoc.ps nasmdoc.pdf nasmdoc.txt "${pkgdir}"/usr/share/doc/nasm/ - install -D -m644 ../LICENSE "${pkgdir}"/usr/share/licenses/nasm-doc/LICENSE -} diff --git a/extra/qtiplot/PKGBUILD b/extra/qtiplot/PKGBUILD index 1689779ab..dc0109641 100644 --- a/extra/qtiplot/PKGBUILD +++ b/extra/qtiplot/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 148908 2012-02-05 11:55:28Z ibiru $ +# $Id: PKGBUILD 164771 2012-08-04 20:28:32Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: damir <damir.archlinux.org> # Contributor: Gergely Imreh <imrehg@gmail.com> pkgname=qtiplot -pkgver=0.9.8.8 -pkgrel=2 +pkgver=0.9.8.9 +pkgrel=1 arch=('i686' 'x86_64') url="http://soft.proindependent.com/qtiplot.html" pkgdesc="Data analysis and scientific plotting - free clone of Origin" -depends=('muparser' 'gsl' 'python2-qt' 'boost-libs' 'shared-mime-info' 'mesa' 'liborigin2' 'qt-assistant-compat' 'tamu-anova') +depends=('muparser' 'gsl' 'python2-pyqt' 'boost-libs' 'shared-mime-info' 'mesa' 'liborigin2' 'qt-assistant-compat' 'tamu-anova') # build against qwtplot3d provided in the package ... # build against qwt provided in the package ... # as systemwide one doesn't provide all needed functions @@ -27,7 +27,7 @@ source=(http://download.berlios.de/qtiplot/qtiplot-${pkgver}.tar.bz2 qtiplot-0.9.8.6-tamuanova.patch qwtplot3d-qt-4.8.0.patch qwtplot3d-libpng15.patch) -sha1sums=('02801cdf31b543c0f5d7ef1b1f358f0738d93d48' +sha1sums=('73b17dd9195c3d86750d5f1f5bdd4d5483c5fe30' '4d5d7cf3965a0a1b1aa9cafc34e70ee207700bc8' '4301cb2a36024a10108b689990d28c4fe5c7416e' '326ee6bc623a637d058ab7ee9f65fede40a23a09' @@ -92,5 +92,3 @@ package() { install -D -m644 "${srcdir}/${pkgname}.xml" \ "${pkgdir}/usr/share/mime/packages/${pkgname}.xml" } - - diff --git a/extra/suitesparse/PKGBUILD b/extra/suitesparse/PKGBUILD index ab9b16cd1..2d54663e3 100644 --- a/extra/suitesparse/PKGBUILD +++ b/extra/suitesparse/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 153722 2012-03-18 17:12:55Z ronald $ +# $Id: PKGBUILD 164773 2012-08-04 20:35:22Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> pkgname=suitesparse -pkgver=3.7.0 +pkgver=4.0.2 pkgrel=1 pkgdesc="A collection of sparse matrix libraries" url="http://www.cise.ufl.edu/research/sparse/SuiteSparse/" @@ -14,14 +14,14 @@ depends=('blas' 'lapack') makedepends=('gcc-fortran') license=('GPL') source=(http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-$pkgver.tar.gz) -sha1sums=('d0eb24b43ee2f7def032e80eaa7a589f94f546fc') +sha1sums=('46b24a28eef4b040ea5a02d2c43e82e28b7d6195') build() { cd "$srcdir"/SuiteSparse export CFLAGS=" ${CFLAGS} -DNPARTITION" - make -C UFconfig/xerbla - make -C UFconfig + make -C SuiteSparse_config/xerbla + make -C SuiteSparse_config for _lib in AMD CAMD COLAMD BTF KLU LDL CCOLAMD UMFPACK CHOLMOD CXSparse SPQR; do make -C ${_lib} library done @@ -32,7 +32,7 @@ package() { cd "${srcdir}"/SuiteSparse install -dm755 "${pkgdir}"/usr/{lib,include} - for _lib in UFconfig AMD CAMD COLAMD BTF KLU LDL CCOLAMD UMFPACK CHOLMOD CXSparse SPQR; do + for _lib in SuiteSparse_config AMD CAMD COLAMD BTF KLU LDL CCOLAMD UMFPACK CHOLMOD CXSparse SPQR; do make -C ${_lib} INSTALL_LIB="${pkgdir}"/usr/lib INSTALL_INCLUDE="${pkgdir}"/usr/include install done diff --git a/extra/vamp-plugin-sdk/PKGBUILD b/extra/vamp-plugin-sdk/PKGBUILD index 88eb1559e..1e8fc0fff 100644 --- a/extra/vamp-plugin-sdk/PKGBUILD +++ b/extra/vamp-plugin-sdk/PKGBUILD @@ -1,20 +1,18 @@ -# $Id: PKGBUILD 151204 2012-02-25 07:32:54Z allan $ +# $Id: PKGBUILD 164737 2012-08-04 10:47:06Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Orivej Desh <smpuj@bk.ru> pkgname=vamp-plugin-sdk -pkgver=2.2 -pkgrel=2 +pkgver=2.4 +pkgrel=1 pkgdesc="The Vamp audio analysis plug-in system" arch=('i686' 'x86_64') url="http://www.vamp-plugins.org/" license=('BSD') depends=('gcc-libs' 'libsndfile') -options=('!libtool') -source=("http://downloads.sourceforge.net/vamp/$pkgname-$pkgver.tar.gz" - 'gcc44.patch') -md5sums=('037cdb83f20a331ff1fa07d54550c773' - 'a07e3ef9c657a56cf2e8c4afc0ba1cec') +#options=('!libtool') +source=("http://code.soundsoftware.ac.uk/attachments/download/517/$pkgname-$pkgver.tar.gz") +md5sums=('4bd75ca4515c141cd8776bdb59066261') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 1404df7f8..f534ac848 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 163786 2012-07-20 05:22:44Z giovanni $ +# $Id: PKGBUILD 164719 2012-08-04 05:32:21Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=2.0.3 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64') url="http://www.videolan.org/vlc/" @@ -63,6 +63,7 @@ build() { sed -i -e 's:truetype/freefont:TTF:g' modules/text_renderer/freetype.c ./configure --prefix=/usr \ + --sysconfdir=/etc \ --disable-rpath \ --enable-oss \ --enable-faad \ diff --git a/extra/xf86-input-evdev/PKGBUILD b/extra/xf86-input-evdev/PKGBUILD index 55b8ca2c6..ae28528a2 100644 --- a/extra/xf86-input-evdev/PKGBUILD +++ b/extra/xf86-input-evdev/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 164024 2012-07-24 15:40:48Z andyrtr $ +# $Id: PKGBUILD 164779 2012-08-04 21:22:47Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <Alexander@archlinux.org pkgname=xf86-input-evdev -pkgver=2.7.1 +pkgver=2.7.2 pkgrel=1 pkgdesc="X.org evdev input driver" arch=(i686 x86_64) @@ -15,7 +15,7 @@ conflicts=('xorg-server<1.11.99.902') options=('!libtool' '!makeflags') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('1c128bbd34bc17d08cc723c2429cdfe7efc426cb753e38189ffd290002a3b598') +sha256sums=('ef729a0e4623e278e1d18801a6c3e4565f108bfa2546fa79333f8a731cfdd1dc') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index 46dad6a6a..27fb5d504 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 164759 2012-08-04 18:47:16Z andrea $ +# $Id: PKGBUILD 164789 2012-08-05 12:10:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgname=kdelibs pkgname=kdelibs-libre pkgver=4.9.0 -pkgrel=3 +pkgrel=4 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/kde/kdelibs' diff --git a/pcr/python2-pysfml2-git/PKGBUILD b/pcr/python2-pysfml2-git/PKGBUILD new file mode 100644 index 000000000..6bd8e759c --- /dev/null +++ b/pcr/python2-pysfml2-git/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: Philippe Huerlimann <phihue@gmail.com> +pkgname=python2-pysfml2-git +pkgver=20120804 +pkgrel=1 +pkgdesc="A Python 2 binding for SFML 2, written with Cython." +arch=('i686' 'x86_64') +url="http://pysfml2-cython.readthedocs.org/" +license=('BSD') +depends=('sfml-git' 'python2') +makedepends=('cython2' 'git') +source=() +md5sums=() +_gitroot='https://github.com/bastienleonard/pysfml2-cython.git' +_gitname='pysfml2-cython' + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin + msg "The local files are updated." + else + git clone $_gitroot $_gitname + fi + + msg "GIT checkout done or server timeout" + msg "Starting make..." + + rm -rf "$srcdir/$_gitname-build" + git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + python2 setup.py build +} + +package() { + cd "$srcdir/$_gitname-build" + python2 setup.py install --root="${pkgdir}" --prefix=/usr + + # Copying the examples + cp -R examples "${pkgdir}/usr/lib/python2.7/site-packages/pysfml" + + # Copying the License file + install -D -m644 "$srcdir/$_gitname-build/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + + # Fixing permissions + chmod 644 "${pkgdir}"/usr/lib/python2.7/site-packages/sfml.so +} diff --git a/pcr/ryzom-client/PKGBUILD b/pcr/ryzom-client/PKGBUILD index 74d999d29..dbcd531f4 100644 --- a/pcr/ryzom-client/PKGBUILD +++ b/pcr/ryzom-client/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> pkgname=('ryzom-client') pkgver=0.8.0 -pkgrel=6 +pkgrel=7 arch=('x86_64' 'i686') url="http://www.ryzom.com" license=('AGPL3') @@ -29,7 +29,7 @@ build() { fi cd "ryzom-client" - cmake .. -Wno-dev -DFINAL_VERSION=ON -DWITH_RYZOM_CLIENT=ON -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL=OFF -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin -DWITH_SYMBOLS=ON + cmake .. -Wno-dev -DFINAL_VERSION=ON -DWITH_RYZOM_CLIENT=ON -DWITH_LUA51=ON -DWITH_RYZOM_SERVER=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_LIBWWW_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL=OFF -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin make -j3 } @@ -39,4 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha256sums=('0abcf7daa01dab27a3b9a9276e521369693963be3a25624b3195023495212bc2')
\ No newline at end of file +sha256sums=('0abcf7daa01dab27a3b9a9276e521369693963be3a25624b3195023495212bc2') diff --git a/pcr/ryzom-nel/PKGBUILD b/pcr/ryzom-nel/PKGBUILD index f7dd7c580..b45bef098 100644 --- a/pcr/ryzom-nel/PKGBUILD +++ b/pcr/ryzom-nel/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com> pkgname='ryzom-nel' pkgver=0.8.0 -pkgrel=10 +pkgrel=11 arch=('x86_64' 'i686') conflicts=('ryzom-nel') groups=('ryzom') @@ -40,7 +40,7 @@ build() { cd $pkgname #CMAKE_USE_RELATIVE_PATHS=true - cmake .. -Wno-dev -DWITH_RYZOM=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DNL_SHARE_PREFIX=/usr/share/nel -DNL_BIN_PREFIX=/usr/bin -DNL_SBIN_PREFIX=/usr/sbin -DNL_LIB_PREFIX=/usr/lib/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DWITH_SYMBOLS=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON + cmake .. -Wno-dev -DWITH_RYZOM=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DNL_SHARE_PREFIX=/usr/share/nel -DNL_BIN_PREFIX=/usr/bin -DNL_SBIN_PREFIX=/usr/sbin -DNL_LIB_PREFIX=/usr/lib/nel -DNL_DRIVER_PREFIX=/usr/lib/nel make -j3 } diff --git a/pcr/sfml-git/PKGBUILD b/pcr/sfml-git/PKGBUILD new file mode 100644 index 000000000..be243d639 --- /dev/null +++ b/pcr/sfml-git/PKGBUILD @@ -0,0 +1,67 @@ +# Maintainer: Ondrej Martinak <omartinak@gmail.com> +# Contributor: Jorge Araya Navarro <jorgean@lavabit.com> + +pkgname=sfml-git +pkgver=20120805 +pkgrel=1 +pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API.' +arch=('i686' 'x86_64') +url='http://www.sfml-dev.org/' +license=('zlib') +depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2') +makedepends=('git' 'mesa' 'cmake' 'doxygen') +conflicts=('sfml') +provides=('sfml') +source=("arial.patch") + +_gitroot='https://github.com/LaurentGomila/SFML.git' +_gitname='SFML' +_gitchangeset='191730ac0d639cfdef8fae560cdbc7d7e8c67db1' + +build() { + cd "$srcdir" + msg "Connecting to GIT server...." + + if [ -d $_gitname ] ; then + cd $_gitname && git pull origin + msg "The local files are updated." + else + git clone $_gitroot + cd $_gitname + fi + + msg "GIT checkout done or server timeout" + msg "Starting make..." + + rm -rf "$srcdir/$_gitname-build" + cd "$srcdir" + git checkout $_gitchangeset >& /dev/null + #Applying the patch + cp "$srcdir/arial.patch" "$srcdir/$_gitname/src/$_gitname/" + cd "$srcdir/$_gitname/src/$_gitname/" + patch -p3 -i arial.patch + + cp -r "$srcdir/$_gitname" "$srcdir/$_gitname-build" + cd "$srcdir/$_gitname-build" + + mkdir build && cd build + cmake .. -DCMAKE_INSTALL_PREFIX=/usr \ + -DSFML_BUILD_DOC=true \ + -DSFML_BUILD_EXAMPLES=true + make + make doc +} + +package() { + cd "$srcdir/$_gitname-build/build" + + make DESTDIR="$pkgdir/" install + + install -Dm644 "$pkgdir/usr/share/SFML/cmake/Modules/FindSFML.cmake" "$pkgdir/usr/share/cmake-2.8/Modules/FindSFML.cmake" + + install -Dm644 ../license.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + + make clean +} + +sha256sums=('4a1a0991b45c93584405be7c7920d92ec95f39d2af533f6d09b0094e4110eae8') diff --git a/pcr/sfml-git/arial.patch b/pcr/sfml-git/arial.patch new file mode 100644 index 000000000..a9225065b --- /dev/null +++ b/pcr/sfml-git/arial.patch @@ -0,0 +1,10 @@ +--- SFML-a/src/SFML/Graphics/CMakeLists.txt 2012-08-03 19:41:49.885910580 -0600 ++++ SFML-b/src/SFML/Graphics/CMakeLists.txt 2012-08-03 19:42:53.578898858 -0600 +@@ -4,7 +4,6 @@ +
+ # all source files
+ set(SRC
+- ${SRCROOT}/Arial.hpp
+ ${INCROOT}/BlendMode.hpp
+ ${SRCROOT}/Color.cpp
+ ${INCROOT}/Color.hpp
diff --git a/pcr/yate/PKGBUILD b/pcr/yate/PKGBUILD new file mode 100644 index 000000000..01428fa27 --- /dev/null +++ b/pcr/yate/PKGBUILD @@ -0,0 +1,36 @@ + # Maintainer: said + # Contributor: Yejun Yang <yejunx AT gmail DOT com> + # Contributor: Biru Ionut <ionut@archlinux.ro> + pkgname=yate + pkgver=4.1.0 + pkgrel=1 + pkgdesc="next-generation telephony engine" + arch=('i686' 'x86_64') + url="http://yate.null.ro" + license=('GPL') + depends=('speex' 'gsm' 'postgresql-libs' 'libmysqlclient' \ + 'alsa-lib') + makedepends=('pkgconfig') + source=(http://yate.null.ro/tarballs/yate4/${pkgname}-${pkgver}-1.tar.gz yate.init) + options=(!makeflags) + + md5sums=('06adaa9b8dc4f18908b35e9659ab9ad5' + 'c0d344607046c47c1d75ac23d323817a') + + build() { + cd $srcdir/${pkgname} + export LDFLAGS="${LDFLAGS//-Wl,--as-needed}" + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --with-libpq \ + --with-mysql \ + --without-openh323 + make + } + + package(){ + cd $srcdir/${pkgname} + make DESTDIR=$pkgdir install + install -D -m755 $srcdir/yate.init $pkgdir/etc/rc.d/yate + } +
\ No newline at end of file diff --git a/pcr/yate/yate.init b/pcr/yate/yate.init new file mode 100755 index 000000000..762fff8c7 --- /dev/null +++ b/pcr/yate/yate.init @@ -0,0 +1,61 @@ +#!/bin/bash +OPTS="-rs -vvv -l /var/log/yate" + +# Source function library. +. /etc/rc.conf +. /etc/rc.d/functions + +RETVAL=0 + +# See how we were called. +case "$1" in + start) + stat_busy "Starting YATE" + unset DISPLAY + + yate -d -p /var/run/yate.pid $OPTS + RETVAL=$? + if [ $RETVAL -gt 0 ]; then + stat_fail + else + add_daemon yate + touch /var/lock/yate + stat_done + fi + ;; + stop) + stat_busy "Stopping YATE" + [ -f /var/run/yate.pid ] && kill $(cat /var/run/yate.pid) > /dev/null 2>&1 + RETVAL=$? + if [ $RETVAL -gt 0 ]; then + stat_fail + else + rm -f /var/run/yate.pid + rm -f /var/lock/yate + rm_daemon yate + stat_done + fi + ;; + status) + [ -f /var/run/yate.pid ] && echo -e "Yate is running" || echo -e "Yate is not running" + ;; + restart) + $0 stop + sleep 1 + $1 start + ;; + condrestart) + if [ -f /var/lock/yate ]; then + $0 stop + $0 start + fi + ;; + reload) + pkill yate -HUP + RETVAL=$? + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}" + ;; +esac +exit $RETVAL diff --git a/testing/iproute2/PKGBUILD b/testing/iproute2/PKGBUILD index 2c3ec8aae..d6c682a5d 100644 --- a/testing/iproute2/PKGBUILD +++ b/testing/iproute2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 162010 2012-06-18 15:22:32Z ronald $ +# $Id: PKGBUILD 164765 2012-08-04 18:56:16Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Judd Vinet <jvinet@zeroflux.org> pkgname=iproute2 -pkgver=3.4.0 -pkgrel=2 +pkgver=3.5.0 +pkgrel=1 pkgdesc="IP Routing Utilities" arch=('i686' 'x86_64') license=('GPL2') @@ -20,7 +20,7 @@ backup=('etc/iproute2/ematch_map' 'etc/iproute2/rt_dsfield' 'etc/iproute2/rt_pro 'etc/iproute2/rt_realms' 'etc/iproute2/rt_scopes' 'etc/iproute2/rt_tables') source=(http://www.kernel.org/pub/linux/utils/net/$pkgname/$pkgname-$pkgver.tar.xz iproute2-fhs.patch) -sha1sums=('fcea492dea2f3ecf9d35f279e2f1a7ea6ca0d527' +sha1sums=('a78f6bbbb21a1932315baf7be2f3f1d6e6c5ed62' '35b8cf2dc94b73eccad427235c07596146cd6f6c') build() { diff --git a/testing/monodevelop-debugger-gdb/PKGBUILD b/testing/monodevelop-debugger-gdb/PKGBUILD new file mode 100644 index 000000000..3a639b826 --- /dev/null +++ b/testing/monodevelop-debugger-gdb/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 164745 2012-08-04 11:23:57Z andyrtr $ +# Maintainer: Daniel Isenmann <daniel@archlinux.org> + +pkgname=monodevelop-debugger-gdb +pkgver=3.0.3.5 +pkgrel=1 +pkgdesc="Mono Debugger support" +arch=('i686' 'x86_64') # also "any" pkg? +url="http://monodevelop.com" +license=('GPL') +depends=('monodevelop>=3.0.3.5-2' 'gdb') +makedepends=('mono') +options=('!makeflags') +source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2) +md5sums=('c16da5cdbda46fb32e0dc730bb433203') + +build() { + export MONO_SHARED_DIR="${srcdir}/.wabi" + mkdir -p "${MONO_SHARED_DIR}" + + cd "${srcdir}/${pkgname}-${pkgver}" + + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} + diff --git a/testing/monodevelop/PKGBUILD b/testing/monodevelop/PKGBUILD new file mode 100644 index 000000000..1371e34d8 --- /dev/null +++ b/testing/monodevelop/PKGBUILD @@ -0,0 +1,41 @@ +# $Id: PKGBUILD 164744 2012-08-04 11:23:54Z andyrtr $ +# Maintainer: Daniel Isenmann <daniel@archlinux.org> +# Contributor: Timm Preetz <timm@preetz.us> +# Contributor: Giovanni Scafora <giovanni@archlinux.org> + +pkgname=monodevelop +pkgver=3.0.3.5 +pkgrel=2 +pkgdesc="An IDE primarily designed for C# and other .NET languages" + +# should probably changed to "any" - no ELF files - OpenSUSE builds it as NOARCH +arch=('i686' 'x86_64') + +url="http://www.monodevelop.com" +license=('GPL') +depends=('mono>=2.10.8' 'mono-addins>=0.6.2' 'gnome-sharp' 'desktop-file-utils' 'hicolor-icon-theme') +options=(!makeflags) +install=monodevelop.install +source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2 + monodevelop-core-addins.pc.in.patch) +md5sums=('ca46b77b49266112b63a8f5c451c5565' + '8466d032735130e37d4091a793a7966c') + +build() { + export MONO_SHARED_DIR=$srcdir/src/.wabi + mkdir -p $MONO_SHARED_DIR + + cd $srcdir/$pkgname-$pkgver + # fix location for MonoDevelop.Gettext.dll - breaks gdb build + patch -Np0 -i ${srcdir}/monodevelop-core-addins.pc.in.patch + + ./configure --prefix=/usr --disable-update-mimedb --disable-update-desktopdb + LD_PRELOAD="" make +} + +package() { + cd $srcdir/$pkgname-$pkgver + LD_PRELOAD="" make DESTDIR=$pkgdir install + rm -r $MONO_SHARED_DIR +} + diff --git a/testing/monodevelop/monodevelop-core-addins.pc.in.patch b/testing/monodevelop/monodevelop-core-addins.pc.in.patch new file mode 100644 index 000000000..c1da3bf1f --- /dev/null +++ b/testing/monodevelop/monodevelop-core-addins.pc.in.patch @@ -0,0 +1,8 @@ +--- monodevelop-core-addins.pc.in 2012-07-27 21:33:41.000000000 +0200 ++++ monodevelop-core-addins.pc.in.new 2012-08-04 12:42:36.086516667 +0200 +@@ -6,4 +6,4 @@ + Name: MonoDevelop Core Add-ins + Description: MonoDevelop Core Add-ins + Version: @VERSION@ +-Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll -r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll -r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll -r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll -r:${libdir}/AddIns/DisplayBindings/Gettext/MonoDevelop.Gettext.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll -r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll -r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll -r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll -r:${libdir}/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll -r:${libdir}/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll -r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll ++Libs: -r:${libdir}/AddIns/VersionControl/MonoDevelop.VersionControl.dll -r:${libdir}/AddIns/NUnit/MonoDevelop.NUnit.dll -r:${libdir}/AddIns/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.dll -r:${libdir}/AddIns/MonoDevelop.AspNet/MonoDevelop.AspNet.dll -r:${libdir}/AddIns/DisplayBindings/MonoDevelop.Gettext/MonoDevelop.Gettext.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.dll -r:${libdir}/AddIns/MonoDevelop.Deployment/MonoDevelop.Deployment.Linux.dll -r:${libdir}/AddIns/MonoDevelop.GtkCore/MonoDevelop.GtkCore.dll -r:${libdir}/AddIns/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.VBNetBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CBinding.dll -r:${libdir}/AddIns/BackendBindings/MonoDevelop.CSharpBinding.dll -r:${libdir}/AddIns/MonoDevelop.Autotools/MonoDevelop.Autotools.dll -r:${libdir}/AddIns/DisplayBindings/SourceEditor/MonoDevelop.SourceEditor2.dll -r:${libdir}/AddIns/MonoDevelop.Debugger/MonoDevelop.Debugger.dll -r:${libdir}/AddIns/MonoDevelop.Refactoring/MonoDevelop.Refactoring.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugging.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.dll -r:${libdir}/AddIns/MonoDevelop.Debugger.Soft/Mono.Debugger.Soft.dll diff --git a/testing/monodevelop/monodevelop.install b/testing/monodevelop/monodevelop.install new file mode 100644 index 000000000..070e6202c --- /dev/null +++ b/testing/monodevelop/monodevelop.install @@ -0,0 +1,20 @@ +post_install() { + update-mime-database /usr/share/mime 1> /dev/null + echo "update desktop mime database..." + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +pre_remove() { + /bin/true +} + +post_remove() { + update-mime-database /usr/share/mime 1> /dev/null + echo "update desktop mime database..." + update-desktop-database -q +} diff --git a/testing/net-tools/PKGBUILD b/testing/net-tools/PKGBUILD new file mode 100644 index 000000000..9468ff936 --- /dev/null +++ b/testing/net-tools/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 164775 2012-08-04 20:55:03Z ronald $ +# Maintainer: Ronald van Haren <ronald.archlinux.org> +# Contributor: judd <jvinet@zeroflux.org> + +pkgname=net-tools +pkgver=1.60.20120804git +pkgrel=1 +pkgdesc="Configuration tools for Linux networking" +arch=(i686 x86_64) +license=('GPL2') +url="http://net-tools.sourceforge.net/" +depends=('glibc') + +# http://www.tazenda.demon.co.uk/phil/$pkgname/$pkgname-$pkgver.tar.bz2 +# use git checkout instead +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz) +options=(!makeflags) +install=net-tools.install +sha1sums=('a3341086cb403a8d747b783693f72ee2dfd72d82') + +build() { + cd $srcdir/$pkgname-$pkgver + yes "" | make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make BASEDIR=$pkgdir update + + # the following is provided by yp-tools + rm "${pkgdir}"/bin/{nis,yp}domainname + rm "${pkgdir}"/usr/share/man/man1/{nis,yp}domainname.1 + + # hostname is provided by inetutils + rm "${pkgdir}"/bin/{hostname,dnsdomainname,domainname} + rm -rf "${pkgdir}"/usr/share/man/man1 +} diff --git a/testing/net-tools/net-tools.install b/testing/net-tools/net-tools.install new file mode 100644 index 000000000..9eee9e51b --- /dev/null +++ b/testing/net-tools/net-tools.install @@ -0,0 +1,12 @@ +post_upgrade() { + if [ "$(vercmp $2 1.60-16)" -lt 0 ]; then + echo "hostname and {,yp,nis}domainname has moved:" + echo "----------" + echo "hostname is now in coreutils" + echo "domainname is now in yp-tools" + echo "their functionality might have changed slightly" + echo "" + echo "dnsdomainname remains in net-tools" + echo "----------" + fi +} diff --git a/testing/xf86-video-intel/PKGBUILD b/testing/xf86-video-intel/PKGBUILD index a6cfcfbf7..e8bebaaa0 100644 --- a/testing/xf86-video-intel/PKGBUILD +++ b/testing/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163603 2012-07-16 18:25:33Z andyrtr $ +# $Id: PKGBUILD 164777 2012-08-04 21:16:40Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.20.0 +pkgver=2.20.3 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -18,7 +18,7 @@ conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'x options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('21949297220ceda32bba430f778c6409002079dc717c7190dbd1062ab4a56783') +sha256sums=('effca1382e595cc071b109818150db229ffb54f92769e4758398abbe69acb92c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/~emulatorman/jitsi/PKGBUILD b/~emulatorman/jitsi/PKGBUILD index 5d8a2e4cb..61460bd5c 100644 --- a/~emulatorman/jitsi/PKGBUILD +++ b/~emulatorman/jitsi/PKGBUILD @@ -1,10 +1,9 @@ # Maintainer: Xavier Devlamynck <magicrhesus@ouranos.be> # Contributors: Keshav P R, atommix aka Aleks Lifey, Xavion, Ananda Samaddar, Dan Serban -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> pkgname=jitsi pkgver=1.0.3967 -pkgrel=1 +pkgrel=3 pkgdesc="An audio/video SIP VoIP phone and instant messenger written in Java (formerly SIP-Communicator)" arch=('i686' 'x86_64') url="http://jitsi.org" @@ -17,7 +16,7 @@ source=("http://download.jitsi.org/jitsi/src/jitsi-src-1.0-build.${pkgver##*.}.z jitsi.sh) md5sums=('0fb7aaaad551177c3037ae570ca2f2e1' 'aad7cf1fb18ff5d7c964834ecc38aed8' - 'c75c74f41e613a7d17bf2f1f310adee3') + 'b36c119d2005507e38cd5cb68f4ba31a') build() { diff --git a/~emulatorman/jitsi/jitsi.sh b/~emulatorman/jitsi/jitsi.sh index c78c69f2f..71dba6a36 100644 --- a/~emulatorman/jitsi/jitsi.sh +++ b/~emulatorman/jitsi/jitsi.sh @@ -1,9 +1,9 @@ #!/bin/bash CLIENTARGS="" -arch | grep i686 && CLIENTARGS="-client -Xmx256m" +uname -m | grep i686 && CLIENTARGS="-client -Xmx256m" -javabin=${JAVA_HOME}/bin/java +javabin=/usr/bin/java SCDIR=/usr/lib/jitsi LIBPATH=$SCDIR/lib |