diff options
49 files changed, 636 insertions, 168 deletions
diff --git a/community/codeblocks/PKGBUILD b/community/codeblocks/PKGBUILD index 478c452c4..5e6b2eafa 100644 --- a/community/codeblocks/PKGBUILD +++ b/community/codeblocks/PKGBUILD @@ -1,33 +1,33 @@ +# $Id: PKGBUILD 80953 2012-12-07 20:15:05Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Robert Hollencamp <rhollencamp@gmail.com> # Contributor: Daniel J Griffiths <griffithsdj@inbox.com> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> pkgname=codeblocks -pkgver=10.05 -pkgrel=2 -pkgdesc="An open source and cross-platform C/C++ IDE" +pkgver=12.11 +pkgrel=1 +pkgdesc='Open source and cross-platform C/C++ IDE' arch=('i686' 'x86_64') url="http://www.codeblocks.org" license=('GPL3') -depends=('wxgtk' 'hicolor-icon-theme' 'bzip2' 'shared-mime-info' 'desktop-file-utils' 'gtk-update-icon-cache') +depends=('boost' 'bzip2' 'desktop-file-utils' 'gamin' 'gtk-update-icon-cache' + 'hicolor-icon-theme' 'hunspell' 'shared-mime-info' 'wxgtk') makedepends=('zip') options=('!libtool') -source=(http://download.berlios.de/$pkgname/$pkgname-${pkgver}-src.tar.bz2) -md5sums=('ab077d562e98b0586f2f86c14cb773ba') install=codeblocks.install +source=(http://download.berlios.de/$pkgname/${pkgname}_${pkgver}-1.tar.gz) +md5sums=('4fa8980a8c578b8b5589fceb9b0890d6') build() { - cd "$srcdir/$pkgname-$pkgver-release" + cd $srcdir/$pkgname-${pkgver}release* LDFLAGS+=' -lX11' - ./bootstrap ./configure --prefix=/usr --with-contrib-plugins=all make } package() { - cd "$srcdir/$pkgname-$pkgver-release" - make DESTDIR="$pkgdir" install + cd $srcdir/$pkgname-${pkgver}release* + make DESTDIR=$pkgdir install } - diff --git a/community/fcitx-hangul/PKGBUILD b/community/fcitx-hangul/PKGBUILD new file mode 100644 index 000000000..d0732f8ff --- /dev/null +++ b/community/fcitx-hangul/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 80966 2012-12-08 01:28:14Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> + +pkgname=fcitx-hangul +pkgver=0.1.2 +pkgrel=2 +pkgdesc="Hangul (Korean) support for fcitx" +arch=('i686' 'x86_64') +url="http://code.google.com/p/fcitx/" +license=('GPL2') +depends=('fcitx>=4.2.2' 'libhangul') +makedepends=('cmake' 'intltool') +install="$pkgname.install" +source=("http://fcitx.googlecode.com/files/$pkgname-$pkgver.tar.xz") +sha1sums=('30648e569ea75e2a734ed98f8cc90b0a656a6bf5') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + msg "Starting make..." + + rm -rf build + mkdir build + cd build + + cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release .. + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver/build" + make DESTDIR="$pkgdir" install +} + + diff --git a/community/fcitx-hangul/fcitx-hangul.install b/community/fcitx-hangul/fcitx-hangul.install new file mode 100644 index 000000000..c0797237a --- /dev/null +++ b/community/fcitx-hangul/fcitx-hangul.install @@ -0,0 +1,11 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community/freeimage/PKGBUILD b/community/freeimage/PKGBUILD index a047e79f9..817429c57 100644 --- a/community/freeimage/PKGBUILD +++ b/community/freeimage/PKGBUILD @@ -12,7 +12,7 @@ arch=('i686' 'x86_64') license=('GPL' 'custom:FIPL') url="http://freeimage.sourceforge.net/" depends=('gcc-libs') -makedepends=('hd2u') +makedepends=('dos2unix') source=("http://downloads.sourceforge.net/project/freeimage/Source%20Distribution/${pkgver}/FreeImage${pkgver//./}.zip") md5sums=('6c305b4086500ff8541c596ea6fc7cd7') diff --git a/community/gtest/PKGBUILD b/community/gtest/PKGBUILD new file mode 100644 index 000000000..efc2ab416 --- /dev/null +++ b/community/gtest/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 80934 2012-12-07 06:58:41Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Alexandre Bique <bique.alexandre@gmail.com> +# Contributor: Louis R. Marascio <lrm@fitnr.com> +# Contributor: Cody Maloney <cmaloney@theoreticalchaos.com> + +pkgname=gtest +pkgver=1.6.0 +pkgrel=7 +pkgdesc="Google Test - C++ testing utility based on the xUnit framework (like JUnit)" +arch=('i686' 'x86_64') +url="http://code.google.com/p/googletest/" +license=('custom:BSD3') +options=('!libtool') +depends=('gcc-libs' 'sh') +makedepends=('python2' 'cmake') +source=("http://googletest.googlecode.com/files/$pkgname-$pkgver.zip") +sha1sums=('00d6be170eb9fc3b2198ffdcb1f1d6ba7fc6e621') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + rm -rf build + mkdir build + cd build + + cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_SKIP_RPATH=ON .. + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + mkdir -pm 0755 $pkgdir/usr/{lib,include/gtest/internal,share/licenses/$pkgname,src/gtest/src,src/gtest/cmake} + install -m 0644 build/libgtest{,_main}.so $pkgdir/usr/lib/ + install -m 0644 include/gtest/*.h $pkgdir/usr/include/gtest/ + install -m 0644 include/gtest/internal/*.h $pkgdir/usr/include/gtest/internal/ + install -m 0644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + install -m 0644 $srcdir/$pkgname-$pkgver/fused-src/gtest/* $pkgdir/usr/src/gtest/src + install -m 0644 $srcdir/$pkgname-$pkgver/CMakeLists.txt $pkgdir/usr/src/gtest + install -m 0644 $srcdir/$pkgname-$pkgver/cmake/* $pkgdir/usr/src/gtest/cmake +} + +# vim:set ts=2 sw=2 et: diff --git a/community/ibus-chewing/PKGBUILD b/community/ibus-chewing/PKGBUILD index 8e0967fd8..fed502367 100644 --- a/community/ibus-chewing/PKGBUILD +++ b/community/ibus-chewing/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80617 2012-11-27 04:47:44Z fyan $ +# $Id: PKGBUILD 80968 2012-12-08 02:26:09Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Rainy <rainylau(at)gmail(dot)com> @@ -7,13 +7,13 @@ pkgname=ibus-chewing pkgver=1.4.3 -pkgrel=1 +pkgrel=2 pkgdesc='Chinese Chewing Engine for IBus Framework' arch=('i686' 'x86_64') license=('GPL') url='http://ibus.googlecode.com' -depends=('ibus' 'libchewing' 'libxtst') -makedepends=('swig' 'cmake' 'gob2' 'gconf') +depends=('ibus' 'libchewing' 'libxtst' 'gconf') +makedepends=('swig' 'cmake' 'gob2') options=('!makeflags') install=ibus-chewing.install source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz") diff --git a/community/igmpproxy/PKGBUILD b/community/igmpproxy/PKGBUILD new file mode 100644 index 000000000..ab3e7e291 --- /dev/null +++ b/community/igmpproxy/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 80944 2012-12-07 13:00:49Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> +# Contributor: sda <sda00@himki.net> + +pkgname=igmpproxy +pkgver=0.1 +pkgrel=1 +pkgdesc="a simple multicast router for Linux only using the IGMP protocol" +arch=(i686 x86_64) +url="http://sourceforge.net/projects/igmpproxy" +license=('GPL') +depends=() +backup=("etc/igmpproxy.conf") +source=("http://downloads.sourceforge.net/sourceforge/igmpproxy/igmpproxy-$pkgver.tar.gz" + "igmpproxy.rc.d" + "igmpproxy.service") +md5sums=('c56f41ec195bc1fe016369bf74efc5a1' + '642054dd586e5b0e7f660863e8131f57' + '2ff8500f8a59cdfaf910e48cd54ab659') + +build() { + cd $srcdir/$pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install + install -Dm755 $srcdir/$pkgname.rc.d $pkgdir/etc/rc.d/$pkgname + install -Dm644 $srcdir/$pkgname.service $pkgdir/usr/lib/systemd/system/$pkgname.service +} diff --git a/community/igmpproxy/igmpproxy.rc.d b/community/igmpproxy/igmpproxy.rc.d new file mode 100644 index 000000000..5b88e94f1 --- /dev/null +++ b/community/igmpproxy/igmpproxy.rc.d @@ -0,0 +1,38 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +PID=`pidof -o %PPID /usr/sbin/igmpproxy` +case "$1" in + start) + stat_busy "Starting igmpproxy routing daemon" + if [ -z "$PID" ]; then + /usr/sbin/igmpproxy /etc/igmpproxy.conf & + fi + if [ ! -z "$PID" -o $? -gt 0 ]; then + stat_fail + else + disown + add_daemon igmpproxy + stat_done + fi + ;; + stop) + stat_busy "Stopping igmpproxy routing daemon" + [ ! -z "$PID" ] && kill $PID &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon igmpproxy + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac diff --git a/community/igmpproxy/igmpproxy.service b/community/igmpproxy/igmpproxy.service new file mode 100644 index 000000000..c10ec63b1 --- /dev/null +++ b/community/igmpproxy/igmpproxy.service @@ -0,0 +1,10 @@ +[Unit] +Description=IGMP proxy +After=network.target + +[Service] +Type=simple +ExecStart=/usr/sbin/igmpproxy /etc/igmpproxy.conf + +[Install] +WantedBy=multi-user.target diff --git a/community/iperf/PKGBUILD b/community/iperf/PKGBUILD index 71a359d8d..5985ba0d1 100644 --- a/community/iperf/PKGBUILD +++ b/community/iperf/PKGBUILD @@ -1,25 +1,28 @@ -# $Id: PKGBUILD 70860 2012-05-18 02:29:56Z seblu $ +# $Id: PKGBUILD 80971 2012-12-08 03:52:17Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Dale Blount <dale@archlinux.org> pkgname=iperf pkgver=2.0.5 -pkgrel=5 +pkgrel=6 pkgdesc='A tool to measure maximum TCP bandwidth' arch=('i686' 'x86_64') license=('custom') url='http://iperf.sourceforge.net' depends=('gcc-libs') +install=iperf.install source=("http://downloads.sourceforge.net/iperf/iperf-$pkgver.tar.gz" 'iperf.rc' 'iperf.conf' - 'iperf.service' + 'iperf-tcp.service' + 'iperf-udp.service' 'client.cpp.patch') md5sums=('44b5536b67719f4250faed632a3cd016' 'e99dc0d41eb800970390dd149d70b544' 'c75cb18434c6bf19fdc89b9caa766d7d' - 'b0c1165e21fb686e449c6bab9852be31' + 'd2203fb26bb50a3378c2699714ada8e5' + '573964ec1b1558a78cd667459676cdb7' '82ce63c87cc8bb2f0f94069857ac14a9') build() { @@ -41,7 +44,8 @@ package() { # install initscripts install -Dm755 iperf.rc "$pkgdir/etc/rc.d/iperf" install -Dm644 iperf.conf "$pkgdir/etc/conf.d/iperf" - install -Dm644 iperf.service "$pkgdir/usr/lib/systemd/system/iperf.service" + install -Dm644 iperf-tcp.service "$pkgdir/usr/lib/systemd/system/iperf-tcp.service" + install -Dm644 iperf-udp.service "$pkgdir/usr/lib/systemd/system/iperf-udp.service" } -# vim:set ts=2 sw=2 ft=sh et: +# vim:set ts=2 sw=2 et: diff --git a/community/iperf/iperf-tcp.service b/community/iperf/iperf-tcp.service new file mode 100644 index 000000000..29967815a --- /dev/null +++ b/community/iperf/iperf-tcp.service @@ -0,0 +1,8 @@ +[Unit] +Description=Iperf TCP Server + +[Service] +ExecStart=/usr/bin/iperf -s -V + +[Install] +WantedBy=multi-user.target diff --git a/community/iperf/iperf-udp.service b/community/iperf/iperf-udp.service new file mode 100644 index 000000000..2253f9c45 --- /dev/null +++ b/community/iperf/iperf-udp.service @@ -0,0 +1,8 @@ +[Unit] +Description=Iperf UDP Server + +[Service] +ExecStart=/usr/bin/iperf -u -s -V + +[Install] +WantedBy=multi-user.target diff --git a/community/iperf/iperf.install b/community/iperf/iperf.install new file mode 100644 index 000000000..2fa553d52 --- /dev/null +++ b/community/iperf/iperf.install @@ -0,0 +1,11 @@ +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + if [ "$(vercmp $2 2.0.5-6)" -lt 0 ]; then + cat << EOF +===> iperf.service unit has been moved to iperf-udp.service and iperf-tcp.service. +EOF + fi +} + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD index 6a36c5ef9..693b1bdf9 100644 --- a/community/lazarus/PKGBUILD +++ b/community/lazarus/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 80760 2012-12-03 10:07:51Z spupykin $ +# $Id: PKGBUILD 80946 2012-12-07 13:01:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Adam (byte/jra) <j_adam@web.de> # Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com> @@ -6,8 +6,8 @@ pkgbase=lazarus pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt') pkgver=1.0.4 -_pkgsubver=0 -pkgrel=1 +_pkgsubver=1 +pkgrel=2 url='http://www.lazarus.freepascal.org/' license=('GPL2' 'MPL' 'custom:LGPL') arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('fpc' 'fpc-src' 'gtk2' 'qt4pas' 'rsync') options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-${_pkgsubver}.tar.gz" 'lazcontrols2.diff') -md5sums=('1075f1d79a4e01784b2bbbcf4209a732' +md5sums=('a3dea4ba0c74c35bd7078acd1d5de4fc' '288bca6ad5ade79deec34c3602daaaa9') build() { diff --git a/community/openocd/PKGBUILD b/community/openocd/PKGBUILD index 6b0884c55..8669ec0c6 100644 --- a/community/openocd/PKGBUILD +++ b/community/openocd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 79223 2012-11-01 10:24:39Z bpiotrowski $ +# $Id: PKGBUILD 80930 2012-12-07 05:30:32Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> # Contributor: Matthias Bauch <matthias.bauch@gmail.com> # Contributor: Laszlo Papp <djszapi2 at gmail com> @@ -6,7 +6,7 @@ pkgname=openocd pkgver=0.6.1 -pkgrel=1 +pkgrel=2 pkgdesc='Debugging, in-system programming and boundary-scan testing for embedded target devices' arch=('i686' 'x86_64') url='http://openocd.berlios.de' @@ -17,7 +17,7 @@ install=openocd.install source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) md5sums=('946421efc2414ff89bdaf3f588b230f8') -_features=(parport ft2232_libftdi amtjtagaccel ep93xxat91rm9200gw16012 presto_libftdi usbprog oocd_trace jlink vsllink rlink arm-jtag-ew buspirate stlink) +_features=(amtjtagaccel arm-jtag-ew buspirate ep93xxat91rm9200gw16012 ft2232_libftdi ftdi jlink oocd_trace parport presto_libftdi rlink stlink ulink usbprog vsllink) build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/opensc/PKGBUILD b/community/opensc/PKGBUILD index 1da03752e..6fd256ca3 100644 --- a/community/opensc/PKGBUILD +++ b/community/opensc/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 62576 2012-01-21 15:54:56Z seblu $ +# $Id: PKGBUILD 80964 2012-12-08 00:07:50Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: kevku <kevku@msn.com> pkgname=opensc -pkgver=0.12.2 -pkgrel=3 +pkgver=0.13.0 +pkgrel=1 pkgdesc='Access smart cards that support cryptographic operations' arch=('x86_64' 'i686') url='http://www.opensc-project.org/opensc/' @@ -13,9 +13,9 @@ backup=('etc/opensc.conf') makedepends=('docbook-xsl') depends=('openssl' 'pcsclite' 'libltdl') options=('!libtool' '!emptydirs') -source=("http://www.opensc-project.org/files/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('5116adea5f2f9f22fb9896965789144b') - +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('74a10de6c646bdaae307d6dc9e9accc0') + build() { cd $pkgname-$pkgver export LIBS=-lltdl @@ -32,11 +32,11 @@ build() { --with-xsl-stylesheetsdir="$_sheetdir" make } - + package(){ cd $pkgname-$pkgver make DESTDIR="$pkgdir" install install -D -m644 etc/opensc.conf "$pkgdir/etc/opensc.conf" -} +} # vim:set ts=2 sw=2 ft=sh et: diff --git a/community/siege/PKGBUILD b/community/siege/PKGBUILD index 9b2aebaff..790bc3ab5 100644 --- a/community/siege/PKGBUILD +++ b/community/siege/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 64675 2012-02-17 18:24:25Z bluewind $ +# $Id: PKGBUILD 80962 2012-12-07 23:56:44Z bluewind $ # Maintainer: Florian Pritz <flo@xinu.at> # Contributor: Sven Kauber <celeon@gmail.com> pkgname=siege -pkgver=2.70 -pkgrel=3 +pkgver=2.72 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL') pkgdesc="An http regression testing and benchmarking utility" @@ -29,4 +29,4 @@ package() { sed -i 's/^# file =$/file = \/etc\/urls.txt/' "$pkgdir/etc/siegerc" } -md5sums=('835c7a0606851357ebf03084ff546310') +md5sums=('6bd0b1dca6b95717e23a6bade9a0a1f4') diff --git a/community/sigil/PKGBUILD b/community/sigil/PKGBUILD index 63b09e8b3..fecf7f6ab 100644 --- a/community/sigil/PKGBUILD +++ b/community/sigil/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 80849 2012-12-04 13:39:38Z giovanni $ +# $Id: PKGBUILD 80936 2012-12-07 11:49:42Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> pkgname=sigil -pkgver=0.6.1 +pkgver=0.6.2 pkgrel=1 pkgdesc="WYSIWYG ebook editor" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('qtwebkit' 'boost-libs') makedepends=('cmake' 'gendesk' 'boost') install=sigil.install source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip") -md5sums=('cc104b2a9c3a5918c489a784c71ddf74') +md5sums=('78615dc007c12cc34271243d82783a36') build() { cd "${srcdir}" diff --git a/extra/e_dbus/PKGBUILD b/extra/e_dbus/PKGBUILD index b308f0d17..8b65e390b 100644 --- a/extra/e_dbus/PKGBUILD +++ b/extra/e_dbus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171993 2012-11-25 21:21:29Z ronald $ +# $Id: PKGBUILD 172972 2012-12-07 19:30:17Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=e_dbus -pkgver=1.7.2 +pkgver=1.7.3 pkgrel=1 pkgdesc="D-Bus integration with Ecore" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore' 'dbus-core') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('119af7ddeabf65e294c998ba27a7486027a5e67c') +sha1sums=('1bd664721ea4910fb61cff3f4b16863ecdbd0772') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/ecore/PKGBUILD b/extra/ecore/PKGBUILD index c7c1e0b2e..f46e6d991 100644 --- a/extra/ecore/PKGBUILD +++ b/extra/ecore/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171984 2012-11-25 21:16:15Z ronald $ +# $Id: PKGBUILD 172964 2012-12-07 19:25:18Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=ecore -pkgver=1.7.2 +pkgver=1.7.3 pkgrel=1 pkgdesc="OS abstraction layer for e17" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('eina' 'evas' 'glib2' 'libxp' 'curl' 'libxss' 'libxtst' makedepends=('subversion') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('190f257d7c8c5a233a9e4644a02e9fd6b4898e89') +sha1sums=('c6ee8092af99842631e49566f6be32b6149eaaca') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/edje/PKGBUILD b/extra/edje/PKGBUILD index e8149d97a..83c8e6621 100644 --- a/extra/edje/PKGBUILD +++ b/extra/edje/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171989 2012-11-25 21:18:51Z ronald $ +# $Id: PKGBUILD 172968 2012-12-07 19:27:48Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=edje -pkgver=1.7.2 +pkgver=1.7.3 pkgrel=1 pkgdesc="A graphical design and layout library based on Evas" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('python2: inkscape2edc') install=edje.install options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('f42b5276840dc2b5cc611150ad72f1a54dae123b') +sha1sums=('7882ee5cdf67a53a543b06d27a9f06f833b1b5da') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eet/PKGBUILD b/extra/eet/PKGBUILD index c30e44d2c..20cad2e9f 100644 --- a/extra/eet/PKGBUILD +++ b/extra/eet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171981 2012-11-25 21:14:16Z ronald $ +# $Id: PKGBUILD 172961 2012-12-07 19:23:17Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eet -pkgver=1.7.2 +pkgver=1.7.3 pkgrel=1 pkgdesc="A data storage and compression library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('libjpeg>=7' 'openssl' 'eina') options=(!libtool) source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('8e768421107e48ae55839ba0e3d36440f74e0bf6') +sha1sums=('42265eb508a17e3684a01429593da138da369718') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eeze/PKGBUILD b/extra/eeze/PKGBUILD index 4f0f3490c..bb54f32e0 100644 --- a/extra/eeze/PKGBUILD +++ b/extra/eeze/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171987 2012-11-25 21:17:34Z ronald $ +# $Id: PKGBUILD 172966 2012-12-07 19:26:35Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=eeze -pkgver=1.7.2 +pkgver=1.7.3 pkgrel=1 pkgdesc="Manipulate devices using udev and sysfs" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore' 'eina' 'udev') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('6d5562116c143841485c51278064b772d79bdb27') +sha1sums=('3b3edfa7eed63f4b74184939578f16d866fa2bb2') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/efreet/PKGBUILD b/extra/efreet/PKGBUILD index c65d34c48..4e227bef1 100644 --- a/extra/efreet/PKGBUILD +++ b/extra/efreet/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171992 2012-11-25 21:20:53Z ronald $ +# $Id: PKGBUILD 172971 2012-12-07 19:29:41Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=efreet -pkgver=1.7.2 +pkgver=1.7.3 pkgrel=1 pkgdesc="FreeDesktop.Org specifications for e17" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('eina' 'ecore' 'e_dbus') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('ec8c8f6504b2205c74e992f8ea911dcb746452fd') +sha1sums=('3161ca46a1fed410340924f43ee773c52ff5e553') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eina/PKGBUILD b/extra/eina/PKGBUILD index 5315ea2af..b09c81952 100644 --- a/extra/eina/PKGBUILD +++ b/extra/eina/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171980 2012-11-25 21:13:37Z ronald $ +# $Id: PKGBUILD 172960 2012-12-07 19:22:39Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=eina -pkgver=1.7.2 +pkgver=1.7.3 pkgrel=1 pkgdesc="A core data structure and common utility library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('LGPL2.1') depends=('glibc') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('cb56cf9ec28d7cb42ca168d9e261c5f580986c29') +sha1sums=('b668b23cd0f88b0857a7b140eca645783b770108') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/eio/PKGBUILD b/extra/eio/PKGBUILD index 81c8cf032..0c1328fef 100644 --- a/extra/eio/PKGBUILD +++ b/extra/eio/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171985 2012-11-25 21:16:56Z ronald $ +# $Id: PKGBUILD 172965 2012-12-07 19:26:00Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=eio -pkgver=1.7.2 +pkgver=1.7.3 pkgrel=1 pkgdesc="Async IO library using Ecore" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('ecore') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('ce242ab4d3ec2659e4986694e5ed99932d9faa99') +sha1sums=('aaf54bfaee1ddae9bbff89da0178b56605df6048') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/elementary/PKGBUILD b/extra/elementary/PKGBUILD index 8c1c5cd65..984789bc1 100644 --- a/extra/elementary/PKGBUILD +++ b/extra/elementary/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171994 2012-11-25 21:22:05Z ronald $ +# $Id: PKGBUILD 172973 2012-12-07 19:30:53Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=elementary -pkgver=1.7.2 +pkgver=1.7.3 pkgrel=1 pkgdesc="Enlightenment's widget set" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('edje' 'e_dbus' 'efreet' 'ethumb' 'eio') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('59968aee7ae83b1843a4d812140922e95a20b317') +sha1sums=('b7c3f346dbeb1d3ee43f140fd2a93384c20a92bb') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/embryo/PKGBUILD b/extra/embryo/PKGBUILD index 0a556c623..00d7395e9 100644 --- a/extra/embryo/PKGBUILD +++ b/extra/embryo/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171988 2012-11-25 21:18:10Z ronald $ +# $Id: PKGBUILD 172967 2012-12-07 19:27:09Z ronald $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=embryo -pkgver=1.7.2 +pkgver=1.7.3 pkgrel=1 pkgdesc="implementation of a C like scripting language for e17" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('glibc' 'eina') options=('!libtool') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('517126e873b8c3af9e0ad966af1de390947f89fd') +sha1sums=('9850e01d65aeb724fa53e5d9d351cf94eb6957f5') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/emotion/PKGBUILD b/extra/emotion/PKGBUILD index 3ea81b2ca..dc9fa14a4 100644 --- a/extra/emotion/PKGBUILD +++ b/extra/emotion/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171990 2012-11-25 21:19:38Z ronald $ +# $Id: PKGBUILD 172969 2012-12-07 19:28:30Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=emotion -pkgver=1.7.2 +pkgver=1.7.3 pkgrel=1 pkgdesc="Library to easily integrate media playback into EFL applications" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('gstreamer0.10' 'edje' 'eeze') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('20304f130e5fb4d81176c442262465cacaa52381') +sha1sums=('9aebc9ee614e68b3ccb69e10f42ae2989d0d29a0') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD index 5e8651abe..b7c097abd 100644 --- a/extra/enlightenment17/PKGBUILD +++ b/extra/enlightenment17/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 172777 2012-12-05 18:43:12Z ronald $ +# $Id: PKGBUILD 172937 2012-12-07 14:57:50Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=enlightenment17 _pkgname=enlightenment -pkgver=0.17.0alpha8 -_pkgver=0.17.0-alpha8 +pkgver=0.17.0beta1 +_pkgver=0.17.0-beta pkgrel=1 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64') @@ -22,7 +22,7 @@ options=('!libtool' '!emptydirs') install=enlightenment17.install source=(http://download.enlightenment.org/releases/$_pkgname-$_pkgver.tar.gz 'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch') -sha1sums=('12612175f08d11ff34c0c509f4e28e412cc13510' +sha1sums=('2ff60e4dfe050b27d597836dfb524dd205d595d9' 'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5' '3f53931ae86de8fe99e386aeb097521aac0decd8' '86f1c5e36dc274c3101362532378be034e89c593') diff --git a/extra/ethumb/PKGBUILD b/extra/ethumb/PKGBUILD index a6f952bef..33866e671 100644 --- a/extra/ethumb/PKGBUILD +++ b/extra/ethumb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171991 2012-11-25 21:20:15Z ronald $ +# $Id: PKGBUILD 172970 2012-12-07 19:29:06Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=ethumb -pkgver=1.7.2 +pkgver=1.7.3 pkgrel=1 pkgdesc="Thumbnailing library and D-Bus service using EFL" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('libexif' 'e_dbus' 'emotion') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('16d9a9908fb16df2b06f9084190a828683f72f8f') +sha1sums=('decee66729d0deccb4f836967c4492172a8d3875') build() { cd $srcdir/$pkgname-$pkgver diff --git a/extra/evas/PKGBUILD b/extra/evas/PKGBUILD index 3fbadcb62..1bec2a72a 100644 --- a/extra/evas/PKGBUILD +++ b/extra/evas/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171983 2012-11-25 21:15:28Z ronald $ +# $Id: PKGBUILD 172963 2012-12-07 19:24:28Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas -pkgver=1.7.2 +pkgver=1.7.3 pkgrel=1 pkgdesc="A hardware-accelerated canvas API for X-Windows" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ depends=('eet' 'giflib' 'libpng' 'libjpeg>=7' 'libxrender' 'mesa' optdepends=("evas_generic_loaders") options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('47e43fb21dae959959e9e3e2b1e0868e4c92b63f') +sha1sums=('ffa9b12d34e801112cf081a3c024eca5ef86ed8a') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD index 56f01eab9..6f3fa377b 100644 --- a/extra/evas_generic_loaders/PKGBUILD +++ b/extra/evas_generic_loaders/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 171982 2012-11-25 21:14:53Z ronald $ +# $Id: PKGBUILD 172962 2012-12-07 19:23:53Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=evas_generic_loaders -pkgver=1.7.2 +pkgver=1.7.3 pkgrel=1 pkgdesc="Additional generic loaders for Evas" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('librsvg' 'gstreamer0.10' 'poppler' 'libraw' 'libspectre' 'eina') options=('!libtool' '!emptydirs') source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz) -sha1sums=('dc1adc0b604acc3a3ed3260653d7cb485a4c5732') +sha1sums=('2aeee66f9f6ce8a2a7daf0eebf75681f0e89730d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index bf0eb9c94..802e69f62 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 171263 2012-11-16 23:35:38Z ibiru $ +# $Id: PKGBUILD 172943 2012-12-07 18:27:01Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=1.0 -pkgrel=2 +pkgver=1.0.1 +pkgrel=1 epoch=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ license=('GPL') depends=(alsa-lib bzip2 gsm lame libpulse libtheora libva libvorbis libvpx opencore-amr openjpeg rtmpdump schroedinger sdl speex v4l-utils x264 xvidcore zlib) makedepends=('yasm' 'git' 'libvdpau') source=(http://ffmpeg.org/releases/$pkgname-$pkgver.tar.bz2) -md5sums=('3ed526cea20c1bffb5a37f7730f710bd') +md5sums=('dbbb88ce5525dea22b24aaa098a9bcc2') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-control-center/PKGBUILD b/extra/gnome-control-center/PKGBUILD index bdc425a68..73215c333 100644 --- a/extra/gnome-control-center/PKGBUILD +++ b/extra/gnome-control-center/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 170990 2012-11-14 14:28:31Z ibiru $ +# $Id: PKGBUILD 172933 2012-12-07 12:12:32Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-control-center pkgver=3.6.3 -pkgrel=2 +pkgrel=3 pkgdesc="The Control Center for GNOME" arch=('i686' 'x86_64') depends=('accountsservice' 'cups-pk-helper' 'gnome-bluetooth' 'gnome-desktop' 'gnome-menus' @@ -18,11 +18,15 @@ groups=('gnome') install=gnome-control-center.install license=('GPL') options=('!libtool' '!emptydirs') -source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('2ae23972bc64f62b4facd12dd5adce212bda02491eb6e56bbf195332157d21fb') +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + pulse3.0.patch) +sha256sums=('2ae23972bc64f62b4facd12dd5adce212bda02491eb6e56bbf195332157d21fb' + '27f1d518df91ad9687e3e217023d83726c0d44f65b30942e79106e4aad53c916') build() { cd $pkgname-$pkgver + + patch -Np1 -i ../pulse3.0.patch ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ diff --git a/extra/gnome-control-center/pulse3.0.patch b/extra/gnome-control-center/pulse3.0.patch new file mode 100644 index 000000000..203547940 --- /dev/null +++ b/extra/gnome-control-center/pulse3.0.patch @@ -0,0 +1,25 @@ +From 10a0c18b8e3058144586880019b68ab4ea40ce78 Mon Sep 17 00:00:00 2001 +From: David Henningsson <david.henningsson@canonical.com> +Date: Fri, 07 Dec 2012 10:52:09 +0000 +Subject: sound: Fix port handling for the unknown availability case + +The current code assumes that port availability transitions will be +between YES and NO, and doesn't account for the fact that it may also be +UNKNOWN. This causes spurious entries if the port availability +transitions between YES and UNKNOWN. +--- +diff --git a/panels/sound/gvc-mixer-control.c b/panels/sound/gvc-mixer-control.c +index 34ddc0c..2f6cf34 100644 +--- a/panels/sound/gvc-mixer-control.c ++++ b/panels/sound/gvc-mixer-control.c +@@ -2138,7 +2138,7 @@ update_card (GvcMixerControl *control, + else { + for (i = 0; i < info->n_ports; i++) { + if (g_strcmp0 (card_port->port, info->ports[i]->name) == 0) { +- if (card_port->available != info->ports[i]->available) { ++ if ((card_port->available == PA_PORT_AVAILABLE_NO) != (info->ports[i]->available == PA_PORT_AVAILABLE_NO)) { + card_port->available = info->ports[i]->available; + g_debug ("sync port availability on card %i, card port name '%s', new available value %i", + gvc_mixer_card_get_index (card), +-- +cgit v0.9.0.2 diff --git a/extra/ibus/PKGBUILD b/extra/ibus/PKGBUILD index 8d55c9c74..09f560671 100644 --- a/extra/ibus/PKGBUILD +++ b/extra/ibus/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 170696 2012-11-09 20:17:29Z eric $ +# $Id: PKGBUILD 172983 2012-12-08 02:06:48Z eric $ # Contributor: Rainy <rainylau(at)gmail(dot)com> # Contributor: Lee.MaRS <leemars at gmail dot com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Maintainer: Brad Fanella <bradfanella@archlinux.us> pkgname=ibus -pkgver=1.4.99.20121109 +pkgver=1.5.0 pkgrel=1 pkgdesc="Next Generation Input Bus for Linux" arch=('i686' 'x86_64') url="http://ibus.googlecode.com" license=('LGPL') depends=('hicolor-icon-theme' 'gtk2' 'gtk3' 'python2-xdg' 'python2-gobject') -makedepends=('gobject-introspection' 'dconf' 'iso-codes' 'intltool') +makedepends=('gobject-introspection' 'vala' 'dconf' 'iso-codes' 'intltool') options=('!libtool') install=ibus.install source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -sha1sums=('e534d836117b968b8d0eab2eea5a1fac09ea85fb') +sha1sums=('ca810499ca21ab85e4faa8a103cfd461361b723a') build() { cd ${pkgname}-${pkgver} diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 887383eaa..ff3b04f1d 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 169750 2012-10-27 23:41:58Z eric $ +# $Id: PKGBUILD 172929 2012-12-07 05:50:58Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.0.3 +pkgver=6.8.0.7 pkgrel=1 arch=('i686' 'x86_64') url="http://www.imagemagick.org/" @@ -12,7 +12,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr') source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('3f3dfa63445081ece9a47825a2d692ca11d97cab' +sha1sums=('aafa7934a663547f4f9ae38c20e7a60db92da6ae' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD index 2e08ce716..36ae7edb5 100644 --- a/extra/nasm/PKGBUILD +++ b/extra/nasm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166564 2012-09-11 14:37:47Z stephane $ +# $Id: PKGBUILD 172939 2012-12-07 16:59:58Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=nasm -pkgver=2.10.05 +pkgver=2.10.06 pkgrel=1 pkgdesc="An 80x86 assembler designed for portability and modularity" url="http://www.nasm.us" @@ -11,7 +11,7 @@ license=('BSD') arch=('i686' 'x86_64') depends=('glibc') source=(http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('fb9cd57680ed8026c9b612f0db8ecf8df05a1e3c') +sha1sums=('0acad2db3281509af338a283b64e9288a81f195f') install=nasm.install build() { diff --git a/extra/opus/PKGBUILD b/extra/opus/PKGBUILD index c250b548d..46008e22c 100644 --- a/extra/opus/PKGBUILD +++ b/extra/opus/PKGBUILD @@ -1,28 +1,34 @@ +# $Id: PKGBUILD 172981 2012-12-08 01:33:56Z eric $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com> # Contributor: pumbur pkgname=opus -pkgver=1.0.1 -pkgrel=2 -pkgdesc="codec designed for interactive speech and audio transmission over the Internet" +pkgver=1.0.2 +pkgrel=1 +pkgdesc="Codec designed for interactive speech and audio transmission over the Internet" arch=('i686' 'x86_64') url="http://www.opus-codec.org/" license=('custom') depends=('glibc') -source=("http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") options=('!libtool') -md5sums=('bbac19996957b404a1139816e2f357f5') +source=("http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") +md5sums=('c503ad05a59ddb44deab96204401be03') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr make } +check() { + cd "${srcdir}/${pkgname}-${pkgver}" + make check +} + package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/opus" install -m644 COPYING "${pkgdir}/usr/share/licenses/opus/" } diff --git a/extra/rtmpdump/PKGBUILD b/extra/rtmpdump/PKGBUILD index b1e933a21..274020c5c 100644 --- a/extra/rtmpdump/PKGBUILD +++ b/extra/rtmpdump/PKGBUILD @@ -1,27 +1,25 @@ -# $Id: PKGBUILD 134127 2011-08-02 03:47:07Z eric $ +# $Id: PKGBUILD 172942 2012-12-07 18:25:31Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: xduugu # Contributor: Elis Hughes <elishughes@googlemail.com> pkgname=rtmpdump -pkgver=2.4 +pkgver=20121203 pkgrel=1 pkgdesc="A tool to download rtmp streams" arch=('i686' 'x86_64') url="http://rtmpdump.mplayerhq.hu/" license=('GPL2' 'LGPL2.1') depends=('openssl') -#source=(http://rtmpdump.mplayerhq.hu/download/${pkgname}-${pkgver}.tgz) -source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('2c3b76d46d56180176ef099b8ad50a1608bef1dac35d8cb0b21ceac31b5c0656') +options=(!makeflags) +#git://git.ffmpeg.org/rtmpdump +source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz) +sha256sums=('e5d9f7411bddd5a12be677f2a285c38100313db2b3b1f8d2a709d46e03741409') build() { - cd "${srcdir}/${pkgname}-${pkgver}" - make + make -C "$pkgname-$pkgver" } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - install -d -m755 "${pkgdir}/usr/lib" - make prefix=/usr mandir=/usr/share/man DESTDIR="${pkgdir}" install + make -C "$pkgname-$pkgver" prefix=/usr mandir=/usr/share/man DESTDIR="$pkgdir" install } diff --git a/kernels/linux-libre-grsec/PKGBUILD b/kernels/linux-libre-grsec/PKGBUILD index d586f77f7..873b96b91 100755 --- a/kernels/linux-libre-grsec/PKGBUILD +++ b/kernels/linux-libre-grsec/PKGBUILD @@ -9,12 +9,12 @@ pkgbase=linux-libre-grsec # Build stock -LIBRE-GRSEC kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.6 -_sublevel=8 +_sublevel=9 _grsecver=2.9.1 -_timestamp=201212011309 +_timestamp=201212061820 pkgver=${_basekernel}.${_sublevel} pkgrel=3 -_lxopkgver=${_basekernel}.8 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -31,13 +31,10 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' - #'module-symbol-waiting-3.6.patch' - #'module-init-wait-3.6.patch' - #'irq_cfg_pointer-3.6.6.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a2312edd0265b5b07bd4b50afae2b380' - '3f4d630f49a12079598a3601dd2adb24' - '404f94ed95983191b673f3462715bd64' + '2127e118d09154c7a44dd2dfed2cfecd' + '5a7ac3d736bda40cd459865a13263e7d' '9b4ec887671d9242eba16be5cba4f9dc' '55695d7853abe483f4db189877fd5e36' '5f66bed97a5c37e48eb2f71b2d354b9a' @@ -45,10 +42,7 @@ md5sums=('a2312edd0265b5b07bd4b50afae2b380' '8267264d9a8966e57fdacd1fa1fc65c4' '86d3c12bdb77173617d2b9e170522ee0' '9d3c56a4b999c8bfbd4018089a62f662' - #'670931649c60fcb3ef2e0119ed532bd4' - #'8a71abc4224f575008f974a099b5cf6f' - #'4909a0271af4e5f373136b382826717f' - 'acc79d1934fe9710acd9039dcd4e8b30') + '2f3ae0624acb4a4b12ea2c008b964bd2') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] @@ -77,14 +71,6 @@ build() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" -# # fix module initialisation -# # https://bugs.archlinux.org/task/32122 -# patch -Np1 -i "${srcdir}/module-symbol-waiting-3.6.patch" -# patch -Np1 -i "${srcdir}/module-init-wait-3.6.patch" - -# # fix FS#32615 - Check for valid irq_cfg pointer in smp_irq_move_cleanup_interrupt -# patch -Np1 -i "${srcdir}/irq_cfg_pointer-3.6.6.patch" - if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-grsec|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/kernels/linux-libre-grsec/linux-libre-grsec.install b/kernels/linux-libre-grsec/linux-libre-grsec.install index 4c65c9783..640b32e25 100755 --- a/kernels/linux-libre-grsec/linux-libre-grsec.install +++ b/kernels/linux-libre-grsec/linux-libre-grsec.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-grsec -KERNEL_VERSION=3.6.7-4-LIBRE-GRSEC +KERNEL_VERSION=3.6.9-3-LIBRE-GRSEC _fix_permissions() { /usr/bin/paxutils diff --git a/kernels/linux-libre-lts-grsec/PKGBUILD b/kernels/linux-libre-lts-grsec/PKGBUILD index 9e3ef91ce..e6ea24827 100755 --- a/kernels/linux-libre-lts-grsec/PKGBUILD +++ b/kernels/linux-libre-lts-grsec/PKGBUILD @@ -10,9 +10,9 @@ pkgbase=linux-libre-lts-grsec # Build stock -LIBRE-LTS-GRSEC kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.2 _grsecver=2.9.1 -_timestamp=201211251859 -pkgver=${_basekernel}.34 -pkgrel=3 +_timestamp=201212061818 +pkgver=${_basekernel}.35 +pkgrel=1 _lxopkgver=${_basekernel}.34 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -20,7 +20,7 @@ license=('GPL2') makedepends=('xmlto' 'docbook-xsl') options=('!strip') source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gnu/linux-libre-${_basekernel}-gnu.tar.xz" - "http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgver}-gnu/patch-${_basekernel}-gnu-${_pkgver}-gnu.xz" + "http://linux-libre.fsfla.org/pub/linux-libre/releases/${pkgver}-gnu/patch-${_basekernel}-gnu-${pkgver}-gnu.xz" "http://grsecurity.net/stable/grsecurity-$_grsecver-$pkgver-$_timestamp.patch" # the main kernel config files 'config.i686' 'config.x86_64' @@ -34,14 +34,14 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'ext4-options.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('65c669b6e4888db84a80882461851867' - 'cb77e85201da7df05a1c0609e5c91740' - '31b0af1369d602537bcce58141f37645' + '11cd72c1febacfa98e3c6162fee86ba9' + '27c45c7b29406bea785a8bef77ebfaf2' '9cdc3506425c2f5ca4a05493c0c8dec9' '969fb7ac31e86521d1d854b7d5a3fa18' '243221bb1898f996dcf2020c015f6fd0' '2967cecc3af9f954ccc822fd63dca6ff' '8267264d9a8966e57fdacd1fa1fc65c4' - '04b21c79df0a952c22d681dd4f4562df' + '86d3c12bdb77173617d2b9e170522ee0' '9d3c56a4b999c8bfbd4018089a62f662' '263725f20c0b9eb9c353040792d644e5' 'f36222e7ce20c8e4dc27376f9be60f6c' @@ -60,11 +60,11 @@ build() { cd "${srcdir}/linux-${_basekernel}" if [ "${_basekernel}" != "${pkgver}" ]; then - patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${_pkgver}-gnu" + patch -Np1 -i "${srcdir}/patch-${_basekernel}-gnu-${pkgver}-gnu" fi # Add grsecurity patches - patch -Np1 -i $srcdir/grsecurity-$_grsecver-$pkgver-$_timestamp.patch + patch -Np1 -i ${srcdir}/grsecurity-${_grsecver}-${pkgver}-${_timestamp}.patch rm localversion-grsec # Add freedo as boot logo diff --git a/kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.install b/kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.install index 87abae14c..18b408248 100755 --- a/kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.install +++ b/kernels/linux-libre-lts-grsec/linux-libre-lts-grsec.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts-grsec -KERNEL_VERSION=3.2.34-1-LIBRE-LTS-GRSEC +KERNEL_VERSION=3.2.35-1-LIBRE-LTS-GRSEC # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' @@ -17,7 +17,7 @@ post_install () { fi # compat symlinks for the official kernels only - if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts-rt" ]; then + if [ -z "${KERNEL_NAME}" -o "${KERNEL_NAME}" = "-lts-grsec" ]; then loaders="$(find /boot -name syslinux.cfg -or -name extlinux.conf -or -name grub.cfg -or -name menu.lst)" [ -f /etc/lilo.conf ] && loaders="$loaders /etc/lilo.conf" if [ -n "${loaders}" ] && grep -q -e vmlinuz26 -e kernel26.img -e kernel26-fallback.img $loaders; then diff --git a/kernels/paxutils/PKGBUILD b/kernels/paxutils/PKGBUILD index 3d6d1e772..66896a32a 100644 --- a/kernels/paxutils/PKGBUILD +++ b/kernels/paxutils/PKGBUILD @@ -3,8 +3,8 @@ pkgname=paxutils pkgdesc='PaX utilities to configure flags for several binaries to work with PaX kernels' -pkgver=0.1.0 -pkgrel=2 +pkgver=0.1.1 +pkgrel=1 arch=(any) url='https://projects.parabolagnulinux.org/abslibre.git/tree/kernels/paxutils/' license=(GPL2) @@ -13,7 +13,7 @@ replaces=('linux-pax-flags' 'linux-libre-pax-flags') conflicts=('linux-pax-flags' 'linux-libre-pax-flags') provides=('linux-pax-flags' 'linux-libre-pax-flags') source=($pkgname) -sha256sums=(bf1fda4919e7ed8052711c91933d9da5d86945ba44133c94e1952dedb4d1759b) +sha256sums=(a47ebcde9ecb0a5d16825cdca3710ea8ab4fd111abae72216d44e1b0294e043a) build() { return 0 diff --git a/kernels/paxutils/paxutils b/kernels/paxutils/paxutils index 22f5a8171..69662a646 100755 --- a/kernels/paxutils/paxutils +++ b/kernels/paxutils/paxutils @@ -1,14 +1,25 @@ #!/bin/bash -[ "$UID" = "0" ] || { - sudo $0 - exit $! +function usage() { + echo $(basename $0) \[options\] >&2 + echo + echo ' -h This help.' + echo ' -y Do not ask before changes.' + echo + exit 1 } function homedir() { egrep ^$1 /etc/passwd | cut -d: -f 6 } +[ "$1" = '-h' ] && usage + +[ "$UID" = "0" ] || { + sudo $0 $@ + exit $! +} + declare -A perms perms=( @@ -19,6 +30,7 @@ perms=( # MPROTECT and RANDMMAP off ['cPSmXEr']=' /usr/bin/elinks + /usr/bin/gnome-shell /usr/bin/pyrogenesis /usr/lib/iceweasel/iceweasel /usr/lib/iceweasel/plugin-container @@ -148,22 +160,22 @@ echo configuration for the following binaries: for perm in ${!perms[@]}; do for path in ${perms[$perm]}; do - [ -f $path ] && echo " * $path" + [ -f "$path" ] && echo " * $path" done done echo echo Continue writing PaX headers? \[Y/n\] -read a +[ "$1" = '-y' ] && a=y || read a case $a in "Y"|"y"|"") for perm in ${!perms[@]}; do for path in ${perms[$perm]}; do - [ -f $path ] && { + [ -f "$path" ] && { echo $perm $path - paxctl -$perm $path + paxctl -$perm "$path" } done done diff --git a/pcr/gens-gs/PKGBUILD b/pcr/gens-gs/PKGBUILD new file mode 100644 index 000000000..316c0af9c --- /dev/null +++ b/pcr/gens-gs/PKGBUILD @@ -0,0 +1,49 @@ +# Maintainer: trya <tryagainprod@gmail.com> + +pkgname=gens-gs +pkgver=r7 +pkgrel=5 +pkgdesc="An emulator of Sega Genesis, Sega CD and 32X, combining features from various forks of Gens" +url="http://segaretro.org/Gens/GS" +arch=('i686' 'x86_64') +license=('GPL') +if [[ $CARCH == "x86_64" ]]; then + depends=('lib32-gtk2' 'lib32-sdl' 'lib32-libgl') + makedepends=('nasm' 'gcc-multilib') + optdepends=('lib32-alsa-plugins: sound with Gens/GS for Pulseaudio users' + 'lib32-libpulse: sound with Gens/GS for Pulseaudio users') +else + depends=('gtk2' 'sdl' 'libgl') + makedepends=('nasm' 'gcc') +fi +replaces=('bin32-gens-gs') +conflicts=('gens' 'gens-gs-git' 'bin32-gens-gs' 'bin32-gens') +options=('!libtool') +source=("http://segaretro.org/images/6/6d/Gens-gs-r7.tar.gz" + gens-gtk.patch) +md5sums=('bcb17b49774aa318a224c741028aabc3' + '94a8ea744dee8caea73db1223ac67dcd') + +build() { + if [ $CARCH == "x86_64" ]; then + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + fi + + cd "$srcdir/$pkgname-$pkgver" + + patch -Np1 < ../gens-gtk.patch + if [ $CARCH == "x86_64" ]; then + i386 ./configure --prefix=/usr + else + ./configure --prefix=/usr LIBS="-ldl -lX11" + fi + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + rm -f "$pkgdir/usr/lib/mdp/*.a" +} diff --git a/pcr/gens-gs/gens-gtk.patch b/pcr/gens-gs/gens-gtk.patch new file mode 100644 index 000000000..0bc6fd0ee --- /dev/null +++ b/pcr/gens-gs/gens-gtk.patch @@ -0,0 +1,187 @@ +diff -ru gens/src/gens/ui/gtk/about/about_window.cpp gens-build/src/gens/ui/gtk/about/about_window.cpp +--- gens/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/about/about_window.cpp 2010-10-11 15:46:25.000000000 +0000 +@@ -84,7 +84,7 @@ + gtk_window_set_position(GTK_WINDOW(about_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(about_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(about_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(about_window), FALSE); ++ g_object_set(GTK_DIALOG(about_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)about_window, "delete_event", +diff -ru gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp +--- gens/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/bios_misc_files/bmf_window.cpp 2010-10-11 15:33:03.000000000 +0000 +@@ -84,7 +84,7 @@ + gtk_window_set_position(GTK_WINDOW(bmf_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(bmf_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(bmf_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(bmf_window), FALSE); ++ g_object_set(GTK_DIALOG(bmf_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)bmf_window, "delete_event", +diff -ru gens/src/gens/ui/gtk/directory_config/dir_window.cpp gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp +--- gens/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/directory_config/dir_window.cpp 2010-10-11 15:34:21.000000000 +0000 +@@ -109,7 +109,7 @@ + gtk_window_set_position(GTK_WINDOW(dir_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(dir_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(dir_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(dir_window), FALSE); ++ g_object_set(GTK_DIALOG(dir_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)(dir_window), "delete_event", +diff -ru gens/src/gens/ui/gtk/general_options/genopt_window.cpp gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp +--- gens/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/general_options/genopt_window.cpp 2010-10-11 15:36:00.000000000 +0000 +@@ -140,7 +140,7 @@ + gtk_window_set_position(GTK_WINDOW(genopt_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(genopt_window), false); + gtk_window_set_type_hint(GTK_WINDOW(genopt_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(genopt_window), false); ++ g_object_set(GTK_DIALOG(genopt_window), "has-separator", false, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)genopt_window, "delete_event", +@@ -458,11 +458,11 @@ + gtk_box_pack_start(GTK_BOX(vboxIntroEffect), lblIntroEffect, false, false, 0); + + // Dropdown for intro effect. +- cboIntroEffect = gtk_combo_box_new_text(); +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "None"); +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Gens Logo Effect"); +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "\"Crazy\" Effect"); +- //gtk_combo_box_append_text(GTK_COMBO_BOX(cboIntroEffect), "Genesis TMSS"); // TODO: Broken. ++ cboIntroEffect = gtk_combo_box_text_new(); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "None"); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Gens Logo Effect"); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "\"Crazy\" Effect"); ++ //gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboIntroEffect), "Genesis TMSS"); // TODO: Broken. + gtk_widget_show(cboIntroEffect); + gtk_box_pack_start(GTK_BOX(vboxIntroEffect), cboIntroEffect, false, false, 0); + g_signal_connect((gpointer)(cboIntroEffect), "changed", +diff -ru gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp +--- gens/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/gens/gens_window_callbacks.cpp 2010-10-11 15:21:28.000000000 +0000 +@@ -154,9 +154,9 @@ + GSFT_UNUSED_PARAMETER(y); + GSFT_UNUSED_PARAMETER(user_data); + +- if (context->targets) ++ if (gdk_drag_context_list_targets(context)) + { +- GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(context->targets, 0)); ++ GdkAtom target_type = GDK_POINTER_TO_ATOM(g_list_nth_data(gdk_drag_context_list_targets(context), 0)); + gtk_drag_get_data(widget, context, target_type, time); + return true; + } +diff -ru gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp +--- gens/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/opengl_resolution/glres_window.cpp 2010-10-11 15:46:21.000000000 +0000 +@@ -75,7 +75,7 @@ + gtk_window_set_position(GTK_WINDOW(glres_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(glres_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(glres_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(glres_window), FALSE); ++ g_object_set(GTK_DIALOG(glres_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)(glres_window), "delete_event", +diff -ru gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp +--- gens/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/plugin_manager/pmgr_window.cpp 2010-10-11 15:46:29.000000000 +0000 +@@ -80,8 +80,7 @@ + // Callbacks. + static gboolean pmgr_window_callback_close(GtkWidget *widget, GdkEvent *event, gpointer user_data); + static void pmgr_window_callback_response(GtkDialog *dialog, gint response_id, gpointer user_data); +-static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page, +- guint page_num, gpointer user_data); ++static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data); + static void pmgr_window_callback_lstPluginList_cursor_changed(GtkTreeView *tree_view, gpointer user_data); + static void pmgr_window_callback_fraPluginDesc_size_allocate(GtkWidget *widget, GtkAllocation *allocation, gpointer user_data); + +@@ -119,7 +118,7 @@ + gtk_window_set_position(GTK_WINDOW(pmgr_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(pmgr_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(pmgr_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(pmgr_window), FALSE); ++ g_object_set(GTK_DIALOG(pmgr_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)pmgr_window, "delete_event", +@@ -559,11 +558,9 @@ + * @param page_num New notebook page index. + * @param user_data User data. + */ +-static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, GtkNotebookPage *page, +- guint page_num, gpointer user_data) ++static void pmgr_window_callback_tabPluginList_switch_page(GtkNotebook *notebook, guint page_num, gpointer user_data) + { + GSFT_UNUSED_PARAMETER(notebook); +- GSFT_UNUSED_PARAMETER(page); + GSFT_UNUSED_PARAMETER(user_data); + + // Activate the "cursor-changed" callback for the page. +diff -ru gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp +--- gens/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/gens/ui/gtk/select_cdrom/selcd_window.cpp 2010-10-11 15:46:16.000000000 +0000 +@@ -94,7 +94,7 @@ + gtk_window_set_position(GTK_WINDOW(selcd_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(selcd_window), FALSE); + gtk_window_set_type_hint(GTK_WINDOW(selcd_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(selcd_window), FALSE); ++ g_object_set(GTK_DIALOG(selcd_window), "has-separator", FALSE, NULL); + + // Callbacks for if the window is closed. + g_signal_connect((gpointer)(selcd_window), "delete_event", +@@ -128,7 +128,7 @@ + gtk_box_pack_start(GTK_BOX(hboxDeviceName), lblDeviceName, false, false, 0); + + // Create the dropdown for the CD-ROM device name. +- cboDeviceName = gtk_combo_box_entry_new_text(); ++ cboDeviceName = gtk_combo_box_text_new_with_entry(); + gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(cboDeviceName))), 63); + gtk_label_set_mnemonic_widget(GTK_LABEL(lblDeviceName), cboDeviceName); + gtk_widget_show(cboDeviceName); +@@ -156,7 +156,7 @@ + gtk_box_pack_start(GTK_BOX(hboxDriveSpeed), vboxDriveSpeedDropdown, true, true, 0); + + // Create the dropdown for the CD-ROM drive speed selection. +- cboDriveSpeed = gtk_combo_box_new_text(); ++ cboDriveSpeed = gtk_combo_box_text_new(); + char tmpSpeed[16]; + for (unsigned int i = 0; i < ((sizeof(CD_DriveSpeed) / sizeof(CD_DriveSpeed[0])) - 1); i++) + { +@@ -167,7 +167,7 @@ + else + szprintf(tmpSpeed, sizeof(tmpSpeed), "%dx", CD_DriveSpeed[i]); + +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboDriveSpeed), tmpSpeed); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDriveSpeed), tmpSpeed); + } + gtk_widget_show(cboDriveSpeed); + gtk_box_pack_start(GTK_BOX(vboxDriveSpeedDropdown), cboDriveSpeed, true, false, 0); +@@ -252,7 +252,7 @@ + continue; + + // Add the device file. +- gtk_combo_box_append_text(GTK_COMBO_BOX(cboDeviceName), tmpDeviceName); ++ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(cboDeviceName), tmpDeviceName); + } + } + +diff -ru gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp +--- gens/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 16:32:29.000000000 +0000 ++++ gens-build/src/mdp/misc/game_genie/gg_window_gtk2.cpp 2010-10-11 15:52:05.000000000 +0000 +@@ -111,7 +111,7 @@ + gtk_window_set_position(GTK_WINDOW(gg_window), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(gg_window), TRUE); + gtk_window_set_type_hint(GTK_WINDOW(gg_window), GDK_WINDOW_TYPE_HINT_DIALOG); +- gtk_dialog_set_has_separator(GTK_DIALOG(gg_window), FALSE); ++ g_object_set(GTK_DIALOG(gg_window), "has-separator", FALSE, NULL); + + // Add the window icon. + GList *icon_list = NULL; |