summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
Diffstat (limited to 'extra')
-rw-r--r--extra/amule/PKGBUILD6
-rw-r--r--extra/bitlbee/PKGBUILD12
-rw-r--r--extra/calligra/PKGBUILD81
-rw-r--r--extra/inkscape/PKGBUILD4
-rw-r--r--extra/libreoffice/PKGBUILD9
-rw-r--r--extra/net-snmp/PKGBUILD12
-rw-r--r--extra/poppler/PKGBUILD10
-rw-r--r--extra/pygobject2/PKGBUILD40
-rw-r--r--extra/python-lxml/PKGBUILD17
-rw-r--r--extra/xf86-video-intel/PKGBUILD8
-rw-r--r--extra/xf86-video-modesetting/PKGBUILD32
-rw-r--r--extra/xf86-video-trident/PKGBUILD10
-rw-r--r--extra/xf86-video-trident/git_fixes.diff63
-rw-r--r--extra/xfce4-settings/PKGBUILD14
-rw-r--r--extra/xfce4-settings/xfce4-settings-4.10.0-check-service-name-of-nameownerchanged.patch55
-rw-r--r--extra/xfce4-settings/xfce4-settings-4.10.0-fix-gtk3-theme-detection.patch22
-rw-r--r--extra/xorg-server/0001-dix-fix-zaphod-screen-scrossing-54654.patch42
-rw-r--r--extra/xorg-server/PKGBUILD13
18 files changed, 323 insertions, 127 deletions
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index 993423a43..c43d64e11 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')
@@ -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 56a5b1627..264d15a97 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/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD
index 17578c147..6811af51b 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/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/net-snmp/PKGBUILD b/extra/net-snmp/PKGBUILD
index 325c61b06..09af24cb2 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')
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 d8e07c8d9..ecb84a61c 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)
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/pygobject2/PKGBUILD b/extra/pygobject2/PKGBUILD
index c0c558183..b8521ed97 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')
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 f0875d3ee..b7dfec5af 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')
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/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index c3e7b9ae5..c643205da 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 169365 2012-10-20 06:35:06Z 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.10
+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=('df41a28c3d877f3c5e87cd7d840f51fd38dde8bc91f5f0d09510fb8e2336cdcd')
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-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 5953c1240..5724cabe6 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')
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 36da56815..08ccbaf56 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')
license=('custom')
url="http://xorg.freedesktop.org"
@@ -18,13 +18,15 @@ source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2
autoconfig-sis.patch
xvfb-run
xvfb-run.1
- 10-quirks.conf)
+ 10-quirks.conf
+ 0001-dix-fix-zaphod-screen-scrossing-54654.patch)
sha256sums=('548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a'
'66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162'
'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84'
'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9'
'2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776'
- '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166')
+ '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166'
+ '23861814b4283ca3fe43aae6e88ee82bcbae5713bf88eabeaef7beb94efe9707')
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -35,6 +37,9 @@ build() {
# Use unofficial imedia SiS driver for supported SiS devices
patch -Np0 -i "${srcdir}/autoconfig-sis.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
./configure --prefix=/usr \
--enable-ipv6 \
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-09-02 14:29:56 +0000