From ad4b2565385561c6ff56f1f91c1e40115cf939d7 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 12 Jun 2011 22:59:55 +0000 Subject: Sun Jun 12 22:59:55 UTC 2011 --- multilib-testing/lib32-glibc/PKGBUILD | 12 +++++-- .../lib32-glibc/glibc-2.14-revert-4462fad3.patch | 37 ++++++++++++++++++++++ 2 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch (limited to 'multilib-testing') diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD index f5958c7da..e1ed19461 100644 --- a/multilib-testing/lib32-glibc/PKGBUILD +++ b/multilib-testing/lib32-glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 48898 2011-06-07 12:25:15Z heftig $ +# $Id: PKGBUILD 49129 2011-06-11 13:29:12Z heftig $ # Maintainer: Jan "heftig" Steffens # Contributor: Jan de Groot # Contributor: Allan McRae @@ -9,7 +9,7 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.14 -pkgrel=1 +pkgrel=2 _glibcdate=20110605 pkgdesc="GNU C Library for multilib" arch=('x86_64') @@ -26,6 +26,7 @@ source=(http://mirrors.kernel.org/archlinux/other/glibc/${_pkgbasename}-${pkgver glibc-2.12.2-ignore-origin-of-privileged-program.patch glibc-2.13-futex.patch glibc-2.14-libdl-crash.patch + glibc-2.14-revert-4462fad3.patch lib32-glibc.conf) md5sums=('a96742599fc8a99e52b9e344f39a1000' '4dadb9203b69a3210d53514bb46f41c3' @@ -35,6 +36,7 @@ md5sums=('a96742599fc8a99e52b9e344f39a1000' 'b042647ea7d6f22ad319e12e796bd13e' '7d0154b7e17ea218c9fa953599d24cc4' 'cea62cc6b903d222c5f26e05a3c0e0e6' + '46e56492cccb1c9172ed3a235cf43c6c' '6e052f1cb693d5d3203f50f9d4e8c33b') build() { @@ -65,6 +67,10 @@ build() { # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch + # revert fix for http://sourceware.org/bugzilla/show_bug.cgi?id=12684 + # as it causes crashes (FS#24615) + patch -Np1 -i ${srcdir}/glibc-2.14-revert-4462fad3.patch + cd ${srcdir} mkdir glibc-build cd glibc-build @@ -119,7 +125,7 @@ package() { usr/lib32/libnss_{compat,dns,files,hesiod,nis,nisplus}-${pkgver}.so \ usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \ usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \ - usr/lib32/{pt_chown,gconv/*.so} + usr/lib32/{pt_chown,{audit,gconv}/*.so} # Dynamic linker install -d -m755 ${pkgdir}/lib diff --git a/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch b/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch new file mode 100644 index 000000000..d71e37492 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.14-revert-4462fad3.patch @@ -0,0 +1,37 @@ +diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c +--- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000 ++++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000 +@@ -549,7 +549,7 @@ + ns, ansp, ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || resplen2 == 0)) ++ if (n == 0) + goto next_ns; + } else { + /* Use datagrams. */ +@@ -559,7 +559,7 @@ + ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || resplen2 == 0)) ++ if (n == 0) + goto next_ns; + if (v_circuit) + // XXX Check whether both requests failed or +@@ -1275,14 +1275,10 @@ + (*thisresplenp > *thisanssizp) + ? *thisanssizp : *thisresplenp); + +- if (recvresp1 || (buf2 != NULL && recvresp2)) { +- *resplen2 = 0; ++ if (recvresp1 || (buf2 != NULL && recvresp2)) + return resplen; +- } + if (buf2 != NULL) + { +- /* No data from the first reply. */ +- resplen = 0; + /* We are waiting for a possible second reply. */ + if (hp->id == anhp->id) + recvresp1 = 1; -- cgit v1.2.3-54-g00ecf From 7c64c5039335c73eaa1a402c417235e8ca9a5109 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 13 Jun 2011 19:04:06 +0000 Subject: Mon Jun 13 19:04:06 UTC 2011 --- community/emesene/PKGBUILD | 52 +++++++++++++--------- community/emesene/emesene.install | 3 +- community/emesene/emesene.run | 2 +- community/gsmartcontrol/PKGBUILD | 21 +++++---- community/uzbl/PKGBUILD | 6 +-- community/vhba-module/PKGBUILD | 10 ++--- elementary/elementary-gtk-theme/PKGBUILD | 27 +++++++++++ .../elementary-gtk-theme.install | 10 +++++ elementary/elementary-icons/PKGBUILD | 24 ++++++++++ elementary/postler/PKGBUILD | 28 ++++++++++++ elementary/postler/postler.install | 12 +++++ elementary/vala-010/PKGBUILD | 34 ++++++++++++++ extra/bitlbee/PKGBUILD | 8 ++-- extra/bochs/PKGBUILD | 17 ++++--- extra/celestia/PKGBUILD | 28 +++++++----- extra/celestia/celestia-1.6.1-gentoo.patch | 23 ++++++++++ extra/fvwm/PKGBUILD | 21 +++++---- extra/fvwm/fvwm.desktop | 7 +++ extra/kile/PKGBUILD | 8 ++-- extra/kile/kile.install | 2 + extra/miro/PKGBUILD | 11 ++--- libre/unarchiver/PKGBUILD | 2 +- libre/xchat-libre/PKGBUILD | 19 ++++---- libre/xchat-libre/no-firefox.patch | 11 +++++ libre/your-freedom/PKGBUILD | 2 +- multilib-testing/lib32-mesa/PKGBUILD | 12 ++--- testing/mesa/PKGBUILD | 12 ++--- 27 files changed, 309 insertions(+), 103 deletions(-) create mode 100644 elementary/elementary-gtk-theme/PKGBUILD create mode 100644 elementary/elementary-gtk-theme/elementary-gtk-theme.install create mode 100644 elementary/elementary-icons/PKGBUILD create mode 100644 elementary/postler/PKGBUILD create mode 100644 elementary/postler/postler.install create mode 100644 elementary/vala-010/PKGBUILD create mode 100644 extra/celestia/celestia-1.6.1-gentoo.patch create mode 100644 extra/fvwm/fvwm.desktop create mode 100644 libre/xchat-libre/no-firefox.patch (limited to 'multilib-testing') diff --git a/community/emesene/PKGBUILD b/community/emesene/PKGBUILD index 38a900af3..469adf4b8 100755 --- a/community/emesene/PKGBUILD +++ b/community/emesene/PKGBUILD @@ -2,47 +2,57 @@ # Contributor: Claudio Riva pkgname=emesene -pkgver=1.6.3 -pkgrel=4 +pkgver=2.11.5 +pkgrel=1 pkgdesc="A pygtk MSN Messenger client" url="http://www.emesene.org/" license=('custom:PSF' 'GPL' 'LGPL2.1') arch=('i686' 'x86_64') # libmimic is hardcoded, so no 'any' package -depends=('python2' 'pygtk' 'hicolor-icon-theme' 'xdg-utils') +#depends=('python2' 'pygtk' 'hicolor-icon-theme' 'xdg-utils') +depends=('python2' 'pygtk' 'python-dnspython' 'pylint' 'python-notify' 'openssl' \ +'papyon' 'python-imaging' 'dbus-python' 'xdg-utils' 'hicolor-icon-theme') +makedepends=('python2-distribute') optdepends=('gnome-python-extras: spell-check plugin' 'gtkspell: spell-check plugin' 'aspell: spell-check plugin (also need aspell dictionary)' 'gstreamer0.10-python: webcam support' - 'gstreamer0.10-good-plugins: webcam support') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-$pkgver.tar.gz \ - 'emesene.run' 'setup.patch') + 'gstreamer0.10-good-plugins: webcam support' + 'pywebkitgtk: for alternative conversation window' + 'xmpppy: for gtalk and facebook chat support' + 'pyqt: alternative qt4 interface (emesene -e main:qt4_main') +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz" \ + 'emesene.run') install=emesene.install options=('!libtool') -sha1sums=('c4759efe180c8e1589bd966c6b84106aa7cd356e' - '46dcc89d089c0356d121356aa2ffff45e4468138' - '0195898a6cb609f4ad736e0687bf76641f6db537') +sha1sums=('54e5fe81e99ddf5909b50c1c4f938480ed43f691' + '2d72b485875803d4675d1e1b36c90778e4475651') build() { cd ${srcdir}/${pkgname}-${pkgver} - # python2 fix - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' Controller.py - - # enable installing in setup.py - patch -Np0 -i ${srcdir}/setup.patch - - # install license files - install -Dm644 COPYING ${pkgdir}/usr/share/licenses/emesene/COPYING - install -Dm644 PSF ${pkgdir}/usr/share/licenses/emesene/PSF + # do not import dummy session + # sed -i -e "/import dummy/d" emesene/emesene.py # install files + export PYTHONPATH="${pkgdir}/usr/lib/python2.7/site-packages/" + install -d ${pkgdir}/usr/lib/python2.7/site-packages/ python2 setup.py install --prefix=${pkgdir}/usr +} + +package() { + cd ${pkgdir} # use /usr/share/emesene instead of /usr/lib/python2.5/site-packages - mv -f ${pkgdir}/usr/lib/python2.7/site-packages $pkgdir/usr/share/emesene + mv -f ${pkgdir}/usr/lib/python2.7/site-packages/emesene-2.0-py2.7.egg/share \ + ${pkgdir}/usr + mv -f ${pkgdir}/usr/lib/python2.7/site-packages/emesene-2.0-py2.7.egg/emesene \ + ${pkgdir}/usr/share rm -rf ${pkgdir}/usr/lib - # remove old executable and use our own because we use /usr/share/emesene - rm ${pkgdir}/usr/bin/emesene + # python -> python2 + find -name *.py -exec sed -i "s|/usr/bin/env python|/usr/bin/env python2|" {} \; + + # create executable install -Dm755 ${srcdir}/emesene.run ${pkgdir}/usr/bin/emesene } + diff --git a/community/emesene/emesene.install b/community/emesene/emesene.install index 309ea10a5..9ff2df7f8 100644 --- a/community/emesene/emesene.install +++ b/community/emesene/emesene.install @@ -1,5 +1,6 @@ post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q + xdg-icon-resource forceupdate --theme hicolor &> /dev/null } post_upgrade() { diff --git a/community/emesene/emesene.run b/community/emesene/emesene.run index 35d9dbfa3..3b0aacdf9 100644 --- a/community/emesene/emesene.run +++ b/community/emesene/emesene.run @@ -1,3 +1,3 @@ #!/bin/bash -python2 /usr/share/emesene/Controller.py $@ +python2 /usr/share/emesene/emesene.py $@ diff --git a/community/gsmartcontrol/PKGBUILD b/community/gsmartcontrol/PKGBUILD index 09cf1249f..b1a9ce27f 100644 --- a/community/gsmartcontrol/PKGBUILD +++ b/community/gsmartcontrol/PKGBUILD @@ -1,20 +1,25 @@ -# Contributor: Daniel J Griffiths +# Maintainer: Jelle van der Waa pkgname=gsmartcontrol -pkgver=0.8.5 +pkgver=0.8.6 pkgrel=1 pkgdesc="A graphical user interface for the smartctl hard disk drive health inspection tool." arch=('i686' 'x86_64') url="http://gsmartcontrol.berlios.de/home/index.php/en/Home" license=('GPL3') -depends=('smartmontools' 'pcre' 'gtkmm' 'libglademm') +depends=('smartmontools' 'pcre' 'gtkmm' 'libglademm' 'glib2') install=${pkgname}.install -source=(http://download.berlios.de/gsmartcontrol/$pkgname-$pkgver.tar.bz2) -md5sums=('654ee0b77665206d4d8a46080c5747b6') +source=(http://download.berlios.de/gsmartcontrol/${pkgname}-${pkgver}.tar.bz2) +md5sums=('d2ac685e2e73b05f7ba74c93623af739') build() { - cd $srcdir/$pkgname-$pkgver + cd ${srcdir}/${pkgname}-${pkgver} ./configure --prefix=/usr - make || return 1 - make DESTDIR=$pkgdir install + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install } diff --git a/community/uzbl/PKGBUILD b/community/uzbl/PKGBUILD index 82bbe2770..42cfc5ea3 100644 --- a/community/uzbl/PKGBUILD +++ b/community/uzbl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 45245 2011-04-18 20:59:54Z lcarlier $ +# $Id: PKGBUILD 49179 2011-06-12 21:24:14Z jelle $ # Maintainer : Laurent Carlier # Contributor: Ionut Biru # Contributor: Dieter Plaetinck @@ -6,7 +6,7 @@ pkgbase=uzbl pkgname=('uzbl-core' 'uzbl-browser' 'uzbl-tabbed') pkgver=2011.04.12 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url="http://www.uzbl.org" license=('GPL3') @@ -23,7 +23,7 @@ build() { done sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ - $(find ./ -name '*.py') + $(find ./ -name '*.py') bin/* make } diff --git a/community/vhba-module/PKGBUILD b/community/vhba-module/PKGBUILD index f75e3f1bd..43fa2bc67 100644 --- a/community/vhba-module/PKGBUILD +++ b/community/vhba-module/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 44936 2011-04-13 05:20:34Z schiv $ +# $Id: PKGBUILD 48166 2011-05-29 11:57:10Z mherych $ # Maintainer: Mateusz Herych # Contributor: Charles Lindsay pkgname=vhba-module pkgver=20100822 -_kernver='2.6.38-ARCH' -pkgrel=4 +_kernver='2.6.39-ARCH' +pkgrel=5 pkgdesc="Kernel module that emulates SCSI devices" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/" license=('GPL2') -depends=('kernel26>=2.6.38' 'kernel26<2.6.39') -makedepends=('kernel26-headers>=2.6.38' 'git') +depends=('kernel26>=2.6.39' 'kernel26<2.6.40') +makedepends=('kernel26-headers>=2.6.39' 'git') install=vhba-module.install source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz vhba-kernel2.6.37.patch) diff --git a/elementary/elementary-gtk-theme/PKGBUILD b/elementary/elementary-gtk-theme/PKGBUILD new file mode 100644 index 000000000..64f4a4511 --- /dev/null +++ b/elementary/elementary-gtk-theme/PKGBUILD @@ -0,0 +1,27 @@ +# Maintainer: paterbrown +# Contributor: Daniel Milde + +pkgname=elementary-gtk-theme +_pkgname=egtk +pkgver=2.1 +pkgrel=5 +pkgdesc="The official elementary GTK theme designed to be smooth, attractive, fast, and usable." +arch=('any') +url="https://launchpad.net/egtk" +license=('GPL2') +depends=('gtk-engine-murrine') +optdepends=('elementary-icons: the elementary icon theme' + 'nautilus-elementary-bzr: the fork of Nautilus for simplicity') +source=(http://launchpad.net/egtk/2.0/${pkgver}/+download/${_pkgname}.zip) +md5sums=('f685d659c72271944ca2e76d638ca2ed') +install=elementary-gtk-theme.install + +build () { + mkdir -p ${pkgdir}/usr/share/themes + cp -r ${srcdir}/${_pkgname} ${pkgdir}/usr/share/themes/elementary + + # remove unnecessary files + rm -rf ${pkgdir}/usr/share/themes/elementary/debian + rm -rf ${pkgdir}/usr/share/themes/elementary/.bzr +} + diff --git a/elementary/elementary-gtk-theme/elementary-gtk-theme.install b/elementary/elementary-gtk-theme/elementary-gtk-theme.install new file mode 100644 index 000000000..66264ead4 --- /dev/null +++ b/elementary/elementary-gtk-theme/elementary-gtk-theme.install @@ -0,0 +1,10 @@ +pkgname=elementary-gtk-theme + +post_install() { + echo -e "\033[1;34mIf you prefer the light panel then follow this instruction:\033[0m" + echo -e "change '\033[1;32minclude "Apps/panel-dark.rc"\033[0m' to '\033[1;32minclude "Apps/panel.rc"\033[0m' in '/usr/share/themes/elementary/gtk-2.0/gtkrc'" +} + +post_upgrade() { + post_install $1 +} diff --git a/elementary/elementary-icons/PKGBUILD b/elementary/elementary-icons/PKGBUILD new file mode 100644 index 000000000..b56c16d8b --- /dev/null +++ b/elementary/elementary-icons/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: paterbrown +# Contributor: Josip + +pkgname=elementary-icons +_pkgname=elementary-icon-theme +pkgver=2.7.1 +pkgrel=1 +pkgdesc="The elementary icons is an icon theme designed to be smooth, sexy, clear, and efficient." +arch=('any') +url="https://launchpad.net/elementaryicons" +license=('GPL3') +depends=('librsvg') +source=(http://launchpad.net/elementaryicons/2.0/${pkgver}/+download/${_pkgname}-${pkgver}.tar.gz) +md5sums=('fc4580641089a09cbcf7df38ebddd807') + +build() { + cd ${srcdir}/${_pkgname}/elementary/panel/22 + for i in audio*-panel.svg; do ln -s "$i" "${i%-panel.svg}.svg"; done + cd ${srcdir}/${_pkgname}/elementary-mono-dark/panel/22 + for i in audio*-panel.svg; do ln -s "$i" "${i%-panel.svg}.svg"; done + mkdir -p ${pkgdir}/usr/share/icons + cp -r ${srcdir}/${_pkgname}/elementary ${pkgdir}/usr/share/icons + cp -r ${srcdir}/${_pkgname}/elementary-mono-dark ${pkgdir}/usr/share/icons +} diff --git a/elementary/postler/PKGBUILD b/elementary/postler/PKGBUILD new file mode 100644 index 000000000..55b523f82 --- /dev/null +++ b/elementary/postler/PKGBUILD @@ -0,0 +1,28 @@ +# Maintainer: Kosava + +pkgname=postler +pkgver=0.1.1 +pkgrel=2 +pkgdesc="Postler is simple desktop mail client built in vala" +arch=('i686' 'x86_64') +url="https://launchpad.net/postler" +license=('GPL') +depends=('libwebkit' 'libunique' 'libcanberra' 'libnotify') +makedepends=('vala-010' 'intltool' 'librsvg' 'gettext' 'python2' 'msmtp') +optdepends=('dexter: provides contact completion' + 'lynx: enables HTML to text conversion' + 'libindicate: raise flags on dbus for other components of the desktop') +install="postler.install" +source=(http://git.xfce.org/apps/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 $pkgname.install) +md5sums=('02e502c9f4a4b92e4ace32d9e268f06d' + '7541710086c2b4f45da7268c137ed708') + +build() { + cd $srcdir/$pkgname-$pkgver + export VALAC="/opt/vala-0.10/bin/valac" + msg "Patching the buildscript to use python2..." + sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|g" waf + ./waf configure --prefix=/usr --disable-libindicate + ./waf build + ./waf --destdir=$pkgdir install +} diff --git a/elementary/postler/postler.install b/elementary/postler/postler.install new file mode 100644 index 000000000..709ad81f2 --- /dev/null +++ b/elementary/postler/postler.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/elementary/vala-010/PKGBUILD b/elementary/vala-010/PKGBUILD new file mode 100644 index 000000000..7712f99c4 --- /dev/null +++ b/elementary/vala-010/PKGBUILD @@ -0,0 +1,34 @@ +# Maintainer: Alessio Sergi + +pkgname=vala-010 +_pkgname=vala +pkgver=0.10.4 +pkgrel=1 +pkgdesc="Compiler for the GObject type system (0.10 branch)" +arch=('i686' 'x86_64') +url="http://live.gnome.org/Vala" +license=('LGPL2.1') +depends=('glib2') +makedepends=('libxslt') +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgname}/0.10/${_pkgname}-${pkgver}.tar.bz2) +sha256sums=('4d23bd8b904ec59537ed5bcf44064104ccc41d639a3386cbc62d91f6bf0301c4') + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + ./configure --prefix=/opt/vala-0.10 \ + --enable-vapigen + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + + make DESTDIR="${pkgdir}" install + + # make it nice + install -d -m755 ${pkgdir}/usr/bin + ln -s /opt/vala-0.10/bin/{vala-0.10,valac-0.10,vala-gen-introspect-0.10,vapicheck-0.10,vapigen-0.10} ${pkgdir}/usr/bin/ +} + diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index 7da66f7f9..880792b3d 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 119552 2011-04-12 06:10:02Z bisson $ +# $Id: PKGBUILD 127301 2011-06-12 14:10:02Z bisson $ # Contributor: FUBAR # Contributor: simo # Contributor: Jeff 'codemac' Mickey @@ -6,8 +6,8 @@ # Maintainer: Gaetan Bisson pkgname=bitlbee -pkgver=3.0.2 -pkgrel=3 +pkgver=3.0.3 +pkgrel=1 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' arch=('i686' 'x86_64') url='http://www.bitlbee.org/' @@ -17,7 +17,7 @@ optdepends=('xinetd: to run bitlbee through xinetd') source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz" 'xinetd' 'rc.d') -sha1sums=('59113b1dc440ebd775e6cf324d1cfb698fb20cfc' +sha1sums=('4140eb7aaa2c6a39fa059d19f8fbaec0d7a1ebff' '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17' 'be09d29af3853825778331df451f16ca9e452d03') diff --git a/extra/bochs/PKGBUILD b/extra/bochs/PKGBUILD index 7106ce9d9..859c5d737 100644 --- a/extra/bochs/PKGBUILD +++ b/extra/bochs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 94642 2010-10-09 04:04:21Z kevin $ +# $Id: PKGBUILD 127306 2011-06-13 00:31:34Z kevin $ #Contributor: Tom Newsom # Maintainer: Kevin Piche pkgname=bochs -pkgver=2.4.5 +pkgver=2.4.6 pkgrel=1 pkgdesc="A portable x86 PC emulation software package" arch=('i686' 'x86_64') @@ -11,16 +11,21 @@ license=('LGPL') url="http://bochs.sourceforge.net/" source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz 2.4.5-fetchcode.patch) -depends=('gcc-libs' 'libxpm') +depends=('gcc-libs' 'libxrandr') +# 'libxpm') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np0 -i ${srcdir}/2.4.5-fetchcode.patch + #patch -Np0 -i ${srcdir}/2.4.5-fetchcode.patch ./configure --prefix=/usr --enable-vbe --without-wx --enable-cpu-level=6 \ --enable-fpu --enable-3dnow - make || return 1 + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} make prefix=${pkgdir}/usr install install -D -m 644 .bochsrc ${pkgdir}/etc/bochsrc-sample.txt } -sha256sums=('b948622a364c2e7da4221a6a4640ba2efa68422e1411ac377c69d37f46f67616' +sha256sums=('689dcc5fccfd70c8340a54986f0cb9c2824009ed602718802868333da9ac53b9' '3dba808614da7d0fa1a3d6ddaceabf027a873d1f45fb90ec43b8dce876baa8ff') diff --git a/extra/celestia/PKGBUILD b/extra/celestia/PKGBUILD index 87c4af8a6..702e3e05f 100644 --- a/extra/celestia/PKGBUILD +++ b/extra/celestia/PKGBUILD @@ -1,34 +1,38 @@ -# $Id: PKGBUILD 63841 2010-01-18 21:47:42Z ibiru $ +# $Id: PKGBUILD 127269 2011-06-12 08:43:30Z ronald $ # Maintainer: Ronald van Haren # Contributor : Damir Perisa pkgname=celestia -pkgver=1.6.0 -pkgrel=2 +pkgver=1.6.1 +pkgrel=1 pkgdesc="Real-time space simulation" arch=('i686' 'x86_64') license=('GPL') url="http://www.shatters.net/celestia/" -depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'mesa' 'libjpeg>=8') +depends=('gtk2' 'libtheora' 'lua' 'gtkglext' 'glut' 'libxmu' 'mesa' 'libjpeg') options=('!makeflags') source=(http://downloads.sourceforge.net/sourceforge/celestia/${pkgname}-${pkgver}.tar.gz - celestia-1.5.1-gcc44.patch libpng14.patch) -md5sums=('9b96a8e7666ab5a26f032b9d605e023d' - '0c606dbd3a641afb1b0725428db854c8' - '829c0860659272a9f55aedf096ee4216') + celestia-1.5.1-gcc44.patch celestia-1.6.1-gentoo.patch) +sha1sums=('1f0fdf4525a8b9d6c708e1f6383babed670d18e7' + '5ab2769e239a89468bb8ffb5740cbeec6018143c' + 'aebf894630fdba4c4d429622f5e2b8da56d8b61e') build() { cd ${srcdir}/${pkgname}-${pkgver} # build patch - patch -Np0 < ${srcdir}/celestia-1.5.1-gcc44.patch || return 1 - patch -Np1 -i ${srcdir}/libpng14.patch || return 1 + patch -Np0 < ${srcdir}/celestia-1.5.1-gcc44.patch + patch -Np0 -i ${srcdir}/celestia-1.6.1-gentoo.patch ./configure --prefix=/usr \ --with-lua=/usr \ --datadir=/usr/share \ --with-gtk - make || return 1 - make DESTDIR=${pkgdir} install || return 1 + make +} + +package() { + cd ${srcdir}/${pkgname}-${pkgver} + make DESTDIR=${pkgdir} install } diff --git a/extra/celestia/celestia-1.6.1-gentoo.patch b/extra/celestia/celestia-1.6.1-gentoo.patch new file mode 100644 index 000000000..57fffe159 --- /dev/null +++ b/extra/celestia/celestia-1.6.1-gentoo.patch @@ -0,0 +1,23 @@ +--- src/celestia/Makefile.am 2011-06-07 19:15:51.502000147 +0200 ++++ src/celestia/Makefile.am.new 2011-06-07 19:15:47.208000302 +0200 +@@ -15,6 +15,7 @@ + if ENABLE_GTK + SUBDIRS += gtk + celestiaGTKLIBS = $(GTK_LIBS) gtk/libgtkgui.a ++LIBS += $(GTK_LIBS) + endif + + COMMONSOURCES = \ + +Index: src/celengine/frametree.h +=================================================================== +--- src/celengine/frametree.h (revision 5163) ++++ src/celengine/frametree.h (arbetskopia) +@@ -14,6 +14,7 @@ + #define _CELENGINE_FRAMETREE_H_ + + #include ++#include + + class Star; + class Body; diff --git a/extra/fvwm/PKGBUILD b/extra/fvwm/PKGBUILD index bd7af2998..88ea17960 100644 --- a/extra/fvwm/PKGBUILD +++ b/extra/fvwm/PKGBUILD @@ -1,22 +1,24 @@ -# $Id: PKGBUILD 122671 2011-05-06 03:51:25Z eric $ +# $Id: PKGBUILD 127312 2011-06-13 03:53:57Z eric $ # Maintainer: Eric Bélanger pkgname=fvwm pkgver=2.6.1 -pkgrel=2 +pkgrel=3 pkgdesc="A multiple large virtual desktop window manager originally derived from twm" arch=('i686' 'x86_64') url="http://www.fvwm.org" license=('GPL' 'custom') depends=('imlib' 'fribidi' 'perl' 'libstroke' 'libxpm' 'librsvg' 'libxinerama' 'libxcursor') makedepends=('libxslt') +provides=('fvwm-devel') conflicts=('fvwm-devel') -options=('!emptydirs') -source=(ftp://ftp.fvwm.org/pub/fvwm/version-2/${pkgname}-${pkgver}.tar.bz2 fvwm2.desktop) +replaces=('fvwm-devel') +options=('!emptydirs' '!makeflags') +source=(ftp://ftp.fvwm.org/pub/fvwm/version-${pkgver%%.*}/${pkgname}-${pkgver}.tar.bz2 fvwm.desktop) md5sums=('fbbbed1bb41fa0878b17ee209947602d' - 'e52a6ef25a936dcf3ad0e58f2e9ed0ea') + 'a12c52729a74355838404ee2f5716e0c') sha1sums=('cf7165d40180b45409e604736066cf9fcc792e36' - 'e0924164329e7eb14e0d6137d8ff18cf6230191c') + '6fd8fd767f32f88cc8b4743a2ba49bcfcdb32bcb') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -27,10 +29,7 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - - install -d "${pkgdir}/etc/fvwm" - install -D -m644 sample.fvwmrc/* "${pkgdir}/etc/fvwm" - rm -f "${pkgdir}"/etc/fvwm/Makefile* - install -D -m644 ../fvwm2.desktop "${pkgdir}/usr/share/xsessions/fvwm2.desktop" + install -D -m644 sample.fvwmrc/{decor_examples,DecorMwm,DecorWin95,new-features,system.*} "${pkgdir}/usr/share/doc/fvwm" + install -D -m644 ../fvwm.desktop "${pkgdir}/usr/share/xsessions/fvwm.desktop" install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/fvwm/fvwm.desktop b/extra/fvwm/fvwm.desktop new file mode 100644 index 000000000..e297a6109 --- /dev/null +++ b/extra/fvwm/fvwm.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=FVWM +Comment=The fvwm window manager +Type=XSession +Exec=/usr/bin/fvwm +TryExec=/usr/bin/fvwm diff --git a/extra/kile/PKGBUILD b/extra/kile/PKGBUILD index 5e2987a07..46fe51c12 100644 --- a/extra/kile/PKGBUILD +++ b/extra/kile/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 108891 2011-02-04 17:44:40Z ronald $ +# $Id: PKGBUILD 127274 2011-06-12 09:04:19Z ronald $ # Maintainer: Ronald van Haren # Contributor : Damir Perisa pkgname=kile -pkgver=2.1b5 +pkgver=2.1 pkgrel=1 pkgdesc="A user friendly TeX/LaTeX frontend for KDE." arch=("i686" "x86_64") license=('GPL2') url="http://kile.sourceforge.net/" -depends=('kdelibs' 'texlive-core') +depends=('kdebase-runtime' 'texlive-core') makedepends=('cmake' 'automoc4' 'docbook-xml' 'docbook-xsl') install=kile.install source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2") -sha1sums=('ee805e5210474d42344d690d24383adaad1d8842') +sha1sums=('860ac96b68b6026f48b8a9c401c6024ba78e3cdf') build() { cd ${srcdir} diff --git a/extra/kile/kile.install b/extra/kile/kile.install index e70c054ec..9fe93eeac 100644 --- a/extra/kile/kile.install +++ b/extra/kile/kile.install @@ -1,5 +1,7 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q } post_upgrade() { diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD index a923b8f65..9f5a1c34a 100644 --- a/extra/miro/PKGBUILD +++ b/extra/miro/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 119004 2011-04-10 11:32:39Z eric $ +# $Id: PKGBUILD 127264 2011-06-12 08:13:43Z ronald $ # Maintainer: Ronald van Haren pkgname=miro -pkgver=3.5.1 -pkgrel=2 +pkgver=4.0.1.1 +pkgrel=1 pkgdesc="The free and open source internet TV platform" arch=('i686' 'x86_64') url="http://www.getmiro.com" @@ -12,11 +12,12 @@ depends=('dbus-python' 'pyrex' 'pygtk' 'gstreamer0.10' 'python2-gconf' 'python-pysqlite' 'pywebkitgtk' 'shared-mime-info' 'desktop-file-utils' 'gstreamer0.10' 'hicolor-icon-theme' 'gstreamer0.10-python' 'python-notify' 'libtorrent-rasterbar' - 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl') + 'gstreamer0.10-base-plugins' 'gstreamer0.10-good-plugins' 'python-pycurl' + 'gstreamer0.10-ffmpeg' 'ffmpeg') makedepends=('pkg-config') install=miro.install source=(http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgver}.tar.gz) -sha1sums=('0f5c2a307e7040c9c2895ee9a2d1c3ff99d34e9e') +sha1sums=('f6dbfb661bd642ccf60b38405c63182c7a9142df') build() { cd "${srcdir}/${pkgname}-${pkgver}/linux" diff --git a/libre/unarchiver/PKGBUILD b/libre/unarchiver/PKGBUILD index 4a5cb737e..b319676c4 100644 --- a/libre/unarchiver/PKGBUILD +++ b/libre/unarchiver/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Cedric Girard pkgname=unarchiver pkgver=2.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="An Objective-C application for uncompressing archive files" arch=('x86_64' 'i686') url="http://wakaba.c3.cx/s/apps/unarchiver.html" diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD index 8262e03be..0c0c0b6b1 100644 --- a/libre/xchat-libre/PKGBUILD +++ b/libre/xchat-libre/PKGBUILD @@ -4,7 +4,7 @@ pkgbasename=xchat pkgname=xchat-libre pkgver=2.8.8 -pkgrel=3 +pkgrel=3.1 pkgdesc="A GTK+ based IRC client without non-free browser reference" arch=('i686' 'x86_64') url="http://www.xchat.org/" @@ -18,17 +18,14 @@ optdepends=('enchant: for spell checking support' 'tcl: for tcl plugin' \ 'python2: for python plugin') options=('!libtool') changelog=ChangeLog -source=(http://www.xchat.org/files/source/${pkgver%.*}/${pkgbasename}-${pkgver}.tar.xz remove-non-free-suggestion.patch) -md5sums=('9a11f13121ff0af787bba3b014378e58' - '47c665961f11a803e9a12007811a04c9') -sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532' - '05e673aa44813ddac8aabb251d5f0124efde91a2') - - +source=(http://www.xchat.org/files/source/${pkgver%.*}/${pkgbasename}-${pkgver}.tar.xz + remove-non-free-suggestion.patch + no-firefox.patch) build() { cd "${srcdir}/${pkgbasename}-${pkgver}" patch -p1 < ../remove-non-free-suggestion.patch + patch -p1 < ../no-firefox.patch ./configure --prefix=/usr --sysconfdir=/etc --enable-openssl --enable-dbus \ --disable-textfe --enable-ipv6 --enable-shm --enable-spell=static make @@ -39,3 +36,9 @@ package() { make DESTDIR="${pkgdir}" install } +md5sums=('9a11f13121ff0af787bba3b014378e58' + '47c665961f11a803e9a12007811a04c9' + 'ba11c3e889509d1b46307d6ebf74509c') +sha1sums=('e12305da42d1aacc26c2ca25e239f393d4dd3532' + '05e673aa44813ddac8aabb251d5f0124efde91a2' + '3a1c115c4436bdfb1882bcf93dedbe0d40dad9ae') diff --git a/libre/xchat-libre/no-firefox.patch b/libre/xchat-libre/no-firefox.patch new file mode 100644 index 000000000..7fb5190de --- /dev/null +++ b/libre/xchat-libre/no-firefox.patch @@ -0,0 +1,11 @@ +--- xchat-2.8.8/src/fe-gtk/fe-gtk.c_orig 2011-06-02 04:25:03.386077554 +0200 ++++ xchat-2.8.8/src/fe-gtk/fe-gtk.c 2011-06-02 04:25:14.959410608 +0200 +@@ -956,7 +956,7 @@ + } + + /* everything failed, what now? just try firefox */ +- if (try_browser ("firefox", NULL, url)) ++ if (try_browser ("icecat", NULL, url)) + return; + + /* fresh out of ideas... */ diff --git a/libre/your-freedom/PKGBUILD b/libre/your-freedom/PKGBUILD index df53ec0cb..a7f25c7bb 100644 --- a/libre/your-freedom/PKGBUILD +++ b/libre/your-freedom/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Parabola Project pkgname=your-freedom pkgver=$(LC_ALL=C date -u +%Y%m%d) -pkgrel=3 +pkgrel=1 pkgdesc="This package conflicts with every unfree package known to date." arch=('any') url="https://parabolagnulinux.org" diff --git a/multilib-testing/lib32-mesa/PKGBUILD b/multilib-testing/lib32-mesa/PKGBUILD index 6e6ac7c57..4180ba36c 100644 --- a/multilib-testing/lib32-mesa/PKGBUILD +++ b/multilib-testing/lib32-mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 48547 2011-06-01 17:35:49Z lcarlier $ +# $Id: PKGBUILD 49162 2011-06-12 18:11:21Z lcarlier $ # Contributor: Jan de Groot # Contributor: Andreas Radke @@ -10,7 +10,7 @@ _git=true #_git=false if [ "${_git}" = "true" ]; then - pkgver=7.10.99.git20110531 + pkgver=7.10.99.git20110612 else pkgver=7.10.2 fi @@ -22,9 +22,9 @@ makedepends=('glproto>=1.4.12' 'pkgconfig' 'lib32-libdrm>=2.4.25' 'lib32-libxxf8 url="http://mesa3d.sourceforge.net" license=('custom') if [ "${_git}" = "true" ]; then - # mesa git shot from mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b1246cf13bc4e301b499a95d33e0cab26655fed5 - source=('ftp://ftp.archlinux.org/other/mesa/mesa-b1246cf13bc4e301b499a95d33e0cab26655fed5.tar.bz2') - md5sums=('c2ff7ab905adf67a5d6c8acbbf495b12') + # mesa git shot from mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a00dd974699e369b1eb292103fbde8bc6adfb87 + source=('ftp://ftp.archlinux.org/other/mesa/mesa-9a00dd974699e369b1eb292103fbde8bc6adfb87.tar.bz2') + md5sums=('77b10baeba21268d2a65440f99f97c12') else source=("ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" nouveau-fix-header.patch) md5sums=('f5de82852f1243f42cc004039e10b771' '67c87b77cc2236b52a3b47dad3fbb5d4') @@ -194,7 +194,7 @@ package_lib32-mesa() { package_lib32-ati-dri() { depends=("lib32-libgl=${pkgver}") - pkgdesc="Mesa DRI + Gallium3D for r300 and later chipsets drivers for AMD/ATI Radeon (32-bit)" + pkgdesc="Mesa DRI radeon/r200 + Gallium3D for r300 and later chipsets drivers for AMD/ATI Radeon (32-bit)" conflicts=('xf86-video-ati<6.9.0-6') if [ "${_git}" = "true" ]; then diff --git a/testing/mesa/PKGBUILD b/testing/mesa/PKGBUILD index 4c3f56ebd..edd92d262 100644 --- a/testing/mesa/PKGBUILD +++ b/testing/mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 125908 2011-05-31 19:03:01Z andyrtr $ +# $Id: PKGBUILD 127284 2011-06-12 11:12:35Z andyrtr $ # Maintainer: Jan de Groot # Maintainer: Andreas Radke @@ -9,7 +9,7 @@ _git=true #_git=false if [ "${_git}" = "true" ]; then - pkgver=7.10.99.git20110531 + pkgver=7.10.99.git20110612 else pkgver=7.10.2 fi @@ -21,8 +21,8 @@ url="http://mesa3d.sourceforge.net" license=('custom') source=(LICENSE gnome-shell-shader-fix.patch nouveau-fix-header.patch) if [ "${_git}" = "true" ]; then - # mesa git shot from mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b1246cf13bc4e301b499a95d33e0cab26655fed5 - source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-b1246cf13bc4e301b499a95d33e0cab26655fed5.tar.bz2') + # mesa git shot from mastee (will become 7.11) branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9a00dd974699e369b1eb292103fbde8bc6adfb87 + source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-9a00dd974699e369b1eb292103fbde8bc6adfb87.tar.bz2') else source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" ) @@ -30,7 +30,7 @@ fi md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' '3ec78f340f9387abd7a37b195e764cbf' '67c87b77cc2236b52a3b47dad3fbb5d4' - 'c2ff7ab905adf67a5d6c8acbbf495b12') + '77b10baeba21268d2a65440f99f97c12') build() { if [ "${_git}" = "true" ]; then @@ -209,7 +209,7 @@ fi package_ati-dri() { depends=("libgl=${pkgver}") - pkgdesc="Mesa DRI + Gallium3D r300 drivers for AMD/ATI Radeon" + pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon" conflicts=('xf86-video-ati<6.9.0-6') if [ "${_git}" = "true" ]; then -- cgit v1.2.3-54-g00ecf