diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-05 10:04:45 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-05 10:04:45 -0300 |
| commit | 1d7654844d03a315c45e204abf8fa44f4d750bba (patch) | |
| tree | 3a009f4ec4921e4d62428d0f3da4169380dd8f7e | |
| parent | b6c59f3d5bcae3f0b61856c1bea145c25c02a6f7 (diff) | |
| parent | 777466db27694f0cad10a7159ba66f2a2b39a516 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
gnome-unstable/folks/PKGBUILD
gnome-unstable/telepathy-glib/PKGBUILD
gnome-unstable/telepathy-mission-control/PKGBUILD
libre/kdenetwork-kopete-libre/PKGBUILD
testing/iputils/PKGBUILD
testing/iputils/iputils.install
testing/ypserv/PKGBUILD
50 files changed, 621 insertions, 220 deletions
diff --git a/community-testing/haskell-extensible-exceptions/PKGBUILD b/community-testing/haskell-extensible-exceptions/PKGBUILD new file mode 100644 index 000000000..a97e33964 --- /dev/null +++ b/community-testing/haskell-extensible-exceptions/PKGBUILD @@ -0,0 +1,39 @@ +# $Id: PKGBUILD 77072 2012-10-04 10:49:53Z jelle $ +# Maintainer: Jelle van der Waa <jelle@vdwaa.nl> + +_hkgname=extensible-exceptions +pkgname=haskell-${_hkgname} +pkgver=0.1.1.4 +pkgrel=3 +pkgdesc="extensible exceptions for both new and old versions of GHC" +url="http://hackage.haskell.org/package/extensible-exceptions" +license=('custom:BSD3') +arch=('i686' 'x86_64') +depends=('ghc=7.6.1-1' sh) +source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) +install=$pkgname.install +md5sums=('fa1cadd15c1c7aa362618d41c6e17d8b') + +build() { + cd ${srcdir}/${_hkgname}-${pkgver} + + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ + --libsubdir=\$compiler/site-local/\$pkgid + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + cd ${srcdir}/${_hkgname}-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} + runhaskell Setup copy --destdir=${pkgdir} + install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE + rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE +} diff --git a/community-testing/haskell-extensible-exceptions/haskell-extensible-exceptions.install b/community-testing/haskell-extensible-exceptions/haskell-extensible-exceptions.install new file mode 100644 index 000000000..20c7dce30 --- /dev/null +++ b/community-testing/haskell-extensible-exceptions/haskell-extensible-exceptions.install @@ -0,0 +1,19 @@ +HS_DIR=usr/share/haskell/haskell-extensible-exceptions +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_upgrade() { + ${HS_DIR}/unregister.sh +} +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_remove() { + ${HS_DIR}/unregister.sh +} +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} + diff --git a/community-testing/virtualbox-modules-lts/PKGBUILD b/community-testing/virtualbox-modules-lts/PKGBUILD new file mode 100644 index 000000000..493f7cc3a --- /dev/null +++ b/community-testing/virtualbox-modules-lts/PKGBUILD @@ -0,0 +1,69 @@ +# $Id: PKGBUILD 77089 2012-10-04 16:56:39Z bpiotrowski $ +# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# Contributor: Ionut Biru <ibiru@archlinux.org> +# Contributor: Sébastien Luttringer <seblu@aur.archlinux.org> + +pkgbase=virtualbox-modules-lts +pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts') +pkgver=4.2.0 +pkgrel=3 +arch=('i686' 'x86_64') +url='http://virtualbox.org' +license=('GPL') +makedepends=('linux-lts-headers' + "virtualbox-host-source>=$pkgver" + "virtualbox-guest-source>=$pkgver" + 'expac') + +build() { + # current kernel version + _kernver=$(expac -Q '%v' linux-lts-headers)-lts + # 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-lts(){ + pkgdesc='Host kernel modules for VirtualBox' + depends=('linux-lts>=3.0' 'linux-lts<3.1') + replaces=('virtualbox-modules-lts') + conflicts=('virtualbox-modules-lts') + provides=("virtualbox-host-modules=$pkgver") + install=virtualbox-host-modules-lts.install + + _kernver=$(expac -Q '%v' linux-lts-headers)-lts + _extraver=extramodules-${_kernver%.*}-lts + + install -dm755 "$pkgdir/usr/lib/modules/$_extraver" + cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" + install -m644 * "$pkgdir/usr/lib/modules/$_extraver" + find "$pkgdir" -name '*.ko' -exec gzip -9 {} + + sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-host-modules-lts.install" +} + +package_virtualbox-guest-modules-lts(){ + pkgdesc='Guest kernel modules for VirtualBox' + license=('GPL') + depends=('linux-lts>=3.0' 'linux-lts<3.1') + replaces=('virtualbox-archlinux-modules-lts') + conflicts=('virtualbox-archlinux-modules-lts') + provides=("virtualbox-host-modules=$pkgver") + install=virtualbox-guest-modules-lts.install + + _kernver=$(expac -Q '%v' linux-lts-headers)-lts + _extraver=extramodules-${_kernver%.*}-lts + + install -dm755 "$pkgdir/usr/lib/modules/$_extraver" + cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" + install -m644 * "$pkgdir/usr/lib/modules/$_extraver" + find "$pkgdir" -name '*.ko' -exec gzip -9 {} + + sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-guest-modules-lts.install" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/virtualbox-modules-lts/build.sh b/community-testing/virtualbox-modules-lts/build.sh new file mode 100755 index 000000000..828448cab --- /dev/null +++ b/community-testing/virtualbox-modules-lts/build.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +if (( $# != 1 )); then + echo "usage: $0 extra" + echo " $0 testing" + exit 1 +fi + +$1-i686-build +linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 + +$1-x86_64-build +makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -r /var/lib/archbuild/$1-x86_64 + + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/virtualbox-modules-lts/virtualbox-guest-modules-lts.install b/community-testing/virtualbox-modules-lts/virtualbox-guest-modules-lts.install new file mode 100644 index 000000000..d2984a743 --- /dev/null +++ b/community-testing/virtualbox-modules-lts/virtualbox-guest-modules-lts.install @@ -0,0 +1,16 @@ +EXTRAMODULES='extramodules-3.0-lts' + +post_install() { +cat << EOF +===> You may want to load vboxguest, vboxsf and vboxvideo +EOF + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_upgrade() { + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} diff --git a/community-testing/virtualbox-modules-lts/virtualbox-host-modules-lts.install b/community-testing/virtualbox-modules-lts/virtualbox-host-modules-lts.install new file mode 100644 index 000000000..07ecf7311 --- /dev/null +++ b/community-testing/virtualbox-modules-lts/virtualbox-host-modules-lts.install @@ -0,0 +1,18 @@ +EXTRAMODULES='extramodules-3.0-lts' + +post_install() { +cat << EOF +===> You must load vboxdrv module before starting VirtualBox: +===> # modprobe vboxdrv +EOF + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_upgrade() { + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo 'In order to use the new version, reload all virtualbox modules manually.' +} + +post_remove() { + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} diff --git a/community/catalyst-dkms/PKGBUILD b/community/catalyst-dkms/PKGBUILD index 175851c6b..61d49f0b1 100644 --- a/community/catalyst-dkms/PKGBUILD +++ b/community/catalyst-dkms/PKGBUILD @@ -1,16 +1,19 @@ -# $Id: PKGBUILD 76979 2012-10-02 21:27:47Z lcarlier $ +# $Id: PKGBUILD 77076 2012-10-04 11:57:37Z lcarlier $ # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Vi0L0, wonder, Eduardo "kensai" Romero # Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert pkgname=catalyst-dkms pkgver=12.8 -pkgrel=0.1 +pkgrel=1 pkgdesc="AMD proprietary gpu kernel driver" arch=('i686' 'x86_64') url="http://www.amd.com" license=('custom') -depends=('linux>=3.5' 'linux-headers>=3.5' 'dkms') +depends=('dkms') +optdepends=('linux-headers: build the module against Arch kernel' + 'linux-lts-headers: build the module against LTS Arch kernel') +replaces=('catalyst-lts-dkms') # useless source=(http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip dkms.conf 3.5-do_mmap.patch) diff --git a/community/cegui/PKGBUILD b/community/cegui/PKGBUILD index 1623f8045..8fd4dd440 100644 --- a/community/cegui/PKGBUILD +++ b/community/cegui/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 76647 2012-09-25 15:44:46Z svenstaro $ +# $Id: PKGBUILD 77052 2012-10-04 03:54:27Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Juergen Hoetzel <juergen@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com>, # Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> pkgname=cegui -pkgver=0.7.6 -pkgrel=6 +pkgver=0.7.7 +pkgrel=1 pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" arch=('i686' 'x86_64' 'mips64el') url="http://crayzedsgui.sourceforge.net" @@ -18,16 +18,12 @@ optdepends=("python2: python bindings" "ogre: ogre module" "irrlicht: irrlicht module") options=(!libtool) -source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz - cegui-0.7.6-python-detection.patch) -md5sums=('7ddb5145dc94fb7daf9aea1d30a6ffa3' - '4600775f78b7349621a8a314ade8c902') +source=(http://downloads.sourceforge.net/crayzedsgui/CEGUI-$pkgver.tar.gz) +md5sums=('8b83577f86eaa1581765dd155c7c8f24') build() { cd $srcdir/CEGUI-${pkgver} - patch -Np0 < $srcdir/cegui-0.7.6-python-detection.patch - ./bootstrap ./configure --prefix=/usr \ diff --git a/community/freeimage/PKGBUILD b/community/freeimage/PKGBUILD index 9eff60264..7a50ca009 100644 --- a/community/freeimage/PKGBUILD +++ b/community/freeimage/PKGBUILD @@ -6,7 +6,7 @@ pkgname=freeimage pkgver=3.15.3 -pkgrel=1 +pkgrel=2 pkgdesc="Library project for developers who would like to support popular graphics image formats" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'custom:FIPL') @@ -26,6 +26,9 @@ build() { cp -r FreeImage FreeImagefip + export CFLAGS="$CFLAGS -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS" + export CXXFLAGS="$CXXFLAGS -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS" + cd FreeImage make diff --git a/community/moreutils/PKGBUILD b/community/moreutils/PKGBUILD index f2996f957..77ec7bf24 100644 --- a/community/moreutils/PKGBUILD +++ b/community/moreutils/PKGBUILD @@ -1,17 +1,16 @@ -# $Id: PKGBUILD 74174 2012-07-22 18:31:30Z spupykin $ +# $Id: PKGBUILD 77069 2012-10-04 09:18:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com> pkgname=moreutils pkgver=0.47 -pkgrel=1 +pkgrel=2 pkgdesc="A growing collection of the unix tools that nobody thought to write thirty years ago" arch=('i686' 'x86_64' 'mips64el') url="http://joeyh.name/code/moreutils/" license=('GPL') makedepends=('docbook2x' 'docbook-xml' 'perl-xml-sax') -depends=('perl') -optdepends=('perl-timedate' 'perl-time-duration' 'perl-ipc-run') +depends=('perl' 'perl-ipc-run' 'perl-timedate' 'perl-time-duration') options=('!emptydirs' 'zipman') replaces=(moreutils-svn) source=(http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_$pkgver.tar.gz) diff --git a/community/stone-soup/PKGBUILD b/community/stone-soup/PKGBUILD index 8f703df80..9ffd6f29f 100644 --- a/community/stone-soup/PKGBUILD +++ b/community/stone-soup/PKGBUILD @@ -1,12 +1,12 @@ # Maintainer: Jakob Gruber <jakob.gruber@gmail.com> pkgname=stone-soup -pkgver=0.10.3 +pkgver=0.11.0 pkgrel=1 pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting' arch=('i686' 'x86_64' 'mips64el') url='http://crawl.develz.org/' -depends=('lua' 'ncurses' 'sdl_image' 'sqlite' 'libgl' 'mesa' 'freetype2') +depends=('lua' 'ncurses' 'sdl_image' 'sqlite' 'libgl' 'mesa' 'freetype2' 'ttf-dejavu') makedepends=('bison' 'flex' 'gendesk') conflicts=('crawl' 'stone-soup-tile' 'stone-soup-git') license=('custom') @@ -65,4 +65,4 @@ build() { } -md5sums=('ec617185bd3d5562904a401a45c65afd') +md5sums=('715d800410a7251499bf8efcc8675ca6') diff --git a/community/xvba-video-open/PKGBUILD b/community/xvba-video-open/PKGBUILD new file mode 100644 index 000000000..b676215f2 --- /dev/null +++ b/community/xvba-video-open/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 77096 2012-10-04 19:43:11Z lcarlier $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> +# Contributor: Jesse Jaara <gmail.com: jesse.jaara> + +pkgname=xvba-video-open +pkgver=0.8.0 +pkgrel=1 +pkgdesc="OSS version of xvba-video lib to enable hw video acceleration on AMD's HD series of GFX cards" +arch=('i686' 'x86_64') +url="http://www.splitted-desktop.com/~gbeauchesne/xvba-video/" +license=('GPL2') +depends=('catalyst-utils' 'libva') +makedepends=('mesa') +options=(!libtool) +source=(ftp://ftp.archlinux.org/other/community/xvba-video-open/xvba-video-${pkgver}.tar.gz + http://developer.amd.com/downloads/xvba-sdk-0.74-404001.tar.gz) +md5sums=('d9ddec2e7f02c1fa533773918e88e311' + 'b8f56bc55aa70cb19dd12857fdc184cc') + +build() { + cd "${srcdir}/xvba-video-${pkgver}" + + export CPPFLAGS="${CPPFLAGS} -I${srcdir}/include" + + ./configure --disable-debug --enable-libxvba-dlopen --prefix=/usr + make PYTHON=python2 +} + +package() { + cd "${srcdir}/xvba-video-${pkgver}" + + make DESTDIR="${pkgdir}" install +} diff --git a/extra/enlightenment/PKGBUILD b/extra/enlightenment/PKGBUILD index ca8adf7f3..c521f4c4f 100644 --- a/extra/enlightenment/PKGBUILD +++ b/extra/enlightenment/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 149104 2012-02-05 18:10:13Z schiv $ +# $Id: PKGBUILD 167950 2012-10-04 04:38:27Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=enlightenment -pkgver=1.0.10 +pkgver=1.0.11 _themever=1.0.1 -pkgrel=2 +pkgrel=1 pkgdesc="A fast, flexible, and very extensible Window Manager" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" @@ -14,7 +14,7 @@ depends=('libxinerama' 'imlib2' 'perl' 'pango' 'libxcomposite' \ options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/e16-${pkgver}.tar.gz \ http://downloads.sourceforge.net/enlightenment/e16-themes-${_themever}.tar.gz) -sha1sums=('20e56c851aeb5279479eb43570b5d58bcc1d6ef9' +sha1sums=('146028c39b3148fdd3e247dfb29ef8ec6b9cf10d' 'ae34e2df1294198795736bf953bf695aba93b710') build() { diff --git a/extra/epplet-base/PKGBUILD b/extra/epplet-base/PKGBUILD index 33af3327e..8399f5ec4 100644 --- a/extra/epplet-base/PKGBUILD +++ b/extra/epplet-base/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 134351 2011-08-03 02:24:23Z eric $ +# $Id: PKGBUILD 167952 2012-10-04 04:50:04Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=epplet-base -pkgver=0.13 -pkgrel=2 +pkgver=0.14 +pkgrel=1 pkgdesc="Addon plugins for the enlightenment windowmanager" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" @@ -12,8 +12,7 @@ depends=('imlib2' 'libcdaudio' 'libgl') makedepends=('mesa') options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/enlightenment/epplets-${pkgver}.tar.gz) -md5sums=('6304130e5741b626c27b6b0cf7ae58e0') -sha1sums=('8af41829e5993a992c31f6285122edce6b60475a') +sha1sums=('ddecad7c22771bc50565f76c36ae334f952388aa') build() { cd "${srcdir}/epplets-${pkgver}" diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index e53c4c31d..2e6c051f7 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166171 2012-09-05 06:03:48Z andyrtr $ +# $Id: PKGBUILD 167978 2012-10-04 14:32:20Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -23,10 +23,10 @@ pkgname=('libreoffice-common' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python' 'libreoffice-extension-wiki-publisher' - 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built -_LOver=3.6.1.2 -pkgver=3.6.1 -pkgrel=4 + 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) +_LOver=3.6.2.2 +pkgver=3.6.2 +pkgrel=1 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -35,7 +35,6 @@ makedepends=( # makedepends 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' - #'saxon' - currently broken # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" @@ -81,8 +80,8 @@ source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.xz ${_additional_source_url}/0d2dcdfbf28d6208751b33057f5361f0-libcmis-0.2.3.tar.gz ${_additional_source_url}/ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll + make-pyuno-work-with-system-wide-module-install.diff buildfix.diff - git_fixes.diff libreoffice-common.sh libreoffice-common.csh) noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz @@ -114,9 +113,9 @@ noextract=(94e7f271e38c976462558b4278590178-libvisio-0.0.19.tar.bz2 db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip ce5a1def34578b75959ac31210f031f6-libcdr-0.0.8.tar.bz2 ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip) -md5sums=('3ddcf145b74daa4361e48dafe97e7d21' - '7966e66099729d23d9ee594f526a50ed' - '2555590c1b4395857fc5c469f7f1bd0c' +md5sums=('ae171ba4633cc72dba4451b1bdd3385e' + 'cdad0734d247d91a79cb282fd851d2a7' + 'e9a7e3d35432b72a4603ce094deb6a67' '18f577b374d60b3c760a3a3350407632' 'f02578f5218f217a9f20e9c30e119c6a' '94e7f271e38c976462558b4278590178' @@ -147,8 +146,8 @@ md5sums=('3ddcf145b74daa4361e48dafe97e7d21' '0d2dcdfbf28d6208751b33057f5361f0' 'ce5a1def34578b75959ac31210f031f6' '185d60944ea767075d27247c3162b3bc' + '97bf43dda273d79ff90c848ab53b0e3c' '234e91ac65945ce1ab1e3839780e90f7' - '2445aca137bdbf0cf7526e91f768a1d0' 'abcb1b0a7deaffe13ab3d7ca70becb49' '72790a4103da259a55cadd66db931d00') @@ -171,8 +170,10 @@ build() { ln -s ../libreoffice-translations-$_LOver/translations . # buildfixes & bugfixes - patch -Np1 -i ${srcdir}/buildfix.diff - patch -Np1 -i ${srcdir}/git_fixes.diff + patch -Np1 -i ${srcdir}/buildfix.diff # leaves out a broken pdfimport test + + # fix not upstreamable pyuno paths - patch taken from Debian + patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff #use the CFLAGS but remove the LibO overridden ones for i in $CFLAGS; do @@ -266,7 +267,7 @@ build() { make # fake installation to create split file lists mkdir $srcdir/fakeinstall - make DESTDIR=${srcdir}/fakeinstall distro-pack-install + make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check } #check() { @@ -281,7 +282,6 @@ package_libreoffice-common() { depends=('libreoffice-langpack' "hunspell>=1.2.8" "python2>=2.7" "neon>=0.28.6" 'nspr' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=49.1" 'clucene' 'lcms2' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils' 'orbit2') - #'saxon' optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' 'libcups: adds printing support' @@ -373,27 +373,22 @@ package_libreoffice-postgresql-connector() { groups=('libreoffice') replaces=('libreoffice') - # no file-list so far - install -dm755 ${pkgdir}/usr/lib/libreoffice/program/services - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.uno.so ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc-impl.uno.so ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/postgresql-sdbc.ini ${pkgdir}/usr/lib/libreoffice/program - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/program/services/postgresql-sdbc.rdb ${pkgdir}/usr/lib/libreoffice/program/services - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/registry - install -m644 ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/postgresqlsdbc.xcd ${pkgdir}/usr/lib/libreoffice/share/registry + # workaround double entries in the file list + mv ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt.orig + sort ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt # create directories from *list.txt file -# for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do -# install -dm755 ${pkgdir}/${directory/\%dir/} -# done + for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do + install -dm755 ${pkgdir}/${directory/\%dir/} + done # install files into the pkg from fakeinstall dir -# for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do -# dirname=`dirname $file` + for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/postgresql_list.txt`; do + dirname=`dirname $file` # check if directory has been already been created - some are missing like manpages -# [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname + [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname # mv file from fakeinstall to pkgdir -# mv ${srcdir}/fakeinstall${file} ${pkgdir}$file -# done + mv ${srcdir}/fakeinstall${file} ${pkgdir}$file + done } package_libreoffice-calc() { @@ -550,7 +545,6 @@ package_libreoffice-sdk() { done # fix environment path to keep compatibility with openjdk6 and openjdk7 - #sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" /usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} } diff --git a/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff b/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff new file mode 100644 index 000000000..e86548136 --- /dev/null +++ b/extra/libreoffice/make-pyuno-work-with-system-wide-module-install.diff @@ -0,0 +1,44 @@ +diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh +index defd7b2..ea2a809 100755 +--- a/desktop/scripts/soffice.sh ++++ b/desktop/scripts/soffice.sh +@@ -128,6 +128,9 @@ if echo "$checks" | grep -q "cc" ; then + exit 1; + fi + ++PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH} ++export PYTHONPATH ++ + case "`uname -s`" in + NetBSD|OpenBSD|FreeBSD|DragonFly) + # this is a temporary hack until we can live with the default search paths +diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py +index f93ac5e..92a2891 100644 +--- a/pyuno/source/module/uno.py ++++ b/pyuno/source/module/uno.py +@@ -26,8 +26,12 @@ + # for a copy of the LGPLv3 License. + # + #************************************************************************* ++import os + import sys + ++sys.path.append('/usr/lib/libreoffice/program') ++if getattr(os.environ, 'URE_BOOTSTRAP', None) is None: ++ os.environ['URE_BOOTSTRAP'] = "vnd.sun.star.pathname:/usr/lib/libreoffice/program/fundamentalrc" + import pyuno + + try: +diff --git a/scripting/source/pyprov/officehelper.py b/scripting/source/pyprov/officehelper.py +index 610ac5f..df243d0 100755 +--- a/scripting/source/pyprov/officehelper.py ++++ b/scripting/source/pyprov/officehelper.py +@@ -53,7 +53,7 @@ def bootstrap(): + if "UNO_PATH" in os.environ: + sOffice = os.environ["UNO_PATH"] + else: +- sOffice = "" # lets hope for the best ++ sOffice = "/usr/lib/libreoffice/program" + sOffice = os.path.join(sOffice, "soffice") + if platform.startswith("win"): + sOffice += ".exe" diff --git a/extra/libwebp/PKGBUILD b/extra/libwebp/PKGBUILD new file mode 100644 index 000000000..8028b0de5 --- /dev/null +++ b/extra/libwebp/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 167975 2012-10-04 13:31:03Z heftig $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Jon Nordby <jononor@gmail.com> + +pkgname=libwebp +pkgver=0.2.0 +pkgrel=1 +pkgdesc="WebP library and conversion tools" +arch=('x86_64' 'i686') +url="http://code.google.com/intl/en/speed/webp/" +license=('BSD') +depends=('libpng' 'libjpeg') +options=('!libtool') +source=("http://webp.googlecode.com/files/$pkgname-$pkgver.tar.gz") +sha256sums=('aa7d5e162826362c79d7c36d41484042ab7460dc08dc33d4ea6823a0c77d4bfb') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install + install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 7960dd2d6..74056ffc9 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167205 2012-09-27 23:00:52Z giovanni $ +# $Id: PKGBUILD 167982 2012-10-04 16:26:08Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2012.09.27 +pkgver=2012.10.04 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('a587166b7830f1be4b829c2bf84ac195') +md5sums=('6188132efc675f2f6b298b8f5fae6b2f') build() { cd ${srcdir}/live diff --git a/extra/metalog/PKGBUILD b/extra/metalog/PKGBUILD index 6845854ca..fd87ef8c8 100644 --- a/extra/metalog/PKGBUILD +++ b/extra/metalog/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 156093 2012-04-13 11:44:31Z juergen $ +# $Id: PKGBUILD 167973 2012-10-04 13:24:41Z juergen $ # Maintainer: juergen <juergen@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=metalog -pkgver=2.0 -pkgrel=2 +pkgver=3.0 +pkgrel=0 pkgdesc="Metalog is a modern replacement for syslogd and klogd" url="http://metalog.sourceforge.net" license=('GPL') @@ -12,21 +12,25 @@ arch=('i686' 'x86_64' 'mips64el') depends=('pcre') provides=('logger') backup=('etc/metalog.conf' 'etc/conf.d/metalog') -source=("http://sourceforge.net/projects/metalog/files/metalog-2.tar.xz/download" 'metalog' 'metalog.confd') -md5sums=('e948d10d780205eae17645c89aee1361' +source=("http://sourceforge.net/projects/metalog/files/metalog-3.tar.xz/download" 'metalog' 'metalog.confd' 'metalog.service') +md5sums=('6fe404e49764fa24108fd090417bacb5' '9e73301a7f0be291749ee30638527cb9' - '86bccd5a02996921e29eff8a0394d11f') + '86bccd5a02996921e29eff8a0394d11f' + 'f005e6970c25bfdaf0596791e9135f98') build() { - cd $srcdir/$pkgname-2 + cd $srcdir/$pkgname-3 ./configure --prefix=/usr --sysconfdir=/etc make } package() { - cd $srcdir/$pkgname-2 + cd $srcdir/$pkgname-3 make DESTDIR=$pkgdir install install -D -m755 $srcdir/metalog $pkgdir/etc/rc.d/metalog install -D -m644 $srcdir/metalog.confd $pkgdir/etc/conf.d/metalog install -D -m644 metalog.conf $pkgdir/etc/metalog.conf + + install -d "${pkgdir}"/usr/lib/systemd/system + install -Dm644 "${srcdir}"/metalog.service "${pkgdir}"/usr/lib/systemd/system/ } diff --git a/extra/metalog/metalog.service b/extra/metalog/metalog.service new file mode 100644 index 000000000..5982c8804 --- /dev/null +++ b/extra/metalog/metalog.service @@ -0,0 +1,9 @@ +[Unit] +Description=System Logger Daemon + +[Service] +ExecStart=/usr/sbin/metalog + +[Install] +WantedBy=multi-user.target +Alias=syslog.service diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD index 3d0fd6932..2106afe30 100644 --- a/extra/oxygen-gtk2/PKGBUILD +++ b/extra/oxygen-gtk2/PKGBUILD @@ -1,23 +1,22 @@ -# $Id: PKGBUILD 163736 2012-07-18 10:30:46Z andrea $ +# $Id: PKGBUILD 167990 2012-10-04 19:22:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: birdflesh <antkoul at gmail dot com> pkgname=oxygen-gtk2 -pkgver=1.3.0 +pkgver=1.3.1 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/playground/artwork/oxygen-gtk/' license=('LGPL') -depends=('gtk2' 'dbus-glib') +depends=('gtk2') conflicts=('oxygen-gtk') replaces=('oxygen-gtk') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('9c9d996904db3f4897772788f3bf1599') +md5sums=('269283e34c5ae547a062da29cab58aa9') build() { - cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -27,6 +26,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/oxygen-gtk3/PKGBUILD b/extra/oxygen-gtk3/PKGBUILD index a9c3c0e10..f38ddf171 100644 --- a/extra/oxygen-gtk3/PKGBUILD +++ b/extra/oxygen-gtk3/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 163738 2012-07-18 10:31:20Z andrea $ +# $Id: PKGBUILD 167992 2012-10-04 19:24:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=oxygen-gtk3 -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3" arch=('i686' 'x86_64' 'mips64el') url='https://projects.kde.org/projects/playground/artwork/oxygen-gtk/' license=('LGPL') -depends=('gtk3' 'dbus-glib') +depends=('gtk3') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('d5c5b5debd3974ea4ea1cc1a7fbe56b9') +md5sums=('284139caf8a95a94bac1d82900745b4f') build() { - cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -24,6 +23,6 @@ build() { } package() { - cd "${srcdir}"/build + cd build make DESTDIR="${pkgdir}" install } diff --git a/extra/pathological/PKGBUILD b/extra/pathological/PKGBUILD index 8260ca650..41bade6fd 100644 --- a/extra/pathological/PKGBUILD +++ b/extra/pathological/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 149371 2012-02-07 09:25:53Z eric $ +# $Id: PKGBUILD 167956 2012-10-04 06:16:36Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=pathological pkgver=1.1.3 -pkgrel=7 +pkgrel=8 pkgdesc="A puzzle game with the same feel as frozen bubble" arch=('i686' 'x86_64' 'mips64el') url="http://pathological.sourceforge.net/" license=('GPL') -depends=('python-pygame') +depends=('python2-pygame') makedepends=('netpbm') install=pathological.install source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD index f2d299ca8..8add8c625 100644 --- a/extra/perl-net-ssleay/PKGBUILD +++ b/extra/perl-net-ssleay/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 160545 2012-06-02 10:28:03Z bluewind $ +# $Id: PKGBUILD 167980 2012-10-04 16:11:02Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-ssleay _cpanname=Net-SSLeay -pkgver=1.48 -pkgrel=2 +pkgver=1.49 +pkgrel=1 pkgdesc="Perl extension for using OpenSSL" arch=('i686' 'x86_64' 'mips64el') license=('custom:BSD') @@ -15,7 +15,7 @@ options=(!emptydirs) replaces=('net-ssleay') provides=('net-ssleay') source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz") -md5sums=('4e10d9da28f26732e37807820bf72af5') +md5sums=('9e05acd6773ff5e94c5a1dcd7c0ec4a7') build() { cd ${srcdir}/${_cpanname}-${pkgver} diff --git a/extra/psi/PKGBUILD b/extra/psi/PKGBUILD index da80c51fa..aa256bc97 100644 --- a/extra/psi/PKGBUILD +++ b/extra/psi/PKGBUILD @@ -1,37 +1,30 @@ -# $Id: PKGBUILD 151383 2012-02-25 23:49:47Z pierre $ +# $Id: PKGBUILD 167954 2012-10-04 05:36:54Z pierre $ # Maintainer: Pierre Schmitz <pierre@archlinux.de> pkgname=psi -pkgver=0.14 -pkgrel=6 +pkgver=0.15 +pkgrel=1 pkgdesc='Instant messaging application designed for the Jabber IM' url='http://psi-im.org/' license=('GPL') arch=('i686' 'x86_64' 'mips64el') depends=('qca-ossl' 'qca-gnupg' 'enchant' 'libxss' 'xdg-utils') +makedepends=('icu') install='psi.install' source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2" - 'archlinux.patch' 'affiliationlistconfigmuc.patch' - 'configureroomcrash.patch' 'gcc-47.patch' 'input-validation.patch') -md5sums=('9d7dcce3bcab53b741a712199bd986be' - 'a965c6a4ad1028f14a5897c3f5088ae8' - '28258c884a0a6f2cbb297435a144ae04' - '8291eee7110a8aa8163c2e2e38c6d491' - 'd7acbb7b81671339d490622c74082d11' - '259cf255ca2d2395840a25799056a58b') + 'archlinux.patch') +md5sums=('aea15f17cf93e7cea52f305523f761be' + '2ed44ef84007b5b7f9a3f0a4f5f6a86d') build() { cd ${srcdir}/psi-${pkgver} - patch -p1 -i ${srcdir}/archlinux.patch - patch -p1 -i ${srcdir}/affiliationlistconfigmuc.patch - patch -p1 -i ${srcdir}/configureroomcrash.patch - patch -p0 -i ${srcdir}/gcc-47.patch - patch -p0 -i ${srcdir}/input-validation.patch - ./configure --prefix=/usr --disable-bundled-qca --release --no-separate-debug-info + patch -p0 -i ${srcdir}/archlinux.patch + ./configure --prefix=/usr --release --no-separate-debug-info make } package() { cd ${srcdir}/psi-${pkgver} make INSTALL_ROOT=${pkgdir} install + rm -rf ${pkgdir}/usr/share/psi/certs/ } diff --git a/extra/psi/archlinux.patch b/extra/psi/archlinux.patch index bf89ab4a9..d9cbb454b 100644 --- a/extra/psi/archlinux.patch +++ b/extra/psi/archlinux.patch @@ -1,7 +1,6 @@ -diff -aur psi-0.12.old/src/systeminfo.cpp psi-0.12/src/systeminfo.cpp ---- psi-0.12.old/src/systeminfo.cpp 2007-04-08 10:37:46.000000000 +0200 -+++ psi-0.12/src/systeminfo.cpp 2009-05-11 15:09:14.000000000 +0200 -@@ -89,7 +89,7 @@ +--- src/systeminfo.cpp 2012-10-04 02:53:03.000000000 +0200 ++++ src/systeminfo.cpp 2012-10-04 07:18:45.111088591 +0200 +@@ -114,7 +114,7 @@ { LinuxSlackware, OsAppendFile, "/etc/slackware-version", "Slackware Linux" }, { LinuxPLD, OsUseFile, "/etc/pld-release", "PLD Linux" }, { LinuxAurox, OsUseName, "/etc/aurox-release", "Aurox Linux" }, diff --git a/extra/psi/psi.install b/extra/psi/psi.install index e70c054ec..464d2e625 100644 --- a/extra/psi/psi.install +++ b/extra/psi/psi.install @@ -1,5 +1,6 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q &> /dev/null } post_upgrade() { diff --git a/extra/python-pygame/PKGBUILD b/extra/python-pygame/PKGBUILD index 9bd6d385e..be5f23b2e 100644 --- a/extra/python-pygame/PKGBUILD +++ b/extra/python-pygame/PKGBUILD @@ -1,14 +1,16 @@ -# $Id: PKGBUILD 153735 2012-03-19 03:45:07Z eric $ +# $Id: PKGBUILD 167958 2012-10-04 06:29:37Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> -pkgname=python-pygame +pkgbase=python-pygame +pkgname=python2-pygame pkgver=1.9.1 -pkgrel=5 +pkgrel=7 pkgdesc="Python game library" arch=('i686' 'x86_64' 'mips64el') url="http://www.pygame.org/" license=('LGPL') depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'python2' 'portmidi') +conflicts=('python-pygame') source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz \ config.patch pygame-v4l.patch) sha1sums=('a45aeb0623e36ae7a1707b5f41ee6274f72ca4fa' @@ -21,7 +23,7 @@ build() { patch -Np1 -i "${srcdir}/pygame-v4l.patch" } -package() { +package_python2-pygame() { cd "${srcdir}/pygame-${pkgver}release" python2 config.py -auto python2 setup.py install --root="${pkgdir}" --prefix=/usr diff --git a/gnome-unstable/grilo-plugins/PKGBUILD b/gnome-unstable/grilo-plugins/PKGBUILD index 71fc20159..972566440 100644 --- a/gnome-unstable/grilo-plugins/PKGBUILD +++ b/gnome-unstable/grilo-plugins/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 167865 2012-10-03 14:50:36Z heftig $ +# $Id: PKGBUILD 167998 2012-10-04 23:16:55Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=grilo-plugins -pkgver=0.2.1 -pkgrel=2 +pkgver=0.2.2 +pkgrel=1 pkgdesc="Plugins for Grilo" url="http://www.gnome.org" arch=('i686' 'x86_64') license=('LGPL') depends=('grilo' 'sqlite' 'libgcrypt') -makedepends=(gupnp-av libgdata libquvi gmime rest libtracker-sparql totem-plparser libdmapsharing) +makedepends=(gupnp-av libgdata libquvi gmime rest libtracker-sparql totem-plparser libdmapsharing + json-glib) optdepends=('gupnp-av: uPnP plugin' 'libgdata: Youtube plugin' 'libquvi: Youtube plugin' @@ -18,10 +19,11 @@ optdepends=('gupnp-av: uPnP plugin' 'rest: Blip.tv plugin' 'libtracker-sparql: Tracker plugin' 'totem-plparser: Optical media plugin' - 'libdmapsharing: DMAP sharing plugin') + 'libdmapsharing: DMAP sharing plugin' + 'json-glib: TMDb plugin') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('d437e146bfdf7f2f4b6306131676f564f5ad02f904089e43b1b8a1f1fe99f895') +sha256sums=('54e65b734917df74ba5e53d92a3b2e69edd669625820fd0353c22e9b0f61e90d') build() { cd $pkgname-$pkgver diff --git a/gnome-unstable/grilo/PKGBUILD b/gnome-unstable/grilo/PKGBUILD index c286b345b..024f59890 100644 --- a/gnome-unstable/grilo/PKGBUILD +++ b/gnome-unstable/grilo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 167718 2012-10-03 10:21:01Z jgc $ +# $Id: PKGBUILD 167997 2012-10-04 23:14:47Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=grilo -pkgver=0.2.1 +pkgver=0.2.2 pkgrel=1 pkgdesc="Framework that provides access to various sources of multimedia content" url="http://www.gnome.org" @@ -13,7 +13,7 @@ makedepends=('gobject-introspection' 'gtk-doc' 'vala') optdepends=('grilo-plugins: Plugins for grilo') options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('eb225fb88389e018858869eb5da5aee9d72bdb2306979e8f3defb5fc898af676') +sha256sums=('e98d86e9c26dc444f43782e68f44a90da47f69da8a4ac313da9a3795fb72271f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD index f69e561be..17fafa08c 100644 --- a/libre/kdebase-konqueror-libre/PKGBUILD +++ b/libre/kdebase-konqueror-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgname='kdebase-konqueror' pkgname='kdebase-konqueror-libre' -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://kde.org/applications/internet/konqueror/" @@ -15,7 +15,7 @@ groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz" "konq-about-fsdg.diff") -sha1sums=('9014332fd6fb18999c8290a3cbb498793d8caa2f' +sha1sums=('8b5a45cfd77e7e67a57c06cdbf387692e8547b66' 'f41541371414dcbe5e76687835e648112b3ff364') pkgdesc='KDE File Manager & Web Browser' depends=('kdebase-dolphin' 'kdebase-keditbookmarks') diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD index ba6273763..bcf1c0922 100644 --- a/libre/kdebase-runtime-libre/PKGBUILD +++ b/libre/kdebase-runtime-libre/PKGBUILD @@ -5,7 +5,7 @@ _pkgname=kdebase-runtime pkgname=kdebase-runtime-libre -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Plugins and applications necessary for the running of KDE applications (without non-privacy search providers)" arch=('i686' 'x86_64' 'mips64el') @@ -25,7 +25,7 @@ provides=("${_pkgname}=${pkgver}") install="${_pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.xz" 'duckduckgo_lite.desktop') -sha1sums=('4b67e0f12617c478ee29546da4d98f605cd35dec' +sha1sums=('97c811e404322e520f62320c919eecd73db8c5dd' '265d4ca95c3a022b5f6f1d5daea6f8e3a25dee85') build() { diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD index e5fdb1ea6..ce44c6bcd 100644 --- a/libre/kdelibs-libre/PKGBUILD +++ b/libre/kdelibs-libre/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165921 2012-09-03 21:48:13Z andrea $ +# $Id: PKGBUILD 167425 2012-10-02 09:09:06Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kdelibs pkgname=kdelibs-libre -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') @@ -25,7 +25,7 @@ source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar. 'kde-applications-menu.patch' 'use-pythondontwritebytecode.patch' 'khtml-fsdg.diff') -sha1sums=('33fb26ec7735122b2bb084b79f8fcffb826c58f0' +sha1sums=('e86ee16ac7c412b0f6abe3754cb372a45d41c71b' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' 'bbacbbe2194f3961cd7557d98a9ddef158ca11aa' 'a1502a964081ad583a00cf90c56e74bf60121830') diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD index 0721a4ed6..0ddb44e32 100644 --- a/libre/kdenetwork-kopete-libre/PKGBUILD +++ b/libre/kdenetwork-kopete-libre/PKGBUILD @@ -5,8 +5,8 @@ pkgbase=kdenetwork pkgname=('kdenetwork-kopete-libre') -pkgver=4.9.1 -pkgrel=3 +pkgver=4.9.2 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -16,7 +16,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp' 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('22f8cde8b5617ba7e401d82b0669a06899b17320') +sha1sums=('6779039e5354fae02cf7faa3442385b95befb430') build() { cd "${srcdir}" diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD index a71990231..68954e29b 100644 --- a/libre/kdeutils-ark-libre/PKGBUILD +++ b/libre/kdeutils-ark-libre/PKGBUILD @@ -4,7 +4,7 @@ _pkgname=kdeutils-ark pkgname=kdeutils-ark-libre -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='Archiving Tool' url='http://kde.org/applications/utilities/ark/' @@ -19,7 +19,7 @@ provides=("kdeutils-ark=$pkgver") replaces=('kdeutils-ark') conflicts=('kdeutils-ark') source=("http://download.kde.org/stable/${pkgver}/src/ark-${pkgver}.tar.xz") -sha1sums=('2f7d32b9f99913d14801b56f0c858eda128a7b91') +sha1sums=('180ad836ebfc6bdc26d245e6bd27c2fc7a59918c') build() { cd "${srcdir}" diff --git a/libre/kile-libre/PKGBUILD b/libre/kile-libre/PKGBUILD index 2637c5ea4..a28bce338 100644 --- a/libre/kile-libre/PKGBUILD +++ b/libre/kile-libre/PKGBUILD @@ -2,11 +2,11 @@ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> -# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> +# Contributor (Parabola): André Silva <emulatorman@lavabit.com> _pkgname=kile pkgname=kile-libre -pkgver=2.1.2 +pkgver=2.1.3 pkgrel=1 pkgdesc="A user friendly TeX/LaTeX frontend for KDE" arch=("i686" "x86_64" "mips64el") @@ -20,7 +20,7 @@ provides=('kile') install=${_pkgname}.install source=("http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.bz2" "no-acroread.patch") -sha1sums=('238a8fde4fca00e06b314c13671ff53e2ac4845c' +sha1sums=('1a80748d5f01f359b5e5c28140ec90691f0166c5' '9bbe5d1b0e2a78b13667fcf4e5e21f801447f9d6') build() { diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD index c41112a07..70fba1db5 100644 --- a/libre/liferea-libre/PKGBUILD +++ b/libre/liferea-libre/PKGBUILD @@ -5,8 +5,8 @@ _pkgname=liferea pkgname=liferea-libre -pkgver=1.8.8 -pkgrel=1.2 +pkgver=1.8.9 +pkgrel=1 pkgdesc="A desktop news aggregator for online news feeds and weblogs" arch=('i686' 'x86_64' 'mips64el') url="http://liferea.sourceforge.net/" @@ -20,7 +20,7 @@ options=('!libtool' '!emptydirs') install=liferea.install source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.gz remove-non-free-suggestions.patch) -sha1sums=('9dfbf5ff8bd91060bdea93d74c37a8a828a2edfe' +sha1sums=('35452b46d987ba37d5a81ea3e4c0f7199c9c0403' '0d68c567c3d37932a49709c58c37c3f138fd19cb') build() { diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD index 802800fa0..d3154ac86 100644 --- a/libre/linux-libre-tools/PKGBUILD +++ b/libre/linux-libre-tools/PKGBUILD @@ -4,11 +4,11 @@ pkgbase=linux-libre-tools pkgname=('perf-libre' 'cpupower-libre' 'x86_energy_perf_policy-libre' 'usbip-libre') -_basekernel=3.5 +_basekernel=3.6 #_sublevel=1 #pkgver=${_basekernel}.${_sublevel} pkgver=${_basekernel} -pkgrel=5 +pkgrel=1 license=('GPL2') arch=('i686' 'x86_64' 'mips64el') url='http://linux-libre.fsfla.org/' @@ -32,9 +32,9 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'usbipd.conf' 'usbipd.rc' 'usbipd.service') -md5sums=('2407fc9563a74acaf38aa0c06516eb1c' - '18d5aa9e4c6bb23bb02bf65e155e0f0e' - '1d9214637968b91706b6e616a100d44b' +md5sums=('a2312edd0265b5b07bd4b50afae2b380' + '56883c159381ba89e50ab8ea65efec77' + '5fc1fcda4cef93f16e752b1931db23e3' 'c0d17b5295fe964623c772a2dd981771' '2450e8ff41b30eb58d43b5fffbfde1f4' 'e8fac9c45a628015644b4150b139278a' @@ -102,7 +102,7 @@ package_cpupower-libre() { pkgdesc='Linux-libre kernel tool to examine and tune power saving related features of your processor' backup=('etc/conf.d/cpupower') depends=('bash' 'pciutils') - replaces=('cpupower') + replaces=('cpupower' 'cpufrequtils') conflicts=('cpupower' 'cpufrequtils') provides=("cpupower=$pkgver") @@ -152,4 +152,4 @@ package_usbip-libre() { install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service" } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/libre/linux-libre-tools/cpupower.conf b/libre/linux-libre-tools/cpupower.conf index f4e9cc4c8..b5c522ea1 100644 --- a/libre/linux-libre-tools/cpupower.conf +++ b/libre/linux-libre-tools/cpupower.conf @@ -8,10 +8,11 @@ #max_freq="3GHz" # Specific frequency to be set. -# Requires userspace governor to be available and loaded. +# Requires userspace governor to be available. +# Do not set governor field if you use this one. #freq= -# Utilizes cores in one processor package/socket first before processes are +# Utilizes cores in one processor package/socket first before processes are # scheduled to other processor packages/sockets. # See man (1) CPUPOWER-SET for additional details. #mc_scheduler= diff --git a/libre/linux-libre-tools/cpupower.rc b/libre/linux-libre-tools/cpupower.rc index 2c4441c4e..88edaf791 100644 --- a/libre/linux-libre-tools/cpupower.rc +++ b/libre/linux-libre-tools/cpupower.rc @@ -2,7 +2,6 @@ . /etc/rc.conf . /etc/rc.d/functions -. /etc/conf.d/${0##*/} case "$1" in start|restart) diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index bcb82132a..eea164fc3 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=27 +pkgrel=28 epoch=1 _extramodules=extramodules-3.5-LIBRE arch=('i686' 'x86_64' 'mips64el') @@ -20,18 +20,10 @@ source=(http://prdownloads.sourceforge.net/${_pkgbase}/${_pkgbase}-${pkgver}.tar lircd-handle-large-config.patch lirc_atiusb-kfifo.patch kernel-2.6.39.patch - lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd) -md5sums=('b232aef26f23fe33ea8305d276637086' - '1cce37e18e3f6f46044abab29016d18f' - 'b70cc9640505205446ec47b7d4779f38' - '1f8b104a2365d9f93404b143f499059b' - '087a7d102e1c96bf1179f38db2b0b237' - '8d0e238dc0eda95e340fe570605da492' - '85f7fdac55e5256967241864049bf5e9' - '3deb02604b37811d41816e9b4385fcc3' - '5b1f8c9cd788a39a6283f93302ce5c6e' - 'f0c0ac930326168035f0c8e24357ae55' - '69d099e6deedfa3c1ee2b6e82d9b8bfb') + lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd + lirc.service lircm.service irexec.service + lirc.tmpfiles + ) build() { _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" @@ -88,11 +80,16 @@ package_lirc-utils-libre() { conflicts=('lirc-utils') provides=("lirc-utils=$pkgver") backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf') + install=lirc-utils.install cd "${srcdir}/lirc-${pkgver}" make DESTDIR="${pkgdir}" install install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d" cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d" + install -D -m644 "${srcdir}"/lirc.service "${pkgdir}"/usr/lib/systemd/system/lirc.service + install -D -m644 "${srcdir}"/lircm.service "${pkgdir}"/usr/lib/systemd/system/lircm.service + install -D -m644 "${srcdir}"/irexec.service "${pkgdir}"/usr/lib/systemd/system/irexec.service + install -D -m644 "${srcdir}"/lirc.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/lirc.conf cp -rp remotes "${pkgdir}/usr/share/lirc" chmod -R go-w "${pkgdir}/usr/share/lirc/" @@ -110,3 +107,18 @@ package_lirc-utils-libre() { # remove built modules rm -r "${pkgdir}/usr/lib/modules" } +md5sums=('b232aef26f23fe33ea8305d276637086' + '1cce37e18e3f6f46044abab29016d18f' + 'b70cc9640505205446ec47b7d4779f38' + '1f8b104a2365d9f93404b143f499059b' + '087a7d102e1c96bf1179f38db2b0b237' + '8d0e238dc0eda95e340fe570605da492' + '85f7fdac55e5256967241864049bf5e9' + '3deb02604b37811d41816e9b4385fcc3' + '5b1f8c9cd788a39a6283f93302ce5c6e' + 'f0c0ac930326168035f0c8e24357ae55' + '69d099e6deedfa3c1ee2b6e82d9b8bfb' + 'dab8a73bcc5fd5479d8750493d8d97dc' + 'c2e20fe68b034df752dba2773db16ebe' + '07131d117fcfe9dcd50c453c3a5e9531' + 'febf25c154a7d36f01159e84f26c2d9a')
\ No newline at end of file diff --git a/libre/lirc-libre/irexec.service b/libre/lirc-libre/irexec.service new file mode 100644 index 000000000..5d7915b29 --- /dev/null +++ b/libre/lirc-libre/irexec.service @@ -0,0 +1,11 @@ +[Unit] +Description=IR Exec +After=lirc.service +Wants=lirc.service + +[Service] +ExecStart=/usr/bin/irexec --daemon +Type=forking + +[Install] +WantedBy=multi-user.target diff --git a/libre/lirc-libre/lirc-utils.install b/libre/lirc-libre/lirc-utils.install new file mode 100644 index 000000000..293d1ed7c --- /dev/null +++ b/libre/lirc-libre/lirc-utils.install @@ -0,0 +1,7 @@ +post_install() { + systemd-tmpfiles --create lirc.conf +} + +post_upgrade() { + post_install +} diff --git a/libre/lirc-libre/lirc.service b/libre/lirc-libre/lirc.service new file mode 100644 index 000000000..953601fd3 --- /dev/null +++ b/libre/lirc-libre/lirc.service @@ -0,0 +1,11 @@ +[Unit] +Description=Linux Infrared Remote Control + +[Service] +ExecStartPre=/usr/bin/ln -sf /run/lirc/lircd /dev/lircd +ExecStart=/usr/sbin/lircd --pidfile=/run/lirc/lircd.pid +Type=forking +PIDFile=/run/lirc/lircd.pid + +[Install] +WantedBy=multi-user.target diff --git a/libre/lirc-libre/lirc.tmpfiles b/libre/lirc-libre/lirc.tmpfiles new file mode 100644 index 000000000..0b80e2e47 --- /dev/null +++ b/libre/lirc-libre/lirc.tmpfiles @@ -0,0 +1 @@ +d /run/lirc 0755 root root - diff --git a/libre/lirc-libre/lircm.service b/libre/lirc-libre/lircm.service new file mode 100644 index 000000000..6b258e312 --- /dev/null +++ b/libre/lirc-libre/lircm.service @@ -0,0 +1,11 @@ +[Unit] +Description=LIRC Mouse +After=lirc.service +Wants=lirc.service + +[Service] +ExecStart=/usr/sbin/lircmd -u +Type=forking + +[Install] +WantedBy=multi-user.target diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD index cea9ca4d3..7d44e458e 100644 --- a/libre/rp-pppoe-libre/PKGBUILD +++ b/libre/rp-pppoe-libre/PKGBUILD @@ -1,59 +1,48 @@ -# $Id: PKGBUILD 119995 2011-04-18 07:09:47Z daniel $ +# $Id: PKGBUILD 166893 2012-09-20 23:56:51Z eric $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> # Contributor: orelien <aurelien.foret@wanadoo.fr> +# Maintainer (Parabola): André Silva <emulatorman@lavabit.com> +_pkgname=rp-pppoe pkgname=rp-pppoe-libre -pkgver=3.10 -pkgrel=7 +pkgver=3.11 +pkgrel=1 pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client. Unfree software recommendation removed." arch=('i686' 'x86_64' 'mips64el') url="http://www.roaringpenguin.com/pppoe/" license=('GPL') depends=('ppp>=2.4.5' 'sh' 'net-tools') +backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq + etc/ppp/pppoe-server-options) options=('!makeflags') -backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq etc/ppp/pppoe-server-options) -source=(http://repo.parabolagnulinux.org/other/$pkgname-$pkgver.tar.gz adsl - $pkgname.patch) -install=rp-pppoe.install provides=("rp-pppoe=$pkgver") replaces=('rp-pppoe') conflicts=('rp-pppoe') +install=rp-pppoe.install +source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig} + adsl adsl.service $pkgname.patch) +md5sums=('13b5900c56bd602df6cc526e5e520722' + '8fc724aa146dba52ef7b3fbe5b8784c6' + 'adace1ad441aa88dcb3db52fb7f9c97f' + 'af234125f956f3a356ab0d0fcaa9e8a2' + '3c53d550ac408608abb0b6cd6b76b6c2') -mksource() { - wget http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz \ - -O - | tar xzf - - - pushd rp-pppoe-$pkgver >/dev/null - - patch -Np1 -i ../rp-pppoe-libre.patch - - popd >/dev/null - - mv -v rp-pppoe-$pkgver $pkgname-$pkgver +build() { + cd "$srcdir/$_pkgname-$pkgver" + + ## Adding patch to remove unfree software recommendation (ServPoET) + patch -Np1 -i "$srcdir/rp-pppoe-libre.patch" - tar czvf $pkgname-$pkgver.tar.gz $pkgname-$pkgver/ -} + cd ./src -build() { - cd $srcdir/$pkgname-$pkgver/src ./configure --prefix=/usr --enable-plugin - make PLUGIN_DIR="/usr/lib/rp-pppoe" + make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so } package() { - cd $srcdir/$pkgname-$pkgver/src - make DESTDIR=$pkgdir install - - #moving .so files to /usr/lib according to FS#13876 - mkdir -p ${pkgdir}/usr/lib/rp-pppoe - mv ${pkgdir}/etc/ppp/plugins/rp-pppoe.so ${pkgdir}/usr/lib/rp-pppoe/ - #not necessary after moving the plugin - rm -rf ${pkgdir}/etc/ppp/plugins - #changing config to the new path - #sed -i 's/LINUX_PLUGIN=/LINUX_PLUGIN=\/usr\/lib\/rp-pppoe\/rp-pppoe.so/g' ${pkgdir}/etc/ppp/pppoe.conf + cd "$srcdir/$_pkgname-$pkgver/src" + make PLUGIN_DIR="/usr/lib/rp-pppoe" DESTDIR="$pkgdir" install - install -Dm755 $srcdir/adsl $pkgdir/etc/rc.d/adsl + install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl" + install -Dm755 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service" } -md5sums=('2c4a678fa684269ff4579bb639674198' - 'adace1ad441aa88dcb3db52fb7f9c97f' - '9f0d49c3a550c5ad76bb70d65c9d97b2') diff --git a/libre/rp-pppoe-libre/adsl.service b/libre/rp-pppoe-libre/adsl.service new file mode 100644 index 000000000..324164943 --- /dev/null +++ b/libre/rp-pppoe-libre/adsl.service @@ -0,0 +1,10 @@ +[Unit] +Description=ADSL Deamon + +[Service] +Type=forking +ExecStart=/usr/sbin/pppoe-start +ExecStop=/usr/sbin/pppoe-stop + +[Install] +WantedBy=multi-user.target diff --git a/libre/rp-pppoe-libre/rp-pppoe-libre.patch b/libre/rp-pppoe-libre/rp-pppoe-libre.patch index 4f2302496..9cf16d7d7 100644 --- a/libre/rp-pppoe-libre/rp-pppoe-libre.patch +++ b/libre/rp-pppoe-libre/rp-pppoe-libre.patch @@ -1,7 +1,7 @@ -diff -rauNp rp-pppoe-3.10/rp-pppoe.spec rp-pppoe-3.10-libre//rp-pppoe.spec ---- rp-pppoe-3.10/rp-pppoe.spec 2008-06-30 11:00:41.000000000 -0300 -+++ rp-pppoe-3.10-libre//rp-pppoe.spec 2011-06-05 21:03:06.000000000 -0300 -@@ -55,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT +diff -Nur rp-pppoe-3.11.orig/rp-pppoe.spec rp-pppoe-3.11/rp-pppoe.spec +--- rp-pppoe-3.11.orig/rp-pppoe.spec 2012-08-17 15:31:25.000000000 -0300 ++++ rp-pppoe-3.11/rp-pppoe.spec 2012-10-05 01:42:29.964508454 -0300 +@@ -55,7 +55,7 @@ %files %defattr(-,root,root) @@ -10,9 +10,9 @@ diff -rauNp rp-pppoe-3.10/rp-pppoe.spec rp-pppoe-3.10-libre//rp-pppoe.spec %config(noreplace) /etc/ppp/pppoe.conf %config(noreplace) /etc/ppp/pppoe-server-options %config(noreplace) /etc/ppp/firewall-masq -diff -rauNp rp-pppoe-3.10/SERVPOET rp-pppoe-3.10-libre//SERVPOET ---- rp-pppoe-3.10/SERVPOET 2008-06-30 11:00:41.000000000 -0300 -+++ rp-pppoe-3.10-libre//SERVPOET 1969-12-31 21:00:00.000000000 -0300 +diff -Nur rp-pppoe-3.11.orig/SERVPOET /dev/null +--- rp-pppoe-3.11.orig/SERVPOET 2012-08-17 15:31:25.000000000 -0300 ++++ /dev/null 2012-10-05 01:27:08.580078512 -0300 @@ -1,18 +0,0 @@ -# LIC: GPL - @@ -32,10 +32,10 @@ diff -rauNp rp-pppoe-3.10/SERVPOET rp-pppoe-3.10-libre//SERVPOET - --- -David F. Skoll <dfs@roaringpenguin.com> -diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in ---- rp-pppoe-3.10/src/Makefile.in 2008-06-30 11:00:42.000000000 -0300 -+++ rp-pppoe-3.10-libre//src/Makefile.in 2011-06-05 21:03:51.000000000 -0300 -@@ -44,9 +44,6 @@ PPPOE_RELAY=@PPPOE_RELAY@ +diff -Nur rp-pppoe-3.11.orig/src/Makefile.in rp-pppoe-3.11/src/Makefile.in +--- rp-pppoe-3.11.orig/src/Makefile.in 2012-08-17 15:31:25.000000000 -0300 ++++ rp-pppoe-3.11/src/Makefile.in 2012-10-05 01:46:13.121336619 -0300 +@@ -44,9 +44,6 @@ PPPOE_PATH=$(sbindir)/pppoe PPPD_PATH=@PPPD@ @@ -45,7 +45,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in # Kernel-mode plugin gets installed here. PLUGIN_DIR=/etc/ppp/plugins PLUGIN_PATH=$(PLUGIN_DIR)/rp-pppoe.so -@@ -151,7 +148,6 @@ install: all +@@ -152,7 +149,6 @@ $(install) -m 644 ../doc/HOW-TO-CONNECT $(DESTDIR)$(docdir) $(install) -m 644 ../doc/LICENSE $(DESTDIR)$(docdir) $(install) -m 644 ../README $(DESTDIR)$(docdir) @@ -53,7 +53,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in $(install) -m 644 ../configs/pap-secrets $(DESTDIR)$(docdir) -mkdir -p $(DESTDIR)$(mandir)/man8 for i in $(TARGETS) ; do \ -@@ -209,25 +205,15 @@ install: all +@@ -210,25 +206,15 @@ @echo "" @echo "Type 'pppoe-setup' to configure the software." @@ -80,7 +80,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in cp ../$$i ../rp-pppoe-$(VERSION)$(BETA) || exit 1; \ done mkdir ../rp-pppoe-$(VERSION)$(BETA)/gui -@@ -282,10 +268,6 @@ rpms: tgz +@@ -286,10 +272,6 @@ /usr/src/redhat/RPMS/i386/rp-pppoe-$(VERSION)-1.i386.rpm \ /usr/src/redhat/RPMS/i386/rp-pppoe-gui-$(VERSION)-1.i386.rpm @@ -89,9 +89,9 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in - cd .. && rpm -ba servpoet.spec - clean: - rm -f *.o pppoe pppoe-sniff pppoe-server core rp-pppoe.so plugin/*.o plugin/libplugin.a *~ + rm -f *.o pppoe-relay pppoe pppoe-sniff pppoe-server core rp-pppoe.so plugin/*.o plugin/libplugin.a *~ test -f licensed-only/Makefile && $(MAKE) -C licensed-only clean || true -@@ -300,15 +282,13 @@ distclean: clean +@@ -304,15 +286,13 @@ update-version: sed -e 's/^Version: .*$$/Version: $(VERSION)/' ../rp-pppoe.spec > ../rp-pppoe.spec.new && mv ../rp-pppoe.spec.new ../rp-pppoe.spec sed -e 's+^Source: .*$$+Source: http://www.roaringpenguin.com/pppoe/rp-pppoe-$(VERSION).tar.gz+' ../rp-pppoe.spec > ../rp-pppoe.spec.new && mv ../rp-pppoe.spec.new ../rp-pppoe.spec @@ -104,7 +104,7 @@ diff -rauNp rp-pppoe-3.10/src/Makefile.in rp-pppoe-3.10-libre//src/Makefile.in licensed-only: - $(MAKE) -C licensed-only all VERSION=$(VERSION) SERVPOET_VERSION=$(SERVPOET_VERSION) -+ $(MAKE) -C licensed-only all VERSION=$(VERSION) ++ $(MAKE) -C licensed-only all VERSION=$(VERSION) l2tp: libevent/libevent.a $(MAKE) -C l2tp all diff --git a/multilib/lib32-catalyst-utils/PKGBUILD b/multilib/lib32-catalyst-utils/PKGBUILD new file mode 100644 index 000000000..1f57c82b6 --- /dev/null +++ b/multilib/lib32-catalyst-utils/PKGBUILD @@ -0,0 +1,58 @@ +# $Id: PKGBUILD 77082 2012-10-04 12:27:22Z lcarlier $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> +# Contributor: Vi0L0, wonder, Eduardo "kensai" Romero +# Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert + +pkgname=lib32-catalyst-utils +pkgver=12.8 +pkgrel=1 +pkgdesc="AMD Catalyst drivers libraries (32 bits)" +arch=('x86_64') +url="http://www.amd.com" +license=('custom') +source=("http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip") +md5sums=('41c5478322b13be6909eeb46412a3aa0') +provides=('lib32-libgl') +conflicts=('lib32-libgl' 'lib32-nvidia-utils') +depends=("catalyst-utils=${pkgver}") + +build() { + cd ${srcdir} + + sh ./amd-driver-installer*.run --extract fglrx-install +} + +package() { + install -dm755 "${pkgdir}"/usr/bin + install -dm755 "${pkgdir}"/usr/lib32/{dri,xorg/modules/{dri,extensions/fglrx}} + + # binaries + cd ${srcdir}/fglrx-install + install -m755 arch/x86/usr/X11R6/bin/fgl_glxgears "${pkgdir}/usr/bin/fgl_glxgears32" + install -m755 arch/x86/usr/X11R6/bin/fglrxinfo "${pkgdir}/usr/bin/fglrxinfo32" + + # dri/gl/... drivers + cd ${srcdir}/fglrx-install/xpic/usr/X11R6/lib/modules + install -m755 *.so "${pkgdir}/usr/lib32/xorg/modules/" + cd ${srcdir}/fglrx-install/arch/x86/usr/X11R6/lib + install -m755 modules/dri/fglrx_dri.so "${pkgdir}/usr/lib32/xorg/modules/dri/" + ln -s /usr/lib32/xorg/modules/dri/fglrx_dri.so "${pkgdir}/usr/lib32/dri/" + install -m755 fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib32/" + install -m755 *.so* "${pkgdir}/usr/lib32/" + install -m644 libAMDXvBA.cap "${pkgdir}/usr/lib32/" + cd ${srcdir}/fglrx-install/arch/x86/usr/lib + install -m755 *.so* "${pkgdir}/usr/lib32/" + # needed symlinks + ln -s libatiuki.so.1.0 "${pkgdir}/usr/lib32/libatiuki.so.1" + ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib32/libGL.so.1" + ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib32/libGL.so" + ln -s libAMDXvBA.so.1.0 "${pkgdir}/usr/lib32/libAMDXvBA.so.1" + ln -s libAMDXvBA.so.1.0 "${pkgdir}/usr/lib32/libAMDXvBA.so" + ln -s libfglrx_dm.so.1.0 "${pkgdir}/usr/lib32/libfglrx_dm.so.1" + + # useful for 32 bits ? + rm "${pkgdir}"/usr/lib32/lib{amdocl*,OpenCL}.so* + + # licenses + install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" +} |