[arch-commits] Commit in python-setuptools/repos/testing-any (PKGBUILD PKGBUILD)
Date: Monday, September 16, 2013 @ 07:26:09 Author: angvp Revision: 194404 archrelease: copy trunk to testing-any Added: python-setuptools/repos/testing-any/PKGBUILD (from rev 194403, python-setuptools/trunk/PKGBUILD) Deleted: python-setuptools/repos/testing-any/PKGBUILD --+ PKGBUILD | 134 ++--- 1 file changed, 67 insertions(+), 67 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2013-09-16 05:25:24 UTC (rev 194403) +++ PKGBUILD2013-09-16 05:26:09 UTC (rev 194404) @@ -1,67 +0,0 @@ -# $Id$ -# Maintainer: Angel Velasquez -pkgbase=python-setuptools -pkgname=('python-setuptools' 'python2-setuptools') -pkgver=1.1 -pkgrel=1 -pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages" -arch=('any') -license=('PSF') -url="http://pypi.python.org/pypi/setuptools"; -makedepends=('python' 'python2') -source=(http://pypi.python.org/packages/source/s/setuptools/setuptools-${pkgver}.tar.gz) -md5sums=('84062633c3818c912af76d54a40d11a7') - -#check() { -# # Check python3 module -# cd "${srcdir}"/setuptools-${pkgver} -# python3 setup.py test -# -# # Check python2 module -# cd "${srcdir}"/setuptools-${pkgver}-python2 -# python2 setup.py test -#} - -prepare() { - cd "${srcdir}" - - pushd setuptools-${pkgver} - popd - - cp -a setuptools-${pkgver}{,-python2} - - cd "${srcdir}"/setuptools-${pkgver} - sed -i -e "s|^#\!.*/usr/bin/python|#!/usr/bin/python3|" setuptools/tests/test_resources.py - - cd ../setuptools-${pkgver}-python2 - sed -i -e "s|^#\!.*/usr/bin/python|#!/usr/bin/python2|" setuptools/tests/test_resources.py -} - -build() { - # Build python 3 module - cd "${srcdir}"/setuptools-${pkgver} - python3 setup.py build - - # Build python 2 module - cd ../setuptools-${pkgver}-python2 - python2 setup.py build -} - -package_python-setuptools() { - depends=('python>=3.3') - provides=('python-distribute') - replaces=('python-distribute') - - cd "${srcdir}/setuptools-${pkgver}" - python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build -} - -package_python2-setuptools() { - depends=('python2>=2.7') - provides=('python2-distribute' 'setuptools') - replaces=('python2-distribute' 'setuptools') - - cd "${srcdir}/setuptools-${pkgver}-python2" - python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build - rm "${pkgdir}/usr/bin/easy_install" -} Copied: python-setuptools/repos/testing-any/PKGBUILD (from rev 194403, python-setuptools/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2013-09-16 05:26:09 UTC (rev 194404) @@ -0,0 +1,67 @@ +# $Id$ +# Maintainer: Angel Velasquez +pkgbase=python-setuptools +pkgname=('python-setuptools' 'python2-setuptools') +pkgver=1.1.5 +pkgrel=1 +pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages" +arch=('any') +license=('PSF') +url="http://pypi.python.org/pypi/setuptools"; +makedepends=('python' 'python2') +source=(http://pypi.python.org/packages/source/s/setuptools/setuptools-${pkgver}.tar.gz) +md5sums=('8d2a7d43de8e1d1e1e92366cc9f93be2') + +#check() { +# # Check python3 module +# cd "${srcdir}"/setuptools-${pkgver} +# python3 setup.py test +# +# # Check python2 module +# cd "${srcdir}"/setuptools-${pkgver}-python2 +# python2 setup.py test +#} + +prepare() { + cd "${srcdir}" + + pushd setuptools-${pkgver} + popd + + cp -a setuptools-${pkgver}{,-python2} + + cd "${srcdir}"/setuptools-${pkgver} + sed -i -e "s|^#\!.*/usr/bin/python|#!/usr/bin/python3|" setuptools/tests/test_resources.py + + cd ../setuptools-${pkgver}-python2 + sed -i -e "s|^#\!.*/usr/bin/python|#!/usr/bin/python2|" setuptools/tests/test_resources.py +} + +build() { + # Build python 3 module + cd "${srcdir}"/setuptools-${pkgver} + python3 setup.py build + + # Build python 2 module + cd ../setuptools-${pkgver}-python2 + python2 setup.py build +} + +package_python-setuptools() { + depends=('python>=3.3') + provides=('python-distribute') + replaces=('python-distribute') + + cd "${srcdir}/setuptools-${pkgver}" + python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build +} + +package_python2-setuptools() { + depends=('python2>=2.7') + provides=('python2-distribute' 'setuptools') + replaces=('python2-distribute' 'setuptools') + + cd "${srcdir}/setuptools-${pkgver}-python2" + python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build + rm "${pkgdir}/usr/bin/easy_install" +}
[arch-commits] Commit in python-setuptools/trunk (PKGBUILD)
Date: Monday, September 16, 2013 @ 07:25:24 Author: angvp Revision: 194403 upgpkg: python-setuptools 1.1.5-1 Version bump to 1.1.5 Modified: python-setuptools/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-16 05:04:06 UTC (rev 194402) +++ PKGBUILD2013-09-16 05:25:24 UTC (rev 194403) @@ -2,7 +2,7 @@ # Maintainer: Angel Velasquez pkgbase=python-setuptools pkgname=('python-setuptools' 'python2-setuptools') -pkgver=1.1 +pkgver=1.1.5 pkgrel=1 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages" arch=('any') @@ -10,7 +10,7 @@ url="http://pypi.python.org/pypi/setuptools"; makedepends=('python' 'python2') source=(http://pypi.python.org/packages/source/s/setuptools/setuptools-${pkgver}.tar.gz) -md5sums=('84062633c3818c912af76d54a40d11a7') +md5sums=('8d2a7d43de8e1d1e1e92366cc9f93be2') #check() { # # Check python3 module
[arch-commits] Commit in python-setuptools/repos (testing-any testing-any/PKGBUILD)
Date: Monday, September 16, 2013 @ 07:04:06 Author: angvp Revision: 194402 archrelease: copy trunk to testing-any Added: python-setuptools/repos/testing-any/ python-setuptools/repos/testing-any/PKGBUILD (from rev 194401, python-setuptools/trunk/PKGBUILD) --+ PKGBUILD | 67 + 1 file changed, 67 insertions(+) Copied: python-setuptools/repos/testing-any/PKGBUILD (from rev 194401, python-setuptools/trunk/PKGBUILD) === --- testing-any/PKGBUILD(rev 0) +++ testing-any/PKGBUILD2013-09-16 05:04:06 UTC (rev 194402) @@ -0,0 +1,67 @@ +# $Id$ +# Maintainer: Angel Velasquez +pkgbase=python-setuptools +pkgname=('python-setuptools' 'python2-setuptools') +pkgver=1.1 +pkgrel=1 +pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages" +arch=('any') +license=('PSF') +url="http://pypi.python.org/pypi/setuptools"; +makedepends=('python' 'python2') +source=(http://pypi.python.org/packages/source/s/setuptools/setuptools-${pkgver}.tar.gz) +md5sums=('84062633c3818c912af76d54a40d11a7') + +#check() { +# # Check python3 module +# cd "${srcdir}"/setuptools-${pkgver} +# python3 setup.py test +# +# # Check python2 module +# cd "${srcdir}"/setuptools-${pkgver}-python2 +# python2 setup.py test +#} + +prepare() { + cd "${srcdir}" + + pushd setuptools-${pkgver} + popd + + cp -a setuptools-${pkgver}{,-python2} + + cd "${srcdir}"/setuptools-${pkgver} + sed -i -e "s|^#\!.*/usr/bin/python|#!/usr/bin/python3|" setuptools/tests/test_resources.py + + cd ../setuptools-${pkgver}-python2 + sed -i -e "s|^#\!.*/usr/bin/python|#!/usr/bin/python2|" setuptools/tests/test_resources.py +} + +build() { + # Build python 3 module + cd "${srcdir}"/setuptools-${pkgver} + python3 setup.py build + + # Build python 2 module + cd ../setuptools-${pkgver}-python2 + python2 setup.py build +} + +package_python-setuptools() { + depends=('python>=3.3') + provides=('python-distribute') + replaces=('python-distribute') + + cd "${srcdir}/setuptools-${pkgver}" + python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build +} + +package_python2-setuptools() { + depends=('python2>=2.7') + provides=('python2-distribute' 'setuptools') + replaces=('python2-distribute' 'setuptools') + + cd "${srcdir}/setuptools-${pkgver}-python2" + python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build + rm "${pkgdir}/usr/bin/easy_install" +}
[arch-commits] Commit in python-setuptools/trunk (PKGBUILD)
Date: Monday, September 16, 2013 @ 07:03:29 Author: angvp Revision: 194401 upgpkg: python-setuptools 1.1-1 Version bump to 1.1 Modified: python-setuptools/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-16 04:50:43 UTC (rev 194400) +++ PKGBUILD2013-09-16 05:03:29 UTC (rev 194401) @@ -2,7 +2,7 @@ # Maintainer: Angel Velasquez pkgbase=python-setuptools pkgname=('python-setuptools' 'python2-setuptools') -pkgver=1.0 +pkgver=1.1 pkgrel=1 pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages" arch=('any') @@ -10,7 +10,7 @@ url="http://pypi.python.org/pypi/setuptools"; makedepends=('python' 'python2') source=(http://pypi.python.org/packages/source/s/setuptools/setuptools-${pkgver}.tar.gz) -md5sums=('3d196ffb6e5e4425daddbb4fe42a4a74') +md5sums=('84062633c3818c912af76d54a40d11a7') #check() { # # Check python3 module
[arch-commits] Commit in youtube-dl/trunk (PKGBUILD)
Date: Monday, September 16, 2013 @ 06:51:04 Author: eric Revision: 97272 upgpkg: youtube-dl 2013.09.16-1 Upstream update Modified: youtube-dl/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-16 02:31:54 UTC (rev 97271) +++ PKGBUILD2013-09-16 04:51:04 UTC (rev 97272) @@ -2,7 +2,7 @@ # Maintainer: Eric Bélanger pkgname=youtube-dl -pkgver=2013.09.10 +pkgver=2013.09.16 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -13,7 +13,7 @@ optdepends=('ffmpeg: for video post-processing') source=(http://youtube-dl.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.gz http://youtube-dl.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.gz.sig) -sha1sums=('04dfa711258d54738a33dc56b8389bb03b787002' +sha1sums=('9edb435b89746e06fa01e17fc010990c72f64d72' 'SKIP') prepare() {
[arch-commits] Commit in youtube-dl/repos/community-any (PKGBUILD PKGBUILD)
Date: Monday, September 16, 2013 @ 06:51:38 Author: eric Revision: 97273 archrelease: copy trunk to community-any Added: youtube-dl/repos/community-any/PKGBUILD (from rev 97272, youtube-dl/trunk/PKGBUILD) Deleted: youtube-dl/repos/community-any/PKGBUILD --+ PKGBUILD | 60 ++-- 1 file changed, 30 insertions(+), 30 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2013-09-16 04:51:04 UTC (rev 97272) +++ PKGBUILD2013-09-16 04:51:38 UTC (rev 97273) @@ -1,30 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger - -pkgname=youtube-dl -pkgver=2013.09.10 -pkgrel=1 -pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" -arch=('any') -url="http://rg3.github.io/youtube-dl/"; -license=('custom') -depends=('python') -makedepends=('python-setuptools') -optdepends=('ffmpeg: for video post-processing') -source=(http://youtube-dl.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.gz - http://youtube-dl.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.gz.sig) -sha1sums=('04dfa711258d54738a33dc56b8389bb03b787002' - 'SKIP') - -prepare() { - cd ${pkgname} - sed -i 's|etc/bash_completion.d|share/bash-completion/completions|' setup.py -} - -package() { - cd ${pkgname} - python setup.py install --root="${pkgdir}/" --optimize=1 - mv "${pkgdir}/usr/share/bash-completion/completions/youtube-dl.bash-completion" \ -"${pkgdir}/usr/share/bash-completion/completions/youtube-dl" - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: youtube-dl/repos/community-any/PKGBUILD (from rev 97272, youtube-dl/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2013-09-16 04:51:38 UTC (rev 97273) @@ -0,0 +1,30 @@ +# $Id$ +# Maintainer: Eric Bélanger + +pkgname=youtube-dl +pkgver=2013.09.16 +pkgrel=1 +pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" +arch=('any') +url="http://rg3.github.io/youtube-dl/"; +license=('custom') +depends=('python') +makedepends=('python-setuptools') +optdepends=('ffmpeg: for video post-processing') +source=(http://youtube-dl.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.gz + http://youtube-dl.org/downloads/${pkgver}/${pkgname}-${pkgver}.tar.gz.sig) +sha1sums=('9edb435b89746e06fa01e17fc010990c72f64d72' + 'SKIP') + +prepare() { + cd ${pkgname} + sed -i 's|etc/bash_completion.d|share/bash-completion/completions|' setup.py +} + +package() { + cd ${pkgname} + python setup.py install --root="${pkgdir}/" --optimize=1 + mv "${pkgdir}/usr/share/bash-completion/completions/youtube-dl.bash-completion" \ +"${pkgdir}/usr/share/bash-completion/completions/youtube-dl" + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +}
[arch-commits] Commit in subversion/repos (16 files)
Date: Monday, September 16, 2013 @ 06:50:43 Author: angvp Revision: 194400 archrelease: copy trunk to staging-i686, staging-x86_64 Added: subversion/repos/staging-i686/ subversion/repos/staging-i686/PKGBUILD (from rev 194399, subversion/trunk/PKGBUILD) subversion/repos/staging-i686/subversion.install (from rev 194399, subversion/trunk/subversion.install) subversion/repos/staging-i686/subversion.rpath.fix.patch (from rev 194399, subversion/trunk/subversion.rpath.fix.patch) subversion/repos/staging-i686/svn (from rev 194399, subversion/trunk/svn) subversion/repos/staging-i686/svnserve.conf (from rev 194399, subversion/trunk/svnserve.conf) subversion/repos/staging-i686/svnserve.service (from rev 194399, subversion/trunk/svnserve.service) subversion/repos/staging-i686/svnserve.tmpfiles (from rev 194399, subversion/trunk/svnserve.tmpfiles) subversion/repos/staging-x86_64/ subversion/repos/staging-x86_64/PKGBUILD (from rev 194399, subversion/trunk/PKGBUILD) subversion/repos/staging-x86_64/subversion.install (from rev 194399, subversion/trunk/subversion.install) subversion/repos/staging-x86_64/subversion.rpath.fix.patch (from rev 194399, subversion/trunk/subversion.rpath.fix.patch) subversion/repos/staging-x86_64/svn (from rev 194399, subversion/trunk/svn) subversion/repos/staging-x86_64/svnserve.conf (from rev 194399, subversion/trunk/svnserve.conf) subversion/repos/staging-x86_64/svnserve.service (from rev 194399, subversion/trunk/svnserve.service) subversion/repos/staging-x86_64/svnserve.tmpfiles (from rev 194399, subversion/trunk/svnserve.tmpfiles) ---+ staging-i686/PKGBUILD | 99 staging-i686/subversion.install |7 + staging-i686/subversion.rpath.fix.patch | 10 ++ staging-i686/svn | 11 +++ staging-i686/svnserve.conf|7 + staging-i686/svnserve.service | 11 +++ staging-i686/svnserve.tmpfiles|1 staging-x86_64/PKGBUILD | 99 staging-x86_64/subversion.install |7 + staging-x86_64/subversion.rpath.fix.patch | 10 ++ staging-x86_64/svn| 11 +++ staging-x86_64/svnserve.conf |7 + staging-x86_64/svnserve.service | 11 +++ staging-x86_64/svnserve.tmpfiles |1 14 files changed, 292 insertions(+) Copied: subversion/repos/staging-i686/PKGBUILD (from rev 194399, subversion/trunk/PKGBUILD) === --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2013-09-16 04:50:43 UTC (rev 194400) @@ -0,0 +1,99 @@ +# $Id$ +# Maintainer: Angel Velasquez +# Contributor: Stéphane Gaudreault +# Contributor: Paul Mattal +# Contributor: Jason Chu + +pkgname=subversion +pkgver=1.8.3 +pkgrel=1 +pkgdesc="A Modern Concurrent Version Control System" +arch=('i686' 'x86_64') +url="http://subversion.apache.org/"; +license=('APACHE') +depends=('sqlite' 'file' 'serf' 'systemd') +makedepends=('apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment' + 'libgnome-keyring' 'kdelibs' 'ruby') +optdepends=('libgnome-keyring: for GNOME Keyring for auth credentials' +'kdeutils-kwallet: for KWallet for auth credentials' +'bash-completion: for svn bash completion' +'python2: for some hook scripts' +'java-environment: for Java support' +'ruby: for some hook scripts') +provides=('svn') +backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') +options=('!makeflags' '!libtool' '!emptydirs') +install=${pkgname}.install +source=(http://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.asc} +svn +svnserve.conf +svnserve.tmpfiles +svnserve.service +subversion.rpath.fix.patch) +md5sums=('7d7bd97347a4491e1ffb529563ce2e9e' + 'SKIP' + 'a0db6dd43af33952739b6ec089852630' + 'c459e299192552f61578f3438abf0664' + 'bb2857eceafcfac35dde39dcffad2314' + 'e8020c7a1d1a0c47091b5fdd034f81c5' + '6b4340ba9d8845cd8497e013ae01be3f') + +prepare() { + cd ${pkgname}-${pkgver} + patch -Np0 -i ../subversion.rpath.fix.patch + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py +} + +build() { + cd ${pkgname}-${pkgver} + export PYTHON=/usr/bin/python2 + ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \ + --with-zlib=/usr --with-serf=/usr --with-apxs \ + --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.3 \ + --enable-javahl --with-gnome-keyring --with-kwallet \ + --with-apache-libexecdir=/usr/lib/httpd/modules \ + --with-ruby-sitedir=/usr/lib/ruby/vendor_r
[arch-commits] Commit in subversion/trunk (PKGBUILD)
Date: Monday, September 16, 2013 @ 06:48:58 Author: angvp Revision: 194399 upgpkg: subversion 1.8.3-1 Version bump + rebuilt against new serf Modified: subversion/trunk/PKGBUILD --+ PKGBUILD | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-16 01:46:20 UTC (rev 194398) +++ PKGBUILD2013-09-16 04:48:58 UTC (rev 194399) @@ -5,8 +5,8 @@ # Contributor: Jason Chu pkgname=subversion -pkgver=1.8.1 -pkgrel=2 +pkgver=1.8.3 +pkgrel=1 pkgdesc="A Modern Concurrent Version Control System" arch=('i686' 'x86_64') url="http://subversion.apache.org/"; @@ -24,13 +24,13 @@ backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve') options=('!makeflags' '!libtool' '!emptydirs') install=${pkgname}.install -source=(http://www.apache.org/dist/subversion/subversion-1.8.1.tar.bz2{,.asc} +source=(http://www.apache.org/dist/subversion/subversion-${pkgver}.tar.bz2{,.asc} svn svnserve.conf svnserve.tmpfiles svnserve.service subversion.rpath.fix.patch) -md5sums=('f2ee0471b8a560f5efa0f2349d9c9ab9' +md5sums=('7d7bd97347a4491e1ffb529563ce2e9e' 'SKIP' 'a0db6dd43af33952739b6ec089852630' 'c459e299192552f61578f3438abf0664' @@ -60,11 +60,11 @@ swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl swig-rb } -check() { - cd ${pkgname}-${pkgver} - export LANG=C LC_ALL=C - make check check-swig-pl check-swig-py check-swig-rb CLEANUP=yes # check-javahl -} +#check() { +# cd ${pkgname}-${pkgver} +# export LANG=C LC_ALL=C +# make check check-swig-pl check-swig-py check-swig-rb CLEANUP=yes # check-javahl +#} package() { cd ${pkgname}-${pkgver}
[arch-commits] Commit in pysolfc/repos (2 files)
Date: Monday, September 16, 2013 @ 04:31:54 Author: eric Revision: 97271 archrelease: copy trunk to community-staging-any Added: pysolfc/repos/community-staging-any/ pysolfc/repos/community-staging-any/PKGBUILD (from rev 97270, pysolfc/trunk/PKGBUILD) --+ PKGBUILD | 32 1 file changed, 32 insertions(+) Copied: pysolfc/repos/community-staging-any/PKGBUILD (from rev 97270, pysolfc/trunk/PKGBUILD) === --- community-staging-any/PKGBUILD (rev 0) +++ community-staging-any/PKGBUILD 2013-09-16 02:31:54 UTC (rev 97271) @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Jaroslav Lichtblau +# Maintainer: Eric Bélanger + +pkgname=pysolfc +pkgver=2.0 +pkgrel=5 +pkgdesc="PySol (Fan Club edition) is an exciting collection of more than 1000 solitaire games" +arch=('any') +url="http://pysolfc.sourceforge.net/"; +license=('GPL3') +depends=('tk' 'pysol-sound-server' 'python2-pillow') +source=(http://downloads.sourceforge.net/pysolfc/PySolFC-${pkgver}.tar.bz2) +sha1sums=('7a11aa04b3f5147396c8b5011228094c10ddc257') + +prepare() { + cd PySolFC-${pkgver} + find . -name \*.py -exec sed -i -e "s|#!/usr/bin/env python|#!/usr/bin/env python2|" {} \; + sed -i 's/pysol.py/pysol/' data/pysol.desktop + sed -i 's/import Image/from PIL import Image/' scripts/cardset_viewer.py pysollib/mfxutil.py + sed -i 's/import GifImagePlugin/from PIL import GifImagePlugin/' pysollib/mfxutil.py + sed -i 's/import PngImagePlugin/from PIL import PngImagePlugin/' pysollib/mfxutil.py + sed -i 's/import JpegImagePlugin/from PIL import JpegImagePlugin/' pysollib/mfxutil.py + sed -i 's/import BmpImagePlugin/from PIL import BmpImagePlugin/' pysollib/mfxutil.py + sed -i 's/import PpmImagePlugin/from PIL import PpmImagePlugin/' pysollib/mfxutil.py +} + +package() { + cd PySolFC-${pkgver} + python2 setup.py install --root="${pkgdir}" + mv "${pkgdir}/usr/bin/pysol.py" "${pkgdir}/usr/bin/pysol" +}
[arch-commits] Commit in pysolfc/trunk (PKGBUILD)
Date: Monday, September 16, 2013 @ 04:31:28 Author: eric Revision: 97270 upgpkg: pysolfc 2.0-5 Update python-imaging depends to python2-pillow, Rename binary instead of adding symlink Modified: pysolfc/trunk/PKGBUILD --+ PKGBUILD | 23 --- 1 file changed, 16 insertions(+), 7 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 22:44:38 UTC (rev 97269) +++ PKGBUILD2013-09-16 02:31:28 UTC (rev 97270) @@ -4,20 +4,29 @@ pkgname=pysolfc pkgver=2.0 -pkgrel=4 +pkgrel=5 pkgdesc="PySol (Fan Club edition) is an exciting collection of more than 1000 solitaire games" arch=('any') url="http://pysolfc.sourceforge.net/"; license=('GPL3') -depends=('python2' 'tk' 'pysol-sound-server' 'python-imaging') -conflicts=('pysol') -replaces=('pysol') +depends=('tk' 'pysol-sound-server' 'python2-pillow') source=(http://downloads.sourceforge.net/pysolfc/PySolFC-${pkgver}.tar.bz2) sha1sums=('7a11aa04b3f5147396c8b5011228094c10ddc257') +prepare() { + cd PySolFC-${pkgver} + find . -name \*.py -exec sed -i -e "s|#!/usr/bin/env python|#!/usr/bin/env python2|" {} \; + sed -i 's/pysol.py/pysol/' data/pysol.desktop + sed -i 's/import Image/from PIL import Image/' scripts/cardset_viewer.py pysollib/mfxutil.py + sed -i 's/import GifImagePlugin/from PIL import GifImagePlugin/' pysollib/mfxutil.py + sed -i 's/import PngImagePlugin/from PIL import PngImagePlugin/' pysollib/mfxutil.py + sed -i 's/import JpegImagePlugin/from PIL import JpegImagePlugin/' pysollib/mfxutil.py + sed -i 's/import BmpImagePlugin/from PIL import BmpImagePlugin/' pysollib/mfxutil.py + sed -i 's/import PpmImagePlugin/from PIL import PpmImagePlugin/' pysollib/mfxutil.py +} + package() { - cd "${srcdir}/PySolFC-${pkgver}" - find . -name \*.py -exec sed -i -e "s|#!/usr/bin/env python|#!/usr/bin/env python2|" {} \; + cd PySolFC-${pkgver} python2 setup.py install --root="${pkgdir}" - ln -s pysol.py "${pkgdir}/usr/bin/pysol" + mv "${pkgdir}/usr/bin/pysol.py" "${pkgdir}/usr/bin/pysol" }
[arch-commits] Commit in freeciv/repos (8 files)
Date: Monday, September 16, 2013 @ 03:46:20 Author: eric Revision: 194398 archrelease: copy trunk to extra-i686, extra-x86_64 Added: freeciv/repos/extra-i686/PKGBUILD (from rev 194397, freeciv/trunk/PKGBUILD) freeciv/repos/extra-i686/freeciv.install (from rev 194397, freeciv/trunk/freeciv.install) freeciv/repos/extra-x86_64/PKGBUILD (from rev 194397, freeciv/trunk/PKGBUILD) freeciv/repos/extra-x86_64/freeciv.install (from rev 194397, freeciv/trunk/freeciv.install) Deleted: freeciv/repos/extra-i686/PKGBUILD freeciv/repos/extra-i686/freeciv.install freeciv/repos/extra-x86_64/PKGBUILD freeciv/repos/extra-x86_64/freeciv.install --+ /PKGBUILD| 56 + /freeciv.install | 22 extra-i686/PKGBUILD | 26 --- extra-i686/freeciv.install | 11 extra-x86_64/PKGBUILD| 26 --- extra-x86_64/freeciv.install | 11 6 files changed, 78 insertions(+), 74 deletions(-) Deleted: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2013-09-16 01:45:44 UTC (rev 194397) +++ extra-i686/PKGBUILD 2013-09-16 01:46:20 UTC (rev 194398) @@ -1,26 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger - -pkgname=freeciv -pkgver=2.3.4 -pkgrel=1 -pkgdesc="A multiuser clone of the famous Microprose game of Civilization" -arch=('i686' 'x86_64') -url="http://www.freeciv.org/"; -license=('GPL') -depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme') -options=('!libtool') -install=freeciv.install -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('974bbadf86c697bd2d4de7abf12d992fb50f1724') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-client=gtk2 --enable-shared --without-ggz-client - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} Copied: freeciv/repos/extra-i686/PKGBUILD (from rev 194397, freeciv/trunk/PKGBUILD) === --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-09-16 01:46:20 UTC (rev 194398) @@ -0,0 +1,28 @@ +# $Id$ +# Maintainer: Eric Bélanger + +pkgname=freeciv +pkgver=2.4.0 +pkgrel=1 +pkgdesc="A multiuser clone of the famous Microprose game of Civilization" +arch=('i686' 'x86_64') +url="http://www.freeciv.org/"; +license=('GPL') +depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme' 'lua51' 'sqlite' 'curl' 'libltdl') +backup=('etc/freeciv/database.lua') +options=('!libtool' '!staticlibs') +install=freeciv.install +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('4a3537dc050bd69002794c832b74f5af972da25e') + +build() { + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc --enable-shared --enable-sys-lua \ +--enable-client=gtk2 --enable-fcdb=sqlite3 --enable-aimodules + make +} + +package() { + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install +} Deleted: extra-i686/freeciv.install === --- extra-i686/freeciv.install 2013-09-16 01:45:44 UTC (rev 194397) +++ extra-i686/freeciv.install 2013-09-16 01:46:20 UTC (rev 194398) @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} Copied: freeciv/repos/extra-i686/freeciv.install (from rev 194397, freeciv/trunk/freeciv.install) === --- extra-i686/freeciv.install (rev 0) +++ extra-i686/freeciv.install 2013-09-16 01:46:20 UTC (rev 194398) @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} Deleted: extra-x86_64/PKGBUILD === --- extra-x86_64/PKGBUILD 2013-09-16 01:45:44 UTC (rev 194397) +++ extra-x86_64/PKGBUILD 2013-09-16 01:46:20 UTC (rev 194398) @@ -1,26 +0,0 @@ -# $Id$ -# Maintainer: Eric Bélanger - -pkgname=freeciv -pkgver=2.3.4 -pkgrel=1 -pkgdesc="A multiuser clone of the famous Microprose game of Civilization" -arch=('i686' 'x86_64') -url="http://www.freeciv.org/"; -license=('GPL') -depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme') -options=('!libtool') -install=freeciv.install -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('974bbadf86c697bd2d4de7abf12d992fb50f1724') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-client=gtk2 --enable-shared --without-ggz-client - make -} - -package() { - cd "${src
[arch-commits] Commit in freeciv/trunk (PKGBUILD)
Date: Monday, September 16, 2013 @ 03:45:44 Author: eric Revision: 194397 upgpkg: freeciv 2.4.0-1 Upstream update, Switch to system lua, Add db and aimodules support to server, Remove static libraries Modified: freeciv/trunk/PKGBUILD --+ PKGBUILD | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 21:07:04 UTC (rev 194396) +++ PKGBUILD2013-09-16 01:45:44 UTC (rev 194397) @@ -2,25 +2,27 @@ # Maintainer: Eric Bélanger pkgname=freeciv -pkgver=2.3.4 +pkgver=2.4.0 pkgrel=1 pkgdesc="A multiuser clone of the famous Microprose game of Civilization" arch=('i686' 'x86_64') url="http://www.freeciv.org/"; license=('GPL') -depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme') -options=('!libtool') +depends=('gtk2' 'sdl_mixer' 'hicolor-icon-theme' 'lua51' 'sqlite' 'curl' 'libltdl') +backup=('etc/freeciv/database.lua') +options=('!libtool' '!staticlibs') install=freeciv.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('974bbadf86c697bd2d4de7abf12d992fb50f1724') +sha1sums=('4a3537dc050bd69002794c832b74f5af972da25e') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --enable-client=gtk2 --enable-shared --without-ggz-client + cd ${pkgname}-${pkgver} + ./configure --prefix=/usr --sysconfdir=/etc --enable-shared --enable-sys-lua \ +--enable-client=gtk2 --enable-fcdb=sqlite3 --enable-aimodules make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install }
[arch-commits] Commit in hexchat/repos (8 files)
Date: Monday, September 16, 2013 @ 00:44:38 Author: alucryd Revision: 97269 archrelease: copy trunk to community-i686, community-x86_64 Added: hexchat/repos/community-i686/PKGBUILD (from rev 97268, hexchat/trunk/PKGBUILD) hexchat/repos/community-i686/hexchat.install (from rev 97268, hexchat/trunk/hexchat.install) hexchat/repos/community-x86_64/PKGBUILD (from rev 97268, hexchat/trunk/PKGBUILD) hexchat/repos/community-x86_64/hexchat.install (from rev 97268, hexchat/trunk/hexchat.install) Deleted: hexchat/repos/community-i686/PKGBUILD hexchat/repos/community-i686/hexchat.install hexchat/repos/community-x86_64/PKGBUILD hexchat/repos/community-x86_64/hexchat.install --+ /PKGBUILD| 70 + /hexchat.install | 28 ++ community-i686/PKGBUILD | 35 -- community-i686/hexchat.install | 14 --- community-x86_64/PKGBUILD| 35 -- community-x86_64/hexchat.install | 14 --- 6 files changed, 98 insertions(+), 98 deletions(-) Deleted: community-i686/PKGBUILD === --- community-i686/PKGBUILD 2013-09-15 22:44:23 UTC (rev 97268) +++ community-i686/PKGBUILD 2013-09-15 22:44:38 UTC (rev 97269) @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer: Maxime Gauduin -# Contributor: TingPing - -pkgname=hexchat -pkgver=2.9.6 -pkgrel=2 -pkgdesc="A popular and easy to use graphical IRC (chat) client" -arch=('i686' 'x86_64') -url="http://www.hexchat.org/"; -license=('GPL') -depends=('dbus-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'libcanberra' 'libnotify' 'libproxy' 'libsexy' 'pciutils') -makedepends=('perl' 'python') -optdepends=('enchant: Spell check' -'perl: Perl plugin' -'python: Python plugin') -options=('!libtool') -install="${pkgname}.install" -source=("http://dl.hexchat.org/hexchat/hexchat-${pkgver}.tar.xz";) -sha256sums=('eaefc07867a6e546cd9e19a4ccc976b4736c759ba3f946020eeae3cd6f4684b0') - -build() { - cd ${pkgname}-${pkgver} - - ./configure --prefix='/usr' --enable-{python='python3',shm,spell='libsexy',textfe} - make -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR="$pkgdir" install -} - -# vim: ts=2 sw=2 et: Copied: hexchat/repos/community-i686/PKGBUILD (from rev 97268, hexchat/trunk/PKGBUILD) === --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-09-15 22:44:38 UTC (rev 97269) @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Maxime Gauduin +# Contributor: TingPing + +pkgname=hexchat +pkgver=2.9.6.1 +pkgrel=1 +pkgdesc="A popular and easy to use graphical IRC (chat) client" +arch=('i686' 'x86_64') +url="http://hexchat.github.io/"; +license=('GPL') +depends=('dbus-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'libcanberra' 'libnotify' 'libproxy' 'libsexy' 'pciutils') +makedepends=('perl' 'python') +optdepends=('enchant: Spell check' +'perl: Perl plugin' +'python: Python plugin') +options=('!libtool') +install="${pkgname}.install" +source=("http://dl.hexchat.net/${pkgname}/${pkgname}-${pkgver}.tar.xz";) +sha256sums=('6267ff3c4d0aec8a808365b384115a769d5001d99dbb10403634667c43966470') + +build() { + cd ${pkgname}-${pkgver} + + ./configure --prefix='/usr' --enable-{python='python3',shm,spell='libsexy',textfe} + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR="$pkgdir" install +} + +# vim: ts=2 sw=2 et: Deleted: community-i686/hexchat.install === --- community-i686/hexchat.install 2013-09-15 22:44:23 UTC (rev 97268) +++ community-i686/hexchat.install 2013-09-15 22:44:38 UTC (rev 97269) @@ -1,14 +0,0 @@ -post_install() { - gtk-update-icon-cache -ftq usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim: ts=2 sw=2 et: Copied: hexchat/repos/community-i686/hexchat.install (from rev 97268, hexchat/trunk/hexchat.install) === --- community-i686/hexchat.install (rev 0) +++ community-i686/hexchat.install 2013-09-15 22:44:38 UTC (rev 97269) @@ -0,0 +1,14 @@ +post_install() { + gtk-update-icon-cache -ftq usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim: ts=2 sw=2 et: Deleted: community-x86_64/PKGBUILD === --- community-x86_64/PKGBUILD 2013-09-15 22:44:23 UTC (rev 97268) +++ community-x86_64/PKGBUILD 2013-09-15 22:44:38 UTC (rev 97269) @@ -1,35 +0,0 @@ -# $Id$ -# Maintainer: Maxime Gauduin -# Contributor: TingPing - -pkgname=hexchat -
[arch-commits] Commit in hexchat/trunk (PKGBUILD)
Date: Monday, September 16, 2013 @ 00:44:23 Author: alucryd Revision: 97268 upgpkg: hexchat 2.9.6.1-1 Modified: hexchat/trunk/PKGBUILD --+ PKGBUILD | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 21:54:32 UTC (rev 97267) +++ PKGBUILD2013-09-15 22:44:23 UTC (rev 97268) @@ -3,11 +3,11 @@ # Contributor: TingPing pkgname=hexchat -pkgver=2.9.6 -pkgrel=2 +pkgver=2.9.6.1 +pkgrel=1 pkgdesc="A popular and easy to use graphical IRC (chat) client" arch=('i686' 'x86_64') -url="http://www.hexchat.org/"; +url="http://hexchat.github.io/"; license=('GPL') depends=('dbus-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'libcanberra' 'libnotify' 'libproxy' 'libsexy' 'pciutils') makedepends=('perl' 'python') @@ -16,8 +16,8 @@ 'python: Python plugin') options=('!libtool') install="${pkgname}.install" -source=("http://dl.hexchat.org/hexchat/hexchat-${pkgver}.tar.xz";) -sha256sums=('eaefc07867a6e546cd9e19a4ccc976b4736c759ba3f946020eeae3cd6f4684b0') +source=("http://dl.hexchat.net/${pkgname}/${pkgname}-${pkgver}.tar.xz";) +sha256sums=('6267ff3c4d0aec8a808365b384115a769d5001d99dbb10403634667c43966470') build() { cd ${pkgname}-${pkgver}
[arch-commits] Commit in gdc/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 23:54:20 Author: dicebot Revision: 97266 upgpkg: gdc 4.8.1-4 Fix #36939 - remove unused libatomic Modified: gdc/trunk/PKGBUILD --+ PKGBUILD |3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 21:53:08 UTC (rev 97265) +++ PKGBUILD2013-09-15 21:54:20 UTC (rev 97266) @@ -5,7 +5,7 @@ pkgname=('gdc' 'libgphobos-devel') pkgver=4.8.1 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') url="https://github.com/D-Programming-GDC/GDC"; license=('GPL') @@ -93,5 +93,4 @@ cp -r $srcdir/gdc/libphobos/src/etc ${pkgdir}/usr/include/dlang/gdc/$pkgver/etc install -D -m644 $srcdir/gcc-build/$CHOST/libphobos/src/libgphobos2.a $pkgdir/usr/lib/libgphobos2.a -install -D -m644 $srcdir/gcc-build/$CHOST/libatomic/.libs/libatomic.a $pkgdir/usr/lib/libatomic.a }
[arch-commits] Commit in gdc/repos (8 files)
Date: Sunday, September 15, 2013 @ 23:54:32 Author: dicebot Revision: 97267 archrelease: copy trunk to community-i686, community-x86_64 Added: gdc/repos/community-i686/PKGBUILD (from rev 97266, gdc/trunk/PKGBUILD) gdc/repos/community-i686/folders.diff (from rev 97266, gdc/trunk/folders.diff) gdc/repos/community-x86_64/PKGBUILD (from rev 97266, gdc/trunk/PKGBUILD) gdc/repos/community-x86_64/folders.diff (from rev 97266, gdc/trunk/folders.diff) Deleted: gdc/repos/community-i686/PKGBUILD gdc/repos/community-i686/folders.diff gdc/repos/community-x86_64/PKGBUILD gdc/repos/community-x86_64/folders.diff ---+ /PKGBUILD | 192 /folders.diff | 66 + community-i686/PKGBUILD | 97 community-i686/folders.diff | 33 -- community-x86_64/PKGBUILD | 97 community-x86_64/folders.diff | 33 -- 6 files changed, 258 insertions(+), 260 deletions(-) Deleted: community-i686/PKGBUILD === --- community-i686/PKGBUILD 2013-09-15 21:54:20 UTC (rev 97266) +++ community-i686/PKGBUILD 2013-09-15 21:54:32 UTC (rev 97267) @@ -1,97 +0,0 @@ -# Maintainer: Mihails Strasuns -# Contributor: Moritz Maxeiner -# Contributor: Jerome Berger -# Contributor: Jesus Alvarez - -pkgname=('gdc' 'libgphobos-devel') -pkgver=4.8.1 -pkgrel=3 -arch=('i686' 'x86_64') -url="https://github.com/D-Programming-GDC/GDC"; -license=('GPL') -makedepends=('binutils>=2.23' 'git' 'gcc' 'make' 'perl' 'cloog' 'automake') -options=('!libtool' '!emptydirs' '!buildflags') -_snapshot=4.8-20130725 -source=(ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2 -gdc::git://github.com/D-Programming-GDC/GDC.git#branch=gdc-4.8 -folders.diff) -sha256sums=('e4e2202b15f8ba323f88c65de0e4190b0630a4b2e70b0653526b31e946877ead' -'SKIP' -'88a1f1315633e9dde18637ff5239898abd94dca9a39fdb211a66555dd84c2fec') - -groups=('dlang' 'dlang-gdc') -conflicts=('gdc1-bin' 'gdc1-hg' 'gdc-git') - -prepare() -{ -cd $srcdir/gcc-$_snapshot - -# Do not run fixincludes -sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in - -echo $pkgver > gcc/BASE-VER - -# hack! - some configure tests for header files using "$CPP $CPPFLAGS" -sed -i "/ac_cpp=/s/\$CPPFLAGS/\$CPPFLAGS -O2/" {libiberty,gcc}/configure - -cd $srcdir/gdc -git apply $srcdir/folders.diff # fix gdc_include_path -./setup-gcc.sh ../gcc-$_snapshot - -mkdir $srcdir/gcc-build -} - - -build() -{ -cd ${srcdir}/gcc-build - -${srcdir}/gcc-$_snapshot/configure --prefix=/usr \ ---libdir=/usr/lib --libexecdir=/usr/lib \ ---mandir=/usr/share/man --infodir=/usr/share/info \ ---with-bugurl=https://bugs.archlinux.org/ \ ---enable-languages=d \ ---enable-shared --enable-threads=posix \ ---with-system-zlib --enable-__cxa_atexit \ ---disable-libunwind-exceptions --enable-clocale=gnu \ ---disable-libstdcxx-pch \ ---enable-gnu-unique-object --enable-linker-build-id \ ---enable-cloog-backend=isl --disable-cloog-version-check \ ---enable-lto --enable-gold --enable-ld=default \ ---enable-plugin --with-plugin-ld=ld.gold \ ---with-linker-hash-style=gnu --disable-install-libiberty \ ---disable-multilib --disable-libssp --disable-werror \ ---disable-nls --disable-bootstrap \ ---disable-libgomp --disable-libmudflap --disable-libquadmath - -make -} - -package_gdc() -{ -depends=('libmpc' 'zlib') -optdepends=('libgphobos-devel: D standard library, GDC version') -pkgdesc="Compiler for D programming language wich uses gcc backend" - -install -D -m755 $srcdir/gcc-build/gcc/gdc $pkgdir/usr/bin/gdc -install -D -m755 $srcdir/gcc-build/gcc/cc1d $pkgdir/usr/lib/gcc/$CHOST/4.8.1/cc1d -} - -package_libgphobos-devel() -{ -pkgdesc="Standard library for D programming language, GDC port" -depends=('gdc') - -# druntime -install -D $srcdir/gdc/libphobos/libdruntime/object.di $pkgdir/usr/include/dlang/gdc/$pkgver/object.di -cp -r $srcdir/gdc/libphobos/libdruntime/core $pkgdir/usr/include/dlang/gdc/$pkgver/core -cp -r $srcdir/gdc/libphobos/libdruntime/gcc $pkgdir/usr/include/dlang/gdc/$pkgver/gcc - -# phobos -cp $srcdir/gdc/libphobos/src/crc32.d ${pkgdir}/usr/include/dlang/gdc/$pkgver/crc32.d -cp -r $srcdir/gdc/libphobos/src/std ${pkgdir}/usr/include/dlang/gdc/$pkgver/std -cp -r $srcdir/gdc/libphobos/src/etc ${pkgdir}/usr/include/dlang/gdc/$pkgver/etc - -install -D -m644 $srcdir/gcc-build/$CHOST/libphobos/src/libgphobos2.a $pkgdir/usr/lib/libgphobos2.a -install -D -m644 $srcdir/gcc-build/$CHOST/libatomic/.libs/libatomic.a $pkgdir/usr/lib/libatomic.a -} Copied: gdc/repos/community-i686/PKGBUIL
[arch-commits] Commit in python-pillow/repos (6 files)
Date: Sunday, September 15, 2013 @ 23:53:08 Author: kkeen Revision: 97265 archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: python-pillow/repos/community-staging-i686/PKGBUILD (from rev 97264, python-pillow/trunk/PKGBUILD) python-pillow/repos/community-staging-i686/pull325.diff (from rev 97264, python-pillow/trunk/pull325.diff) python-pillow/repos/community-staging-x86_64/PKGBUILD (from rev 97264, python-pillow/trunk/PKGBUILD) python-pillow/repos/community-staging-x86_64/pull325.diff (from rev 97264, python-pillow/trunk/pull325.diff) Deleted: python-pillow/repos/community-staging-i686/PKGBUILD python-pillow/repos/community-staging-x86_64/PKGBUILD ---+ /PKGBUILD | 136 community-staging-i686/PKGBUILD | 64 --- community-staging-i686/pull325.diff | 38 community-staging-x86_64/PKGBUILD | 64 --- community-staging-x86_64/pull325.diff | 38 5 files changed, 212 insertions(+), 128 deletions(-) Deleted: community-staging-i686/PKGBUILD === --- community-staging-i686/PKGBUILD 2013-09-15 21:52:25 UTC (rev 97264) +++ community-staging-i686/PKGBUILD 2013-09-15 21:53:08 UTC (rev 97265) @@ -1,64 +0,0 @@ -# $Id$ -# Maintainer: Kyle Keen -# Contributor: minder - -pkgbase=python-pillow -pkgname=(python-pillow python2-pillow) -_appname=Pillow -pkgver=2.1.0 -pkgrel=4 -pkgdesc="Python Imaging Library (PIL) fork. Python3 version." -arch=('i686' 'x86_64') -url="http://python-imaging.github.io/"; -license=('BSD') -makedepends=('python-setuptools' 'python2-setuptools' 'lcms' 'libwebp' 'tk' 'sane') -source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip";) -md5sums=('ec630d8ae15d4a3c4ae7b7efdeac8200') - -build() { - cd "$srcdir" - cp -r "$srcdir/$_appname-$pkgver" "$srcdir/${_appname}2-$pkgver" -} - -package_python-pillow() { - depends=('python' 'lcms' 'libwebp') - optdepends=('tk: for the ImageTK module' - 'sane: for the Sane module' - 'python-pyqt4: for the ImageQt module') - cd "$srcdir/$_appname-$pkgver" - python3 setup.py install --root="$pkgdir/" --optimize=0 - pushd Sane -python3 setup.py install --root="$pkgdir/" --optimize=0 - popd - install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - # clean up bins - cd "$pkgdir/usr/bin" - for f in *.py; do -mv "$f" "${f%.py}" - done -} - -package_python2-pillow() { - pkgdesc="Python Imaging Library (PIL) fork. Python2 version." - depends=('python2' 'lcms' 'libwebp') - optdepends=('tk: for the ImageTK module' - 'sane: for the Sane module' - 'python2-pyqt4: for the ImageQt module') - provides=('python-imaging' 'python2-imaging') - conflicts=('python-imaging' 'python2-imaging') - replaces=('python2-imaging') - cd "$srcdir/${_appname}2-$pkgver" - python2 setup.py install --root="$pkgdir/" --optimize=0 - pushd Sane -python2 setup.py install --root="$pkgdir/" --optimize=0 - popd - install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - # clean up bins - cd "$pkgdir/usr/bin" - for f in *.py; do -mv "$f" "${f%.py}2" - done -} - Copied: python-pillow/repos/community-staging-i686/PKGBUILD (from rev 97264, python-pillow/trunk/PKGBUILD) === --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2013-09-15 21:53:08 UTC (rev 97265) @@ -0,0 +1,68 @@ +# $Id$ +# Maintainer: Kyle Keen +# Contributor: minder + +pkgbase=python-pillow +pkgname=(python-pillow python2-pillow) +_appname=Pillow +pkgver=2.1.0 +pkgrel=5 +pkgdesc="Python Imaging Library (PIL) fork. Python3 version." +arch=('i686' 'x86_64') +url="http://python-imaging.github.io/"; +license=('BSD') +makedepends=('python-setuptools' 'python2-setuptools' 'lcms' 'libwebp' 'tk' 'sane') +# remove pull325.diff on 2.1.1 release, fixes FS#36945 +source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip"; + "pull325.diff") +md5sums=('ec630d8ae15d4a3c4ae7b7efdeac8200' + 'aa3fa12bd2d61041f6d01fedddab39fb') + +build() { + cd "$srcdir" + cp -r "$srcdir/$_appname-$pkgver" "$srcdir/${_appname}2-$pkgver" +} + +package_python-pillow() { + depends=('python' 'lcms' 'libwebp') + optdepends=('tk: for the ImageTK module' + 'sane: for the Sane module' + 'python-pyqt4: for the ImageQt module') + cd "$srcdir/$_appname-$pkgver" + python3 setup.py install --root="$pkgdir/" --optimize=0 + pushd Sane +python3 setup.py install --root="$pkgdir/" --optimize=0 + popd + install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # clean up bins + cd "$pkgdir/usr/bin" + for f in *.py; do +mv
[arch-commits] Commit in python-pillow/trunk (PKGBUILD pull325.diff)
Date: Sunday, September 15, 2013 @ 23:52:25 Author: kkeen Revision: 97264 upgpkg: python-pillow 2.1.0-5, fix FS#36945 Added: python-pillow/trunk/pull325.diff Modified: python-pillow/trunk/PKGBUILD --+ PKGBUILD | 10 +++--- pull325.diff | 38 ++ 2 files changed, 45 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 21:50:11 UTC (rev 97263) +++ PKGBUILD2013-09-15 21:52:25 UTC (rev 97264) @@ -6,14 +6,17 @@ pkgname=(python-pillow python2-pillow) _appname=Pillow pkgver=2.1.0 -pkgrel=4 +pkgrel=5 pkgdesc="Python Imaging Library (PIL) fork. Python3 version." arch=('i686' 'x86_64') url="http://python-imaging.github.io/"; license=('BSD') makedepends=('python-setuptools' 'python2-setuptools' 'lcms' 'libwebp' 'tk' 'sane') -source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip";) -md5sums=('ec630d8ae15d4a3c4ae7b7efdeac8200') +# remove pull325.diff on 2.1.1 release, fixes FS#36945 +source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip"; + "pull325.diff") +md5sums=('ec630d8ae15d4a3c4ae7b7efdeac8200' + 'aa3fa12bd2d61041f6d01fedddab39fb') build() { cd "$srcdir" @@ -49,6 +52,7 @@ conflicts=('python-imaging' 'python2-imaging') replaces=('python2-imaging') cd "$srcdir/${_appname}2-$pkgver" + patch -Np1 -i ../pull325.diff python2 setup.py install --root="$pkgdir/" --optimize=0 pushd Sane python2 setup.py install --root="$pkgdir/" --optimize=0 Added: pull325.diff === --- pull325.diff(rev 0) +++ pull325.diff2013-09-15 21:52:25 UTC (rev 97264) @@ -0,0 +1,38 @@ +diff --git a/PIL/Image.py b/PIL/Image.py +index bb15aaa..2e120e5 100644 +--- a/PIL/Image.py b/PIL/Image.py +@@ -706,7 +706,7 @@ def convert(self, mode=None, data=None, dither=None, + if self.mode == "L" and mode == "RGBA" and "transparency" in self.info: + from PIL import ImagePalette + self.mode = "P" +-bytePalette = bytes([i//3 for i in range(768)]) ++bytePalette = bytes(bytearray([i//3 for i in range(768)])) + self.palette = ImagePalette.raw("RGB", bytePalette) + self.palette.dirty = 1 + self.load() +diff --git a/_imaging.c b/_imaging.c +index 9f48030..84f06e9 100644 +--- a/_imaging.c b/_imaging.c +@@ -287,6 +287,7 @@ int PyImaging_GetBuffer(PyObject* buffer, Py_buffer *view) + static const char* wrong_raw_mode = "unrecognized raw mode"; + static const char* outside_image = "image index out of range"; + static const char* outside_palette = "palette index out of range"; ++static const char* wrong_palette_size = "invalid palette size"; + static const char* no_palette = "image has no palette"; + static const char* readonly = "image is readonly"; + /* static const char* no_content = "image has no content"; */ +@@ -1413,6 +1414,11 @@ int PyImaging_GetBuffer(PyObject* buffer, Py_buffer *view) + return NULL; + } + ++if ( palettesize * 8 / bits > 256) { ++PyErr_SetString(PyExc_ValueError, wrong_palette_size); ++return NULL; ++} ++ + ImagingPaletteDelete(self->image->palette); + + strcpy(self->image->mode, "P"); +
[arch-commits] Commit in openra/repos/community-any (4 files)
Date: Sunday, September 15, 2013 @ 23:50:11 Author: svenstaro Revision: 97263 archrelease: copy trunk to community-any Added: openra/repos/community-any/PKGBUILD (from rev 97262, openra/trunk/PKGBUILD) openra/repos/community-any/openra.install (from rev 97262, openra/trunk/openra.install) Deleted: openra/repos/community-any/PKGBUILD openra/repos/community-any/openra.install + PKGBUILD | 81 --- openra.install | 36 2 files changed, 60 insertions(+), 57 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2013-09-15 21:50:02 UTC (rev 97262) +++ PKGBUILD2013-09-15 21:50:11 UTC (rev 97263) @@ -1,39 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase -# Contributor: Matthew Bowra-Dean -pkgname=openra -pkgver=20130514 -pkgrel=1 -pkgdesc="An open-source implementation of the Red Alert engine using .NET/mono and OpenGL" -arch=('any') -url="http://open-ra.org"; -license=('GPL3') -install=openra.install -depends=('mono' 'openal' 'libgl' 'freetype2' 'sdl' 'hicolor-icon-theme' 'ttf-dejavu') -makedepends=('git' 'unzip') -optdepends=('nvidia-cg-toolkit: for using the alternative Cg renderer') -options=(!strip) -source=("openra-$pkgver::https://github.com/OpenRA/OpenRA/tarball/release-$pkgver";) -md5sums=('1aa42cde61571b90c8d2a418b407967a') - -build() { - cd OpenRA-OpenRA-* - - make -} - -package() { - cd OpenRA-OpenRA-* - - mkdir -p "$pkgdir/usr/share/applications" - sed "s/{VERSION}/$pkgver/g" packaging/linux/openra.desktop > "$pkgdir/usr/share/applications/openra.desktop" - - sed "/Version/s/{DEV_VERSION}/release-${pkgver}/" -i mods/{ra,cnc}/mod.yaml - - mkdir -p "$pkgdir/usr/share/icons/" - cp -r packaging/linux/hicolor "$pkgdir/usr/share/icons/" - - make prefix=/usr DESTDIR="$pkgdir" install - - find "$pkgdir" -iname \*.mdb -delete -} Copied: openra/repos/community-any/PKGBUILD (from rev 97262, openra/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2013-09-15 21:50:11 UTC (rev 97263) @@ -0,0 +1,42 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase +# Contributor: Matthew Bowra-Dean +pkgname=openra +pkgver=20130915 +pkgrel=1 +pkgdesc="An open-source implementation of the Red Alert engine using .NET/mono and OpenGL" +arch=('any') +url="http://open-ra.org"; +license=('GPL3') +install=openra.install +depends=('mono' 'openal' 'libgl' 'freetype2' 'sdl' 'hicolor-icon-theme' 'ttf-dejavu' 'gtk-update-icon-cache' 'desktop-file-utils') +makedepends=('git' 'unzip') +optdepends=('nvidia-cg-toolkit: for using the alternative Cg renderer') +options=(!strip) +source=("openra-$pkgver::https://github.com/OpenRA/OpenRA/tarball/release-$pkgver"; +https://github.com/OpenRA/OpenRA/pull/3837.patch) +md5sums=('9284b6113a77978f446fa0bade7f9cd3' + '46ee544f4117c80cc400c03e1637f1f1') + +build() { + cd OpenRA-OpenRA-* + + patch -Np1 < $srcdir/3837.patch + make +} + +package() { + cd OpenRA-OpenRA-* + + mkdir -p "$pkgdir/usr/share/applications" + sed "s/{VERSION}/$pkgver/g" packaging/linux/openra.desktop > "$pkgdir/usr/share/applications/openra.desktop" + + sed "/Version/s/{DEV_VERSION}/release-${pkgver}/" -i mods/{ra,cnc}/mod.yaml + + mkdir -p "$pkgdir/usr/share/icons/" + cp -r packaging/linux/hicolor "$pkgdir/usr/share/icons/" + + make prefix=/usr DESTDIR="$pkgdir" install + + find "$pkgdir" -iname \*.mdb -delete +} Deleted: openra.install === --- openra.install 2013-09-15 21:50:02 UTC (rev 97262) +++ openra.install 2013-09-15 21:50:11 UTC (rev 97263) @@ -1,18 +0,0 @@ -post_upgrade() { -update-desktop-database -q -gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_install() { -echo "If the game doesn't run, try using the Cg renderer ~/.openra/settings.yaml like so:" -echo "Graphics:" -echo "Renderer: Cg" -echo "Be careful to only use one indenting tab with 8 shift width." -post_upgrade -} - -post_remove() { -echo "openra downloaded data files to ~/.openra/Content and you might want" -echo "to delete those." -post_upgrade -} Copied: openra/repos/community-any/openra.install (from rev 97262, o
[arch-commits] Commit in openra/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 23:50:02 Author: svenstaro Revision: 97262 upgpkg: openra 20130915-1 Updating to 20130915 Modified: openra/trunk/PKGBUILD --+ PKGBUILD | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 21:40:36 UTC (rev 97261) +++ PKGBUILD2013-09-15 21:50:02 UTC (rev 97262) @@ -2,7 +2,7 @@ # Maintainer: Sven-Hendrik Haase # Contributor: Matthew Bowra-Dean pkgname=openra -pkgver=20130514 +pkgver=20130915 pkgrel=1 pkgdesc="An open-source implementation of the Red Alert engine using .NET/mono and OpenGL" arch=('any') @@ -9,16 +9,19 @@ url="http://open-ra.org"; license=('GPL3') install=openra.install -depends=('mono' 'openal' 'libgl' 'freetype2' 'sdl' 'hicolor-icon-theme' 'ttf-dejavu') +depends=('mono' 'openal' 'libgl' 'freetype2' 'sdl' 'hicolor-icon-theme' 'ttf-dejavu' 'gtk-update-icon-cache' 'desktop-file-utils') makedepends=('git' 'unzip') optdepends=('nvidia-cg-toolkit: for using the alternative Cg renderer') options=(!strip) -source=("openra-$pkgver::https://github.com/OpenRA/OpenRA/tarball/release-$pkgver";) -md5sums=('1aa42cde61571b90c8d2a418b407967a') +source=("openra-$pkgver::https://github.com/OpenRA/OpenRA/tarball/release-$pkgver"; +https://github.com/OpenRA/OpenRA/pull/3837.patch) +md5sums=('9284b6113a77978f446fa0bade7f9cd3' + '46ee544f4117c80cc400c03e1637f1f1') build() { cd OpenRA-OpenRA-* + patch -Np1 < $srcdir/3837.patch make }
[arch-commits] Commit in python2-rst2pdf/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 23:40:36 Author: arodseth Revision: 97261 upgpkg: python2-rst2pdf 0.93-6 Modified: python2-rst2pdf/trunk/PKGBUILD --+ PKGBUILD |1 + 1 file changed, 1 insertion(+) Modified: PKGBUILD === --- PKGBUILD2013-09-15 21:35:37 UTC (rev 97260) +++ PKGBUILD2013-09-15 21:40:36 UTC (rev 97261) @@ -24,6 +24,7 @@ cd "rst2pdf-$pkgver" find . -name "*.py" -exec sed -i '0,/env python/s//env python2/' {} \; + sed -i 's/import Image/from PIL import Image/' rst2pdf/math_flowable.py } build() {
[arch-commits] Commit in python2-rst2pdf/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 23:35:32 Author: arodseth Revision: 97259 upgpkg: python2-rst2pdf 0.93-6 Modified: python2-rst2pdf/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 21:33:09 UTC (rev 97258) +++ PKGBUILD2013-09-15 21:35:32 UTC (rev 97259) @@ -5,7 +5,7 @@ pkgname=python2-rst2pdf pkgver=0.93 -pkgrel=5 +pkgrel=6 pkgdesc='Create PDFs from simple text markup, no LaTeX required' arch=('any') url='http://rst2pdf.googlecode.com/' @@ -16,7 +16,7 @@ #'python2-svglib: some SVG support' 'inkscape: best SVG support' #'python2-wordaxe: hyphenation' -'python2-imaging: non-JPEG bitmap image formats') +'python2-pillow: non-JPEG bitmap image formats') source=("http://rst2pdf.googlecode.com/files/rst2pdf-$pkgver.tar.gz";) sha256sums=('3af44283ced19030a8286e8f8d71106ca6c78efe4bc95e9af42d678c363efcbc')
[arch-commits] Commit in python2-rst2pdf/repos (2 files)
Date: Sunday, September 15, 2013 @ 23:35:37 Author: arodseth Revision: 97260 archrelease: copy trunk to community-staging-any Added: python2-rst2pdf/repos/community-staging-any/ python2-rst2pdf/repos/community-staging-any/PKGBUILD (from rev 97259, python2-rst2pdf/trunk/PKGBUILD) --+ PKGBUILD | 45 + 1 file changed, 45 insertions(+) Copied: python2-rst2pdf/repos/community-staging-any/PKGBUILD (from rev 97259, python2-rst2pdf/trunk/PKGBUILD) === --- community-staging-any/PKGBUILD (rev 0) +++ community-staging-any/PKGBUILD 2013-09-15 21:35:37 UTC (rev 97260) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Alexander Rødseth +# Contributor: Angel Velasquez +# Contributor: Roberto Alsina + +pkgname=python2-rst2pdf +pkgver=0.93 +pkgrel=6 +pkgdesc='Create PDFs from simple text markup, no LaTeX required' +arch=('any') +url='http://rst2pdf.googlecode.com/' +license=('MIT') +makedepends=('python2-setuptools') +depends=('python2-docutils' 'python2-reportlab' 'python2-pygments' 'python2-pdfrw') +optdepends=('uniconvertor: vector images support' +#'python2-svglib: some SVG support' +'inkscape: best SVG support' +#'python2-wordaxe: hyphenation' +'python2-pillow: non-JPEG bitmap image formats') +source=("http://rst2pdf.googlecode.com/files/rst2pdf-$pkgver.tar.gz";) +sha256sums=('3af44283ced19030a8286e8f8d71106ca6c78efe4bc95e9af42d678c363efcbc') + +prepare() { + cd "rst2pdf-$pkgver" + + find . -name "*.py" -exec sed -i '0,/env python/s//env python2/' {} \; +} + +build() { + cd "rst2pdf-$pkgver" + + python2 setup.py build + cd doc + rst2man2 rst2pdf.txt rst2pdf.1 +} + +package() { + cd "rst2pdf-$pkgver" + + python2 setup.py install --root="$pkgdir" --optimize=1 + install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + install -Dm644 doc/rst2pdf.1 "$pkgdir/usr/share/man/man1/rst2pdf.1" +} + +# vim:set ts=2 sw=2 et:
[arch-commits] Commit in tucan/repos (2 files)
Date: Sunday, September 15, 2013 @ 23:33:09 Author: arodseth Revision: 97258 archrelease: copy trunk to community-staging-any Added: tucan/repos/community-staging-any/ tucan/repos/community-staging-any/PKGBUILD (from rev 97257, tucan/trunk/PKGBUILD) --+ PKGBUILD | 34 ++ 1 file changed, 34 insertions(+) Copied: tucan/repos/community-staging-any/PKGBUILD (from rev 97257, tucan/trunk/PKGBUILD) === --- community-staging-any/PKGBUILD (rev 0) +++ community-staging-any/PKGBUILD 2013-09-15 21:33:09 UTC (rev 97258) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Alexander Rødseth +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor: Daniel J Griffiths +# Contributor: Raul Pons Lopez + +pkgname=tucan +pkgver=0.3.10 +pkgrel=3 +pkgdesc='Download and upload manager for hosting sites' +arch=('any') +url='http://tucaneando.com/' +license=('GPL3') +depends=('python2-pillow' 'pygtk' 'tesseract' 'librsvg') +source=("http://build-tucan-doc.googlecode.com/files/tucan-$pkgver.tar.gz";) +sha256sums=('41c4e68de970eb4388b41fa75b7c38142b989483318490abf8af377303c99e5c') + +prepare() { +cd "$pkgname-$pkgver" + +# python2 fix + sed -i '0,/on/s//on2/' tucan.py +# PIL/Pillow fix + sed -i 's/import Image/from PIL import Image/g' core/tesseract.py +} + +package() { +cd "$pkgname-$pkgver" + +make DESTDIR="$pkgdir/usr" install +ln -sf /usr/share/tucan/tucan.py "$pkgdir/usr/bin/tucan" +} + +# vim:set ts=2 sw=2 et:
[arch-commits] Commit in tucan/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 23:30:11 Author: arodseth Revision: 97257 upgpkg: tucan 0.3.10-3 Modified: tucan/trunk/PKGBUILD --+ PKGBUILD |9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 21:21:20 UTC (rev 97256) +++ PKGBUILD2013-09-15 21:30:11 UTC (rev 97257) @@ -3,22 +3,25 @@ # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Daniel J Griffiths # Contributor: Raul Pons Lopez + pkgname=tucan pkgver=0.3.10 -pkgrel=2 +pkgrel=3 pkgdesc='Download and upload manager for hosting sites' arch=('any') url='http://tucaneando.com/' license=('GPL3') -depends=('python-imaging' 'python2' 'pygtk' 'tesseract' 'librsvg') +depends=('python2-pillow' 'pygtk' 'tesseract' 'librsvg') source=("http://build-tucan-doc.googlecode.com/files/tucan-$pkgver.tar.gz";) sha256sums=('41c4e68de970eb4388b41fa75b7c38142b989483318490abf8af377303c99e5c') -build() { +prepare() { cd "$pkgname-$pkgver" # python2 fix sed -i '0,/on/s//on2/' tucan.py +# PIL/Pillow fix + sed -i 's/import Image/from PIL import Image/g' core/tesseract.py } package() {
[arch-commits] Commit in oblogout/repos (5 files)
Date: Sunday, September 15, 2013 @ 23:21:20 Author: arodseth Revision: 97256 archrelease: copy trunk to community-staging-any Added: oblogout/repos/community-staging-any/ oblogout/repos/community-staging-any/PKGBUILD (from rev 97255, oblogout/trunk/PKGBUILD) oblogout/repos/community-staging-any/oblogout.conf (from rev 97255, oblogout/trunk/oblogout.conf) oblogout/repos/community-staging-any/oblogout.patch (from rev 97255, oblogout/trunk/oblogout.patch) oblogout/repos/community-staging-any/ru.po (from rev 97255, oblogout/trunk/ru.po) + PKGBUILD | 40 oblogout.conf | 28 + oblogout.patch | 57 +++ ru.po | 89 +++ 4 files changed, 214 insertions(+) Copied: oblogout/repos/community-staging-any/PKGBUILD (from rev 97255, oblogout/trunk/PKGBUILD) === --- community-staging-any/PKGBUILD (rev 0) +++ community-staging-any/PKGBUILD 2013-09-15 21:21:20 UTC (rev 97256) @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: Alexander Rødseth +# Contributor: XaBz + +pkgname=oblogout +pkgver=0.2 +pkgrel=15 +pkgdesc='Openbox logout script' +arch=('any') +url='https://launchpad.net/oblogout' +depends=('pygtk' 'cairo' 'python2-pillow' 'python2-distutils-extra' + 'dbus-python' 'upower') +license=('GPL2') +backup=(etc/oblogout.conf) +conflicts=('openboxlogout-gnome') +source=("http://launchpad.net/oblogout/$pkgver/$pkgver.0/+download/$pkgname-$pkgver.tar.bz2"; + "$pkgname.patch" + "$pkgname.conf" + 'ru.po') +sha256sums=('f80003b85e9f4f1c588675453ea03f40a86fc50546d509ceb69706eb045782a9' +'cea52a14df0ef924fcdd63b2e82c14b94cc2a7753994c176621ace9502bd9109' +'e8e915973c2dd0ebfb6797e2b49b2769380a00b4c47229a264b58608b0b7a1e7' +'aa8504055ec1e0661c3588cde85aad3267ffa7a42414c106e6ce8bff71f9d883') + +build() { + cd "$pkgname" + + patch -p0 -i "$srcdir/$pkgname.patch" + sed -i '0,/on/s//on2/' "$pkgname"/*.py + cp "$srcdir/ru.po" po +} + +package() { + cd "$pkgname" + + python2 setup.py install --root="$pkgdir" + install -m644 "$srcdir/oblogout.conf" "$pkgdir/etc/" +} + +# vim:set ts=2 sw=2 et: Copied: oblogout/repos/community-staging-any/oblogout.conf (from rev 97255, oblogout/trunk/oblogout.conf) === --- community-staging-any/oblogout.conf (rev 0) +++ community-staging-any/oblogout.conf 2013-09-15 21:21:20 UTC (rev 97256) @@ -0,0 +1,28 @@ +[settings] +usehal = false + +[looks] +opacity = 70 +bgcolor = black +buttontheme = oxygen +buttons = cancel, logout, restart, shutdown, suspend, hibernate, lock + +[shortcuts] +cancel = Escape +shutdown = S +restart = R +suspend = U +logout = L +lock = K +hibernate = H + +[commands] +shutdown = systemctl poweroff +restart = systemctl reboot +suspend = dbus-send --system --print-reply --dest="org.freedesktop.UPower" /org/freedesktop/UPower org.freedesktop.UPower.Suspend +hibernate = dbus-send --system --print-reply --dest="org.freedesktop.UPower" /org/freedesktop/UPower org.freedesktop.UPower.Hibernate +logout = openbox --exit +lock = xtrlock & +#switchuser = gdm-control --switch-user +#safesuspend = safesuspend + Copied: oblogout/repos/community-staging-any/oblogout.patch (from rev 97255, oblogout/trunk/oblogout.patch) === --- community-staging-any/oblogout.patch(rev 0) +++ community-staging-any/oblogout.patch2013-09-15 21:21:20 UTC (rev 97256) @@ -0,0 +1,57 @@ +--- oblogout/__init__.py 2009-04-13 16:48:11.0 -0400 da/oblogout/__init__.py2010-10-19 14:38:29.0 -0300 +@@ -222,8 +222,8 @@ class OpenboxLogout(): + if self.parser.has_section("commands"): + for key in self.parser.items("commands"): + self.logger.debug("Setting cmd_%s as %s" % (key[0], key[1])) +-if key[1] in ['logout', 'restart', 'shutdown', 'suspend', 'hibernate', 'safesuspend', 'lock', 'switch']: +-if key[1]: setattr(self, "cmd_" + key[0], key[1]) ++if key[0] in ['logout', 'restart', 'shutdown', 'suspend', 'hibernate', 'safesuspend', 'lock', 'switch']: ++if key[0]: setattr(self, "cmd_" + key[0], key[1]) + + # Load theme information from local directory if local mode is set + if self.local_mode: +--- oblogout/__init__.py 2012-03-05 14:51:08.0 +0100 __init__.py2012-03-05 20:43:49.185068877 +0100 +@@ -176,6 +176,7 @@ + self.parser.read(config) + + # Set some safe defaults ++ self.lock_before_suspend = False + self.opacity = 50 + self.button_theme
[arch-commits] Commit in oblogout/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 23:21:13 Author: arodseth Revision: 97255 upgpkg: oblogout 0.2-15 Modified: oblogout/trunk/PKGBUILD --+ PKGBUILD | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 21:12:08 UTC (rev 97254) +++ PKGBUILD2013-09-15 21:21:13 UTC (rev 97255) @@ -4,11 +4,11 @@ pkgname=oblogout pkgver=0.2 -pkgrel=14 +pkgrel=15 pkgdesc='Openbox logout script' arch=('any') url='https://launchpad.net/oblogout' -depends=('pygtk' 'cairo' 'python-imaging' 'python2-distutils-extra' +depends=('pygtk' 'cairo' 'python2-pillow' 'python2-distutils-extra' 'dbus-python' 'upower') license=('GPL2') backup=(etc/oblogout.conf) @@ -23,18 +23,18 @@ 'aa8504055ec1e0661c3588cde85aad3267ffa7a42414c106e6ce8bff71f9d883') build() { - cd $srcdir/$pkgname + cd "$pkgname" - patch -p0 < $srcdir/$pkgname.patch - sed -i '0,/on/s//on2/' $pkgname/*.py - cp $srcdir/ru.po $srcdir/$pkgname/po/ + patch -p0 -i "$srcdir/$pkgname.patch" + sed -i '0,/on/s//on2/' "$pkgname"/*.py + cp "$srcdir/ru.po" po } package() { - cd $srcdir/$pkgname + cd "$pkgname" - python2 setup.py install --root=$pkgdir - install -m644 $srcdir/oblogout.conf $pkgdir/etc/ + python2 setup.py install --root="$pkgdir" + install -m644 "$srcdir/oblogout.conf" "$pkgdir/etc/" } # vim:set ts=2 sw=2 et:
[arch-commits] Commit in lib32-glibc/repos (7 files)
Date: Sunday, September 15, 2013 @ 23:12:08 Author: heftig Revision: 97254 archrelease: copy trunk to multilib-testing-x86_64 Added: lib32-glibc/repos/multilib-testing-x86_64/ lib32-glibc/repos/multilib-testing-x86_64/PKGBUILD (from rev 97253, lib32-glibc/trunk/PKGBUILD) lib32-glibc/repos/multilib-testing-x86_64/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch (from rev 97253, lib32-glibc/trunk/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch) lib32-glibc/repos/multilib-testing-x86_64/glibc-2.18-readdir_r-CVE-2013-4237.patch (from rev 97253, lib32-glibc/trunk/glibc-2.18-readdir_r-CVE-2013-4237.patch) lib32-glibc/repos/multilib-testing-x86_64/glibc-2.18-strcoll-CVE-2012-4412+4424.patch (from rev 97253, lib32-glibc/trunk/glibc-2.18-strcoll-CVE-2012-4412+4424.patch) lib32-glibc/repos/multilib-testing-x86_64/glibc-2.18-strstr-hackfix.patch (from rev 97253, lib32-glibc/trunk/glibc-2.18-strstr-hackfix.patch) lib32-glibc/repos/multilib-testing-x86_64/lib32-glibc.conf (from rev 97253, lib32-glibc/trunk/lib32-glibc.conf) ---+ PKGBUILD | 148 +++ glibc-2.18-malloc-corrupt-CVE-2013-4332.patch | 54 + glibc-2.18-readdir_r-CVE-2013-4237.patch | 281 ++ glibc-2.18-strcoll-CVE-2012-4412+4424.patch | 1004 glibc-2.18-strstr-hackfix.patch | 13 lib32-glibc.conf |1 6 files changed, 1501 insertions(+) The diff is longer than the limit of 200KB. Use svn diff -r 97253:97254 to see the changes.
[arch-commits] Commit in lib32-glibc/trunk (3 files)
Date: Sunday, September 15, 2013 @ 23:11:02 Author: heftig Revision: 97253 2.18-4 Added: lib32-glibc/trunk/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch lib32-glibc/trunk/glibc-2.18-strcoll-CVE-2012-4412+4424.patch Modified: lib32-glibc/trunk/PKGBUILD ---+ PKGBUILD | 21 glibc-2.18-malloc-corrupt-CVE-2013-4332.patch | 54 + glibc-2.18-strcoll-CVE-2012-4412+4424.patch | 1004 3 files changed, 1074 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 20:57:59 UTC (rev 97252) +++ PKGBUILD2013-09-15 21:11:02 UTC (rev 97253) @@ -9,7 +9,7 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.18 -pkgrel=3 +pkgrel=4 pkgdesc="GNU C Library for multilib" arch=('x86_64') url="http://www.gnu.org/software/libc"; @@ -18,21 +18,32 @@ options=('!strip' '!emptydirs') source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig} glibc-2.18-readdir_r-CVE-2013-4237.patch +glibc-2.18-malloc-corrupt-CVE-2013-4332.patch +glibc-2.18-strcoll-CVE-2012-4412+4424.patch glibc-2.18-strstr-hackfix.patch lib32-glibc.conf) md5sums=('88fbbceafee809e82efd52efa1e3c58f' 'SKIP' '154da6bf5a5248f42a7bf5bf08e01a47' + 'b79561ab9dce900e9bbeaf0d49927c2b' + 'c7264b99d0f7e51922a4d3126182c40a' '4441f6dfe7d75ced1fa75e54dd21d36e' '6e052f1cb693d5d3203f50f9d4e8c33b') - prepare() { cd ${srcdir}/${_pkgbasename}-${pkgver} - + # upstream commit 91ce4085 patch -p1 -i $srcdir/glibc-2.18-readdir_r-CVE-2013-4237.patch - + + # upstream commits 1159a193, 55e17aad and b73ed247 + patch -p1 -i $srcdir/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch + + # upstream commit 1326ba1a and two not yet committed patches + # https://sourceware.org/ml/libc-alpha/2013-08/msg00394.html + # https://sourceware.org/ml/libc-alpha/2013-08/msg00462.html + patch -p1 -i $srcdir/glibc-2.18-strcoll-CVE-2012-4412+4424.patch + # hack fix for strstr issues on x86 patch -p1 -i $srcdir/glibc-2.18-strstr-hackfix.patch @@ -74,7 +85,7 @@ # build libraries with hardening disabled echo "build-programs=no" >> configparms make - + # re-enable hardening for programs sed -i "/build-programs=/s#no#yes#" configparms echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms Added: glibc-2.18-malloc-corrupt-CVE-2013-4332.patch === --- glibc-2.18-malloc-corrupt-CVE-2013-4332.patch (rev 0) +++ glibc-2.18-malloc-corrupt-CVE-2013-4332.patch 2013-09-15 21:11:02 UTC (rev 97253) @@ -0,0 +1,54 @@ +diff --git a/malloc/malloc.c b/malloc/malloc.c +index dd295f5..7f43ba3 100644 +--- a/malloc/malloc.c b/malloc/malloc.c +@@ -3082,6 +3082,13 @@ __libc_pvalloc(size_t bytes) + size_t page_mask = GLRO(dl_pagesize) - 1; + size_t rounded_bytes = (bytes + page_mask) & ~(page_mask); + ++ /* Check for overflow. */ ++ if (bytes > SIZE_MAX - 2*pagesz - MINSIZE) ++{ ++ __set_errno (ENOMEM); ++ return 0; ++} ++ + void *(*hook) (size_t, size_t, const void *) = + force_reg (__memalign_hook); + if (__builtin_expect (hook != NULL, 0)) +diff --git a/malloc/malloc.c b/malloc/malloc.c +index 7f43ba3..3148c5f 100644 +--- a/malloc/malloc.c b/malloc/malloc.c +@@ -3046,6 +3046,13 @@ __libc_valloc(size_t bytes) + + size_t pagesz = GLRO(dl_pagesize); + ++ /* Check for overflow. */ ++ if (bytes > SIZE_MAX - pagesz - MINSIZE) ++{ ++ __set_errno (ENOMEM); ++ return 0; ++} ++ + void *(*hook) (size_t, size_t, const void *) = + force_reg (__memalign_hook); + if (__builtin_expect (hook != NULL, 0)) +diff --git a/malloc/malloc.c b/malloc/malloc.c +index 3148c5f..f7718a9 100644 +--- a/malloc/malloc.c b/malloc/malloc.c +@@ -3015,6 +3015,13 @@ __libc_memalign(size_t alignment, size_t bytes) + /* Otherwise, ensure that it is at least a minimum chunk size */ + if (alignment < MINSIZE) alignment = MINSIZE; + ++ /* Check for overflow. */ ++ if (bytes > SIZE_MAX - alignment - MINSIZE) ++{ ++ __set_errno (ENOMEM); ++ return 0; ++} ++ + arena_get(ar_ptr, bytes + alignment + MINSIZE); + if(!ar_ptr) + return 0; Added: glibc-2.18-strcoll-CVE-2012-4412+4424.patch === --- glibc-2.18-strcoll-CVE-2012-4412+4424.patch (rev 0) +++ glibc-2.18-strcoll-CVE-2012-4412+4424.patch 2013-09-15 21:11:02 UTC (rev 97253) @@ -0,0 +1,1004 @@ +diff --git a/string/strcoll_l.c b/string/strcoll_l.c +index ecda08f..bb34a72 100644 +--- a/string/strcoll_l.c b/string/strcoll_l.c +@@ -41,11 +41,434 @@ + + #include "../locale/localeinfo.h" + ++/* Track status while looking for sequences
[arch-commits] Commit in meld/repos/extra-any (PKGBUILD PKGBUILD install install)
Date: Sunday, September 15, 2013 @ 23:07:04 Author: bisson Revision: 194396 archrelease: copy trunk to extra-any Added: meld/repos/extra-any/PKGBUILD (from rev 194395, meld/trunk/PKGBUILD) meld/repos/extra-any/install (from rev 194395, meld/trunk/install) Deleted: meld/repos/extra-any/PKGBUILD meld/repos/extra-any/install --+ PKGBUILD | 76 ++--- install | 26 ++-- 2 files changed, 51 insertions(+), 51 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2013-09-15 21:06:36 UTC (rev 194395) +++ PKGBUILD2013-09-15 21:07:04 UTC (rev 194396) @@ -1,38 +0,0 @@ -# $Id$ -# Maintainer: Gaetan Bisson -# Contributor: Daniel J Griffiths -# Contributor: Douglas Soares de Andrade - -pkgname=meld -pkgver=1.7.5 -pkgrel=1 -pkgdesc='Visual diff and merge tool' -url='http://meldmerge.org/' -license=('GPL') -arch=('any') -makedepends=('intltool' 'gnome-doc-utils') -depends=('pygtk' 'hicolor-icon-theme' 'desktop-file-utils') -optdepends=('pygtksourceview2: syntax highlighting' -'python2-dbus: open a new tab in an already running instance' -'python2-gconf: gnome integration') -source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz";) -sha1sums=('13be80b0f3487870315f66ce376ccca35c22b786') - -install=install -options=('!emptydirs') - -prepare() { - cd "${pkgname}-${pkgver}" - sed -i 's/update-/#update-/' Makefile - sed -i 's/env python/env python2/' bin/meld -} - -build() { - cd "${pkgname}-${pkgver}" - make PYTHON=/usr/bin/python2 prefix=/usr -} - -package() { - cd "${pkgname}-${pkgver}" - make PYTHON=/usr/bin/python2 prefix=/usr DESTDIR="${pkgdir}" install -} Copied: meld/repos/extra-any/PKGBUILD (from rev 194395, meld/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2013-09-15 21:07:04 UTC (rev 194396) @@ -0,0 +1,38 @@ +# $Id$ +# Maintainer: Gaetan Bisson +# Contributor: Daniel J Griffiths +# Contributor: Douglas Soares de Andrade + +pkgname=meld +pkgver=1.8.0 +pkgrel=1 +pkgdesc='Visual diff and merge tool' +url='http://meldmerge.org/' +license=('GPL') +arch=('any') +makedepends=('intltool' 'gnome-doc-utils') +depends=('pygtk' 'hicolor-icon-theme' 'desktop-file-utils') +optdepends=('pygtksourceview2: syntax highlighting' +'python2-dbus: open a new tab in an already running instance' +'python2-gconf: gnome integration') +source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz";) +sha1sums=('96b636d578ced74f1393e73492f818a7e1d53b80') + +install=install +options=('!emptydirs') + +prepare() { + cd "${pkgname}-${pkgver}" + sed -i 's/update-/#update-/' Makefile + sed -i 's/env python/env python2/' bin/meld +} + +build() { + cd "${pkgname}-${pkgver}" + make PYTHON=/usr/bin/python2 prefix=/usr +} + +package() { + cd "${pkgname}-${pkgver}" + make PYTHON=/usr/bin/python2 prefix=/usr DESTDIR="${pkgdir}" install +} Deleted: install === --- install 2013-09-15 21:06:36 UTC (rev 194395) +++ install 2013-09-15 21:07:04 UTC (rev 194396) @@ -1,13 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} Copied: meld/repos/extra-any/install (from rev 194395, meld/trunk/install) === --- install (rev 0) +++ install 2013-09-15 21:07:04 UTC (rev 194396) @@ -0,0 +1,13 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}
[arch-commits] Commit in meld/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 23:06:36 Author: bisson Revision: 194395 upstream update Modified: meld/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 18:16:48 UTC (rev 194394) +++ PKGBUILD2013-09-15 21:06:36 UTC (rev 194395) @@ -4,7 +4,7 @@ # Contributor: Douglas Soares de Andrade pkgname=meld -pkgver=1.7.5 +pkgver=1.8.0 pkgrel=1 pkgdesc='Visual diff and merge tool' url='http://meldmerge.org/' @@ -16,7 +16,7 @@ 'python2-dbus: open a new tab in an already running instance' 'python2-gconf: gnome integration') source=("http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz";) -sha1sums=('13be80b0f3487870315f66ce376ccca35c22b786') +sha1sums=('96b636d578ced74f1393e73492f818a7e1d53b80') install=install options=('!emptydirs')
[arch-commits] Commit in glm/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 22:57:59 Author: svenstaro Revision: 97252 Fix license Modified: glm/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 20:45:53 UTC (rev 97251) +++ PKGBUILD2013-09-15 20:57:59 UTC (rev 97252) @@ -5,7 +5,7 @@ pkgrel=1 pkgdesc="C++ mathematics library for 3D software based on the OpenGL Shading Language (GLSL) specification" arch=('any') -license=('GPL') +license=('MIT') url="http://glm.g-truc.net"; source=("http://sourceforge.net/projects/ogl-math/files/glm-$pkgver/glm-$pkgver.zip";) md5sums=('73dbb0ad8af36e29ad8a23c20fbf27ef')
[arch-commits] Commit in notify-sharp/trunk (3 files)
Date: Sunday, September 15, 2013 @ 22:45:53 Author: bgyorgy Revision: 97251 Remove leftover files Deleted: notify-sharp/trunk/02_reverse_cap_check.patch notify-sharp/trunk/03-use-dbus-sharp.patch notify-sharp/trunk/04-fix-app-name-derivation.patch --+ 02_reverse_cap_check.patch | 26 --- 03-use-dbus-sharp.patch | 312 - 04-fix-app-name-derivation.patch | 24 -- 3 files changed, 362 deletions(-) Deleted: 02_reverse_cap_check.patch === --- 02_reverse_cap_check.patch 2013-09-15 20:35:17 UTC (rev 97250) +++ 02_reverse_cap_check.patch 2013-09-15 20:45:53 UTC (rev 97251) @@ -1,26 +0,0 @@ -Description: Reverse the patch merged upstream which swallows actions in - notifications. It is more appropriate for applications to make - that decision rather than a library. -From: David Barth -Bug-Ubuntu: https://bugs.launchpad.net/bugs/349550 -Index: notify-sharp/src/Notification.cs -=== notify-sharp.orig/src/Notification.cs 2011-02-26 02:13:37.452598287 +0800 -+++ notify-sharp/src/Notification.cs 2011-02-26 02:14:10.562409163 +0800 -@@ -341,13 +341,10 @@ - } - - public void AddAction (string action, string label, ActionHandler handler) { -- if (Notifications.Global.Capabilities != null && -- Array.IndexOf (Notifications.Global.Capabilities, "actions") > -1) { -- lock (action_map) { -- action_map[action] = new ActionTuple (label, handler); -- } -- Update (); -+ lock (action_map) { -+ action_map[action] = new ActionTuple (label, handler); - } -+ Update (); - } - - public void RemoveAction (string action) { Deleted: 03-use-dbus-sharp.patch === --- 03-use-dbus-sharp.patch 2013-09-15 20:35:17 UTC (rev 97250) +++ 03-use-dbus-sharp.patch 2013-09-15 20:45:53 UTC (rev 97251) @@ -1,312 +0,0 @@ -Description: Usage of new dbus-sharp bindings -Author: Rico Tzschichholz -Forwarded: no - -Index: notify-sharp/Makefile.in -=== notify-sharp.orig/Makefile.in 2011-10-25 09:18:50.340768390 +0800 -+++ notify-sharp/Makefile.in 2011-10-25 09:18:52.470780790 +0800 -@@ -114,8 +114,8 @@ - MONODOC_LIBS = @MONODOC_LIBS@ - MONO_CFLAGS = @MONO_CFLAGS@ - MONO_LIBS = @MONO_LIBS@ --NDESK_DBUS_CFLAGS = @NDESK_DBUS_CFLAGS@ --NDESK_DBUS_LIBS = @NDESK_DBUS_LIBS@ -+DBUS_SHARP_CFLAGS = @DBUS_SHARP_CFLAGS@ -+DBUS_SHARP_LIBS = @DBUS_SHARP_LIBS@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ - PACKAGE_NAME = @PACKAGE_NAME@ -Index: notify-sharp/configure -=== notify-sharp.orig/configure2011-10-25 09:18:50.310768215 +0800 -+++ notify-sharp/configure 2011-10-25 09:18:52.474114142 +0800 -@@ -601,8 +601,8 @@ - ac_unique_file="src/Global.cs" - ac_subst_vars='LTLIBOBJS - LIBOBJS --NDESK_DBUS_LIBS --NDESK_DBUS_CFLAGS -+DBUS_SHARP_LIBS -+DBUS_SHARP_CFLAGS - GTK_SHARP_LIBS - GTK_SHARP_CFLAGS - BUILD_DOCS_FALSE -@@ -709,8 +709,8 @@ - MONODOC_LIBS - GTK_SHARP_CFLAGS - GTK_SHARP_LIBS --NDESK_DBUS_CFLAGS --NDESK_DBUS_LIBS' -+DBUS_SHARP_CFLAGS -+DBUS_SHARP_LIBS' - - - # Initialize some variables set by options. -@@ -1356,10 +1356,10 @@ - C compiler flags for GTK_SHARP, overriding pkg-config - GTK_SHARP_LIBS - linker flags for GTK_SHARP, overriding pkg-config -- NDESK_DBUS_CFLAGS -- C compiler flags for NDESK_DBUS, overriding pkg-config -- NDESK_DBUS_LIBS -- linker flags for NDESK_DBUS, overriding pkg-config -+ DBUS_SHARP_CFLAGS -+ C compiler flags for DBUS_SHARP, overriding pkg-config -+ DBUS_SHARP_LIBS -+ linker flags for DBUS_SHARP, overriding pkg-config - - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. -@@ -3237,27 +3237,27 @@ - fi - - --NDESK_DBUS_REQ_VERSION=0.4 --NDESK_DBUS_GLIB_REQ_VERSION=0.3 -+DBUS_SHARP_REQ_VERSION=0.7 -+DBUS_SHARP_GLIB_REQ_VERSION=0.5 - - pkg_failed=no --{ $as_echo "$as_me:$LINENO: checking for NDESK_DBUS" >&5 --$as_echo_n "checking for NDESK_DBUS... " >&6; } -+{ $as_echo "$as_me:$LINENO: checking for DBUS_SHARP" >&5 -+$as_echo_n "checking for DBUS_SHARP... " >&6; } - - if test -n "$PKG_CONFIG"; then --if test -n "$NDESK_DBUS_CFLAGS"; then --pkg_cv_NDESK_DBUS_CFLAGS="$NDESK_DBUS_CFLAGS" -+if test -n "$DBUS_SHARP_CFLA
[arch-commits] Commit in acpid/repos (20 files)
Date: Sunday, September 15, 2013 @ 22:35:17 Author: seblu Revision: 97250 archrelease: copy trunk to community-i686, community-x86_64 Added: acpid/repos/community-i686/PKGBUILD (from rev 97249, acpid/trunk/PKGBUILD) acpid/repos/community-i686/acpid.service (from rev 97249, acpid/trunk/acpid.service) acpid/repos/community-i686/acpid.socket (from rev 97249, acpid/trunk/acpid.socket) acpid/repos/community-i686/anything (from rev 97249, acpid/trunk/anything) acpid/repos/community-i686/handler.sh (from rev 97249, acpid/trunk/handler.sh) acpid/repos/community-x86_64/PKGBUILD (from rev 97249, acpid/trunk/PKGBUILD) acpid/repos/community-x86_64/acpid.service (from rev 97249, acpid/trunk/acpid.service) acpid/repos/community-x86_64/acpid.socket (from rev 97249, acpid/trunk/acpid.socket) acpid/repos/community-x86_64/anything (from rev 97249, acpid/trunk/anything) acpid/repos/community-x86_64/handler.sh (from rev 97249, acpid/trunk/handler.sh) Deleted: acpid/repos/community-i686/PKGBUILD acpid/repos/community-i686/acpid.service acpid/repos/community-i686/acpid.socket acpid/repos/community-i686/anything acpid/repos/community-i686/handler.sh acpid/repos/community-x86_64/PKGBUILD acpid/repos/community-x86_64/acpid.service acpid/repos/community-x86_64/acpid.socket acpid/repos/community-x86_64/anything acpid/repos/community-x86_64/handler.sh + /PKGBUILD | 104 ++ /acpid.service | 20 + /acpid.socket | 16 /anything |6 + /handler.sh| 154 +++ community-i686/PKGBUILD| 52 - community-i686/acpid.service | 10 -- community-i686/acpid.socket|8 -- community-i686/anything|3 community-i686/handler.sh | 77 --- community-x86_64/PKGBUILD | 52 - community-x86_64/acpid.service | 10 -- community-x86_64/acpid.socket |8 -- community-x86_64/anything |3 community-x86_64/handler.sh| 77 --- 15 files changed, 300 insertions(+), 300 deletions(-) Deleted: community-i686/PKGBUILD === --- community-i686/PKGBUILD 2013-09-15 20:35:05 UTC (rev 97249) +++ community-i686/PKGBUILD 2013-09-15 20:35:17 UTC (rev 97250) @@ -1,52 +0,0 @@ -# $Id$ -# Maintainer: Sébastien Luttringer -# Contributor: xduugu -# Contributor: Manolis Tzanidakis -# Contributor: Jonathan Schmidt http://downloads.sourceforge.net/sourceforge/acpid2/$pkgname-$pkgver.tar.xz"; -'acpid.socket' -'acpid.service' -'anything' -'handler.sh') -md5sums=('0b07a982e3e28cf37645f2c6269af72e' - 'd11700eb136e0489835ddaf977a7905b' - '79cc7a9dceacdeffd51f070c2ba5f023' - '2d37b98d6e74bab815604b8b48c6cfd4' - '47f44ff5f02685dce8bcdab8568f0c38') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sbindir=/usr/bin - make -} - -package() { - pushd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - popd - - # default config - install -Dm644 anything "$pkgdir/etc/acpi/events/anything" - install -Dm755 handler.sh "$pkgdir/etc/acpi/handler.sh" - - # systemd - install -Dm644 acpid.socket "$pkgdir/usr/lib/systemd/system/acpid.socket" - install -Dm644 acpid.service "$pkgdir/usr/lib/systemd/system/acpid.service" - - # fix acpid rights - chmod 755 "$pkgdir/usr/bin/acpid" -} - -# vim:set ts=2 sw=2 et: Copied: acpid/repos/community-i686/PKGBUILD (from rev 97249, acpid/trunk/PKGBUILD) === --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-09-15 20:35:17 UTC (rev 97250) @@ -0,0 +1,52 @@ +# $Id$ +# Maintainer: Sébastien Luttringer +# Contributor: xduugu +# Contributor: Manolis Tzanidakis +# Contributor: Jonathan Schmidt http://downloads.sourceforge.net/sourceforge/acpid2/$pkgname-$pkgver.tar.xz"; +'acpid.socket' +'acpid.service' +'anything' +'handler.sh') +md5sums=('1b740e6419cf45aaeb2bd78d589f27f9' + 'd11700eb136e0489835ddaf977a7905b' + '79cc7a9dceacdeffd51f070c2ba5f023' + '2d37b98d6e74bab815604b8b48c6cfd4' + '47f44ff5f02685dce8bcdab8568f0c38') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sbindir=/usr/bin + make +} + +package() { + pushd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + popd + + # default config + install -Dm644 anything "$pkgdir/etc/acpi/events/anything" + install -Dm755 handler.sh "$pkgdir/etc/acpi/handler.sh" + + # systemd + install -Dm644 acpid.socket "$pkgdir/usr/lib/systemd/system/acpid.socket" + install -Dm644 acpid.service "$pkgdir/usr/lib/systemd/system/acpid.service" + + # fix acpid rights + chmod 7
[arch-commits] Commit in acpid/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 22:35:05 Author: seblu Revision: 97249 upgpkg: acpid 2.0.20-1 Modified: acpid/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 20:16:53 UTC (rev 97248) +++ PKGBUILD2013-09-15 20:35:05 UTC (rev 97249) @@ -5,7 +5,7 @@ # Contributor: Jonathan Schmidt
[arch-commits] Commit in notify-sharp/repos/community-any (8 files)
Date: Sunday, September 15, 2013 @ 22:16:53 Author: bgyorgy Revision: 97248 archrelease: copy trunk to community-any Added: notify-sharp/repos/community-any/02_reverse_cap_check.patch (from rev 97247, notify-sharp/trunk/02_reverse_cap_check.patch) notify-sharp/repos/community-any/03-use-dbus-sharp.patch (from rev 97247, notify-sharp/trunk/03-use-dbus-sharp.patch) notify-sharp/repos/community-any/04-fix-app-name-derivation.patch (from rev 97247, notify-sharp/trunk/04-fix-app-name-derivation.patch) notify-sharp/repos/community-any/PKGBUILD (from rev 97247, notify-sharp/trunk/PKGBUILD) Deleted: notify-sharp/repos/community-any/02_reverse_cap_check.patch notify-sharp/repos/community-any/03-use-dbus-sharp.patch notify-sharp/repos/community-any/04-fix-app-name-derivation.patch notify-sharp/repos/community-any/PKGBUILD --+ 02_reverse_cap_check.patch | 52 +-- 03-use-dbus-sharp.patch | 624 ++--- 04-fix-app-name-derivation.patch | 48 +- PKGBUILD | 70 +--- 4 files changed, 391 insertions(+), 403 deletions(-) Deleted: 02_reverse_cap_check.patch === --- 02_reverse_cap_check.patch 2013-09-15 20:16:47 UTC (rev 97247) +++ 02_reverse_cap_check.patch 2013-09-15 20:16:53 UTC (rev 97248) @@ -1,26 +0,0 @@ -Description: Reverse the patch merged upstream which swallows actions in - notifications. It is more appropriate for applications to make - that decision rather than a library. -From: David Barth -Bug-Ubuntu: https://bugs.launchpad.net/bugs/349550 -Index: notify-sharp/src/Notification.cs -=== notify-sharp.orig/src/Notification.cs 2011-02-26 02:13:37.452598287 +0800 -+++ notify-sharp/src/Notification.cs 2011-02-26 02:14:10.562409163 +0800 -@@ -341,13 +341,10 @@ - } - - public void AddAction (string action, string label, ActionHandler handler) { -- if (Notifications.Global.Capabilities != null && -- Array.IndexOf (Notifications.Global.Capabilities, "actions") > -1) { -- lock (action_map) { -- action_map[action] = new ActionTuple (label, handler); -- } -- Update (); -+ lock (action_map) { -+ action_map[action] = new ActionTuple (label, handler); - } -+ Update (); - } - - public void RemoveAction (string action) { Copied: notify-sharp/repos/community-any/02_reverse_cap_check.patch (from rev 97247, notify-sharp/trunk/02_reverse_cap_check.patch) === --- 02_reverse_cap_check.patch (rev 0) +++ 02_reverse_cap_check.patch 2013-09-15 20:16:53 UTC (rev 97248) @@ -0,0 +1,26 @@ +Description: Reverse the patch merged upstream which swallows actions in + notifications. It is more appropriate for applications to make + that decision rather than a library. +From: David Barth +Bug-Ubuntu: https://bugs.launchpad.net/bugs/349550 +Index: notify-sharp/src/Notification.cs +=== +--- notify-sharp.orig/src/Notification.cs 2011-02-26 02:13:37.452598287 +0800 notify-sharp/src/Notification.cs 2011-02-26 02:14:10.562409163 +0800 +@@ -341,13 +341,10 @@ + } + + public void AddAction (string action, string label, ActionHandler handler) { +- if (Notifications.Global.Capabilities != null && +- Array.IndexOf (Notifications.Global.Capabilities, "actions") > -1) { +- lock (action_map) { +- action_map[action] = new ActionTuple (label, handler); +- } +- Update (); ++ lock (action_map) { ++ action_map[action] = new ActionTuple (label, handler); + } ++ Update (); + } + + public void RemoveAction (string action) { Deleted: 03-use-dbus-sharp.patch === --- 03-use-dbus-sharp.patch 2013-09-15 20:16:47 UTC (rev 97247) +++ 03-use-dbus-sharp.patch 2013-09-15 20:16:53 UTC (rev 97248) @@ -1,312 +0,0 @@ -Description: Usage of new dbus-sharp bindings -Author: Rico Tzschichholz -Forwarded: no - -Index: notify-sharp/Makefile.in -=== notify-sharp.orig/Makefile.in 2011-10-25 09:18:50.34076
[arch-commits] Commit in notify-sharp/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 22:16:47 Author: bgyorgy Revision: 97247 upgpkg: notify-sharp 0.4.1-1 Switch upstream source, update to version 0.4.1 Modified: notify-sharp/trunk/PKGBUILD --+ PKGBUILD | 30 +- 1 file changed, 9 insertions(+), 21 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 19:52:44 UTC (rev 97246) +++ PKGBUILD2013-09-15 20:16:47 UTC (rev 97247) @@ -4,38 +4,26 @@ # Contributor: Jorge Mokross pkgname=notify-sharp -pkgver=0.4.0.3032 -_pkgver=0.4.0~r3032 -pkgrel=2 -pkgdesc="C Sharp bindings for desktop notification" +pkgver=0.4.1 +pkgrel=1 +pkgdesc="C D-Bus client library for desktop notifications" arch=('any') -url="http://www.ndesk.org/NotifySharp"; +url="https://www.meebey.net/projects/notify-sharp/"; license=('MIT') depends=('gtk-sharp-2' 'dbus-sharp-glib') -provides=('notify-sharp-svn=3032') +provides=('notify-sharp-svn') replaces=('notify-sharp-svn') -source=(http://pkgbuild.com/~bgyorgy/sources/${pkgname}_$_pkgver.orig.tar.gz -02_reverse_cap_check.patch -03-use-dbus-sharp.patch -04-fix-app-name-derivation.patch) -md5sums=('7691cc46f04d0aa13f342a97dd33f0ac' - '7ea06cc54c3357081a932a58b0f89ce4' - '7871afb6ffd228179c1016b2a5074316' - '98848a5b09e27ca47b0abf8d244ae226') +source=(https://www.meebey.net/projects/notify-sharp/downloads/$pkgname-$pkgver.tar.gz) +md5sums=('46fcb7a6b9b1cd0241366b8234e31e37') build() { - cd "$srcdir/$pkgname-${pkgver%.*}" - patch -Np1 -i "$srcdir/02_reverse_cap_check.patch" - patch -Np1 -i "$srcdir/03-use-dbus-sharp.patch" - patch -Np1 -i "$srcdir/04-fix-app-name-derivation.patch" - + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var make } package() { - cd "$srcdir/$pkgname-${pkgver%.*}" - + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" }
[arch-commits] Commit in cinelerra-cv/repos (12 files)
Date: Sunday, September 15, 2013 @ 21:52:44 Author: schiv Revision: 97246 archrelease: copy trunk to community-testing-x86_64, community-testing-i686 Added: cinelerra-cv/repos/community-testing-i686/ cinelerra-cv/repos/community-testing-i686/PKGBUILD (from rev 97245, cinelerra-cv/trunk/PKGBUILD) cinelerra-cv/repos/community-testing-i686/cinelerra-std_and_str_h.patch (from rev 97245, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch) cinelerra-cv/repos/community-testing-i686/ffmpeg2.0.patch (from rev 97245, cinelerra-cv/trunk/ffmpeg2.0.patch) cinelerra-cv/repos/community-testing-i686/ffmpeg_api.patch (from rev 97245, cinelerra-cv/trunk/ffmpeg_api.patch) cinelerra-cv/repos/community-testing-i686/v4l1_removal.patch (from rev 97245, cinelerra-cv/trunk/v4l1_removal.patch) cinelerra-cv/repos/community-testing-x86_64/ cinelerra-cv/repos/community-testing-x86_64/PKGBUILD (from rev 97245, cinelerra-cv/trunk/PKGBUILD) cinelerra-cv/repos/community-testing-x86_64/cinelerra-std_and_str_h.patch (from rev 97245, cinelerra-cv/trunk/cinelerra-std_and_str_h.patch) cinelerra-cv/repos/community-testing-x86_64/ffmpeg2.0.patch (from rev 97245, cinelerra-cv/trunk/ffmpeg2.0.patch) cinelerra-cv/repos/community-testing-x86_64/ffmpeg_api.patch (from rev 97245, cinelerra-cv/trunk/ffmpeg_api.patch) cinelerra-cv/repos/community-testing-x86_64/v4l1_removal.patch (from rev 97245, cinelerra-cv/trunk/v4l1_removal.patch) + community-testing-i686/PKGBUILD| 106 + community-testing-i686/cinelerra-std_and_str_h.patch | 81 +++ community-testing-i686/ffmpeg2.0.patch | 98 + community-testing-i686/ffmpeg_api.patch| 163 +++ community-testing-i686/v4l1_removal.patch | 125 +++ community-testing-x86_64/PKGBUILD | 106 + community-testing-x86_64/cinelerra-std_and_str_h.patch | 81 +++ community-testing-x86_64/ffmpeg2.0.patch | 98 + community-testing-x86_64/ffmpeg_api.patch | 163 +++ community-testing-x86_64/v4l1_removal.patch| 125 +++ 10 files changed, 1146 insertions(+) Copied: cinelerra-cv/repos/community-testing-i686/PKGBUILD (from rev 97245, cinelerra-cv/trunk/PKGBUILD) === --- community-testing-i686/PKGBUILD (rev 0) +++ community-testing-i686/PKGBUILD 2013-09-15 19:52:44 UTC (rev 97246) @@ -0,0 +1,106 @@ +# $Id$ +# Maintainer: Ray Rashif +# Contributor: Daniel J Griffiths +# Contributor: Jaroslaw Swierczynski +# Contributor: Alexander Rødseth + +pkgname=cinelerra-cv +pkgver=2.2 +_gitrel=2.2.0 +pkgrel=18 +epoch=1 +pkgdesc="Professional video editing and compositing environment" +arch=('x86_64' 'i686') +url="http://cinelerra.org/"; +license=('GPL') +depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv' + 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu' + 'ffmpeg' 'faad2' 'faac' 'openexr>=2.0.0') +makedepends=('git' 'nasm' 'mesa') +options=('!libtool') +source=("$pkgname::git+git://git.cinelerra.org/CinelerraCV.git#branch=rel$_gitrel" +'v4l1_removal.patch' +'ffmpeg_api.patch' +'ffmpeg2.0.patch' +'cinelerra-std_and_str_h.patch') +md5sums=('SKIP' + 'bfa85e20809429d88eba4ab83e569612' + 'b05ec2fb54e7d02f6167525417802111' + '14dd897084d64cd0b5e9caa8a69818bd' + '02d8222e596133bbc05eaad15bef242c') + +_confit() { + ./configure --prefix=/usr \ + --with-buildinfo=git/recompile \ + --with-external-ffmpeg \ + --enable-opengl \ + --disable-esd $@ +} + +prepare() { + cd "$srcdir/$pkgname" + + ## Patches (oldest first) ## + + # v4l1 removal patch + patch -Np1 -i "$srcdir/v4l1_removal.patch" + + # ffmpeg api patch update for 0.11 + patch -Np1 -i "$srcdir/ffmpeg_api.patch" + + # fix some missing headers + patch -Np0 -i "$srcdir/cinelerra-std_and_str_h.patch" + + # fix avcodec_alloc_context and alloc_open + patch -Np1 -i "$srcdir/ffmpeg2.0.patch" + + ## Hacks ## + + # if you don't need OpenGL comment out the next line (and no glu/mesa dep) + # TODO: check if this is still needed (pre-svn commit) --schiv + sed -i '/\/X11R6/s///' configure.in + + # TODO: check if this is still needed (old commit; r29539 by ibiru) --schiv + sed -i -e '/Debian/d' admin/nasm + + # fix some pngs that break with newer libpng + # see https://mailman.archlinux.org/pipermail/arch-dev-public/2013-May/024872.html + #msg2 "Fixing PNGs, please wait..." + #find -name '*.png' -exec optipng -quiet -force -fix {} + + + # ffmpeg 2.0 related replacements + find -type f -exec sed -i 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' {} \; + find -type f -exec sed -i 's/CodecID/AVCodecID/' {} \; +} + +build()
[arch-commits] Commit in cinelerra-cv/trunk (PKGBUILD ffmpeg2.0.patch)
Date: Sunday, September 15, 2013 @ 21:52:15 Author: schiv Revision: 97245 upgpkg: cinelerra-cv 1:2.2-18 fix ffmpeg 2.0 patch; closes FS#36685 Modified: cinelerra-cv/trunk/PKGBUILD cinelerra-cv/trunk/ffmpeg2.0.patch -+ PKGBUILD| 51 +++ ffmpeg2.0.patch |2 +- 2 files changed, 28 insertions(+), 25 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 19:11:31 UTC (rev 97244) +++ PKGBUILD2013-09-15 19:52:15 UTC (rev 97245) @@ -7,7 +7,7 @@ pkgname=cinelerra-cv pkgver=2.2 _gitrel=2.2.0 -pkgrel=17 +pkgrel=18 epoch=1 pkgdesc="Professional video editing and compositing environment" arch=('x86_64' 'i686') @@ -16,17 +16,18 @@ depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'libxv' 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu' 'ffmpeg' 'faad2' 'faac' 'openexr>=2.0.0') -makedepends=('git' 'nasm' 'mesa' 'optipng') +makedepends=('git' 'nasm' 'mesa') options=('!libtool') source=("$pkgname::git+git://git.cinelerra.org/CinelerraCV.git#branch=rel$_gitrel" 'v4l1_removal.patch' +'ffmpeg_api.patch' 'ffmpeg2.0.patch' -'cinelerra-std_and_str_h.patch' -'ffmpeg_api.patch') +'cinelerra-std_and_str_h.patch') md5sums=('SKIP' 'bfa85e20809429d88eba4ab83e569612' - '02d8222e596133bbc05eaad15bef242c' - 'b05ec2fb54e7d02f6167525417802111') + 'b05ec2fb54e7d02f6167525417802111' + '14dd897084d64cd0b5e9caa8a69818bd' + '02d8222e596133bbc05eaad15bef242c') _confit() { ./configure --prefix=/usr \ @@ -39,37 +40,44 @@ prepare() { cd "$srcdir/$pkgname" + ## Patches (oldest first) ## + # v4l1 removal patch patch -Np1 -i "$srcdir/v4l1_removal.patch" + # ffmpeg api patch update for 0.11 + patch -Np1 -i "$srcdir/ffmpeg_api.patch" + + # fix some missing headers patch -Np0 -i "$srcdir/cinelerra-std_and_str_h.patch" - # new ffmpeg api patch - patch -Np1 -i "$srcdir/ffmpeg_api.patch" - - # fix avcodec_alloc_context and alloc_open + # fix avcodec_alloc_context and alloc_open patch -Np1 -i "$srcdir/ffmpeg2.0.patch" - # TODO: check if this is still needed (not sure what it does) --schiv - sed -i -e '/Debian/d' admin/nasm + ## Hacks ## # if you don't need OpenGL comment out the next line (and no glu/mesa dep) - # TODO: kind of forgot about the specifics of this one, recheck --schiv + # TODO: check if this is still needed (pre-svn commit) --schiv sed -i '/\/X11R6/s///' configure.in + # TODO: check if this is still needed (old commit; r29539 by ibiru) --schiv + sed -i -e '/Debian/d' admin/nasm + # fix some pngs that break with newer libpng # see https://mailman.archlinux.org/pipermail/arch-dev-public/2013-May/024872.html -# msg2 "Fixing PNGs, please wait..." -#find -name '*.png' -exec optipng -quiet -force -fix {} + + #msg2 "Fixing PNGs, please wait..." + #find -name '*.png' -exec optipng -quiet -force -fix {} + - # FFmpeg 2.0 related replacements - find -type f -exec sed -i 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' {} \; - find -type f -exec sed -i 's/CodecID/AVCodecID/' {} \; + # ffmpeg 2.0 related replacements + find -type f -exec sed -i 's/AVCODEC_MAX_AUDIO_FRAME_SIZE/192000/' {} \; + find -type f -exec sed -i 's/CodecID/AVCodecID/' {} \; } build() { cd "$srcdir/$pkgname" + ## More Hacks (must be in existing env) ## + # gcc 4.6 workaround export CFLAGS+=" -Wwrite-strings -D__STDC_CONSTANT_MACROS" export CPPFLAGS="$CFLAGS" @@ -79,7 +87,7 @@ ./autogen.sh - # TODO: check if this is still needed (forgot why at all) --schiv + # TODO: check if this is still needed (pre-svn commit) --schiv if [ "$CARCH" = 'x86_64' ]; then _confit --disable-mmx else @@ -96,8 +104,3 @@ } # vim:set ts=2 sw=2 et: -md5sums=('SKIP' - 'bfa85e20809429d88eba4ab83e569612' - '8d003f144b1c5e1cbbf13791fabb67cc' - '02d8222e596133bbc05eaad15bef242c' - 'b05ec2fb54e7d02f6167525417802111') Modified: ffmpeg2.0.patch === --- ffmpeg2.0.patch 2013-09-15 19:11:31 UTC (rev 97244) +++ ffmpeg2.0.patch 2013-09-15 19:52:15 UTC (rev 97245) @@ -75,7 +75,7 @@ } - if(avcodec_open(context, - ptr->decoder[i]) < 0) -+ if(avcodec_open2(context,(ptr->decoder[i]) < 0,NULL)) ++ if(avcodec_open2(context, ptr->decoder[i], NULL) < 0) { printf("quicktime_new_ffmpeg: avcodec_open failed.\n"); quicktime_delete_ffmpeg(ptr);
[arch-commits] Commit in python-pillow/repos (4 files)
Date: Sunday, September 15, 2013 @ 21:11:31 Author: bgyorgy Revision: 97244 archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: python-pillow/repos/community-staging-i686/PKGBUILD (from rev 97243, python-pillow/trunk/PKGBUILD) python-pillow/repos/community-staging-x86_64/PKGBUILD (from rev 97243, python-pillow/trunk/PKGBUILD) Deleted: python-pillow/repos/community-staging-i686/PKGBUILD python-pillow/repos/community-staging-x86_64/PKGBUILD ---+ /PKGBUILD | 128 community-staging-i686/PKGBUILD | 67 -- community-staging-x86_64/PKGBUILD | 67 -- 3 files changed, 128 insertions(+), 134 deletions(-) Deleted: community-staging-i686/PKGBUILD === --- community-staging-i686/PKGBUILD 2013-09-15 19:11:03 UTC (rev 97243) +++ community-staging-i686/PKGBUILD 2013-09-15 19:11:31 UTC (rev 97244) @@ -1,67 +0,0 @@ -# $Id$ -# Maintainer: Kyle Keen -# Contributor: minder - -pkgbase=python-pillow -pkgname=(python-pillow python2-pillow) -_appname=Pillow -pkgver=2.1.0 -pkgrel=3 -pkgdesc="Python Imaging Library (PIL) fork. Python3 version." -arch=('i686' 'x86_64') -url="http://python-imaging.github.io/"; -license=('BSD') -depends=('python' 'python2') -makedepends=('python-setuptools' 'python2-setuptools' 'sane') -source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip";) -md5sums=('ec630d8ae15d4a3c4ae7b7efdeac8200') - -build() { - cd "$srcdir" - cp -r "$srcdir/$_appname-$pkgver" "$srcdir/${_appname}2-$pkgver" -} - -package_python-pillow() { - depends=('python') - makedepends=('python-setuptools' 'sane') - optdepends=('tk: for the ImageTK module' - 'sane: for the ImageSane module' - 'python-pyqt4: for the ImageQt module') - cd "$srcdir/$_appname-$pkgver" - python3 setup.py install --root="$pkgdir/" --optimize=0 - pushd Sane -python3 setup.py install --root="$pkgdir/" --optimize=0 - popd - install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - # clean up bins - cd "$pkgdir/usr/bin" - for f in *.py; do -mv "$f" "${f%.py}" - done -} - -package_python2-pillow() { - pkgdesc="Python Imaging Library (PIL) fork. Python2 version." - depends=('python2') - makedepends=('python2-setuptools' 'sane') - optdepends=('tk: for the ImageTK module' - 'sane: for the ImageSane module' - 'python2-pyqt4: for the ImageQt module') - provides=('python-imaging' 'python2-imaging') - conflicts=('python-imaging' 'python2-imaging') - replaces=('python2-imaging') - cd "$srcdir/${_appname}2-$pkgver" - python2 setup.py install --root="$pkgdir/" --optimize=0 - pushd Sane -python2 setup.py install --root="$pkgdir/" --optimize=0 - popd - install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - # clean up bins - cd "$pkgdir/usr/bin" - for f in *.py; do -mv "$f" "${f%.py}2" - done -} - Copied: python-pillow/repos/community-staging-i686/PKGBUILD (from rev 97243, python-pillow/trunk/PKGBUILD) === --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2013-09-15 19:11:31 UTC (rev 97244) @@ -0,0 +1,64 @@ +# $Id$ +# Maintainer: Kyle Keen +# Contributor: minder + +pkgbase=python-pillow +pkgname=(python-pillow python2-pillow) +_appname=Pillow +pkgver=2.1.0 +pkgrel=4 +pkgdesc="Python Imaging Library (PIL) fork. Python3 version." +arch=('i686' 'x86_64') +url="http://python-imaging.github.io/"; +license=('BSD') +makedepends=('python-setuptools' 'python2-setuptools' 'lcms' 'libwebp' 'tk' 'sane') +source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip";) +md5sums=('ec630d8ae15d4a3c4ae7b7efdeac8200') + +build() { + cd "$srcdir" + cp -r "$srcdir/$_appname-$pkgver" "$srcdir/${_appname}2-$pkgver" +} + +package_python-pillow() { + depends=('python' 'lcms' 'libwebp') + optdepends=('tk: for the ImageTK module' + 'sane: for the Sane module' + 'python-pyqt4: for the ImageQt module') + cd "$srcdir/$_appname-$pkgver" + python3 setup.py install --root="$pkgdir/" --optimize=0 + pushd Sane +python3 setup.py install --root="$pkgdir/" --optimize=0 + popd + install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # clean up bins + cd "$pkgdir/usr/bin" + for f in *.py; do +mv "$f" "${f%.py}" + done +} + +package_python2-pillow() { + pkgdesc="Python Imaging Library (PIL) fork. Python2 version." + depends=('python2' 'lcms' 'libwebp') + optdepends=('tk: for the ImageTK module' + 'sane: for the Sane module' + 'python2-pyqt4: for the ImageQt module') + provides=('python-imaging' 'python2-imaging') + conflicts=('python-imaging' 'pyt
[arch-commits] Commit in python-pillow/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 21:11:03 Author: bgyorgy Revision: 97243 upgpkg: python-pillow 2.1.0-4 Enable optional features Modified: python-pillow/trunk/PKGBUILD --+ PKGBUILD | 15 ++- 1 file changed, 6 insertions(+), 9 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 18:37:06 UTC (rev 97242) +++ PKGBUILD2013-09-15 19:11:03 UTC (rev 97243) @@ -6,13 +6,12 @@ pkgname=(python-pillow python2-pillow) _appname=Pillow pkgver=2.1.0 -pkgrel=3 +pkgrel=4 pkgdesc="Python Imaging Library (PIL) fork. Python3 version." arch=('i686' 'x86_64') url="http://python-imaging.github.io/"; license=('BSD') -depends=('python' 'python2') -makedepends=('python-setuptools' 'python2-setuptools' 'sane') +makedepends=('python-setuptools' 'python2-setuptools' 'lcms' 'libwebp' 'tk' 'sane') source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip";) md5sums=('ec630d8ae15d4a3c4ae7b7efdeac8200') @@ -22,10 +21,9 @@ } package_python-pillow() { - depends=('python') - makedepends=('python-setuptools' 'sane') + depends=('python' 'lcms' 'libwebp') optdepends=('tk: for the ImageTK module' - 'sane: for the ImageSane module' + 'sane: for the Sane module' 'python-pyqt4: for the ImageQt module') cd "$srcdir/$_appname-$pkgver" python3 setup.py install --root="$pkgdir/" --optimize=0 @@ -43,10 +41,9 @@ package_python2-pillow() { pkgdesc="Python Imaging Library (PIL) fork. Python2 version." - depends=('python2') - makedepends=('python2-setuptools' 'sane') + depends=('python2' 'lcms' 'libwebp') optdepends=('tk: for the ImageTK module' - 'sane: for the ImageSane module' + 'sane: for the Sane module' 'python2-pyqt4: for the ImageQt module') provides=('python-imaging' 'python2-imaging') conflicts=('python-imaging' 'python2-imaging')
[arch-commits] Commit in penlight/repos/community-any (PKGBUILD PKGBUILD)
Date: Sunday, September 15, 2013 @ 20:37:06 Author: seblu Revision: 97242 archrelease: copy trunk to community-any Added: penlight/repos/community-any/PKGBUILD (from rev 97241, penlight/trunk/PKGBUILD) Deleted: penlight/repos/community-any/PKGBUILD --+ PKGBUILD | 72 + 1 file changed, 39 insertions(+), 33 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2013-09-15 18:37:00 UTC (rev 97241) +++ PKGBUILD2013-09-15 18:37:06 UTC (rev 97242) @@ -1,33 +0,0 @@ -# $Id$ -# Maintainer: Sébastien Luttringer -# Contributor: SpepS -# Contributor: Laszlo Papp -# Contributor: Donald Ephraim Curtis - -pkgbase=penlight -pkgname=('lua-penlight') -pkgver=1.2.0 -pkgrel=1 -pkgdesc='Lua libraries focusing on input data handling' -arch=('any') -url='https://github.com/stevedonovan/penlight' -license=('custom') -makedepends=('lua') -source=("$pkgname-$pkgver.tar.gz::https://github.com/stevedonovan/penlight/archive/$pkgver.tar.gz";) -md5sums=('fa213fa3aa3e2c920af8c4b28bdf2a1e') - -package_lua-penlight() { - depends=('lua' 'lua-filesystem') - - cd Penlight-$pkgver - install -dm755 "$pkgdir/usr/share/lua/5.2/pl/platf" - install -m644 lua/pl/*.lua "$pkgdir/usr/share/lua/5.2/pl" - install -m644 lua/pl/platf/*.lua "$pkgdir/usr/share/lua/5.2/pl/platf" - # copy docs - install -dm755 "$pkgdir/usr/share/doc/$pkgname" - install -m644 CHANGES.md README.md doc/manual/* "$pkgdir/usr/share/doc/$pkgname" - # copy license - install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 et: Copied: penlight/repos/community-any/PKGBUILD (from rev 97241, penlight/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2013-09-15 18:37:06 UTC (rev 97242) @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Sébastien Luttringer +# Contributor: SpepS +# Contributor: Laszlo Papp +# Contributor: Donald Ephraim Curtis + +pkgbase=penlight +pkgname=('lua-penlight') +pkgver=1.3.0 +pkgrel=1 +pkgdesc='Lua libraries focusing on input data handling' +arch=('any') +url='https://github.com/stevedonovan/penlight' +license=('custom') +depends=('lua' 'lua-filesystem') +source=("$pkgname-$pkgver.tar.gz::https://github.com/stevedonovan/penlight/archive/$pkgver.tar.gz";) +md5sums=('7add43a98a940fb066b873c1298c4489') + +check() { + cd Penlight-$pkgver + export LUA_PATH="$PWD/lua/?/init.lua;$PWD/lua/?.lua;$(lua -e 'print(package.path)')" + lua run.lua +} + +package_lua-penlight() { + + cd Penlight-$pkgver + install -dm755 "$pkgdir/usr/share/lua/5.2/pl" + install -m644 lua/pl/* "$pkgdir/usr/share/lua/5.2/pl" + # copy docs + install -dm755 "$pkgdir/usr/share/doc/$pkgname/"{,manual,examples} + install -m644 CONTRIBUTING.md CHANGES.md README.md "$pkgdir/usr/share/doc/$pkgname" + install -m644 doc/manual/* "$pkgdir/usr/share/doc/$pkgname/manual" + install -m644 examples/* "$pkgdir/usr/share/doc/$pkgname/examples" + # copy license + install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et:
[arch-commits] Commit in penlight/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 20:37:00 Author: seblu Revision: 97241 upgpkg: penlight 1.3.0-1 Modified: penlight/trunk/PKGBUILD --+ PKGBUILD | 24 +++- 1 file changed, 15 insertions(+), 9 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 15:41:43 UTC (rev 97240) +++ PKGBUILD2013-09-15 18:37:00 UTC (rev 97241) @@ -6,26 +6,32 @@ pkgbase=penlight pkgname=('lua-penlight') -pkgver=1.2.0 +pkgver=1.3.0 pkgrel=1 pkgdesc='Lua libraries focusing on input data handling' arch=('any') url='https://github.com/stevedonovan/penlight' license=('custom') -makedepends=('lua') +depends=('lua' 'lua-filesystem') source=("$pkgname-$pkgver.tar.gz::https://github.com/stevedonovan/penlight/archive/$pkgver.tar.gz";) -md5sums=('fa213fa3aa3e2c920af8c4b28bdf2a1e') +md5sums=('7add43a98a940fb066b873c1298c4489') +check() { + cd Penlight-$pkgver + export LUA_PATH="$PWD/lua/?/init.lua;$PWD/lua/?.lua;$(lua -e 'print(package.path)')" + lua run.lua +} + package_lua-penlight() { - depends=('lua' 'lua-filesystem') cd Penlight-$pkgver - install -dm755 "$pkgdir/usr/share/lua/5.2/pl/platf" - install -m644 lua/pl/*.lua "$pkgdir/usr/share/lua/5.2/pl" - install -m644 lua/pl/platf/*.lua "$pkgdir/usr/share/lua/5.2/pl/platf" + install -dm755 "$pkgdir/usr/share/lua/5.2/pl" + install -m644 lua/pl/* "$pkgdir/usr/share/lua/5.2/pl" # copy docs - install -dm755 "$pkgdir/usr/share/doc/$pkgname" - install -m644 CHANGES.md README.md doc/manual/* "$pkgdir/usr/share/doc/$pkgname" + install -dm755 "$pkgdir/usr/share/doc/$pkgname/"{,manual,examples} + install -m644 CONTRIBUTING.md CHANGES.md README.md "$pkgdir/usr/share/doc/$pkgname" + install -m644 doc/manual/* "$pkgdir/usr/share/doc/$pkgname/manual" + install -m644 examples/* "$pkgdir/usr/share/doc/$pkgname/examples" # copy license install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE" }
[arch-commits] Commit in xorg-luit/repos (6 files)
Date: Sunday, September 15, 2013 @ 20:16:48 Author: andyrtr Revision: 194394 archrelease: copy trunk to extra-i686, extra-x86_64 Added: xorg-luit/repos/extra-i686/PKGBUILD (from rev 194393, xorg-luit/trunk/PKGBUILD) xorg-luit/repos/extra-i686/git_fixes.diff (from rev 194393, xorg-luit/trunk/git_fixes.diff) xorg-luit/repos/extra-x86_64/PKGBUILD (from rev 194393, xorg-luit/trunk/PKGBUILD) xorg-luit/repos/extra-x86_64/git_fixes.diff (from rev 194393, xorg-luit/trunk/git_fixes.diff) Deleted: xorg-luit/repos/extra-i686/PKGBUILD xorg-luit/repos/extra-x86_64/PKGBUILD -+ /PKGBUILD | 64 ++ extra-i686/PKGBUILD | 28 extra-i686/git_fixes.diff | 254 ++ extra-x86_64/PKGBUILD | 28 extra-x86_64/git_fixes.diff | 254 ++ 5 files changed, 572 insertions(+), 56 deletions(-) Deleted: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2013-09-15 18:16:24 UTC (rev 194393) +++ extra-i686/PKGBUILD 2013-09-15 18:16:48 UTC (rev 194394) @@ -1,28 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot - -pkgname=xorg-luit -pkgver=1.1.1 -pkgrel=1 -pkgdesc="Filter that can be run between an arbitrary application and a UTF-8 terminal emulator" -arch=(i686 x86_64) -url="http://xorg.freedesktop.org/"; -license=('custom') -depends=('libfontenc') -groups=('xorg' 'xorg-apps') -makedepends=('xorg-util-macros') -source=(http://xorg.freedesktop.org/archive/individual/app/luit-${pkgver}.tar.bz2) -sha1sums=('3130c14d7267cecce0ba2280643844b48cca49b0') - -build() { - cd "${srcdir}/luit-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/luit-${pkgver}" - make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" -} Copied: xorg-luit/repos/extra-i686/PKGBUILD (from rev 194393, xorg-luit/trunk/PKGBUILD) === --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-09-15 18:16:48 UTC (rev 194394) @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Jan de Groot + +pkgname=xorg-luit +pkgver=1.1.1 +pkgrel=2 +pkgdesc="Filter that can be run between an arbitrary application and a UTF-8 terminal emulator" +arch=(i686 x86_64) +url="http://xorg.freedesktop.org/"; +license=('custom') +depends=('libfontenc') +groups=('xorg' 'xorg-apps') +makedepends=('xorg-util-macros') +source=(http://xorg.freedesktop.org/archive/individual/app/luit-${pkgver}.tar.bz2 +git_fixes.diff) +sha256sums=('30b0e787cb07a0f504b70f1d6123930522111ce9d4276f6683a69b322b49c636' +'aa5d83b8cc772e135e57ae0f0d2b7662b51981f4a120a136a7b201c254b23327') + +build() { + cd luit-${pkgver} + patch -Np1 -i $srcdir/git_fixes.diff + autoreconf -vfi + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/luit-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} Copied: xorg-luit/repos/extra-i686/git_fixes.diff (from rev 194393, xorg-luit/trunk/git_fixes.diff) === --- extra-i686/git_fixes.diff (rev 0) +++ extra-i686/git_fixes.diff 2013-09-15 18:16:48 UTC (rev 194394) @@ -0,0 +1,254 @@ +From 473959141641b6779e6ff3c3c5b6ef326073bcd4 Mon Sep 17 00:00:00 2001 +From: Mike FABIAN +Date: Tue, 07 Jun 2011 11:42:00 + +Subject: Set up terminal before fork. + +After the fork it is undefined wether parent or child runs +first. So there can be a race: if the child runs before the +terminal of the parent is set up correctly luit may hang. +This patch sets up the terminal before forking and undoes +the settings in the child. + +Signed-off-by: Mike FABIAN +Signed-off-by: Egbert Eich +--- +diff --git a/luit.c b/luit.c +index 0ece7b6..5cb3b8f 100644 +--- a/luit.c b/luit.c +@@ -577,6 +577,8 @@ condom(int argc, char **argv) + IGNORE_RC(pipe(c2p_waitpipe)); + } + ++setup_io(pty); ++ + pid = fork(); + if (pid < 0) { + perror("Couldn't fork"); +@@ -584,6 +586,10 @@ condom(int argc, char **argv) + } + + if (pid == 0) { ++#ifdef SIGWINCH ++ installHandler(SIGWINCH, SIG_DFL); ++#endif ++ installHandler(SIGCHLD, SIG_DFL); + close(pty); + if (pipe_option) { + close_waitpipe(1); +@@ -661,7 +667,6 @@ parent(int pid GCC_UNUSED, int pty) + if (verbose) { + reportIso2022(outputState); + } +-setup_io(pty); + + if (pipe_option) { + write_waitpipe(p2c_waitpipe); +-- +cgit v0.9.0.2-2-gbebe + +From 09f4907e4ab4ba3654de829bf3ac2a4a02bb9ef4 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Sat, 22 Jun 2013
[arch-commits] Commit in xorg-luit/trunk (PKGBUILD git_fixes.diff)
Date: Sunday, September 15, 2013 @ 20:16:24 Author: andyrtr Revision: 194393 upgpkg: xorg-luit 1.1.1-2 add upstream git commits to fix build; FS#36933 Added: xorg-luit/trunk/git_fixes.diff Modified: xorg-luit/trunk/PKGBUILD + PKGBUILD | 12 +- git_fixes.diff | 254 +++ 2 files changed, 262 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 13:43:50 UTC (rev 194392) +++ PKGBUILD2013-09-15 18:16:24 UTC (rev 194393) @@ -3,7 +3,7 @@ pkgname=xorg-luit pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Filter that can be run between an arbitrary application and a UTF-8 terminal emulator" arch=(i686 x86_64) url="http://xorg.freedesktop.org/"; @@ -11,11 +11,15 @@ depends=('libfontenc') groups=('xorg' 'xorg-apps') makedepends=('xorg-util-macros') -source=(http://xorg.freedesktop.org/archive/individual/app/luit-${pkgver}.tar.bz2) -sha1sums=('3130c14d7267cecce0ba2280643844b48cca49b0') +source=(http://xorg.freedesktop.org/archive/individual/app/luit-${pkgver}.tar.bz2 +git_fixes.diff) +sha256sums=('30b0e787cb07a0f504b70f1d6123930522111ce9d4276f6683a69b322b49c636' +'aa5d83b8cc772e135e57ae0f0d2b7662b51981f4a120a136a7b201c254b23327') build() { - cd "${srcdir}/luit-${pkgver}" + cd luit-${pkgver} + patch -Np1 -i $srcdir/git_fixes.diff + autoreconf -vfi ./configure --prefix=/usr make } Added: git_fixes.diff === --- git_fixes.diff (rev 0) +++ git_fixes.diff 2013-09-15 18:16:24 UTC (rev 194393) @@ -0,0 +1,254 @@ +From 473959141641b6779e6ff3c3c5b6ef326073bcd4 Mon Sep 17 00:00:00 2001 +From: Mike FABIAN +Date: Tue, 07 Jun 2011 11:42:00 + +Subject: Set up terminal before fork. + +After the fork it is undefined wether parent or child runs +first. So there can be a race: if the child runs before the +terminal of the parent is set up correctly luit may hang. +This patch sets up the terminal before forking and undoes +the settings in the child. + +Signed-off-by: Mike FABIAN +Signed-off-by: Egbert Eich +--- +diff --git a/luit.c b/luit.c +index 0ece7b6..5cb3b8f 100644 +--- a/luit.c b/luit.c +@@ -577,6 +577,8 @@ condom(int argc, char **argv) + IGNORE_RC(pipe(c2p_waitpipe)); + } + ++setup_io(pty); ++ + pid = fork(); + if (pid < 0) { + perror("Couldn't fork"); +@@ -584,6 +586,10 @@ condom(int argc, char **argv) + } + + if (pid == 0) { ++#ifdef SIGWINCH ++ installHandler(SIGWINCH, SIG_DFL); ++#endif ++ installHandler(SIGCHLD, SIG_DFL); + close(pty); + if (pipe_option) { + close_waitpipe(1); +@@ -661,7 +667,6 @@ parent(int pid GCC_UNUSED, int pty) + if (verbose) { + reportIso2022(outputState); + } +-setup_io(pty); + + if (pipe_option) { + write_waitpipe(p2c_waitpipe); +-- +cgit v0.9.0.2-2-gbebe + +From 09f4907e4ab4ba3654de829bf3ac2a4a02bb9ef4 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Sat, 22 Jun 2013 04:11:43 + +Subject: Fix GCC_UNUSED definition to actually work with -Wunused-parameter + +Silences warnings of: +charset.c: In function ‘IdentityRecode’: +charset.c:42:51: warning: unused parameter ‘self’ [-Wunused-parameter] +charset.c: In function ‘NullReverse’: +charset.c:84:26: warning: unused parameter ‘n’ [-Wunused-parameter] +charset.c:84:59: warning: unused parameter ‘self’ [-Wunused-parameter] +other.c: In function ‘mapping_utf8’: +other.c:108:44: warning: unused parameter ‘s’ [-Wunused-parameter] +other.c: In function ‘reverse_utf8’: +other.c:114:44: warning: unused parameter ‘s’ [-Wunused-parameter] +luit.c: In function ‘sigwinchHandler’: +luit.c:463:21: warning: unused parameter ‘sig’ [-Wunused-parameter] +luit.c: In function ‘sigchldHandler’: +luit.c:470:20: warning: unused parameter ‘sig’ [-Wunused-parameter] +luit.c: In function ‘parent’: +luit.c:657:12: warning: unused parameter ‘pid’ [-Wunused-parameter] + +Signed-off-by: Alan Coopersmith +--- +diff --git a/other.h b/other.h +index 9d814a3..d18b586 100644 +--- a/other.h b/other.h +@@ -26,7 +26,11 @@ THE SOFTWARE. + #include "config.h" /* include this, for self-contained headers */ + + #ifndef GCC_UNUSED +-#define GCC_UNUSED/* ARGSUSED */ ++# if defined(__GNUC__) && ((__GNUC__ * 100 + __GNUC_MINOR__) >= 205) ++# define GCC_UNUSED __attribute__((__unused__)) ++# else ++# define GCC_UNUSED /* ARGSUSED */ ++# endif + #endif + + #include +-- +cgit v0.9.0.2-2-gbebe + +From 445863f8b5059692ac7a4df785af6920849faa82 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Sat, 13 Jul 2013 16:08:34 + +Subject: config: Add missing AC_CONFIG_SRCDIR + +Regroup AC statements under the Autoconf initialization section. +Regroup AM statements under the Automake initialization section. + +Signe
[arch-commits] Commit in smuxi/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 17:41:37 Author: bgyorgy Revision: 97239 upgpkg: smuxi 0.9-2 Rebuild for log4net Modified: smuxi/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 15:35:57 UTC (rev 97238) +++ PKGBUILD2013-09-15 15:41:37 UTC (rev 97239) @@ -8,7 +8,7 @@ pkgbase=smuxi pkgname=('smuxi-server' 'smuxi') pkgver=0.9 -pkgrel=1 +pkgrel=2 pkgdesc="User-friendly and cross-platform IRC client for sophisticated users for GNOME/GTK+" arch=('any') url="http://www.smuxi.org/";
[arch-commits] Commit in smuxi/repos/community-any (6 files)
Date: Sunday, September 15, 2013 @ 17:41:43 Author: bgyorgy Revision: 97240 archrelease: copy trunk to community-any Added: smuxi/repos/community-any/PKGBUILD (from rev 97239, smuxi/trunk/PKGBUILD) smuxi/repos/community-any/fix-build.patch (from rev 97239, smuxi/trunk/fix-build.patch) smuxi/repos/community-any/smuxi.install (from rev 97239, smuxi/trunk/smuxi.install) Deleted: smuxi/repos/community-any/PKGBUILD smuxi/repos/community-any/fix-build.patch smuxi/repos/community-any/smuxi.install -+ PKGBUILD| 132 +++--- fix-build.patch | 48 +-- smuxi.install | 22 - 3 files changed, 101 insertions(+), 101 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2013-09-15 15:41:37 UTC (rev 97239) +++ PKGBUILD2013-09-15 15:41:43 UTC (rev 97240) @@ -1,66 +0,0 @@ -# $Id$ -# Maintainer: Balló György -# Contributor: Madek -# Contributor: Marcelo Cavalcante -# Contributor: Jens Kleikamp -# Contributor: Philipp Gildein - -pkgbase=smuxi -pkgname=('smuxi-server' 'smuxi') -pkgver=0.9 -pkgrel=1 -pkgdesc="User-friendly and cross-platform IRC client for sophisticated users for GNOME/GTK+" -arch=('any') -url="http://www.smuxi.org/"; -license=('GPL') -makedepends=('notify-sharp' 'log4net' 'nini' 'gtkspell' 'stfl' 'intltool') -options=('!emptydirs') -source=(http://www.smuxi.org/jaws/data/files/$pkgbase-$pkgver.tar.gz -fix-build.patch) -md5sums=('e7b52fe121905fcef08ca66332c42cfb' - 'c514fb59a34a00024d2374dd6d6ca8ca') - -prepare() { - cd "$srcdir/$pkgbase-$pkgver/lib/SmartIrc4net/" - patch -Np1 -i "$srcdir/fix-build.patch" -} - -build() { - cd "$srcdir/$pkgbase-$pkgver" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --enable-frontend-stfl \ - --with-vendor-package-version="Arch Linux $pkgver-$pkgrel" \ - MCS=/usr/bin/dmcs - LANG=C make -} - -package_smuxi-server() { - pkgdesc+=" (common files and server)" - depends=('log4net' 'nini') - cd "$srcdir/$pkgbase-$pkgver" - - make DESTDIR="$pkgdir" install - - # Split frontend - [[ -d $srcdir/frontend ]] && rm -r "$srcdir/frontend/" - mkdir "$srcdir"/frontend - mv "$pkgdir"/usr/bin/smuxi-frontend-{gnome,stfl} \ - "$pkgdir"/usr/lib/pkgconfig/smuxi-frontend.pc \ - "$pkgdir"/usr/lib/smuxi/smuxi-frontend* \ - "$pkgdir"/usr/share/{applications,icons} \ - "$srcdir/frontend/" -} - -package_smuxi() { - pkgdesc+=" (frontend)" - depends=('smuxi-server' 'notify-sharp' 'gtkspell' 'stfl' 'hicolor-icon-theme' 'xdg-utils') - install=smuxi.install - cd "$srcdir/frontend" - - mkdir -p "$pkgdir"/usr/{bin,lib/{pkgconfig,smuxi},share} - mv smuxi-frontend-{gnome,stfl} "$pkgdir/usr/bin" - mv smuxi-frontend.pc "$pkgdir/usr/lib/pkgconfig" - mv smuxi-frontend* "$pkgdir/usr/lib/smuxi" - mv {applications,icons} "$pkgdir/usr/share" -} Copied: smuxi/repos/community-any/PKGBUILD (from rev 97239, smuxi/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2013-09-15 15:41:43 UTC (rev 97240) @@ -0,0 +1,66 @@ +# $Id$ +# Maintainer: Balló György +# Contributor: Madek +# Contributor: Marcelo Cavalcante +# Contributor: Jens Kleikamp +# Contributor: Philipp Gildein + +pkgbase=smuxi +pkgname=('smuxi-server' 'smuxi') +pkgver=0.9 +pkgrel=2 +pkgdesc="User-friendly and cross-platform IRC client for sophisticated users for GNOME/GTK+" +arch=('any') +url="http://www.smuxi.org/"; +license=('GPL') +makedepends=('notify-sharp' 'log4net' 'nini' 'gtkspell' 'stfl' 'intltool') +options=('!emptydirs') +source=(http://www.smuxi.org/jaws/data/files/$pkgbase-$pkgver.tar.gz +fix-build.patch) +md5sums=('e7b52fe121905fcef08ca66332c42cfb' + 'c514fb59a34a00024d2374dd6d6ca8ca') + +prepare() { + cd "$srcdir/$pkgbase-$pkgver/lib/SmartIrc4net/" + patch -Np1 -i "$srcdir/fix-build.patch" +} + +build() { + cd "$srcdir/$pkgbase-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --enable-frontend-stfl \ + --with-vendor-package-version="Arch Linux $pkgver-$pkgrel" \ + MCS=/usr/bin/dmcs + LANG=C make +} + +package_smuxi-server() { + pkgdesc+=" (common files and server)" + depends=('log4net' 'nini') + cd "$srcdir/$pkgbase-$pkgver" + + make DESTDIR="$pkgdir" install + + # Split frontend + [[ -d $srcdir/frontend ]] && rm -r "$srcdir/frontend/" + mkdir "$srcdir"/frontend + mv "$pkgdir"/usr/bin/smuxi-frontend-{gnome,stfl} \ + "$pkgdir"/usr/lib/pkgconfig/smuxi-frontend.pc \ + "$pkgdir"/usr/lib/smuxi/smuxi-frontend* \ + "$pkgdir"/usr/share/{applications,icons} \ + "$srcdir/frontend/" +} + +package_smuxi() { + pkgdesc+=" (frontend)" + depends=('smuxi-server' 'notify-sharp' 'gtkspell' 'stfl' 'hicolor-icon-theme' 'xdg-utils')
[arch-commits] Commit in log4net/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 17:35:52 Author: bgyorgy Revision: 97237 upgpkg: log4net 1.2.12-1 Update to version log4net Modified: log4net/trunk/PKGBUILD --+ PKGBUILD | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 14:55:33 UTC (rev 97236) +++ PKGBUILD2013-09-15 15:35:52 UTC (rev 97237) @@ -4,8 +4,8 @@ # Contributor: Thijs Vermeir pkgname=log4net -pkgver=1.2.11 -pkgrel=3 +pkgver=1.2.12 +pkgrel=1 pkgdesc="A tool to help the programmer output log statements to a variety of output targets" arch=('any') url="http://logging.apache.org/log4net/"; @@ -13,7 +13,7 @@ depends=('mono') source=(http://www.apache.org/dist/logging/$pkgname/source/$pkgname-$pkgver-src.zip $pkgname.pc) -md5sums=('64f9ba6cfb76ee5c7fa5c9c247c30203' +md5sums=('6cd79437bf1b6dd80f7983704abc9aad' 'a292da72afbd6bd705e02f4ddb564fd7') build() { @@ -21,8 +21,8 @@ sed -i "s/@VERSION@/$pkgver/" $srcdir/$pkgname.pc mkdir bin - gmcs -t:library -out:bin/$pkgname.dll -keyfile:$pkgname.snk \ - -r:System,System.Data,System.Xml,System.Web \ + dmcs -t:library -out:bin/$pkgname.dll -keyfile:$pkgname.snk -d:NET_2_0 \ + -r:System,System.Data,System.Xml,System.Web,System.Net,System.Configuration \ $(find src -name "*.cs") }
[arch-commits] Commit in log4net/repos/community-any (4 files)
Date: Sunday, September 15, 2013 @ 17:35:57 Author: bgyorgy Revision: 97238 archrelease: copy trunk to community-any Added: log4net/repos/community-any/PKGBUILD (from rev 97237, log4net/trunk/PKGBUILD) log4net/repos/community-any/log4net.pc (from rev 97237, log4net/trunk/log4net.pc) Deleted: log4net/repos/community-any/PKGBUILD log4net/repos/community-any/log4net.pc + PKGBUILD | 68 +-- log4net.pc | 16 ++--- 2 files changed, 42 insertions(+), 42 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2013-09-15 15:35:52 UTC (rev 97237) +++ PKGBUILD2013-09-15 15:35:57 UTC (rev 97238) @@ -1,34 +0,0 @@ -# $Id$ -# Maintainer: Balló György -# Contributor: Frane Bandov -# Contributor: Thijs Vermeir - -pkgname=log4net -pkgver=1.2.11 -pkgrel=3 -pkgdesc="A tool to help the programmer output log statements to a variety of output targets" -arch=('any') -url="http://logging.apache.org/log4net/"; -license=('Apache') -depends=('mono') -source=(http://www.apache.org/dist/logging/$pkgname/source/$pkgname-$pkgver-src.zip -$pkgname.pc) -md5sums=('64f9ba6cfb76ee5c7fa5c9c247c30203' - 'a292da72afbd6bd705e02f4ddb564fd7') - -build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i "s/@VERSION@/$pkgver/" $srcdir/$pkgname.pc - mkdir bin - - gmcs -t:library -out:bin/$pkgname.dll -keyfile:$pkgname.snk \ - -r:System,System.Data,System.Xml,System.Web \ - $(find src -name "*.cs") -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - gacutil -i bin/$pkgname.dll -package $pkgname-$pkgver -root "$pkgdir/usr/lib/" - install -Dm644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc" -} Copied: log4net/repos/community-any/PKGBUILD (from rev 97237, log4net/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2013-09-15 15:35:57 UTC (rev 97238) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Balló György +# Contributor: Frane Bandov +# Contributor: Thijs Vermeir + +pkgname=log4net +pkgver=1.2.12 +pkgrel=1 +pkgdesc="A tool to help the programmer output log statements to a variety of output targets" +arch=('any') +url="http://logging.apache.org/log4net/"; +license=('Apache') +depends=('mono') +source=(http://www.apache.org/dist/logging/$pkgname/source/$pkgname-$pkgver-src.zip +$pkgname.pc) +md5sums=('6cd79437bf1b6dd80f7983704abc9aad' + 'a292da72afbd6bd705e02f4ddb564fd7') + +build() { + cd "$srcdir/$pkgname-$pkgver" + sed -i "s/@VERSION@/$pkgver/" $srcdir/$pkgname.pc + mkdir bin + + dmcs -t:library -out:bin/$pkgname.dll -keyfile:$pkgname.snk -d:NET_2_0 \ + -r:System,System.Data,System.Xml,System.Web,System.Net,System.Configuration \ + $(find src -name "*.cs") +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + gacutil -i bin/$pkgname.dll -package $pkgname-$pkgver -root "$pkgdir/usr/lib/" + install -Dm644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc" +} Deleted: log4net.pc === --- log4net.pc 2013-09-15 15:35:52 UTC (rev 97237) +++ log4net.pc 2013-09-15 15:35:57 UTC (rev 97238) @@ -1,8 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib - -Name: Log4net -Description: Log4net - Logging library for C# and VB.NET -Version: @VERSION@ -Libs: -r:${libdir}/mono/log4net-@VERSION@/log4net.dll Copied: log4net/repos/community-any/log4net.pc (from rev 97237, log4net/trunk/log4net.pc) === --- log4net.pc (rev 0) +++ log4net.pc 2013-09-15 15:35:57 UTC (rev 97238) @@ -0,0 +1,8 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${exec_prefix}/lib + +Name: Log4net +Description: Log4net - Logging library for C# and VB.NET +Version: @VERSION@ +Libs: -r:${libdir}/mono/log4net-@VERSION@/log4net.dll
[arch-commits] Commit in gourmet/trunk (PKGBUILD gourmet.changelog pil.patch)
Date: Sunday, September 15, 2013 @ 16:55:28 Author: bgyorgy Revision: 97235 upgpkg: gourmet 0.16.1-1 Update to version 0.16.1 Modified: gourmet/trunk/PKGBUILD Deleted: gourmet/trunk/gourmet.changelog gourmet/trunk/pil.patch ---+ PKGBUILD | 14 ++- gourmet.changelog | 48 -- pil.patch | 94 3 files changed, 4 insertions(+), 152 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 14:37:25 UTC (rev 97234) +++ PKGBUILD2013-09-15 14:55:28 UTC (rev 97235) @@ -4,8 +4,8 @@ # Contributor: see .contrib pkgname=gourmet -pkgver=0.16.0 -pkgrel=2 +pkgver=0.16.1 +pkgrel=1 pkgdesc="A simple but powerful recipe-managing application" arch=('any') url="http://thinkle.github.io/gourmet/"; @@ -19,12 +19,9 @@ 'python2-gtkspell: Spell Checking plugin' 'python2-poppler: Printing and PDF Export plugin' 'python2-reportlab: Printing and PDF Export plugin') -changelog=$pkgname.changelog install=$pkgname.install -source=("https://launchpad.net/gourmet/main/$pkgver/+download/$pkgname-$pkgver.tar.bz2"; -"pil.patch") -md5sums=('6a4ddb80b40e1bee7797697f03c9ef82' - '6e90c8021d5949525e565c2607d2e6e6') +source=("$pkgname-$pkgver.tar.gz::https://github.com/thinkle/$pkgname/archive/$pkgver.tar.gz";) +md5sums=('322814a7394d6bace7e0ef887efbe0f8') prepare() { cd "$srcdir/$pkgname-$pkgver" @@ -34,9 +31,6 @@ sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file done - - # python-imaging -> python-pillow (relative PIL import) - patch -Np1 -i "$srcdir/pil.patch" } package() { Deleted: gourmet.changelog === --- gourmet.changelog 2013-09-15 14:37:25 UTC (rev 97234) +++ gourmet.changelog 2013-09-15 14:55:28 UTC (rev 97235) @@ -1,48 +0,0 @@ -2013-04-15 Balló György - - * Version bump: 0.16.0 - Upstream release - - * Update upstream URL - - * Update dependencies - - * Call gtk-update-icon-cache from install script - -2011-05-07 Ray Rashif - - * Version bump: 0.15.9 - Upstream release - -2011-01-28 Ray Rashif - - * Fixed some deps; see https://bugs.archlinux.org/task/22572 - -2010-12-08 Ray Rashif - - * Version bump: 0.15.6 - - * semantics.patch: removed, no longer needed - -2010-06-29 Ray Rashif - - * Version bump: 0.15.4 - - * PKGBUILD: added new changelog array - - * ChangeLog: changed to gourmet.changelog - - * semantics.patch: fixes upstream bug - -2009-08-27 Corrado Primier - - * Version bump: 0.15.0 - -2009-04-18 Corrado Primier - - * Version bump: 0.14.7 - - * PKGBUILD: moved to $srcdir/$pkgdir syntax, added optdepends, added - 'python-sqlalchemy' dependency, added 'intltool' make dependency - - * gourmet.install: removed Deleted: pil.patch === --- pil.patch 2013-09-15 14:37:25 UTC (rev 97234) +++ pil.patch 2013-09-15 14:55:28 UTC (rev 97235) @@ -1,94 +0,0 @@ -diff -bur gourmet-0.16.0.orig/gourmet/exporters/exporter.py gourmet-0.16.0/gourmet/exporters/exporter.py gourmet-0.16.0.orig/gourmet/exporters/exporter.py 2013-09-15 08:40:09.090420987 + -+++ gourmet-0.16.0/gourmet/exporters/exporter.py 2013-09-15 09:00:15.0 + -@@ -1,10 +1,15 @@ --import re, Image, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap, types -+import re, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap, types - from gourmet import gglobals, convert - from gourmet.gdebug import * - from gettext import gettext as _ - from gourmet.plugin_loader import Pluggable, pluggable_method - from gourmet.plugin import BaseExporterPlugin, BaseExporterMultiRecPlugin - from gourmet.threadManager import SuspendableThread -+# Require PIL module. -+try: -+from PIL import Image -+except ImportError: -+import Image - - REC_ATTR_DIC = gglobals.REC_ATTR_DIC - DEFAULT_ATTR_ORDER = gglobals.DEFAULT_ATTR_ORDER -diff -bur gourmet-0.16.0.orig/gourmet/ImageExtras.py gourmet-0.16.0/gourmet/ImageExtras.py gourmet-0.16.0.orig/gourmet/ImageExtras.py 2013-09-15 08:40:09.097087657 + -+++ gourmet-0.16.0/gourmet/ImageExtras.py 2013-09-15 07:12:30.0 + -@@ -1,5 +1,10 @@ --import os, os.path, tempfile, gtk, Image, StringIO -+import os, os.path, tempfile, gtk, StringIO - from gdebug import * -+# Require PIL module. -+try: -+from PIL import Image -+except ImportError: -+import Image - - TMPFILE = tempfile.mktemp(prefix='gourmet_tempfile_') - -diff -bur gourmet-0.16.0.orig/gourmet/plugins/import_export/html_plugin/html_exporter.py gourmet-0.16.0/gourmet/plugins/import_export/html_plugin/html_expor
[arch-commits] Commit in gourmet/repos/community-staging-any (8 files)
Date: Sunday, September 15, 2013 @ 16:55:33 Author: bgyorgy Revision: 97236 archrelease: copy trunk to community-staging-any Added: gourmet/repos/community-staging-any/.contrib (from rev 97235, gourmet/trunk/.contrib) gourmet/repos/community-staging-any/PKGBUILD (from rev 97235, gourmet/trunk/PKGBUILD) gourmet/repos/community-staging-any/gourmet.install (from rev 97235, gourmet/trunk/gourmet.install) Deleted: gourmet/repos/community-staging-any/.contrib gourmet/repos/community-staging-any/PKGBUILD gourmet/repos/community-staging-any/gourmet.changelog gourmet/repos/community-staging-any/gourmet.install gourmet/repos/community-staging-any/pil.patch ---+ .contrib |6 +-- PKGBUILD | 86 ++- gourmet.changelog | 48 -- gourmet.install | 22 ++-- pil.patch | 94 5 files changed, 54 insertions(+), 202 deletions(-) Deleted: .contrib === --- .contrib2013-09-15 14:55:28 UTC (rev 97235) +++ .contrib2013-09-15 14:55:33 UTC (rev 97236) @@ -1,3 +0,0 @@ -# Contributor: Corrado Primier -# Contributor: Eric Belanger -# Contributor: Andrew Conkling Copied: gourmet/repos/community-staging-any/.contrib (from rev 97235, gourmet/trunk/.contrib) === --- .contrib(rev 0) +++ .contrib2013-09-15 14:55:33 UTC (rev 97236) @@ -0,0 +1,3 @@ +# Contributor: Corrado Primier +# Contributor: Eric Belanger +# Contributor: Andrew Conkling Deleted: PKGBUILD === --- PKGBUILD2013-09-15 14:55:28 UTC (rev 97235) +++ PKGBUILD2013-09-15 14:55:33 UTC (rev 97236) @@ -1,46 +0,0 @@ -# $Id$ -# Maintainer: -# Contributor: Ray Rashif -# Contributor: see .contrib - -pkgname=gourmet -pkgver=0.16.0 -pkgrel=2 -pkgdesc="A simple but powerful recipe-managing application" -arch=('any') -url="http://thinkle.github.io/gourmet/"; -license=('GPL') -depends=('pygtk' 'python2-pillow' 'python2-sqlalchemy' 'hicolor-icon-theme') -makedepends=('python2-distutils-extra') -optdepends=('gstreamer0.10-python: play timer sounds' -'ipython2: Python Shell plugin' -'pyrtf: RTF support' -'python2-beautifulsoup3: Webpage import plugin' -'python2-gtkspell: Spell Checking plugin' -'python2-poppler: Printing and PDF Export plugin' -'python2-reportlab: Printing and PDF Export plugin') -changelog=$pkgname.changelog -install=$pkgname.install -source=("https://launchpad.net/gourmet/main/$pkgver/+download/$pkgname-$pkgver.tar.bz2"; -"pil.patch") -md5sums=('6a4ddb80b40e1bee7797697f03c9ef82' - '6e90c8021d5949525e565c2607d2e6e6') - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - - # python2 fix - for file in $(find . -name '*.py' -print); do -sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file -sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file - done - - # python-imaging -> python-pillow (relative PIL import) - patch -Np1 -i "$srcdir/pil.patch" -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - python2 setup.py install --root="$pkgdir" --optimize=1 -} Copied: gourmet/repos/community-staging-any/PKGBUILD (from rev 97235, gourmet/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2013-09-15 14:55:33 UTC (rev 97236) @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: +# Contributor: Ray Rashif +# Contributor: see .contrib + +pkgname=gourmet +pkgver=0.16.1 +pkgrel=1 +pkgdesc="A simple but powerful recipe-managing application" +arch=('any') +url="http://thinkle.github.io/gourmet/"; +license=('GPL') +depends=('pygtk' 'python2-pillow' 'python2-sqlalchemy' 'hicolor-icon-theme') +makedepends=('python2-distutils-extra') +optdepends=('gstreamer0.10-python: play timer sounds' +'ipython2: Python Shell plugin' +'pyrtf: RTF support' +'python2-beautifulsoup3: Webpage import plugin' +'python2-gtkspell: Spell Checking plugin' +'python2-poppler: Printing and PDF Export plugin' +'python2-reportlab: Printing and PDF Export plugin') +install=$pkgname.install +source=("$pkgname-$pkgver.tar.gz::https://github.com/thinkle/$pkgname/archive/$pkgver.tar.gz";) +md5sums=('322814a7394d6bace7e0ef887efbe0f8') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # python2 fix + for file in $(find . -name '*.py' -print); do +sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file +sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file + done +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + python2 setup.py install --root="$pkgdir" --optimize=1 +} Deleted: gourmet.
[arch-commits] Commit in ubuntu-sso-client/repos (3 files)
Date: Sunday, September 15, 2013 @ 16:37:25 Author: bgyorgy Revision: 97234 archrelease: copy trunk to community-staging-any Added: ubuntu-sso-client/repos/community-staging-any/ ubuntu-sso-client/repos/community-staging-any/PKGBUILD (from rev 97233, ubuntu-sso-client/trunk/PKGBUILD) ubuntu-sso-client/repos/community-staging-any/oauthlib-0.3.8.patch (from rev 97233, ubuntu-sso-client/trunk/oauthlib-0.3.8.patch) --+ PKGBUILD | 41 + oauthlib-0.3.8.patch | 40 2 files changed, 81 insertions(+) Copied: ubuntu-sso-client/repos/community-staging-any/PKGBUILD (from rev 97233, ubuntu-sso-client/trunk/PKGBUILD) === --- community-staging-any/PKGBUILD (rev 0) +++ community-staging-any/PKGBUILD 2013-09-15 14:37:25 UTC (rev 97234) @@ -0,0 +1,41 @@ +# $Id$ +# Maintainer: Balló György + +pkgname=ubuntu-sso-client +pkgver=4.2.0 +pkgrel=3 +pkgdesc="Desktop service to allow applications to sign into Ubuntu services via SSO" +arch=('any') +url="https://launchpad.net/ubuntu-sso-client"; +license=('GPL') +depends=('python2-dbus' 'python2-pyqt' 'python2-dirspec' 'python2-httplib2' 'python2-oauthlib' 'python2-pyopenssl' 'python2-pillow' 'twisted' 'gnome-keyring' 'gsettings-desktop-schemas') +makedepends=('python2-distutils-extra') +replaces=('ubuntu-sso-client-gtk' 'ubuntu-sso-client-qt') +provides=('ubuntu-sso-client-gtk' 'ubuntu-sso-client-qt') +source=(https://launchpad.net/$pkgname/stable-4-2/$pkgver/+download/$pkgname-$pkgver.tar.gz +oauthlib-0.3.8.patch) +md5sums=('1e80d1702ee69cf63242aafaa2c0cc00' + '7eb0cf5ea1318ef5916b49f3c610aacd') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # Python2 fix + sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/* + + # Fix error with oautlib>=0.3.8 + patch -Np0 -i "$srcdir/oauthlib-0.3.8.patch" +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + python2 setup.py build +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + python2 setup.py install --root=$pkgdir/ --optimize=1 + + # Remove unneeded files + rm "$pkgdir"/usr/share/ubuntu-sso-client/*.ttf +} Copied: ubuntu-sso-client/repos/community-staging-any/oauthlib-0.3.8.patch (from rev 97233, ubuntu-sso-client/trunk/oauthlib-0.3.8.patch) === --- community-staging-any/oauthlib-0.3.8.patch (rev 0) +++ community-staging-any/oauthlib-0.3.8.patch 2013-09-15 14:37:25 UTC (rev 97234) @@ -0,0 +1,40 @@ +=== modified file 'ubuntu_sso/utils/webclient/common.py' +--- ubuntu_sso/utils/webclient/common.py 2013-02-19 22:12:47 + ubuntu_sso/utils/webclient/common.py 2013-04-12 20:11:22 + +@@ -157,9 +157,12 @@ + else SIGNATURE_TYPE_AUTH_HEADER), + timestamp=str(timestamp)) + +-url, signed_headers, body = oauth_client.sign( +-uri, method, parameters if parameters is not None else {}, +-{'Content-Type': 'application/x-www-form-urlencoded'}) ++try: ++url, signed_headers, body = oauth_client.sign( ++uri, method, parameters if parameters is not None else {}, ++{'Content-Type': 'application/x-www-form-urlencoded'}) ++except ValueError: ++url, signed_headers, body = oauth_client.sign(uri, method) + + return url, signed_headers, body + + +=== modified file 'ubuntu_sso/utils/webclient/tests/test_webclient.py' +--- ubuntu_sso/utils/webclient/tests/test_webclient.py 2013-02-19 22:12:47 + ubuntu_sso/utils/webclient/tests/test_webclient.py 2013-04-12 20:11:22 + +@@ -794,15 +794,6 @@ + + self.assert_headers_correct(signed_headers) + self.assertEqual(url, self.sample_url) +-if params is not None: +-for param, value in params.items(): +-self.assertIn(param, body) +-actual = body[param] +-self.assertEqual(value, actual) +- +-def test_build_oauth_request_with_params(self): +-"""Check that the oauth request are properly with params.""" +-self.test_build_oauth_request(params=self.sample_params) + + @defer.inlineCallbacks + def test_build_signed_iri(self, params=None): +
[arch-commits] Commit in ubuntu-sso-client/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 16:37:22 Author: bgyorgy Revision: 97233 upgpkg: ubuntu-sso-client 4.2.0-3 Rebuild for Pillow Modified: ubuntu-sso-client/trunk/PKGBUILD --+ PKGBUILD | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 14:28:09 UTC (rev 97232) +++ PKGBUILD2013-09-15 14:37:22 UTC (rev 97233) @@ -3,12 +3,12 @@ pkgname=ubuntu-sso-client pkgver=4.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="Desktop service to allow applications to sign into Ubuntu services via SSO" arch=('any') url="https://launchpad.net/ubuntu-sso-client"; license=('GPL') -depends=('python2-dbus' 'python2-pyqt' 'python2-dirspec' 'python2-httplib2' 'python2-oauthlib' 'python2-pyopenssl' 'python2-imaging' 'twisted' 'gnome-keyring' 'gsettings-desktop-schemas') +depends=('python2-dbus' 'python2-pyqt' 'python2-dirspec' 'python2-httplib2' 'python2-oauthlib' 'python2-pyopenssl' 'python2-pillow' 'twisted' 'gnome-keyring' 'gsettings-desktop-schemas') makedepends=('python2-distutils-extra') replaces=('ubuntu-sso-client-gtk' 'ubuntu-sso-client-qt') provides=('ubuntu-sso-client-gtk' 'ubuntu-sso-client-qt') @@ -17,7 +17,7 @@ md5sums=('1e80d1702ee69cf63242aafaa2c0cc00' '7eb0cf5ea1318ef5916b49f3c610aacd') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" # Python2 fix @@ -25,14 +25,15 @@ # Fix error with oautlib>=0.3.8 patch -Np0 -i "$srcdir/oauthlib-0.3.8.patch" +} +build() { + cd "$srcdir/$pkgname-$pkgver" python2 setup.py build } package() { - cd "$srcdir/$pkgname-$pkgver" - python2 setup.py install --root=$pkgdir/ --optimize=1 # Remove unneeded files
[arch-commits] Commit in ocrfeeder/repos/community-staging-any (6 files)
Date: Sunday, September 15, 2013 @ 16:28:09 Author: bgyorgy Revision: 97232 archrelease: copy trunk to community-staging-any Added: ocrfeeder/repos/community-staging-any/PKGBUILD (from rev 97231, ocrfeeder/trunk/PKGBUILD) ocrfeeder/repos/community-staging-any/ocrfeeder-pillow.patch (from rev 97231, ocrfeeder/trunk/ocrfeeder-pillow.patch) ocrfeeder/repos/community-staging-any/ocrfeeder.install (from rev 97231, ocrfeeder/trunk/ocrfeeder.install) Deleted: ocrfeeder/repos/community-staging-any/PKGBUILD ocrfeeder/repos/community-staging-any/ocrfeeder-pillow.patch ocrfeeder/repos/community-staging-any/ocrfeeder.install + PKGBUILD | 92 +++--- ocrfeeder-pillow.patch | 144 +++ ocrfeeder.install | 22 +++ 3 files changed, 130 insertions(+), 128 deletions(-) Deleted: PKGBUILD === --- PKGBUILD2013-09-15 14:28:04 UTC (rev 97231) +++ PKGBUILD2013-09-15 14:28:09 UTC (rev 97232) @@ -1,45 +0,0 @@ -# $Id$ -# Maintainer: Balló György - -pkgname=ocrfeeder -pkgver=0.7.11 -pkgrel=3 -pkgdesc="GTK+ document layout analysis and optical character recognition application" -arch=('any') -url="http://live.gnome.org/OCRFeeder"; -license=('GPL') -depends=('python2-pyenchant' 'pygoocanvas' 'python2-gtkspell' 'python2-pillow' 'python2-lxml' 'python2-reportlab' 'ghostscript' 'unpaper' 'sane' 'desktop-file-utils') -makedepends=('intltool' 'gnome-doc-utils') -optdepends=('tesseract: character recognition' -'ocrad: character recognition' -'gocr: character recognition' -'cuneiform: character recognition') -install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz -ocrfeeder-pillow.patch) -sha256sums=('4508f4a0e2fdab521ab4a6d0265058a21fda80622483b169fd041189938ea6d5' -'54dbe61ae384d4f5ed48e9fae0d5d1fc65787916208c87f44862aa1a3eb31e80') - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - - # Pillow port - patch -Np1 -i "$srcdir/ocrfeeder-pillow.patch" - - # Python2 fix - sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/ocrfeeder*.in src/ocrfeeder/odf/*.py -} - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - PYTHON=python2 - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install - mkdir -p "$pkgdir/usr/share/pixmaps" - ln -s ../ocrfeeder/icons/ocrfeeder.svg "$pkgdir/usr/share/pixmaps/ocrfeeder.svg" -} Copied: ocrfeeder/repos/community-staging-any/PKGBUILD (from rev 97231, ocrfeeder/trunk/PKGBUILD) === --- PKGBUILD(rev 0) +++ PKGBUILD2013-09-15 14:28:09 UTC (rev 97232) @@ -0,0 +1,47 @@ +# $Id$ +# Maintainer: Balló György + +pkgname=ocrfeeder +pkgver=0.7.11 +pkgrel=4 +pkgdesc="GTK+ document layout analysis and optical character recognition application" +arch=('any') +url="http://live.gnome.org/OCRFeeder"; +license=('GPL') +depends=('python2-pyenchant' 'pygoocanvas' 'python2-gtkspell' 'python2-pillow' \ + 'python2-lxml' 'python2-reportlab' 'ghostscript' 'unpaper' 'sane' 'iso-codes' \ + 'desktop-file-utils') +makedepends=('intltool' 'gnome-doc-utils') +optdepends=('tesseract: character recognition' +'ocrad: character recognition' +'gocr: character recognition' +'cuneiform: character recognition') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz +ocrfeeder-pillow.patch) +sha256sums=('4508f4a0e2fdab521ab4a6d0265058a21fda80622483b169fd041189938ea6d5' +'54dbe61ae384d4f5ed48e9fae0d5d1fc65787916208c87f44862aa1a3eb31e80') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # Pillow port + patch -Np1 -i "$srcdir/ocrfeeder-pillow.patch" + + # Python2 fix + sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/ocrfeeder*.in src/ocrfeeder/odf/*.py +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + PYTHON=python2 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + mkdir -p "$pkgdir/usr/share/pixmaps" + ln -s ../ocrfeeder/icons/ocrfeeder.svg "$pkgdir/usr/share/pixmaps/ocrfeeder.svg" +} Deleted: ocrfeeder-pillow.patch === --- ocrfeeder-pillow.patch 2013-09-15 14:28:04 UTC (rev 97231) +++ ocrfeeder-pillow.patch 2013-09-15 14:28:09 UTC (rev 97232) @@ -1,72 +0,0 @@ -diff -Naur ocrfeeder-0.7.11.orig/src/ocrfeeder/feeder/imageManipulation.py ocrfeeder-0.7.11/src/ocrfeeder/feeder/imageManipulation.py ocrfeeder-0.7.11.orig/src/ocrfeeder/feeder/imageManipulation.
[arch-commits] Commit in ocrfeeder/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 16:28:04 Author: bgyorgy Revision: 97231 upgpkg: ocrfeeder 0.7.11-4 Add iso-codes to dependencies (FS#36938) Modified: ocrfeeder/trunk/PKGBUILD --+ PKGBUILD |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 14:21:15 UTC (rev 97230) +++ PKGBUILD2013-09-15 14:28:04 UTC (rev 97231) @@ -3,12 +3,14 @@ pkgname=ocrfeeder pkgver=0.7.11 -pkgrel=3 +pkgrel=4 pkgdesc="GTK+ document layout analysis and optical character recognition application" arch=('any') url="http://live.gnome.org/OCRFeeder"; license=('GPL') -depends=('python2-pyenchant' 'pygoocanvas' 'python2-gtkspell' 'python2-pillow' 'python2-lxml' 'python2-reportlab' 'ghostscript' 'unpaper' 'sane' 'desktop-file-utils') +depends=('python2-pyenchant' 'pygoocanvas' 'python2-gtkspell' 'python2-pillow' \ + 'python2-lxml' 'python2-reportlab' 'ghostscript' 'unpaper' 'sane' 'iso-codes' \ + 'desktop-file-utils') makedepends=('intltool' 'gnome-doc-utils') optdepends=('tesseract: character recognition' 'ocrad: character recognition'
[arch-commits] Commit in screenlets-pack-basic/trunk (2 files)
Date: Sunday, September 15, 2013 @ 16:21:10 Author: bgyorgy Revision: 97229 upgpkg: screenlets-pack-basic 0.1.6-3 Rebuild for Pillow Added: screenlets-pack-basic/trunk/screenlets-pack-basic-pillow.patch Modified: screenlets-pack-basic/trunk/PKGBUILD + PKGBUILD | 13 screenlets-pack-basic-pillow.patch | 36 +++ 2 files changed, 45 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 14:02:27 UTC (rev 97228) +++ PKGBUILD2013-09-15 14:21:10 UTC (rev 97229) @@ -4,7 +4,7 @@ pkgname=screenlets-pack-basic _pkgname=indiv-screenlets pkgver=0.1.6 -pkgrel=2 +pkgrel=3 pkgdesc="Desktop widgets for Screenlets" arch=('any') url="http://screenlets.org/"; @@ -13,12 +13,14 @@ makedepends=('dos2unix') optdepends=('python2-feedparser: Clear Rss Screenlet' 'python2-pytz: Freemeteo Weather Screenlet' -'python2-imaging: Lipik Screenlet' +'python2-pillow: Lipik, Lyrics Screenlets' 'python2-numpy: Lipik Screenlet') source=(https://launchpad.net/indiv-screenlets/trunk/$pkgver/+download/$_pkgname-$pkgver.tar.bz2 -drop-gnomevfs.patch) +drop-gnomevfs.patch +screenlets-pack-basic-pillow.patch) md5sums=('d908308a60eecbee13a21917d36b10bc' - '0ee366b0eafea6b646a7a5f02df2a65c') + '0ee366b0eafea6b646a7a5f02df2a65c' + '4e30b2ad949e05f2a32770c95f95cd8f') build() { cd "$srcdir/$_pkgname-$pkgver" @@ -27,6 +29,9 @@ # https://code.launchpad.net/~ballogy/indiv-screenlets/lyrics-replace-gnomevfs/+merge/104175 patch -Np1 -i "$srcdir/drop-gnomevfs.patch" + # Port to Pillow + patch -Np1 -i "$srcdir/screenlets-pack-basic-pillow.patch" + # Some files are distributed in DOS format... find . -name \*.py -exec dos2unix -q '{}' \; Added: screenlets-pack-basic-pillow.patch === --- screenlets-pack-basic-pillow.patch (rev 0) +++ screenlets-pack-basic-pillow.patch 2013-09-15 14:21:10 UTC (rev 97229) @@ -0,0 +1,36 @@ +diff -Naur indiv-screenlets-0.1.6.orig/src/dayNight/dayNightScreenlet.py indiv-screenlets-0.1.6/src/dayNight/dayNightScreenlet.py +--- indiv-screenlets-0.1.6.orig/src/dayNight/dayNightScreenlet.py 2012-01-27 22:51:45.0 +0100 indiv-screenlets-0.1.6/src/dayNight/dayNightScreenlet.py 2013-09-15 16:12:07.698782839 +0200 +@@ -32,7 +32,7 @@ + import pango + import math + import os +-import Image ++from PIL import Image + import time + import datetime + import Sun +diff -Naur indiv-screenlets-0.1.6.orig/src/Lipik/LipikScreenlet.py indiv-screenlets-0.1.6/src/Lipik/LipikScreenlet.py +--- indiv-screenlets-0.1.6.orig/src/Lipik/LipikScreenlet.py2012-01-27 22:51:45.0 +0100 indiv-screenlets-0.1.6/src/Lipik/LipikScreenlet.py 2013-09-15 16:12:07.695449426 +0200 +@@ -33,7 +33,7 @@ + from screenlets.options import FontOption, ColorOption + + import gtk +-import Image ++from PIL import Image + import os + from gtk import gdk + import cairo +diff -Naur indiv-screenlets-0.1.6.orig/src/Lyrics/gui/utils.py indiv-screenlets-0.1.6/src/Lyrics/gui/utils.py +--- indiv-screenlets-0.1.6.orig/src/Lyrics/gui/utils.py2011-08-22 08:54:04.0 +0200 indiv-screenlets-0.1.6/src/Lyrics/gui/utils.py 2013-09-15 16:12:07.698782839 +0200 +@@ -127,7 +127,7 @@ + except: + pass + """ +-import Image ++from PIL import Image + def thumbnail(path): + image = Image.open(path) + print dir(image)
[arch-commits] Commit in screenlets-pack-basic/repos (4 files)
Date: Sunday, September 15, 2013 @ 16:21:15 Author: bgyorgy Revision: 97230 archrelease: copy trunk to community-staging-any Added: screenlets-pack-basic/repos/community-staging-any/ screenlets-pack-basic/repos/community-staging-any/PKGBUILD (from rev 97229, screenlets-pack-basic/trunk/PKGBUILD) screenlets-pack-basic/repos/community-staging-any/drop-gnomevfs.patch (from rev 97229, screenlets-pack-basic/trunk/drop-gnomevfs.patch) screenlets-pack-basic/repos/community-staging-any/screenlets-pack-basic-pillow.patch (from rev 97229, screenlets-pack-basic/trunk/screenlets-pack-basic-pillow.patch) + PKGBUILD | 56 +++ drop-gnomevfs.patch| 56 +++ screenlets-pack-basic-pillow.patch | 36 ++ 3 files changed, 148 insertions(+) Copied: screenlets-pack-basic/repos/community-staging-any/PKGBUILD (from rev 97229, screenlets-pack-basic/trunk/PKGBUILD) === --- community-staging-any/PKGBUILD (rev 0) +++ community-staging-any/PKGBUILD 2013-09-15 14:21:15 UTC (rev 97230) @@ -0,0 +1,56 @@ +# $Id$ +# Maintainer: Balló György + +pkgname=screenlets-pack-basic +_pkgname=indiv-screenlets +pkgver=0.1.6 +pkgrel=3 +pkgdesc="Desktop widgets for Screenlets" +arch=('any') +url="http://screenlets.org/"; +license=('GPL3') +depends=('screenlets') +makedepends=('dos2unix') +optdepends=('python2-feedparser: Clear Rss Screenlet' +'python2-pytz: Freemeteo Weather Screenlet' +'python2-pillow: Lipik, Lyrics Screenlets' +'python2-numpy: Lipik Screenlet') +source=(https://launchpad.net/indiv-screenlets/trunk/$pkgver/+download/$_pkgname-$pkgver.tar.bz2 +drop-gnomevfs.patch +screenlets-pack-basic-pillow.patch) +md5sums=('d908308a60eecbee13a21917d36b10bc' + '0ee366b0eafea6b646a7a5f02df2a65c' + '4e30b2ad949e05f2a32770c95f95cd8f') + +build() { + cd "$srcdir/$_pkgname-$pkgver" + + # Remove python2-gnomevfs dependency + # https://code.launchpad.net/~ballogy/indiv-screenlets/lyrics-replace-gnomevfs/+merge/104175 + patch -Np1 -i "$srcdir/drop-gnomevfs.patch" + + # Port to Pillow + patch -Np1 -i "$srcdir/screenlets-pack-basic-pillow.patch" + + # Some files are distributed in DOS format... + find . -name \*.py -exec dos2unix -q '{}' \; + + # Python2 fix + find . -name \*.py -exec sed -i 's@^#.*python$@#!/usr/bin/python2@' '{}' \; + sed -i 's@^#.*python$@#!/usr/bin/python2@' src/Lyrics/gui/{ls_widget,afv_widgets} + sed -i 's/python -u/python2 -u/' setup.py + + # Fix desktop files + sed -i 's/desktop_file % (podir, packname, podir, podir)/desktop_file % (podir, normal_packname, podir, podir)/' setup.py +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + + python2 setup.py install --root=$pkgdir/ --optimize=1 + + # Remove screenlets-pack-all, because a lot of them are broken + rm "$pkgdir"/usr/lib/python2.7/site-packages/screenlets_pack_all-$pkgver-py2.7.egg-info + rm -r "$pkgdir"/usr/share/applications/screenlets_pack_all + rm -r "$pkgdir"/usr/share/screenlets/screenlets-pack-all +} Copied: screenlets-pack-basic/repos/community-staging-any/drop-gnomevfs.patch (from rev 97229, screenlets-pack-basic/trunk/drop-gnomevfs.patch) === --- community-staging-any/drop-gnomevfs.patch (rev 0) +++ community-staging-any/drop-gnomevfs.patch 2013-09-15 14:21:15 UTC (rev 97230) @@ -0,0 +1,56 @@ +diff -Naur indiv-screenlets-0.1.6.orig/src/Lyrics/LyricsPanel.py indiv-screenlets-0.1.6/src/Lyrics/LyricsPanel.py +--- indiv-screenlets-0.1.6.orig/src/Lyrics/LyricsPanel.py 2011-08-22 08:54:04.0 +0200 indiv-screenlets-0.1.6/src/Lyrics/LyricsPanel.py 2012-04-30 18:24:17.030184345 +0200 +@@ -942,9 +942,10 @@ + content = sel_data.get_text() + print content + if content.startswith("file:///"): +- import gnomevfs ++ import gio + print content +- path = gnomevfs.get_local_path_from_uri(content) ++ giof = gio.File(content) ++ path = giof.get_path() + print path + f = open(path.strip(), "r") + lyrics = f.read() +diff -Naur indiv-screenlets-0.1.6.orig/src/Lyrics/players/RhythmboxPlayer.py indiv-screenlets-0.1.6/src/Lyrics/players/RhythmboxPlayer.py +--- indiv-screenlets-0.1.6.orig/src/Lyrics/players/RhythmboxPlayer.py 2011-08-22 08:54:04.0 +0200 indiv-screenlets-0.1.6/src/Lyrics/players/RhythmboxPlayer.py 2012-04-30 18:02:39.264279698 +0200 +@@ -16,7 +16,6 @@ + + + import screenlets +-#import gnomevfs + import utils + from screenlets.pl
[arch-commits] Commit in ocrfeeder/trunk (PKGBUILD ocrfeeder-pillow.patch)
Date: Sunday, September 15, 2013 @ 16:02:23 Author: bgyorgy Revision: 97227 upgpkg: ocrfeeder 0.7.11-3 Rebuild for Pillow Added: ocrfeeder/trunk/ocrfeeder-pillow.patch Modified: ocrfeeder/trunk/PKGBUILD + PKGBUILD | 21 + ocrfeeder-pillow.patch | 72 +++ 2 files changed, 87 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 13:54:10 UTC (rev 97226) +++ PKGBUILD2013-09-15 14:02:23 UTC (rev 97227) @@ -3,12 +3,12 @@ pkgname=ocrfeeder pkgver=0.7.11 -pkgrel=2 +pkgrel=3 pkgdesc="GTK+ document layout analysis and optical character recognition application" arch=('any') url="http://live.gnome.org/OCRFeeder"; license=('GPL') -depends=('python2-pyenchant' 'pygoocanvas' 'python2-gtkspell' 'python2-imaging' 'python2-lxml' 'python2-reportlab' 'ghostscript' 'unpaper' 'sane' 'desktop-file-utils') +depends=('python2-pyenchant' 'pygoocanvas' 'python2-gtkspell' 'python2-pillow' 'python2-lxml' 'python2-reportlab' 'ghostscript' 'unpaper' 'sane' 'desktop-file-utils') makedepends=('intltool' 'gnome-doc-utils') optdepends=('tesseract: character recognition' 'ocrad: character recognition' @@ -15,13 +15,23 @@ 'gocr: character recognition' 'cuneiform: character recognition') install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('4508f4a0e2fdab521ab4a6d0265058a21fda80622483b169fd041189938ea6d5') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz +ocrfeeder-pillow.patch) +sha256sums=('4508f4a0e2fdab521ab4a6d0265058a21fda80622483b169fd041189938ea6d5' +'54dbe61ae384d4f5ed48e9fae0d5d1fc65787916208c87f44862aa1a3eb31e80') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" + + # Pillow port + patch -Np1 -i "$srcdir/ocrfeeder-pillow.patch" + + # Python2 fix sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/ocrfeeder*.in src/ocrfeeder/odf/*.py +} +build() { + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ PYTHON=python2 make @@ -29,7 +39,6 @@ package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install mkdir -p "$pkgdir/usr/share/pixmaps" ln -s ../ocrfeeder/icons/ocrfeeder.svg "$pkgdir/usr/share/pixmaps/ocrfeeder.svg" Added: ocrfeeder-pillow.patch === --- ocrfeeder-pillow.patch (rev 0) +++ ocrfeeder-pillow.patch 2013-09-15 14:02:23 UTC (rev 97227) @@ -0,0 +1,72 @@ +diff -Naur ocrfeeder-0.7.11.orig/src/ocrfeeder/feeder/imageManipulation.py ocrfeeder-0.7.11/src/ocrfeeder/feeder/imageManipulation.py +--- ocrfeeder-0.7.11.orig/src/ocrfeeder/feeder/imageManipulation.py 2012-10-02 20:00:33.0 +0200 ocrfeeder-0.7.11/src/ocrfeeder/feeder/imageManipulation.py 2013-09-15 15:28:11.779102147 +0200 +@@ -21,7 +21,7 @@ + from ocrfeeder.util.lib import debug + + import gettext +-import Image, ImageDraw ++from PIL import Image, ImageDraw + import os.path + from ocrfeeder.util import graphics + import sys +diff -Naur ocrfeeder-0.7.11.orig/src/ocrfeeder/feeder/layoutAnalysis.py ocrfeeder-0.7.11/src/ocrfeeder/feeder/layoutAnalysis.py +--- ocrfeeder-0.7.11.orig/src/ocrfeeder/feeder/layoutAnalysis.py 2013-02-08 08:57:12.0 +0100 ocrfeeder-0.7.11/src/ocrfeeder/feeder/layoutAnalysis.py2013-09-15 15:28:11.779102147 +0200 +@@ -23,7 +23,7 @@ + from ocrfeeder.util.constants import OCRFEEDER_DEBUG, DTP + from ocrfeeder.studio.dataHolder import DataBox + from imageManipulation import ImageProcessor +-import Image ++from PIL import Image + import re + import math + +diff -Naur ocrfeeder-0.7.11.orig/src/ocrfeeder/studio/dataHolder.py ocrfeeder-0.7.11/src/ocrfeeder/studio/dataHolder.py +--- ocrfeeder-0.7.11.orig/src/ocrfeeder/studio/dataHolder.py 2013-02-08 08:57:12.0 +0100 ocrfeeder-0.7.11/src/ocrfeeder/studio/dataHolder.py2013-09-15 15:27:20.787882011 +0200 +@@ -20,7 +20,7 @@ + + import os.path + from ocrfeeder.util import graphics +-import Image ++from PIL import Image + import gobject + from ocrfeeder.util.graphics import getImagePrintSize, getImageResolution + from ocrfeeder.util import TEXT_TYPE, IMAGE_TYPE, ALIGN_LEFT, lib +diff -Naur ocrfeeder-0.7.11.orig/src/ocrfeeder/studio/widgetPresenter.py ocrfeeder-0.7.11/src/ocrfeeder/studio/widgetPresenter.py +--- ocrfeeder-0.7.11.orig/src/ocrfeeder/studio/widgetPresenter.py 2013-02-08 08:57:12.0 +0100 ocrfeeder-0.7.11/src/ocrfeeder/studio/widgetPresenter.py 2013-09-15 15:28:11.775768733 +0200 +@@ -26,7 +26,7 @@ + from ocrfeeder.util.constants import * + from ocrfeeder.util.graphics import convertPixbufToImage + from en
[arch-commits] Commit in ocrfeeder/repos (4 files)
Date: Sunday, September 15, 2013 @ 16:02:27 Author: bgyorgy Revision: 97228 archrelease: copy trunk to community-staging-any Added: ocrfeeder/repos/community-staging-any/ ocrfeeder/repos/community-staging-any/PKGBUILD (from rev 97227, ocrfeeder/trunk/PKGBUILD) ocrfeeder/repos/community-staging-any/ocrfeeder-pillow.patch (from rev 97227, ocrfeeder/trunk/ocrfeeder-pillow.patch) ocrfeeder/repos/community-staging-any/ocrfeeder.install (from rev 97227, ocrfeeder/trunk/ocrfeeder.install) + PKGBUILD | 45 + ocrfeeder-pillow.patch | 72 +++ ocrfeeder.install | 11 +++ 3 files changed, 128 insertions(+) Copied: ocrfeeder/repos/community-staging-any/PKGBUILD (from rev 97227, ocrfeeder/trunk/PKGBUILD) === --- community-staging-any/PKGBUILD (rev 0) +++ community-staging-any/PKGBUILD 2013-09-15 14:02:27 UTC (rev 97228) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Balló György + +pkgname=ocrfeeder +pkgver=0.7.11 +pkgrel=3 +pkgdesc="GTK+ document layout analysis and optical character recognition application" +arch=('any') +url="http://live.gnome.org/OCRFeeder"; +license=('GPL') +depends=('python2-pyenchant' 'pygoocanvas' 'python2-gtkspell' 'python2-pillow' 'python2-lxml' 'python2-reportlab' 'ghostscript' 'unpaper' 'sane' 'desktop-file-utils') +makedepends=('intltool' 'gnome-doc-utils') +optdepends=('tesseract: character recognition' +'ocrad: character recognition' +'gocr: character recognition' +'cuneiform: character recognition') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz +ocrfeeder-pillow.patch) +sha256sums=('4508f4a0e2fdab521ab4a6d0265058a21fda80622483b169fd041189938ea6d5' +'54dbe61ae384d4f5ed48e9fae0d5d1fc65787916208c87f44862aa1a3eb31e80') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # Pillow port + patch -Np1 -i "$srcdir/ocrfeeder-pillow.patch" + + # Python2 fix + sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/ocrfeeder*.in src/ocrfeeder/odf/*.py +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + PYTHON=python2 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install + mkdir -p "$pkgdir/usr/share/pixmaps" + ln -s ../ocrfeeder/icons/ocrfeeder.svg "$pkgdir/usr/share/pixmaps/ocrfeeder.svg" +} Copied: ocrfeeder/repos/community-staging-any/ocrfeeder-pillow.patch (from rev 97227, ocrfeeder/trunk/ocrfeeder-pillow.patch) === --- community-staging-any/ocrfeeder-pillow.patch (rev 0) +++ community-staging-any/ocrfeeder-pillow.patch2013-09-15 14:02:27 UTC (rev 97228) @@ -0,0 +1,72 @@ +diff -Naur ocrfeeder-0.7.11.orig/src/ocrfeeder/feeder/imageManipulation.py ocrfeeder-0.7.11/src/ocrfeeder/feeder/imageManipulation.py +--- ocrfeeder-0.7.11.orig/src/ocrfeeder/feeder/imageManipulation.py 2012-10-02 20:00:33.0 +0200 ocrfeeder-0.7.11/src/ocrfeeder/feeder/imageManipulation.py 2013-09-15 15:28:11.779102147 +0200 +@@ -21,7 +21,7 @@ + from ocrfeeder.util.lib import debug + + import gettext +-import Image, ImageDraw ++from PIL import Image, ImageDraw + import os.path + from ocrfeeder.util import graphics + import sys +diff -Naur ocrfeeder-0.7.11.orig/src/ocrfeeder/feeder/layoutAnalysis.py ocrfeeder-0.7.11/src/ocrfeeder/feeder/layoutAnalysis.py +--- ocrfeeder-0.7.11.orig/src/ocrfeeder/feeder/layoutAnalysis.py 2013-02-08 08:57:12.0 +0100 ocrfeeder-0.7.11/src/ocrfeeder/feeder/layoutAnalysis.py2013-09-15 15:28:11.779102147 +0200 +@@ -23,7 +23,7 @@ + from ocrfeeder.util.constants import OCRFEEDER_DEBUG, DTP + from ocrfeeder.studio.dataHolder import DataBox + from imageManipulation import ImageProcessor +-import Image ++from PIL import Image + import re + import math + +diff -Naur ocrfeeder-0.7.11.orig/src/ocrfeeder/studio/dataHolder.py ocrfeeder-0.7.11/src/ocrfeeder/studio/dataHolder.py +--- ocrfeeder-0.7.11.orig/src/ocrfeeder/studio/dataHolder.py 2013-02-08 08:57:12.0 +0100 ocrfeeder-0.7.11/src/ocrfeeder/studio/dataHolder.py2013-09-15 15:27:20.787882011 +0200 +@@ -20,7 +20,7 @@ + + import os.path + from ocrfeeder.util import graphics +-import Image ++from PIL import Image + import gobject + from ocrfeeder.util.graphics import getImagePrintSize, getImageResolution + from ocrfeeder.util import TEXT_TYPE, IMAGE_TYPE, ALIGN_LEFT, lib +diff -Naur ocrfeeder-0.7.11.orig/src/ocrfeeder/studio/widgetPresenter.py ocrfeeder-0.7.11/src/ocrfeeder/studio/widgetPresenter.py +--- ocrfeeder-0.7.11.orig/src/ocrfeeder/studio/widgetPresenter.py 2013-02-08 08:57:12.0
[arch-commits] Commit in python-pillow/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 15:54:01 Author: bgyorgy Revision: 97225 upgpkg: python-pillow 2.1.0-3 Build ImageSane module, add optional dependencies Modified: python-pillow/trunk/PKGBUILD --+ PKGBUILD | 20 1 file changed, 16 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 13:34:01 UTC (rev 97224) +++ PKGBUILD2013-09-15 13:54:01 UTC (rev 97225) @@ -6,13 +6,13 @@ pkgname=(python-pillow python2-pillow) _appname=Pillow pkgver=2.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="Python Imaging Library (PIL) fork. Python3 version." arch=('i686' 'x86_64') url="http://python-imaging.github.io/"; license=('BSD') depends=('python' 'python2') -makedepends=('python-setuptools' 'python2-setuptools') +makedepends=('python-setuptools' 'python2-setuptools' 'sane') source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip";) md5sums=('ec630d8ae15d4a3c4ae7b7efdeac8200') @@ -23,9 +23,15 @@ package_python-pillow() { depends=('python') - makedepends=('python-setuptools') + makedepends=('python-setuptools' 'sane') + optdepends=('tk: for the ImageTK module' + 'sane: for the ImageSane module' + 'python-pyqt4: for the ImageQt module') cd "$srcdir/$_appname-$pkgver" python3 setup.py install --root="$pkgdir/" --optimize=0 + pushd Sane +python3 setup.py install --root="$pkgdir/" --optimize=0 + popd install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" # clean up bins @@ -38,12 +44,18 @@ package_python2-pillow() { pkgdesc="Python Imaging Library (PIL) fork. Python2 version." depends=('python2') - makedepends=('python2-setuptools') + makedepends=('python2-setuptools' 'sane') + optdepends=('tk: for the ImageTK module' + 'sane: for the ImageSane module' + 'python2-pyqt4: for the ImageQt module') provides=('python-imaging' 'python2-imaging') conflicts=('python-imaging' 'python2-imaging') replaces=('python2-imaging') cd "$srcdir/${_appname}2-$pkgver" python2 setup.py install --root="$pkgdir/" --optimize=0 + pushd Sane +python2 setup.py install --root="$pkgdir/" --optimize=0 + popd install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" # clean up bins
[arch-commits] Commit in python-pillow/repos (4 files)
Date: Sunday, September 15, 2013 @ 15:54:10 Author: bgyorgy Revision: 97226 archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: python-pillow/repos/community-staging-i686/PKGBUILD (from rev 97225, python-pillow/trunk/PKGBUILD) python-pillow/repos/community-staging-x86_64/PKGBUILD (from rev 97225, python-pillow/trunk/PKGBUILD) Deleted: python-pillow/repos/community-staging-i686/PKGBUILD python-pillow/repos/community-staging-x86_64/PKGBUILD ---+ /PKGBUILD | 134 community-staging-i686/PKGBUILD | 55 -- community-staging-x86_64/PKGBUILD | 55 -- 3 files changed, 134 insertions(+), 110 deletions(-) Deleted: community-staging-i686/PKGBUILD === --- community-staging-i686/PKGBUILD 2013-09-15 13:54:01 UTC (rev 97225) +++ community-staging-i686/PKGBUILD 2013-09-15 13:54:10 UTC (rev 97226) @@ -1,55 +0,0 @@ -# $Id$ -# Maintainer: Kyle Keen -# Contributor: minder - -pkgbase=python-pillow -pkgname=(python-pillow python2-pillow) -_appname=Pillow -pkgver=2.1.0 -pkgrel=2 -pkgdesc="Python Imaging Library (PIL) fork. Python3 version." -arch=('i686' 'x86_64') -url="http://python-imaging.github.io/"; -license=('BSD') -depends=('python' 'python2') -makedepends=('python-setuptools' 'python2-setuptools') -source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip";) -md5sums=('ec630d8ae15d4a3c4ae7b7efdeac8200') - -build() { - cd "$srcdir" - cp -r "$srcdir/$_appname-$pkgver" "$srcdir/${_appname}2-$pkgver" -} - -package_python-pillow() { - depends=('python') - makedepends=('python-setuptools') - cd "$srcdir/$_appname-$pkgver" - python3 setup.py install --root="$pkgdir/" --optimize=0 - install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - # clean up bins - cd "$pkgdir/usr/bin" - for f in *.py; do -mv "$f" "${f%.py}" - done -} - -package_python2-pillow() { - pkgdesc="Python Imaging Library (PIL) fork. Python2 version." - depends=('python2') - makedepends=('python2-setuptools') - provides=('python-imaging' 'python2-imaging') - conflicts=('python-imaging' 'python2-imaging') - replaces=('python2-imaging') - cd "$srcdir/${_appname}2-$pkgver" - python2 setup.py install --root="$pkgdir/" --optimize=0 - install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - # clean up bins - cd "$pkgdir/usr/bin" - for f in *.py; do -mv "$f" "${f%.py}2" - done -} - Copied: python-pillow/repos/community-staging-i686/PKGBUILD (from rev 97225, python-pillow/trunk/PKGBUILD) === --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2013-09-15 13:54:10 UTC (rev 97226) @@ -0,0 +1,67 @@ +# $Id$ +# Maintainer: Kyle Keen +# Contributor: minder + +pkgbase=python-pillow +pkgname=(python-pillow python2-pillow) +_appname=Pillow +pkgver=2.1.0 +pkgrel=3 +pkgdesc="Python Imaging Library (PIL) fork. Python3 version." +arch=('i686' 'x86_64') +url="http://python-imaging.github.io/"; +license=('BSD') +depends=('python' 'python2') +makedepends=('python-setuptools' 'python2-setuptools' 'sane') +source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip";) +md5sums=('ec630d8ae15d4a3c4ae7b7efdeac8200') + +build() { + cd "$srcdir" + cp -r "$srcdir/$_appname-$pkgver" "$srcdir/${_appname}2-$pkgver" +} + +package_python-pillow() { + depends=('python') + makedepends=('python-setuptools' 'sane') + optdepends=('tk: for the ImageTK module' + 'sane: for the ImageSane module' + 'python-pyqt4: for the ImageQt module') + cd "$srcdir/$_appname-$pkgver" + python3 setup.py install --root="$pkgdir/" --optimize=0 + pushd Sane +python3 setup.py install --root="$pkgdir/" --optimize=0 + popd + install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # clean up bins + cd "$pkgdir/usr/bin" + for f in *.py; do +mv "$f" "${f%.py}" + done +} + +package_python2-pillow() { + pkgdesc="Python Imaging Library (PIL) fork. Python2 version." + depends=('python2') + makedepends=('python2-setuptools' 'sane') + optdepends=('tk: for the ImageTK module' + 'sane: for the ImageSane module' + 'python2-pyqt4: for the ImageQt module') + provides=('python-imaging' 'python2-imaging') + conflicts=('python-imaging' 'python2-imaging') + replaces=('python2-imaging') + cd "$srcdir/${_appname}2-$pkgver" + python2 setup.py install --root="$pkgdir/" --optimize=0 + pushd Sane +python2 setup.py install --root="$pkgdir/" --optimize=0 + popd + install -Dm644 docs/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + # clean up bins + cd "$pkgdir/usr/bin" + for f in *.py; do +mv "$f" "${f%.py}2" + done +} + Deleted: c
[arch-commits] Commit in aegisub/repos (12 files)
Date: Sunday, September 15, 2013 @ 15:34:01 Author: alucryd Revision: 97224 archrelease: copy trunk to community-i686, community-x86_64 Added: aegisub/repos/community-i686/PKGBUILD (from rev 97223, aegisub/trunk/PKGBUILD) aegisub/repos/community-i686/aegisub.install (from rev 97223, aegisub/trunk/aegisub.install) aegisub/repos/community-i686/wxgtk2.9.5.patch (from rev 97223, aegisub/trunk/wxgtk2.9.5.patch) aegisub/repos/community-x86_64/PKGBUILD (from rev 97223, aegisub/trunk/PKGBUILD) aegisub/repos/community-x86_64/aegisub.install (from rev 97223, aegisub/trunk/aegisub.install) aegisub/repos/community-x86_64/wxgtk2.9.5.patch (from rev 97223, aegisub/trunk/wxgtk2.9.5.patch) Deleted: aegisub/repos/community-i686/PKGBUILD aegisub/repos/community-i686/aegisub.install aegisub/repos/community-i686/wxgtk2.9.5.patch aegisub/repos/community-x86_64/PKGBUILD aegisub/repos/community-x86_64/aegisub.install aegisub/repos/community-x86_64/wxgtk2.9.5.patch ---+ /PKGBUILD | 88 /aegisub.install | 28 +++ /wxgtk2.9.5.patch | 82 + community-i686/PKGBUILD | 46 -- community-i686/aegisub.install| 14 - community-i686/wxgtk2.9.5.patch | 41 community-x86_64/PKGBUILD | 46 -- community-x86_64/aegisub.install | 14 - community-x86_64/wxgtk2.9.5.patch | 41 9 files changed, 198 insertions(+), 202 deletions(-) Deleted: community-i686/PKGBUILD === --- community-i686/PKGBUILD 2013-09-15 13:32:52 UTC (rev 97223) +++ community-i686/PKGBUILD 2013-09-15 13:34:01 UTC (rev 97224) @@ -1,46 +0,0 @@ -# $Id$ -# Maintainer: Maxime Gauduin -# Contributor: kozec -# Contributor: Limao Luo - -pkgname=aegisub -pkgver=3.0.4 -pkgrel=3 -pkgdesc="A general-purpose subtitle editor with ASS/SSA support" -arch=('i686' 'x86_64') -url="http://www.aegisub.org"; -license=('GPL' 'BSD') -depends=('desktop-file-utils' 'ffmpegsource' 'fftw' 'hicolor-icon-theme' 'hunspell' 'lua51' 'wxgtk2.9') -makedepends=('mesa') -install="${pkgname}.install" -source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz"; -'wxgtk2.9.5.patch') -sha256sums=('7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a' -'8aed8aaf4773e4a315f9336d3ea4af2c46b9e84c4e651c202e0a70a6cd9e499c') - -prepare() { - cd ${pkgname}/${pkgname} - - patch -Np2 -i ../../wxgtk2.9.5.patch -} - -build() { - cd ${pkgname}/${pkgname} - - export ACLOCAL=aclocal - export AUTOMAKE=automake - ./autogen.sh --prefix='/usr' --without-{portaudio,openal,oss} --with-wxdir='/usr/include/wx-2.9' --with-wx-config='/usr/bin/wx-config-2.9' - make -} - -package() { - cd ${pkgname}/${pkgname} - - make DESTDIR="${pkgdir}" install - -# License - install -dm 755 "${pkgdir}"/usr/share/licenses/aegisub - install -m 644 LICENCE "${pkgdir}"/usr/share/licenses/aegisub/LICENSE -} - -# vim: ts=2 sw=2 et: Copied: aegisub/repos/community-i686/PKGBUILD (from rev 97223, aegisub/trunk/PKGBUILD) === --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-09-15 13:34:01 UTC (rev 97224) @@ -0,0 +1,44 @@ +# $Id$ +# Maintainer: Maxime Gauduin +# Contributor: kozec +# Contributor: Limao Luo + +pkgname=aegisub +pkgver=3.0.4 +pkgrel=4 +pkgdesc="A general-purpose subtitle editor with ASS/SSA support" +arch=('i686' 'x86_64') +url="http://www.aegisub.org"; +license=('GPL' 'BSD') +depends=('desktop-file-utils' 'ffms2' 'fftw' 'hicolor-icon-theme' 'hunspell' 'lua51' 'wxgtk2.9') +makedepends=('mesa') +install="${pkgname}.install" +source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz"; +'wxgtk2.9.5.patch') +sha256sums=('7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a' +'8aed8aaf4773e4a315f9336d3ea4af2c46b9e84c4e651c202e0a70a6cd9e499c') + +prepare() { + cd ${pkgname}/${pkgname} + + patch -Np2 -i ../../wxgtk2.9.5.patch +} + +build() { + cd ${pkgname}/${pkgname} + + ./configure --prefix='/usr' --without-{portaudio,openal,oss} --with-wxdir='/usr/include/wx-2.9' --with-wx-config='/usr/bin/wx-config-2.9' + make +} + +package() { + cd ${pkgname}/${pkgname} + + make DESTDIR="${pkgdir}" install + +# License + install -dm 755 "${pkgdir}"/usr/share/licenses/aegisub + install -m 644 LICENCE "${pkgdir}"/usr/share/licenses/aegisub/LICENSE +} + +# vim: ts=2 sw=2 et: Deleted: community-i686/aegisub.install === --- community-i686/aegisub.install 2013-09-15 13:32:52 UTC (rev 97223) +++ community-i686/aegisub.install 2013-09-15 13:34:01 UTC (rev 97224) @@ -1,14
[arch-commits] Commit in ffms2 (5 files)
Date: Sunday, September 15, 2013 @ 15:32:52 Author: alucryd Revision: 97223 archrelease: copy trunk to community-i686, community-x86_64 Added: ffms2/repos/ ffms2/repos/community-i686/ ffms2/repos/community-i686/PKGBUILD (from rev 97222, ffms2/trunk/PKGBUILD) ffms2/repos/community-x86_64/ ffms2/repos/community-x86_64/PKGBUILD (from rev 97222, ffms2/trunk/PKGBUILD) ---+ community-i686/PKGBUILD | 34 ++ community-x86_64/PKGBUILD | 34 ++ 2 files changed, 68 insertions(+) Copied: ffms2/repos/community-i686/PKGBUILD (from rev 97222, ffms2/trunk/PKGBUILD) === --- repos/community-i686/PKGBUILD (rev 0) +++ repos/community-i686/PKGBUILD 2013-09-15 13:32:52 UTC (rev 97223) @@ -0,0 +1,34 @@ +# $Id$$ +# Maintainer: Maxime Gauduin + +pkgname=ffms2 +pkgver=2.19 +pkgrel=1 +pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access" +arch=('i686' 'x86_64') +url="https://github.com/FFMS/ffms2"; +license=('MIT') +depends=('ffmpeg') +replaces=('ffmpegsource') +options=('!libtool') +source=("https://github.com/FFMS/ffms2/archive/${pkgver}.tar.gz";) +sha256sums=('6f1379514f03a14092fdfc9941960a9b86f5b78d86f9e000eeddf3bf50d42811') + +build() { + cd ${pkgname}-${pkgver} + + ./configure --prefix='/usr' --enable-shared --disable-static + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install + +# License + install -dm 755 "${pkgdir}"/usr/share/licenses/${pkgname} + install -m 644 {,"${pkgdir}"/usr/share/licenses/${pkgname}/}COPYING +} + +# vim: ts=2 sw=2 et: Copied: ffms2/repos/community-x86_64/PKGBUILD (from rev 97222, ffms2/trunk/PKGBUILD) === --- repos/community-x86_64/PKGBUILD (rev 0) +++ repos/community-x86_64/PKGBUILD 2013-09-15 13:32:52 UTC (rev 97223) @@ -0,0 +1,34 @@ +# $Id$$ +# Maintainer: Maxime Gauduin + +pkgname=ffms2 +pkgver=2.19 +pkgrel=1 +pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access" +arch=('i686' 'x86_64') +url="https://github.com/FFMS/ffms2"; +license=('MIT') +depends=('ffmpeg') +replaces=('ffmpegsource') +options=('!libtool') +source=("https://github.com/FFMS/ffms2/archive/${pkgver}.tar.gz";) +sha256sums=('6f1379514f03a14092fdfc9941960a9b86f5b78d86f9e000eeddf3bf50d42811') + +build() { + cd ${pkgname}-${pkgver} + + ./configure --prefix='/usr' --enable-shared --disable-static + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install + +# License + install -dm 755 "${pkgdir}"/usr/share/licenses/${pkgname} + install -m 644 {,"${pkgdir}"/usr/share/licenses/${pkgname}/}COPYING +} + +# vim: ts=2 sw=2 et:
[arch-commits] Commit in (5 files)
Date: Sunday, September 15, 2013 @ 15:31:58 Author: alucryd Revision: 97222 Replace ffmpegsource with ffms2 Added: ffms2/ ffms2/trunk/ ffms2/trunk/PKGBUILD Modified: aegisub/trunk/PKGBUILD Deleted: ffmpegsource/ + aegisub/trunk/PKGBUILD |8 +++- ffms2/trunk/PKGBUILD | 34 ++ 2 files changed, 37 insertions(+), 5 deletions(-) Modified: aegisub/trunk/PKGBUILD === --- aegisub/trunk/PKGBUILD 2013-09-15 13:21:19 UTC (rev 97221) +++ aegisub/trunk/PKGBUILD 2013-09-15 13:31:58 UTC (rev 97222) @@ -5,12 +5,12 @@ pkgname=aegisub pkgver=3.0.4 -pkgrel=3 +pkgrel=4 pkgdesc="A general-purpose subtitle editor with ASS/SSA support" arch=('i686' 'x86_64') url="http://www.aegisub.org"; license=('GPL' 'BSD') -depends=('desktop-file-utils' 'ffmpegsource' 'fftw' 'hicolor-icon-theme' 'hunspell' 'lua51' 'wxgtk2.9') +depends=('desktop-file-utils' 'ffms2' 'fftw' 'hicolor-icon-theme' 'hunspell' 'lua51' 'wxgtk2.9') makedepends=('mesa') install="${pkgname}.install" source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz"; @@ -27,9 +27,7 @@ build() { cd ${pkgname}/${pkgname} - export ACLOCAL=aclocal - export AUTOMAKE=automake - ./autogen.sh --prefix='/usr' --without-{portaudio,openal,oss} --with-wxdir='/usr/include/wx-2.9' --with-wx-config='/usr/bin/wx-config-2.9' + ./configure --prefix='/usr' --without-{portaudio,openal,oss} --with-wxdir='/usr/include/wx-2.9' --with-wx-config='/usr/bin/wx-config-2.9' make } Added: ffms2/trunk/PKGBUILD === --- ffms2/trunk/PKGBUILD(rev 0) +++ ffms2/trunk/PKGBUILD2013-09-15 13:31:58 UTC (rev 97222) @@ -0,0 +1,34 @@ +# $Id$$ +# Maintainer: Maxime Gauduin + +pkgname=ffms2 +pkgver=2.19 +pkgrel=1 +pkgdesc="A libav/ffmpeg based source library and Avisynth plugin for easy frame accurate access" +arch=('i686' 'x86_64') +url="https://github.com/FFMS/ffms2"; +license=('MIT') +depends=('ffmpeg') +replaces=('ffmpegsource') +options=('!libtool') +source=("https://github.com/FFMS/ffms2/archive/${pkgver}.tar.gz";) +sha256sums=('6f1379514f03a14092fdfc9941960a9b86f5b78d86f9e000eeddf3bf50d42811') + +build() { + cd ${pkgname}-${pkgver} + + ./configure --prefix='/usr' --enable-shared --disable-static + make +} + +package() { + cd ${pkgname}-${pkgver} + + make DESTDIR="${pkgdir}" install + +# License + install -dm 755 "${pkgdir}"/usr/share/licenses/${pkgname} + install -m 644 {,"${pkgdir}"/usr/share/licenses/${pkgname}/}COPYING +} + +# vim: ts=2 sw=2 et: Property changes on: ffms2/trunk/PKGBUILD ___ Added: svn:keywords ## -0,0 +1 ## +Id \ No newline at end of property
[arch-commits] Commit in gwibber/repos (16 files)
Date: Sunday, September 15, 2013 @ 15:21:19 Author: bgyorgy Revision: 97221 archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: gwibber/repos/community-staging-i686/ gwibber/repos/community-staging-i686/PKGBUILD (from rev 97220, gwibber/trunk/PKGBUILD) gwibber/repos/community-staging-i686/gtkspell3-port.patch (from rev 97220, gwibber/trunk/gtkspell3-port.patch) gwibber/repos/community-staging-i686/gwibber-pillow.patch (from rev 97220, gwibber/trunk/gwibber-pillow.patch) gwibber/repos/community-staging-i686/gwibber.install (from rev 97220, gwibber/trunk/gwibber.install) gwibber/repos/community-staging-i686/lp_1051801.patch (from rev 97220, gwibber/trunk/lp_1051801.patch) gwibber/repos/community-staging-i686/lp_1088775.patch (from rev 97220, gwibber/trunk/lp_1088775.patch) gwibber/repos/community-staging-i686/lp_934530.patch (from rev 97220, gwibber/trunk/lp_934530.patch) gwibber/repos/community-staging-x86_64/ gwibber/repos/community-staging-x86_64/PKGBUILD (from rev 97220, gwibber/trunk/PKGBUILD) gwibber/repos/community-staging-x86_64/gtkspell3-port.patch (from rev 97220, gwibber/trunk/gtkspell3-port.patch) gwibber/repos/community-staging-x86_64/gwibber-pillow.patch (from rev 97220, gwibber/trunk/gwibber-pillow.patch) gwibber/repos/community-staging-x86_64/gwibber.install (from rev 97220, gwibber/trunk/gwibber.install) gwibber/repos/community-staging-x86_64/lp_1051801.patch (from rev 97220, gwibber/trunk/lp_1051801.patch) gwibber/repos/community-staging-x86_64/lp_1088775.patch (from rev 97220, gwibber/trunk/lp_1088775.patch) gwibber/repos/community-staging-x86_64/lp_934530.patch (from rev 97220, gwibber/trunk/lp_934530.patch) ---+ community-staging-i686/PKGBUILD | 66 community-staging-i686/gtkspell3-port.patch | 29 ++ community-staging-i686/gwibber-pillow.patch | 24 community-staging-i686/gwibber.install| 12 community-staging-i686/lp_1051801.patch | 12 community-staging-i686/lp_1088775.patch | 16 + community-staging-i686/lp_934530.patch| 21 +++ community-staging-x86_64/PKGBUILD | 66 community-staging-x86_64/gtkspell3-port.patch | 29 ++ community-staging-x86_64/gwibber-pillow.patch | 24 community-staging-x86_64/gwibber.install | 12 community-staging-x86_64/lp_1051801.patch | 12 community-staging-x86_64/lp_1088775.patch | 16 + community-staging-x86_64/lp_934530.patch | 21 +++ 14 files changed, 360 insertions(+) Copied: gwibber/repos/community-staging-i686/PKGBUILD (from rev 97220, gwibber/trunk/PKGBUILD) === --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2013-09-15 13:21:19 UTC (rev 97221) @@ -0,0 +1,66 @@ +# $Id$ +# Maintainer: Balló György + +pkgname=gwibber +pkgver=3.6.0 +pkgrel=5 +pkgdesc="Microblogging client for GNOME, which supports Facebook, Identi.ca, Twitter, Flickr, Foursquare, Sina and Sohu" +arch=('i686' 'x86_64') +url="http://gwibber.com/"; +license=('GPL') +depends=('libgee06' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-pillow' 'python2-xdg' 'dconf') +makedepends=('intltool' 'vala') +options=('!libtool') +install=$pkgname.install +source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz +lp_934530.patch +lp_1051801.patch +lp_1088775.patch +gtkspell3-port.patch +gwibber-pillow.patch) +md5sums=('5988e36e9f592c6eca6537ba6878307a' + '8c43ae0ed96c52602befeff640a8672a' + '0eb53f4f248a6c600b6c6dfaac12341f' + '5698a3b1699c018719b193362486c9b5' + 'e8c657543542d8141fdfe4b87a24d7fe' + '8380d55786490965dfad37be09216dcb') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' + + # Apply some fixes from Ubuntu + patch -Np1 -i "$srcdir/lp_934530.patch" + patch -Np1 -i "$srcdir/lp_1051801.patch" + patch -Np1 -i "$srcdir/lp_1088775.patch" + + # Port to the new gtkspell3 + patch -Np1 -i "$srcdir/gtkspell3-port.patch" + + # Port to python-pillow + patch -Np1 -i "$srcdir/gwibber-pillow.patch" + + # Use the standalone accounts configuration panel + sed -i 's/"gnome-control-center", "credentials", "application=gwibber"/"credentials-preferences"/' client/gwibber-client.vala + sed -i 's/"gnome-control-center", "credentials"/"credentials-preferences"/' gwibber/microblog/dispatcher.py + + # Remove unneeded dependency on libdbusmenu + sed -i '/Dbusmenu-0.4/ d' client/Makefi
[arch-commits] Commit in gwibber/trunk (PKGBUILD gwibber-pillow.patch)
Date: Sunday, September 15, 2013 @ 15:20:04 Author: bgyorgy Revision: 97220 upgpkg: gwibber 3.6.0-5 Rebuild for Pillow Added: gwibber/trunk/gwibber-pillow.patch Modified: gwibber/trunk/PKGBUILD --+ PKGBUILD | 22 -- gwibber-pillow.patch | 24 2 files changed, 40 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 11:50:12 UTC (rev 97219) +++ PKGBUILD2013-09-15 13:20:04 UTC (rev 97220) @@ -3,12 +3,12 @@ pkgname=gwibber pkgver=3.6.0 -pkgrel=4 +pkgrel=5 pkgdesc="Microblogging client for GNOME, which supports Facebook, Identi.ca, Twitter, Flickr, Foursquare, Sina and Sohu" arch=('i686' 'x86_64') url="http://gwibber.com/"; license=('GPL') -depends=('libgee06' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf') +depends=('libgee06' 'account-plugins' 'libnotify' 'libsoup' 'dee' 'json-glib' 'gtkspell3' 'python2-dbus' 'python2-gobject' 'python2-gobject2' 'python2-httplib2' 'python2-oauth' 'python2-pillow' 'python2-xdg' 'dconf') makedepends=('intltool' 'vala') options=('!libtool') install=$pkgname.install @@ -16,14 +16,16 @@ lp_934530.patch lp_1051801.patch lp_1088775.patch -gtkspell3-port.patch) +gtkspell3-port.patch +gwibber-pillow.patch) md5sums=('5988e36e9f592c6eca6537ba6878307a' '8c43ae0ed96c52602befeff640a8672a' '0eb53f4f248a6c600b6c6dfaac12341f' '5698a3b1699c018719b193362486c9b5' - 'e8c657543542d8141fdfe4b87a24d7fe') + 'e8c657543542d8141fdfe4b87a24d7fe' + '8380d55786490965dfad37be09216dcb') -build() { +prepare() { cd "$srcdir/$pkgname-$pkgver" find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' @@ -35,6 +37,9 @@ # Port to the new gtkspell3 patch -Np1 -i "$srcdir/gtkspell3-port.patch" + # Port to python-pillow + patch -Np1 -i "$srcdir/gwibber-pillow.patch" + # Use the standalone accounts configuration panel sed -i 's/"gnome-control-center", "credentials", "application=gwibber"/"credentials-preferences"/' client/gwibber-client.vala sed -i 's/"gnome-control-center", "credentials"/"credentials-preferences"/' gwibber/microblog/dispatcher.py @@ -42,6 +47,12 @@ # Remove unneeded dependency on libdbusmenu sed -i '/Dbusmenu-0.4/ d' client/Makefile.{am,in} + # Fix libaccounts-glib dependency + sed -i 's/--pkg accounts/--pkg libaccounts-glib/' */Makefile.{am,in} */*/Makefile.{am,in} +} + +build() { + cd "$srcdir/$pkgname-$pkgver" autoreconf -fi intltoolize --force ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ @@ -51,6 +62,5 @@ package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install } Added: gwibber-pillow.patch === --- gwibber-pillow.patch(rev 0) +++ gwibber-pillow.patch2013-09-15 13:20:04 UTC (rev 97220) @@ -0,0 +1,24 @@ +diff -Naur gwibber-3.6.0.orig/gwibber/microblog/util/imagehandler.py gwibber-3.6.0/gwibber/microblog/util/imagehandler.py +--- gwibber-3.6.0.orig/gwibber/microblog/util/imagehandler.py 2012-08-21 06:14:09.0 +0200 gwibber-3.6.0/gwibber/microblog/util/imagehandler.py 2013-09-15 15:03:07.056371930 +0200 +@@ -1,6 +1,7 @@ + #!/usr/bin/env python + +-import os, hashlib, urllib2, Image ++import os, hashlib, urllib2 ++from PIL import Image + + DEFAULT_AVATAR = 'http://digg.com/img/udl.png' + +diff -Naur gwibber-3.6.0.orig/gwibber/microblog/util/resources.py gwibber-3.6.0/gwibber/microblog/util/resources.py +--- gwibber-3.6.0.orig/gwibber/microblog/util/resources.py 2012-08-21 06:14:09.0 +0200 gwibber-3.6.0/gwibber/microblog/util/resources.py 2013-09-15 15:02:36.825648020 +0200 +@@ -8,7 +8,7 @@ + from hashlib import sha1 + from os import makedirs, remove, environ + from os.path import join, isdir, realpath, exists +-import Image ++from PIL import Image + from datetime import datetime + from gwibber.microblog import network + from gwibber.microblog.util.const import *
[arch-commits] Commit in glibc/repos (38 files)
Date: Sunday, September 15, 2013 @ 15:12:40 Author: allan Revision: 194391 fix conflict Added: glibc/repos/testing-i686/ glibc/repos/testing-i686/PKGBUILD (from rev 194390, glibc/trunk/PKGBUILD) glibc/repos/testing-i686/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch (from rev 194390, glibc/trunk/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch) glibc/repos/testing-i686/glibc-2.18-readdir_r-CVE-2013-4237.patch (from rev 194390, glibc/trunk/glibc-2.18-readdir_r-CVE-2013-4237.patch) glibc/repos/testing-i686/glibc-2.18-strcoll-CVE-2012-4412+4424.patch (from rev 194390, glibc/trunk/glibc-2.18-strcoll-CVE-2012-4412+4424.patch) glibc/repos/testing-i686/glibc-2.18-strstr-hackfix.patch (from rev 194390, glibc/trunk/glibc-2.18-strstr-hackfix.patch) glibc/repos/testing-i686/glibc.install (from rev 194390, glibc/trunk/glibc.install) glibc/repos/testing-i686/locale-gen (from rev 194390, glibc/trunk/locale-gen) glibc/repos/testing-i686/locale.gen.txt (from rev 194390, glibc/trunk/locale.gen.txt) glibc/repos/testing-i686/nscd.service (from rev 194390, glibc/trunk/nscd.service) glibc/repos/testing-i686/nscd.tmpfiles (from rev 194390, glibc/trunk/nscd.tmpfiles) glibc/repos/testing-x86_64/ glibc/repos/testing-x86_64/PKGBUILD (from rev 194390, glibc/trunk/PKGBUILD) glibc/repos/testing-x86_64/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch (from rev 194390, glibc/trunk/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch) glibc/repos/testing-x86_64/glibc-2.18-readdir_r-CVE-2013-4237.patch (from rev 194390, glibc/trunk/glibc-2.18-readdir_r-CVE-2013-4237.patch) glibc/repos/testing-x86_64/glibc-2.18-strcoll-CVE-2012-4412+4424.patch (from rev 194390, glibc/trunk/glibc-2.18-strcoll-CVE-2012-4412+4424.patch) glibc/repos/testing-x86_64/glibc-2.18-strstr-hackfix.patch (from rev 194390, glibc/trunk/glibc-2.18-strstr-hackfix.patch) glibc/repos/testing-x86_64/glibc.install (from rev 194390, glibc/trunk/glibc.install) glibc/repos/testing-x86_64/locale-gen (from rev 194390, glibc/trunk/locale-gen) glibc/repos/testing-x86_64/locale.gen.txt (from rev 194390, glibc/trunk/locale.gen.txt) glibc/repos/testing-x86_64/nscd.service (from rev 194390, glibc/trunk/nscd.service) glibc/repos/testing-x86_64/nscd.tmpfiles (from rev 194390, glibc/trunk/nscd.tmpfiles) Deleted: glibc/repos/testing-i686/PKGBUILD glibc/repos/testing-i686/glibc-2.18-readdir_r-CVE-2013-4237.patch glibc/repos/testing-i686/glibc-2.18-strstr-hackfix.patch glibc/repos/testing-i686/glibc.install glibc/repos/testing-i686/locale-gen glibc/repos/testing-i686/locale.gen.txt glibc/repos/testing-i686/nscd.service glibc/repos/testing-i686/nscd.tmpfiles glibc/repos/testing-x86_64/PKGBUILD glibc/repos/testing-x86_64/glibc-2.18-readdir_r-CVE-2013-4237.patch glibc/repos/testing-x86_64/glibc-2.18-strstr-hackfix.patch glibc/repos/testing-x86_64/glibc.install glibc/repos/testing-x86_64/locale-gen glibc/repos/testing-x86_64/locale.gen.txt glibc/repos/testing-x86_64/nscd.service glibc/repos/testing-x86_64/nscd.tmpfiles --+ /PKGBUILD| 318 +++ /glibc-2.18-readdir_r-CVE-2013-4237.patch| 562 + /glibc-2.18-strstr-hackfix.patch | 26 /glibc.install | 38 /locale-gen | 84 /locale.gen.txt | 46 /nscd.service| 36 /nscd.tmpfiles |8 testing-i686/PKGBUILD| 148 - testing-i686/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch | 54 testing-i686/glibc-2.18-readdir_r-CVE-2013-4237.patch| 281 -- testing-i686/glibc-2.18-strcoll-CVE-2012-4412+4424.patch | 1004 ++ testing-i686/glibc-2.18-strstr-hackfix.patch | 13 testing-i686/glibc.install | 19 testing-i686/locale-gen | 42 testing-i686/locale.gen.txt | 23 testing-i686/nscd.service| 18 testing-i686/nscd.tmpfiles |4 testing-x86_64/PKGBUILD | 148 - testing-x86_64/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch | 54 testing-x86_64/glibc-2.18-readdir_r-CVE-2013-4237.patch | 281 -- testing-x86_64/glibc-2.18-strcoll-CVE-2012-4412+4424.patch | 1004 ++ testing-x86_64/glibc-2.18-strstr-hackfix.patch | 13 testing-x86_64/glibc.install | 19 testing-x86_64/locale-gen| 42 testing-x86_64/lo
[arch-commits] Commit in glibc/trunk (3 files)
Date: Sunday, September 15, 2013 @ 15:03:44 Author: allan Revision: 194390 upgpkg: glibc 2.18-4 fix CVEs 2012-4412 (strcoll), 2012-4424 (strcoll) and 2013-4432 (malloc) Added: glibc/trunk/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch glibc/trunk/glibc-2.18-strcoll-CVE-2012-4412+4424.patch Modified: glibc/trunk/PKGBUILD ---+ PKGBUILD | 17 glibc-2.18-malloc-corrupt-CVE-2013-4332.patch | 54 + glibc-2.18-strcoll-CVE-2012-4412+4424.patch | 1004 3 files changed, 1072 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 12:35:01 UTC (rev 194389) +++ PKGBUILD2013-09-15 13:03:44 UTC (rev 194390) @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.18 -pkgrel=3 +pkgrel=4 pkgdesc="GNU C Library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc"; @@ -21,6 +21,8 @@ install=glibc.install source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig} glibc-2.18-readdir_r-CVE-2013-4237.patch + glibc-2.18-malloc-corrupt-CVE-2013-4332.patch + glibc-2.18-strcoll-CVE-2012-4412+4424.patch glibc-2.18-strstr-hackfix.patch nscd.service nscd.tmpfiles @@ -29,6 +31,8 @@ md5sums=('88fbbceafee809e82efd52efa1e3c58f' 'SKIP' '154da6bf5a5248f42a7bf5bf08e01a47' + 'b79561ab9dce900e9bbeaf0d49927c2b' + 'c7264b99d0f7e51922a4d3126182c40a' '4441f6dfe7d75ced1fa75e54dd21d36e' 'd5fab2cd3abea65aa5ae696ea4a47d6b' 'da662ca76e7c8d7efbc7986ab7acea2d' @@ -35,13 +39,20 @@ '07ac979b6ab5eeb778d55f041529d623' '476e9113489f93b348b21e144b6a8fcf') - prepare() { cd ${srcdir}/${pkgname}-${pkgver} # upstream commit 91ce4085 patch -p1 -i $srcdir/glibc-2.18-readdir_r-CVE-2013-4237.patch - + + # upstream commits 1159a193, 55e17aad and b73ed247 + patch -p1 -i $srcdir/glibc-2.18-malloc-corrupt-CVE-2013-4332.patch + + # upstream commit 1326ba1a and two not yet committed patches + # https://sourceware.org/ml/libc-alpha/2013-08/msg00394.html + # https://sourceware.org/ml/libc-alpha/2013-08/msg00462.html + patch -p1 -i $srcdir/glibc-2.18-strcoll-CVE-2012-4412+4424.patch + # hack fix for strstr issues on x86 patch -p1 -i $srcdir/glibc-2.18-strstr-hackfix.patch Added: glibc-2.18-malloc-corrupt-CVE-2013-4332.patch === --- glibc-2.18-malloc-corrupt-CVE-2013-4332.patch (rev 0) +++ glibc-2.18-malloc-corrupt-CVE-2013-4332.patch 2013-09-15 13:03:44 UTC (rev 194390) @@ -0,0 +1,54 @@ +diff --git a/malloc/malloc.c b/malloc/malloc.c +index dd295f5..7f43ba3 100644 +--- a/malloc/malloc.c b/malloc/malloc.c +@@ -3082,6 +3082,13 @@ __libc_pvalloc(size_t bytes) + size_t page_mask = GLRO(dl_pagesize) - 1; + size_t rounded_bytes = (bytes + page_mask) & ~(page_mask); + ++ /* Check for overflow. */ ++ if (bytes > SIZE_MAX - 2*pagesz - MINSIZE) ++{ ++ __set_errno (ENOMEM); ++ return 0; ++} ++ + void *(*hook) (size_t, size_t, const void *) = + force_reg (__memalign_hook); + if (__builtin_expect (hook != NULL, 0)) +diff --git a/malloc/malloc.c b/malloc/malloc.c +index 7f43ba3..3148c5f 100644 +--- a/malloc/malloc.c b/malloc/malloc.c +@@ -3046,6 +3046,13 @@ __libc_valloc(size_t bytes) + + size_t pagesz = GLRO(dl_pagesize); + ++ /* Check for overflow. */ ++ if (bytes > SIZE_MAX - pagesz - MINSIZE) ++{ ++ __set_errno (ENOMEM); ++ return 0; ++} ++ + void *(*hook) (size_t, size_t, const void *) = + force_reg (__memalign_hook); + if (__builtin_expect (hook != NULL, 0)) +diff --git a/malloc/malloc.c b/malloc/malloc.c +index 3148c5f..f7718a9 100644 +--- a/malloc/malloc.c b/malloc/malloc.c +@@ -3015,6 +3015,13 @@ __libc_memalign(size_t alignment, size_t bytes) + /* Otherwise, ensure that it is at least a minimum chunk size */ + if (alignment < MINSIZE) alignment = MINSIZE; + ++ /* Check for overflow. */ ++ if (bytes > SIZE_MAX - alignment - MINSIZE) ++{ ++ __set_errno (ENOMEM); ++ return 0; ++} ++ + arena_get(ar_ptr, bytes + alignment + MINSIZE); + if(!ar_ptr) + return 0; Added: glibc-2.18-strcoll-CVE-2012-4412+4424.patch === --- glibc-2.18-strcoll-CVE-2012-4412+4424.patch (rev 0) +++ glibc-2.18-strcoll-CVE-2012-4412+4424.patch 2013-09-15 13:03:44 UTC (rev 194390) @@ -0,0 +1,1004 @@ +diff --git a/string/strcoll_l.c b/string/strcoll_l.c +index ecda08f..bb34a72 100644 +--- a/string/strcoll_l.c b/string/strcoll_l.c +@@ -41,11 +41,434 @@ + + #include "../locale/localeinfo.h" + ++/* Track status while looking for sequences in a string. */ ++typedef struct ++{ ++ int len;/* Len
[arch-commits] Commit in ardour/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 14:34:31 Author: schiv Revision: 194388 upgpkg: ardour 3.4-1 upstream release Modified: ardour/trunk/PKGBUILD --+ PKGBUILD |8 1 file changed, 4 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 11:31:24 UTC (rev 194387) +++ PKGBUILD2013-09-15 12:34:31 UTC (rev 194388) @@ -5,20 +5,20 @@ pkgname=ardour _pkgname=Ardour3 -pkgver=3.3 +pkgver=3.4 pkgrel=1 pkgdesc="Professional-grade digital audio workstation" arch=('i686' 'x86_64') url="http://ardour.org/"; license=('GPL') -depends=('liblrdf' 'liblo' 'libsmf' 'lilv>=0.16.0' - 'aubio' 'libgnomecanvasmm' 'suil>=0.6.12') +depends=('liblrdf' 'liblo' 'libsmf' 'lilv' + 'aubio' 'libgnomecanvasmm' 'suil') makedepends=('python2' 'boost' 'cppunit' 'doxygen' 'graphviz') optdepends=('xjadeo: video monitoring') install=$pkgname.install source=("ftp://ftp.archlinux.org/other/$pkgname/$_pkgname-$pkgver.tar.bz2"; "$pkgname.desktop") -md5sums=('40edf6ab63488d52abf94a2a48d7ac97' +md5sums=('4c2286d9c5de6846e2abaa2a8fab0349' '316bd21ece5e2208a104fd09cac521af') prepare() {
[arch-commits] Commit in ardour/repos (16 files)
Date: Sunday, September 15, 2013 @ 14:35:01 Author: schiv Revision: 194389 archrelease: copy trunk to extra-i686, extra-x86_64 Added: ardour/repos/extra-i686/.contrib (from rev 194388, ardour/trunk/.contrib) ardour/repos/extra-i686/PKGBUILD (from rev 194388, ardour/trunk/PKGBUILD) ardour/repos/extra-i686/ardour.desktop (from rev 194388, ardour/trunk/ardour.desktop) ardour/repos/extra-i686/ardour.install (from rev 194388, ardour/trunk/ardour.install) ardour/repos/extra-x86_64/.contrib (from rev 194388, ardour/trunk/.contrib) ardour/repos/extra-x86_64/PKGBUILD (from rev 194388, ardour/trunk/PKGBUILD) ardour/repos/extra-x86_64/ardour.desktop (from rev 194388, ardour/trunk/ardour.desktop) ardour/repos/extra-x86_64/ardour.install (from rev 194388, ardour/trunk/ardour.install) Deleted: ardour/repos/extra-i686/.contrib ardour/repos/extra-i686/PKGBUILD ardour/repos/extra-i686/ardour.desktop ardour/repos/extra-i686/ardour.install ardour/repos/extra-x86_64/.contrib ardour/repos/extra-x86_64/PKGBUILD ardour/repos/extra-x86_64/ardour.desktop ardour/repos/extra-x86_64/ardour.install -+ /.contrib |4 + /PKGBUILD | 102 ++ /ardour.desktop | 18 +++ /ardour.install | 78 extra-i686/.contrib |2 extra-i686/PKGBUILD | 51 - extra-i686/ardour.desktop |9 --- extra-i686/ardour.install | 39 extra-x86_64/.contrib |2 extra-x86_64/PKGBUILD | 51 - extra-x86_64/ardour.desktop |9 --- extra-x86_64/ardour.install | 39 12 files changed, 202 insertions(+), 202 deletions(-) Deleted: extra-i686/.contrib === --- extra-i686/.contrib 2013-09-15 12:34:31 UTC (rev 194388) +++ extra-i686/.contrib 2013-09-15 12:35:01 UTC (rev 194389) @@ -1,2 +0,0 @@ -# Contributor: Bernardo Barros -# Contributor: Uli Armbruster Copied: ardour/repos/extra-i686/.contrib (from rev 194388, ardour/trunk/.contrib) === --- extra-i686/.contrib (rev 0) +++ extra-i686/.contrib 2013-09-15 12:35:01 UTC (rev 194389) @@ -0,0 +1,2 @@ +# Contributor: Bernardo Barros +# Contributor: Uli Armbruster Deleted: extra-i686/PKGBUILD === --- extra-i686/PKGBUILD 2013-09-15 12:34:31 UTC (rev 194388) +++ extra-i686/PKGBUILD 2013-09-15 12:35:01 UTC (rev 194389) @@ -1,51 +0,0 @@ -# $Id$ -# Maintainer: Ray Rashif -# Contributor: SpepS -# Contributor: see .contrib - -pkgname=ardour -_pkgname=Ardour3 -pkgver=3.3 -pkgrel=1 -pkgdesc="Professional-grade digital audio workstation" -arch=('i686' 'x86_64') -url="http://ardour.org/"; -license=('GPL') -depends=('liblrdf' 'liblo' 'libsmf' 'lilv>=0.16.0' - 'aubio' 'libgnomecanvasmm' 'suil>=0.6.12') -makedepends=('python2' 'boost' 'cppunit' 'doxygen' 'graphviz') -optdepends=('xjadeo: video monitoring') -install=$pkgname.install -source=("ftp://ftp.archlinux.org/other/$pkgname/$_pkgname-$pkgver.tar.bz2"; -"$pkgname.desktop") -md5sums=('40edf6ab63488d52abf94a2a48d7ac97' - '316bd21ece5e2208a104fd09cac521af') - -prepare() { - cd "$srcdir/$_pkgname-$pkgver" - - # python2 fix - sed -i 's/python ${SRC}/python2 ${SRC}/' libs/pbd/wscript -} - -build() { - cd "$srcdir/$_pkgname-$pkgver" - - python2 waf configure --prefix=/usr \ ---configdir=/etc \ ---docs - - python2 waf build $MAKEFLAGS -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - - python2 waf install --destdir="$pkgdir" - - # install some freedesktop.org compatibility - install -Dm644 "$srcdir/$pkgname.desktop" \ -"$pkgdir/usr/share/applications/$pkgname.desktop" -} - -# vim:set ts=2 sw=2 et: Copied: ardour/repos/extra-i686/PKGBUILD (from rev 194388, ardour/trunk/PKGBUILD) === --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2013-09-15 12:35:01 UTC (rev 194389) @@ -0,0 +1,51 @@ +# $Id$ +# Maintainer: Ray Rashif +# Contributor: SpepS +# Contributor: see .contrib + +pkgname=ardour +_pkgname=Ardour3 +pkgver=3.4 +pkgrel=1 +pkgdesc="Professional-grade digital audio workstation" +arch=('i686' 'x86_64') +url="http://ardour.org/"; +license=('GPL') +depends=('liblrdf' 'liblo' 'libsmf' 'lilv' + 'aubio' 'libgnomecanvasmm' 'suil') +makedepends=('python2' 'boost' 'cppunit' 'doxygen' 'graphviz') +optdepends=('xjadeo: video monitoring') +install=$pkgname.install +source=("ftp://ftp.archlinux.org/other/$pkgname/$_pkgname-$pkgver.tar.bz2"; +"$pkgname.desktop") +md5sums=('4c2286d9c5de6846e2abaa2a8fab0349' + '316bd21ec
[arch-commits] Commit in python2-gevent-beta/repos (4 files)
Date: Sunday, September 15, 2013 @ 13:50:12 Author: fyan Revision: 97219 archrelease: copy trunk to community-i686, community-x86_64 Added: python2-gevent-beta/repos/community-i686/PKGBUILD (from rev 97218, python2-gevent-beta/trunk/PKGBUILD) python2-gevent-beta/repos/community-x86_64/PKGBUILD (from rev 97218, python2-gevent-beta/trunk/PKGBUILD) Deleted: python2-gevent-beta/repos/community-i686/PKGBUILD python2-gevent-beta/repos/community-x86_64/PKGBUILD ---+ /PKGBUILD | 66 community-i686/PKGBUILD | 36 community-x86_64/PKGBUILD | 36 3 files changed, 66 insertions(+), 72 deletions(-) Deleted: community-i686/PKGBUILD === --- community-i686/PKGBUILD 2013-09-15 11:48:36 UTC (rev 97218) +++ community-i686/PKGBUILD 2013-09-15 11:50:12 UTC (rev 97219) @@ -1,36 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan - -_pkgbase=gevent -pkgname=python2-${_pkgbase}-beta -pkgver=1.0rc2 -pkgrel=4 -pkgdesc="Python networking library based on greenlet and libev - Beta version" -arch=('i686' 'x86_64') -url="http://www.gevent.org/"; -license=('MIT') -depends=('python2-greenlet') -makedepends=('cython2') -conflicts=('python2-gevent') -provides=("python2-gevent=$pkgver") -source=("https://github.com/surfly/gevent/archive/$pkgver.tar.gz";) - -package() { - cd "$srcdir/${_pkgbase}-${pkgver}" - msg "Starting make..." - - # Workaround - unset MAKEFLAGS - - LIBEV_EMBED=1 \ - CARES_EMBED=1 \ - CYTHON=cython2 \ - PYTHON=python2 \ - python2 setup.py install \ ---prefix=/usr \ ---root="$pkgdir" - - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -md5sums=('e1bce8e15c7ebb08788978c0f4860f9d') Copied: python2-gevent-beta/repos/community-i686/PKGBUILD (from rev 97218, python2-gevent-beta/trunk/PKGBUILD) === --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-09-15 11:50:12 UTC (rev 97219) @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: Felix Yan + +_pkgbase=gevent +pkgname=python2-${_pkgbase}-beta +pkgver=1.0rc3 +pkgrel=1 +pkgdesc="Python networking library based on greenlet and libev - Beta version" +arch=('i686' 'x86_64') +url="http://www.gevent.org/"; +license=('MIT') +depends=('python2-greenlet') +makedepends=('cython2') +conflicts=('python2-gevent') +provides=("python2-gevent=$pkgver") +source=("https://github.com/surfly/gevent/archive/$pkgver.tar.gz";) + +package() { + cd "$srcdir/${_pkgbase}-${pkgver}" + msg "Starting make..." + + LIBEV_EMBED=1 \ + CARES_EMBED=1 \ + CYTHON=cython2 \ + PYTHON=python2 \ + python2 setup.py install \ +--prefix=/usr \ +--root="$pkgdir" + + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +sha512sums=('b0c978a7d3690051175edb862ab5a3132ba31e58c6aaa12ea2715d16679650ec05b239c1fb776a410749dc60ff32f53882c2810789f4e89e1bcb76a7a32b1f48') Deleted: community-x86_64/PKGBUILD === --- community-x86_64/PKGBUILD 2013-09-15 11:48:36 UTC (rev 97218) +++ community-x86_64/PKGBUILD 2013-09-15 11:50:12 UTC (rev 97219) @@ -1,36 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan - -_pkgbase=gevent -pkgname=python2-${_pkgbase}-beta -pkgver=1.0rc2 -pkgrel=4 -pkgdesc="Python networking library based on greenlet and libev - Beta version" -arch=('i686' 'x86_64') -url="http://www.gevent.org/"; -license=('MIT') -depends=('python2-greenlet') -makedepends=('cython2') -conflicts=('python2-gevent') -provides=("python2-gevent=$pkgver") -source=("https://github.com/surfly/gevent/archive/$pkgver.tar.gz";) - -package() { - cd "$srcdir/${_pkgbase}-${pkgver}" - msg "Starting make..." - - # Workaround - unset MAKEFLAGS - - LIBEV_EMBED=1 \ - CARES_EMBED=1 \ - CYTHON=cython2 \ - PYTHON=python2 \ - python2 setup.py install \ ---prefix=/usr \ ---root="$pkgdir" - - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -md5sums=('e1bce8e15c7ebb08788978c0f4860f9d') Copied: python2-gevent-beta/repos/community-x86_64/PKGBUILD (from rev 97218, python2-gevent-beta/trunk/PKGBUILD) === --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2013-09-15 11:50:12 UTC (rev 97219) @@ -0,0 +1,33 @@ +# $Id$ +# Maintainer: Felix Yan + +_pkgbase=gevent +pkgname=python2-${_pkgbase}-beta +pkgver=1.0rc3 +pkgrel=1 +pkgdesc="Python networking library based on greenlet and libev - Beta version" +arch=('i686' 'x86_64') +url="http://www.gevent.org/"; +license=('MIT') +depends=('python2-greenlet') +makedepends=('cython2') +conflicts=('python2-gevent') +provides=("python2-gevent=$pkgver") +source=("https://github.com/surfly/gevent/archive/$pkgver.tar
[arch-commits] Commit in python2-gevent-beta/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 13:48:36 Author: fyan Revision: 97218 upgpkg: python2-gevent-beta 1.0rc3-1 Modified: python2-gevent-beta/trunk/PKGBUILD --+ PKGBUILD |9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 11:42:40 UTC (rev 97217) +++ PKGBUILD2013-09-15 11:48:36 UTC (rev 97218) @@ -3,8 +3,8 @@ _pkgbase=gevent pkgname=python2-${_pkgbase}-beta -pkgver=1.0rc2 -pkgrel=4 +pkgver=1.0rc3 +pkgrel=1 pkgdesc="Python networking library based on greenlet and libev - Beta version" arch=('i686' 'x86_64') url="http://www.gevent.org/"; @@ -19,9 +19,6 @@ cd "$srcdir/${_pkgbase}-${pkgver}" msg "Starting make..." - # Workaround - unset MAKEFLAGS - LIBEV_EMBED=1 \ CARES_EMBED=1 \ CYTHON=cython2 \ @@ -33,4 +30,4 @@ install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } -md5sums=('e1bce8e15c7ebb08788978c0f4860f9d') +sha512sums=('b0c978a7d3690051175edb862ab5a3132ba31e58c6aaa12ea2715d16679650ec05b239c1fb776a410749dc60ff32f53882c2810789f4e89e1bcb76a7a32b1f48')
[arch-commits] Commit in libkkc/repos (4 files)
Date: Sunday, September 15, 2013 @ 13:42:40 Author: fyan Revision: 97217 archrelease: copy trunk to community-i686, community-x86_64 Added: libkkc/repos/community-i686/PKGBUILD (from rev 97216, libkkc/trunk/PKGBUILD) libkkc/repos/community-x86_64/PKGBUILD (from rev 97216, libkkc/trunk/PKGBUILD) Deleted: libkkc/repos/community-i686/PKGBUILD libkkc/repos/community-x86_64/PKGBUILD ---+ /PKGBUILD | 68 community-i686/PKGBUILD | 34 -- community-x86_64/PKGBUILD | 34 -- 3 files changed, 68 insertions(+), 68 deletions(-) Deleted: community-i686/PKGBUILD === --- community-i686/PKGBUILD 2013-09-15 11:41:02 UTC (rev 97216) +++ community-i686/PKGBUILD 2013-09-15 11:42:40 UTC (rev 97217) @@ -1,34 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan -# Contributor: ponsfoot - -pkgname=libkkc -pkgver=0.3.0 -pkgrel=1 -pkgdesc="Japanese Kana Kanji conversion library" -arch=('i686' 'x86_64') -url="https://bitbucket.org/libkkc"; -license=('GPL') -options=(!libtool) -depends=('marisa' 'json-glib' 'libgee06') -makedepends=('vala' 'gobject-introspection' 'intltool' 'python2-marisa') -optdepends=('sh: to use kkc-package-data') -source=(https://bitbucket.org/libkkc/libkkc/downloads/${pkgname}-${pkgver}.tar.gz) - -build() { - cd "${pkgname}-${pkgver}" - - PYTHON=/usr/bin/python2 \ - ./configure --prefix=/usr --disable-static --disable-silent-rules - make -} - -package() { - cd "${pkgname}-${pkgver}" - make DESTDIR="$pkgdir" install - install -d "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}" - install -m 644 README data/rules/README.rules COPYING \ -"${pkgdir}/usr/share/doc/${pkgname}-${pkgver}/" -} - -sha512sums=('32b7268e4566acc7b13b9ae8ac06fe3ea3c23fef2a7157f8246f7ddb7b1f844da111334bea5b0b5ad9ac822a9be3a07ea5126ac59b8add1217aad2ba8157345f') Copied: libkkc/repos/community-i686/PKGBUILD (from rev 97216, libkkc/trunk/PKGBUILD) === --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-09-15 11:42:40 UTC (rev 97217) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Felix Yan +# Contributor: ponsfoot + +pkgname=libkkc +pkgver=0.3.1 +pkgrel=1 +pkgdesc="Japanese Kana Kanji conversion library" +arch=('i686' 'x86_64') +url="https://bitbucket.org/libkkc"; +license=('GPL') +options=(!libtool) +depends=('marisa' 'json-glib' 'libgee06') +makedepends=('vala' 'gobject-introspection' 'intltool' 'python2-marisa') +optdepends=('sh: to use kkc-package-data') +source=(https://bitbucket.org/libkkc/libkkc/downloads/${pkgname}-${pkgver}.tar.gz) + +build() { + cd "${pkgname}-${pkgver}" + + PYTHON=/usr/bin/python2 \ + ./configure --prefix=/usr --disable-static --disable-silent-rules + make +} + +package() { + cd "${pkgname}-${pkgver}" + make DESTDIR="$pkgdir" install + install -d "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}" + install -m 644 README data/rules/README.rules COPYING \ +"${pkgdir}/usr/share/doc/${pkgname}-${pkgver}/" +} + +sha512sums=('6b237930ec0fd0f788364a301b2cf97a0607d708c109cf619b73321255ec50f08c396afde767856a9db6f8e8ceb0117a95eda3a17f3c9c8065a32843b1e97fc0') Deleted: community-x86_64/PKGBUILD === --- community-x86_64/PKGBUILD 2013-09-15 11:41:02 UTC (rev 97216) +++ community-x86_64/PKGBUILD 2013-09-15 11:42:40 UTC (rev 97217) @@ -1,34 +0,0 @@ -# $Id$ -# Maintainer: Felix Yan -# Contributor: ponsfoot - -pkgname=libkkc -pkgver=0.3.0 -pkgrel=1 -pkgdesc="Japanese Kana Kanji conversion library" -arch=('i686' 'x86_64') -url="https://bitbucket.org/libkkc"; -license=('GPL') -options=(!libtool) -depends=('marisa' 'json-glib' 'libgee06') -makedepends=('vala' 'gobject-introspection' 'intltool' 'python2-marisa') -optdepends=('sh: to use kkc-package-data') -source=(https://bitbucket.org/libkkc/libkkc/downloads/${pkgname}-${pkgver}.tar.gz) - -build() { - cd "${pkgname}-${pkgver}" - - PYTHON=/usr/bin/python2 \ - ./configure --prefix=/usr --disable-static --disable-silent-rules - make -} - -package() { - cd "${pkgname}-${pkgver}" - make DESTDIR="$pkgdir" install - install -d "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}" - install -m 644 README data/rules/README.rules COPYING \ -"${pkgdir}/usr/share/doc/${pkgname}-${pkgver}/" -} - -sha512sums=('32b7268e4566acc7b13b9ae8ac06fe3ea3c23fef2a7157f8246f7ddb7b1f844da111334bea5b0b5ad9ac822a9be3a07ea5126ac59b8add1217aad2ba8157345f') Copied: libkkc/repos/community-x86_64/PKGBUILD (from rev 97216, libkkc/trunk/PKGBUILD) === --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2013-09-15 11:42:40 UTC (rev 97217) @@ -0,0 +1,34 @@ +# $Id$ +# Maintainer: Felix Yan +# Contrib
[arch-commits] Commit in libkkc/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 13:41:02 Author: fyan Revision: 97216 upgpkg: libkkc 0.3.1-1 Modified: libkkc/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 11:35:15 UTC (rev 97215) +++ PKGBUILD2013-09-15 11:41:02 UTC (rev 97216) @@ -3,7 +3,7 @@ # Contributor: ponsfoot pkgname=libkkc -pkgver=0.3.0 +pkgver=0.3.1 pkgrel=1 pkgdesc="Japanese Kana Kanji conversion library" arch=('i686' 'x86_64') @@ -31,4 +31,4 @@ "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}/" } -sha512sums=('32b7268e4566acc7b13b9ae8ac06fe3ea3c23fef2a7157f8246f7ddb7b1f844da111334bea5b0b5ad9ac822a9be3a07ea5126ac59b8add1217aad2ba8157345f') +sha512sums=('6b237930ec0fd0f788364a301b2cf97a0607d708c109cf619b73321255ec50f08c396afde767856a9db6f8e8ceb0117a95eda3a17f3c9c8065a32843b1e97fc0')
[arch-commits] Commit in vhba-module/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 13:34:24 Author: tpowa Revision: 97212 upgpkg: vhba-module 20130607-14 rebuild against 3.11.1 Modified: vhba-module/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 11:34:09 UTC (rev 97211) +++ PKGBUILD2013-09-15 11:34:24 UTC (rev 97212) @@ -6,7 +6,7 @@ pkgname=vhba-module pkgver=20130607 _extramodules=extramodules-3.11-ARCH -pkgrel=13 +pkgrel=14 pkgdesc="Kernel module that emulates SCSI devices" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/";
[arch-commits] Commit in vhba-module/repos (12 files)
Date: Sunday, September 15, 2013 @ 13:34:36 Author: tpowa Revision: 97213 archrelease: copy trunk to community-testing-i686, community-testing-x86_64 Added: vhba-module/repos/community-testing-i686/60-vhba.rules (from rev 97212, vhba-module/trunk/60-vhba.rules) vhba-module/repos/community-testing-i686/PKGBUILD (from rev 97212, vhba-module/trunk/PKGBUILD) vhba-module/repos/community-testing-i686/vhba-module.install (from rev 97212, vhba-module/trunk/vhba-module.install) vhba-module/repos/community-testing-x86_64/60-vhba.rules (from rev 97212, vhba-module/trunk/60-vhba.rules) vhba-module/repos/community-testing-x86_64/PKGBUILD (from rev 97212, vhba-module/trunk/PKGBUILD) vhba-module/repos/community-testing-x86_64/vhba-module.install (from rev 97212, vhba-module/trunk/vhba-module.install) Deleted: vhba-module/repos/community-testing-i686/60-vhba.rules vhba-module/repos/community-testing-i686/PKGBUILD vhba-module/repos/community-testing-i686/vhba-module.install vhba-module/repos/community-testing-x86_64/60-vhba.rules vhba-module/repos/community-testing-x86_64/PKGBUILD vhba-module/repos/community-testing-x86_64/vhba-module.install --+ /60-vhba.rules |2 /PKGBUILD| 80 + /vhba-module.install | 44 + community-testing-i686/60-vhba.rules |1 community-testing-i686/PKGBUILD | 40 community-testing-i686/vhba-module.install | 22 -- community-testing-x86_64/60-vhba.rules |1 community-testing-x86_64/PKGBUILD| 40 community-testing-x86_64/vhba-module.install | 22 -- 9 files changed, 126 insertions(+), 126 deletions(-) Deleted: community-testing-i686/60-vhba.rules === --- community-testing-i686/60-vhba.rules2013-09-15 11:34:24 UTC (rev 97212) +++ community-testing-i686/60-vhba.rules2013-09-15 11:34:36 UTC (rev 97213) @@ -1 +0,0 @@ -ACTION=="add", KERNEL=="vhba_ctl", NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu", TAG+="uaccess" Copied: vhba-module/repos/community-testing-i686/60-vhba.rules (from rev 97212, vhba-module/trunk/60-vhba.rules) === --- community-testing-i686/60-vhba.rules(rev 0) +++ community-testing-i686/60-vhba.rules2013-09-15 11:34:36 UTC (rev 97213) @@ -0,0 +1 @@ +ACTION=="add", KERNEL=="vhba_ctl", NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu", TAG+="uaccess" Deleted: community-testing-i686/PKGBUILD === --- community-testing-i686/PKGBUILD 2013-09-15 11:34:24 UTC (rev 97212) +++ community-testing-i686/PKGBUILD 2013-09-15 11:34:36 UTC (rev 97213) @@ -1,40 +0,0 @@ -# $Id$ -# Maintainer: Ray Rashif -# Contributor: Mateusz Herych -# Contributor: Charles Lindsay - -pkgname=vhba-module -pkgver=20130607 -_extramodules=extramodules-3.11-ARCH -pkgrel=13 -pkgdesc="Kernel module that emulates SCSI devices" -arch=('i686' 'x86_64') -url="http://cdemu.sourceforge.net/"; -license=('GPL') -depends=('linux>=3.11' 'linux<3.12') -makedepends=('linux-headers') -options=(!makeflags) -install=$pkgname.install -source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2"; -'60-vhba.rules') -md5sums=('92a681e4665aa85a8335d00395a61697' - '4dc37dc348b5a2c83585829bde790dcc') - -build() { - cd $pkgname-$pkgver - _kernver="$(cat /usr/lib/modules/$_extramodules/version)" - make KDIR=/usr/lib/modules/$_kernver/build -} - -package() { - cd $pkgname-$pkgver - install -Dm644 vhba.ko "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko" - install -Dm644 ../60-vhba.rules "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules" - - cd $startdir - cp -f $install ${install}.pkg - true && install=${install}.pkg - sed -i "s/EXTRAMODULES=.*/EXTRAMODULES=$_extramodules/" $install -} - -# vim:set ts=2 sw=2 et: Copied: vhba-module/repos/community-testing-i686/PKGBUILD (from rev 97212, vhba-module/trunk/PKGBUILD) === --- community-testing-i686/PKGBUILD (rev 0) +++ community-testing-i686/PKGBUILD 2013-09-15 11:34:36 UTC (rev 97213) @@ -0,0 +1,40 @@ +# $Id$ +# Maintainer: Ray Rashif +# Contributor: Mateusz Herych +# Contributor: Charles Lindsay + +pkgname=vhba-module +pkgver=20130607 +_extramodules=extramodules-3.11-ARCH +pkgrel=14 +pkgdesc="Kernel module that emulates SCSI devices" +arch=('i686' 'x86_64') +url="http://cdemu.sourceforge.net/"; +license=('GPL') +depends=('linux>=3.11' 'linux<3.12') +makedepends=('linux-headers') +options=(!makeflags) +install=$pkgname.install +source=("http://downloads.sourceforge.net/cdem
[arch-commits] Commit in virtualbox-modules/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 13:35:01 Author: tpowa Revision: 97214 upgpkg: virtualbox-modules 4.2.18-3 rebuild against 3.11.1 Modified: virtualbox-modules/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 11:34:36 UTC (rev 97213) +++ PKGBUILD2013-09-15 11:35:01 UTC (rev 97214) @@ -5,7 +5,7 @@ pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.2.18 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL')
[arch-commits] Commit in virtualbox-modules/repos (16 files)
Date: Sunday, September 15, 2013 @ 13:35:15 Author: tpowa Revision: 97215 archrelease: copy trunk to community-testing-i686, community-testing-x86_64 Added: virtualbox-modules/repos/community-testing-i686/PKGBUILD (from rev 97214, virtualbox-modules/trunk/PKGBUILD) virtualbox-modules/repos/community-testing-i686/build.sh (from rev 97214, virtualbox-modules/trunk/build.sh) virtualbox-modules/repos/community-testing-i686/virtualbox-guest-modules.install (from rev 97214, virtualbox-modules/trunk/virtualbox-guest-modules.install) virtualbox-modules/repos/community-testing-i686/virtualbox-host-modules.install (from rev 97214, virtualbox-modules/trunk/virtualbox-host-modules.install) virtualbox-modules/repos/community-testing-x86_64/PKGBUILD (from rev 97214, virtualbox-modules/trunk/PKGBUILD) virtualbox-modules/repos/community-testing-x86_64/build.sh (from rev 97214, virtualbox-modules/trunk/build.sh) virtualbox-modules/repos/community-testing-x86_64/virtualbox-guest-modules.install (from rev 97214, virtualbox-modules/trunk/virtualbox-guest-modules.install) virtualbox-modules/repos/community-testing-x86_64/virtualbox-host-modules.install (from rev 97214, virtualbox-modules/trunk/virtualbox-host-modules.install) Deleted: virtualbox-modules/repos/community-testing-i686/PKGBUILD virtualbox-modules/repos/community-testing-i686/build.sh virtualbox-modules/repos/community-testing-i686/virtualbox-guest-modules.install virtualbox-modules/repos/community-testing-i686/virtualbox-host-modules.install virtualbox-modules/repos/community-testing-x86_64/PKGBUILD virtualbox-modules/repos/community-testing-x86_64/build.sh virtualbox-modules/repos/community-testing-x86_64/virtualbox-guest-modules.install virtualbox-modules/repos/community-testing-x86_64/virtualbox-host-modules.install ---+ /PKGBUILD | 124 /build.sh | 120 +++ /virtualbox-guest-modules.install | 42 /virtualbox-host-modules.install | 46 community-testing-i686/PKGBUILD | 62 -- community-testing-i686/build.sh | 60 - community-testing-i686/virtualbox-guest-modules.install | 21 -- community-testing-i686/virtualbox-host-modules.install| 23 -- community-testing-x86_64/PKGBUILD | 62 -- community-testing-x86_64/build.sh | 60 - community-testing-x86_64/virtualbox-guest-modules.install | 21 -- community-testing-x86_64/virtualbox-host-modules.install | 23 -- 12 files changed, 332 insertions(+), 332 deletions(-) Deleted: community-testing-i686/PKGBUILD === --- community-testing-i686/PKGBUILD 2013-09-15 11:35:01 UTC (rev 97214) +++ community-testing-i686/PKGBUILD 2013-09-15 11:35:15 UTC (rev 97215) @@ -1,62 +0,0 @@ -# $Id$ -# Maintainer: Ionut Biru -# Maintainer: Sébastien Luttringer - -pkgbase=virtualbox-modules -pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') -pkgver=4.2.18 -pkgrel=2 -arch=('i686' 'x86_64') -url='http://virtualbox.org' -license=('GPL') -makedepends=('linux>=3.11' 'linux<3.12' - 'linux-headers>=3.11' 'linux-headers<3.12' - "virtualbox-host-dkms>=$pkgver" - "virtualbox-guest-dkms>=$pkgver") - -# remember to also adjust the .install files and the package deps below -_extramodules=extramodules-3.11-ARCH - -build() { - _kernver="$(cat /usr/lib/modules/$_extramodules/version)" - # dkms need modification to be run as user - cp -r /var/lib/dkms . - echo "dkms_tree='$srcdir/dkms'" > dkms.conf - # build host modules - msg2 'Host modules' - dkms --dkmsframework dkms.conf build "vboxhost/$pkgver" -k "$_kernver" - # build guest modules - msg2 'Guest modules' - dkms --dkmsframework dkms.conf build "vboxguest/$pkgver" -k "$_kernver" -} - -package_virtualbox-host-modules(){ - _kernver="$(cat /usr/lib/modules/$_extramodules/version)" - pkgdesc='Host kernel modules for VirtualBox' - depends=('linux>=3.11' 'linux<3.12') - replaces=('virtualbox-modules') - conflicts=('virtualbox-modules') - install=virtualbox-host-modules.install - - cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" - install -dm755 "$pkgdir/usr/lib/modules/$_extramodules/" - install -m644 * "$pkgdir/usr/lib/modules/$_extramodules/" - find "$pkgdir" -name '*.ko' -exec gzip -9 {} + -} - -package_virtualbox-guest-modules(){ - _kernver="$(cat /usr/lib/modules/$_extramodules/version)" - pkgdesc='Guest kernel modules for VirtualBox' - license=('GPL') - depends=('linux>=3.11' 'linux<3.12') - replaces=('virtualbox-archlinux-modules') - conflicts=('virtualbox-archlinux-modules') - install=virtualbox-guest-mod
[arch-commits] Commit in rt3562sta/repos (44 files)
Date: Sunday, September 15, 2013 @ 13:33:40 Author: tpowa Revision: 97209 archrelease: copy trunk to community-testing-i686, community-testing-x86_64 Added: rt3562sta/repos/community-testing-i686/PKGBUILD (from rev 97208, rt3562sta/trunk/PKGBUILD) rt3562sta/repos/community-testing-i686/linux-3.8.patch (from rev 97208, rt3562sta/trunk/linux-3.8.patch) rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-WPA-mixed.patch (from rev 97208, rt3562sta/trunk/rt3562sta-2.4.1.1-WPA-mixed.patch) rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-config.patch (from rev 97208, rt3562sta/trunk/rt3562sta-2.4.1.1-config.patch) rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch (from rev 97208, rt3562sta/trunk/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch) rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch (from rev 97208, rt3562sta/trunk/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch) rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-reduce_debug_output.patch (from rev 97208, rt3562sta/trunk/rt3562sta-2.4.1.1-reduce_debug_output.patch) rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch (from rev 97208, rt3562sta/trunk/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch) rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-remove_date_time.patch (from rev 97208, rt3562sta/trunk/rt3562sta-2.4.1.1-remove_date_time.patch) rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-return_nonvoid.patch (from rev 97208, rt3562sta/trunk/rt3562sta-2.4.1.1-return_nonvoid.patch) rt3562sta/repos/community-testing-i686/rt3562sta.install (from rev 97208, rt3562sta/trunk/rt3562sta.install) rt3562sta/repos/community-testing-x86_64/PKGBUILD (from rev 97208, rt3562sta/trunk/PKGBUILD) rt3562sta/repos/community-testing-x86_64/linux-3.8.patch (from rev 97208, rt3562sta/trunk/linux-3.8.patch) rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-WPA-mixed.patch (from rev 97208, rt3562sta/trunk/rt3562sta-2.4.1.1-WPA-mixed.patch) rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-config.patch (from rev 97208, rt3562sta/trunk/rt3562sta-2.4.1.1-config.patch) rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch (from rev 97208, rt3562sta/trunk/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch) rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch (from rev 97208, rt3562sta/trunk/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch) rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-reduce_debug_output.patch (from rev 97208, rt3562sta/trunk/rt3562sta-2.4.1.1-reduce_debug_output.patch) rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch (from rev 97208, rt3562sta/trunk/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch) rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-remove_date_time.patch (from rev 97208, rt3562sta/trunk/rt3562sta-2.4.1.1-remove_date_time.patch) rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-return_nonvoid.patch (from rev 97208, rt3562sta/trunk/rt3562sta-2.4.1.1-return_nonvoid.patch) rt3562sta/repos/community-testing-x86_64/rt3562sta.install (from rev 97208, rt3562sta/trunk/rt3562sta.install) Deleted: rt3562sta/repos/community-testing-i686/PKGBUILD rt3562sta/repos/community-testing-i686/linux-3.8.patch rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-WPA-mixed.patch rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-config.patch rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-reduce_debug_output.patch rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-remove_date_time.patch rt3562sta/repos/community-testing-i686/rt3562sta-2.4.1.1-return_nonvoid.patch rt3562sta/repos/community-testing-i686/rt3562sta.install rt3562sta/repos/community-testing-x86_64/PKGBUILD rt3562sta/repos/community-testing-x86_64/linux-3.8.patch rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-WPA-mixed.patch rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-config.patch rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-reduce_debug_output.patch rt3562sta/repos/community-testing-x86_64/rt3562sta-2.4.1.1-remove-potential-conflic
[arch-commits] Commit in tp_smapi/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 13:33:59 Author: tpowa Revision: 97210 upgpkg: tp_smapi 0.41-35 rebuild against 3.11.1 Modified: tp_smapi/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 11:33:40 UTC (rev 97209) +++ PKGBUILD2013-09-15 11:33:59 UTC (rev 97210) @@ -10,7 +10,7 @@ pkgname=tp_smapi pkgver=0.41 -pkgrel=34 +pkgrel=35 pkgdesc="Modules for ThinkPad's SMAPI functionality" arch=('i686' 'x86_64') url='https://github.com/evgeni/tp_smapi'
[arch-commits] Commit in tp_smapi/repos (8 files)
Date: Sunday, September 15, 2013 @ 13:34:09 Author: tpowa Revision: 97211 archrelease: copy trunk to community-testing-i686, community-testing-x86_64 Added: tp_smapi/repos/community-testing-i686/PKGBUILD (from rev 97210, tp_smapi/trunk/PKGBUILD) tp_smapi/repos/community-testing-i686/tp_smapi.install (from rev 97210, tp_smapi/trunk/tp_smapi.install) tp_smapi/repos/community-testing-x86_64/PKGBUILD (from rev 97210, tp_smapi/trunk/PKGBUILD) tp_smapi/repos/community-testing-x86_64/tp_smapi.install (from rev 97210, tp_smapi/trunk/tp_smapi.install) Deleted: tp_smapi/repos/community-testing-i686/PKGBUILD tp_smapi/repos/community-testing-i686/tp_smapi.install tp_smapi/repos/community-testing-x86_64/PKGBUILD tp_smapi/repos/community-testing-x86_64/tp_smapi.install ---+ /PKGBUILD | 118 /tp_smapi.install | 26 ++ community-testing-i686/PKGBUILD | 59 -- community-testing-i686/tp_smapi.install | 13 --- community-testing-x86_64/PKGBUILD | 59 -- community-testing-x86_64/tp_smapi.install | 13 --- 6 files changed, 144 insertions(+), 144 deletions(-) Deleted: community-testing-i686/PKGBUILD === --- community-testing-i686/PKGBUILD 2013-09-15 11:33:59 UTC (rev 97210) +++ community-testing-i686/PKGBUILD 2013-09-15 11:34:09 UTC (rev 97211) @@ -1,59 +0,0 @@ -# $Id$ -# Maintainer: Lukas Fleischer -# Contributor: xduugu -# Contributor: nh2 -# Contributor: Steven Davidovitz -# Contributor: Nick B -# Contributor: Christof Musik -# Contributor: Stefan Rupp -# Contributor: Ignas Anikevicius - -pkgname=tp_smapi -pkgver=0.41 -pkgrel=34 -pkgdesc="Modules for ThinkPad's SMAPI functionality" -arch=('i686' 'x86_64') -url='https://github.com/evgeni/tp_smapi' -license=('GPL') -depends=('linux>=3.11' 'linux<3.12') -makedepends=('linux-headers>=3.11' 'linux-headers<3.12') -install="${pkgname}.install" -source=("https://github.com/downloads/evgeni/${pkgname}/${pkgname}-${pkgver}.tar.gz";) -md5sums=('63c683415c764568f6bf17c7eabe4752') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - _kernver=${_kernver:-$(uname -r)} - _extramodules=$(readlink -f "/usr/lib/modules/${_kernver}/extramodules" || true) - _kernver=$(< "${_extramodules}/version") - - sed -ri -e "s/^(KVER\s*:=).*$/\1 ${_kernver}/" \ - -e "s#^(KBASE\s*:=).*\$#\1 ${_extramodules%/*}/${_kernver}#" Makefile - - make HDAPS=1 -} - -package() { - _kernver=${_kernver:-$(uname -r)} - _extramodules=$(readlink -f "/usr/lib/modules/${_kernver}/extramodules" || true) - _kernver=$(< "${_extramodules}/version") - - make -C "${_extramodules%/*}/${_kernver}/build" \ -INSTALL_MOD_PATH="${pkgdir}/${_extramodules%%/lib/*}" \ -M="${srcdir}/${pkgname}-${pkgver}" modules_install - - cd "${pkgdir}/${_extramodules%/*}" - mv "${_kernver}/extra" "${_extramodules##*/}" - rmdir "${_kernver}" - - # compress kernel modules - find "${pkgdir}" -name "*.ko" -exec gzip -9 {} + - - # load module on startup - echo tp_smapi > "${srcdir}/${pkgname}.conf" - install -Dm644 "${srcdir}/${pkgname}.conf" "${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf" - - # update kernel version in install file - sed -ri "s#^(extramodules=).*\$#\1${_extramodules}#" "${startdir}/${pkgname}.install" -} Copied: tp_smapi/repos/community-testing-i686/PKGBUILD (from rev 97210, tp_smapi/trunk/PKGBUILD) === --- community-testing-i686/PKGBUILD (rev 0) +++ community-testing-i686/PKGBUILD 2013-09-15 11:34:09 UTC (rev 97211) @@ -0,0 +1,59 @@ +# $Id$ +# Maintainer: Lukas Fleischer +# Contributor: xduugu +# Contributor: nh2 +# Contributor: Steven Davidovitz +# Contributor: Nick B +# Contributor: Christof Musik +# Contributor: Stefan Rupp +# Contributor: Ignas Anikevicius + +pkgname=tp_smapi +pkgver=0.41 +pkgrel=35 +pkgdesc="Modules for ThinkPad's SMAPI functionality" +arch=('i686' 'x86_64') +url='https://github.com/evgeni/tp_smapi' +license=('GPL') +depends=('linux>=3.11' 'linux<3.12') +makedepends=('linux-headers>=3.11' 'linux-headers<3.12') +install="${pkgname}.install" +source=("https://github.com/downloads/evgeni/${pkgname}/${pkgname}-${pkgver}.tar.gz";) +md5sums=('63c683415c764568f6bf17c7eabe4752') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + _kernver=${_kernver:-$(uname -r)} + _extramodules=$(readlink -f "/usr/lib/modules/${_kernver}/extramodules" || true) + _kernver=$(< "${_extramodules}/version") + + sed -ri -e "s/^(KVER\s*:=).*$/\1 ${_kernver}/" \ + -e "s#^(KBASE\s*:=).*\$#\1 ${_extramodules%/*}/${_kernver}#" Makefile + + make HDAPS=1 +} + +package() { + _kernver=${_kernver:-$(uname -r)} + _extramodules=$(readlink -f "/usr/lib/modules/${_kernver}/extramodules" || true) +
[arch-commits] Commit in rt3562sta/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 13:33:12 Author: tpowa Revision: 97208 upgpkg: rt3562sta 2.4.1.1-44 rebuild against 3.11.1 Modified: rt3562sta/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 11:32:50 UTC (rev 97207) +++ PKGBUILD2013-09-15 11:33:12 UTC (rev 97208) @@ -4,7 +4,7 @@ pkgname=rt3562sta pkgver=2.4.1.1 -pkgrel=43 +pkgrel=44 pkgdesc="Ralink RT3562 PCI WLAN adaptors kernel module" arch=(i686 x86_64) url="http://www.mediatek.com/en/Products/support.php?sn=501";
[arch-commits] Commit in r8168/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 13:32:39 Author: tpowa Revision: 97206 upgpkg: r8168 8.036.00-11 rebuild against 3.11.1 Modified: r8168/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 11:32:07 UTC (rev 97205) +++ PKGBUILD2013-09-15 11:32:39 UTC (rev 97206) @@ -5,7 +5,7 @@ pkgname=r8168 pkgver=8.036.00 -pkgrel=10 +pkgrel=11 pkgdesc="A kernel module for Realtek 8168 network cards" url="http://www.realtek.com.tw"; license=("GPL")
[arch-commits] Commit in r8168/repos (12 files)
Date: Sunday, September 15, 2013 @ 13:32:50 Author: tpowa Revision: 97207 archrelease: copy trunk to community-testing-i686, community-testing-x86_64 Added: r8168/repos/community-testing-i686/PKGBUILD (from rev 97206, r8168/trunk/PKGBUILD) r8168/repos/community-testing-i686/linux-3.10.patch (from rev 97206, r8168/trunk/linux-3.10.patch) r8168/repos/community-testing-i686/r8168.install (from rev 97206, r8168/trunk/r8168.install) r8168/repos/community-testing-x86_64/PKGBUILD (from rev 97206, r8168/trunk/PKGBUILD) r8168/repos/community-testing-x86_64/linux-3.10.patch (from rev 97206, r8168/trunk/linux-3.10.patch) r8168/repos/community-testing-x86_64/r8168.install (from rev 97206, r8168/trunk/r8168.install) Deleted: r8168/repos/community-testing-i686/PKGBUILD r8168/repos/community-testing-i686/linux-3.10.patch r8168/repos/community-testing-i686/r8168.install r8168/repos/community-testing-x86_64/PKGBUILD r8168/repos/community-testing-x86_64/linux-3.10.patch r8168/repos/community-testing-x86_64/r8168.install ---+ /PKGBUILD | 102 /linux-3.10.patch | 118 /r8168.install| 34 community-testing-i686/PKGBUILD | 51 community-testing-i686/linux-3.10.patch | 59 -- community-testing-i686/r8168.install | 17 community-testing-x86_64/PKGBUILD | 51 community-testing-x86_64/linux-3.10.patch | 59 -- community-testing-x86_64/r8168.install| 17 9 files changed, 254 insertions(+), 254 deletions(-) Deleted: community-testing-i686/PKGBUILD === --- community-testing-i686/PKGBUILD 2013-09-15 11:32:39 UTC (rev 97206) +++ community-testing-i686/PKGBUILD 2013-09-15 11:32:50 UTC (rev 97207) @@ -1,51 +0,0 @@ -# $Id$ -# Maintainer: Massimiliano Torromeo -# Contributor: Bob Fanger < bfanger(at)gmail > -# Contributor: Filip , Det < nimetonmaili(at)gmail > - -pkgname=r8168 -pkgver=8.036.00 -pkgrel=10 -pkgdesc="A kernel module for Realtek 8168 network cards" -url="http://www.realtek.com.tw"; -license=("GPL") -arch=('i686' 'x86_64') -depends=('glibc' 'linux') -makedepends=('linux-headers') -source=(http://r8168.googlecode.com/files/$pkgname-$pkgver.tar.bz2 linux-3.10.patch) -install=$pkgname.install - -prepare() { - cd "$pkgname-$pkgver" - patch -p0 -i "$srcdir/linux-3.10.patch" -} - -build() { - _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -) - KERNEL_RELEASE=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version) - - cd "$pkgname-$pkgver" - - # avoid using the Makefile directly -- it doesn't understand - # any kernel but the current. - make -C /usr/lib/modules/$KERNEL_RELEASE/build \ - SUBDIRS="$srcdir/$pkgname-$pkgver/src" \ - EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \ - modules -} - -package() { - _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -) - depends=("linux>=3.${_kernver}" "linux<3.$(expr ${_kernver} + 1)") - KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version) - msg "Kernel = $KERNEL_VERSION" - - cd "$pkgname-$pkgver" - install -Dm644 src/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH/$pkgname.ko" - find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - - sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install" -} - -sha256sums=('937fd5d7d4cbfc95cf2859d8c3beb15a8536dc4e41752f7a53f2a25f07cdcd33' -'1fb115b4d1b6b058d23322b89fad52d29748ce75b2774815e72c679a235d0e87') Copied: r8168/repos/community-testing-i686/PKGBUILD (from rev 97206, r8168/trunk/PKGBUILD) === --- community-testing-i686/PKGBUILD (rev 0) +++ community-testing-i686/PKGBUILD 2013-09-15 11:32:50 UTC (rev 97207) @@ -0,0 +1,51 @@ +# $Id$ +# Maintainer: Massimiliano Torromeo +# Contributor: Bob Fanger < bfanger(at)gmail > +# Contributor: Filip , Det < nimetonmaili(at)gmail > + +pkgname=r8168 +pkgver=8.036.00 +pkgrel=11 +pkgdesc="A kernel module for Realtek 8168 network cards" +url="http://www.realtek.com.tw"; +license=("GPL") +arch=('i686' 'x86_64') +depends=('glibc' 'linux') +makedepends=('linux-headers') +source=(http://r8168.googlecode.com/files/$pkgname-$pkgver.tar.bz2 linux-3.10.patch) +install=$pkgname.install + +prepare() { + cd "$pkgname-$pkgver" + patch -p0 -i "$srcdir/linux-3.10.patch" +} + +build() { + _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -) + KERNEL_RELEASE=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/vers
[arch-commits] Commit in bbswitch/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 13:31:56 Author: tpowa Revision: 97204 upgpkg: bbswitch 0.7-14 rebuild against 3.11.1 Modified: bbswitch/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 11:29:57 UTC (rev 97203) +++ PKGBUILD2013-09-15 11:31:56 UTC (rev 97204) @@ -5,7 +5,7 @@ pkgname=bbswitch pkgver=0.7 _extramodules=extramodules-3.11-ARCH # Don't forget to update bbswitch.install -pkgrel=13 +pkgrel=14 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops" arch=('i686' 'x86_64') url=("http://github.com/Bumblebee-Project/bbswitch";)
[arch-commits] Commit in bbswitch/repos (8 files)
Date: Sunday, September 15, 2013 @ 13:32:07 Author: tpowa Revision: 97205 archrelease: copy trunk to community-testing-i686, community-testing-x86_64 Added: bbswitch/repos/community-testing-i686/PKGBUILD (from rev 97204, bbswitch/trunk/PKGBUILD) bbswitch/repos/community-testing-i686/bbswitch.install (from rev 97204, bbswitch/trunk/bbswitch.install) bbswitch/repos/community-testing-x86_64/PKGBUILD (from rev 97204, bbswitch/trunk/PKGBUILD) bbswitch/repos/community-testing-x86_64/bbswitch.install (from rev 97204, bbswitch/trunk/bbswitch.install) Deleted: bbswitch/repos/community-testing-i686/PKGBUILD bbswitch/repos/community-testing-i686/bbswitch.install bbswitch/repos/community-testing-x86_64/PKGBUILD bbswitch/repos/community-testing-x86_64/bbswitch.install ---+ /PKGBUILD | 64 /bbswitch.install | 24 ++ community-testing-i686/PKGBUILD | 32 -- community-testing-i686/bbswitch.install | 12 - community-testing-x86_64/PKGBUILD | 32 -- community-testing-x86_64/bbswitch.install | 12 - 6 files changed, 88 insertions(+), 88 deletions(-) Deleted: community-testing-i686/PKGBUILD === --- community-testing-i686/PKGBUILD 2013-09-15 11:31:56 UTC (rev 97204) +++ community-testing-i686/PKGBUILD 2013-09-15 11:32:07 UTC (rev 97205) @@ -1,32 +0,0 @@ -# Maintainer: Sven-Hendrik Haase -# Contributor: M0Rf30 -# Contributor: Samsagax - -pkgname=bbswitch -pkgver=0.7 -_extramodules=extramodules-3.11-ARCH # Don't forget to update bbswitch.install -pkgrel=13 -pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops" -arch=('i686' 'x86_64') -url=("http://github.com/Bumblebee-Project/bbswitch";) -license=('GPL') -depends=('linux>=3.11' 'linux<3.12') -makedepends=('linux-headers>=3.11' 'linux-headers<3.12') -install=bbswitch.install -source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz";) -md5sums=('b9df5ea40109ef9766448a0577c798e6') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - - make KDIR=/usr/src/linux-${_kernver} -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - install -Dm644 bbswitch.ko "${pkgdir}"/usr/lib/modules/${_extramodules}/bbswitch.ko - gzip "${pkgdir}/usr/lib/modules/${_extramodules}/bbswitch.ko" -} Copied: bbswitch/repos/community-testing-i686/PKGBUILD (from rev 97204, bbswitch/trunk/PKGBUILD) === --- community-testing-i686/PKGBUILD (rev 0) +++ community-testing-i686/PKGBUILD 2013-09-15 11:32:07 UTC (rev 97205) @@ -0,0 +1,32 @@ +# Maintainer: Sven-Hendrik Haase +# Contributor: M0Rf30 +# Contributor: Samsagax + +pkgname=bbswitch +pkgver=0.7 +_extramodules=extramodules-3.11-ARCH # Don't forget to update bbswitch.install +pkgrel=14 +pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops" +arch=('i686' 'x86_64') +url=("http://github.com/Bumblebee-Project/bbswitch";) +license=('GPL') +depends=('linux>=3.11' 'linux<3.12') +makedepends=('linux-headers>=3.11' 'linux-headers<3.12') +install=bbswitch.install +source=("https://github.com/Bumblebee-Project/bbswitch/archive/v${pkgver}.tar.gz";) +md5sums=('b9df5ea40109ef9766448a0577c798e6') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" + + make KDIR=/usr/src/linux-${_kernver} +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + install -Dm644 bbswitch.ko "${pkgdir}"/usr/lib/modules/${_extramodules}/bbswitch.ko + gzip "${pkgdir}/usr/lib/modules/${_extramodules}/bbswitch.ko" +} Deleted: community-testing-i686/bbswitch.install === --- community-testing-i686/bbswitch.install 2013-09-15 11:31:56 UTC (rev 97204) +++ community-testing-i686/bbswitch.install 2013-09-15 11:32:07 UTC (rev 97205) @@ -1,12 +0,0 @@ -post_install() { -EXTRAMODULES='extramodules-3.11-ARCH' -depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_upgrade() { -post_install -} - -post_remove() { -post_install -} Copied: bbswitch/repos/community-testing-i686/bbswitch.install (from rev 97204, bbswitch/trunk/bbswitch.install) === --- community-testing-i686/bbswitch.install (rev 0) +++ community-testing-i686/bbswitch.install 2013-09-15 11:32:07 UTC (rev 97205) @@ -0,0 +1,12 @@ +post_install() { +EXTRAMODULES='extramodules-3.11-ARCH' +depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_upgrade() { +po
[arch-commits] Commit in lirc/repos (52 files)
Date: Sunday, September 15, 2013 @ 13:31:24 Author: tpowa Revision: 194387 archrelease: copy trunk to testing-i686, testing-x86_64 Added: lirc/repos/testing-i686/PKGBUILD (from rev 194386, lirc/trunk/PKGBUILD) lirc/repos/testing-i686/irexec.service (from rev 194386, lirc/trunk/irexec.service) lirc/repos/testing-i686/kernel-2.6.39.patch (from rev 194386, lirc/trunk/kernel-2.6.39.patch) lirc/repos/testing-i686/linux-3.8.patch (from rev 194386, lirc/trunk/linux-3.8.patch) lirc/repos/testing-i686/lirc-utils.install (from rev 194386, lirc/trunk/lirc-utils.install) lirc/repos/testing-i686/lirc.install (from rev 194386, lirc/trunk/lirc.install) lirc/repos/testing-i686/lirc.logrotate (from rev 194386, lirc/trunk/lirc.logrotate) lirc/repos/testing-i686/lirc.service (from rev 194386, lirc/trunk/lirc.service) lirc/repos/testing-i686/lirc.tmpfiles (from rev 194386, lirc/trunk/lirc.tmpfiles) lirc/repos/testing-i686/lirc_atiusb-kfifo.patch (from rev 194386, lirc/trunk/lirc_atiusb-kfifo.patch) lirc/repos/testing-i686/lirc_wpc8769l.patch (from rev 194386, lirc/trunk/lirc_wpc8769l.patch) lirc/repos/testing-i686/lircd-handle-large-config.patch (from rev 194386, lirc/trunk/lircd-handle-large-config.patch) lirc/repos/testing-i686/lircm.service (from rev 194386, lirc/trunk/lircm.service) lirc/repos/testing-x86_64/PKGBUILD (from rev 194386, lirc/trunk/PKGBUILD) lirc/repos/testing-x86_64/irexec.service (from rev 194386, lirc/trunk/irexec.service) lirc/repos/testing-x86_64/kernel-2.6.39.patch (from rev 194386, lirc/trunk/kernel-2.6.39.patch) lirc/repos/testing-x86_64/linux-3.8.patch (from rev 194386, lirc/trunk/linux-3.8.patch) lirc/repos/testing-x86_64/lirc-utils.install (from rev 194386, lirc/trunk/lirc-utils.install) lirc/repos/testing-x86_64/lirc.install (from rev 194386, lirc/trunk/lirc.install) lirc/repos/testing-x86_64/lirc.logrotate (from rev 194386, lirc/trunk/lirc.logrotate) lirc/repos/testing-x86_64/lirc.service (from rev 194386, lirc/trunk/lirc.service) lirc/repos/testing-x86_64/lirc.tmpfiles (from rev 194386, lirc/trunk/lirc.tmpfiles) lirc/repos/testing-x86_64/lirc_atiusb-kfifo.patch (from rev 194386, lirc/trunk/lirc_atiusb-kfifo.patch) lirc/repos/testing-x86_64/lirc_wpc8769l.patch (from rev 194386, lirc/trunk/lirc_wpc8769l.patch) lirc/repos/testing-x86_64/lircd-handle-large-config.patch (from rev 194386, lirc/trunk/lircd-handle-large-config.patch) lirc/repos/testing-x86_64/lircm.service (from rev 194386, lirc/trunk/lircm.service) Deleted: lirc/repos/testing-i686/PKGBUILD lirc/repos/testing-i686/irexec.service lirc/repos/testing-i686/kernel-2.6.39.patch lirc/repos/testing-i686/linux-3.8.patch lirc/repos/testing-i686/lirc-utils.install lirc/repos/testing-i686/lirc.install lirc/repos/testing-i686/lirc.logrotate lirc/repos/testing-i686/lirc.service lirc/repos/testing-i686/lirc.tmpfiles lirc/repos/testing-i686/lirc_atiusb-kfifo.patch lirc/repos/testing-i686/lirc_wpc8769l.patch lirc/repos/testing-i686/lircd-handle-large-config.patch lirc/repos/testing-i686/lircm.service lirc/repos/testing-x86_64/PKGBUILD lirc/repos/testing-x86_64/irexec.service lirc/repos/testing-x86_64/kernel-2.6.39.patch lirc/repos/testing-x86_64/linux-3.8.patch lirc/repos/testing-x86_64/lirc-utils.install lirc/repos/testing-x86_64/lirc.install lirc/repos/testing-x86_64/lirc.logrotate lirc/repos/testing-x86_64/lirc.service lirc/repos/testing-x86_64/lirc.tmpfiles lirc/repos/testing-x86_64/lirc_atiusb-kfifo.patch lirc/repos/testing-x86_64/lirc_wpc8769l.patch lirc/repos/testing-x86_64/lircd-handle-large-config.patch lirc/repos/testing-x86_64/lircm.service + /PKGBUILD | 214 +++ /irexec.service| 22 ++ /kernel-2.6.39.patch | 108 +++ /linux-3.8.patch | 160 + /lirc-utils.install| 14 + /lirc.install | 32 +++ /lirc.logrotate| 10 + /lirc.service | 22 ++ /lirc.tmpfiles |2 /lirc_atiusb-kfifo.patch | 62 ++ /lirc_wpc8769l.patch | 176 ++ /lircd-handle-large-config.patch | 78 /lircm.service | 22 ++ testing-i686/PKGBUILD | 107 --- testing-i686/irexec.service| 11 - testing-i686/kernel-2.6.39.patch | 54 - testing-i686/linux-3.8.patch | 80 testing-i686/lirc-utils.install|7 testing-i686/lirc.install
[arch-commits] Commit in lirc/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 13:30:54 Author: tpowa Revision: 194386 upgpkg: lirc 1:0.9.0-60 rebuild against 3.11.1 Modified: lirc/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 11:29:07 UTC (rev 194385) +++ PKGBUILD2013-09-15 11:30:54 UTC (rev 194386) @@ -4,7 +4,7 @@ pkgbase=lirc pkgname=('lirc' 'lirc-utils') pkgver=0.9.0 -pkgrel=59 +pkgrel=60 epoch=1 _extramodules=extramodules-3.11-ARCH arch=('i686' 'x86_64')
[arch-commits] Commit in gourmet/repos (6 files)
Date: Sunday, September 15, 2013 @ 13:29:57 Author: schiv Revision: 97203 archrelease: copy trunk to community-staging-any Added: gourmet/repos/community-staging-any/ gourmet/repos/community-staging-any/.contrib (from rev 97202, gourmet/trunk/.contrib) gourmet/repos/community-staging-any/PKGBUILD (from rev 97202, gourmet/trunk/PKGBUILD) gourmet/repos/community-staging-any/gourmet.changelog (from rev 97202, gourmet/trunk/gourmet.changelog) gourmet/repos/community-staging-any/gourmet.install (from rev 97202, gourmet/trunk/gourmet.install) gourmet/repos/community-staging-any/pil.patch (from rev 97202, gourmet/trunk/pil.patch) ---+ .contrib |3 + PKGBUILD | 46 + gourmet.changelog | 48 ++ gourmet.install | 11 ++ pil.patch | 94 5 files changed, 202 insertions(+) Copied: gourmet/repos/community-staging-any/.contrib (from rev 97202, gourmet/trunk/.contrib) === --- community-staging-any/.contrib (rev 0) +++ community-staging-any/.contrib 2013-09-15 11:29:57 UTC (rev 97203) @@ -0,0 +1,3 @@ +# Contributor: Corrado Primier +# Contributor: Eric Belanger +# Contributor: Andrew Conkling Copied: gourmet/repos/community-staging-any/PKGBUILD (from rev 97202, gourmet/trunk/PKGBUILD) === --- community-staging-any/PKGBUILD (rev 0) +++ community-staging-any/PKGBUILD 2013-09-15 11:29:57 UTC (rev 97203) @@ -0,0 +1,46 @@ +# $Id$ +# Maintainer: +# Contributor: Ray Rashif +# Contributor: see .contrib + +pkgname=gourmet +pkgver=0.16.0 +pkgrel=2 +pkgdesc="A simple but powerful recipe-managing application" +arch=('any') +url="http://thinkle.github.io/gourmet/"; +license=('GPL') +depends=('pygtk' 'python2-pillow' 'python2-sqlalchemy' 'hicolor-icon-theme') +makedepends=('python2-distutils-extra') +optdepends=('gstreamer0.10-python: play timer sounds' +'ipython2: Python Shell plugin' +'pyrtf: RTF support' +'python2-beautifulsoup3: Webpage import plugin' +'python2-gtkspell: Spell Checking plugin' +'python2-poppler: Printing and PDF Export plugin' +'python2-reportlab: Printing and PDF Export plugin') +changelog=$pkgname.changelog +install=$pkgname.install +source=("https://launchpad.net/gourmet/main/$pkgver/+download/$pkgname-$pkgver.tar.bz2"; +"pil.patch") +md5sums=('6a4ddb80b40e1bee7797697f03c9ef82' + '6e90c8021d5949525e565c2607d2e6e6') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # python2 fix + for file in $(find . -name '*.py' -print); do +sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file +sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file + done + + # python-imaging -> python-pillow (relative PIL import) + patch -Np1 -i "$srcdir/pil.patch" +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + python2 setup.py install --root="$pkgdir" --optimize=1 +} Copied: gourmet/repos/community-staging-any/gourmet.changelog (from rev 97202, gourmet/trunk/gourmet.changelog) === --- community-staging-any/gourmet.changelog (rev 0) +++ community-staging-any/gourmet.changelog 2013-09-15 11:29:57 UTC (rev 97203) @@ -0,0 +1,48 @@ +2013-04-15 Balló György + + * Version bump: 0.16.0 + Upstream release + + * Update upstream URL + + * Update dependencies + + * Call gtk-update-icon-cache from install script + +2011-05-07 Ray Rashif + + * Version bump: 0.15.9 + Upstream release + +2011-01-28 Ray Rashif + + * Fixed some deps; see https://bugs.archlinux.org/task/22572 + +2010-12-08 Ray Rashif + + * Version bump: 0.15.6 + + * semantics.patch: removed, no longer needed + +2010-06-29 Ray Rashif + + * Version bump: 0.15.4 + + * PKGBUILD: added new changelog array + + * ChangeLog: changed to gourmet.changelog + + * semantics.patch: fixes upstream bug + +2009-08-27 Corrado Primier + + * Version bump: 0.15.0 + +2009-04-18 Corrado Primier + + * Version bump: 0.14.7 + + * PKGBUILD: moved to $srcdir/$pkgdir syntax, added optdepends, added + 'python-sqlalchemy' dependency, added 'intltool' make dependency + + * gourmet.install: removed Copied: gourmet/repos/community-staging-any/gourmet.install (from rev 97202, gourmet/trunk/gourmet.install) === --- community-staging-any/gourmet.install (rev 0) +++ community-staging-any/gourmet.install 2013-09-15 11:29:57 UTC (rev 97203) @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-c
[arch-commits] Commit in gourmet/trunk (.contrib PKGBUILD pil.patch)
Date: Sunday, September 15, 2013 @ 13:29:40 Author: schiv Revision: 97202 upgpkg: gourmet 0.16.0-2 PIL -> Pillow TODO Added: gourmet/trunk/.contrib gourmet/trunk/pil.patch Modified: gourmet/trunk/PKGBUILD ---+ .contrib |3 + PKGBUILD | 30 --- pil.patch | 94 3 files changed, 116 insertions(+), 11 deletions(-) Added: .contrib === --- .contrib(rev 0) +++ .contrib2013-09-15 11:29:40 UTC (rev 97202) @@ -0,0 +1,3 @@ +# Contributor: Corrado Primier +# Contributor: Eric Belanger +# Contributor: Andrew Conkling Modified: PKGBUILD === --- PKGBUILD2013-09-15 10:39:15 UTC (rev 97201) +++ PKGBUILD2013-09-15 11:29:40 UTC (rev 97202) @@ -1,17 +1,16 @@ # $Id$ -# Maintainer: Ray Rashif -# Contributor: Corrado Primier -# Contributor: Eric Belanger -# Contributor: Andrew Conkling +# Maintainer: +# Contributor: Ray Rashif +# Contributor: see .contrib pkgname=gourmet pkgver=0.16.0 -pkgrel=1 +pkgrel=2 pkgdesc="A simple but powerful recipe-managing application" -arch=(any) -url="http://thinkle.github.com/gourmet/"; +arch=('any') +url="http://thinkle.github.io/gourmet/"; license=('GPL') -depends=('pygtk' 'python2-imaging' 'python2-sqlalchemy' 'hicolor-icon-theme') +depends=('pygtk' 'python2-pillow' 'python2-sqlalchemy' 'hicolor-icon-theme') makedepends=('python2-distutils-extra') optdepends=('gstreamer0.10-python: play timer sounds' 'ipython2: Python Shell plugin' @@ -22,10 +21,12 @@ 'python2-reportlab: Printing and PDF Export plugin') changelog=$pkgname.changelog install=$pkgname.install -source=(https://launchpad.net/gourmet/main/$pkgver/+download/$pkgname-$pkgver.tar.bz2) -md5sums=('6a4ddb80b40e1bee7797697f03c9ef82') +source=("https://launchpad.net/gourmet/main/$pkgver/+download/$pkgname-$pkgver.tar.bz2"; +"pil.patch") +md5sums=('6a4ddb80b40e1bee7797697f03c9ef82' + '6e90c8021d5949525e565c2607d2e6e6') -package() { +prepare() { cd "$srcdir/$pkgname-$pkgver" # python2 fix @@ -34,5 +35,12 @@ sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file done + # python-imaging -> python-pillow (relative PIL import) + patch -Np1 -i "$srcdir/pil.patch" +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + python2 setup.py install --root="$pkgdir" --optimize=1 } Added: pil.patch === --- pil.patch (rev 0) +++ pil.patch 2013-09-15 11:29:40 UTC (rev 97202) @@ -0,0 +1,94 @@ +diff -bur gourmet-0.16.0.orig/gourmet/exporters/exporter.py gourmet-0.16.0/gourmet/exporters/exporter.py +--- gourmet-0.16.0.orig/gourmet/exporters/exporter.py 2013-09-15 08:40:09.090420987 + gourmet-0.16.0/gourmet/exporters/exporter.py 2013-09-15 09:00:15.0 + +@@ -1,10 +1,15 @@ +-import re, Image, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap, types ++import re, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap, types + from gourmet import gglobals, convert + from gourmet.gdebug import * + from gettext import gettext as _ + from gourmet.plugin_loader import Pluggable, pluggable_method + from gourmet.plugin import BaseExporterPlugin, BaseExporterMultiRecPlugin + from gourmet.threadManager import SuspendableThread ++# Require PIL module. ++try: ++from PIL import Image ++except ImportError: ++import Image + + REC_ATTR_DIC = gglobals.REC_ATTR_DIC + DEFAULT_ATTR_ORDER = gglobals.DEFAULT_ATTR_ORDER +diff -bur gourmet-0.16.0.orig/gourmet/ImageExtras.py gourmet-0.16.0/gourmet/ImageExtras.py +--- gourmet-0.16.0.orig/gourmet/ImageExtras.py 2013-09-15 08:40:09.097087657 + gourmet-0.16.0/gourmet/ImageExtras.py 2013-09-15 07:12:30.0 + +@@ -1,5 +1,10 @@ +-import os, os.path, tempfile, gtk, Image, StringIO ++import os, os.path, tempfile, gtk, StringIO + from gdebug import * ++# Require PIL module. ++try: ++from PIL import Image ++except ImportError: ++import Image + + TMPFILE = tempfile.mktemp(prefix='gourmet_tempfile_') + +diff -bur gourmet-0.16.0.orig/gourmet/plugins/import_export/html_plugin/html_exporter.py gourmet-0.16.0/gourmet/plugins/import_export/html_plugin/html_exporter.py +--- gourmet-0.16.0.orig/gourmet/plugins/import_export/html_plugin/html_exporter.py 2013-09-15 08:40:09.137087303 + gourmet-0.16.0/gourmet/plugins/import_export/html_plugin/html_exporter.py 2013-09-15 07:13:00.0 + +@@ -1,8 +1,13 @@ +-import re, Image, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap ++import re, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap + from gettext import gettext as _ + from gourmet import convert,gglobals + from gourmet.gdebug import * + from gourmet.expor
[arch-commits] Commit in nvidia-304xx/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 13:28:55 Author: tpowa Revision: 194384 upgpkg: nvidia-304xx 304.108-5 rebuild against 3.11.1 Modified: nvidia-304xx/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 11:27:21 UTC (rev 194383) +++ PKGBUILD2013-09-15 11:28:55 UTC (rev 194384) @@ -4,7 +4,7 @@ pkgname=nvidia-304xx pkgver=304.108 _extramodules=extramodules-3.11-ARCH -pkgrel=4 +pkgrel=5 pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" arch=('i686' 'x86_64') url="http://www.nvidia.com/";
[arch-commits] Commit in nvidia-304xx/repos (12 files)
Date: Sunday, September 15, 2013 @ 13:29:07 Author: tpowa Revision: 194385 archrelease: copy trunk to testing-i686, testing-x86_64 Added: nvidia-304xx/repos/testing-i686/PKGBUILD (from rev 194384, nvidia-304xx/trunk/PKGBUILD) nvidia-304xx/repos/testing-i686/nvidia-linux-3.11.patch (from rev 194384, nvidia-304xx/trunk/nvidia-linux-3.11.patch) nvidia-304xx/repos/testing-i686/nvidia.install (from rev 194384, nvidia-304xx/trunk/nvidia.install) nvidia-304xx/repos/testing-x86_64/PKGBUILD (from rev 194384, nvidia-304xx/trunk/PKGBUILD) nvidia-304xx/repos/testing-x86_64/nvidia-linux-3.11.patch (from rev 194384, nvidia-304xx/trunk/nvidia-linux-3.11.patch) nvidia-304xx/repos/testing-x86_64/nvidia.install (from rev 194384, nvidia-304xx/trunk/nvidia.install) Deleted: nvidia-304xx/repos/testing-i686/PKGBUILD nvidia-304xx/repos/testing-i686/nvidia-linux-3.11.patch nvidia-304xx/repos/testing-i686/nvidia.install nvidia-304xx/repos/testing-x86_64/PKGBUILD nvidia-304xx/repos/testing-x86_64/nvidia-linux-3.11.patch nvidia-304xx/repos/testing-x86_64/nvidia.install + /PKGBUILD | 100 +++ /nvidia-linux-3.11.patch | 50 +++ /nvidia.install| 30 + testing-i686/PKGBUILD | 50 --- testing-i686/nvidia-linux-3.11.patch | 25 --- testing-i686/nvidia.install| 15 testing-x86_64/PKGBUILD| 50 --- testing-x86_64/nvidia-linux-3.11.patch | 25 --- testing-x86_64/nvidia.install | 15 9 files changed, 180 insertions(+), 180 deletions(-) Deleted: testing-i686/PKGBUILD === --- testing-i686/PKGBUILD 2013-09-15 11:28:55 UTC (rev 194384) +++ testing-i686/PKGBUILD 2013-09-15 11:29:07 UTC (rev 194385) @@ -1,50 +0,0 @@ -# $Id$ -# Maintainer : Thomas Baechler - -pkgname=nvidia-304xx -pkgver=304.108 -_extramodules=extramodules-3.11-ARCH -pkgrel=4 -pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" -arch=('i686' 'x86_64') -url="http://www.nvidia.com/"; -depends=('linux>=3.11' 'linux<3.12' "nvidia-304xx-utils=${pkgver}") -makedepends=('linux-headers>=3.11' 'linux-headers<3.12') -conflicts=('nvidia' 'nvidia-96xx' 'nvidia-173xx') -license=('custom') -install=nvidia.install -options=(!strip) -source=('nvidia-linux-3.11.patch') -md5sums=('5c962760de069ed4ad34e64d5988686a') - -if [ "$CARCH" = "i686" ]; then -_arch='x86' -_pkg="NVIDIA-Linux-${_arch}-${pkgver}" - source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";) -md5sums+=('ef453e32515c2176c67ebd95c770dc0e') -elif [ "$CARCH" = "x86_64" ]; then -_arch='x86_64' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" - source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";) -md5sums+=('4e0e54de6735023f44c858a3006b3e18') -fi - - -build() { -_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" -cd "${srcdir}" -sh "${_pkg}.run" --extract-only -cd "${_pkg}/kernel" -patch -Np2 -i ${srcdir}/nvidia-linux-3.11.patch -make SYSSRC=/usr/lib/modules/"${_kernver}/build" module -} - -package() { -install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ -"${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" -install -d -m755 "${pkgdir}/usr/lib/modprobe.d" -echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" -sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" -gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" -install -D -m644 ${srcdir}/${_pkg}/LICENSE "${pkgdir}/usr/share/licenses/nvidia-304xx/LICENSE" -} Copied: nvidia-304xx/repos/testing-i686/PKGBUILD (from rev 194384, nvidia-304xx/trunk/PKGBUILD) === --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2013-09-15 11:29:07 UTC (rev 194385) @@ -0,0 +1,50 @@ +# $Id$ +# Maintainer : Thomas Baechler + +pkgname=nvidia-304xx +pkgver=304.108 +_extramodules=extramodules-3.11-ARCH +pkgrel=5 +pkgdesc="NVIDIA drivers for linux, 304xx legacy branch" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/"; +depends=('linux>=3.11' 'linux<3.12' "nvidia-304xx-utils=${pkgver}") +makedepends=('linux-headers>=3.11' 'linux-headers<3.12') +conflicts=('nvidia' 'nvidia-96xx' 'nvidia-173xx') +license=('custom') +install=nvidia.install +options=(!strip) +source=('nvidia-linux-3.11.patch') +md5sums=('5c962760de069ed4ad34e64d5988686a') + +if [ "$CARCH" = "i686" ]; then +_arch='x86' +_pkg="NVIDIA-Linux-${_arch}-${pkgver}" + source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";) +md5sums+=('ef453e32515c2176c67ebd95c770dc0e') +elif
[arch-commits] Commit in nvidia/repos (12 files)
Date: Sunday, September 15, 2013 @ 13:27:21 Author: tpowa Revision: 194383 archrelease: copy trunk to testing-i686, testing-x86_64 Added: nvidia/repos/testing-i686/PKGBUILD (from rev 194382, nvidia/trunk/PKGBUILD) nvidia/repos/testing-i686/nvidia-linux-3.11.patch (from rev 194382, nvidia/trunk/nvidia-linux-3.11.patch) nvidia/repos/testing-i686/nvidia.install (from rev 194382, nvidia/trunk/nvidia.install) nvidia/repos/testing-x86_64/PKGBUILD (from rev 194382, nvidia/trunk/PKGBUILD) nvidia/repos/testing-x86_64/nvidia-linux-3.11.patch (from rev 194382, nvidia/trunk/nvidia-linux-3.11.patch) nvidia/repos/testing-x86_64/nvidia.install (from rev 194382, nvidia/trunk/nvidia.install) Deleted: nvidia/repos/testing-i686/PKGBUILD nvidia/repos/testing-i686/nvidia-linux-3.11.patch nvidia/repos/testing-i686/nvidia.install nvidia/repos/testing-x86_64/PKGBUILD nvidia/repos/testing-x86_64/nvidia-linux-3.11.patch nvidia/repos/testing-x86_64/nvidia.install + /PKGBUILD | 96 +++ /nvidia-linux-3.11.patch | 50 /nvidia.install| 36 +++ testing-i686/PKGBUILD | 48 --- testing-i686/nvidia-linux-3.11.patch | 25 testing-i686/nvidia.install| 18 - testing-x86_64/PKGBUILD| 48 --- testing-x86_64/nvidia-linux-3.11.patch | 25 testing-x86_64/nvidia.install | 18 - 9 files changed, 182 insertions(+), 182 deletions(-) Deleted: testing-i686/PKGBUILD === --- testing-i686/PKGBUILD 2013-09-15 11:27:06 UTC (rev 194382) +++ testing-i686/PKGBUILD 2013-09-15 11:27:21 UTC (rev 194383) @@ -1,48 +0,0 @@ -# $Id$ -# Maintainer : Thomas Baechler - -pkgname=nvidia -pkgver=325.15 -_extramodules=extramodules-3.11-ARCH -pkgrel=6 -pkgdesc="NVIDIA drivers for linux" -arch=('i686' 'x86_64') -url="http://www.nvidia.com/"; -depends=('linux>=3.11' 'linux<3.12' "nvidia-libgl" "nvidia-utils=${pkgver}") -makedepends=('linux-headers>=3.11' 'linux-headers<3.12') -conflicts=('nvidia-96xx' 'nvidia-173xx') -license=('custom') -install=nvidia.install -options=(!strip) -source=('nvidia-linux-3.11.patch') -md5sums=('5c962760de069ed4ad34e64d5988686a') - -if [ "$CARCH" = "i686" ]; then -_arch='x86' -_pkg="NVIDIA-Linux-${_arch}-${pkgver}" - source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";) -md5sums+=('528fc538584de6446384b9cec3099d6c') -elif [ "$CARCH" = "x86_64" ]; then -_arch='x86_64' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" - source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";) -md5sums+=('63b2caa0cb128efa1a7808d7bddb2074') -fi - -build() { -_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" -cd "${srcdir}" -sh "${_pkg}.run" --extract-only -cd "${_pkg}/kernel" -patch -Np2 -i ${srcdir}/nvidia-linux-3.11.patch -make SYSSRC=/usr/lib/modules/"${_kernver}/build" module -} - -package() { -install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \ -"${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" -install -d -m755 "${pkgdir}/usr/lib/modprobe.d" -echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf" -sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install" -gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko" -} Copied: nvidia/repos/testing-i686/PKGBUILD (from rev 194382, nvidia/trunk/PKGBUILD) === --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2013-09-15 11:27:21 UTC (rev 194383) @@ -0,0 +1,48 @@ +# $Id$ +# Maintainer : Thomas Baechler + +pkgname=nvidia +pkgver=325.15 +_extramodules=extramodules-3.11-ARCH +pkgrel=7 +pkgdesc="NVIDIA drivers for linux" +arch=('i686' 'x86_64') +url="http://www.nvidia.com/"; +depends=('linux>=3.11' 'linux<3.12' "nvidia-libgl" "nvidia-utils=${pkgver}") +makedepends=('linux-headers>=3.11' 'linux-headers<3.12') +conflicts=('nvidia-96xx' 'nvidia-173xx') +license=('custom') +install=nvidia.install +options=(!strip) +source=('nvidia-linux-3.11.patch') +md5sums=('5c962760de069ed4ad34e64d5988686a') + +if [ "$CARCH" = "i686" ]; then +_arch='x86' +_pkg="NVIDIA-Linux-${_arch}-${pkgver}" + source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";) +md5sums+=('528fc538584de6446384b9cec3099d6c') +elif [ "$CARCH" = "x86_64" ]; then +_arch='x86_64' + _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" + source+=("ftp://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run";) +md5sums+=('63b2caa0cb128efa1a7808d7bddb2074') +fi + +build() { +_ker
[arch-commits] Commit in nvidia/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 13:27:06 Author: tpowa Revision: 194382 upgpkg: nvidia 325.15-7 rebuild against 3.11.1 Modified: nvidia/trunk/PKGBUILD --+ PKGBUILD |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 10:04:52 UTC (rev 194381) +++ PKGBUILD2013-09-15 11:27:06 UTC (rev 194382) @@ -4,7 +4,7 @@ pkgname=nvidia pkgver=325.15 _extramodules=extramodules-3.11-ARCH -pkgrel=6 +pkgrel=7 pkgdesc="NVIDIA drivers for linux" arch=('i686' 'x86_64') url="http://www.nvidia.com/";
[arch-commits] Commit in puddletag/repos (2 files)
Date: Sunday, September 15, 2013 @ 12:39:15 Author: alucryd Revision: 97201 archrelease: copy trunk to community-staging-any Added: puddletag/repos/community-staging-any/ puddletag/repos/community-staging-any/PKGBUILD (from rev 97200, puddletag/trunk/PKGBUILD) --+ PKGBUILD | 37 + 1 file changed, 37 insertions(+) Copied: puddletag/repos/community-staging-any/PKGBUILD (from rev 97200, puddletag/trunk/PKGBUILD) === --- community-staging-any/PKGBUILD (rev 0) +++ community-staging-any/PKGBUILD 2013-09-15 10:39:15 UTC (rev 97201) @@ -0,0 +1,37 @@ +# $Id$ +# Maintainer: Maxime Gauduin +# Contributor: Lucky +# Contributor: Farhad Shahbazi + +pkgname=puddletag +pkgver=1.0.2rc1 +pkgrel=2 +pkgdesc="A tag editor for GNU/Linux" +url="http://puddletag.sourceforge.net"; +license=("GPL") +arch=("any") +depends=("chromaprint" "mutagen" "python2-configobj" "python2-musicbrainz2" "python2-pyparsing" "python2-pyqt4") +optdepends=("python2-pillow: FLAC cover art" +"quodlibet: QuodLibet library support") +source=("http://downloads.sourceforge.net/project/${pkgname}/dev/${pkgname}-${pkgver^^}.tar.gz";) +sha256sums=('1dc1e336de5c0e07d4d1f5ef7549f8214807357454b31b055a21260fc1f39a6c') + +prepare() { + cd ${pkgname}-${pkgver^^} + + sed -i 's|^#!.*python$|#!/usr/bin/python2|' $(grep -rl '^#!.*python') +} + +build() { + cd ${pkgname}-${pkgver^^} + + python2 setup.py config +} + +package() { + cd ${pkgname}-${pkgver^^} + + python2 setup.py install --prefix="${pkgdir}"/usr --optimize=1 +} + +# vim: ts=2 sw=2 et:
[arch-commits] Commit in puddletag/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 12:39:07 Author: alucryd Revision: 97200 Pillow rebuild: puddletag 1.0.2rc1-2 Modified: puddletag/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 10:17:49 UTC (rev 97199) +++ PKGBUILD2013-09-15 10:39:07 UTC (rev 97200) @@ -5,13 +5,13 @@ pkgname=puddletag pkgver=1.0.2rc1 -pkgrel=1 +pkgrel=2 pkgdesc="A tag editor for GNU/Linux" url="http://puddletag.sourceforge.net"; license=("GPL") arch=("any") depends=("chromaprint" "mutagen" "python2-configobj" "python2-musicbrainz2" "python2-pyparsing" "python2-pyqt4") -optdepends=("python2-imaging: FLAC cover art" +optdepends=("python2-pillow: FLAC cover art" "quodlibet: QuodLibet library support") source=("http://downloads.sourceforge.net/project/${pkgname}/dev/${pkgname}-${pkgver^^}.tar.gz";) sha256sums=('1dc1e336de5c0e07d4d1f5ef7549f8214807357454b31b055a21260fc1f39a6c')
[arch-commits] Commit in cinnamon/repos (26 files)
Date: Sunday, September 15, 2013 @ 12:17:49 Author: faidoc Revision: 97199 archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: cinnamon/repos/community-staging-i686/ cinnamon/repos/community-staging-i686/PKGBUILD (from rev 97198, cinnamon/trunk/PKGBUILD) cinnamon/repos/community-staging-i686/background.patch (from rev 97198, cinnamon/trunk/background.patch) cinnamon/repos/community-staging-i686/bluetooth_obex_transfer.patch (from rev 97198, cinnamon/trunk/bluetooth_obex_transfer.patch) cinnamon/repos/community-staging-i686/cinnamon.install (from rev 97198, cinnamon/trunk/cinnamon.install) cinnamon/repos/community-staging-i686/disable-mpris-support.patch (from rev 97198, cinnamon/trunk/disable-mpris-support.patch) cinnamon/repos/community-staging-i686/fallback-helpers.patch (from rev 97198, cinnamon/trunk/fallback-helpers.patch) cinnamon/repos/community-staging-i686/fix-control-center-check.patch (from rev 97198, cinnamon/trunk/fix-control-center-check.patch) cinnamon/repos/community-staging-i686/gnome-3.8.patch (from rev 97198, cinnamon/trunk/gnome-3.8.patch) cinnamon/repos/community-staging-i686/idle-dim.patch (from rev 97198, cinnamon/trunk/idle-dim.patch) cinnamon/repos/community-staging-i686/keyboard_applet.patch (from rev 97198, cinnamon/trunk/keyboard_applet.patch) cinnamon/repos/community-staging-i686/remove_GC.patch (from rev 97198, cinnamon/trunk/remove_GC.patch) cinnamon/repos/community-staging-i686/switch-applications.patch (from rev 97198, cinnamon/trunk/switch-applications.patch) cinnamon/repos/community-staging-x86_64/ cinnamon/repos/community-staging-x86_64/PKGBUILD (from rev 97198, cinnamon/trunk/PKGBUILD) cinnamon/repos/community-staging-x86_64/background.patch (from rev 97198, cinnamon/trunk/background.patch) cinnamon/repos/community-staging-x86_64/bluetooth_obex_transfer.patch (from rev 97198, cinnamon/trunk/bluetooth_obex_transfer.patch) cinnamon/repos/community-staging-x86_64/cinnamon.install (from rev 97198, cinnamon/trunk/cinnamon.install) cinnamon/repos/community-staging-x86_64/disable-mpris-support.patch (from rev 97198, cinnamon/trunk/disable-mpris-support.patch) cinnamon/repos/community-staging-x86_64/fallback-helpers.patch (from rev 97198, cinnamon/trunk/fallback-helpers.patch) cinnamon/repos/community-staging-x86_64/fix-control-center-check.patch (from rev 97198, cinnamon/trunk/fix-control-center-check.patch) cinnamon/repos/community-staging-x86_64/gnome-3.8.patch (from rev 97198, cinnamon/trunk/gnome-3.8.patch) cinnamon/repos/community-staging-x86_64/idle-dim.patch (from rev 97198, cinnamon/trunk/idle-dim.patch) cinnamon/repos/community-staging-x86_64/keyboard_applet.patch (from rev 97198, cinnamon/trunk/keyboard_applet.patch) cinnamon/repos/community-staging-x86_64/remove_GC.patch (from rev 97198, cinnamon/trunk/remove_GC.patch) cinnamon/repos/community-staging-x86_64/switch-applications.patch (from rev 97198, cinnamon/trunk/switch-applications.patch) -+ community-staging-i686/PKGBUILD | 111 community-staging-i686/background.patch | 16 community-staging-i686/bluetooth_obex_transfer.patch| 25 community-staging-i686/cinnamon.install | 11 community-staging-i686/disable-mpris-support.patch | 17 community-staging-i686/fallback-helpers.patch | 20 community-staging-i686/fix-control-center-check.patch | 12 community-staging-i686/gnome-3.8.patch | 4186 ++ community-staging-i686/idle-dim.patch | 35 community-staging-i686/keyboard_applet.patch| 142 community-staging-i686/remove_GC.patch | 124 community-staging-i686/switch-applications.patch| 31 community-staging-x86_64/PKGBUILD | 111 community-staging-x86_64/background.patch | 16 community-staging-x86_64/bluetooth_obex_transfer.patch | 25 community-staging-x86_64/cinnamon.install | 11 community-staging-x86_64/disable-mpris-support.patch| 17 community-staging-x86_64/fallback-helpers.patch | 20 community-staging-x86_64/fix-control-center-check.patch | 12 community-staging-x86_64/gnome-3.8.patch| 4186 ++ community-staging-x86_64/idle-dim.patch | 35 community-staging-x86_64/keyboard_applet.patch | 142 community-staging-x86_64/remove_GC.patch| 124 community-staging-x86_64/switch-applications.patch | 31 24 files changed, 9460 insertions(+) The diff is longer than the limit of 200KB. Use svn diff -r 97198:97199 to see the changes.
[arch-commits] Commit in cinnamon/repos (26 files)
Date: Sunday, September 15, 2013 @ 12:16:29 Author: faidoc Revision: 97198 archrelease: copy trunk to staging-i686, staging-x86_64 Added: cinnamon/repos/staging-i686/ cinnamon/repos/staging-i686/PKGBUILD (from rev 97197, cinnamon/trunk/PKGBUILD) cinnamon/repos/staging-i686/background.patch (from rev 97197, cinnamon/trunk/background.patch) cinnamon/repos/staging-i686/bluetooth_obex_transfer.patch (from rev 97197, cinnamon/trunk/bluetooth_obex_transfer.patch) cinnamon/repos/staging-i686/cinnamon.install (from rev 97197, cinnamon/trunk/cinnamon.install) cinnamon/repos/staging-i686/disable-mpris-support.patch (from rev 97197, cinnamon/trunk/disable-mpris-support.patch) cinnamon/repos/staging-i686/fallback-helpers.patch (from rev 97197, cinnamon/trunk/fallback-helpers.patch) cinnamon/repos/staging-i686/fix-control-center-check.patch (from rev 97197, cinnamon/trunk/fix-control-center-check.patch) cinnamon/repos/staging-i686/gnome-3.8.patch (from rev 97197, cinnamon/trunk/gnome-3.8.patch) cinnamon/repos/staging-i686/idle-dim.patch (from rev 97197, cinnamon/trunk/idle-dim.patch) cinnamon/repos/staging-i686/keyboard_applet.patch (from rev 97197, cinnamon/trunk/keyboard_applet.patch) cinnamon/repos/staging-i686/remove_GC.patch (from rev 97197, cinnamon/trunk/remove_GC.patch) cinnamon/repos/staging-i686/switch-applications.patch (from rev 97197, cinnamon/trunk/switch-applications.patch) cinnamon/repos/staging-x86_64/ cinnamon/repos/staging-x86_64/PKGBUILD (from rev 97197, cinnamon/trunk/PKGBUILD) cinnamon/repos/staging-x86_64/background.patch (from rev 97197, cinnamon/trunk/background.patch) cinnamon/repos/staging-x86_64/bluetooth_obex_transfer.patch (from rev 97197, cinnamon/trunk/bluetooth_obex_transfer.patch) cinnamon/repos/staging-x86_64/cinnamon.install (from rev 97197, cinnamon/trunk/cinnamon.install) cinnamon/repos/staging-x86_64/disable-mpris-support.patch (from rev 97197, cinnamon/trunk/disable-mpris-support.patch) cinnamon/repos/staging-x86_64/fallback-helpers.patch (from rev 97197, cinnamon/trunk/fallback-helpers.patch) cinnamon/repos/staging-x86_64/fix-control-center-check.patch (from rev 97197, cinnamon/trunk/fix-control-center-check.patch) cinnamon/repos/staging-x86_64/gnome-3.8.patch (from rev 97197, cinnamon/trunk/gnome-3.8.patch) cinnamon/repos/staging-x86_64/idle-dim.patch (from rev 97197, cinnamon/trunk/idle-dim.patch) cinnamon/repos/staging-x86_64/keyboard_applet.patch (from rev 97197, cinnamon/trunk/keyboard_applet.patch) cinnamon/repos/staging-x86_64/remove_GC.patch (from rev 97197, cinnamon/trunk/remove_GC.patch) cinnamon/repos/staging-x86_64/switch-applications.patch (from rev 97197, cinnamon/trunk/switch-applications.patch) ---+ staging-i686/PKGBUILD | 111 staging-i686/background.patch | 16 staging-i686/bluetooth_obex_transfer.patch| 25 staging-i686/cinnamon.install | 11 staging-i686/disable-mpris-support.patch | 17 staging-i686/fallback-helpers.patch | 20 staging-i686/fix-control-center-check.patch | 12 staging-i686/gnome-3.8.patch | 4186 staging-i686/idle-dim.patch | 35 staging-i686/keyboard_applet.patch| 142 staging-i686/remove_GC.patch | 124 staging-i686/switch-applications.patch| 31 staging-x86_64/PKGBUILD | 111 staging-x86_64/background.patch | 16 staging-x86_64/bluetooth_obex_transfer.patch | 25 staging-x86_64/cinnamon.install | 11 staging-x86_64/disable-mpris-support.patch| 17 staging-x86_64/fallback-helpers.patch | 20 staging-x86_64/fix-control-center-check.patch | 12 staging-x86_64/gnome-3.8.patch| 4186 staging-x86_64/idle-dim.patch | 35 staging-x86_64/keyboard_applet.patch | 142 staging-x86_64/remove_GC.patch| 124 staging-x86_64/switch-applications.patch | 31 24 files changed, 9460 insertions(+) The diff is longer than the limit of 200KB. Use svn diff -r 97197:97198 to see the changes.
[arch-commits] Commit in cinnamon/trunk (PKGBUILD)
Date: Sunday, September 15, 2013 @ 12:15:45 Author: faidoc Revision: 97197 upgpkg: cinnamon 1.8.8-5 Modified: cinnamon/trunk/PKGBUILD --+ PKGBUILD |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-09-15 10:07:40 UTC (rev 97196) +++ PKGBUILD2013-09-15 10:15:45 UTC (rev 97197) @@ -6,7 +6,7 @@ pkgname=cinnamon pkgver=1.8.8 -pkgrel=4 +pkgrel=5 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience" arch=('i686' 'x86_64') url="http://cinnamon.linuxmint.com/"; @@ -14,7 +14,7 @@ depends=('accountsservice' 'caribou' 'clutter-gtk' 'gjs' 'gnome-bluetooth' 'gnome-icon-theme' 'gnome-menus' 'gnome-settings-daemon' 'gnome-session' 'gnome-themes-standard' 'gstreamer0.10' 'libgnome-keyring' 'librsvg' - 'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-imaging' + 'networkmanager' 'muffin' 'pygtk' 'python2-dbus' 'python2-pillow' 'python2-pyinotify' 'python2-lxml' 'webkitgtk3' 'gnome-settings-daemon-compat' 'gnome-panel') makedepends=('gnome-common' 'intltool')
[arch-commits] Commit in calibre/repos (10 files)
Date: Sunday, September 15, 2013 @ 12:07:40 Author: jelle Revision: 97196 archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: calibre/repos/community-staging-i686/ calibre/repos/community-staging-i686/PKGBUILD (from rev 97195, calibre/trunk/PKGBUILD) calibre/repos/community-staging-i686/calibre-mount-helper (from rev 97195, calibre/trunk/calibre-mount-helper) calibre/repos/community-staging-i686/calibre.install (from rev 97195, calibre/trunk/calibre.install) calibre/repos/community-staging-i686/desktop_integration.patch (from rev 97195, calibre/trunk/desktop_integration.patch) calibre/repos/community-staging-x86_64/ calibre/repos/community-staging-x86_64/PKGBUILD (from rev 97195, calibre/trunk/PKGBUILD) calibre/repos/community-staging-x86_64/calibre-mount-helper (from rev 97195, calibre/trunk/calibre-mount-helper) calibre/repos/community-staging-x86_64/calibre.install (from rev 97195, calibre/trunk/calibre.install) calibre/repos/community-staging-x86_64/desktop_integration.patch (from rev 97195, calibre/trunk/desktop_integration.patch) + community-staging-i686/PKGBUILD| 89 +++ community-staging-i686/calibre-mount-helper| 28 community-staging-i686/calibre.install | 12 ++ community-staging-i686/desktop_integration.patch | 109 +++ community-staging-x86_64/PKGBUILD | 89 +++ community-staging-x86_64/calibre-mount-helper | 28 community-staging-x86_64/calibre.install | 12 ++ community-staging-x86_64/desktop_integration.patch | 109 +++ 8 files changed, 476 insertions(+) Copied: calibre/repos/community-staging-i686/PKGBUILD (from rev 97195, calibre/trunk/PKGBUILD) === --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2013-09-15 10:07:40 UTC (rev 97196) @@ -0,0 +1,89 @@ +# $Id$ +# Maintainer: jelle van der Waa +# Maintainer: Daniel Wallace +# Contributor: Giovanni Scafora +# Contributor: Petrov Roman +# Contributor: Andrea Fagiani +# Contributor: Larry Hajali + +pkgname=calibre +pkgver=1.3.0 +pkgrel=2 +pkgdesc="Ebook management application" +arch=('i686' 'x86_64') +url="http://calibre-ebook.com/"; +license=('GPL3') +depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy' + 'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3' + 'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' + 'python2-pillow' 'shared-mime-info' 'python2-dnspython' + 'libunrar' 'python2-pyqt4' 'python2-psutil' 'icu' 'libmtp' + 'python2-netifaces' 'python2-cssselect' 'python2-apsw') +makedepends=('python2-pycountry' 'qt4-private-headers') +optdepends=('ipython2: to use calibre-debug') +install=calibre.install +source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz"; +'desktop_integration.patch' +'calibre-mount-helper') +md5sums=('38597e9ddb7b24a162f8e3bb6df18fc4' + '8353d1878c5a498b3e49eddef473605f' + '675cd87d41342119827ef706055491e7') + +prepare(){ + cd "${srcdir}/${pkgname}" + #rm -rf src/{cherrypy,pyPdf} + rm -rf src/cherrypy + rm -rf resources/${pkgname}-portable.* + sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py + + # Fix for calibre-0.8.58 + sed -i -e "s:#!usr:#!/usr:g" src/calibre/ebooks/markdown/extensions/meta.py + + sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#![ ]/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \ +$(find . -regex ".*.py\|.*.recipe") +} + +build() { + cd "${srcdir}/${pkgname}" + + LANG='en_US.UTF-8' python2 setup.py build + # LANG='en_US.UTF-8' python2 setup.py resources + + # Don't build translations since building them is broken badly +#LANG='en_US.UTF-8' 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" + install -d "${pkgdir}/usr/share/zsh/site-functions" + LANG='en_US.UTF-8' python2 setup.py install --root="${pkgdir}" --prefix=/usr \ +--staging-bindir="