From 8fd7bc607a8e4b26853b4263153a736767b163cd Mon Sep 17 00:00:00 2001 From: root Date: Sat, 15 Oct 2011 23:14:29 +0000 Subject: Sat Oct 15 23:14:29 UTC 2011 --- community-staging/calibre/PKGBUILD | 67 +++++++++++++++++++++ community-staging/calibre/calibre.install | 12 ++++ .../calibre/desktop_integration.patch | 68 ++++++++++++++++++++++ community/blueman/PKGBUILD | 10 ++-- community/calibre/PKGBUILD | 6 +- community/cherokee/PKGBUILD | 10 ++-- .../cherokee/cherokee-admin-socket-bind.patch | 23 ++++++++ community/cppcheck/PKGBUILD | 6 +- community/ibus-table/PKGBUILD | 15 ++--- community/mplayer2/PKGBUILD | 15 +++-- community/mplayer2/mplayer2-SAMI-subs.patch | 12 ++++ community/musepack-tools/PKGBUILD | 39 ++++++++----- community/musepack-tools/math.patch | 22 ++----- community/redis/PKGBUILD | 10 ++-- core/coreutils/PKGBUILD | 11 ++-- core/inetutils/PKGBUILD | 8 +-- extra/cups-pdf/PKGBUILD | 11 ++-- extra/eclipse/PKGBUILD | 24 ++++---- extra/libepc/PKGBUILD | 14 ++--- extra/monodevelop-debugger-gdb/PKGBUILD | 6 +- extra/monodevelop/PKGBUILD | 4 +- testing/erlang/PKGBUILD | 62 ++++++++++++++++++++ testing/hplip/PKGBUILD | 47 ++++++--------- testing/pyalpm/PKGBUILD | 4 +- testing/telepathy-glib/PKGBUILD | 13 ++--- 25 files changed, 377 insertions(+), 142 deletions(-) create mode 100644 community-staging/calibre/PKGBUILD create mode 100644 community-staging/calibre/calibre.install create mode 100644 community-staging/calibre/desktop_integration.patch create mode 100644 community/cherokee/cherokee-admin-socket-bind.patch create mode 100644 community/mplayer2/mplayer2-SAMI-subs.patch create mode 100644 testing/erlang/PKGBUILD diff --git a/community-staging/calibre/PKGBUILD b/community-staging/calibre/PKGBUILD new file mode 100644 index 000000000..9a2853bbb --- /dev/null +++ b/community-staging/calibre/PKGBUILD @@ -0,0 +1,67 @@ +# $Id: PKGBUILD 56839 2011-10-14 14:56:59Z giovanni $ +# Maintainer: Giovanni Scafora +# Contributor: Petrov Roman +# Contributor: Andrea Fagiani + +pkgname=calibre +pkgver=0.8.22 +pkgrel=2 +pkgdesc="Ebook management application" +arch=('i686' 'x86_64') +url="http://calibre-ebook.com/" +license=('GPL3') +depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' + 'python-mechanize' 'podofo' 'libwmf' 'python-beautifulsoup' + 'imagemagick' 'poppler-qt' 'chmlib' 'python-lxml' 'libusb' + 'python-imaging' 'desktop-file-utils' 'shared-mime-info' + 'python-dnspython' 'unrar' 'python2-pyqt' 'icu') +makedepends=('python2-pycountry') +optdepends=('ipython: to use calibre-debug') +install=calibre.install +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" + 'desktop_integration.patch') +md5sums=('b4e968cda582f362124a52ad588f8af0' + '253ce4fe5d01f8ff76b63cd3825755ea') + +build() { + cd "${srcdir}/${pkgname}" + + #rm -rf src/{cherrypy,pyPdf} + rm -rf src/cherrypy + sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py + sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \ + $(find . -regex ".*.py\|.*.recipe") + + python2 setup.py build + python2 setup.py resources + python2 setup.py translations +} + +package() { + cd "${srcdir}/${pkgname}" + + patch -Np1 -i "${srcdir}/desktop_integration.patch" + + # More on desktop integration (e.g. enforce arch defaults) + sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \ + -e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \ + -e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \ + -e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \ + -e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py + + # Fix the environment module location + sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py + + install -d "${pkgdir}/usr/lib/python2.7/site-packages" + python2 setup.py install --root="${pkgdir}" --prefix=/usr \ + --staging-bindir="${pkgdir}/usr/bin" \ + --staging-libdir="${pkgdir}/usr/lib" \ + --staging-sharedir="${pkgdir}/usr/share" + + find "${pkgdir}" -type d -empty -delete + + # Decompress the man pages so makepkg will do it for us. + for decom in "${pkgdir}"/usr/share/man/man1/*.bz2; do + bzip2 -d "${decom}" + done +} diff --git a/community-staging/calibre/calibre.install b/community-staging/calibre/calibre.install new file mode 100644 index 000000000..6210bd0ab --- /dev/null +++ b/community-staging/calibre/calibre.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/calibre/desktop_integration.patch b/community-staging/calibre/desktop_integration.patch new file mode 100644 index 000000000..4dbf53757 --- /dev/null +++ b/community-staging/calibre/desktop_integration.patch @@ -0,0 +1,68 @@ +--- a/src/calibre/linux.py 2011-06-17 19:56:05.000000000 +0200 ++++ b/src/calibre/linux.py 2011-06-18 00:07:46.000000000 +0200 +@@ -339,51 +339,39 @@ + + with TemporaryDirectory() as tdir: + with CurrentDir(tdir): +- render_img('mimetypes/lrf.png', 'calibre-lrf.png') +- check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True) +- self.icon_resources.append(('mimetypes', 'application-lrf', '128')) +- check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True) +- self.icon_resources.append(('mimetypes', 'application-lrs', +- '128')) +- render_img('lt.png', 'calibre-gui.png') +- check_call('xdg-icon-resource install --noupdate --size 128 calibre-gui.png calibre-gui', shell=True) +- self.icon_resources.append(('apps', 'calibre-gui', '128')) +- render_img('viewer.png', 'calibre-viewer.png') +- check_call('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True) +- self.icon_resources.append(('apps', 'calibre-viewer', '128')) ++ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps') ++ os.mkdir(dir) ++ render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png')) ++ render_img('lt.png', os.path.join(dir, 'calibre-gui.png')) ++ render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png')) + + mimetypes = set([]) + for x in all_input_formats(): + mt = guess_type('dummy.'+x)[0] +- if mt and 'chemical' not in mt and 'ctc-posml' not in mt: ++ if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt: + mimetypes.add(mt) + + def write_mimetypes(f): + f.write('MimeType=%s;\n'%';'.join(mimetypes)) + +- f = open('calibre-lrfviewer.desktop', 'wb') ++ dir = os.path.join(self.opts.staging_sharedir,'../applications') ++ os.mkdir(dir) ++ f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb') + f.write(VIEWER) + f.close() +- f = open('calibre-ebook-viewer.desktop', 'wb') ++ f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb') + f.write(EVIEWER) + write_mimetypes(f) + f.close() +- f = open('calibre-gui.desktop', 'wb') ++ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb') + f.write(GUI) + write_mimetypes(f) + f.close() +- des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', +- 'calibre-ebook-viewer.desktop') +- for x in des: +- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x] +- check_call(' '.join(cmd), shell=True) +- self.menu_resources.append(x) +- check_call(['xdg-desktop-menu', 'forceupdate']) +- f = open('calibre-mimetypes', 'wb') ++ dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/') ++ os.makedirs(dir) ++ f = open(os.path.join(dir, 'calibre.xml'), 'wb') + f.write(MIME) + f.close() +- self.mime_resources.append('calibre-mimetypes') +- check_call('xdg-mime install ./calibre-mimetypes', shell=True) + except Exception: + if self.opts.fatal_errors: + raise diff --git a/community/blueman/PKGBUILD b/community/blueman/PKGBUILD index 0f42d755d..f4311acdd 100644 --- a/community/blueman/PKGBUILD +++ b/community/blueman/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 40729 2011-02-26 08:51:40Z ibiru $ +# $Id: PKGBUILD 56850 2011-10-14 21:12:20Z spupykin $ # Maintainer : Ionut Biru pkgname=blueman -pkgver=1.21 -pkgrel=7 +pkgver=1.23 +pkgrel=1 pkgdesc="GTK+ bluetooth manager" arch=('i686' 'x86_64') license=('GPL') @@ -22,13 +22,13 @@ options=('!libtool') install=$pkgname.install source=(http://download.tuxfamily.org/blueman/${pkgname}-${pkgver}.tar.gz PulsePatch.patch) -md5sums=('26b70341b3d3da28da62c917c8b20377' +md5sums=('f0bee59589f4c23e35bf08c2ef8acaef' 'cdce55a57d7628ed8b6c7fcf4391f4f0') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/PulsePatch.patch" +# patch -Np1 -i "${srcdir}/PulsePatch.patch" # python2 fix for file in apps/blueman*; do diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD index 3d1beb13f..0824f557d 100644 --- a/community/calibre/PKGBUILD +++ b/community/calibre/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56089 2011-09-30 23:22:23Z giovanni $ +# $Id: PKGBUILD 56837 2011-10-14 14:47:09Z giovanni $ # Maintainer: Giovanni Scafora # Contributor: Petrov Roman # Contributor: Andrea Fagiani pkgname=calibre -pkgver=0.8.21 +pkgver=0.8.22 pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') @@ -20,7 +20,7 @@ optdepends=('ipython: to use calibre-debug') install=calibre.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'desktop_integration.patch') -md5sums=('46317b1f4bd6f1cd5279a5f8a1d712ae' +md5sums=('b4e968cda582f362124a52ad588f8af0' '253ce4fe5d01f8ff76b63cd3825755ea') build() { diff --git a/community/cherokee/PKGBUILD b/community/cherokee/PKGBUILD index 93b88a2d1..10c60f529 100644 --- a/community/cherokee/PKGBUILD +++ b/community/cherokee/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56629 2011-10-09 09:37:35Z foutrelis $ +# $Id: PKGBUILD 56833 2011-10-14 14:02:14Z foutrelis $ # Maintainer: Evangelos Foutras # Contributor: Link Dupont pkgname=cherokee pkgver=1.2.100 -pkgrel=1 +pkgrel=2 pkgdesc="A very fast, flexible and easy to configure Web Server" arch=('i686' 'x86_64') url="http://www.cherokee-project.com/" @@ -26,11 +26,13 @@ options=('!libtool') source=(http://www.cherokee-project.com/download/1.2/$pkgver/cherokee-$pkgver.tar.gz cherokee.rc cherokee.logrotate - fix-ctk-path-handler-match.patch) + fix-ctk-path-handler-match.patch + cherokee-admin-socket-bind.patch) sha1sums=('2ed95504c7f156227f9b688a901608be21cf3dff' '85e24ccc94e6e97858226222ac62cca79c17bc80' '266064ab6d3ebd206d7207e1d97b003d2021b2e4' - '6d64371dfb23f43c29a24e37e7ae99e08a0c84cc') + '6d64371dfb23f43c29a24e37e7ae99e08a0c84cc' + '3c0b407e7282542657125d7cfb1c64eb3521ed8c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/cherokee/cherokee-admin-socket-bind.patch b/community/cherokee/cherokee-admin-socket-bind.patch new file mode 100644 index 000000000..0b266a245 --- /dev/null +++ b/community/cherokee/cherokee-admin-socket-bind.patch @@ -0,0 +1,23 @@ +diff --git a/cherokee/main_admin.c b/cherokee/main_admin.c +index 861473f..e52b2d6 100644 +--- a/cherokee/main_admin.c ++++ b/cherokee/main_admin.c +@@ -89,9 +89,9 @@ find_empty_port (int starting, int *port) + cherokee_buffer_add_str (&bind_, "127.0.0.1"); + + cherokee_socket_init (&s); +- cherokee_socket_create_fd (&s, AF_INET); + + while (true) { ++ cherokee_socket_create_fd (&s, AF_INET); + ret = cherokee_socket_bind (&s, p, &bind_); + if (ret == ret_ok) + break; +@@ -104,6 +104,7 @@ find_empty_port (int starting, int *port) + } + } + ++ cherokee_socket_close (&s); + cherokee_socket_mrproper (&s); + cherokee_buffer_mrproper (&bind_); + diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD index ddab85731..186d4cae9 100644 --- a/community/cppcheck/PKGBUILD +++ b/community/cppcheck/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 55608 2011-09-15 21:38:48Z stephane $ +# $Id: PKGBUILD 56835 2011-10-14 14:22:51Z stephane $ # Maintainer: Stéphane Gaudreault pkgname=cppcheck -pkgver=1.50 +pkgver=1.51 pkgrel=1 pkgdesc="A tool for static C/C++ code analysis" arch=('i686' 'x86_64') @@ -9,7 +9,7 @@ url="http://cppcheck.wiki.sourceforge.net/" license=('GPL') depends=('pcre') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('39ad14cb4cb9caa45fd3365203c5f54981ee2870') +sha1sums=('d6774e123b9fa086cb6cc3722743e1de7a1f0b0c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/ibus-table/PKGBUILD b/community/ibus-table/PKGBUILD index f60bfb58e..eb75f17bd 100644 --- a/community/ibus-table/PKGBUILD +++ b/community/ibus-table/PKGBUILD @@ -1,25 +1,26 @@ +# $Id: PKGBUILD 56830 2011-10-14 06:44:36Z ebelanger $ # Contributor: coderoar # Contributor: leemars # Maintainer: Daniel J Griffiths pkgname=ibus-table -pkgver=1.3.0.20100621 -pkgrel=4 +pkgver=1.3.9.20110827 +pkgrel=1 pkgdesc='The IM Engine framework for table-based input methods, such as ZhengMa, WuBi, ErBi, CangJie and so on.' arch=('i686' 'x86_64') url="http://code.google.com/p/ibus/" license=('LGPL') depends=('python2-pyenchant' 'ibus' 'aspell-en') source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('0fd5812197400f7b586480fca1a0c082') +md5sums=('251e2c8ace8ed265d780b30755afc163') build() { - cd ${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" # python2 fix find -type f -exec sed -i -e 's_exec python_exec python2_' -e 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' -e 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' {} \; - ./configure \ + PYTHON=/usr/bin/python2 ./configure \ --prefix=/usr \ --libexecdir=/usr/lib/ibus @@ -27,7 +28,7 @@ build() { } package() { - cd ${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=${pkgdir} install + make DESTDIR="${pkgdir}" install } diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD index a39946560..7f012d00b 100644 --- a/community/mplayer2/PKGBUILD +++ b/community/mplayer2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 56005 2011-09-28 18:33:51Z stephane $ +# $Id: PKGBUILD 56845 2011-10-14 19:26:53Z stephane $ # Maintainer: Stéphane Gaudreault # Contributor: Bartek Piotrowski pkgname=mplayer2 pkgver=2.0 -pkgrel=14 +pkgrel=15 pkgdesc="A movie player" arch=('i686' 'x86_64') license=('GPL') @@ -17,9 +17,11 @@ backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') provides=('mplayer') conflicts=('mplayer') source=(http://ftp.mplayer2.org/pub/release/${pkgname}-${pkgver/_/-}.tar.xz - mplayer2-remove-mp3lib.patch) + mplayer2-remove-mp3lib.patch + mplayer2-SAMI-subs.patch) sha1sums=('0df8d4e5484128b7b28029273b7704ab5d5419bc' - 'c55128a99406a5e01ab077555b7b24aa7b54110c') + 'c55128a99406a5e01ab077555b7b24aa7b54110c' + '4059d5d0564004feb55d25b5f62f7f4672e40fb1') options=('!emptydirs') build() { @@ -33,6 +35,11 @@ build() { rm -fr mp3lib patch -Np1 -i ../mplayer2-remove-mp3lib.patch + # SAMI subtitle parsing buffer overflow + # http://mplayerhq.hu/pipermail/mplayer-cvslog/2011-May/042075.html + # http://labs.mwrinfosecurity.com/files/Advisories/mwri_mplayer-sami-subtitles_2011-08-12.pdf + patch -Np1 -i ../mplayer2-SAMI-subs.patch + ./configure --prefix=/usr \ --enable-runtime-cpudetection \ --disable-arts \ diff --git a/community/mplayer2/mplayer2-SAMI-subs.patch b/community/mplayer2/mplayer2-SAMI-subs.patch new file mode 100644 index 000000000..8238167e2 --- /dev/null +++ b/community/mplayer2/mplayer2-SAMI-subs.patch @@ -0,0 +1,12 @@ +diff -Naur mplayer2-2.0.ori/sub/subreader.c mplayer2-2.0/sub/subreader.c +--- mplayer2-2.0.ori/sub/subreader.c 2011-03-24 17:40:29.000000000 -0400 ++++ mplayer2-2.0/sub/subreader.c 2011-10-14 15:04:47.196477670 -0400 +@@ -179,6 +179,8 @@ + break; + + case 3: /* get all text until '<' appears */ ++ if (p - text >= LINE_LEN) ++ sami_add_line(current, text, &p); + if (*s == '\0') break; + else if (!strncasecmp (s, "
", 4)) { + sami_add_line(current, text, &p); diff --git a/community/musepack-tools/PKGBUILD b/community/musepack-tools/PKGBUILD index 3cb7732d0..3cebcc68a 100644 --- a/community/musepack-tools/PKGBUILD +++ b/community/musepack-tools/PKGBUILD @@ -1,32 +1,41 @@ -# $Id: PKGBUILD 11191 2010-02-06 17:49:24Z dgriffiths $ -# Maintainer: Corrado Primier +# $Id: PKGBUILD 56848 2011-10-14 21:03:20Z schiv $ +# Maintainer: +# Contributor: Corrado Primier # Contributor: Eric Belanger pkgname=musepack-tools -pkgver=435 -pkgrel=2 +pkgver=475 +pkgrel=1 pkgdesc="Musepack decoder/encoder" arch=('i686' 'x86_64') url="http://www.musepack.net/" license=('LGPL') depends=('libcuefile' 'libreplaygain') makedepends=('cmake') -source=(http://files.musepack.net/source/musepack_src_r${pkgver}.tar.gz math.patch) -md5sums=('0e858972978fe480fd1400b7331061de' 'f9d51d2d7ba46fbdc4d038596871f9e0') +source=("http://files.musepack.net/source/musepack_src_r$pkgver.tar.gz" + "math.patch") +md5sums=('754d67be67f713e54baf70fcfdb2817e' + '9de31f07a3492c7b1db1248b055fbdc8') build() { - export LDFLAGS="${LDFLAGS} -lm" - cd ${srcdir}/musepack_src_r${pkgver} + cd "$srcdir/musepack_src_r$pkgver" - patch -Np0 -i ${srcdir}/math.patch || return 1 + #export LDFLAGS+="-lm" - mkdir build - cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=ON .. || return 1 - make DESTDIR="${pkgdir}" install || return 1 + patch -Np1 -i "$srcdir/math.patch" + + cmake . -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_SKIP_RPATH=ON +} + +package() { + cd "$srcdir/musepack_src_r$pkgver" + + make DESTDIR="$pkgdir" install for bin in chap cut dec enc gain 2sv8; do - install -Dm755 ${srcdir}/musepack_src_r${pkgver}/build/mpc${bin}/mpc${bin} \ - ${pkgdir}/usr/bin/mpc${bin} + install -Dm755 mpc$bin/mpc$bin "$pkgdir/usr/bin/mpc$bin" done } + +# vim:set ts=2 sw=2 et: diff --git a/community/musepack-tools/math.patch b/community/musepack-tools/math.patch index 11588cbbf..61b3d07ec 100644 --- a/community/musepack-tools/math.patch +++ b/community/musepack-tools/math.patch @@ -1,22 +1,12 @@ ---- include/mpc/mpcmath.h.orig 2009-07-25 16:49:10.000000000 +0300 -+++ include/mpc/mpcmath.h 2009-07-31 15:33:45.000000000 +0300 -@@ -16,6 +16,8 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#include -+ - #include - - typedef union mpc_floatint ---- CMakeLists.txt.orig 2008-03-29 20:23:23.000000000 +0100 -+++ CMakeLists.txt 2010-02-04 12:31:27.498930581 +0100 -@@ -9,7 +9,7 @@ +diff -aur musepack_src_r475.old/CMakeLists.txt musepack_src_r475/CMakeLists.txt +--- musepack_src_r475.old/CMakeLists.txt 2011-10-14 16:31:05.536450109 +0800 ++++ musepack_src_r475/CMakeLists.txt 2011-10-14 16:31:34.022962450 +0800 +@@ -16,7 +16,7 @@ add_definitions(-DFAST_MATH -DCVD_FASTLOG) if(NOT MSVC) --set(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -pipe") -+set(CMAKE_C_FLAGS "-O3 -fomit-frame-pointer -pipe -lm") +- set(CMAKE_C_FLAGS "-O3 -Wall -fomit-frame-pointer -pipe") ++ set(CMAKE_C_FLAGS "-O3 -Wall -fomit-frame-pointer -pipe -lm") endif(NOT MSVC) add_subdirectory(libmpcdec) diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index ebcbab11a..d15f6cd32 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 56203 2011-10-03 11:01:21Z spupykin $ +# $Id: PKGBUILD 56852 2011-10-14 21:13:51Z spupykin $ # Maintainer: Sergej Pupykin # Maintainer: Jan-Erik Rediger # Contributor: nofxx .com> pkgname=redis -pkgver=2.2.14 -pkgrel=2 +pkgver=2.4.0 +pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64') url="http://redis.io/" @@ -18,13 +18,13 @@ backup=("etc/redis.conf" source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" "redis.d" "redis.logrotate") -md5sums=('3605e3d4c9465fdfefa2e96f3a408ef5' +md5sums=('efdfa0d40fc7676199005bd0178cf6a9' '9726d06d0a0c60cb5d55a31b3dc1e55d' '9e2d75b7a9dc421122d673fe520ef17f') build() { cd "$srcdir/${pkgname}-${pkgver}" - CFLAGS="$CFLAGS -std=c99" make + CFLAGS="$CFLAGS -std=c99" make FORCE_LIBC_MALLOC=yes } package() { diff --git a/core/coreutils/PKGBUILD b/core/coreutils/PKGBUILD index 0cdca9fd1..ee8569c22 100644 --- a/core/coreutils/PKGBUILD +++ b/core/coreutils/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 137787 2011-09-11 01:35:08Z allan $ +# $Id: PKGBUILD 140430 2011-10-14 06:04:29Z allan $ # Maintainer: Allan McRae # Contributor: judd pkgname=coreutils -pkgver=8.13 -pkgrel=2 +pkgver=8.14 +pkgrel=1 pkgdesc="The basic file, shell and text manipulation utilities of the GNU operating system" arch=('i686' 'x86_64') license=('GPL3') @@ -15,11 +15,12 @@ replaces=('mktemp') backup=('etc/pam.d/su') install=${pkgname}.install options=('!emptydirs') -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz +source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz{,.sig} coreutils-uname.patch coreutils-pam.patch su.pam) -md5sums=('8e1675c6c336ff55557c698706a63d6c' +md5sums=('bcb135ce553493a45aba01b39eb3920a' + '279712f9afc954beaff0d99194c8f462' 'c4fcca138b6abf6d443d48a6f0cd8833' 'aad79a2aa6d566c375d7bdd1b0767278' 'fa85e5cce5d723275b14365ba71a8aad') diff --git a/core/inetutils/PKGBUILD b/core/inetutils/PKGBUILD index be383a4e1..ebf19d1ce 100644 --- a/core/inetutils/PKGBUILD +++ b/core/inetutils/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 139637 2011-10-04 00:28:34Z eric $ +# $Id: PKGBUILD 140458 2011-10-14 20:15:14Z eric $ # Maintainer: Eric Bélanger pkgname=inetutils pkgver=1.8 -pkgrel=5 +pkgrel=6 pkgdesc="A collection of common network programs" arch=('i686' 'x86_64') url="http://www.gnu.org/software/inetutils/" -license=('GPL') +license=('GPL3') groups=('base') depends=('readline' 'ncurses' 'pam') provides=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk') @@ -35,7 +35,7 @@ sha1sums=('598445859b511f73681e4d74a41d65cd6ae0f83e' build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --libexec=/usr/sbin --localstatedir=/var \ - --mandir=/usr/share/man --infodir=/usr/share/info \ + --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info \ --without-wrap --with-pam \ --enable-ftp --enable-ftpd \ --enable-telnet --enable-telnetd \ diff --git a/extra/cups-pdf/PKGBUILD b/extra/cups-pdf/PKGBUILD index 845e0125c..5eb0ac5c6 100644 --- a/extra/cups-pdf/PKGBUILD +++ b/extra/cups-pdf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139655 2011-10-04 13:22:43Z andyrtr $ +# $Id: PKGBUILD 140448 2011-10-14 16:56:59Z andyrtr $ # Maintainer: Andreas Radke # Contributor: Thomas Baechler pkgname=cups-pdf -pkgver=2.6.0 -pkgrel=2 +pkgver=2.6.1 +pkgrel=1 pkgdesc="PDF printer for cups" arch=(i686 x86_64) depends=('cups' 'ghostscript') @@ -13,8 +13,7 @@ url="http://cip.physik.uni-wuerzburg.de/~vrbehr/cups-pdf" license=('GPL2') source=(http://cip.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/src/cups-pdf_$pkgver.tar.gz) backup=(etc/cups/cups-pdf.conf) -md5sums=('8ee644c77438aac542301352266db181') -sha1sums=('45ecff78f26dab6261bbf66978e708d93385ef31') +md5sums=('65f3fd525c4a9b1d736b91594b3166d5') build() { cd $srcdir/$pkgname-$pkgver/src @@ -32,6 +31,4 @@ package() { # Install config file install -D -m644 cups-pdf.conf $pkgdir/etc/cups/cups-pdf.conf - # fix https://bugs.archlinux.org/task/26243 - sed -i "s:e cups-pdf.conf:# cups-pdf.conf:g" $pkgdir/etc/cups/cups-pdf.conf } diff --git a/extra/eclipse/PKGBUILD b/extra/eclipse/PKGBUILD index 7b01a70e4..658b3e79c 100644 --- a/extra/eclipse/PKGBUILD +++ b/extra/eclipse/PKGBUILD @@ -1,30 +1,32 @@ -# $Id: PKGBUILD 129286 2011-06-26 10:19:01Z paul $ +# $Id: PKGBUILD 140450 2011-10-14 19:01:32Z ibiru $ # Maintainer: Paul Mattal # Contributor: Andrew Wright # Contributor: Andreas W. Hauser +# Contributor: Marco Crosio pkgname=eclipse -pkgver=3.7 -_internal_pkgver=3.7 +pkgver=3.7.1 +_internal_pkgver=3.7.1 pkgrel=1 -_date=201106131736 +_date=201109091335 pkgdesc="An IDE for Java and other languages" arch=('i686' 'x86_64') url="http://eclipse.org" -depends=('java-environment' 'gtk2' 'unzip' 'xulrunner') +depends=('java-environment' 'gtk2' 'unzip' 'libwebkit') install=${pkgname}.install makedepends=('zip') license=("EPL/1.1") +backup=('usr/share/eclipse/configuration/config.ini') source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-${pkgver}-${_date}/${pkgname}-SDK-${pkgver}-linux-gtk.tar.gz" 'eclipse.svg' 'eclipse.sh' 'eclipse.desktop' 'eclipse.ini.patch') -md5sums=('084a33505b2d5b933447692ec3025659' - '77cff7543ccf7e177cb6667f5a20ce19' - '7ea99a30fbaf06ec29261541b8eb1e23' - 'ba8a37e30a7ebd69774cec87c69e8c44' - '017b2a68edc48a752a7e27c7aceef797') +md5sums=('c7f3e186e7996d3a8afc16eec9e9e71f' + '77cff7543ccf7e177cb6667f5a20ce19' + '7ea99a30fbaf06ec29261541b8eb1e23' + 'ba8a37e30a7ebd69774cec87c69e8c44' + '017b2a68edc48a752a7e27c7aceef797') [ "$CARCH" = "x86_64" ] && source[0]="ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-${pkgver}-${_date}/${pkgname}-SDK-${pkgver}-linux-gtk-${CARCH}.tar.gz" -[ "$CARCH" = "x86_64" ] && md5sums[0]='980360c038960dfa1ef7485faa317ec6' +[ "$CARCH" = "x86_64" ] && md5sums[0]='b8b37135600d92c373514ce5bb094143' package() { cd "${srcdir}/eclipse" diff --git a/extra/libepc/PKGBUILD b/extra/libepc/PKGBUILD index 4fbd838dd..66ab46ea6 100644 --- a/extra/libepc/PKGBUILD +++ b/extra/libepc/PKGBUILD @@ -1,25 +1,21 @@ -# $Id: PKGBUILD 139209 2011-10-01 18:55:29Z ibiru $ +# $Id: PKGBUILD 140436 2011-10-14 09:44:47Z ibiru $ # Maintainer: Jan de Groot pkgname=libepc -pkgver=0.4.1 +pkgver=0.4.2 pkgrel=1 pkgdesc="Easy Publish and Consume Library" arch=(i686 x86_64) license=('LGPL') url="http://live.gnome.org/libepc" depends=('gtk3' 'avahi' 'libsoup') -makedepends=('intltool' 'gtk-doc' 'gnome-common') +makedepends=('intltool') options=('!libtool' '!makeflags') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.4/${pkgname}-${pkgver}.tar.xz - 0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch) -sha256sums=('1377defd339122a5ef71509d3b761810c58f178985d655b74bc34760ef4ae49e' - 'd2bcfd72abc4cd74975a70c667c38d88154117d1eef10a8e8b75bc07cb1dde06') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.4/${pkgname}-${pkgver}.tar.xz) +sha256sums=('3dff25a7f2f0d024b7609389f13664789b0ab45a0e5740908395e3d49cceefc2') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch" - gnome-autogen.sh ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD index d85310795..4905e598c 100644 --- a/extra/monodevelop-debugger-gdb/PKGBUILD +++ b/extra/monodevelop-debugger-gdb/PKGBUILD @@ -1,16 +1,16 @@ # Maintainer: Daniel Isenmann pkgname=monodevelop-debugger-gdb -pkgver=2.8 +pkgver=2.8.1 pkgrel=1 pkgdesc="Mono Debugger support" arch=('i686' 'x86_64') url="http://monodevelop.com" license=('GPL') -depends=('monodevelop>=2.8' 'gdb') +depends=('monodevelop>=2.8.1' 'gdb') makedepends=('mono') source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('5378b91fdd9ac22e7d41f0a0002ef605') +md5sums=('398c3b49fa1698857499a6e8261becf3') build() { export MONO_SHARED_DIR="${srcdir}/.wabi" diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD index 4517a1b7f..ec8bf415f 100644 --- a/extra/monodevelop/PKGBUILD +++ b/extra/monodevelop/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Giovanni Scafora pkgname=monodevelop -pkgver=2.8 +pkgver=2.8.1 pkgrel=1 pkgdesc="An IDE primarily designed for C# and other .NET languages" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('mono>=2.10.5' 'mono-addins>=0.6.2' 'gnome-sharp' 'gecko-sharp-2.0>=0.1 options=(!makeflags) install=monodevelop.install source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('49d4831aa23972e2a63dfd1be98f1d5e') +md5sums=('02c3f0f75e1d21d72ac5cd0b373d0e58') build() { export MONO_SHARED_DIR=$srcdir/src/.wabi diff --git a/testing/erlang/PKGBUILD b/testing/erlang/PKGBUILD new file mode 100644 index 000000000..b9da3fc65 --- /dev/null +++ b/testing/erlang/PKGBUILD @@ -0,0 +1,62 @@ +# $Id: PKGBUILD 140452 2011-10-14 19:44:00Z ibiru $ +# Maintainer: Vesa Kaihlavirta +# Contributor: Sarah Hay +# Contributor: Tom Burdick + +pkgname=erlang +pkgver=R14B04 +pkgrel=1 +pkgdesc="A small concurrent functional programming language developed by Ericsson." +arch=(i686 x86_64) +url="http://www.erlang.org/index.html" +license=('custom') +depends=('ncurses' 'glibc') +makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc' 'mesa') +optdepends=('wxgtk: for wx support' 'unixodbc: database') + +options=('!makeflags') +source=(http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz + http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz) + +build() { + cd "$srcdir/otp_src_${pkgver/./-}" + ERTSVERSION=$(sed -n 's/^VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < erts/vsn.mk) + ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < lib/erl_interface/vsn.mk) + + sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure + + CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support --enable-threads -enable-native-libs + make + make INSTALL_PREFIX="$pkgdir" install + +# fix prefix + cd "$pkgdir" + for i in usr/lib/erlang/bin/erl \ + usr/lib/erlang/bin/start \ + usr/lib/erlang/erts-${ERTSVERSION}/bin/erl \ + usr/lib/erlang/erts-${ERTSVERSION}/bin/start \ + usr/lib/erlang/releases/RELEASES ;do + sed -i "s#$pkgdir##" $i + done + +# fix symlinks + cd "$pkgdir/usr/lib/erlang/bin" + ln -sf ../erts-${ERTSVERSION}/bin/epmd + + cd "$pkgdir/usr/bin" + for file in *; do + ln -sfv ../lib/erlang/bin/$file + done + + ln -s ../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call "$pkgdir/usr/bin/erl_call" + +# install documentation + install -d "$pkgdir/usr/share/doc/erlang" + install -D -m644 "$srcdir"/{COPYRIGHT,PR.template,README} "$pkgdir/usr/share/doc/erlang" + cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang" + + install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE" + +} +md5sums=('4b469729f103f52702bfb1fb24529dc0' + 'f31e72518daae4007f595c0b224dd59f') diff --git a/testing/hplip/PKGBUILD b/testing/hplip/PKGBUILD index f91e41043..b94467fd7 100644 --- a/testing/hplip/PKGBUILD +++ b/testing/hplip/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 139141 2011-09-30 09:12:15Z eric $ +# $Id: PKGBUILD 140428 2011-10-14 05:01:01Z eric $ # Maintainer : Rémy Oudompheng # Contributor: Morgan LEFIEUX pkgname=hplip -pkgver=3.11.7 -pkgrel=2 +pkgver=3.11.10 +pkgrel=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" arch=('i686' 'x86_64') url="http://hplipopensource.com" license=('GPL') -makedepends=('python2-qt' 'python2-gobject2' 'pkg-config' 'sane' 'rpcbind' 'cups') depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine' - 'libcups>=1.3.10-3' 'net-snmp>=5.7.1' 'libusb-compat') + 'net-snmp>=5.7.1') +makedepends=('python2-qt' 'python2-gobject2' 'sane' 'rpcbind' 'cups') optdepends=('cups: for printing support' 'dbus-python: for dbus support' 'sane: for scanner support' @@ -19,22 +19,25 @@ optdepends=('cups: for printing support' 'python-notify: for Desktop notification support' 'rpcbind: for network support' 'python2-qt: for running hp-toolbox' - 'pygobject: for running hp-toolbox' + 'python2-gobject2: for running hp-toolbox' 'hplip-plugin: binary blobs for specific devices') replaces=('hpijs') options=('!libtool') install=hplip.install -source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc} - hplip-cups-1.5.0-compatibility.patch) -md5sums=('5cb89a00b0c680d8bf9bf4b4f1f863b1' - 'f4422ee0dc842e1a53b75c24f468d65c' - 'a767000ce920e9f7f6a5b0a8e4392ef9') +source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}) +md5sums=('6143f30f3b6905ef22105176a3b80db0' + '396bbd8c5cc92aa8295e5bcb508692f3') build() { cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i "$srcdir/hplip-cups-1.5.0-compatibility.patch" export PYTHON=python2 find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} + + sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py + # fix sysfs rules + sed -i -e "s|SYSFS|ATTR|g" \ + -e "s|sysfs|attr|g" \ + data/rules/56-hpmud_support.rules + ./configure --prefix=/usr \ --enable-qt4 \ --enable-foomatic-rip-hplip-install \ @@ -51,21 +54,7 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install - - rm -rf "$pkgdir/etc/sane.d" - # remove autostart of hp-daemon - rm -r "$pkgdir/etc/xdg" - # move udev rules to /lib/udev/rules.d - mkdir -p "$pkgdir/lib/udev/rules.d" - mv "$pkgdir"/etc/udev/rules.d/* "$pkgdir/lib/udev/rules.d/" - rm -r "$pkgdir/etc/udev" - # remove lp user, it's not used on archlinux - sed -i 's|OWNER="lp", ||g' "$pkgdir/lib/udev/rules.d/40-hplip.rules" - # fix sysfs rules - sed -i -e "s|SYSFS|ATTR|g" \ - -e "s|sysfs|attr|g" \ - -e 's|"bin/sh|"/bin/sh|g' \ - "$pkgdir/lib/udev/rules.d/56-hpmud_support.rules" + make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install + # remove config provided by sane and autostart of hp-daemon + rm -rf "$pkgdir"/etc/{sane.d,xdg} } - diff --git a/testing/pyalpm/PKGBUILD b/testing/pyalpm/PKGBUILD index 7a2eccdda..ae6b07d79 100644 --- a/testing/pyalpm/PKGBUILD +++ b/testing/pyalpm/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer : Rémy Oudompheng pkgname=pyalpm -pkgver=0.5 +pkgver=0.5.1 pkgrel=1 pkgdesc="Libalpm bindings for Python 3" arch=('i686' 'x86_64') @@ -9,7 +9,7 @@ url="http://projects.archlinux.org/users/remy/pyalpm.git/" license=('GPL') depends=('python>=3.2' 'pacman>=4') source=("ftp://ftp.archlinux.org/other/pyalpm/$pkgname-$pkgver.tar.gz") -md5sums=('25b078e0c56d10cf64edd026be317760') +md5sums=('dc59883d19306e89d99e15d820a877e6') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/testing/telepathy-glib/PKGBUILD b/testing/telepathy-glib/PKGBUILD index 73f2c19af..7d49f32f9 100644 --- a/testing/telepathy-glib/PKGBUILD +++ b/testing/telepathy-glib/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 139169 2011-09-30 19:17:32Z ibiru $ +# $Id: PKGBUILD 140454 2011-10-14 19:55:55Z ibiru $ # Maintainer: Ionut Biru # Contributor: Kessia 'even' Pinheiro pkgname=telepathy-glib -pkgver=0.15.6 -pkgrel=2 +pkgver=0.16.0 +pkgrel=1 pkgdesc="GLib bindings for the Telepathy D-Bus protocol" arch=('i686' 'x86_64') url="http://telepathy.freedesktop.org" @@ -14,14 +14,11 @@ license=('LGPL2.1') options=('!libtool' '!emptydirs') depends=('dbus-glib') makedepends=('libxslt' 'vala' 'gobject-introspection') -source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" - fix_gnome-shell.patch) -md5sums=('37881cb8d2a33184cf5957db809b8278' - '015037782eeb8658a9fb093f49a2097f') +source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('071ed1b34ace45109188df73933609e4') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/fix_gnome-shell.patch" PYTHON=/usr/bin/python2 ./configure --prefix=/usr \ --libexecdir=/usr/lib/telepathy \ --enable-vala-bindings \ -- cgit v1.2.3-54-g00ecf