diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-22 11:05:18 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-22 11:05:18 -0300 |
| commit | 2352f09f581b24fa01f022026728acf919c0335a (patch) | |
| tree | 36667ad9212b04db2500f304da5ac4a611cce5c9 /extra | |
| parent | 7e9d319e9575e68d86463b792425fcdba0f195d2 (diff) | |
| parent | 99746708edfd2c56f2ba654a14f27e98b1601a43 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/gambas3/PKGBUILD
community-staging/luminancehdr/PKGBUILD
community-staging/luxrays/PKGBUILD
community-staging/luxrender/PKGBUILD
community-staging/performous/PKGBUILD
community-staging/widelands/PKGBUILD
community/chmsee/PKGBUILD
community/flac123/PKGBUILD
community/pam-krb5/PKGBUILD
community/python-pyxattr/PKGBUILD
extra/postgresql/PKGBUILD
extra/pygobject2/PKGBUILD
extra/python-lxml/PKGBUILD
extra/usbview/PKGBUILD
extra/vlc/PKGBUILD
extra/xorg-server/PKGBUILD
multilib/lib32-libpng/PKGBUILD
multilib/lib32-util-linux/PKGBUILD
staging/bzflag/PKGBUILD
staging/calligra/PKGBUILD
staging/enblend-enfuse/PKGBUILD
staging/gegl/PKGBUILD
staging/hugin/PKGBUILD
staging/inkscape/PKGBUILD
testing/btrfs-progs/PKGBUILD
testing/btrfs-progs/initcpio-hook-btrfs
testing/btrfs-progs/initcpio-install-btrfs
testing/cryptsetup/PKGBUILD
testing/cryptsetup/encrypt_hook
testing/empathy/PKGBUILD
testing/evolution/PKGBUILD
testing/glibmm/PKGBUILD
testing/gtkglext/PKGBUILD
testing/ibus/PKGBUILD
testing/kmod/PKGBUILD
testing/udisks2/PKGBUILD
testing/xf86-video-intel/PKGBUILD
Diffstat (limited to 'extra')
36 files changed, 1261 insertions, 193 deletions
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index c47594024..2493c3359 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 161344 2012-06-10 05:51:02Z giovanni $ +# $Id: PKGBUILD 169418 2012-10-20 18:24:37Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> pkgname=amule -pkgver=10792 +pkgver=10795 pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ url="http://www.amule.org" license=('GPL') depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('ff828df9561e4964e439539189a891f7') +md5sums=('e64c4f198e66c3e231a292b60b7cafb4') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/bitlbee/PKGBUILD b/extra/bitlbee/PKGBUILD index 675e52389..d0f3a6348 100644 --- a/extra/bitlbee/PKGBUILD +++ b/extra/bitlbee/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163519 2012-07-14 13:10:00Z allan $ +# $Id: PKGBUILD 169422 2012-10-20 20:58:46Z dreisner $ # Contributor: FUBAR <mrfubar@gmail.com> # Contributor: simo <simo@archlinux.org> @@ -8,8 +8,8 @@ # Maintainer: Dave Reisner <dreisner@archlinux.org> pkgname=bitlbee -pkgver=3.0.5 -pkgrel=4 +pkgver=3.0.6 +pkgrel=1 pkgdesc='Brings instant messaging (XMPP, MSN, Yahoo!, AIM, ICQ, Twitter) to IRC' url='http://www.bitlbee.org/' license=('GPL') @@ -20,12 +20,10 @@ optdepends=('skype4py: to use skyped' 'libotr: for OTR encryption support' 'xinetd: to run bitlbee through xinetd') source=("http://get.bitlbee.org/src/${pkgname}-${pkgver}.tar.gz" - 'sbindir.patch' 'xinetd' 'rc.d' 'bitlbee.tmpfiles') -sha1sums=('74afdff87be49ce060771a6ae10d7643cd57b9b6' - '9b774e6d85471a4e43e25b8b941cd0e1032a7a6c' +sha1sums=('6ac7cab4dab422f9baac97818e69ee9934db345c' '5e0af27ba9cc4fe455e3381c75fc49a9326e2f17' '02423c500ac64f673ba26a3395c7c7036c17343e' '3695ed2fe22436c4d0fc3ead829f7d1f89bc491c') @@ -37,8 +35,6 @@ install=bitlbee.install build() { cd "$pkgname-$pkgver" - patch -p1 -i ../sbindir.patch - ./configure \ --prefix=/usr \ --etcdir=/etc/bitlbee \ diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 61f297008..73b65af15 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,15 +1,11 @@ -# $Id: PKGBUILD 168545 2012-10-13 09:58:07Z andrea $ +# $Id: PKGBUILD 169384 2012-10-20 09:31:33Z andyrtr $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=calligra pkgname=('calligra-filters' - 'calligra-interfaces' 'calligra-libs' 'calligra-plugins' - 'calligra-pics' - 'calligra-servicetypes' - 'calligra-templates' 'calligra-tools' 'calligra-karbon' 'calligra-kexi' @@ -22,14 +18,14 @@ pkgname=('calligra-filters' 'calligra-braindump' 'calligra-flow') pkgver=2.5.3 -pkgrel=2 +pkgrel=5 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') makedepends=('cmake' 'automoc4' 'boost ' 'kdepimlibs' 'eigen2' 'kdeedu-marble' 'lcms2' 'libmysqlclient' 'libpqxx' 'freetds' 'xbase' 'libwpg' 'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw' - 'openjpeg' 'kdegraphics-okular' 'pstoedit') + 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'mesa') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2") md5sums=('83e2679b7ecb923b953ace06db7ca4c2') @@ -56,24 +52,22 @@ package_calligra-filters() { make DESTDIR="${pkgdir}" install } -package_calligra-interfaces() { - pkgdesc="Interfaces for the Calligra office suite" - depends=('calligra-libs') - conflicts=('koffice-interfaces') - replaces=('koffice-interfaces') - - cd "${srcdir}"/build/interfaces - make DESTDIR="${pkgdir}" install -} - package_calligra-libs() { pkgdesc="Libraries for the Calligra office suite" - depends=('kdepimlibs' 'lcms2' 'calligra-servicetypes') - conflicts=('koffice-libs') - replaces=('koffice-libs') - - cd "${srcdir}"/build/libs - make DESTDIR="${pkgdir}" install + depends=('kdepimlibs' 'lcms2') + conflicts=('koffice-interfaces' 'koffice-libs' 'koffice-pics' + 'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces' + 'calligra-libs' 'calligra-pics' 'calligra-servicetypes' + 'calligra-templates') + replaces=('koffice-interfaces' 'koffice-libs' 'koffice-pics' + 'koffice-servicetypes' 'koffice-templates' 'calligra-interfaces' + 'calligra-libs' 'calligra-pics' 'calligra-servicetypes' + 'calligra-templates') + + for d in interfaces libs pics servicetypes templates; do + cd "${srcdir}"/build/${d} + make DESTDIR="${pkgdir}" install + done } package_calligra-plugins() { @@ -87,35 +81,6 @@ package_calligra-plugins() { make DESTDIR="${pkgdir}" install } -package_calligra-pics() { - pkgdesc="Icons for the Calligra office suite" - conflicts=('koffice-pics') - replaces=('koffice-pics') - install=calligra.install - - cd "${srcdir}"/build/pics - make DESTDIR="${pkgdir}" install -} - -package_calligra-servicetypes() { - pkgdesc="Servicetypes for the Calligra office suite" - conflicts=('koffice-servicetypes') - replaces=('koffice-servicetypes') - install=calligra.install - - cd "${srcdir}"/build/servicetypes - make DESTDIR="${pkgdir}" install -} - -package_calligra-templates() { - pkgdesc="Templates for the Calligra office suite" - conflicts=('koffice-templates') - replaces=('koffice-templates') - - cd "${srcdir}"/build/templates - make DESTDIR="${pkgdir}" install -} - package_calligra-tools() { pkgdesc="Tools for the Calligra office suite" depends=('calligra-libs') @@ -129,7 +94,7 @@ package_calligra-tools() { package_calligra-karbon() { pkgdesc="Create scalable vector drawings" - depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime' 'pstoedit') + depends=('calligra-libs' 'kdebase-runtime' 'pstoedit') optdepends=('calligra-filters: import/export filters' 'calligra-tools: extra calligra tools') conflicts=('koffice-karbon' 'koffice-karbon-doc' 'calligra-karbon-doc') @@ -142,7 +107,7 @@ package_calligra-karbon() { package_calligra-kexi() { pkgdesc="Develop desktop database applications" - depends=('calligra-libs' 'calligra-templates' 'glew' 'fftw') + depends=('calligra-libs' 'glew' 'fftw') optdepends=('libmysqlclient: MySQL driver' 'libpqxx: PostgreSQL driver' 'freetds: Sybase & MS SQL driver' @@ -173,7 +138,7 @@ package_calligra-plan() { package_calligra-stage() { pkgdesc="Write presentation documents" - depends=('calligra-libs' 'calligra-templates' 'kdebase-runtime') + depends=('calligra-libs' 'kdebase-runtime') optdepends=('calligra-plugins: extra calligra plugins') conflicts=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc') replaces=('koffice-kpresenter' 'koffice-kpresenter-doc' 'calligra-stage-doc') @@ -187,7 +152,7 @@ package_calligra-stage() { package_calligra-krita() { pkgdesc="Edit and paint images" - depends=('calligra-templates' 'calligra-plugins' 'kdebase-runtime' 'eigen2' + depends=('calligra-plugins' 'kdebase-runtime' 'eigen2' 'poppler-qt' 'libkdcraw' 'fftw' 'glew' 'opengtl') conflicts=('koffice-krita' 'calligra-krita-doc') replaces=('koffice-krita' 'calligra-krita-doc') @@ -199,7 +164,7 @@ package_calligra-krita() { package_calligra-sheets() { pkgdesc="Write spreadsheet documents" - depends=('calligra-templates' 'calligra-libs' 'gsl' 'kdebase-runtime') + depends=('calligra-libs' 'gsl' 'kdebase-runtime') optdepends=('calligra-filters: import/export filters' 'calligra-plugins: extra calligra plugins' 'calligra-tools: extra calligra tools') @@ -215,7 +180,7 @@ package_calligra-sheets() { package_calligra-words() { pkgdesc="Word Processor" - depends=('calligra-templates' 'calligra-pics' 'calligra-plugins' 'kdegraphics-okular') + depends=('calligra-libs' 'kdegraphics-okular') optdepends=('calligra-tools: extra calligra tools') conflicts=('koffice-kword') replaces=('koffice-kword') diff --git a/extra/ethtool/PKGBUILD b/extra/ethtool/PKGBUILD index 4c0e68c77..0ab6d86a8 100644 --- a/extra/ethtool/PKGBUILD +++ b/extra/ethtool/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 165653 2012-08-28 08:48:01Z ibiru $ +# $Id: PKGBUILD 169444 2012-10-21 10:28:57Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Martin Kemp <mdkemp@elys.com> pkgname=ethtool -pkgver=3.5 +pkgver=3.6 pkgrel=1 epoch=1 pkgdesc="Utility for controlling network drivers and hardware" @@ -13,7 +13,7 @@ url="http://www.kernel.org/pub/software/network/ethtool/" license=('GPL') depends=('glibc') source=(http://www.kernel.org/pub/software/network/$pkgname/$pkgname-$pkgver.tar.xz) -md5sums=('021b5785f65637a04d65c2d44d6c2250') +md5sums=('b897aa2e7eeafb5d69a571b48a1b354f') build() { cd $pkgname-$pkgver diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index 6009587fc..d69825e0b 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 165428 2012-08-19 07:57:43Z andyrtr $ +# $Id: PKGBUILD 169386 2012-10-20 09:31:39Z andyrtr $ # Contributor: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=inkscape pkgver=0.48.3.1 -pkgrel=5 +pkgrel=6 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' license=('GPL' 'LGPL') diff --git a/extra/libpng/PKGBUILD b/extra/libpng/PKGBUILD index 8bbad77b9..047e706e8 100644 --- a/extra/libpng/PKGBUILD +++ b/extra/libpng/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 164030 2012-07-24 16:52:28Z ibiru $ +# $Id: PKGBUILD 169446 2012-10-21 10:49:41Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Travis Willard <travis@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=libpng -pkgver=1.5.12 -_apngver=1.5.12 +pkgver=1.5.13 +_apngver=1.5.13 pkgrel=1 pkgdesc="A collection of routines used to create PNG format graphics files" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ depends=('zlib' 'sh') options=('!libtool') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.xz" "http://downloads.sourceforge.net/sourceforge/libpng-apng/libpng-$_apngver-apng.patch.gz") -md5sums=('0fd51add1da6a0e470e0c726c59171b9' - '7f2924b1fe0cca9080e18b8720443716') +md5sums=('0b607a685da977f1bfc96e1c47055183' + '23c8765aa6ca188c0575386d5ea8fe70') build() { cd $pkgname-$pkgver diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 8df933197..2bb3bf12e 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 168606 2012-10-13 11:47:57Z andyrtr $ +# $Id: PKGBUILD 169387 2012-10-20 09:31:46Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -26,15 +26,15 @@ pkgname=('libreoffice-common' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) _LOver=3.6.2.2 pkgver=3.6.2 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' #'boost' - 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' + 'apache-ant' 'gperf' 'poppler>=0.20.5' 'kdelibs' 'gconf' 'cppunit' 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' - 'glu' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' + 'glu' 'mesa' 'gstreamer0.10-base' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=49.1" @@ -288,7 +288,6 @@ package_libreoffice-common() { 'gconf: adds additional gnome support' 'nss: adds support for signed files/macros' 'pstoedit: translates PostScript and PDF graphics into other vector formats' - 'poppler: for shipped pdfimport extension' 'libmythes: for use in thesaurus' 'beanshell: interactive java -- good for prototyping /macros' 'vigra: C++ computer vision library, usable in Basebmp' diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD index 1148b234b..a22fdf1ac 100644 --- a/extra/libtorrent-rasterbar/PKGBUILD +++ b/extra/libtorrent-rasterbar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 165655 2012-08-28 09:42:38Z ibiru $ +# $Id: PKGBUILD 169448 2012-10-21 11:01:54Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libtorrent-rasterbar -pkgver=0.16.3 +pkgver=0.16.4 pkgrel=1 epoch=1 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" @@ -14,7 +14,7 @@ depends=('boost-libs' 'geoip' 'python2') makedepends=('boost') options=('!libtool' '!emptydirs') source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha1sums=('72788037bdf6a0a4796b4d74e543528cbfe9899b') +sha1sums=('f8695373c574a6801b4dfe7030e0a0c4bb610abd') build() { cd $pkgname-$pkgver diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD index 117641c20..9a9245a8c 100644 --- a/extra/msmtp/PKGBUILD +++ b/extra/msmtp/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 166148 2012-09-04 22:30:41Z eric $ +# $Id: PKGBUILD 169483 2012-10-22 00:13:27Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=msmtp pkgname=('msmtp' 'msmtp-mta') -pkgver=1.4.29 +pkgver=1.4.30 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL3') url="http://msmtp.sourceforge.net" makedepends=('texlive-core' 'gsasl' 'libgnome-keyring') source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgbase}-${pkgver}.tar.bz2) -sha1sums=('6db88d6c5093b3958b0285b5010f2677b05e0348') +sha1sums=('fd469bae0c3394b30b771780e62bbd41c4d5d175') build() { cd "${srcdir}/${pkgbase}-${pkgver}" diff --git a/extra/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD index 3f5ea1f1f..54bc7cada 100644 --- a/extra/net-snmp/PKGBUILD +++ b/extra/net-snmp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168300 2012-10-08 05:33:09Z eric $ +# $Id: PKGBUILD 169381 2012-10-20 09:06:34Z eric $ # Maintainer: # Contributor: Dale Blount <dale@archlinux.org> pkgname=net-snmp -pkgver=5.7.1 -pkgrel=4 +pkgver=5.7.2 +pkgrel=1 pkgdesc="A suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6" arch=('i686' 'x86_64' 'mips64el') url="http://www.net-snmp.org/" @@ -16,11 +16,11 @@ optdepends=('perl-term-readkey: for snmpcheck application' 'python2: for the python modules') provides=('ucd-snmp') backup=('etc/conf.d/snmpd') -options=('!libtool' '!makeflags' '!emptydirs') +options=('!libtool' '!emptydirs') source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc} snmpd.confd snmpd.rc snmpd.service libnl32.patch) -sha1sums=('ddb82ce1112ef0642869d3c8d7c7e585f151849a' - '2bdc2839ce09d7daa608cd54687fa8beb47ed907' +sha1sums=('c493027907f32400648244d81117a126aecd27ee' + '25ee4b2e7b5a1b91122d06e82d41ef5bb5359d6d' 'cf811da9e57bbca34d8e2a3c358bb3bfc0c2b33b' '90600c0141eed10d6e3ca3ccc97ad8dda15c2112' 'f59ddc049c1c689f04e68c3c7cd8b8e301df3158' diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 49f3b2cc2..37ad46c3e 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 165431 2012-08-19 07:58:23Z andyrtr $ +# $Id: PKGBUILD 169388 2012-10-20 09:31:48Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.20.3 +pkgver=0.20.5 pkgrel=1 arch=(i686 x86_64 mips64el) license=('GPL') -makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection') +makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection' 'icu') options=('!libtool' '!emptydirs') url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('28c40266f374e1960a7bcead17d39f96' +md5sums=('8a80ae83eb7a327b031808d09ee1d54d' '9dc64c254a31e570507bdd4ad4ba629a') build() { @@ -36,7 +36,7 @@ check() { cd "${srcdir}" ln -sf test-${_testtag} test cd ${pkgbase}-${pkgver} - LANG=en_US.UTF8 make check + LANG=en_US.UTF8 make check || /bin/true } package_poppler() { diff --git a/extra/postgresql/PKGBUILD b/extra/postgresql/PKGBUILD index ca3fbcdcb..91ddb8421 100644 --- a/extra/postgresql/PKGBUILD +++ b/extra/postgresql/PKGBUILD @@ -1,39 +1,47 @@ -# $Id: PKGBUILD 166983 2012-09-24 14:35:11Z dan $ +# $Id: PKGBUILD 169465 2012-10-21 16:43:35Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgbase=postgresql pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql') pkgver=9.2.1 _majorver=${pkgver%.*} -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.postgresql.org/" license=('custom:PostgreSQL') makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl' 'openssl>=1.0.0') source=(http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 + postgresql-run-socket.patch postgresql.rcd postgresql.confd postgresql.pam postgresql.logrotate - postgresql.service postgresql-check-db-dir) + postgresql.service postgresql.tmpfiles.conf postgresql-check-db-dir) md5sums=('c0b4799ea9850eae3ead14f0a60e9418' + '75c579eed03ffb2312631f0b649175b4' '1ddd1df8010549f237e7983bb326025e' 'a54d09a20ab1672adf08f037df188d53' '96f82c38f3f540b53f3e5144900acf17' 'd28e443f9f65a5712c52018b84e27137' '89b48774b0dae7c37fbb0e907c3c1db8' + 'd34e4ab6d589aa819a1e2829290a3b7c' '505e0e4abfc746cae9558584d471a03c') sha256sums=('db61d498105a7d5fe46185e67ac830c878cdd7dc1f82a87f06b842217924c461' + '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9' '9f6307b1358892e304f9474a456f0cb9160cfb8812a9da0430abe647f8a9cf45' '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81' '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e' 'c69b614731fdd3f4e127540814f5999f423363523c5209e252e19b1d4362ad68' + 'd25980980b4c747a1a49d8d4736d8440a77fb8bc3275dbdc3dc6c4cf4ae8de07' '3a3279d290f556bf7a362670e32b491794f47ed218f6b8c6acef366a3291f669') build() { cd "${srcdir}/postgresql-${pkgver}" + patch -Np1 < ../postgresql-run-socket.patch + ./configure --prefix=/usr \ --mandir=/usr/share/man \ --datadir=/usr/share/postgresql \ + --sysconfdir=/etc \ --with-krb5 \ --with-libxml \ --with-openssl \ @@ -137,18 +145,20 @@ package_postgresql() { # install launch script install -D -m755 "${srcdir}/postgresql.rcd" "${pkgdir}/etc/rc.d/postgresql" + install -D -m644 "${srcdir}/postgresql.tmpfiles.conf" \ + "${pkgdir}/usr/lib/tmpfiles.d/postgresql.conf" install -D -m644 "${srcdir}/postgresql.service" \ "${pkgdir}/usr/lib/systemd/system/postgresql.service" install -D -m755 "${srcdir}/postgresql-check-db-dir" \ "${pkgdir}/usr/bin/postgresql-check-db-dir" # install conf file - install -D -m644 ${srcdir}/postgresql.confd \ + install -D -m644 "${srcdir}/postgresql.confd" \ "${pkgdir}/etc/conf.d/postgresql" - install -D -m644 ${srcdir}/postgresql.pam \ + install -D -m644 "${srcdir}/postgresql.pam" \ "${pkgdir}/etc/pam.d/postgresql" - install -D -m644 ${srcdir}/postgresql.logrotate \ + install -D -m644 "${srcdir}/postgresql.logrotate" \ "${pkgdir}/etc/logrotate.d/postgresql" } diff --git a/extra/postgresql/postgresql-run-socket.patch b/extra/postgresql/postgresql-run-socket.patch new file mode 100644 index 000000000..b558c7b74 --- /dev/null +++ b/extra/postgresql/postgresql-run-socket.patch @@ -0,0 +1,12 @@ +diff -Naur postgresql-9.2.0.sockets/src/include/pg_config_manual.h postgresql-9.2.0/src/include/pg_config_manual.h +--- postgresql-9.2.0.sockets/src/include/pg_config_manual.h 2012-09-06 17:26:17.000000000 -0400 ++++ postgresql-9.2.0/src/include/pg_config_manual.h 2012-09-06 18:13:18.183092471 -0400 +@@ -144,7 +144,7 @@ + * here's where to twiddle it. You can also override this at runtime + * with the postmaster's -k switch. + */ +-#define DEFAULT_PGSOCKET_DIR "/tmp" ++#define DEFAULT_PGSOCKET_DIR "/run/postgresql" + + /* + * The random() function is expected to yield values between 0 and diff --git a/extra/postgresql/postgresql.install b/extra/postgresql/postgresql.install index 7b73f6fa9..263bccb25 100644 --- a/extra/postgresql/postgresql.install +++ b/extra/postgresql/postgresql.install @@ -18,6 +18,10 @@ post_upgrade() { if [ "$postgres_shell" = "/sbin/nologin" ]; then chsh -s /bin/bash postgres fi + if [ $(vercmp $2 '9.2.1-2') -lt 0 ]; then + echo "Note: The Unix domain socket location has changed; be sure to" + echo " restart any local applications using libpq.so." + fi } post_remove() { diff --git a/extra/postgresql/postgresql.tmpfiles.conf b/extra/postgresql/postgresql.tmpfiles.conf new file mode 100644 index 000000000..6c48e34ed --- /dev/null +++ b/extra/postgresql/postgresql.tmpfiles.conf @@ -0,0 +1 @@ +d /run/postgresql 0755 postgres postgres - diff --git a/extra/pygobject2/PKGBUILD b/extra/pygobject2/PKGBUILD index 6df4b19cc..45c687042 100644 --- a/extra/pygobject2/PKGBUILD +++ b/extra/pygobject2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 169003 2012-10-17 10:19:49Z allan $ +# $Id: PKGBUILD 169377 2012-10-20 09:01:36Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=pygobject2 pkgname=(python-gobject2 python2-gobject2 pygobject2-devel) pkgver=2.28.6 -pkgrel=7 +pkgrel=8 arch=('i686' 'x86_64' 'mips64el') url="http://www.pygtk.org/" license=('LGPL') @@ -20,9 +20,15 @@ sha256sums=('fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8' '4bff9adcea13a824c45d14ec501c927df47d23c22507a2456d8b5ec885924c0a') build() { - cd "${srcdir}" + cd pygobject-$pkgver + + # patches available in 2.28 branch but unreleased. + patch -Np1 -i "${srcdir}/python2-fix-type.patch" + patch -Np1 -i "${srcdir}/python3-fix-build.patch" + patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch" + + cd .. cp -a "pygobject-${pkgver}" python2-build - mkdir devel ( cd python2-build @@ -33,11 +39,6 @@ build() { ( cd "pygobject-${pkgver}" - #patches available in 2.28 branch but unreleased. - patch -Np1 -i "${srcdir}/python2-fix-type.patch" - patch -Np1 -i "${srcdir}/python3-fix-build.patch" - patch -Np1 -i "${srcdir}/python3-fix-maketrans.patch" - ./configure --prefix=/usr --disable-introspection make ) @@ -49,7 +50,7 @@ package_python-gobject2() { replaces=('py3gobject') provides=("py3gobject=$pkgver") - cd "${srcdir}/pygobject-${pkgver}" + cd pygobject-${pkgver} make DESTDIR="${pkgdir}" install # Delete devel stuff @@ -62,25 +63,22 @@ package_python2-gobject2() { replaces=('pygobject') provides=("pygobject=$pkgver") - cd "${srcdir}/python2-build" + cd python2-build make DESTDIR="${pkgdir}" install find "$pkgdir"/usr/share/pygobject -name '*.py' | \ xargs sed -i "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" # Split devel stuff - mv "$pkgdir"/usr/{include,lib/pkgconfig,share/{gtk-doc,pygobject/xsl}} \ - "$srcdir/devel/" + cd .. + mkdir -p devel/usr/{lib,share/pygobject} + mv {"$pkgdir",devel}/usr/include + mv {"$pkgdir",devel}/usr/lib/pkgconfig + mv {"$pkgdir",devel}/usr/share/gtk-doc + mv {"$pkgdir",devel}/usr/share/pygobject/xsl } package_pygobject2-devel() { pkgdesc="Development files for the pygobject bindings" - - cd "${srcdir}/devel" - mkdir -p "$pkgdir"/usr/{include,lib,share/pygobject} - - mv include "$pkgdir/usr/" - mv pkgconfig "$pkgdir/usr/lib/" - mv gtk-doc "$pkgdir/usr/share/" - mv xsl "$pkgdir/usr/share/pygobject/" + mv devel/* "$pkgdir" } diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD index 2d3652c6c..e6e78a163 100644 --- a/extra/python-lxml/PKGBUILD +++ b/extra/python-lxml/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 169319 2012-10-19 09:25:22Z andrea $ +# $Id: PKGBUILD 169394 2012-10-20 09:48:34Z eric $ # Maintainer: pkgbase=python-lxml pkgname=('python-lxml' 'python2-lxml' 'python-lxml-docs') -pkgver=3.0 -pkgrel=2 +pkgver=3.0.1 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('BSD' 'custom') url="http://lxml.de/" makedepends=('python2' 'python' 'libxslt') source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc}) -sha1sums=('8dbbd03a637bb563113cf07049a4d5a109369441' - 'b38447fd3f9cfb30b4d56ffe3bec42739afb2947') +sha1sums=('bb7fa04e1a49091151608df347cf12e10e9ed7f1' + '1d6f08dcdd860c3a52664af9fa3de35a47ca4f16') check() { cd lxml-$pkgver @@ -60,4 +60,11 @@ package_python-lxml-docs() { cd lxml-$pkgver install -d "${pkgdir}"/usr/share/doc/${pkgbase} cp -r doc/html "${pkgdir}"/usr/share/doc/${pkgbase} + + install -Dm644 LICENSES.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE + install -Dm644 doc/licenses/BSD.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/BSD.txt + install -Dm644 doc/licenses/elementtree.txt \ + "${pkgdir}"/usr/share/licenses/$pkgname/elementtree.txt } diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index cc5acc17c..e0c6f5bdf 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167235 2012-09-29 06:58:03Z ibiru $ +# $Id: PKGBUILD 169450 2012-10-21 11:25:20Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgver=2.71 +pkgver=2.73 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.transmissionbt.com/" @@ -14,7 +14,7 @@ source=(http://mirrors.m0k.org/transmission/files/$pkgbase-$pkgver.tar.xz transmission.tmpfiles) build() { - cd "$pkgbase-$pkgver" + cd "$pkgbase-2.72" ./configure --prefix=/usr make @@ -28,7 +28,7 @@ package_transmission-cli() { backup=('etc/conf.d/transmissiond') install=transmission-cli.install - cd "$pkgbase-$pkgver" + cd "$pkgbase-2.72" for dir in daemon cli web utils do @@ -50,7 +50,7 @@ package_transmission-gtk() { 'transmission-cli: daemon and web support') install=transmission-gtk.install - cd "$pkgbase-$pkgver" + cd "$pkgbase-2.72" make -C gtk DESTDIR="$pkgdir" install make -C po DESTDIR="$pkgdir" install @@ -63,7 +63,7 @@ package_transmission-qt() { optdepends=('transmission-cli: daemon and web support') install=transmission-qt.install - cd "$pkgbase-$pkgver" + cd "$pkgbase-2.72" make -C qt INSTALL_ROOT="$pkgdir"/usr install @@ -71,7 +71,7 @@ package_transmission-qt() { install -D -m644 qt/icons/transmission.png "$pkgdir/usr/share/pixmaps/transmission-qt.png" install -D -m644 qt/transmission-qt.desktop "$pkgdir/usr/share/applications/transmission-qt.desktop" } -md5sums=('26d24de210076a7625e5fe37e3252f2a' +md5sums=('86479f9bb378b793ce7a8a71f5b15904' '7d6186ee2a852ae3d44980f05063e194' 'db72b02fee139e8ab416324e6c044d76' '5c289c8901221a94be74665368ab5c2c' diff --git a/extra/transmission/transmission-cli.install b/extra/transmission/transmission-cli.install index 8ab275e61..94a829f5c 100644 --- a/extra/transmission/transmission-cli.install +++ b/extra/transmission/transmission-cli.install @@ -1,8 +1,8 @@ post_install() { cat << _EOF - If you want to run the Transmission daemon at boot, - add transmissiond to the DAEMONS array in /etc/rc.conf. + If you want to run the Transmission daemon at boot do: + systemctl enable transmissiond _EOF post_upgrade diff --git a/extra/usbview/PKGBUILD b/extra/usbview/PKGBUILD index f8f794675..b8ed604a7 100644 --- a/extra/usbview/PKGBUILD +++ b/extra/usbview/PKGBUILD @@ -1,25 +1,38 @@ -# $Id: PKGBUILD 143990 2011-12-01 15:29:15Z giovanni $ +# $Id: PKGBUILD 169432 2012-10-21 07:40:08Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=usbview pkgver=1.1 -pkgrel=3 -pkgdesc="USB Viewer" +pkgrel=4 +pkgdesc="Display the topology of devices on the USB bus" arch=('i686' 'x86_64' 'mips64el') url="http://www.kroah.com/linux-usb/" license=('GPL') -depends=('gtk2') -makedepends=('pkg-config') -source=("http://www.kroah.com/linux-usb/${pkgname}-${pkgver}.tar.gz") -md5sums=('8bf5e66351156356f3ad07454123affa') +depends=('gtk3' 'desktop-file-utils') +makedepends=('pkg-config' 'gendesk') +install=${pkgname}.install +source=("http://www.kroah.com/linux-usb/${pkgname}-${pkgver}.tar.gz" + 'usbview-1.1-gtk3-port.patch' + 'usbview-1.1-missing-usbfs.patch') +md5sums=('8bf5e66351156356f3ad07454123affa' + '578ed1099228f205b728ee2d46ed6f56' + '02e4313887423d0057a7f4f15b7f37d4') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "${srcdir}" + gendesk -n + sed -i "s:Application;:Application;System:g" "${srcdir}"/${pkgname}.desktop + + cd "${pkgname}-${pkgver}" + + patch -Np1 -i "${srcdir}/usbview-1.1-gtk3-port.patch" + patch -Np1 -i "${srcdir}/usbview-1.1-missing-usbfs.patch" + autoreconf ./configure --prefix=/usr \ --sysconfdir=/etc \ - --localstatedir=/var + --localstatedir=/var make } @@ -29,4 +42,10 @@ package() { make prefix="${pkgdir}/usr" \ sysconfdir="${pkgdir}/etc" \ localstatedir="${pkgdir}/var" install + + install -Dm0644 "${srcdir}"/${pkgname}.desktop \ + "${pkgdir}"/usr/share/applications/${pkgname}.desktop + + install -Dm0644 "${srcdir}"/${pkgname}-${pkgver}/usb_icon.xpm \ + "${pkgdir}"/usr/share/pixmaps/${pkgname}.xpm } diff --git a/extra/usbview/usbview-1.1-gtk3-port.patch b/extra/usbview/usbview-1.1-gtk3-port.patch new file mode 100644 index 000000000..9462dcf43 --- /dev/null +++ b/extra/usbview/usbview-1.1-gtk3-port.patch @@ -0,0 +1,802 @@ +--- a/Makefile.am 2009-03-11 03:25:46.000000000 +0100 ++++ b/Makefile.am 2012-06-14 20:33:10.641639573 +0200 +@@ -16,10 +16,8 @@ + interface.c \ + callbacks.c \ + usbtree.c usbtree.h \ +- showmessage.c \ + usbparse.c usbparse.h \ + configure-dialog.c \ +- about-dialog.c \ + usbview_logo.xpm \ + usbview_logo.xcf \ + usb_icon.xpm \ +--- a/callbacks.c 2008-06-25 23:03:13.000000000 +0200 ++++ b/callbacks.c 2012-06-14 21:06:05.000523489 +0200 +@@ -23,13 +23,13 @@ + #endif + + #include <gtk/gtk.h> +- + #include "usbtree.h" ++#include "usbview_logo.xpm" /* logo */ + + + void on_buttonClose_clicked (GtkButton *button, gpointer user_data) + { +- gtk_exit(0); ++ gtk_main_quit(); + } + + +@@ -55,7 +55,21 @@ + + void on_buttonAbout_clicked (GtkButton *button, gpointer user_data) + { +- about_dialog (); ++ GdkPixbuf *logo; ++ gchar *authors[] = { "Greg Kroah-Hartman <greg@kroah.com>", NULL }; ++ ++ logo = gdk_pixbuf_new_from_xpm_data ((const char **)usbview_logo_xpm); ++ gtk_show_about_dialog (GTK_WINDOW (windowMain), ++ "logo", logo, ++ "program-name", "usbview", ++ "version", VERSION, ++ "comments", "Display information on USB devices", ++ "website-label", "http://www.kroah.com/linux-usb/", ++ "website", "http://www.kroah.com/linux-usb/", ++ "copyright", "Copyright © 1999-2012", ++ "authors", authors, ++ NULL); ++ g_object_unref (logo); + } + + +--- a/configure-dialog.c 2009-03-11 02:40:28.000000000 +0100 ++++ b/configure-dialog.c 2012-06-14 21:06:05.000523489 +0200 +@@ -24,264 +24,78 @@ + #endif + + #include <gtk/gtk.h> +-#include <stdio.h> +-#include <stdlib.h> + #include <string.h> +-#include <ctype.h> +- + #include "usbtree.h" + #include "usbparse.h" + +- +- +- + static GtkWidget *fileEntry; +-static GtkWidget *filew; +-static char *sFilename; +- +-/* +- * Get the selected filename and print it to the console +- */ +-static void file_ok_sel (GtkWidget *w, GtkFileSelection *fs) +-{ +- const char *sTempFile; +- +- /* --- Get the name --- */ +- sTempFile = gtk_file_selection_get_filename (GTK_FILE_SELECTION (fs)); +- +- /* --- Allocate space and save it. --- */ +- sFilename = malloc (sizeof (char) * (strlen (sTempFile) + 1)); +- strcpy (sFilename, sTempFile); +- +- /* --- Destroy the file selection --- */ +- gtk_widget_destroy (filew); +-} +- +- +-static void file_cancel_sel (GtkWidget *w, GtkFileSelection *fs) +-{ +- /* --- Destroy the file selection --- */ +- gtk_widget_destroy (filew); +-} +- +- +-/* +- * DestroyDialog +- * +- * Destroy the dialog (obvious, eh?) but also remove the +- * grab and close the modal. +- */ +-static int DestroyDialog (GtkWidget *widget, gpointer *data) +-{ +- gtk_grab_remove (widget); +- gtk_main_quit (); +- return(FALSE); +-} +- +- +-/* +- * GetFilename +- */ +-static char *GetFilename (char *sTitle, char *initialFilename) +-{ +- sFilename = NULL; +- +- /* --- Create a new file selection widget --- */ +- filew = gtk_file_selection_new (sTitle); +- +- /* --- If it's destroyed --- */ +- gtk_signal_connect (GTK_OBJECT (filew), "destroy", (GtkSignalFunc) DestroyDialog, &filew); +- +- /* --- Connect the ok_button to file_ok_sel function --- */ +- gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filew)->ok_button), "clicked", (GtkSignalFunc) file_ok_sel, filew ); +- +- /* --- Connect the cancel_button to destroy the widget --- */ +- gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION (filew)->cancel_button), "clicked", (GtkSignalFunc) file_cancel_sel, filew); +- +- /* --- Lets set the filename --- */ +- gtk_file_selection_set_filename (GTK_FILE_SELECTION(filew), initialFilename); +- +- /* --- Turn off the file operation buttons --- */ +- gtk_file_selection_hide_fileop_buttons (GTK_FILE_SELECTION(filew)); +- +- /* --- Of course, we show it --- */ +- gtk_widget_show (filew); +- +- /* --- Make sure we keep the focus --- */ +- gtk_grab_add (filew); +- +- gtk_main (); +- +- return(sFilename); +-} +- +- +-static void ClearShowMessage (GtkWidget *widget, gpointer data) +-{ +- gtk_grab_remove (widget); +-} +- +-static void CancelConfigureDialog (GtkWidget *widget, gpointer data) +-{ +- GtkWidget *dialogWidget = (GtkWidget *) data; +- +- gtk_grab_remove (dialogWidget); +- +- /* --- Close the widget --- */ +- gtk_widget_destroy (dialogWidget); +-} +- +-static void OkConfigureDialog (GtkWidget *widget, gpointer data) +-{ +- GtkWidget *dialogWidget = (GtkWidget *) data; +- gchar *editString; +- +- editString = gtk_editable_get_chars (GTK_EDITABLE (fileEntry), 0, -1); +- +- gtk_grab_remove (dialogWidget); +- +- /* --- Close the widget --- */ +- gtk_widget_destroy (dialogWidget); +- +- strcpy (devicesFile, editString); +- g_free (editString); +- LoadUSBTree(0); +-} +- + + static void fileSelectButtonClick (GtkWidget *widget, gpointer data) + { +- gchar *newFilename; ++ GtkWidget *dialog; ++ gchar *filename; + +- newFilename = GetFilename ("locate usbdevfs devices file", devicesFile); +- +- if (newFilename != NULL) { +- gtk_entry_set_text (GTK_ENTRY (fileEntry), newFilename); +- gtk_widget_show (fileEntry); +- g_free (newFilename); ++ dialog = gtk_file_chooser_dialog_new ( ++ "locate usbdevfs devices file", ++ GTK_WINDOW (windowMain), ++ GTK_FILE_CHOOSER_ACTION_OPEN, ++ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, ++ GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, ++ NULL); ++ ++ if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) ++ { ++ filename = gtk_file_chooser_get_filename( ++ GTK_FILE_CHOOSER (dialog)); ++ gtk_entry_set_text (GTK_ENTRY (fileEntry), filename); ++ g_free (filename); + } ++ ++ gtk_widget_destroy (dialog); + } + +- + void configure_dialog (void) + { +- GtkWidget *configDialog; +- GtkWidget *dialog_vbox2; ++ GtkWidget *dialog, *content_area; + GtkWidget *hbox1; + GtkWidget *label1; +- GtkWidget *label41; +- GtkWidget *label42; +- GtkWidget *label43; +- GtkWidget *vbox1; +- GtkWidget *dialog_action_area2; +- GtkWidget *hbuttonbox2; +- GtkWidget *okButton; +- GtkWidget *cancelButton; + GtkWidget *fileSelectButton; ++ gchar *editString; ++ gint result; + +- configDialog = gtk_dialog_new (); +- gtk_object_set_data (GTK_OBJECT (configDialog), "configDialog", configDialog); +- gtk_window_set_title (GTK_WINDOW (configDialog), "USB View Configuration"); +- gtk_window_set_policy (GTK_WINDOW (configDialog), TRUE, TRUE, FALSE); +- +- dialog_vbox2 = GTK_DIALOG (configDialog)->vbox; +- gtk_object_set_data (GTK_OBJECT (configDialog), "dialog_vbox2", dialog_vbox2); +- gtk_widget_show (dialog_vbox2); +- +- vbox1 = gtk_vbox_new (FALSE, 0); +- gtk_widget_ref (vbox1); +- gtk_object_set_data_full (GTK_OBJECT (configDialog), "vbox1", vbox1, (GtkDestroyNotify) gtk_widget_unref); +- gtk_widget_show (vbox1); +- gtk_box_pack_start (GTK_BOX (dialog_vbox2), vbox1, TRUE, TRUE, 0); +- +- label41 = gtk_label_new (""); +- gtk_widget_ref (label41); +- gtk_object_set_data_full (GTK_OBJECT (configDialog), "label41", label41, (GtkDestroyNotify) gtk_widget_unref); +- gtk_widget_show (label41); +- gtk_box_pack_start (GTK_BOX (vbox1), label41, FALSE, FALSE, 0); +- +- hbox1 = gtk_hbox_new (FALSE, 0); +- gtk_widget_ref (hbox1); +- gtk_object_set_data_full (GTK_OBJECT (configDialog), "hbox1", hbox1, (GtkDestroyNotify) gtk_widget_unref); +- gtk_widget_show (hbox1); +-// gtk_box_pack_start (GTK_BOX (dialog_vbox2), hbox1, TRUE, TRUE, 0); +- gtk_box_pack_start (GTK_BOX (vbox1), hbox1, TRUE, TRUE, 0); +- +- label42 = gtk_label_new (""); +- gtk_widget_ref (label42); +- gtk_object_set_data_full (GTK_OBJECT (configDialog), "label42", label42, (GtkDestroyNotify) gtk_widget_unref); +- gtk_widget_show (label42); +- gtk_box_pack_start (GTK_BOX (vbox1), label42, FALSE, FALSE, 0); +- +- +- label1 = gtk_label_new (" Location of usbdevfs devices file"); +- gtk_widget_ref (label1); +- gtk_object_set_data_full (GTK_OBJECT (configDialog), "label1", label1, (GtkDestroyNotify) gtk_widget_unref); +- gtk_widget_show (label1); ++ dialog = gtk_dialog_new_with_buttons ( ++ "USB View Configuration", ++ GTK_WINDOW (windowMain), ++ GTK_DIALOG_DESTROY_WITH_PARENT, ++ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, ++ GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, ++ NULL); ++ ++ content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); ++ ++ hbox1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); ++ gtk_container_add (GTK_CONTAINER (content_area), hbox1); ++ ++ label1 = gtk_label_new ("Location of usbdevfs devices file"); + gtk_box_pack_start (GTK_BOX (hbox1), label1, FALSE, FALSE, 5); + + fileEntry = gtk_entry_new (); +- gtk_widget_ref (fileEntry); +- gtk_object_set_data_full (GTK_OBJECT (configDialog), "fileEntry", fileEntry, (GtkDestroyNotify) gtk_widget_unref); + gtk_entry_set_text (GTK_ENTRY (fileEntry), devicesFile); +- gtk_widget_show (fileEntry); + gtk_box_pack_start (GTK_BOX (hbox1), fileEntry, TRUE, TRUE, 0); + +- dialog_action_area2 = GTK_DIALOG (configDialog)->action_area; +- gtk_object_set_data (GTK_OBJECT (configDialog), "dialog_action_area2", dialog_action_area2); +- gtk_widget_show (dialog_action_area2); +- gtk_container_set_border_width (GTK_CONTAINER (dialog_action_area2), 1); +- +- hbuttonbox2 = gtk_hbutton_box_new (); +- gtk_widget_ref (hbuttonbox2); +- gtk_object_set_data_full (GTK_OBJECT (configDialog), "hbuttonbox2", hbuttonbox2, (GtkDestroyNotify) gtk_widget_unref); +- gtk_widget_show (hbuttonbox2); +- gtk_box_pack_start (GTK_BOX (dialog_action_area2), hbuttonbox2, TRUE, TRUE, 11); +- +- okButton = gtk_button_new_with_label (" OK "); +- gtk_widget_ref (okButton); +- gtk_object_set_data_full (GTK_OBJECT (configDialog), "okButton", okButton, (GtkDestroyNotify) gtk_widget_unref); +- gtk_widget_show (okButton); +- gtk_container_add (GTK_CONTAINER (hbuttonbox2), okButton); +- GTK_WIDGET_SET_FLAGS (okButton, GTK_CAN_DEFAULT); +- +- cancelButton = gtk_button_new_with_label (" Cancel "); +- gtk_widget_ref (cancelButton); +- gtk_object_set_data_full (GTK_OBJECT (configDialog), "cancelButton", cancelButton, (GtkDestroyNotify) gtk_widget_unref); +- gtk_widget_show (cancelButton); +- gtk_container_add (GTK_CONTAINER (hbuttonbox2), cancelButton); +- GTK_WIDGET_SET_FLAGS (cancelButton, GTK_CAN_DEFAULT); +- + fileSelectButton = gtk_button_new_with_label ("..."); +- gtk_widget_ref (fileSelectButton); +- gtk_object_set_data_full (GTK_OBJECT (configDialog), "fileSelectButton", fileSelectButton, (GtkDestroyNotify) gtk_widget_unref); +- gtk_widget_show (fileSelectButton); +- ++ g_signal_connect (G_OBJECT (fileSelectButton), "clicked", ++ G_CALLBACK (fileSelectButtonClick), NULL); + gtk_box_pack_start (GTK_BOX (hbox1), fileSelectButton, TRUE, FALSE, 1); + +- label43 = gtk_label_new (" "); +- gtk_widget_ref (label43); +- gtk_object_set_data_full (GTK_OBJECT (configDialog), "label43", label43, (GtkDestroyNotify) gtk_widget_unref); +- gtk_widget_show (label43); +- gtk_box_pack_start (GTK_BOX (hbox1), label43, FALSE, FALSE, 0); +- +- gtk_signal_connect (GTK_OBJECT (okButton), "clicked", GTK_SIGNAL_FUNC (OkConfigureDialog), configDialog); +- gtk_signal_connect (GTK_OBJECT (cancelButton), "clicked", GTK_SIGNAL_FUNC (CancelConfigureDialog), configDialog); +- gtk_signal_connect (GTK_OBJECT (fileSelectButton), "clicked", GTK_SIGNAL_FUNC (fileSelectButtonClick), configDialog); +- +- /* --- Default the "Ok" button --- */ +- GTK_WIDGET_SET_FLAGS (okButton, GTK_CAN_DEFAULT); +- gtk_widget_grab_default (okButton); +- +- gtk_signal_connect (GTK_OBJECT (configDialog), "destroy", GTK_SIGNAL_FUNC (ClearShowMessage), NULL); +- +- /* --- Show the dialog --- */ +- gtk_widget_show (configDialog); +- +- /* --- Only this window can have actions done. --- */ +- gtk_grab_add (configDialog); +- +- return; ++ gtk_widget_show_all (dialog); ++ result = gtk_dialog_run(GTK_DIALOG (dialog)); ++ if (result == GTK_RESPONSE_ACCEPT) { ++ editString = gtk_editable_get_chars ( ++ GTK_EDITABLE (fileEntry), 0, -1); ++ strcpy (devicesFile, editString); ++ g_free (editString); ++ LoadUSBTree (0); ++ } ++ gtk_widget_destroy (dialog); + } +- +- +--- a/configure.in 2007-10-23 02:03:36.000000000 +0200 ++++ b/configure.in 2012-06-14 20:25:16.629667442 +0200 +@@ -1,7 +1,7 @@ + dnl Process this file with autoconf to produce a configure script. + + AC_INIT(configure.in) +-AM_INIT_AUTOMAKE(usbview, 1.0) ++AM_INIT_AUTOMAKE(usbview, 1.1) + AM_CONFIG_HEADER(config.h) + + # required versions of other packages +@@ -12,33 +12,10 @@ + AM_PROG_CC_STDC + AC_HEADER_STDC + +-PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.0.5) ++PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.0) + AC_SUBST(GTK_FLAGS) + AC_SUBST(GTK_LIBS) + +- +-dnl Set PACKAGE_LOCALE_DIR in config.h. +-if test "x${prefix}" = "xNONE"; then +- AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${ac_default_prefix}/${DATADIRNAME}/locale") +-else +- AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${prefix}/${DATADIRNAME}/locale") +-fi +- +-dnl Set PACKAGE_DATA_DIR in config.h. +-if test "x${datadir}" = 'x${prefix}/share'; then +- if test "x${prefix}" = "xNONE"; then +- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}") +- else +- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}") +- fi +-else +- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}") +-fi +- +-dnl Set PACKAGE_SOURCE_DIR in config.h. +-packagesrcdir=`cd $srcdir && pwd` +-AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}") +- + dnl Use -Wall if we have gcc. + changequote(,)dnl + if test "x$GCC" = "xyes"; then +--- a/interface.c 2009-03-11 03:11:47.000000000 +0100 ++++ b/interface.c 2012-06-14 21:06:05.000523489 +0200 +@@ -32,15 +32,16 @@ + #include "usb_icon.xpm" + + GtkWidget *treeUSB; ++GtkTreeStore *treeStore; + GtkTextBuffer *textDescriptionBuffer; + GtkWidget *textDescriptionView; ++GtkWidget *windowMain; + + int timer; + + GtkWidget* + create_windowMain () + { +- GtkWidget *windowMain; + GtkWidget *vbox1; + GtkWidget *hpaned1; + GtkWidget *scrolledwindow1; +@@ -50,68 +51,61 @@ + GtkWidget *buttonClose; + GtkWidget *buttonAbout; + GdkPixbuf *icon; ++ GtkCellRenderer *treeRenderer; ++ GtkTreeViewColumn *treeColumn; + + windowMain = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_widget_set_name (windowMain, "windowMain"); +- gtk_object_set_data (GTK_OBJECT (windowMain), "windowMain", windowMain); + gtk_window_set_title (GTK_WINDOW (windowMain), "USB Viewer"); +- gtk_window_set_default_size (GTK_WINDOW (windowMain), 500, 300); ++ gtk_window_set_default_size (GTK_WINDOW (windowMain), 600, 300); + + icon = gdk_pixbuf_new_from_xpm_data((const char **)usb_icon_xpm); + gtk_window_set_icon(GTK_WINDOW(windowMain), icon); + +- vbox1 = gtk_vbox_new (FALSE, 0); ++ vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + gtk_widget_set_name (vbox1, "vbox1"); +- gtk_widget_ref (vbox1); +- gtk_object_set_data_full (GTK_OBJECT (windowMain), "vbox1", vbox1, +- (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (vbox1); + gtk_container_add (GTK_CONTAINER (windowMain), vbox1); + +- hpaned1 = gtk_hpaned_new (); ++ hpaned1 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); + gtk_widget_set_name (hpaned1, "hpaned1"); +- gtk_widget_ref (hpaned1); +- gtk_object_set_data_full (GTK_OBJECT (windowMain), "hpaned1", hpaned1, +- (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (hpaned1); + gtk_box_pack_start (GTK_BOX (vbox1), hpaned1, TRUE, TRUE, 0); +- gtk_paned_set_position (GTK_PANED (hpaned1), 200); + +- treeUSB = gtk_ctree_new_with_titles (1, 0, NULL); ++ treeStore = gtk_tree_store_new (N_COLUMNS, ++ G_TYPE_STRING, /* NAME_COLUMN */ ++ G_TYPE_INT, /* DEVICE_ADDR_COLUMN */ ++ G_TYPE_STRING /* COLOR_COLUMN */); ++ treeUSB = gtk_tree_view_new_with_model (GTK_TREE_MODEL (treeStore)); ++ treeRenderer = gtk_cell_renderer_text_new (); ++ treeColumn = gtk_tree_view_column_new_with_attributes ( ++ "USB devices", ++ treeRenderer, ++ "text", NAME_COLUMN, ++ "foreground", COLOR_COLUMN, ++ NULL); ++ gtk_tree_view_append_column (GTK_TREE_VIEW (treeUSB), treeColumn); + gtk_widget_set_name (treeUSB, "treeUSB"); +- gtk_widget_ref (treeUSB); +- gtk_object_set_data_full (GTK_OBJECT (windowMain), "treeUSB", treeUSB, +- (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (treeUSB); +- gtk_container_add (GTK_CONTAINER (hpaned1), treeUSB); +- gtk_widget_set_usize (treeUSB, 200, -2); ++ gtk_paned_pack1 (GTK_PANED (hpaned1), treeUSB, FALSE, FALSE); + + scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_set_name (scrolledwindow1, "scrolledwindow1"); +- gtk_widget_ref (scrolledwindow1); +- gtk_object_set_data_full (GTK_OBJECT (windowMain), "scrolledwindow1", scrolledwindow1, +- (GtkDestroyNotify) gtk_widget_unref); +- gtk_widget_show (scrolledwindow1); +- gtk_container_add (GTK_CONTAINER (hpaned1), scrolledwindow1); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); ++ gtk_widget_show (scrolledwindow1); ++ gtk_paned_pack2 (GTK_PANED (hpaned1), scrolledwindow1, TRUE, FALSE); + + textDescriptionBuffer = gtk_text_buffer_new(NULL); + //textDescription = gtk_text_new (NULL, NULL); + textDescriptionView = gtk_text_view_new_with_buffer(textDescriptionBuffer); + gtk_widget_set_name (textDescriptionView, "textDescription"); +- gtk_widget_ref (textDescriptionView); +- gtk_object_set_data_full (GTK_OBJECT (windowMain), "textDescription", textDescriptionView, +- (GtkDestroyNotify) gtk_widget_unref); + gtk_text_view_set_editable(GTK_TEXT_VIEW(textDescriptionView), FALSE); + gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(textDescriptionView), FALSE); + gtk_widget_show (textDescriptionView); + gtk_container_add (GTK_CONTAINER (scrolledwindow1), textDescriptionView); + +- hbuttonbox1 = gtk_hbutton_box_new (); ++ hbuttonbox1 = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); + gtk_widget_set_name (hbuttonbox1, "hbuttonbox1"); +- gtk_widget_ref (hbuttonbox1); +- gtk_object_set_data_full (GTK_OBJECT (windowMain), "hbuttonbox1", hbuttonbox1, +- (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (hbuttonbox1); + gtk_box_pack_start (GTK_BOX (vbox1), hbuttonbox1, FALSE, FALSE, 5); + //gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbuttonbox1), 10); +@@ -120,58 +115,46 @@ + + buttonRefresh = gtk_button_new_from_stock(GTK_STOCK_REFRESH); + gtk_widget_set_name (buttonRefresh, "buttonRefresh"); +- gtk_widget_ref (buttonRefresh); +- gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonRefresh", buttonRefresh, +- (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (buttonRefresh); + gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonRefresh); + gtk_container_set_border_width (GTK_CONTAINER (buttonRefresh), 4); +- GTK_WIDGET_SET_FLAGS (buttonRefresh, GTK_CAN_DEFAULT); ++ gtk_widget_set_can_default (buttonRefresh, TRUE); + + buttonConfigure = gtk_button_new_with_label ("Configure..."); + gtk_widget_set_name (buttonConfigure, "buttonConfigure"); +- gtk_widget_ref (buttonConfigure); +- gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonConfigure", buttonConfigure, +- (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (buttonConfigure); + gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonConfigure); + gtk_container_set_border_width (GTK_CONTAINER (buttonConfigure), 4); +- GTK_WIDGET_SET_FLAGS (buttonConfigure, GTK_CAN_DEFAULT); ++ gtk_widget_set_can_default (buttonConfigure, TRUE); + + buttonAbout = gtk_button_new_from_stock(GTK_STOCK_ABOUT); + gtk_widget_set_name (buttonAbout, "buttonAbout"); +- gtk_widget_ref (buttonAbout); +- gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonAbout", buttonAbout, +- (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (buttonAbout); + gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonAbout); + gtk_container_set_border_width (GTK_CONTAINER (buttonAbout), 4); +- GTK_WIDGET_SET_FLAGS (buttonAbout, GTK_CAN_DEFAULT); ++ gtk_widget_set_can_default (buttonAbout, TRUE); + + buttonClose = gtk_button_new_from_stock(GTK_STOCK_QUIT); + gtk_widget_set_name (buttonClose, "buttonClose"); +- gtk_widget_ref (buttonClose); +- gtk_object_set_data_full (GTK_OBJECT (windowMain), "buttonClose", buttonClose, +- (GtkDestroyNotify) gtk_widget_unref); + gtk_widget_show (buttonClose); + gtk_container_add (GTK_CONTAINER (hbuttonbox1), buttonClose); + gtk_container_set_border_width (GTK_CONTAINER (buttonClose), 4); +- GTK_WIDGET_SET_FLAGS (buttonClose, GTK_CAN_DEFAULT); ++ gtk_widget_set_can_default (buttonClose, TRUE); + +- gtk_signal_connect (GTK_OBJECT (windowMain), "delete_event", +- GTK_SIGNAL_FUNC (on_window1_delete_event), ++ g_signal_connect (G_OBJECT (windowMain), "delete_event", ++ G_CALLBACK (on_window1_delete_event), + NULL); +- gtk_signal_connect (GTK_OBJECT (buttonRefresh), "clicked", +- GTK_SIGNAL_FUNC (on_buttonRefresh_clicked), ++ g_signal_connect (G_OBJECT (buttonRefresh), "clicked", ++ G_CALLBACK (on_buttonRefresh_clicked), + NULL); +- gtk_signal_connect (GTK_OBJECT (buttonConfigure), "clicked", +- GTK_SIGNAL_FUNC (on_buttonConfigure_clicked), ++ g_signal_connect (G_OBJECT (buttonConfigure), "clicked", ++ G_CALLBACK (on_buttonConfigure_clicked), + NULL); +- gtk_signal_connect (GTK_OBJECT (buttonAbout), "clicked", +- GTK_SIGNAL_FUNC (on_buttonAbout_clicked), ++ g_signal_connect (G_OBJECT (buttonAbout), "clicked", ++ G_CALLBACK (on_buttonAbout_clicked), + NULL); +- gtk_signal_connect (GTK_OBJECT (buttonClose), "clicked", +- GTK_SIGNAL_FUNC (on_buttonClose_clicked), ++ g_signal_connect (G_OBJECT (buttonClose), "clicked", ++ G_CALLBACK (on_buttonClose_clicked), + NULL); + + /* create our timer */ +--- a/main.c 2008-06-25 23:03:27.000000000 +0200 ++++ b/main.c 2012-06-14 21:06:05.000523489 +0200 +@@ -30,7 +30,6 @@ + { + GtkWidget *window1; + +- gtk_set_locale (); + gtk_init (&argc, &argv); + + initialize_stuff(); +--- a/usbparse.h 2008-06-25 23:03:47.000000000 +0200 ++++ b/usbparse.h 2012-06-14 21:06:05.000523489 +0200 +@@ -166,7 +166,7 @@ + struct Device *child[MAX_CHILDREN]; + DeviceBandwidth *bandwidth; + GtkWidget *tree; +- GtkCTreeNode *leaf; ++ GtkTreeIter leaf; + } Device; + + +--- a/usbtree.c 2012-06-14 21:08:11.672516042 +0200 ++++ b/usbtree.c 2012-06-14 21:06:05.000523489 +0200 +@@ -45,7 +45,7 @@ + + /* blow away the tree if there is one */ + if (rootDevice != NULL) { +- gtk_ctree_remove_node (GTK_CTREE(treeUSB), GTK_CTREE_NODE(rootDevice->leaf)); ++ gtk_tree_store_clear (treeStore); + } + + /* clean out the text box */ +@@ -208,32 +208,37 @@ + } + + +-void SelectItem (GtkWidget *widget, GtkCTreeNode *node, gint column, gpointer userData) ++void SelectItem (GtkTreeSelection *selection, gpointer userData) + { +- int data; +- data = (int) gtk_ctree_node_get_row_data (GTK_CTREE (widget), node); +- +- PopulateListBox ((int)data); +- +- return; ++ GtkTreeIter iter; ++ GtkTreeModel *model; ++ gint deviceAddr; ++ ++ if (gtk_tree_selection_get_selected (selection, &model, &iter)) { ++ gtk_tree_model_get (model, &iter, ++ DEVICE_ADDR_COLUMN, &deviceAddr, ++ -1); ++ PopulateListBox (deviceAddr); ++ } + } + + + static void DisplayDevice (Device *parent, Device *device) + { + int i; +- gchar *text[1]; + int configNum; + int interfaceNum; + gboolean driverAttached = TRUE; ++ gint deviceAddr; ++ const gchar *color = "black"; + + if (device == NULL) + return; + + /* build this node */ +- text[0] = device->name; +- device->leaf = gtk_ctree_insert_node (GTK_CTREE(treeUSB), parent->leaf, NULL, text, 1, NULL, NULL, NULL, NULL, FALSE, FALSE); +- gtk_ctree_node_set_row_data (GTK_CTREE(treeUSB), device->leaf, (gpointer)((device->deviceNumber<<8) | (device->busNumber))); ++ deviceAddr = (device->deviceNumber << 8) | device->busNumber; ++ gtk_tree_store_append (treeStore, &device->leaf, ++ (device->level != 0) ? &parent->leaf : NULL); + + /* determine if this device has drivers attached to all interfaces */ + for (configNum = 0; configNum < MAX_CONFIGS; ++configNum) { +@@ -252,15 +257,14 @@ + } + + /* change the color of this leaf if there are no drivers attached to it */ +- if (driverAttached == FALSE) { +- GdkColor red; +- +- red.red = 56000; +- red.green = 0; +- red.blue = 0; +- red.pixel = 0; +- gtk_ctree_node_set_foreground (GTK_CTREE(treeUSB), device->leaf, &red); +- } ++ if (driverAttached == FALSE) ++ color = "red"; ++ ++ gtk_tree_store_set (treeStore, &device->leaf, ++ NAME_COLUMN, device->name, ++ DEVICE_ADDR_COLUMN, deviceAddr, ++ COLOR_COLUMN, color, ++ -1); + + /* create all of the children's leafs */ + for (i = 0; i < MAX_CHILDREN; ++i) { +@@ -283,11 +287,16 @@ + + static void FileError (void) + { +- gchar *tempString = g_malloc0(strlen (verifyMessage) + strlen (devicesFile) + 50); +- sprintf (tempString, " Can not open the file %s \n\n%s", devicesFile, verifyMessage); +- ShowMessage ("USBView Error", tempString, FALSE); +- g_free (tempString); +- return; ++ GtkWidget *dialog; ++ ++ dialog = gtk_message_dialog_new ( ++ GTK_WINDOW (windowMain), ++ GTK_DIALOG_DESTROY_WITH_PARENT, ++ GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, ++ "Can not open the file %s\n\n%s", ++ devicesFile, verifyMessage); ++ gtk_dialog_run (GTK_DIALOG (dialog)); ++ gtk_widget_destroy (dialog); + } + + +@@ -328,10 +337,6 @@ + int finished; + int i; + +- if (MessageShown() == TRUE) { +- return; +- } +- + /* if refresh is selected, then always do a refresh, otherwise look at the file first */ + if (!refresh) { + if (!FileHasChanged()) { +@@ -368,11 +373,5 @@ + usb_name_devices (); + +- /* set up our tree */ +- gtk_ctree_set_line_style (GTK_CTREE(treeUSB), GTK_CTREE_LINES_DOTTED); +- gtk_ctree_set_expander_style (GTK_CTREE(treeUSB), GTK_CTREE_EXPANDER_SQUARE); +- gtk_ctree_set_indent (GTK_CTREE(treeUSB),10); +- gtk_clist_column_titles_passive (GTK_CLIST(treeUSB)); +- + /* build our tree */ + for (i = 0; i < rootDevice->maxChildren; ++i) { + DisplayDevice (rootDevice, rootDevice->child[i]); +@@ -380,11 +386,14 @@ + + gtk_widget_show (treeUSB); + +- gtk_ctree_expand_recursive (GTK_CTREE(treeUSB), NULL); ++ gtk_tree_view_expand_all (GTK_TREE_VIEW (treeUSB)); + + /* hook up our callback function to this tree if we haven't yet */ + if (!signal_connected) { +- gtk_signal_connect (GTK_OBJECT (treeUSB), "tree-select-row", GTK_SIGNAL_FUNC (SelectItem), NULL); ++ GtkTreeSelection *select; ++ select = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeUSB)); ++ g_signal_connect (G_OBJECT (select), "changed", ++ G_CALLBACK (SelectItem), NULL); + signal_connected = TRUE; + } + +--- a/usbtree.h 2008-06-25 23:03:52.000000000 +0200 ++++ b/usbtree.h 2012-06-14 21:06:05.000523489 +0200 +@@ -21,16 +21,24 @@ + #ifndef __USB_TREE_H + #define __USB_TREE_H + ++enum { ++ NAME_COLUMN, ++ DEVICE_ADDR_COLUMN, ++ COLOR_COLUMN, ++ N_COLUMNS ++}; ++ + extern gchar devicesFile[1000]; ++extern GtkTreeStore *treeStore; + extern GtkWidget *treeUSB; + extern GtkWidget *textDescriptionView; + extern GtkTextBuffer *textDescriptionBuffer; ++extern GtkWidget *windowMain; + + extern void LoadUSBTree (int refresh); + extern void initialize_stuff (void); + extern GtkWidget * create_windowMain (void); + extern void configure_dialog (void); +-extern void about_dialog (void); + + extern void on_buttonClose_clicked (GtkButton *button, gpointer user_data); + extern gboolean on_window1_delete_event (GtkWidget *widget, GdkEvent *event, gpointer user_data); +@@ -39,8 +47,4 @@ + extern void on_buttonAbout_clicked (GtkButton *button, gpointer user_data); + extern gint on_timer_timeout (gpointer user_data); + +-extern void ShowMessage (gchar *title, gchar *message, gboolean centered); +-extern gboolean MessageShown (void); +- +- + #endif /* __USB_TREE_H */ diff --git a/extra/usbview/usbview-1.1-missing-usbfs.patch b/extra/usbview/usbview-1.1-missing-usbfs.patch new file mode 100644 index 000000000..7da2f0ca0 --- /dev/null +++ b/extra/usbview/usbview-1.1-missing-usbfs.patch @@ -0,0 +1,11 @@ +--- a/usbtree.c 2012-10-21 08:21:35.000000000 +0200 ++++ b/usbtree.c 2012-10-21 08:21:12.000000000 +0200 +@@ -397,7 +397,7 @@ + + void initialize_stuff (void) + { +- strcpy (devicesFile, "/proc/bus/usb/devices"); ++ strcpy (devicesFile, "/sys/kernel/debug/usb/devices"); + memset (&previousDevicesFile[0], 0x00, sizeof(previousDevicesFile)); + previousChange = 0; + diff --git a/extra/usbview/usbview.install b/extra/usbview/usbview.install new file mode 100644 index 000000000..e111ef946 --- /dev/null +++ b/extra/usbview/usbview.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 42a2f20f1..25e015e13 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166660 2012-09-15 04:03:40Z tdziedzic $ +# $Id: PKGBUILD 169487 2012-10-22 02:10:39Z tdziedzic $ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: tobias [ tobias at archlinux org ] # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,8 +6,8 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.3 -_patchlevel=661 -__hgrev=5884d056e1d1 +_patchlevel=709 +__hgrev=06e088d016ad _versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} pkgrel=1 @@ -21,12 +21,12 @@ source=("ftp://ftp.archlinux.org/other/vim/vim-${pkgver}.tar.xz" 'vimrc' 'archlinux.vim' 'gvim.desktop') -sha1sums=('989e907fe9858647e762bddc927f656a03fb5226' - '195c7fc5163fca966ea331d8160bf2d307c1533c' - '4d9dcfb32874aa5467e6f06e418aeb4e675daaf2' - '3494baf53a63581ba69f86a81293640ff681c5c5' - '25dd3c2ce436e73a367c8f73b68f7f6889682437' - '4a579cf66590d711f49c5dfb4a25e5df116ff7ba') +md5sums=('7a42c72b07e8bfe6795197a303b21d53' + '5c5723f3c39aaa716bd868d7edf9f563' + '6e7adfbd5d26c1d161030ec203a7f243' + 'e57777374891063b9ca48a1fe392ac05' + '10353a61aadc3f276692d0e17db1478e' + 'd90413bd21f400313a785bb4010120cd') # source PKGBUILD && mksource mksource() { diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index d71166bac..6f64a9ca8 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 169077 2012-10-17 18:09:33Z giovanni $ +# $Id: PKGBUILD 169442 2012-10-21 09:07:49Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc pkgver=2.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -19,7 +19,7 @@ makedepends=('live-media' 'libnotify' 'libbluray' 'flac' 'kdelibs' 'fluidsynth' 'libdc1394' 'libavc1394' 'libcaca' 'librsvg' 'portaudio' 'libgme' 'xosd' 'twolame' 'aalib' 'libmtp' 'libdvdcss' - 'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager') + 'gnome-vfs' 'libgoom2' 'libtar' 'vcdimager' 'opus') [ "$CARCH" = "mips64el" ] || makedepends+=('lirc-utils' 'oss' 'projectm') optdepends=('avahi: for service discovery using bonjour protocol' 'libnotify: for notification plugin' @@ -49,7 +49,8 @@ optdepends+=('libcaca: for colored ASCII art video output' 'smbclient: for SMB access plugin' 'libcdio: for audio CD playback support' 'ttf-freefont: for subtitle font ' - 'ttf-dejavu: for subtitle font') + 'ttf-dejavu: for subtitle font' + 'opus: for opus support') conflicts=('vlc-plugin') replaces=('vlc-plugin') backup=('usr/share/vlc/lua/http/.hosts' @@ -80,7 +81,8 @@ build() { --enable-aa \ --enable-vcdx \ --enable-upnp \ - $extraconf + --enable-opus \ + $extraconf make } diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index c3e7b9ae5..239d5a1b0 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168576 2012-10-13 11:45:01Z andyrtr $ +# $Id: PKGBUILD 169469 2012-10-21 18:59:02Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.20.9 -pkgrel=2 +pkgver=2.20.12 +pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" license=('custom') @@ -19,7 +19,7 @@ conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERS options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('b9830c9fdaf2f64648cd45807883821f14dd91f9ff1cfa59af11035f62dc9389') +sha256sums=('39e02b7f90a2665efe5483075f93b1c87d24f48070d5de783dd41e20d9eb0c7c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-modesetting/PKGBUILD b/extra/xf86-video-modesetting/PKGBUILD new file mode 100644 index 000000000..8259ce7b1 --- /dev/null +++ b/extra/xf86-video-modesetting/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 169401 2012-10-20 11:16:26Z andyrtr $ +# Maintainer: Andreas Radke <andyrtr@archlinux.org> +# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> + +pkgname=xf86-video-modesetting +pkgver=0.5.0 +pkgrel=1 +pkgdesc="X.org generic modesetting video driver" +arch=('i686' 'x86_64') +url="http://xorg.freedesktop.org/" +license=('custom') +depends=('libdrm>=2.4.37' 'systemd') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') +groups=('xorg-drivers' 'xorg') +groups=('xorg-drivers' 'xorg') +options=('!libtool') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha256sums=('248d384ba9b520643fc0b2b2930d6593dfb8185e88e1562381c8f9b1cd5582f2') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/extra/xf86-video-nv/PKGBUILD b/extra/xf86-video-nv/PKGBUILD index 54c15d0e0..692363280 100644 --- a/extra/xf86-video-nv/PKGBUILD +++ b/extra/xf86-video-nv/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 163675 2012-07-17 16:58:02Z andyrtr $ +# $Id: PKGBUILD 169436 2012-10-21 08:18:01Z andyrtr $ +# Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer:Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-nv pkgver=2.1.20 -pkgrel=1 +pkgrel=2 pkgdesc="X.org nv video driver" arch=('i686' 'x86_64') license=('custom') url="http://xorg.freedesktop.org/" depends=('glibc') -makedepends=('xorg-server-devel>=1.11.99.903') -conflicts=('xorg-server<1.11.99.903') +makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'resourceproto' 'scrnsaverproto') +conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-trident/PKGBUILD b/extra/xf86-video-trident/PKGBUILD index a709ee1a2..5dee69638 100644 --- a/extra/xf86-video-trident/PKGBUILD +++ b/extra/xf86-video-trident/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 168591 2012-10-13 11:46:02Z andyrtr $ +# $Id: PKGBUILD 169416 2012-10-20 17:43:29Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-trident pkgver=1.3.6 -pkgrel=2 +pkgrel=3 pkgdesc="X.org Trident video driver" arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -13,11 +13,13 @@ makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=13' 'xf86dgaproto' 'res conflicts=('xorg-server<1.13.0' 'X-ABI-VIDEODRV_VERSION<13' 'X-ABI-VIDEODRV_VERSION>=14') groups=('xorg-drivers' 'xorg') options=(!libtool) -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 git_fixes.diff) +sha256sums=('6a58e3f3034abd8803af8a5c7dd5a6a4a28ed4fdac742ffb05518caaddc28104' + 'e51d7a9c5a3d7d2df7f56e482f5fbeac1babc2b30cdf4655052b11c9d4ec2c1c') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/git_fixes.diff ./configure --prefix=/usr make } diff --git a/extra/xf86-video-trident/git_fixes.diff b/extra/xf86-video-trident/git_fixes.diff new file mode 100644 index 000000000..fa54143b2 --- /dev/null +++ b/extra/xf86-video-trident/git_fixes.diff @@ -0,0 +1,63 @@ +From 30787294c837aefa8820b6f76f00fe30d4e54181 Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 25 Sep 2012 12:55:01 +0000 +Subject: Remove mibstore.h + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/trident_driver.c b/src/trident_driver.c +index dc12b76..408c870 100644 +--- a/src/trident_driver.c ++++ b/src/trident_driver.c +@@ -56,7 +56,6 @@ + + #include "mipointer.h" + +-#include "mibstore.h" + #include "shadow.h" + #include "trident.h" + #include "trident_regs.h" +@@ -3037,7 +3036,6 @@ TRIDENTScreenInit(SCREEN_INIT_ARGS_DECL) + TridentAccelInit(pScreen); + } + +- miInitializeBackingStore(pScreen); + xf86SetBackingStore(pScreen); + + /* Initialise cursor functions */ +-- +cgit v0.9.0.2-2-gbebe +From 48c15909691e28ad2c188a2978b1c8ef3d9d8760 Mon Sep 17 00:00:00 2001 +From: Timo Aaltonen <tjaalton@ubuntu.com> +Date: Wed, 26 Sep 2012 08:01:26 +0000 +Subject: Fix loading the driver without XAA + +--- +diff --git a/src/trident_dga.c b/src/trident_dga.c +index 0263aa7..c4b5b9a 100644 +--- a/src/trident_dga.c ++++ b/src/trident_dga.c +@@ -37,10 +37,10 @@ + static Bool TRIDENT_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, + int *, int *, int *); + static Bool TRIDENT_SetMode(ScrnInfoPtr, DGAModePtr); +-static void TRIDENT_Sync(ScrnInfoPtr); + static int TRIDENT_GetViewport(ScrnInfoPtr); + static void TRIDENT_SetViewport(ScrnInfoPtr, int, int, int); + #ifdef HAVE_XAA_H ++static void TRIDENT_Sync(ScrnInfoPtr); + static void TRIDENT_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long); + static void TRIDENT_BlitRect(ScrnInfoPtr, int, int, int, int, int, int); + #if 0 +@@ -56,8 +56,8 @@ DGAFunctionRec TRIDENTDGAFuncs = { + TRIDENT_SetMode, + TRIDENT_SetViewport, + TRIDENT_GetViewport, +- TRIDENT_Sync, + #ifdef HAVE_XAA_H ++ TRIDENT_Sync, + TRIDENT_FillRect, + TRIDENT_BlitRect, + #if 0 +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/xfce4-settings/PKGBUILD b/extra/xfce4-settings/PKGBUILD index 2009f3d83..4fce8caab 100644 --- a/extra/xfce4-settings/PKGBUILD +++ b/extra/xfce4-settings/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 158103 2012-05-02 23:12:45Z foutrelis $ +# $Id: PKGBUILD 169428 2012-10-21 04:01:39Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: tobias <tobias funnychar archlinux.org> # Contributor: Corrado Primier <bardo@aur.archlinux.org> pkgname=xfce4-settings pkgver=4.10.0 -pkgrel=2 +pkgrel=3 pkgdesc="Settings manager for xfce" arch=('i686' 'x86_64' 'mips64el') url="http://www.xfce.org/" @@ -16,8 +16,12 @@ depends=('exo' 'garcon' 'libxfce4ui' 'libnotify' 'libxklavier' makedepends=('intltool') optdepends=('libcanberra: for sound control') source=(http://archive.xfce.org/src/xfce/$pkgname/4.10/$pkgname-$pkgver.tar.bz2 + xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch + xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch xfce4-settings-xml-4.10.0.patch) sha256sums=('0843f09ba9673f1d1b5df8dce4a17b63c183a9ba3be75fb6ef99a67fc8c1f77e' + '28482a3410d587fe051b84080ab5366b4fbe2af8684ee46384ff899b73d3f349' + '5be974f8fba6ba9dc14e136762cf752fe46eac99f71511d77d910610b5401244' '78e68ef2cbf19760707ba24f3d57dd59fbf40a540d50d20e7cc62ba02196aaaa') build() { @@ -27,6 +31,12 @@ build() { # (taken from Fedora) patch -Np1 -i "$srcdir/xfce4-settings-xml-4.10.0.patch" + # https://bugzilla.xfce.org/show_bug.cgi?id=9272 + patch -Np1 -i "$srcdir/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch" + + # https://bugzilla.xfce.org/show_bug.cgi?id=9273 + patch -Np1 -i "$srcdir/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch" + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/xfce4-settings/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch b/extra/xfce4-settings/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch new file mode 100644 index 000000000..1d271476e --- /dev/null +++ b/extra/xfce4-settings/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch @@ -0,0 +1,55 @@ +From 2ec636049b95d0c51286253813b5b1a074472afc Mon Sep 17 00:00:00 2001 +From: Lionel Le Folgoc <lionel@lefolgoc.net> +Date: Sun, 09 Sep 2012 09:50:19 +0000 +Subject: Xfsettingsd: Check service name of NameOwnerChanged (bug #9273). + +In some conditions, the dbus spawn of xfconf leads to the +shutdown of xfsettingsd because it "thinks" another instance +is taking over... After some debugging I found that it +receives a NameOwnerChanged signal describing the launch +of Xfconf (name=org.xfce.Xfconf, old=, new=:1.11 for example). + +(cherry picked from commit c17fe35e6f2ff673bab102e736a327fa7bcc1d73) +--- +diff --git a/xfsettingsd/main.c b/xfsettingsd/main.c +index 0f3a68d..55c4183 100644 +--- a/xfsettingsd/main.c ++++ b/xfsettingsd/main.c +@@ -93,15 +93,29 @@ signal_handler (gint signum, + + + static DBusHandlerResult +-dbus_connection_filter_func (DBusConnection *connection, +- DBusMessage *message, +- void *user_data) ++dbus_connection_filter_func (DBusConnection *connection, ++ DBusMessage *message, ++ void *user_data) + { ++ gchar *name, *old, *new; ++ + if (dbus_message_is_signal (message, DBUS_INTERFACE_DBUS, "NameOwnerChanged")) + { +- g_printerr (G_LOG_DOMAIN ": %s\n", "Another instance took over. Leaving..."); +- gtk_main_quit (); +- return DBUS_HANDLER_RESULT_HANDLED; ++ /* double check if it is really org.xfce.SettingsDaemon ++ * being replaced, see bug 9273 */ ++ if (dbus_message_get_args (message, NULL, ++ DBUS_TYPE_STRING, &name, ++ DBUS_TYPE_STRING, &old, ++ DBUS_TYPE_STRING, &new, ++ DBUS_TYPE_INVALID)) ++ { ++ if (g_strcmp0 (name, XFSETTINGS_DBUS_NAME) == 0) ++ { ++ g_printerr (G_LOG_DOMAIN ": %s\n", "Another instance took over. Leaving..."); ++ gtk_main_quit (); ++ return DBUS_HANDLER_RESULT_HANDLED; ++ } ++ } + } + + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; +-- +cgit v0.9.0.3 diff --git a/extra/xfce4-settings/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch b/extra/xfce4-settings/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch new file mode 100644 index 000000000..ebd270bd9 --- /dev/null +++ b/extra/xfce4-settings/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch @@ -0,0 +1,22 @@ +From 8032dd77047329a93edd4c4a8b686ffc36d2f7a7 Mon Sep 17 00:00:00 2001 +From: Lionel Le Folgoc <lionel@lefolgoc.net> +Date: Sun, 09 Sep 2012 09:41:18 +0000 +Subject: Appearance: Fix gtk3 theme detection in install script (bug #9272). + +(cherry picked from commit e3c6db6f57e72cdbdf0e293bba7d6ca650d7521b) +--- +diff --git a/dialogs/appearance-settings/appearance-install-theme b/dialogs/appearance-settings/appearance-install-theme +index 13f61ae..6dc1e17 100755 +--- a/dialogs/appearance-settings/appearance-install-theme ++++ b/dialogs/appearance-settings/appearance-install-theme +@@ -140,7 +140,7 @@ if test "$retval" -eq 0; then + detectthemes "gtk-2.0/gtkrc" + + # install gtk-3.0 themes +- detectthemes "gtk-3.0/gtkrc" ++ detectthemes "gtk-3.0/gtk.css" + + # install xfwm4 themes + detectthemes "xfwm4/themerc" +-- +cgit v0.9.0.3 diff --git a/extra/xorg-server/0001-dix-fix-zaphod-screen-scrossing-54654.patch b/extra/xorg-server/0001-dix-fix-zaphod-screen-scrossing-54654.patch new file mode 100644 index 000000000..e3e42d410 --- /dev/null +++ b/extra/xorg-server/0001-dix-fix-zaphod-screen-scrossing-54654.patch @@ -0,0 +1,42 @@ +From 29d84d5a7ca4cc12cce47de9313adeb8554fb894 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Thu, 18 Oct 2012 15:11:31 +1000 +Subject: [PATCH] dix: fix zaphod screen scrossing (#54654) + +POINTER_SCREEN coordinates are screen-relative. For a Zaphod setup, the +coordinates after a screen crossing are already relative to the new screen's +origin. Add that offset to the coordinates before re-setting. + +regression introduced by +commit bafbd99080be49a17be97d2cc758fbe623369945 +Author: Peter Hutterer <peter.hutterer@who-t.net> +Date: Wed Aug 8 11:34:32 2012 +1000 + + dix: work around scaling issues during WarpPointer (#53037) + +X.Org Bug 54654 <http://bugs.freedesktop.org/show_bug.cgi?id=54654> + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +--- + dix/getevents.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/dix/getevents.c b/dix/getevents.c +index 71d83c4..8b4379d 100644 +--- a/dix/getevents.c ++++ b/dix/getevents.c +@@ -1400,8 +1400,9 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type, + coordinates were. + */ + if (flags & POINTER_SCREEN) { +- screenx = sx; +- screeny = sy; ++ scr = miPointerGetScreen(pDev); ++ screenx = sx + scr->x; ++ screeny = sy + scr->y; + } + + scr = positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative, +-- +1.7.11.7 + diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 82b6c8e89..9fa7af6e5 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 168552 2012-10-13 11:43:10Z andyrtr $ +# $Id: PKGBUILD 169364 2012-10-20 06:35:05Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=xorg-server pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') pkgver=1.13.0 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org" @@ -20,14 +20,16 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 xvfb-run xvfb-run.1 10-quirks.conf - loongson.patch) + loongson.patch + 0001-dix-fix-zaphod-screen-scrossing-54654.patch) sha256sums=('548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a' '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166' - '966b8c509006e3b7e6ac951c93a760ecbb2cb2ad7a5807fb919f0c4ee5e079a5') + '966b8c509006e3b7e6ac951c93a760ecbb2cb2ad7a5807fb919f0c4ee5e079a5' + '23861814b4283ca3fe43aae6e88ee82bcbae5713bf88eabeaef7beb94efe9707') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -41,6 +43,9 @@ build() { # Based on http://lists.freedesktop.org/archives/xorg-devel/2011-October/026249.html patch -Np1 -i "${srcdir}/loongson.patch" + # https://bugs.archlinux.org/task/31959 / https://bugs.freedesktop.org/show_bug.cgi?id=54654 + patch -Np1 -i ${srcdir}/0001-dix-fix-zaphod-screen-scrossing-54654.patch + autoreconf -fi if [ "$CARCH" = "mips64el" ]; then ./configure --prefix=/usr \ diff --git a/extra/zeitgeist/PKGBUILD b/extra/zeitgeist/PKGBUILD index 582730865..a852b9ff0 100644 --- a/extra/zeitgeist/PKGBUILD +++ b/extra/zeitgeist/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 162048 2012-06-19 07:36:41Z andrea $ +# $Id: PKGBUILD 169475 2012-10-21 21:14:01Z eric $ # Maintainer: # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: György Balló <ballogy@freestart.hu> pkgname=zeitgeist -pkgver=0.9.0.1 +pkgver=0.9.5 pkgrel=1 pkgdesc="A service which logs the users's activities and events and makes relevant information available to other applications" arch=('i686' 'x86_64' 'mips64el') url="http://zeitgeist-project.com/" license=('GPL') -depends=('python2-dbus' 'python2-gobject2' 'pyxdg' 'xapian-core') +depends=('python2-dbus' 'python2-gobject2' 'python2-xdg' 'xapian-core') makedepends=('intltool' 'raptor' 'python2-rdflib') checkdepends=('vala') -source=("https://launchpad.net/$pkgname/${pkgver%.*.*}/$pkgver/+download/$pkgname-$pkgver.tar.bz2"{,.asc}) -md5sums=('08f2eb384824e8458f18e10db7654965' - '64486b3e6bec080c447c94f3ac2ff8e8') +source=("https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.bz2") +md5sums=('5841e4624b07ba74866fb177f1c9aae7') build() { cd "$srcdir/$pkgname-$pkgver" @@ -25,10 +24,10 @@ build() { make } -#check() { -# cd "$srcdir/$pkgname-$pkgver" -# make check -#} +check() { + cd "$srcdir/$pkgname-$pkgver" + make -j1 check +} package() { cd "$srcdir/$pkgname-$pkgver" |