diff options
Diffstat (limited to 'extra')
287 files changed, 8087 insertions, 12576 deletions
diff --git a/extra/acpid/PKGBUILD b/extra/acpid/PKGBUILD index e2da6357b..828c589c0 100644 --- a/extra/acpid/PKGBUILD +++ b/extra/acpid/PKGBUILD @@ -1,24 +1,29 @@ -# $Id: PKGBUILD 125928 2011-05-31 21:48:19Z andrea $ +# $Id: PKGBUILD 140134 2011-10-07 19:20:48Z eric $ # Maintainer: # Contributor: xduugu # Contributor: Manolis Tzanidakis # Contributor: Jonathan Schmidt <j.schmidt@archlinux.us pkgname=acpid -pkgver=2.0.10 -pkgrel=2 +pkgver=2.0.12 +pkgrel=1 pkgdesc="A daemon for delivering ACPI power management events with netlink support" arch=('i686' 'x86_64' 'mips64el') url="http://tedfelix.com/linux/acpid-netlink.html" license=('GPL') depends=('bash') +replaces=('acpid2') +backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid') source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.gz" 'acpid' 'anything' 'handler.sh' 'acpid.conf.d') -replaces=('acpid2') -backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid') +md5sums=('c5104722f72451f64f893b5541bd9ab4' + '955490c4db5233ec44461db694b873a4' + '2d37b98d6e74bab815604b8b48c6cfd4' + '24bd717aeb6b628a144b6956ff661ab0' + '929c6d2e91295c22ed9ec6212d7eabef') build() { cd "${srcdir}"/$pkgname-$pkgver @@ -36,8 +41,3 @@ package() { chmod 755 "${pkgdir}"/usr/sbin/acpid } -md5sums=('d5dd88bcfaa4a0bf51905e95115da6df' - '955490c4db5233ec44461db694b873a4' - '2d37b98d6e74bab815604b8b48c6cfd4' - '24bd717aeb6b628a144b6956ff661ab0' - '929c6d2e91295c22ed9ec6212d7eabef') diff --git a/extra/akonadi/fix-slow-kde-logout.patch b/extra/akonadi/fix-slow-kde-logout.patch deleted file mode 100644 index 49228ef8b..000000000 --- a/extra/akonadi/fix-slow-kde-logout.patch +++ /dev/null @@ -1,64 +0,0 @@ -commit c8e45b10c32679bf070af5b7ad9a22b91eb9a02c -Author: Sergio Martins <iamsergio@gmail.com> -Date: Mon Sep 12 13:48:33 2011 +0100 - - Fix crash on agent_launcher exit. - - Don't unload plugins here. They will be unloaded on application exit, - so it's redundant. - - Seems they are being unloaded too early, before QThreadStorage - cleanup occurs: - - ==18802== Invalid read of size 8 - ==18802== at 0x53178AE: QThreadStorage<QFontCache*>::deleteData(void*) (in - /data/installation/qt/qt-4.7/lib/libQtGui.so.4.7.1) - ==18802== by 0x5E8F8CF: QThreadStorageData::set(void*) - (qthreadstorage.cpp:165) - ==18802== by 0x5317940: void - qThreadStorage_setLocalData<QFontCache>(QThreadStorageData&, QFontCache**) - (qthreadstorage.h:92) - ==18802== by 0x53165BA: - QThreadStorage<QFontCache*>::setLocalData(QFontCache*) (qthreadstorage.h:148) - ==18802== by 0x531407A: QFontCache::cleanup() (qfont.cpp:2632) - ==18802== by 0x5406536: QFont::cleanup() (qfont_x11.cpp:182) - ==18802== by 0x5104E35: qt_cleanup() (qapplication_x11.cpp:2647) - ==18802== by 0x50603B2: QApplication::~QApplication() - (qapplication.cpp:1172) - ==18802== by 0x41B1F6: main (agentlauncher.cpp:28) - ==18802== Address 0x11a090b0 is not stack'd, malloc'd or (recently) free'd - - CCBUG: 261788 - -diff --git a/agentserver/agentpluginloader.cpp b/agentserver/agentpluginloader.cpp -index 2d62d3b..456a124 100644 ---- a/agentserver/agentpluginloader.cpp -+++ b/agentserver/agentpluginloader.cpp -@@ -25,13 +25,8 @@ using namespace Akonadi; - - AgentPluginLoader::~AgentPluginLoader() - { -- QHash<QString, QPluginLoader*>::iterator it = m_pluginLoaders.begin(); -- while ( it != m_pluginLoaders.end() ) { -- it.value()->unload(); -- ++it; -- } -- - qDeleteAll( m_pluginLoaders ); -+ m_pluginLoaders.clear(); - } - - QPluginLoader *AgentPluginLoader::load( const QString &pluginName ) -diff --git a/agentserver/agentpluginloader.h b/agentserver/agentpluginloader.h -index 77f5de9..c8c815f 100644 ---- a/agentserver/agentpluginloader.h -+++ b/agentserver/agentpluginloader.h -@@ -26,7 +26,7 @@ class AgentPluginLoader - { - public: - /** -- Unloads and deletes all instantiated QPluginLoaders. -+ Deletes all instantiated QPluginLoaders. - */ - ~AgentPluginLoader(); - diff --git a/extra/allegro/PKGBUILD b/extra/allegro/PKGBUILD index a37609c5e..fa829a121 100644 --- a/extra/allegro/PKGBUILD +++ b/extra/allegro/PKGBUILD @@ -1,21 +1,19 @@ -# $Id: PKGBUILD 125663 2011-05-27 21:50:52Z ibiru $ +# $Id: PKGBUILD 140688 2011-10-18 03:46:08Z eric $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: arjan <arjan@archlinux.org> pkgname=allegro -pkgver=4.4.2 +pkgver=5.0.4 pkgrel=1 pkgdesc="Portable library mainly aimed at video game and multimedia programming" arch=('i686' 'x86_64' 'mips64el') url="http://alleg.sourceforge.net/" license=('custom') -depends=('jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'libpng') -makedepends=('cmake') -source=(http://downloads.sourceforge.net/alleg/${pkgname}-${pkgver}.tar.gz - LICENSE) -md5sums=('4db71b0460fc99926ae91d223199c2e6' - 'cd97e2992e8e66b9e6a449d832dc9c7a') +depends=('jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor' 'libpng' 'libgl' 'libjpeg') +makedepends=('cmake' 'mesa') +source=(http://downloads.sourceforge.net/alleg/${pkgname}-${pkgver}.tar.gz) +md5sums=('e2e314ee7116c7efddd0497d6c885e46') build() { cd "${srcdir}" @@ -34,6 +32,5 @@ package() { make DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/" + install -D -m644 ../${pkgname}-${pkgver}/LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/allegro/LICENSE b/extra/allegro4/LICENSE index 497c56a8f..497c56a8f 100644 --- a/extra/allegro/LICENSE +++ b/extra/allegro4/LICENSE diff --git a/extra/allegro4/PKGBUILD b/extra/allegro4/PKGBUILD new file mode 100644 index 000000000..eae85013f --- /dev/null +++ b/extra/allegro4/PKGBUILD @@ -0,0 +1,38 @@ +# $Id: PKGBUILD 140690 2011-10-18 03:46:10Z eric $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# Contributor: arjan <arjan@archlinux.org> + +pkgname=allegro4 +pkgver=4.4.2 +pkgrel=1 +pkgdesc="Portable library mainly aimed at video game and multimedia programming (legacy version)" +arch=('i686' 'x86_64') +url="http://alleg.sourceforge.net/" +license=('custom') +depends=('sh' 'jack' 'libxpm' 'libxxf86vm' 'libxxf86dga' 'libxcursor') +makedepends=('cmake' 'libpng') +source=(http://downloads.sourceforge.net/alleg/allegro-${pkgver}.tar.gz + LICENSE) +md5sums=('4db71b0460fc99926ae91d223199c2e6' + 'cd97e2992e8e66b9e6a449d832dc9c7a') + +build() { + cd "${srcdir}" + mkdir build && cd build + + cmake "../allegro-${pkgver}" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWANT_DOCS=OFF + + make +} + +package() { + cd "${srcdir}"/build + + make DESTDIR="${pkgdir}" install + + install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index 8e1bc9f12..78e948415 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 138463 2011-09-24 09:30:24Z giovanni $ +# $Id: PKGBUILD 140393 2011-10-12 09:39:10Z 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=10616 +pkgver=10645 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++' 'libsm') source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2") -md5sums=('b94fa71f713e1bd3c39ad12b08ca8a2f') +md5sums=('2dfd86333cd42b6df5cb312de852a1f3') build() { cd "${srcdir}/aMule-SVN-r${pkgver}" diff --git a/extra/ardour/gcc46.patch b/extra/ardour/gcc46.patch deleted file mode 100644 index d01610d1d..000000000 --- a/extra/ardour/gcc46.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -rupN ardour-2.8.11.old/libs/ardour/enums.cc ardour-2.8.11/libs/ardour/enums.cc ---- ardour-2.8.11.old/libs/ardour/enums.cc 2010-04-20 13:28:37.000000000 -0400 -+++ ardour-2.8.11/libs/ardour/enums.cc 2011-02-13 11:23:02.000000000 -0500 -@@ -31,7 +31,8 @@ - - using namespace std; - using namespace PBD; --using namespace ARDOUR; -+namespace ARDOUR -+{ - - void - setup_enum_writer () -@@ -362,3 +363,5 @@ setup_enum_writer () - REGISTER (_Track_FreezeState); - - } -+ -+} -diff -rupN ardour-2.8.11.old/libs/rubberband/rubberband/RubberBandStretcher.h ardour-2.8.11/libs/rubberband/rubberband/RubberBandStretcher.h ---- ardour-2.8.11.old/libs/rubberband/rubberband/RubberBandStretcher.h 2009-03-26 10:25:40.000000000 -0400 -+++ ardour-2.8.11/libs/rubberband/rubberband/RubberBandStretcher.h 2011-02-09 21:41:04.000000000 -0500 -@@ -19,6 +19,7 @@ - #define RUBBERBAND_API_MAJOR_VERSION 2 - #define RUBBERBAND_API_MINOR_VERSION 0 - -+#include <cstddef> - #include <vector> - - /** -diff -rupN ardour-2.8.11.old/libs/surfaces/wiimote/wiimote.cc ardour-2.8.11/libs/surfaces/wiimote/wiimote.cc ---- ardour-2.8.11.old/libs/surfaces/wiimote/wiimote.cc 2009-02-24 07:38:19.000000000 -0500 -+++ ardour-2.8.11/libs/surfaces/wiimote/wiimote.cc 2011-02-13 11:23:24.000000000 -0500 -@@ -177,7 +177,7 @@ wiimote_discovery: - std::cerr << "Wiimote: discovering, press 1+2" << std::endl; - - while (!wiimote_handle && !main_thread_quit) { -- bdaddr = *BDADDR_ANY; -+ bdaddr = (bdaddr_t) {{0, 0, 0, 0, 0, 0}}; - callback_thread_registered_for_ardour = false; - wiimote_handle = cwiid_open(&bdaddr, 0); - diff --git a/extra/ardour/raptor2.patch b/extra/ardour/raptor2.patch deleted file mode 100644 index fe7cacff3..000000000 --- a/extra/ardour/raptor2.patch +++ /dev/null @@ -1,57 +0,0 @@ -Index: SConstruct -=================================================================== ---- SConstruct (revision 9877) -+++ SConstruct (revision 9878) -@@ -431,7 +431,6 @@ - 'gtk+-2.0' : '2.8.1', - 'libxml-2.0' : '2.6.0', - 'samplerate' : '0.1.0', -- 'raptor' : '1.4.2', - 'lrdf' : '0.4.0', - 'jack' : '0.109.0', - 'libgnomecanvas-2.0' : '2.0', -@@ -487,7 +486,10 @@ - - libraries['core'] = LibraryInfo (CCFLAGS = '-Ilibs') - --conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists } ) -+conf = env.Configure (custom_tests = { 'CheckPKGExists' : CheckPKGExists, -+ 'CheckPKGVersion' : CheckPKGVersion } -+ ) -+ - - if conf.CheckPKGExists ('fftw3f'): - libraries['fftw3f'] = LibraryInfo() -@@ -501,6 +503,22 @@ - libraries['aubio'] = LibraryInfo() - libraries['aubio'].ParseConfig('pkg-config --cflags --libs aubio') - -+raptorOK = 0 -+ -+if conf.CheckPKGExists ('raptor2'): -+ libraries['raptor'] = LibraryInfo() -+ libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor2') -+ raptorOK = 1 -+else: -+ if conf.CheckPKGExists ('raptor') and conf.CheckPKGVersion (pkg, '1.4.2'): -+ libraries['raptor'] = LibraryInfo() -+ libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor') -+ raptorOK = 1 -+ -+if raptorOK == 0: -+ print "Ardour requires either raptor or raptor2 to be available at build time" -+ Exit (1) -+ - env = conf.Finish () - - if env['FFT_ANALYSIS']: -@@ -570,9 +588,6 @@ - libraries['lrdf'] = LibraryInfo() - libraries['lrdf'].ParseConfig('pkg-config --cflags --libs lrdf') - --libraries['raptor'] = LibraryInfo() --libraries['raptor'].ParseConfig('pkg-config --cflags --libs raptor') -- - libraries['sndfile'] = LibraryInfo() - libraries['sndfile'].ParseConfig ('pkg-config --cflags --libs sndfile') - diff --git a/extra/avidemux/PKGBUILD b/extra/avidemux/PKGBUILD index 371991f76..a0ecb58ef 100644 --- a/extra/avidemux/PKGBUILD +++ b/extra/avidemux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 134343 2011-08-03 00:13:58Z eric $ +# $Id: PKGBUILD 140069 2011-10-06 07:33:44Z ibiru $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=avidemux pkgname=('avidemux-cli' 'avidemux-gtk' 'avidemux-qt') pkgver=2.5.5 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://fixounet.free.fr/avidemux/" diff --git a/extra/beagle/PKGBUILD b/extra/beagle/PKGBUILD deleted file mode 100644 index ef7fab4d9..000000000 --- a/extra/beagle/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 102373 2010-12-07 14:55:37Z jgc $ -# Maintainer: Daniel Isenmann <daniel @ archlinux.org> -# Contributor: Shadowhand <woody.gilk@gmail.com> - -pkgname=beagle -pkgver=0.3.9 -pkgrel=4 -pkgdesc="Search tool that ransacks your personal information space to find whatever you are looking for." -arch=(i686 x86_64 'mips64el') -url="http://beagle-project.org/" -license=('custom') -depends=('gnome-sharp>=2.24.1' 'gmime>=2.4.10' 'evolution-sharp>=0.20.0' 'libexif' 'librsvg>=2.26.0' 'sqlite3>=3.6.13' 'libxss' 'wv>=1.2.4' 'chmlib' 'gsf-sharp>=0.8.1' 'libsm' 'xdg-utils' 'ndesk-dbus-glib' 'mono>=2.4' 'taglib-sharp') -makedepends=('intltool' 'zip' 'pkgconfig') -options=('!libtool') -backup=('etc/beagle/crawl-rules/crawl-manpages' - 'etc/beagle/crawl-rules/crawl-windows' - 'etc/beagle/crawl-rules/crawl-applications' - 'etc/beagle/crawl-rules/crawl-documentation' - 'etc/beagle/crawl-rules/crawl-monodoc' - 'etc/beagle/crawl-rules/crawl-executables') -install=beagle.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.3/${pkgname}-${pkgver}.tar.bz2 - beagle-0.3.9-spew.patch - beagle-0.3.9-gmime24.patch - beagle-0.3.9-mono-data-sqlite-2.patch - mono-2.8.patch) -md5sums=('b73c12423d2d67133dbb05933f4c8fe1' - '003ada7acc2724e94e0218e4a6705b4a' - '73b5a5ea03dc3a7ca71ed41772e4dd82' - 'd99a93730485b7f9a5e2111a8b2bf440' - '7ef884a29c17b73a20cb09fac0536a47') - -build() { - export "MONO_SHARED_DIR=${srcdir}/.wabi" - mkdir -p "${MONO_SHARED_DIR}" - - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i -e 's/CRAWL_USER=beagleindex/CRAWL_USER=beaglidx/' tools/beagle-crawl-system.in - sed -i -e 's/libchm.so.1/libchm.so.0/' Util/ChmFile.cs - sed -i -e 's/libgnome-desktop-2.so.2/libgnome-desktop-2.so.17/' search/Beagle.Search.exe.config - sed -i -e 's/python/python2/' tools/keygrabber.py - - patch -Np1 -i "${srcdir}/beagle-0.3.9-spew.patch" - patch -Np1 -i "${srcdir}/beagle-0.3.9-mono-data-sqlite-2.patch" - patch -Np1 -i "${srcdir}/beagle-0.3.9-gmime24.patch" - patch -Np1 -i "${srcdir}/mono-2.8.patch" - - libtoolize --force - autoreconf - - sed -i -e 's/gmime-sharp/gmime-sharp-2.4/' configure - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --enable-inotify \ - --disable-static \ - --disable-docs - make - make DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/var/cache/beagle/indexes" - chown -R 86:86 "${pkgdir}/var/cache/beagle" - install -m755 -d "${pkgdir}/usr/share/licenses/beagle" - install -m644 COPYING "${pkgdir}/usr/share/licenses/beagle/" -} diff --git a/extra/beagle/beagle-0.3.9-gmime24.patch b/extra/beagle/beagle-0.3.9-gmime24.patch deleted file mode 100644 index 7d943dabf..000000000 --- a/extra/beagle/beagle-0.3.9-gmime24.patch +++ /dev/null @@ -1,703 +0,0 @@ -diff -upNr beagle-0.3.9.orign/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs beagle-0.3.9/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs ---- beagle-0.3.9.orign/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs 2008-04-25 20:17:04.000000000 +0200 -+++ beagle-0.3.9/beagled/EvolutionMailQueryable/EvolutionMailIndexableGenerator.cs 2009-01-28 12:33:17.000000000 +0100 -@@ -333,28 +333,46 @@ namespace Beagle.Daemon.EvolutionMailQue - indexable.AddProperty (Property.NewUnsearched ("fixme:folder", this.folder_name)); - - GMime.InternetAddressList addrs; -- -- addrs = message.GetRecipients (GMime.Message.RecipientType.To); -- foreach (GMime.InternetAddress ia in addrs) { -- if (this.folder_name == "Sent" && ia.AddressType != GMime.InternetAddressType.Group) -- indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", ia.Addr)); -+ -+ if (this.folder_name == "Sent") { -+ addrs = message.GetRecipients (GMime.RecipientType.To); -+ foreach (GMime.InternetAddress ia in addrs) { -+ if (ia is GMime.InternetAddressMailbox) { -+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox; -+ -+ indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address)); -+ } -+ } -+ -+ addrs.Dispose (); - } -- addrs.Dispose (); -- -- addrs = message.GetRecipients (GMime.Message.RecipientType.Cc); -- foreach (GMime.InternetAddress ia in addrs) { -- if (this.folder_name == "Sent" && ia.AddressType != GMime.InternetAddressType.Group) -- indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", ia.Addr)); -+ -+ if (this.folder_name == "Sent") { -+ addrs = message.GetRecipients (GMime.RecipientType.Cc); -+ foreach (GMime.InternetAddress ia in addrs) { -+ if (ia is GMime.InternetAddressMailbox) { -+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox; -+ -+ indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address)); -+ } -+ } -+ -+ addrs.Dispose (); - } -- addrs.Dispose (); -- -- addrs = GMime.InternetAddressList.ParseString (GMime.Utils.HeaderDecodePhrase (message.Sender)); -- foreach (GMime.InternetAddress ia in addrs) { -- if (this.folder_name != "Sent" && ia.AddressType != GMime.InternetAddressType.Group) -- indexable.AddProperty (Property.NewUnsearched ("fixme:gotFrom", ia.Addr)); -+ -+ if (this.folder_name != "Sent") { -+ addrs = GMime.InternetAddressList.Parse (message.Sender); -+ foreach (GMime.InternetAddress ia in addrs) { -+ if (ia is GMime.InternetAddressMailbox) { -+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox; -+ -+ indexable.AddProperty (Property.NewUnsearched ("fixme:gotFrom", mailbox.Address)); -+ } -+ } -+ -+ addrs.Dispose (); - } -- addrs.Dispose (); -- -+ - if (this.folder_name == "Sent") - indexable.AddProperty (Property.NewFlag ("fixme:isSent")); - -@@ -750,48 +768,54 @@ namespace Beagle.Daemon.EvolutionMailQue - } - - GMime.InternetAddressList addrs; -- addrs = GMime.InternetAddressList.ParseString (messageInfo.to); -+ addrs = GMime.InternetAddressList.Parse (messageInfo.to); - foreach (GMime.InternetAddress ia in addrs) { -+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox; -+ - if (!have_content) { - indexable.AddProperty (Property.NewUnsearched ("fixme:to", ia.ToString (false))); -- if (ia.AddressType != GMime.InternetAddressType.Group) -- indexable.AddProperty (Property.New ("fixme:to_address", ia.Addr)); -- -+ if (ia is GMime.InternetAddressMailbox) -+ indexable.AddProperty (Property.New ("fixme:to_address", mailbox.Address)); -+ - indexable.AddProperty (Property.New ("fixme:to_name", ia.Name)); - } -- -- if (this.folder_name == "Sent" && ia.AddressType != GMime.InternetAddressType.Group) -- indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", ia.Addr)); -+ -+ if (this.folder_name == "Sent" && ia is GMime.InternetAddressMailbox) -+ indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address)); - } - addrs.Dispose (); - -- addrs = GMime.InternetAddressList.ParseString (messageInfo.cc); -+ addrs = GMime.InternetAddressList.Parse (messageInfo.cc); - foreach (GMime.InternetAddress ia in addrs) { -+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox; -+ - if (!have_content) { - indexable.AddProperty (Property.NewUnsearched ("fixme:cc", ia.ToString (false))); -- if (ia.AddressType != GMime.InternetAddressType.Group) -- indexable.AddProperty (Property.New ("fixme:cc_address", ia.Addr)); -- -+ if (ia is GMime.InternetAddressMailbox) -+ indexable.AddProperty (Property.New ("fixme:cc_address", mailbox.Address)); -+ - indexable.AddProperty (Property.New ("fixme:cc_name", ia.Name)); - } -- -- if (this.folder_name == "Sent" && ia.AddressType != GMime.InternetAddressType.Group) -- indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", ia.Addr)); -+ -+ if (this.folder_name == "Sent" && ia is GMime.InternetAddressMailbox) -+ indexable.AddProperty (Property.NewUnsearched ("fixme:sentTo", mailbox.Address)); - } - addrs.Dispose (); - -- addrs = GMime.InternetAddressList.ParseString (messageInfo.from); -+ addrs = GMime.InternetAddressList.Parse (messageInfo.from); - foreach (GMime.InternetAddress ia in addrs) { -+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox; -+ - if (!have_content) { - indexable.AddProperty (Property.NewUnsearched ("fixme:from", ia.ToString (false))); -- if (ia.AddressType != GMime.InternetAddressType.Group) -- indexable.AddProperty (Property.New ("fixme:from_address", ia.Addr)); -- -+ if (ia is GMime.InternetAddressMailbox) -+ indexable.AddProperty (Property.New ("fixme:from_address", mailbox.Address)); -+ - indexable.AddProperty (Property.New ("fixme:from_name", ia.Name)); - } - -- if (this.folder_name != "Sent" && ia.AddressType != GMime.InternetAddressType.Group) -- indexable.AddProperty (Property.NewUnsearched ("fixme:gotFrom", ia.Addr)); -+ if (this.folder_name != "Sent" && ia is GMime.InternetAddressMailbox) -+ indexable.AddProperty (Property.NewUnsearched ("fixme:gotFrom", mailbox.Address)); - } - addrs.Dispose (); - -diff -upNr beagle-0.3.9.orign/beagled/GoogleBackends/GMailSearchDriver.cs beagle-0.3.9/beagled/GoogleBackends/GMailSearchDriver.cs ---- beagle-0.3.9.orign/beagled/GoogleBackends/GMailSearchDriver.cs 2008-04-25 21:26:19.000000000 +0200 -+++ beagle-0.3.9/beagled/GoogleBackends/GMailSearchDriver.cs 2009-01-28 12:33:17.000000000 +0100 -@@ -322,38 +322,47 @@ namespace Beagle.Daemon.GoogleBackend { - hit.AddProperty (Property.NewDate ("fixme:date", message.Date.ToUniversalTime ())); - - GMime.InternetAddressList addrs; -- addrs = message.GetRecipients (GMime.Message.RecipientType.To); -+ addrs = message.GetRecipients (GMime.RecipientType.To); - foreach (GMime.InternetAddress ia in addrs) { - hit.AddProperty (Property.NewUnsearched ("fixme:to", ia.ToString (false))); -- if (ia.AddressType != GMime.InternetAddressType.Group) -- hit.AddProperty (Property.New ("fixme:to_address", ia.Addr)); -- -+ if (ia is GMime.InternetAddressMailbox) { -+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox; -+ -+ hit.AddProperty (Property.New ("fixme:to_address", mailbox.Address)); -+ } -+ - hit.AddProperty (Property.New ("fixme:to_name", ia.Name)); - } - addrs.Dispose (); - -- addrs = message.GetRecipients (GMime.Message.RecipientType.Cc); -+ addrs = message.GetRecipients (GMime.RecipientType.Cc); - foreach (GMime.InternetAddress ia in addrs) { - hit.AddProperty (Property.NewUnsearched ("fixme:cc", ia.ToString (false))); -- if (ia.AddressType != GMime.InternetAddressType.Group) -- hit.AddProperty (Property.New ("fixme:cc_address", ia.Addr)); -- -+ if (ia is GMime.InternetAddressMailbox) { -+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox; -+ -+ hit.AddProperty (Property.New ("fixme:cc_address", mailbox.Address)); -+ } -+ - hit.AddProperty (Property.New ("fixme:cc_name", ia.Name)); - } - addrs.Dispose (); - -- addrs = GMime.InternetAddressList.ParseString (GMime.Utils.HeaderDecodePhrase (message.Sender)); -+ addrs = GMime.InternetAddressList.Parse (message.Sender); - foreach (GMime.InternetAddress ia in addrs) { - hit.AddProperty (Property.NewUnsearched ("fixme:from", ia.ToString (false))); -- if (ia.AddressType != GMime.InternetAddressType.Group) -- hit.AddProperty (Property.New ("fixme:from_address", ia.Addr)); -- -+ if (ia is GMime.InternetAddressMailbox) { -+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox; -+ -+ hit.AddProperty (Property.New ("fixme:from_address", mailbox.Address)); -+ } -+ - hit.AddProperty (Property.New ("fixme:from_name", ia.Name)); - } - addrs.Dispose (); - - foreach (GMime.References refs in message.References) -- hit.AddProperty (Property.NewUnsearched ("fixme:reference", refs.Msgid)); -+ hit.AddProperty (Property.NewUnsearched ("fixme:reference", refs.MessageId)); - - string list_id = message.GetHeader ("List-Id"); - if (list_id != null) -diff -upNr beagle-0.3.9.orign/beagled/KMailQueryable/KMailIndexer.cs beagle-0.3.9/beagled/KMailQueryable/KMailIndexer.cs ---- beagle-0.3.9.orign/beagled/KMailQueryable/KMailIndexer.cs 2008-02-10 21:24:19.000000000 +0100 -+++ beagle-0.3.9/beagled/KMailQueryable/KMailIndexer.cs 2009-01-28 12:33:17.000000000 +0100 -@@ -407,28 +407,46 @@ namespace Beagle.Daemon.KMailQueryable { - indexable.AddProperty (Property.NewUnsearched ("fixme:folder", folder_name)); - - GMime.InternetAddressList addrs; -- -- addrs = message.GetRecipients (GMime.Message.RecipientType.To); -- foreach (GMime.InternetAddress ia in addrs) { -- if (folder_name == Queryable.SentMailFolderName && ia.AddressType != GMime.InternetAddressType.Group) -- indexable.AddProperty (Property.NewKeyword ("fixme:sentTo", ia.Addr)); -- } -- addrs.Dispose (); -- -- addrs = message.GetRecipients (GMime.Message.RecipientType.Cc); -- foreach (GMime.InternetAddress ia in addrs) { -- if (folder_name == Queryable.SentMailFolderName && ia.AddressType != GMime.InternetAddressType.Group) -- indexable.AddProperty (Property.NewKeyword ("fixme:sentTo", ia.Addr)); -- } -- addrs.Dispose (); -- -- addrs = GMime.InternetAddressList.ParseString (GMime.Utils.HeaderDecodePhrase (message.Sender)); -- foreach (GMime.InternetAddress ia in addrs) { -- if (folder_name != Queryable.SentMailFolderName && ia.AddressType != GMime.InternetAddressType.Group) -- indexable.AddProperty (Property.NewKeyword ("fixme:gotFrom", ia.Addr)); -+ -+ if (folder_name == Queryable.SentMailFolderName) { -+ addrs = message.GetRecipients (GMime.RecipientType.To); -+ foreach (GMime.InternetAddress ia in addrs) { -+ if (ia is GMime.InternetAddressMailbox) { -+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox; -+ -+ indexable.AddProperty (Property.NewKeyword ("fixme:sentTo", mailbox.Address)); -+ } -+ } -+ -+ addrs.Dispose (); - } -- addrs.Dispose (); -- -+ -+ if (folder_name == Queryable.SentMailFolderName) { -+ addrs = message.GetRecipients (GMime.RecipientType.Cc); -+ foreach (GMime.InternetAddress ia in addrs) { -+ if (ia is GMime.InternetAddressMailbox) { -+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox; -+ -+ indexable.AddProperty (Property.NewKeyword ("fixme:sentTo", mailbox.Address)); -+ } -+ } -+ -+ addrs.Dispose (); -+ } -+ -+ if (folder_name != Queryable.SentMailFolderName) { -+ addrs = GMime.InternetAddressList.Parse (message.Sender); -+ foreach (GMime.InternetAddress ia in addrs) { -+ if (ia is GMime.InternetAddressMailbox) { -+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox; -+ -+ indexable.AddProperty (Property.NewKeyword ("fixme:gotFrom", mailbox.Address)); -+ } -+ } -+ -+ addrs.Dispose (); -+ } -+ - if (folder_name == Queryable.SentMailFolderName) - indexable.AddProperty (Property.NewFlag ("fixme:isSent")); - else { -diff -upNr beagle-0.3.9.orign/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs beagle-0.3.9/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs ---- beagle-0.3.9.orign/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs 2008-07-18 16:27:59.000000000 +0200 -+++ beagle-0.3.9/beagled/ThunderbirdQueryable/ThunderbirdQueryable.cs 2009-01-28 12:33:17.000000000 +0100 -@@ -367,9 +367,14 @@ namespace Beagle.Daemon.ThunderbirdQuery - message.Subject = Mime.HeaderDecodeText (GetText (document, "Subject")); - message.Sender = Mime.HeaderDecodePhrase (GetText (document, "Author")); - message.MessageId = GetText (document, "MessageId"); -- message.SetDate (DateTimeUtil.UnixToDateTimeUtc (Convert.ToInt64 (GetText (document, "Date"))), 0); -- message.AddRecipientsFromString ("To", Mime.HeaderDecodePhrase (GetText (document, "Recipients"))); -- -+ message.Date = DateTimeUtil.UnixToDateTimeUtc (Convert.ToInt64 (GetText (document, "Date"))); -+ -+ string str = GetText (document, "Recipients"); -+ GMime.InternetAddressList recipients = GMime.InternetAddressList.Parse (str); -+ foreach (GMime.InternetAddress ia in recipients) -+ message.To.Add (ia); -+ recipients.Dispose (); -+ - return message; - } - -@@ -434,7 +439,7 @@ namespace Beagle.Daemon.ThunderbirdQuery - - // We _know_ that the stream comes from a StreamReader, which uses UTF8 by - // default. So we use that here when parsing our string. -- return (str != null ? Encoding.UTF8.GetString (str, 0, pos) : string.Empty); -+ return (str != null ? System.Text.Encoding.UTF8.GetString (str, 0, pos) : string.Empty); - } - - // This spell "charset=" -@@ -462,7 +467,7 @@ namespace Beagle.Daemon.ThunderbirdQuery - // instead of UTF-8 in some cases and that will really mess things up. - byte[] buffer = null; - int c, header_length = 0, newlines = 0, charset_pos = 0; -- Encoding enc = Encoding.UTF8; -+ System.Text.Encoding enc = System.Text.Encoding.UTF8; - try { - do { - c = stream.BaseStream.ReadByte (); -@@ -491,7 +496,7 @@ namespace Beagle.Daemon.ThunderbirdQuery - stream.BaseStream.Read (buffer, 0, buffer.Length); - - // We need to use correct encoding -- enc = Encoding.GetEncoding (encoding_str); -+ enc = System.Text.Encoding.GetEncoding (encoding_str); - } catch { - } finally { - stream.Close (); -diff -upNr beagle-0.3.9.orign/configure beagle-0.3.9/configure ---- beagle-0.3.9.orign/configure 2008-07-19 13:20:36.000000000 +0200 -+++ beagle-0.3.9/configure 2009-01-28 12:35:43.000000000 +0100 -@@ -2791,7 +2791,7 @@ MONODOC_REQUIRED=1.2.4 - NDESK_DBUS_REQUIRED=0.5.2 - NDESK_DBUS_GLIB_REQUIRED=0.3.0 - GTK_SHARP_REQUIRED=2.10.0 --GMIME_SHARP_REQUIRED=2.2.0 -+GMIME_SHARP_REQUIRED=2.4.0 - EVOLUTION_SHARP_REQUIRED=0.13.3 - GSF_SHARP_REQUIRED=0.6 - GTK_REQUIRED=2.10.0 -@@ -25660,7 +25660,7 @@ if test -n "$PKG_CONFIG"; then - glade-sharp-2.0 >= \$GTK_SHARP_REQUIRED - gnome-sharp-2.0 >= \$GTK_SHARP_REQUIRED - gnome-vfs-sharp-2.0 >= \$GTK_SHARP_REQUIRED -- gmime-sharp >= \$GMIME_SHARP_REQUIRED -+ gmime-sharp-2.4 >= \$GMIME_SHARP_REQUIRED - \"") >&5 - ($PKG_CONFIG --exists --print-errors " - gtk-sharp-2.0 >= $GTK_SHARP_REQUIRED -@@ -25668,7 +25668,7 @@ if test -n "$PKG_CONFIG"; then - glade-sharp-2.0 >= $GTK_SHARP_REQUIRED - gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED - gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED -- gmime-sharp >= $GMIME_SHARP_REQUIRED -+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -25679,7 +25679,7 @@ if test -n "$PKG_CONFIG"; then - glade-sharp-2.0 >= $GTK_SHARP_REQUIRED - gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED - gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED -- gmime-sharp >= $GMIME_SHARP_REQUIRED -+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED - " 2>/dev/null` - else - pkg_failed=yes -@@ -25699,7 +25699,7 @@ if test -n "$PKG_CONFIG"; then - glade-sharp-2.0 >= \$GTK_SHARP_REQUIRED - gnome-sharp-2.0 >= \$GTK_SHARP_REQUIRED - gnome-vfs-sharp-2.0 >= \$GTK_SHARP_REQUIRED -- gmime-sharp >= \$GMIME_SHARP_REQUIRED -+ gmime-sharp-2.4 >= \$GMIME_SHARP_REQUIRED - \"") >&5 - ($PKG_CONFIG --exists --print-errors " - gtk-sharp-2.0 >= $GTK_SHARP_REQUIRED -@@ -25707,7 +25707,7 @@ if test -n "$PKG_CONFIG"; then - glade-sharp-2.0 >= $GTK_SHARP_REQUIRED - gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED - gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED -- gmime-sharp >= $GMIME_SHARP_REQUIRED -+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED - ") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -@@ -25718,7 +25718,7 @@ if test -n "$PKG_CONFIG"; then - glade-sharp-2.0 >= $GTK_SHARP_REQUIRED - gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED - gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED -- gmime-sharp >= $GMIME_SHARP_REQUIRED -+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED - " 2>/dev/null` - else - pkg_failed=yes -@@ -25744,7 +25744,7 @@ fi - glade-sharp-2.0 >= $GTK_SHARP_REQUIRED - gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED - gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED -- gmime-sharp >= $GMIME_SHARP_REQUIRED -+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED - "` - else - BEAGLE_UI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " -@@ -25753,7 +25753,7 @@ fi - glade-sharp-2.0 >= $GTK_SHARP_REQUIRED - gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED - gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED -- gmime-sharp >= $GMIME_SHARP_REQUIRED -+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED - "` - fi - # Put the nasty error message in config.log where it belongs -@@ -25765,7 +25765,7 @@ fi - glade-sharp-2.0 >= $GTK_SHARP_REQUIRED - gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED - gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED -- gmime-sharp >= $GMIME_SHARP_REQUIRED -+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED - ) were not met: - - $BEAGLE_UI_PKG_ERRORS -@@ -25783,7 +25783,7 @@ echo "$as_me: error: Package requirement - glade-sharp-2.0 >= $GTK_SHARP_REQUIRED - gnome-sharp-2.0 >= $GTK_SHARP_REQUIRED - gnome-vfs-sharp-2.0 >= $GTK_SHARP_REQUIRED -- gmime-sharp >= $GMIME_SHARP_REQUIRED -+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED - ) were not met: - - $BEAGLE_UI_PKG_ERRORS -@@ -26167,18 +26167,18 @@ if test -n "$PKG_CONFIG"; then - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-sharp >= \$EVOLUTION_SHARP_REQUIRED \\ - gconf-sharp-2.0 >= \$GTK_SHARP_REQUIRED \\ - glib-sharp-2.0 >= \$GTK_SHARP_REQUIRED -- gmime-sharp >= \$GMIME_SHARP_REQUIRED\"") >&5 -+ gmime-sharp-2.4 >= \$GMIME_SHARP_REQUIRED\"") >&5 - ($PKG_CONFIG --exists --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED \ - gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED \ - glib-sharp-2.0 >= $GTK_SHARP_REQUIRED -- gmime-sharp >= $GMIME_SHARP_REQUIRED") 2>&5 -+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_EVO_CFLAGS=`$PKG_CONFIG --cflags "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED \ - gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED \ - glib-sharp-2.0 >= $GTK_SHARP_REQUIRED -- gmime-sharp >= $GMIME_SHARP_REQUIRED" 2>/dev/null` -+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -26194,18 +26194,18 @@ if test -n "$PKG_CONFIG"; then - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"evolution-sharp >= \$EVOLUTION_SHARP_REQUIRED \\ - gconf-sharp-2.0 >= \$GTK_SHARP_REQUIRED \\ - glib-sharp-2.0 >= \$GTK_SHARP_REQUIRED -- gmime-sharp >= \$GMIME_SHARP_REQUIRED\"") >&5 -+ gmime-sharp-2.4 >= \$GMIME_SHARP_REQUIRED\"") >&5 - ($PKG_CONFIG --exists --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED \ - gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED \ - glib-sharp-2.0 >= $GTK_SHARP_REQUIRED -- gmime-sharp >= $GMIME_SHARP_REQUIRED") 2>&5 -+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - pkg_cv_EVO_LIBS=`$PKG_CONFIG --libs "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED \ - gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED \ - glib-sharp-2.0 >= $GTK_SHARP_REQUIRED -- gmime-sharp >= $GMIME_SHARP_REQUIRED" 2>/dev/null` -+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -26227,12 +26227,12 @@ fi - EVO_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED \ - gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED \ - glib-sharp-2.0 >= $GTK_SHARP_REQUIRED -- gmime-sharp >= $GMIME_SHARP_REQUIRED"` -+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED"` - else - EVO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "evolution-sharp >= $EVOLUTION_SHARP_REQUIRED \ - gconf-sharp-2.0 >= $GTK_SHARP_REQUIRED \ - glib-sharp-2.0 >= $GTK_SHARP_REQUIRED -- gmime-sharp >= $GMIME_SHARP_REQUIRED"` -+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED"` - fi - # Put the nasty error message in config.log where it belongs - echo "$EVO_PKG_ERRORS" >&5 -@@ -26781,12 +26781,12 @@ if test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - shared-mime-info -- gmime-sharp >= \$GMIME_SHARP_REQUIRED -+ gmime-sharp-2.4 >= \$GMIME_SHARP_REQUIRED - glib-sharp-2.0 >= \$GTK_SHARP_REQUIRED - \"") >&5 - ($PKG_CONFIG --exists --print-errors " - shared-mime-info -- gmime-sharp >= $GMIME_SHARP_REQUIRED -+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED - glib-sharp-2.0 >= $GTK_SHARP_REQUIRED - ") 2>&5 - ac_status=$? -@@ -26794,7 +26794,7 @@ if test -n "$PKG_CONFIG"; then - (exit $ac_status); }; then - pkg_cv_BEAGLED_CFLAGS=`$PKG_CONFIG --cflags " - shared-mime-info -- gmime-sharp >= $GMIME_SHARP_REQUIRED -+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED - glib-sharp-2.0 >= $GTK_SHARP_REQUIRED - " 2>/dev/null` - else -@@ -26811,12 +26811,12 @@ if test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \" - shared-mime-info -- gmime-sharp >= \$GMIME_SHARP_REQUIRED -+ gmime-sharp-2.4 >= \$GMIME_SHARP_REQUIRED - glib-sharp-2.0 >= \$GTK_SHARP_REQUIRED - \"") >&5 - ($PKG_CONFIG --exists --print-errors " - shared-mime-info -- gmime-sharp >= $GMIME_SHARP_REQUIRED -+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED - glib-sharp-2.0 >= $GTK_SHARP_REQUIRED - ") 2>&5 - ac_status=$? -@@ -26824,7 +26824,7 @@ if test -n "$PKG_CONFIG"; then - (exit $ac_status); }; then - pkg_cv_BEAGLED_LIBS=`$PKG_CONFIG --libs " - shared-mime-info -- gmime-sharp >= $GMIME_SHARP_REQUIRED -+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED - glib-sharp-2.0 >= $GTK_SHARP_REQUIRED - " 2>/dev/null` - else -@@ -26847,13 +26847,13 @@ fi - if test $_pkg_short_errors_supported = yes; then - BEAGLED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " - shared-mime-info -- gmime-sharp >= $GMIME_SHARP_REQUIRED -+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED - glib-sharp-2.0 >= $GTK_SHARP_REQUIRED - "` - else - BEAGLED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " - shared-mime-info -- gmime-sharp >= $GMIME_SHARP_REQUIRED -+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED - glib-sharp-2.0 >= $GTK_SHARP_REQUIRED - "` - fi -@@ -26862,7 +26862,7 @@ fi - - { { echo "$as_me:$LINENO: error: Package requirements ( - shared-mime-info -- gmime-sharp >= $GMIME_SHARP_REQUIRED -+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED - glib-sharp-2.0 >= $GTK_SHARP_REQUIRED - ) were not met: - -@@ -26877,7 +26877,7 @@ See the pkg-config man page for more det - " >&5 - echo "$as_me: error: Package requirements ( - shared-mime-info -- gmime-sharp >= $GMIME_SHARP_REQUIRED -+ gmime-sharp-2.4 >= $GMIME_SHARP_REQUIRED - glib-sharp-2.0 >= $GTK_SHARP_REQUIRED - ) were not met: - -@@ -26924,7 +26924,7 @@ BEAGLED_LIBS="$BEAGLED_LIBS $GSF_SHARP_L - - - GSF_SHARP_PREFIX=`$PKG_CONFIG --variable=prefix gsf-sharp` --GMIME_SHARP_PREFIX=`$PKG_CONFIG --variable=prefix gmime-sharp` -+GMIME_SHARP_PREFIX=`$PKG_CONFIG --variable=prefix gmime-sharp-2.4` - - - # Check whether --enable-epiphany-extension was given. -diff -upNr beagle-0.3.9.orign/Filters/FilterMail.cs beagle-0.3.9/Filters/FilterMail.cs ---- beagle-0.3.9.orign/Filters/FilterMail.cs 2008-06-12 02:20:07.000000000 +0200 -+++ beagle-0.3.9/Filters/FilterMail.cs 2009-01-28 12:33:17.000000000 +0100 -@@ -126,7 +126,7 @@ namespace Beagle.Filters { - - // Messages that are multipart/alternative shouldn't be considered as having - // attachments. Unless of course they do. -- if (mime_part is GMime.Multipart && mime_part.ContentType.Subtype.ToLower () != "alternative") -+ if (mime_part is GMime.Multipart && mime_part.ContentType.MediaSubtype.ToLower () != "alternative") - return true; - - return false; -@@ -140,34 +140,43 @@ namespace Beagle.Filters { - AddProperty (Property.NewDate ("fixme:date", message.Date.ToUniversalTime ())); - - GMime.InternetAddressList addrs; -- addrs = this.message.GetRecipients (GMime.Message.RecipientType.To); -+ addrs = this.message.GetRecipients (GMime.RecipientType.To); - foreach (GMime.InternetAddress ia in addrs) { - AddProperty (Property.NewUnsearched ("fixme:to", ia.ToString (false))); -- if (ia.AddressType != GMime.InternetAddressType.Group) -- AddProperty (Property.New ("fixme:to_address", ia.Addr)); -- -+ if (ia is GMime.InternetAddressMailbox) { -+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox; -+ -+ AddProperty (Property.New ("fixme:to_address", mailbox.Address)); -+ } -+ - AddProperty (Property.New ("fixme:to_name", ia.Name)); - AddEmailLink (ia); - } - addrs.Dispose (); - -- addrs = this.message.GetRecipients (GMime.Message.RecipientType.Cc); -+ addrs = this.message.GetRecipients (GMime.RecipientType.Cc); - foreach (GMime.InternetAddress ia in addrs) { - AddProperty (Property.NewUnsearched ("fixme:cc", ia.ToString (false))); -- if (ia.AddressType != GMime.InternetAddressType.Group) -- AddProperty (Property.New ("fixme:cc_address", ia.Addr)); -- -+ if (ia is GMime.InternetAddressMailbox) { -+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox; -+ -+ AddProperty (Property.New ("fixme:cc_address", mailbox.Address)); -+ } -+ - AddProperty (Property.New ("fixme:cc_name", ia.Name)); - AddEmailLink (ia); - } - addrs.Dispose (); - -- addrs = GMime.InternetAddressList.ParseString (GMime.Utils.HeaderDecodePhrase (this.message.Sender)); -+ addrs = GMime.InternetAddressList.Parse (this.message.Sender); - foreach (GMime.InternetAddress ia in addrs) { - AddProperty (Property.NewUnsearched ("fixme:from", ia.ToString (false))); -- if (ia.AddressType != GMime.InternetAddressType.Group) -- AddProperty (Property.New ("fixme:from_address", ia.Addr)); -- -+ if (ia is GMime.InternetAddressMailbox) { -+ GMime.InternetAddressMailbox mailbox = ia as GMime.InternetAddressMailbox; -+ -+ AddProperty (Property.New ("fixme:from_address", mailbox.Address)); -+ } -+ - AddProperty (Property.New ("fixme:from_name", ia.Name)); - AddEmailLink (ia); - } -@@ -184,7 +193,7 @@ namespace Beagle.Filters { - AddProperty (Property.NewUnsearched ("fixme:msgid", GMime.Utils.DecodeMessageId (msgid))); - - foreach (GMime.References refs in this.message.References) -- AddProperty (Property.NewUnsearched ("fixme:reference", refs.Msgid)); -+ AddProperty (Property.NewUnsearched ("fixme:reference", refs.MessageId)); - - string list_id = this.message.GetHeader ("List-Id"); - if (list_id != null) -@@ -345,16 +354,15 @@ namespace Beagle.Filters { - } - } else if (mime_part is GMime.Multipart) { - GMime.Multipart multipart = (GMime.Multipart) mime_part; -- -- int num_parts = multipart.Number; -+ int num_parts = multipart.Count; - - // If the mimetype is multipart/alternative, we only want to index - // one part -- the richest one we can filter. -- if (mime_part.ContentType.Subtype.ToLower () == "alternative") { -+ if (mime_part.ContentType.MediaSubtype.ToLower () == "alternative") { - // The richest formats are at the end, so work from there - // backward. - for (int i = num_parts - 1; i >= 0; i--) { -- GMime.Object subpart = multipart.GetPart (i); -+ GMime.Object subpart = multipart[i]; - - if (IsMimeTypeHandled (subpart.ContentType.ToString ())) { - part = subpart; -@@ -370,7 +378,7 @@ namespace Beagle.Filters { - // the parts, treat them like a bunch of attachments. - if (part == null) { - for (int i = 0; i < num_parts; i++) { -- using (GMime.Object subpart = multipart.GetPart (i)) -+ using (GMime.Object subpart = multipart[i]) - this.OnEachPart (subpart); - } - } -@@ -400,7 +408,7 @@ namespace Beagle.Filters { - } else if (mime_type == "text/html") { - no_child_needed = true; - html_part = true; -- string enc = part.GetContentTypeParameter ("charset"); -+ string enc = part.ContentType.GetParameter ("charset"); - // DataWrapper.Stream is a very limited stream - // and does not allow Seek or Tell - // HtmlFilter requires Stream.Position=0. -@@ -473,7 +481,7 @@ namespace Beagle.Filters { - if (length != -1) - child.AddProperty (Property.NewUnsearched ("fixme:filesize", length)); - -- if (part.ContentType.Type.ToLower () == "text") -+ if (part.ContentType.MediaType.ToLower () == "text") - child.SetTextReader (new StreamReader (stream)); - else - child.SetBinaryStream (stream); diff --git a/extra/beagle/beagle-0.3.9-mono-data-sqlite-2.patch b/extra/beagle/beagle-0.3.9-mono-data-sqlite-2.patch deleted file mode 100644 index ef090be9e..000000000 --- a/extra/beagle/beagle-0.3.9-mono-data-sqlite-2.patch +++ /dev/null @@ -1,81 +0,0 @@ ---- beagle-0.3.9/Util/FSpotTools.cs.orig 2010-01-30 14:45:38.000000000 +0100 -+++ beagle-0.3.9/Util/FSpotTools.cs 2010-01-30 14:47:00.000000000 +0100 -@@ -85,8 +85,12 @@ - while (reader == null) { - try { - reader = command.ExecuteReader (); -- } catch (SqliteBusyException) { -- Thread.Sleep (50); -+ } catch (SqliteException e) { -+ if (e.ErrorCode == SQLiteErrorCode.Busy) { -+ Thread.Sleep (50); -+ } else { -+ throw; -+ } - } - } - reader.Close (); ---- beagle-0.3.9/beagled/SqliteUtils.cs.orig 2010-01-30 14:47:14.000000000 +0100 -+++ beagle-0.3.9/beagled/SqliteUtils.cs 2010-01-30 14:53:16.000000000 +0100 -@@ -55,8 +55,13 @@ - try { - ret = command.ExecuteNonQuery (); - break; -- } catch (SqliteBusyException ex) { -- Thread.Sleep (50); -+ } catch (SqliteException ex) { -+ if (ex.ErrorCode == SQLiteErrorCode.Busy) { -+ Thread.Sleep (50); -+ } else { -+ Log.Error(ex, "SQL that caused the exception: {0}", command_text); -+ throw; -+ } - } catch (Exception e) { - Log.Error (e, "SQL that caused the exception: {0}", command_text); - throw; -@@ -79,8 +84,13 @@ - try { - ret = command.ExecuteNonQuery (); - break; -- } catch (SqliteBusyException ex) { -- Thread.Sleep (50); -+ } catch (SqliteException ex) { -+ if (ex.ErrorCode == SQLiteErrorCode.Busy) { -+ Thread.Sleep (50); -+ } else { -+ Log.Error(ex, "SQL that caused the exception: {0}", command.CommandText); -+ throw; -+ } - } catch (Exception e) { - Log.Error ( e, "SQL that caused the exception: {0}", command.CommandText); - throw; -@@ -96,8 +106,12 @@ - while (reader == null) { - try { - reader = command.ExecuteReader (); -- } catch (SqliteBusyException ex) { -- Thread.Sleep (50); -+ } catch (SqliteException ex) { -+ if (ex.ErrorCode == SQLiteErrorCode.Busy) { -+ Thread.Sleep (50); -+ } else { -+ throw; -+ } - } - } - return reader; -@@ -108,8 +122,12 @@ - while (true) { - try { - return reader.Read (); -- } catch (SqliteBusyException ex) { -- Thread.Sleep (50); -+ } catch (SqliteException ex) { -+ if (ex.ErrorCode == SQLiteErrorCode.Busy) { -+ Thread.Sleep (50); -+ } else { -+ throw; -+ } - } - } - } diff --git a/extra/beagle/beagle-0.3.9-spew.patch b/extra/beagle/beagle-0.3.9-spew.patch deleted file mode 100644 index 6e31c964c..000000000 --- a/extra/beagle/beagle-0.3.9-spew.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upNr beagle-0.3.9.orign/beagled/BeagleDaemon.cs beagle-0.3.9/beagled/BeagleDaemon.cs ---- beagle-0.3.9.orign/beagled/BeagleDaemon.cs 2008-06-11 20:42:20.000000000 +0200 -+++ beagle-0.3.9/beagled/BeagleDaemon.cs 2009-01-31 12:44:23.000000000 +0100 -@@ -456,7 +456,7 @@ namespace Beagle.Daemon { - // debugging this code, after all... - // arg_debug ? LogLevel.Debug : LogLevel.Warn - -- Log.Initialize (PathFinder.LogDir, "Beagle", LogLevel.Debug, arg_fg); -+ Log.Initialize (PathFinder.LogDir, "Beagle", arg_debug ? LogLevel.Debug : LogLevel.Warn, arg_fg); - Log.Always ("Starting Beagle Daemon (version {0})", ExternalStringsHack.Version); - Log.Always ("Running on {0}", SystemInformation.MonoRuntimeVersion); - Log.Always ("Command Line: {0}", diff --git a/extra/beagle/beagle.install b/extra/beagle/beagle.install deleted file mode 100644 index bfc90ecd1..000000000 --- a/extra/beagle/beagle.install +++ /dev/null @@ -1,8 +0,0 @@ -post_install() { - getent group beaglidx >/dev/null || usr/sbin/groupadd -g 86 beaglidx - getent passwd beaglidx >/dev/null || usr/sbin/useradd -c 'User for Beagle indexing' -u 86 -g beaglidx -d '/' -s /bin/false beaglidx -} - -post_upgrade() { - post_install $1 -} diff --git a/extra/beagle/mono-2.8.patch b/extra/beagle/mono-2.8.patch deleted file mode 100644 index 503243444..000000000 --- a/extra/beagle/mono-2.8.patch +++ /dev/null @@ -1,152 +0,0 @@ -Patch to enable compilation against mono-2.8 - -* Mono-2.8 uses mono-2.pc instead of mono.pc for setting cflags and libs. -* Mono-2.8 disables direct access to struct MonoType fields; use accessors -instead (mono_type_get_type and mono_field_get_flags have been present in -the API since at least mono-1.2, so we do not need any version ifdefs). -* Cast FSpot.MetadataStore to IEnumerable in foreach() to prevent CS1640 -errors (non-unique enumeration of the type) with mono-2.8's gmcs. - -diff -ru beagle-0.3.9-orig/configure.in beagle-0.3.9/configure.in ---- beagle-0.3.9-orig/configure.in 2010-10-16 01:30:03.807825004 -0400 -+++ beagle-0.3.9/configure.in 2010-10-16 01:30:10.385825003 -0400 -@@ -59,11 +59,20 @@ - AC_MSG_ERROR([You need to install the Mono gmcs compiler]) - fi - --AC_MSG_CHECKING([for mono.pc]) --if test -z `$PKG_CONFIG --variable=prefix mono`; then -- AC_MSG_ERROR([missing the mono.pc file, usually found in the mono-devel package]) -+# mono-2.8 and higher uses mono-2.pc instead of mono.pc for cflags and libs -+AC_MSG_CHECKING([for mono-2.pc]) -+if test -z `$PKG_CONFIG --variable=prefix mono-2`; then -+ AC_MSG_RESULT([not found]) -+ AC_MSG_CHECKING([for mono.pc]) -+ if test -z `$PKG_CONFIG --variable=prefix mono`; then -+ AC_MSG_ERROR([missing the mono.pc file, usually found in the mono-devel package]) -+ else -+ AC_MSG_RESULT([found]) -+ mono_pc=mono -+ fi - else - AC_MSG_RESULT([found]) -+ mono_pc=mono-2 - fi - - BEAGLE_DEFINES="" -@@ -71,10 +80,10 @@ - # check that we have the require version of mono - - # Temporary: check for mono-1.9 --PKG_CHECK_MODULES(MONO, mono >= 1.9, mono_1_9=yes, mono_1_9=no) -+PKG_CHECK_MODULES(MONO, $mono_pc >= 1.9, mono_1_9=yes, mono_1_9=no) - if test "x$mono_1_9" = "xno"; then - AC_MSG_RESULT([missing mono >= 1.9. Searching for mono >= 1.2.4]) -- PKG_CHECK_MODULES(MONO, mono >= $MONO_REQUIRED) -+ PKG_CHECK_MODULES(MONO, $mono_pc >= $MONO_REQUIRED) - else - AC_MSG_RESULT([found mono >= 1.9]) - BEAGLE_DEFINES="$BEAGLE_DEFINES -define:MONO_1_9" -@@ -84,7 +93,7 @@ - needed_dlls="Mono.Data.Sqlite Mono.Posix System.Data System.Web ICSharpCode.SharpZipLib" - for i in $needed_dlls; do - AC_MSG_CHECKING([for $i.dll]) -- if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; then -+ if test ! -e `$PKG_CONFIG --variable=prefix $mono_pc`/lib/mono/2.0/$i.dll; then - AC_MSG_ERROR([missing required mono DLL: $i.dll]) - else - AC_MSG_RESULT([found]) -@@ -195,7 +204,7 @@ - if test "x$enable_google" = "xyes"; then - i="System.Security" - AC_MSG_CHECKING([for $i.dll (needed by Google backends)]) -- if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; then -+ if test ! -e `$PKG_CONFIG --variable=prefix $mono_pc`/lib/mono/2.0/$i.dll; then - AC_MSG_ERROR([missing required mono DLL: $i.dll]) - else - AC_MSG_RESULT([found]) -@@ -560,7 +569,7 @@ - if test "x$enable_qt" != "xno" -a "x$has_qyoto" = "xno"; then - i="qt-dotnet" - AC_MSG_CHECKING([for $i.dll]) -- if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/2.0/$i.dll; then -+ if test ! -e `$PKG_CONFIG --variable=prefix $mono_pc`/lib/mono/2.0/$i.dll; then - AC_MSG_ERROR([missing required mono DLL: $i.dll]) - else - AC_MSG_RESULT([found]) -Only in beagle-0.3.9: configure.in.orig -diff -ru beagle-0.3.9-orig/Filters/FilterImage.cs beagle-0.3.9/Filters/FilterImage.cs ---- beagle-0.3.9-orig/Filters/FilterImage.cs 2008-04-13 15:24:13.000000000 -0400 -+++ beagle-0.3.9/Filters/FilterImage.cs 2010-10-16 02:08:10.755825005 -0400 -@@ -141,7 +141,7 @@ - Resource rights_anon = null; - Resource title_anon = null; - -- foreach (Statement stmt in xmp.Store) { -+ foreach (Statement stmt in (IEnumerable)xmp.Store) { - if (stmt.Predicate == MetadataStore.Namespaces.Resolve ("dc:subject")) { - //Console.WriteLine ("found subject"); - subject_anon = stmt.Object; -@@ -163,7 +163,7 @@ - } - } - -- foreach (Statement stmt in xmp.Store) { -+ foreach (Statement stmt in (IEnumerable)xmp.Store) { - if (stmt.Subject == subject_anon && - stmt.Predicate != MetadataStore.Namespaces.Resolve ("rdf:type")) { - AddProperty (Beagle.Property.New ("dc:subject", ((Literal)stmt.Object).Value)); -diff -ru beagle-0.3.9-orig/Filters/FilterPdf.cs beagle-0.3.9/Filters/FilterPdf.cs ---- beagle-0.3.9-orig/Filters/FilterPdf.cs 2008-04-13 15:31:18.000000000 -0400 -+++ beagle-0.3.9/Filters/FilterPdf.cs 2010-10-16 02:22:09.528825003 -0400 -@@ -8,6 +8,7 @@ - // - - using System; -+using System.Collections; - using System.IO; - using System.Diagnostics; - -@@ -220,7 +221,7 @@ - Resource rights_anon = null; - Resource title_anon = null; - -- foreach (Statement stmt in xmp.Store) { -+ foreach (Statement stmt in (IEnumerable)xmp.Store) { - if (stmt.Predicate == MetadataStore.Namespaces.Resolve ("dc:subject")) { - //Console.WriteLine ("found subject"); - subject_anon = stmt.Object; -@@ -239,7 +240,7 @@ - } - } - -- foreach (Statement stmt in xmp.Store) { -+ foreach (Statement stmt in (IEnumerable)xmp.Store) { - if (stmt.Subject == subject_anon && - stmt.Predicate != MetadataStore.Namespaces.Resolve ("rdf:type")) { - AddProperty (Beagle.Property.New ("dc:subject", ((Literal)stmt.Object).Value)); -diff -ru beagle-0.3.9-orig/glue/mono-glue.c beagle-0.3.9/glue/mono-glue.c ---- beagle-0.3.9-orig/glue/mono-glue.c 2007-11-26 20:50:05.000000000 -0500 -+++ beagle-0.3.9/glue/mono-glue.c 2010-10-16 01:04:19.839825010 -0400 -@@ -79,18 +79,18 @@ - type = mono_class_get_type (klass); - - /* This is an array, so drill down into it */ -- if (type->type == MONO_TYPE_SZARRAY) -+ if (mono_type_get_type (type) == MONO_TYPE_SZARRAY) - total += memory_usage_array ((MonoArray *) obj, visited); - - while ((field = mono_class_get_fields (klass, &iter)) != NULL) { - MonoType *ftype = mono_field_get_type (field); - gpointer value; - -- if ((ftype->attrs & (FIELD_ATTRIBUTE_STATIC | FIELD_ATTRIBUTE_HAS_FIELD_RVA)) != 0) -+ if ((mono_field_get_flags (field) & (FIELD_ATTRIBUTE_STATIC | FIELD_ATTRIBUTE_HAS_FIELD_RVA)) != 0) - continue; - - /* FIXME: There are probably other types we need to drill down into */ -- switch (ftype->type) { -+ switch (mono_type_get_type (ftype)) { - - case MONO_TYPE_CLASS: - case MONO_TYPE_OBJECT: diff --git a/extra/bluedevil/PKGBUILD b/extra/bluedevil/PKGBUILD index 909e4cadd..ad2437496 100644 --- a/extra/bluedevil/PKGBUILD +++ b/extra/bluedevil/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 137972 2011-09-13 10:41:55Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 140234 2011-10-10 10:51:49Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=bluedevil -pkgver=1.2 +pkgver=1.2.2 pkgrel=1 pkgdesc='KDE bluetooth framework' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +13,7 @@ depends=('kdebase-workspace' 'libbluedevil' 'obex-data-server' 'obexd-client') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('09ed36095367dd51ab8c23e0705cf411') +md5sums=('f1b2b932f3e1e52b13b0bad515bf4125') build(){ cd "${srcdir}" diff --git a/extra/bluedevil/bluedevil.install b/extra/bluedevil/bluedevil.install index 8652c4ad4..af8efba2c 100644 --- a/extra/bluedevil/bluedevil.install +++ b/extra/bluedevil/bluedevil.install @@ -1,5 +1,6 @@ post_install() { update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q } post_upgrade() { diff --git a/extra/bug-buddy/PKGBUILD b/extra/bug-buddy/PKGBUILD deleted file mode 100644 index bb24f9b29..000000000 --- a/extra/bug-buddy/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 91665 2010-09-27 15:48:02Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=bug-buddy -pkgver=2.32.0 -pkgrel=1 -pkgdesc="A bug reporting tool for GNOME" -arch=(i686 x86_64 'mips64el') -install=bug-buddy.install -depends=('evolution-data-server>=2.32.0' 'libgtop>=2.28.1' 'elfutils' 'hicolor-icon-theme' 'libbonobo>=2.32.0') -makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils>=0.20.1') -groups=('gnome-extra') -license=(GPL) -options=('!libtool' '!emptydirs') -url="http://www.gnome.org" -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.32/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('ffdc70fe4a59c0aef42b5b0b72b08f17db2b1d9f49ba2b68722334ddbee5e3ca') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain bug-buddy ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/extra/bug-buddy/bug-buddy.install b/extra/bug-buddy/bug-buddy.install deleted file mode 100644 index eec3336ba..000000000 --- a/extra/bug-buddy/bug-buddy.install +++ /dev/null @@ -1,24 +0,0 @@ -pkgname=bug-buddy - -post_install() { - usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - usr/bin/gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD index 34851290a..50c70dce4 100644 --- a/extra/clamav/PKGBUILD +++ b/extra/clamav/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 132770 2011-07-26 00:09:35Z bisson $ +# $Id: PKGBUILD 140665 2011-10-17 22:40:35Z bisson $ # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=clamav -pkgver=0.97.2 +pkgver=0.97.3 pkgrel=1 pkgdesc='Anti-virus toolkit for Unix' arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,7 @@ source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pk 'conf.d' 'logrotate' 'config.patch') -sha1sums=('27d47c6ad22edc87c030f6d483fab1e13320cbf7' +sha1sums=('263c7b8b7dc1536652ab64e32263d1c60e138655' '7f15f0b13a1c11235bc99ef0add01efd8a442f07' 'cb116cdab49a810381a515cbcfb6a6c148547f07' 'be3310d2b41a68ce06e33c84ab68ffe59fdce104' @@ -28,7 +28,7 @@ install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../config.patch + patch -p1 -i ../config.patch ./configure \ --prefix=/usr \ --sysconfdir=/etc/clamav \ diff --git a/extra/cups-pdf/PKGBUILD b/extra/cups-pdf/PKGBUILD index 39fe4af1d..f49de5233 100644 --- a/extra/cups-pdf/PKGBUILD +++ b/extra/cups-pdf/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139655 2011-10-04 13:22:43Z andyrtr $ +# $Id: PKGBUILD 140448 2011-10-14 16:56:59Z andyrtr $ # Maintainer: Andreas Radke <andyrtr at archlinux.org> # Contributor: Thomas Baechler <thomas.baechler@rwth-aachen.de> pkgname=cups-pdf -pkgver=2.6.0 -pkgrel=2 +pkgver=2.6.1 +pkgrel=1 pkgdesc="PDF printer for cups" arch=(i686 x86_64 'mips64el') depends=('cups' 'ghostscript') @@ -13,8 +13,7 @@ url="http://cip.physik.uni-wuerzburg.de/~vrbehr/cups-pdf" license=('GPL2') source=(http://cip.physik.uni-wuerzburg.de/~vrbehr/cups-pdf/src/cups-pdf_$pkgver.tar.gz) backup=(etc/cups/cups-pdf.conf) -md5sums=('8ee644c77438aac542301352266db181') -sha1sums=('45ecff78f26dab6261bbf66978e708d93385ef31') +md5sums=('65f3fd525c4a9b1d736b91594b3166d5') build() { cd $srcdir/$pkgname-$pkgver/src @@ -32,6 +31,4 @@ package() { # Install config file install -D -m644 cups-pdf.conf $pkgdir/etc/cups/cups-pdf.conf - # fix https://bugs.archlinux.org/task/26243 - sed -i "s:e cups-pdf.conf:# cups-pdf.conf:g" $pkgdir/etc/cups/cups-pdf.conf } diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD index bb84f6c3a..6996b8916 100644 --- a/extra/cyrus-sasl/PKGBUILD +++ b/extra/cyrus-sasl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 134446 2011-08-03 20:43:28Z jgc $ +# $Id: PKGBUILD 140376 2011-10-11 21:30:12Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # This package spans multiple repositories. @@ -8,7 +8,7 @@ pkgbase=('cyrus-sasl') pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql') #pkgname=libsasl pkgver=2.1.23 -pkgrel=7 +pkgrel=8 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library" arch=('i686' 'x86_64' 'mips64el') url="http://cyrusimap.web.cmu.edu/downloads.html#sasl" @@ -133,7 +133,6 @@ build() { package_libsasl() { pkgdesc="Cyrus Simple Authentication Service Layer (SASL) Library" depends=('openssl') - provides=('cyrus-sasl-plugins') conflicts=('cyrus-sasl-plugins') cd "${srcdir}/cyrus-sasl-${pkgver}" diff --git a/extra/dbus-glib/PKGBUILD b/extra/dbus-glib/PKGBUILD index 27ea2e8b8..fc4c6c60e 100644 --- a/extra/dbus-glib/PKGBUILD +++ b/extra/dbus-glib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 129344 2011-06-26 21:48:20Z ibiru $ +# $Id: PKGBUILD 140079 2011-10-06 07:35:47Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=dbus-glib -pkgver=0.94 -pkgrel=2 +pkgver=0.98 +pkgrel=1 pkgdesc="GLib bindings for DBUS" arch=(i686 x86_64 'mips64el') license=('GPL') @@ -11,14 +11,11 @@ url="http://www.freedesktop.org/wiki/Software/DBusBindings" depends=('dbus-core' 'glib2') makedepends=('pkgconfig') options=('!libtool' '!emptydirs') -source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz - fix_network_manager.patch) -md5sums=('e1f1506a6f4941e67bffd614b1ad5af6' - '2a3598342dd25722d452e7beaf21b5f3') +source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) +md5sums=('3f7f117dc7c8d899d9acfdcbf9253fb8') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/fix_network_manager.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --enable-static=no --enable-bash-completion=no make diff --git a/extra/dbus-glib/fix_network_manager.patch b/extra/dbus-glib/fix_network_manager.patch deleted file mode 100644 index 246b85550..000000000 --- a/extra/dbus-glib/fix_network_manager.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3e0828f57c3925ea9b63d22ab82d991a0fea0536 Mon Sep 17 00:00:00 2001 -From: Simon McVittie <simon.mcvittie@collabora.co.uk> -Date: Thu, 02 Jun 2011 12:49:51 +0000 -Subject: Fix regression in marshalling objects as object paths - -This regressed while fixing fd.o #36811. NetworkManager apparently uses -this idiom. - -Bug: https://bugs.freedesktop.org/show_bug.cgi?id=37852 -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628890 -Tested-by: Michael Biebl <biebl@debian.org> -Reviewed-by: Colin Walters <walters@verbum.org> ---- -diff --git a/dbus/dbus-gobject.c b/dbus/dbus-gobject.c -index 3b0bd17..7ee0b4f 100644 ---- a/dbus/dbus-gobject.c -+++ b/dbus/dbus-gobject.c -@@ -3049,16 +3049,16 @@ out: - const char * - _dbus_gobject_get_path (GObject *obj) - { -- GSList *registrations; -+ ObjectExport *oe; - ObjectRegistration *o; - -- registrations = g_object_get_data (obj, "dbus_glib_object_registrations"); -+ oe = g_object_get_data (obj, "dbus_glib_object_registrations"); - -- if (registrations == NULL) -+ if (oe == NULL || oe->registrations == NULL) - return NULL; - - /* First one to have been registered wins */ -- o = registrations->data; -+ o = oe->registrations->data; - - return o->object_path; - } --- -cgit v0.8.3-6-g21f6 diff --git a/extra/dbus/PKGBUILD b/extra/dbus/PKGBUILD index 1b32bef4a..8de562ddb 100644 --- a/extra/dbus/PKGBUILD +++ b/extra/dbus/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 134376 2011-08-03 11:19:50Z ibiru $ +# $Id: PKGBUILD 140077 2011-10-06 07:35:45Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@subpop.net> # pkgname=dbus -pkgver=1.4.14 +pkgver=1.4.16 pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" @@ -12,7 +12,7 @@ license=('GPL' 'custom') depends=("dbus-core>=${pkgver}" 'libx11') source=(http://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz 30-dbus) -md5sums=('ae6de2562a57516cfabaf56903375ba9' +md5sums=('44a2a10678e7e50460879c3eb4453a65' 'd14e59575f04e55d21a04907b6fd9f3c') build() { diff --git a/extra/di/PKGBUILD b/extra/di/PKGBUILD index da7aa5868..0e80c24ed 100644 --- a/extra/di/PKGBUILD +++ b/extra/di/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139175 2011-10-01 04:29:21Z eric $ +# $Id: PKGBUILD 140256 2011-10-11 02:47:40Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=di -pkgver=4.29 +pkgver=4.30 pkgrel=1 pkgdesc="A disk information utility, displaying everything (and more) that your df command does" arch=('i686' 'x86_64' 'mips64el') @@ -10,7 +10,7 @@ url="http://www.gentoo.com/di/" license=('ZLIB') depends=('glibc') source=(http://www.gentoo.com/di/${pkgname}-${pkgver}.tar.gz) -sha1sums=('620b22b362067b48c25674b1af494015453d7cd9') +sha1sums=('45fae9dd34df9f5f2c391237fb316c056d4854fe') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/dnsmasq/PKGBUILD b/extra/dnsmasq/PKGBUILD index 8e78bb04c..3c68a1a8b 100644 --- a/extra/dnsmasq/PKGBUILD +++ b/extra/dnsmasq/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 137814 2011-09-11 16:06:30Z dreisner $ +# $Id: PKGBUILD 140772 2011-10-19 01:14:39Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=dnsmasq -pkgver=2.58 -pkgrel=2 +pkgver=2.59 +pkgrel=1 pkgdesc="Lightweight, easy to configure DNS forwarder and DHCP server" url="http://www.thekelleys.org.uk/dnsmasq/doc.html" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('glibc' 'bash' 'dbus-core') +depends=('glibc' 'dbus-core') makedepends=('libcap>=2.16') install=$pkgname.install backup=('etc/dnsmasq.conf' @@ -19,7 +19,7 @@ source=("http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz" 'dnsmasq.confd' 'rc.dnsmasq' 'dnsmasq.service') -md5sums=('14c5c81debb324adc261db971730f4c6' +md5sums=('29d43f182ecad06d64b3598c02380a80' '66479e99123faeab83ebaed709ef95b5' '818c122ea4d81868a75afad109411170' 'f329d86f8ba1cd85f9b6ee59e0ce3791') @@ -38,7 +38,6 @@ package() { make PREFIX=/usr DESTDIR="$pkgdir" install - install -dm755 "$pkgdir"/var/{db,lib/misc} install -Dm755 "$srcdir"/rc.dnsmasq "$pkgdir"/etc/rc.d/dnsmasq install -Dm644 "$srcdir"/dnsmasq.confd "$pkgdir/etc/conf.d/dnsmasq" diff --git a/extra/dssi/PKGBUILD b/extra/dssi/PKGBUILD index e3d017a37..84a6bd436 100644 --- a/extra/dssi/PKGBUILD +++ b/extra/dssi/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 91030 2010-09-21 05:56:54Z schiv $ +# $Id: PKGBUILD 140086 2011-10-06 09:24:49Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Pajaro pkgname=dssi -pkgver=1.1.0 +pkgver=1.1.1 pkgrel=1 -pkgdesc="API for audio processing plugins/softsynths with user interfaces" +pkgdesc="An API for audio processing plugins & softsynths with UIs" arch=(i686 x86_64 'mips64el') url="http://dssi.sourceforge.net/" -license=('LGPL' 'BSD') +license=('LGPL' 'BSD' 'custom') depends=('liblo' 'jack') makedepends=('ladspa' 'qt') optdepends=('qt: example plugins') options=('!libtool') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - LICENSE) -md5sums=('dfc850e66fae94e7ec08aebb43d07848' +source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz" + 'license.txt') +md5sums=('619ab73c883b02dc37ddb37001591f8b' '258ca4d0ca28c5c4d4675147621fac18') build() { @@ -29,9 +29,9 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install - install -Dm644 "$srcdir/LICENSE" \ + install -Dm644 "$srcdir/license.txt" \ "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/extra/dssi/LICENSE b/extra/dssi/license.txt index ddef4f23b..ddef4f23b 100644 --- a/extra/dssi/LICENSE +++ b/extra/dssi/license.txt diff --git a/extra/eclipse/PKGBUILD b/extra/eclipse/PKGBUILD index 6a4c37ae1..b80d72e83 100644 --- a/extra/eclipse/PKGBUILD +++ b/extra/eclipse/PKGBUILD @@ -1,30 +1,31 @@ -# $Id: PKGBUILD 129286 2011-06-26 10:19:01Z paul $ +# $Id: PKGBUILD 140489 2011-10-15 15:29:09Z ibiru $ # Maintainer: Paul Mattal <paul@archlinux.org> # Contributor: Andrew Wright <andreww@photism.org> # Contributor: Andreas W. Hauser <andy-aur@splashground.de> +# Contributor: Marco Crosio <marco.crosio@gmail.com> pkgname=eclipse -pkgver=3.7 -_internal_pkgver=3.7 -pkgrel=1 -_date=201106131736 +pkgver=3.7.1 +_internal_pkgver=3.7.1 +pkgrel=2 +_date=201109091335 pkgdesc="An IDE for Java and other languages" arch=('i686' 'x86_64' 'mips64el') url="http://eclipse.org" -depends=('java-environment' 'gtk2' 'unzip' 'xulrunner') +depends=('java-environment' 'gtk2' 'unzip' 'libwebkit') install=${pkgname}.install makedepends=('zip') license=("EPL/1.1") source=("ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-${pkgver}-${_date}/${pkgname}-SDK-${pkgver}-linux-gtk.tar.gz" 'eclipse.svg' 'eclipse.sh' 'eclipse.desktop' 'eclipse.ini.patch') -md5sums=('084a33505b2d5b933447692ec3025659' - '77cff7543ccf7e177cb6667f5a20ce19' - '7ea99a30fbaf06ec29261541b8eb1e23' - 'ba8a37e30a7ebd69774cec87c69e8c44' - '017b2a68edc48a752a7e27c7aceef797') +md5sums=('c7f3e186e7996d3a8afc16eec9e9e71f' + '77cff7543ccf7e177cb6667f5a20ce19' + '7ea99a30fbaf06ec29261541b8eb1e23' + 'ba8a37e30a7ebd69774cec87c69e8c44' + '017b2a68edc48a752a7e27c7aceef797') [ "$CARCH" = "x86_64" ] && source[0]="ftp://ftp.osuosl.org/pub/eclipse/eclipse/downloads/drops/R-${pkgver}-${_date}/${pkgname}-SDK-${pkgver}-linux-gtk-${CARCH}.tar.gz" -[ "$CARCH" = "x86_64" ] && md5sums[0]='980360c038960dfa1ef7485faa317ec6' +[ "$CARCH" = "x86_64" ] && md5sums[0]='b8b37135600d92c373514ce5bb094143' package() { cd "${srcdir}/eclipse" diff --git a/extra/empathy/PKGBUILD b/extra/empathy/PKGBUILD index 7bc2f761f..6576f1976 100644 --- a/extra/empathy/PKGBUILD +++ b/extra/empathy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139245 2011-10-01 18:56:30Z ibiru $ +# $Id: PKGBUILD 140214 2011-10-09 19:40:31Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=empathy -pkgver=3.2.0 +pkgver=3.2.0.1 pkgrel=1 pkgdesc="A GNOME instant messaging client using the Telepathy framework." arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ options=('!libtool') groups=('gnome-extra') install=empathy.install source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/3.2/${pkgname}-${pkgver}.tar.xz) -sha256sums=('0c55d8603ab2f1a4e998dc06bf8a6e48bdb6b02e373ac0d009b3f218fdec9633') +sha256sums=('b11f6f980ce7ae75ddcdbe14bded86c0cc5970181e2257026610a025b75f5512') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/enlightenment/PKGBUILD b/extra/enlightenment/PKGBUILD index 106c472b8..f4ec645c3 100644 --- a/extra/enlightenment/PKGBUILD +++ b/extra/enlightenment/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 134356 2011-08-03 02:27:18Z eric $ +# $Id: PKGBUILD 140259 2011-10-11 03:24:04Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=enlightenment -pkgver=1.0.9 +pkgver=1.0.10 _themever=1.0.1 -pkgrel=2 +pkgrel=1 pkgdesc="A fast, flexible, and very extensible Window Manager" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" @@ -14,9 +14,7 @@ depends=('libxinerama' 'imlib2' 'perl' 'pango' 'libxcomposite' \ options=('!libtool') source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/e16-${pkgver}.tar.gz \ http://downloads.sourceforge.net/enlightenment/e16-themes-${_themever}.tar.gz) -md5sums=('ad85044366efe64cb67f4a8e49a37f84' - 'bbd9cfd969610c29c7627c2ba1ce3094') -sha1sums=('97929090b5d66fa28067b21b17f48cedea1f81bb' +sha1sums=('20e56c851aeb5279479eb43570b5d58bcc1d6ef9' 'ae34e2df1294198795736bf953bf695aba93b710') build() { diff --git a/extra/epiphany-extensions/PKGBUILD b/extra/epiphany-extensions/PKGBUILD index cb6a21df4..2e1094690 100644 --- a/extra/epiphany-extensions/PKGBUILD +++ b/extra/epiphany-extensions/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 119191 2011-04-11 08:30:21Z ibiru $ +# $Id: PKGBUILD 140164 2011-10-08 07:58:37Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=epiphany-extensions -pkgver=3.0.0 +pkgver=3.2.0 pkgrel=1 url="http://www.gnome.org/projects/epiphany/" pkgdesc="Various extentions for the Epiphany web browser" @@ -12,8 +12,8 @@ depends=('epiphany' 'opensp' 'hicolor-icon-theme') makedepends=('gnome-doc-utils' 'intltool') options=('!libtool' '!emptydirs') install=epiphany-extensions.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('c9984de0912b307fecd0232135c0e3d8c7f0859867b9693221ff12d1c483b724') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) +sha256sums=('0707c9109bc6070f5f4e6ef3a9653e18ad5200eb57f396852b4c13cbac69baae') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/epiphany-extensions/epiphany-extensions.install b/extra/epiphany-extensions/epiphany-extensions.install index 1a05f573e..c0ed9a0d7 100644 --- a/extra/epiphany-extensions/epiphany-extensions.install +++ b/extra/epiphany-extensions/epiphany-extensions.install @@ -1,4 +1,5 @@ post_install() { + glib-compile-schemas usr/share/glib-2.0/schemas gtk-update-icon-cache -q -t -f usr/share/icons/hicolor } diff --git a/extra/evince/PKGBUILD b/extra/evince/PKGBUILD index 43cff1bbc..dfb163f9c 100644 --- a/extra/evince/PKGBUILD +++ b/extra/evince/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139253 2011-10-01 18:56:43Z ibiru $ +# $Id: PKGBUILD 140567 2011-10-17 08:14:39Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=evince pkgver=3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="Simply a document viewer" url="http://projects.gnome.org/evince/" arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/evince/introspection-fix.patch b/extra/evince/introspection-fix.patch deleted file mode 100644 index 6a64517bd..000000000 --- a/extra/evince/introspection-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff a/libview/Makefile.am b/libview/Makefile.am ---- a/libview/Makefile.am -+++ b/libview/Makefile.am -@@ -136,6 +136,7 @@ EvinceView-$(EV_API_VERSION).gir: libevview3.la Makefile $(INST_H_FILES) $(filte - --output $@ \ - --pkg evince-document-$(EV_API_VERSION) \ - --pkg evince-view-$(EV_API_VERSION) \ -+ -L$(top_builddir)/libdocument/ \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - -DEVINCE_COMPILATION \ diff --git a/extra/evolution-groupwise/PKGBUILD b/extra/evolution-groupwise/PKGBUILD new file mode 100644 index 000000000..5a79f4628 --- /dev/null +++ b/extra/evolution-groupwise/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 140166 2011-10-08 08:16:17Z ibiru $ +# Maintainer : Ionut Biru <ibiru@archlinux.org> +# Contributor: György Balló <ballogy@freestart.hu> + +pkgname=evolution-groupwise +pkgver=3.2.0 +pkgrel=1 +pkgdesc="GroupWise connector for evolution" +arch=(i686 x86_64) +url="http://projects.gnome.org/evolution/" +license=(LGPL) +depends=('evolution-data-server' 'gtkhtml4') +makedepends=(intltool evolution) +optdepends=('evolution: evolution plugin') +options=(!libtool) +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz) +sha256sums=(7c3dec3c4561931dfbc9313949dee68c4f935583fae8323ab4ca87b23b5aabb3) + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} + diff --git a/extra/evolution-sharp/PKGBUILD b/extra/evolution-sharp/PKGBUILD deleted file mode 100644 index edd8a44bf..000000000 --- a/extra/evolution-sharp/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 122598 2011-05-04 19:22:42Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=evolution-sharp -pkgver=0.21.1 -pkgrel=3 -pkgdesc="C# bindings for Novell Evolution" -arch=(i686 x86_64 'mips64el') -license=('GPL') -url="http://ftp.gnome.org/pub/GNOME/sources/evolution-sharp/" -depends=('evolution-data-server') -makedepends=('pkg-config' 'gtk-sharp-2') -options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.21/${pkgname}-${pkgver}.tar.bz2 - evolution-sharp-0.21.1-fix-retarded-version-check.patch - evolution-data-server-lib-target.patch) -sha256sums=('3cb78088e332f71b2a7958d2e8c6af3c9ff168731c8fb423aad7038cbdef3a1c' - '80f98baf3336383241deac73c3f0d3a0905c9a2a3790db7ec4bf6089a577cf5b' - '910783e0213002d40d3111b0a5bc5103ca21a8d1a33bd1a305238dc147cf1401') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i "${srcdir}/evolution-sharp-0.21.1-fix-retarded-version-check.patch" - patch -Np1 -i "${srcdir}/evolution-data-server-lib-target.patch" - autoreconf -fi - - export MONO_SHARED_DIR="${srcdir}/.wabi" - mkdir -p "${MONO_SHARED_DIR}" - - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static - make DESTDIR="${pkgdir}" install - rm -f "${pkgdir}/usr/lib/libevolutionglue.a" -} diff --git a/extra/evolution-sharp/evolution-data-server-lib-target.patch b/extra/evolution-sharp/evolution-data-server-lib-target.patch deleted file mode 100644 index a2e7b82a4..000000000 --- a/extra/evolution-sharp/evolution-data-server-lib-target.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nur evolution-sharp-0.21.1.orig/evolution/evolution-sharp.dll.config.in evolution-sharp-0.21.1/evolution/evolution-sharp.dll.config.in ---- evolution-sharp-0.21.1.orig/evolution/evolution-sharp.dll.config.in 2009-05-26 00:25:06.000000000 -0700 -+++ evolution-sharp-0.21.1/evolution/evolution-sharp.dll.config.in 2011-05-04 12:14:58.087467727 -0700 -@@ -1,7 +1,7 @@ - <configuration> -- <dllmap dll="ebook" target="libebook@EDS_VERSION@@LIB_PREFIX@.@EBOOK_SOVERSION@@LIB_SUFFIX@"/> -- <dllmap dll="ecal" target="libecal@EDS_VERSION@@LIB_PREFIX@.@ECAL_SOVERSION@@LIB_SUFFIX@"/> -- <dllmap dll="edataserver" target="libedataserver@EDS_VERSION@@LIB_PREFIX@.@EDS_SOVERSION@@LIB_SUFFIX@"/> -- <dllmap dll="ebackend" target="libebackend@EDS_VERSION@@LIB_PREFIX@.@EBACKEND_SOVERSION@@LIB_SUFFIX@"/> -- <dllmap dll="edatacal" target="libedata-cal@EDS_VERSION@@LIB_PREFIX@.@EDATACAL_SOVERSION@@LIB_SUFFIX@"/> -+ <dllmap dll="ebook" target="libebook@EDS_VERSION@@LIB_PREFIX@.10@LIB_SUFFIX@"/> -+ <dllmap dll="ecal" target="libecal@EDS_VERSION@@LIB_PREFIX@.8@LIB_SUFFIX@"/> -+ <dllmap dll="edataserver" target="libedataserver@EDS_VERSION@@LIB_PREFIX@.14@LIB_SUFFIX@"/> -+ <dllmap dll="ebackend" target="libebackend@EDS_VERSION@@LIB_PREFIX@.1@LIB_SUFFIX@"/> -+ <dllmap dll="edatacal" target="libedata-cal@EDS_VERSION@@LIB_PREFIX@.11@LIB_SUFFIX@"/> - </configuration> diff --git a/extra/evolution-sharp/evolution-sharp-0.21.1-fix-retarded-version-check.patch b/extra/evolution-sharp/evolution-sharp-0.21.1-fix-retarded-version-check.patch deleted file mode 100644 index 9a2ebe95e..000000000 --- a/extra/evolution-sharp/evolution-sharp-0.21.1-fix-retarded-version-check.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up evolution-sharp-0.21.1/configure.in.fix-retarded-version-check evolution-sharp-0.21.1/configure.in ---- evolution-sharp-0.21.1/configure.in.fix-retarded-version-check 2009-08-20 21:46:34.000000000 -0400 -+++ evolution-sharp-0.21.1/configure.in 2009-08-20 21:47:16.000000000 -0400 -@@ -16,8 +16,7 @@ fi - PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_8, evolution-data-server-1.2 >= 1.8 evolution-data-server-1.2 < 1.9, edsver="1.8", AC_MSG_RESULT([no])) - PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_9, evolution-data-server-1.2 >= 1.9 evolution-data-server-1.2 < 1.10, edsver="1.9", AC_MSG_RESULT([no])) - PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_1_10, evolution-data-server-1.2 >= 1.10 evolution-data-server-1.2 < 2.23.92, edsver="1.10", AC_MSG_RESULT([no])) --PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_2_24, evolution-data-server-1.2 >= 2.23.92 evolution-data-server-1.2 < 2.27.4, edsver="2.24", AC_MSG_RESULT([no])) --PKG_CHECK_MODULES(TOO_NEW_EDS, evolution-data-server-1.2 >= 2.27.4, edsver="unsupported", AC_MSG_RESULT([no])) -+PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER_2_24, evolution-data-server-1.2 >= 2.23.92, edsver="2.24", AC_MSG_RESULT([no])) - - if test "x$edsver" = "x1.8"; then - EDS_VERSION=-1.2 diff --git a/extra/evolution-webcal/PKGBUILD b/extra/evolution-webcal/PKGBUILD deleted file mode 100644 index d3cc3790a..000000000 --- a/extra/evolution-webcal/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 92013 2010-09-28 16:50:49Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=evolution-webcal -pkgver=2.32.0 -pkgrel=1 -pkgdesc="Evolution Web calendar" -arch=(i686 x86_64 'mips64el') -license=('GPL') -install=evolution-webcal.install -url="http://www.ximian.com" -depends=('evolution-data-server>=2.32.0') -makedepends=('intltool' 'pkgconfig' 'evolution>=2.32.0') -groups=('gnome-extra') -options=(!emptydirs) -source=(http://ftp.acc.umu.se/pub/GNOME/sources/evolution-webcal/2.32/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('b6ae8a105665771c4069be96d67e0c10f13e01417805cb3a1900c397c9bd580c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --libexecdir=/usr/lib/evolution-webcal \ - --localstatedir=/var - make - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evolution-webcal ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/extra/evolution-webcal/evolution-webcal.install b/extra/evolution-webcal/evolution-webcal.install deleted file mode 100644 index 67e4861ce..000000000 --- a/extra/evolution-webcal/evolution-webcal.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=evolution-webcal - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} diff --git a/extra/farsight2/PKGBUILD b/extra/farsight2/PKGBUILD index d8e765fb5..02144244e 100644 --- a/extra/farsight2/PKGBUILD +++ b/extra/farsight2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 128061 2011-06-21 14:53:16Z ibiru $ +# $Id: PKGBUILD 140265 2011-10-11 14:15:08Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: William Díaz <wdiaz@archlinux.us> pkgname=farsight2 -pkgver=0.0.29 +pkgver=0.0.31 pkgrel=1 pkgdesc="Audio/Video conference software for Instant Messengers" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('libnice' 'gstreamer0.10-base-plugins' 'gstreamer0.10-good' 'gstreamer0 optdepends=('gstreamer0.10-ugly-plugins: h264 codec') options=('!libtool' '!emptydirs') source=(http://farsight.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('276076f65b70236d981c288413572168') +md5sums=('3771d8268f025b28261cc1e977fab27f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/feh/PKGBUILD b/extra/feh/PKGBUILD index e3d6450e6..b7376f6bc 100644 --- a/extra/feh/PKGBUILD +++ b/extra/feh/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 138608 2011-09-27 12:17:18Z bisson $ +# $Id: PKGBUILD 140246 2011-10-10 21:07:53Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: dorphell <dorphell@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=feh -pkgver=1.16.2 +pkgver=2.0 pkgrel=1 -pkgdesc='Fast, lightweight image viewer which uses imlib2' -arch=('i686' 'x86_64' 'mips64el') +pkgdesc='Fast and light imlib2-based image viewer' url='http://feh.finalrewind.org/' license=('MIT') +arch=('i686' 'x86_64' 'mips64el') depends=('giblib' 'curl' 'libxinerama') optdepends=('perl: feh-cam, webcam wrapper for feh') makedepends=('libxt') source=("${url}${pkgname}-${pkgver}.tar.bz2") -sha1sums=('bbb530f1bca9140040052164c3f79289011c45f1') +sha1sums=('890e4f7343e7c2157f25f1011a75688adcf6c3f2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 0bbd13537..3965375d6 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 138450 2011-09-23 13:55:25Z ibiru $ +# $Id: PKGBUILD 140063 2011-10-06 07:33:35Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=ffmpeg -pkgver=20110923 +pkgver=20111003 pkgrel=1 pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ makedepends=('yasm' 'git') #git clone git://git.videolan.org/ffmpeg.git source=(ftp://ftp.archlinux.org/other/ffmpeg/${pkgname}-${pkgver}.tar.xz ffmpeg-loongson.patch) -md5sums=('36111c640a2eea19f677924ac3193ce4' +md5sums=('38139817bee918a5664c549adb487468' '081d03278559a351322157a441fabcf5') build() { diff --git a/extra/freenx/PKGBUILD b/extra/freenx/PKGBUILD index 986183143..c55c55f31 100644 --- a/extra/freenx/PKGBUILD +++ b/extra/freenx/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 135657 2011-08-17 06:43:27Z tpowa $ +# $Id: PKGBUILD 140055 2011-10-06 06:24:35Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> #Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> pkgname=freenx pkgver=0.7.3 -pkgrel=9 +pkgrel=10 pkgdesc="Free Software (GPL) Implementation of the NX Server" arch=(i686 x86_64 'mips64el') url="http://freenx.berlios.de" license=('GPL') -depends=('nxserver' 'gnu-netcat' 'openssh' 'expect' 'xorg-xauth' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage' 'xorg-xrdb' 'xorg-xpr' 'xorg-xset' 'xorg-sessreg') +depends=('nxserver' 'gnu-netcat' 'inetutils' 'openssh' 'expect' 'xorg-xauth' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage' 'xorg-xrdb' 'xorg-xpr' 'xorg-xset' 'xorg-sessreg') backup=(opt/NX/etc/node.conf) install=freenx.install source=(http://download.berlios.de/freenx/$pkgname-server-$pkgver.tar.gz @@ -17,7 +17,6 @@ source=(http://download.berlios.de/freenx/$pkgname-server-$pkgver.tar.gz freenx-latest-svn.patch remove-dialog.patch) - build() { # patch and install nxserver cd $startdir/src/$pkgname-server-$pkgver diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD index 11a13d69b..c1d48b9b3 100644 --- a/extra/gcin/PKGBUILD +++ b/extra/gcin/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 137498 2011-09-07 18:03:42Z bisson $ +# $Id: PKGBUILD 140668 2011-10-18 00:42:56Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: damir <damir@archlinux.org> pkgname=gcin -pkgver=1.6.8 -pkgrel=2 +pkgver=1.7.0 +pkgrel=1 pkgdesc='Input method server supporting various input methods' arch=('i686' 'x86_64' 'mips64el') license=('LGPL') @@ -17,18 +17,15 @@ optdepends=('qt: support for qt4 input method' 'anthy: support for anthy input method' 'libchewing: support for chewing input method') source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz" - 'qt4-lib64.patch' - 'missing.patch') -sha1sums=('c400924a8827723d7d69183bbafae13ae9e1949d' - '4307b0d7d6dc10f15909c94973c4357caf31de7e' - '791c190c8b0db2e70b0099d4d03a32417497d065') + 'qt4-lib64.patch') +sha1sums=('151d1286dc54d7f7fa230d37e89d3d0fe0845258' + '4307b0d7d6dc10f15909c94973c4357caf31de7e') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../missing.patch patch -p1 -i ../qt4-lib64.patch sed '/include suffixes-rule/a \ CFLAGS+='"${CFLAGS}"' \ diff --git a/extra/gcin/missing.patch b/extra/gcin/missing.patch deleted file mode 100644 index 3d8737392..000000000 --- a/extra/gcin/missing.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff -aur old/gen-dist new/gen-dist ---- old/gen-dist 2011-09-07 10:51:59.214132579 -0700 -+++ new/gen-dist 2011-09-07 10:53:27.534010656 -0700 -@@ -1,5 +1,5 @@ - GCIN_VERSION="gcin-`cat VERSION.gcin`" --sh gen-gtk3 -+#sh gen-gtk3 - sed -i '/^$/d' Changelog.html - rm -f tags core.* - cd .. -diff -aur old/gtk3-im/gtkimcontextgcin.c new/gtk3-im/gtkimcontextgcin.c ---- old/gtk3-im/gtkimcontextgcin.c 2011-09-07 10:51:59.224132565 -0700 -+++ new/gtk3-im/gtkimcontextgcin.c 2011-09-07 10:53:09.984034884 -0700 -@@ -128,7 +128,7 @@ - GdkWindow *client_window = context_xim->client_window; - if (!client_window) - return; -- GdkScreen *screen = gdk_drawable_get_screen (client_window); -+ GdkScreen *screen = gdk_window_get_screen (client_window); - if (!screen) - return; - -@@ -137,7 +137,7 @@ - return; - - if (!context_xim->gcin_ch) { -- if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY()))) -+ if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY_XDISPLAY(gdk_display_get_default())))) - perror("cannot open gcin_ch"); - #if 1 - context_xim->timeout_handle = 0; diff --git a/extra/gdm/2.91_fix_external_program_directories.patch b/extra/gdm/2.91_fix_external_program_directories.patch deleted file mode 100644 index 912b5cdae..000000000 --- a/extra/gdm/2.91_fix_external_program_directories.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -Nur gdm-2.91.91.orig/daemon/gdm-server.c gdm-2.91.91/daemon/gdm-server.c ---- gdm-2.91.91.orig/daemon/gdm-server.c 2011-02-17 19:27:53.000000000 -0800 -+++ gdm-2.91.91/daemon/gdm-server.c 2011-02-27 16:56:51.283347074 -0800 -@@ -131,7 +131,7 @@ - g_return_val_if_fail (GDM_IS_SERVER (server), NULL); - - error = NULL; -- command = g_strdup_printf (LIBEXECDIR "/ck-get-x11-display-device --display %s", -+ command = g_strdup_printf ("/usr/lib/ConsoleKit/ck-get-x11-display-device --display %s", - server->priv->display_name); - - g_debug ("GdmServer: Running helper %s", command); -diff -Nur gdm-2.91.91.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in gdm-2.91.91/data/greeter-autostart/gnome-settings-daemon.desktop.in.in ---- gdm-2.91.91.orig/data/greeter-autostart/gnome-settings-daemon.desktop.in.in 2011-02-17 19:27:53.000000000 -0800 -+++ gdm-2.91.91/data/greeter-autostart/gnome-settings-daemon.desktop.in.in 2011-02-26 08:43:28.700009251 -0800 -@@ -1,8 +1,8 @@ - [Desktop Entry] - Type=Application - _Name=GNOME Settings Daemon --TryExec=@LIBEXECDIR@/gnome-settings-daemon --Exec=@LIBEXECDIR@/gnome-settings-daemon -+TryExec=/usr/bin/gnome-settings-daemon -+Exec=/usr/bin/gnome-settings-daemon - OnlyShowIn=GNOME; - X-GNOME-Autostart-Phase=Initialization - X-GNOME-Autostart-Notify=true -diff -Nur gdm-2.91.91.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in gdm-2.91.91/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in ---- gdm-2.91.91.orig/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in 2011-02-17 19:27:53.000000000 -0800 -+++ gdm-2.91.91/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in 2011-02-26 08:44:06.810009153 -0800 -@@ -1,5 +1,5 @@ - [Desktop Entry] - Type=Application - _Name=PolicyKit Authentication Agent --Exec=@LIBEXECDIR@/polkit-gnome-authentication-agent-1 -+Exec=/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 - OnlyShowIn=GNOME; -diff -Nur gdm-2.91.91.orig/gui/simple-chooser/gdm-chooser-session.c gdm-2.91.91/gui/simple-chooser/gdm-chooser-session.c ---- gdm-2.91.91.orig/gui/simple-chooser/gdm-chooser-session.c 2011-02-17 19:27:53.000000000 -0800 -+++ gdm-2.91.91/gui/simple-chooser/gdm-chooser-session.c 2011-02-26 08:45:01.946675918 -0800 -@@ -131,7 +131,7 @@ - ret = FALSE; - - error = NULL; -- g_spawn_command_line_async (LIBEXECDIR "/gnome-settings-daemon", &error); -+ g_spawn_command_line_async ("/usr/bin/gnome-settings-daemon", &error); - if (error != NULL) { - g_warning ("Error starting settings daemon: %s", error->message); - g_error_free (error); diff --git a/extra/gimp-devel/PKGBUILD b/extra/gimp-devel/PKGBUILD index 8773e5900..2b80e462a 100644 --- a/extra/gimp-devel/PKGBUILD +++ b/extra/gimp-devel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136060 2011-08-22 10:24:51Z eric $ +# $Id: PKGBUILD 140571 2011-10-17 08:14:44Z jgc $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=gimp-devel pkgver=2.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="GNU Image Manipulation Program (Development Version)" arch=('i686' 'x86_64' 'mips64el') url="http://www.gimp.org/" diff --git a/extra/gimp/PKGBUILD b/extra/gimp/PKGBUILD index 78d9da1e7..eb1b6fd3f 100644 --- a/extra/gimp/PKGBUILD +++ b/extra/gimp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 130354 2011-07-05 17:55:54Z eric $ +# $Id: PKGBUILD 140569 2011-10-17 08:14:42Z jgc $ # Maintainer: tobias <tobias@archlinux.org> pkgname=gimp pkgver=2.6.11 -pkgrel=6 +pkgrel=7 pkgdesc="GNU Image Manipulation Program" arch=('i686' 'x86_64' 'mips64el') url="http://www.gimp.org/" @@ -19,18 +19,22 @@ optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cu options=('!libtool' '!makeflags') conflicts=('gimp-devel') install=gimp.install -source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl - uri-backend-libcurl.patch) +#source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl +source=(http://mirror.umoss.org/gimp/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl + uri-backend-libcurl.patch gimp-poppler-0.18.patch) md5sums=('bb2939fe13e54fc7255cef5d097bb5dd' 'bb27bc214261d36484093e857f015f38' - 'e894f4b2ffa92c71448fdd350e9b78c6') + 'e894f4b2ffa92c71448fdd350e9b78c6' + 'bfc73f80e911ed7a7d500d80973469f1') sha1sums=('2f9d596e727bdbf304fa78257c1731d9faf3934c' '110ce9798173b19a662d086ed7b882b4729f06cf' - 'a65b0ee6cd1b4345065b7b98c07f2fed15f844f4') + 'a65b0ee6cd1b4345065b7b98c07f2fed15f844f4' + '1479a6d80be7adf74f66a3b88057a5029fe892e8') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 < ../uri-backend-libcurl.patch + patch -p1 < ../gimp-poppler-0.18.patch PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \ --enable-mp --enable-gimp-console --enable-gimp-remote \ --enable-python --with-gif-compression=lzw --with-libcurl \ diff --git a/extra/gimp/gimp-poppler-0.18.patch b/extra/gimp/gimp-poppler-0.18.patch new file mode 100644 index 000000000..0715460bc --- /dev/null +++ b/extra/gimp/gimp-poppler-0.18.patch @@ -0,0 +1,476 @@ +From 69f69eed816b89be9a01a48a1f0643d1fd496118 Mon Sep 17 00:00:00 2001 +From: Nils Philippsen <nils@redhat.com> +Date: Fri, 6 May 2011 11:58:44 +0200 +Subject: [PATCH] patch: poppler-0.17 + +Squashed commit of the following: + +commit 529d940222dfc352d41fbf72de29134421aa4002 +Author: Nils Philippsen <nils@redhat.com> +Date: Fri May 6 11:50:30 2011 +0200 + + use code based on pixbufs instead of cairo surfaces + + this is done to avoid adding to libgimp, thanks to Mukund Sivaraman for + hints how to do this + +commit f8671d8767d4cdab830dc06310e96c63a88ec0fd +Author: Mukund Sivaraman <muks@banu.com> +Date: Thu Apr 21 13:57:13 2011 +0530 + + file-pdf-load: Update attribution, removing bogus copyright + (cherry picked from commit e999122e0b20b6ccd6bde3ce039bb64068fc0019) + +commit 89a78f2590d298dac2f42e6d9a3016fc5d672c70 +Author: Nils Philippsen <nils@redhat.com> +Date: Thu Apr 21 13:52:18 2011 +0200 + + file-pdf-load: Use better API + cleanups + + * fixes issues with poppler 0.17 completely + * uses new libgimp API to pass surfaces instead of pixbufs + * uses GTK+ 3 API to convert surfaces to pixbufs where available + (backported from commit 7bdadd80ba479d6ff904e276d805e16f6b940ee2) + +commit 4e92302c4a14a961f112587a0ad86696c88da2f8 +Author: Nils Philippsen <nils@redhat.com> +Date: Thu Apr 21 13:38:08 2011 +0200 + + file-pdf-load: Don't use deprecated API (bug #646947) + + (cherry picked from commit 9b3e1c91fd2eac69da6947ec9c7fbf10096ba237) + + Conflicts: + + plug-ins/common/file-pdf.c +--- + plug-ins/common/file-pdf.c | 323 ++++++++++++++++++++++++++++++++++++++------ + 1 files changed, 283 insertions(+), 40 deletions(-) + +diff --git a/plug-ins/common/file-pdf.c b/plug-ins/common/file-pdf.c +index a43b459..43c2b7d 100644 +--- a/plug-ins/common/file-pdf.c ++++ b/plug-ins/common/file-pdf.c +@@ -4,6 +4,9 @@ + * + * Copyright (C) 2005 Nathan Summers + * ++ * Some code in render_page_to_surface() borrowed from ++ * poppler.git/glib/poppler-page.cc. ++ * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or +@@ -80,16 +83,20 @@ static gboolean load_dialog (PopplerDocument *doc, + static PopplerDocument * open_document (const gchar *filename, + GError **error); + +-static GdkPixbuf * get_thumbnail (PopplerDocument *doc, ++static cairo_surface_t * get_thumb_surface (PopplerDocument *doc, ++ gint page, ++ gint preferred_size); ++ ++static GdkPixbuf * get_thumb_pixbuf (PopplerDocument *doc, + gint page, + gint preferred_size); + + static gint32 layer_from_pixbuf (gint32 image, +- const gchar *layer_name, +- gint position, +- GdkPixbuf *buf, +- gdouble progress_start, +- gdouble progress_scale); ++ const gchar *layer_name, ++ gint position, ++ GdkPixbuf *pixbuf, ++ gdouble progress_start, ++ gdouble progress_scale); + + /** + ** the following was formerly part of +@@ -433,11 +440,12 @@ run (const gchar *name, + } + else + { +- gdouble width = 0; +- gdouble height = 0; +- gdouble scale; +- gint32 image = -1; +- GdkPixbuf *pixbuf = NULL; ++ gdouble width = 0; ++ gdouble height = 0; ++ gdouble scale; ++ gint32 image = -1; ++ gint num_pages = 0; ++ GdkPixbuf *pixbuf = NULL; + + /* Possibly retrieve last settings */ + gimp_get_data (LOAD_PROC, &loadvals); +@@ -455,7 +463,10 @@ run (const gchar *name, + g_object_unref (page); + } + +- pixbuf = get_thumbnail (doc, 0, param[1].data.d_int32); ++ num_pages = poppler_document_get_n_pages (doc); ++ ++ pixbuf = get_thumb_pixbuf (doc, 0, param[1].data.d_int32); ++ + g_object_unref (doc); + } + +@@ -548,6 +559,187 @@ open_document (const gchar *filename, + return doc; + } + ++/* FIXME: Remove this someday when we depend fully on GTK+ >= 3 */ ++ ++#if (!GTK_CHECK_VERSION (3, 0, 0)) ++ ++static cairo_format_t ++gdk_cairo_format_for_content (cairo_content_t content) ++{ ++ switch (content) ++ { ++ case CAIRO_CONTENT_COLOR: ++ return CAIRO_FORMAT_RGB24; ++ case CAIRO_CONTENT_ALPHA: ++ return CAIRO_FORMAT_A8; ++ case CAIRO_CONTENT_COLOR_ALPHA: ++ default: ++ return CAIRO_FORMAT_ARGB32; ++ } ++} ++ ++static cairo_surface_t * ++gdk_cairo_surface_coerce_to_image (cairo_surface_t *surface, ++ cairo_content_t content, ++ int src_x, ++ int src_y, ++ int width, ++ int height) ++{ ++ cairo_surface_t *copy; ++ cairo_t *cr; ++ ++ copy = cairo_image_surface_create (gdk_cairo_format_for_content (content), ++ width, ++ height); ++ ++ cr = cairo_create (copy); ++ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); ++ cairo_set_source_surface (cr, surface, -src_x, -src_y); ++ cairo_paint (cr); ++ cairo_destroy (cr); ++ ++ return copy; ++} ++ ++static void ++convert_alpha (guchar *dest_data, ++ int dest_stride, ++ guchar *src_data, ++ int src_stride, ++ int src_x, ++ int src_y, ++ int width, ++ int height) ++{ ++ int x, y; ++ ++ src_data += src_stride * src_y + src_x * 4; ++ ++ for (y = 0; y < height; y++) { ++ guint32 *src = (guint32 *) src_data; ++ ++ for (x = 0; x < width; x++) { ++ guint alpha = src[x] >> 24; ++ ++ if (alpha == 0) ++ { ++ dest_data[x * 4 + 0] = 0; ++ dest_data[x * 4 + 1] = 0; ++ dest_data[x * 4 + 2] = 0; ++ } ++ else ++ { ++ dest_data[x * 4 + 0] = (((src[x] & 0xff0000) >> 16) * 255 + alpha / 2) / alpha; ++ dest_data[x * 4 + 1] = (((src[x] & 0x00ff00) >> 8) * 255 + alpha / 2) / alpha; ++ dest_data[x * 4 + 2] = (((src[x] & 0x0000ff) >> 0) * 255 + alpha / 2) / alpha; ++ } ++ dest_data[x * 4 + 3] = alpha; ++ } ++ ++ src_data += src_stride; ++ dest_data += dest_stride; ++ } ++} ++ ++static void ++convert_no_alpha (guchar *dest_data, ++ int dest_stride, ++ guchar *src_data, ++ int src_stride, ++ int src_x, ++ int src_y, ++ int width, ++ int height) ++{ ++ int x, y; ++ ++ src_data += src_stride * src_y + src_x * 4; ++ ++ for (y = 0; y < height; y++) { ++ guint32 *src = (guint32 *) src_data; ++ ++ for (x = 0; x < width; x++) { ++ dest_data[x * 3 + 0] = src[x] >> 16; ++ dest_data[x * 3 + 1] = src[x] >> 8; ++ dest_data[x * 3 + 2] = src[x]; ++ } ++ ++ src_data += src_stride; ++ dest_data += dest_stride; ++ } ++} ++ ++/** ++ * gdk_pixbuf_get_from_surface: ++ * @surface: surface to copy from ++ * @src_x: Source X coordinate within @surface ++ * @src_y: Source Y coordinate within @surface ++ * @width: Width in pixels of region to get ++ * @height: Height in pixels of region to get ++ * ++ * Transfers image data from a #cairo_surface_t and converts it to an RGB(A) ++ * representation inside a #GdkPixbuf. This allows you to efficiently read ++ * individual pixels from cairo surfaces. For #GdkWindows, use ++ * gdk_pixbuf_get_from_window() instead. ++ * ++ * This function will create an RGB pixbuf with 8 bits per channel. ++ * The pixbuf will contain an alpha channel if the @surface contains one. ++ * ++ * Return value: (transfer full): A newly-created pixbuf with a reference ++ * count of 1, or %NULL on error ++ */ ++static GdkPixbuf * ++gdk_pixbuf_get_from_surface (cairo_surface_t *surface, ++ gint src_x, ++ gint src_y, ++ gint width, ++ gint height) ++{ ++ cairo_content_t content; ++ GdkPixbuf *dest; ++ ++ /* General sanity checks */ ++ g_return_val_if_fail (surface != NULL, NULL); ++ g_return_val_if_fail (width > 0 && height > 0, NULL); ++ ++ content = cairo_surface_get_content (surface) | CAIRO_CONTENT_COLOR; ++ dest = gdk_pixbuf_new (GDK_COLORSPACE_RGB, ++ !!(content & CAIRO_CONTENT_ALPHA), ++ 8, ++ width, height); ++ ++ surface = gdk_cairo_surface_coerce_to_image (surface, content, ++ src_x, src_y, ++ width, height); ++ cairo_surface_flush (surface); ++ if (cairo_surface_status (surface) || dest == NULL) ++ { ++ cairo_surface_destroy (surface); ++ return NULL; ++ } ++ ++ if (gdk_pixbuf_get_has_alpha (dest)) ++ convert_alpha (gdk_pixbuf_get_pixels (dest), ++ gdk_pixbuf_get_rowstride (dest), ++ cairo_image_surface_get_data (surface), ++ cairo_image_surface_get_stride (surface), ++ 0, 0, ++ width, height); ++ else ++ convert_no_alpha (gdk_pixbuf_get_pixels (dest), ++ gdk_pixbuf_get_rowstride (dest), ++ cairo_image_surface_get_data (surface), ++ cairo_image_surface_get_stride (surface), ++ 0, 0, ++ width, height); ++ ++ cairo_surface_destroy (surface); ++ return dest; ++} ++ ++#endif ++ + static gint32 + layer_from_pixbuf (gint32 image, + const gchar *layer_name, +@@ -566,6 +758,54 @@ layer_from_pixbuf (gint32 image, + return layer; + } + ++static cairo_surface_t * ++render_page_to_surface (PopplerPage *page, ++ int width, ++ int height, ++ double scale) ++{ ++ cairo_surface_t *surface; ++ cairo_t *cr; ++ ++ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height); ++ cr = cairo_create (surface); ++ ++ cairo_save (cr); ++ cairo_translate (cr, 0.0, 0.0); ++ ++ if (scale != 1.0) ++ cairo_scale (cr, scale, scale); ++ ++ poppler_page_render (page, cr); ++ cairo_restore (cr); ++ ++ cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER); ++ cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); ++ cairo_paint (cr); ++ ++ cairo_destroy (cr); ++ ++ return surface; ++} ++ ++static GdkPixbuf * ++render_page_to_pixbuf (PopplerPage *page, ++ int width, ++ int height, ++ double scale) ++{ ++ GdkPixbuf *pixbuf; ++ cairo_surface_t *surface; ++ ++ surface = render_page_to_surface (page, width, height, scale); ++ pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, ++ cairo_image_surface_get_width (surface), ++ cairo_image_surface_get_height (surface)); ++ cairo_surface_destroy (surface); ++ ++ return pixbuf; ++} ++ + static gint32 + load_image (PopplerDocument *doc, + const gchar *filename, +@@ -597,7 +837,7 @@ load_image (PopplerDocument *doc, + gdouble page_width; + gdouble page_height; + +- GdkPixbuf *buf; ++ GdkPixbuf *pixbuf; + gint width; + gint height; + +@@ -627,15 +867,13 @@ load_image (PopplerDocument *doc, + gimp_image_set_resolution (image_ID, resolution, resolution); + } + +- buf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height); +- +- poppler_page_render_to_pixbuf (page, 0, 0, width, height, scale, 0, buf); ++ pixbuf = render_page_to_pixbuf (page, width, height, scale); + +- layer_from_pixbuf (image_ID, page_label, i, buf, ++ layer_from_pixbuf (image_ID, page_label, i, pixbuf, + doc_progress, 1.0 / pages->n_pages); + + g_free (page_label); +- g_object_unref (buf); ++ g_object_unref(pixbuf); + + doc_progress = (double) (i + 1) / pages->n_pages; + gimp_progress_update (doc_progress); +@@ -676,30 +914,22 @@ load_image (PopplerDocument *doc, + return image_ID; + } + +-static GdkPixbuf * +-get_thumbnail (PopplerDocument *doc, +- gint page_num, +- gint preferred_size) ++static cairo_surface_t * ++get_thumb_surface (PopplerDocument *doc, ++ gint page_num, ++ gint preferred_size) + { + PopplerPage *page; +- GdkPixbuf *pixbuf; ++ cairo_surface_t *surface; + + page = poppler_document_get_page (doc, page_num); + + if (! page) + return NULL; + +- /* XXX: Remove conditional when we depend on poppler 0.8.0, but also +- * add configure check to make sure POPPLER_WITH_GDK is enabled! +- */ +-#ifdef POPPLER_WITH_GDK +- pixbuf = poppler_page_get_thumbnail_pixbuf (page); +-#else +- pixbuf = poppler_page_get_thumbnail (page); +-#endif +- ++ surface = poppler_page_get_thumbnail (page); + +- if (! pixbuf) ++ if (! surface) + { + gdouble width; + gdouble height; +@@ -712,15 +942,28 @@ get_thumbnail (PopplerDocument *doc, + width *= scale; + height *= scale; + +- pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, +- width, height); +- +- poppler_page_render_to_pixbuf (page, +- 0, 0, width, height, scale, 0, pixbuf); ++ surface = render_page_to_surface (page, width, height, scale); + } + + g_object_unref (page); + ++ return surface; ++} ++ ++static GdkPixbuf * ++get_thumb_pixbuf (PopplerDocument *doc, ++ gint page_num, ++ gint preferred_size) ++{ ++ cairo_surface_t *surface; ++ GdkPixbuf *pixbuf; ++ ++ surface = get_thumb_surface (doc, page_num, preferred_size); ++ pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, ++ cairo_image_surface_get_width (surface), ++ cairo_image_surface_get_height (surface)); ++ cairo_surface_destroy (surface); ++ + return pixbuf; + } + +@@ -769,8 +1012,8 @@ thumbnail_thread (gpointer data) + idle_data->page_no = i; + + /* FIXME get preferred size from somewhere? */ +- idle_data->pixbuf = get_thumbnail (thread_data->document, i, +- THUMBNAIL_SIZE); ++ idle_data->pixbuf = get_thumb_pixbuf (thread_data->document, i, ++ THUMBNAIL_SIZE); + + g_idle_add (idle_set_thumbnail, idle_data); + +-- +1.7.5 diff --git a/extra/gjs/gjs-0.7.14-js185-backport.patch b/extra/gjs/gjs-0.7.14-js185-backport.patch deleted file mode 100644 index b8b2082a3..000000000 --- a/extra/gjs/gjs-0.7.14-js185-backport.patch +++ /dev/null @@ -1,436 +0,0 @@ -From cef9c0835bfd8be105ff8905083d6b51d9010b8f Mon Sep 17 00:00:00 2001 -From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> -Date: Fri, 1 Apr 2011 21:04:57 +0200 -Subject: [PATCH 1/4] Conditionally adapt to JS_DestroyScript removal - -Upstream changed the behaviour of several things about JSScripts in -http://hg.mozilla.org/mozilla-central/rev/c919a7271ac1 - -We now have to use a JSObject instead of a JSScript in certain circumstances, -and we no longer have to call JS_DestroyScript which no longer exists - -https://bugzilla.gnome.org/show_bug.cgi?id=646471 - -Conflicts: - - configure.ac ---- - configure.ac | 1 + - modules/console.c | 6 ++++++ - 2 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 715f2c3..f81704b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -160,6 +160,7 @@ AC_CHECK_LIB([mozjs], [JS_GetFunctionName], AC_DEFINE([HAVE_JS_GETFUNCTIONNAME], - AC_CHECK_LIB([mozjs], [JS_GetStringChars], AC_DEFINE([HAVE_JS_GETSTRINGCHARS], [1], [Define if we still have JS_GetStringChars]),, [$JS_LIBS]) - AC_CHECK_LIB([mozjs], [JS_StrictPropertyStub], AC_DEFINE([HAVE_JS_STRICTPROPERTYSTUB], [1], [Define if we have JS_StrictPropertyStub]),, [$JS_LIBS]) - AC_CHECK_LIB([mozjs], [JS_GetGlobalForScopeChain], AC_DEFINE([HAVE_JS_GETGLOBALFORSCOPECHAIN], [1], [Define if we have JS_GetGlobalForScopeChain]),, [$JS_LIBS]) -+AC_CHECK_LIB([mozjs], [JS_DestroyScript], AC_DEFINE([HAVE_JS_DESTROYSCRIPT], [1], [Define if we still have JS_DestroyScript]),, [$JS_LIBS]) - - AC_MSG_CHECKING([for mozilla-js >= 2 ]) - if `$PKG_CONFIG --exists $JS_PACKAGE '>=' 2`; then -diff --git a/modules/console.c b/modules/console.c -index 49f891b..e6945be 100644 ---- a/modules/console.c -+++ b/modules/console.c -@@ -161,7 +161,11 @@ gjs_console_interact(JSContext *context, - { - JSObject *object = JS_THIS_OBJECT(context, vp); - gboolean eof = FALSE; -+#ifdef HAVE_JS_DESTROYSCRIPT - JSScript *script = NULL; -+#else -+ JSObject *script = NULL; -+#endif - jsval result; - JSString *str; - GString *buffer = NULL; -@@ -219,8 +223,10 @@ gjs_console_interact(JSContext *context, - } - - next: -+#ifdef HAVE_JS_DESTROYSCRIPT - if (script) - JS_DestroyScript(context, script); -+#endif - g_string_free(buffer, TRUE); - } while (!eof); - --- -1.7.5.4 - - -From 3c8396821c78e362c8b3a89a27dcf4d32e25ee05 Mon Sep 17 00:00:00 2001 -From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com> -Date: Fri, 29 Apr 2011 01:01:03 +0200 -Subject: [PATCH 2/4] conditonally adapt to JS_BufferIsCompilableUnit changes - -Upstream added an argument to JS_BufferIsCompilableUnit in commit -http://hg.mozilla.org/mozilla-central/rev/a773890b676f -We now have to tell if the bytes are utf8 or not. - -https://bugzilla.gnome.org/show_bug.cgi?id=646471 ---- - configure.ac | 1 + - modules/console.c | 4 ++++ - 2 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f81704b..270bc46 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -161,6 +161,7 @@ AC_CHECK_LIB([mozjs], [JS_GetStringChars], AC_DEFINE([HAVE_JS_GETSTRINGCHARS], [ - AC_CHECK_LIB([mozjs], [JS_StrictPropertyStub], AC_DEFINE([HAVE_JS_STRICTPROPERTYSTUB], [1], [Define if we have JS_StrictPropertyStub]),, [$JS_LIBS]) - AC_CHECK_LIB([mozjs], [JS_GetGlobalForScopeChain], AC_DEFINE([HAVE_JS_GETGLOBALFORSCOPECHAIN], [1], [Define if we have JS_GetGlobalForScopeChain]),, [$JS_LIBS]) - AC_CHECK_LIB([mozjs], [JS_DestroyScript], AC_DEFINE([HAVE_JS_DESTROYSCRIPT], [1], [Define if we still have JS_DestroyScript]),, [$JS_LIBS]) -+AC_CHECK_LIB([mozjs], [JS_DecodeUTF8], AC_DEFINE([HAVE_JS_DECODEUTF8], [1], [Define if we have JS_DecodeUTF8]),, [$JS_LIBS]) - - AC_MSG_CHECKING([for mozilla-js >= 2 ]) - if `$PKG_CONFIG --exists $JS_PACKAGE '>=' 2`; then -diff --git a/modules/console.c b/modules/console.c -index e6945be..8e20db3 100644 ---- a/modules/console.c -+++ b/modules/console.c -@@ -196,7 +196,11 @@ gjs_console_interact(JSContext *context, - g_string_append(buffer, temp_buf); - g_free(temp_buf); - lineno++; -+#ifdef HAVE_JS_DECODEUTF8 -+ } while (!JS_BufferIsCompilableUnit(context, JS_TRUE, object, buffer->str, buffer->len)); -+#else - } while (!JS_BufferIsCompilableUnit(context, object, buffer->str, buffer->len)); -+#endif - - script = JS_CompileScript(context, object, buffer->str, buffer->len, "typein", - startline); --- -1.7.5.4 - - -From 00dd38de7ac8e82ac35c40909707fa91665c3102 Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters@verbum.org> -Date: Thu, 5 May 2011 12:49:09 -0400 -Subject: [PATCH 3/4] JS_CLASS_TRACE is a preprocessor macro, can't use - AC_CHECK_LIB - -Conflicts: - - configure.ac ---- - configure.ac | 24 ++++++++++++++++++++++++ - 1 files changed, 24 insertions(+), 0 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 270bc46..d259471 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -230,6 +230,30 @@ if test "$have_jslocale_to_unicode_const" = yes; then - AC_DEFINE([JS_LOCALETOUNICODE_NEEDS_CONST_CHAR], [1], [Define if JSLocaleToUnicode takes a const char* for its src]) - fi - -+save_CFLAGS="$CFLAGS" -+CFLAGS="$CFLAGS $JS_CFLAGS" -+AC_MSG_CHECKING([for JS_CLASS_TRACE macro]) -+AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM( -+ [[ -+ #include <jsapi.h> -+ #ifndef JS_CLASS_TRACE -+ #error "No JS_CLASS_TRACE" -+ #endif -+ ]], -+ [[(void) 0;]] -+ )], -+ [have_js_class_trace=yes], -+ [have_js_class_trace=no]) -+ -+if test "x$have_js_class_trace" = xyes; then -+ AC_MSG_RESULT([yes]) -+ AC_DEFINE([HAVE_JS_CLASS_TRACE], [1], [Define if we still have JS_CLASS_TRACE]) -+else -+ AC_MSG_RESULT([no]) -+fi -+CFLAGS="$save_CFLAGS" -+ - common_packages="gobject-2.0 >= gobject_required_version $JS_PACKAGE" - gjs_packages="gmodule-2.0 gthread-2.0 $common_packages" - gjs_gi_packages="gobject-introspection-1.0 >= 0.10.1 $common_packages" --- -1.7.5.4 - - -From 5553cdd691ffddae3e3ffa5cc75e6575a237d0b7 Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters@verbum.org> -Date: Wed, 4 May 2011 14:14:18 -0400 -Subject: [PATCH 4/4] Support compilation with standalone mozjs185 release - -Adjust the detection logic so that we look for mozjs-185.pc first. If -we have this, we can skip all kinds of insanity. - -See https://bugzilla.mozilla.org/show_bug.cgi?id=628723 -for the discussion about creating this release. - -https://bugzilla.gnome.org/show_bug.cgi?id=646369 - -Conflicts: - - configure.ac ---- - configure.ac | 218 ++++++++++++++++++++++++++++++++-------------------------- - 1 files changed, 121 insertions(+), 97 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d259471..cb54ffc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -91,124 +91,148 @@ m4_define(gobject_required_version, 2.18.0) - AC_CHECK_HEADERS([malloc.h]) - AC_CHECK_FUNCS(mallinfo) - --# Look for Spidermonkey. If js-config exists, use that; --# otherwise we try some pkgconfig files from various distributions. -+# First, try separate mozjs185 release -+AC_MSG_CHECKING([for standalone mozjs]) -+PKG_CHECK_EXISTS([mozjs185], JS_PACKAGE=mozjs185,) -+if test x$JS_PACKAGE != x; then -+ FIREFOX_JS_LIBDIR=`$PKG_CONFIG --variable=libdir $JS_PACKAGE` -+ MOZJS_IS_STANDALONE=yes -+ MOZJS_LIB=mozjs185 -+ AC_MSG_RESULT([yes]) -+ PKG_CHECK_MODULES(JS, $JS_PACKAGE) -+else -+ AC_MSG_RESULT([no]) -+ MOZJS_LIB=mozjs -+fi -+ -+# If we didn't find mozjs185 (the standalone spidermonkey); look for -+# one from Firefox/XULRunner. If js-config exists, use that; otherwise -+# we try some pkgconfig files from various distributions. - - AC_ARG_VAR([JS_CONFIG], [The js-config program to use]) --if test "$ac_cv_env_JS_CONFIG_set" != "set"; then -+if test x$JS_PACKAGE = x && test "$ac_cv_env_JS_CONFIG_set" != "set"; then - AC_PATH_PROG([JS_CONFIG], [js-config], []) - fi - --if test -n "$JS_CONFIG"; then -- JS_CFLAGS="$($JS_CONFIG --cflags)" -- JS_LIBS="$($JS_CONFIG --libs)" -- FIREFOX_JS_LIBDIR="$($JS_CONFIG --libdir)" -- JS_PACKAGE= -- -- # js-config gives almost usable CFLAGS, we must define one of XP_BEOS, -- # XP_OS2, XP_WIN or XP_UNIX -- JS_CFLAGS="$JS_CFLAGS -DXP_UNIX" --else -- ## spidermonkey .pc file name varies across distributions and Gecko version -- ## -- ## mozilla-js: Gecko 1.9, all distributions -- ## xulrunner-js: Gecko 1.8 (and earlier?) Debian/Ubuntu -- ## firefox-js: ??? -- ## -- ## Checking for mozilla-js first will hopefully get us the newest version -- ## of spidermonkey. -- PKG_CHECK_EXISTS([mozilla-js], [JS_PACKAGE=mozilla-js], -- [PKG_CHECK_EXISTS([xulrunner-js], [JS_PACKAGE=xulrunner-js], [JS_PACKAGE=firefox-js])]) -- -- PKG_CHECK_MODULES(JS, $JS_PACKAGE) -- -- ## some flavors of Firefox .pc only set sdkdir, not libdir -- FIREFOX_JS_SDKDIR=`$PKG_CONFIG --variable=sdkdir $JS_PACKAGE` -- FIREFOX_JS_LIBDIR=`$PKG_CONFIG --variable=libdir $JS_PACKAGE` -+if test x$JS_PACKAGE = x; then -+ if test -n "$JS_CONFIG"; then -+ JS_CFLAGS="$($JS_CONFIG --cflags)" -+ JS_LIBS="$($JS_CONFIG --libs)" -+ FIREFOX_JS_LIBDIR="$($JS_CONFIG --libdir)" -+ JS_PACKAGE= -+ -+ # js-config gives almost usable CFLAGS, we must define one of XP_BEOS, -+ # XP_OS2, XP_WIN or XP_UNIX -+ JS_CFLAGS="$JS_CFLAGS -DXP_UNIX" -+ else -+ ## spidermonkey .pc file name varies across distributions and Gecko version -+ ## -+ ## mozilla-js: Gecko 1.9, all distributions -+ ## xulrunner-js: Gecko 1.8 (and earlier?) Debian/Ubuntu -+ ## firefox-js: ??? -+ ## -+ ## Checking for mozilla-js first will hopefully get us the newest version -+ ## of spidermonkey. -+ if test x$JS_PACKAGE = x; then -+ PKG_CHECK_EXISTS([mozilla-js], [JS_PACKAGE=mozilla-js],) -+ -+ fi -+ if test x$JS_PACKAGE = x; then -+ PKG_CHECK_EXISTS([xulrunner-js], [JS_PACKAGE=xulrunner-js]) -+ fi -+ if test x$JS_PACKAGE = x; then -+ PKG_CHECK_EXISTS([firefox-js], [JS_PACKAGE=firefox-js]) -+ fi -+ if test x$JS_PACKAGE = x; then -+ AC_MSG_ERROR([Unable to find spidermonkey package]) -+ fi -+ -+ PKG_CHECK_MODULES(JS, $JS_PACKAGE) -+ -+ ## some flavors of Firefox .pc only set sdkdir, not libdir -+ FIREFOX_JS_SDKDIR=`$PKG_CONFIG --variable=sdkdir $JS_PACKAGE` -+ FIREFOX_JS_LIBDIR=`$PKG_CONFIG --variable=libdir $JS_PACKAGE` -+ -+ ## Ubuntu does not set libdir in mozilla-js.pc -+ if test x"$FIREFOX_JS_LIBDIR" = x ; then -+ ## Ubuntu returns xulrunner-devel as the sdkdir, but for the -+ ## libdir we want the runtime location on the target system, -+ ## so can't use -devel. -+ ## The library is in the non-devel directory also. -+ ## Don't ask me why it's in two places. -+ FIREFOX_JS_LIBDIR=`echo "$FIREFOX_JS_SDKDIR" | sed -e 's/-devel//g'` -+ -+ if ! test -d "$FIREFOX_JS_LIBDIR" ; then -+ FIREFOX_JS_LIBDIR= -+ fi -+ fi -+ fi - -- ## Ubuntu does not set libdir in mozilla-js.pc - if test x"$FIREFOX_JS_LIBDIR" = x ; then -- ## Ubuntu returns xulrunner-devel as the sdkdir, but for the -- ## libdir we want the runtime location on the target system, -- ## so can't use -devel. -- ## The library is in the non-devel directory also. -- ## Don't ask me why it's in two places. -- FIREFOX_JS_LIBDIR=`echo "$FIREFOX_JS_SDKDIR" | sed -e 's/-devel//g'` -- -- if ! test -d "$FIREFOX_JS_LIBDIR" ; then -- FIREFOX_JS_LIBDIR= -- fi -+ AC_MSG_ERROR([Could not figure out where Firefox JavaScript library lives]) - fi --fi - --if test x"$FIREFOX_JS_LIBDIR" = x ; then -- AC_MSG_ERROR([Could not figure out where Firefox JavaScript library lives]) -+ ## workaround for Ubuntu Hardy bug where mozilla-js.pc gives CFLAGS -+ ## -I.../stable while jsapi.h is in .../unstable -+ AC_MSG_CHECKING([if SpiderMonkey needs extra compiler flags]) -+ save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS $JS_CFLAGS" -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <jsapi.h>]])], -+ [js_extra_cflags_needed=no], -+ [js_extra_cflags_needed=yes]) -+ CFLAGS="$save_CFLAGS" -+ AC_MSG_RESULT([$js_extra_cflags_needed]) -+ -+ JS_EXTRA_CFLAGS= -+ if test "$js_extra_cflags_needed" = yes; then -+ try_cflags="-I`$PKG_CONFIG --variable=includedir $JS_PACKAGE`/unstable" -+ AC_MSG_CHECKING([if $try_cflags works]) -+ save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS $JS_CFLAGS $try_cflags" -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <jsapi.h>]])], -+ [AC_MSG_RESULT([yes]) -+ JS_EXTRA_CFLAGS="$try_cflags"], -+ [AC_MSG_RESULT([no])]) -+ CFLAGS="$save_CFLAGS" -+ -+ if test x"$JS_EXTRA_CFLAGS" = x; then -+ AC_MSG_ERROR([Unable to determine extra compiler flags needed]) -+ fi -+ fi -+ AC_SUBST([JS_EXTRA_CFLAGS]) -+ -+ AC_MSG_CHECKING([for mozilla-js >= 1.9.2 ]) -+ if `$PKG_CONFIG --exists $JS_PACKAGE '>=' 1.9.2`; then -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_ERROR([$JS_PACKAGE >= 1.9.2 is required]) -+ fi - fi - - AC_SUBST(JS_PACKAGE) - AC_SUBST(FIREFOX_JS_LIBDIR) - --AC_MSG_CHECKING([for mozilla-js >= 1.9.2 ]) --if `$PKG_CONFIG --exists $JS_PACKAGE '>=' 1.9.2`; then -- AC_MSG_RESULT([yes]) --else -- AC_MSG_ERROR([$JS_PACKAGE >= 1.9.2 is required]) --fi -- --AC_CHECK_LIB([mozjs], [JS_GetStringBytes], AC_DEFINE([HAVE_JS_GETSTRINGBYTES], [1], [Define if we still have JS_GetStringBytes]),, [$JS_LIBS]) --AC_CHECK_LIB([mozjs], [JS_GetFunctionName], AC_DEFINE([HAVE_JS_GETFUNCTIONNAME], [1], [Define if we still have JS_GetFunctionName]),, [$JS_LIBS]) --AC_CHECK_LIB([mozjs], [JS_GetStringChars], AC_DEFINE([HAVE_JS_GETSTRINGCHARS], [1], [Define if we still have JS_GetStringChars]),, [$JS_LIBS]) --AC_CHECK_LIB([mozjs], [JS_StrictPropertyStub], AC_DEFINE([HAVE_JS_STRICTPROPERTYSTUB], [1], [Define if we have JS_StrictPropertyStub]),, [$JS_LIBS]) --AC_CHECK_LIB([mozjs], [JS_GetGlobalForScopeChain], AC_DEFINE([HAVE_JS_GETGLOBALFORSCOPECHAIN], [1], [Define if we have JS_GetGlobalForScopeChain]),, [$JS_LIBS]) --AC_CHECK_LIB([mozjs], [JS_DestroyScript], AC_DEFINE([HAVE_JS_DESTROYSCRIPT], [1], [Define if we still have JS_DestroyScript]),, [$JS_LIBS]) --AC_CHECK_LIB([mozjs], [JS_DecodeUTF8], AC_DEFINE([HAVE_JS_DECODEUTF8], [1], [Define if we have JS_DecodeUTF8]),, [$JS_LIBS]) -- --AC_MSG_CHECKING([for mozilla-js >= 2 ]) --if `$PKG_CONFIG --exists $JS_PACKAGE '>=' 2`; then -- AC_MSG_RESULT([yes]) -- AC_DEFINE(HAVE_MOZJS_2, [1], [Define if mozilla-js is at least 2]) -- AC_CHECK_LIB([mozjs], [JS_FreezeObject], AC_DEFINE([HAVE_JS_FREEZEOBJECT], [1], [Define if we have JS_FreezeObject]), -+AC_CHECK_LIB([$MOZJS_LIB], [JS_GetStringBytes], AC_DEFINE([HAVE_JS_GETSTRINGBYTES], [1], [Define if we still have JS_GetStringBytes]),, [$JS_LIBS]) -+AC_CHECK_LIB([$MOZJS_LIB], [JS_GetFunctionName], AC_DEFINE([HAVE_JS_GETFUNCTIONNAME], [1], [Define if we still have JS_GetFunctionName]),, [$JS_LIBS]) -+AC_CHECK_LIB([$MOZJS_LIB], [JS_GetStringChars], AC_DEFINE([HAVE_JS_GETSTRINGCHARS], [1], [Define if we still have JS_GetStringChars]),, [$JS_LIBS]) -+AC_CHECK_LIB([$MOZJS_LIB], [JS_StrictPropertyStub], AC_DEFINE([HAVE_JS_STRICTPROPERTYSTUB], [1], [Define if we have JS_StrictPropertyStub]),, [$JS_LIBS]) -+AC_CHECK_LIB([$MOZJS_LIB], [JS_GetGlobalForScopeChain], AC_DEFINE([HAVE_JS_GETGLOBALFORSCOPECHAIN], [1], [Define if we have JS_GetGlobalForScopeChain]),, [$JS_LIBS]) -+AC_CHECK_LIB([$MOZJS_LIB], [JS_CLASS_TRACE], AC_DEFINE([HAVE_JS_CLASS_TRACE], [1], [Define if we still have JS_CLASS_TRACE]),, [$JS_LIBS]) -+AC_CHECK_LIB([$MOZJS_LIB], [JS_DestroyScript], AC_DEFINE([HAVE_JS_DESTROYSCRIPT], [1], [Define if we still have JS_DestroyScript]),, [$JS_LIBS]) -+AC_CHECK_LIB([$MOZJS_LIB], [JS_DecodeUTF8], AC_DEFINE([HAVE_JS_DECODEUTF8], [1], [Define if we have JS_DecodeUTF8]),, [$JS_LIBS]) -+AC_CHECK_LIB([$MOZJS_LIB], [JS_FreezeObject], AC_DEFINE([HAVE_JS_FREEZEOBJECT], [1], [Define if we have JS_FreezeObject]), - , [$JS_LIBS]) -- AC_CHECK_LIB([mozjs], [JS_IsScriptFrame], AC_DEFINE([HAVE_JS_ISSCRIPTFRAME], [1], [Define if we have JS_IsScriptFrame]), -+AC_CHECK_LIB([$MOZJS_LIB], [JS_IsScriptFrame], AC_DEFINE([HAVE_JS_ISSCRIPTFRAME], [1], [Define if we have JS_IsScriptFrame]), - , [$JS_LIBS]) -- AC_CHECK_LIB([mozjs], [JS_EndPC], AC_DEFINE([HAVE_JS_ENDPC], [1], [Define if we have JS_EndPC]), -+AC_CHECK_LIB([$MOZJS_LIB], [JS_EndPC], AC_DEFINE([HAVE_JS_ENDPC], [1], [Define if we have JS_EndPC]), - , [$JS_LIBS]) -- AC_CHECK_LIB([mozjs], [JS_NewCompartmentAndGlobalObject], -+AC_CHECK_LIB([$MOZJS_LIB], [JS_NewCompartmentAndGlobalObject], - AC_DEFINE([HAVE_JS_NEWCOMPARTMENTANDGLOBALOBJECT], [1], [Define if we have JS_NewCompartmentAndGlobalObject]), - , [$JS_LIBS]) - --else -- AC_MSG_RESULT([no]) --fi -- --## workaround for Ubuntu Hardy bug where mozilla-js.pc gives CFLAGS --## -I.../stable while jsapi.h is in .../unstable --AC_MSG_CHECKING([if SpiderMonkey needs extra compiler flags]) --save_CFLAGS="$CFLAGS" --CFLAGS="$CFLAGS $JS_CFLAGS" --AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <jsapi.h>]])], -- [js_extra_cflags_needed=no], -- [js_extra_cflags_needed=yes]) --CFLAGS="$save_CFLAGS" --AC_MSG_RESULT([$js_extra_cflags_needed]) -- --JS_EXTRA_CFLAGS= --if test "$js_extra_cflags_needed" = yes; then -- try_cflags="-I`$PKG_CONFIG --variable=includedir $JS_PACKAGE`/unstable" -- AC_MSG_CHECKING([if $try_cflags works]) -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $JS_CFLAGS $try_cflags" -- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <jsapi.h>]])], -- [AC_MSG_RESULT([yes]) -- JS_EXTRA_CFLAGS="$try_cflags"], -- [AC_MSG_RESULT([no])]) -- CFLAGS="$save_CFLAGS" -- -- if test x"$JS_EXTRA_CFLAGS" = x; then -- AC_MSG_ERROR([Unable to determine extra compiler flags needed]) -- fi -+if test x$MOZJS_IS_STANDALONE = xyes || `$PKG_CONFIG --exists $JS_PACKAGE '>=' 2`; then -+ AC_DEFINE(HAVE_MOZJS_2, [1], [Define if mozilla-js is at least 2]) - fi --AC_SUBST([JS_EXTRA_CFLAGS]) - - AC_MSG_CHECKING([whether JSLocaleToUnicode takes a const char*]) - save_CFLAGS="$CFLAGS" --- -1.7.5.4 - diff --git a/extra/glade/PKGBUILD b/extra/glade/PKGBUILD index 154ffc963..0b90d2b4c 100644 --- a/extra/glade/PKGBUILD +++ b/extra/glade/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 138085 2011-09-16 07:41:36Z ibiru $ +# $Id: PKGBUILD 140391 2011-10-12 06:17:27Z ibiru $ # Maintainer: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=glade -pkgver=3.10.0 -pkgrel=2 +pkgver=3.10.2 +pkgrel=1 pkgdesc="User interface builder for GTK+ and GNOME." arch=(i686 x86_64 mips64el) license=('GPL' 'LGPL') depends=('gtk3' 'libxml2' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'pygobject2-devel') +makedepends=('intltool' 'python2' 'gtk-doc' 'gobject-introspection' 'python2-gobject2') optdepends=('python2: Python widgets support') options=('!libtool') url="http://glade.gnome.org/" install=glade.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2) -sha256sums=('7e6a1423f1697d8b40618d0b01f0ebff572ccb80f5818a36af0971c5d1d94253') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('0f59ffbd7e1e595396593fedcdb85c51fd01ed05d5ef7c6f724f3a0bcf24d5c4') build() { cd "${srcdir}/$pkgname-${pkgver}" diff --git a/extra/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch b/extra/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch deleted file mode 100644 index c26f422aa..000000000 --- a/extra/glib-networking/fix_G_TLS_ERROR_EOF_handling.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 9e2aaacafb45d51cff57dc033f4b5ad5bc1a1762 Mon Sep 17 00:00:00 2001 -From: Dan Winship <danw@gnome.org> -Date: Fri, 16 Sep 2011 15:29:29 +0000 -Subject: gnutls: fix G_TLS_ERROR_EOF handling with gnutls 3.0 - -gnutls 3.0 has a new error code for "peer closed connection without -sending a Close packet", so add some #ifdefs to do the right thing -with either 2.x or 3.x. - -https://bugzilla.gnome.org/show_bug.cgi?id=659233 ---- -diff --git a/tls/gnutls/gtlsconnection-gnutls.c b/tls/gnutls/gtlsconnection-gnutls.c -index c1ede79..0f792bb 100644 ---- a/tls/gnutls/gtlsconnection-gnutls.c -+++ b/tls/gnutls/gtlsconnection-gnutls.c -@@ -132,7 +132,10 @@ struct _GTlsConnectionGnutlsPrivate - - GError *error; - GCancellable *cancellable; -- gboolean blocking, eof; -+ gboolean blocking; -+#ifndef GNUTLS_E_PREMATURE_TERMINATION -+ gboolean eof; -+#endif - GIOCondition internal_direction; - }; - -@@ -548,19 +551,22 @@ end_gnutls_io (GTlsConnectionGnutls *gnutls, - gnutls->priv->need_handshake = TRUE; - return status; - } -- else if (status == GNUTLS_E_UNEXPECTED_PACKET_LENGTH) -+ else if ( -+#ifdef GNUTLS_E_PREMATURE_TERMINATION -+ status == GNUTLS_E_PREMATURE_TERMINATION -+#else -+ status == GNUTLS_E_UNEXPECTED_PACKET_LENGTH && gnutls->priv->eof -+#endif -+ ) - { -- if (gnutls->priv->eof) -+ if (gnutls->priv->require_close_notify) - { -- if (gnutls->priv->require_close_notify) -- { -- g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_EOF, -- _("TLS connection closed unexpectedly")); -- return status; -- } -- else -- return 0; -+ g_set_error_literal (error, G_TLS_ERROR, G_TLS_ERROR_EOF, -+ _("TLS connection closed unexpectedly")); -+ return status; - } -+ else -+ return 0; - } - - return status; -@@ -795,8 +801,10 @@ g_tls_connection_gnutls_pull_func (gnutls_transport_ptr_t transport_data, - - if (ret < 0) - set_gnutls_error (gnutls, G_IO_IN); -+#ifndef GNUTLS_E_PREMATURE_TERMINATION - else if (ret == 0) - gnutls->priv->eof = TRUE; -+#endif - - return ret; - } --- -cgit v0.9.0.2 diff --git a/extra/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch b/extra/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch deleted file mode 100644 index 19a168638..000000000 --- a/extra/glib-networking/glib-networking-2.29.9-port-gnutls3-API.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: tls/gnutls/gtlsconnection-gnutls.c -=================================================================== ---- tls/gnutls/gtlsconnection-gnutls.c -+++ tls/gnutls/gtlsconnection-gnutls.c 2011-08-04 00:40:33.194189789 +0200 -@@ -860,9 +860,10 @@ - - if (peer_certificate) - { -- int status; -+ int verify_ret; -+ unsigned int status; - -- status = gnutls_certificate_verify_peers (gnutls->priv->session); -+ verify_ret = gnutls_certificate_verify_peers2 (gnutls->priv->session, &status); - peer_certificate_errors = g_tls_certificate_gnutls_convert_flags (status); - if (peer_certificate_errors) - { diff --git a/extra/gnome-mag/PKGBUILD b/extra/gnome-mag/PKGBUILD deleted file mode 100644 index 8b08b9ee5..000000000 --- a/extra/gnome-mag/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 123655 2011-05-12 07:09:30Z jgc $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gnome-mag -pkgver=0.16.3 -pkgrel=1 -pkgdesc="Gnome magnifier" -arch=(i686 x86_64 'mips64el') -license=('GPL') -url="http://www.gnome.org" -depends=('at-spi>=1.32.0') -makedepends=('intltool' 'pkgconfig') -options=('!libtool') -groups=('gnome-extra') -source=(http://ftp.gnome.org/pub/gnome/sources/gnome-mag/0.16/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('1ea1b1218ce621226b0397c4c548db29636ab663da7943440327e04345916d99') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var - make - make DESTDIR="${pkgdir}" install -} diff --git a/extra/gnome-media/gnome_volume_control_fix_channel_bars.patch b/extra/gnome-media/gnome_volume_control_fix_channel_bars.patch deleted file mode 100644 index 9d3de0331..000000000 --- a/extra/gnome-media/gnome_volume_control_fix_channel_bars.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur gnome-media-2.32.0/gnome-volume-control/src/gvc-channel-bar.c gnome-media-2.32.0.new/gnome-volume-control/src/gvc-channel-bar.c ---- gnome-media-2.32.0/gnome-volume-control/src/gvc-channel-bar.c 2010-09-28 15:46:15.000000000 +0100 -+++ gnome-media-2.32.0.new/gnome-volume-control/src/gvc-channel-bar.c 2010-12-31 15:14:23.964994328 +0000 -@@ -449,7 +449,7 @@ - /* Switch side scroll to vertical */ - if (direction == GDK_SCROLL_RIGHT) - direction = GDK_SCROLL_UP; -- else if (GDK_SCROLL_LEFT) -+ else if (direction == GDK_SCROLL_LEFT) - direction = GDK_SCROLL_DOWN; - } - diff --git a/extra/gnome-phone-manager/PKGBUILD b/extra/gnome-phone-manager/PKGBUILD index fe515d90b..6304baeba 100644 --- a/extra/gnome-phone-manager/PKGBUILD +++ b/extra/gnome-phone-manager/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 139309 2011-10-01 18:58:06Z ibiru $ +# $Id: PKGBUILD 140561 2011-10-17 08:06:31Z heftig $ # Maintainer: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-phone-manager -pkgver=0.67 +pkgver=0.68 pkgrel=1 pkgdesc="Control your mobile phone from your GNOME desktop." arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool' 'gnome-common') options=('!emptydirs' '!libtool') install=gnome-phone-manager.install source=(http://ftp.gnome.org/pub/GNOME/sources/gnome-phone-manager/${pkgver}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('bb21c57b8bbe0481bccb373765f9d42f260f6005f2d9c55878bfc511a5541caf') +sha256sums=('3777b62ee36492274532ece965f4688600457014f17a6f21dd01fb63bbb77f8f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/gnome-phone-manager/git-update.patch b/extra/gnome-phone-manager/git-update.patch deleted file mode 100644 index cd2430be9..000000000 --- a/extra/gnome-phone-manager/git-update.patch +++ /dev/null @@ -1,3052 +0,0 @@ -diff --git a/configure.in b/configure.in -index f43ee35..2338f4b 100644 ---- a/configure.in -+++ b/configure.in -@@ -45,7 +45,7 @@ PKG_CHECK_MODULES(TMP_EVO, libebook-1.2, - PKG_CHECK_MODULES(LIBGSM, glib-2.0 gobject-2.0 $GNOKII_REQS gthread-2.0 bluez $evo_pc_file) - - PKG_CHECK_MODULES(PHONEMGR, gtk+-2.0 >= 2.18 glib-2.0 >= 2.25.0 -- libcanberra-gtk gdk-pixbuf-2.0 gconf-2.0 -+ libcanberra-gtk gconf-2.0 - $GNOME_BLUETOOTH_REQS $evo_pc_file - gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1 - gtkspell-2.0 -diff --git a/data/gnome-phone-manager.1 b/data/gnome-phone-manager.1 -index abffb72..0ea62db 100644 ---- a/data/gnome-phone-manager.1 -+++ b/data/gnome-phone-manager.1 -@@ -1,13 +1,13 @@ --.TH "GNOME-PHONE-MANAGER" "1" "January 2011" "Francesco Namuri" "User Commands" -+.TH "GNOME-PHONE-MANAGER" "1" "June 2011" "Francesco Namuri" "User Commands" - .SH "NAME" - gnome\-phone\-manager \- Manage your mobile phone - .SH "USAGE" - .B gnome-phone-manager --[\-\-identify\ <baddr>] [\-\-config] [\-d|\-\-debug]] [\-\-display=DISPLAY] -+[\-\-identify\=PORT] [\-\-config=PORT] [\-d|\-\-debug] [\-\-display=DISPLAY] - .SH "DESCRIPTION" - This manual page documents briefly the \fBgnome\-phone\-manager\fR command. - --\fBgnome\-phone\-manager\fR is a program created to allow you to control aspects of your mobile phone from your GNOME 2 desktop. -+\fBgnome\-phone\-manager\fR is a program created to allow you to control aspects of your mobile phone from your GNOME desktop. - .TP - Current features include: - .BR \- -@@ -17,10 +17,10 @@ Runs in the background; indicates status on the panel notification area, - Display on\-screen alert when text message (SMS) arrives, - .br - .BR \- --Text message (SMS) sending facility, -+Text message (SMS) sending facility with Evolution Addressbook integration, - .br - .BR \- --Evolution Addressbook integration. -+Sync phone clock with the computer's. - .SH "OPTIONS" - .SS "Help Options:" - .TP -@@ -55,6 +55,6 @@ X display to use - .SH "SEE ALSO" - Homepage: http://live.gnome.org/PhoneManager - .SH "AUTHOR" --\fBgnome\-phone\-manager\fR was written by Bastien Nocera <<hadess@hadess.net>> and Edd Dumbill <edd@usefullinc.com> -+\fBgnome\-phone\-manager\fR was written by Bastien Nocera <hadess@hadess.net> and Edd Dumbill <edd@usefullinc.com> - - This manual page was written by Francesco Namuri <francesco@namuri.it> for the Debian project (but may be used by others). -diff --git a/po/da.po b/po/da.po -index 95bfc91..e35d83c 100644 ---- a/po/da.po -+++ b/po/da.po -@@ -1,127 +1,133 @@ - # Danish translation for phonemgr. --# Copyright (C) 2009 phonemgr & Joe Hansen. -+# Copyright (C) 2011 phonemgr & Joe Hansen. - # This file is distributed under the same license as the phonemgr package. --# Joe Hansen <joedalton2@yahoo.dk>, 2009. -+# Joe Hansen <joedalton2@yahoo.dk>, 2009, 2011. - # - msgid "" - msgstr "" - "Project-Id-Version: phonemgr master\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2009-12-03 23:46+0100\n" --"PO-Revision-Date: 2009-12-01 22:41+0200\n" -+"POT-Creation-Date: 2011-03-26 14:52+0100\n" -+"PO-Revision-Date: 2011-03-17 22:41+0200\n" - "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" - "Language-Team: Danish <dansk@dansk-gruppen.dk>\n" -+"Language: da\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:152 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:153 - #, c-format - msgid "Cannot get contact: %s" - msgstr "Kan ikke få kontakt: %s" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:185 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:186 - #, c-format - msgid "Could not find contact: %s" - msgstr "Kunne ikke finde kontakt: %s" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:411 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:414 - msgid "Cannot create searchable view." - msgstr "Kan ikke oprette søgbar visning." - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:883 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:886 - msgid "Success" - msgstr "Succes" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:885 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:888 - msgid "An argument was invalid." - msgstr "Et argument var ugyldigt." - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:887 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:890 - msgid "The address book is busy." - msgstr "Adressebogen er optaget." - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:889 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:892 - msgid "The address book is offline." - msgstr "Adressebogen er offline." - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:891 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:894 - msgid "The address book does not exist." - msgstr "Adressebogen eksisterer ikke." - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:893 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:896 - msgid "The \"Me\" contact does not exist." - msgstr "Kontakten \"Mig\" eksisterer ikke." - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:895 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:898 - msgid "The address book is not loaded." - msgstr "Adressebogen er ikke indlæst." - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:897 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:900 - msgid "The address book is already loaded." - msgstr "Adressebogen er allerede indlæst." - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:899 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:902 - msgid "Permission was denied when accessing the address book." - msgstr "Adgang blev nægtet under tilgang til adressebogen." - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:901 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:904 - msgid "The contact was not found." - msgstr "Kontakten blev ikke fundet." - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:903 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:906 - msgid "This contact ID already exists." - msgstr "Dette kontakt-id eksisterer allerede." - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:905 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:908 - msgid "The protocol is not supported." - msgstr "Protokollen er ikke understøttet." - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:907 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:910 - msgid "The operation was cancelled." - msgstr "Handlingen blev afbrudt." - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:909 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:912 - msgid "The operation could not be cancelled." - msgstr "Handlingen kunne ikke afbrydes." - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:911 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:914 - msgid "The address book authentication failed." - msgstr "Godkendelse af adressebogen mislykkedes." - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:913 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:916 - msgid "" - "Authentication is required to access the address book and was not given." - msgstr "" - "Godkendelse er krævet for at tilgå adressebogen og denne blev ikke givet." - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:915 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:918 - msgid "A secure connection is not available." - msgstr "En sikker forbindelse er ikke tilgængelig." - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:917 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:920 - msgid "A CORBA error occurred whilst accessing the address book." - msgstr "En CORBA-fejl opstod under tilgang til adressebogen." - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:919 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:922 - msgid "The address book source does not exist." - msgstr "Adressebogkilden eksisterer ikke." - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:921 - #: ../cut-n-paste/e-contact-entry/e-contact-entry.c:924 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:927 - msgid "An unknown error occurred." - msgstr "En ukendt fejl opstod." - --#: ../cut-n-paste/gconf-bridge/gconf-bridge.c:1221 -+#: ../cut-n-paste/gconf-bridge/gconf-bridge.c:1233 - #, c-format - msgid "GConf error: %s" - msgstr "GConf-fejl: %s" - --#: ../cut-n-paste/gconf-bridge/gconf-bridge.c:1231 -+#: ../cut-n-paste/gconf-bridge/gconf-bridge.c:1238 - msgid "All further errors shown only on terminal." - msgstr "Alle yderligere fejl vises kun i terminal." - -+#. Translators: "device" is a phone or a modem -+#: ../gnome-bluetooth/phonemgr.c:133 -+msgid "Use this device with Phone Manager" -+msgstr "Brug denne enhed med telefonhåndteringen" -+ - #. translators: the '%s' will be substituted with '/dev/ttyS0' - #. or similar - #: ../src/connection.c:124 -@@ -138,7 +144,7 @@ msgstr "Forbundet til enhed på %s" - msgid "Failed connection to device on %s" - msgstr "Mislykket forbindelse til enhed på %s" - --#: ../src/gnome-phone-manager.desktop.in.h:1 ../src/menu.c:49 ../src/menu.c:51 -+#: ../src/gnome-phone-manager.desktop.in.h:1 ../src/menu.c:50 ../src/menu.c:52 - msgid "Phone Manager" - msgstr "Telefonhåndtering" - -@@ -166,6 +172,10 @@ msgstr "Ikke forbundet" - msgid "Show model name of a specific device" - msgstr "Vis modelnavn på en specifik enhed" - -+#: ../src/main.c:38 ../src/main.c:39 -+msgid "PORT" -+msgstr "PORT" -+ - #: ../src/main.c:39 - msgid "Write the configuration file for gnokii debugging" - msgstr "Skriv konfigurationsfilen for fejlsøgning i gnokii" -@@ -182,48 +192,48 @@ msgstr "Vis versionsinformation og afslut" - msgid "- Manage your mobile phone" - msgstr "- Håndter din mobiltelefon" - --#: ../src/main.c:72 -+#: ../src/main.c:74 - #, c-format - msgid "gnome-phone-manager version %s\n" - msgstr "gnome-phone-manager version %s\n" - --#: ../src/menu.c:40 -+#: ../src/menu.c:43 -+msgid "Send and receive messages from your mobile phone." -+msgstr "Send og modtag beskeder fra din mobiltelefon." -+ -+#: ../src/menu.c:55 - msgid "translator_credits" - msgstr "" --"Joe Hansen <joedalton2@yahoo.dk>, 2009.\n" -+"Joe Hansen, 2009, 2011.\n" - "\n" - "Dansk-gruppen <dansk@dansk-gruppen.dk>\n" - "Mere info: http://www.dansk-gruppen.dk" - --#: ../src/menu.c:44 --msgid "Send and receive messages from your mobile phone." --msgstr "Send og modtag beskeder fra din mobiltelefon." -- --#: ../src/menu.c:56 -+#: ../src/menu.c:57 - msgid "Phone Manager website" - msgstr "Telefonhåndteringens hjemmeside" - --#: ../src/menu.c:87 -+#: ../src/menu.c:88 - msgid "_Send Message" - msgstr "_Send besked" - --#: ../src/ui.c:166 -+#: ../src/ui.c:111 - msgid "New text message received" - msgstr "Ny tekstbesked modtaget" - --#: ../src/ui.c:331 -+#: ../src/ui.c:277 - msgid "Message too long!" - msgstr "Besked for lang!" - --#: ../data/phonemgr.glade.h:1 -+#: ../data/phonemgr.ui.h:1 - msgid "Alerting" - msgstr "Alarmerer" - --#: ../data/phonemgr.glade.h:2 -+#: ../data/phonemgr.ui.h:2 - msgid "Alternative device filename, e.g. /dev/ttyS3" - msgstr "Alternativt enhedsfilnavn, for eksempel /dev/ttyS3" - --#: ../data/phonemgr.glade.h:3 -+#: ../data/phonemgr.ui.h:3 - msgid "" - "Always try and reconnect whenever a connection is not immediately available. " - "Use this with Bluetooth to ensure your phone connects whenever it comes in " -@@ -233,136 +243,136 @@ msgstr "" - "tilgængelig. Brug denne med Bluetooth for at sikre at din telefon forbinder " - "så snart den er inden for rækkevidde." - --#: ../data/phonemgr.glade.h:4 -+#: ../data/phonemgr.ui.h:4 - msgid "Automated Tasks" - msgstr "Automatiske opgaver" - --#: ../data/phonemgr.glade.h:5 -+#: ../data/phonemgr.ui.h:5 - msgid "Automatically _retry connections" - msgstr "Forsøg automatisk at forbinde _igen" - --#: ../data/phonemgr.glade.h:6 -+#: ../data/phonemgr.ui.h:6 - msgid "Characters left:" - msgstr "Tegn tilbage:" - --#: ../data/phonemgr.glade.h:7 -+#: ../data/phonemgr.ui.h:7 - msgid "Connect using an alternative serial device" - msgstr "Forbind med brug af en alternativ serielenhed" - --#: ../data/phonemgr.glade.h:8 -+#: ../data/phonemgr.ui.h:8 - msgid "Connect using infrared communication" - msgstr "Forbind med brug af infrarød kommunikation" - --#: ../data/phonemgr.glade.h:9 -+#: ../data/phonemgr.ui.h:9 - msgid "Connect using serial port 1, also known as COM1 or /dev/ttyS0" - msgstr "Forbind med brug af serielport 1, også kendt som COM1 eller /dev/ttyS0" - --#: ../data/phonemgr.glade.h:10 -+#: ../data/phonemgr.ui.h:10 - msgid "Connect using serial port 2, also known as COM2 or /dev/ttyS1" - msgstr "Forbind med brug af serielport 2, også kendt som COM2 eller /dev/ttyS1" - --#: ../data/phonemgr.glade.h:11 -+#: ../data/phonemgr.ui.h:11 - msgid "Connection" - msgstr "Forbindelse" - --#: ../data/phonemgr.glade.h:12 -+#: ../data/phonemgr.ui.h:12 - msgid "Date:" - msgstr "Dato:" - --#: ../data/phonemgr.glade.h:13 -+#: ../data/phonemgr.ui.h:13 - msgid "Enter the text message you want to send." - msgstr "Indtast tekstbeskeden du ønsker at sende." - --#: ../data/phonemgr.glade.h:14 -+#: ../data/phonemgr.ui.h:14 - msgid "Enter your text message" - msgstr "Indtast din tekstbesked" - --#: ../data/phonemgr.glade.h:15 -+#: ../data/phonemgr.ui.h:15 - msgid "I_nfra red (/dev/ircomm0)" - msgstr "I_nfrarød (/dev/ircomm0)" - --#: ../data/phonemgr.glade.h:16 -+#: ../data/phonemgr.ui.h:16 - msgid "Interface" - msgstr "Grænseflade" - --#: ../data/phonemgr.glade.h:17 -+#: ../data/phonemgr.ui.h:17 - msgid "Message Received" - msgstr "Besked modtaget" - --#: ../data/phonemgr.glade.h:18 -+#: ../data/phonemgr.ui.h:18 - msgid "Other _port" - msgstr "Anden _port" - --#: ../data/phonemgr.glade.h:19 -+#: ../data/phonemgr.ui.h:19 - msgid "Phone Connection" - msgstr "Telefonforbindelse" - --#: ../data/phonemgr.glade.h:20 -+#: ../data/phonemgr.ui.h:20 - msgid "Phone Manager Preferences" - msgstr "Indstillinger for telefonhåndtering" - --#: ../data/phonemgr.glade.h:21 -+#: ../data/phonemgr.ui.h:21 - msgid "Play _sound when messages arrive" - msgstr "Afspil _lyd når beskeder ankommer" - --#: ../data/phonemgr.glade.h:22 -+#: ../data/phonemgr.ui.h:22 - msgid "Send Message" - msgstr "Send besked" - --#: ../data/phonemgr.glade.h:23 -+#: ../data/phonemgr.ui.h:23 - msgid "Sender:" - msgstr "Afsender:" - --#: ../data/phonemgr.glade.h:24 -+#: ../data/phonemgr.ui.h:24 - msgid "Serial port _1 (/dev/ttyS0)" - msgstr "Serielport _1 (/dev/ttyS0)" - --#: ../data/phonemgr.glade.h:25 -+#: ../data/phonemgr.ui.h:25 - msgid "Serial port _2 (/dev/ttyS1)" - msgstr "Serielport _2 (/dev/ttyS1)" - --#: ../data/phonemgr.glade.h:26 -+#: ../data/phonemgr.ui.h:26 - msgid "Synchronise phone's _time and date" - msgstr "Synkroniser telefonens _tid og dato" - --#: ../data/phonemgr.glade.h:27 -+#: ../data/phonemgr.ui.h:27 - msgid "Synchronise phone's time and date with the computer's clock" - msgstr "Synkroniser telefonens tid og dato med computerens ur" - --#: ../data/phonemgr.glade.h:28 -+#: ../data/phonemgr.ui.h:28 - msgid "Use Bluetooth wireless networking to connect to your phone" - msgstr "Brug Bluetooths trådløse netværk til at forbinde til din telefon" - --#: ../data/phonemgr.glade.h:29 -+#: ../data/phonemgr.ui.h:29 - msgid "You have received a message" - msgstr "Du har modtaget en besked" - --#: ../data/phonemgr.glade.h:30 -+#: ../data/phonemgr.ui.h:30 - msgid "_Bluetooth" - msgstr "_Bluetooth" - --#: ../data/phonemgr.glade.h:31 -+#: ../data/phonemgr.ui.h:31 - msgid "_Message:" - msgstr "_Besked:" - - #. This is a receipt from the SMS server saying the message has been delivered to the recipient's phone --#: ../data/phonemgr.glade.h:33 -+#: ../data/phonemgr.ui.h:33 - msgid "_Notify when message is delivered" - msgstr "_Giv besked når besked er leveret" - --#: ../data/phonemgr.glade.h:34 -+#: ../data/phonemgr.ui.h:34 - msgid "_Pop-up window for new messages" - msgstr "_Pop op-vindue til nye beskeder" - --#: ../data/phonemgr.glade.h:35 -+#: ../data/phonemgr.ui.h:35 - msgid "_Recipient:" - msgstr "_Modtager:" - --#: ../data/phonemgr.glade.h:36 -+#: ../data/phonemgr.ui.h:36 - msgid "_Reply" - msgstr "_Svar" - --#: ../data/phonemgr.glade.h:37 -+#: ../data/phonemgr.ui.h:37 - msgid "_Send" - msgstr "_Send" - -diff --git a/po/de.po b/po/de.po -index 94da8ec..0488597 100644 ---- a/po/de.po -+++ b/po/de.po -@@ -3,16 +3,15 @@ - # This file is distributed under the same license as the phonemgr package. - # Hendrik Brandt <heb@gnome-de.org>, 2004-2005. - # Jens Seidel <jseidel@cvs.gnome.org>, 2005. --# Mario Blättermann <mariobl@gnome.org>, 2009, 2010. --# -+# Mario Blättermann <mariobl@gnome.org>, 2009-2011. - # - msgid "" - msgstr "" - "Project-Id-Version: phonemgr master\n" - "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" - "phone-manager&component=general\n" --"POT-Creation-Date: 2010-12-12 15:33+0000\n" --"PO-Revision-Date: 2010-12-17 14:50+0100\n" -+"POT-Creation-Date: 2011-02-15 20:00+0000\n" -+"PO-Revision-Date: 2011-02-26 22:23+0100\n" - "Last-Translator: Mario Blättermann <mariobl@gnome.org>\n" - "Language-Team: German <gnome-de@gnome.org>\n" - "MIME-Version: 1.0\n" -@@ -128,6 +127,11 @@ msgstr "GConf-Fehler: %s" - msgid "All further errors shown only on terminal." - msgstr "Alle weiteren Fehlermeldungen werden nur im Terminal angezeigt." - -+#. Translators: "device" is a phone or a modem -+#: ../gnome-bluetooth/phonemgr.c:133 -+msgid "Use this device with Phone Manager" -+msgstr "Dieses Gerät mit der Telefonverwaltung verwenden" -+ - #. translators: the '%s' will be substituted with '/dev/ttyS0' - #. or similar - #: ../src/connection.c:124 -@@ -172,14 +176,14 @@ msgstr "Nicht verbunden" - msgid "Show model name of a specific device" - msgstr "Modellname eines bestimmten Geräts anzeigen" - -+#: ../src/main.c:38 ../src/main.c:39 -+msgid "PORT" -+msgstr "PORT" -+ - #: ../src/main.c:39 - msgid "Write the configuration file for gnokii debugging" - msgstr "Konfigurationsdatei für gnokii-Debugging schreiben" - --#: ../src/main.c:39 --msgid "PORT" --msgstr "PORT" -- - #: ../src/main.c:40 - msgid "Enable debug" - msgstr "Debugging aktivieren" -@@ -192,7 +196,7 @@ msgstr "Versionsinformationen anzeigen und beenden" - msgid "- Manage your mobile phone" - msgstr "- Verwalten Ihres Mobiltelefons" - --#: ../src/main.c:72 -+#: ../src/main.c:74 - #, c-format - msgid "gnome-phone-manager version %s\n" - msgstr "gnome-phone-manager version %s\n" -@@ -216,23 +220,23 @@ msgstr "Phone-Manager-Webseite" - msgid "_Send Message" - msgstr "Nachrichten _senden" - --#: ../src/ui.c:166 -+#: ../src/ui.c:111 - msgid "New text message received" - msgstr "Neue Nachricht erhalten" - --#: ../src/ui.c:331 -+#: ../src/ui.c:277 - msgid "Message too long!" - msgstr "Ihre Nachricht ist zu lang!" - --#: ../data/phonemgr.glade.h:1 -+#: ../data/phonemgr.ui.h:1 - msgid "Alerting" - msgstr "Benachrichtigung" - --#: ../data/phonemgr.glade.h:2 -+#: ../data/phonemgr.ui.h:2 - msgid "Alternative device filename, e.g. /dev/ttyS3" - msgstr "Anderer Gerätename, z.B. /dev/ttyS3" - --#: ../data/phonemgr.glade.h:3 -+#: ../data/phonemgr.ui.h:3 - msgid "" - "Always try and reconnect whenever a connection is not immediately available. " - "Use this with Bluetooth to ensure your phone connects whenever it comes in " -@@ -243,142 +247,142 @@ msgstr "" - "dass Ihr Telefon jedes Mal verbunden wird, sobald es in Bluetooth-Reichweite " - "kommt." - --#: ../data/phonemgr.glade.h:4 -+#: ../data/phonemgr.ui.h:4 - msgid "Automated Tasks" - msgstr "Automatisierte Aufgaben" - --#: ../data/phonemgr.glade.h:5 -+#: ../data/phonemgr.ui.h:5 - msgid "Automatically _retry connections" - msgstr "Verbindung automatisch wieder herstellen" - --#: ../data/phonemgr.glade.h:6 -+#: ../data/phonemgr.ui.h:6 - msgid "Characters left:" - msgstr "Verbleibende Zeichen:" - --#: ../data/phonemgr.glade.h:7 -+#: ../data/phonemgr.ui.h:7 - msgid "Connect using an alternative serial device" - msgstr "Zum Verbinden ein anderes serielles Gerät verwenden" - --#: ../data/phonemgr.glade.h:8 -+#: ../data/phonemgr.ui.h:8 - msgid "Connect using infrared communication" - msgstr "Zum Verbinden die Infrarotschnittstelle verwenden" - --#: ../data/phonemgr.glade.h:9 -+#: ../data/phonemgr.ui.h:9 - msgid "Connect using serial port 1, also known as COM1 or /dev/ttyS0" - msgstr "" - "Zum Verbinden die serielle Schnittstelle 1 verwenden (auch COM1 oder /dev/" - "ttyS0)" - --#: ../data/phonemgr.glade.h:10 -+#: ../data/phonemgr.ui.h:10 - msgid "Connect using serial port 2, also known as COM2 or /dev/ttyS1" - msgstr "" - "Zum Verbinden die serielle Schnittstelle 2 verwenden (auch COM2 oder /dev/" - "ttyS1)" - --#: ../data/phonemgr.glade.h:11 -+#: ../data/phonemgr.ui.h:11 - msgid "Connection" - msgstr "Verbindung" - --#: ../data/phonemgr.glade.h:12 -+#: ../data/phonemgr.ui.h:12 - msgid "Date:" - msgstr "Datum:" - --#: ../data/phonemgr.glade.h:13 -+#: ../data/phonemgr.ui.h:13 - msgid "Enter the text message you want to send." - msgstr "Bitte geben Sie die zu verschickende Textnachricht ein." - --#: ../data/phonemgr.glade.h:14 -+#: ../data/phonemgr.ui.h:14 - msgid "Enter your text message" - msgstr "Bitte geben Sie Ihre Textnachricht ein" - --#: ../data/phonemgr.glade.h:15 -+#: ../data/phonemgr.ui.h:15 - msgid "I_nfra red (/dev/ircomm0)" - msgstr "_Infrarot (/dev/ircomm0)" - --#: ../data/phonemgr.glade.h:16 -+#: ../data/phonemgr.ui.h:16 - msgid "Interface" - msgstr "Schnittstelle" - --#: ../data/phonemgr.glade.h:17 -+#: ../data/phonemgr.ui.h:17 - msgid "Message Received" - msgstr "Nachricht erhalten" - --#: ../data/phonemgr.glade.h:18 -+#: ../data/phonemgr.ui.h:18 - msgid "Other _port" - msgstr "Anderer _Port" - --#: ../data/phonemgr.glade.h:19 -+#: ../data/phonemgr.ui.h:19 - msgid "Phone Connection" - msgstr "Telefonverbindung" - --#: ../data/phonemgr.glade.h:20 -+#: ../data/phonemgr.ui.h:20 - msgid "Phone Manager Preferences" - msgstr "Einstellungen der Telefonverwaltung" - --#: ../data/phonemgr.glade.h:21 -+#: ../data/phonemgr.ui.h:21 - msgid "Play _sound when messages arrive" - msgstr "Einen _Klang abspielen, wenn eine neue Nachricht eintrifft" - --#: ../data/phonemgr.glade.h:22 -+#: ../data/phonemgr.ui.h:22 - msgid "Send Message" - msgstr "Nachricht versenden" - --#: ../data/phonemgr.glade.h:23 -+#: ../data/phonemgr.ui.h:23 - msgid "Sender:" - msgstr "Sender:" - --#: ../data/phonemgr.glade.h:24 -+#: ../data/phonemgr.ui.h:24 - msgid "Serial port _1 (/dev/ttyS0)" - msgstr "Serielle Schnittstelle _1 (/dev/ttyS0)" - --#: ../data/phonemgr.glade.h:25 -+#: ../data/phonemgr.ui.h:25 - msgid "Serial port _2 (/dev/ttyS1)" - msgstr "Serielle Schnittstelle _2 (/dev/ttyS1)" - --#: ../data/phonemgr.glade.h:26 -+#: ../data/phonemgr.ui.h:26 - msgid "Synchronise phone's _time and date" - msgstr "Zei_t und Datum des Mobiltelefons abgleichen" - --#: ../data/phonemgr.glade.h:27 -+#: ../data/phonemgr.ui.h:27 - msgid "Synchronise phone's time and date with the computer's clock" - msgstr "Abgleich der Uhr des Telefons mit der des Rechners" - --#: ../data/phonemgr.glade.h:28 -+#: ../data/phonemgr.ui.h:28 - msgid "Use Bluetooth wireless networking to connect to your phone" - msgstr "" - "Wenn diese Option ausgewählt ist, wird das drahtlose Bluetooth-Netzwerk " - "verwendet, um eine Verbindung mit Ihrem Telefon herzustellen" - --#: ../data/phonemgr.glade.h:29 -+#: ../data/phonemgr.ui.h:29 - msgid "You have received a message" - msgstr "Sie haben eine Nachricht erhalten" - --#: ../data/phonemgr.glade.h:30 -+#: ../data/phonemgr.ui.h:30 - msgid "_Bluetooth" - msgstr "_Bluetooth" - --#: ../data/phonemgr.glade.h:31 -+#: ../data/phonemgr.ui.h:31 - msgid "_Message:" - msgstr "_Nachricht:" - - #. This is a receipt from the SMS server saying the message has been delivered to the recipient's phone --#: ../data/phonemgr.glade.h:33 -+#: ../data/phonemgr.ui.h:33 - msgid "_Notify when message is delivered" - msgstr "Be_nachrichtigen, wenn eine neue Nachricht eintrifft" - --#: ../data/phonemgr.glade.h:34 -+#: ../data/phonemgr.ui.h:34 - msgid "_Pop-up window for new messages" - msgstr "_Dialogfenster für neue Nachrichten" - --#: ../data/phonemgr.glade.h:35 -+#: ../data/phonemgr.ui.h:35 - msgid "_Recipient:" - msgstr "_Empfänger:" - --#: ../data/phonemgr.glade.h:36 -+#: ../data/phonemgr.ui.h:36 - msgid "_Reply" - msgstr "_Antworten" - --#: ../data/phonemgr.glade.h:37 -+#: ../data/phonemgr.ui.h:37 - msgid "_Send" - msgstr "_Senden" - -@@ -461,163 +465,3 @@ msgid "Whether to synchronise the phone clock with the computer's." - msgstr "" - "Legt fest, ob die Uhr des Telefons mit der des Rechners abgeglichen werden " - "soll." -- --#~ msgid "Selection mode" --#~ msgstr "Auswahlmodus" -- --#~ msgid "The selection mode" --#~ msgstr "Der Auswahlmodus" -- --#~ msgid "Sorted" --#~ msgstr "Geordnet" -- --#~ msgid "Icon list is sorted" --#~ msgstr "Symbolliste ist geordnet" -- --#~ msgid "Sort order" --#~ msgstr "Sortierreihenfolge" -- --#~ msgid "Sort direction the icon list should use" --#~ msgstr "Sortierrichtung der Symbolliste" -- --#~ msgid "Icon padding" --#~ msgstr "Symbolabstand" -- --#~ msgid "Number of pixels between icons" --#~ msgstr "Anzahl der Pixel zwischen zwei Symbolen" -- --#~ msgid "Top margin" --#~ msgstr "Oberer Rand" -- --#~ msgid "Number of pixels in top margin" --#~ msgstr "Anzahl der Pixel des oberen Randes" -- --#~ msgid "Bottom margin" --#~ msgstr "Unterer Rand" -- --#~ msgid "Number of pixels in bottom margin" --#~ msgstr "Anzahl der Pixel des unteren Randes" -- --#~ msgid "Left margin" --#~ msgstr "Linker Rand" -- --#~ msgid "Number of pixels in left margin" --#~ msgstr "Anzahl der Pixel des linken Randes" -- --#~ msgid "Right margin" --#~ msgstr "Rechter Rand" -- --#~ msgid "Number of pixels in right margin" --#~ msgstr "Anzahl der Pixel des rechten Randes" -- --#~ msgid "Selection Box Color" --#~ msgstr "Auswahlboxfarbe" -- --#~ msgid "Color of the selection box" --#~ msgstr "Die Farbe der Auswahlbox" -- --#~ msgid "Selection Box Alpha" --#~ msgstr "Auswahlbox-Alphakanal" -- --#~ msgid "Opacity of the selection box" --#~ msgstr "Deckkraft der Auswahlbox" -- --#~ msgid "Pixbuf" --#~ msgstr "Pixbuf" -- --#~ msgid "A GdkPixbuf to display" --#~ msgstr "Ein anzuzeigender GdkPixbuf" -- --#~ msgid "Filename" --#~ msgstr "Dateiname" -- --#~ msgid "Filename to load and display" --#~ msgstr "Der Name der zu ladende und anzuzeigende Datei" -- --#~ msgid "Stock ID" --#~ msgstr "Stock ID" -- --#~ msgid "Stock ID for a stock image to display" --#~ msgstr "Stock ID für ein anzuzeigendes Stock-Image" -- --#~ msgid "Animation" --#~ msgstr "Animation" -- --#~ msgid "GdkPixbufAnimation to display" --#~ msgstr "Eine anzuzeigende GdkPixbufAnimation" -- --#~ msgid "Image type" --#~ msgstr "Bildtyp" -- --#~ msgid "The representation being used for image data" --#~ msgstr "Die zu verwendende Darstellung für Bilddaten" -- --#~ msgid "Size" --#~ msgstr "Größe" -- --#~ msgid "The size of the icon" --#~ msgstr "Die Größe des Symbols" -- --#~ msgid "Blinking" --#~ msgstr "Blinkend" -- --#~ msgid "Whether or not the status icon is blinking" --#~ msgstr "Legen Sie hier fest, ob das Statussymbol blinken soll" -- --#~ msgid "Orientation" --#~ msgstr "Ausrichtung" -- --#~ msgid "The orientation of the tray." --#~ msgstr "Die Ausrichtung des Benachrichtigungsfeldes" -- --#~ msgid "" --#~ "<span weight=\"bold\" size=\"larger\">Couldn't find notification area</" --#~ "span>\n" --#~ "\n" --#~ "Phone Manager uses the notification area to display information and " --#~ "provide access to message sending and preferences. You can add it by right-" --#~ "clicking on your panel and choosing <i>Add to Panel -> Utility -> " --#~ "Notification Area</i>." --#~ msgstr "" --#~ "<span weight=\"bold\" size=\"larger\">Benachrichtigungsfeld konnte nicht " --#~ "gefunden werden</span>\n" --#~ "\n" --#~ "Die Telefonverwaltung verwendet das Benachrichtigungsfeld um Informationen " --#~ "anzuzeigen und außerdem um es Ihnen zu ermöglichen Nachrichten zu " --#~ "versenden und Einstellungen vorzunehmen. Sie können das " --#~ "Benachrichtigungsfeld zu Ihrem Panel hinzufügen, in dem Sie es mit der " --#~ "rechten Maustaste anklicken, »Zum Panel hinzufügen...« auswählen und " --#~ "anschließend im erscheindenen Dialog»Benachrichtigungsfeld« markieren und " --#~ "es mit »Hinzufügen« hinzufügen." -- --#~ msgid "Couldn't create phone listener." --#~ msgstr "Der Telefonempfänger konnte nicht angelegt werden." -- --#~ msgid "No Bluetooth device chosen." --#~ msgstr "Es wurde kein Bluetooth-Gerät ausgewählt." -- --#~ msgid "/dev/ttyS2" --#~ msgstr "/dev/ttyS2" -- --#~ msgid "<b>Error Handling</b>" --#~ msgstr "<b>Fehlerbehandlung</b>" -- --#~ msgid "<span weight=\"bold\" size=\"larger\">Enter your text message</span>" --#~ msgstr "" --#~ "<span weight=\"bold\" size=\"larger\">Bitte geben Sie Ihre Textnachricht " --#~ "ein</span>" -- --#~ msgid "" --#~ "<span weight=\"bold\" size=\"larger\">You have received a message</span>" --#~ msgstr "" --#~ "<span weight=\"bold\" size=\"larger\">Sie haben eine Nachricht erhalten</" --#~ "span>" -- --#~ msgid "Choo_se" --#~ msgstr "Au_swählen" -- --#~ msgid "Number of characters left in the message" --#~ msgstr "Die Anzahl der Zeichen, die für diese Nachricht verbleiben" -- --#~ msgid "message body" --#~ msgstr "Nachrichtenkörper" -diff --git a/po/fr.po b/po/fr.po -index cfacc58..a723c09 100644 ---- a/po/fr.po -+++ b/po/fr.po -@@ -1,20 +1,21 @@ - # French translation of phonemgr. --# Copyright (C) 2003-2009 The Free Software Foundation, Inc. -+# Copyright (C) 2003-2011 The Free Software Foundation, Inc. - # This file is distributed under the GNU General Public License Version 2. - # - # Gaël Chamoulaud (strider) <strider@freespiders.org>, 2003. - # Audrey Simons <asimons@redhat.com>, 2004. - # Jonathan Ernst <jonathan@ernstfamily.ch>, 2006. - # Robert-André Mauchin <zebob.m@pengzone.org>, 2007-2008. -+# Bruno Brouard <annoa.b@gmail.com>, 2011. - # - msgid "" - msgstr "" - "Project-Id-Version: phonemgr 0.4\n" - "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" - "phone-manager&component=general\n" --"POT-Creation-Date: 2010-12-12 15:33+0000\n" --"PO-Revision-Date: 2009-10-16 23:38+0200\n" --"Last-Translator: Claude Paroz <claude@2xlibre.net>\n" -+"POT-Creation-Date: 2011-02-15 20:00+0000\n" -+"PO-Revision-Date: 2011-03-20 12:51+0100\n" -+"Last-Translator: Bruno Brouard <annoa.b@gmail.com>\n" - "Language-Team: GNOME French Team <gnomefr@traduc.org>\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" -@@ -128,6 +129,11 @@ msgstr "Erreur GConf : %s" - msgid "All further errors shown only on terminal." - msgstr "Toutes les futures erreurs apparaissent uniquement dans le terminal." - -+#. Translators: "device" is a phone or a modem -+#: ../gnome-bluetooth/phonemgr.c:133 -+msgid "Use this device with Phone Manager" -+msgstr "Utiliser ce périphérique avec Phone Manager" -+ - #. translators: the '%s' will be substituted with '/dev/ttyS0' - #. or similar - #: ../src/connection.c:124 -@@ -173,14 +179,14 @@ msgstr "Non connecté" - msgid "Show model name of a specific device" - msgstr "Afficher le modèle d'un périphérique spécifique" - -+#: ../src/main.c:38 ../src/main.c:39 -+msgid "PORT" -+msgstr "PORT" -+ - #: ../src/main.c:39 - msgid "Write the configuration file for gnokii debugging" - msgstr "Écrire le fichier de configuration pour le débogage de gnokii" - --#: ../src/main.c:39 --msgid "PORT" --msgstr "PORT" -- - #: ../src/main.c:40 - msgid "Enable debug" - msgstr "Activer le débogage" -@@ -193,7 +199,7 @@ msgstr "Afficher les informations de version et quitter" - msgid "- Manage your mobile phone" - msgstr "- Gestion de votre téléphone portable" - --#: ../src/main.c:72 -+#: ../src/main.c:74 - #, c-format - msgid "gnome-phone-manager version %s\n" - msgstr "gnome-phone-manager version %s\n" -@@ -218,23 +224,23 @@ msgstr "Site Web de Phone Manager" - msgid "_Send Message" - msgstr "Envoyer le me_ssage" - --#: ../src/ui.c:166 -+#: ../src/ui.c:111 - msgid "New text message received" - msgstr "Nouveau message texte reçu" - --#: ../src/ui.c:331 -+#: ../src/ui.c:277 - msgid "Message too long!" - msgstr "Message trop long !" - --#: ../data/phonemgr.glade.h:1 -+#: ../data/phonemgr.ui.h:1 - msgid "Alerting" - msgstr "Avertir" - --#: ../data/phonemgr.glade.h:2 -+#: ../data/phonemgr.ui.h:2 - msgid "Alternative device filename, e.g. /dev/ttyS3" - msgstr "Autre fichier de périphérique, par exemple /dev/ttyS3" - --#: ../data/phonemgr.glade.h:3 -+#: ../data/phonemgr.ui.h:3 - msgid "" - "Always try and reconnect whenever a connection is not immediately available. " - "Use this with Bluetooth to ensure your phone connects whenever it comes in " -@@ -244,138 +250,138 @@ msgstr "" - "immédiatement disponible. Utilisez ceci avec Bluetooth afin de vous assurer " - "que votre téléphone se connecte dès qu'il devient à portée." - --#: ../data/phonemgr.glade.h:4 -+#: ../data/phonemgr.ui.h:4 - msgid "Automated Tasks" - msgstr "Tâches automatisées" - --#: ../data/phonemgr.glade.h:5 -+#: ../data/phonemgr.ui.h:5 - msgid "Automatically _retry connections" - msgstr "Tentatives de _reconnexion automatiques" - --#: ../data/phonemgr.glade.h:6 -+#: ../data/phonemgr.ui.h:6 - msgid "Characters left:" - msgstr "Caractères restants :" - --#: ../data/phonemgr.glade.h:7 -+#: ../data/phonemgr.ui.h:7 - msgid "Connect using an alternative serial device" - msgstr "Se connecter par un autre périphérique série" - --#: ../data/phonemgr.glade.h:8 -+#: ../data/phonemgr.ui.h:8 - msgid "Connect using infrared communication" - msgstr "Se connecter par communication infrarouge" - --#: ../data/phonemgr.glade.h:9 -+#: ../data/phonemgr.ui.h:9 - msgid "Connect using serial port 1, also known as COM1 or /dev/ttyS0" - msgstr "Se connecter par le port série 1, aussi appelé COM1 ou /dev/ttyS0" - --#: ../data/phonemgr.glade.h:10 -+#: ../data/phonemgr.ui.h:10 - msgid "Connect using serial port 2, also known as COM2 or /dev/ttyS1" - msgstr "Se connecter par le port série 2, aussi appelé COM2 ou /dev/ttyS1" - --#: ../data/phonemgr.glade.h:11 -+#: ../data/phonemgr.ui.h:11 - msgid "Connection" - msgstr "Connexion" - --#: ../data/phonemgr.glade.h:12 -+#: ../data/phonemgr.ui.h:12 - msgid "Date:" - msgstr "Date :" - --#: ../data/phonemgr.glade.h:13 -+#: ../data/phonemgr.ui.h:13 - msgid "Enter the text message you want to send." - msgstr "Saisissez le message texte à envoyer." - --#: ../data/phonemgr.glade.h:14 -+#: ../data/phonemgr.ui.h:14 - msgid "Enter your text message" - msgstr "Saisissez le message texte" - --#: ../data/phonemgr.glade.h:15 -+#: ../data/phonemgr.ui.h:15 - msgid "I_nfra red (/dev/ircomm0)" - msgstr "I_nfrarouge (/dev/ircomm0)" - --#: ../data/phonemgr.glade.h:16 -+#: ../data/phonemgr.ui.h:16 - msgid "Interface" - msgstr "Interface" - --#: ../data/phonemgr.glade.h:17 -+#: ../data/phonemgr.ui.h:17 - msgid "Message Received" - msgstr "Message reçu" - --#: ../data/phonemgr.glade.h:18 -+#: ../data/phonemgr.ui.h:18 - msgid "Other _port" - msgstr "Autre _port" - --#: ../data/phonemgr.glade.h:19 -+#: ../data/phonemgr.ui.h:19 - msgid "Phone Connection" - msgstr "Connexion au téléphone" - --#: ../data/phonemgr.glade.h:20 -+#: ../data/phonemgr.ui.h:20 - msgid "Phone Manager Preferences" - msgstr "Préférences de Phone Manager" - --#: ../data/phonemgr.glade.h:21 -+#: ../data/phonemgr.ui.h:21 - msgid "Play _sound when messages arrive" - msgstr "Jouer un _son à l'arrivée d'un message" - --#: ../data/phonemgr.glade.h:22 -+#: ../data/phonemgr.ui.h:22 - msgid "Send Message" - msgstr "Envoyer le message" - --#: ../data/phonemgr.glade.h:23 -+#: ../data/phonemgr.ui.h:23 - msgid "Sender:" - msgstr "Expéditeur :" - --#: ../data/phonemgr.glade.h:24 -+#: ../data/phonemgr.ui.h:24 - msgid "Serial port _1 (/dev/ttyS0)" - msgstr "Port série _1 (/dev/ttyS0)" - --#: ../data/phonemgr.glade.h:25 -+#: ../data/phonemgr.ui.h:25 - msgid "Serial port _2 (/dev/ttyS1)" - msgstr "Port série _2 (/dev/ttyS1)" - --#: ../data/phonemgr.glade.h:26 -+#: ../data/phonemgr.ui.h:26 - msgid "Synchronise phone's _time and date" - msgstr "Synchroniser l'_heure et la date du téléphone" - --#: ../data/phonemgr.glade.h:27 -+#: ../data/phonemgr.ui.h:27 - msgid "Synchronise phone's time and date with the computer's clock" - msgstr "" - "Synchronise l'heure et la date du téléphone avec celles de l'ordinateur" - --#: ../data/phonemgr.glade.h:28 -+#: ../data/phonemgr.ui.h:28 - msgid "Use Bluetooth wireless networking to connect to your phone" - msgstr "" - "Utiliser la communication Bluetooth pour se connecter à votre téléphone" - --#: ../data/phonemgr.glade.h:29 -+#: ../data/phonemgr.ui.h:29 - msgid "You have received a message" - msgstr "Vous avez reçu un message" - --#: ../data/phonemgr.glade.h:30 -+#: ../data/phonemgr.ui.h:30 - msgid "_Bluetooth" - msgstr "_Bluetooth" - --#: ../data/phonemgr.glade.h:31 -+#: ../data/phonemgr.ui.h:31 - msgid "_Message:" - msgstr "_Message :" - - #. This is a receipt from the SMS server saying the message has been delivered to the recipient's phone --#: ../data/phonemgr.glade.h:33 -+#: ../data/phonemgr.ui.h:33 - msgid "_Notify when message is delivered" - msgstr "_Demander un accusé de réception" - --#: ../data/phonemgr.glade.h:34 -+#: ../data/phonemgr.ui.h:34 - msgid "_Pop-up window for new messages" - msgstr "Afficher les nouveaux messages dans une fenêtre _pop-up" - --#: ../data/phonemgr.glade.h:35 -+#: ../data/phonemgr.ui.h:35 - msgid "_Recipient:" - msgstr "Destinatai_re :" - --#: ../data/phonemgr.glade.h:36 -+#: ../data/phonemgr.ui.h:36 - msgid "_Reply" - msgstr "_Répondre" - --#: ../data/phonemgr.glade.h:37 -+#: ../data/phonemgr.ui.h:37 - msgid "_Send" - msgstr "_Envoyer" - -@@ -413,7 +419,7 @@ msgid "" - "The device node for the serial device to connect to. Requires " - "connection_type to be 4 to be used." - msgstr "" --"Le nœud de périphérique pour le périphérique série auquel se connecter." -+"Le nœud de périphérique pour le périphérique série auquel se connecter. " - "Nécessite que « connection_type » soit défini à 4 pour être utilisé." - - #: ../data/gnome-phone-manager.schemas.in.h:7 -diff --git a/po/he.po b/po/he.po -index e73207c..384af21 100644 ---- a/po/he.po -+++ b/po/he.po -@@ -6,14 +6,14 @@ msgid "" - msgstr "" - "Project-Id-Version: gnome-phone-manager\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2011-01-26 17:39+0200\n" --"PO-Revision-Date: 2011-01-26 18:02+0200\n" -+"POT-Creation-Date: 2011-02-28 19:27+0200\n" -+"PO-Revision-Date: 2011-02-28 19:27+0200\n" - "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n" - "Language-Team: Gezer (Hebrew) <gezer@lists.launchpad.net>\n" --"Language: he\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -+"Language: he\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" - "X-Generator: Virtaal 0.7.0-beta4\n" - "X-Project-Style: gnome\n" -@@ -126,6 +126,11 @@ msgstr "שגיאת GConf: %s" - msgid "All further errors shown only on terminal." - msgstr "כל שאר השגיאות מופיעות רק במסוף." - -+#. Translators: "device" is a phone or a modem -+#: ../gnome-bluetooth/phonemgr.c:133 -+msgid "Use this device with Phone Manager" -+msgstr "שימוש בהתקן זה עם Phone Manager" -+ - #. translators: the '%s' will be substituted with '/dev/ttyS0' - #. or similar - #: ../src/connection.c:124 -@@ -142,7 +147,7 @@ msgstr "מחובר להתקן שב־%s" - msgid "Failed connection to device on %s" - msgstr "החיבור להתקן שב־%s נכשל" - --#: ../src/gnome-phone-manager.desktop.in.h:1 ../src/menu.c:49 ../src/menu.c:51 -+#: ../src/gnome-phone-manager.desktop.in.h:1 ../src/menu.c:51 ../src/menu.c:53 - msgid "Phone Manager" - msgstr "מנהל הטלפונים" - -@@ -203,31 +208,31 @@ msgstr "ירון שהרבני <sh.yaron@gmail.com>" - msgid "Send and receive messages from your mobile phone." - msgstr "קבלה ושליחה של הודעות טקסט אל ומהטלפון הנייד שלך." - --#: ../src/menu.c:56 -+#: ../src/menu.c:58 - msgid "Phone Manager website" - msgstr "האתר של מנהל הטלפונים" - --#: ../src/menu.c:87 -+#: ../src/menu.c:89 - msgid "_Send Message" - msgstr "_שליחת הודעה" - --#: ../src/ui.c:166 -+#: ../src/ui.c:111 - msgid "New text message received" - msgstr "התקבלה הודעת טקסט חדשה" - --#: ../src/ui.c:331 -+#: ../src/ui.c:277 - msgid "Message too long!" - msgstr "ההודעה ארוכה מדי!" - --#: ../data/phonemgr.glade.h:1 -+#: ../data/phonemgr.ui.h:1 - msgid "Alerting" - msgstr "התרעה" - --#: ../data/phonemgr.glade.h:2 -+#: ../data/phonemgr.ui.h:2 - msgid "Alternative device filename, e.g. /dev/ttyS3" - msgstr "שם חלופי להתקן, לדוגמה /dev/ttyS3" - --#: ../data/phonemgr.glade.h:3 -+#: ../data/phonemgr.ui.h:3 - msgid "" - "Always try and reconnect whenever a connection is not immediately available. " - "Use this with Bluetooth to ensure your phone connects whenever it comes in " -@@ -236,136 +241,136 @@ msgstr "" - "תמיד יש לנסות להתחבר מחדש כאשר החיבור אינו זמין באותו הרגע. יש להשתמש " - "בבלוטות׳ כדי לוודא שהטלפון שלך מתחבר מתי שהוא נכנס לטווח." - --#: ../data/phonemgr.glade.h:4 -+#: ../data/phonemgr.ui.h:4 - msgid "Automated Tasks" - msgstr "משימות אוטומטיות" - --#: ../data/phonemgr.glade.h:5 -+#: ../data/phonemgr.ui.h:5 - msgid "Automatically _retry connections" - msgstr "ני_סיון התחברות חוזר" - --#: ../data/phonemgr.glade.h:6 -+#: ../data/phonemgr.ui.h:6 - msgid "Characters left:" - msgstr "תווים שנותרו:" - --#: ../data/phonemgr.glade.h:7 -+#: ../data/phonemgr.ui.h:7 - msgid "Connect using an alternative serial device" - msgstr "התחברות באמצעות התקן טורי חלופי" - --#: ../data/phonemgr.glade.h:8 -+#: ../data/phonemgr.ui.h:8 - msgid "Connect using infrared communication" - msgstr "התחברות באמצעות תקשורת אינפרא אדום" - --#: ../data/phonemgr.glade.h:9 -+#: ../data/phonemgr.ui.h:9 - msgid "Connect using serial port 1, also known as COM1 or /dev/ttyS0" - msgstr "התחברות באמצעות היציאה הטורית 1, הידועה גם בשם COM1 או /dev/ttyS0" - --#: ../data/phonemgr.glade.h:10 -+#: ../data/phonemgr.ui.h:10 - msgid "Connect using serial port 2, also known as COM2 or /dev/ttyS1" - msgstr "התחברות באמצעות היציאה הטורית 2, הידועה גם בשם COM2 או /dev/ttyS1" - --#: ../data/phonemgr.glade.h:11 -+#: ../data/phonemgr.ui.h:11 - msgid "Connection" - msgstr "חיבור" - --#: ../data/phonemgr.glade.h:12 -+#: ../data/phonemgr.ui.h:12 - msgid "Date:" - msgstr "תאריך:" - --#: ../data/phonemgr.glade.h:13 -+#: ../data/phonemgr.ui.h:13 - msgid "Enter the text message you want to send." - msgstr "נא להזין את הודעה הטקסט אותה ברצונך לשלוח." - --#: ../data/phonemgr.glade.h:14 -+#: ../data/phonemgr.ui.h:14 - msgid "Enter your text message" - msgstr "נא להזין את הודעה הטקסט שלך" - --#: ../data/phonemgr.glade.h:15 -+#: ../data/phonemgr.ui.h:15 - msgid "I_nfra red (/dev/ircomm0)" - msgstr "_אינפרא אדום (/dev/ircomm0)" - --#: ../data/phonemgr.glade.h:16 -+#: ../data/phonemgr.ui.h:16 - msgid "Interface" - msgstr "מנשק" - --#: ../data/phonemgr.glade.h:17 -+#: ../data/phonemgr.ui.h:17 - msgid "Message Received" - msgstr "התקבלה הודעה" - --#: ../data/phonemgr.glade.h:18 -+#: ../data/phonemgr.ui.h:18 - msgid "Other _port" - msgstr "_פתחה אחרת" - --#: ../data/phonemgr.glade.h:19 -+#: ../data/phonemgr.ui.h:19 - msgid "Phone Connection" - msgstr "חיבור טלפון" - --#: ../data/phonemgr.glade.h:20 -+#: ../data/phonemgr.ui.h:20 - msgid "Phone Manager Preferences" - msgstr "העדפות מנהל הטלפונים" - --#: ../data/phonemgr.glade.h:21 -+#: ../data/phonemgr.ui.h:21 - msgid "Play _sound when messages arrive" - msgstr "השמעת _צליל בעת קבלת הודעות" - --#: ../data/phonemgr.glade.h:22 -+#: ../data/phonemgr.ui.h:22 - msgid "Send Message" - msgstr "שליחת הודעה" - --#: ../data/phonemgr.glade.h:23 -+#: ../data/phonemgr.ui.h:23 - msgid "Sender:" - msgstr "שולח" - --#: ../data/phonemgr.glade.h:24 -+#: ../data/phonemgr.ui.h:24 - msgid "Serial port _1 (/dev/ttyS0)" - msgstr "יציאה טורית _1 (/dev/ttyS0)" - --#: ../data/phonemgr.glade.h:25 -+#: ../data/phonemgr.ui.h:25 - msgid "Serial port _2 (/dev/ttyS1)" - msgstr "יציאה טורית _2 (/dev/ttyS1)" - --#: ../data/phonemgr.glade.h:26 -+#: ../data/phonemgr.ui.h:26 - msgid "Synchronise phone's _time and date" - msgstr "סנכרון ה_זמן והתאריך של הטלפון" - --#: ../data/phonemgr.glade.h:27 -+#: ../data/phonemgr.ui.h:27 - msgid "Synchronise phone's time and date with the computer's clock" - msgstr "סנכרון השעה והתאריך של הטלפון שלך עם אלו של שעון המחשב" - --#: ../data/phonemgr.glade.h:28 -+#: ../data/phonemgr.ui.h:28 - msgid "Use Bluetooth wireless networking to connect to your phone" - msgstr "שימוש ברשת בלוטות׳ אלחוטית כדי להתחבר לטלפון שלך" - --#: ../data/phonemgr.glade.h:29 -+#: ../data/phonemgr.ui.h:29 - msgid "You have received a message" - msgstr "קיבלת הודעה" - --#: ../data/phonemgr.glade.h:30 -+#: ../data/phonemgr.ui.h:30 - msgid "_Bluetooth" - msgstr "_בלוטות׳" - --#: ../data/phonemgr.glade.h:31 -+#: ../data/phonemgr.ui.h:31 - msgid "_Message:" - msgstr "הו_דעה:" - - #. This is a receipt from the SMS server saying the message has been delivered to the recipient's phone --#: ../data/phonemgr.glade.h:33 -+#: ../data/phonemgr.ui.h:33 - msgid "_Notify when message is delivered" - msgstr "ה_צגת התרעה בעת קבלת הודעה" - --#: ../data/phonemgr.glade.h:34 -+#: ../data/phonemgr.ui.h:34 - msgid "_Pop-up window for new messages" - msgstr "ה_קפצת חלון עם קבלת הודעות חדשות" - --#: ../data/phonemgr.glade.h:35 -+#: ../data/phonemgr.ui.h:35 - msgid "_Recipient:" - msgstr "_נמען:" - --#: ../data/phonemgr.glade.h:36 -+#: ../data/phonemgr.ui.h:36 - msgid "_Reply" - msgstr "ת_גובה" - --#: ../data/phonemgr.glade.h:37 -+#: ../data/phonemgr.ui.h:37 - msgid "_Send" - msgstr "_שליחה" - -diff --git a/po/lv.po b/po/lv.po -index 373a0ab..d93632f 100644 ---- a/po/lv.po -+++ b/po/lv.po -@@ -3,25 +3,140 @@ - # This file is distributed under the same license as the PACKAGE package. - # - # Raivis Dejus <orvils@gmail.com>, 2008. -+# Rūdofls Mazurs <rudolfs.mazurs@gmail.com>, 2011. - msgid "" - msgstr "" - "Project-Id-Version: gnome-phone-manager\n" --"Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2008-08-11 00:58+0300\n" --"PO-Revision-Date: 2008-08-11 13:18+0300\n" --"Last-Translator: Raivis Dejus <orvils@gmail.com>\n" -+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug." -+"cgi?product=gnome-phone-manager&component=general\n" -+"POT-Creation-Date: 2011-02-15 20:00+0000\n" -+"PO-Revision-Date: 2011-03-31 19:23+0300\n" -+"Last-Translator: Rūdofls Mazurs <rudolfs.mazurs@gmail.com>\n" - "Language-Team: Latvian <locale@laka.lv>\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "X-Poedit-Language: Latvian\n" - "X-Poedit-Country: LATVIA\n" --"X-Generator: KBabel 1.11.4\n" --"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" -+"X-Generator: Lokalize 1.1\n" -+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " -+"2);\n" -+ -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:153 -+#, c-format -+msgid "Cannot get contact: %s" -+msgstr "Nevaru dabūt kontaktinformāciju: %s" -+ -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:186 -+#, c-format -+msgid "Could not find contact: %s" -+msgstr "Nevaru atrast kontaktinformāciju: %s" -+ -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:414 -+msgid "Cannot create searchable view." -+msgstr "Nevaru izveidot meklējamu skatu." -+ -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:886 -+msgid "Success" -+msgstr "Veiksmīgi" -+ -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:888 -+msgid "An argument was invalid." -+msgstr "Nepareiza argumenta vērtība." -+ -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:890 -+msgid "The address book is busy." -+msgstr "Pieslēgums adrešu grāmatai ir aizņemts." -+ -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:892 -+msgid "The address book is offline." -+msgstr "Adrešu grāmata ir atsaistē." -+ -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:894 -+msgid "The address book does not exist." -+msgstr "Adrešu grāmata neeksistē." -+ -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:896 -+msgid "The \"Me\" contact does not exist." -+msgstr "\"Mana\" kontaktinformācija nav atrodama." -+ -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:898 -+msgid "The address book is not loaded." -+msgstr "Adrešu grāmata nav ielādēta." -+ -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:900 -+msgid "The address book is already loaded." -+msgstr "Adrešu grāmata jau ir ielādēta." -+ -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:902 -+msgid "Permission was denied when accessing the address book." -+msgstr "Pieeja adrešu grāmatai liegta." -+ -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:904 -+msgid "The contact was not found." -+msgstr "Kontaktinformācija nav atrasta." -+ -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:906 -+msgid "This contact ID already exists." -+msgstr "Kontaktinformācijas ID jau eksistē." -+ -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:908 -+msgid "The protocol is not supported." -+msgstr "Protokols netiek atbalstīts." -+ -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:910 -+msgid "The operation was cancelled." -+msgstr "Darbība tika atcelta." -+ -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:912 -+msgid "The operation could not be cancelled." -+msgstr "Pieprasīto operāciju nevar atcelt." -+ -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:914 -+msgid "The address book authentication failed." -+msgstr "Adrešu grāmatas autentifikācija neizdevās." -+ -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:916 -+msgid "" -+"Authentication is required to access the address book and was not given." -+msgstr "" -+"Lai lasītu adrešu grāmatu, bija nepieciešama autentificēšanās, kura netika " -+"nodrošināta." -+ -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:918 -+msgid "A secure connection is not available." -+msgstr "Drošs savienojums nav pieejams." -+ -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:920 -+msgid "A CORBA error occurred whilst accessing the address book." -+msgstr "Lasot adrešu grāmatu, notikusi CORBA kļūda." -+ -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:922 -+msgid "The address book source does not exist." -+msgstr "Adrešu grāmatas primārais dokuments neeksistē." -+ -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:924 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:927 -+msgid "An unknown error occurred." -+msgstr "Atgadījās nezināma kļūda." -+ -+#: ../cut-n-paste/gconf-bridge/gconf-bridge.c:1233 -+#, c-format -+msgid "GConf error: %s" -+msgstr "GConf kļūda: %s" -+ -+#: ../cut-n-paste/gconf-bridge/gconf-bridge.c:1238 -+msgid "All further errors shown only on terminal." -+msgstr "Visas turpmākās kļūdas tiks parādītas tikai terminālī." -+ -+#. Translators: "device" is a phone or a modem -+#: ../gnome-bluetooth/phonemgr.c:133 -+msgid "Use this device with Phone Manager" -+msgstr "Izmantot šo ierīci ar Tālruņa pārvaldnieku" - - #. translators: the '%s' will be substituted with '/dev/ttyS0' - #. or similar --#: ../src/connection.c:113 -+#: ../src/connection.c:124 - #, c-format - msgid "Connected to device on %s" - msgstr "Savienots ar iekārtu %s" -@@ -30,23 +145,12 @@ msgstr "Savienots ar iekārtu %s" - #. bother changing the icon ourselves at this point - #. translators: the '%s' will be substituted with '/dev/ttyS0' - #. or similar --#: ../src/connection.c:119 -+#: ../src/connection.c:130 - #, c-format - msgid "Failed connection to device on %s" - msgstr "Neizdevās savienoties ar iekārtu %s" - --#: ../src/gconf-bridge.c:1218 --#, c-format --msgid "GConf error: %s" --msgstr "GConf kļūda: %s" -- --#: ../src/gconf-bridge.c:1228 --msgid "All further errors shown only on terminal." --msgstr "Visas turpmākās kļūdas tiks parādītas tikai terminālī." -- --#: ../src/gnome-phone-manager.desktop.in.h:1 --#: ../src/menu.c:49 --#: ../src/menu.c:51 -+#: ../src/gnome-phone-manager.desktop.in.h:1 ../src/menu.c:49 ../src/menu.c:51 - msgid "Phone Manager" - msgstr "Tālruņa pārvaldnieks" - -@@ -70,27 +174,31 @@ msgstr "Savienojos ar tālruni" - msgid "Not connected" - msgstr "Nav savienots" - --#: ../src/main.c:37 -+#: ../src/main.c:38 - msgid "Show model name of a specific device" - msgstr "Rādīt iekārtas modeli" - --#: ../src/main.c:38 -+#: ../src/main.c:38 ../src/main.c:39 -+msgid "PORT" -+msgstr "PORTS" -+ -+#: ../src/main.c:39 - msgid "Write the configuration file for gnokii debugging" - msgstr "Rakstīt konfigurācijas failu gnokii lāgošanai" - --#: ../src/main.c:39 -+#: ../src/main.c:40 - msgid "Enable debug" - msgstr "Ieslēgt lāgošanu" - --#: ../src/main.c:40 -+#: ../src/main.c:41 - msgid "Show version information and exit" - msgstr "Skatīt versijas informāciju un iziet" - --#: ../src/main.c:59 -+#: ../src/main.c:60 - msgid "- Manage your mobile phone" - msgstr "- Pārvalda jūsu mobilo tālruni" - --#: ../src/main.c:72 -+#: ../src/main.c:74 - #, c-format - msgid "gnome-phone-manager version %s\n" - msgstr "gnome-phone-manager versija %s\n" -@@ -111,152 +219,166 @@ msgstr "Tālruņa pārvaldnieka mājas lapa" - msgid "_Send Message" - msgstr "_Sūtīt īsziņu" - --#: ../src/phonemgr-chooser-button.c:80 --#: ../src/phonemgr-chooser-button.c:190 --msgid "Click to select device..." --msgstr "Klikšķiniet, lai izvēlētos iekārtu..." -+#: ../src/ui.c:111 -+#| msgid "Message Received" -+msgid "New text message received" -+msgstr "Saņemta jauna teksta īsziņa" - --#: ../src/ui.c:335 -+#: ../src/ui.c:277 - msgid "Message too long!" - msgstr "Īsziņa ir pārāk gara!" - --#: ../data/phonemgr.glade.h:1 --msgid "/dev/ttyS2" --msgstr "/dev/ttyS2" -- --#: ../data/phonemgr.glade.h:2 -+#: ../data/phonemgr.ui.h:1 - msgid "Alerting" - msgstr "Brīdināšana" - --#: ../data/phonemgr.glade.h:3 -+#: ../data/phonemgr.ui.h:2 - msgid "Alternative device filename, e.g. /dev/ttyS3" - msgstr "Alternatīvs ierīces faila nosaukums, piem. /dev/ttyS3" - --#: ../data/phonemgr.glade.h:4 --msgid "Always try and reconnect whenever a connection is not immediately available. Use this with Bluetooth to ensure your phone connects whenever it comes in range." --msgstr "Vienmēr censties atjaunot zaudētu savienojumu. Lietojiet Bluetooth, lai nodrošinātu savienojumu, tikko tālrunis ir parādījies pieejamajā diapazonā." -+#: ../data/phonemgr.ui.h:3 -+msgid "" -+"Always try and reconnect whenever a connection is not immediately available. " -+"Use this with Bluetooth to ensure your phone connects whenever it comes in " -+"range." -+msgstr "" -+"Vienmēr censties atjaunot zaudētu savienojumu. Lietojiet Bluetooth, lai " -+"nodrošinātu savienojumu, tikko tālrunis ir parādījies pieejamajā diapazonā." -+ -+#: ../data/phonemgr.ui.h:4 -+msgid "Automated Tasks" -+msgstr "Automatizētie uzdevumi" - --#: ../data/phonemgr.glade.h:5 -+#: ../data/phonemgr.ui.h:5 - msgid "Automatically _retry connections" - msgstr "Automātiski mēģināt pieslēgties vēl_reiz" - --#: ../data/phonemgr.glade.h:6 -+#: ../data/phonemgr.ui.h:6 - msgid "Characters left:" - msgstr "Atlikušais zīmju skaits:" - --#: ../data/phonemgr.glade.h:7 -+#: ../data/phonemgr.ui.h:7 - msgid "Connect using an alternative serial device" - msgstr "Savienoties ar tālruni, izmantojot citu seriālo iekārtu" - --#: ../data/phonemgr.glade.h:8 -+#: ../data/phonemgr.ui.h:8 - msgid "Connect using infrared communication" - msgstr "Savienoties ar tālruni, izmantojot infrasarkanos sakarus" - --#: ../data/phonemgr.glade.h:9 -+#: ../data/phonemgr.ui.h:9 - msgid "Connect using serial port 1, also known as COM1 or /dev/ttyS0" --msgstr "Savienoties ar tālruni, izmantojot pirmo seriālo portu, zināmu arī kā COM1 vai /dev/ttyS0" -+msgstr "" -+"Savienoties ar tālruni, izmantojot pirmo seriālo portu, zināmu arī kā COM1 " -+"vai /dev/ttyS0" - --#: ../data/phonemgr.glade.h:10 -+#: ../data/phonemgr.ui.h:10 - msgid "Connect using serial port 2, also known as COM2 or /dev/ttyS1" --msgstr "Savienoties ar tālruni, izmantojot otro seriālo portu, zināmu arī kā COM2 vai /dev/ttyS1" -+msgstr "" -+"Savienoties ar tālruni, izmantojot otro seriālo portu, zināmu arī kā COM2 " -+"vai /dev/ttyS1" - --#: ../data/phonemgr.glade.h:11 -+#: ../data/phonemgr.ui.h:11 - msgid "Connection" - msgstr "Savienojums" - --#: ../data/phonemgr.glade.h:12 -+#: ../data/phonemgr.ui.h:12 - msgid "Date:" - msgstr "Datums:" - --#: ../data/phonemgr.glade.h:13 -+#: ../data/phonemgr.ui.h:13 - msgid "Enter the text message you want to send." - msgstr "Ievadiet īsziņas tekstu, kuru vēlaties nosūtīt." - --#: ../data/phonemgr.glade.h:14 -+#: ../data/phonemgr.ui.h:14 - msgid "Enter your text message" - msgstr "Ievadiet īsziņas tekstu" - --#: ../data/phonemgr.glade.h:15 --msgid "Error Handling" --msgstr "Kļūdu apstrāde" -- --#: ../data/phonemgr.glade.h:16 -+#: ../data/phonemgr.ui.h:15 - msgid "I_nfra red (/dev/ircomm0)" - msgstr "I_nfrasarkanais (/dev/ircomm0)" - --#: ../data/phonemgr.glade.h:17 -+#: ../data/phonemgr.ui.h:16 - msgid "Interface" - msgstr "Saskarne" - --#: ../data/phonemgr.glade.h:18 -+#: ../data/phonemgr.ui.h:17 - msgid "Message Received" - msgstr "Saņemta īsziņa" - --#: ../data/phonemgr.glade.h:19 -+#: ../data/phonemgr.ui.h:18 - msgid "Other _port" - msgstr "Cits _ports" - --#: ../data/phonemgr.glade.h:20 -+#: ../data/phonemgr.ui.h:19 - msgid "Phone Connection" - msgstr "Tālruņa savienojums" - --#: ../data/phonemgr.glade.h:21 -+#: ../data/phonemgr.ui.h:20 - msgid "Phone Manager Preferences" - msgstr "Tālruņa pārvaldnieka iestatījumi" - --#: ../data/phonemgr.glade.h:22 -+#: ../data/phonemgr.ui.h:21 - msgid "Play _sound when messages arrive" - msgstr "_Saņemot īsziņu, atskaņot signālu" - --#: ../data/phonemgr.glade.h:23 -+#: ../data/phonemgr.ui.h:22 - msgid "Send Message" - msgstr "Sūtīt īsziņu" - --#: ../data/phonemgr.glade.h:24 -+#: ../data/phonemgr.ui.h:23 - msgid "Sender:" - msgstr "Sūtītājs:" - --#: ../data/phonemgr.glade.h:25 -+#: ../data/phonemgr.ui.h:24 - msgid "Serial port _1 (/dev/ttyS0)" - msgstr "Pirmais seriālais ports ( _1 /dev/ttyS0) " - --#: ../data/phonemgr.glade.h:26 -+#: ../data/phonemgr.ui.h:25 - msgid "Serial port _2 (/dev/ttyS1)" - msgstr "Otrais seriālais ports ( _2 /dev/ttyS1) " - --#: ../data/phonemgr.glade.h:27 -+#: ../data/phonemgr.ui.h:26 -+msgid "Synchronise phone's _time and date" -+msgstr "Sinhronizēt _tālruņa laiku un datumu" -+ -+#: ../data/phonemgr.ui.h:27 -+msgid "Synchronise phone's time and date with the computer's clock" -+msgstr "Sinhronizēt tālruņa laiku un datumu ar datora pulksteni" -+ -+#: ../data/phonemgr.ui.h:28 - msgid "Use Bluetooth wireless networking to connect to your phone" - msgstr "Savienoties ar tālruni, izmantojot Bluetooth bezvadu savienojumu" - --#: ../data/phonemgr.glade.h:28 -+#: ../data/phonemgr.ui.h:29 - msgid "You have received a message" - msgstr "Saņemta jauna īsziņa" - --#: ../data/phonemgr.glade.h:29 -+#: ../data/phonemgr.ui.h:30 - msgid "_Bluetooth" - msgstr "_Bluetooth" - --#: ../data/phonemgr.glade.h:30 -+#: ../data/phonemgr.ui.h:31 - msgid "_Message:" - msgstr "Īs_ziņa:" - --#: ../data/phonemgr.glade.h:31 -+#. This is a receipt from the SMS server saying the message has been delivered to the recipient's phone -+#: ../data/phonemgr.ui.h:33 - msgid "_Notify when message is delivered" - msgstr "Saņemt īsziņas piegādes paziņojumu" - --#: ../data/phonemgr.glade.h:32 -+#: ../data/phonemgr.ui.h:34 - msgid "_Pop-up window for new messages" - msgstr "Jaunās īsziņas _parādīt uznirstošā logā" - --#: ../data/phonemgr.glade.h:33 -+#: ../data/phonemgr.ui.h:35 - msgid "_Recipient:" - msgstr "_Saņēmējs:" - --#: ../data/phonemgr.glade.h:34 -+#: ../data/phonemgr.ui.h:36 - msgid "_Reply" - msgstr "_Atbildēt" - --#: ../data/phonemgr.glade.h:35 -+#: ../data/phonemgr.ui.h:37 - msgid "_Send" - msgstr "_Sūtīt" - -@@ -265,24 +387,36 @@ msgid "Bluetooth address of the device to connect to" - msgstr "Iekārtas ar kuru savienoties, Bluetooth adrese" - - #: ../data/gnome-phone-manager.schemas.in.h:2 --msgid "Bluetooth address of the device to connect to. Requires connection_type to be 1 to be used." --msgstr "Bluetooth adrese iekārtai, kurai pieslēgties. Pieprasa izmantot savienojuma veidu 1." -+msgid "" -+"Bluetooth address of the device to connect to. Requires connection_type to " -+"be 1 to be used." -+msgstr "" -+"Bluetooth adrese iekārtai, kurai pieslēgties. Pieprasa izmantot savienojuma " -+"veidu 1." - - #: ../data/gnome-phone-manager.schemas.in.h:3 - msgid "The connection type used by gnome-phone-manager" - msgstr "Savienojuma veids, kuru izmanto Gnome tālruņa pārvaldnieks" - - #: ../data/gnome-phone-manager.schemas.in.h:4 --msgid "The connection type used by gnome-phone-manager: Bluetooth is 0 Serial 1 is 1 Serial 2 is 2 IrDa is 3 Other connection types are 4" --msgstr "Gnome tālruņa pārvaldnieka savienojuma veidi: Bluetooth - 0, seriālais ports 1 ir 1, seriālais ports2 ir 2, IrDA (infrasarkanais) - 3, citi savienojumi - 4" -+msgid "" -+"The connection type used by gnome-phone-manager: Bluetooth is 0 Serial 1 is " -+"1 Serial 2 is 2 IrDa is 3 Other connection types are 4" -+msgstr "" -+"Gnome tālruņa pārvaldnieka savienojuma veidi: Bluetooth - 0, seriālais ports " -+"1 ir 1, seriālais ports2 ir 2, IrDA (infrasarkanais) - 3, citi savienojumi - " -+"4" - - #: ../data/gnome-phone-manager.schemas.in.h:5 - msgid "The device node for the serial device to connect to" - msgstr "Seriālās iekārtas fails pieslēgumam" - - #: ../data/gnome-phone-manager.schemas.in.h:6 --msgid "The device node for the serial device to connect to. Requires connection_type to be 4 to be used." --msgstr "Seriālās iekārtas fails pieslēgumam. Pieprasa izmantot savienojuma tipu 4." -+msgid "" -+"The device node for the serial device to connect to. Requires " -+"connection_type to be 4 to be used." -+msgstr "" -+"Seriālās iekārtas fails pieslēgumam. Pieprasa izmantot savienojuma tipu 4." - - #: ../data/gnome-phone-manager.schemas.in.h:7 - msgid "Whether to play a sound alert when a new message comes in" -@@ -297,109 +431,36 @@ msgid "Whether to popup new messages on the desktop" - msgstr "Jaunas īsziņas izmanto uznirstošu logu darbvirsmā" - - #: ../data/gnome-phone-manager.schemas.in.h:10 --msgid "Whether to popup new messages on the desktop as soon as they're received, as opposed to showing them when clicking on the tray icon." --msgstr "Vai jaunas īsziņas, tikko saņemtas, izmanto uznirstošu logu darbvirsmā, pretējā gadījumā parādot tās noklišķinot uz paneļa ikonas." -+msgid "" -+"Whether to popup new messages on the desktop as soon as they're received, as " -+"opposed to showing them when clicking on the tray icon." -+msgstr "" -+"Vai jaunas īsziņas, tikko saņemtas, izmanto uznirstošu logu darbvirsmā, " -+"pretējā gadījumā parādot tās noklišķinot uz paneļa ikonas." - - #: ../data/gnome-phone-manager.schemas.in.h:11 - msgid "Whether to retry connecting to the mobile phone" - msgstr "Vai mēģināt atkārtoti savienoties ar tālruni" - - #: ../data/gnome-phone-manager.schemas.in.h:12 --msgid "Whether to retry connecting to the mobile phone if the connection fails at some point." -+msgid "" -+"Whether to retry connecting to the mobile phone if the connection fails at " -+"some point." - msgstr "Vai mēģināt atkārtoti atjaunot pārtrauktu savienojumu." - --#: ../src/e-contact-entry.c:158 --#, c-format --msgid "Cannot get contact: %s" --msgstr "Nevaru dabūt kontaktinformāciju: %s" -- --#: ../src/e-contact-entry.c:191 --#, c-format --msgid "Could not find contact: %s" --msgstr "Nevaru atrast kontaktinformāciju: %s" -- --#: ../src/e-contact-entry.c:417 --msgid "Cannot create searchable view." --msgstr "Nevaru izveidot meklējamu skatu." -- --#: ../src/e-contact-entry.c:890 --msgid "Success" --msgstr "Veiksmīgi" -- --#: ../src/e-contact-entry.c:892 --msgid "An argument was invalid." --msgstr "Nepareiza argumenta vērtība." -- --#: ../src/e-contact-entry.c:894 --msgid "The address book is busy." --msgstr "Pieslēgums adrešu grāmatai ir aizņemts." -- --#: ../src/e-contact-entry.c:896 --msgid "The address book is offline." --msgstr "Adrešu grāmata ir atsaistē." -- --#: ../src/e-contact-entry.c:898 --msgid "The address book does not exist." --msgstr "Adrešu grāmata neeksistē." -- --#: ../src/e-contact-entry.c:900 --msgid "The \"Me\" contact does not exist." --msgstr "\"Mana\" kontaktinformācija nav atrodama." -- --#: ../src/e-contact-entry.c:902 --msgid "The address book is not loaded." --msgstr "Adrešu grāmata nav ielādēta." -- --#: ../src/e-contact-entry.c:904 --msgid "The address book is already loaded." --msgstr "Adrešu grāmata jau ir ielādēta." -- --#: ../src/e-contact-entry.c:906 --msgid "Permission was denied when accessing the address book." --msgstr "Pieeja adrešu grāmatai liegta." -- --#: ../src/e-contact-entry.c:908 --msgid "The contact was not found." --msgstr "Kontaktinformācija nav atrasta." -- --#: ../src/e-contact-entry.c:910 --msgid "This contact ID already exists." --msgstr "Kontaktinformācijas ID jau eksistē." -- --#: ../src/e-contact-entry.c:912 --msgid "The protocol is not supported." --msgstr "Protokols netiek atbalstīts." -- --#: ../src/e-contact-entry.c:914 --msgid "The operation was cancelled." --msgstr "Darbība tika atcelta." -- --#: ../src/e-contact-entry.c:916 --msgid "The operation could not be cancelled." --msgstr "Pieprasīto operāciju nevar atcelt." -- --#: ../src/e-contact-entry.c:918 --msgid "The address book authentication failed." --msgstr "Adrešu grāmatas autentifikācija neizdevās." -- --#: ../src/e-contact-entry.c:920 --msgid "Authentication is required to access the address book and was not given." --msgstr "Lai lasītu adrešu grāmatu, bija nepieciešama autentificēšanās, kura netika nodrošināta." -+#: ../data/gnome-phone-manager.schemas.in.h:13 -+msgid "Whether to synchronise the phone clock with the computer's" -+msgstr "Vai sinhronizēt tālruņa pulksteni ar datora" - --#: ../src/e-contact-entry.c:922 --msgid "A secure connection is not available." --msgstr "Drošs savienojums nav pieejams." -+#: ../data/gnome-phone-manager.schemas.in.h:14 -+msgid "Whether to synchronise the phone clock with the computer's." -+msgstr "Vai sinhronizēt tālruņa pulksteni ar datora." - --#: ../src/e-contact-entry.c:924 --msgid "A CORBA error occurred whilst accessing the address book." --msgstr "Lasot adrešu grāmatu, notikusi CORBA kļūda." -+#~ msgid "Click to select device..." -+#~ msgstr "Klikšķiniet, lai izvēlētos iekārtu..." - --#: ../src/e-contact-entry.c:926 --msgid "The address book source does not exist." --msgstr "Adrešu grāmatas primārais dokuments neeksistē." -- --#: ../src/e-contact-entry.c:928 --#: ../src/e-contact-entry.c:931 --msgid "An unknown error occurred." --msgstr "Atgadījās nezināma kļūda." -+#~ msgid "/dev/ttyS2" -+#~ msgstr "/dev/ttyS2" - -+#~ msgid "Error Handling" -+#~ msgstr "Kļūdu apstrāde" -diff --git a/po/pt_BR.po b/po/pt_BR.po -index a9c19a5..501f8e9 100644 ---- a/po/pt_BR.po -+++ b/po/pt_BR.po -@@ -3,19 +3,21 @@ - # This file is distributed under the same license as the phonemgr package. - # Raphael Higino <In Memorian>, 2004. - # Fábio Nogueira <deb-user-ba@ubuntu.com>, 2008. --# - msgid "" - msgstr "" - "Project-Id-Version: phonemgr\n" - "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" - "phone-manager&component=general\n" --"POT-Creation-Date: 2010-12-26 01:41+0000\n" --"PO-Revision-Date: 2010-12-29 14:15-0300\n" --"Last-Translator: Mateus Zenaide <matzenh@gmail.com>\n" --"Language-Team: Brazilian Portuguese <gnome-l10n-br@listas.cipsga.org.br>\n" -+"POT-Creation-Date: 2011-02-15 20:00+0000\n" -+"PO-Revision-Date: 2011-05-03 10:45-0200\n" -+"Last-Translator: Djavan Fagundes <djavan@comum.org>\n" -+"Language-Team: Brazilian Portuguese <gnome-pt_br-list@gnome.org>\n" -+"Language: pt_BR\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=2; plural=(n > 1);\n" -+"X-Generator: Virtaal 0.6.1\n" - - #: ../cut-n-paste/e-contact-entry/e-contact-entry.c:153 - #, c-format -@@ -124,6 +126,11 @@ msgstr "Erro do gconf: %s" - msgid "All further errors shown only on terminal." - msgstr "Os próximos erros serão exibidos apenas no terminal." - -+#. Translators: "device" is a phone or a modem -+#: ../gnome-bluetooth/phonemgr.c:133 -+msgid "Use this device with Phone Manager" -+msgstr "Use este dispositivo com o gerenciador de telefones" -+ - #. translators: the '%s' will be substituted with '/dev/ttyS0' - #. or similar - #: ../src/connection.c:124 -@@ -168,14 +175,14 @@ msgstr "Desconectado" - msgid "Show model name of a specific device" - msgstr "Mostra o nome do modelo de um dispositivo específico" - -+#: ../src/main.c:38 ../src/main.c:39 -+msgid "PORT" -+msgstr "PORTA" -+ - #: ../src/main.c:39 - msgid "Write the configuration file for gnokii debugging" - msgstr "Escreve o arquivo de configuração para depuração gnokii" - --#: ../src/main.c:39 --msgid "PORT" --msgstr "PORTA" -- - #: ../src/main.c:40 - msgid "Enable debug" - msgstr "Habilita depuração" -@@ -211,23 +218,23 @@ msgstr "Site do gerenciador de telefones" - msgid "_Send Message" - msgstr "_Enviar mensagem" - --#: ../src/ui.c:166 -+#: ../src/ui.c:111 - msgid "New text message received" - msgstr "Nova mensagem recebida" - --#: ../src/ui.c:331 -+#: ../src/ui.c:277 - msgid "Message too long!" - msgstr "Mensagem longa demais!" - --#: ../data/phonemgr.glade.h:1 -+#: ../data/phonemgr.ui.h:1 - msgid "Alerting" - msgstr "Alertas" - --#: ../data/phonemgr.glade.h:2 -+#: ../data/phonemgr.ui.h:2 - msgid "Alternative device filename, e.g. /dev/ttyS3" - msgstr "Nome do arquivo de dispositivo alternativo, p. ex. /dev/ttyS3" - --#: ../data/phonemgr.glade.h:3 -+#: ../data/phonemgr.ui.h:3 - msgid "" - "Always try and reconnect whenever a connection is not immediately available. " - "Use this with Bluetooth to ensure your phone connects whenever it comes in " -@@ -237,138 +244,138 @@ msgstr "" - "imediatamente. Use isso com Bluetooth para garantir que o seu telefone se " - "conecte sempre que ele estiver na área do sinal." - --#: ../data/phonemgr.glade.h:4 -+#: ../data/phonemgr.ui.h:4 - msgid "Automated Tasks" - msgstr "Tarefas automatizadas" - --#: ../data/phonemgr.glade.h:5 -+#: ../data/phonemgr.ui.h:5 - msgid "Automatically _retry connections" - msgstr "_Re-tentar conexões automaticamente" - --#: ../data/phonemgr.glade.h:6 -+#: ../data/phonemgr.ui.h:6 - msgid "Characters left:" - msgstr "Caracteres restantes:" - --#: ../data/phonemgr.glade.h:7 -+#: ../data/phonemgr.ui.h:7 - msgid "Connect using an alternative serial device" - msgstr "Conectar usando um dispositivo serial alternativo" - --#: ../data/phonemgr.glade.h:8 -+#: ../data/phonemgr.ui.h:8 - msgid "Connect using infrared communication" - msgstr "Conectar usando comunicação infra vermelho" - --#: ../data/phonemgr.glade.h:9 -+#: ../data/phonemgr.ui.h:9 - msgid "Connect using serial port 1, also known as COM1 or /dev/ttyS0" - msgstr "" - "Conectar usando a porta serial 1, também conhecida como COM1 ou /dev/ttyS0" - --#: ../data/phonemgr.glade.h:10 -+#: ../data/phonemgr.ui.h:10 - msgid "Connect using serial port 2, also known as COM2 or /dev/ttyS1" - msgstr "" - "Conectar usando a porta serial 2, também conhecida como COM2 ou /dev/ttyS1" - --#: ../data/phonemgr.glade.h:11 -+#: ../data/phonemgr.ui.h:11 - msgid "Connection" - msgstr "Conexão" - --#: ../data/phonemgr.glade.h:12 -+#: ../data/phonemgr.ui.h:12 - msgid "Date:" - msgstr "Data:" - --#: ../data/phonemgr.glade.h:13 -+#: ../data/phonemgr.ui.h:13 - msgid "Enter the text message you want to send." - msgstr "Digite a mensagem de texto que quer enviar." - --#: ../data/phonemgr.glade.h:14 -+#: ../data/phonemgr.ui.h:14 - msgid "Enter your text message" - msgstr "Digite a mensagem de texto" - --#: ../data/phonemgr.glade.h:15 -+#: ../data/phonemgr.ui.h:15 - msgid "I_nfra red (/dev/ircomm0)" - msgstr "I_nfra vermelho (/dev/ircomm0)" - --#: ../data/phonemgr.glade.h:16 -+#: ../data/phonemgr.ui.h:16 - msgid "Interface" - msgstr "Interface" - --#: ../data/phonemgr.glade.h:17 -+#: ../data/phonemgr.ui.h:17 - msgid "Message Received" - msgstr "Mensagem recebida" - --#: ../data/phonemgr.glade.h:18 -+#: ../data/phonemgr.ui.h:18 - msgid "Other _port" - msgstr "Outra _porta" - --#: ../data/phonemgr.glade.h:19 -+#: ../data/phonemgr.ui.h:19 - msgid "Phone Connection" - msgstr "Conexão com o telefone" - --#: ../data/phonemgr.glade.h:20 -+#: ../data/phonemgr.ui.h:20 - msgid "Phone Manager Preferences" - msgstr "Preferências do gerenciador de telefones" - --#: ../data/phonemgr.glade.h:21 -+#: ../data/phonemgr.ui.h:21 - msgid "Play _sound when messages arrive" - msgstr "Reproduzir um _som quando chegar uma mensagem" - --#: ../data/phonemgr.glade.h:22 -+#: ../data/phonemgr.ui.h:22 - msgid "Send Message" - msgstr "Enviar Mensagem" - --#: ../data/phonemgr.glade.h:23 -+#: ../data/phonemgr.ui.h:23 - msgid "Sender:" - msgstr "Remetente:" - --#: ../data/phonemgr.glade.h:24 -+#: ../data/phonemgr.ui.h:24 - msgid "Serial port _1 (/dev/ttyS0)" - msgstr "Porta serial _1 (/dev/ttyS0)" - --#: ../data/phonemgr.glade.h:25 -+#: ../data/phonemgr.ui.h:25 - msgid "Serial port _2 (/dev/ttyS1)" - msgstr "Porta serial _2 (/dev/ttyS1)" - --#: ../data/phonemgr.glade.h:26 -+#: ../data/phonemgr.ui.h:26 - msgid "Synchronise phone's _time and date" - msgstr "Sincronizar a _hora e data do telefone" - --#: ../data/phonemgr.glade.h:27 -+#: ../data/phonemgr.ui.h:27 - msgid "Synchronise phone's time and date with the computer's clock" - msgstr "Sincronizar a hora e data do telefone com o relógio do computador" - --#: ../data/phonemgr.glade.h:28 -+#: ../data/phonemgr.ui.h:28 - msgid "Use Bluetooth wireless networking to connect to your phone" - msgstr "Use rede sem fio Bluetooth para conectar no seu telefone" - --#: ../data/phonemgr.glade.h:29 -+#: ../data/phonemgr.ui.h:29 - msgid "You have received a message" - msgstr "Você recebeu uma mensagem" - --#: ../data/phonemgr.glade.h:30 -+#: ../data/phonemgr.ui.h:30 - msgid "_Bluetooth" - msgstr "_Bluetooth" - --#: ../data/phonemgr.glade.h:31 -+#: ../data/phonemgr.ui.h:31 - msgid "_Message:" - msgstr "_Mensagem:" - - #. This is a receipt from the SMS server saying the message has been delivered to the recipient's phone --#: ../data/phonemgr.glade.h:33 -+#: ../data/phonemgr.ui.h:33 - msgid "_Notify when message is delivered" - msgstr "_Informar quando a mensagem for entregue " - --#: ../data/phonemgr.glade.h:34 -+#: ../data/phonemgr.ui.h:34 - msgid "_Pop-up window for new messages" - msgstr "Janela _instantânea para novas mensagens" - --#: ../data/phonemgr.glade.h:35 -+#: ../data/phonemgr.ui.h:35 - msgid "_Recipient:" - msgstr "_Destinatário:" - --#: ../data/phonemgr.glade.h:36 -+#: ../data/phonemgr.ui.h:36 - msgid "_Reply" - msgstr "_Responder" - --#: ../data/phonemgr.glade.h:37 -+#: ../data/phonemgr.ui.h:37 - msgid "_Send" - msgstr "_Enviar" - -diff --git a/po/sv.po b/po/sv.po -index 7cc9ea0..77711d7 100644 ---- a/po/sv.po -+++ b/po/sv.po -@@ -1,7 +1,7 @@ - # Swedish messages for phonemgr. --# Copyright (C) 2004-2010 Free Software Foundation, Inc. -+# Copyright (C) 2004-2011 Free Software Foundation, Inc. - # Christian Rose <menthos@menthos.com>, 2004. --# Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009, 2010. -+# Daniel Nylander <po@danielnylander.se>, 2006, 2007, 2008, 2009, 2010, 2011. - # - # $Id: sv.po,v 1.2 2006/04/12 18:56:30 dnylande Exp $ - # -@@ -9,8 +9,8 @@ msgid "" - msgstr "" - "Project-Id-Version: phonemgr\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2010-12-29 15:05+0100\n" --"PO-Revision-Date: 2010-12-29 18:35+0100\n" -+"POT-Creation-Date: 2011-03-01 01:09+0100\n" -+"PO-Revision-Date: 2011-03-01 08:54+0100\n" - "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" - "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" - "Language: sv\n" -@@ -122,6 +122,11 @@ msgstr "GConf-fel: %s" - msgid "All further errors shown only on terminal." - msgstr "Alla ytterligare fel visas endast på terminalen." - -+#. Translators: "device" is a phone or a modem -+#: ../gnome-bluetooth/phonemgr.c:133 -+msgid "Use this device with Phone Manager" -+msgstr "Använd denna enhet med Telefonhanterare" -+ - #. translators: the '%s' will be substituted with '/dev/ttyS0' - #. or similar - #: ../src/connection.c:124 -@@ -139,8 +144,8 @@ msgid "Failed connection to device on %s" - msgstr "Anslutning till enhet på %s misslyckades" - - #: ../src/gnome-phone-manager.desktop.in.h:1 --#: ../src/menu.c:49 - #: ../src/menu.c:51 -+#: ../src/menu.c:53 - msgid "Phone Manager" - msgstr "Telefonhanterare" - -@@ -168,14 +173,15 @@ msgstr "Inte ansluten" - msgid "Show model name of a specific device" - msgstr "Visa modellnamn för en specifik enhet" - --#: ../src/main.c:39 --msgid "Write the configuration file for gnokii debugging" --msgstr "Skriv konfigurationsfilen för gnokii-felsökning" -- -+#: ../src/main.c:38 - #: ../src/main.c:39 - msgid "PORT" - msgstr "PORT" - -+#: ../src/main.c:39 -+msgid "Write the configuration file for gnokii debugging" -+msgstr "Skriv konfigurationsfilen för gnokii-felsökning" -+ - #: ../src/main.c:40 - msgid "Enable debug" - msgstr "Aktivera felsökning" -@@ -196,174 +202,174 @@ msgstr "gnome-phone-manager version %s\n" - #: ../src/menu.c:40 - msgid "translator_credits" - msgstr "" --"Daniel Nylander\n" -+"Daniel Nylander <po@danielnylander.se>\n" - "Christian Rose\n" - "\n" - "Skicka synpunkter på översättningen till\n" --"tp-sv@listor.tp-sv.se" -+"<tp-sv@listor.tp-sv.se>." - - #: ../src/menu.c:44 - msgid "Send and receive messages from your mobile phone." - msgstr "Skicka och mottag meddelanden från din mobiltelefon." - --#: ../src/menu.c:56 -+#: ../src/menu.c:58 - msgid "Phone Manager website" - msgstr "Webbplatsen för Telefonhanterare" - --#: ../src/menu.c:87 -+#: ../src/menu.c:89 - msgid "_Send Message" - msgstr "_Skicka meddelande" - --#: ../src/ui.c:166 -+#: ../src/ui.c:111 - msgid "New text message received" - msgstr "Nytt textmeddelande har mottagits" - --#: ../src/ui.c:331 -+#: ../src/ui.c:277 - msgid "Message too long!" - msgstr "Meddelandet är för långt!" - --#: ../data/phonemgr.glade.h:1 -+#: ../data/phonemgr.ui.h:1 - msgid "Alerting" - msgstr "Varnar" - --#: ../data/phonemgr.glade.h:2 -+#: ../data/phonemgr.ui.h:2 - msgid "Alternative device filename, e.g. /dev/ttyS3" - msgstr "Alternativt enhetsfilnamn, t.ex. /dev/ttyS3" - --#: ../data/phonemgr.glade.h:3 -+#: ../data/phonemgr.ui.h:3 - msgid "Always try and reconnect whenever a connection is not immediately available. Use this with Bluetooth to ensure your phone connects whenever it comes in range." - msgstr "Försök alltid att ansluta igen när en anslutning inte är omedelbart tillgänglig. Använd detta tillsammans med Bluetooth för att försäkra dig om att din telefon ansluter när den är inom räckhåll." - --#: ../data/phonemgr.glade.h:4 -+#: ../data/phonemgr.ui.h:4 - msgid "Automated Tasks" - msgstr "Automatiserade funktioner" - --#: ../data/phonemgr.glade.h:5 -+#: ../data/phonemgr.ui.h:5 - msgid "Automatically _retry connections" - msgstr "_Försök ansluta igen automatiskt" - --#: ../data/phonemgr.glade.h:6 -+#: ../data/phonemgr.ui.h:6 - msgid "Characters left:" - msgstr "Tecken kvar:" - --#: ../data/phonemgr.glade.h:7 -+#: ../data/phonemgr.ui.h:7 - msgid "Connect using an alternative serial device" - msgstr "Anslut genom att använda en alternativ seriell enhet" - --#: ../data/phonemgr.glade.h:8 -+#: ../data/phonemgr.ui.h:8 - msgid "Connect using infrared communication" - msgstr "Anslut genom att använda infraröd kommunikation" - --#: ../data/phonemgr.glade.h:9 -+#: ../data/phonemgr.ui.h:9 - msgid "Connect using serial port 1, also known as COM1 or /dev/ttyS0" - msgstr "Anslut genom att använda serieport 1, även känd som COM1 eller /dev/ttyS0" - --#: ../data/phonemgr.glade.h:10 -+#: ../data/phonemgr.ui.h:10 - msgid "Connect using serial port 2, also known as COM2 or /dev/ttyS1" - msgstr "Anslut genom att använda serieport 2, även känd som COM2 eller /dev/ttyS1" - --#: ../data/phonemgr.glade.h:11 -+#: ../data/phonemgr.ui.h:11 - msgid "Connection" - msgstr "Anslutning" - --#: ../data/phonemgr.glade.h:12 -+#: ../data/phonemgr.ui.h:12 - msgid "Date:" - msgstr "Datum:" - --#: ../data/phonemgr.glade.h:13 -+#: ../data/phonemgr.ui.h:13 - msgid "Enter the text message you want to send." - msgstr "Ange det textmeddelande som du vill skicka." - --#: ../data/phonemgr.glade.h:14 -+#: ../data/phonemgr.ui.h:14 - msgid "Enter your text message" - msgstr "Ange ditt textmeddelande" - --#: ../data/phonemgr.glade.h:15 -+#: ../data/phonemgr.ui.h:15 - msgid "I_nfra red (/dev/ircomm0)" - msgstr "I_nfrarött (/dev/ircomm0)" - --#: ../data/phonemgr.glade.h:16 -+#: ../data/phonemgr.ui.h:16 - msgid "Interface" - msgstr "Gränssnitt" - --#: ../data/phonemgr.glade.h:17 -+#: ../data/phonemgr.ui.h:17 - msgid "Message Received" - msgstr "Meddelande har mottagits" - --#: ../data/phonemgr.glade.h:18 -+#: ../data/phonemgr.ui.h:18 - msgid "Other _port" - msgstr "Annan _port" - --#: ../data/phonemgr.glade.h:19 -+#: ../data/phonemgr.ui.h:19 - msgid "Phone Connection" - msgstr "Telefonanslutning" - --#: ../data/phonemgr.glade.h:20 -+#: ../data/phonemgr.ui.h:20 - msgid "Phone Manager Preferences" - msgstr "Inställningar för telefonhanteraren" - --#: ../data/phonemgr.glade.h:21 -+#: ../data/phonemgr.ui.h:21 - msgid "Play _sound when messages arrive" - msgstr "Spela _ljudfil när meddelanden ankommer" - --#: ../data/phonemgr.glade.h:22 -+#: ../data/phonemgr.ui.h:22 - msgid "Send Message" - msgstr "Skicka meddelande" - --#: ../data/phonemgr.glade.h:23 -+#: ../data/phonemgr.ui.h:23 - msgid "Sender:" - msgstr "Avsändare:" - --#: ../data/phonemgr.glade.h:24 -+#: ../data/phonemgr.ui.h:24 - msgid "Serial port _1 (/dev/ttyS0)" - msgstr "Serieport _1 (/dev/ttyS0)" - --#: ../data/phonemgr.glade.h:25 -+#: ../data/phonemgr.ui.h:25 - msgid "Serial port _2 (/dev/ttyS1)" - msgstr "Serieport _2 (/dev/ttyS1)" - --#: ../data/phonemgr.glade.h:26 -+#: ../data/phonemgr.ui.h:26 - msgid "Synchronise phone's _time and date" - msgstr "Synkronisera telefonens _tid och datum" - --#: ../data/phonemgr.glade.h:27 -+#: ../data/phonemgr.ui.h:27 - msgid "Synchronise phone's time and date with the computer's clock" - msgstr "Synkronisera telefonens tid och datum med datorns klocka" - --#: ../data/phonemgr.glade.h:28 -+#: ../data/phonemgr.ui.h:28 - msgid "Use Bluetooth wireless networking to connect to your phone" - msgstr "Använd trådlöst blåtandsnätverk för att ansluta till din telefon" - --#: ../data/phonemgr.glade.h:29 -+#: ../data/phonemgr.ui.h:29 - msgid "You have received a message" - msgstr "Du har fått ett meddelande" - --#: ../data/phonemgr.glade.h:30 -+#: ../data/phonemgr.ui.h:30 - msgid "_Bluetooth" - msgstr "_Bluetooth" - --#: ../data/phonemgr.glade.h:31 -+#: ../data/phonemgr.ui.h:31 - msgid "_Message:" - msgstr "_Meddelande:" - - #. This is a receipt from the SMS server saying the message has been delivered to the recipient's phone --#: ../data/phonemgr.glade.h:33 -+#: ../data/phonemgr.ui.h:33 - msgid "_Notify when message is delivered" - msgstr "_Notifiera när meddelanden ankommer" - --#: ../data/phonemgr.glade.h:34 -+#: ../data/phonemgr.ui.h:34 - msgid "_Pop-up window for new messages" - msgstr "_Popupfönster för nya meddelanden" - --#: ../data/phonemgr.glade.h:35 -+#: ../data/phonemgr.ui.h:35 - msgid "_Recipient:" - msgstr "_Mottagare:" - --#: ../data/phonemgr.glade.h:36 -+#: ../data/phonemgr.ui.h:36 - msgid "_Reply" - msgstr "_Svara" - --#: ../data/phonemgr.glade.h:37 -+#: ../data/phonemgr.ui.h:37 - msgid "_Send" - msgstr "_Skicka" - -diff --git a/po/zh_CN.po b/po/zh_CN.po -index 40a4ede..1f7dce7 100644 ---- a/po/zh_CN.po -+++ b/po/zh_CN.po -@@ -9,7 +9,7 @@ msgstr "" - "Project-Id-Version: phonemgr master\n" - "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" - "phone-manager&component=general\n" --"POT-Creation-Date: 2010-02-05 17:50+0000\n" -+"POT-Creation-Date: 2011-02-15 20:00+0000\n" - "PO-Revision-Date: 2010-02-24 16:31+0800\n" - "Last-Translator: YunQiang Su <wzssyqa@gmail.com>\n" - "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" -@@ -17,111 +17,116 @@ msgstr "" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:152 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:153 - #, c-format - msgid "Cannot get contact: %s" - msgstr "无法获取联系人：%s" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:185 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:186 - #, c-format - msgid "Could not find contact: %s" - msgstr "无法找到联系人：%s" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:411 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:414 - msgid "Cannot create searchable view." - msgstr "无法创建可搜索视图。" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:883 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:886 - msgid "Success" - msgstr "成功" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:885 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:888 - msgid "An argument was invalid." - msgstr "一个参数无效。" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:887 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:890 - msgid "The address book is busy." - msgstr "地址簿忙。" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:889 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:892 - msgid "The address book is offline." - msgstr "地址簿离线" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:891 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:894 - msgid "The address book does not exist." - msgstr "地址簿不存在。" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:893 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:896 - msgid "The \"Me\" contact does not exist." - msgstr "“Me”联系人不存在。" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:895 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:898 - msgid "The address book is not loaded." - msgstr "地址簿未加载。" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:897 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:900 - msgid "The address book is already loaded." - msgstr "地址簿已经加载。" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:899 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:902 - msgid "Permission was denied when accessing the address book." - msgstr "访问地址簿时许可被拒绝。" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:901 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:904 - msgid "The contact was not found." - msgstr "联系人未找到。" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:903 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:906 - msgid "This contact ID already exists." - msgstr "联系人 ID 已经存在。" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:905 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:908 - msgid "The protocol is not supported." - msgstr "协议不受支持。" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:907 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:910 - msgid "The operation was cancelled." - msgstr "操作被取消。" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:909 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:912 - msgid "The operation could not be cancelled." - msgstr "操作无法取消。" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:911 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:914 - msgid "The address book authentication failed." - msgstr "地址簿认证失败。" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:913 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:916 - msgid "" - "Authentication is required to access the address book and was not given." - msgstr "访问地址簿需要认证但是没有给出。" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:915 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:918 - msgid "A secure connection is not available." - msgstr "安全连接不可用。" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:917 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:920 - msgid "A CORBA error occurred whilst accessing the address book." - msgstr "访问地址簿时发生 CORBA 错误。" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:919 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:922 - msgid "The address book source does not exist." - msgstr "地址簿源不存在。" - --#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:921 - #: ../cut-n-paste/e-contact-entry/e-contact-entry.c:924 -+#: ../cut-n-paste/e-contact-entry/e-contact-entry.c:927 - msgid "An unknown error occurred." - msgstr "发生了一个未知错误。" - --#: ../cut-n-paste/gconf-bridge/gconf-bridge.c:1221 -+#: ../cut-n-paste/gconf-bridge/gconf-bridge.c:1233 - #, c-format - msgid "GConf error: %s" - msgstr "GConf 错误：%s" - --#: ../cut-n-paste/gconf-bridge/gconf-bridge.c:1231 -+#: ../cut-n-paste/gconf-bridge/gconf-bridge.c:1238 - msgid "All further errors shown only on terminal." - msgstr "进一步的错误只在终端中显示。" - -+#. Translators: "device" is a phone or a modem -+#: ../gnome-bluetooth/phonemgr.c:133 -+msgid "Use this device with Phone Manager" -+msgstr "" -+ - #. translators: the '%s' will be substituted with '/dev/ttyS0' - #. or similar - #: ../src/connection.c:124 -@@ -166,6 +171,10 @@ msgstr "未连接" - msgid "Show model name of a specific device" - msgstr "显示指定设备的型号名" - -+#: ../src/main.c:38 ../src/main.c:39 -+msgid "PORT" -+msgstr "" -+ - #: ../src/main.c:39 - msgid "Write the configuration file for gnokii debugging" - msgstr "为 gnokii 调试写配置文件" -@@ -182,7 +191,7 @@ msgstr "显示版本信息然后退出" - msgid "- Manage your mobile phone" - msgstr " - 管理您的移动电话" - --#: ../src/main.c:72 -+#: ../src/main.c:74 - #, c-format - msgid "gnome-phone-manager version %s\n" - msgstr "gnome-phone-manager 版本 %s\n" -@@ -203,23 +212,23 @@ msgstr "电话管理器网站" - msgid "_Send Message" - msgstr "发送消息(_S)" - --#: ../src/ui.c:166 -+#: ../src/ui.c:111 - msgid "New text message received" - msgstr "收到了新文本消息" - --#: ../src/ui.c:331 -+#: ../src/ui.c:277 - msgid "Message too long!" - msgstr "消息太长！" - --#: ../data/phonemgr.glade.h:1 -+#: ../data/phonemgr.ui.h:1 - msgid "Alerting" - msgstr "提醒" - --#: ../data/phonemgr.glade.h:2 -+#: ../data/phonemgr.ui.h:2 - msgid "Alternative device filename, e.g. /dev/ttyS3" - msgstr "其它设备文件名，例如 /dev/ttyS3" - --#: ../data/phonemgr.glade.h:3 -+#: ../data/phonemgr.ui.h:3 - msgid "" - "Always try and reconnect whenever a connection is not immediately available. " - "Use this with Bluetooth to ensure your phone connects whenever it comes in " -@@ -228,136 +237,136 @@ msgstr "" - "每当连接不立即可用时，总使尝试重新连接。对蓝牙使用此选项可以确保，每当手机进" - "入可用区域，自动连接。" - --#: ../data/phonemgr.glade.h:4 -+#: ../data/phonemgr.ui.h:4 - msgid "Automated Tasks" - msgstr "自动任务" - --#: ../data/phonemgr.glade.h:5 -+#: ../data/phonemgr.ui.h:5 - msgid "Automatically _retry connections" - msgstr "自动重试连接(_R)" - --#: ../data/phonemgr.glade.h:6 -+#: ../data/phonemgr.ui.h:6 - msgid "Characters left:" - msgstr "所剩字符数：" - --#: ../data/phonemgr.glade.h:7 -+#: ../data/phonemgr.ui.h:7 - msgid "Connect using an alternative serial device" - msgstr "使用另外的串行设备连接" - --#: ../data/phonemgr.glade.h:8 -+#: ../data/phonemgr.ui.h:8 - msgid "Connect using infrared communication" - msgstr "使用红外连接" - --#: ../data/phonemgr.glade.h:9 -+#: ../data/phonemgr.ui.h:9 - msgid "Connect using serial port 1, also known as COM1 or /dev/ttyS0" - msgstr "使用串口 1 连接，也就是 COM1 或 /dev/ttyS0" - --#: ../data/phonemgr.glade.h:10 -+#: ../data/phonemgr.ui.h:10 - msgid "Connect using serial port 2, also known as COM2 or /dev/ttyS1" - msgstr "使用串口 2 连接，也就是 COM2 或 /dev/ttyS1" - --#: ../data/phonemgr.glade.h:11 -+#: ../data/phonemgr.ui.h:11 - msgid "Connection" - msgstr "连接" - --#: ../data/phonemgr.glade.h:12 -+#: ../data/phonemgr.ui.h:12 - msgid "Date:" - msgstr "日期：" - --#: ../data/phonemgr.glade.h:13 -+#: ../data/phonemgr.ui.h:13 - msgid "Enter the text message you want to send." - msgstr "输入您想要发送的文字消息。" - --#: ../data/phonemgr.glade.h:14 -+#: ../data/phonemgr.ui.h:14 - msgid "Enter your text message" - msgstr "输入您的文本消息。" - --#: ../data/phonemgr.glade.h:15 -+#: ../data/phonemgr.ui.h:15 - msgid "I_nfra red (/dev/ircomm0)" - msgstr "红外(/dev/ircomm0)(_N)" - --#: ../data/phonemgr.glade.h:16 -+#: ../data/phonemgr.ui.h:16 - msgid "Interface" - msgstr "界面" - --#: ../data/phonemgr.glade.h:17 -+#: ../data/phonemgr.ui.h:17 - msgid "Message Received" - msgstr "收到了消息" - --#: ../data/phonemgr.glade.h:18 -+#: ../data/phonemgr.ui.h:18 - msgid "Other _port" - msgstr "其它端口(_P)" - --#: ../data/phonemgr.glade.h:19 -+#: ../data/phonemgr.ui.h:19 - msgid "Phone Connection" - msgstr "电话连接" - --#: ../data/phonemgr.glade.h:20 -+#: ../data/phonemgr.ui.h:20 - msgid "Phone Manager Preferences" - msgstr "电话管理器首选项" - --#: ../data/phonemgr.glade.h:21 -+#: ../data/phonemgr.ui.h:21 - msgid "Play _sound when messages arrive" - msgstr "收到消息时播放声音(_S)" - --#: ../data/phonemgr.glade.h:22 -+#: ../data/phonemgr.ui.h:22 - msgid "Send Message" - msgstr "发送消息" - --#: ../data/phonemgr.glade.h:23 -+#: ../data/phonemgr.ui.h:23 - msgid "Sender:" - msgstr "发送人：" - --#: ../data/phonemgr.glade.h:24 -+#: ../data/phonemgr.ui.h:24 - msgid "Serial port _1 (/dev/ttyS0)" - msgstr "串口1(/dev/ttyS0)(_1)" - --#: ../data/phonemgr.glade.h:25 -+#: ../data/phonemgr.ui.h:25 - msgid "Serial port _2 (/dev/ttyS1)" - msgstr "串口2(/dev/ttyS1)(_2)" - --#: ../data/phonemgr.glade.h:26 -+#: ../data/phonemgr.ui.h:26 - msgid "Synchronise phone's _time and date" - msgstr "同步电话的时间和日期(_T)" - --#: ../data/phonemgr.glade.h:27 -+#: ../data/phonemgr.ui.h:27 - msgid "Synchronise phone's time and date with the computer's clock" - msgstr "使用计算机时钟同步电话时间和日期" - --#: ../data/phonemgr.glade.h:28 -+#: ../data/phonemgr.ui.h:28 - msgid "Use Bluetooth wireless networking to connect to your phone" - msgstr "使用蓝牙无线网络连接到您的电话" - --#: ../data/phonemgr.glade.h:29 -+#: ../data/phonemgr.ui.h:29 - msgid "You have received a message" - msgstr "您收到了一条消息" - --#: ../data/phonemgr.glade.h:30 -+#: ../data/phonemgr.ui.h:30 - msgid "_Bluetooth" - msgstr "蓝牙(_B)" - --#: ../data/phonemgr.glade.h:31 -+#: ../data/phonemgr.ui.h:31 - msgid "_Message:" - msgstr "消息(_M)：" - - #. This is a receipt from the SMS server saying the message has been delivered to the recipient's phone --#: ../data/phonemgr.glade.h:33 -+#: ../data/phonemgr.ui.h:33 - msgid "_Notify when message is delivered" - msgstr "消息成功传送时通知(_N)" - --#: ../data/phonemgr.glade.h:34 -+#: ../data/phonemgr.ui.h:34 - msgid "_Pop-up window for new messages" - msgstr "新消息弹出窗口(_P)" - --#: ../data/phonemgr.glade.h:35 -+#: ../data/phonemgr.ui.h:35 - msgid "_Recipient:" - msgstr "收件人(_R)：" - --#: ../data/phonemgr.glade.h:36 -+#: ../data/phonemgr.ui.h:36 - msgid "_Reply" - msgstr "回复(_R)" - --#: ../data/phonemgr.glade.h:37 -+#: ../data/phonemgr.ui.h:37 - msgid "_Send" - msgstr "发送(_S)" - -diff --git a/src/e-phone-entry.h b/src/e-phone-entry.h -index 2b4eae6..2431836 100644 ---- a/src/e-phone-entry.h -+++ b/src/e-phone-entry.h -@@ -29,10 +29,10 @@ - - G_BEGIN_DECLS - --#define E_PHONE_ENTRY(obj) (GTK_CHECK_CAST ((obj), e_phone_entry_get_type (), EPhoneEntry)) --#define E_PHONE_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), e_phone_entry_get_type (), EPhoneEntryClass)) --#define E_IS_PHONE_ENTRY(obj) (GTK_CHECK_TYPE (obj, e_phone_entry_get_type ())) --#define E_IS_PHONE_ENTRY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), e_phone_entry_get_type ())) -+#define E_PHONE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), e_phone_entry_get_type (), EPhoneEntry)) -+#define E_PHONE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), e_phone_entry_get_type (), EPhoneEntryClass)) -+#define E_IS_PHONE_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, e_phone_entry_get_type ())) -+#define E_IS_PHONE_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), e_phone_entry_get_type ())) - #define E_PHONE_ENTRY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), E_PHONE_ENTRY_TYPE, EPhoneEntryClass)) - - typedef struct EPhoneEntry EPhoneEntry; -diff --git a/src/icon.c b/src/icon.c -index 45d1683..4224ae2 100644 ---- a/src/icon.c -+++ b/src/icon.c -@@ -56,18 +56,18 @@ set_icon_state (MyApp *app) - gtk_widget_set_sensitive (app->send_item, TRUE); - if (app->messages) { - gtk_status_icon_set_from_icon_name (app->tray_icon, "phone-message"); -- gtk_status_icon_set_tooltip (app->tray_icon, _("Message arrived")); -+ gtk_status_icon_set_tooltip_text (app->tray_icon, _("Message arrived")); - } else { - gtk_status_icon_set_from_icon_name (app->tray_icon, "phone"); -- gtk_status_icon_set_tooltip (app->tray_icon, _("Connected")); -+ gtk_status_icon_set_tooltip_text (app->tray_icon, _("Connected")); - } - } else if (app->connecting) { - gtk_status_icon_set_from_icon_name (app->tray_icon, "phone-connecting"); -- gtk_status_icon_set_tooltip (app->tray_icon, _("Connecting to phone")); -+ gtk_status_icon_set_tooltip_text (app->tray_icon, _("Connecting to phone")); - gtk_widget_set_sensitive (app->send_item, FALSE); - } else { - gtk_status_icon_set_from_icon_name (app->tray_icon, "phone-error"); -- gtk_status_icon_set_tooltip (app->tray_icon, _("Not connected")); -+ gtk_status_icon_set_tooltip_text (app->tray_icon, _("Not connected")); - gtk_widget_set_sensitive (app->send_item, FALSE); - } - } -diff --git a/src/menu.c b/src/menu.c -index e8ebeae..98905a0 100644 ---- a/src/menu.c -+++ b/src/menu.c -@@ -37,7 +37,6 @@ about_activated(GtkMenuItem *item, gpointer data) - { - const char *authors[] = { "Bastien Nocera <hadess@hadess.net>", "Edd Dumbill <edd@usefulinc.com>", NULL }; - const char *documenters[] = { NULL }; -- const char *translator_credits = _("translator_credits"); - - gtk_show_about_dialog (NULL, - "authors", authors, -@@ -53,7 +52,7 @@ about_activated(GtkMenuItem *item, gpointer data) - "name", _("Phone Manager"), - #endif /* GTK+ 2.11.0 */ - "version", VERSION, -- "translator-credits", strcmp (translator_credits, "translator_credits") != 0 ? translator_credits : NULL, -+ "translator-credits", _("translator_credits"), - "website", "http://live.gnome.org/PhoneManager", - "website-label", _("Phone Manager website"), - NULL); -diff --git a/src/ui.c b/src/ui.c -index 7daf22d..56a70ad 100644 ---- a/src/ui.c -+++ b/src/ui.c -@@ -451,12 +451,6 @@ ui_init (MyApp *app) - "active"); - - /* And the address chooser */ -- /* XXX Force a value to the device property else if there is no valid value in gconf -- and the Bluetooth chooser button won't show any label -- */ -- g_object_set (G_OBJECT (gtk_builder_get_object (app->ui, "btchooser")), -- "device", NULL, -- NULL); - gconf_bridge_bind_property (bridge, - CONFBASE"/bluetooth_addr", - G_OBJECT (gtk_builder_get_object (app->ui, "btchooser")), diff --git a/extra/gnome-phone-manager/gtk3.patch b/extra/gnome-phone-manager/gtk3.patch deleted file mode 100644 index 141e53a2c..000000000 --- a/extra/gnome-phone-manager/gtk3.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 4944880ed2227f666b0761961663b0fbbcc45aa8 Mon Sep 17 00:00:00 2001 -From: Jan de Groot <jan@jgc.homeip.net> -Date: Thu, 30 Jun 2011 19:54:21 +0200 -Subject: [PATCH] Port to gtk3. This raises the required version for - gnome-bluetooth to 3.0, as this is the first released - version that uses gtk3. - ---- - configure.in | 7 +++---- - src/ui.c | 6 ------ - 2 files changed, 3 insertions(+), 10 deletions(-) - -diff --git a/configure.in b/configure.in -index 2338f4b..e486768 100644 ---- a/configure.in -+++ b/configure.in -@@ -13,7 +13,7 @@ dnl Initialize libtool - AM_PROG_LIBTOOL - - GNOKII_REQS="gnokii >= 0.6.28" --GNOME_BLUETOOTH_REQS="gnome-bluetooth-1.0" -+GNOME_BLUETOOTH_REQS="gnome-bluetooth-1.0 >= 3.0" - - AC_PROG_CC - AC_PROG_INSTALL -@@ -44,11 +44,10 @@ PKG_CHECK_MODULES(TMP_EVO, libebook-1.2, - - PKG_CHECK_MODULES(LIBGSM, glib-2.0 gobject-2.0 $GNOKII_REQS gthread-2.0 bluez $evo_pc_file) - --PKG_CHECK_MODULES(PHONEMGR, gtk+-2.0 >= 2.18 glib-2.0 >= 2.25.0 -- libcanberra-gtk gconf-2.0 -+PKG_CHECK_MODULES(PHONEMGR, gtk+-3.0 >= 3.0 glib-2.0 >= 2.25.0 -+ libcanberra-gtk3 gconf-2.0 - $GNOME_BLUETOOTH_REQS $evo_pc_file - gmodule-2.0 dbus-glib-1 gnome-icon-theme >= 2.19.1 -- gtkspell-2.0 - ) - - DBUSLIBDIR="`$PKG_CONFIG dbus-glib-1 --variable=libdir`" -diff --git a/src/ui.c b/src/ui.c -index 56a70ad..bc89bf4 100644 ---- a/src/ui.c -+++ b/src/ui.c -@@ -22,7 +22,6 @@ - #include <glib/gi18n.h> - #include <stdlib.h> - #include <gtk/gtk.h> --#include <gtkspell/gtkspell.h> - #include <canberra-gtk.h> - #include <time.h> - #include <string.h> -@@ -343,11 +342,6 @@ create_send_dialog (MyApp *app, GtkDialog *parent, const char *recip) - buf = gtk_text_view_get_buffer (view); - gtk_text_buffer_set_text (buf, "", 0); - -- if (!gtkspell_new_attach (view, NULL, &err)) { -- g_warning ("Couldn't initialise spell checking: %s", err->message); -- g_error_free (err); -- } -- - entry = GTK_ENTRY (gtk_builder_get_object (ui, "recipient")); - if (recip) - gtk_entry_set_text (entry, recip); --- -1.7.6 - diff --git a/extra/gnome-power-manager/fix-suspend.patch b/extra/gnome-power-manager/fix-suspend.patch deleted file mode 100644 index acd9093cd..000000000 --- a/extra/gnome-power-manager/fix-suspend.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 44503c5bca065290ce73b0d064a1a0db7de2936d Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Mon, 02 May 2011 23:18:58 +0000 -Subject: gpm-idle: manually update the status property - -gnome-session doesn't emit PropertyChanged since it uses dbus-glib, -therefore we need to manually update the cached property when -receiving a SessionChanged signal. - -https://bugzilla.redhat.com/show_bug.cgi?id=679083 - -Signed-off-by: Richard Hughes <richard@hughsie.com> ---- -diff --git a/src/gpm-idle.c b/src/gpm-idle.c -index 04225fc..0f2f1ee 100644 ---- a/src/gpm-idle.c -+++ b/src/gpm-idle.c -@@ -424,6 +424,11 @@ gpm_idle_dbus_signal_cb (GDBusProxy *proxy, const gchar *sender_name, const gcha - return; - } - if (g_strcmp0 (signal_name, "StatusChanged") == 0) { -+ guint status; -+ -+ g_variant_get (parameters, "(u)", &status); -+ g_dbus_proxy_set_cached_property (proxy, "status", -+ g_variant_new ("u", status)); - g_debug ("Received gnome session status change"); - gpm_idle_evaluate (idle); - return; --- -cgit v0.9 diff --git a/extra/gnome-python-desktop/PKGBUILD b/extra/gnome-python-desktop/PKGBUILD index 7453b87ba..b426842f0 100644 --- a/extra/gnome-python-desktop/PKGBUILD +++ b/extra/gnome-python-desktop/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 139181 2011-10-01 08:28:33Z ibiru $ +# $Id: PKGBUILD 140109 2011-10-06 19:11:44Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Arjan Timmerman <arjan@soulfly.nl> # Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> @@ -6,7 +6,7 @@ pkgbase=gnome-python-desktop pkgname=('gnome-python-desktop' 'python-evolution' 'python-gnomedesktop' 'python-gnomekeyring' 'python-gtop' 'python-metacity' 'python-rsvg' 'python-totem-plparser' 'python-wnck' 'python-gnomeprint') pkgver=2.32.0 -pkgrel=7 +pkgrel=8 arch=(i686 x86_64 'mips64el') license=('GPL' 'LGPL') options=('!libtool') diff --git a/extra/gnome-shell/arch.patch b/extra/gnome-shell/arch.patch deleted file mode 100644 index 67baefdcb..000000000 --- a/extra/gnome-shell/arch.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur gnome-shell.orig/data/org.gnome.shell.gschema.xml.in gnome-shell/data/org.gnome.shell.gschema.xml.in ---- gnome-shell.orig/data/org.gnome.shell.gschema.xml.in 2011-04-06 08:47:58.638600793 -0700 -+++ gnome-shell/data/org.gnome.shell.gschema.xml.in 2011-04-06 08:49:17.035274675 -0700 -@@ -30,7 +30,7 @@ - </_description> - </key> - <key name="favorite-apps" type="as"> -- <default>[ 'mozilla-firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'openoffice.org-writer.desktop', 'nautilus.desktop' ]</default> -+ <default>[ 'firefox.desktop', 'evolution.desktop', 'empathy.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'writer.desktop', 'nautilus.desktop' ]</default> - <_summary>List of desktop file IDs for favorite applications</_summary> - <_description> - The applications corresponding to these identifiers diff --git a/extra/gnome-shell/bluetoothstatus-always-update-devices.patch b/extra/gnome-shell/bluetoothstatus-always-update-devices.patch deleted file mode 100644 index 0272169f5..000000000 --- a/extra/gnome-shell/bluetoothstatus-always-update-devices.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 76fce94b66be7bdebbedcc3bce62898da51da15a Mon Sep 17 00:00:00 2001 -From: Giovanni Campagna <gcampagna@src.gnome.org> -Date: Wed, 13 Apr 2011 17:08:45 +0000 -Subject: BluetoothStatus: always update devices - -Previously, we skipped rebuilding device items in case the device -had already been seen, but this caused the connected switch not to -be updated. Now it has been refactored to update in case the device -changes, and to create only when the device is completely new. - -https://bugzilla.gnome.org/show_bug.cgi?id=647565 ---- -diff --git a/js/ui/status/bluetooth.js b/js/ui/status/bluetooth.js -index 070016a..cee2f90 100644 ---- a/js/ui/status/bluetooth.js -+++ b/js/ui/status/bluetooth.js -@@ -127,13 +127,6 @@ Indicator.prototype = { - } - }, - -- _deviceCompare: function(d1, d2) { -- return d1.device_path == d2.device_path && -- d1.bdaddr == d2.bdaddr && -- d1.can_connect == d2.can_connect && -- d1.capabilities == d2.capabilities; -- }, -- - _updateDevices: function() { - let devices = this._applet.get_devices(); - -@@ -142,12 +135,8 @@ Indicator.prototype = { - let item = this._deviceItems[i]; - let destroy = true; - for (let j = 0; j < devices.length; j++) { -- // we need to deep compare because BluetoothSimpleDevice is a boxed type -- // (but we take advantage of that, because _skip will disappear the next -- // time get_devices() is called) -- if (this._deviceCompare(item._device, devices[j])) { -- item.label.text = devices[j].alias; -- devices[j]._skip = true; -+ if (item._device.device_path == devices[j].device_path) { -+ this._updateDeviceItem(item, devices[j]); - destroy = false; - break; - } -@@ -162,7 +151,7 @@ Indicator.prototype = { - this._hasDevices = newlist.length > 0; - for (let i = 0; i < devices.length; i++) { - let d = devices[i]; -- if (d._skip) -+ if (d._item) - continue; - let item = this._createDeviceItem(d); - if (item) { -@@ -177,17 +166,55 @@ Indicator.prototype = { - this._deviceSep.actor.hide(); - }, - -+ _updateDeviceItem: function(item, device) { -+ if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE) { -+ item.destroy(); -+ return; -+ } -+ -+ let prevDevice = item._device; -+ let prevCapabilities = prevDevice.capabilities; -+ let prevCanConnect = prevDevice.can_connect; -+ -+ // adopt the new device object -+ item._device = device; -+ device._item = item; -+ -+ // update properties -+ item.label.text = device.alias; -+ -+ if (prevCapabilities != device.capabilities || -+ prevCanConnect != device.can_connect) { -+ // need to rebuild the submenu -+ item.menu.removeAll(); -+ this._buildDeviceSubMenu(item, device); -+ } -+ -+ // update connected property -+ if (device.can_connect) -+ item._connectedMenuitem.setToggleState(device.connected); -+ }, -+ - _createDeviceItem: function(device) { - if (!device.can_connect && device.capabilities == GnomeBluetoothApplet.Capabilities.NONE) - return null; - let item = new PopupMenu.PopupSubMenuMenuItem(device.alias); -+ -+ // adopt the device object, and add a back link - item._device = device; -+ device._item = item; - -+ this._buildDeviceSubMenu(item, device); -+ -+ return item; -+ }, -+ -+ _buildDeviceSubMenu: function(item, device) { - if (device.can_connect) { - item._connected = device.connected; -- let menuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected); -+ item._connectedMenuitem = new PopupMenu.PopupSwitchMenuItem(_("Connection"), device.connected); - -- menuitem.connect('toggled', Lang.bind(this, function() { -+ item._connectedMenuitem.connect('toggled', Lang.bind(this, function() { - if (item._connected > ConnectionState.CONNECTED) { - // operation already in progress, revert - menuitem.setToggleState(menuitem.state); -@@ -217,7 +244,7 @@ Indicator.prototype = { - } - })); - -- item.menu.addMenuItem(menuitem); -+ item.menu.addMenuItem(item._connectedMenuitem); - } - - if (device.capabilities & GnomeBluetoothApplet.Capabilities.OBEX_PUSH) { -@@ -263,8 +290,6 @@ Indicator.prototype = { - default: - break; - } -- -- return item; - }, - - _updateFullMenu: function() { --- -cgit v0.9 diff --git a/extra/gnome-shell/shell-recorder-missing-XFree.patch b/extra/gnome-shell/shell-recorder-missing-XFree.patch deleted file mode 100644 index a7329166f..000000000 --- a/extra/gnome-shell/shell-recorder-missing-XFree.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 88df18345069c295e68d319606a11b7727b2bd4b Mon Sep 17 00:00:00 2001 -From: Maxim Ermilov <zaspire@rambler.ru> -Date: Tue, 24 May 2011 22:46:47 +0000 -Subject: shell-recorder: missing XFree - -https://bugzilla.gnome.org/show_bug.cgi?id=650934 ---- -diff --git a/src/shell-recorder.c b/src/shell-recorder.c -index 6555187..d297923 100644 ---- a/src/shell-recorder.c -+++ b/src/shell-recorder.c -@@ -412,6 +412,8 @@ recorder_fetch_cursor_image (ShellRecorder *recorder) - *(guint32 *)(data + i * stride + 4 * j) = cursor_image->pixels[i * cursor_image->width + j]; - - cairo_surface_mark_dirty (recorder->cursor_image); -+ -+ XFree (cursor_image); - } - - /* Overlay the cursor image on the frame. We draw the cursor image --- -cgit v0.9 diff --git a/extra/gnome-terminal/exitcode.patch b/extra/gnome-terminal/exitcode.patch deleted file mode 100644 index ded5e6dc0..000000000 --- a/extra/gnome-terminal/exitcode.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6eb49392fad8c76ade38fbd712509f0daa419a06 Mon Sep 17 00:00:00 2001 -From: Jan de Groot <jan@jgc.homeip.net> -Date: Thu, 31 Mar 2011 12:27:37 +0200 -Subject: [PATCH] Initialize exit status with EXIT_SUCCESS instead of -1. When things go wrong, the exit status is set to something else anyways. Fixes bug #646317 - ---- - src/terminal.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/terminal.c b/src/terminal.c -index 202b850..06de533 100644 ---- a/src/terminal.c -+++ b/src/terminal.c -@@ -579,7 +579,7 @@ main (int argc, char **argv) - data = g_new (OwnData, 1); - data->factory_name = get_factory_name_for_display (display_name); - data->options = options; -- data->exit_code = -1; -+ data->exit_code = EXIT_SUCCESS; - data->argv = argv_copy; - data->argc = argc_copy; - --- -1.7.4.2 - diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index a9e73f9c9..441a988e0 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 138216 2011-09-19 03:13:19Z andyrtr $ +# $Id: PKGBUILD 140493 2011-10-15 19:34:21Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gnutls -pkgver=3.0.3 -pkgrel=1 +pkgver=3.0.4 +pkgrel=2 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') license=('GPL3' 'LGPL') url="http://www.gnu.org/software/gnutls/" install=gnutls.install options=('!libtool' '!zipman') -depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.2' 'p11-kit') +<<<<<<< HEAD +depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle>=2.4' 'p11-kit') [ "$CARCH" = "mips64el" ] || makedepends=('valgrind') -source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz) -md5sums=('7b45b99cb6d314c452f8c0f1c7a736dd') -sha1sums=('0e6c325ae12cf1a4bd7d25125b8d58d51472fc14') +source=(ftp://ftp.gnu.org/gnu/gnutls/${pkgname}-${pkgver}.tar.xz + addGNU-stack.diff) +md5sums=('748d537027978abcb7dd33ec396dc511' + '19b92429e8d1639cfc4dfad0883298cb') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i ${srcdir}/addGNU-stack.diff ./configure --prefix=/usr \ --with-zlib \ --disable-static \ diff --git a/extra/gnutls/addGNU-stack.diff b/extra/gnutls/addGNU-stack.diff new file mode 100644 index 000000000..8324b5a58 --- /dev/null +++ b/extra/gnutls/addGNU-stack.diff @@ -0,0 +1,13 @@ +Description: Prevent executable stack +Author: Andreas Metzler <ametzler@debian.org> + +--- gnutls28-3.0.4.orig/lib/accelerated/x86/asm/padlock-common.s ++++ gnutls28-3.0.4/lib/accelerated/x86/asm/padlock-common.s +@@ -38,3 +38,7 @@ is_padlock_nano: + xorl %eax,%eax + ret + .size is_padlock_nano,.-is_padlock_nano ++ ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif diff --git a/extra/gok/PKGBUILD b/extra/gok/PKGBUILD deleted file mode 100644 index a0d841433..000000000 --- a/extra/gok/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 92436 2010-09-29 22:05:23Z ibiru $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=gok -pkgver=2.30.1 -pkgrel=1 -pkgdesc="Gnome Onscreen Keyboard" -arch=(i686 x86_64 'mips64el') -license=('GPL') -url="http://www.gnome.org" -depends=('gnome-speech>=0.4.25' 'at-spi>=1.32' 'libwnck>=2.30.5' 'hicolor-icon-theme' 'libcanberra>=0.25' 'gconf>=2.32.0') -makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils>=0.20.0') -options=('!emptydirs') -groups=('gnome-extra') -install=gok.install -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('6422dedb80c2cb3d5ee47238227960dc0e6dde0d0d1351cc7d11de06089c36c0') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var - make - make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install - - install -m755 -d "${pkgdir}/usr/share/gconf/schemas" - gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain gok ${pkgdir}/etc/gconf/schemas/*.schemas - rm -f ${pkgdir}/etc/gconf/schemas/*.schemas -} diff --git a/extra/gok/gok.install b/extra/gok/gok.install deleted file mode 100644 index d3d5a9bae..000000000 --- a/extra/gok/gok.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=gok - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} diff --git a/extra/gok/lm.patch b/extra/gok/lm.patch deleted file mode 100644 index b74ce19b7..000000000 --- a/extra/gok/lm.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gok-2.27.2/gok/Makefile.in.lm gok-2.27.2/gok/Makefile.in ---- gok-2.27.2/gok/Makefile.in.lm 2009-06-13 00:59:29.162580117 -0400 -+++ gok-2.27.2/gok/Makefile.in 2009-06-13 00:59:11.583583888 -0400 -@@ -374,7 +374,7 @@ INCLUDES = -DGOK_LOCALEDIR=\""$(datadir) - -DDATADIR=\""$(datadir)"\" -DLIBDIR=\""$(libdir)"\" \ - -I$(top_srcdir) -I$(top_builddir) $(GOK_CFLAGS) \ - $(am__append_1) --LDADD = $(GOK_LIBS) $(X_LIBS) @LT_VERSION_INFO@ $(am__append_2) -+LDADD = $(GOK_LIBS) $(X_LIBS) -lm @LT_VERSION_INFO@ $(am__append_2) - gok_LDFLAGS = -export-dynamic - gok_SOURCES = callbacks.c callbacks.h gok-branchback-stack.c \ - gok-branchback-stack.h gok-button.c gok-button.h gok-chunker.c \ diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD index e9d2c22ba..14021c4e5 100644 --- a/extra/gparted/PKGBUILD +++ b/extra/gparted/PKGBUILD @@ -1,27 +1,30 @@ -# $Id: PKGBUILD 139177 2011-10-01 06:10:22Z giovanni $ +# $Id: PKGBUILD 140162 2011-10-08 07:31:59Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Andrew Simmons <andrew.simmons@gmail.com> +# Contributor: György Balló <ballogy@freestart.hu> pkgname=gparted pkgver=0.9.1 -pkgrel=2 +pkgrel=3 pkgdesc="A Partition Magic clone, frontend to GNU Parted" arch=('i686' 'x86_64' 'mips64el') url="http://gparted.sourceforge.net" license=('GPL') depends=('parted' 'gtkmm' 'libsigc++') -makedepends=('intltool' 'pkgconfig' 'gnome-doc-utils') +makedepends=('intltool' 'pkg-config' 'gnome-doc-utils') optdepends=('dosfstools: for FAT16 and FAT32 partitions' 'jfsutils: for jfs partitions' 'ntfsprogs: for ntfs partitions' 'reiserfsprogs: for reiser partitions' 'xfsprogs: for xfs partitions' - 'gksu: to run gparted directly from menu' + 'polkit: to run gparted directly from menu' 'gpart: for recovering corrupt partition tables' 'mtools') install=gparted.install -source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('f35785099994c7c9b7b2e842840f8b72') +source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2" + 'org.archlinux.pkexec.gparted.policy') +md5sums=('f35785099994c7c9b7b2e842840f8b72' + '27c264cfad8fa413d75954dda7a2dd50') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -34,5 +37,16 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - sed -i -e "s:Exec= /usr/sbin:Exec=gksu /usr/sbin:g" ${pkgdir}/usr/share/applications/gparted.desktop + + # Install policy file + install -Dm644 "${srcdir}/org.archlinux.pkexec.gparted.policy" "${pkgdir}/usr/share/polkit-1/actions/org.archlinux.pkexec.gparted.policy" + + # Install launcher script + mkdir -p ${pkgdir}/usr/bin + echo '#!/bin/sh' > ${pkgdir}/usr/bin/gparted-pkexec + echo 'pkexec "/usr/sbin/gparted" "$@"' >> ${pkgdir}/usr/bin/gparted-pkexec + chmod 755 ${pkgdir}/usr/bin/gparted-pkexec + + # Modify desktop file + sed -i -e "s/Exec=.*/Exec=gparted-pkexec/" ${pkgdir}/usr/share/applications/gparted.desktop } diff --git a/extra/gparted/org.archlinux.pkexec.gparted.policy b/extra/gparted/org.archlinux.pkexec.gparted.policy new file mode 100644 index 000000000..561cd7d1e --- /dev/null +++ b/extra/gparted/org.archlinux.pkexec.gparted.policy @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE policyconfig PUBLIC + "-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN" + "http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd"> +<policyconfig> + + <action id="org.archlinux.pkexec.gparted"> + <message>Authentication is required to run the GParted Partition Editor</message> + <icon_name>gparted</icon_name> + <defaults> + <allow_any>auth_admin</allow_any> + <allow_inactive>auth_admin</allow_inactive> + <allow_active>auth_admin</allow_active> + </defaults> + <annotate key="org.freedesktop.policykit.exec.path">/usr/sbin/gparted</annotate> + <annotate key="org.freedesktop.policykit.exec.allow_gui">true</annotate> + </action> + +</policyconfig> + diff --git a/extra/gperf/PKGBUILD b/extra/gperf/PKGBUILD index f3fb917ad..efc0ff0c6 100644 --- a/extra/gperf/PKGBUILD +++ b/extra/gperf/PKGBUILD @@ -1,18 +1,20 @@ -# $Id: PKGBUILD 125923 2011-05-31 21:45:14Z andrea $ +# $Id: PKGBUILD 140657 2011-10-17 19:09:57Z andrea $ # Maintainer: # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gperf pkgver=3.0.4 -pkgrel=3 +pkgrel=4 pkgdesc="Perfect hash function generator" arch=('x86_64' 'i686' 'mips64el') url="http://www.gnu.org/software/gperf/" license=('GPL3') depends=('gcc-libs' 'texinfo') install=gperf.install -source=("http://ftp.gnu.org/pub/gnu/gperf/${pkgname}-${pkgver}.tar.gz") -md5sums=('c1f1db32fb6598d6a93e6e88796a8632') +source=("http://ftp.gnu.org/pub/gnu/gperf/${pkgname}-${pkgver}.tar.gz"{,.sig}) +sha1sums=('e32d4aff8f0c730c9a56554377b2c6d82d0951b8' + '85b8c44964a70a63d751afa5906796a0417e64ce') +options=('!makeflags') build() { cd "${srcdir}"/${pkgname}-${pkgver} @@ -21,8 +23,12 @@ build() { make } +check() { + cd "${srcdir}"/${pkgname}-${pkgver} + make check +} + package() { cd "${srcdir}"/${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install - gzip "${pkgdir}"/usr/share/info/gperf.info } diff --git a/extra/gperf/gperf.install b/extra/gperf/gperf.install index cdb8f9de8..90ac2a86d 100644 --- a/extra/gperf/gperf.install +++ b/extra/gperf/gperf.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info file=gperf.info.gz post_install() { diff --git a/extra/gpsd/PKGBUILD b/extra/gpsd/PKGBUILD index c1ae62d2b..3068d223f 100644 --- a/extra/gpsd/PKGBUILD +++ b/extra/gpsd/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 136393 2011-08-28 23:22:26Z andrea $ +# $Id: PKGBUILD 140082 2011-10-06 08:10:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org @@ -9,18 +9,19 @@ pkgver=3.1 pkgrel=1 pkgdesc="GPS daemon and library to support USB/serial GPS devices" arch=('i686' 'x86_64' 'mips64el') -url="http://gpsd.berlios.de" +url="http://catb.org/gpsd/" license=('BSD') depends=('python2' 'libusb' 'bluez' 'desktop-file-utils') optdepends=('php: generate a PHP status page for your GPS' - 'php-gd: image support for the PHP status page') + 'php-gd: image support for the PHP status page' + 'pygtk: GUI frontends') makedepends=('scons' 'docbook-xsl' 'chrpath') backup=('etc/conf.d/gpsd' 'lib/udev/rules.d/99-gpsd-usb.rules') options=('!libtool' '!buildflags') install="${pkgname}.install" -source=("http://download.berlios.de/${pkgname}/${pkgname}-${pkgver}.tar.gz" +source=("http://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz" 'gpsd' 'gpsd.conf.d') -md5sums=('f280b914c19da3a91aa5e67d83d35033' +md5sums=('f783c2890774fcafa56bdb968a0372fc' '1f3402f8e33a7032b9ae6dfd077234f7' '3e963df3f9f7ef3572ecc648ae829315') diff --git a/extra/gstreamer0.10-ugly/PKGBUILD b/extra/gstreamer0.10-ugly/PKGBUILD index 7c05964ef..0ddce1182 100644 --- a/extra/gstreamer0.10-ugly/PKGBUILD +++ b/extra/gstreamer0.10-ugly/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 127813 2011-06-18 16:10:52Z ibiru $ +# $Id: PKGBUILD 140071 2011-10-06 07:33:46Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gstreamer0.10-ugly pkgname=('gstreamer0.10-ugly' 'gstreamer0.10-ugly-plugins') pkgver=0.10.18 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64' 'mips64el') license=('LGPL') makedepends=('pkgconfig' 'gstreamer0.10-base>=0.10.34' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libid3tag' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') diff --git a/extra/gtksourceview3/PKGBUILD b/extra/gtksourceview3/PKGBUILD index 986b7c113..aa8d3101c 100644 --- a/extra/gtksourceview3/PKGBUILD +++ b/extra/gtksourceview3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 139352 2011-10-01 18:59:14Z ibiru $ +# $Id: PKGBUILD 140208 2011-10-09 15:35:36Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtksourceview3 _pkgbasename=gtksourceview -pkgver=3.2.0 +pkgver=3.2.1 pkgrel=1 pkgdesc="A text widget adding syntax highlighting and more to GNOME" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('intltool' 'pkgconfig' 'gobject-introspection') options=('!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgbasename/${pkgver%.*}/$_pkgbasename-${pkgver}.tar.xz) -sha256sums=('63582fbb25eb756865bfdcc38b2839c80a6bd2388bba8c7edce09aef791c360e') +sha256sums=('979e967a3e8d64512db5f7466ce71431e0fa8a77958275369fd9061e068585a4') build() { cd "${srcdir}/$_pkgbasename-${pkgver}" diff --git a/extra/hyphen/PKGBUILD b/extra/hyphen/PKGBUILD index 51291ba39..54d5cfd56 100644 --- a/extra/hyphen/PKGBUILD +++ b/extra/hyphen/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 104194 2010-12-30 18:07:33Z andyrtr $ +# $Id: PKGBUILD 140476 2011-10-15 10:01:23Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase=hyphen pkgname=('hyphen' 'hyphen-en') -pkgver=2.7.1 -pkgrel=2 +pkgver=2.8.3 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://hunspell.sf.net" license=('GPL' 'LGPL' 'MPL') @@ -12,7 +12,7 @@ groups=() makedepends=('glibc' 'perl') options=('!libtool') source=(http://downloads.sourceforge.net/hunspell/${pkgname}-${pkgver}.tar.gz) -md5sums=('48a9f787f43a09c0a9b7b00cd1fddbbf') +md5sums=('86261f06c097d3e425a2f6d0b0635380') build() { cd "$srcdir/$pkgname-$pkgver" @@ -27,7 +27,7 @@ package_hyphen() { pkgdesc="library for high quality hyphenation and justification" depends=('glibc' 'perl') - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgbase-$pkgver" make DESTDIR="$pkgdir/" install-libLTLIBRARIES make DESTDIR="$pkgdir/" install-binSCRIPTS make DESTDIR="$pkgdir/" install-includeHEADERS @@ -41,7 +41,7 @@ package_hyphen-en() { # arch=('any') optdepends=('hyphen: offers hyphenation library functions') - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgbase-$pkgver" make DESTDIR="$pkgdir/" install-hyphDATA pushd ${pkgdir}/usr/share/hyphen/ @@ -58,4 +58,4 @@ package_hyphen-en() { ln -sv /usr/share/hyphen/$(basename $file) . done popd -}
\ No newline at end of file +} diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index c5f1d0ece..f5de91c3c 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 138489 2011-09-25 02:10:52Z eric $ +# $Id: PKGBUILD 140515 2011-10-16 08:18:29Z foutrelis $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.7.2.8 +pkgver=6.7.3.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" @@ -12,7 +12,7 @@ depends=('libltdl' 'lcms2' 'libxt' 'bzip2' 'xz' 'fontconfig' 'libxext' 'libjpeg- makedepends=('ghostscript' 'openexr' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'libpng') source=(ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('227cc36d2a82d438cfb8b34ff1c7049e43d287ea' +sha1sums=('67e20cf171fa50e76c30bf6e703d37419164ce70' '23405f80904b1de94ebd7bd6fe2a332471b8c283') build() { @@ -48,7 +48,7 @@ package_imagemagick() { 'etc/ImageMagick/magic.xml' 'etc/ImageMagick/mime.xml' 'etc/ImageMagick/policy.xml' - 'etc/ImageMagick/sRGB.icm' + 'etc/ImageMagick/sRGB.icc' 'etc/ImageMagick/thresholds.xml' 'etc/ImageMagick/type.xml' 'etc/ImageMagick/type-dejavu.xml' diff --git a/extra/inkscape/PKGBUILD b/extra/inkscape/PKGBUILD index e702eb448..78479b8ab 100644 --- a/extra/inkscape/PKGBUILD +++ b/extra/inkscape/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 137989 2011-09-13 21:30:09Z eric $ +# $Id: PKGBUILD 140573 2011-10-17 08:14:49Z jgc $ # Contributor: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=inkscape pkgver=0.48.2 -pkgrel=2 +pkgrel=3 pkgdesc='Vector graphics editor using the SVG file format' url='http://inkscape.sourceforge.net/' arch=('i686' 'x86_64' 'mips64el') diff --git a/extra/kdebase-workspace/important-performance-bugfix.patch b/extra/kdebase-workspace/important-performance-bugfix.patch deleted file mode 100644 index a34c77e5c..000000000 --- a/extra/kdebase-workspace/important-performance-bugfix.patch +++ /dev/null @@ -1,91 +0,0 @@ -commit e142a1a142cbc8b87f021223e6abc947f456a7f9 -Author: Thomas Lübking <thomas.luebking@gmail.com> -Date: Thu Sep 8 22:20:35 2011 +0200 - - replace non-const QVector::operator[] accesses with const ::at() to avoid maaany deep vecor copies - -diff --git a/kwin/effects.cpp b/kwin/effects.cpp -index e0c76cb..f5863fc0 100644 ---- a/kwin/effects.cpp -+++ b/kwin/effects.cpp -@@ -200,7 +200,7 @@ void EffectsHandlerImpl::reconfigure() - void EffectsHandlerImpl::prePaintScreen(ScreenPrePaintData& data, int time) - { - if (current_paint_screen < loaded_effects.size()) { -- loaded_effects[current_paint_screen++].second->prePaintScreen(data, time); -+ loaded_effects.at(current_paint_screen++).second->prePaintScreen(data, time); - --current_paint_screen; - } - // no special final code -@@ -209,7 +209,7 @@ void EffectsHandlerImpl::prePaintScreen(ScreenPrePaintData& data, int time) - void EffectsHandlerImpl::paintScreen(int mask, QRegion region, ScreenPaintData& data) - { - if (current_paint_screen < loaded_effects.size()) { -- loaded_effects[current_paint_screen++].second->paintScreen(mask, region, data); -+ loaded_effects.at(current_paint_screen++).second->paintScreen(mask, region, data); - --current_paint_screen; - } else - scene->finalPaintScreen(mask, region, data); -@@ -218,7 +218,7 @@ void EffectsHandlerImpl::paintScreen(int mask, QRegion region, ScreenPaintData& - void EffectsHandlerImpl::postPaintScreen() - { - if (current_paint_screen < loaded_effects.size()) { -- loaded_effects[current_paint_screen++].second->postPaintScreen(); -+ loaded_effects.at(current_paint_screen++).second->postPaintScreen(); - --current_paint_screen; - } - // no special final code -@@ -227,7 +227,7 @@ void EffectsHandlerImpl::postPaintScreen() - void EffectsHandlerImpl::prePaintWindow(EffectWindow* w, WindowPrePaintData& data, int time) - { - if (current_paint_window < loaded_effects.size()) { -- loaded_effects[current_paint_window++].second->prePaintWindow(w, data, time); -+ loaded_effects.at(current_paint_window++).second->prePaintWindow(w, data, time); - --current_paint_window; - } - // no special final code -@@ -236,7 +236,7 @@ void EffectsHandlerImpl::prePaintWindow(EffectWindow* w, WindowPrePaintData& dat - void EffectsHandlerImpl::paintWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) - { - if (current_paint_window < loaded_effects.size()) { -- loaded_effects[current_paint_window++].second->paintWindow(w, mask, region, data); -+ loaded_effects.at(current_paint_window++).second->paintWindow(w, mask, region, data); - --current_paint_window; - } else - scene->finalPaintWindow(static_cast<EffectWindowImpl*>(w), mask, region, data); -@@ -245,7 +245,7 @@ void EffectsHandlerImpl::paintWindow(EffectWindow* w, int mask, QRegion region, - void EffectsHandlerImpl::paintEffectFrame(EffectFrame* frame, QRegion region, double opacity, double frameOpacity) - { - if (current_paint_effectframe < loaded_effects.size()) { -- loaded_effects[current_paint_effectframe++].second->paintEffectFrame(frame, region, opacity, frameOpacity); -+ loaded_effects.at(current_paint_effectframe++).second->paintEffectFrame(frame, region, opacity, frameOpacity); - --current_paint_effectframe; - } else { - const EffectFrameImpl* frameImpl = static_cast<const EffectFrameImpl*>(frame); -@@ -256,7 +256,7 @@ void EffectsHandlerImpl::paintEffectFrame(EffectFrame* frame, QRegion region, do - void EffectsHandlerImpl::postPaintWindow(EffectWindow* w) - { - if (current_paint_window < loaded_effects.size()) { -- loaded_effects[current_paint_window++].second->postPaintWindow(w); -+ loaded_effects.at(current_paint_window++).second->postPaintWindow(w); - --current_paint_window; - } - // no special final code -@@ -273,7 +273,7 @@ bool EffectsHandlerImpl::provides(Effect::Feature ef) - void EffectsHandlerImpl::drawWindow(EffectWindow* w, int mask, QRegion region, WindowPaintData& data) - { - if (current_draw_window < loaded_effects.size()) { -- loaded_effects[current_draw_window++].second->drawWindow(w, mask, region, data); -+ loaded_effects.at(current_draw_window++).second->drawWindow(w, mask, region, data); - --current_draw_window; - } else - scene->finalDrawWindow(static_cast<EffectWindowImpl*>(w), mask, region, data); -@@ -282,7 +282,7 @@ void EffectsHandlerImpl::drawWindow(EffectWindow* w, int mask, QRegion region, W - void EffectsHandlerImpl::buildQuads(EffectWindow* w, WindowQuadList& quadList) - { - if (current_build_quads < loaded_effects.size()) { -- loaded_effects[current_build_quads++].second->buildQuads(w, quadList); -+ loaded_effects.at(current_build_quads++).second->buildQuads(w, quadList); - --current_build_quads; - } - } diff --git a/extra/kdeedu-marble/gpsd3.patch b/extra/kdeedu-marble/gpsd3.patch deleted file mode 100644 index e11859b0b..000000000 --- a/extra/kdeedu-marble/gpsd3.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -up marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp ---- marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp.orig 2011-05-20 15:34:41.000000000 -0500 -+++ marble-4.7.0/src/plugins/positionprovider/gpsd/GpsdConnection.cpp 2011-08-24 13:38:37.050200241 -0500 -@@ -20,6 +20,9 @@ using namespace Marble; - - GpsdConnection::GpsdConnection( QObject* parent ) - : QObject( parent ), -+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) -+ m_gpsd("localhost", DEFAULT_GPSD_PORT), -+#endif - m_timer( 0 ) - { - m_oldLocale = setlocale( LC_NUMERIC, NULL ); -@@ -35,7 +38,11 @@ GpsdConnection::~GpsdConnection() - void GpsdConnection::initialize() - { - m_timer.stop(); -+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) -+ gps_data_t* data; -+#else - gps_data_t* data = m_gpsd.open(); -+#endif - if ( data ) { - m_status = PositionProviderStatusAcquiring; - emit statusChanged( m_status ); -@@ -82,8 +89,16 @@ void GpsdConnection::initialize() - void GpsdConnection::update() - { - #if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 3 ) && defined( PACKET_SET ) -+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) -+ if ( m_gpsd.waiting(0) ) { -+#else - if ( m_gpsd.waiting() ) { -+#endif -+#if defined( GPSD_API_MAJOR_VERSION ) && ( GPSD_API_MAJOR_VERSION >= 5 ) -+ gps_data_t* data = m_gpsd.read(); -+#else - gps_data_t* data = m_gpsd.poll(); -+#endif - if ( data && data->set & PACKET_SET ) { - emit gpsdInfo( *data ); - } diff --git a/extra/kdelibs/PKGBUILD b/extra/kdelibs/PKGBUILD index 79dd85cde..16d13fea9 100644 --- a/extra/kdelibs/PKGBUILD +++ b/extra/kdelibs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139893 2011-10-05 19:09:04Z andrea $ +# $Id: PKGBUILD 140212 2011-10-09 17:04:53Z ronald $ # Maintainer: Andrea Scarpino <andrea@archlinux.org # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdelibs pkgver=4.7.2 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -19,15 +19,19 @@ makedepends=('pkgconfig' 'cmake' 'automoc4' 'intltool' 'avahi' 'libgl' replaces=('kdelibs-experimental') install='kdelibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" - 'kde-applications-menu.patch') + 'kde-applications-menu.patch' + 'kdelibs-nepomuk-unicode.diff') sha1sums=('4b074633cbf69752fda96018514ee771efe8f18b' - '86ee8c8660f19de8141ac99cd6943964d97a1ed7') + '86ee8c8660f19de8141ac99cd6943964d97a1ed7' + 'e24aae17ef0d83085199ad7c7623afef9919b8ff') build() { cd "${srcdir}"/${pkgname}-${pkgver} # avoid file conflict with gnome-menus patch -p1 -i "${srcdir}"/kde-applications-menu.patch + # nepomuk unicode character fix + patch -p1 -i "${srcdir}"/kdelibs-nepomuk-unicode.diff cd "${srcdir}" mkdir build diff --git a/extra/kdelibs/fix-kdirwatch-with-linux3.patch b/extra/kdelibs/fix-kdirwatch-with-linux3.patch deleted file mode 100644 index 6685d9cc4..000000000 --- a/extra/kdelibs/fix-kdirwatch-with-linux3.patch +++ /dev/null @@ -1,56 +0,0 @@ -From: Alex Fiestas <afiestas@kde.org> -Date: Fri, 09 Sep 2011 16:54:23 +0000 -Subject: Fix KDirWatch when using Kernel 3.0 -X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=7df5a79fb9f09e4a4a80cd541cc478b5fa6df00f ---- -Fix KDirWatch when using Kernel 3.0 - -To know INotify is available in the kernel we are checking for a -kernel newer than 2.6.14, that's all allright but the problem is -that the Kernel version format has changed and now we can't be sure -that it is going to be formed by 3 numbers. -Basically we where checking for: - -%d.%d.%d and now it can be %d.%d as it is with 3.0 - -This patch what does is check if the kernel is 2.6, if it is then -it proceed with the version checking. - -CCMAIL: dfaure@kde.org ---- - - ---- a/kdecore/io/kdirwatch.cpp -+++ b/kdecore/io/kdirwatch.cpp -@@ -210,16 +210,24 @@ KDirWatchPrivate::KDirWatchPrivate() - { - struct utsname uts; - int major, minor, patch; -- if (uname(&uts) < 0) -- supports_inotify = false; // *shrug* -- else if (sscanf(uts.release, "%d.%d.%d", &major, &minor, &patch) != 3) -- supports_inotify = false; // *shrug* -- else if( major * 1000000 + minor * 1000 + patch < 2006014 ) { // <2.6.14 -- kDebug(7001) << "Can't use INotify, Linux kernel too old"; -+ if (uname(&uts) < 0) { - supports_inotify = false; -+ kDebug(7001) << "Unable to get uname"; -+ } else if (sscanf(uts.release, "%d.%d", &major, &minor) != 2) { -+ supports_inotify = false; -+ kDebug(7001) << "The version is malformed: " << uts.release; -+ } else if(major == 2 && minor == 6) { // If it is 2.6 check further... -+ if (sscanf(uts.release, "%d.%d.%d", &major, &minor, &patch) != 3) { -+ supports_inotify = false; -+ kDebug() << "Detected 2.6 kernel but can't know more: " << uts.release; -+ } else if (major * 1000000 + minor * 1000 + patch < 2006014 ){ -+ supports_inotify = false; -+ kDebug(7001) << "Can't use INotify, Linux kernel too old " << uts.release; -+ } - } - } - -+ kDebug() << "INotify available: " << supports_inotify; - if ( supports_inotify ) { - availableMethods << "INotify"; - fcntl(m_inotify_fd, F_SETFD, FD_CLOEXEC); - diff --git a/extra/kdelibs/kdelibs-nepomuk-unicode.diff b/extra/kdelibs/kdelibs-nepomuk-unicode.diff new file mode 100644 index 000000000..1c85d6fc9 --- /dev/null +++ b/extra/kdelibs/kdelibs-nepomuk-unicode.diff @@ -0,0 +1,65 @@ +diff --git a/nepomuk/query/querybuilderdata_p.h b/nepomuk/query/querybuilderdata_p.h +index 055482e..3880e13 100644 +--- a/nepomuk/query/querybuilderdata_p.h ++++ b/nepomuk/query/querybuilderdata_p.h +@@ -32,6 +32,28 @@ + #include "query_p.h" + #include "groupterm_p.h" + ++namespace { ++/// A hack to avoid passing extended chars to the bif:search_excerpts method which cannot handle ++/// utf8 chars which use more than one char, ie. wide chars. ++/// Thus, we simply truncate each term at the first wide char. ++QStringList stripExtendedCharsHack(const QStringList& terms) { ++ QStringList newTerms; ++ foreach(const QString& term, terms) { ++ int i = 0; ++ while(i < term.length()) { ++ if(term[i].unicode() > 0x7f) { ++ break; ++ } ++ ++i; ++ } ++ if(i > 0) { ++ newTerms.append(term.left(i)); ++ } ++ } ++ return newTerms; ++} ++} ++ + namespace Nepomuk { + namespace Query { + class QueryBuilderData +@@ -246,16 +268,23 @@ namespace Nepomuk { + for( QHash<QString, QStringList>::const_iterator it = m_fullTextSearchTerms.constBegin(); + it != m_fullTextSearchTerms.constEnd(); ++it ) { + const QString& varName = it.key(); +- const QStringList& terms = it.value(); +- // bif:search_excerpt wants a vector of all search terms +- excerptParts +- << QString::fromLatin1("bif:search_excerpt(bif:vector(bif:charset_recode('%1', '_WIDE_', 'UTF-8')), %2)") +- .arg( terms.join(QLatin1String("','")), +- varName ); ++ const QStringList terms = stripExtendedCharsHack(it.value()); ++ if(terms.count()) { ++ // bif:search_excerpt wants a vector of all search terms ++ excerptParts ++ << QString::fromLatin1("bif:search_excerpt(bif:vector('%1'), %2)") ++ .arg( terms.join(QLatin1String("','")), ++ varName ); ++ } + } + +- return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_") +- .arg(excerptParts.join(QLatin1String(","))); ++ if(excerptParts.count()) { ++ return QString::fromLatin1("(bif:concat(%1)) as ?_n_f_t_m_ex_") ++ .arg(excerptParts.join(QLatin1String(","))); ++ } ++ else { ++ return QString(); ++ } + } + else { + return QString();
\ No newline at end of file diff --git a/extra/kdepim-runtime/PKGBUILD b/extra/kdepim-runtime/PKGBUILD index dd2355249..630457d3e 100644 --- a/extra/kdepim-runtime/PKGBUILD +++ b/extra/kdepim-runtime/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139900 2011-10-05 19:09:16Z andrea $ +# $Id: PKGBUILD 140395 2011-10-12 10:17:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime pkgver=4.7.2 -pkgrel=1 +pkgrel=2 pkgdesc='KDE PIM Runtime Environment' arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' @@ -12,10 +12,15 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdepimlibs' 'kdebase-runtime') makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -sha1sums=('f82886a63c48d718f30d60bd76ea7ac97f17a4c3') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2" + 'smi0.91.patch') +sha1sums=('f82886a63c48d718f30d60bd76ea7ac97f17a4c3' + 'b5af2b56cd7c9c57522e862b591e3d4ad23641c6') build() { + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/smi0.91.patch + cd "${srcdir}" mkdir build cd build diff --git a/extra/kdepim-runtime/smi0.91.patch b/extra/kdepim-runtime/smi0.91.patch new file mode 100644 index 000000000..2229f9cd1 --- /dev/null +++ b/extra/kdepim-runtime/smi0.91.patch @@ -0,0 +1,11 @@ +--- kdepim-runtime-4.7.2/plugins/akonadi_serializer_addressee.desktop~ 2011-10-12 10:05:55.432618174 +0000 ++++ kdepim-runtime-4.7.2/plugins/akonadi_serializer_addressee.desktop 2011-10-12 10:06:06.586046531 +0000 +@@ -89,7 +89,7 @@ + Comment[zh_TW]=地址物件的 Akonadi 序列器外掛程式 + + [Plugin] +-Type=text/vcard,text/directory ++Type=text/vcard + X-Akonadi-Class=legacy;default;KABC::Addressee; + X-KDE-Library=akonadi_serializer_addressee + X-KDE-ClassName=Akonadi::SerializerPluginAddressee diff --git a/extra/keytouch-editor/PKGBUILD b/extra/keytouch-editor/PKGBUILD deleted file mode 100644 index e32eb7ff4..000000000 --- a/extra/keytouch-editor/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 122686 2011-05-06 05:33:49Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=keytouch-editor -pkgver=3.1.3 -pkgrel=2 -pkgdesc="An utility to create keyboard files for keytouch" -arch=('i686' 'x86_64' 'mips64el') -url="http://keytouch.sourceforge.net/" -license=('GPL') -depends=('gtk2') -install=keytouch-editor.install -source=(http://downloads.sourceforge.net/keytouch/${pkgname}-${pkgver}.tar.gz keytouch-editor-3.1.3-glibc28.patch) -md5sums=('046e0525d2b1275f1ec1b5140bd93565' 'def8cf803d7f25dd919b8ad090083bf1') -sha1sums=('a8c0b28bac4b1f9de3897e1a78dc14b4d994334e' 'c6b725267a628cfc93388044cfd72974f53debaf') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../keytouch-editor-3.1.3-glibc28.patch - autoreconf - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/keytouch-editor/keytouch-editor-3.1.3-glibc28.patch b/extra/keytouch-editor/keytouch-editor-3.1.3-glibc28.patch deleted file mode 100644 index 885813feb..000000000 --- a/extra/keytouch-editor/keytouch-editor-3.1.3-glibc28.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur keytouch-editor-3.1.3-orig/src/Makefile.am keytouch-editor-3.1.3/src/Makefile.am ---- keytouch-editor-3.1.3-orig/src/Makefile.am 2008-06-22 22:47:34.000000000 -0400 -+++ keytouch-editor-3.1.3/src/Makefile.am 2008-06-22 22:49:52.000000000 -0400 -@@ -9,7 +9,7 @@ - - bin_PROGRAMS = keytouch-editor-bin - --AM_CFLAGS=@CFLAGS@ -Wall -+AM_CFLAGS=@CFLAGS@ -Wall -D_GNU_SOURCE - - keytouch_editor_bin_SOURCES = \ - main.c keytouch-editor.h \ diff --git a/extra/keytouch-editor/keytouch-editor.install b/extra/keytouch-editor/keytouch-editor.install deleted file mode 100644 index e1f991f31..000000000 --- a/extra/keytouch-editor/keytouch-editor.install +++ /dev/null @@ -1,6 +0,0 @@ -post_install() { - cat << EOF -==> To use keytouch-editor: -==> You'll need to have either gksu (pacman -S gksu) or kdesu (pacman -S kdebase-runtime) installed. -EOF -} diff --git a/extra/keytouch/PKGBUILD b/extra/keytouch/PKGBUILD deleted file mode 100644 index b768a4e09..000000000 --- a/extra/keytouch/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 128421 2011-06-23 23:07:34Z eric $ -# Contributor: Eric Bélanger <eric@archlinux.org> -# Contributor: mouse256 & AndyRTR -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=keytouch -pkgver=2.4.1 -pkgrel=3 -pkgdesc="A program which allows you to easily configure the extra function keys of your keyboard" -arch=('i686' 'x86_64' 'mips64el') -url="http://keytouch.sourceforge.net/" -license=('GPL') -depends=('libxtst' 'gnome-menus' 'alsa-lib' 'gtk2') -optdepends=('acpid: for ACPI support') -options=('!makeflags') -install=keytouch.install -source=(http://downloads.sourceforge.net/sourceforge/keytouch/${pkgname}-${pkgver}.tar.gz \ - keytouch.daemon keytouch.desktop Xsession) -md5sums=('c3a917ae9666c9649d43d9aa09ecc96a' - '5bd72f347f56c0524c7a7c8f44fc9a3a' - 'c5ffe28988dc74fae812ffe204f8883b' - '795430001f4fdb6691d0e93b09a241a9') -sha1sums=('f1f26dc95c21afd404aebe2b1066e75c8313ca80' - '9c3ff4fd979fd0322014768bec132ddf005c7f7b' - '5bac2f62f1ac26caa32da02a8075dc090d981cfb' - '960b2fa51cfdeb2bc3fa7e086dc9f3a3be483dff') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc - make - - cd keytouch-config - ./configure --prefix=/usr --sysconfdir=/etc - make - - cd ../keytouch-keyboard - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - install -d "${pkgdir}"/etc/{rc.d,X11/Xsession.d} - install -d "${pkgdir}/usr/share/keytouch" - make DESTDIR="${pkgdir}" install - - cd keytouch-config - make DESTDIR="${pkgdir}" install - - cd ../keytouch-keyboard - make DESTDIR="${pkgdir}" install - - install -Dm755 "${srcdir}/keytouch.daemon" "${pkgdir}/etc/rc.d/keytouch" - install -Dm644 "${srcdir}/keytouch.desktop" "${pkgdir}/usr/share/applications/keytouch.desktop" - install -Dm755 "${srcdir}/Xsession" "${pkgdir}/etc/X11/Xsession" - chmod 755 "${pkgdir}"/etc/X11/Xsession.d/* - rm "${pkgdir}"/etc/rc.d/*.sh -} diff --git a/extra/keytouch/Xsession b/extra/keytouch/Xsession deleted file mode 100755 index 0da89f9aa..000000000 --- a/extra/keytouch/Xsession +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -for script in /etc/X11/Xsession.d/*; do - if [ -x $script ]; then - . $script - fi -done -unset script diff --git a/extra/keytouch/keytouch.daemon b/extra/keytouch/keytouch.daemon deleted file mode 100755 index d705b3dfc..000000000 --- a/extra/keytouch/keytouch.daemon +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID /usr/bin/keytouch-acpid) -case "$1" in - start) - stat_busy "Starting keyTouch Daemon" - /usr/bin/keytouch-init - if [ -z "$PID" ]; then - /usr/bin/keytouch-acpid &> /dev/null & - fi - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon keytouch - stat_done - fi - ;; - stop) - stat_busy "Stopping keyTouch Daemon" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon keytouch - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/extra/keytouch/keytouch.desktop b/extra/keytouch/keytouch.desktop deleted file mode 100644 index f127b1041..000000000 --- a/extra/keytouch/keytouch.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=keyTouch -Comment=Keyboard configuration tool -Icon=/usr/share/keytouch/pixmaps/icon.png -Exec=/usr/bin/keytouch -Terminal=false -Type=Application -Categories=Application;Utility -StartupNotify=false diff --git a/extra/keytouch/keytouch.install b/extra/keytouch/keytouch.install deleted file mode 100644 index c3b9c9cec..000000000 --- a/extra/keytouch/keytouch.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - cat << EOF -==> To use keytouch: -o Add keytouch to your DAEMONS line in /etc/rc.conf -o Add: - /etc/X11/Xsession -to your ~/.xinitrc -o You'll need to have either gksu (pacman -S gksu) or kdesu (pacman -S kdebase) installed. - -==> If your keyboard is not supported "out of the box": -o Go to http://keytouch.sourceforge.net/dl-keyboards.html to see if your keyboard has been added - or install keytouch-editor to make your custom keyboard file. -EOF -} diff --git a/extra/koffice/PKGBUILD b/extra/koffice/PKGBUILD index c17257010..56a5e6907 100644 --- a/extra/koffice/PKGBUILD +++ b/extra/koffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 139889 2011-10-05 19:06:53Z andrea $ +# $Id: PKGBUILD 140575 2011-10-17 08:14:55Z jgc $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: BlackEagle < ike DOT devolder AT gmail DOT com > @@ -37,17 +37,17 @@ pkgname=( # 'koffice-kdgantt' # still an empty package ) pkgver=2.3.3 -pkgrel=8 +pkgrel=9 arch=('i686' 'x86_64' 'mips64el') url='http://koffice.kde.org' license=('GPL' 'LGPL' 'FDL') makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms' 'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd' - 'libwpg' 'opengtl' 'libkdcraw') + 'libwpg' 'opengtl' 'libkdcraw' 'oxygen-icons') [ "$CARCH" = "mips64el" ] && \ makedepends=('pkg-config' 'cmake' 'automoc4' 'boost' 'eigen' 'gsl' 'lcms' 'glew' 'qimageblitz' 'kdepimlibs' 'pstoedit' 'poppler-qt' 'libwpd' - 'libwpg' 'libkdcraw') + 'libwpg' 'libkdcraw' 'oxygen-icons') groups=('koffice') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2" 'kde4-koffice-libwpg02.patch' 'gcc46.patch') @@ -59,7 +59,7 @@ build() { cd "${srcdir}/${pkgbase}-${pkgver}" patch -p1 -i "${srcdir}/kde4-koffice-libwpg02.patch" - patch -p1 -i "${srcdir}"/gcc46.patch + patch -p1 -i "${srcdir}"/gcc46.patch cd "${srcdir}" mkdir build @@ -75,9 +75,12 @@ build() { package_koffice-filters(){ pkgdesc="Filters for the KDE office suite" - optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer' - 'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter' - 'libkdcraw: support for raw images') + depends=('shared-mime-info') + optdepends=('libgsf: Microsoft Word document importer' 'libwpd: WordPerfect document importer' + 'libwpg: Corel WordPerfect Graphics image importer' 'pstoedit: Karbon EPS import filter' + 'libkdcraw: support for raw images' 'poppler: support for pdf' + 'koffice-kspread: Kspread filters' 'koffice-karbon: Karbon filters' + 'koffice-kplato: Kplato filters') install=filters.install cd "${srcdir}/build/filters" make DESTDIR="${pkgdir}" install @@ -85,14 +88,14 @@ package_koffice-filters(){ package_koffice-interfaces(){ pkgdesc="Interfaces for the KDE office suite" - depends=('kdelibs' 'koffice-libs') + depends=('koffice-libs') cd "${srcdir}/build/interfaces" make DESTDIR="${pkgdir}" install } package_koffice-libs(){ pkgdesc="Libs for the KDE office suite" - depends=('kdepimlibs' 'qca' 'lcms' 'koffice-servicetypes') + depends=('kdepimlibs' 'lcms' 'koffice-servicetypes') cd "${srcdir}/build/libs" make DESTDIR="${pkgdir}" install } @@ -108,6 +111,7 @@ package_koffice-plugins(){ package_koffice-pics(){ pkgdesc="Icons for the KDE office suite" + depends=('desktop-file-utils' 'xdg-utils') install=koffice.install cd "${srcdir}/build/pics" make DESTDIR="${pkgdir}" install @@ -127,7 +131,7 @@ package_koffice-templates(){ package_koffice-tools(){ pkgdesc="Tools for the KDE office suite" - depends=('koffice-libs') + depends=('koffice-libs' 'oxygen-icons') cd "${srcdir}/build/tools" make DESTDIR="${pkgdir}" install } @@ -138,7 +142,7 @@ package_koffice-tools(){ package_koffice-karbon(){ pkgdesc="Vector drawing application for KDE" - depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates') + depends=('koffice-libs' 'koffice-templates' 'oxygen-icons') optdepends=('koffice-filters: import/export filters') install=koffice.install cd "${srcdir}/build/karbon" @@ -153,7 +157,8 @@ package_koffice-karbon-doc(){ package_koffice-kexi(){ pkgdesc="Integrated data management application for the KDE office suite" - depends=('kdelibs' 'koffice-libs' 'koffice-kspread' 'sqlite3') + depends=('koffice-kspread' 'oxygen-icons') + install=koffice.install cd "${srcdir}/build/kexi" make DESTDIR="${pkgdir}" install } @@ -166,7 +171,8 @@ package_koffice-kexi-doc(){ package_koffice-kformula(){ pkgdesc="Formula editor for the KDE office suite" - depends=('kdelibs' 'koffice-libs') + depends=('koffice-libs') + install=koffice.install cd "${srcdir}/build/kformula" make DESTDIR="${pkgdir}" install } @@ -180,15 +186,14 @@ package_koffice-kformula-doc() { package_koffice-kounavail(){ pkgdesc="Kounavail for the KDE office suite" - depends=('kdelibs' 'koffice-libs') + depends=('koffice-libs') cd "${srcdir}/build/kounavail" make DESTDIR="${pkgdir}" install } package_koffice-kplato(){ pkgdesc="Project management application for KDE" - depends=('hicolor-icon-theme' 'koffice-libs' 'kdepimlibs' 'koffice-templates' \ - 'koffice-plugins' 'koffice-kword') + depends=('koffice-kword' 'oxygen-icons') install=koffice.install cd "${srcdir}/build/kplato" make DESTDIR="${pkgdir}" install @@ -202,7 +207,7 @@ package_koffice-kplato(){ package_koffice-kpresenter(){ pkgdesc="Presentation tool for KDE" - depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates') + depends=('koffice-libs' 'koffice-templates' 'oxygen-icons') optdepends=('koffice-filters: import/export filters') install=koffice.install cd "${srcdir}/build/kpresenter" @@ -217,13 +222,12 @@ package_koffice-kpresenter-doc(){ package_koffice-krita(){ pkgdesc="Graphics editor for KDE" - depends=('hicolor-icon-theme' 'glew' 'qimageblitz' 'koffice-libs' \ - 'koffice-templates' 'koffice-plugins' 'poppler-qt' 'shared-mime-info' \ - 'openexr' 'opengtl') + depends=('glew' 'qimageblitz' 'oxygen-icons' 'koffice-templates' \ + 'koffice-plugins' 'poppler-qt' 'opengtl') + optdepends=('koffice-filters: import/export filters' 'libkdcraw: support for raw images') [ "$CARCH" = "mips64el" ] && \ - depends=('hicolor-icon-theme' 'glew' 'qimageblitz' 'koffice-libs' \ - 'koffice-templates' 'koffice-plugins' 'poppler-qt' 'shared-mime-info' \ - 'openexr') + depends=('glew' 'qimageblitz' 'oxygen-icons' 'koffice-templates' \ + 'koffice-plugins' 'poppler-qt') optdepends=('koffice-filters: import/export filters') install=krita.install cd "${srcdir}/build/krita" @@ -239,7 +243,7 @@ package_koffice-krita(){ package_koffice-kspread(){ pkgdesc="Spreadsheet application for KDE" - depends=('hicolor-icon-theme' 'gsl' 'koffice-libs' 'koffice-templates' 'koffice-plugins') + depends=('gsl' 'koffice-templates' 'koffice-plugins' 'oxygen-icons') optdepends=('koffice-filters: import/export filters') install=koffice.install cd "${srcdir}/build/kspread" @@ -254,7 +258,7 @@ package_koffice-kspread-doc(){ package_koffice-kword(){ pkgdesc="Wordprocessor for KDE" - depends=('hicolor-icon-theme' 'koffice-libs' 'koffice-templates' 'koffice-pics' \ + depends=('koffice-templates' 'koffice-pics' 'oxygen-icons' \ 'koffice-kounavail' 'koffice-plugins') optdepends=('koffice-filters: import/export filters') install=koffice.install diff --git a/extra/koffice/koffice.install b/extra/koffice/koffice.install index e70c054ec..6c87527e2 100644 --- a/extra/koffice/koffice.install +++ b/extra/koffice/koffice.install @@ -1,5 +1,6 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q } post_upgrade() { diff --git a/extra/koffice/krita.install b/extra/koffice/krita.install index ce5c32e1b..5d458de55 100644 --- a/extra/koffice/krita.install +++ b/extra/koffice/krita.install @@ -1,6 +1,7 @@ post_install() { xdg-icon-resource forceupdate --theme hicolor &> /dev/null update-mime-database usr/share/mime &> /dev/null + update-desktop-database -q } post_upgrade() { @@ -9,4 +10,4 @@ post_upgrade() { post_remove() { post_install -}
\ No newline at end of file +} diff --git a/extra/krusader/PKGBUILD b/extra/krusader/PKGBUILD deleted file mode 100644 index d8d51eb63..000000000 --- a/extra/krusader/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 134530 2011-08-05 09:45:45Z andrea $ -# Maintainer: -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> - -pkgname=krusader -pkgver=2.4.0beta1 -_pkgver=2.4.0-beta1 -pkgrel=4 -pkgdesc="An alternative file manager for KDE resembling Midnight Commander" -arch=('i686' 'x86_64' 'mips64el') -url="http://krusader.sourceforge.net/" -license=('GPL') -depends=('kdebase-runtime' 'kdebase-lib') -makedepends=('cmake' 'automoc4' 'docbook-xsl' 'kdeutils-ark') -optdepends=("kdebase-keditbookmarks: to edit bookmarks" - "kdebase-kwrite: to edit/view files" - "kdeutils-ark: extract archive with right-click") -install=${pkgname}.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${_pkgver}.tar.bz2") -md5sums=('d2340718d05d69e7f2a7f0846471ee12') - -build() { - cd "${srcdir}" - mkdir build - cd build - cmake ../${pkgname}-${_pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}/build" - make DESTDIR="${pkgdir}" install -} diff --git a/extra/krusader/krusader.install b/extra/krusader/krusader.install deleted file mode 100644 index e70c054ec..000000000 --- a/extra/krusader/krusader.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/extra/kwebkitpart/PKGBUILD b/extra/kwebkitpart/PKGBUILD index ea776db41..cc44ba19b 100644 --- a/extra/kwebkitpart/PKGBUILD +++ b/extra/kwebkitpart/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 126252 2011-06-02 23:08:29Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 140401 2011-10-12 18:43:47Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=kwebkitpart -pkgver=1.1.1 +pkgver=1.2.0 pkgrel=1 -pkgdesc="A web browser component for KDE" +pkgdesc="A WebKit browser component for KDE" url="http://opendesktop.org/content/show.php?content=127960" arch=('i686' 'x86_64' 'mips64el') license=('LGPL') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install -source=("${pkgname}-${pkgver}.tar.bz2"::"http://quickgit.kde.org/?p=${pkgname}.git&a=snapshot&h=37bddda24735bb8eb2d9e324f983b8e84a45503e&fmt=tbz2") -md5sums=('54c1fbb77f4a3c021b33a52a503fec8e') +source=("${pkgname}-${pkgver}.tar.bz2"::"http://quickgit.kde.org/?p=${pkgname}.git&a=snapshot&h=d2aba2aa0664fde17f29d526226576aa6b956ee1&fmt=tbz2") +md5sums=('d87b69fc4945aa9159908f842c3f9e2e') build() { cd "${srcdir}" diff --git a/extra/libass/PKGBUILD b/extra/libass/PKGBUILD index 5060eb640..278a75386 100644 --- a/extra/libass/PKGBUILD +++ b/extra/libass/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 134004 2011-07-31 16:07:36Z giovanni $ +# $Id: PKGBUILD 140250 2011-10-10 22:45:12Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: G_Syme <demichan(at)mail(dot)upb(dot)de> pkgname=libass -pkgver=0.9.13 +pkgver=0.10.0 pkgrel=1 pkgdesc="A portable library for SSA/ASS subtitles rendering" arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/libass/" license=('BSD') -depends=('enca' 'fontconfig' 'libpng') -makedepends=('pkgconfig') +depends=('enca' 'fontconfig' 'libpng' 'fribidi') +makedepends=('pkg-config') options=(!libtool) source=("http://libass.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") -md5sums=('d99381922dcbeb7a766d2e7825cca193') +md5sums=('1855bddc4c167f96968dddeeda0eb45c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libbeagle/PKGBUILD b/extra/libbeagle/PKGBUILD deleted file mode 100644 index c024a6dca..000000000 --- a/extra/libbeagle/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 89703 2010-09-03 11:38:40Z remy $ -# Maintainer: Daniel Isenmann <daniel@archlinux.org> - -pkgname=libbeagle -pkgver=0.3.9 -pkgrel=2 -pkgdesc="Beagle desktop search client library" -arch=(i686 x86_64 'mips64el') -url="http://www.gnome.org/projects/beagle/" -license=('custom') -depends=('glib2>=2.20.0' 'libxml2>=2.7.3') -makedepends=('pkgconfig' 'pygtk') -options=('!libtool') -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/0.3/${pkgname}-${pkgver}.tar.bz2) -md5sums=('af1e25bdfb704ee87047bc49a73fbb10') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static || return 1 - make -} -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install || return 1 - install -m755 -d "${pkgdir}/usr/share/licenses/libbeagle" - install -m644 COPYING "${pkgdir}/usr/share/licenses/libbeagle/" || return 1 -} diff --git a/extra/libbluedevil/PKGBUILD b/extra/libbluedevil/PKGBUILD index f26e0a152..86bd35dc1 100644 --- a/extra/libbluedevil/PKGBUILD +++ b/extra/libbluedevil/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 119928 2011-04-17 01:27:41Z andrea $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 140236 2011-10-10 10:55:52Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=libbluedevil -pkgver=1.9 +pkgver=1.9.1 pkgrel=1 pkgdesc='A Qt wrapper for bluez used in the new KDE bluetooth stack' arch=('i686' 'x86_64' 'mips64el') @@ -10,11 +11,11 @@ url="https://projects.kde.org/projects/playground/libs/libbluedevil" license=('GPL') depends=('qt' 'bluez') makedepends=('cmake') -source=("http://download.kde.org/unstable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('5f22614dfb840734da6e8b8710c2472e') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('b3f04954f75f78c874cdb462c2454afc') build(){ - cd ${srcdir} + cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -24,6 +25,6 @@ build(){ } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install + cd "${srcdir}"/build + make DESTDIR="${pkgdir}" install } diff --git a/extra/libburn/PKGBUILD b/extra/libburn/PKGBUILD index be37e1d02..e6a4c6174 100644 --- a/extra/libburn/PKGBUILD +++ b/extra/libburn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 135153 2011-08-10 16:27:10Z andyrtr $ +# $Id: PKGBUILD 140467 2011-10-15 09:28:22Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=libburn -pkgver=1.1.4 #.pl01 +pkgver=1.1.6 #.pl01 pkgrel=1 pkgdesc="Library for reading, mastering and writing optical discs" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL') depends=('glibc') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz) options=('!libtool' '!emptydirs') -md5sums=('a337cf8bf044a1bbc367ff35b9bc6a8b') +md5sums=('741604c3d4064502f06bae20293c508c') build() { cd ${srcdir}/${pkgname}-${pkgver} #/.pl??/} diff --git a/extra/libcanberra/libcanberra-gtk-module.sh b/extra/libcanberra/libcanberra-gtk-module.sh deleted file mode 100644 index 2ae6b7e17..000000000 --- a/extra/libcanberra/libcanberra-gtk-module.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -case "$SESSION" in - GNOME) - # Done by gnome-settings-daemon - ;; - *) - if [ -z "$GTK_MODULES" ]; then - GTK_MODULES="canberra-gtk-module" - else - GTK_MODULES="$GTK_MODULES:canberra-gtk-module" - fi - export GTK_MODULES - ;; -esac diff --git a/extra/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch b/extra/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch deleted file mode 100644 index 5352688a2..000000000 --- a/extra/libepc/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 715c6ddf3de90936c9ba7a6bb6904b7072d3b241 Mon Sep 17 00:00:00 2001 -From: Ionut Biru <ibiru@archlinux.org> -Date: Fri, 30 Sep 2011 10:57:14 +0000 -Subject: [PATCH] Avoid use of deprecated G_CONST_RETURN - -Signed-off-by: Ionut Biru <ibiru@archlinux.org> ---- - libepc/enums.c.in | 2 +- - libepc/enums.h.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libepc/enums.c.in b/libepc/enums.c.in -index 75f737c..bc81b84 100644 ---- a/libepc/enums.c.in -+++ b/libepc/enums.c.in -@@ -65,7 +65,7 @@ G@Type@Class* - * - * Returns: The string representation of @value, or %NULL. - */ --G_CONST_RETURN gchar* -+const gchar* - @enum_name@_to_string (@EnumName@ value) - { - const G@Type@Value *@type@_value = g_@type@_get_value (@enum_name@_get_class (), value); -diff --git a/libepc/enums.h.in b/libepc/enums.h.in -index fea8b07..48973e5 100644 ---- a/libepc/enums.h.in -+++ b/libepc/enums.h.in -@@ -19,7 +19,7 @@ G_BEGIN_DECLS - - GType @enum_name@_get_type (void) G_GNUC_CONST; - G@Type@Class* @enum_name@_get_class (void) G_GNUC_CONST; --G_CONST_RETURN gchar* @enum_name@_to_string (@EnumName@ value) G_GNUC_PURE; -+const gchar* @enum_name@_to_string (@EnumName@ value) G_GNUC_PURE; - /*** END value-header ***/ - - /*** BEGIN file-tail ***/ --- -1.7.6.4 - diff --git a/extra/libepc/PKGBUILD b/extra/libepc/PKGBUILD index 2ad391d40..0dd0d0e9d 100644 --- a/extra/libepc/PKGBUILD +++ b/extra/libepc/PKGBUILD @@ -1,25 +1,21 @@ -# $Id: PKGBUILD 139209 2011-10-01 18:55:29Z ibiru $ +# $Id: PKGBUILD 140436 2011-10-14 09:44:47Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libepc -pkgver=0.4.1 +pkgver=0.4.2 pkgrel=1 pkgdesc="Easy Publish and Consume Library" arch=(i686 x86_64 'mips64el') license=('LGPL') url="http://live.gnome.org/libepc" depends=('gtk3' 'avahi' 'libsoup') -makedepends=('intltool' 'gtk-doc' 'gnome-common') +makedepends=('intltool') options=('!libtool' '!makeflags') -source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.4/${pkgname}-${pkgver}.tar.xz - 0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch) -sha256sums=('1377defd339122a5ef71509d3b761810c58f178985d655b74bc34760ef4ae49e' - 'd2bcfd72abc4cd74975a70c667c38d88154117d1eef10a8e8b75bc07cb1dde06') +source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.4/${pkgname}-${pkgver}.tar.xz) +sha256sums=('3dff25a7f2f0d024b7609389f13664789b0ab45a0e5740908395e3d49cceefc2') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/0001-Avoid-use-of-deprecated-G_CONST_RETURN.patch" - gnome-autogen.sh ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static make diff --git a/extra/libffi/PKGBUILD b/extra/libffi/PKGBUILD deleted file mode 100644 index ba466479b..000000000 --- a/extra/libffi/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 136233 2011-08-25 06:36:16Z eric $ -# Maintainer: Jan de Groot <jgc@archlinux.org> - -pkgname=libffi -pkgver=3.0.10 -pkgrel=1 -pkgdesc="A portable, high level programming interface to various calling conventions" -arch=('i686' 'x86_64' 'mips64el') -url="http://sourceware.org/libffi" -license=('MIT') -depends=('glibc') -options=('!libtool') -install=libffi.install -source=(ftp://sourceware.org/pub/libffi/libffi-${pkgver}.tar.gz) -md5sums=('79390673f5d07a8fb342bc09b5055b6f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/extra/libffi/libffi.install b/extra/libffi/libffi.install deleted file mode 100644 index 903bede10..000000000 --- a/extra/libffi/libffi.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(libffi.info.gz) - -post_install() { - [[ -x usr/bin/install-info ]] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [[ -x usr/bin/install-info ]] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/extra/libgnomeuimm/PKGBUILD b/extra/libgnomeuimm/PKGBUILD index c85a9a1f6..4c4b8c8d5 100644 --- a/extra/libgnomeuimm/PKGBUILD +++ b/extra/libgnomeuimm/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 55079 2009-10-11 21:58:41Z jgc $ +# $Id: PKGBUILD 140505 2011-10-16 04:27:15Z eric $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=libgnomeuimm pkgver=2.28.0 -pkgrel=1 -pkgdesc="A C++ wrapper for libgnomeui." +pkgrel=2 +pkgdesc="A C++ wrapper for libgnomeui" arch=(i686 x86_64 'mips64el') +url="http://gtkmm.sourceforge.net/" license=('GPL') -depends=('libgnomeui>=2.24.1' 'libgnomecanvasmm>=2.26.0' 'libgnomemm>=2.28.0' 'libglademm>=2.6.7' 'gconfmm>=2.28.0' 'gnome-vfsmm>=2.26.0') -makedepends=('pkgconfig') +depends=('libgnomeui>=2.24.4' 'libgnomecanvasmm>=2.26.0' 'libgnomemm>=2.30.0' 'libglademm>=2.6.7' 'gconfmm>=2.28.2' 'gnome-vfsmm>=2.26.0') options=('!libtool') -url="http://gtkmm.sourceforge.net/" source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.28/${pkgname}-${pkgver}.tar.bz2) sha256sums=('6cb46494913f1e5e34b94a0f5b9ff8ef238bb71e3b08d0ef0ab7f4a7c88211d3') build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure --prefix=/usr --sysconfdir=/etc \ - --localstatedir=/var --disable-static || return 1 - make || return 1 - make DESTDIR="${pkgdir}" install || return 1 + --localstatedir=/var --disable-static + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/libgweather/01_gettext_not_xml.patch b/extra/libgweather/01_gettext_not_xml.patch deleted file mode 100644 index d5f57305e..000000000 --- a/extra/libgweather/01_gettext_not_xml.patch +++ /dev/null @@ -1,527 +0,0 @@ -only in patch2: -unchanged: -diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/configure.in libgweather-2.27.91.new/configure.in ---- libgweather-2.27.91/configure.in 2009-08-25 23:56:58.000000000 +1000 -+++ libgweather-2.27.91.new/configure.in 2009-08-26 11:54:52.000000000 +1000 -@@ -40,6 +40,10 @@ - AM_MAINTAINER_MODE - GNOME_MAINTAINER_MODE_DEFINES - -+dnl IT_PROG_INTLTOOL does this for us in the case of the po/ subdir, but we're on our own for po-locations -+AC_OUTPUT_COMMANDS([sed -e "/POTFILES =/r po/POTFILES" po-locations/Makefile.in > po-locations/Makefile]) -+IT_PO_SUBDIR([po-locations]) -+ - IT_PROG_INTLTOOL([0.40.3]) - PKG_PROG_PKG_CONFIG([0.19]) - -@@ -50,13 +54,6 @@ - AM_PROG_LIBTOOL - AC_PATH_PROG(GCONFTOOL, gconftool-2) - --AC_ARG_ENABLE(all-translations-in-one-xml, -- [AC_HELP_STRING([--enable-all-translations-in-one-xml], -- [Put all translations in a big Locations.xml file (slow to parse)])], -- [enable_big_xml=yes], -- [enable_big_xml=no]) --AM_CONDITIONAL(USE_ONE_BIG_XML, test "x$enable_big_xml" = "xyes") -- - AC_ARG_ENABLE(locations-compression, - [AC_HELP_STRING([--enable-locations-compression], - [Compress Locations.xml files])], -@@ -253,7 +250,7 @@ - Makefile - doc/Makefile - po/Makefile.in --po-locations/Makefile -+po-locations/Makefile.in - libgweather/Makefile - libgweather/gweather.pc - libgweather/gweather-uninstalled.pc -@@ -261,12 +258,6 @@ - python/Makefile - ]) - --if test "x$enable_big_xml" = "xyes"; then -- LOCATIONS_XML_TRANSLATIONS="one big file" --else -- LOCATIONS_XML_TRANSLATIONS="one file per translation" --fi -- - dnl *************************************************************************** - dnl *** Display Summary *** - dnl *************************************************************************** -diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/data/Makefile.am libgweather-2.27.91.new/data/Makefile.am ---- libgweather-2.27.91/data/Makefile.am 2009-07-22 03:01:11.000000000 +1000 -+++ libgweather-2.27.91.new/data/Makefile.am 2009-08-26 11:57:46.000000000 +1000 -@@ -4,55 +4,23 @@ - libgweatherlocationsdir = $(pkgdatadir) - libgweatherlocations_in_files = Locations.xml.in - --if USE_ONE_BIG_XML -- --LOCATIONS_STAMP = -- --libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT)) -- --%.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po) -- $(AM_V_GEN)LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \ -- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ -- gzip --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`; \ -- fi -- --else # USE_ONE_BIG_XML -- - LOCATIONS_STAMP = stamp-Locations.xml - --PO_LOCATIONS = $(shell if test -n "$(LINGUAS)"; then for lang in $(LINGUAS); do if test -f "$(top_srcdir)/po-locations/$$lang.po"; then echo "$(top_srcdir)/po-locations/$$lang.po "; fi; done; else for pofile in $(top_srcdir)/po-locations/*.po; do echo $$pofile; done; fi) -- - # Helper variable --libgweatherlocations_data = $(libgweatherlocations_in_files:.xml.in=.xml) -- --libgweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdir)/po-locations/|Locations.|g;s|\.po|.xml$(COMPRESS_EXT)|g") $(libgweatherlocations_data)$(COMPRESS_EXT) -+libgweatherlocations_DATA = $(libgweatherlocations_in_files:.xml.in=.xml) - - # We need this step so that we merge all the make Locations.xy.xml destinations - # into one unique destination. This makes -j2 work. (Else, we end up with - # multiple and conflicting calls to intltool-merge) - $(libgweatherlocations_DATA): $(LOCATIONS_STAMP) - --$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) $(PO_LOCATIONS) Makefile -- $(AM_V_at)LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache $(top_srcdir)/po-locations $< $(libgweatherlocations_data) && \ -- for pofile in $(PO_LOCATIONS); do \ -- locale=`echo $$pofile | sed "s;$(top_srcdir)/po-locations/\(.*\)\.po;\1;"`; \ -- xmllint --noblanks -o Locations.$$locale.xml $$locale/$(libgweatherlocations_data); \ -- rm -f $$locale/$(libgweatherlocations_data); \ -- test -d $$locale && rmdir $$locale; \ -- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ -- gzip --force Locations.$$locale.xml; \ -- fi; \ -- done && \ -- xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_data) && \ -- rm -f C/$(libgweatherlocations_data) && \ -+$(LOCATIONS_STAMP): $(libgweatherlocations_in_files) Makefile -+ LC_ALL=C $(INTLTOOL_MERGE) --multiple-output --xml-style --utf8 --cache=$(top_builddir)/po-locations/.intltool-merge-cache /dev/null $< $(libgweatherlocations_DATA) && \ -+ xmllint --noblanks -o Locations.xml C/$(libgweatherlocations_DATA) && \ -+ rm -f C/$(libgweatherlocations_DATA) && \ - test -d C && rmdir C && \ -- if test "x$(COMPRESS_EXT)" = "x.gz"; then \ -- gzip --force Locations.xml; \ -- fi && \ - touch $@ - --endif # USE_ONE_BIG_XML -- - check: - xmllint --valid --noout $(top_srcdir)/data/Locations.xml.in - $(srcdir)/check-timezones.sh $(srcdir)/Locations.xml.in -diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/libgweather/gweather-location.c libgweather-2.27.91.new/libgweather/gweather-location.c ---- libgweather-2.27.91/libgweather/gweather-location.c 2009-04-20 03:41:11.000000000 +1000 -+++ libgweather-2.27.91.new/libgweather/gweather-location.c 2009-08-26 11:54:52.000000000 +1000 -@@ -22,11 +22,14 @@ - #include <config.h> - #endif - -+#include "config.h" -+ - #include <string.h> - #include <math.h> - #include <locale.h> - #include <gtk/gtk.h> - #include <libxml/xmlreader.h> -+#include <libintl.h> - - #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE - #include "gweather-location.h" -@@ -184,10 +187,20 @@ - - tagname = (const char *) xmlTextReaderConstName (parser->xml); - if (!strcmp (tagname, "name") && !loc->name) { -- value = gweather_parser_get_localized_value (parser); -+ char *context = NULL; -+ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); -+ -+ value = gweather_parser_get_value (parser); - if (!value) - goto error_out; -- loc->name = g_strdup (value); -+ -+ if (context != NULL) { -+ loc->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, value)); -+ xmlFree (context); -+ } -+ else -+ loc->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",value)); -+ - xmlFree (value); - normalized = g_utf8_normalize (loc->name, -1, G_NORMALIZE_ALL); - loc->sort_name = g_utf8_casefold (normalized, -1); -diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/libgweather/gweather-timezone.c libgweather-2.27.91.new/libgweather/gweather-timezone.c ---- libgweather-2.27.91/libgweather/gweather-timezone.c 2009-08-12 19:00:52.000000000 +1000 -+++ libgweather-2.27.91.new/libgweather/gweather-timezone.c 2009-08-26 11:54:52.000000000 +1000 -@@ -23,6 +23,7 @@ - #endif - - #include <string.h> -+#include <libintl.h> - - #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE - #include "gweather-timezone.h" -@@ -152,7 +153,7 @@ - parse_timezone (GWeatherParser *parser) - { - GWeatherTimezone *zone = NULL; -- char *id = NULL, *name = NULL; -+ char *id = NULL, *name = NULL, *context = NULL; - int offset = 0, dst_offset = 0; - gboolean has_dst = FALSE; - -@@ -175,27 +176,34 @@ - continue; - } - -- if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) -- name = gweather_parser_get_localized_value (parser); -+ if (!strcmp ((const char *) xmlTextReaderConstName (parser->xml), "name")) { -+ context = xmlTextReaderGetAttribute(parser->xml,"msgctxt"); -+ name = gweather_parser_get_value (parser); -+ } - else { - if (xmlTextReaderNext (parser->xml) != 1) - break; - } - } - } -- -+ - if (parse_tzdata (id, parser->year_start, parser->year_end, - &offset, &has_dst, &dst_offset)) { - zone = g_slice_new0 (GWeatherTimezone); - zone->ref_count = 1; - zone->id = g_strdup (id); -- zone->name = g_strdup (name); -+ if (context != NULL) -+ zone->name = g_strdup (g_dpgettext2(GETTEXT_PACKAGE "-locations", context, name)); -+ else -+ zone->name = g_strdup (dgettext(GETTEXT_PACKAGE "-locations",name)); - zone->offset = offset; - zone->has_dst = has_dst; - zone->dst_offset = dst_offset; - } - - xmlFree (id); -+ if (context) -+ xmlFree (context); - if (name) - xmlFree (name); - -diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/po-locations/LINGUAS libgweather-2.27.91.new/po-locations/LINGUAS ---- libgweather-2.27.91/po-locations/LINGUAS 1970-01-01 10:00:00.000000000 +1000 -+++ libgweather-2.27.91.new/po-locations/LINGUAS 2009-08-26 11:54:52.000000000 +1000 -@@ -0,0 +1,78 @@ -+ang -+ar -+as -+az -+be -+be@latin -+bg -+bn_IN -+bn -+bs -+ca -+cs -+cy -+da -+de -+dz -+el -+en_CA -+en_GB -+es -+et -+eu -+fa -+fi -+fr -+ga -+gl -+gu -+he -+hi -+hr -+hu -+id -+it -+ja -+ka -+kn -+ko -+ku -+ky -+lt -+lv -+mai -+mg -+mk -+ml -+mn -+mr -+ms -+nb -+ne -+nl -+nn -+oc -+or -+pa -+pl -+pt_BR -+pt -+ro -+ru -+rw -+si -+sk -+sl -+sq -+sr@latin -+sr -+sv -+ta -+te -+th -+tr -+uk -+vi -+zh_CN -+zh_HK -+zh_TW -diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/po-locations/Makefile.in.in libgweather-2.27.91.new/po-locations/Makefile.in.in ---- libgweather-2.27.91/po-locations/Makefile.in.in 1970-01-01 10:00:00.000000000 +1000 -+++ libgweather-2.27.91.new/po-locations/Makefile.in.in 2009-08-26 11:54:52.000000000 +1000 -@@ -0,0 +1,217 @@ -+# Makefile for program source directory in GNU NLS utilities package. -+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu> -+# Copyright (C) 2004-2008 Rodney Dawes <dobey.pwns@gmail.com> -+# -+# This file may be copied and used freely without restrictions. It may -+# be used in projects which are not available under a GNU Public License, -+# but which still want to provide support for the GNU gettext functionality. -+# -+# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE -+# instead of PACKAGE and to look for po2tbl in ./ not in intl/ -+# -+# - Modified by jacob berkman <jacob@ximian.com> to install -+# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize -+# -+# - Modified by Rodney Dawes <dobey.pwns@gmail.com> for use with intltool -+# -+# We have the following line for use by intltoolize: -+# INTLTOOL_MAKEFILE -+ -+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-locations -+PACKAGE = @PACKAGE@ -+VERSION = @VERSION@ -+ -+SHELL = /bin/sh -+ -+srcdir = @srcdir@ -+top_srcdir = @top_srcdir@ -+top_builddir = @top_builddir@ -+VPATH = @srcdir@ -+ -+prefix = @prefix@ -+exec_prefix = @exec_prefix@ -+datadir = @datadir@ -+datarootdir = @datarootdir@ -+libdir = @libdir@ -+DATADIRNAME = @DATADIRNAME@ -+itlocaledir = $(prefix)/$(DATADIRNAME)/locale -+subdir = po-locations -+install_sh = @install_sh@ -+# Automake >= 1.8 provides @mkdir_p@. -+# Until it can be supposed, use the safe fallback: -+mkdir_p = $(install_sh) -d -+ -+INSTALL = @INSTALL@ -+INSTALL_DATA = @INSTALL_DATA@ -+ -+GMSGFMT = @GMSGFMT@ -+MSGFMT = @MSGFMT@ -+XGETTEXT = @XGETTEXT@ -+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ -+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ -+MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist -+GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot -+ -+ALL_LINGUAS = @ALL_LINGUAS@ -+ -+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) -+ -+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi) -+ -+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) -+ -+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) -+ -+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) -+EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS -+ -+POTFILES = \ -+# This comment gets stripped out -+ -+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) -+ -+.SUFFIXES: -+.SUFFIXES: .po .pox .gmo .mo .msg .cat -+ -+.po.pox: -+ $(MAKE) $(GETTEXT_PACKAGE).pot -+ $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox -+ -+.po.mo: -+ $(MSGFMT) -o $@ $< -+ -+.po.gmo: -+ file=`echo $* | sed 's,.*/,,'`.gmo \ -+ && rm -f $$file && $(GMSGFMT) -o $$file $< -+ -+.po.cat: -+ sed -f ../intl/po2msg.sed < $< > $*.msg \ -+ && rm -f $@ && gencat $@ $*.msg -+ -+ -+all: all-@USE_NLS@ -+ -+all-yes: $(CATALOGS) -+all-no: -+ -+$(GETTEXT_PACKAGE).pot: $(POTFILES) -+ $(GENPOT) -+ -+install: install-data -+install-data: install-data-@USE_NLS@ -+install-data-no: all -+install-data-yes: all -+ linguas="$(USE_LINGUAS)"; \ -+ for lang in $$linguas; do \ -+ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ -+ $(mkdir_p) $$dir; \ -+ if test -r $$lang.gmo; then \ -+ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ -+ echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ -+ else \ -+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ -+ echo "installing $(srcdir)/$$lang.gmo as" \ -+ "$$dir/$(GETTEXT_PACKAGE).mo"; \ -+ fi; \ -+ if test -r $$lang.gmo.m; then \ -+ $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ -+ echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ -+ else \ -+ if test -r $(srcdir)/$$lang.gmo.m ; then \ -+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ -+ $$dir/$(GETTEXT_PACKAGE).mo.m; \ -+ echo "installing $(srcdir)/$$lang.gmo.m as" \ -+ "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ -+ else \ -+ true; \ -+ fi; \ -+ fi; \ -+ done -+ -+# Empty stubs to satisfy archaic automake needs -+dvi info tags TAGS ID: -+ -+# Define this as empty until I found a useful application. -+install-exec installcheck: -+ -+uninstall: -+ linguas="$(USE_LINGUAS)"; \ -+ for lang in $$linguas; do \ -+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ -+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ -+ done -+ -+check: all $(GETTEXT_PACKAGE).pot -+ rm -f missing notexist -+ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m -+ if [ -r missing -o -r notexist ]; then \ -+ exit 1; \ -+ fi -+ -+mostlyclean: -+ rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp -+ rm -f .intltool-merge-cache -+ -+clean: mostlyclean -+ -+distclean: clean -+ rm -f Makefile Makefile.in POTFILES stamp-it -+ rm -f *.mo *.msg *.cat *.cat.m *.gmo -+ -+maintainer-clean: distclean -+ @echo "This command is intended for maintainers to use;" -+ @echo "it deletes files that may require special tools to rebuild." -+ rm -f Makefile.in.in -+ -+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -+dist distdir: $(DISTFILES) -+ dists="$(DISTFILES)"; \ -+ extra_dists="$(EXTRA_DISTFILES)"; \ -+ for file in $$extra_dists; do \ -+ test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ -+ done; \ -+ for file in $$dists; do \ -+ test -f $$file || file="$(srcdir)/$$file"; \ -+ ln $$file $(distdir) 2> /dev/null \ -+ || cp -p $$file $(distdir); \ -+ done -+ -+update-po: Makefile -+ $(MAKE) $(GETTEXT_PACKAGE).pot -+ tmpdir=`pwd`; \ -+ linguas="$(USE_LINGUAS)"; \ -+ for lang in $$linguas; do \ -+ echo "$$lang:"; \ -+ result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ -+ if $$result; then \ -+ if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ -+ rm -f $$tmpdir/$$lang.new.po; \ -+ else \ -+ if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ -+ :; \ -+ else \ -+ echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ -+ rm -f $$tmpdir/$$lang.new.po; \ -+ exit 1; \ -+ fi; \ -+ fi; \ -+ else \ -+ echo "msgmerge for $$lang.gmo failed!"; \ -+ rm -f $$tmpdir/$$lang.new.po; \ -+ fi; \ -+ done -+ -+Makefile POTFILES: stamp-it -+ @if test ! -f $@; then \ -+ rm -f stamp-it; \ -+ $(MAKE) stamp-it; \ -+ fi -+ -+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in -+ cd $(top_builddir) \ -+ && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ -+ $(SHELL) ./config.status -+ -+# Tell versions [3.59,3.63) of GNU make not to export all variables. -+# Otherwise a system limit (for SysV at least) may be exceeded. -+.NOEXPORT: -diff -Nur -x '*.orig' -x '*~' libgweather-2.27.91/po-locations/POTFILES.in libgweather-2.27.91.new/po-locations/POTFILES.in ---- libgweather-2.27.91/po-locations/POTFILES.in 1970-01-01 10:00:00.000000000 +1000 -+++ libgweather-2.27.91.new/po-locations/POTFILES.in 2009-08-26 11:54:52.000000000 +1000 -@@ -0,0 +1,4 @@ -+# This list should contain *only* data/Locations.xml.in. -+# Everything else should be in POTFILES.skip. -+[encoding:UTF-8] -+data/Locations.xml.in diff --git a/extra/libhangul/PKGBUILD b/extra/libhangul/PKGBUILD index cce918db2..a3a99a4cd 100644 --- a/extra/libhangul/PKGBUILD +++ b/extra/libhangul/PKGBUILD @@ -1,18 +1,19 @@ -# $Id: PKGBUILD 110870 2011-02-22 20:13:14Z bisson $ +# $Id: PKGBUILD 140549 2011-10-17 07:24:10Z bisson $ # Contributor: damir <damir@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=libhangul -pkgver=0.0.12 -pkgrel=2 -_filecode=5855 +pkgver=0.1.0 +pkgrel=1 +_filecode=6000 pkgdesc='Input method library for Korean' arch=('i686' 'x86_64' 'mips64el') url='http://kldp.net/projects/hangul/' license=('LGPL') options=('!libtool') -source=("http://kldp.net/frs/download.php/${_filecode}/${pkgname}-${pkgver}.tgz") -sha1sums=('5e02fe61c8f51ace03bebb1ec75875a2262e3cd5') +DLAGENTS=("http::/usr/bin/curl -A '' -fLC - --retry 3 --retry-delay 3 -o %o %u") # moronic httpd bans curl's user-agent +source=("http://kldp.net/frs/download.php/${_filecode}/${pkgname}-${pkgver}.tar.gz") +sha1sums=('9c6f3a82f2d4068771215f1b9f13a0d4bdbbfc77') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libisoburn/PKGBUILD b/extra/libisoburn/PKGBUILD index 3e21c4394..f8b45bf55 100644 --- a/extra/libisoburn/PKGBUILD +++ b/extra/libisoburn/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 135163 2011-08-10 16:43:11Z andyrtr $ +# $Id: PKGBUILD 140472 2011-10-15 09:35:02Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Gour <Gour <gour@mail.inet.hr> pkgname=libisoburn -pkgver=1.1.4 +pkgver=1.1.6 pkgrel=1 pkgdesc="frontend for libraries libburn and libisofs" url="http://libburnia.pykix.org/wiki/Libisoburn" @@ -13,7 +13,7 @@ depends=('libburn' 'libisofs' 'readline') options=('!libtool') install=${pkgname}.install source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz) -md5sums=('db79a0f0622077bb1a901f57cc1e2b67') +md5sums=('132746d3662005fd4dd462fc5d80d588') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libisofs/PKGBUILD b/extra/libisofs/PKGBUILD index d473129b4..09ccc5a16 100644 --- a/extra/libisofs/PKGBUILD +++ b/extra/libisofs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135158 2011-08-10 16:31:59Z andyrtr $ +# $Id: PKGBUILD 140469 2011-10-15 09:31:03Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Hugo Doria <hugodoria@gmail.com> # Contributor: Bjorn Martensen pkgname=libisofs -pkgver=1.1.4 +pkgver=1.1.6 pkgrel=1 pkgdesc="Library to pack up hard disk files and directories into a ISO 9660 disk image" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL') depends=('acl' 'zlib') source=(http://files.libburnia-project.org/releases/${pkgname}-${pkgver}.tar.gz) options=('!libtool') -md5sums=('2bdfda5f47fc986230efe8d05c463d52') +md5sums=('2f6088ba9ae7ed6cc91a51d2b6f2dfa0') build() { cd ${srcdir}/${pkgname}-${pkgver} diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 78a5166b2..15b67b82a 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 138502 2011-09-25 14:55:46Z andyrtr $ +# $Id: PKGBUILD 140577 2011-10-17 08:15:00Z jgc $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -37,15 +37,15 @@ pkgname=('libreoffice-common' 'libreoffice-extension-wiki-publisher') _LOver=3.4.3.2 pkgver=3.4.3 -pkgrel=2 -arch=('i686' 'x86_64' 'mips64el') +pkgrel=4 +arch=('i686' 'x86_64') #_LO_tree="3.4" _OFFICEUPD="340" license=('LGPL3') url="http://www.libreoffice.org/" makedepends=( # makedepends 'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc' 'hsqldb-java' #'boost' - we use internal one for now that has some gcc4.6 fixes. - 'apache-ant' 'gperf' 'poppler' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient' + 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient' 'beanshell' 'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick' 'mesa' 'gstreamer0.10-base' 'java-environment' #'saxon' - currently broken @@ -53,7 +53,7 @@ makedepends=( # makedepends "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' "icu>=4.6" 'libxslt' 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' #'libgraphite' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' # keep gtk2 for install script + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' # keep gtk2 for install script 'ttf-dejavu') # to satisfy regression tests # translate-toolkit - todo move them to extra to allow --with-system-foo builds # http://download.documentfoundation.org/mirrors/all.html @@ -105,7 +105,13 @@ source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions buildfix_boost.diff buildfix_ct2n.diff vbahelper.visibility.patch - scp2-more-reasonable-file-access-rights.diff) + scp2-more-reasonable-file-access-rights.diff + java-detection.diff::http://cgit.freedesktop.org/libreoffice/libs-core/patch/?id=14bc9100d36eae3999f1623efce8ee84091da842 + oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1 + poppler-check.diff::http://cgit.freedesktop.org/libreoffice/bootstrap/patch/?id=72a5f87cb3f0a367f1cd6a5cc15101acc83396fe + pdfimport.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=53e66aea4c1b3617363fd138a7903190d964da6b + poppler-buildfix.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=9540db43f3f1b11d3407a45aefda235d7e78f76b + build-without-glib-poppler-bindings.diff::http://cgit.freedesktop.org/libreoffice/extensions/patch/?id=a9cc06fa45d4cd9547f40a9869c64c912b821b42) noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2 @@ -206,7 +212,13 @@ md5sums=('7c2e73f1197d169519f86efe422e5df9' 'bc228237108cab7745897a9f466b6d39' 'eee273f501ff45dc5f1365e78c6d57c0' '43b145db28e6c0d73578ae6fd35e510d' - '37638431e7e40baf2e47966ebb9bc0e9') + '37638431e7e40baf2e47966ebb9bc0e9' + 'ca6032e86229ae798f3744ae244f5bfe' + '3c6c62e77c30649a3dfe73512947cc9a' + '64497be966802e62ffe3282d3facf7b7' + '89ff871e77e10357a976fe9d1ab3a65a' + 'c4cb0d7f2602396a3f4cac55b8a4e308' + 'b8f1fb7f3902d22aeaa2575c6b08a62c') build() { @@ -236,6 +248,12 @@ build() { patch -Np1 -i ${srcdir}/buildfix_ct2n.diff patch -Np0 -i ${srcdir}/vbahelper.visibility.patch patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff + patch -Np1 -i ${srcdir}/java-detection.diff + patch -Np1 -i ${srcdir}/oracle-recognition.diff + patch -Np1 -i ${srcdir}/poppler-check.diff + patch -Np1 -i ${srcdir}/pdfimport.diff + patch -Np1 -i ${srcdir}/poppler-buildfix.diff + patch -Np1 -i ${srcdir}/build-without-glib-poppler-bindings.diff # unset C(XX)FLAGS # http://www.openoffice.org/issues/show_bug.cgi?id=103205 @@ -376,7 +394,7 @@ package_libreoffice-common() { depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6" 'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' #'libgraphite' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2') # keep gtk2 for install script + 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script #'java-runtime' #'saxon' optdepends=('libreoffice-langpack: additional language support' diff --git a/extra/libtorrent-rasterbar/PKGBUILD b/extra/libtorrent-rasterbar/PKGBUILD index 53cf9a6d0..fe7c8f49d 100644 --- a/extra/libtorrent-rasterbar/PKGBUILD +++ b/extra/libtorrent-rasterbar/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 134299 2011-08-02 19:50:28Z ibiru $ +# $Id: PKGBUILD 140204 2011-10-09 10:15:48Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> pkgname=libtorrent-rasterbar -pkgver=0.15.7 +pkgver=0.15.8 pkgrel=1 pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around" url="http://www.rasterbar.com/products/libtorrent/" @@ -12,7 +12,7 @@ license=('custom') depends=('boost-libs' 'python2') makedepends=('boost') source=(http://libtorrent.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -sha1sums=('5ddc5966436f98c146b6aba8595dfe86cecb6724') +sha1sums=('9e21ebfa6fba19b237754a10ae9b8007781c48f0') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/libvncserver/PKGBUILD b/extra/libvncserver/PKGBUILD index 86a9b7bf8..1c62d5b3a 100644 --- a/extra/libvncserver/PKGBUILD +++ b/extra/libvncserver/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 135798 2011-08-18 15:04:30Z andyrtr $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# $Id: PKGBUILD 140764 2011-10-18 19:48:49Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=libvncserver -pkgver=0.9.8 -pkgrel=4 +pkgver=0.9.8.1 +pkgrel=1 pkgdesc="A cross-platform C libraries that allow you to easily implement VNC server" arch=('i686' 'x86_64' 'mips64el') url="http://libvncserver.sourceforge.net/" @@ -12,7 +13,7 @@ license=('GPL') depends=('libjpeg' 'gnutls' 'libgcrypt') options=('!libtool') source=("http://downloads.sourceforge.net/${pkgname}/LibVNCServer-${pkgver}.tar.gz") -md5sums=('dda9e75a1d5d7c37bb57d90ead7b32b3') +md5sums=('51e972bd26c098b0b8d4687af6afbeb1') build() { cd "${srcdir}/LibVNCServer-${pkgver}" diff --git a/extra/linux_logo/PKGBUILD b/extra/linux_logo/PKGBUILD index ee3632dfd..7093d16f2 100644 --- a/extra/linux_logo/PKGBUILD +++ b/extra/linux_logo/PKGBUILD @@ -1,9 +1,8 @@ -# $Id: PKGBUILD 84817 2010-07-04 16:35:24Z eric $ -# Maintainer: Damir Perisa <damir@archlinux.org> -# Contributor: Damir Perisa <damir.perisa@bluewin.ch> +# $Id: PKGBUILD 140770 2011-10-19 00:51:32Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=linux_logo -pkgver=5.10 +pkgver=5.11 pkgrel=1 pkgdesc="Text-based logo and system information program" arch=('i686' 'x86_64' 'mips64el') @@ -11,8 +10,7 @@ url="http://www.deater.net/weave/vmwprod/linux_logo" license=('GPL') depends=('glibc') source=(http://www.deater.net/weave/vmwprod/linux_logo/${pkgname}-${pkgver}.tar.gz) -md5sums=('30d635841ba2cf630b040fadbf95377d') -sha1sums=('0ba27d563b938fd802e424c8c116e1ea3c19aab4') +sha1sums=('bd22808f165574cb3bc98c579aa48c0acab65f39') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/liquidwar/PKGBUILD b/extra/liquidwar/PKGBUILD index 6e62ae215..5f12019fc 100644 --- a/extra/liquidwar/PKGBUILD +++ b/extra/liquidwar/PKGBUILD @@ -1,29 +1,30 @@ -# $Id: PKGBUILD 63784 2010-01-18 15:14:56Z ibiru $ -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Maintainer: Jason Chu <jason@archlinux.org> +# $Id: PKGBUILD 140692 2011-10-18 03:46:14Z eric $ # Maintainer: Jeff Mickey <jeff@archlinux.org> pkgname=liquidwar pkgver=5.6.4 -pkgrel=4 +pkgrel=5 pkgdesc="A unique multiplayer wargame" arch=('i686' 'x86_64' 'mips64el') url="http://www.ufoot.org/liquidwar/" license=('GPL') -depends=('allegro>=4.4.0.1') -makedepends=('python') +depends=('allegro4') +makedepends=('python2') install=liquidwar.install -source=(http://www.ufoot.org/download/$pkgname/v5/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('6917dd1026e6685404ffbd086f8ba374') -sha1sums=('a3006c4da9517c3af3b7bf165b2c86fa369a71c6') +source=(http://www.ufoot.org/download/$pkgname/v5/$pkgver/$pkgname-$pkgver.tar.gz + http://www.ufoot.org/sig/$pkgname-$pkgver.tar.gz.sig) +sha1sums=('a3006c4da9517c3af3b7bf165b2c86fa369a71c6' + 'a262967d60e0f04ac5b99693144ef6b0038bb6c4') build() { cd "$srcdir/$pkgname-$pkgver" + sed -i 's/python/python2/' doc/Makefile.in [ "$CARCH" == "x86_64" ] && EXTRAOPTS="--disable-asm" - ./configure --prefix=/usr --disable-doc-ps --disable-doc-pdf --disable-doc-php3 $EXTRAOPTS || return 1 - sed -i 's|$(EXTERN_LIBS)|$(EXTERN_LIBS) -lm|' src/Makefile || return 1 - make GAMEDIR=/usr/bin DATADIR=/usr/share/$pkgname || return 1 - make DESTDIR="$pkgdir" DATADIR=/usr/share/$pkgname install || return 1 - mv "$pkgdir"/usr/games/* "$pkgdir/usr/bin/" - rmdir "${pkgdir}/usr/games" + LIBS='-lm' PYTHON=yes ./configure --prefix=/usr $EXTRAOPTS + make GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" GAMEDIR=/usr/bin DATADIR=/usr/share/liquidwar install_nolink } diff --git a/extra/liquidwar/liquidwar.install b/extra/liquidwar/liquidwar.install index e864e83ea..9c98acbc7 100644 --- a/extra/liquidwar/liquidwar.install +++ b/extra/liquidwar/liquidwar.install @@ -1,4 +1,4 @@ -infodir=/usr/share/info +infodir=usr/share/info file=(liquidwar.info.gz) post_install() { diff --git a/extra/lsof/PKGBUILD b/extra/lsof/PKGBUILD index e1e12bf6b..347125050 100644 --- a/extra/lsof/PKGBUILD +++ b/extra/lsof/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 115676 2011-03-19 06:54:43Z angvp $ +# $Id: PKGBUILD 140198 2011-10-09 08:36:54Z angvp $ # Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: Jochem Kossen <j.kossen@home.nl> pkgname=lsof -pkgver=4.84 -pkgrel=3 +pkgver=4.85 +pkgrel=1 pkgdesc="Lists open files for running Unix processes" arch=('i686' 'x86_64' 'mips64el') url="http://people.freebsd.org/~abe/" license=('custom') depends=('glibc') source=(ftp://sunsite.ualberta.ca/pub/Mirror/lsof/${pkgname}_${pkgver}.tar.bz2 license.txt) -md5sums=('a09326df500ef7e4550af546868338d6' +md5sums=('102ee2081172bbe76dccaa6cceda8573' '1b63c76bd10437cabf890508c8e58d36') build() { diff --git a/extra/m17n-lib/PKGBUILD b/extra/m17n-lib/PKGBUILD index 5b4952dd3..0afbbe4e3 100644 --- a/extra/m17n-lib/PKGBUILD +++ b/extra/m17n-lib/PKGBUILD @@ -1,29 +1,27 @@ -# $Id: PKGBUILD 106797 2011-01-19 09:42:18Z bisson $ +# $Id: PKGBUILD 140555 2011-10-17 07:25:46Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Camille Moncelier <pix@devlife.org> pkgname=m17n-lib -pkgver=1.6.2 -pkgrel=2 -pkgdesc='A multilingual text processing library (runtimes)' +pkgver=1.6.3 +pkgrel=1 +pkgdesc='Multilingual text processing library (runtimes)' arch=('i686' 'x86_64' 'mips64el') url='http://www.m17n.org/m17n-lib/' license=('GPL') -depends=('libxft' 'm17n-db' 'fribidi' 'libxml2' 'gd' 'libotf>=0.9.11') +depends=('libxft' 'm17n-db' 'fribidi' 'libxml2' 'gd' 'libotf') optdepends=('anthy: to use the anthy input method') -options=('!libtool' '!makeflags') -source=("http://www.m17n.org/m17n-lib-download/$pkgname-$pkgver.tar.gz" - 'locale.patch') -sha1sums=('9b9ada79357dd56c90c64cd36845c5537c363d79' - '55a09b9d8e6ea590d5c8f06d1397bfa0b00c1697') +options=('!libtool' '!emptydirs') +source=("http://www.m17n.org/m17n-lib-download/${pkgname}-${pkgver}.tar.gz") +sha1sums=('b3a725b1c417f167f6b2c6b7889b7d728a1e6b8f') build() { - cd "$srcdir/$pkgname-$pkgver" - patch -p1 -i ../locale.patch # cf. FS#20482 - ./configure --prefix=/usr - make + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --enable-static=no + make } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } diff --git a/extra/m17n-lib/locale.patch b/extra/m17n-lib/locale.patch deleted file mode 100644 index 79fed402d..000000000 --- a/extra/m17n-lib/locale.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- old/src/locale.c 2010/03/19 11:59:43 1.12 -+++ new/src/locale.c 2010/11/05 11:20:41 1.13 -@@ -86,34 +86,24 @@ - MLocale *mlocale_monetary, *mlocale_numeric, ; - #endif - --/** Parse locale name NAME and return a newly created MLocale object. -- If the locale is not supported by the system, return NULL. */ -+/** Parse locale name NAME and return a newly created MLocale object. */ - - static MLocale * - make_locale (const char *name) - { -- char *current, *new, *str; -+ char *str; - int len; - MLocale *locale; - char c; - -- str = setlocale (LC_CTYPE, NULL); -- len = strlen (str) + 1; -- current = alloca (len); -- memcpy (current, str, len); -- -- if (! (new = setlocale (LC_CTYPE, name))) -- return NULL; -- -- - M17N_OBJECT (locale, NULL, MERROR_LOCALE); -- locale->name = msymbol (new); -+ locale->name = msymbol (name); - msymbol_put (locale->name, M_locale, (void *) locale); - M17N_OBJECT_UNREF (locale); - -- len = strlen (new) + 1; -+ len = strlen (name) + 1; - str = alloca (len); -- memcpy (str, new, len); -+ memcpy (str, name, len); - - c = '\0'; - while (1) -@@ -162,8 +152,6 @@ - } - else - locale->coding = Mcoding_us_ascii; -- -- setlocale (LC_CTYPE, current); - return locale; - } - diff --git a/extra/midori/PKGBUILD b/extra/midori/PKGBUILD index a176cfe2e..75be8d734 100644 --- a/extra/midori/PKGBUILD +++ b/extra/midori/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 139590 2011-10-03 14:23:27Z andyrtr $ +# $Id: PKGBUILD 140480 2011-10-15 10:32:49Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: rabyte <rabyte.at.gmail.dot.com> # Contributor: Johannes Krampf <wuischke.at.amule.dot.org> pkgname=midori -pkgver=0.4.0 -pkgrel=2 +pkgver=0.4.1 +pkgrel=1 pkgdesc="A lightweight web browser based on Gtk WebKit" arch=('i686' 'x86_64' 'mips64el') url="http://www.twotoasts.de/index.php?/pages/midori_summary.html" @@ -14,19 +14,12 @@ install=midori.install depends=('libwebkit>=1.3.13' 'libunique' 'hicolor-icon-theme' 'desktop-file-utils' 'libnotify>=0.7.1' 'libxss' 'sqlite3' 'glib2') makedepends=('libxml2' 'intltool' 'gtk-doc' 'librsvg' 'python2>=2.7.1' 'vala') # 'git' optdepends=('vala: for use in extensions') -source=(http://archive.xfce.org/src/apps/$pkgname/0.4/$pkgname-$pkgver.tar.bz2 - webkit_search.diff) -md5sums=('14aa14ccabf3d003903f1584dab15d7a' - '293c026e1875145e0df9584e1ff2a70e') -sha1sums=('c6d1d41f4e3c97bd2839235bd9d7b2a8a408c585' - '82bba447bc1aaeabf0ec95f3ddaf5c24dd27474c') +source=(http://archive.xfce.org/src/apps/$pkgname/0.4/$pkgname-$pkgver.tar.bz2) +md5sums=('33dde203cd71ae2b1d2adcc7f5739f65') build() { cd ${srcdir}/${pkgname}-${pkgver} - # FS#26207 - patch -Np1 -i ${srcdir}/webkit_search.diff - # python2 export PYTHON=/usr/bin/python2 sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" wscript waf diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD index 44587a1f8..a344cf176 100644 --- a/extra/mkvtoolnix/PKGBUILD +++ b/extra/mkvtoolnix/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 138691 2011-09-27 16:36:38Z giovanni $ +# $Id: PKGBUILD 140216 2011-10-09 20:54:01Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=mkvtoolnix -pkgver=5.0.0 +pkgver=5.0.1 pkgrel=1 pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://www.bunkus.org/videotools/mkvtoolnix/index.html" depends=('file' 'boost-libs' 'libmatroska' 'lzo2' 'expat' 'flac' 'libvorbis') makedepends=('boost' 'ruby') source=("http://www.bunkus.org/videotools/${pkgname}/sources/${pkgname}-${pkgver}.tar.bz2") -md5sums=('8a8d29c3b0eb202bb32ea44c54aeb83b') +md5sums=('93fbbe946de6013eca699c0c2a93a4e9') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD index 3080dac22..7a414474a 100644 --- a/extra/monodevelop-debugger-gdb/PKGBUILD +++ b/extra/monodevelop-debugger-gdb/PKGBUILD @@ -1,16 +1,16 @@ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=monodevelop-debugger-gdb -pkgver=2.6.0.1 +pkgver=2.8.1 pkgrel=1 pkgdesc="Mono Debugger support" arch=('i686' 'x86_64' 'mips64el') url="http://monodevelop.com" license=('GPL') -depends=('monodevelop>=2.6' 'gdb') +depends=('monodevelop>=2.8.1' 'gdb') makedepends=('mono') source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('ad11a5ae0ed0c10630ad6c92262c7cf0') +md5sums=('398c3b49fa1698857499a6e8261becf3') build() { export MONO_SHARED_DIR="${srcdir}/.wabi" diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD index 0b6fbc489..9fac6ee7b 100644 --- a/extra/monodevelop/PKGBUILD +++ b/extra/monodevelop/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=monodevelop -pkgver=2.6.0.1 +pkgver=2.8.1 pkgrel=1 pkgdesc="An IDE primarily designed for C# and other .NET languages" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ depends=('mono>=2.10.5' 'mono-addins>=0.6.2' 'gnome-sharp' 'gecko-sharp-2.0>=0.1 options=(!makeflags) install=monodevelop.install source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('994ce8de46911568bd061c9e98b6faa3') +md5sums=('02c3f0f75e1d21d72ac5cd0b373d0e58') build() { export MONO_SHARED_DIR=$srcdir/src/.wabi diff --git a/extra/msmtp/PKGBUILD b/extra/msmtp/PKGBUILD index a3b75136f..d2fecdefd 100644 --- a/extra/msmtp/PKGBUILD +++ b/extra/msmtp/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135802 2011-08-18 15:04:35Z andyrtr $ +# $Id: PKGBUILD 140559 2011-10-17 07:57:05Z eric $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Ben Mazer <blm@groknil.org> pkgname=msmtp -pkgver=1.4.24 -pkgrel=3 +pkgver=1.4.25 +pkgrel=1 pkgdesc="A mini smtp client" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') @@ -14,7 +14,7 @@ makedepends=('texlive-core') provides=('smtp-forwarder') install=msmtp.install source=(http://download.sourceforge.net/sourceforge/msmtp/${pkgname}-${pkgver}.tar.bz2) -md5sums=('3ed704fbd3e7419cab5c65bb7928d9ba') +md5sums=('2d9603a7b5c1ebd83ea289ac2aa3a634') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/mtr/PKGBUILD b/extra/mtr/PKGBUILD index f8c36fb4c..373444048 100644 --- a/extra/mtr/PKGBUILD +++ b/extra/mtr/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 106670 2011-01-17 20:34:58Z ibiru $ +# $Id: PKGBUILD 140175 2011-10-08 12:02:46Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgbase=mtr pkgname=(mtr mtr-gtk) -pkgver=0.80 -pkgrel=2 +pkgver=0.81 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('GPL') makedepends=('ncurses' 'gtk2') source=(ftp://ftp.bitwizard.nl/mtr/${pkgbase}-${pkgver}.tar.gz) url="http://www.bitwizard.nl/mtr/" -md5sums=('fa68528eaec1757f52bacf9fea8c68a9') +md5sums=('b7a7914f1fc1b5a21ab10bdca44356e1') build() { install -d "${srcdir}/"{mtr-cli,mtr-gtk} @@ -20,20 +20,20 @@ build() { make cd "${srcdir}/mtr-gtk" - ../${pkgbase}-${pkgver}/configure --prefix=/usr --enable-gtk2 + ../${pkgbase}-${pkgver}/configure --prefix=/usr make } package_mtr() { pkgdesc="Combines the functionality of traceroute and ping into one tool (CLI version)" - depends=('ncurses>=5.7') + depends=('ncurses') cd "${srcdir}/mtr-cli" make DESTDIR="${pkgdir}" install } package_mtr-gtk() { pkgdesc="Combines the functionality of traceroute and ping into one tool (GTK version)" - depends=('ncurses>=5.7' "gtk2>=2.22.0") + depends=('ncurses' "gtk2") conflicts=("mtr") provides=("mtr=${pkgver}") diff --git a/extra/net-snmp/libnl-2.patch b/extra/net-snmp/libnl-2.patch deleted file mode 100644 index 7c140fe83..000000000 --- a/extra/net-snmp/libnl-2.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -Nur net-snmp-5.5.orig//agent/mibgroup/mibII/tcpTable.c net-snmp-5.5//agent/mibgroup/mibII/tcpTable.c ---- net-snmp-5.5.orig//agent/mibgroup/mibII/tcpTable.c 2009-06-13 04:02:02.000000000 +0200 -+++ net-snmp-5.5//agent/mibgroup/mibII/tcpTable.c 2011-01-15 10:31:03.579735957 +0100 -@@ -555,8 +555,10 @@ - static int - tcpTable_load_netlink() - { -+ int err; -+ - /* TODO: perhaps use permanent nl handle? */ -- struct nl_handle *nl = nl_handle_alloc(); -+ struct nl_sock *nl = nl_socket_alloc(); - - if (nl == NULL) { - DEBUGMSGTL(("mibII/tcpTable", "Failed to allocate netlink handle\n")); -@@ -564,10 +566,10 @@ - return -1; - } - -- if (nl_connect(nl, NETLINK_INET_DIAG) < 0) { -- DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror())); -- snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror()); -- nl_handle_destroy(nl); -+ if ((err = nl_connect(nl, NETLINK_INET_DIAG)) < 0) { -+ DEBUGMSGTL(("mibII/tcpTable", "Failed to connect to netlink: %s\n", nl_geterror(err))); -+ snmp_log(LOG_ERR, "snmpd: Couldn't connect to netlink: %s\n", nl_geterror(err)); -+ nl_socket_free(nl); - return -1; - } - -@@ -579,10 +581,10 @@ - struct nl_msg *nm = nlmsg_alloc_simple(TCPDIAG_GETSOCK, NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST); - nlmsg_append(nm, &req, sizeof(struct inet_diag_req), 0); - -- if (nl_send_auto_complete(nl, nm) < 0) { -- DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror())); -- snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror()); -- nl_handle_destroy(nl); -+ if ((err = nl_send_auto_complete(nl, nm)) < 0) { -+ DEBUGMSGTL(("mibII/tcpTable", "nl_send_autocomplete(): %s\n", nl_geterror(err))); -+ snmp_log(LOG_ERR, "snmpd: nl_send_autocomplete(): %s\n", nl_geterror(err)); -+ nl_socket_free(nl); - return -1; - } - nlmsg_free(nm); -@@ -593,9 +595,9 @@ - - while (running) { - if ((len = nl_recv(nl, &peer, &buf, NULL)) <= 0) { -- DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror())); -- snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror()); -- nl_handle_destroy(nl); -+ DEBUGMSGTL(("mibII/tcpTable", "nl_recv(): %s\n", nl_geterror(len))); -+ snmp_log(LOG_ERR, "snmpd: nl_recv(): %s\n", nl_geterror(len)); -+ nl_socket_free(nl); - return -1; - } - -@@ -644,7 +646,7 @@ - free(buf); - } - -- nl_handle_destroy(nl); -+ nl_socket_free(nl); - - if (tcp_head) { - DEBUGMSGTL(("mibII/tcpTable", "Loaded TCP Table using netlink\n")); diff --git a/extra/nettle/PKGBUILD b/extra/nettle/PKGBUILD index a72ef0427..d970890c2 100644 --- a/extra/nettle/PKGBUILD +++ b/extra/nettle/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 135770 2011-08-18 15:03:50Z andyrtr $ +# $Id: PKGBUILD 140462 2011-10-15 08:19:09Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: bender02 at gmx dot com pkgname=nettle -pkgver=2.2 +pkgver=2.4 pkgrel=1 pkgdesc="A low-level cryptographic library" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('GPL2') install=$pkgname.install depends=('gmp') source=(ftp://ftp.lysator.liu.se/pub/security/lsh/$pkgname-$pkgver.tar.gz) -md5sums=('9a9c6102eb9909019f8a13b67578cdfe') +md5sums=(''450be8c4886d46c09f49f568ad6fa013'') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD index d4c0d33dd..2e1336805 100644 --- a/extra/opal/PKGBUILD +++ b/extra/opal/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 136105 2011-08-23 01:58:25Z heftig $ +# $Id: PKGBUILD 140067 2011-10-06 07:33:41Z ibiru $ # Maintainer: Jan de Groot <jan@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=opal pkgver=3.10.2 -pkgrel=1 +pkgrel=2 pkgdesc="Open Phone Abstraction Library" arch=(i686 x86_64 'mips64el') url="http://www.ekiga.org" diff --git a/extra/openbabel/PKGBUILD b/extra/openbabel/PKGBUILD index e4f8e9e01..078e83de1 100644 --- a/extra/openbabel/PKGBUILD +++ b/extra/openbabel/PKGBUILD @@ -1,12 +1,11 @@ -# $Id: PKGBUILD 99851 2010-11-18 20:52:23Z andrea $ +# $Id: PKGBUILD 140672 2011-10-18 02:34:13Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Damir Perisa <damir.perisa@bluewin.ch> pkgname=openbabel -pkgver=2.3.0 -pkgrel=3 -pkgdesc="A library designed to interconvert between many file formats used in \ -molecular modeling and computational chemistry" +pkgver=2.3.1 +pkgrel=1 +pkgdesc="A library designed to interconvert between many file formats used in molecular modeling and computational chemistry" arch=('i686' 'x86_64' 'mips64el') url="http://openbabel.org/wiki/Main_Page" license=('GPL') @@ -16,10 +15,10 @@ optdepends=('eigen: to use bindings' 'wxgtk: GUI interface') options=('!libtool') source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('effda01ed4a31d18d8e3d08191799608') +md5sums=('1f029b0add12a3b55582dc2c832b04f8') build() { - cd ${srcdir} + cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ @@ -29,6 +28,6 @@ build() { } package() { - cd ${srcdir}/build - make DESTDIR=${pkgdir} install + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install } diff --git a/extra/oxygen-gtk/PKGBUILD b/extra/oxygen-gtk/PKGBUILD index a927c4bda..061915e98 100644 --- a/extra/oxygen-gtk/PKGBUILD +++ b/extra/oxygen-gtk/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 138061 2011-09-15 17:22:52Z andrea $ +# $Id: PKGBUILD 140513 2011-10-16 08:02:52Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: birdflesh <antkoul at gmail dot com> pkgname=oxygen-gtk -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('LGPL') depends=('gtk2') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('e3b280a61cbe4363c41c26083e94643d') +md5sums=('61a7424e77785501df27b5c050e5f287') build() { cd "${srcdir}" diff --git a/extra/perl-event/PKGBUILD b/extra/perl-event/PKGBUILD index 056a22ba8..de05e0f6d 100644 --- a/extra/perl-event/PKGBUILD +++ b/extra/perl-event/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 125258 2011-05-25 19:17:24Z foutrelis $ +# $Id: PKGBUILD 140115 2011-10-07 08:31:40Z eric $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> # Contributor: François Charette <francois.archlinux.org> pkgname=perl-event _srcname=Event -pkgver=1.17 +pkgver=1.20 pkgrel=1 pkgdesc="Framework for GUI events" arch=('i686' 'x86_64' 'mips64el') license=('PerlArtistic' 'GPL') url="http://search.cpan.org/dist/${_srcname}/" depends=('perl') -options=(!emptydirs) +options=('!emptydirs') source=(http://search.cpan.org/CPAN/authors/id/J/JP/JPRIT/${_srcname}-${pkgver}.tar.gz) -md5sums=('c58cdf7c56cd5f10a58b234d2c81295f') +md5sums=('bdbdf6c1b235c3e13c25f3b0491c5134') build() { cd "${srcdir}/${_srcname}-${pkgver}" @@ -22,6 +22,10 @@ build() { # install module in vendor directories. perl Makefile.PL INSTALLDIRS=vendor make +} + +check() { + cd "${srcdir}/${_srcname}-${pkgver}" make test } @@ -31,6 +35,6 @@ package() { make install DESTDIR="${pkgdir}" # remove perllocal.pod and .packlist - find ${pkgdir} -name perllocal.pod -delete - find ${pkgdir} -name .packlist -delete + find "${pkgdir}" -name perllocal.pod -delete + find "${pkgdir}" -name .packlist -delete } diff --git a/extra/perl-fcgi/PKGBUILD b/extra/perl-fcgi/PKGBUILD index 458065068..3ef98a39c 100644 --- a/extra/perl-fcgi/PKGBUILD +++ b/extra/perl-fcgi/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 131681 2011-07-13 14:35:40Z giovanni $ +# $Id: PKGBUILD 140128 2011-10-07 15:36:23Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: François Charette <firmicus ατ gmx δοτ net> pkgname=perl-fcgi -pkgver=0.73 +pkgver=0.74 pkgrel=1 pkgdesc="Fast CGI" arch=('i686' 'x86_64' 'mips64el') @@ -11,8 +11,8 @@ url="http://search.cpan.org/dist/FCGI" license=('GPL' 'PerlArtistic') depends=('perl>=5.14') options=('!emptydirs') -source=(http://www.cpan.org/CPAN/authors/id/F/FL/FLORA/FCGI-${pkgver}.tar.gz) -md5sums=('b55c8b93ccd175b3c0e4473f1a6c0bdd') +source=("http://www.cpan.org/CPAN/authors/id/F/FL/FLORA/FCGI-${pkgver}.tar.gz") +md5sums=('462a77a0072480fea791a4d3095eb486') build() { cd "${srcdir}/FCGI-${pkgver}" diff --git a/extra/perl-net-ssleay/PKGBUILD b/extra/perl-net-ssleay/PKGBUILD index 39325115f..51eb34b27 100644 --- a/extra/perl-net-ssleay/PKGBUILD +++ b/extra/perl-net-ssleay/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 125276 2011-05-25 19:20:00Z foutrelis $ +# $Id: PKGBUILD 140126 2011-10-07 15:32:39Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Manolis Tzanidakis pkgname=perl-net-ssleay _cpanname=Net-SSLeay -pkgver=1.36 -pkgrel=5 +pkgver=1.42 +pkgrel=1 pkgdesc="Perl extension for using OpenSSL" arch=('i686' 'x86_64' 'mips64el') license=('custom:BSD') @@ -14,8 +14,8 @@ depends=('perl' 'openssl') options=(!emptydirs) replaces=('net-ssleay') provides=('net-ssleay') -source=(http://www.cpan.org/authors/id/F/FL/FLORA/${_cpanname}-${pkgver}.tar.gz) -md5sums=('54061638720dd6a325395331c77f21d8') +source=("http://www.cpan.org/authors/id/M/MI/MIKEM/${_cpanname}-${pkgver}.tar.gz") +md5sums=('3f9c9589495301c14bfc03097388ca4f') build() { cd ${srcdir}/${_cpanname}-${pkgver} diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index 9a285a663..4a60a554c 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 137658 2011-09-10 10:56:37Z pierre $ +# $Id: PKGBUILD 140587 2011-10-17 08:15:19Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.16.7 -pkgrel=2 +pkgver=0.18.0 +pkgrel=1 arch=(i686 x86_64 mips64el) license=('GPL') -makedepends=('libjpeg' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection') -options=('!libtool') +makedepends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'gtk2' 'qt' 'pkgconfig' 'lcms' 'gobject-introspection') +options=('!libtool' '!emptydirs') url="http://poppler.freedesktop.org/" source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz) -md5sums=('3afa28e3c8c4f06b0fbca3c91e06394e') +md5sums=('4cd3bf2a0a13fa8eaf00d31368915f77') build() { cd "${srcdir}/${pkgbase}-${pkgver}" @@ -29,7 +29,7 @@ build() { package_poppler() { pkgdesc="PDF rendering library based on xpdf 3.0" - depends=('libjpeg' 'gcc-libs' 'cairo' 'libxml2' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data') + depends=('libjpeg' 'gcc-libs' 'cairo' 'fontconfig' 'openjpeg' 'lcms' 'poppler-data') conflicts=("poppler-qt3<${pkgver}") cd "${srcdir}/${pkgbase}-${pkgver}" @@ -42,7 +42,7 @@ package_poppler() { package_poppler-glib() { pkgdesc="Poppler glib bindings" - depends=("poppler=${pkgver}" 'gtk2') + depends=("poppler=${pkgver}" 'glib2') cd "${srcdir}/${pkgbase}-${pkgver}/poppler" make DESTDIR="${pkgdir}" install-libLTLIBRARIES @@ -51,6 +51,7 @@ package_poppler-glib() { install -m755 -d "${pkgdir}/usr/lib/pkgconfig" install -m644 ../poppler-glib.pc "${pkgdir}/usr/lib/pkgconfig/" rm -f "${pkgdir}"/usr/lib/libpoppler.* + rm -f "${pkgdir}/usr/bin/poppler-glib-demo" } package_poppler-qt() { diff --git a/extra/postgresql-old-upgrade/build.patch b/extra/postgresql-old-upgrade/build.patch deleted file mode 100644 index c8f665d12..000000000 --- a/extra/postgresql-old-upgrade/build.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur postgresql-8.2.3-orig/src/Makefile postgresql-8.2.3/src/Makefile ---- postgresql-8.2.3-orig/src/Makefile 2006-06-22 16:50:35.000000000 -0700 -+++ postgresql-8.2.3/src/Makefile 2007-03-05 10:46:24.000000000 -0800 -@@ -23,7 +23,6 @@ - $(MAKE) -C bin $@ - $(MAKE) -C pl $@ - $(MAKE) -C makefiles $@ -- $(MAKE) -C test/regress $@ - - install: install-local - diff --git a/extra/postgresql/build.patch b/extra/postgresql/build.patch deleted file mode 100644 index c8f665d12..000000000 --- a/extra/postgresql/build.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur postgresql-8.2.3-orig/src/Makefile postgresql-8.2.3/src/Makefile ---- postgresql-8.2.3-orig/src/Makefile 2006-06-22 16:50:35.000000000 -0700 -+++ postgresql-8.2.3/src/Makefile 2007-03-05 10:46:24.000000000 -0800 -@@ -23,7 +23,6 @@ - $(MAKE) -C bin $@ - $(MAKE) -C pl $@ - $(MAKE) -C makefiles $@ -- $(MAKE) -C test/regress $@ - - install: install-local - diff --git a/extra/postgresql/perl-5.14-fix.patch b/extra/postgresql/perl-5.14-fix.patch deleted file mode 100644 index 82ef7d688..000000000 --- a/extra/postgresql/perl-5.14-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/src/pl/plperl/plperl.c -+++ b/src/pl/plperl/plperl.c -@@ -926,7 +926,7 @@ plperl_trusted_init(void) - if (!isGV_with_GP(sv) || !GvCV(sv)) - continue; - SvREFCNT_dec(GvCV(sv)); /* free the CV */ -- GvCV(sv) = NULL; /* prevent call via GV */ -+ GvCV_set(sv, NULL); /* prevent call via GV */ - } - hv_clear(stash); - ---- a/src/pl/plperl/plperl.h -+++ b/src/pl/plperl/plperl.h -@@ -49,6 +49,11 @@ - (U32)HeKUTF8(he)) - #endif - -+/* supply GvCV_set if it's missing - ppport.h doesn't supply it, unfortunately */ -+#ifndef GvCV_set -+#define GvCV_set(gv, cv) (GvCV(gv) = cv) -+#endif -+ - /* declare routines from plperl.c for access by .xs files */ - HV *plperl_spi_exec(char *, int); - void plperl_return_next(SV *); diff --git a/extra/pulseaudio/PKGBUILD b/extra/pulseaudio/PKGBUILD index 27e02658f..b01befd3c 100644 --- a/extra/pulseaudio/PKGBUILD +++ b/extra/pulseaudio/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 139658 2011-10-04 14:14:35Z heftig $ +# $Id: PKGBUILD 140517 2011-10-16 08:44:24Z heftig $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> # Contributor: Corrado Primier <bardo@aur.archlinux.org> @@ -8,26 +8,27 @@ pkgbase=pulseaudio pkgname=(pulseaudio libpulse) pkgdesc="A featureful, general-purpose sound server" pkgver=1.0 -pkgrel=3 +pkgrel=4 arch=(i686 x86_64 mips64el) url="http://pulseaudio.org/" license=(GPL LGPL) makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit speex tdb udev dbus-core xcb-util avahi bluez gconf intltool jack openssl fftw orc json-c) - gconf intltool jack openssl) [ "$CARCH" = "mips64el" ] || makedepends+=(lirc-utils) options=(!emptydirs !libtool !makeflags) source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz - $pkgbase.xinit version-number.patch) + $pkgbase.xinit version-number.patch dont-require-dbus.patch) sha256sums=('e63464f8a0975446e2b4cfe768b615a66735c8d092b2366d2bdc7a2a04a249be' 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf' - '6b067ae9e8da703510fb24eae8ee53f3a7b6a90bcf88941ee50997ad679a4530') + '6b067ae9e8da703510fb24eae8ee53f3a7b6a90bcf88941ee50997ad679a4530' + '68c8ddf7ddb4035405ec61e7aa72e88f1430a30f75a36f31761fbfffa8f7dad4') build() { cd "$srcdir/$pkgbase-$pkgver" patch -Np1 -i "$srcdir/version-number.patch" + patch -Np1 -i "$srcdir/dont-require-dbus.patch" ./configure --prefix=/usr \ --sysconfdir=/etc \ diff --git a/extra/pulseaudio/dont-require-dbus.patch b/extra/pulseaudio/dont-require-dbus.patch new file mode 100644 index 000000000..915e3baec --- /dev/null +++ b/extra/pulseaudio/dont-require-dbus.patch @@ -0,0 +1,46 @@ +commit 6d58497dd1d68231af201cf2a07bb9881c4efd2f +Author: Tanu Kaskinen <tanuk@iki.fi> +Date: Thu Oct 6 23:28:37 2011 +0300 + + daemon: Don't treat it as a fatal error if we can't connect to the session bus + + http://lists.freedesktop.org/archives/pulseaudio-discuss/2011-June/010276.html + +diff --git a/src/daemon/main.c b/src/daemon/main.c +index e2e4a81..c32f7c7 100644 +--- a/src/daemon/main.c ++++ b/src/daemon/main.c +@@ -1107,14 +1107,14 @@ int main(int argc, char *argv[]) { + + #ifdef HAVE_DBUS + if (!conf->system_instance) { +- if (!(server_lookup = pa_dbusobj_server_lookup_new(c))) +- goto finish; +- if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.PulseAudio1"))) +- goto finish; ++ if ((server_lookup = pa_dbusobj_server_lookup_new(c))) { ++ if (!(lookup_service_bus = register_dbus_name(c, DBUS_BUS_SESSION, "org.PulseAudio1"))) ++ goto finish; ++ } + } + +- if (start_server && !(server_bus = register_dbus_name(c, conf->system_instance ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, "org.pulseaudio.Server"))) +- goto finish; ++ if (start_server) ++ server_bus = register_dbus_name(c, conf->system_instance ? DBUS_BUS_SYSTEM : DBUS_BUS_SESSION, "org.pulseaudio.Server"); + #endif + + #ifdef HAVE_FORK +diff --git a/src/daemon/server-lookup.c b/src/daemon/server-lookup.c +index 45796e7..9bdc699 100644 +--- a/src/daemon/server-lookup.c ++++ b/src/daemon/server-lookup.c +@@ -485,7 +485,7 @@ pa_dbusobj_server_lookup *pa_dbusobj_server_lookup_new(pa_core *c) { + sl->path_registered = FALSE; + + if (!(sl->conn = pa_dbus_bus_get(c, DBUS_BUS_SESSION, &error)) || dbus_error_is_set(&error)) { +- pa_log("Unable to contact D-Bus: %s: %s", error.name, error.message); ++ pa_log_warn("Unable to contact D-Bus: %s: %s", error.name, error.message); + goto fail; + } + diff --git a/extra/pycups/PKGBUILD b/extra/pycups/PKGBUILD index 9c30e7266..b6113fd99 100644 --- a/extra/pycups/PKGBUILD +++ b/extra/pycups/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 134034 2011-08-01 10:36:25Z andrea $ +# $Id: PKGBUILD 140387 2011-10-12 02:51:45Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: nesl247 <nesl247@gmail.com> pkgname=pycups -pkgver=1.9.58 +pkgver=1.9.60 pkgrel=1 pkgdesc="Python CUPS Bindings" url="http://cyberelk.net/tim/software/pycups/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') depends=('libcups' 'python2') -source=("http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('320d8ce1f10dea9a3dd9054befaf6239') +source=(http://cyberelk.net/tim/data/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.asc}) +md5sums=('083f3dd657df986e712a6fae36427457' + 'cda91ca46362ba3423df2f08c33de5cb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/pysmbc/PKGBUILD b/extra/pysmbc/PKGBUILD index 81a51277a..ff5c6b82e 100644 --- a/extra/pysmbc/PKGBUILD +++ b/extra/pysmbc/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 127695 2011-06-17 17:55:40Z andrea $ +# $Id: PKGBUILD 140148 2011-10-07 22:11:09Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Shane Peelar <lookatyouhacker@gm@il(d0t)c0m> pkgname=pysmbc -pkgver=1.0.11 +pkgver=1.0.11.1 pkgrel=1 pkgdesc="Python bindings for libsmbclient" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://pypi.python.org/pypi/pysmbc/" license=('GPL') depends=('python2' 'smbclient') source=("http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('8593053cfe3cc0b79d8c4ab892044d4b') +md5sums=('97a2a9738f41f89400c510efb2c20f77') build(){ cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/python-egenix-mx-base/PKGBUILD b/extra/python-egenix-mx-base/PKGBUILD index 7eebcf736..217a550a8 100644 --- a/extra/python-egenix-mx-base/PKGBUILD +++ b/extra/python-egenix-mx-base/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 126581 2011-06-06 10:49:23Z stephane $ -# Maintainer: +# $Id: PKGBUILD 140254 2011-10-11 00:44:55Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=python-egenix-mx-base -origname=egenix-mx-base -pkgver=3.2.0 +_origname=egenix-mx-base +pkgver=3.2.1 pkgrel=1 pkgdesc="A collection of Python tools" arch=('i686' 'x86_64' 'mips64el') @@ -14,16 +14,20 @@ depends=('python2') makedepends=('python2-distribute') replaces=('egenix-mx-base') provides=('egenix-mx-base') -source=("http://downloads.egenix.com/python/${origname}-${pkgver}.tar.gz") -sha1sums=('7346268002461512ef59da726047f79649a82b27') +source=("http://downloads.egenix.com/python/${_origname}-${pkgver}.tar.gz") +sha1sums=('a82f7f155ea92f26f40a6a3bf9160bfac7c52a00') build() { - cd "${srcdir}/${origname}-${pkgver}" + cd "${srcdir}/${_origname}-${pkgver}" + + find . -name \*.py -exec sed -i -e "s|#!/usr/bin/env python|#!/usr/bin/env python2|" \ + -e "s|#!/usr/local/.*python.*|#!/usr/bin/env python2|" {} \; + python2 setup.py build } package() { - cd "${srcdir}/${origname}-${pkgver}" + cd "${srcdir}/${_origname}-${pkgver}" python2 setup.py install --root="${pkgdir}" --skip-build --optimize=1 install -D -m644 COPYRIGHT "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE } diff --git a/extra/python-geoip/PKGBUILD b/extra/python-geoip/PKGBUILD index 764eee3e3..b43e0d82b 100644 --- a/extra/python-geoip/PKGBUILD +++ b/extra/python-geoip/PKGBUILD @@ -1,9 +1,10 @@ -# $Id: PKGBUILD 89623 2010-09-02 16:32:29Z remy $ +# $Id: PKGBUILD 140200 2011-10-09 08:54:48Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=python-geoip -pkgver=1.2.4 -pkgrel=2 +pkgver=1.2.7 +pkgrel=1 pkgdesc="Python bindings for the GeoIP IP-to-country resolver library." arch=(i686 x86_64 'mips64el') url="http://www.maxmind.com/app/python" @@ -12,9 +13,9 @@ depends=('python2' 'geoip') source=(http://www.maxmind.com/download/geoip/api/python/GeoIP-Python-${pkgver}.tar.gz) replaces=('geoip-python') provides=('geoip-python') +md5sums=('df71f5ae7a5c77bbdf726d512b7d67cf') build() { cd ${startdir}/src/GeoIP-Python-${pkgver} python2 setup.py build install --root=${startdir}/pkg } -md5sums=('50f820d854476efaf3b7af733ffe4236') diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD index dc1cff385..dc7ad0811 100644 --- a/extra/python-lxml/PKGBUILD +++ b/extra/python-lxml/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 109621 2011-02-11 10:29:56Z andrea $ +# $Id: PKGBUILD 140122 2011-10-07 10:35:34Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> @@ -6,25 +6,28 @@ # Contributor: Guillem Rieu <guillemr@gmx.net> pkgname=python-lxml -pkgver=2.3 +pkgver=2.3.1 pkgrel=1 pkgdesc="Python binding for the libxml2 and libxslt libraries" arch=('i686' 'x86_64' 'mips64el') license=('BSD' 'GPL' 'custom') -url="http://codespeak.net/lxml" +url="http://lxml.de/" depends=('python2' 'libxslt') -optdepends=("beautiful-soup: support for parsing not well formed HTML") +optdepends=('python-beautifulsoup: support for parsing not well formed HTML') conflicts=('lxml') replaces=('lxml') source=("http://codespeak.net/lxml/lxml-${pkgver}.tgz") -md5sums=('a245a015fd59b63e220005f263e1682a') +md5sums=('87931fbf35df60cd71cfe7484b4b36ed') package() { - cd ${srcdir}/lxml-$pkgver + cd "${srcdir}"/lxml-$pkgver python2 setup.py install --root="${pkgdir}" --optimize=1 - install -D -m644 LICENSES.txt ${pkgdir}/usr/share/licenses/$pkgname/LICENSE - install -D -m644 doc/licenses/BSD.txt ${pkgdir}/usr/share/licenses/$pkgname/BSD.txt - install -D -m644 doc/licenses/elementtree.txt ${pkgdir}/usr/share/licenses/$pkgname/elementtree.txt + 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/python-m2crypto/PKGBUILD b/extra/python-m2crypto/PKGBUILD index a4da31bf5..9af824956 100644 --- a/extra/python-m2crypto/PKGBUILD +++ b/extra/python-m2crypto/PKGBUILD @@ -1,25 +1,22 @@ -# $Id: PKGBUILD 87898 2010-08-18 16:12:44Z ibiru $ -# Maintainer: +# $Id: PKGBUILD 140196 2011-10-09 08:27:16Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Sergej Pupykin <sergej@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=python-m2crypto -pkgver=0.20.2 -pkgrel=3 +pkgver=0.21.1 +pkgrel=1 pkgdesc="A crypto and SSL toolkit for Python" arch=('i686' 'x86_64' 'mips64el') url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto" license=('BSD') depends=('python2' 'openssl') makedepends=('swig') -source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz" - 'openssl1.patch') -md5sums=('6c24410410d6eb1920ea43f77a93613a' - '80a707ad6610f2871efdf40658e30364') +source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz") +md5sums=('f93d8462ff7646397a9f77a2fe602d17') build() { cd "${srcdir}/M2Crypto-${pkgver}" - patch -Np0 -i ${srcdir}/openssl1.patch python2 setup.py build } diff --git a/extra/python-pysqlite/ChangeLog b/extra/python-pysqlite/ChangeLog index 12c0ad090..2f42c5de4 100644 --- a/extra/python-pysqlite/ChangeLog +++ b/extra/python-pysqlite/ChangeLog @@ -1,3 +1,6 @@ +2011-10-07 Angel Velasquez <angvp@archlinux.org> + * Updated to: 2.6.3 + * Added check function 2009-08-06 Douglas Soares de Andrade <douglas@archlinux.org> diff --git a/extra/python-pysqlite/PKGBUILD b/extra/python-pysqlite/PKGBUILD index ab00b1e2d..423f84915 100644 --- a/extra/python-pysqlite/PKGBUILD +++ b/extra/python-pysqlite/PKGBUILD @@ -1,11 +1,10 @@ -# $Id: PKGBUILD 89652 2010-09-02 20:47:02Z remy $ +# $Id: PKGBUILD 140136 2011-10-07 20:31:49Z angvp $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> -# Contributor: Aaron Griffin <aaron@archlinux.org> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=python-pysqlite -pkgver=2.6.0 -pkgrel=2 +pkgver=2.6.3 +pkgrel=1 pkgdesc="A Python DB-API 2.0 interface for the SQLite embedded relational database engine" license=('custom') arch=('i686' 'x86_64' 'mips64el') @@ -14,8 +13,14 @@ depends=('python2' 'sqlite3') replaces=('pysqlite2') source=(http://pysqlite.googlecode.com/files/pysqlite-${pkgver}.tar.gz \ setup.cfg) -md5sums=('fc92618b3b39d02e6ff10dc467c36640' - '86dd356c65afd14a22f2f8f64a26441e') +md5sums=('711afa1062a1d2c4a67acdf02a33d86e' + '86dd356c65afd14a22f2f8f64a26441e') + +check() { + cd ${pkgdir}/usr/lib/python2.7/site-packages + python2 -c "from pysqlite2 import test; test.test()" +} + build() { cd ${srcdir}/pysqlite-${pkgver} cp ${srcdir}/setup.cfg . diff --git a/extra/qtcurve-gtk2/PKGBUILD b/extra/qtcurve-gtk2/PKGBUILD index c76550443..ed5fb8b2a 100644 --- a/extra/qtcurve-gtk2/PKGBUILD +++ b/extra/qtcurve-gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 130208 2011-07-04 08:59:54Z andrea $ +# $Id: PKGBUILD 140659 2011-10-17 19:15:55Z ronald $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qtcurve-gtk2 -pkgver=1.8.9 +pkgver=1.8.11 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') groups=('qtcurve') @@ -14,7 +14,7 @@ depends=('gtk2') makedepends=('pkgconfig' 'cmake') options=('!libtool') source=("http://craigd.wikispaces.com/file/view/QtCurve-Gtk2-${pkgver}.tar.bz2") -md5sums=('e3248bd1b926f250b3a6ff9699134abd') +sha1sums=('113f2e7f5925323acbcf63977e4c71e60678b69c') build() { cd "${srcdir}" diff --git a/extra/qtcurve-kde4/PKGBUILD b/extra/qtcurve-kde4/PKGBUILD index 9455f4bb7..cb31d7040 100644 --- a/extra/qtcurve-kde4/PKGBUILD +++ b/extra/qtcurve-kde4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 130203 2011-07-04 08:57:57Z andrea $ +# $Id: PKGBUILD 140653 2011-10-17 18:59:52Z ronald $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qtcurve-kde4 -pkgver=1.8.8 +pkgver=1.8.9 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') groups=('qtcurve') @@ -14,9 +14,8 @@ depends=('kdebase-workspace') makedepends=('cmake' 'automoc4') source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2" 'bypass-kde-config.patch') -md5sums=('b264d80b4c1e0e8d59e91d571cb639e4' - '3f6681147cc361bd2bfd4d7477f2a8d0') - +sha1sums=('93bc8ce3e5bed506521a8839a254f7076b4bc988' + '8005c8bf0e9c5d75e80b417a01513bd45853274c') build() { cd "${srcdir}"/QtCurve-KDE4-${pkgver} # Bypass KDE prefix detection by kde4-config, see: diff --git a/extra/ristretto/PKGBUILD b/extra/ristretto/PKGBUILD index f92748b78..416a534a6 100644 --- a/extra/ristretto/PKGBUILD +++ b/extra/ristretto/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 112061 2011-03-03 17:24:57Z andyrtr $ +# $Id: PKGBUILD 140478 2011-10-15 10:11:04Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> pkgname=ristretto -pkgver=0.0.93 +pkgver=0.1.1 pkgrel=1 pkgdesc="Ristretto is a image viewer for Xfce" arch=('i686' 'x86_64' 'mips64el') @@ -13,9 +13,9 @@ depends=('libxfce4ui' 'libexif' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('intltool') options=('!libtool') groups=('xfce4-goodies') -source=(http://archive.xfce.org/src/apps/$pkgname/0.0/$pkgname-$pkgver.tar.bz2) +source=(http://archive.xfce.org/src/apps/$pkgname/0.1/$pkgname-$pkgver.tar.bz2) install=ristretto.install -md5sums=('74dcdf0fcbf7039852b817732a91fb6c') +md5sums=('4b0f58c00ef99f13ebf134979ee76980') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/extra/rox/PKGBUILD b/extra/rox/PKGBUILD index 96dd4393f..30d4e3554 100644 --- a/extra/rox/PKGBUILD +++ b/extra/rox/PKGBUILD @@ -1,28 +1,26 @@ -# $Id: PKGBUILD 127760 2011-06-18 07:02:05Z eric $ +# $Id: PKGBUILD 140263 2011-10-11 07:46:57Z eric $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Jochem Kossen <j.kossen@home.nl> pkgname=rox -pkgver=2.10 -pkgrel=2 -pkgdesc="A small and fast file manager which can optionally manage the desktop background and panels." -arch=(i686 x86_64 'mips64el') -license=('GPL2') +pkgver=2.11 +pkgrel=1 +pkgdesc="A small and fast file manager which can optionally manage the desktop background and panels" +arch=('i686' 'x86_64' 'mips64el') +license=('GPL') url="http://roscidus.com/desktop/" -depends=('sh' 'libsm' 'libglade') -makedepends=('librsvg' 'python') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/rox-filer-${pkgver}.tar.bz2 \ - rox.desktop rox.svg rox.sh right-click.diff) -md5sums=('28e8494c9af783258ff86c830f8f0062' - '80e7a90e9d58375b25494fbdc01a05bd' +depends=('sh' 'libsm' 'gtk2') +makedepends=('librsvg' 'python2') +source=("http://downloads.sourceforge.net/${pkgname}/rox-filer-${pkgver}.tar.bz2" + 'rox.desktop' 'rox.svg' 'rox.sh') +md5sums=('0eebf05a67f7932367750ebf9faf215d' + 'de05c906395abd4402b0470c1bc2ae6e' '658c8648b51e215558e13e6afb2b5c76' - '31578a90b241f0a8d09c9f8587608d00' - '2b2105a33070ac09a6352c29a5a17e4e') + '31578a90b241f0a8d09c9f8587608d00') build() { - cd "${srcdir}/rox-filer-${pkgver}/ROX-Filer" - patch -p2 -i "${srcdir}/right-click.diff" - ./AppRun --compile + cd "${srcdir}/rox-filer-${pkgver}" + ./ROX-Filer/AppRun --compile # finally we render a png as fallback for svg unaware menu applications # Attention: always make sure you check the dimensions of the source-svg, # you can read the dimensions via inkscape's export function diff --git a/extra/rox/right-click.diff b/extra/rox/right-click.diff deleted file mode 100644 index e8ad67907..000000000 --- a/extra/rox/right-click.diff +++ /dev/null @@ -1,32 +0,0 @@ -From c2232d5075342347a8ff814ced5ce8b9e1cf64b9 Mon Sep 17 00:00:00 2001 -From: Thomas Leonard <talex5@gmail.com> -Date: Wed, 7 Apr 2010 15:44:57 +0100 -Subject: [PATCH] Bugfix: unselect item when menu is closed - -We used to listen for "unmap_event", but this is no longer emitted in recent -versions of GTK. Switched to using "selection-done" instead. - -Closes #2925212 (reported by Barry Kauler). ---- - ROX-Filer/src/menu.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ROX-Filer/src/menu.c b/ROX-Filer/src/menu.c -index 611918d..bf4bae3 100644 ---- a/ROX-Filer/src/menu.c -+++ b/ROX-Filer/src/menu.c -@@ -322,9 +322,9 @@ gboolean ensure_filer_menu(void) - GET_SSMENU_ITEM(item, "filer", "Window", "New Window"); - filer_new_window = GTK_BIN(item)->child; - -- g_signal_connect(filer_menu, "unmap_event", -+ g_signal_connect(filer_menu, "selection-done", - G_CALLBACK(menu_closed), NULL); -- g_signal_connect(filer_file_menu, "unmap_event", -+ g_signal_connect(filer_file_menu, "selection-done", - G_CALLBACK(menu_closed), NULL); - - g_signal_connect(filer_keys, "accel_changed", --- -1.6.5.GIT - diff --git a/extra/rox/rox.desktop b/extra/rox/rox.desktop index b1a2014f7..93edfabcf 100644 --- a/extra/rox/rox.desktop +++ b/extra/rox/rox.desktop @@ -1,10 +1,7 @@ [Desktop Entry] Name=ROX Filer -Comment=ROX Filer Exec=rox Icon=rox Terminal=false -MultipleArgs=false Type=Application -Categories=Application;FileManager; - +Categories=System;Utility;Core;FileManager; diff --git a/extra/rubberband/PKGBUILD b/extra/rubberband/PKGBUILD index f13c7c7e0..526dd8f57 100644 --- a/extra/rubberband/PKGBUILD +++ b/extra/rubberband/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135007 2011-08-09 21:02:54Z schiv $ +# $Id: PKGBUILD 140085 2011-10-06 09:24:38Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Felipe Machado aka arch_audio <machado.felipe@gmail.com> pkgname=rubberband pkgver=1.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="Time-stretching and pitch-shifting audio library and utility" arch=('i686' 'x86_64' 'mips64el') url="http://www.breakfastquay.com/rubberband/" @@ -12,9 +12,8 @@ license=('GPL') depends=('libsamplerate' 'fftw' 'vamp-plugin-sdk') makedepends=('ladspa') source=("http://code.breakfastquay.com/attachments/download/16/$pkgname-$pkgver.tar.bz2" - 'gcc46.patch') -md5sums=('28e3dc1f5ae694d6846bcb0ef3d597fc' - '7c2f404975da6052f6b80eac12efbeb4') + 'gcc46.patch' + 'vectorops.patch') build() { cd "$srcdir/$pkgname-$pkgver" @@ -22,6 +21,10 @@ build() { # fix gcc 4.6 compatibility patch -Np1 -i "$srcdir/gcc46.patch" + # fix bug exposed by gcc 4.6 + # see https://bugs.archlinux.org/task/26140 + patch -Np1 -i "$srcdir/vectorops.patch" + ./configure --prefix=/usr make } @@ -29,7 +32,10 @@ build() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: +md5sums=('28e3dc1f5ae694d6846bcb0ef3d597fc' + '7c2f404975da6052f6b80eac12efbeb4' + '4bdc9689179d3a2cf64172f0f911701d') diff --git a/extra/rubberband/vectorops.patch b/extra/rubberband/vectorops.patch new file mode 100644 index 000000000..cae961591 --- /dev/null +++ b/extra/rubberband/vectorops.patch @@ -0,0 +1,13 @@ +--- a/src/system/VectorOps.h Mon Mar 21 21:51:33 2011 +0000 ++++ b/src/system/VectorOps.h Sun Oct 02 21:12:42 2011 +0100 +@@ -84,8 +84,8 @@ + } + + template<typename T> +-inline void v_move(T *const R__ dst, +- const T *const R__ src, ++inline void v_move(T *const dst, ++ const T *const src, + const int count) + { + memmove(dst, src, count * sizeof(T)); diff --git a/extra/scim-hangul/PKGBUILD b/extra/scim-hangul/PKGBUILD index bb57dfe8c..081538425 100644 --- a/extra/scim-hangul/PKGBUILD +++ b/extra/scim-hangul/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 111080 2011-02-23 22:13:26Z bisson $ +# $Id: PKGBUILD 140551 2011-10-17 07:24:46Z bisson $ # Contributor: damir <damir@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=scim-hangul pkgver=0.3.2 -pkgrel=3 +pkgrel=4 pkgdesc='Korean input method module for SCIM' arch=('i686' 'x86_64' 'mips64el') url='http://www.scim-im.org/' diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD index 6cf2d2cef..80ea1a4b9 100644 --- a/extra/seahorse/PKGBUILD +++ b/extra/seahorse/PKGBUILD @@ -1,24 +1,28 @@ -# $Id: PKGBUILD 139427 2011-10-01 19:01:16Z ibiru $ +# $Id: PKGBUILD 140590 2011-10-17 08:52:42Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Michel Brabants <michel.linux@tiscali.be> pkgname=seahorse pkgver=3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNOME application for managing PGP keys." arch=(i686 x86_64 'mips64el') license=('GPL') url="http://projects.gnome.org/seahorse/" depends=('gtk3' 'libgnome-keyring' 'gnome-keyring' 'libsoup' 'gpgme' 'desktop-file-utils' 'hicolor-icon-theme' 'dconf') makedepends=('gettext' 'libldap' 'intltool' 'pkgconfig' 'gnome-doc-utils' 'gobject-introspection' 'openssh' 'libsm') +optdepends=('openssh: SSH support') +provides=('x11-ssh-askpass') options=('!libtool' '!emptydirs') groups=('gnome-extra') install=seahorse.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('ef76aed10bac519fa854a869dc713cd7b49a41fbd2085647067444595302b6f7') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz + seahorse-ssh-askpass.sh) +sha256sums=('ef76aed10bac519fa854a869dc713cd7b49a41fbd2085647067444595302b6f7' + '1792ab2c0bbad446b8fad0a0c9008a75f60a9666c895d37d2adcd827e49fafbb') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --disable-static \ --enable-ldap --enable-hkp \ @@ -29,6 +33,8 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm755 "$srcdir/seahorse-ssh-askpass.sh" \ + "$pkgdir/etc/profile.d/seahorse-ssh-askpass.sh" } diff --git a/extra/seahorse/seahorse-ssh-askpass.sh b/extra/seahorse/seahorse-ssh-askpass.sh new file mode 100644 index 000000000..44281ac2b --- /dev/null +++ b/extra/seahorse/seahorse-ssh-askpass.sh @@ -0,0 +1,3 @@ +if [ -z "$SSH_ASKPASS" ]; then + export SSH_ASKPASS=/usr/lib/seahorse/seahorse-ssh-askpass +fi diff --git a/extra/shared-mime-info/PKGBUILD b/extra/shared-mime-info/PKGBUILD index 51cddce46..50fc9038f 100644 --- a/extra/shared-mime-info/PKGBUILD +++ b/extra/shared-mime-info/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 109014 2011-02-05 11:17:17Z andyrtr $ +# $Id: PKGBUILD 140226 2011-10-10 09:56:21Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=shared-mime-info -pkgver=0.90 +pkgver=0.91 pkgrel=1 pkgdesc="Freedesktop.org Shared MIME Info" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -depends=('libxml2>=2.7.7' 'glib2>=2.26.0') +depends=('libxml2' 'glib2') makedepends=('intltool' 'pkgconfig') install=shared-mime-info.install url="http://freedesktop.org/Software/shared-mime-info" -source=(http://freedesktop.org/~hadess/${pkgname}-${pkgver}.tar.bz2 +source=(http://freedesktop.org/~hadess/${pkgname}-${pkgver}.tar.xz pbm.patch) -md5sums=('967d68d3890ba3994cfce3adf5b8f15b' - '39fcc08fbd33145684ba97f1f64644c2') +md5sums=('982a211560ba4c47dc791ccff34e8fbc' + '3ec0e21a746f75a890716eb83d73e754') options=(!makeflags) build() { diff --git a/extra/shared-mime-info/pbm.patch b/extra/shared-mime-info/pbm.patch index 040900e01..95f9ab81f 100644 --- a/extra/shared-mime-info/pbm.patch +++ b/extra/shared-mime-info/pbm.patch @@ -40,10 +40,3 @@ diff -Naur shared-mime-info-0.70-orig/freedesktop.org.xml shared-mime-info-0.70/ </match> </match> </magic> -@@ -23926,4 +23920,4 @@ - </treemagic> - </mime-type> - --</mime-info> -\ No newline at end of file -+</mime-info> diff --git a/extra/squid/PKGBUILD b/extra/squid/PKGBUILD index 7e046a1e9..d9b5ee2db 100644 --- a/extra/squid/PKGBUILD +++ b/extra/squid/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 135984 2011-08-21 04:56:14Z eric $ +# $Id: PKGBUILD 140501 2011-10-15 22:54:05Z kevin $ # Maintainer: Kevin Piche <kevin@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgname=squid -pkgver=3.1.14 -pkgrel=2 +pkgver=3.1.16 +pkgrel=1 pkgdesc="A full-featured Web proxy cache server." arch=(i686 x86_64 'mips64el') url="http://www.squid-cache.org" @@ -14,22 +14,18 @@ license=('GPL') backup=(etc/squid/squid.conf etc/squid/mime.conf etc/conf.d/squid) install=squid.install source=(http://www.squid-cache.org/Versions/v3/3.1/${pkgname}-${pkgver}.tar.bz2 - squid squid.conf.d squid.pam squid.cron squid-3.1.11-unused.patch) -md5sums=('8f82a451b04c3bf3c29202c548d2f2dd' + squid squid.conf.d squid.pam squid.cron) +md5sums=('675aef4411d41f5b55b15a29ad6e5261' 'd213b0cc1db72b749bb8c88716fdab39' '2383772ef94efddc7b920628bc7ac5b0' '270977cdd9b47ef44c0c427ab9034777' - '5e17df989e2a74e869790c066f61225b' - '8e59089e4a8556fc18df51979f1cfbff') + '5e17df989e2a74e869790c066f61225b') build() { cd "${srcdir}"/${pkgname}-${pkgver} # gcc 4.6 doesn't support -fhuge-objects. sed '/^ HUGE_OBJECT_FLAG=/ s/"-fhuge-objects"//' -i configure - # fix compile errors with gcc 4.6 - # http://bugs.squid-cache.org/show_bug.cgi?id=3178 - #patch -Np1 -i "${srcdir}"/squid-3.1.11-unused.patch # fix cache_dir, cache_dir size, and effective group. sed '/^DEFAULT_SWAP_DIR/ s@/cache@/cache/squid@' -i src/Makefile.in diff --git a/extra/squid/squid-3.1.11-unused.patch b/extra/squid/squid-3.1.11-unused.patch deleted file mode 100644 index 698ce5fe5..000000000 --- a/extra/squid/squid-3.1.11-unused.patch +++ /dev/null @@ -1,296 +0,0 @@ -diff -up squid-3.1.11/helpers/external_acl/ldap_group/squid_ldap_group.c.unused squid-3.1.11/helpers/external_acl/ldap_group/squid_ldap_group.c ---- squid-3.1.11/helpers/external_acl/ldap_group/squid_ldap_group.c.unused 2011-02-10 10:04:50.422205003 +0100 -+++ squid-3.1.11/helpers/external_acl/ldap_group/squid_ldap_group.c 2011-02-10 10:05:48.020204424 +0100 -@@ -219,7 +219,6 @@ main(int argc, char **argv) - int use_extension_dn = 0; - int strip_nt_domain = 0; - int strip_kerberos_realm = 0; -- int err = 0; - - setbuf(stdout, NULL); - -@@ -602,7 +601,6 @@ error: - tryagain = 1; - } - } -- err = 0; - } - if (ld) - ldap_unbind(ld); -diff -up squid-3.1.11/helpers/ntlm_auth/fakeauth/fakeauth_auth.c.unused squid-3.1.11/helpers/ntlm_auth/fakeauth/fakeauth_auth.c ---- squid-3.1.11/helpers/ntlm_auth/fakeauth/fakeauth_auth.c.unused 2011-02-10 09:57:56.170205002 +0100 -+++ squid-3.1.11/helpers/ntlm_auth/fakeauth/fakeauth_auth.c 2011-02-10 09:58:39.039205002 +0100 -@@ -141,7 +141,6 @@ ntlmMakeChallenge(struct ntlm_challenge - { - static unsigned hash; - int r; -- char *d; - int i; - - debug("ntlmMakeChallenge: flg %08x\n", flags); -@@ -158,7 +157,6 @@ ntlmMakeChallenge(struct ntlm_challenge - chal->flags = flags; - chal->unknown[6] = htole16(0x003a); - -- d = (char *) chal + 48; - i = 0; - - if (authenticate_ntlm_domain != NULL) -diff -up squid-3.1.11/src/auth/negotiate/auth_negotiate.cc.unused squid-3.1.11/src/auth/negotiate/auth_negotiate.cc ---- squid-3.1.11/src/auth/negotiate/auth_negotiate.cc.unused 2011-02-10 07:57:04.293205769 +0100 -+++ squid-3.1.11/src/auth/negotiate/auth_negotiate.cc 2011-02-10 07:58:22.643205463 +0100 -@@ -544,7 +544,6 @@ AuthNegotiateUserRequest::module_start(R - { - authenticateStateData *r = NULL; - static char buf[MAX_AUTHTOKEN_LEN]; -- negotiate_user_t *negotiate_user; - AuthUser *auth_user = user(); - - assert(data); -@@ -552,8 +551,6 @@ AuthNegotiateUserRequest::module_start(R - assert(auth_user); - assert(auth_user->auth_type == AUTH_NEGOTIATE); - -- negotiate_user = dynamic_cast<negotiate_user_t *>(user()); -- - debugs(29, 8, "AuthNegotiateUserRequest::module_start: auth state is '" << auth_state << "'"); - - if (negotiateConfig.authenticate == NULL) { -@@ -655,12 +652,10 @@ AuthNegotiateUserRequest::authenticate(H - - /** \todo rename this!! */ - AuthUser *local_auth_user; -- negotiate_user_t *negotiate_user; - - local_auth_user = user(); - assert(local_auth_user); - assert(local_auth_user->auth_type == AUTH_NEGOTIATE); -- negotiate_user = dynamic_cast<negotiate_user_t *>(local_auth_user); - assert (this); - - /** Check that we are in the client side, where we can generate -diff -up squid-3.1.11/src/auth/ntlm/auth_ntlm.cc.unused squid-3.1.11/src/auth/ntlm/auth_ntlm.cc ---- squid-3.1.11/src/auth/ntlm/auth_ntlm.cc.unused 2011-02-10 08:07:21.181205066 +0100 -+++ squid-3.1.11/src/auth/ntlm/auth_ntlm.cc 2011-02-10 08:08:52.188204812 +0100 -@@ -460,7 +460,6 @@ AuthNTLMUserRequest::module_start(RH * h - { - authenticateStateData *r = NULL; - static char buf[8192]; -- ntlm_user_t *ntlm_user; - AuthUser *auth_user = user(); - - assert(data); -@@ -468,8 +467,6 @@ AuthNTLMUserRequest::module_start(RH * h - assert(auth_user); - assert(auth_user->auth_type == AUTH_NTLM); - -- ntlm_user = dynamic_cast<ntlm_user_t *>(user()); -- - debugs(29, 8, "AuthNTLMUserRequest::module_start: auth state is '" << auth_state << "'"); - - if (ntlmConfig.authenticate == NULL) { -@@ -572,12 +569,10 @@ AuthNTLMUserRequest::authenticate(HttpRe - - /* TODO: rename this!! */ - AuthUser *local_auth_user; -- ntlm_user_t *ntlm_user; - - local_auth_user = user(); - assert(local_auth_user); - assert(local_auth_user->auth_type == AUTH_NTLM); -- ntlm_user = dynamic_cast<ntlm_user_t *>(local_auth_user); - assert (this); - - /* Check that we are in the client side, where we can generate -diff -up squid-3.1.11/src/auth/User.cc.unused squid-3.1.11/src/auth/User.cc ---- squid-3.1.11/src/auth/User.cc.unused 2011-02-10 08:14:08.623207125 +0100 -+++ squid-3.1.11/src/auth/User.cc 2011-02-10 08:14:52.305205340 +0100 -@@ -158,13 +158,11 @@ AuthUser::CachedACLsReset() - */ - AuthUserHashPointer *usernamehash; - AuthUser *auth_user; -- char const *username = NULL; - debugs(29, 3, "AuthUser::CachedACLsReset: Flushing the ACL caches for all users."); - hash_first(proxy_auth_username_cache); - - while ((usernamehash = ((AuthUserHashPointer *) hash_next(proxy_auth_username_cache)))) { - auth_user = usernamehash->user(); -- username = auth_user->username(); - /* free cached acl results */ - aclCacheMatchFlush(&auth_user->proxy_match_cache); - -diff -up squid-3.1.11/src/client_side_reply.cc.unused squid-3.1.11/src/client_side_reply.cc ---- squid-3.1.11/src/client_side_reply.cc.unused 2011-02-10 08:28:52.861205280 +0100 -+++ squid-3.1.11/src/client_side_reply.cc 2011-02-10 08:37:22.530205334 +0100 -@@ -1056,14 +1056,6 @@ clientReplyContext::storeNotOKTransferDo - /* haven't found end of headers yet */ - return 0; - -- int sending = SENDING_BODY; -- -- if (curReply->sline.status == HTTP_NO_CONTENT || -- curReply->sline.status == HTTP_NOT_MODIFIED || -- curReply->sline.status < HTTP_OK || -- http->request->method == METHOD_HEAD) -- sending = SENDING_HDRSONLY; -- - /* - * Figure out how much data we are supposed to send. - * If we are sending a body and we don't have a content-length, -@@ -2028,13 +2020,10 @@ clientReplyContext::sendMoreData (StoreI - - char *buf = next()->readBuffer.data; - -- char *body_buf = buf; -- - if (buf != result.data) { - /* we've got to copy some data */ - assert(result.length <= next()->readBuffer.length); - xmemcpy(buf, result.data, result.length); -- body_buf = buf; - } - - #if USE_ZPH_QOS -diff -up squid-3.1.11/src/comm.cc.unused squid-3.1.11/src/comm.cc ---- squid-3.1.11/src/comm.cc.unused 2011-02-10 08:20:37.942204904 +0100 -+++ squid-3.1.11/src/comm.cc 2011-02-10 08:21:43.940205003 +0100 -@@ -706,7 +706,6 @@ comm_openex(int sock_type, - { - int new_socket; - fde *F = NULL; -- int tos = 0; - struct addrinfo *AI = NULL; - - PROF_start(comm_open); -@@ -756,11 +755,6 @@ comm_openex(int sock_type, - - debugs(50, 3, "comm_openex: Opened socket FD " << new_socket << " : family=" << AI->ai_family << ", type=" << AI->ai_socktype << ", protocol=" << AI->ai_protocol ); - -- /* set TOS if needed */ -- if (TOS && comm_set_tos(new_socket, TOS) ) { -- tos = TOS; -- } -- - if ( Ip::EnableIpv6&IPV6_SPECIAL_SPLITSTACK && addr.IsIPv6() ) - comm_set_v6only(new_socket, 1); - -diff -up squid-3.1.11/src/DiskIO/AIO/AIODiskIOStrategy.cc.unused squid-3.1.11/src/DiskIO/AIO/AIODiskIOStrategy.cc ---- squid-3.1.11/src/DiskIO/AIO/AIODiskIOStrategy.cc.unused 2011-02-10 09:42:07.029205002 +0100 -+++ squid-3.1.11/src/DiskIO/AIO/AIODiskIOStrategy.cc 2011-02-10 09:42:37.171205594 +0100 -@@ -123,7 +123,6 @@ AIODiskIOStrategy::callback() - void *cbdata; - int callback_valid; - void *buf; -- int filedescriptor; - async_queue_entry_t *aqe; - async_queue_entry_type_t type; - -@@ -148,7 +147,6 @@ AIODiskIOStrategy::callback() - /* Get the callback parameters */ - freefunc = aqe->aq_e_free; - buf = aqe->aq_e_buf; -- filedescriptor = aqe->aq_e_fd; - type = aqe->aq_e_type; - callback_valid = cbdataReferenceValidDone(aqe->aq_e_callback_data, &cbdata); - AIODiskFile * theFile = NULL; -diff -up squid-3.1.11/src/dns_internal.cc.unused squid-3.1.11/src/dns_internal.cc ---- squid-3.1.11/src/dns_internal.cc.unused 2011-02-10 09:15:50.096204636 +0100 -+++ squid-3.1.11/src/dns_internal.cc 2011-02-10 09:16:39.951205440 +0100 -@@ -1360,8 +1360,6 @@ idnsInit(void) - CBDATA_INIT_TYPE(idns_query); - - if (DnsSocketA < 0 && DnsSocketB < 0) { -- int port; -- - IpAddress addrA; // since we don't want to alter Config.Addrs.udp_* and dont have one of our own. - - if (!Config.Addrs.udp_outgoing.IsNoAddr()) -@@ -1397,12 +1395,10 @@ idnsInit(void) - * statement. Doing so messes up the internal Debug::level - */ - if (DnsSocketB >= 0) { -- port = comm_local_port(DnsSocketB); - debugs(78, 1, "DNS Socket created at " << addrB << ", FD " << DnsSocketB); - commSetSelect(DnsSocketB, COMM_SELECT_READ, idnsRead, NULL, 0); - } - if (DnsSocketA >= 0) { -- port = comm_local_port(DnsSocketA); - debugs(78, 1, "DNS Socket created at " << addrA << ", FD " << DnsSocketA); - commSetSelect(DnsSocketA, COMM_SELECT_READ, idnsRead, NULL, 0); - } -diff -up squid-3.1.11/src/errorpage.cc.unused squid-3.1.11/src/errorpage.cc ---- squid-3.1.11/src/errorpage.cc.unused 2011-02-10 08:42:44.965205002 +0100 -+++ squid-3.1.11/src/errorpage.cc 2011-02-10 08:43:50.597205002 +0100 -@@ -515,7 +515,6 @@ int - ErrorState::Dump(MemBuf * mb) - { - MemBuf str; -- const char *p = NULL; /* takes priority over mb if set */ - char ntoabuf[MAX_IPSTRLEN]; - - str.reset(); -@@ -570,10 +569,6 @@ ErrorState::Dump(MemBuf * mb) - packerToMemInit(&pck, &str); - request->header.packInto(&pck); - packerClean(&pck); -- } else if (request_hdrs) { -- p = request_hdrs; -- } else { -- p = "[none]"; - } - - str.Printf("\r\n"); -diff -up squid-3.1.11/src/fqdncache.cc.unused squid-3.1.11/src/fqdncache.cc ---- squid-3.1.11/src/fqdncache.cc.unused 2011-02-10 09:29:50.426205631 +0100 -+++ squid-3.1.11/src/fqdncache.cc 2011-02-10 09:30:57.407204865 +0100 -@@ -497,10 +497,8 @@ fqdncacheHandleReply(void *data, char *r - fqdncacheHandleReply(void *data, rfc1035_rr * answers, int na, const char *error_message) - #endif - { -- int n; - fqdncache_entry *f; - static_cast<generic_cbdata *>(data)->unwrap(&f); -- n = ++FqdncacheStats.replies; - const int age = f->age(); - statHistCount(&statCounter.dns.svc_time, age); - #if USE_DNSSERVERS -diff -up squid-3.1.11/src/ftp.cc.unused squid-3.1.11/src/ftp.cc ---- squid-3.1.11/src/ftp.cc.unused 2011-02-10 09:22:52.118205001 +0100 -+++ squid-3.1.11/src/ftp.cc 2011-02-10 09:23:56.324205001 +0100 -@@ -2453,7 +2453,6 @@ ftpReadEPSV(FtpStateData* ftpState) - { - int code = ftpState->ctrl.replycode; - char h1, h2, h3, h4; -- int n; - u_short port; - IpAddress ipa_remote; - int fd = ftpState->data.fd; -@@ -2521,7 +2520,7 @@ ftpReadEPSV(FtpStateData* ftpState) - - buf = ftpState->ctrl.last_reply + strcspn(ftpState->ctrl.last_reply, "("); - -- n = sscanf(buf, "(%c%c%c%hu%c)", &h1, &h2, &h3, &port, &h4); -+ sscanf(buf, "(%c%c%c%hu%c)", &h1, &h2, &h3, &port, &h4); - - if (h1 != h2 || h1 != h3 || h1 != h4) { - debugs(9, DBG_IMPORTANT, "Invalid EPSV reply from " << -diff -up squid-3.1.11/src/neighbors.cc.unused squid-3.1.11/src/neighbors.cc ---- squid-3.1.11/src/neighbors.cc.unused 2011-02-10 09:36:24.432205185 +0100 -+++ squid-3.1.11/src/neighbors.cc 2011-02-10 09:36:51.359204616 +0100 -@@ -827,7 +827,6 @@ neighborsDigestSelect(HttpRequest * requ - peer *best_p = NULL; - #if USE_CACHE_DIGESTS - -- const cache_key *key; - int best_rtt = 0; - int choice_count = 0; - int ichoice_count = 0; -@@ -838,8 +837,6 @@ neighborsDigestSelect(HttpRequest * requ - if (!request->flags.hierarchical) - return NULL; - -- key = storeKeyPublicByRequest(request); -- - for (i = 0, p = first_ping; i++ < Config.npeers; p = p->next) { - lookup_t lookup; - diff --git a/extra/squid/squid.install b/extra/squid/squid.install index 44c9130bf..e7aa5ff68 100644 --- a/extra/squid/squid.install +++ b/extra/squid/squid.install @@ -8,9 +8,9 @@ post_install() { chown proxy.proxy var/{cache,log}/squid - cat << EOF -Release notes: http://www.squid-cache.org/Versions/v3/3.1/RELEASENOTES.html -EOF +# cat << EOF +#Release notes: http://www.squid-cache.org/Versions/v3/3.1/RELEASENOTES.html +#EOF } post_upgrade() { diff --git a/extra/strigi/PKGBUILD b/extra/strigi/PKGBUILD index b29534ce1..b00a6c0bb 100644 --- a/extra/strigi/PKGBUILD +++ b/extra/strigi/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139891 2011-10-05 19:06:59Z andrea $ +# $Id: PKGBUILD 140761 2011-10-18 19:07:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=strigi pkgver=0.7.6 -pkgrel=1 +pkgrel=2 pkgdesc="Fast crawling desktop search engine with Qt4 GUI" arch=('i686' 'x86_64' 'mips64el') url="http://www.vandenoever.info/software/strigi/" @@ -14,10 +14,15 @@ makedepends=('qt' 'cmake' 'pkg-config' 'boost') optdepends=('kdegraphics-strigi-analyzer: strigi analyzers for various graphics file' 'kdesdk-strigi-analyzer: strigi analyzer for KDE SDK') #source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('41cddd39e4ae3f590d82c859a14e9261') +source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'libstreamanalyzer_pdf.patch') +md5sums=('41cddd39e4ae3f590d82c859a14e9261' + '3e722a93cf5c6238e625ca58463afac2') build() { + cd "${srcdir}"/${pkgname}-${pkgver}/libstreamanalyzer + patch -p1 -i "${srcdir}"/libstreamanalyzer_pdf.patch + cd "${srcdir}" mkdir build cd build diff --git a/extra/strigi/libstreamanalyzer_pdf.patch b/extra/strigi/libstreamanalyzer_pdf.patch new file mode 100644 index 000000000..6871d67fa --- /dev/null +++ b/extra/strigi/libstreamanalyzer_pdf.patch @@ -0,0 +1,27 @@ +commit 23d5ce636b7897dc3f233a5293f3164dac50566d +Author: Jos van den Oever <jos@vandenoever.info> +Date: Sun Jul 31 12:32:44 2011 +0200 + + Revert patch that breaks parsing of PDF files. + The offending patch was 672c8b7b3cb4400bc505421f4cc70cf742ed9df0. + +diff --git a/lib/pdf/pdfparser.cpp b/lib/pdf/pdfparser.cpp +index c27f691..df2f7e5 100644 +--- a/lib/pdf/pdfparser.cpp ++++ b/lib/pdf/pdfparser.cpp +@@ -34,12 +34,13 @@ StreamStatus + PdfParser::read(int32_t min, int32_t max) { + int32_t off = (int32_t)(pos-start); + int32_t d = (int32_t)(stream->position() - bufferStart); +- bufferStart += off; ++ min += d; ++ if (max > 0) max += d; + stream->reset(bufferStart); + int32_t n = stream->read(start, min, max); + // printf("objstart %i %i\n", d, n); + if (n < min) return stream->status(); +- pos = start; ++ pos = start + off; + end = start + n; + return Ok; + } diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index 20e557e94..083fc9414 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 134387 2011-08-03 14:53:04Z andrea $ +# $Id: PKGBUILD 140389 2011-10-12 04:35:30Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=system-config-printer pkgname=('system-config-printer-common' 'system-config-printer-gnome') -pkgver=1.3.5 -pkgrel=2 +pkgver=1.3.7 +pkgrel=1 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" arch=('i686' 'x86_64' 'mips64el') license=('GPL') -makedepends=('intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libcups' 'libxml2') -source=("http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz" - 'no-packagekit.patch') -md5sums=('9d806643f17dc65a492a1d4e8a60f2ec' - 'e70a274c3cced39db1668e2a748e068f') +makedepends=('udev' 'intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libcups' 'libxml2') +source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig}) +md5sums=('f579ba287403d8ae3028377c6641feed' + 'a2ce58f4e612130b30e5c029e9afd31f') build() { cd "${srcdir}"/${pkgbase}-${pkgver} - patch -p1 -i "${srcdir}"/no-packagekit.patch - sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ $(find . -name '*.py') @@ -36,7 +33,7 @@ build() { package_system-config-printer-common() { pkgdesc='Pygtk CUPS Configuration' - depends=('pycups' 'dbus-python' 'pysmbc') + depends=('udev' 'pycups' 'dbus-python' 'pysmbc') optdepends=('system-config-printer-gnome: for the GTK frontend' 'kdeadmin-system-config-printer-kde: for the administration tool in KDE System Settings') replaces=('system-config-printer') diff --git a/extra/system-config-printer/no-packagekit.patch b/extra/system-config-printer/no-packagekit.patch deleted file mode 100644 index 8482ad823..000000000 --- a/extra/system-config-printer/no-packagekit.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- system-config-printer-1.3.5/cupshelpers/cupshelpers.py 2011-08-01 10:47:11.614519332 +0100 -+++ system-config-printer-1.3.5/cupshelpers/cupshelpers.py 2011-08-02 15:45:33.807623959 +0100 -@@ -21,7 +21,6 @@ - - import cups, pprint, os, tempfile, re, string - import locale --import packagekit.client, packagekit.enums - from . import _debugprint - - class Printer: -@@ -829,24 +828,7 @@ - missing executables - """ - executables = missingExecutables(ppd) -- packages = [] -- if executables: -- unresolved_executables = [] -- client = packagekit.client.PackageKitClient () -- for executable in executables: -- if not executable.startswith ("/"): -- executable = "/usr/bin/" + executable -- -- result = client.search_file ([executable], -- packagekit.enums.FILTER_NOT_INSTALLED) -- if result: -- packages.extend (set (map (lambda x: x.name, result))) -- else: -- unresolved_executables.append (executable) -- -- executables = unresolved_executables -- -- return (packages, executables) -+ return ([], executables) - - def _main(): - c = cups.Connection() diff --git a/extra/telepathy-glib/PKGBUILD b/extra/telepathy-glib/PKGBUILD index a044740ac..df4a775e3 100644 --- a/extra/telepathy-glib/PKGBUILD +++ b/extra/telepathy-glib/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139664 2011-10-04 16:22:17Z ibiru $ +# $Id: PKGBUILD 140532 2011-10-16 19:26:18Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> pkgname=telepathy-glib -pkgver=0.15.7 +pkgver=0.16.0 pkgrel=1 pkgdesc="GLib bindings for the Telepathy D-Bus protocol" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs') depends=('dbus-glib') makedepends=('libxslt' 'vala' 'gobject-introspection') source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('1ddf36edbfcecb9c8ad473d113ce087f') +md5sums=('071ed1b34ace45109188df73933609e4') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/telepathy-glib/fix_gnome-shell.patch b/extra/telepathy-glib/fix_gnome-shell.patch deleted file mode 100644 index 425a6ce48..000000000 --- a/extra/telepathy-glib/fix_gnome-shell.patch +++ /dev/null @@ -1,123 +0,0 @@ -commit 014135b89d23f15464d8a82f462ed0f9f98344e0 -Author: Jan Steffens <jan.steffens@gmail.com> -Date: Fri Sep 30 21:09:25 2011 +0200 - - Revert "Sort alphabetically introspected files" - - This reverts commit 48998822d5e9575af822c1936b35be514dc2401b. - - Conflicts: - - telepathy-glib/introspection.am - -diff --git a/telepathy-glib/introspection.am b/telepathy-glib/introspection.am -index 2027c5f..0c867cc 100644 ---- a/telepathy-glib/introspection.am -+++ b/telepathy-glib/introspection.am -@@ -8,63 +8,64 @@ introspection_extra_dist = \ - if HAVE_INTROSPECTION - - INTROSPECTION_FILES = \ -+ $(srcdir)/proxy.c _gen/proxy-introspectable.h \ - $(srcdir)/account.c $(srcdir)/account.h \ - $(srcdir)/account-channel-request.c $(srcdir)/account-channel-request.h \ - $(srcdir)/account-manager.c $(srcdir)/account-manager.h \ -- $(srcdir)/add-dispatch-operation-context.c $(srcdir)/add-dispatch-operation-context.h \ - $(srcdir)/automatic-client-factory.c $(srcdir)/automatic-client-factory.h \ - $(srcdir)/automatic-proxy-factory.c $(srcdir)/automatic-proxy-factory.h \ -- $(srcdir)/base-client.c $(srcdir)/base-client.h \ -- $(srcdir)/base-connection.c $(srcdir)/base-connection.h \ - $(srcdir)/basic-proxy-factory.c $(srcdir)/basic-proxy-factory.h \ -- $(srcdir)/capabilities.c $(srcdir)/capabilities.h \ -- $(srcdir)/channel.c $(srcdir)/channel.h \ -- $(srcdir)/channel-contacts.c \ -- $(srcdir)/channel-dispatcher.c $(srcdir)/channel-dispatcher.h \ -- $(srcdir)/channel-dispatch-operation.c $(srcdir)/channel-dispatch-operation.h \ -- $(srcdir)/channel-group.c \ -- $(srcdir)/channel-request.c $(srcdir)/channel-request.h \ - $(srcdir)/client-channel-factory.c $(srcdir)/client-channel-factory.h \ -- $(srcdir)/client-message.c $(srcdir)/client-message.h \ - $(srcdir)/connection.c $(srcdir)/connection.h \ -- $(srcdir)/connection-avatars.c \ - $(srcdir)/connection-contact-list.c $(srcdir)/connection-contact-list.h \ - $(srcdir)/connection-handles.c $(srcdir)/connection-contact-info.c \ -+ $(srcdir)/connection-avatars.c \ -+ $(srcdir)/protocol.c $(srcdir)/protocol.h \ - $(srcdir)/connection-manager.c $(srcdir)/connection-manager.h \ -+ $(srcdir)/channel.c $(srcdir)/channel.h \ -+ $(srcdir)/channel-contacts.c \ -+ $(srcdir)/channel-group.c \ -+ $(srcdir)/handle.c $(srcdir)/handle.h \ -+ $(srcdir)/handle-channels-context.c $(srcdir)/handle-channels-context.h \ -+ $(srcdir)/dbus-daemon.c $(srcdir)/dbus-daemon.h \ -+ $(srcdir)/interfaces.c \ -+ $(srcdir)/intset.c $(srcdir)/intset.h \ -+ $(srcdir)/dbus.c $(srcdir)/dbus.h \ -+ $(srcdir)/capabilities.c $(srcdir)/capabilities.h \ - $(srcdir)/contact.c $(srcdir)/contact.h \ - $(srcdir)/contact-operations.c $(srcdir)/contact-operations.h \ - $(srcdir)/contact-search.c $(srcdir)/contact-search.h \ - $(srcdir)/contact-search-result.c $(srcdir)/contact-search-result.h \ -- $(srcdir)/contacts-mixin.c $(srcdir)/contacts-mixin.h \ -- $(srcdir)/dbus.c $(srcdir)/dbus.h \ -- $(srcdir)/dbus-daemon.c $(srcdir)/dbus-daemon.h \ -- $(srcdir)/dbus-properties-mixin.c $(srcdir)/dbus-properties-mixin.h \ -- $(srcdir)/dbus-tube-channel.c $(srcdir)/dbus-tube-channel.h \ -- $(srcdir)/debug.c $(srcdir)/debug.h \ - $(srcdir)/defs.h \ -- $(srcdir)/errors.c $(srcdir)/errors.h \ -- $(srcdir)/file-transfer-channel.c $(srcdir)/file-transfer-channel.h \ -- $(srcdir)/group-mixin.c $(srcdir)/group-mixin.h \ -- $(srcdir)/handle.c $(srcdir)/handle.h \ -- $(srcdir)/handle-channels-context.c $(srcdir)/handle-channels-context.h \ -- $(srcdir)/handle-repo.c $(srcdir)/handle-repo.h $(srcdir)/handle-set.c \ -- $(srcdir)/interfaces.c \ -- $(srcdir)/intset.c $(srcdir)/intset.h \ -- $(srcdir)/message.c $(srcdir)/message.h \ -- $(srcdir)/observe-channels-context.c $(srcdir)/observe-channels-context.h \ -- $(srcdir)/presence-mixin.c $(srcdir)/presence-mixin.h \ -- $(srcdir)/protocol.c $(srcdir)/protocol.h \ -- $(srcdir)/proxy.c _gen/proxy-introspectable.h \ -- $(srcdir)/signalled-message.c $(srcdir)/signalled-message.h \ -+ $(srcdir)/debug.c $(srcdir)/debug.h \ -+ $(srcdir)/base-client.c $(srcdir)/base-client.h \ - $(srcdir)/simple-approver.c $(srcdir)/simple-approver.h \ - $(srcdir)/simple-client-factory.c $(srcdir)/simple-client-factory.h \ - $(srcdir)/simple-handler.c $(srcdir)/simple-handler.h \ - $(srcdir)/simple-observer.c $(srcdir)/simple-observer.h \ -+ $(srcdir)/dbus-properties-mixin.c $(srcdir)/dbus-properties-mixin.h \ -+ $(srcdir)/contacts-mixin.c $(srcdir)/contacts-mixin.h \ -+ $(srcdir)/group-mixin.c $(srcdir)/group-mixin.h \ -+ $(srcdir)/presence-mixin.c $(srcdir)/presence-mixin.h \ -+ $(srcdir)/channel-dispatch-operation.c $(srcdir)/channel-dispatch-operation.h \ -+ $(srcdir)/channel-request.c $(srcdir)/channel-request.h \ -+ $(srcdir)/observe-channels-context.c $(srcdir)/observe-channels-context.h \ -+ $(srcdir)/add-dispatch-operation-context.c $(srcdir)/add-dispatch-operation-context.h \ -+ $(srcdir)/protocol.c $(srcdir)/protocol.h \ -+ $(srcdir)/base-connection.c $(srcdir)/base-connection.h \ -+ $(srcdir)/handle-repo.c $(srcdir)/handle-repo.h $(srcdir)/handle-set.c \ - $(srcdir)/stream-tube-channel.c $(srcdir)/stream-tube-channel.h \ -+ $(srcdir)/dbus-tube-channel.c $(srcdir)/dbus-tube-channel.h \ - $(srcdir)/stream-tube-connection.c $(srcdir)/stream-tube-connection.h \ - $(srcdir)/text-channel.c $(srcdir)/text-channel.h \ -+ $(srcdir)/file-transfer-channel.c $(srcdir)/file-transfer-channel.h \ -+ $(srcdir)/client-message.c $(srcdir)/client-message.h \ -+ $(srcdir)/message.c $(srcdir)/message.h \ -+ $(srcdir)/signalled-message.c $(srcdir)/signalled-message.h \ -+ $(srcdir)/channel-dispatcher.c $(srcdir)/channel-dispatcher.h \ -+ $(srcdir)/errors.c $(srcdir)/errors.h \ - _gen/telepathy-enums.h _gen/telepathy-enums-gtk-doc.h \ -- _gen/telepathy-interfaces.h _gen/telepathy-interfaces-gtk-doc.h\ -+ _gen/telepathy-interfaces.h \ - $(NULL) - - _gen/proxy-introspectable.h: proxy.h introspection.am -@@ -76,7 +77,6 @@ TelepathyGLib-0.12.gir: $(INTROSPECTION_SCANNER) \ - $(srcdir)/kludge.xsl \ - $(INTROSPECTION_FILES) - $(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \ -- --warn-all \ - --namespace TelepathyGLib \ - --nsversion=0.12 \ - --identifier-prefix=Tp \ - diff --git a/extra/telepathy-mission-control/PKGBUILD b/extra/telepathy-mission-control/PKGBUILD index aa8ae89fc..348ed04ad 100644 --- a/extra/telepathy-mission-control/PKGBUILD +++ b/extra/telepathy-mission-control/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 139437 2011-10-01 19:01:29Z ibiru $ +# $Id: PKGBUILD 140177 2011-10-08 12:03:11Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Ju Liu <liuju86 at gmail dot com> # Contributor: Bjorn Lindeijer <bjorn lindeijer nl> # Contributor: Andreas Zwinkau <beza1e1@web.de> pkgname=telepathy-mission-control -pkgver=5.9.2 +pkgver=5.9.3 pkgrel=1 pkgdesc="A Telepathy component providing abstraction of some of the details of connection managers." arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ depends=('telepathy-glib' 'libgnome-keyring') makedepends=('libxslt' 'python2') options=('!libtool') source=(http://telepathy.freedesktop.org/releases/telepathy-mission-control/$pkgname-$pkgver.tar.gz) -md5sums=('312fb289f644a90d4514064586445d58') +md5sums=('15fc8e560bc67a86393a3138d7ac38e3') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/telepathy-qt4/PKGBUILD b/extra/telepathy-qt4/PKGBUILD index 00efe6491..375333cc0 100644 --- a/extra/telepathy-qt4/PKGBUILD +++ b/extra/telepathy-qt4/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 132835 2011-07-26 13:03:28Z andrea $ +# $Id: PKGBUILD 140179 2011-10-08 12:12:17Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> pkgname=telepathy-qt4 -pkgver=0.7.1 +pkgver=0.7.3 pkgrel=1 pkgdesc="A library for Qt-based Telepathy clients" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ options=('!libtool') depends=('qt' 'telepathy-farsight') makedepends=('libxslt' 'python2' 'cmake' 'doxygen') source=("http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('a609c6e9638e8cf24134b2165fec1c8a') +md5sums=('a8e4f9f996b074a4e9a8950ddb5240d7') build() { cd "${srcdir}" diff --git a/extra/telepathy-salut/PKGBUILD b/extra/telepathy-salut/PKGBUILD index 94ba3d455..9cc79c69d 100644 --- a/extra/telepathy-salut/PKGBUILD +++ b/extra/telepathy-salut/PKGBUILD @@ -1,8 +1,9 @@ -# $Id: PKGBUILD 130825 2011-07-08 08:13:11Z ibiru $ +# $Id: PKGBUILD 140754 2011-10-18 17:03:04Z ibiru $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Daniel Balieiro <daniel@balieiro.com> + pkgname=telepathy-salut -pkgver=0.5.1 +pkgver=0.6.0 pkgrel=1 pkgdesc="A link-local XMPP connection manager for Telepathy" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +14,7 @@ depends=('telepathy-glib' 'avahi' 'libsoup') makedepends=('libxslt' 'python2' 'xmldiff') install=telepathy-salut.install source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('8c9a0588d9b74c467a8b2dcb442efae1') +md5sums=('a0df48e6c2e137a928f8f39655b8dc26') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/thunar/fix-gvfs.patch b/extra/thunar/fix-gvfs.patch deleted file mode 100644 index 71c7dbb57..000000000 --- a/extra/thunar/fix-gvfs.patch +++ /dev/null @@ -1,148 +0,0 @@ ---- a/thunar/thunar-shortcuts-model.c -+++ b/thunar/thunar-shortcuts-model.c -@@ -1,25 +1,23 @@ --/* vi:set et ai sw=2 sts=2 ts=2: */ -+/* $Id$ */ - /*- - * Copyright (c) 2005-2006 Benedikt Meurer <benny@xfce.org> -- * Copyright (c) 2009-2011 Jannis Pohlmann <jannis@xfce.org> -+ * Copyright (c) 2009 Jannis Pohlmann <jannis@xfce.org> - * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU General Public License as -- * published by the Free Software Foundation; either version 2 of -- * the License, or (at your option) any later version. -+ * This program is free software; you can redistribute it and/or modify it -+ * under the terms of the GNU General Public License as published by the Free -+ * Software Foundation; either version 2 of the License, or (at your option) -+ * any later version. - * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -+ * This program is distributed in the hope that it will be useful, but WITHOUT -+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -+ * more details. - * -- * You should have received a copy of the GNU General Public -- * License along with this program; if not, write to the Free -- * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02110-1301, USA. -+ * You should have received a copy of the GNU General Public License along with -+ * this program; if not, write to the Free Software Foundation, Inc., 59 Temple -+ * Place, Suite 330, Boston, MA 02111-1307 USA - */ - -- - #ifdef HAVE_CONFIG_H - #include <config.h> - #endif -@@ -219,84 +217,6 @@ thunar_shortcuts_model_drag_source_init (GtkTreeDragSourceIface *iface) - - - --static gboolean --thunar_shortcuts_model_add_network_idle (gpointer user_data) --{ -- ThunarShortcutsModel *model = THUNAR_SHORTCUTS_MODEL (user_data); -- ThunarShortcut *shortcut = NULL; -- GtkTreePath *path; -- GtkTreeIter iter; -- ThunarFile *file = NULL; -- GVolume *volume = NULL; -- gboolean have_iter = FALSE; -- gboolean is_separator = FALSE; -- gboolean position_found = FALSE; -- GFile *location = NULL; -- -- /* append the network icon if browsing the network is supported */ -- if (thunar_g_vfs_is_uri_scheme_supported ("network")) -- { -- /* load the network root file */ -- location = g_file_new_for_uri ("network://"); -- file = thunar_file_get (location, NULL); -- g_object_unref (location); -- -- /* create the shortcut */ -- shortcut = g_slice_new0 (ThunarShortcut); -- shortcut->type = THUNAR_SHORTCUT_SYSTEM_DEFINED; -- shortcut->file = file; -- -- /* iterate over all rows in the model in order to find the -- * first one with a volume or a separator */ -- have_iter = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter); -- while (have_iter && !position_found) -- { -- /* read volume and separator flag from the current row */ -- gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, -- THUNAR_SHORTCUTS_MODEL_COLUMN_VOLUME, &volume, -- THUNAR_SHORTCUTS_MODEL_COLUMN_SEPARATOR, &is_separator, -- -1); -- -- /* check if a volume row was found */ -- if (volume != NULL) -- { -- /* stop searching */ -- position_found = TRUE; -- -- /* release the volume */ -- g_object_unref (volume); -- } -- else if (is_separator) -- { -- /* stop searching */ -- position_found = TRUE; -- } -- else -- { -- /* advance to the next row */ -- have_iter = gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &iter); -- } -- } -- -- /* we always have a volume or separator row */ -- g_assert (position_found); -- -- /* get the path of the iter */ -- path = gtk_tree_model_get_path (GTK_TREE_MODEL (model), &iter); -- -- /* append the shortcut to the list */ -- thunar_shortcuts_model_add_shortcut (model, shortcut, path); -- -- /* release the path */ -- gtk_tree_path_free (path); -- } -- -- /* remove this idle handler */ -- return FALSE; --} -- -- -- - static void - thunar_shortcuts_model_init (ThunarShortcutsModel *model) - { -@@ -339,6 +259,10 @@ thunar_shortcuts_model_init (ThunarShortcutsModel *model) - /* append the root file system */ - system_paths = g_list_append (system_paths, thunar_g_file_new_for_root ()); - -+ /* append the network icon if browsing the network is supported */ -+ if (thunar_g_vfs_is_uri_scheme_supported ("network")) -+ system_paths = g_list_append (system_paths, g_file_new_for_uri ("network://")); -+ - /* will be used to append the shortcuts to the list */ - path = gtk_tree_path_new_from_indices (0, -1); - -@@ -416,9 +340,6 @@ thunar_shortcuts_model_init (ThunarShortcutsModel *model) - g_object_unref (bookmarks); - g_object_unref (home); - gtk_tree_path_free (path); -- -- /* add the network item (and other slow items) in an idle handler */ -- g_idle_add_full (G_PRIORITY_LOW, thunar_shortcuts_model_add_network_idle, model, NULL); - } - - - diff --git a/extra/thunar/fix-samba.patch b/extra/thunar/fix-samba.patch deleted file mode 100644 index 61d53bec3..000000000 --- a/extra/thunar/fix-samba.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- thunar-file-ORIGINAL.c 2011-05-27 00:11:27.000000000 +0200 -+++ thunar-1.2.2/thunar/thunar-file.c 2011-08-22 08:00:24.095066077 +0200 -@@ -754,7 +754,10 @@ thunar_file_load (ThunarFile *file, - target_uri = - g_file_info_get_attribute_string (file->info, - G_FILE_ATTRIBUTE_STANDARD_TARGET_URI); -- file->is_mounted = (target_uri != NULL); -+ file->is_mounted = (target_uri != NULL) -+ ? !g_file_info_get_attribute_boolean (file->info, -+ G_FILE_ATTRIBUTE_MOUNTABLE_CAN_MOUNT) -+ : FALSE; - } - } - else diff --git a/extra/totem/fix_crash.patch b/extra/totem/fix_crash.patch deleted file mode 100644 index 08409696c..000000000 --- a/extra/totem/fix_crash.patch +++ /dev/null @@ -1,30 +0,0 @@ -From cee6399c1de27e5ccae35975aaae4fd7cfa40c2c Mon Sep 17 00:00:00 2001 -From: Marcel van den Hof <marcelvdh@gmail.com> -Date: Sun, 29 May 2011 23:45:36 +0100 -Subject: [PATCH] Fix segfault in Bemused plugin - -If bluetoothd is not running sdp_connect() returns a null value which -will cause the plugin to segfault. - -This patch adds a check for a possible null value from sdp_connect(). ---- - src/plugins/bemused/totem-bemused.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/src/plugins/bemused/totem-bemused.c b/src/plugins/bemused/totem-bemused.c -index 584b4d3..c51a0ee 100644 ---- a/src/plugins/bemused/totem-bemused.c -+++ b/src/plugins/bemused/totem-bemused.c -@@ -655,7 +655,8 @@ sdp_svc_add_spp(u_int8_t port, - - /* Connect to the local SDP server, register the service record */ - session = sdp_connect (BDADDR_ANY, BDADDR_LOCAL, 0); -- sdp_record_register (session, &record, 0); -+ if (session != NULL) -+ sdp_record_register (session, &record, 0); - - /* Cleanup */ - sdp_data_free (channel); --- -1.7.5.2 - diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD index 0130a76a8..d9b62ca2d 100644 --- a/extra/tracker/PKGBUILD +++ b/extra/tracker/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 139445 2011-10-01 19:01:47Z ibiru $ +# $Id: PKGBUILD 140581 2011-10-17 08:15:06Z jgc $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Alexander Fehr <pizzapunk gmail com> pkgbase=tracker pkgname=(tracker libtracker-sparql) -pkgver=0.12.3 +pkgver=0.12.5 _tver=${pkgver%.*} pkgrel=1 pkgdesc="All-in-one indexer, search tool and metadata database" @@ -15,12 +15,11 @@ makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme' 'gobject-introspection' 'intltool' 'giflib' 'gstreamer0.10-base' 'totem-plparser' - 'evolution' 'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' - 'vala') + 'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala') url="http://www.gnome.org" options=('!libtool' '!emptydirs') source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz) -sha256sums=('97c9e151d48878409129eeeea2da0716f14a52d6097d8db3b304c6af0b7ae187') +sha256sums=('5fddbda9df10fada07f335751370e46b5e2b5ef971d4da8efd47ea795d7b5c5b') build() { cd "$srcdir/$pkgbase-$pkgver" @@ -44,7 +43,6 @@ package_tracker() { optdepends=('giflib: extractor for GIF data' 'gstreamer0.10-base: video extractor' 'totem-plparser: playlist support' - 'evolution: Evolution email data miner' 'nautilus: nautilus-extension' 'libvorbis: Vorbis metadata extractor' 'flac: FLAC metadata extractor' diff --git a/extra/transmission/PKGBUILD b/extra/transmission/PKGBUILD index b051af36b..5a6c35916 100644 --- a/extra/transmission/PKGBUILD +++ b/extra/transmission/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 132249 2011-07-22 09:01:42Z ibiru $ +# $Id: PKGBUILD 140241 2011-10-10 15:24:45Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> pkgbase=transmission pkgname=('transmission-cli' 'transmission-gtk' 'transmission-qt') -pkgver=2.33 -pkgrel=1 +pkgver=2.41 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url="http://www.transmissionbt.com/" license=('MIT') -makedepends=('gtk2' 'intltool' 'curl' 'libnotify' 'qt' 'libevent' 'libcanberra' 'dbus-glib') -source=(http://mirrors.m0k.org/transmission/files/${pkgbase}-${pkgver}.tar.bz2 +makedepends=('gtk2' 'intltool' 'curl' 'qt' 'libevent') +source=(http://mirrors.m0k.org/transmission/files/${pkgbase}-${pkgver}.tar.xz transmissiond transmissiond.conf) -md5sums=('082217a65713ac879410c622cbe6eb26' +md5sums=('0d0a061dfb92c0cb359dc531d5da0a94' '08875299e3fbb68fc546c1f350ac1f06' 'be39806c35b7544856fa4070b00fc960') build() { @@ -43,8 +43,7 @@ package_transmission-cli() { package_transmission-gtk() { pkgdesc="Fast, easy, and free BitTorrent client (GTK+ GUI)" - depends=('curl' 'libevent' 'libnotify' 'desktop-file-utils' 'hicolor-icon-theme' - 'gtk2' 'dbus-glib' 'libcanberra') + depends=('curl' 'libevent' 'gtk2' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('notification-daemon: Desktop notification support' 'transmission-cli: daemon and web support') install=transmission-gtk.install diff --git a/extra/tumbler/PKGBUILD b/extra/tumbler/PKGBUILD index 1223c720f..7f3c4bc70 100644 --- a/extra/tumbler/PKGBUILD +++ b/extra/tumbler/PKGBUILD @@ -1,25 +1,27 @@ -# $Id: PKGBUILD 138679 2011-09-27 15:18:13Z tpowa $ +# $Id: PKGBUILD 140583 2011-10-17 08:15:09Z jgc $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Jan Jezek <honzin.jezek@gmail.com> pkgname=tumbler pkgver=0.1.22 -pkgrel=2 +pkgrel=3 pkgdesc="D-Bus service for applications to request thumbnails" url="http://git.xfce.org/xfce/tumbler/" license=('GPL2' 'LGPL') arch=('i686' 'x86_64' 'mips64el') groups=('xfce4') -depends=('poppler-glib' 'dbus-glib') -makedepends=('intltool' 'ffmpegthumbnailer') +depends=('poppler-glib' 'dbus-glib' 'bzip2' 'gdk-pixbuf2') +makedepends=('intltool' 'ffmpegthumbnailer' 'gstreamer0.10') optdepends=('ffmpegthumbnailer: for video thumbnails' 'gstreamer0.10: for video thumbnails') options=('!libtool') source=(http://archive.xfce.org/src/apps/${pkgname}/0.1/${pkgname}-${pkgver}.tar.bz2 fix-video-image.patch) +md5sums=('e7ba3b8f21f8f7e736f1e214906b4ca9' + 'be9b0f1c3a4b0be102774c84d5ac29e6') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i ../fix-video-image.patch ./configure --prefix=/usr \ --sysconfdir=/etc \ @@ -30,8 +32,6 @@ build() { } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=$pkgdir install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install } -md5sums=('e7ba3b8f21f8f7e736f1e214906b4ca9' - 'be9b0f1c3a4b0be102774c84d5ac29e6') diff --git a/extra/usermin/PKGBUILD b/extra/usermin/PKGBUILD index b6e75c295..b294040a7 100644 --- a/extra/usermin/PKGBUILD +++ b/extra/usermin/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 134661 2011-08-07 10:26:07Z tpowa $ +# $Id: PKGBUILD 140170 2011-10-08 10:02:07Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=usermin -pkgver=1.480 +pkgver=1.490 pkgrel=1 pkgdesc="a web interface that can be used to easily perform tasks like reading mail, setting up SSH or configuring mail forwarding" arch=(i686 x86_64 'mips64el') @@ -124,6 +124,6 @@ build() { #install license install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/usermin/LICENCE } -md5sums=('b5fa9938a29b7e83c36249f0b01119a3' +md5sums=('a6d87aad595ea8abbe6639ce2c08efc1' 'cfef4490cd1ef9517c0b39a7bd75c968' 'ec37a79f948f778224550930d2a7ca07') diff --git a/extra/vim/PKGBUILD b/extra/vim/PKGBUILD index 44df64642..5a989a09e 100644 --- a/extra/vim/PKGBUILD +++ b/extra/vim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 139129 2011-09-30 05:59:05Z eric $ +# $Id: PKGBUILD 140768 2011-10-18 23:20:38Z eric $ # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> # Maintainer: tobias [ tobias at archlinux org ] # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,55 +6,53 @@ pkgbase=vim pkgname=('vim' 'gvim' 'vim-runtime') _topver=7.3 -_patchlevel=322 +_patchlevel=338 +__hgrev=f530aef0d959 +_versiondir="vim${_topver//./}" pkgver=${_topver}.${_patchlevel} -__hgrev=5e84f6567623 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') license=('custom:vim') url="http://www.vim.org" -makedepends=('gawk' 'gpm' 'python2' 'python' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2' - 'mercurial' 'rsync') -source=(pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872 +makedepends=('gpm' 'python2' 'python' 'ruby' 'libxt' 'desktop-file-utils' 'gtk2') +source=(ftp://ftp.archlinux.org/other/vim/${pkgname}-${pkgver}.tar.xz + pythoncomplete.vim::http://www.vim.org/scripts/download_script.php\?src_id=10872 vimrc archlinux.vim gvim.desktop) -md5sums=('6e7adfbd5d26c1d161030ec203a7f243' +md5sums=('fc83d6580fd8441793fccfd26487aadb' + '6e7adfbd5d26c1d161030ec203a7f243' 'e57777374891063b9ca48a1fe392ac05' '10353a61aadc3f276692d0e17db1478e' 'd90413bd21f400313a785bb4010120cd') -__hgroot='http://vim.googlecode.com/hg/' -__hgrepo='vim' -__hgbranch='default' +# source PKGBUILD && mksource +mksource() { -_versiondir="vim${_topver//./}" + [[ -x /usr/bin/hg ]] || (echo "hg not found. Install mercurial." && return 1) -##### Build ##### + __hgroot='http://vim.googlecode.com/hg/' + __hgrepo='vim' + __hgbranch='default' -build() { - cd "${srcdir}" - - msg2 'Checking out source from Mercurial...' - - if [[ -d ${__hgrepo} ]]; then - cd ${__hgrepo} - hg pull -b ${__hgbranch}|| warning 'hg pull failed!' - hg update -r ${__hgrev} - else - hg clone -b ${__hgbranch} -u ${__hgrev} "${__hgroot}${__hgrepo}" ${__hgrepo} - cd ${__hgrepo} - fi + hg clone -b ${__hgbranch} -u ${__hgrev} "${__hgroot}${__hgrepo}" ${__hgrepo} + pushd ${__hgrepo} if (( $(hg id -n) < $(hg id -nr ${__hgbranch}) )); then - warning 'You are not building the latest revision!' - warning "Consider updating __hgrev to $(hg id -r ${__hgbranch})." - sleep 10 + printf 'You are not building the latest revision!\n' + printf "Consider updating __hgrev to $(hg id -r ${__hgbranch}).\n" fi + popd - cd .. - rm -rf vim-build gvim-build - rsync -a --exclude='.hg/' ${__hgrepo}/ vim-build + mv vim ${pkgname}-${pkgver} + find ${pkgname}-${pkgver} -depth -type d -name .hg -exec rm -rf {} \; + rm ${pkgname}-${pkgver}/{.hgignore,.hgtags} + tar -cJf ${pkgname}-${pkgver}.tar.xz ${pkgname}-${pkgver}/* + rm -r ${pkgname}-${pkgver} +} + +build() { + cd "${srcdir}" - msg2 'Patching...' + cp -a ${pkgname}-${pkgver} vim-build # define the place for the global (g)vimrc file (set to /etc/vimrc) sed -i 's|^.*\(#define SYS_.*VIMRC_FILE.*"\) .*$|\1|' \ @@ -66,8 +64,6 @@ build() { vim-build/src/configure.in (cd vim-build/src && autoconf) - msg2 'Building...' - cp -a vim-build gvim-build cd "${srcdir}"/vim-build @@ -93,8 +89,6 @@ build() { make } -##### Packaging ##### - package_vim() { pkgdesc='Vi Improved, a highly configurable, improved version of the vi text editor' depends=("vim-runtime=${pkgver}-${pkgrel}" 'gpm') @@ -118,7 +112,7 @@ package_vim() { rm -r "${pkgdir}"/usr/share/vim # license - install -Dm644 "${srcdir}"/vim/runtime/doc/uganda.txt \ + install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \ "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt } @@ -152,7 +146,7 @@ package_gvim() { install -Dm644 runtime/vim48x48.png "${pkgdir}"/usr/share/pixmaps/gvim.png # license - install -Dm644 "${srcdir}"/vim/runtime/doc/uganda.txt \ + install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/doc/uganda.txt \ "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt } @@ -189,7 +183,7 @@ package_vim-runtime() { "${pkgdir}"/usr/share/vim/vimfiles/archlinux.vim # rgb.txt file - install -Dm644 "${srcdir}"/vim/runtime/rgb.txt \ + install -Dm644 "${srcdir}"/vim-${pkgver}/runtime/rgb.txt \ "${pkgdir}"/usr/share/vim/${_versiondir}/rgb.txt # license diff --git a/extra/vlc/PKGBUILD b/extra/vlc/PKGBUILD index 7dc7b5e01..6c899f321 100644 --- a/extra/vlc/PKGBUILD +++ b/extra/vlc/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 135810 2011-08-18 15:04:49Z andyrtr $ +# $Id: PKGBUILD 140130 2011-10-07 15:51:39Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca> # Contributor: Martin Sandsmark <martin.sandsmark@kde.org> pkgname=vlc -pkgver=1.1.11 -pkgrel=4 +pkgver=1.1.12 +pkgrel=1 pkgdesc="A multi-platform MPEG, VCD/DVD, and DivX player" arch=('i686' 'x86_64' 'mips64el') url="http://www.videolan.org/vlc/" @@ -54,7 +54,7 @@ backup=('usr/share/vlc/http/.hosts' options=('!libtool') install=vlc.install source=("http://download.videolan.org/pub/videolan/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('a64846d6f21ea179ae8e8bfb6f9447fe') +md5sums=('91de1ad308c947e35380f9d747ff5713') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/webmin/PKGBUILD b/extra/webmin/PKGBUILD index 4a3a2cb9f..daf3477a9 100644 --- a/extra/webmin/PKGBUILD +++ b/extra/webmin/PKGBUILD @@ -1,7 +1,7 @@ -# $Id: PKGBUILD 134656 2011-08-07 10:21:55Z tpowa $ +# $Id: PKGBUILD 140171 2011-10-08 10:04:27Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=webmin -pkgver=1.560 +pkgver=1.570 pkgrel=1 pkgdesc="a web-based interface for system administration" arch=(i686 x86_64 'mips64el') @@ -210,7 +210,7 @@ build() { # install license install -m 644 -D $startdir/src/$pkgname-$pkgver/LICENCE $startdir/pkg/usr/share/licenses/webmin/LICENCE } -md5sums=('6a3eb723f991fd8c3004655472352cd7' +md5sums=('20b4f488637366c39458b9b93162eff3' 'da6bea412a5be8cf82a813078fec5847' 'bfebb75bb94029b48c46b7f1ba1aa811' '0673e51af0e81418b4a6c1e205f7e5cd') diff --git a/extra/x264/PKGBUILD b/extra/x264/PKGBUILD index 29de1fd05..cfa7bfb72 100644 --- a/extra/x264/PKGBUILD +++ b/extra/x264/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 127804 2011-06-18 16:05:03Z ibiru $ +# $Id: PKGBUILD 140061 2011-10-06 07:33:34Z ibiru $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: damir <damir@archlinux.org> # Contributor: Paul Mattal <paul@archlinux.org> pkgname=x264 -pkgver=20110617 +pkgver=20111001 pkgrel=1 pkgdesc="free library for encoding H264/AVC video streams" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ license=('GPL') depends=('glibc') makedepends=('yasm') source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2) -md5sums=('928717aa2f0c7ca91e589d6b60e688f1') +md5sums=('dd67dca96ac79e7cb963bfcbf68e017b') build() { cd "$srcdir/$pkgname-snapshot-$pkgver-2245" diff --git a/extra/xf86-input-acecad/PKGBUILD b/extra/xf86-input-acecad/PKGBUILD index f2bfca2e6..c07e69d4a 100644 --- a/extra/xf86-input-acecad/PKGBUILD +++ b/extra/xf86-input-acecad/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 123257 2011-05-09 13:44:31Z jgc $ +# $Id: PKGBUILD 140352 2011-10-11 21:29:41Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-input-acecad pkgver=1.5.0 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org acecad tablet input driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('sysfsutils') -makedepends=('xorg-server-devel') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.10.99.902') +conflicts=('xorg-server<1.10.99.902') options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('410cee68e4435dc95774fb389fcefae1b2ffe3d1') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + assign-local-private-after-allocating.patch) +sha1sums=('410cee68e4435dc95774fb389fcefae1b2ffe3d1' + '9301020b0ef3c6f2081e957481a88d2e187a7973') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/assign-local-private-after-allocating.patch" ./configure --prefix=/usr make } diff --git a/extra/xf86-input-acecad/assign-local-private-after-allocating.patch b/extra/xf86-input-acecad/assign-local-private-after-allocating.patch new file mode 100644 index 000000000..e3e635a6f --- /dev/null +++ b/extra/xf86-input-acecad/assign-local-private-after-allocating.patch @@ -0,0 +1,24 @@ +From ec2c4ead497133ef20d5ef5a9b481b38e1e0f7a2 Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Mon, 27 Jun 2011 03:13:54 +0000 +Subject: Assign local->private after allocating. + +It is detrimental to the user experience when the driver tries to derefernce +null pointers. + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +--- +diff --git a/src/acecad.c b/src/acecad.c +index ad6d793..604fe91 100644 +--- a/src/acecad.c ++++ b/src/acecad.c +@@ -343,6 +343,7 @@ AceCadPreInit(InputDriverPtr drv, InputInfoPtr local, int flags) + return BadAlloc; + + memset(priv, 0, sizeof(AceCadPrivateRec)); ++ local->private = priv; + + local->device_control = DeviceControl; + +-- +cgit v0.8.3-6-g21f6 diff --git a/extra/xf86-input-aiptek/PKGBUILD b/extra/xf86-input-aiptek/PKGBUILD index 61a054eb2..e4f7ab6ba 100644 --- a/extra/xf86-input-aiptek/PKGBUILD +++ b/extra/xf86-input-aiptek/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 130860 2011-07-08 13:07:09Z andyrtr $ +# $Id: PKGBUILD 140354 2011-10-11 21:29:43Z jgc $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-input-aiptek pkgver=1.4.1 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org Aiptek USB Digital Tablet input driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('pkgconfig' 'xorg-server-devel') -conflicts=('xorg-server<1.10.0') +makedepends=('pkgconfig' 'xorg-server-devel>=1.10.99.902') +conflicts=('xorg-server<1.10.99.902') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-input-evdev/PKGBUILD b/extra/xf86-input-evdev/PKGBUILD index b524d10ac..b56a620c4 100644 --- a/extra/xf86-input-evdev/PKGBUILD +++ b/extra/xf86-input-evdev/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 115269 2011-03-17 16:14:58Z andyrtr $ +# $Id: PKGBUILD 140356 2011-10-11 21:29:45Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <Alexander@archlinux.org pkgname=xf86-input-evdev pkgver=2.6.0 -pkgrel=3 +pkgrel=4 pkgdesc="X.org evdev input driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.10.99.902') +conflicts=('xorg-server<1.10.99.902') options=('!libtool' '!makeflags') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-input-joystick/LICENSE b/extra/xf86-input-joystick/LICENSE deleted file mode 100644 index 434899a50..000000000 --- a/extra/xf86-input-joystick/LICENSE +++ /dev/null @@ -1,22 +0,0 @@ -This package was downloaded from -http://xorg.freedesktop.org/releases/individual/driver/ - -Copyright 1995-1999 by Frederic Lepied, France. <Lepied@XFree86.org> - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation, and that the name of Frederic Lepied not be used in -advertising or publicity pertaining to distribution of the software without -specific, written prior permission. Frederic Lepied makes no -representations about the suitability of this software for any purpose. It -is provided "as is" without express or implied warranty. - -FREDERIC LEPIED DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -EVENT SHALL FREDERIC LEPIED BE LIABLE FOR ANY SPECIAL, INDIRECT OR -CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. diff --git a/extra/xf86-input-joystick/PKGBUILD b/extra/xf86-input-joystick/PKGBUILD index c4e4af6f8..0a6fe5e38 100644 --- a/extra/xf86-input-joystick/PKGBUILD +++ b/extra/xf86-input-joystick/PKGBUILD @@ -1,24 +1,22 @@ -# $Id: PKGBUILD 120502 2011-04-24 14:51:16Z jgc $ +# $Id: PKGBUILD 140358 2011-10-11 21:29:48Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-input-joystick pkgver=1.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="X.Org Joystick input driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.10.99.902') +conflicts=('xorg-server<1.10.99.902') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - 50-joystick.conf - LICENSE) + 50-joystick.conf) sha1sums=('3b9aed1b8128e1fbd947fdcdd5e16efccad1c780' - 'e1ff3699a0470c6bb78a53f718df9d8521621e11' - 'ee4c79491b36a680ed9d86f5fc41ae447f26353e') + 'e1ff3699a0470c6bb78a53f718df9d8521621e11') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -35,5 +33,5 @@ package() { install -m644 "${srcdir}/50-joystick.conf" "${pkgdir}/etc/X11/xorg.conf.d/" install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/extra/xf86-input-keyboard/PKGBUILD b/extra/xf86-input-keyboard/PKGBUILD index abfcf931a..009bc808f 100644 --- a/extra/xf86-input-keyboard/PKGBUILD +++ b/extra/xf86-input-keyboard/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 115452 2011-03-18 08:08:01Z andyrtr $ +# $Id: PKGBUILD 140360 2011-10-11 21:29:51Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-input-keyboard pkgver=1.6.0 -pkgrel=2 +pkgrel=3 pkgdesc="X.Org keyboard input driver" arch=(i686 x86_64 'mips64el') license=('custom') url="http://xorg.freedesktop.org/" depends=('glibc') -makedepends=('xorg-server-devel') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.10.99.902') +conflicts=('xorg-server<1.10.99.902') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-input-mouse/PKGBUILD b/extra/xf86-input-mouse/PKGBUILD index 61ce843bd..ffff8fec6 100644 --- a/extra/xf86-input-mouse/PKGBUILD +++ b/extra/xf86-input-mouse/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 130850 2011-07-08 12:58:03Z andyrtr $ +# $Id: PKGBUILD 140362 2011-10-11 21:29:54Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-input-mouse pkgver=1.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="X.org mouse input driver" arch=(i686 x86_64 'mips64el') license=('custom') url="http://xorg.freedesktop.org/" depends=('glibc') -makedepends=('xorg-server-devel') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.10.99.902') +conflicts=('xorg-server<1.10.99.902') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-input-synaptics/PKGBUILD b/extra/xf86-input-synaptics/PKGBUILD index cd8dce772..a0b628d28 100644 --- a/extra/xf86-input-synaptics/PKGBUILD +++ b/extra/xf86-input-synaptics/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 130717 2011-07-07 22:08:11Z andyrtr $ +# $Id: PKGBUILD 140364 2011-10-11 21:29:57Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Bächler <thomas@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-input-synaptics -pkgver=1.4.1 +pkgver=1.5.0 pkgrel=1 pkgdesc="Synaptics driver for notebook touchpads" -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org/" depends=('libxtst') -makedepends=('xorg-server-devel' 'libxi' 'libx11') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.10.99.902' 'libxi' 'libx11') +conflicts=('xorg-server<1.10.99.902') replaces=('synaptics') provides=('synaptics') conflicts=('synaptics') @@ -22,7 +22,7 @@ options=(!libtool) backup=('etc/X11/xorg.conf.d/10-synaptics.conf') source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 10-synaptics.conf) -sha1sums=('e41201476f4bc8658291808d2d6ef2e0535179ae' +sha1sums=('7373c1e3f02bf7e18f71b65762a982d907b4a053' '68e1f4ef5e1038231d210eb422fa4d18c5922f0f') build() { @@ -30,6 +30,7 @@ build() { ./configure --prefix=/usr make } + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/xf86-input-void/PKGBUILD b/extra/xf86-input-void/PKGBUILD index ab7400c55..411a25c62 100644 --- a/extra/xf86-input-void/PKGBUILD +++ b/extra/xf86-input-void/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 123252 2011-05-09 13:38:43Z jgc $ +# $Id: PKGBUILD 140368 2011-10-11 21:30:01Z jgc $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-input-void pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="X.org void input driver" arch=(i686 x86_64 'mips64el') license=('custom') url="http://xorg.freedesktop.org/" depends=('glibc') -makedepends=('xorg-server-devel') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.10.99.902') +conflicts=('xorg-server<1.10.99.902') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD index 5c982f730..1933dab48 100644 --- a/extra/xf86-input-wacom/PKGBUILD +++ b/extra/xf86-input-wacom/PKGBUILD @@ -1,19 +1,19 @@ -# $Id: PKGBUILD 135826 2011-08-19 02:23:54Z heftig $ +# $Id: PKGBUILD 140370 2011-10-11 21:30:03Z jgc $ # Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: M Rawash <mrawash@gmail.com> pkgname=xf86-input-wacom pkgver=0.11.1 -pkgrel=2 +pkgrel=3 pkgdesc="X.Org Wacom tablet driver" arch=('i686' 'x86_64' 'mips64el') url="http://linuxwacom.sourceforge.net/" license=('GPL') backup=('etc/X11/xorg.conf.d/50-wacom.conf') depends=('libxi' 'libxrandr') -makedepends=('xorg-server-devel' 'libxext' 'libxi') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.10.99.902' 'libxext' 'libxi') +conflicts=('xorg-server<1.10.99.902') options=(!libtool) source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2 70-wacom.rules) diff --git a/extra/xf86-video-apm/PKGBUILD b/extra/xf86-video-apm/PKGBUILD index 0fda16708..dee8429de 100644 --- a/extra/xf86-video-apm/PKGBUILD +++ b/extra/xf86-video-apm/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 115281 2011-03-17 16:59:19Z andyrtr $ +# $Id: PKGBUILD 140350 2011-10-11 21:29:39Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-apm pkgver=1.2.3 -pkgrel=3 +pkgrel=4 pkgdesc="X.org Alliance ProMotion video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.11.0') +conflicts=('xorg-server<1.11.0') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-ark/PKGBUILD b/extra/xf86-video-ark/PKGBUILD index 03e1340b0..dc5ab26e8 100644 --- a/extra/xf86-video-ark/PKGBUILD +++ b/extra/xf86-video-ark/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 115284 2011-03-17 17:01:41Z andyrtr $ +# $Id: PKGBUILD 140348 2011-10-11 21:29:38Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-ark pkgver=0.7.3 -pkgrel=3 +pkgrel=4 pkgdesc="X.org ark video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.11.0') +conflicts=('xorg-server<1.11.0') options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('56901ec6097a83433689f208268281f9c98c238b') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + git-fixes.patch) +sha1sums=('56901ec6097a83433689f208268281f9c98c238b' + 'f62cdc7995e9b64c9105382ccfa842732fa81309') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/git-fixes.patch" ./configure --prefix=/usr make make DESTDIR="${pkgdir}" install diff --git a/extra/xf86-video-ark/git-fixes.patch b/extra/xf86-video-ark/git-fixes.patch new file mode 100644 index 000000000..2de0f64be --- /dev/null +++ b/extra/xf86-video-ark/git-fixes.patch @@ -0,0 +1,118 @@ +From 9d3769bed020e9796e51411c63de337da5073bb4 Mon Sep 17 00:00:00 2001 +From: Ondrej Zary <linux@rainbow-software.org> +Date: Sat, 04 Dec 2010 00:23:51 +0000 +Subject: Don't assume that FB address registers are initialized properly + +https://bugs.freedesktop.org/show_bug.cgi?id=28249 + +ark driver does not work with Hercules Stingray 64 card (ark2000pv). +X fails to start with: + +[...] +(II) ark(0): vgaHWGetIOBase: hwp->IOBase is 0x03d0, hwp->PIOOffset is +0x0000 +(II) ark(0): Creating default Display subsection in Screen section + "Default Screen Section" for depth/fbbpp 24/32 +(==) ark(0): Depth 24, (--) framebuffer bpp 32 +(==) ark(0): RGB weight 888 +(==) ark(0): Default visual is TrueColor +(**) ark(0): Chipset: "ark2000pv" +(--) ark(0): Framebuffer @ 0xe5e50000 +(==) ark(0): Using gamma correction (1.0, 1.0, 1.0) +(--) ark(0): Detected 2048 bytes video ram +[...] +Fatal server error: +AddScreen/ScreenInit failed for driver 0 + +Comparing with lspci, the framebuffer address is wrong: +00:0f.0 VGA compatible controller: ARK Logic Inc 2000PV [Stingray] (prog-if 00 [VGA controller]) + Flags: medium devsel + Memory at e5000000 (32-bit, prefetchable) [size=4M] + [virtual] Expansion ROM at 1c000000 [disabled] [size=64K] + +Reviewed-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/ark.h b/src/ark.h +index de301dc..077f93b 100644 +--- a/src/ark.h ++++ b/src/ark.h +@@ -34,7 +34,6 @@ typedef struct _ARKRec { + #endif + EntityInfoPtr pEnt; + CARD32 IOAddress; +- CARD32 FBAddress; + unsigned char * FBBase; + unsigned char * MMIOBase; + unsigned long videoRam; +diff --git a/src/ark_driver.c b/src/ark_driver.c +index 5de3b9a..fec3e1a 100644 +--- a/src/ark_driver.c ++++ b/src/ark_driver.c +@@ -363,14 +363,14 @@ static Bool ARKPreInit(ScrnInfoPtr pScrn, int flags) + outb(hwp->PIOOffset + hwp->IOBase + 5, tmp & 0x7f); + modinx(hwp->PIOOffset + 0x3c4, 0x1d, 0x01, 0x01); + +- /* use membase's later on ??? */ +- pARK->FBAddress = (rdinx(hwp->PIOOffset + 0x3c4, 0x13) << 16) + +- (rdinx(hwp->PIOOffset + 0x3c4, 0x14) << 24); +- +- pScrn->memPhysBase = pARK->FBAddress; ++#ifndef XSERVER_LIBPCIACCESS ++ pScrn->memPhysBase = pARK->PciInfo->memBase[0]; ++#else ++ pScrn->memPhysBase = pARK->PciInfo->regions[0].base_addr; ++#endif + + xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Framebuffer @ 0x%lx\n", +- (unsigned long)pARK->FBAddress); ++ (unsigned long)pScrn->memPhysBase); + + if (!xf86SetGamma(pScrn, gzeros)) + return FALSE; +@@ -748,8 +748,13 @@ static Bool ARKModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) + new->sr10 = rdinx(isaIOBase + 0x3c4, 0x10) & ~0x1f; + new->sr10 |= 0x1f; + +- new->sr13 = pARK->FBAddress >> 16; +- new->sr14 = pARK->FBAddress >> 24; ++#ifndef XSERVER_LIBPCIACCESS ++ new->sr13 = pARK->PciInfo->memBase[0] >> 16; ++ new->sr14 = pARK->PciInfo->memBase[0] >> 24; ++#else ++ new->sr13 = pARK->PciInfo->regions[0].base_addr >> 16; ++ new->sr14 = pARK->PciInfo->regions[0].base_addr >> 24; ++#endif + + new->sr12 = rdinx(isaIOBase + 0x3c4, 0x12) & ~0x03; + switch (pScrn->videoRam) { +@@ -1022,7 +1027,7 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn) + pARK->PciTag, 0xb8000, 0x8000); + + pARK->FBBase = xf86MapPciMem(pScrn->scrnIndex, VIDMEM_FRAMEBUFFER, +- pARK->PciTag, pARK->FBAddress, ++ pARK->PciTag, pARK->PciInfo->memBase[0], + pScrn->videoRam * 1024); + #else + +@@ -1032,14 +1037,17 @@ static Bool ARKMapMem(ScrnInfoPtr pScrn) + { + void** result = (void**)&pARK->FBBase; + int err = pci_device_map_range(pARK->PciInfo, +- pARK->FBAddress, ++ pARK->PciInfo->regions[0].base_addr, + pScrn->videoRam * 1024, + PCI_DEV_MAP_FLAG_WRITABLE | + PCI_DEV_MAP_FLAG_WRITE_COMBINE, + result); + +- if (err) ++ if (err) { ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++ "Cound not map framebuffer: %d\n", err); + return FALSE; ++ } + } + #endif + +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/xf86-video-ast/PKGBUILD b/extra/xf86-video-ast/PKGBUILD index 0920103f8..f3effc947 100644 --- a/extra/xf86-video-ast/PKGBUILD +++ b/extra/xf86-video-ast/PKGBUILD @@ -1,19 +1,20 @@ -# $Id: PKGBUILD 115287 2011-03-17 17:04:02Z andyrtr $ +# $Id: PKGBUILD 140346 2011-10-11 21:29:36Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-ast -pkgver=0.91.10 -pkgrel=3 +pkgver=0.93.9 +pkgrel=1 pkgdesc="X.org ASPEED AST Graphics video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel') +makedepends=('xorg-server-devel>=1.11.0') +conflicts=('xorg-server<1.11.0') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('a90624e63f33fdcb50ccefcdeebb34052f341ef3') +sha1sums=('424cc93d0300e49a882199c0546425f223b3b4bd') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-ati/PKGBUILD b/extra/xf86-video-ati/PKGBUILD index 47b339cd1..ce97f1169 100644 --- a/extra/xf86-video-ati/PKGBUILD +++ b/extra/xf86-video-ati/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 125569 2011-05-26 19:49:03Z andyrtr $ +# $Id: PKGBUILD 140344 2011-10-11 21:29:33Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-video-ati pkgver=6.14.2 -pkgrel=1 +pkgrel=2 pkgdesc="X.org ati video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=(libpciaccess libdrm udev pixman ati-dri) -makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.11.0' 'libdrm' 'xf86driproto' 'mesa' 'glproto') +conflicts=('xorg-server<1.11.0') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -md5sums=('111ec4aef32a4298df7e38afa8bef373') +sha1sums=('2733b3c126ad9e082ea18b7e7663d6d87fce4d49') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-ati/ati-fix-build-1.10.patch b/extra/xf86-video-ati/ati-fix-build-1.10.patch deleted file mode 100644 index 75980cbf3..000000000 --- a/extra/xf86-video-ati/ati-fix-build-1.10.patch +++ /dev/null @@ -1,38 +0,0 @@ -From ecfdb209afe2aafc378baab8c511f5df7b000270 Mon Sep 17 00:00:00 2001 -From: Sedat Dilek <sedat.dilek@googlemail.com> -Date: Fri, 25 Feb 2011 21:48:14 +0100 -Subject: [PATCH] UMS: Fix build against xserver 1.10-rc3 - -This issue was introduced due to last minute backout of RandR-1.4 -in xserver 1.10-rc3. - -Switch to "#ifdef RANDR_14_INTERFACE" as suggested by Keith Packard. -See also <http://lists.x.org/archives/xorg-devel/2011-February/019643.html>. - -Note: -The ddx needs a rebuild as the X video driver ABI changed to version 10.0. - -Reported-by: Alex Deucher <alexdeucher@gmail.com> -CC: Keith Packard <keithp@keithp.com> -Signed-off-by: Sedat Dilek <sedat.dilek@gmail.com> ---- - src/radeon_output.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/radeon_output.c b/src/radeon_output.c -index 15cef06..ccde346 100644 ---- a/src/radeon_output.c -+++ b/src/radeon_output.c -@@ -1622,7 +1622,7 @@ radeon_set_mode_for_property(xf86OutputPtr output) - xf86CrtcPtr crtc = output->crtc; - - if (crtc->enabled) { --#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,99,901,0) -+#ifdef RANDR_14_INTERFACE - xf86CrtcSetRec crtc_set_rec; - - crtc_set_rec.flags = (XF86CrtcSetMode | --- -1.7.1 - - diff --git a/extra/xf86-video-chips/PKGBUILD b/extra/xf86-video-chips/PKGBUILD index c190ad607..b0a05fdfe 100644 --- a/extra/xf86-video-chips/PKGBUILD +++ b/extra/xf86-video-chips/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 115295 2011-03-17 17:13:45Z andyrtr $ +# $Id: PKGBUILD 140342 2011-10-11 21:29:31Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-video-chips pkgver=1.2.4 -pkgrel=2 +pkgrel=3 pkgdesc="X.org Chips and Technologies video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=(glibc) -makedepends=('xorg-server-devel') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.11.0') +conflicts=('xorg-server<1.11.0') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('71f474335d05f93b2451a7a0750c4409669641a4') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + gut-overlay-8-16-support-from-driver.patch) +sha1sums=('71f474335d05f93b2451a7a0750c4409669641a4' + 'f6a635196118dacb73fad980571b390849963b3d') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/gut-overlay-8-16-support-from-driver.patch" ./configure --prefix=/usr make make DESTDIR="${pkgdir}" install diff --git a/extra/xf86-video-chips/gut-overlay-8-16-support-from-driver.patch b/extra/xf86-video-chips/gut-overlay-8-16-support-from-driver.patch new file mode 100644 index 000000000..b9c832238 --- /dev/null +++ b/extra/xf86-video-chips/gut-overlay-8-16-support-from-driver.patch @@ -0,0 +1,580 @@ +From e4bd864898fd276a62dac05cdfff394e98434f02 Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Tue, 29 Mar 2011 03:53:31 +0000 +Subject: chips: gut the overlay 8/16 support from driver. + +This driver is for chips that were bought by Intel in 1997, +this feature means maintaining a lot of code in the X server +for little gain. + +Drop it like its hot. + +Signed-off-by: Dave Airlie <airlied@redhat.com> +Reviewed-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/man/chips.man b/man/chips.man +index 740af38..0c022ee 100644 +--- a/man/chips.man ++++ b/man/chips.man +@@ -165,9 +165,6 @@ Force the use of memory mapped IO where it can be used. Default: off + Force driver to leave centering and stretching registers alone. This + can fix some laptop suspend/resume problems. Default: off + .TP +-.BI "Option \*qOverlay\*q" +-Enable 8+24 overlay mode. Only appropriate for depth 24. Default: off. +-.TP + .BI "Option \*qColorKey\*q \*q" integer \*q + Set the colormap index used for the transparency key for the depth 8 plane + when operating in 8+16 overlay mode. The value must be in the range +diff --git a/src/ct_accel.c b/src/ct_accel.c +index 3920b0a..4b5776a 100644 +--- a/src/ct_accel.c ++++ b/src/ct_accel.c +@@ -428,19 +428,7 @@ chips_imagewrite: + infoPtr->ImageWriteFlags |= NO_PLANEMASK; + #endif + +- +-#ifdef CHIPS_HIQV +- if (XAAInit(pScreen, infoPtr)) { +- if (cPtr->Flags & ChipsOverlay8plus16) +- return(XAAInitDualFramebufferOverlay(pScreen, +- CTNAME(DepthChange))); +- else +- return TRUE; +- } else +- return FALSE; +-#else + return(XAAInit(pScreen, infoPtr)); +-#endif + } + + #ifdef CHIPS_HIQV +@@ -1243,11 +1231,6 @@ CTNAME(SubsequentScreenToScreenColorExpandFill)(ScrnInfoPtr pScrn, + #endif + w *= cAcl->BytesPerPixel; + ctBLTWAIT; +-#ifdef CHIPS_HIQV +- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16) && +- (pScrn->depth == 8)) +- ctSETPITCH(cAcl->PitchInBytes << 1, cAcl->PitchInBytes); +-#endif + ctSETSRCADDR(srcaddr); + ctSETDSTADDR(destaddr); + #ifdef CHIPS_HIQV +@@ -1271,10 +1254,6 @@ CTNAME(SetupForColor8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty, + patternaddr = (paty * pScrn->displayWidth + + (patx & ~0x3F)) * cAcl->BytesPerPixel; + cAcl->patternyrot = (patx & 0x3F) >> 3; +-#ifdef CHIPS_HIQV +- if (cPtr->Flags & ChipsOverlay8plus16) +- patternaddr += cPtr->FbOffset16; +-#endif + + ctBLTWAIT; + ctSETPATSRCADDR(patternaddr); +@@ -1338,10 +1317,7 @@ CTNAME(SetupForMono8x8PatternFill)(ScrnInfoPtr pScrn, int patx, int paty, + + #ifdef CHIPS_HIQV + patternaddr = paty * pScrn->displayWidth + patx; +- if (cPtr->Flags & ChipsOverlay8plus16) +- patternaddr = patternaddr * 2 + cPtr->FbOffset16; +- else +- patternaddr *= cAcl->BytesPerPixel; ++ patternaddr *= cAcl->BytesPerPixel; + #else + patternaddr = (paty * pScrn->displayWidth + patx) * cAcl->BytesPerPixel; + #endif +@@ -1593,10 +1569,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, + dwords = (((skipleft + bytesPerLine + 0x7) & ~0x7)) >> 2; + destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); + destpitch = pScrn->displayWidth * (bpp >> 3); +- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) +- destaddr += cPtr->FbOffset16; +- else +- destaddr += cAcl->FbOffset; ++ destaddr += cAcl->FbOffset; + + ctBLTWAIT; + +@@ -1681,10 +1654,7 @@ CTNAME(WritePixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, + y++; + + destaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); +- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) +- destaddr += cPtr->FbOffset16; +- else +- destaddr += cAcl->FbOffset; ++ destaddr += cAcl->FbOffset; + + ctBLTWAIT; + ctSETDSTADDR(destaddr); +@@ -1717,10 +1687,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, + dwords = (((bytesPerLine + 0x7) & ~0x7)) >> 2; + srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); + srcpitch = pScrn->displayWidth * (bpp >> 3); +- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) +- srcaddr += cPtr->FbOffset16; +- else +- srcaddr += cAcl->FbOffset; ++ srcaddr += cAcl->FbOffset; + + ctBLTWAIT; + ctSETROP( ctDSTSYSTEM | ctLEFT2RIGHT | ctTOP2BOTTOM | +@@ -1755,10 +1722,7 @@ CTNAME(ReadPixmap)(ScrnInfoPtr pScrn, int x, int y, int w, int h, + dst += dstwidth; + y++; + srcaddr = (y * pScrn->displayWidth + x) * (bpp >> 3); +- if ((y >= pScrn->virtualY) && (cPtr->Flags & ChipsOverlay8plus16)) +- srcaddr += cPtr->FbOffset16; +- else +- srcaddr += cAcl->FbOffset; ++ srcaddr += cAcl->FbOffset; + ctBLTWAIT; + ctSETSRCADDR(srcaddr); + ctSETHEIGHTWIDTHGO(h, bytesPerLine); +diff --git a/src/ct_driver.c b/src/ct_driver.c +index 6624b79..08df050 100644 +--- a/src/ct_driver.c ++++ b/src/ct_driver.c +@@ -1639,55 +1639,15 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) + } + } + +- if ((s = xf86GetOptValString(cPtr->Options, OPTION_OVERLAY))) { +- if (!*s || !xf86NameCmp(s, "8,16") || !xf86NameCmp(s, "16,8")) { +- if (pScrn->bitsPerPixel == 16) { +- if (cPtr->Flags & ChipsLinearSupport) { +- cPtr->Flags |= ChipsOverlay8plus16; +- if(!xf86GetOptValInteger( +- cPtr->Options, OPTION_COLOR_KEY, &(pScrn->colorKey))) +- pScrn->colorKey = TRANSPARENCY_KEY; +- pScrn->overlayFlags = OVERLAY_8_16_DUALFB; +- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, +- "PseudoColor overlay enabled.\n"); +- if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_STRETCH)) +- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, +- " - Forcing option \"Stretch\" \"ON\".\n"); +- if (!xf86IsOptionSet(cPtr->Options, OPTION_LCD_CENTER)) +- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, +- " - Forcing option \"LcdCenter\" \"OFF\".\n"); +- if (cPtr->Flags & ChipsShadowFB) { +- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, +- " - Disabling \"Shadow Framebuffer\".\n"); +- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, +- " Not support with option \"8Plus16\".\n"); +- cPtr->Flags &= ~ChipsShadowFB; +- cPtr->Rotate = 0; +- } +- } else { +- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Option \"Overlay\" ignored. Not supported without linear addressing\n"); +- } +- } else { +- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, +- "Option \"Overlay\" is not supported in this configuration\n"); +- } +- } else { +- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, +- "\"%s\" is not a valid value for Option \"Overlay\"\n", s); +- } +- } +- +- if (!(cPtr->Flags & ChipsOverlay8plus16)) { +- if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY, +- &(cPtr->videoKey))) { +- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n", ++ if(xf86GetOptValInteger(cPtr->Options, OPTION_VIDEO_KEY, ++ &(cPtr->videoKey))) { ++ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "video key set to 0x%x\n", + cPtr->videoKey); +- } else { +- cPtr->videoKey = (1 << pScrn->offset.red) | ++ } else { ++ cPtr->videoKey = (1 << pScrn->offset.red) | + (1 << pScrn->offset.green) | + (((pScrn->mask.blue >> pScrn->offset.blue) - 1) + << pScrn->offset.blue); +- } + } + + if (cPtr->Flags & ChipsShadowFB) { +@@ -2335,28 +2295,16 @@ chipsPreInitHiQV(ScrnInfoPtr pScrn, int flags) + /* and 32bits on the others. Thus multiply by a suitable factor */ + if (cPtr->Flags & Chips64BitMemory) { + if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD)) +- if (cPtr->Flags & ChipsOverlay8plus16 ) +- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 4); +- else + cPtr->MaxClock = min(cPtr->MaxClock, + MemClk->Clk * 8 * 0.7 / (bytesPerPixel + 1)); + else +- if (cPtr->Flags & ChipsOverlay8plus16) +- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 8 * 0.7 / 3); +- else + cPtr->MaxClock = min(cPtr->MaxClock, + MemClk->Clk * 8 * 0.7 / bytesPerPixel); + } else { + if (cPtr->FrameBufferSize && (cPtr->PanelType & ChipsLCD)) +- if (cPtr->Flags & ChipsOverlay8plus16 ) +- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 4); +- else + cPtr->MaxClock = min(cPtr->MaxClock, + MemClk->Clk * 4 * 0.7 / (bytesPerPixel + 1)); + else +- if (cPtr->Flags & ChipsOverlay8plus16) +- cPtr->MaxClock = min(cPtr->MaxClock, MemClk->Clk * 4 * 0.7 / 3); +- else + cPtr->MaxClock = min(cPtr->MaxClock, + MemClk->Clk * 4 * 0.7 / bytesPerPixel); + } +@@ -3736,8 +3684,7 @@ CHIPSEnterVT(int scrnIndex, int flags) + /* Should we re-save the text mode on each VT enter? */ + if(!chipsModeInit(pScrn, pScrn->currentMode)) + return FALSE; +- if ((!(cPtr->Flags & ChipsOverlay8plus16)) +- && (cPtr->Flags & ChipsVideoSupport) ++ if ((cPtr->Flags & ChipsVideoSupport) + && (cPtr->Flags & ChipsLinearSupport)) + CHIPSResetVideo(pScrn); + +@@ -3788,8 +3735,7 @@ chipsLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, + int i, index, shift ; + CHIPSEntPtr cPtrEnt; + +- shift = ((pScrn->depth == 15) && +- (!(cPtr->Flags & ChipsOverlay8plus16))) ? 3 : 0; ++ shift = (pScrn->depth == 15) ? 3 : 0; + + if (cPtr->UseDualChannel) { + cPtrEnt = xf86GetEntityPrivate(pScrn->entityList[0], +@@ -3895,18 +3841,6 @@ chipsLoadPalette16(ScrnInfoPtr pScrn, int numColors, int *indices, + hwp->disablePalette(hwp); + } + +-static Bool +-cfb8_16ScreenInit(ScreenPtr pScreen, pointer pbits16, pointer pbits8, +- int xsize, int ysize, int dpix, int dpiy, +- int width16, int width8) +-{ +- return +- (fbOverlaySetupScreen(pScreen, pbits16, pbits8, xsize, ysize, +- dpix, dpiy, width16, width8, 16, 8) && +- fbOverlayFinishScreenInit(pScreen, pbits16, pbits8, xsize, ysize, +- dpix, dpiy, width16, width8, 16, 8, 16, 8)); +-} +- + /* Mandatory */ + static Bool + CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) +@@ -3947,22 +3881,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + if (!chipsMapMem(pScrn)) + return FALSE; + +- /* Setup a pointer to the overlay if needed */ +- if (cPtr->Flags & ChipsOverlay8plus16) { +- cPtr->FbOffset16 = pScrn->displayWidth * pScrn->virtualY; +- cPtr->FbSize16 = (pScrn->displayWidth << 1) * pScrn->virtualY; +- if (cPtr->FbSize16 > (cPtr->FbMapSize - cPtr->FrameBufferSize)) { +- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, +- "Too little memory for overlay. Disabling.\n"); +- cPtr->Flags &= ~ChipsOverlay8plus16; +- } +- if ((pScrn->displayWidth > 1024) || (pScrn->virtualY > 1024)) { +- xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, +- "Max overlay Width/Height 1024 pixels. Disabling.\n"); +- cPtr->Flags &= ~ChipsOverlay8plus16; +- } +- } +- + /* Setup the MMIO register access functions if need */ + if (cPtr->UseFullMMIO && cPtr->MMIOBaseVGA) { + CHIPSSetMmioExtFuncs(cPtr); +@@ -4035,18 +3953,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + miClearVisualTypes(); + + /* Setup the visuals we support. */ +- if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)){ +- if (!miSetVisualTypes(8, PseudoColorMask | GrayScaleMask, +- pScrn->rgbBits, PseudoColor)) +- return FALSE; +- if (!miSetVisualTypes(16, TrueColorMask, pScrn->rgbBits, TrueColor)) +- return FALSE; +- } else { +- if (!miSetVisualTypes(pScrn->depth, ++ if (!miSetVisualTypes(pScrn->depth, + miGetDefaultVisualMask(pScrn->depth), + pScrn->rgbBits, pScrn->defaultVisual)) +- return FALSE; +- } ++ return FALSE; + miSetPixmapDepths (); + + /* +@@ -4090,13 +4000,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + break; + #endif + case 16: +- if (cPtr->Flags & ChipsOverlay8plus16) { +- ret = cfb8_16ScreenInit(pScreen, (unsigned char *)FBStart + +- cPtr->FbOffset16, FBStart, width, +- height, pScrn->xDpi, pScrn->yDpi, +- displayWidth, displayWidth); +- break; +- } + default: + ret = fbScreenInit(pScreen, FBStart, + width,height, +@@ -4244,9 +4147,6 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + if (pScrn->bitsPerPixel < 8) + freespace = allocatebase - pScrn->displayWidth * + pScrn->virtualY / 2; +- else if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) +- freespace = allocatebase - pScrn->displayWidth * +- pScrn->virtualY - cPtr->FbSize16; + else + freespace = allocatebase - pScrn->displayWidth * + pScrn->virtualY * (pScrn->bitsPerPixel >> 3); +@@ -4369,9 +4269,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + AvailFBArea.y2 = cAcl->CacheEnd / + (pScrn->displayWidth * (pScrn->bitsPerPixel >> 3)); + +- if (!(cPtr->Flags & ChipsOverlay8plus16)) { +- xf86InitFBManager(pScreen, &AvailFBArea); +- } ++ xf86InitFBManager(pScreen, &AvailFBArea); + } + if (cPtr->Flags & ChipsAccelSupport) { + if (IS_HiQV(cPtr)) { +@@ -4425,16 +4323,10 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + if (!miCreateDefColormap(pScreen)) + return FALSE; + +- if ((cPtr->Flags & ChipsOverlay8plus16) && (pScrn->bitsPerPixel == 16)) { +- if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, chipsLoadPalette, +- NULL, CMAP_RELOAD_ON_MODE_SWITCH)) +- return FALSE; +- } else { +- if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, ++ if(!xf86HandleColormaps(pScreen, 256, pScrn->rgbBits, + (pScrn->depth == 16 ? chipsLoadPalette16 : chipsLoadPalette), + NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR)) +- return FALSE; +- } ++ return FALSE; + + #ifndef XSERVER_LIBPCIACCESS + racflag = RAC_COLORMAP; +@@ -4448,8 +4340,7 @@ CHIPSScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + xf86SetSilkenMouse(pScreen); + #endif + +- if ((!(cPtr->Flags & ChipsOverlay8plus16)) +- && (cPtr->Flags & ChipsVideoSupport) ++ if ((cPtr->Flags & ChipsVideoSupport) + && (cPtr->Flags & ChipsLinearSupport)) { + CHIPSInitVideo(pScreen); + } +@@ -4522,10 +4413,7 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags) + Base >>= 3; + break; + case 16: +- if (!(cPtr->Flags & ChipsOverlay8plus16)) +- Base >>= 1; +- else +- Base >>= 2; ++ Base >>= 1; + break; + case 24: + if (!IS_HiQV(cPtr)) +@@ -4581,14 +4469,6 @@ CHIPSAdjustFrame(int scrnIndex, int x, int y, int flags) + cPtr->writeMSS(cPtr, hwp, MSS); + } + +- if (cPtr->Flags & ChipsOverlay8plus16) { +- Base = (Base << 3) & ~(unsigned long)0xF; +- +- cPtr->writeMR(cPtr, 0x22, (cPtr->FbOffset16 + Base) & 0xF8); +- cPtr->writeMR(cPtr, 0x23, ((cPtr->FbOffset16 + Base) >> 8) & 0xFF); +- cPtr->writeMR(cPtr, 0x24, ((cPtr->FbOffset16 + Base) >> 16) & 0xFF); +- } +- + } + + /* Mandatory */ +@@ -4652,13 +4532,6 @@ CHIPSValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) + ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + CHIPSPtr cPtr = CHIPSPTR(pScrn); + +- if (flags & MODECHECK_FINAL) { +- /* Don't subtract FrambufferSize here as it should be subtracted already */ +- if ((cPtr->Flags & ChipsOverlay8plus16) +- && ((pScrn->videoRam<<10) - pScrn->displayWidth * 3 * pScrn->virtualY +- < 0)) +- return MODE_MEM; +- } + /* The tests here need to be expanded */ + if ((mode->Flags & V_INTERLACE) && (cPtr->PanelType & ChipsLCD)) + return MODE_NO_INTERLACE; +@@ -5544,12 +5417,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) + } else { + ChipsStd->Attribute[0x10] = 0x01; /* mode */ + } +- if ((pScrn->bitsPerPixel == 16) && (cPtr->Flags & ChipsOverlay8plus16)) { +- /* Make sure that the overlay isn't visible in the overscan region */ +- if (ChipsStd->Attribute[0x11] == pScrn->colorKey) +- ChipsStd->Attribute[0x11] = pScrn->colorKey - 1; +- } else +- ChipsStd->Attribute[0x11] = 0x00; /* overscan (border) color */ ++ ChipsStd->Attribute[0x11] = 0x00; /* overscan (border) color */ + ChipsStd->Attribute[0x12] = 0x0F; /* enable all color planes */ + ChipsStd->Attribute[0x13] = 0x00; /* horiz pixel panning 0 */ + +@@ -5558,8 +5426,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) + /* set virtual screen width */ + tmp = pScrn->displayWidth >> 3; + if (pScrn->bitsPerPixel == 16) { +- if (!(cPtr->Flags & ChipsOverlay8plus16)) +- tmp <<= 1; /* double the width of the buffer */ ++ tmp <<= 1; /* double the width of the buffer */ + } else if (pScrn->bitsPerPixel == 24) { + tmp += tmp << 1; + } else if (pScrn->bitsPerPixel == 32) { +@@ -5688,8 +5555,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) + + /* centering/stretching */ + if (!xf86ReturnOptValBool(cPtr->Options, OPTION_SUSPEND_HACK, FALSE)) { +- if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE) || +- (cPtr->Flags & ChipsOverlay8plus16)) { ++ if (!xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_STRETCH, FALSE)) { + ChipsNew->FR[0x40] &= 0xDF; /* Disable Horizontal stretching */ + ChipsNew->FR[0x48] &= 0xFB; /* Disable vertical stretching */ + ChipsNew->XR[0xA0] = 0x10; /* Disable cursor stretching */ +@@ -5709,8 +5575,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) + } + } + +- if ((xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) +- || (cPtr->Flags & ChipsOverlay8plus16)) { ++ if (xf86ReturnOptValBool(cPtr->Options, OPTION_LCD_CENTER, TRUE)) { + ChipsNew->FR[0x40] |= 0x3; /* Enable Horizontal centering */ + ChipsNew->FR[0x48] |= 0x3; /* Enable Vertical centering */ + } else { +@@ -5723,8 +5588,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) + ChipsNew->XR[0x82] |=0x02; + + /* software mode flag */ +- ChipsNew->XR[0xE2] = chipsVideoMode(((cPtr->Flags & ChipsOverlay8plus16) ? +- 8 : pScrn->depth), (cPtr->PanelType & ChipsLCD) ? ++ ChipsNew->XR[0xE2] = chipsVideoMode((pScrn->depth), (cPtr->PanelType & ChipsLCD) ? + min(mode->CrtcHDisplay, cPtr->PanelSize.HDisplay) : + mode->CrtcHDisplay, mode->CrtcVDisplay); + #ifdef DEBUG +@@ -5762,7 +5626,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) + } + } + /* bpp depend */ +- if ((pScrn->bitsPerPixel == 16) && (!(cPtr->Flags & ChipsOverlay8plus16))) { ++ if (pScrn->bitsPerPixel == 16) { + ChipsNew->XR[0x81] = (ChipsNew->XR[0x81] & 0xF0) | 0x4; + if (cPtr->Flags & ChipsGammaSupport) + ChipsNew->XR[0x82] |= 0x0C; +@@ -5915,60 +5779,7 @@ chipsModeInitHiQV(ScrnInfoPtr pScrn, DisplayModePtr mode) + /* Turn off multimedia by default as it degrades performance */ + ChipsNew->XR[0xD0] &= 0x0f; + +- /* Setup the video/overlay */ +- if (cPtr->Flags & ChipsOverlay8plus16) { +- ChipsNew->XR[0xD0] |= 0x10; /* Force the Multimedia engine on */ +-#ifdef SAR04 +- ChipsNew->XR[0x4F] = 0x2A; /* SAR04 >352 pixel overlay width */ +-#endif +- ChipsNew->MR[0x1E] &= 0xE0; /* Set Zoom and Direction */ +- if ((!(cPtr->PanelType & ChipsLCD)) && (mode->Flags & V_INTERLACE)) +- ChipsNew->MR[0x1E] |= 0x10; /* Interlace */ +- ChipsNew->MR[0x1F] &= 0x14; /* Mask reserved bits */ +- ChipsNew->MR[0x1F] |= 0x08; /* RGB 16bpp */ +- if (pScrn->weight.green == 5) +- ChipsNew->MR[0x1F] |= 0x01; /* RGB 15bpp */ +- +- ChipsNew->MR[0x20] &= 0x03; /* Mask reserved bits */ +- ChipsNew->MR[0x20] |= 0x80; /* Auto Centre, Use mem ptr1 */ +- ChipsNew->MR[0x22] = cPtr->FbOffset16 & 0xF8; /* Setup Pointer 1 */ +- ChipsNew->MR[0x23] = (cPtr->FbOffset16 >> 8) & 0xFF; +- ChipsNew->MR[0x24] = (cPtr->FbOffset16 >> 16) & 0xFF; +- ChipsNew->MR[0x25] = cPtr->FbOffset16 & 0xF8; /* Setup Pointer 2 */ +- ChipsNew->MR[0x26] = (cPtr->FbOffset16 >> 8) & 0xFF; +- ChipsNew->MR[0x27] = (cPtr->FbOffset16 >> 16) & 0xFF; +- ChipsNew->MR[0x28] = (pScrn->displayWidth >> 2) - 1; /* Width */ +- ChipsNew->MR[0x34] = (pScrn->displayWidth >> 2) - 1; +- +- /* Left Edge of Overlay */ +- ChipsNew->MR[0x2A] = cPtr->OverlaySkewX; +- ChipsNew->MR[0x2B] &= 0xF8; /* Mask reserved bits */ +- ChipsNew->MR[0x2B] |= ((cPtr->OverlaySkewX >> 8) & 0x7); +- /* Right Edge of Overlay */ +- ChipsNew->MR[0x2C] = (cPtr->OverlaySkewX + pScrn->displayWidth - +- 1) & 0xFF; +- ChipsNew->MR[0x2D] &= 0xF8; /* Mask reserved bits */ +- ChipsNew->MR[0x2D] |= ((cPtr->OverlaySkewX + pScrn->displayWidth - +- 1) >> 8) & 0x07; +- /* Top Edge of Overlay */ +- ChipsNew->MR[0x2E] = cPtr->OverlaySkewY; +- ChipsNew->MR[0x2F] &= 0xF8; +- ChipsNew->MR[0x2F] |= ((cPtr->OverlaySkewY >> 8) & 0x7); +- /* Bottom Edge of Overlay*/ +- ChipsNew->MR[0x30] = (cPtr->OverlaySkewY + pScrn->virtualY - 1 )& 0xFF; +- ChipsNew->MR[0x31] &= 0xF8; /* Mask reserved bits */ +- ChipsNew->MR[0x31] |= ((cPtr->OverlaySkewY + pScrn->virtualY - +- 1 ) >> 8) & 0x07; +- +- ChipsNew->MR[0x3C] &= 0x18; /* Mask reserved bits */ +- ChipsNew->MR[0x3C] |= 0x07; /* Enable keyed overlay window */ +- ChipsNew->MR[0x3D] = 0x00; +- ChipsNew->MR[0x3E] = 0x00; +- ChipsNew->MR[0x3F] = pScrn->colorKey; /* 8bpp transparency key */ +- ChipsNew->MR[0x40] = 0xFF; +- ChipsNew->MR[0x41] = 0xFF; +- ChipsNew->MR[0x42] = 0x00; +- } else if (cPtr->Flags & ChipsVideoSupport) { ++ if (cPtr->Flags & ChipsVideoSupport) { + #if 0 /* if we do this even though video isn't playing we kill performance */ + ChipsNew->XR[0xD0] |= 0x10; /* Force the Multimedia engine on */ + #endif +@@ -6877,8 +6688,7 @@ chipsRestoreExtendedRegs(ScrnInfoPtr pScrn, CHIPSRegPtr Regs) + } + + /* Set SAR04 multimedia register correctly */ +- if ((cPtr->Flags & ChipsOverlay8plus16) +- || (cPtr->Flags & ChipsVideoSupport)) { ++ if ((cPtr->Flags & ChipsVideoSupport)) { + #ifdef SAR04 + cPtr->writeXR(cPtr, 0x4E, 0x04); + if (cPtr->readXR(cPtr, 0x4F) != Regs->XR[0x4F]) +diff --git a/src/ct_driver.h b/src/ct_driver.h +index d8ce228..10a24d4 100644 +--- a/src/ct_driver.h ++++ b/src/ct_driver.h +@@ -114,7 +114,6 @@ typedef struct { + /* Options flags for the C&T chipsets */ + #define ChipsHWCursor 0x00001000 + #define ChipsShadowFB 0x00002000 +-#define ChipsOverlay8plus16 0x00004000 + #define ChipsUseNewFB 0x00008000 + + /* Architecture type flags */ +diff --git a/src/ct_video.c b/src/ct_video.c +index a68acb9..c9e5bb4 100644 +--- a/src/ct_video.c ++++ b/src/ct_video.c +@@ -56,8 +56,7 @@ CHIPSInitVideo(ScreenPtr pScreen) + CHIPSPtr cPtr = CHIPSPTR(pScrn); + int num_adaptors; + +- if (!(cPtr->Flags & ChipsOverlay8plus16) && +- (cPtr->Flags & ChipsVideoSupport)) { ++ if ((cPtr->Flags & ChipsVideoSupport)) { + newAdaptor = CHIPSSetupImageVideo(pScreen); + CHIPSInitOffscreenImages(pScreen); + } +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/xf86-video-cirrus/LICENSE b/extra/xf86-video-cirrus/LICENSE deleted file mode 100644 index bb283cf4d..000000000 --- a/extra/xf86-video-cirrus/LICENSE +++ /dev/null @@ -1,22 +0,0 @@ -This package was downloaded from -http://xorg.freedesktop.org/releases/individual/driver/ - -Copyright 2000 by Egbert Eich - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that -copyright notice and this permission notice appear in supporting -documentation, and that the name of Alan Hourihane not be used in -advertising or publicity pertaining to distribution of the software without -specific, written prior permission. Alan Hourihane makes no representations -about the suitability of this software for any purpose. It is provided -"as is" without express or implied warranty. - -EGBERT EICH DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO -EVENT SHALL ALAN HOURIHANE BE LIABLE FOR ANY SPECIAL, INDIRECT OR -CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. diff --git a/extra/xf86-video-cirrus/PKGBUILD b/extra/xf86-video-cirrus/PKGBUILD index 7c9c76d07..3a9024d8d 100644 --- a/extra/xf86-video-cirrus/PKGBUILD +++ b/extra/xf86-video-cirrus/PKGBUILD @@ -1,22 +1,20 @@ -# $Id: PKGBUILD 115298 2011-03-17 17:18:57Z andyrtr $ +# $Id: PKGBUILD 140340 2011-10-11 21:29:29Z jgc $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-cirrus pkgver=1.3.2 -pkgrel=6 +pkgrel=7 pkgdesc="X.org Cirrus Logic video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.10.99.902') +conflicts=('xorg-server<1.10.99.902') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - LICENSE) -md5sums=('8195d03ed0be0975c03441e66a9f53b3' - 'b9b570ac5c03f1fbe3e0cee5fe884b82') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +md5sums=('8195d03ed0be0975c03441e66a9f53b3') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -24,5 +22,5 @@ build() { make make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/extra/xf86-video-dummy/PKGBUILD b/extra/xf86-video-dummy/PKGBUILD index 8332a0ff4..7dbc457fe 100644 --- a/extra/xf86-video-dummy/PKGBUILD +++ b/extra/xf86-video-dummy/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 115301 2011-03-17 17:21:06Z andyrtr $ +# $Id: PKGBUILD 140338 2011-10-11 21:29:27Z jgc $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-dummy pkgver=0.3.4 -pkgrel=4 +pkgrel=5 pkgdesc="X.org dummy video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel' 'xf86dgaproto') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.10.99.902' 'xf86dgaproto') +conflicts=('xorg-server<1.10.99.902') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-fbdev/PKGBUILD b/extra/xf86-video-fbdev/PKGBUILD index cc8854074..6b1f05cfe 100644 --- a/extra/xf86-video-fbdev/PKGBUILD +++ b/extra/xf86-video-fbdev/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 115309 2011-03-17 17:26:03Z andyrtr $ +# $Id: PKGBUILD 140336 2011-10-11 21:29:25Z jgc $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-fbdev pkgver=0.4.2 -pkgrel=4 +pkgrel=5 pkgdesc="X.org framebuffer video driver" arch=(i686 x86_64 'mips64el') license=('custom') url="http://xorg.freedesktop.org/" depends=('glibc') -makedepends=('xorg-server-devel') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.10.99.902') +conflicts=('xorg-server<1.10.99.902') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-glint/PKGBUILD b/extra/xf86-video-glint/PKGBUILD index 5483e651f..0b606721e 100644 --- a/extra/xf86-video-glint/PKGBUILD +++ b/extra/xf86-video-glint/PKGBUILD @@ -1,24 +1,24 @@ -# $Id: PKGBUILD 115314 2011-03-17 17:29:52Z andyrtr $ +# $Id: PKGBUILD 140334 2011-10-11 21:29:22Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-glint -pkgver=1.2.5 -pkgrel=2 +pkgver=1.2.6 +pkgrel=1 pkgdesc="X.org GLINT/Permedia video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel' 'xf86dgaproto') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.11.0' 'xf86dgaproto') +conflicts=('xorg-server<1.11.0') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('28d54093c6485bf0055fa16be3d116f9107aaea7') +sha256sums=('d43350ed3c149576db1dbcacf5e9a30a3268a3f49742724c9151b6f1e4bd21a7') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-dri + ./configure --prefix=/usr make make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" diff --git a/extra/xf86-video-i128/PKGBUILD b/extra/xf86-video-i128/PKGBUILD index 07daad5ba..3b0db9e15 100644 --- a/extra/xf86-video-i128/PKGBUILD +++ b/extra/xf86-video-i128/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 115322 2011-03-17 17:39:36Z andyrtr $ +# $Id: PKGBUILD 140332 2011-10-11 21:29:18Z jgc $ # Maintainer:Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-i128 pkgver=1.3.4 -pkgrel=3 +pkgrel=4 pkgdesc="X.org Number 9 I128 video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.10.99.902') +conflicts=('xorg-server<1.10.99.902') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-i740/PKGBUILD b/extra/xf86-video-i740/PKGBUILD index 49bcf9de7..1d7e2446e 100644 --- a/extra/xf86-video-i740/PKGBUILD +++ b/extra/xf86-video-i740/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 115325 2011-03-17 17:41:18Z andyrtr $ +# $Id: PKGBUILD 140330 2011-10-11 21:29:14Z jgc $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-i740 pkgver=1.3.2 -pkgrel=6 +pkgrel=7 pkgdesc="X.org Intel i740 video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.10.99.902') +conflicts=('xorg-server<1.10.99.902') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index ed9252daa..b083bfe78 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,28 +1,24 @@ -# $Id: PKGBUILD 125851 2011-05-30 12:49:55Z jgc $ +# $Id: PKGBUILD 140328 2011-10-11 21:29:11Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.15.0 -pkgrel=2 +pkgver=2.16.0 +pkgrel=1 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=(intel-dri libxvmc libpciaccess libdrm xcb-util libxfixes udev) -makedepends=('xorg-server-devel' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'xcb-util') -conflicts=('xorg-server<1.10.0' 'xf86-video-i810' 'xf86-video-intel-legacy') +makedepends=('xorg-server-devel>=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'libxvmc' 'xcb-util' 'libxrender') +conflicts=('xorg-server<1.10.99.902' 'xf86-video-i810' 'xf86-video-intel-legacy') options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - git-fixes.patch) -sha1sums=('78ec39a4470cfc0bf13d269fb915f6c5a498ee62' - 'd7a9102e58c1d6c1bcb99ff6836146bd54a18161') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('53441ea4d4335b501d32809b6b92593cbb1f79cf') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/git-fixes.patch" - autoreconf ./configure --prefix=/usr --enable-dri make } diff --git a/extra/xf86-video-intel/git-fixes.patch b/extra/xf86-video-intel/git-fixes.patch deleted file mode 100644 index 7ee0d50bb..000000000 --- a/extra/xf86-video-intel/git-fixes.patch +++ /dev/null @@ -1,1050 +0,0 @@ -diff --git a/NEWS b/NEWS -index ea92bcf..61866b0 100644 ---- a/NEWS -+++ b/NEWS -@@ -2,9 +2,9 @@ Release 2.15.0 (2011-04-14) - ============================== - We are pleased to announce this major release of the xf86-video-intel - driver, roughly on schedule at 3 months since 2.14.0. With the many bug --fixes in this release, we encourage everyone to upgrade to 2.14. -+fixes in this release, we encourage everyone to upgrade to 2.15. - --The priority for this quarter has been simply to unexciting and stabilise -+The priority for this quarter has been simply to be unexciting and stabilise - the driver further, seeking to capitalise upon the improvements elsewhere - in the stack. - -diff --git a/configure.ac b/configure.ac -index fd5a3cf..9449e56 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -77,9 +77,7 @@ AC_ARG_WITH(xorg-module-dir, - [moduledir="$libdir/xorg/modules"]) - - AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri], -- [Disable DRI support [[default=auto]]]), -- [DRI="$enableval"], -- [DRI=auto]) -+ [Disable DRI support [[default=auto]]])) - - AC_ARG_ENABLE(xvmc, AS_HELP_STRING([--disable-xvmc], - [Disable XvMC support [[default=yes]]]), -@@ -106,40 +104,48 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) - # Obtain compiler/linker options for the driver dependencies - PKG_CHECK_MODULES(XORG, [xorg-server >= 1.6 xproto fontsproto $REQUIRED_MODULES]) - PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.23]) -+PKG_CHECK_MODULES(DRI, [xf86driproto], , DRI=no) - PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) - - sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` - --save_CFLAGS="$CFLAGS" --CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" --CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" --AC_MSG_CHECKING([whether to include DRI support]) --if test x$DRI != xno; then -- AC_CHECK_FILE([${sdkdir}/dri.h], -- [have_dri_h="yes"], [have_dri_h="no"]) -- AC_CHECK_FILE([${sdkdir}/sarea.h], -- [have_sarea_h="yes"], [have_sarea_h="no"]) -- AC_CHECK_FILE([${sdkdir}/dristruct.h], -- [have_dristruct_h="yes"], [have_dristruct_h="no"]) -+if test "x$enable_dri" != "xno"; then -+ save_CFLAGS="$CFLAGS" -+ save_CPPFLAGS="$CPPFLAGS" -+ CFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" -+ CPPFLAGS="$XORG_CFLAGS $DRI_CFLAGS $DRM_CFLAGS" -+ AC_CHECK_HEADERS([dri.h sarea.h dristruct.h],, [DRI=no], -+ [/* for dri.h */ -+ #include <xf86str.h> -+ /* for dristruct.h */ -+ #include <xorg-server.h> -+ #ifdef HAVE_DRI_H -+ # include <dri.h> -+ #endif -+ #ifdef HAVE_SAREA_H -+ # include <sarea.h> -+ #endif -+ ]) -+ CFLAGS="$save_CFLAGS $DEBUGFLAGS" -+ CPPFLAGS="$save_CPPFLAGS" -+else -+ DRI=no - fi -+ - AC_MSG_CHECKING([whether to include DRI support]) --if test x$DRI = xauto; then -- if test "$have_dri_h" = yes -a \ -- "$have_sarea_h" = yes -a \ -- "$have_dristruct_h" = yes; then -- DRI="yes" -- else -- DRI="no" -- fi --fi --AC_MSG_RESULT([$DRI]) --CFLAGS="$save_CFLAGS $DEBUGFLAGS" -+AC_MSG_RESULT([${DRI-yes}]) - --AM_CONDITIONAL(DRI, test x$DRI = xyes) --if test "$DRI" = yes; then -- PKG_CHECK_MODULES(DRI, [xf86driproto]) -+AM_CONDITIONAL(DRI, test x$DRI != xno) -+if test "x$DRI" != "xno"; then - AC_DEFINE(XF86DRI,1,[Enable DRI driver support]) - AC_DEFINE(XF86DRI_DEVEL,1,[Enable developmental DRI driver support]) -+else -+ DRI_CFLAGS="" -+ DRI_LIBS="" -+ -+ if test "x$enable_dri" = "xyes"; then -+ AC_MSG_ERROR([DRI requested but prerequisites not found]) -+ fi - fi - - if test "$XVMC" = yes; then -diff --git a/src/i965_render.c b/src/i965_render.c -index bfcd3f2..b76107d 100644 ---- a/src/i965_render.c -+++ b/src/i965_render.c -@@ -182,6 +182,10 @@ i965_check_composite(int op, - int width, int height) - { - ScrnInfoPtr scrn = xf86Screens[dest_picture->pDrawable->pScreen->myNum]; -+ intel_screen_private *intel = intel_get_screen_private(scrn); -+ -+ if (IS_GEN7(intel)) -+ return FALSE; - - /* Check for unsupported compositing operations. */ - if (op >= sizeof(i965_blend_op) / sizeof(i965_blend_op[0])) { -diff --git a/src/i965_video.c b/src/i965_video.c -index c757681..53a9394 100644 ---- a/src/i965_video.c -+++ b/src/i965_video.c -@@ -1210,7 +1210,7 @@ I965DisplayVideoTextured(ScrnInfoPtr scrn, - intel_batch_submit(scrn); - } - -- intel_batch_start_atomic(scrn, 100); -+ intel_batch_start_atomic(scrn, 150); - - i965_emit_video_setup(scrn, surface_state_binding_table_bo, n_src_surf, pixmap); - -diff --git a/src/intel_batchbuffer.c b/src/intel_batchbuffer.c -index 289ed2b..d0a41aa 100644 ---- a/src/intel_batchbuffer.c -+++ b/src/intel_batchbuffer.c -@@ -175,13 +175,6 @@ void intel_batch_emit_flush(ScrnInfoPtr scrn) - intel_batch_do_flush(scrn); - } - --static Bool intel_batch_needs_flush(intel_screen_private *intel) --{ -- ScreenPtr screen = intel->scrn->pScreen; -- PixmapPtr pixmap = screen->GetScreenPixmap(screen); -- return intel_get_pixmap_private(pixmap)->batch_write; --} -- - void intel_batch_submit(ScrnInfoPtr scrn) - { - intel_screen_private *intel = intel_get_screen_private(scrn); -@@ -218,7 +211,9 @@ void intel_batch_submit(ScrnInfoPtr scrn) - ret = drm_intel_bo_mrb_exec(intel->batch_bo, - intel->batch_used*4, - NULL, 0, 0xffffffff, -- IS_GEN6(intel) ? intel->current_batch: I915_EXEC_DEFAULT); -+ (HAS_BLT(intel) ? -+ intel->current_batch: -+ I915_EXEC_DEFAULT)); - } - - if (ret != 0) { -@@ -241,8 +236,6 @@ void intel_batch_submit(ScrnInfoPtr scrn) - } - } - -- intel->needs_flush |= intel_batch_needs_flush(intel); -- - while (!list_is_empty(&intel->batch_pixmaps)) { - struct intel_pixmap *entry; - -diff --git a/src/intel_batchbuffer.h b/src/intel_batchbuffer.h -index 605932a..f5f118e 100644 ---- a/src/intel_batchbuffer.h -+++ b/src/intel_batchbuffer.h -@@ -50,14 +50,14 @@ static inline int intel_vertex_space(intel_screen_private *intel) - } - - static inline void --intel_batch_require_space(ScrnInfoPtr scrn, intel_screen_private *intel, unsigned int sz) -+intel_batch_require_space(ScrnInfoPtr scrn, intel_screen_private *intel, int sz) - { - assert(sz < intel->batch_bo->size - 8); - if (intel_batch_space(intel) < sz) - intel_batch_submit(scrn); - } - --static inline void intel_batch_start_atomic(ScrnInfoPtr scrn, unsigned int sz) -+static inline void intel_batch_start_atomic(ScrnInfoPtr scrn, int sz) - { - intel_screen_private *intel = intel_get_screen_private(scrn); - -@@ -137,6 +137,8 @@ intel_batch_mark_pixmap_domains(intel_screen_private *intel, - - priv->batch_write |= write_domain != 0; - priv->busy = 1; -+ -+ intel->needs_flush |= write_domain != 0; - } - - static inline void -diff --git a/src/intel_display.c b/src/intel_display.c -index b6592c4..b55b110 100644 ---- a/src/intel_display.c -+++ b/src/intel_display.c -@@ -1607,7 +1607,7 @@ Bool intel_mode_pre_init(ScrnInfoPtr scrn, int fd, int cpp) - gp.value = &has_flipping; - (void)drmCommandWriteRead(intel->drmSubFD, DRM_I915_GETPARAM, &gp, - sizeof(gp)); -- if (has_flipping) { -+ if (has_flipping && intel->swapbuffers_wait) { - xf86DrvMsg(scrn->scrnIndex, X_INFO, - "Kernel page flipping support detected, enabling\n"); - intel->use_pageflipping = TRUE; -diff --git a/src/intel_dri.c b/src/intel_dri.c -index a39b512..48d0f56 100644 ---- a/src/intel_dri.c -+++ b/src/intel_dri.c -@@ -182,6 +182,8 @@ static PixmapPtr fixup_shadow(DrawablePtr drawable, PixmapPtr pixmap) - /* And redirect the pixmap to the new bo (for 3D). */ - intel_set_pixmap_private(old, priv); - old->refcnt++; -+ -+ intel_get_screen_private(xf86Screens[screen->myNum])->needs_flush = TRUE; - return old; - } - -@@ -425,7 +427,7 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion, - - /* Wait for the scanline to be outside the region to be copied */ - if (pixmap_is_scanout(get_drawable_pixmap(dst)) && -- intel->swapbuffers_wait) { -+ intel->swapbuffers_wait && INTEL_INFO(intel)->gen < 60) { - BoxPtr box; - BoxRec crtcbox; - int y1, y2; -diff --git a/src/intel_driver.c b/src/intel_driver.c -index e867351..8666421 100644 ---- a/src/intel_driver.c -+++ b/src/intel_driver.c -@@ -84,7 +84,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - - typedef enum { -- OPTION_ACCELMETHOD, - OPTION_DRI, - OPTION_VIDEO_KEY, - OPTION_COLOR_KEY, -@@ -105,7 +104,6 @@ typedef enum { - } I830Opts; - - static OptionInfoRec I830Options[] = { -- {OPTION_ACCELMETHOD, "AccelMethod", OPTV_ANYSTR, {0}, FALSE}, - {OPTION_DRI, "DRI", OPTV_BOOLEAN, {0}, TRUE}, - {OPTION_COLOR_KEY, "ColorKey", OPTV_INTEGER, {0}, FALSE}, - {OPTION_VIDEO_KEY, "VideoKey", OPTV_INTEGER, {0}, FALSE}, -@@ -328,10 +326,10 @@ static void intel_check_dri_option(ScrnInfoPtr scrn) - if (!xf86ReturnOptValBool(intel->Options, OPTION_DRI, TRUE)) - intel->directRenderingType = DRI_DISABLED; - -- if (scrn->depth != 16 && scrn->depth != 24) { -+ if (scrn->depth != 16 && scrn->depth != 24 && scrn->depth != 30) { - xf86DrvMsg(scrn->scrnIndex, X_CONFIG, - "DRI is disabled because it " -- "runs only at depths 16 and 24.\n"); -+ "runs only at depths 16, 24, and 30.\n"); - intel->directRenderingType = DRI_DISABLED; - } - } -@@ -586,6 +584,7 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags) - case 15: - case 16: - case 24: -+ case 30: - break; - default: - xf86DrvMsg(scrn->scrnIndex, X_ERROR, -@@ -658,8 +657,6 @@ static Bool I830PreInit(ScrnInfoPtr scrn, int flags) - intel->swapbuffers_wait = xf86ReturnOptValBool(intel->Options, - OPTION_SWAPBUFFERS_WAIT, - TRUE); -- if (IS_GEN6(intel)) -- intel->swapbuffers_wait = FALSE; - - xf86DrvMsg(scrn->scrnIndex, X_CONFIG, "Framebuffer %s\n", - intel->tiling & INTEL_TILING_FB ? "tiled" : "linear"); -diff --git a/src/intel_driver.h b/src/intel_driver.h -index 2e72177..4a584fe 100644 ---- a/src/intel_driver.h -+++ b/src/intel_driver.h -@@ -184,6 +184,13 @@ - #define PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS 0x0126 - #define PCI_CHIP_SANDYBRIDGE_BRIDGE_S 0x0108 /* Server */ - #define PCI_CHIP_SANDYBRIDGE_S_GT 0x010A -+ -+#define PCI_CHIP_IVYBRIDGE_M_GT1 0x0156 -+#define PCI_CHIP_IVYBRIDGE_M_GT2 0x0166 -+#define PCI_CHIP_IVYBRIDGE_D_GT1 0x0152 -+#define PCI_CHIP_IVYBRIDGE_D_GT2 0x0162 -+#define PCI_CHIP_IVYBRIDGE_S_GT1 0x015a -+ - #endif - - #define I85X_CAPID 0x44 -@@ -209,6 +216,7 @@ - #define IS_GEN4(intel) IS_GENx(intel, 4) - #define IS_GEN5(intel) IS_GENx(intel, 5) - #define IS_GEN6(intel) IS_GENx(intel, 6) -+#define IS_GEN7(intel) IS_GENx(intel, 7) - - /* Some chips have specific errata (or limits) that we need to workaround. */ - #define IS_I830(intel) (DEVICE_ID((intel)->PciInfo) == PCI_CHIP_I830_M) -@@ -222,6 +230,7 @@ - - /* supports Y tiled surfaces (pre-965 Mesa isn't ready yet) */ - #define SUPPORTS_YTILING(pI810) (INTEL_INFO(intel)->gen >= 40) -+#define HAS_BLT(pI810) (INTEL_INFO(intel)->gen >= 60) - - extern SymTabRec *intel_chipsets; - -diff --git a/src/intel_module.c b/src/intel_module.c -index 8416544..9468e72 100644 ---- a/src/intel_module.c -+++ b/src/intel_module.c -@@ -39,6 +39,8 @@ - - #include <xf86drmMode.h> - -+static struct intel_device_info *chipset_info; -+ - static const struct intel_device_info intel_i81x_info = { - .gen = 10, - }; -@@ -71,329 +73,148 @@ static const struct intel_device_info intel_sandybridge_info = { - .gen = 60, - }; - -+static const struct intel_device_info intel_ivybridge_info = { -+ .gen = 70, -+}; -+ - static const SymTabRec _intel_chipsets[] = { -- {PCI_CHIP_I810, "i810"}, -- {PCI_CHIP_I810_DC100, "i810-dc100"}, -- {PCI_CHIP_I810_E, "i810e"}, -- {PCI_CHIP_I815, "i815"}, -- {PCI_CHIP_I830_M, "i830M"}, -- {PCI_CHIP_845_G, "845G"}, -- {PCI_CHIP_I854, "854"}, -- {PCI_CHIP_I855_GM, "852GM/855GM"}, -- {PCI_CHIP_I865_G, "865G"}, -- {PCI_CHIP_I915_G, "915G"}, -- {PCI_CHIP_E7221_G, "E7221 (i915)"}, -- {PCI_CHIP_I915_GM, "915GM"}, -- {PCI_CHIP_I945_G, "945G"}, -- {PCI_CHIP_I945_GM, "945GM"}, -- {PCI_CHIP_I945_GME, "945GME"}, -- {PCI_CHIP_PINEVIEW_M, "Pineview GM"}, -- {PCI_CHIP_PINEVIEW_G, "Pineview G"}, -- {PCI_CHIP_I965_G, "965G"}, -- {PCI_CHIP_G35_G, "G35"}, -- {PCI_CHIP_I965_Q, "965Q"}, -- {PCI_CHIP_I946_GZ, "946GZ"}, -- {PCI_CHIP_I965_GM, "965GM"}, -- {PCI_CHIP_I965_GME, "965GME/GLE"}, -- {PCI_CHIP_G33_G, "G33"}, -- {PCI_CHIP_Q35_G, "Q35"}, -- {PCI_CHIP_Q33_G, "Q33"}, -- {PCI_CHIP_GM45_GM, "GM45"}, -- {PCI_CHIP_G45_E_G, "4 Series"}, -- {PCI_CHIP_G45_G, "G45/G43"}, -- {PCI_CHIP_Q45_G, "Q45/Q43"}, -- {PCI_CHIP_G41_G, "G41"}, -- {PCI_CHIP_B43_G, "B43"}, -- {PCI_CHIP_B43_G1, "B43"}, -- {PCI_CHIP_IRONLAKE_D_G, "Clarkdale"}, -- {PCI_CHIP_IRONLAKE_M_G, "Arrandale"}, -- {PCI_CHIP_SANDYBRIDGE_GT1, "Sandybridge" }, -- {PCI_CHIP_SANDYBRIDGE_GT2, "Sandybridge" }, -- {PCI_CHIP_SANDYBRIDGE_GT2_PLUS, "Sandybridge" }, -- {PCI_CHIP_SANDYBRIDGE_M_GT1, "Sandybridge" }, -- {PCI_CHIP_SANDYBRIDGE_M_GT2, "Sandybridge" }, -- {PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS, "Sandybridge" }, -- {PCI_CHIP_SANDYBRIDGE_S_GT, "Sandybridge" }, -- {-1, NULL} -+ {PCI_CHIP_I810, "i810"}, -+ {PCI_CHIP_I810_DC100, "i810-dc100"}, -+ {PCI_CHIP_I810_E, "i810e"}, -+ {PCI_CHIP_I815, "i815"}, -+ {PCI_CHIP_I830_M, "i830M"}, -+ {PCI_CHIP_845_G, "845G"}, -+ {PCI_CHIP_I854, "854"}, -+ {PCI_CHIP_I855_GM, "852GM/855GM"}, -+ {PCI_CHIP_I865_G, "865G"}, -+ {PCI_CHIP_I915_G, "915G"}, -+ {PCI_CHIP_E7221_G, "E7221 (i915)"}, -+ {PCI_CHIP_I915_GM, "915GM"}, -+ {PCI_CHIP_I945_G, "945G"}, -+ {PCI_CHIP_I945_GM, "945GM"}, -+ {PCI_CHIP_I945_GME, "945GME"}, -+ {PCI_CHIP_PINEVIEW_M, "Pineview GM"}, -+ {PCI_CHIP_PINEVIEW_G, "Pineview G"}, -+ {PCI_CHIP_I965_G, "965G"}, -+ {PCI_CHIP_G35_G, "G35"}, -+ {PCI_CHIP_I965_Q, "965Q"}, -+ {PCI_CHIP_I946_GZ, "946GZ"}, -+ {PCI_CHIP_I965_GM, "965GM"}, -+ {PCI_CHIP_I965_GME, "965GME/GLE"}, -+ {PCI_CHIP_G33_G, "G33"}, -+ {PCI_CHIP_Q35_G, "Q35"}, -+ {PCI_CHIP_Q33_G, "Q33"}, -+ {PCI_CHIP_GM45_GM, "GM45"}, -+ {PCI_CHIP_G45_E_G, "4 Series"}, -+ {PCI_CHIP_G45_G, "G45/G43"}, -+ {PCI_CHIP_Q45_G, "Q45/Q43"}, -+ {PCI_CHIP_G41_G, "G41"}, -+ {PCI_CHIP_B43_G, "B43"}, -+ {PCI_CHIP_B43_G1, "B43"}, -+ {PCI_CHIP_IRONLAKE_D_G, "Clarkdale"}, -+ {PCI_CHIP_IRONLAKE_M_G, "Arrandale"}, -+ {PCI_CHIP_SANDYBRIDGE_GT1, "Sandybridge Desktop (GT1)" }, -+ {PCI_CHIP_SANDYBRIDGE_GT2, "Sandybridge Desktop (GT2)" }, -+ {PCI_CHIP_SANDYBRIDGE_GT2_PLUS, "Sandybridge Desktop (GT2+)" }, -+ {PCI_CHIP_SANDYBRIDGE_M_GT1, "Sandybridge Mobile (GT1)" }, -+ {PCI_CHIP_SANDYBRIDGE_M_GT2, "Sandybridge Mobile (GT2)" }, -+ {PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS, "Sandybridge Mobile (GT2+)" }, -+ {PCI_CHIP_SANDYBRIDGE_S_GT, "Sandybridge Server" }, -+ {PCI_CHIP_IVYBRIDGE_M_GT1, "Ivybridge Mobile (GT1)" }, -+ {PCI_CHIP_IVYBRIDGE_M_GT2, "Ivybridge Mobile (GT2)" }, -+ {PCI_CHIP_IVYBRIDGE_D_GT1, "Ivybridge Desktop (GT1)" }, -+ {PCI_CHIP_IVYBRIDGE_D_GT2, "Ivybridge Desktop (GT2)" }, -+ {PCI_CHIP_IVYBRIDGE_S_GT1, "Ivybridge Server" }, -+ {-1, NULL} - }; - SymTabRec *intel_chipsets = (SymTabRec *) _intel_chipsets; - - #define INTEL_DEVICE_MATCH(d,i) \ --{ 0x8086, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) } -+ { 0x8086, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (intptr_t)(i) } - - static const struct pci_id_match intel_device_match[] = { -- INTEL_DEVICE_MATCH (PCI_CHIP_I810, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_I810_DC100, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_I810_E, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_I815, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_I830_M, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_845_G, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_I854, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_I855_GM, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_I865_G, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_I915_G, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_E7221_G, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_I915_GM, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_I945_G, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_I945_GM, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_I945_GME, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_PINEVIEW_M, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_PINEVIEW_G, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_I965_G, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_G35_G, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_I965_Q, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_I946_GZ, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_I965_GM, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_I965_GME, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_G33_G, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_Q35_G, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_Q33_G, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_GM45_GM, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_G45_E_G, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_G45_G, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_Q45_G, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_G41_G, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_B43_G, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_IRONLAKE_D_G, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_IRONLAKE_M_G, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_GT1, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_GT2, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_GT2_PLUS, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_M_GT1, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_M_GT2, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS, 0 ), -- INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_S_GT, 0 ), -- { 0, 0, 0 }, --}; -- --static PciChipsets intel_pci_chipsets[] = { -- {PCI_CHIP_I810, PCI_CHIP_I810, NULL}, -- {PCI_CHIP_I810_DC100, PCI_CHIP_I810_DC100, NULL}, -- {PCI_CHIP_I810_E, PCI_CHIP_I810_E, NULL}, -- {PCI_CHIP_I815, PCI_CHIP_I815, NULL}, -- {PCI_CHIP_I830_M, PCI_CHIP_I830_M, NULL}, -- {PCI_CHIP_845_G, PCI_CHIP_845_G, NULL}, -- {PCI_CHIP_I854, PCI_CHIP_I854, NULL}, -- {PCI_CHIP_I855_GM, PCI_CHIP_I855_GM, NULL}, -- {PCI_CHIP_I865_G, PCI_CHIP_I865_G, NULL}, -- {PCI_CHIP_I915_G, PCI_CHIP_I915_G, NULL}, -- {PCI_CHIP_E7221_G, PCI_CHIP_E7221_G, NULL}, -- {PCI_CHIP_I915_GM, PCI_CHIP_I915_GM, NULL}, -- {PCI_CHIP_I945_G, PCI_CHIP_I945_G, NULL}, -- {PCI_CHIP_I945_GM, PCI_CHIP_I945_GM, NULL}, -- {PCI_CHIP_I945_GME, PCI_CHIP_I945_GME, NULL}, -- {PCI_CHIP_PINEVIEW_M, PCI_CHIP_PINEVIEW_M, NULL}, -- {PCI_CHIP_PINEVIEW_G, PCI_CHIP_PINEVIEW_G, NULL}, -- {PCI_CHIP_I965_G, PCI_CHIP_I965_G, NULL}, -- {PCI_CHIP_G35_G, PCI_CHIP_G35_G, NULL}, -- {PCI_CHIP_I965_Q, PCI_CHIP_I965_Q, NULL}, -- {PCI_CHIP_I946_GZ, PCI_CHIP_I946_GZ, NULL}, -- {PCI_CHIP_I965_GM, PCI_CHIP_I965_GM, NULL}, -- {PCI_CHIP_I965_GME, PCI_CHIP_I965_GME, NULL}, -- {PCI_CHIP_G33_G, PCI_CHIP_G33_G, NULL}, -- {PCI_CHIP_Q35_G, PCI_CHIP_Q35_G, NULL}, -- {PCI_CHIP_Q33_G, PCI_CHIP_Q33_G, NULL}, -- {PCI_CHIP_GM45_GM, PCI_CHIP_GM45_GM, NULL}, -- {PCI_CHIP_G45_E_G, PCI_CHIP_G45_E_G, NULL}, -- {PCI_CHIP_G45_G, PCI_CHIP_G45_G, NULL}, -- {PCI_CHIP_Q45_G, PCI_CHIP_Q45_G, NULL}, -- {PCI_CHIP_G41_G, PCI_CHIP_G41_G, NULL}, -- {PCI_CHIP_B43_G, PCI_CHIP_B43_G, NULL}, -- {PCI_CHIP_IRONLAKE_D_G, PCI_CHIP_IRONLAKE_D_G, NULL}, -- {PCI_CHIP_IRONLAKE_M_G, PCI_CHIP_IRONLAKE_M_G, NULL}, -- {PCI_CHIP_SANDYBRIDGE_GT1, PCI_CHIP_SANDYBRIDGE_GT1, NULL}, -- {PCI_CHIP_SANDYBRIDGE_GT2, PCI_CHIP_SANDYBRIDGE_GT2, NULL}, -- {PCI_CHIP_SANDYBRIDGE_GT2_PLUS, PCI_CHIP_SANDYBRIDGE_GT2_PLUS, NULL}, -- {PCI_CHIP_SANDYBRIDGE_M_GT1, PCI_CHIP_SANDYBRIDGE_M_GT1, NULL}, -- {PCI_CHIP_SANDYBRIDGE_M_GT2, PCI_CHIP_SANDYBRIDGE_M_GT2, NULL}, -- {PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS, PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS, NULL}, -- {PCI_CHIP_SANDYBRIDGE_S_GT, PCI_CHIP_SANDYBRIDGE_S_GT, NULL}, -- {-1, -1, NULL } -+ INTEL_DEVICE_MATCH (PCI_CHIP_I810, &intel_i81x_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_I810_DC100, &intel_i81x_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_I810_E, &intel_i81x_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_I815, &intel_i81x_info ), -+ -+ INTEL_DEVICE_MATCH (PCI_CHIP_I830_M, &intel_i8xx_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_845_G, &intel_i8xx_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_I854, &intel_i8xx_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_I855_GM, &intel_i8xx_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_I865_G, &intel_i8xx_info ), -+ -+ INTEL_DEVICE_MATCH (PCI_CHIP_I915_G, &intel_i915_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_E7221_G, &intel_i915_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_I915_GM, &intel_i915_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_I945_G, &intel_i915_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_I945_GM, &intel_i915_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_I945_GME, &intel_i915_info ), -+ -+ INTEL_DEVICE_MATCH (PCI_CHIP_PINEVIEW_M, &intel_g33_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_PINEVIEW_G, &intel_g33_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_G33_G, &intel_g33_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_Q33_G, &intel_g33_info ), -+ /* Another marketing win: Q35 is another g33 device not a gen4 part -+ * like its G35 brethren. -+ */ -+ INTEL_DEVICE_MATCH (PCI_CHIP_Q35_G, &intel_g33_info ), -+ -+ INTEL_DEVICE_MATCH (PCI_CHIP_I965_G, &intel_i965_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_G35_G, &intel_i965_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_I965_Q, &intel_i965_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_I946_GZ, &intel_i965_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_I965_GM, &intel_i965_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_I965_GME, &intel_i965_info ), -+ -+ INTEL_DEVICE_MATCH (PCI_CHIP_GM45_GM, &intel_g4x_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_G45_E_G, &intel_g4x_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_G45_G, &intel_g4x_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_Q45_G, &intel_g4x_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_G41_G, &intel_g4x_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_B43_G, &intel_g4x_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_B43_G1, &intel_g4x_info ), -+ -+ INTEL_DEVICE_MATCH (PCI_CHIP_IRONLAKE_D_G, &intel_ironlake_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_IRONLAKE_M_G, &intel_ironlake_info ), -+ -+ INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_GT1, &intel_sandybridge_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_GT2, &intel_sandybridge_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_GT2_PLUS, &intel_sandybridge_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_M_GT1, &intel_sandybridge_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_M_GT2, &intel_sandybridge_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS, &intel_sandybridge_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_SANDYBRIDGE_S_GT, &intel_sandybridge_info ), -+ -+ INTEL_DEVICE_MATCH (PCI_CHIP_IVYBRIDGE_M_GT1, &intel_ivybridge_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_IVYBRIDGE_M_GT2, &intel_ivybridge_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_IVYBRIDGE_D_GT1, &intel_ivybridge_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_IVYBRIDGE_D_GT2, &intel_ivybridge_info ), -+ INTEL_DEVICE_MATCH (PCI_CHIP_IVYBRIDGE_S_GT1, &intel_ivybridge_info ), -+ -+ { 0, 0, 0 }, - }; - - void intel_detect_chipset(ScrnInfoPtr scrn, - struct pci_device *pci, - struct intel_chipset *chipset) - { -- uint32_t capid; -- -- switch (DEVICE_ID(pci)) { -- case PCI_CHIP_I810: -- chipset->name = "i810"; -- chipset->info = &intel_i81x_info; -- break; -- case PCI_CHIP_I810_DC100: -- chipset->name = "i810-dc100"; -- chipset->info = &intel_i81x_info; -- break; -- case PCI_CHIP_I810_E: -- chipset->name = "i810e"; -- chipset->info = &intel_i81x_info; -- break; -- case PCI_CHIP_I815: -- chipset->name = "i815"; -- chipset->info = &intel_i81x_info; -- break; -- case PCI_CHIP_I830_M: -- chipset->name = "830M"; -- chipset->info = &intel_i8xx_info; -- break; -- case PCI_CHIP_845_G: -- chipset->name = "845G"; -- chipset->info = &intel_i8xx_info; -- break; -- case PCI_CHIP_I854: -- chipset->name = "854"; -- chipset->info = &intel_i8xx_info; -- break; -- case PCI_CHIP_I855_GM: -- /* Check capid register to find the chipset variant */ -- pci_device_cfg_read_u32(pci, &capid, I85X_CAPID); -- chipset->variant = -- (capid >> I85X_VARIANT_SHIFT) & I85X_VARIANT_MASK; -- switch (chipset->variant) { -- case I855_GM: -- chipset->name = "855GM"; -- break; -- case I855_GME: -- chipset->name = "855GME"; -- break; -- case I852_GM: -- chipset->name = "852GM"; -- break; -- case I852_GME: -- chipset->name = "852GME"; -- break; -- default: -- xf86DrvMsg(scrn->scrnIndex, X_INFO, -- "Unknown 852GM/855GM variant: 0x%x)\n", -- chipset->variant); -- chipset->name = "852GM/855GM (unknown variant)"; -- break; -+ int i; -+ -+ chipset->info = chipset_info; -+ -+ for (i = 0; intel_chipsets[i].name != NULL; i++) { -+ if (DEVICE_ID(pci) == intel_chipsets[i].token) { -+ chipset->name = intel_chipsets[i].name; -+ break; -+ } -+ } -+ if (intel_chipsets[i].name == NULL) { -+ chipset->name = "unknown chipset"; - } -- chipset->info = &intel_i8xx_info; -- break; -- case PCI_CHIP_I865_G: -- chipset->name = "865G"; -- chipset->info = &intel_i8xx_info; -- break; -- case PCI_CHIP_I915_G: -- chipset->name = "915G"; -- chipset->info = &intel_i915_info; -- break; -- case PCI_CHIP_E7221_G: -- chipset->name = "E7221 (i915)"; -- chipset->info = &intel_i915_info; -- break; -- case PCI_CHIP_I915_GM: -- chipset->name = "915GM"; -- chipset->info = &intel_i915_info; -- break; -- case PCI_CHIP_I945_G: -- chipset->name = "945G"; -- chipset->info = &intel_i915_info; -- break; -- case PCI_CHIP_I945_GM: -- chipset->name = "945GM"; -- chipset->info = &intel_i915_info; -- break; -- case PCI_CHIP_I945_GME: -- chipset->name = "945GME"; -- chipset->info = &intel_i915_info; -- break; -- case PCI_CHIP_PINEVIEW_M: -- chipset->name = "Pineview GM"; -- chipset->info = &intel_g33_info; -- break; -- case PCI_CHIP_PINEVIEW_G: -- chipset->name = "Pineview G"; -- chipset->info = &intel_g33_info; -- break; -- case PCI_CHIP_I965_G: -- chipset->name = "965G"; -- chipset->info = &intel_i965_info; -- break; -- case PCI_CHIP_G35_G: -- chipset->name = "G35"; -- chipset->info = &intel_i965_info; -- break; -- case PCI_CHIP_I965_Q: -- chipset->name = "965Q"; -- chipset->info = &intel_i965_info; -- break; -- case PCI_CHIP_I946_GZ: -- chipset->name = "946GZ"; -- chipset->info = &intel_i965_info; -- break; -- case PCI_CHIP_I965_GM: -- chipset->name = "965GM"; -- chipset->info = &intel_i965_info; -- break; -- case PCI_CHIP_I965_GME: -- chipset->name = "965GME/GLE"; -- chipset->info = &intel_i965_info; -- break; -- case PCI_CHIP_G33_G: -- chipset->name = "G33"; -- chipset->info = &intel_g33_info; -- break; -- case PCI_CHIP_Q35_G: -- chipset->name = "Q35"; -- chipset->info = &intel_g33_info; -- break; -- case PCI_CHIP_Q33_G: -- chipset->name = "Q33"; -- chipset->info = &intel_g33_info; -- break; -- case PCI_CHIP_GM45_GM: -- chipset->name = "GM45"; -- chipset->info = &intel_g4x_info; -- break; -- case PCI_CHIP_G45_E_G: -- chipset->name = "4 Series"; -- chipset->info = &intel_g4x_info; -- break; -- case PCI_CHIP_G45_G: -- chipset->name = "G45/G43"; -- chipset->info = &intel_g4x_info; -- break; -- case PCI_CHIP_Q45_G: -- chipset->name = "Q45/Q43"; -- chipset->info = &intel_g4x_info; -- break; -- case PCI_CHIP_G41_G: -- chipset->name = "G41"; -- chipset->info = &intel_g4x_info; -- break; -- case PCI_CHIP_B43_G: -- chipset->name = "B43"; -- chipset->info = &intel_g4x_info; -- break; -- case PCI_CHIP_IRONLAKE_D_G: -- chipset->name = "Clarkdale"; -- chipset->info = &intel_ironlake_info; -- break; -- case PCI_CHIP_IRONLAKE_M_G: -- chipset->name = "Arrandale"; -- chipset->info = &intel_ironlake_info; -- break; -- case PCI_CHIP_SANDYBRIDGE_GT1: -- case PCI_CHIP_SANDYBRIDGE_GT2: -- case PCI_CHIP_SANDYBRIDGE_GT2_PLUS: -- case PCI_CHIP_SANDYBRIDGE_M_GT1: -- case PCI_CHIP_SANDYBRIDGE_M_GT2: -- case PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS: -- case PCI_CHIP_SANDYBRIDGE_S_GT: -- chipset->name = "Sandybridge"; -- chipset->info = &intel_sandybridge_info; -- break; -- default: -- chipset->name = "unknown chipset"; -- break; -- } -- -- xf86DrvMsg(scrn->scrnIndex, X_INFO, -- "Integrated Graphics Chipset: Intel(R) %s\n", chipset->name); -+ -+ xf86DrvMsg(scrn->scrnIndex, X_INFO, -+ "Integrated Graphics Chipset: Intel(R) %s\n", chipset->name); - } - - /* -@@ -404,30 +225,30 @@ void intel_detect_chipset(ScrnInfoPtr scrn, - */ - static void intel_identify(int flags) - { -- xf86PrintChipsets(INTEL_NAME, -- "Driver for Intel Integrated Graphics Chipsets", -- intel_chipsets); -+ xf86PrintChipsets(INTEL_NAME, -+ "Driver for Intel Integrated Graphics Chipsets", -+ intel_chipsets); - } - - static Bool intel_driver_func(ScrnInfoPtr pScrn, - xorgDriverFuncOp op, - pointer ptr) - { -- xorgHWFlags *flag; -+ xorgHWFlags *flag; - -- switch (op) { -- case GET_REQUIRED_HW_INTERFACES: -- flag = (CARD32*)ptr; -+ switch (op) { -+ case GET_REQUIRED_HW_INTERFACES: -+ flag = (CARD32*)ptr; - #ifdef KMS_ONLY -- (*flag) = 0; -+ (*flag) = 0; - #else -- (*flag) = HW_IO | HW_MMIO; -+ (*flag) = HW_IO | HW_MMIO; - #endif -- return TRUE; -- default: -- /* Unknown or deprecated function */ -- return FALSE; -- } -+ return TRUE; -+ default: -+ /* Unknown or deprecated function */ -+ return FALSE; -+ } - } - - static Bool has_kernel_mode_setting(struct pci_device *dev) -@@ -458,55 +279,65 @@ static Bool has_kernel_mode_setting(struct pci_device *dev) - * Setup the dispatch table for the rest of the driver functions. - * - */ --static Bool intel_pci_probe (DriverPtr driver, -- int entity_num, -- struct pci_device *device, -- intptr_t match_data) -+static Bool intel_pci_probe(DriverPtr driver, -+ int entity_num, -+ struct pci_device *device, -+ intptr_t match_data) - { -- ScrnInfoPtr scrn; -+ ScrnInfoPtr scrn; -+ PciChipsets intel_pci_chipsets[ARRAY_SIZE(intel_chipsets)]; -+ int i; -+ -+ chipset_info = (void *)match_data; - -- if (!has_kernel_mode_setting(device)) { -+ if (!has_kernel_mode_setting(device)) { - #if KMS_ONLY -- return FALSE; -+ return FALSE; - #else -- switch (DEVICE_ID(device)) { -- case PCI_CHIP_I810: -- case PCI_CHIP_I810_DC100: -- case PCI_CHIP_I810_E: -- case PCI_CHIP_I815: -- break; -- default: -- return FALSE; -- } -+ switch (DEVICE_ID(device)) { -+ case PCI_CHIP_I810: -+ case PCI_CHIP_I810_DC100: -+ case PCI_CHIP_I810_E: -+ case PCI_CHIP_I815: -+ break; -+ default: -+ return FALSE; -+ } - #endif -- } -+ } - -- scrn = xf86ConfigPciEntity(NULL, 0, entity_num, intel_pci_chipsets, -- NULL, NULL, NULL, NULL, NULL); -- if (scrn != NULL) { -- scrn->driverVersion = INTEL_VERSION; -- scrn->driverName = INTEL_DRIVER_NAME; -- scrn->name = INTEL_NAME; -- scrn->Probe = NULL; -+ for (i = 0; i < ARRAY_SIZE(intel_chipsets); i++) { -+ intel_pci_chipsets[i].numChipset = intel_chipsets[i].token; -+ intel_pci_chipsets[i].PCIid = intel_chipsets[i].token; -+ intel_pci_chipsets[i].dummy = NULL; -+ } -+ -+ scrn = xf86ConfigPciEntity(NULL, 0, entity_num, intel_pci_chipsets, -+ NULL, NULL, NULL, NULL, NULL); -+ if (scrn != NULL) { -+ scrn->driverVersion = INTEL_VERSION; -+ scrn->driverName = INTEL_DRIVER_NAME; -+ scrn->name = INTEL_NAME; -+ scrn->Probe = NULL; - - #if KMS_ONLY -- intel_init_scrn(scrn); -+ intel_init_scrn(scrn); - #else -- switch (DEVICE_ID(device)) { -- case PCI_CHIP_I810: -- case PCI_CHIP_I810_DC100: -- case PCI_CHIP_I810_E: -- case PCI_CHIP_I815: -- lg_i810_init(scrn); -- break; -- -- default: -- intel_init_scrn(scrn); -- break; -- } -+ switch (DEVICE_ID(device)) { -+ case PCI_CHIP_I810: -+ case PCI_CHIP_I810_DC100: -+ case PCI_CHIP_I810_E: -+ case PCI_CHIP_I815: -+ lg_i810_init(scrn); -+ break; -+ -+ default: -+ intel_init_scrn(scrn); -+ break; -+ } - #endif -- } -- return scrn != NULL; -+ } -+ return scrn != NULL; - } - - #ifdef XFree86LOADER -@@ -514,16 +345,16 @@ static Bool intel_pci_probe (DriverPtr driver, - static MODULESETUPPROTO(intel_setup); - - static XF86ModuleVersionInfo intel_version = { -- "intel", -- MODULEVENDORSTRING, -- MODINFOSTRING1, -- MODINFOSTRING2, -- XORG_VERSION_CURRENT, -- INTEL_VERSION_MAJOR, INTEL_VERSION_MINOR, INTEL_VERSION_PATCH, -- ABI_CLASS_VIDEODRV, -- ABI_VIDEODRV_VERSION, -- MOD_CLASS_VIDEODRV, -- {0, 0, 0, 0} -+ "intel", -+ MODULEVENDORSTRING, -+ MODINFOSTRING1, -+ MODINFOSTRING2, -+ XORG_VERSION_CURRENT, -+ INTEL_VERSION_MAJOR, INTEL_VERSION_MINOR, INTEL_VERSION_PATCH, -+ ABI_CLASS_VIDEODRV, -+ ABI_VIDEODRV_VERSION, -+ MOD_CLASS_VIDEODRV, -+ {0, 0, 0, 0} - }; - - static const OptionInfoRec * -@@ -546,16 +377,16 @@ intel_available_options(int chipid, int busid) - } - - static DriverRec intel = { -- INTEL_VERSION, -- INTEL_DRIVER_NAME, -- intel_identify, -- NULL, -- intel_available_options, -- NULL, -- 0, -- intel_driver_func, -- intel_device_match, -- intel_pci_probe -+ INTEL_VERSION, -+ INTEL_DRIVER_NAME, -+ intel_identify, -+ NULL, -+ intel_available_options, -+ NULL, -+ 0, -+ intel_driver_func, -+ intel_device_match, -+ intel_pci_probe - }; - - static pointer intel_setup(pointer module, -@@ -563,24 +394,24 @@ static pointer intel_setup(pointer module, - int *errmaj, - int *errmin) - { -- static Bool setupDone = 0; -- -- /* This module should be loaded only once, but check to be sure. -- */ -- if (!setupDone) { -- setupDone = 1; -- xf86AddDriver(&intel, module, HaveDriverFuncs); -- -- /* -- * The return value must be non-NULL on success even though there -- * is no TearDownProc. -- */ -- return (pointer) 1; -- } else { -- if (errmaj) -- *errmaj = LDR_ONCEONLY; -- return NULL; -- } -+ static Bool setupDone = 0; -+ -+ /* This module should be loaded only once, but check to be sure. -+ */ -+ if (!setupDone) { -+ setupDone = 1; -+ xf86AddDriver(&intel, module, HaveDriverFuncs); -+ -+ /* -+ * The return value must be non-NULL on success even though there -+ * is no TearDownProc. -+ */ -+ return (pointer) 1; -+ } else { -+ if (errmaj) -+ *errmaj = LDR_ONCEONLY; -+ return NULL; -+ } - } - - _X_EXPORT XF86ModuleData intelModuleData = { &intel_version, intel_setup, NULL }; -diff --git a/src/intel_video.c b/src/intel_video.c -index 499614f..021ca5f 100644 ---- a/src/intel_video.c -+++ b/src/intel_video.c -@@ -1599,6 +1599,7 @@ I830PutImageTextured(ScrnInfoPtr scrn, - pixmap); - } - -+ intel_get_screen_private(scrn)->needs_flush = TRUE; - DamageDamageRegion(drawable, clipBoxes); - - return Success; diff --git a/extra/xf86-video-mach64/PKGBUILD b/extra/xf86-video-mach64/PKGBUILD index 41a83c7ac..efe509fbf 100644 --- a/extra/xf86-video-mach64/PKGBUILD +++ b/extra/xf86-video-mach64/PKGBUILD @@ -1,26 +1,23 @@ -# $Id: PKGBUILD 130722 2011-07-07 22:12:01Z andyrtr $ +# $Id: PKGBUILD 140326 2011-10-11 21:29:07Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-mach64 pkgver=6.9.0 -pkgrel=1 +pkgrel=2 pkgdesc="X.org mach64 video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc' 'mach64-dri') -makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 'glproto') +conflicts=('xorg-server<1.10.99.902') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - mach64-fix-pixmap.patch) -sha1sums=('95a7ec9761fe11dadbcd9078c55148198a91b2f1' - '9658d16b964c1c0a3f8aa68f6706bd643cef321e') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) +sha1sums=('95a7ec9761fe11dadbcd9078c55148198a91b2f1') build() { cd "${srcdir}/${pkgname}-${pkgver}" -# patch -Np1 -i ${srcdir}/mach64-fix-pixmap.patch ./configure --prefix=/usr --enable-dri make } diff --git a/extra/xf86-video-mach64/mach64-fix-pixmap.patch b/extra/xf86-video-mach64/mach64-fix-pixmap.patch deleted file mode 100644 index 6f1a64748..000000000 --- a/extra/xf86-video-mach64/mach64-fix-pixmap.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/src/aticonsole.c b/src/aticonsole.c -index 1be147e..6e742d9 100644 ---- a/src/aticonsole.c -+++ b/src/aticonsole.c -@@ -28,6 +28,7 @@ - #include "config.h" - #endif - -+#include "xorgVersion.h" - #include "ati.h" - #include "aticonsole.h" - #include "atii2c.h" -@@ -689,7 +690,9 @@ ATIEnterVT - ScreenPtr pScreen = pScreenInfo->pScreen; - ATIPtr pATI = ATIPTR(pScreenInfo); - PixmapPtr pScreenPixmap; -+#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0)) - DevUnion PixmapPrivate; -+#endif - Bool Entered; - - if (!ATIEnterGraphics(NULL, pScreenInfo, pATI)) -@@ -714,19 +717,24 @@ ATIEnterVT - } - - pScreenPixmap = (*pScreen->GetScreenPixmap)(pScreen); -+ -+#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0)) - PixmapPrivate = pScreenPixmap->devPrivate; - if (!PixmapPrivate.ptr) - pScreenPixmap->devPrivate = pScreenInfo->pixmapPrivate; -+#endif - - /* Tell framebuffer about remapped aperture */ - Entered = (*pScreen->ModifyPixmapHeader)(pScreenPixmap, - -1, -1, -1, -1, -1, pATI->pMemory); - -+#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0)) - if (!PixmapPrivate.ptr) - { - pScreenInfo->pixmapPrivate = pScreenPixmap->devPrivate; - pScreenPixmap->devPrivate.ptr = NULL; - } -+#endif - - #ifdef XF86DRI_DEVEL - diff --git a/extra/xf86-video-mga/PKGBUILD b/extra/xf86-video-mga/PKGBUILD index e67021a97..1ee157c59 100644 --- a/extra/xf86-video-mga/PKGBUILD +++ b/extra/xf86-video-mga/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 115334 2011-03-17 17:57:40Z andyrtr $ +# $Id: PKGBUILD 140324 2011-10-11 21:29:03Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-mga pkgver=1.4.13 -pkgrel=3 +pkgrel=4 pkgdesc="X.org mga video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc' 'mga-dri') -makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 'glproto') +conflicts=('xorg-server<1.10.99.902') options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('55aa185cf381def4b5905c8b93694b8dfbd5c378') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + git-fixes.patch) +sha1sums=('55aa185cf381def4b5905c8b93694b8dfbd5c378' + '74782a39533ef475bd02b8b4645775879494e568') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/git-fixes.patch" ./configure --prefix=/usr --enable-dri make make DESTDIR="${pkgdir}" install diff --git a/extra/xf86-video-neomagic/PKGBUILD b/extra/xf86-video-neomagic/PKGBUILD index 89650f9a2..2a1bac87d 100644 --- a/extra/xf86-video-neomagic/PKGBUILD +++ b/extra/xf86-video-neomagic/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 115337 2011-03-17 17:59:49Z andyrtr $ +# $Id: PKGBUILD 140322 2011-10-11 21:29:00Z jgc $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-neomagic pkgver=1.2.5 -pkgrel=4 +pkgrel=5 pkgdesc="X.org neomagic video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel' 'xf86dgaproto') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.11.0' 'xf86dgaproto') +conflicts=('xorg-server<1.11.0') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-nouveau/PKGBUILD b/extra/xf86-video-nouveau/PKGBUILD index c86785a07..b235d204a 100644 --- a/extra/xf86-video-nouveau/PKGBUILD +++ b/extra/xf86-video-nouveau/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 132822 2011-07-26 12:31:08Z ibiru $ +# $Id: PKGBUILD 140320 2011-10-11 21:28:57Z jgc $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: buddabrod <buddabrod@gmail.com> pkgname=xf86-video-nouveau -_gitdate=20110726 +_gitdate=20110829 pkgver=0.0.16_git${_gitdate} # see configure.ac pkgrel=1 pkgdesc="Open Source 3D acceleration driver for nVidia cards (experimental)" @@ -13,11 +13,11 @@ license=('GPL') #and MIT, not yet a license file, see http://nouveau.freedesktop depends=('libdrm' 'udev') optdepends=('nouveau-dri: experimental gallium3d features') makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto') -conflicts=('xorg-server<1.10.0') +conflicts=('xorg-server<1.11.0') options=('!libtool') install=${pkgname}.install source=(ftp://ftp.archlinux.org/other/$pkgname/xf86-video-nouveau-${_gitdate}.tar.bz2) -md5sums=('8af188f6c2c90dfca3427809cd8fb76f') +md5sums=('8f484f6602a3711f4adfbce74fd886c1') # source PKGBUILD && mksource mksource() { diff --git a/extra/xf86-video-nv/PKGBUILD b/extra/xf86-video-nv/PKGBUILD index 2e5ce4daf..329f39acb 100644 --- a/extra/xf86-video-nv/PKGBUILD +++ b/extra/xf86-video-nv/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 115341 2011-03-17 18:01:19Z andyrtr $ +# $Id: PKGBUILD 140318 2011-10-11 21:28:55Z jgc $ # Maintainer:Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-nv pkgver=2.1.18 -pkgrel=3 +pkgrel=4 pkgdesc="X.org nv video driver" arch=(i686 x86_64 'mips64el') license=('custom') url="http://xorg.freedesktop.org/" depends=('glibc') -makedepends=('xorg-server-devel') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.11.0') +conflicts=('xorg-server<1.11.0') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-openchrome/LICENSE.txt b/extra/xf86-video-openchrome/LICENSE.txt deleted file mode 100644 index dff1dc37b..000000000 --- a/extra/xf86-video-openchrome/LICENSE.txt +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2005-2007 The Openchrome Project [openchrome.org] - * Copyright 2004-2006 Luc Verhaegen. - * Copyright 2004-2005 The Unichrome Project [unichrome.sf.net] - * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved. - * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sub license, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial portions - * of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ diff --git a/extra/xf86-video-openchrome/PKGBUILD b/extra/xf86-video-openchrome/PKGBUILD index 05282816d..7e4f5bee5 100644 --- a/extra/xf86-video-openchrome/PKGBUILD +++ b/extra/xf86-video-openchrome/PKGBUILD @@ -1,35 +1,28 @@ -# $Id: PKGBUILD 115345 2011-03-17 18:03:35Z andyrtr $ +# $Id: PKGBUILD 140316 2011-10-11 21:28:53Z jgc $ # Contributor: Paul Mattal <paul@mattal.com> # Maintainer: Juergen Hoetzel <juergen@hoetzel.info> pkgname=xf86-video-openchrome pkgver=0.2.904 -pkgrel=5 +_svnver=r933 +pkgrel=6 pkgdesc="X.Org Openchrome drivers" arch=(i686 x86_64 'mips64el') license=('custom') url="http://www.openchrome.org" depends=('libdrm' 'libxvmc' 'unichrome-dri') -makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa' 'libxvmc') +makedepends=('xorg-server-devel>=1.11.0' 'libdrm' 'xf86driproto' 'mesa' 'libxvmc' 'glproto') replaces=('openchrome' 'xf86-video-via') options=('!libtool' '!makeflags') -conflicts=('xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'xorg-server<1.10.0') -source=(http://xorg.freedesktop.org/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - drm_stdint.patch - svn-r839.patch - LICENSE.txt) -md5sums=('f2481d98ef54febf5bffbb88a2a2426d' - 'bc516400ffc3df5d0dfe604f6245dd32' - '5aed4aa44dd5a6d3e2da9baad73ac0ab' - 'addb3cf2671f4cf7e91156952de1627f') +conflicts=('xf86-video-via' 'xf86-video-unichrome' 'openchrome' 'xorg-server<1.11.0') +source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}-${_svnver}.tar.bz2) +md5sums=('d661460276a31d3d012d8cdb1a0a73c1') build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -Np1 -i "${srcdir}/svn-r839.patch" - patch -Np0 -i "${srcdir}/drm_stdint.patch" ./configure --prefix=/usr make make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 "${srcdir}/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/extra/xf86-video-openchrome/drm_stdint.patch b/extra/xf86-video-openchrome/drm_stdint.patch deleted file mode 100644 index 226a015e2..000000000 --- a/extra/xf86-video-openchrome/drm_stdint.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/via_xvmc.h.orig 2010-03-07 01:46:34.000000000 +0100 -+++ src/via_xvmc.h 2010-03-07 01:46:45.000000000 +0100 -@@ -26,6 +26,7 @@ - #ifndef _VIA_XVMC_H - #define _VIA_XVMC_H 1 - -+#include <stdint.h> - #include "via_drm.h" - - /* diff --git a/extra/xf86-video-openchrome/svn-r839.patch b/extra/xf86-video-openchrome/svn-r839.patch deleted file mode 100644 index 8e5f05669..000000000 --- a/extra/xf86-video-openchrome/svn-r839.patch +++ /dev/null @@ -1,1447 +0,0 @@ -diff -ruN xf86-video-openchrome-0.2.904/ChangeLog ../openchrome/xf86-video-openchrome-0.2.904/ChangeLog ---- xf86-video-openchrome-0.2.904/ChangeLog 2009-10-03 22:48:55.000000000 +0200 -+++ ../openchrome/xf86-video-openchrome-0.2.904/ChangeLog 2010-03-07 01:09:00.000000000 +0100 -@@ -1,3 +1,52 @@ -+2010-02-10 Bartosz Kosiorek <gang65@poczta.onet.pl> -+ -+ Fix bug with suspend and VT switch on VX800 and 64bit systems -+ -+ * src/via_driver.h: -+ * src/via_video.c: (viaResetVideo), (viaSaveVideo), -+ (viaRestoreVideo), (viaExitVideo): -+ * src/via_video.h: -+ -+2010-01-24 Bartosz Kosiorek <gang65@poczta.onet.pl> -+ -+ Fix starting address restore and save (initial 64-bit support) -+ -+ * src/via_crtc.c: (ViaFirstCRTCSetMode), -+ (ViaFirstCRTCSetStartingAddress): -+ * src/via_dri.c: (VIADRIAgpInit): -+ * src/via_driver.c: (VIASave), (VIARestore): -+ * src/via_driver.h: -+ -+2009-12-04 Bartosz Kosiorek <gang65@poczta.onet.pl> -+ -+ Enable new mode switch for VM800 chipsets -+ -+ * src/via_driver.c: (VIASetupDefaultOptions): -+ -+2009-11-21 Bartosz Kosiorek <gang65@poczta.onet.pl> -+ -+ Add option to enable unaccelerated RandR rotation ("SWRandR"). -+ The accelerated option "HWRandR" is currently not implemented. -+ -+ * src/openchrome.man: -+ * src/via_driver.c: (VIAPreInit): -+ -+2009-11-20 Bartosz Kosiorek <gang65@poczta.onet.pl> -+ -+ Enabled new mode switch for PM800 chipset, -+ to resolve many bugs with resolution detecting and changing -+ (eg. switching to console) -+ -+ * src/via_driver.c: (VIASetupDefaultOptions), (VIAPreInit): -+ -+2009-11-07 Bartosz Kosiorek <gang65@poczta.onet.pl> -+ -+ Add more comments to ViaSetSecondaryFIFO, add panel scale support for -+ CLE266 and KM400, fix bug with malloc. -+ -+ * src/via_bandwidth.c: (ViaSetSecondaryFIFO): -+ * src/via_panel.c: (ViaPanelScale), (ViaPanelGetNativeDisplayMode): -+ - 2009-09-26 Bartosz Kosiorek <gang65@poczta.onet.pl> - - Save/restore ECK Clock Synthesizer -diff -ruN xf86-video-openchrome-0.2.904/man/openchrome.man ../openchrome/xf86-video-openchrome-0.2.904/man/openchrome.man ---- xf86-video-openchrome-0.2.904/man/openchrome.man 2009-10-09 01:12:41.000000000 +0200 -+++ ../openchrome/xf86-video-openchrome-0.2.904/man/openchrome.man 2010-03-07 01:09:00.000000000 +0100 -@@ -59,7 +59,7 @@ - .BI "Option \*qAccelMethod\*q \*q" string \*q - The driver supports "XAA" and "EXA" acceleration methods. The default - method is XAA, since EXA is still experimental. Contrary to XAA, EXA --implements acceleration for screen uploads and downlads (if DRI is -+implements acceleration for screen uploads and downloads (if DRI is - enabled) and for the Render/Composite extension. - .TP - .BI "Option \*qActiveDevice\*q \*q" string \*q -@@ -81,7 +81,7 @@ - no room for DRI textures, they will be allocated from the DRI part of - VRAM (see the option "MaxDRIMem"). The default amount of AGP is - 32768 kB. Note that the AGP aperture set in the BIOS must be able --to accomodate the amount of AGP memory specified here. Otherwise no -+to accommodate the amount of AGP memory specified here. Otherwise no - AGP memory will be available. It is safe to set a very large AGP - aperture in the BIOS. - .TP -@@ -159,9 +159,16 @@ - system. The sizes 640x480, 800x600, 1024x768, 1280x1024, and 1400x1050 - are supported. - .TP -+.BI "Option \*qRotationType\*q \*q" string \*q -+Enabled rotation by using RandR. The driver only support unaccelerated -+RandR rotations "SWRandR". Hardware rotations "HWRandR" is currently -+unimplemented. -+.TP - .BI "Option \*qRotate\*q \*q" string \*q - Rotates the display either clockwise ("CW"), counterclockwise ("CCW") and --upside-down ("UD"). Rotation is only supported unaccelerated. -+upside-down ("UD"). Rotation is only supported unaccelerated. Adding -+option "Rotate", enables RandR rotation feature. The RandR allows -+clients to dynamically change X screens. - .TP - .BI "Option \*qShadowFB\*q \*q" boolean \*q - Enables the use of a shadow frame buffer. This is required when -diff -ruN xf86-video-openchrome-0.2.904/src/svnversion.h ../openchrome/xf86-video-openchrome-0.2.904/src/svnversion.h ---- xf86-video-openchrome-0.2.904/src/svnversion.h 2009-10-09 01:19:04.000000000 +0200 -+++ ../openchrome/xf86-video-openchrome-0.2.904/src/svnversion.h 2010-03-07 01:09:15.000000000 +0100 -@@ -1 +1 @@ --#define BUILDCOMMENT "(openchrome 0.2.904 release)" -+#define BUILDCOMMENT "(development build, at svn revision 839)" -diff -ruN xf86-video-openchrome-0.2.904/src/via_accel.c ../openchrome/xf86-video-openchrome-0.2.904/src/via_accel.c ---- xf86-video-openchrome-0.2.904/src/via_accel.c 2009-10-03 22:48:55.000000000 +0200 -+++ ../openchrome/xf86-video-openchrome-0.2.904/src/via_accel.c 2010-03-07 01:09:00.000000000 +0100 -@@ -1210,7 +1210,8 @@ - - /* General acceleration flags. */ - xaaptr->Flags = (PIXMAP_CACHE | -- OFFSCREEN_PIXMAPS | LINEAR_FRAMEBUFFER | -+ OFFSCREEN_PIXMAPS | -+ LINEAR_FRAMEBUFFER | - MICROSOFT_ZERO_LINE_BIAS | 0); - - if (pScrn->bitsPerPixel == 8) -@@ -1228,14 +1229,17 @@ - - xaaptr->Sync = viaAccelSync; - -+ /* ScreenToScreen copies */ - xaaptr->SetupForScreenToScreenCopy = viaSetupForScreenToScreenCopy; - xaaptr->SubsequentScreenToScreenCopy = viaSubsequentScreenToScreenCopy; - xaaptr->ScreenToScreenCopyFlags = NO_PLANEMASK | ROP_NEEDS_SOURCE; - -+ /* Solid filled rectangles */ - xaaptr->SetupForSolidFill = viaSetupForSolidFill; - xaaptr->SubsequentSolidFillRect = viaSubsequentSolidFillRect; - xaaptr->SolidFillFlags = NO_PLANEMASK | ROP_NEEDS_SOURCE; - -+ /* Mono 8x8 pattern fills */ - xaaptr->SetupForMono8x8PatternFill = viaSetupForMono8x8PatternFill; - xaaptr->SubsequentMono8x8PatternFillRect = - viaSubsequentMono8x8PatternFillRect; -@@ -1244,6 +1248,7 @@ - HARDWARE_PATTERN_PROGRAMMED_ORIGIN | - BIT_ORDER_IN_BYTE_MSBFIRST | 0); - -+ /* Color 8x8 pattern fills */ - xaaptr->SetupForColor8x8PatternFill = viaSetupForColor8x8PatternFill; - xaaptr->SubsequentColor8x8PatternFillRect = - viaSubsequentColor8x8PatternFillRect; -@@ -1252,12 +1257,14 @@ - HARDWARE_PATTERN_PROGRAMMED_BITS | - HARDWARE_PATTERN_PROGRAMMED_ORIGIN | 0); - -+ /* Solid lines */ - xaaptr->SetupForSolidLine = viaSetupForSolidLine; - xaaptr->SubsequentSolidTwoPointLine = viaSubsequentSolidTwoPointLine; - xaaptr->SubsequentSolidHorVertLine = viaSubsequentSolidHorVertLine; - xaaptr->SolidBresenhamLineErrorTermBits = 14; - xaaptr->SolidLineFlags = NO_PLANEMASK | ROP_NEEDS_SOURCE; - -+ /* Dashed line */ - xaaptr->SetupForDashedLine = viaSetupForDashedLine; - xaaptr->SubsequentDashedTwoPointLine = viaSubsequentDashedTwoPointLine; - xaaptr->DashPatternMaxLength = 8; -@@ -1266,35 +1273,42 @@ - LINE_PATTERN_POWER_OF_2_ONLY | - LINE_PATTERN_MSBFIRST_LSBJUSTIFIED | 0); - -+ /* CPU to Screen color expansion */ - xaaptr->ScanlineCPUToScreenColorExpandFillFlags = NO_PLANEMASK | -- CPU_TRANSFER_PAD_DWORD | -- SCANLINE_PAD_DWORD | -- BIT_ORDER_IN_BYTE_MSBFIRST | -- LEFT_EDGE_CLIPPING | ROP_NEEDS_SOURCE | 0; -+ CPU_TRANSFER_PAD_DWORD | -+ SCANLINE_PAD_DWORD | -+ BIT_ORDER_IN_BYTE_MSBFIRST | -+ LEFT_EDGE_CLIPPING | -+ ROP_NEEDS_SOURCE | 0; - - xaaptr->SetupForScanlineCPUToScreenColorExpandFill = - viaSetupForCPUToScreenColorExpandFill; - xaaptr->SubsequentScanlineCPUToScreenColorExpandFill = - viaSubsequentScanlineCPUToScreenColorExpandFill; - xaaptr->ColorExpandBase = pVia->BltBase; -- xaaptr->ColorExpandRange = VIA_MMIO_BLTSIZE; -+ if (pVia->Chipset == VIA_VX800 || pVia->Chipset == VIA_VX855) -+ xaaptr->ColorExpandRange = VIA_MMIO_BLTSIZE; -+ else -+ xaaptr->ColorExpandRange = (64 * 1024); - -+ /* ImageWrite */ - xaaptr->ImageWriteFlags = (NO_PLANEMASK | - CPU_TRANSFER_PAD_DWORD | - SCANLINE_PAD_DWORD | - BIT_ORDER_IN_BYTE_MSBFIRST | -- LEFT_EDGE_CLIPPING | ROP_NEEDS_SOURCE | 0); -+ LEFT_EDGE_CLIPPING | -+ ROP_NEEDS_SOURCE | 0); - // SYNC_AFTER_IMAGE_WRITE | 0); - - /* - * Most Unichromes are much faster using processor-to-framebuffer writes - * than when using the 2D engine for this. -- * test with x11perf -shmput500! -+ * test with "x11perf -shmput500" -+ * Example: K8M890 chipset; with GPU=86.3/sec; without GPU=132.0/sec -+ * TODO Check speed for other chipsets - */ - - switch (pVia->Chipset) { -- case VIA_K8M800: -- case VIA_K8M890: - case VIA_P4M900: - case VIA_VX800: - case VIA_VX855: -diff -ruN xf86-video-openchrome-0.2.904/src/via_bandwidth.c ../openchrome/xf86-video-openchrome-0.2.904/src/via_bandwidth.c ---- xf86-video-openchrome-0.2.904/src/via_bandwidth.c 2009-10-03 22:48:55.000000000 +0200 -+++ ../openchrome/xf86-video-openchrome-0.2.904/src/via_bandwidth.c 2010-03-07 01:09:00.000000000 +0100 -@@ -194,6 +194,7 @@ - else - ViaSeqMask(hwp, 0x22, 0x00, 0x1F); /* 128/4 = overflow = 0 */ - break; -+ /* PM800/PM880/CN400 */ - case VIA_PM800: - hwp->writeSeq(hwp, 0x17, 0x5F); /* 95 */ - ViaSeqMask(hwp, 0x16, 0x20, 0xBF); /* 32 */ -@@ -204,9 +205,10 @@ - else - ViaSeqMask(hwp, 0x22, 0x1F, 0x1F); /* 31 */ - break; -+ /* P4M800Pro/VN800/CN700 */ - case VIA_VM800: - hwp->writeSeq(hwp, 0x17, 0x2F); -- ViaSeqMask(hwp, 0x16, 0x14, 0xBF); -+ ViaSeqMask(hwp, 0x16, 0x14, 0xBF); /* 80/4 = 20 = 0x14 */ - ViaSeqMask(hwp, 0x18, 0x08, 0xBF); - - if ((mode->HDisplay >= 1400) && (pScrn->bitsPerPixel == 32)) -@@ -215,40 +217,51 @@ - ViaSeqMask(hwp, 0x22, 0x00, 0x1F); - break; - case VIA_K8M890: -- hwp->writeSeq(hwp, 0x16, 0x92); -- hwp->writeSeq(hwp, 0x17, 0xB3); -- hwp->writeSeq(hwp, 0x18, 0x8A); -+ /* depth location: {SR17,0,7} */ -+ hwp->writeSeq(hwp, 0x17, 0xB3); /* 360/2-1 = 179 = 0xB3 */ -+ /* Formula (x & 0x3F) | ((x & 0x40) << 1) */ -+ /* threshold location: {SR16,0,5},{SR16,7,7} */ -+ ViaSeqMask(hwp, 0x16, 0x92, 0xBF); /* 328/4 = 82 = 0x52 */ -+ /* high threshold location: {SR18,0,5},{SR18,7,7} */ -+ ViaSeqMask(hwp, 0x18, 0x8A, 0xBF); /* 296/4 = 74 = 0x4A */ -+ /* display queue expire num location: {SR22,0,4}. */ -+ ViaSeqMask(hwp, 0x22, 0x1F, 0x1F); /* 124/4 = 31 = 0x1F */ - break; - case VIA_P4M900: -- ViaSeqMask(hwp, 0x17, 0x2F, 0xFF); -- ViaSeqMask(hwp, 0x16, 0x13, 0x3F); -- ViaSeqMask(hwp, 0x16, 0x00, 0x80); -- ViaSeqMask(hwp, 0x18, 0x13, 0x3F); -- ViaSeqMask(hwp, 0x18, 0x00, 0x80); -+ /* location: {SR17,0,7} */ -+ hwp->writeSeq(hwp, 0x17, 0x2F); /* 96/2-1 = 47 = 0x2F */ -+ /* location: {SR16,0,5},{SR16,7,7} */ -+ ViaSeqMask(hwp, 0x16, 0x13, 0xBF); /* 76/4 = 19 = 0x13 */ -+ /* location: {SR18,0,5},{SR18,7,7} */ -+ ViaSeqMask(hwp, 0x18, 0x13, 0xBF); /* 76/4 = 19 = 0x13 */ -+ /* location: {SR22,0,4}. */ -+ ViaSeqMask(hwp, 0x22, 0x08, 0x1F); /* 32/4 = 8 = 0x08 */ - break; - case VIA_P4M890: -- hwp->writeSeq(hwp, 0x16, 0x13); -- hwp->writeSeq(hwp, 0x17, 0x2F); -- hwp->writeSeq(hwp, 0x18, 0x53); -- hwp->writeSeq(hwp, 0x22, 0x10); -+ hwp->writeSeq(hwp, 0x17, 0x2F); /* 96/2-1 = 47 = 0x2F */ -+ ViaSeqMask(hwp, 0x16, 0x13, 0xBF); /* 76/4 = 19 = 0x13 */ -+ ViaSeqMask(hwp, 0x18, 0x10, 0xBF); /* 64/4 = 16 = 0x10 */ -+ ViaSeqMask(hwp, 0x22, 0x08, 0x1F); /* 32/4 = 8 = 0x08 */ - break; - case VIA_CX700: -- hwp->writeSeq(hwp, 0x16, 0x26); - hwp->writeSeq(hwp, 0x17, 0x5F); -- hwp->writeSeq(hwp, 0x18, 0x66); -- hwp->writeSeq(hwp, 0x22, 0x1F); -+ ViaSeqMask(hwp, 0x16, 0x20, 0xBF); /* 128/4 = 32 = 0x20 */ -+ ViaSeqMask(hwp, 0x18, 0x20, 0xBF); /* 128/4 = 32 = 0x20 */ -+ ViaSeqMask(hwp, 0x22, 0x1F, 0x1F); /* 124/4 = 31 = 0x1F */ - break; - case VIA_VX800: -- hwp->writeSeq(hwp, 0x16, 0x26); /* 152/4 = 38 */ -- hwp->writeSeq(hwp, 0x17, 0x5F); /* 192/2-1 = 95 */ -+ hwp->writeSeq(hwp, 0x17, 0x5F); /* 192/2-1 = 95 = 0x5F */ -+ hwp->writeSeq(hwp, 0x16, 0x26); /* 152/4 = 38 = 0x26 */ - hwp->writeSeq(hwp, 0x18, 0x26); /* 152/4 = 38 */ - hwp->writeSeq(hwp, 0x22, 0x10); /* 64/4 = 16 */ - break; - case VIA_VX855: -- hwp->writeSeq(hwp, 0x16, 0x50); /* 320/4 = 80 */ -- hwp->writeSeq(hwp, 0x17, 0xC7); /* 400/2-1 = 199 */ -- hwp->writeSeq(hwp, 0x18, 0x50); /* 320/4 = 80 */ -- hwp->writeSeq(hwp, 0x22, 0x28); /* 160/4 = 40 */ -+ hwp->writeSeq(hwp, 0x17, 0xC7); /* 400/2-1 = 199 = 0xC7 */ -+ /* TODO Formula for SR16 is: (0x50 & 0x3F) | ((0x50 & 0x40) << 1) = 0x90 */ -+ hwp->writeSeq(hwp, 0x16, 0x50); /* 320/4 = 80 = 0x50 */ -+ hwp->writeSeq(hwp, 0x18, 0x50); /* 320/4 = 80 = 0x50 */ -+ hwp->writeSeq(hwp, 0x22, 0x28); /* 160/4 = 40 = 0x28 */ -+ break; - default: - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "ViaSetPrimaryFIFO: " - "Chipset %d not implemented\n", pVia->Chipset); -@@ -371,7 +384,38 @@ - ViaCrtcMask(hwp, 0x94, 0x20, 0x7F); - break; - case VIA_P4M890: -+ /* depth location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */ -+ ViaCrtcMask(hwp, 0x68, 0xB0, 0xF0); /* 96/8-1 = 11 = 0x0B */ -+ ViaCrtcMask(hwp, 0x94, 0x00, 0x80); -+ ViaCrtcMask(hwp, 0x95, 0x00, 0x80); -+ -+ /* location: {CR68,0,3},{CR95,4,6} */ -+ ViaCrtcMask(hwp, 0x68, 0x03, 0x0F); /* 76/4 = 19 = 0x13 */ -+ ViaCrtcMask(hwp, 0x95, 0x10, 0x70); -+ -+ /* location: {CR92,0,3},{CR95,0,2} */ -+ ViaCrtcMask(hwp, 0x92, 0x00, 0x0F); /* 64/4 = 16 = 0x10 */ -+ ViaCrtcMask(hwp, 0x95, 0x01, 0x07); -+ -+ /* location: {CR94,0,6} */ -+ ViaCrtcMask(hwp, 0x94, 0x08, 0x7F); /* 32/4 = 8 = 0x08 */ -+ break; - case VIA_K8M890: -+ /* Display Queue Depth, location: {CR68,4,7},{CR94,7,7},{CR95,7,7} */ -+ ViaCrtcMask(hwp, 0x68, 0xC0, 0xF0); /* 360/8-1 = 44 = 0x2C; 0x2C << 4 = 0xC0 */ -+ ViaCrtcMask(hwp, 0x94, 0x00, 0x80); /* 0x2C << 3 = 0x00 */ -+ ViaCrtcMask(hwp, 0x95, 0x80, 0x80); /* 0x2C << 2 = 0x80 */ -+ -+ /* Display Queue Read Threshold 1, location: {CR68,0,3},{CR95,4,6} */ -+ ViaCrtcMask(hwp, 0x68, 0x02, 0x0F); /* 328/4 = 82 = 0x52 */ -+ ViaCrtcMask(hwp, 0x95, 0x50, 0x70); -+ -+ /* location: {CR92,0,3},{CR95,0,2} */ -+ ViaCrtcMask(hwp, 0x92, 0x0A, 0x0F); /* 296/4 = 74 = 0x4A */ -+ ViaCrtcMask(hwp, 0x95, 0x04, 0x07); /* 0x4A >> 4 = 0x04 */ -+ -+ /* Display Expire Number Bits, location: {CR94,0,6} */ -+ ViaCrtcMask(hwp, 0x94, 0x1F, 0x7F); /* 124/4 = 31 = 0x1F */ - break; - case VIA_P4M900: - ViaCrtcMask(hwp, 0x68, 0xB0, 0xF0); -diff -ruN xf86-video-openchrome-0.2.904/src/via_crtc.c ../openchrome/xf86-video-openchrome-0.2.904/src/via_crtc.c ---- xf86-video-openchrome-0.2.904/src/via_crtc.c 2009-10-03 22:48:55.000000000 +0200 -+++ ../openchrome/xf86-video-openchrome-0.2.904/src/via_crtc.c 2010-03-07 01:09:00.000000000 +0100 -@@ -234,8 +234,8 @@ - /* Primary starting address -> 0x00, adjustframe does the rest */ - hwp->writeCrtc(hwp, 0x0C, 0x00); - hwp->writeCrtc(hwp, 0x0D, 0x00); -- hwp->writeCrtc(hwp, 0x34, 0x00); - ViaCrtcMask(hwp, 0x48, 0x00, 0x03); /* is this even possible on CLE266A ? */ -+ hwp->writeCrtc(hwp, 0x34, 0x00); - - /* vertical sync start : 2047 */ - temp = mode->CrtcVSyncStart; -@@ -331,15 +331,20 @@ - CARD32 Base; - CARD32 tmp; - -+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ViaFirstCRTCSetStartingAddress\n")); -+ - Base = (y * pScrn->displayWidth + x) * (pScrn->bitsPerPixel / 8); - Base = Base >> 1; - - hwp->writeCrtc(hwp, 0x0C, (Base & 0xFF00) >> 8); - hwp->writeCrtc(hwp, 0x0D, Base & 0xFF); -- hwp->writeCrtc(hwp, 0x34, (Base & 0xFF0000) >> 16); -- -+ /* FIXME The proper starting address for CR48 is 0x1F - Bits[28:24] */ - if (!(pVia->Chipset == VIA_CLE266 && CLE266_REV_IS_AX(pVia->ChipRev))) - ViaCrtcMask(hwp, 0x48, Base >> 24, 0x0F); -+ /* CR34 are fire bits. Must be writed after CR0C CR0D CR48. */ -+ hwp->writeCrtc(hwp, 0x34, (Base & 0xFF0000) >> 16); -+ -+ - } - - void -diff -ruN xf86-video-openchrome-0.2.904/src/via_cursor.c ../openchrome/xf86-video-openchrome-0.2.904/src/via_cursor.c ---- xf86-video-openchrome-0.2.904/src/via_cursor.c 2009-10-03 22:48:55.000000000 +0200 -+++ ../openchrome/xf86-video-openchrome-0.2.904/src/via_cursor.c 2010-03-07 01:09:00.000000000 +0100 -@@ -145,9 +145,12 @@ - infoPtr->ShowCursor = viaShowCursor; - infoPtr->UseHWCursor = viaUseHWCursor; - -+ /* ARGB Cursor init */ - infoPtr->UseHWCursorARGB = viaUseHWCursorARGB; -- if (pVia->CursorARGBSupported) -+ if (pVia->CursorARGBSupported) { -+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "HWCursor ARGB enabled\n")); - infoPtr->LoadCursorARGB = viaLoadCursorARGB; -+ } - - /* Set cursor location in frame buffer. */ - VIASETREG(VIA_REG_CURSOR_MODE, pVia->cursorOffset); -@@ -284,7 +287,7 @@ - } - - /* -- * ARGB Cursor -+ * display the current cursor - */ - - void -@@ -319,13 +322,19 @@ - */ - - /* Duoview */ -- if (pVia->CursorPipe) -+ if (pVia->CursorPipe) { -+ /* Mono Cursor Display Path [bit31]: Secondary */ -+ /* FIXME For CLE266 nad KM400 try to enable 32x32 cursor size [bit1] */ - VIASETREG(VIA_REG_ALPHA_CONTROL, 0xF6000005); -- else -+ } else { -+ /* Mono Cursor Display Path [bit31]: Primary */ - VIASETREG(VIA_REG_ALPHA_CONTROL, 0x76000005); -+ } - } - } - -+ -+/* hide the current cursor */ - void - viaHideCursor(ScrnInfoPtr pScrn) - { -@@ -350,10 +359,16 @@ - - default: - temp = VIAGETREG(VIA_REG_ALPHA_CONTROL); -+ /* Hardware cursor disable [bit0] */ - VIASETREG(VIA_REG_ALPHA_CONTROL, temp & 0xFFFFFFFA); - } - } - -+/* -+ Set the cursor position to (x,y). X and/or y may be negative -+ indicating that the cursor image is partially offscreen on -+ the left and/or top edges of the screen. -+*/ - static void - viaSetCursorPosition(ScrnInfoPtr pScrn, int x, int y) - { -@@ -409,6 +424,15 @@ - && pCurs->bits->height <= pVia->CursorMaxHeight); - } - -+/* -+ If the driver is unable to use a hardware cursor for reasons -+ other than the cursor being larger than the maximum specified -+ in the MaxWidth or MaxHeight field below, it can supply the -+ UseHWCursor function. If UseHWCursor is provided by the driver, -+ it will be called whenever the cursor shape changes or the video -+ mode changes. This is useful for when the hardware cursor cannot -+ be used in interlaced or doublescan modes. -+*/ - static Bool - viaUseHWCursor(ScreenPtr pScreen, CursorPtr pCurs) - { -@@ -423,8 +447,11 @@ - && pCurs->bits->height <= pVia->CursorMaxHeight); - } - -+/* -+ Load Mono Cursor Image -+*/ - static void --viaLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *s) -+viaLoadCursorImage(ScrnInfoPtr pScrn, unsigned char *src) - { - VIAPtr pVia = VIAPTR(pScrn); - CARD32 temp; -@@ -439,7 +466,7 @@ - if (pVia->CursorARGBSupported) { - #define ARGB_PER_CHUNK (8 * sizeof (chunk) / 2) - for (i = 0; i < (pVia->CursorMaxWidth * pVia->CursorMaxHeight / ARGB_PER_CHUNK); i++) { -- chunk = *s++; -+ chunk = *src++; - for (j = 0; j < ARGB_PER_CHUNK; j++, chunk >>= 2) - *dst++ = mono_cursor_color[chunk & 3]; - } -@@ -447,7 +474,7 @@ - pVia->CursorFG = mono_cursor_color[3]; - pVia->CursorBG = mono_cursor_color[2]; - } else { -- memcpy(dst, (CARD8*)s, pVia->CursorSize); -+ memcpy(dst, (CARD8*)src, pVia->CursorSize); - } - switch(pVia->Chipset) { - case VIA_CX700: -@@ -471,11 +498,17 @@ - } - } - -+/* -+ Set the cursor foreground and background colors. In 8bpp, fg and -+ bg are indicies into the current colormap unless the -+ HARDWARE_CURSOR_TRUECOLOR_AT_8BPP flag is set. In that case -+ and in all other bpps the fg and bg are in 8-8-8 RGB format. -+*/ -+ - static void - viaSetCursorColors(ScrnInfoPtr pScrn, int bg, int fg) - { - VIAPtr pVia = VIAPTR(pScrn); -- CARD32 control = pVia->CursorRegControl; - CARD32 pixel; - CARD32 temp; - CARD32 *dst; -@@ -487,12 +520,10 @@ - fg |= 0xff000000; - bg |= 0xff000000; - -+ /* Don't recolour the image if we don't have to. */ - if (fg == pVia->CursorFG && bg == pVia->CursorBG) - return; - -- temp = VIAGETREG(control); -- VIASETREG(control, temp & 0xFFFFFFFE); -- - dst = (CARD32*)pVia->cursorMap; - for (i = 0; i < pVia->CursorMaxWidth * pVia->CursorMaxHeight; i++, dst++) - if ((pixel = *dst)) -@@ -517,7 +548,8 @@ - } - break; - default: -- VIASETREG(control, temp); -+ temp = VIAGETREG(VIA_REG_ALPHA_CONTROL); -+ VIASETREG(VIA_REG_ALPHA_CONTROL, temp & 0xFFFFFFFE); - } - } - -diff -ruN xf86-video-openchrome-0.2.904/src/via_dri.c ../openchrome/xf86-video-openchrome-0.2.904/src/via_dri.c ---- xf86-video-openchrome-0.2.904/src/via_dri.c 2009-10-03 22:48:55.000000000 +0200 -+++ ../openchrome/xf86-video-openchrome-0.2.904/src/via_dri.c 2010-03-07 01:09:00.000000000 +0100 -@@ -267,6 +267,11 @@ - pVIADRI = pDRIInfo->devPrivate; - pVia->agpSize = 0; - -+/* For AMD64 */ -+#ifdef __x86_64__ -+ return FALSE; -+#endif -+ - if (drmAgpAcquire(pVia->drmFD) < 0) { - xf86DrvMsg(pScreen->myNum, X_ERROR, "[drm] drmAgpAcquire failed %d\n", - errno); -diff -ruN xf86-video-openchrome-0.2.904/src/via_driver.c ../openchrome/xf86-video-openchrome-0.2.904/src/via_driver.c ---- xf86-video-openchrome-0.2.904/src/via_driver.c 2009-10-09 00:46:15.000000000 +0200 -+++ ../openchrome/xf86-video-openchrome-0.2.904/src/via_driver.c 2010-03-07 01:09:00.000000000 +0100 -@@ -178,8 +178,8 @@ - {VIA_P4M900, "P4M900/VN896/CN896"}, - {VIA_CX700, "CX700/VX700"}, - {VIA_P4M890, "P4M890"}, -- {VIA_VX800, "VX800"}, -- {VIA_VX855, "VX855"}, -+ {VIA_VX800, "VX800/VX820"}, -+ {VIA_VX855, "VX855/VX875"}, - {-1, NULL } - }; - -@@ -215,6 +215,7 @@ - OPTION_EXA_SCRATCH_SIZE, - OPTION_SWCURSOR, - OPTION_SHADOW_FB, -+ OPTION_ROTATION_TYPE, - OPTION_ROTATE, - OPTION_VIDEORAM, - OPTION_ACTIVEDEVICE, -@@ -253,6 +254,7 @@ - {OPTION_EXA_SCRATCH_SIZE, "ExaScratchSize", OPTV_INTEGER, {0}, FALSE}, - {OPTION_SWCURSOR, "SWCursor", OPTV_BOOLEAN, {0}, FALSE}, - {OPTION_SHADOW_FB, "ShadowFB", OPTV_BOOLEAN, {0}, FALSE}, -+ {OPTION_ROTATION_TYPE, "RotationType", OPTV_ANYSTR, {0}, FALSE}, - {OPTION_ROTATE, "Rotate", OPTV_ANYSTR, {0}, FALSE}, - {OPTION_VIDEORAM, "VideoRAM", OPTV_INTEGER, {0}, FALSE}, - {OPTION_ACTIVEDEVICE, "ActiveDevice", OPTV_ANYSTR, {0}, FALSE}, -@@ -307,6 +309,7 @@ - { - static Bool setupDone = FALSE; - -+ /* Only be loaded once */ - if (!setupDone) { - setupDone = TRUE; - xf86AddDriver(&VIA, module, -@@ -339,6 +342,7 @@ - if (pScrn->driverPrivate) - return TRUE; - -+ /* allocate VIARec */ - pScrn->driverPrivate = xnfcalloc(sizeof(VIARec), 1); - VIAPtr pVia = ((VIARec *) (pScrn->driverPrivate)); - -@@ -455,7 +459,6 @@ - { - ScrnInfoPtr scrn = NULL; - EntityInfoPtr entity; -- DevUnion *private; - - scrn = xf86ConfigPciEntity(scrn, 0, entity_num, VIAPciChipsets, - NULL, NULL, NULL, NULL, NULL); -@@ -652,6 +655,12 @@ - vbeInfoPtr pVbe; - - if (xf86LoadSubModule(pScrn, "vbe")) { -+ /* FIXME This line should be replaced to: -+ -+ pVbe = VBEExtendedInit(NULL, index, 0); -+ -+ for XF86 version > 4.2.99 -+ */ - pVbe = VBEInit(NULL, index); - ConfiguredMonitor = vbeDoEDID(pVbe, NULL); - vbeFree(pVbe); -@@ -664,7 +673,7 @@ - VIAPtr pVia = VIAPTR(pScrn); - VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo; - -- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VIASetupDefaultOptions\n")); -+ DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VIASetupDefaultOptions - Setting up default chipset options.\n")); - - pVia->shadowFB = FALSE; - pVia->NoAccel = FALSE; -@@ -688,6 +697,9 @@ - #ifdef HAVE_DEBUG - pVia->PrintVGARegs = FALSE; - #endif -+ -+ /* Disable vertical interpolation because the size of */ -+ /* line buffer (limited to 800) is too small to do interpolation. */ - pVia->swov.maxWInterp = 800; - pVia->swov.maxHInterp = 600; - pVia->useLegacyVBE = TRUE; -@@ -713,11 +725,14 @@ - pVia->UseLegacyModeSwitch = TRUE; - break; - case VIA_PM800: -+ /* Use new mode switch to resolve many resolution and display bugs (switch to console) */ -+ /* FIXME The video playing (XV) is not working correctly after turn on new mode switch */ - pVia->VideoEngine = VIDEO_ENGINE_CME; -- pVia->UseLegacyModeSwitch = TRUE; - break; - case VIA_VM800: -- pVia->UseLegacyModeSwitch = TRUE; -+ /* New mode switch resolve bug with gamma set #282 */ -+ /* and with Xv after hibernate #240 */ -+ /* FIXME Add panel support for this chipset */ - break; - case VIA_K8M890: - pVia->VideoEngine = VIDEO_ENGINE_CME; -@@ -1050,19 +1065,13 @@ - xf86DrvMsg(pScrn->scrnIndex, from, - "Probed amount of VideoRAM = %d kB\n", pScrn->videoRam); - -- xf86DrvMsg(pScrn->scrnIndex, X_INFO, -- "Setting up default chipset options.\n"); - if (!VIASetupDefaultOptions(pScrn)) { - VIAFreeRec(pScrn); - return FALSE; - } - -- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Reading config file...\n"); - xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, VIAOptions); - -- xf86DrvMsg(pScrn->scrnIndex, X_INFO, -- "Starting to parse config file options...\n"); -- - if (xf86GetOptValInteger(VIAOptions, OPTION_VIDEORAM, &pScrn->videoRam)) - xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, - "Setting amount of VideoRAM to %d kB\n", pScrn->videoRam); -@@ -1100,6 +1109,31 @@ - } - - /* When rotating, switch shadow framebuffer on and acceleration off. */ -+ if ((s = xf86GetOptValString(VIAOptions, OPTION_ROTATION_TYPE))) { -+ if (!xf86NameCmp(s, "SWRandR")) { -+ pVia->shadowFB = TRUE; -+ pVia->NoAccel = TRUE; -+ pVia->RandRRotation = TRUE; -+ pVia->rotate = RR_Rotate_0; -+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Rotating screen " -+ "RandR enabled, acceleration disabled\n"); -+ } else if (!xf86NameCmp(s, "HWRandR")) { -+ pVia->shadowFB = TRUE; -+ pVia->NoAccel = TRUE; -+ pVia->RandRRotation = TRUE; -+ pVia->rotate = RR_Rotate_0; -+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Hardware accelerated " -+ "rotating screen is not implemented. Using SW RandR.\n"); -+ } else { -+ xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "\"%s\" is not a valid" -+ "value for Option \"RotationType\".\n", s); -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, -+ "Valid options are \"SWRandR\" and \"HWRandR\".\n"); -+ } -+ } -+ -+ -+ /* When rotating, switch shadow framebuffer on and acceleration off. */ - if ((s = xf86GetOptValString(VIAOptions, OPTION_ROTATE))) { - if (!xf86NameCmp(s, "CW")) { - pVia->shadowFB = TRUE; -@@ -1498,6 +1532,7 @@ - } - } - -+ /* Initialize the colormap */ - Gamma zeros = { 0.0, 0.0, 0.0 }; - if (!xf86SetGamma(pScrn, zeros)) { - VIAFreeRec(pScrn); -@@ -1561,9 +1596,8 @@ - - if (pBIOSInfo->Panel->IsActive && - ((pVia->Chipset == VIA_K8M800) || -- (pVia->Chipset == VIA_PM800) || - (pVia->Chipset == VIA_VM800))) { -- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Panel on K8M800, PM800 and " -+ xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "Panel on K8M800 and " - "VM800 is currently not supported.\n"); - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Using VBE to set modes to work around this.\n"); -@@ -1621,7 +1655,7 @@ - * - * CLE266A: primary AdjustFrame can use only 24 bits, so we are limited - * to 12x11 bits; 4080x2048 (~2:1), 3344x2508 (4:3), or 2896x2896 (1:1). -- * Test CLE266Cx, KM400, KM400A, K8M800, PM800, CN400 please. -+ * TODO Test CLE266Cx, KM400, KM400A, K8M800, CN400 please. - * - * We should be able to limit the memory available for a mode to 32 MB, - * but xf86ValidateModes (or miScanLineWidth) fails to catch this -@@ -1629,13 +1663,14 @@ - */ - - /* Select valid modes from those available. */ -- i = xf86ValidateModes(pScrn, pScrn->monitor->Modes, /* availModes */ -- pScrn->display->modes, /* modeNames */ -- clockRanges, /* list of clock ranges */ -+ i = xf86ValidateModes(pScrn, -+ pScrn->monitor->Modes, /* List of modes available for the monitor */ -+ pScrn->display->modes, /* List of mode names that the screen is requesting */ -+ clockRanges, /* list of clock ranges */ - NULL, /* list of line pitches */ - 256, /* minimum line pitch */ - 3344, /* maximum line pitch */ -- 32 * 8, /* pitch inc (bits) */ -+ 16 * 8, /* pitch increment (in bits), we just want 16 bytes alignment */ - 128, /* min height */ - 2508, /* max height */ - pScrn->display->virtualX, /* virtual width */ -@@ -1650,6 +1685,7 @@ - return FALSE; - } - -+ /* This function deletes modes in the modes field of the ScrnInfoRec that have been marked as invalid. */ - xf86PruneDriverModes(pScrn); - - if (i == 0 || pScrn->modes == NULL) { -@@ -1662,9 +1698,17 @@ - /* Set up screen parameters. */ - pVia->Bpp = pScrn->bitsPerPixel >> 3; - pVia->Bpl = pScrn->displayWidth * pVia->Bpp; -+ -+ /* This function fills in the Crtc fields for all the modes in the modes field of the ScrnInfoRec. */ - xf86SetCrtcForModes(pScrn, INTERLACE_HALVE_V); -+ -+ /* Set the current mode to the first in the list */ - pScrn->currentMode = pScrn->modes; -+ -+ /* Print the list of modes being used */ - xf86PrintModes(pScrn); -+ -+ /* Set display resolution */ - xf86SetDpi(pScrn, 0, 0); - - #ifdef USE_FB -@@ -1935,7 +1979,9 @@ - Regs->SR17 = hwp->readSeq(hwp, 0x17); - Regs->SR18 = hwp->readSeq(hwp, 0x18); - Regs->SR19 = hwp->readSeq(hwp, 0x19); -+ /* PCI Bus Control */ - Regs->SR1A = hwp->readSeq(hwp, 0x1A); -+ - Regs->SR1B = hwp->readSeq(hwp, 0x1B); - Regs->SR1C = hwp->readSeq(hwp, 0x1C); - Regs->SR1D = hwp->readSeq(hwp, 0x1D); -@@ -1977,40 +2023,56 @@ - Regs->SR4C = hwp->readSeq(hwp, 0x4C); - break; - } -- DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, -- "Non-Primary Adapter! saving VGA_SR_MODE only !!\n")); - DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Crtc...\n")); - - Regs->CR13 = hwp->readCrtc(hwp, 0x13); - - Regs->CR32 = hwp->readCrtc(hwp, 0x32); - Regs->CR33 = hwp->readCrtc(hwp, 0x33); -- Regs->CR34 = hwp->readCrtc(hwp, 0x34); -+ - Regs->CR35 = hwp->readCrtc(hwp, 0x35); - Regs->CR36 = hwp->readCrtc(hwp, 0x36); - -+ -+ -+ /* Starting Address */ -+ /* Start Address High */ -+ Regs->CR0C = hwp->readCrtc(hwp, 0x0C); -+ /* Start Address Low */ -+ Regs->CR0D = hwp->readCrtc(hwp, 0x0D); -+ /* Starting Address Overflow Bits[28:24] */ - Regs->CR48 = hwp->readCrtc(hwp, 0x48); -+ /* CR34 are fire bits. Must be writed after CR0C CR0D CR48. */ -+ /* Starting Address Overflow Bits[23:16] */ -+ Regs->CR34 = hwp->readCrtc(hwp, 0x34); -+ -+ - Regs->CR49 = hwp->readCrtc(hwp, 0x49); - - DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "TVSave...\n")); - if (pBIOSInfo->TVI2CDev) - ViaTVSave(pScrn); - -- /* Save LCD control registers. */ -+ /* Save LCD control registers (from CR 0x50 to 0x93). */ - for (i = 0; i < 68; i++) - Regs->CRTCRegs[i] = hwp->readCrtc(hwp, i + 0x50); - - if (pVia->Chipset != VIA_CLE266 && pVia->Chipset != VIA_KM400) { -- -- Regs->CRA0 = hwp->readCrtc(hwp, 0xA0); -- Regs->CRA1 = hwp->readCrtc(hwp, 0xA1); -- Regs->CRA2 = hwp->readCrtc(hwp, 0xA2); -- -+ /* LVDS Channel 2 Function Select 0 / DVI Function Select */ - Regs->CR97 = hwp->readCrtc(hwp, 0x97); -+ /* LVDS Channel 1 Function Select 0 */ - Regs->CR99 = hwp->readCrtc(hwp, 0x99); -+ /* Digital Video Port 1 Function Select 0 */ - Regs->CR9B = hwp->readCrtc(hwp, 0x9B); -+ /* Power Now Control 4 */ - Regs->CR9F = hwp->readCrtc(hwp, 0x9F); - -+ /* Horizontal Scaling Initial Value */ -+ Regs->CRA0 = hwp->readCrtc(hwp, 0xA0); -+ /* Vertical Scaling Initial Value */ -+ Regs->CRA1 = hwp->readCrtc(hwp, 0xA1); -+ /* Scaling Enable Bit */ -+ Regs->CRA2 = hwp->readCrtc(hwp, 0xA2); - } - - /* Save TMDS status */ -@@ -2098,11 +2160,19 @@ - hwp->writeSeq(hwp, 0x45, Regs->SR45); - hwp->writeSeq(hwp, 0x46, Regs->SR46); - -+ /* Reset VCK PLL */ -+ hwp->writeSeq(hwp, 0x40, hwp->readSeq(hwp, 0x40) | 0x02); /* Set SR40[1] to 1 */ -+ hwp->writeSeq(hwp, 0x40, hwp->readSeq(hwp, 0x40) & 0xFD); /* Set SR40[1] to 0 */ -+ - /* ECK Clock Synthesizer: */ - hwp->writeSeq(hwp, 0x47, Regs->SR47); - hwp->writeSeq(hwp, 0x48, Regs->SR48); - hwp->writeSeq(hwp, 0x49, Regs->SR49); - -+ /* Reset ECK PLL */ -+ hwp->writeSeq(hwp, 0x40, hwp->readSeq(hwp, 0x40) | 0x01); /* Set SR40[0] to 1 */ -+ hwp->writeSeq(hwp, 0x40, hwp->readSeq(hwp, 0x40) & 0xFE); /* Set SR40[0] to 0 */ -+ - switch (pVia->Chipset) { - case VIA_CLE266: - case VIA_KM400: -@@ -2112,6 +2182,10 @@ - hwp->writeSeq(hwp, 0x4A, Regs->SR4A); - hwp->writeSeq(hwp, 0x4B, Regs->SR4B); - hwp->writeSeq(hwp, 0x4C, Regs->SR4C); -+ -+ /* Reset LCK PLL */ -+ hwp->writeSeq(hwp, 0x40, hwp->readSeq(hwp, 0x40) | 0x04); /* Set SR40[2] to 1 */ -+ hwp->writeSeq(hwp, 0x40, hwp->readSeq(hwp, 0x40) & 0xFB); /* Set SR40[2] to 0 */ - break; - } - -@@ -2127,14 +2201,23 @@ - hwp->writeCrtc(hwp, 0x32, Regs->CR32); - /* HSYNCH Adjuster */ - hwp->writeCrtc(hwp, 0x33, Regs->CR33); -- /* Starting Address Overflow */ -- hwp->writeCrtc(hwp, 0x34, Regs->CR34); - /* Extended Overflow */ - hwp->writeCrtc(hwp, 0x35, Regs->CR35); - /*Power Management 3 (Monitor Control) */ - hwp->writeCrtc(hwp, 0x36, Regs->CR36); - -+ /* Starting Address */ -+ /* Start Address High */ -+ hwp->writeCrtc(hwp, 0x0C, Regs->CR0C); -+ /* Start Address Low */ -+ hwp->writeCrtc(hwp, 0x0D, Regs->CR0D); -+ /* Starting Address Overflow Bits[28:24] */ - hwp->writeCrtc(hwp, 0x48, Regs->CR48); -+ /* CR34 are fire bits. Must be writed after CR0C CR0D CR48. */ -+ /* Starting Address Overflow Bits[23:16] */ -+ hwp->writeCrtc(hwp, 0x34, Regs->CR34); -+ -+ - hwp->writeCrtc(hwp, 0x49, Regs->CR49); - - /* Restore LCD control registers. */ -@@ -2453,7 +2536,6 @@ - VIALoadRgbLut(ScrnInfoPtr pScrn, int numColors, int *indices, LOCO *colors, - VisualPtr pVisual) - { -- VIAPtr pVia = VIAPTR(pScrn); - vgaHWPtr hwp = VGAHWPTR(pScrn); - - int i, j, index; -@@ -2880,7 +2962,6 @@ - VIAWriteMode(ScrnInfoPtr pScrn, DisplayModePtr mode) - { - VIAPtr pVia = VIAPTR(pScrn); -- VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo; - - DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VIAWriteMode\n")); - -@@ -3033,9 +3114,7 @@ - VIAAdjustFrame(int scrnIndex, int x, int y, int flags) - { - ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -- vgaHWPtr hwp = VGAHWPTR(pScrn); - VIAPtr pVia = VIAPTR(pScrn); -- CARD32 Base; - - DEBUG(xf86DrvMsg(scrnIndex, X_INFO, "VIAAdjustFrame %dx%d\n", x, y)); - -@@ -3173,7 +3252,6 @@ - static void - VIADPMS(ScrnInfoPtr pScrn, int mode, int flags) - { -- vgaHWPtr hwp = VGAHWPTR(pScrn); - VIAPtr pVia = VIAPTR(pScrn); - VIABIOSInfoPtr pBIOSInfo = pVia->pBIOSInfo; - -diff -ruN xf86-video-openchrome-0.2.904/src/via_driver.h ../openchrome/xf86-video-openchrome-0.2.904/src/via_driver.h ---- xf86-video-openchrome-0.2.904/src/via_driver.h 2009-10-09 01:09:22.000000000 +0200 -+++ ../openchrome/xf86-video-openchrome-0.2.904/src/via_driver.h 2010-03-07 01:09:00.000000000 +0100 -@@ -130,6 +130,7 @@ - CARD8 SR4A, SR4B, SR4C; - - /* extended CRTC registers */ -+ CARD8 CR0C, CR0D; - CARD8 CR13, CR30, CR31, CR32, CR33, CR34, CR35, CR36; - CARD8 CR37, CR38, CR39, CR3A, CR40, CR41, CR42, CR43; - CARD8 CR44, CR45, CR46, CR47, CR48, CR49, CR4A; -@@ -418,10 +419,10 @@ - Bool PrintVGARegs; - Bool PrintTVRegs; - Bool I2CScan; -+#endif /* HAVE_DEBUG */ - - Bool UseLegacyModeSwitch ; - video_via_regs* VideoRegs ; --#endif /* HAVE_DEBUG */ - } VIARec, *VIAPtr; - - #define VIAPTR(p) ((VIAPtr)((p)->driverPrivate)) -diff -ruN xf86-video-openchrome-0.2.904/src/via_id.c ../openchrome/xf86-video-openchrome-0.2.904/src/via_id.c ---- xf86-video-openchrome-0.2.904/src/via_id.c 2009-10-07 23:30:39.000000000 +0200 -+++ ../openchrome/xf86-video-openchrome-0.2.904/src/via_id.c 2010-03-07 01:09:00.000000000 +0100 -@@ -152,6 +152,7 @@ - {"MSI PM8PM", VIA_VM800, 0x1462, 0x7222, VIA_DEVICE_CRT}, - {"Twinhead M6", VIA_VM800, 0x14FF, 0xA007, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, - {"RoverBook Partner W500", VIA_VM800, 0x1509, 0x4330, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, -+ {"FIC PTM800Pro LF", VIA_VM800, 0x1509, 0x601A, VIA_DEVICE_CRT}, - {"Clevo/RoverBook Voyager V511L", VIA_VM800, 0x1558, 0x0662, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, - {"Clevo M5xxS", VIA_VM800, 0x1558, 0x5406, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, - {"Biostar P4M80-M4 / P4VMA-M", VIA_VM800, 0x1565, 0x1202, VIA_DEVICE_CRT}, -@@ -170,6 +171,7 @@ - {"Asustek M2V-MX SE", VIA_K8M890, 0x1043, 0x8297, VIA_DEVICE_CRT}, - {"Foxconn K8M890M2MA-RS2H", VIA_K8M890, 0x105B, 0x0C84, VIA_DEVICE_CRT}, - {"Shuttle FX22V1", VIA_K8M890, 0x1297, 0x3080, VIA_DEVICE_CRT}, -+ {"MSI K8M890M2-V", VIA_K8M890, 0x1462, 0x7139, VIA_DEVICE_CRT}, - {"MSI K9VGM-V", VIA_K8M890, 0x1462, 0x7253, VIA_DEVICE_CRT}, - {"Averatec 226x", VIA_K8M890, 0x14FF, 0xA002, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, - {"Fujitsu/Siemens Amilo La 1703", VIA_K8M890, 0x1734, 0x10D9, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, -@@ -189,6 +191,7 @@ - {"MSI P4M900M / P4M900M2-F/L", VIA_P4M900, 0x1462, 0x7255, VIA_DEVICE_CRT}, - {"MSI P4M900M3-L", VIA_P4M900, 0x1462, 0x7387, VIA_DEVICE_CRT}, - {"Twinhead H12V", VIA_P4M900, 0x14FF, 0xA00F, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, -+ {"Twinhead K15V", VIA_P4M900, 0x14FF, 0xA012, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, - {"Everex NC1501/NC1503", VIA_P4M900, 0x1509, 0x1E30, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, - {"Clevo M660SE", VIA_P4M900, 0x1558, 0x0664, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, - {"Clevo M660SR", VIA_P4M900, 0x1558, 0x0669, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, -@@ -224,6 +227,7 @@ - - /*** VX800 ***/ - {"VIA Epia M700", VIA_VX800, 0x1106, 0x1122, VIA_DEVICE_CRT}, -+ {"Guillemot-Hercules ECafe EC900B", VIA_VX800, 0x1106, 0x3349, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, - {"VIA OpenBook", VIA_VX800, 0x1170, 0x0311, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, /* VIA OpenBook eNote VBE8910 */ - {"Samsung NC20", VIA_VX800, 0x144d, 0xc04e, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, - {"Quanta DreamBook Light IL1", VIA_VX800, 0x152d, 0x0771, VIA_DEVICE_CRT | VIA_DEVICE_LCD}, -@@ -231,6 +235,7 @@ - - /*** VX855 ***/ - {"VIA VT8562C", VIA_VX855, 0x1106, 0x5122, VIA_DEVICE_CRT}, -+ {"OLPC XO 1.5", VIA_VX855, 0x152D, 0x0833, VIA_DEVICE_LCD}, - - /* keep this */ - {NULL, VIA_UNKNOWN, 0x0000, 0x0000, VIA_DEVICE_NONE} -diff -ruN xf86-video-openchrome-0.2.904/src/via_mode.h ../openchrome/xf86-video-openchrome-0.2.904/src/via_mode.h ---- xf86-video-openchrome-0.2.904/src/via_mode.h 2009-10-07 23:31:47.000000000 +0200 -+++ ../openchrome/xf86-video-openchrome-0.2.904/src/via_mode.h 2010-03-07 01:09:00.000000000 +0100 -@@ -54,50 +54,50 @@ - CARD16 UniChrome; - union pllparams UniChromePro; - } ViaDotClocks[] = { -- { 25200, 0x513C, /* 0xa79004 */ { 1, 4, 6, 169 } }, -- { 25312, 0xC763, /* 0xc49005 */ { 1, 4, 7, 198 } }, -- { 26591, 0x471A, /* 0xce9005 */ { 1, 4, 7, 208 } }, -- { 31500, 0xC558, /* 0xae9003 */ { 1, 4, 5, 176 } }, -- { 31704, 0x471F, /* 0xaf9002 */ { 1, 4, 4, 177 } }, -- { 32663, 0xC449, /* 0x479000 */ { 1, 4, 2, 73 } }, -- { 33750, 0x4721, /* 0x959002 */ { 1, 4, 4, 151 } }, -- { 35500, 0x5877, /* 0x759001 */ { 1, 4, 3, 119 } }, -- { 36000, 0x5879, /* 0x9f9002 */ { 1, 4, 4, 161 } }, -- { 39822, 0xC459, /* 0x578c02 */ { 1, 3, 4, 89 } }, -- { 40000, 0x515F, /* 0x848c04 */ { 1, 3, 6, 134 } }, -- { 41164, 0x4417, /* 0x2c8c00 */ { 1, 3, 2, 46 } }, -- { 46981, 0x5069, /* 0x678c02 */ { 1, 3, 4, 105 } }, -- { 49500, 0xC353, /* 0xa48c04 */ { 3, 3, 5, 138 } }, -- { 50000, 0xC354, /* 0x368c00 */ { 1, 3, 2, 56 } }, -- { 56300, 0x4F76, /* 0x3d8c00 */ { 1, 3, 2, 63 } }, -- { 57275, 0, /* 0x3e8c00 */ { 1, 3, 5, 157 } }, /* For XO 1.5 no need for a unichrome clock */ -- { 57284, 0x4E70, /* 0x3e8c00 */ { 1, 3, 2, 64 } }, -- { 64995, 0x0D3B, /* 0x6b8c01 */ { 1, 3, 3, 109 } }, -- { 65000, 0x0D3B, /* 0x6b8c01 */ { 1, 3, 3, 109 } }, /* Slightly unstable on PM800 */ -- { 65028, 0x866D, /* 0x6b8c01 */ { 1, 3, 3, 109 } }, -- { 74480, 0x156E, /* 0x288800 */ { 1, 2, 2, 42 } }, -- { 75000, 0x156E, /* 0x288800 */ { 1, 2, 2, 42 } }, -- { 78800, 0x442C, /* 0x2a8800 */ { 1, 2, 2, 44 } }, -- { 81135, 0x0622, /* 0x428801 */ { 1, 2, 3, 68 } }, -- { 81613, 0x4539, /* 0x708803 */ { 1, 2, 5, 114 } }, -- { 94500, 0x4542, /* 0x4d8801 */ { 1, 2, 3, 79 } }, -- { 108000, 0x0B53, /* 0x778802 */ { 1, 2, 4, 121 } }, -- { 108280, 0x4879, /* 0x778802 */ { 1, 2, 4, 121 } }, -- { 122000, 0x0D6F, /* 0x428800 */ { 1, 2, 2, 68 } }, -- { 122726, 0x073C, /* 0x878802 */ { 1, 2, 4, 137 } }, -- { 135000, 0x0742, /* 0x6f8801 */ { 1, 2, 3, 113 } }, -- { 148500, 0x0853, /* 0x518800 */ { 1, 2, 2, 83 } }, -- { 155800, 0x0857, /* 0x558402 */ { 1, 1, 4, 87 } }, -- { 157500, 0x422C, /* 0x2a8400 */ { 1, 1, 2, 44 } }, -- { 161793, 0x4571, /* 0x6f8403 */ { 1, 1, 5, 113 } }, -- { 162000, 0x0A71, /* 0x6f8403 */ { 1, 1, 5, 113 } }, -- { 175500, 0x4231, /* 0x2f8400 */ { 1, 1, 2, 49 } }, -- { 189000, 0x0542, /* 0x4d8401 */ { 1, 1, 3, 79 } }, -- { 202500, 0x0763, /* 0x6F8402 */ { 1, 1, 4, 113 } }, -- { 204800, 0x0764, /* 0x548401 */ { 1, 1, 3, 86 } }, -- { 218300, 0x043D, /* 0x3b8400 */ { 1, 1, 2, 61 } }, -- { 229500, 0x0660, /* 0x3e8400 */ { 1, 1, 2, 64 } }, /* Not tested on Pro } */ -- { 0, 0, { 0, 0, 0, 0 } } -+ { 25200, 0x513C, /* 0xa79004 */ { { 1, 4, 6, 169 } } }, -+ { 25312, 0xC763, /* 0xc49005 */ { { 1, 4, 7, 198 } } }, -+ { 26591, 0x471A, /* 0xce9005 */ { { 1, 4, 7, 208 } } }, -+ { 31500, 0xC558, /* 0xae9003 */ { { 1, 4, 5, 176 } } }, -+ { 31704, 0x471F, /* 0xaf9002 */ { { 1, 4, 4, 177 } } }, -+ { 32663, 0xC449, /* 0x479000 */ { { 1, 4, 2, 73 } } }, -+ { 33750, 0x4721, /* 0x959002 */ { { 1, 4, 4, 151 } } }, -+ { 35500, 0x5877, /* 0x759001 */ { { 1, 4, 3, 119 } } }, -+ { 36000, 0x5879, /* 0x9f9002 */ { { 1, 4, 4, 161 } } }, -+ { 39822, 0xC459, /* 0x578c02 */ { { 1, 3, 4, 89 } } }, -+ { 40000, 0x515F, /* 0x848c04 */ { { 1, 3, 6, 134 } } }, -+ { 41164, 0x4417, /* 0x2c8c00 */ { { 1, 3, 2, 46 } } }, -+ { 46981, 0x5069, /* 0x678c02 */ { { 1, 3, 4, 105 } } }, -+ { 49500, 0xC353, /* 0xa48c04 */ { { 3, 3, 5, 138 } } }, -+ { 50000, 0xC354, /* 0x368c00 */ { { 1, 3, 2, 56 } } }, -+ { 56300, 0x4F76, /* 0x3d8c00 */ { { 1, 3, 2, 63 } } }, -+ { 57275, 0, /* 0x3e8c00 */ { { 1, 3, 5, 157 } } }, /* For XO 1.5 no need for a unichrome clock */ -+ { 57284, 0x4E70, /* 0x3e8c00 */ { { 1, 3, 2, 64 } } }, -+ { 64995, 0x0D3B, /* 0x6b8c01 */ { { 1, 3, 3, 109 } } }, -+ { 65000, 0x0D3B, /* 0x6b8c01 */ { { 1, 3, 3, 109 } } }, /* Slightly unstable on PM800 */ -+ { 65028, 0x866D, /* 0x6b8c01 */ { { 1, 3, 3, 109 } } }, -+ { 74480, 0x156E, /* 0x288800 */ { { 1, 2, 2, 42 } } }, -+ { 75000, 0x156E, /* 0x288800 */ { { 1, 2, 2, 42 } } }, -+ { 78800, 0x442C, /* 0x2a8800 */ { { 1, 2, 2, 44 } } }, -+ { 81135, 0x0622, /* 0x428801 */ { { 1, 2, 3, 68 } } }, -+ { 81613, 0x4539, /* 0x708803 */ { { 1, 2, 5, 114 } } }, -+ { 94500, 0x4542, /* 0x4d8801 */ { { 1, 2, 3, 79 } } }, -+ { 108000, 0x0B53, /* 0x778802 */ { { 1, 2, 4, 121 } } }, -+ { 108280, 0x4879, /* 0x778802 */ { { 1, 2, 4, 121 } } }, -+ { 122000, 0x0D6F, /* 0x428800 */ { { 1, 2, 2, 68 } } }, -+ { 122726, 0x073C, /* 0x878802 */ { { 1, 2, 4, 137 } } }, -+ { 135000, 0x0742, /* 0x6f8801 */ { { 1, 2, 3, 113 } } }, -+ { 148500, 0x0853, /* 0x518800 */ { { 1, 2, 2, 83 } } }, -+ { 155800, 0x0857, /* 0x558402 */ { { 1, 1, 4, 87 } } }, -+ { 157500, 0x422C, /* 0x2a8400 */ { { 1, 1, 2, 44 } } }, -+ { 161793, 0x4571, /* 0x6f8403 */ { { 1, 1, 5, 113 } } }, -+ { 162000, 0x0A71, /* 0x6f8403 */ { { 1, 1, 5, 113 } } }, -+ { 175500, 0x4231, /* 0x2f8400 */ { { 1, 1, 2, 49 } } }, -+ { 189000, 0x0542, /* 0x4d8401 */ { { 1, 1, 3, 79 } } }, -+ { 202500, 0x0763, /* 0x6F8402 */ { { 1, 1, 4, 113 } } }, -+ { 204800, 0x0764, /* 0x548401 */ { { 1, 1, 3, 86 } } }, -+ { 218300, 0x043D, /* 0x3b8400 */ { { 1, 1, 2, 61 } } }, -+ { 229500, 0x0660, /* 0x3e8400 */ { { 1, 1, 2, 64 } } }, /* Not tested on Pro } */ -+ { 0, 0, { { 0, 0, 0, 0 } } } - }; - - /* -diff -ruN xf86-video-openchrome-0.2.904/src/via_panel.c ../openchrome/xf86-video-openchrome-0.2.904/src/via_panel.c ---- xf86-video-openchrome-0.2.904/src/via_panel.c 2009-10-03 22:48:55.000000000 +0200 -+++ ../openchrome/xf86-video-openchrome-0.2.904/src/via_panel.c 2010-03-07 01:09:00.000000000 +0100 -@@ -171,12 +171,18 @@ - resWidth, resHeight, panelWidth, panelHeight)); - - if (resWidth < panelWidth) { -- /* FIXME: It is different for chipset < K8M800 */ -- horScalingFactor = ((resWidth - 1) * 4096) / (panelWidth - 1); -+ /* Load Horizontal Scaling Factor */ -+ if (pVia->Chipset != VIA_CLE266 && pVia->Chipset != VIA_KM400) { -+ horScalingFactor = ((resWidth - 1) * 4096) / (panelWidth - 1); -+ -+ /* Horizontal scaling enabled */ -+ cra2 = 0xC0; -+ cr9f = horScalingFactor & 0x0003; /* HSCaleFactor[1:0] at CR9F[1:0] */ -+ } else { -+ /* TODO: Need testing */ -+ horScalingFactor = ((resWidth - 1) * 1024) / (panelWidth - 1); -+ } - -- /* Horizontal scaling enabled */ -- cra2 = 0xC0; -- cr9f = horScalingFactor & 0x0003; /* HSCaleFactor[1:0] at CR9F[1:0] */ - cr77 = (horScalingFactor & 0x03FC) >> 2; /* HSCaleFactor[9:2] at CR77[7:0] */ - cr79 = (horScalingFactor & 0x0C00) >> 10; /* HSCaleFactor[11:10] at CR79[5:4] */ - cr79 <<= 4; -@@ -184,11 +190,18 @@ - } - - if (resHeight < panelHeight) { -- verScalingFactor = ((resHeight - 1) * 2048) / (panelHeight - 1); -+ /* Load Vertical Scaling Factor */ -+ if (pVia->Chipset != VIA_CLE266 && pVia->Chipset != VIA_KM400) { -+ verScalingFactor = ((resHeight - 1) * 2048) / (panelHeight - 1); -+ -+ /* Vertical scaling enabled */ -+ cra2 |= 0x08; -+ cr79 |= ((verScalingFactor & 0x0001) << 3); /* VSCaleFactor[0] at CR79[3] */ -+ } else { -+ /* TODO: Need testing */ -+ verScalingFactor = ((resHeight - 1) * 1024) / (panelHeight - 1); -+ } - -- /* Vertical scaling enabled */ -- cra2 |= 0x08; -- cr79 |= ((verScalingFactor & 0x0001) << 3); /* VSCaleFactor[0] at CR79[3] */ - cr78 |= (verScalingFactor & 0x01FE) >> 1; /* VSCaleFactor[8:1] at CR78[7:0] */ - cr79 |= ((verScalingFactor & 0x0600) >> 9) << 6; /* VSCaleFactor[10:9] at CR79[7:6] */ - scaling = TRUE; -@@ -203,12 +216,18 @@ - ViaCrtcMask(hwp, 0x77, cr77, 0xFF); - ViaCrtcMask(hwp, 0x78, cr78, 0xFF); - ViaCrtcMask(hwp, 0x79, cr79, 0xF8); -- ViaCrtcMask(hwp, 0x9F, cr9f, 0x03); -+ if (pVia->Chipset != VIA_CLE266 && pVia->Chipset != VIA_KM400) { -+ ViaCrtcMask(hwp, 0x9F, cr9f, 0x03); -+ } - ViaCrtcMask(hwp, 0x79, 0x03, 0x03); -- } else -+ } else { -+ /* Disable panel scale */ - ViaCrtcMask(hwp, 0x79, 0x00, 0x01); -- -- ViaCrtcMask(hwp, 0xA2, cra2, 0xC8); -+ } -+ -+ if (pVia->Chipset != VIA_CLE266 && pVia->Chipset != VIA_KM400) { -+ ViaCrtcMask(hwp, 0xA2, cra2, 0xC8); -+ } - - /* Horizontal scaling selection: interpolation */ - // ViaCrtcMask(hwp, 0x79, 0x02, 0x02); -@@ -233,14 +252,14 @@ - - if (panelMode->Width && panelMode->Height) { - -- /* TODO: fix refresh rate and check malloc */ -+ /* TODO: fix refresh rate */ - DisplayModePtr p = malloc( sizeof(DisplayModeRec) ) ; -- memset(p, 0, sizeof(DisplayModeRec)); -+ if (p) { -+ memset(p, 0, sizeof(DisplayModeRec)); - -- float refresh = 60.0f ; -+ float refresh = 60.0f ; - -- /* The following code is borrowed from xf86SetModeCrtc. */ -- if (p) { -+ /* The following code is borrowed from xf86SetModeCrtc. */ - viaTimingCvt(p, panelMode->Width, panelMode->Height, refresh, FALSE, TRUE); - p->CrtcHDisplay = p->HDisplay; - p->CrtcHSyncStart = p->HSyncStart; -@@ -256,9 +275,13 @@ - p->CrtcVBlankEnd = max(p->CrtcVSyncEnd, p->CrtcVTotal); - p->CrtcHBlankStart = min(p->CrtcHSyncStart, p->CrtcHDisplay); - p->CrtcHBlankEnd = max(p->CrtcHSyncEnd, p->CrtcHTotal); -- -+ -+ pVia->pBIOSInfo->Panel->NativeDisplayMode = p; -+ } else { -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, -+ "Out of memory. Size: %d bytes\n", sizeof(DisplayModeRec)); - } -- pVia->pBIOSInfo->Panel->NativeDisplayMode = p; -+ - } else { - xf86DrvMsg(pScrn->scrnIndex, X_WARNING, - "Invalid panel dimension (%dx%d)\n", panelMode->Width, -@@ -339,22 +362,22 @@ - ViaPanelGetSizeFromEDID(ScrnInfoPtr pScrn, xf86MonPtr pMon, - int *width, int *height) - { -- int i, max = 0, vsize; -+ int i, max_hsize = 0, vsize = 0; - - DEBUG(xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VIAGetPanelSizeFromEDID\n")); - - /* !!! Why are we not checking VESA modes? */ - - /* checking standard timings */ -- for (i = 0; i < 8; i++) -+ for (i = 0; i < STD_TIMINGS; i++) - if ((pMon->timings2[i].hsize > 256) -- && (pMon->timings2[i].hsize > max)) { -- max = pMon->timings2[i].hsize; -+ && (pMon->timings2[i].hsize > max_hsize)) { -+ max_hsize = pMon->timings2[i].hsize; - vsize = pMon->timings2[i].vsize; - } - -- if (max != 0) { -- *width = max; -+ if (max_hsize != 0) { -+ *width = max_hsize; - *height = vsize; - return TRUE; - } -@@ -369,14 +392,14 @@ - struct detailed_timings timing = pMon->det_mon[i].section.d_timings; - - /* ignore v_active for now */ -- if ((timing.clock > 15000000) && (timing.h_active > max)) { -- max = timing.h_active; -+ if ((timing.clock > 15000000) && (timing.h_active > max_hsize)) { -+ max_hsize = timing.h_active; - vsize = timing.v_active; - } - } - -- if (max != 0) { -- *width = max; -+ if (max_hsize != 0) { -+ *width = max_hsize; - *height = vsize; - return TRUE; - } -diff -ruN xf86-video-openchrome-0.2.904/src/via_video.c ../openchrome/xf86-video-openchrome-0.2.904/src/via_video.c ---- xf86-video-openchrome-0.2.904/src/via_video.c 2009-10-08 01:39:13.000000000 +0200 -+++ ../openchrome/xf86-video-openchrome-0.2.904/src/via_video.c 2010-03-07 01:09:00.000000000 +0100 -@@ -466,8 +466,8 @@ - - viaVidEng->video1_ctl = 0; - viaVidEng->video3_ctl = 0; -- viaVidEng->compose = 0x80000000; -- viaVidEng->compose = 0x40000000; -+ viaVidEng->compose = V1_COMMAND_FIRE; -+ viaVidEng->compose = V3_COMMAND_FIRE; - viaVidEng->color_key = 0x821; - viaVidEng->snd_color_key = 0x821; - -@@ -479,16 +479,16 @@ - VIAPtr pVia = VIAPTR(pScrn); - vmmtr viaVidEng = (vmmtr) pVia->VidMapBase; - -+ DBG_DD(ErrorF(" via_video.c : viaSaveVideo : \n")); - /* Save video registers */ -- /* TODO: Identify which registers should be saved and restored */ - memcpy(pVia->VideoRegs, (void*)viaVidEng, sizeof(video_via_regs)); - - pVia->dwV1 = ((vmmtr) viaVidEng)->video1_ctl; - pVia->dwV3 = ((vmmtr) viaVidEng)->video3_ctl; - viaVidEng->video1_ctl = 0; - viaVidEng->video3_ctl = 0; -- viaVidEng->compose = 0x80000000; -- viaVidEng->compose = 0x40000000; -+ viaVidEng->compose = V1_COMMAND_FIRE; -+ viaVidEng->compose = V3_COMMAND_FIRE; - } - - void -@@ -496,16 +496,65 @@ - { - VIAPtr pVia = VIAPTR(pScrn); - vmmtr viaVidEng = (vmmtr) pVia->VidMapBase; -+ video_via_regs *localVidEng = pVia->VideoRegs; -+ - -+ DBG_DD(ErrorF(" via_video.c : viaRestoreVideo : \n")); - /* Restore video registers */ -- /* TODO: Identify which registers should be saved and restored */ -- memcpy((void*)viaVidEng, pVia->VideoRegs, sizeof(video_via_regs)); -- -+ /* flush restored video engines' setting to VidMapBase */ -+ -+ viaVidEng->alphawin_hvstart = localVidEng->alphawin_hvstart; -+ viaVidEng->alphawin_size = localVidEng->alphawin_size; -+ viaVidEng->alphawin_ctl = localVidEng->alphawin_ctl; -+ viaVidEng->alphafb_stride = localVidEng->alphafb_stride; -+ viaVidEng->color_key = localVidEng->color_key; -+ viaVidEng->alphafb_addr = localVidEng->alphafb_addr; -+ viaVidEng->chroma_low = localVidEng->chroma_low; -+ viaVidEng->chroma_up = localVidEng->chroma_up; -+ -+ if (pVia->ChipId != PCI_CHIP_VT3314) -+ { -+ /*VT3314 only has V3*/ -+ viaVidEng->video1_ctl = localVidEng->video1_ctl; -+ viaVidEng->video1_fetch = localVidEng->video1_fetch; -+ viaVidEng->video1y_addr1 = localVidEng->video1y_addr1; -+ viaVidEng->video1_stride = localVidEng->video1_stride; -+ viaVidEng->video1_hvstart = localVidEng->video1_hvstart; -+ viaVidEng->video1_size = localVidEng->video1_size; -+ viaVidEng->video1y_addr2 = localVidEng->video1y_addr2; -+ viaVidEng->video1_zoom = localVidEng->video1_zoom; -+ viaVidEng->video1_mictl = localVidEng->video1_mictl; -+ viaVidEng->video1y_addr0 = localVidEng->video1y_addr0; -+ viaVidEng->video1_fifo = localVidEng->video1_fifo; -+ viaVidEng->video1y_addr3 = localVidEng->video1y_addr3; -+ viaVidEng->v1_source_w_h = localVidEng->v1_source_w_h ; -+ viaVidEng->video1_CSC1 = localVidEng->video1_CSC1; -+ viaVidEng->video1_CSC2 = localVidEng->video1_CSC2; -+ } -+ viaVidEng->snd_color_key = localVidEng->snd_color_key; -+ viaVidEng->v3alpha_prefifo = localVidEng->v3alpha_prefifo; -+ viaVidEng->v3alpha_fifo = localVidEng->v3alpha_fifo; -+ viaVidEng->video3_CSC2 = localVidEng->video3_CSC2; -+ viaVidEng->video3_CSC2 = localVidEng->video3_CSC2; -+ viaVidEng->v3_source_width = localVidEng->v3_source_width; -+ viaVidEng->video3_ctl = localVidEng->video3_ctl; -+ viaVidEng->video3_addr0 = localVidEng->video3_addr0; -+ viaVidEng->video3_addr1 = localVidEng->video3_addr1; -+ viaVidEng->video3_stride = localVidEng->video3_stride; -+ viaVidEng->video3_hvstart = localVidEng->video3_hvstart; -+ viaVidEng->video3_size = localVidEng->video3_size; -+ viaVidEng->v3alpha_fetch = localVidEng->v3alpha_fetch; -+ viaVidEng->video3_zoom = localVidEng->video3_zoom; -+ viaVidEng->video3_mictl = localVidEng->video3_mictl; -+ viaVidEng->video3_CSC1 = localVidEng->video3_CSC1; -+ viaVidEng->video3_CSC2 = localVidEng->video3_CSC2; -+ viaVidEng->compose = localVidEng->compose; -+ - viaVidEng->video1_ctl = pVia->dwV1; - viaVidEng->video3_ctl = pVia->dwV3; -- viaVidEng->compose = 0x80000000; -- viaVidEng->compose = 0x40000000; -- -+ if (pVia->ChipId != PCI_CHIP_VT3314) -+ viaVidEng->compose = V1_COMMAND_FIRE; -+ viaVidEng->compose = V3_COMMAND_FIRE; - } - - void -@@ -524,8 +573,8 @@ - - viaVidEng->video1_ctl = 0; - viaVidEng->video3_ctl = 0; -- viaVidEng->compose = 0x80000000; -- viaVidEng->compose = 0x40000000; -+ viaVidEng->compose = V1_COMMAND_FIRE; -+ viaVidEng->compose = V3_COMMAND_FIRE; - - /* - * Free all adaptor info allocated in viaInitVideo. -@@ -561,7 +610,7 @@ - XF86VideoAdaptorPtr *adaptors, *newAdaptors; - int num_adaptors, num_new; - -- DBG_DD(ErrorF(" via_video.c : viaInitVideo : \n")); -+ DBG_DD(ErrorF(" via_video.c : viaInitVideo, Screen[%d]\n", pScrn->scrnIndex)); - - allAdaptors = NULL; - newAdaptors = NULL; -@@ -832,7 +881,7 @@ - DevUnion *pdevUnion; - int i, j, usedPorts, numPorts; - -- DBG_DD(ErrorF(" via_video.c : viaSetupImageVideo: \n")); -+ DBG_DD(ErrorF(" via_video.c : viaSetupAdaptors (viaSetupImageVideo): \n")); - - xvBrightness = MAKE_ATOM("XV_BRIGHTNESS"); - xvContrast = MAKE_ATOM("XV_CONTRAST"); -@@ -1042,6 +1091,8 @@ - } - - } else { -+ DBG_DD(ErrorF(" via_video.c : viaGetPortAttribute : is not supported the attribute\n")); -+ - /*return BadMatch */; - } - return Success; -@@ -1498,6 +1549,7 @@ - - DBG_DD(ErrorF(" via_video.c : viaQueryImageAttributes : FourCC=0x%x, ", - id)); -+ DBG_DD(ErrorF(" via_video.c : Screen[%d], w=%d, h=%d\n", pScrn->scrnIndex, *w, *h)); - - if ((!w) || (!h)) - return 0; -@@ -1513,6 +1565,7 @@ - - switch (id) { - case FOURCC_YV12: /*Planar format : YV12 -4:2:0 */ -+ case FOURCC_I420: - *h = (*h + 1) & ~1; - size = *w; - if (pVia->useDmaBlit) -diff -ruN xf86-video-openchrome-0.2.904/src/via_video.h ../openchrome/xf86-video-openchrome-0.2.904/src/via_video.h ---- xf86-video-openchrome-0.2.904/src/via_video.h 2009-10-03 22:48:55.000000000 +0200 -+++ ../openchrome/xf86-video-openchrome-0.2.904/src/via_video.h 2010-03-07 01:09:00.000000000 +0100 -@@ -44,6 +44,10 @@ - - #define VIDEO_BPP 2 - -+ -+#define V1_COMMAND_FIRE 0x80000000 /* V1 commands fire */ -+#define V3_COMMAND_FIRE 0x40000000 /* V3 commands fire */ -+ - typedef struct - { - CARD32 interruptflag; /* 200 */ -@@ -89,7 +93,7 @@ - CARD32 video3_ctl; /* 2a0 */ - CARD32 video3_addr0; /* 2a4 */ - CARD32 video3_addr1; /* 2a8 */ -- CARD32 video3_stribe; /* 2ac */ -+ CARD32 video3_stride; /* 2ac */ - CARD32 video3_hvstart; /* 2b0 */ - CARD32 video3_size; /* 2b4 */ - CARD32 v3alpha_fetch; /* 2b8 */ diff --git a/extra/xf86-video-r128/LICENSE b/extra/xf86-video-r128/LICENSE deleted file mode 100644 index 229a26157..000000000 --- a/extra/xf86-video-r128/LICENSE +++ /dev/null @@ -1,219 +0,0 @@ - -Copyright 1997 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org - -Permission to use, copy, modify, distribute, and sell this software and its -documentation for any purpose is hereby granted without fee, provided that -the above copyright notice appear in all copies and that both that copyright -notice and this permission notice appear in supporting documentation, and -that the name of Marc Aurele La France not be used in advertising or -publicity pertaining to distribution of the software without specific, -written prior permission. Marc Aurele La France makes no representations -about the suitability of this software for any purpose. It is provided -"as-is" without express or implied warranty. - -MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, -INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO -EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR -CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, -DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER -TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR -PERFORMANCE OF THIS SOFTWARE. - -Copyright 2000 Gareth Hughes -All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the -Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice (including the next -paragraph) shall be included in all copies or substantial portions of the -Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -GARETH HUGHES BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -(c) 2004 Adam Jackson. Standard MIT license applies. - -Copyright 1999-2000 Precision Insight, Inc., Cedar Park, Texas. -All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to -deal in the Software without restriction, including without limitation the -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -sell copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice (including the next -paragraph) shall be included in all copies or substantial portions of the -Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL -PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - -Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario, -Precision Insight, Inc., Cedar Park, Texas, and -VA Linux Systems Inc., Fremont, California. - -All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation on the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice (including the -next paragraph) shall be included in all copies or substantial -portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NON-INFRINGEMENT. IN NO EVENT SHALL ATI, PRECISION INSIGHT, VA LINUX -SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR -OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -OTHER DEALINGS IN THE SOFTWARE. - -Copyright 2003 Alex Deucher. - -All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation on the rights to use, copy, modify, merge, -publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice (including the -next paragraph) shall be included in all copies or substantial -portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -NON-INFRINGEMENT. IN NO EVENT SHALL ALEX DEUCHER, OR ANY OTHER -CONTRIBUTORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - - -/************************************************************************** - -Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc., - Cedar Park, Texas. -All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -on the rights to use, copy, modify, merge, publish, distribute, sub -license, and/or sell copies of the Software, and to permit persons to whom -the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice (including the next -paragraph) shall be included in all copies or substantial portions of the -Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL -ATI, PRECISION INSIGHT AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, -DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -USE OR OTHER DEALINGS IN THE SOFTWARE. - -**************************************************************************/ - -/* - * Authors: - * Kevin E. Martin <martin@valinux.com> - * Gareth Hughes <gareth@valinux.com> - * - */ - -/************************************************************************** - -Copyright 2000, 2001 ATI Technologies Inc., Ontario, Canada, and - VA Linux Systems Inc., Fremont, California. - -All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation -on the rights to use, copy, modify, merge, publish, distribute, sub -license, and/or sell copies of the Software, and to permit persons to whom -the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice (including the next -paragraph) shall be included in all copies or substantial portions of the -Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL -ATI, VA LINUX SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, -DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE -USE OR OTHER DEALINGS IN THE SOFTWARE. - -**************************************************************************/ - -/* - * Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario, - * Precision Insight, Inc., Cedar Park, Texas, and - * VA Linux Systems Inc., Fremont, California. - * - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation on the rights to use, copy, modify, merge, - * publish, distribute, sublicense, and/or sell copies of the Software, - * and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial - * portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NON-INFRINGEMENT. IN NO EVENT SHALL ATI, PRECISION INSIGHT, VA LINUX - * SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR - * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, - * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - * OTHER DEALINGS IN THE SOFTWARE. - */ - -/* - * Authors: - * Kevin E. Martin <martin@valinux.com> - * Rickard E. Faith <faith@valinux.com> - * Daryll Strauss <daryll@valinux.com> - * Gareth Hughes <gareth@valinux.com> - * - */ - diff --git a/extra/xf86-video-r128/PKGBUILD b/extra/xf86-video-r128/PKGBUILD index 989b9d964..d40f8b417 100644 --- a/extra/xf86-video-r128/PKGBUILD +++ b/extra/xf86-video-r128/PKGBUILD @@ -1,29 +1,32 @@ -# $Id: PKGBUILD 115348 2011-03-17 18:05:57Z andyrtr $ +# $Id: PKGBUILD 140314 2011-10-11 21:28:51Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-r128 pkgver=6.8.1 -pkgrel=6 +pkgrel=7 pkgdesc="X.org ati Rage128 video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc' 'r128-dri') -makedepends=('xorg-server-devel' 'xf86driproto' 'libdrm' 'mesa') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.11.0' 'xf86driproto' 'libdrm' 'mesa' 'glproto') +conflicts=('xorg-server<1.11.0') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - LICENSE) + git-fixes.patch) md5sums=('2b90854a62a4d45d652062f582dc8d13' - '97ad034bea2a153f4418a6bb0c77acf4') + '3937776d4427861d0797e47119ac327d') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/git-fixes.patch" + + autoreconf -fi ./configure --prefix=/usr --enable-dri make make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/extra/xf86-video-r128/git-fixes.patch b/extra/xf86-video-r128/git-fixes.patch new file mode 100644 index 000000000..933e8fb2a --- /dev/null +++ b/extra/xf86-video-r128/git-fixes.patch @@ -0,0 +1,842 @@ +diff --git a/COPYING b/COPYING +index 7f33cbf..05bcb74 100644 +--- a/COPYING ++++ b/COPYING +@@ -1,12 +1,91 @@ +-This is a stub file. This package has not yet had its complete licensing +-information compiled. Please see the individual source files for details on +-your rights to use and modify this software. ++Copyright 2007 George Sapountzis + +-Please submit updated COPYING files to the Xorg bugzilla: ++Permission is hereby granted, free of charge, to any person obtaining a ++copy of this software and associated documentation files (the "Software"), ++to deal in the Software without restriction, including without limitation ++the rights to use, copy, modify, merge, publish, distribute, sublicense, ++and/or sell copies of the Software, and to permit persons to whom the ++Software is furnished to do so, subject to the following conditions: + +-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ++The above copyright notice and this permission notice (including the next ++paragraph) shall be included in all copies or substantial portions of the ++Software. + +-All licensing questions regarding this software should be directed at the +-Xorg mailing list: ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++SOFTWARE. ++ ++Copyright 1999, 2000 ATI Technologies Inc., Markham, Ontario, ++ Precision Insight, Inc., Cedar Park, Texas, and ++ VA Linux Systems Inc., Fremont, California. ++ ++All Rights Reserved. ++ ++Permission is hereby granted, free of charge, to any person obtaining ++a copy of this software and associated documentation files (the ++"Software"), to deal in the Software without restriction, including ++without limitation on the rights to use, copy, modify, merge, ++publish, distribute, sublicense, and/or sell copies of the Software, ++and to permit persons to whom the Software is furnished to do so, ++subject to the following conditions: ++ ++The above copyright notice and this permission notice (including the ++next paragraph) shall be included in all copies or substantial ++portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ++EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ++MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND ++NON-INFRINGEMENT. IN NO EVENT SHALL ATI, PRECISION INSIGHT, VA LINUX ++SYSTEMS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR ++OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ++ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++OTHER DEALINGS IN THE SOFTWARE. ++ ++Copyright 1999, 2000 Precision Insight, Inc., Cedar Park, Texas. ++Copyright 2002 Tungsten Graphics, Inc., Cedar Park, Texas. ++All Rights Reserved. ++ ++Permission is hereby granted, free of charge, to any person obtaining a ++copy of this software and associated documentation files (the "Software"), ++to deal in the Software without restriction, including without limitation ++the rights to use, copy, modify, merge, publish, distribute, sublicense, ++and/or sell copies of the Software, and to permit persons to whom the ++Software is furnished to do so, subject to the following conditions: ++ ++The above copyright notice and this permission notice (including the next ++paragraph) shall be included in all copies or substantial portions of the ++Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR ++OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ++ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++DEALINGS IN THE SOFTWARE. ++ ++Copyright 2000 through 2004 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org ++ ++Permission to use, copy, modify, distribute, and sell this software and its ++documentation for any purpose is hereby granted without fee, provided that ++the above copyright notice appear in all copies and that both that copyright ++notice and this permission notice appear in supporting documentation, and ++that the name of Marc Aurele La France not be used in advertising or ++publicity pertaining to distribution of the software without specific, ++written prior permission. Marc Aurele La France makes no representations ++about the suitability of this software for any purpose. It is provided ++"as-is" without express or implied warranty. ++ ++MARC AURELE LA FRANCE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO ++EVENT SHALL MARC AURELE LA FRANCE BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++PERFORMANCE OF THIS SOFTWARE. + +-http://lists.freedesktop.org/mailman/listinfo/xorg +diff --git a/Makefile.am b/Makefile.am +index 1f4c3c4..4c278ba 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -18,21 +18,15 @@ + # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +-AUTOMAKE_OPTIONS = foreign + SUBDIRS = src man ++MAINTAINERCLEANFILES = ChangeLog INSTALL + +-if BUILD_LINUXDOC +-README.r128: README.r128.sgml +- $(MAKE_TEXT) README.r128.sgml && mv README.r128.txt README.r128 ++.PHONY: ChangeLog INSTALL + +-endif +- +-EXTRA_DIST = README.r128 README.r128.sgml ChangeLog +-CLEANFILES = ChangeLog +- +-.PHONY: ChangeLog ++INSTALL: ++ $(INSTALL_CMD) + + ChangeLog: + $(CHANGELOG_CMD) + +-dist-hook: ChangeLog ++dist-hook: ChangeLog INSTALL +diff --git a/README b/README +index cb61870..5c6f59d 100644 +--- a/README ++++ b/README +@@ -1,4 +1,161 @@ +-xf86-video-r128 - ATI Rage 128 video driver for the Xorg X server ++ Information for ATI Rage 128 Users ++ Precision Insight, Inc., SuSE GmbH ++ 13 June 2000 ++ ____________________________________________________________ ++ ++ Table of Contents ++ ++ ++ 1. Supported Hardware ++ 2. Features ++ 3. Technical Notes ++ 4. Reported Working Video Cards ++ 5. Configuration ++ 6. Driver Options ++ 7. Known Limitations ++ 8. Authors ++ ++ ++ ______________________________________________________________________ ++ ++ 1. Supported Hardware ++ ++ ++ o ATI Rage 128 based cards ++ ++ ++ ++ 2. Features ++ ++ ++ o Full support (including hardware accelerated 2D drawing) for 8, 15, ++ 16, 24 bit pixel depths. ++ ++ o Hardware cursor support to reduce sprite flicker. ++ ++ o Support for high resolution video modes up to 1800x1440 @ 70Hz. ++ ++ o Support for doublescan video modes (e.g., 320x200 and 320x240). ++ ++ o Support for gamma correction at all pixel depths. ++ ++ o Fully programmable clock supported. ++ ++ o Robust text mode restore for VT switching. ++ ++ ++ ++ 3. Technical Notes ++ ++ ++ o None ++ ++ ++ ++ 4. Reported Working Video Cards ++ ++ ++ o Rage Fury AGP 32MB ++ ++ o XPERT 128 AGP 16MB ++ ++ o XPERT 99 AGP 8MB ++ ++ ++ ++ 5. Configuration ++ ++ The driver auto-detects all device information necessary to initialize ++ the card. The only lines you need in the "Device" section of your ++ xorg.conf file are: ++ ++ Section "Device" ++ Identifier "Rage 128" ++ Driver "r128" ++ EndSection ++ ++ ++ or let xorgconfig do this for you. ++ ++ However, if you have problems with auto-detection, you can specify: ++ ++ o VideoRam - in kilobytes ++ ++ o MemBase - physical address of the linear framebuffer ++ ++ o IOBase - physical address of the memory mapped IO registers ++ ++ o ChipID - PCI DEVICE ID ++ ++ ++ ++ 6. Driver Options ++ ++ ++ o "hw_cursor" - request hardware cursor (default) ++ ++ o "sw_cursor" - software cursor only ++ ++ o "no_accel" - software rendering only ++ ++ o "dac_8_bit" - use color weight 888 in 8 bpp mode (default) ++ ++ o "dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation) ++ ++ ++ ++ 7. Known Limitations ++ ++ ++ o None ++ ++ ++ ++ 8. Authors ++ ++ The X11R7.5 driver was originally part of XFree86 4.4 rc2. ++ ++ The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by: ++ ++ o Rickard E. (Rik) Faith <mailto:faith@precisioninsight.com> ++ ++ o Kevin E. Martin <mailto:kevin@precisioninsight.com> ++ ++ The XFree86 4 driver was funded by ATI and was donated to The XFree86 ++ Project by: ++ ++ Precision Insight, Inc. ++ Cedar Park, TX ++ USA ++ ++ ++ The XFree86 3.3.x driver used for the port was written by: ++ ++ o Rickard E. (Rik) Faith <mailto:faith@precisioninsight.com> ++ ++ o Kevin E. Martin <mailto:kevin@precisioninsight.com> ++ ++ The XFree86 3.3.x driver was funded by ATI and was donated to The ++ XFree86 Project by Precision Insight, Inc. It was based in part on ++ an earlier driver that was written by: ++ ++ o Alan Hourihane <mailto:alanh@fairlite.demon.co.uk> ++ ++ o Dirk Hohndel <mailto:hohndel@suse.de> ++ ++ This early driver was funded and donated to The XFree86 Project by: ++ ++ SuSE GmbH ++ Schanzaekerstr. 10 ++ 90443 Nuernberg ++ Germany ++ ++ ++ ++ http://www.precisioninsight.com ++ ++ http://www.suse.com ++ + + Please submit bugs & patches to the Xorg bugzilla: + +diff --git a/README.r128 b/README.r128 +deleted file mode 100644 +index dcc2715..0000000 +--- a/README.r128 ++++ /dev/null +@@ -1,160 +0,0 @@ +- Information for ATI Rage 128 Users +- Precision Insight, Inc., SuSE GmbH +- 13 June 2000 +- ____________________________________________________________ +- +- Table of Contents +- +- +- 1. Supported Hardware +- 2. Features +- 3. Technical Notes +- 4. Reported Working Video Cards +- 5. Configuration +- 6. Driver Options +- 7. Known Limitations +- 8. Authors +- +- +- ______________________________________________________________________ +- +- [1m1. Supported Hardware[0m +- +- +- +o ATI Rage 128 based cards +- +- +- +- [1m2. Features[0m +- +- +- +o Full support (including hardware accelerated 2D drawing) for 8, 15, +- 16, 24 bit pixel depths. +- +- +o Hardware cursor support to reduce sprite flicker. +- +- +o Support for high resolution video modes up to 1800x1440 @ 70Hz. +- +- +o Support for doublescan video modes (e.g., 320x200 and 320x240). +- +- +o Support for gamma correction at all pixel depths. +- +- +o Fully programmable clock supported. +- +- +o Robust text mode restore for VT switching. +- +- +- +- [1m3. Technical Notes[0m +- +- +- +o None +- +- +- +- [1m4. Reported Working Video Cards[0m +- +- +- +o Rage Fury AGP 32MB +- +- +o XPERT 128 AGP 16MB +- +- +o XPERT 99 AGP 8MB +- +- +- +- [1m5. Configuration[0m +- +- The driver auto-detects all device information necessary to initialize +- the card. The only lines you need in the "Device" section of your +- xorg.conf file are: +- +- Section "Device" +- Identifier "Rage 128" +- Driver "r128" +- EndSection +- +- +- or let xorgconfig do this for you. +- +- However, if you have problems with auto-detection, you can specify: +- +- +o VideoRam - in kilobytes +- +- +o MemBase - physical address of the linear framebuffer +- +- +o IOBase - physical address of the memory mapped IO registers +- +- +o ChipID - PCI DEVICE ID +- +- +- +- [1m6. Driver Options[0m +- +- +- +o "hw_cursor" - request hardware cursor (default) +- +- +o "sw_cursor" - software cursor only +- +- +o "no_accel" - software rendering only +- +- +o "dac_8_bit" - use color weight 888 in 8 bpp mode (default) +- +- +o "dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation) +- +- +- +- [1m7. Known Limitations[0m +- +- +- +o None +- +- +- +- [1m8. Authors[0m +- +- The X11R6.8 driver was originally part of XFree86 4.4 rc2. +- +- The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by: +- +- +o Rickard E. (Rik) Faith <faith@precisioninsight.com> +- +- +o Kevin E. Martin <kevin@precisioninsight.com> +- +- The XFree86 4 driver was funded by ATI and was donated to The XFree86 +- Project by: +- +- Precision Insight, Inc. +- Cedar Park, TX +- USA +- +- +- The XFree86 3.3.x driver used for the port was written by: +- +- +o Rickard E. (Rik) Faith <faith@precisioninsight.com> +- +- +o Kevin E. Martin <kevin@precisioninsight.com> +- +- The XFree86 3.3.x driver was funded by ATI and was donated to The +- XFree86 Project by Precision Insight, Inc. It was based in part on +- an earlier driver that was written by: +- +- +o Alan Hourihane <alanh@fairlite.demon.co.uk> +- +- +o Dirk Hohndel <hohndel@suse.de> +- +- This early driver was funded and donated to The XFree86 Project by: +- +- SuSE GmbH +- Schanzaekerstr. 10 +- 90443 Nuernberg +- Germany +- +- +- +- http://www.precisioninsight.com +- +- http://www.suse.com +- +- +- +diff --git a/README.r128.sgml b/README.r128.sgml +deleted file mode 100644 +index 8d7f448..0000000 +--- a/README.r128.sgml ++++ /dev/null +@@ -1,138 +0,0 @@ +-<!DOCTYPE linuxdoc PUBLIC "-//Xorg//DTD linuxdoc//EN"[ +-<!ENTITY % defs SYSTEM "defs.ent"> %defs; +-]> +- +-<article> +-<title>Information for ATI Rage 128 Users +-<author>Precision Insight, Inc., SuSE GmbH +-<date>13 June 2000 +- +-<ident> +-</ident> +- +-<toc> +- +-<sect>Supported Hardware +-<p> +-<itemize> +- <item>ATI Rage 128 based cards +-</itemize> +- +- +-<sect>Features +-<p> +-<itemize> +- <item>Full support (including hardware accelerated 2D drawing) for 8, 15, +- 16, 24 bit pixel depths. +- <item>Hardware cursor support to reduce sprite flicker. +- <item>Support for high resolution video modes up to 1800x1440 @ 70Hz. +- <item>Support for doublescan video modes (e.g., 320x200 and 320x240). +- <item>Support for gamma correction at all pixel depths. +- <item>Fully programmable clock supported. +- <item>Robust text mode restore for VT switching. +-</itemize> +- +- +-<sect>Technical Notes +-<p> +-<itemize> +- <item>None +-</itemize> +- +- +-<sect>Reported Working Video Cards +-<p> +-<itemize> +- <item>Rage Fury AGP 32MB +- <item>XPERT 128 AGP 16MB +- <item>XPERT 99 AGP 8MB +-</itemize> +- +- +-<sect>Configuration +-<p> +-The driver auto-detects all device information necessary to +-initialize the card. The only lines you need in the "Device" +-section of your xorg.conf file are: +-<verb> +- Section "Device" +- Identifier "Rage 128" +- Driver "r128" +- EndSection +-</verb> +-or let <tt>xorgconfig</tt> do this for you. +- +-However, if you have problems with auto-detection, you can specify: +-<itemize> +- <item>VideoRam - in kilobytes +- <item>MemBase - physical address of the linear framebuffer +- <item>IOBase - physical address of the memory mapped IO registers +- <item>ChipID - PCI DEVICE ID +-</itemize> +- +- +-<sect>Driver Options +-<p> +-<itemize> +- <item>"hw_cursor" - request hardware cursor (default) +- <item>"sw_cursor" - software cursor only +- <item>"no_accel" - software rendering only +- <item>"dac_8_bit" - use color weight 888 in 8 bpp mode (default) +- <item>"dac_6_bit" - use color weight 666 in 8 bpp mode (VGA emulation) +-</itemize> +- +- +-<sect>Known Limitations +-<p> +-<itemize> +- <item>None +-</itemize> +- +- +-<sect>Authors +-<p> +-The X11R&relvers; driver was originally part of XFree86 4.4 rc2. +- +-The XFree86 4 driver was ported from XFree86 3.3.x and enhanced by: +-<itemize> +- <item>Rickard E. (Rik) Faith <email>faith@precisioninsight.com</email> +- <item>Kevin E. Martin <email>kevin@precisioninsight.com</email> +-</itemize> +-<p> +-The XFree86 4 driver was funded by ATI and was donated to The XFree86 +-Project by: +-<verb> +- Precision Insight, Inc. +- Cedar Park, TX +- USA +-</verb> +-<p> +-The XFree86 3.3.x driver used for the port was written by: +-<itemize> +- <item>Rickard E. (Rik) Faith <email>faith@precisioninsight.com</email> +- <item>Kevin E. Martin <email>kevin@precisioninsight.com</email> +-</itemize> +-The XFree86 3.3.x driver was funded by ATI and was donated to The XFree86 +-Project by Precision Insight, Inc. It was based in part on an earlier +-driver that was written by: +-<itemize> +- <item>Alan Hourihane <email>alanh@fairlite.demon.co.uk</email> +- <item>Dirk Hohndel <email>hohndel@suse.de</email> +-</itemize> +-<p>This early driver was funded and donated to The XFree86 Project by: +-<verb> +- SuSE GmbH +- Schanzaekerstr. 10 +- 90443 Nuernberg +- Germany +-</verb> +- +-<p> +-<htmlurl name="http://www.precisioninsight.com" +- url="http://www.precisioninsight.com"> +-<p> +-<htmlurl name="http://www.suse.com" +- url="http://www.suse.com"> +- +- +-</article> +diff --git a/configure.ac b/configure.ac +index 4e0f463..d5a0821 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -20,28 +20,30 @@ + # + # Process this file with autoconf to produce a configure script + +-AC_PREREQ(2.57) ++# Initialize Autoconf ++AC_PREREQ([2.60]) + AC_INIT([xf86-video-r128], +- 6.8.1, ++ [6.8.1], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], +- xf86-video-r128) +- ++ [xf86-video-r128]) + AC_CONFIG_SRCDIR([Makefile.am]) +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_AUX_DIR(.) + +-AM_INIT_AUTOMAKE([dist-bzip2]) ++# Initialize Automake ++AM_INIT_AUTOMAKE([foreign dist-bzip2]) + +-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG +-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +-XORG_MACROS_VERSION(1.2) ++# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS ++m4_ifndef([XORG_MACROS_VERSION], ++ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) ++XORG_MACROS_VERSION(1.8) ++XORG_DEFAULT_OPTIONS + + AM_MAINTAINER_MODE + +-# Checks for programs. ++# Initialize libtool + AC_DISABLE_STATIC + AC_PROG_LIBTOOL +-AC_PROG_CC + + if test "x$GCC" = "xyes"; then + CPPFLAGS="$CPPFLAGS -Wall" +@@ -49,38 +51,35 @@ fi + + AH_TOP([#include "xorg-server.h"]) + ++# Define a configure option for an alternate module directory + AC_ARG_WITH(xorg-module-dir, +- AC_HELP_STRING([--with-xorg-module-dir=DIR], ++ AS_HELP_STRING([--with-xorg-module-dir=DIR], + [Default xorg module directory [[default=$libdir/xorg/modules]]]), + [moduledir="$withval"], + [moduledir="$libdir/xorg/modules"]) + +-AC_ARG_ENABLE(dri, AC_HELP_STRING([--disable-dri], ++AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri], + [Disable DRI support [[default=auto]]]), + [DRI="$enableval"], + [DRI=auto]) + +-# Checks for extensions +-XORG_DRIVER_CHECK_EXT(XINERAMA, xineramaproto) ++# Store the list of server defined optional extensions in REQUIRED_MODULES + XORG_DRIVER_CHECK_EXT(RANDR, randrproto) + XORG_DRIVER_CHECK_EXT(RENDER, renderproto) + XORG_DRIVER_CHECK_EXT(XV, videoproto) + XORG_DRIVER_CHECK_EXT(XF86MISC, xf86miscproto) + XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) + +-# Checks for pkg-config packages ++# Obtain compiler/linker options for the driver dependencies + PKG_CHECK_MODULES(XORG, [xorg-server >= 1.2 xproto fontsproto $REQUIRED_MODULES]) + PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], + HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), + HAVE_XEXTPROTO_71="no") + AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) +-sdkdir=$(pkg-config --variable=sdkdir xorg-server) ++sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` + + # Checks for libraries. + +-# Checks for header files. +-AC_HEADER_STDC +- + if test "$DRI" != no; then + AC_CHECK_FILE([${sdkdir}/dri.h], + [have_dri_h="yes"], [have_dri_h="no"]) +@@ -126,26 +125,20 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then + fi + AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) + +-AC_SUBST([XORG_CFLAGS]) +-AC_SUBST([DRI_CFLAGS]) + AC_SUBST([moduledir]) + + DRIVER_NAME=r128 + AC_SUBST([DRIVER_NAME]) + +-XORG_MANPAGE_SECTIONS +-XORG_RELEASE_VERSION +-XORG_CHECK_LINUXDOC +-XORG_CHANGELOG +- + AC_MSG_NOTICE( + [Please change the Driver line in xorg.conf from "ati" to "r128" or install] + [the ati wrapper as well:] + [ git://anongit.freedesktop.org/git/xorg/driver/xf86-video-ati] + ) + +-AC_OUTPUT([ +- Makefile +- src/Makefile +- man/Makefile ++AC_CONFIG_FILES([ ++ Makefile ++ src/Makefile ++ man/Makefile + ]) ++AC_OUTPUT +diff --git a/man/Makefile.am b/man/Makefile.am +index 858ba62..4e22d61 100644 +--- a/man/Makefile.am ++++ b/man/Makefile.am +@@ -1,27 +1,24 @@ + # + # Copyright 2005 Sun Microsystems, Inc. All rights reserved. +-# +-# Permission to use, copy, modify, distribute, and sell this software and its +-# documentation for any purpose is hereby granted without fee, provided that +-# the above copyright notice appear in all copies and that both that +-# copyright notice and this permission notice appear in supporting +-# documentation. +-# +-# The above copyright notice and this permission notice shall be included +-# in all copies or substantial portions of the Software. +-# +-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +-# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +-# OTHER DEALINGS IN THE SOFTWARE. +-# +-# Except as contained in this notice, the name of the copyright holders shall +-# not be used in advertising or otherwise to promote the sale, use or +-# other dealings in this Software without prior written authorization +-# from the copyright holders. ++# ++# Permission is hereby granted, free of charge, to any person obtaining a ++# copy of this software and associated documentation files (the "Software"), ++# to deal in the Software without restriction, including without limitation ++# the rights to use, copy, modify, merge, publish, distribute, sublicense, ++# and/or sell copies of the Software, and to permit persons to whom the ++# Software is furnished to do so, subject to the following conditions: ++# ++# The above copyright notice and this permission notice (including the next ++# paragraph) shall be included in all copies or substantial portions of the ++# Software. ++# ++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++# DEALINGS IN THE SOFTWARE. + # + + drivermandir = $(DRIVER_MAN_DIR) +@@ -34,25 +31,11 @@ EXTRA_DIST = r128.man + + CLEANFILES = $(driverman_DATA) + +-SED = sed + +-# Strings to replace in man pages +-XORGRELSTRING = @PACKAGE_STRING@ +- XORGMANNAME = X Version 11 ++# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure + +-MAN_SUBSTS = \ +- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ +- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ +- -e 's|__xservername__|Xorg|g' \ +- -e 's|__xconfigfile__|xorg.conf|g' \ +- -e 's|__projectroot__|$(prefix)|g' \ +- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ +- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ +- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ +- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ +- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' + + SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man + + .man.$(DRIVER_MAN_SUFFIX): +- sed $(MAN_SUBSTS) < $< > $@ ++ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ +diff --git a/man/r128.man b/man/r128.man +index 5c7c4fe..4ba933d 100644 +--- a/man/r128.man ++++ b/man/r128.man +@@ -1,4 +1,3 @@ +-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/r128.man,v 1.3 2001/06/01 02:10:05 dawes Exp $ + .\" shorthand for double quote that works everywhere. + .ds q \N'34' + .TH R128 __drivermansuffix__ __vendorversion__ +diff --git a/src/r128_driver.c b/src/r128_driver.c +index d6448b6..9d08d77 100644 +--- a/src/r128_driver.c ++++ b/src/r128_driver.c +@@ -938,14 +938,6 @@ static Bool R128PreInitConfig(ScrnInfoPtr pScrn) + /* BIOS */ + from = X_PROBED; + info->BIOSAddr = info->PciInfo->biosBase & 0xfffe0000; +- if (dev->BiosBase) { +- xf86DrvMsg(pScrn->scrnIndex, X_INFO, +- "BIOS address override, using 0x%08lx instead of 0x%08lx\n", +- dev->BiosBase, +- info->BIOSAddr); +- info->BIOSAddr = dev->BiosBase; +- from = X_CONFIG; +- } + if (info->BIOSAddr) { + xf86DrvMsg(pScrn->scrnIndex, from, + "BIOS at 0x%08lx\n", info->BIOSAddr); diff --git a/extra/xf86-video-rendition/PKGBUILD b/extra/xf86-video-rendition/PKGBUILD index 39238c62d..41bb56a7e 100644 --- a/extra/xf86-video-rendition/PKGBUILD +++ b/extra/xf86-video-rendition/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 115356 2011-03-17 18:07:25Z andyrtr $ +# $Id: PKGBUILD 140312 2011-10-11 21:28:49Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-rendition pkgver=4.2.4 -pkgrel=4 +pkgrel=5 pkgdesc="X.org Rendition video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.11.0') +conflicts=('xorg-server<1.11.0') options=('!libtool' '!strip') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-s3/PKGBUILD b/extra/xf86-video-s3/PKGBUILD index 3512d248e..44b059ea1 100644 --- a/extra/xf86-video-s3/PKGBUILD +++ b/extra/xf86-video-s3/PKGBUILD @@ -1,29 +1,31 @@ -# $Id: PKGBUILD 115359 2011-03-17 18:08:59Z andyrtr $ +# $Id: PKGBUILD 140308 2011-10-11 21:28:45Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-s3 pkgver=0.6.3 -pkgrel=5 +pkgrel=6 pkgdesc="X.org S3 video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.11.0') +conflicts=('xorg-server<1.11.0') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - LICENSE) + git-fixes.patch) md5sums=('5eb06d88533fb327d067928faeb20860' - '6b2bea29522da7cbb81cadde3235024d') + '77a455ce7e254c73b1cbd408c7f4ecf4') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/git-fixes.patch" + autoreconf -fi ./configure --prefix=/usr make make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/xf86-video-s3/git-fixes.patch b/extra/xf86-video-s3/git-fixes.patch new file mode 100644 index 000000000..712b3c9c0 --- /dev/null +++ b/extra/xf86-video-s3/git-fixes.patch @@ -0,0 +1,458 @@ +diff --git a/COPYING b/COPYING +index 7f33cbf..458ab5f 100644 +--- a/COPYING ++++ b/COPYING +@@ -1,12 +1,70 @@ +-This is a stub file. This package has not yet had its complete licensing +-information compiled. Please see the individual source files for details on +-your rights to use and modify this software. ++ Copyright 2001 Ani Joshi <ajoshi@unixbox.com> + +-Please submit updated COPYING files to the Xorg bugzilla: ++ XFree86 4.x driver for S3 chipsets + +-https://bugs.freedesktop.org/enter_bug.cgi?product=xorg + +-All licensing questions regarding this software should be directed at the +-Xorg mailing list: ++Permission to use, copy, modify, distribute, and sell this software and its ++documentation for any purpose is hereby granted without fee, provided that ++the above copyright notice appear in all copies and that both that copyright ++notice and this permission notice appear in supporting documentation and ++that the name of Ani Joshi not be used in advertising or ++publicity pertaining to distribution of the software without specific, ++written prior permission. Ani Joshi makes no representations ++about the suitability of this software for any purpose. It is provided ++"as-is" without express or implied warranty. ++ ++ANI JOSHI DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, ++INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO ++EVENT SHALL ANI JOSHI BE LIABLE FOR ANY SPECIAL, INDIRECT OR ++CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, ++DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER ++TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR ++PERFORMANCE OF THIS SOFTWARE. ++Copyright 2007 George Sapountzis ++ ++Permission is hereby granted, free of charge, to any person obtaining a ++copy of this software and associated documentation files (the "Software"), ++to deal in the Software without restriction, including without limitation ++the rights to use, copy, modify, merge, publish, distribute, sublicense, ++and/or sell copies of the Software, and to permit persons to whom the ++Software is furnished to do so, subject to the following conditions: ++ ++The above copyright notice and this permission notice (including the next ++paragraph) shall be included in all copies or substantial portions of the ++Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, ++OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ++SOFTWARE. ++ ++Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. ++ ++Permission is hereby granted, free of charge, to any person obtaining a copy of ++this software and associated documentation files (the "Software"), to deal in ++the Software without restriction, including without limitation the rights to ++use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies ++of the Software, and to permit persons to whom the Software is furnished to do ++so, subject to the following conditions: ++ ++The above copyright notice and this permission notice shall be included in all ++copies or substantial portions of the Software. ++ ++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- ++NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ++XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN ++AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION ++WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ++ ++Except as contained in this notice, the name of the XFree86 Project shall not ++be used in advertising or otherwise to promote the sale, use or other dealings ++in this Software without prior written authorization from the XFree86 Project. ++ ++ ++Copyright 1995-1997 The XFree86 Project, Inc. ++Copyright (c) 1999,2000 The XFree86 Project Inc. + +-http://lists.freedesktop.org/mailman/listinfo/xorg +diff --git a/ChangeLog b/ChangeLog +deleted file mode 100644 +index ad0b227..0000000 +--- a/ChangeLog ++++ /dev/null +@@ -1,133 +0,0 @@ +-2009-06-25 Evgeny M. zubok <evgeny.zubok@tochka.ru> +- +- * src/s3_driver.c: +- Revert the old behaviour when the BIOS settings are used for +- intialization of DRAM/VRAM timings, i. e. we don't touch the +- timings during initialization phase until any memory option (like +- slow_edodram) is specified. +- +- Add manual page. +- +-2009-05-25 Evgeny M. Zubok <evgeny.zubok@tochka.ru> +- +- * src/s3_driver.c: +- * src/s3_video.c: +- +- Enable Xv extension for Trio64V+ (thanks to Egor Ivanov for +- testing on real hardware) and Trio64UV+ (Tested only on Trio64V2 by +- overriding Chipset with "Trio64UV+" but not on real hardware). +- +- S3 Trio64V+ now using NewMMIO. Trio64V+ chips have the same ChipId +- as Trio32/64 but only with chip revision greater or eq 0x40. So if +- you have problems with NewMMIO, you may override ChipRev in "Device" +- section of your xorg.conf: "ChipRev" 0x00. Note: disabling the NewMMIO +- also disables overlay video (Xv) because it isn't implemented for +- Old MMIO yet. +- +-2009-05-04 Evgeny M. Zubok <evgeny.zubok@tochka.ru> +- +- * src/s3_driver.c: +- * src/s3_shadow.c: +- +- Add shadowFB option. It can be used to speedup drawing when +- hardware acceleration is undesirable or unavailable (for colour depth +- 24 with 24 bpp framebuffer, for example). shadowFB is disabled by +- default. Enabling shadowFB option disables HW acceleration. Thanks +- to Egor Ivanov for initial porting of shadowFB from s3virge. +- +- Interlace mode support. +- +- Close bug #14999. +- +-2008-07-06 Evgeny M. Zubok <evgeny.zubok@tochka.ru> +- +- * src/s3_video.c: +- +- Streams Processor initialization. +- +- XVideo support for 16, 24 and 32 bpp (only for TRIO64V2). +- +- * src/s3_driver.c: +- +- Add XVideo option (enabled by default). +- +- Replace "swcursor" by "hwcursor" option (HW cursor +- not implemented yet for all chipsets). +- +- Close bug #5527: 24-bit colour depth support (24bpp and +- 32bpp framebuffer) for TRIOs. Acceleration doesn't work +- with packed colour mode (24 bpp FB) but works with 32bpp +- framebuffer mode (hardware limitation? -- need data). +- +- Fix system hang-up when switching between console and X session. +- +- Some minor changes of driver messages. +- +-2008-02-23 Evgeny M. Zubok <evgeny.zubok@tochka.ru> +- +- * src/s3_driver.c: Add DPMS support for S3 Trio64V2 and possibly +- others (need testing): S3 Trio64UV+. S3 Aurora64V+ and S3 Trio32/64 +- * src/s3_Trio64DAC: Change clocks for S3 Trio64V2 to make +- the 1024x768@16bpp mode work. +- Thanks to Richard Driscoll for these patches. +- +-2006-04-07 Adam Jackson <ajax@freedesktop.org> +- +- * configure.ac: +- * src/s3.h: +- Bump to 0.4.1 for Xv changes. +- +-2006-04-07 Aaron Plattner <aplattner@nvidia.com> +- +- * src/s3_video.c: (S3PutImage): +- Add a DrawablePtr argument to the XV functions to pave the way for +- redirected video. +- +-2006-04-07 Adam Jackson <ajax@freedesktop.org> +- +- * configure.ac: +- * src/s3.h: +- * src/s3_IBMRGB.c: +- * src/s3_Ti.c: +- * src/s3_Trio64DAC.c: +- * src/s3_bios.c: +- * src/s3_cursor.c: +- * src/s3_dga.c: +- * src/s3_driver.c: +- * src/s3_video.c: +- Unlibcwrap. Bump server version requirement. Bump to 0.4.0. +- +-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org> +- +- * configure.ac: +- Update package version for X11R7 release. +- +-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org> +- +- * configure.ac: +- Update package version number for final X11R7 release candidate. +- +-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org> +- +- * configure.ac: +- Update package version number for X11R7 RC3 release. +- +-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +- +- * configure.ac: +- Remove extraneous AC_MSG_RESULT. +- +-2005-11-29 Adam Jackson <ajax@freedesktop.org> +- +- * configure.ac: +- Only build dlloader modules by default. +- +-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org> +- +- * configure.ac: +- Update package version number for X11R7 RC2 release. +- +-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> +- +- * configure.ac: +- Update pkgcheck dependencies to work with separate build roots. +diff --git a/Makefile.am b/Makefile.am +index 7052905..4c278ba 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -18,5 +18,15 @@ + # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +-AUTOMAKE_OPTIONS = foreign + SUBDIRS = src man ++MAINTAINERCLEANFILES = ChangeLog INSTALL ++ ++.PHONY: ChangeLog INSTALL ++ ++INSTALL: ++ $(INSTALL_CMD) ++ ++ChangeLog: ++ $(CHANGELOG_CMD) ++ ++dist-hook: ChangeLog INSTALL +diff --git a/configure.ac b/configure.ac +index 0eecc87..0ac34f9 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -20,42 +20,50 @@ + # + # Process this file with autoconf to produce a configure script + +-AC_PREREQ(2.57) ++# Initialize Autoconf ++AC_PREREQ([2.60]) + AC_INIT([xf86-video-s3], +- 0.6.3, ++ [0.6.3], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], +- xf86-video-s3) +- ++ [xf86-video-s3]) + AC_CONFIG_SRCDIR([Makefile.am]) +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_AUX_DIR(.) + +-AM_INIT_AUTOMAKE([dist-bzip2]) +- ++# Initialize Automake ++AM_INIT_AUTOMAKE([foreign dist-bzip2]) + AM_MAINTAINER_MODE + +-# Checks for programs. ++# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS ++m4_ifndef([XORG_MACROS_VERSION], ++ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) ++XORG_MACROS_VERSION(1.8) ++XORG_DEFAULT_OPTIONS ++ ++# Initialize libtool + AC_DISABLE_STATIC + AC_PROG_LIBTOOL +-AC_PROG_CC ++ ++# Checks for programs. ++AM_PROG_CC_C_O + + AH_TOP([#include "xorg-server.h"]) + ++# Define a configure option for an alternate module directory + AC_ARG_WITH(xorg-module-dir, +- AC_HELP_STRING([--with-xorg-module-dir=DIR], ++ AS_HELP_STRING([--with-xorg-module-dir=DIR], + [Default xorg module directory [[default=$libdir/xorg/modules]]]), + [moduledir="$withval"], + [moduledir="$libdir/xorg/modules"]) + +-# Checks for extensions ++# Store the list of server defined optional extensions in REQUIRED_MODULES + XORG_DRIVER_CHECK_EXT(RANDR, randrproto) + XORG_DRIVER_CHECK_EXT(RENDER, renderproto) + XORG_DRIVER_CHECK_EXT(XV, videoproto) + XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) + +-# Checks for pkg-config packages ++# Obtain compiler/linker options for the driver dependencies + PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4 xproto fontsproto $REQUIRED_MODULES]) +-sdkdir=$(pkg-config --variable=sdkdir xorg-server) + + # Checks for libraries. + SAVE_CPPFLAGS="$CPPFLAGS" +@@ -65,28 +73,20 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS, + [#include "xorg-server.h"]) + CPPFLAGS="$SAVE_CPPFLAGS" + +-# Checks for header files. +-AC_HEADER_STDC +- + if test "x$XSERVER_LIBPCIACCESS" = xyes; then + PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0]) + XORG_CFLAGS="$XORG_CFLAGS $PCIACCESS_CFLAGS" + fi + AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) + +-AC_SUBST([XORG_CFLAGS]) + AC_SUBST([moduledir]) + + DRIVER_NAME=s3 + AC_SUBST([DRIVER_NAME]) + +-XORG_MANPAGE_SECTIONS +-XORG_RELEASE_VERSION +- +-XORG_CHECK_LINUXDOC +- +-AC_OUTPUT([ +- Makefile +- src/Makefile +- man/Makefile ++AC_CONFIG_FILES([ ++ Makefile ++ src/Makefile ++ man/Makefile + ]) ++AC_OUTPUT +diff --git a/man/Makefile.am b/man/Makefile.am +index f0eb29b..b3688ce 100644 +--- a/man/Makefile.am ++++ b/man/Makefile.am +@@ -1,27 +1,24 @@ + # + # Copyright 2005 Sun Microsystems, Inc. All rights reserved. +-# +-# Permission to use, copy, modify, distribute, and sell this software and its +-# documentation for any purpose is hereby granted without fee, provided that +-# the above copyright notice appear in all copies and that both that +-# copyright notice and this permission notice appear in supporting +-# documentation. +-# +-# The above copyright notice and this permission notice shall be included +-# in all copies or substantial portions of the Software. +-# +-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +-# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +-# OTHER DEALINGS IN THE SOFTWARE. +-# +-# Except as contained in this notice, the name of the copyright holders shall +-# not be used in advertising or otherwise to promote the sale, use or +-# other dealings in this Software without prior written authorization +-# from the copyright holders. ++# ++# Permission is hereby granted, free of charge, to any person obtaining a ++# copy of this software and associated documentation files (the "Software"), ++# to deal in the Software without restriction, including without limitation ++# the rights to use, copy, modify, merge, publish, distribute, sublicense, ++# and/or sell copies of the Software, and to permit persons to whom the ++# Software is furnished to do so, subject to the following conditions: ++# ++# The above copyright notice and this permission notice (including the next ++# paragraph) shall be included in all copies or substantial portions of the ++# Software. ++# ++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++# DEALINGS IN THE SOFTWARE. + # + + drivermandir = $(DRIVER_MAN_DIR) +@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man + + CLEANFILES = $(driverman_DATA) + +-SED = sed + +-# Strings to replace in man pages +-XORGRELSTRING = @PACKAGE_STRING@ +- XORGMANNAME = X Version 11 ++# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure + +-MAN_SUBSTS = \ +- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ +- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ +- -e 's|__xservername__|Xorg|g' \ +- -e 's|__xconfigfile__|xorg.conf|g' \ +- -e 's|__projectroot__|$(prefix)|g' \ +- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ +- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ +- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ +- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ +- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' + + SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man + + .man.$(DRIVER_MAN_SUFFIX): +- sed $(MAN_SUBSTS) < $< > $@ ++ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ +diff --git a/src/s3.h b/src/s3.h +index 49b8a54..0875fc9 100644 +--- a/src/s3.h ++++ b/src/s3.h +@@ -113,7 +113,6 @@ typedef struct _S3Rec { + XAAInfoRecPtr pXAA; + xf86CursorInfoPtr pCurs; + xf86Int10InfoPtr pInt10; +- vbeInfoPtr pVBE; + XF86VideoAdaptorPtr adaptor; + S3PortPrivPtr portPrivate; + +diff --git a/src/s3_driver.c b/src/s3_driver.c +index 29e343d..4519b33 100644 +--- a/src/s3_driver.c ++++ b/src/s3_driver.c +@@ -309,6 +309,7 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags) + S3Ptr pS3; + vgaHWPtr hwp; + ClockRangePtr clockRanges; ++ vbeInfoPtr pVBE; + rgb zeros = {0, 0, 0}; + Gamma gzeros = {0.0, 0.0, 0.0}; + int i, vgaCRIndex, vgaCRReg; +@@ -436,7 +437,8 @@ static Bool S3PreInit(ScrnInfoPtr pScrn, int flags) + } + + if (xf86LoadSubModule(pScrn, "vbe")) { +- pS3->pVBE = VBEInit(pS3->pInt10, pEnt->index); ++ pVBE = VBEInit(pS3->pInt10, pEnt->index); ++ vbeFree(pVBE); + } + + if (pS3->shadowFB) { diff --git a/extra/xf86-video-s3virge/LICENSE b/extra/xf86-video-s3virge/LICENSE deleted file mode 100644 index 23c2aea22..000000000 --- a/extra/xf86-video-s3virge/LICENSE +++ /dev/null @@ -1,25 +0,0 @@ -This package was downloaded from -http://xorg.freedesktop.org/releases/individual/driver/ - -Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT- -NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the name of the XFree86 Project shall not -be used in advertising or otherwise to promote the sale, use or other dealings -in this Software without prior written authorization from the XFree86 Project. diff --git a/extra/xf86-video-s3virge/PKGBUILD b/extra/xf86-video-s3virge/PKGBUILD index 2deeaa2d6..170bd31aa 100644 --- a/extra/xf86-video-s3virge/PKGBUILD +++ b/extra/xf86-video-s3virge/PKGBUILD @@ -1,29 +1,31 @@ -# $Id: PKGBUILD 115362 2011-03-17 18:10:25Z andyrtr $ +# $Id: PKGBUILD 140310 2011-10-11 21:28:47Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xf86-video-s3virge pkgver=1.10.4 -pkgrel=5 +pkgrel=6 pkgdesc="X.org S3 Virge video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('pkgconfig' 'xorg-server-devel') -conflicts=('xorg-server<1.10.0') +makedepends=('pkgconfig' 'xorg-server-devel>=1.10.99.902') +conflicts=('xorg-server<1.10.99.902') options=(!libtool) groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - LICENSE) -md5sums=('6517bbbf808c700502d51acdc44662f8' 'c0a38dfcd6288eff39322f7c584b8d1e') + copyright.patch) +md5sums=('6517bbbf808c700502d51acdc44662f8' + 'f91fb259e3632fb9130fcbe69ecd9d6a') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/copyright.patch" ./configure --prefix=/usr make make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/" + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/extra/xf86-video-savage/PKGBUILD b/extra/xf86-video-savage/PKGBUILD index 32d8afda3..84aabffc1 100644 --- a/extra/xf86-video-savage/PKGBUILD +++ b/extra/xf86-video-savage/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 115365 2011-03-17 18:12:33Z andyrtr $ +# $Id: PKGBUILD 140306 2011-10-11 21:28:43Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-savage -pkgver=2.3.2 -pkgrel=2 +pkgver=2.3.3 +pkgrel=1 pkgdesc="X.org savage video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc' 'savage-dri') -makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa') +makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa' 'glproto') conflicts=('xorg-server<1.10.0') options=(!libtool !makeflags) groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('d675693d0b29cb24f624ef57c1fe2f271f6bf6c3') +sha256sums=('d3854d375dbf7d83bf90e30d72837ce60d808119c6fa4bb98088e68e7cc7e7b2') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/xf86-video-siliconmotion/PKGBUILD b/extra/xf86-video-siliconmotion/PKGBUILD index ceeb4f2d2..09da32575 100644 --- a/extra/xf86-video-siliconmotion/PKGBUILD +++ b/extra/xf86-video-siliconmotion/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 115368 2011-03-17 18:14:01Z andyrtr $ +# $Id: PKGBUILD 140304 2011-10-11 21:28:41Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> @@ -10,8 +10,8 @@ arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.10.99.902') +conflicts=('xorg-server<1.10.99.902') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 diff --git a/extra/xf86-video-sis/PKGBUILD b/extra/xf86-video-sis/PKGBUILD index 436f1e3cb..2868e778d 100644 --- a/extra/xf86-video-sis/PKGBUILD +++ b/extra/xf86-video-sis/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 115371 2011-03-17 18:16:09Z andyrtr $ +# $Id: PKGBUILD 140302 2011-10-11 21:28:39Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-sis pkgver=0.10.3 -pkgrel=4 +pkgrel=5 pkgdesc="X.org SiS video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc' 'sis-dri') -makedepends=('xorg-server-devel' 'xf86dgaproto' 'libdrm' 'xf86driproto' 'mesa') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.11.0' 'xf86dgaproto' 'libdrm' 'xf86driproto' 'mesa' 'glproto') +conflicts=('xorg-server<1.11.0') options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-sisimedia/0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch b/extra/xf86-video-sisimedia/0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch new file mode 100644 index 000000000..fd87b6c8c --- /dev/null +++ b/extra/xf86-video-sisimedia/0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch @@ -0,0 +1,25 @@ +From e4f6a2fcd5712d0f994d3719b9c6c13f5b02bc7c Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Fri, 9 Jan 2009 16:34:01 -0800 +Subject: [PATCH 01/10] Remove xorgconfig & xorgcfg from See Also list in man page + +--- + man/sis.man | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/man/sis.man b/man/sis.man +index d743fe6..c321808 100644 +--- a/man/sis.man ++++ b/man/sis.man +@@ -429,7 +429,7 @@ The amount is to be specified in megabyte, the default is 8. + none. + .SH "SEE ALSO" + #ifdef __xservername__ +-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) ++__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__) + #else + XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__) + #endif +-- +1.6.5.4 + diff --git a/extra/xf86-video-sisimedia/0002-Remove-XFree86-Misc-PassMessage-support.patch b/extra/xf86-video-sisimedia/0002-Remove-XFree86-Misc-PassMessage-support.patch new file mode 100644 index 000000000..860e593c6 --- /dev/null +++ b/extra/xf86-video-sisimedia/0002-Remove-XFree86-Misc-PassMessage-support.patch @@ -0,0 +1,91 @@ +diff -p -up xf86-video-sis-0.9.1/configure.ac.orig xf86-video-sis-0.9.1/configure.ac +--- xf86-video-sis-0.9.1/configure.ac.orig 2010-01-27 15:34:26.000000000 -0500 ++++ xf86-video-sis-0.9.1/configure.ac 2010-01-27 15:34:43.000000000 -0500 +@@ -58,7 +58,6 @@ XORG_DRIVER_CHECK_EXT(XINERAMA, xinerama + XORG_DRIVER_CHECK_EXT(RANDR, randrproto) + XORG_DRIVER_CHECK_EXT(RENDER, renderproto) + XORG_DRIVER_CHECK_EXT(XV, videoproto) +-XORG_DRIVER_CHECK_EXT(XF86MISC, xf86miscproto) + XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) + + # Checks for pkg-config packages +diff -p -up xf86-video-sis-0.9.1/src/sis_driver.c.orig xf86-video-sis-0.9.1/src/sis_driver.c +--- xf86-video-sis-0.9.1/src/sis_driver.c.orig 2010-01-27 15:35:05.000000000 -0500 ++++ xf86-video-sis-0.9.1/src/sis_driver.c 2010-01-27 15:35:39.000000000 -0500 +@@ -86,8 +86,6 @@ + #include "mibank.h" + #include "mipointer.h" + #include "mibstore.h" +-#define _XF86MISC_SERVER_ +-#include <X11/extensions/xf86misc.h> + #include "edid.h" + + #define SIS_NEED_inSISREG +@@ -506,11 +504,6 @@ xf86DrvMsg(0, X_INFO, " + pScrn->FreeScreen = SISFreeScreen; + pScrn->ValidMode = SISValidMode; + pScrn->PMEvent = SISPMEvent; /*add PM function for ACPI hotkey,Ivans*/ +-#ifdef X_XF86MiscPassMessage +-// if(xf86GetVersion() >= XF86_VERSION_NUMERIC(4,3,99,2,0)) { +-// pScrn->HandleMessage = SISHandleMessage; +-// } +-#endif + foundScreen = TRUE; + } + #ifdef SISDUALHEAD +diff -p -up xf86-video-sis-0.9.1/src/sis_driver.h.orig xf86-video-sis-0.9.1/src/sis_driver.h +--- xf86-video-sis-0.9.1/src/sis_driver.h.orig 2010-01-27 15:35:49.000000000 -0500 ++++ xf86-video-sis-0.9.1/src/sis_driver.h 2010-01-27 15:36:04.000000000 -0500 +@@ -791,10 +791,6 @@ static Bool SISHotkeySwitchMode(ScrnInfo + #ifdef SISDUALHEAD + static Bool SISSaveScreenDH(ScreenPtr pScreen, int mode); + #endif +-#ifdef X_XF86MiscPassMessage +-extern int SISHandleMessage(int scrnIndex, const char *msgtype, +- const char *msgval, char **retmsg); +-#endif + static void SISFreeScreen(int scrnIndex, int flags); + static ModeStatus SISValidMode(int scrnIndex, DisplayModePtr mode, + Bool verbose, int flags); +diff -p -up xf86-video-sis-0.9.1/src/sis_utility.c.orig xf86-video-sis-0.9.1/src/sis_utility.c +--- xf86-video-sis-0.9.1/src/sis_utility.c.orig 2010-01-27 15:36:23.000000000 -0500 ++++ xf86-video-sis-0.9.1/src/sis_utility.c 2010-01-27 15:36:59.000000000 -0500 +@@ -40,8 +40,6 @@ + #define NEED_EVENTS + #include <X11/X.h> + #include "dixstruct.h" +-#define _XF86MISC_SERVER_ +-#include <X11/extensions/xf86misc.h> + + #include "sis_videostr.h" + +@@ -262,9 +260,6 @@ typedef struct { + int (*HandleSiSDirectCommand[SISCTRL_MAX_SCREENS])(xSiSCtrlCommandReply *); + } xSiSCtrlScreenTable; + +-#ifdef X_XF86MiscPassMessage +-int SISHandleMessage(int scrnIndex, const char *msgtype, const char *msgval, char **retmsg); +-#endif + void SiSCtrlExtInit(ScrnInfoPtr pScrn); + void SiSCtrlExtUnregister(SISPtr pSiS, int index); + +@@ -975,19 +970,6 @@ unsigned int SISVGADetected(ScrnInfoPtr + } + + /*********************************** +- * MessageHandler interface * +- * (unused now; use extension) * +- ***********************************/ +- +-#ifdef X_XF86MiscPassMessage +-int +-SISHandleMessage(int scrnIndex, const char *msgtype, const char *msgval, char **retmsg) +-{ +- return BadMatch; +-} +-#endif +- +-/*********************************** + * SiSCtrl extension interface * + ***********************************/ + diff --git a/extra/xf86-video-sisimedia/0003-Fix-build-with-Werror-format-security.patch b/extra/xf86-video-sisimedia/0003-Fix-build-with-Werror-format-security.patch new file mode 100644 index 000000000..4fc355bbb --- /dev/null +++ b/extra/xf86-video-sisimedia/0003-Fix-build-with-Werror-format-security.patch @@ -0,0 +1,65 @@ +From 9b010b7db7f0c6730c1a1b3cd473d49b01ed5b5f Mon Sep 17 00:00:00 2001 +From: Ander Conselvan de Oliveira <ander@mandriva.com.br> +Date: Mon, 22 Jun 2009 16:07:26 -0400 +Subject: [PATCH] Fix build with -Werror=format-security + +--- + src/sis_driver.c | 4 ++-- + src/sis_mergedfb.c | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/sis_driver.c b/src/sis_driver.c +index 5b91004..0a154db 100644 +--- a/src/sis_driver.c ++++ b/src/sis_driver.c +@@ -831,14 +831,14 @@ SISErrorLog(ScrnInfoPtr pScrn, const char *format, ...) + static const char *str = "**************************************************\n"; + + va_start(ap, format); +- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str); ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str); + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + " ERROR:\n"); + xf86VDrvMsgVerb(pScrn->scrnIndex, X_ERROR, 1, format, ap); + va_end(ap); + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + " END OF MESSAGE\n"); +- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, str); ++ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "%s", str); + } + + static void +diff --git a/src/sis_mergedfb.c b/src/sis_mergedfb.c +index 61b4255..feca024 100644 +--- a/src/sis_mergedfb.c ++++ b/src/sis_mergedfb.c +@@ -357,7 +357,7 @@ SiSCopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest, + + strcat(printbuffer, namebuf1); + +- xf86DrvMsg(pScrn->scrnIndex, X_INFO, printbuffer); ++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "%s", printbuffer); + } + + mode->next = mode; +@@ -2137,7 +2137,7 @@ SiSUpdateXineramaScreenInfo(ScrnInfoPtr pScrn1) + if(infochanged && !usenonrect) { + xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb, + "Current screen size does not match maximum display modes...\n"); +- xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb, rectxine); ++ xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb, "%s", rectxine); + } + + } else if(infochanged && usenonrect) { +@@ -2145,7 +2145,7 @@ SiSUpdateXineramaScreenInfo(ScrnInfoPtr pScrn1) + usenonrect = FALSE; + xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb, + "Only clone modes available for this screen size...\n"); +- xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb, rectxine); ++ xf86DrvMsgVerb(pScrn1->scrnIndex, X_INFO, pSiS->XineVerb, "%s", rectxine); + + } + +-- +1.6.2.4 + diff --git a/extra/xf86-video-sisimedia/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch b/extra/xf86-video-sisimedia/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch new file mode 100644 index 000000000..68ec63138 --- /dev/null +++ b/extra/xf86-video-sisimedia/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch @@ -0,0 +1,32 @@ +From 49c641b638ac36d2a559555c04a3bd2777c8d071 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Fri, 1 May 2009 16:52:10 -0700 +Subject: [PATCH 04/10] Make sisRegs3D4 big enough to hold all values written to it + +Increase size from 0xff to 0x100 since SiS315Save (sis_dac.c line 752) +writes values into sisRegs3D4[0x00..0xff] if ChipType >= XGI_20 + +[This bug was found by the Parfait bug checking tool. + For more information see http://research.sun.com/projects/parfait ] + +Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> +--- + src/sis.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/sis.h b/src/sis.h +index 9bafd4b..773f709 100644 +--- a/src/sis.h ++++ b/src/sis.h +@@ -747,7 +747,7 @@ typedef struct { + UChar sisRegsGR[10]; + UChar sisDAC[768]; + UChar sisRegs3C4[0x80]; +- UChar sisRegs3D4[0xff]; ++ UChar sisRegs3D4[0x100]; + UChar sisRegs3C2; + UChar sisCapt[0x60]; + UChar sisVid[0x50]; +-- +1.6.5.4 + diff --git a/extra/xf86-video-sisimedia/0005-Correct-bounds-check-of-blitClip-array-access.patch b/extra/xf86-video-sisimedia/0005-Correct-bounds-check-of-blitClip-array-access.patch new file mode 100644 index 000000000..038322bf6 --- /dev/null +++ b/extra/xf86-video-sisimedia/0005-Correct-bounds-check-of-blitClip-array-access.patch @@ -0,0 +1,38 @@ +From 933dd8f860883c613acb5bcdf6b66100dbdfa952 Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith <alan.coopersmith@sun.com> +Date: Fri, 1 May 2009 16:57:22 -0700 +Subject: [PATCH 05/10] Correct bounds check of blitClip array access + +Array is defined as blitClip[NUM_BLIT_PORTS], so invalid indexes +are >= NUM_BLIT_PORTS, not just > NUM_BLIT_PORTS + +[This bug was found by the Parfait bug checking tool. + For more information see http://research.sun.com/projects/parfait ] + +Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> +--- + src/sis_video.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +Index: xf86-video-sis-0.9.1/src/sis_video.c +=================================================================== +--- xf86-video-sis-0.9.1.orig/src/sis_video.c ++++ xf86-video-sis-0.9.1/src/sis_video.c +@@ -4656,7 +4656,7 @@ SISStopVideoBlit(ScrnInfoPtr pScrn, ULon + * adapt->flags but we provide it anyway. + */ + +- if(index > NUM_BLIT_PORTS) return; ++ if(index >= NUM_BLIT_PORTS) return; + + REGION_EMPTY(pScrn->pScreen, &pPriv->blitClip[index]); + +@@ -4698,7 +4698,7 @@ SISPutImageBlit_671( + int xoffset = 0, yoffset = 0; + Bool first; + +- if(index > NUM_BLIT_PORTS) ++ if(index >= NUM_BLIT_PORTS) + return BadMatch; + + if(!height || !width) diff --git a/extra/xf86-video-sisimedia/0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch b/extra/xf86-video-sisimedia/0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch new file mode 100644 index 000000000..f023c774e --- /dev/null +++ b/extra/xf86-video-sisimedia/0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch @@ -0,0 +1,25 @@ +From 910073e0ab3a7bf9e5c9d97437a879d97edc2714 Mon Sep 17 00:00:00 2001 +From: root <root@greentea.conectiva> +Date: Wed, 1 Jul 2009 09:59:39 -0400 +Subject: [PATCH] Fix backlight off on SiS30x. video bridges. + +--- + src/init301.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/init301.c b/src/init301.c +index c179ae8..70a6aab 100644 +--- a/src/init301.c ++++ b/src/init301.c +@@ -9261,7 +9261,7 @@ void + SiS_SiS30xBLOff(struct SiS_Private *SiS_Pr) + { + /* Switch off LCD backlight on SiS30xLV */ +- SiS_SetRegAND(SiS_Pr->SiS_Part4Port,0x26,0xFE); ++ SiS_SetRegAND(SiS_Pr->SiS_Part4Port,0x26,0xFC); + SiS_DDC2Delay(SiS_Pr,0xff00); + } + +-- +1.5.4.3 + diff --git a/extra/xf86-video-sisimedia/0006-Add-IgnoreHotkeyFlag-driver-option.patch b/extra/xf86-video-sisimedia/0006-Add-IgnoreHotkeyFlag-driver-option.patch new file mode 100644 index 000000000..8ebc799a7 --- /dev/null +++ b/extra/xf86-video-sisimedia/0006-Add-IgnoreHotkeyFlag-driver-option.patch @@ -0,0 +1,89 @@ +From 072af02d180c1965f30246ea269d208292ed6f05 Mon Sep 17 00:00:00 2001 +From: root <root@greentea.conectiva> +Date: Wed, 1 Jul 2009 14:13:52 -0400 +Subject: [PATCH] Add IgnoreHotkeyFlag driver option. + +Some BIOSes do not set the hotkey flag correctly. Without this option +set, the driver won't change the mirroring state of LCD and VGA +connections if the BIOS did not set this flag. +--- + src/sis.h | 3 +++ + src/sis_driver.c | 2 +- + src/sis_opt.c | 13 ++++++++++++- + 3 files changed, 16 insertions(+), 2 deletions(-) + +diff --git a/src/sis.h b/src/sis.h +index c50690b..c82c302 100644 +--- a/src/sis.h ++++ b/src/sis.h +@@ -1565,6 +1565,9 @@ typedef struct { + + /* Enable special 1366x768x60hz mode of LVDS panel. Ivans@090109 */ + Bool EnablePanel_1366x768; ++ ++ /* Ignore hotkey flag on capability changed APM events */ ++ Bool IgnoreHotkeyFlag; + + } SISRec, *SISPtr; + +diff --git a/src/sis_driver.c b/src/sis_driver.c +index c935c11..2a5001c 100644 +--- a/src/sis_driver.c ++++ b/src/sis_driver.c +@@ -11370,7 +11370,7 @@ SISPMEvent(int scrnIndex, pmEvent event, Bool undo) + inSISIDXREG(SISCR,0x3d,hotkeyflag);/*check device switch flag from BIOS CR 0x3d bit[2].*/ + + +- if(hotkeyflag & 0x04) ++ if(pSiS->IgnoreHotkeyFlag || (hotkeyflag & 0x04)) + { + + SISCRT1PreInit(pScrn); /*redetecting CRT1, pSiS->CRT1detected will update.*/ +diff --git a/src/sis_opt.c b/src/sis_opt.c +index 4b79f7f..7f726ea 100644 +--- a/src/sis_opt.c ++++ b/src/sis_opt.c +@@ -159,7 +159,8 @@ typedef enum { + OPTION_PSEUDO, + OPTION_FUTRO_TIMING, /*chaoyu's modified: for Fuji-Siemans specail timing*/ + OPTION_TRACEVGAMISCW, +- OPTION_USETIMING1366 /*option of enable 1366x768 timing for LVDS panel. Ivans@090109*/ ++ OPTION_USETIMING1366, /*option of enable 1366x768 timing for LVDS panel. Ivans@090109*/ ++ OPTION_IGNOREHOTKEYFLAG + } SISOpts; + + static const OptionInfoRec SISOptions[] = { +@@ -305,6 +306,7 @@ static const OptionInfoRec SISOptions[] = { + { OPTION_FUTRO_TIMING, "FutroTiming", OPTV_BOOLEAN, {0}, FALSE },/*chaoyu's modified: for Fuji-seimans special timing*/ + { OPTION_TRACEVGAMISCW, "TraceVgaMISCW", OPTV_BOOLEAN, {0}, FALSE },/*Ivans added for helping detected CRT1 using BIOS setting.*/ + { OPTION_USETIMING1366, "UseTiming1366", OPTV_BOOLEAN, {0}, FALSE },/*enable 1366 timing on LVDS, Ivans@090109*/ ++ { OPTION_IGNOREHOTKEYFLAG, "IgnoreHotkeyFlag", OPTV_BOOLEAN, {0}, FALSE }, + { -1, NULL, OPTV_NONE, {0}, FALSE } + }; + +@@ -624,6 +626,7 @@ SiSOptions(ScrnInfoPtr pScrn) + pSiS->CRT2IsScrn0 = FALSE; + #endif + #endif ++ pSiS->IgnoreHotkeyFlag = FALSE; + + /* Chipset dependent defaults */ + +@@ -2419,6 +2422,14 @@ SiSOptions(ScrnInfoPtr pScrn) + pSiS->EnablePanel_1366x768 = TRUE; + } + } ++ /* Ignore hotkey flag for video switch, switch on every ++ * XF86_APM_CAPABILITY_CHANGED event */ ++ if(xf86GetOptValBool(pSiS->Options, OPTION_IGNOREHOTKEYFLAG, &val)){ ++ if(val){ ++ xf86DrvMsg(pScrn->scrnIndex, X_INFO,"Ignoring hotkey flag\n"); ++ pSiS->IgnoreHotkeyFlag = TRUE; ++ } ++ } + + } + +-- +1.5.4.3 + diff --git a/extra/xf86-video-sisimedia/0007-Remove-useless-loader-symbol-lists.patch b/extra/xf86-video-sisimedia/0007-Remove-useless-loader-symbol-lists.patch new file mode 100644 index 000000000..395213375 --- /dev/null +++ b/extra/xf86-video-sisimedia/0007-Remove-useless-loader-symbol-lists.patch @@ -0,0 +1,249 @@ +From ae1a7dcebdac904c8068cc38fb77648c548f5075 Mon Sep 17 00:00:00 2001 +From: Paulo Ricardo Zanoni <pzanoni@mandriva.com> +Date: Thu, 22 Apr 2010 11:19:29 -0300 +Subject: [PATCH] Remove useless loader symbol lists + +Adaption of xf86-video-sis patch 74553b5ee476a0dd28e136f5a33a546ea0c3ef28 +--- + src/sis_driver.c | 150 +----------------------------------------------------- + 1 files changed, 1 insertions(+), 149 deletions(-) + +diff --git a/src/sis_driver.c b/src/sis_driver.c +index d56182f..96255d3 100644 +--- a/src/sis_driver.c ++++ b/src/sis_driver.c +@@ -227,126 +227,6 @@ static PciChipsets XGIPciChipsets[] = { + { -1, -1, RES_UNDEFINED } + }; + +-#ifdef SIS_USE_XAA +-static const char *xaaSymbols[] = { +- "XAACreateInfoRec", +- "XAADestroyInfoRec", +- "XAAHelpPatternROP", +- "XAAInit", +- NULL +-}; +-#endif +- +-#ifdef SIS_USE_EXA +-static const char *exaSymbols[] = { +- "exaGetVersion", +- "exaDriverInit", +- "exaDriverFini", +- "exaOffscreenAlloc", +- "exaOffscreenFree", +- NULL +-}; +-#endif +- +-static const char *fbSymbols[] = { +- "fbPictureInit", +- "fbScreenInit", +- NULL +-}; +- +-static const char *shadowSymbols[] = { +- "ShadowFBInit", +- NULL +-}; +- +-static const char *ramdacSymbols[] = { +- "xf86CreateCursorInfoRec", +- "xf86DestroyCursorInfoRec", +- "xf86InitCursor", +- NULL +-}; +- +-static const char *ddcSymbols[] = { +- "xf86PrintEDID", +- "xf86InterpretEDID", +- NULL +-}; +- +-static const char *int10Symbols[] = { +- "xf86FreeInt10", +- "xf86InitInt10", +- NULL +-}; +- +-static const char *vbeSymbols[] = { +-#if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0) +- "VBEInit", +-#else +- "VBEExtendedInit", +-#endif +- "vbeDoEDID", +- "vbeFree", +- "VBEGetVBEInfo", +- "VBEFreeVBEInfo", +- "VBEGetModeInfo", +- "VBEFreeModeInfo", +- "VBESaveRestore", +- "VBESetVBEMode", +- "VBEGetVBEMode", +- "VBESetDisplayStart", +- "VBESetGetLogicalScanlineLength", +- NULL +-}; +- +-#ifdef XF86DRI +-static const char *drmSymbols[] = { +- "drmAddMap", +- "drmAgpAcquire", +- "drmAgpRelease", +- "drmAgpAlloc", +- "drmAgpFree", +- "drmAgpBase", +- "drmAgpBind", +- "drmAgpUnbind", +- "drmAgpEnable", +- "drmAgpGetMode", +- "drmCtlInstHandler", +- "drmCtlUninstHandler", +- "drmGetInterruptFromBusID", +-#ifndef SISHAVEDRMWRITE +- "drmSiSAgpInit", +-#else +- "drmCommandWrite", +-#endif +-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(4,3,0,0,0) +- "drmGetVersion", +- "drmFreeVersion", +-#endif +- NULL +-}; +- +-static const char *driSymbols[] = { +- "DRICreateInfoRec", +- "DRIScreenInit", +- "DRIFinishScreenInit", +- "DRIDestroyInfoRec", +- "DRICloseScreen", +- "DRIGetSAREAPrivate", +- "DRILock", +- "DRIUnlock", +- "DRIQueryVersion", +- "GlxSetVisualConfigs", +- NULL +-}; +- +-#ifdef XFree86LOADER +-static const char *driRefSymbols[] = { +- "DRICreatePCIBusID", /* not REQUIRED, but eventually referenced */ +- NULL +-}; +-#endif +-#endif /* XF86DRI */ +- + #ifdef XFree86LOADER + + static MODULESETUPPROTO(sisSetup); +@@ -382,19 +262,6 @@ sisSetup(pointer module, pointer opts, int *errmaj, int *errmin) + if(!setupDone) { + setupDone = TRUE; + xf86AddDriver(&SIS, module, SIS_HaveDriverFuncs); +- LoaderRefSymLists(fbSymbols, +-#ifdef SIS_USE_XAA +- xaaSymbols, +-#endif +-#ifdef SIS_USE_EXA +- exaSymbols, +-#endif +- shadowSymbols, ramdacSymbols, +- vbeSymbols, int10Symbols, +-#ifdef XF86DRI +- drmSymbols, driSymbols, driRefSymbols, +-#endif +- NULL); + return (pointer)TRUE; + } + +@@ -1068,7 +935,6 @@ SiS_LoadInitVBE(ScrnInfoPtr pScrn) + return; + + if(xf86LoadSubModule(pScrn, "vbe")) { +- xf86LoaderReqSymLists(vbeSymbols, NULL); + #if XF86_VERSION_CURRENT < XF86_VERSION_NUMERIC(4,2,99,0,0) + pSiS->pVbe = VBEInit(pSiS->pInt, pSiS->pEnt->index); + #else +@@ -1092,7 +958,6 @@ SiSLoadInitDDCModule(ScrnInfoPtr pScrn) + return TRUE; + + if(xf86LoadSubModule(pScrn, "ddc")) { +- xf86LoaderReqSymLists(ddcSymbols, NULL); + pSiS->haveDDC = TRUE; + return TRUE; + } +@@ -3586,7 +3451,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + xf86DrvMsg(pScrn->scrnIndex, X_INFO, + "Initializing adapter through int10\n"); + if(xf86LoadSubModule(pScrn, "int10")) { +- xf86LoaderReqSymLists(int10Symbols, NULL); + pSiS->pInt = xf86InitInt10(pSiS->pEnt->index); + } else { + SISErrorLog(pScrn, "Failed to load int10 module\n"); +@@ -3683,7 +3547,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + SISErrorLog(pScrn, "Could not load ramdac module\n"); + goto my_error_1; + } +- xf86LoaderReqSymLists(ramdacSymbols, NULL); + + /* Set pScrn->monitor */ + pScrn->monitor = pScrn->confScreen->monitor; +@@ -5868,22 +5731,18 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + SISErrorLog(pScrn, "Unsupported framebuffer bpp (%d)\n", pScrn->bitsPerPixel); + goto my_error_1; + } +- xf86LoaderReqSymLists(fbSymbols, NULL); + + /* Load XAA/EXA (if needed) */ + if(!pSiS->NoAccel) { + char *modName = NULL; +- const char **symNames = NULL; + #ifdef SIS_USE_XAA + if(!pSiS->useEXA) { + modName = "xaa"; +- symNames = xaaSymbols; + } + #endif + #ifdef SIS_USE_EXA + if(pSiS->useEXA) { + modName = "exa"; +- symNames = exaSymbols; + } + #endif + if(modName && (!xf86LoadSubModule(pScrn, modName))) { +@@ -5894,9 +5753,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + pSiS->NoXvideo = TRUE; + } + #endif +- } else if(symNames) { +- xf86LoaderReqSymLists(symNames, NULL); +- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "2D acceleration enabled, modename %s\n",modName); + } + } + +@@ -5909,8 +5765,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + pSiS->ShadowFB = FALSE; + pSiS->Rotate = pSiS->Reflect = 0; + } +- } else { +- xf86LoaderReqSymLists(shadowSymbols, NULL); + } + } + +@@ -5920,9 +5774,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + if(!xf86LoaderCheckSymbol("DRIScreenInit")) { + if(xf86LoadSubModule(pScrn, "dri")) { + if(!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) { +- if(xf86LoadSubModule(pScrn, "glx")) { +- xf86LoaderReqSymLists(driSymbols, drmSymbols, NULL); +- } else { ++ if(! xf86LoadSubModule(pScrn, "glx")) { + SISErrorLog(pScrn, "Failed to load glx module\n"); + } + } +-- +1.6.4.4 + diff --git a/extra/xf86-video-sisimedia/0008-update-to-xextproto-7-1-support.patch b/extra/xf86-video-sisimedia/0008-update-to-xextproto-7-1-support.patch new file mode 100644 index 000000000..1dcbdf05c --- /dev/null +++ b/extra/xf86-video-sisimedia/0008-update-to-xextproto-7-1-support.patch @@ -0,0 +1,45 @@ +From 59ea80738d22c69a2850fd7ff89bd75330cc310b Mon Sep 17 00:00:00 2001 +From: Peter Hutterer <peter.hutterer@who-t.net> +Date: Thu, 16 Jul 2009 01:55:25 +0000 +Subject: Update to xextproto 7.1 support. + +DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers +need to include dpmsconst.h if xextproto 7.1 is available. + +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +--- +diff --git a/configure.ac b/configure.ac +index 089c5fa..f19c1b7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -62,6 +62,10 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) + + # Checks for pkg-config packages + PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto xf86dgaproto $REQUIRED_MODULES]) ++PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], ++ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), ++ HAVE_XEXTPROTO_71="no") ++AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ]) + sdkdir=$(pkg-config --variable=sdkdir xorg-server) + + # Checks for libraries. +diff --git a/src/sis_driver.c b/src/sis_driver.c +index ef7b522..a1ced97 100644 +--- a/src/sis_driver.c ++++ b/src/sis_driver.c +@@ -78,8 +78,13 @@ + + #include "globals.h" + ++#ifdef HAVE_XEXTPROTO_71 ++#include <X11/extensions/dpmsconst.h> ++#else + #define DPMS_SERVER + #include <X11/extensions/dpms.h> ++#endif ++ + + #ifdef XF86DRI + #include "dri.h" +-- +cgit v0.8.3-6-g21f6 diff --git a/extra/xf86-video-sisimedia/0009-update-for-rac-removal.patch b/extra/xf86-video-sisimedia/0009-update-for-rac-removal.patch new file mode 100644 index 000000000..df1421798 --- /dev/null +++ b/extra/xf86-video-sisimedia/0009-update-for-rac-removal.patch @@ -0,0 +1,69 @@ +From 9e1ebb9530bbb71be7fcab9e6f8f9a475be72efe Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Tue, 28 Jul 2009 03:32:37 +0000 +Subject: sis: update for resources/RAC API removal + +--- +diff --git a/src/sis.h b/src/sis.h +index 773f709..e859c78 100644 +--- a/src/sis.h ++++ b/src/sis.h +@@ -77,7 +77,9 @@ + #include "xf86Pci.h" + #include "xf86Priv.h" + #include "xf86_OSproc.h" ++#ifndef XSERVER_LIBPCIACCESS + #include "xf86Resources.h" ++#endif + #include "xf86.h" + #include "xf86PciInfo.h" + #include "xf86Cursor.h" +diff --git a/src/sis_driver.c b/src/sis_driver.c +index a1ced97..bb11cbb 100644 +--- a/src/sis_driver.c ++++ b/src/sis_driver.c +@@ -49,7 +49,9 @@ + + #include "sis.h" + ++#ifndef XSERVER_LIBPCIACCESS + #include "xf86RAC.h" ++#endif + #include "dixstruct.h" + #include "shadowfb.h" + #include "fb.h" +@@ -3552,6 +3554,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + SiS_MapVGAMem(pScrn); + #endif + ++#ifndef XSERVER_LIBPCIACCESS + /* Set operating state */ + + /* 1. memory */ +@@ -3581,6 +3584,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + /* Operations for which I/O access is required */ + pScrn->racIoFlags = RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT; + ++#endif ++ + /* Load ramdac module */ + if(!xf86LoadSubModule(pScrn, "ramdac")) { + SISErrorLog(pScrn, "Could not load ramdac module\n"); +@@ -4424,6 +4429,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + xf86DrvMsg(pScrn->scrnIndex, from, "MMIO registers at 0x%lX (size %ldK)\n", + (ULong)pSiS->IOAddress, pSiS->mmioSize); + ++#ifndef XSERVER_LIBPCIACCESS + /* Register the PCI-assigned resources */ + if(xf86RegisterResources(pSiS->pEnt->index, NULL, ResExclusive)) { + SISErrorLog(pScrn, "PCI resource conflicts detected\n"); +@@ -4435,6 +4441,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + SISFreeRec(pScrn); + return FALSE; + } ++#endif + + from = X_PROBED; + if(pSiS->pEnt->device->videoRam != 0) { +-- +cgit v0.8.3-6-g21f6 diff --git a/extra/xf86-video-sisimedia/0010-change-to-use-abi-version-check.patch b/extra/xf86-video-sisimedia/0010-change-to-use-abi-version-check.patch new file mode 100644 index 000000000..cb9fd7ea5 --- /dev/null +++ b/extra/xf86-video-sisimedia/0010-change-to-use-abi-version-check.patch @@ -0,0 +1,34 @@ +From 8c3eca873717e877048c2bde345c02b1e9099e50 Mon Sep 17 00:00:00 2001 +From: Dave Airlie <airlied@redhat.com> +Date: Tue, 28 Jul 2009 05:22:41 +0000 +Subject: sis: change to using ABI version check + +--- +diff --git a/src/sis.h b/src/sis.h +index e859c78..400b83f 100644 +--- a/src/sis.h ++++ b/src/sis.h +@@ -77,7 +77,7 @@ + #include "xf86Pci.h" + #include "xf86Priv.h" + #include "xf86_OSproc.h" +-#ifndef XSERVER_LIBPCIACCESS ++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 + #include "xf86Resources.h" + #endif + #include "xf86.h" +diff --git a/src/sis_driver.c b/src/sis_driver.c +index bb11cbb..994b02d 100644 +--- a/src/sis_driver.c ++++ b/src/sis_driver.c +@@ -49,7 +49,7 @@ + + #include "sis.h" + +-#ifndef XSERVER_LIBPCIACCESS ++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 + #include "xf86RAC.h" + #endif + #include "dixstruct.h" +-- +cgit v0.8.3-6-g21f6 diff --git a/extra/xf86-video-sisimedia/0011-more-rac-removal.patch b/extra/xf86-video-sisimedia/0011-more-rac-removal.patch new file mode 100644 index 000000000..8175dea98 --- /dev/null +++ b/extra/xf86-video-sisimedia/0011-more-rac-removal.patch @@ -0,0 +1,13 @@ +diff -Nrup xf86-video-sis-0.9.1/src/sis_hwmc.c patched/src/sis_hwmc.c +--- xf86-video-sis-0.9.1/src/sis_hwmc.c 2008-03-04 14:31:10.000000000 -0300 ++++ patched/src/sis_hwmc.c 2010-04-20 17:10:21.073690167 -0300 +@@ -43,7 +43,9 @@ THE USE OR OTHER DEALINGS IN THE SOFTWAR + + #include "xf86.h" + #include "xf86_OSproc.h" ++#ifndef GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 + #include "xf86Resources.h" ++#endif + #include "compiler.h" + #include "xf86PciInfo.h" + #include "xf86Pci.h" diff --git a/extra/xf86-video-sisimedia/COPYING b/extra/xf86-video-sisimedia/COPYING new file mode 100644 index 000000000..d643012d7 --- /dev/null +++ b/extra/xf86-video-sisimedia/COPYING @@ -0,0 +1,139 @@ +Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1) Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2) Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3) The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Copyright (C) 1998, 1999 by Alan Hourihane, Wigan, England. +Parts Copyright (C) 2001-2005 Thomas Winischhofer, Vienna, Austria. + +Licensed under the following terms: + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appears in all copies and that both that copyright +notice and this permission notice appear in supporting documentation, and +and that the name of the copyright holder not be used in advertising +or publicity pertaining to distribution of the software without specific, +written prior permission. The copyright holder makes no representations +about the suitability of this software for any purpose. It is provided +"as is" without expressed or implied warranty. + +THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO +EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + +Copyright (C) 2003 Eric Anholt + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appears in all copies and that both that copyright +notice and this permission notice appear in supporting documentation, and +and that the name of the copyright holder not be used in advertising +or publicity pertaining to distribution of the software without specific, +written prior permission. The copyright holder makes no representations +about the suitability of this software for any purpose. It is provided +"as is" without expressed or implied warranty. + +THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO +EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + +Copyright (C) 2000 by Alan Hourihane, Sychdyn, North Wales, UK. +Copyright (C) 2001-2005 by Thomas Winischhofer, Vienna, Austria + +Portions from radeon_dga.c which is + Copyright 2000 ATI Technologies Inc., Markham, Ontario, and + VA Linux Systems Inc., Fremont, California. + +Licensed under the following terms: + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appear in all copies and that both that +copyright notice and this permission notice appear in supporting +documentation, and that the name of the providers not be used in +advertising or publicity pertaining to distribution of the software without +specific, written prior permission. The providers make no representations +about the suitability of this software for any purpose. It is provided +"as is" without express or implied warranty. + +THE PROVIDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +EVENT SHALL THE PROVIDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + +Copyright 2007 George Sapountzis + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +Copyright (C) 1999-2004 by The XFree86 Project, Inc. +based on code written by Mark Vojkovich +Copyright (C) 2003-2005 Thomas Winischhofer + +Licensed under the following terms: + +Permission to use, copy, modify, distribute, and sell this software and its +documentation for any purpose is hereby granted without fee, provided that +the above copyright notice appears in all copies and that both that copyright +notice and this permission notice appear in supporting documentation, and +and that the name of the copyright holder not be used in advertising +or publicity pertaining to distribution of the software without specific, +written prior permission. The copyright holder makes no representations +about the suitability of this software for any purpose. It is provided +"as is" without expressed or implied warranty. + +THE COPYRIGHT HOLDER DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO +EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY SPECIAL, INDIRECT OR +CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +PERFORMANCE OF THIS SOFTWARE. + diff --git a/extra/xf86-video-sisimedia/PKGBUILD b/extra/xf86-video-sisimedia/PKGBUILD new file mode 100644 index 000000000..edf4ef0bb --- /dev/null +++ b/extra/xf86-video-sisimedia/PKGBUILD @@ -0,0 +1,82 @@ +# $Id: PKGBUILD 140378 2011-10-11 21:33:02Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=xf86-video-sisimedia +pkgver=0.9.1 +pkgrel=1 +pkgdesc="X.org SiS 671 video driver" +arch=(i686 x86_64) +url="http://www.linuxconsulting.ro/xorg-drivers/" +license=('custom') +depends=('glibc' 'sis-dri') +makedepends=('xorg-server-devel>=1.11.0' 'xf86dgaproto' 'libdrm' 'xf86driproto' 'mesa' 'glproto') +conflicts=('xorg-server<1.11.0') +options=('!libtool') +source=(ftp://ftp.archlinux.org/other/xf86-video-sisimedia/xf86-video-sisimedia-0.9.1_20091203.tar.bz2 + xf86-video-sis-0.9.1-20102701.patch + 0002-Remove-XFree86-Misc-PassMessage-support.patch + 0003-Fix-build-with-Werror-format-security.patch + 0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch + 0006-Add-IgnoreHotkeyFlag-driver-option.patch + xf86-video-sis-0.9.1-dump-regs-after-video-init.patch + 0007-Remove-useless-loader-symbol-lists.patch + 0008-update-to-xextproto-7-1-support.patch + 0009-update-for-rac-removal.patch + 0010-change-to-use-abi-version-check.patch + 0011-more-rac-removal.patch + 0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch + 0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch + 0005-Correct-bounds-check-of-blitClip-array-access.patch + xserver19.patch + COPYING) +sha1sums=('22e6616df49ec82755daae08043a29aaf92fa430' + '61715bb86180decde55a56fad9a12d841c89fbb2' + '33fdea57187a2758802bcb9572d3a864aaab4d59' + '6f05eae535b099b01c2819e63c68d4489b940267' + 'a6cb5da9312d32d729ad2619d8ae50cb26ba7d4d' + 'df728052a89c4152abbe89826756040dac23b624' + '4bed1c2455ed447f7053cb0729e99cbe598b3274' + 'd7802db5c49540ab136e71450cc846cfccd8b8d1' + 'e2236d2d00338f1658c66d9b972919af39897071' + '0c6b9322e6cb22c67e04d50a0b818a2dd4585cf2' + '802829a8ebd2b7e35fcc86665d842b1594a8ba30' + 'c26afe7508183735b7568b435be9c270ceeb62f1' + 'd2fa2a21454f3a161bcd8ae4d349657561049edd' + '5e288526bfa2c534f1feabdb571da16da8a1c7a6' + 'e86d702cb0b5e9bf43ff732696229965e176db7c' + 'b5f260bed7e705808ec05620316e503ed5d52ee5' + 'a64e244f274bcb155f892d0488a1a4b1b2f7d70d') + +build() { + cd "${srcdir}/xf86-video-sis-${pkgver}" + patch -Np1 -i "${srcdir}/xf86-video-sis-0.9.1-20102701.patch" + patch -Np1 -i "${srcdir}/0002-Remove-XFree86-Misc-PassMessage-support.patch" + patch -Np1 -i "${srcdir}/0003-Fix-build-with-Werror-format-security.patch" + patch -Np1 -i "${srcdir}/0005-Fix-backlight-off-on-SiS30x.-video-bridges.patch" + patch -Np1 -i "${srcdir}/0006-Add-IgnoreHotkeyFlag-driver-option.patch" + patch -Np1 -i "${srcdir}/xf86-video-sis-0.9.1-dump-regs-after-video-init.patch" + patch -Np1 -i "${srcdir}/0007-Remove-useless-loader-symbol-lists.patch" + patch -Np1 -i "${srcdir}/0008-update-to-xextproto-7-1-support.patch" + patch -Np1 -i "${srcdir}/0009-update-for-rac-removal.patch" + patch -Np1 -i "${srcdir}/0010-change-to-use-abi-version-check.patch" + patch -Np1 -i "${srcdir}/0011-more-rac-removal.patch" + patch -Np1 -i "${srcdir}/0001-Remove-xorgconfig-xorgcfg-from-See-Also-list-in-man-.patch" + patch -Np1 -i "${srcdir}/0004-Make-sisRegs3D4-big-enough-to-hold-all-values-writte.patch" + patch -Np1 -i "${srcdir}/0005-Correct-bounds-check-of-blitClip-array-access.patch" + patch -Np1 -i "${srcdir}/xserver19.patch" + + sed -i -e 's,sis_drv,sisimedia_drv,g' src/Makefile.am + sed -i -e 's,\"sis\",\"sisimedia\",g' src/sis.h + sed -i -e 's,sisModuleData,sisimediaModuleData,g' src/sis_driver.c + + autoreconf -fi + + ./configure --prefix=/usr --enable-dri + make + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}/usr/share/man" + + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" + install -m644 "${srcdir}/COPYING" "${pkgdir}/usr/share/licenses/${pkgname}/" +} diff --git a/extra/xf86-video-sisimedia/xf86-video-sis-0.9.1-20102701.patch b/extra/xf86-video-sisimedia/xf86-video-sis-0.9.1-20102701.patch new file mode 100644 index 000000000..944eceb12 --- /dev/null +++ b/extra/xf86-video-sisimedia/xf86-video-sis-0.9.1-20102701.patch @@ -0,0 +1,1376 @@ +diff -p -up xf86-video-sis-0.9.1/src/sis.h.orig xf86-video-sis-0.9.1/src/sis.h +--- xf86-video-sis-0.9.1/src/sis.h.orig 2010-01-27 15:27:11.000000000 -0500 ++++ xf86-video-sis-0.9.1/src/sis.h 2010-01-27 15:22:42.000000000 -0500 +@@ -98,6 +98,7 @@ + #define XF86_VERSION_CURRENT XF86_VERSION_NUMERIC(4,3,99,902,0) + #endif + ++#if 0 + /*** Xorg Version Path <= X-Server 2.0 ***/ + /* K.T for xorg 1.3 */ + #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(2,0,0,0,0) +@@ -109,33 +110,36 @@ + #define NEW_XORG_VERSION 1 + #endif + #endif ++#endif ++#define NEW_XORG_VERSION 1 + +-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,0,0,0) ++//#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,0,0,0) + #define SIS_HAVE_RR_FUNC + #ifdef HaveDriverFuncs + #undef SIS_HaveDriverFuncs + #define SIS_HaveDriverFuncs HaveDriverFuncs + #define SIS_HAVE_DRIVER_FUNC + #endif /* HaveDriverFuncs */ +-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,900,0) ++//#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,900,0) + #define SISISXORG6899900 +-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,901,0) ++//#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,901,0) + #define SISISXORG6899901 + #ifdef RANDR + #define SIS_HAVE_RR_GET_MODE_MM + #define SIS_HAVE_RANDR_SIZE_PATCH + #endif /* RANDR */ +-#endif /* >= 6.8.99.901 */ +-#endif /* >= 6.8.99.900 */ +-#endif /* >= 6.8.0.0 */ +-#else /* XORG_VERSION_CURRENT */ +-#include "xf86Version.h" +-#define SISMYSERVERNAME "XFree86" ++//#endif /* >= 6.8.99.901 */ ++//#endif /* >= 6.8.99.900 */ ++//#endif /* >= 6.8.0.0 */ ++//#else /* XORG_VERSION_CURRENT */ ++//#include "xf86Version.h" ++//#define SISMYSERVERNAME "XFree86" + #endif + + /*I.L. modified*/ + //#define NEC_CASE /*It used the old Xorg_Version with new PCI structure.*/ + ++#if 0 + #ifdef XSERVER_LIBPCIACCESS + #ifdef NEC_CASE + #define XORG_VERSION_CURRENT (((7) * 10000000) + ((1) * 100000) + ((0) * 1000) + 0) +@@ -143,6 +147,7 @@ + #define XORG_VERSION_CURRENT (((7) * 10000000) + ((4) * 100000) + ((0) * 1000) + 0) + #endif + #endif ++#endif + + + #define SIS_NAME "SIS" +@@ -268,16 +273,16 @@ + + #undef SISCHECKOSSSE + #ifdef XORG_VERSION_CURRENT +-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0) ++//#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0) + #define SISCHECKOSSSE /* Automatic check OS for SSE; requires SigIll facility */ +-#endif ++//#endif + #endif + + #undef SISGAMMARAMP + #ifdef XORG_VERSION_CURRENT +-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0) ++//#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(6,8,99,13,0) + #define SISGAMMARAMP /* Driver can set gamma ramp; requires additional symbols in xf86sym.h */ +-#endif ++//#endif + #endif + + #if 0 /* Perhaps for future use */ +@@ -1031,6 +1036,7 @@ typedef struct { + #endif + + PCITAG PciTag; ++ + int PciBus, PciDevice, PciFunc; + EntityInfoPtr pEnt; + int Chipset; +diff -p -up xf86-video-sis-0.9.1/src/sis300_accel.c.orig xf86-video-sis-0.9.1/src/sis300_accel.c +--- xf86-video-sis-0.9.1/src/sis300_accel.c.orig 2007-05-29 22:12:02.000000000 -0400 ++++ xf86-video-sis-0.9.1/src/sis300_accel.c 2010-01-27 15:21:54.000000000 -0500 +@@ -1231,8 +1231,8 @@ SiS300AccelInit(ScreenPtr pScreen) + + #ifdef SIS_USE_EXA /* ----------------------- EXA ----------------------- */ + if(pSiS->useEXA) { +-#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) +- ++//#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) ++#if 0 + if(pSiS->scrnOffset < 8192) { + int obase = 0; + /* data */ +@@ -1430,7 +1430,8 @@ SiS300AccelInit(ScreenPtr pScreen) + pSiS->exa_scratch = exaOffscreenAlloc(pScreen, 128 * 1024, 16, TRUE, + SiSScratchSave, pSiS); + +- #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) ++// #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) ++ #if 0 + if(pSiS->exa_scratch) { + pSiS->exa_scratch_next = pSiS->exa_scratch->offset; + pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch; +diff -p -up xf86-video-sis-0.9.1/src/sis310_accel.c.orig xf86-video-sis-0.9.1/src/sis310_accel.c +--- xf86-video-sis-0.9.1/src/sis310_accel.c.orig 2007-09-29 05:13:12.000000000 -0400 ++++ xf86-video-sis-0.9.1/src/sis310_accel.c 2010-01-27 15:21:54.000000000 -0500 +@@ -65,9 +65,9 @@ + # define SIS_NEED_ARRAY + # undef SISNEWRENDER + # ifdef XORG_VERSION_CURRENT +-# if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0) ++//# if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0) + # define SISNEWRENDER +-# endif ++//# endif + # endif + # endif + #endif +@@ -1463,7 +1463,7 @@ SiSUploadToScratch(PixmapPtr pSrc, Pixma + int dst_pitch, size, w, h, bytes; + + w = pSrc->drawable.width; +- ++/* + #if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) + dst_pitch = ((w * (pSrc->drawable.bitsPerPixel >> 3)) + + pSiS->EXADriverPtr->card.offscreenPitch - 1) & +@@ -1472,17 +1472,17 @@ SiSUploadToScratch(PixmapPtr pSrc, Pixma + dst_pitch = ((w * (pSrc->drawable.bitsPerPixel >> 3)) + + pSiS->EXADriverPtr->card.pixmapPitchAlign - 1) & + ~(pSiS->EXADriverPtr->card.pixmapPitchAlign - 1); +-#else ++#else*/ + dst_pitch = ((w * (pSrc->drawable.bitsPerPixel >> 3)) + + pSiS->EXADriverPtr->pixmapPitchAlign - 1) & + ~(pSiS->EXADriverPtr->pixmapPitchAlign - 1); + +-#endif ++//#endif + size = dst_pitch * pSrc->drawable.height; + + if(size > pSiS->exa_scratch->size) + return FALSE; +- ++/* + #if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) + pSiS->exa_scratch_next = (pSiS->exa_scratch_next + + pSiS->EXADriverPtr->card.offscreenByteAlign - 1) & +@@ -1491,34 +1491,34 @@ SiSUploadToScratch(PixmapPtr pSrc, Pixma + pSiS->exa_scratch_next = (pSiS->exa_scratch_next + + pSiS->EXADriverPtr->card.pixmapOffsetAlign - 1) & + ~(pSiS->EXADriverPtr->card.pixmapOffsetAlign - 1); +-#else ++#else*/ + pSiS->exa_scratch_next = (pSiS->exa_scratch_next + + pSiS->EXADriverPtr->pixmapOffsetAlign - 1) & + ~(pSiS->EXADriverPtr->pixmapOffsetAlign - 1); +-#endif +- ++//#endif ++/* + #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) + if(pSiS->exa_scratch_next + size > + pSiS->exa_scratch->offset + pSiS->exa_scratch->size) { + (pSiS->EXADriverPtr->accel.WaitMarker)(pSrc->drawable.pScreen, 0); + pSiS->exa_scratch_next = pSiS->exa_scratch->offset; + } +-#else ++#else*/ + if(pSiS->exa_scratch_next + size > + pSiS->exa_scratch->offset + pSiS->exa_scratch->size) { + (pSiS->EXADriverPtr->WaitMarker)(pSrc->drawable.pScreen, 0); + pSiS->exa_scratch_next = pSiS->exa_scratch->offset; + } +-#endif ++//#endif + + memcpy(pDst, pSrc, sizeof(*pDst)); + pDst->devKind = dst_pitch; + +-#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) +- pDst->devPrivate.ptr = pSiS->EXADriverPtr->card.memoryBase + pSiS->exa_scratch_next; +-#else ++//#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) ++// pDst->devPrivate.ptr = pSiS->EXADriverPtr->card.memoryBase + pSiS->exa_scratch_next; ++//#else + pDst->devPrivate.ptr = pSiS->EXADriverPtr->memoryBase + pSiS->exa_scratch_next; +-#endif ++//#endif + + pSiS->exa_scratch_next += size; + +@@ -1762,7 +1762,8 @@ SiS315AccelInit(ScreenPtr pScreen) + + #ifdef SIS_USE_EXA /* ----------------------- EXA ----------------------- */ + if(pSiS->useEXA) { +-#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) ++#if 0 ++//#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) + + int obase = 0; + +@@ -1952,11 +1953,11 @@ SiS315AccelInit(ScreenPtr pScreen) + SiSScratchSave, pSiS); + if(pSiS->exa_scratch) { + pSiS->exa_scratch_next = pSiS->exa_scratch->offset; +- #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) +- pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch; +- #else ++ //#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) ++ // pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch; ++ //#else + pSiS->EXADriverPtr->UploadToScratch = SiSUploadToScratch; +- #endif ++ //#endif + } + + } else { +diff -p -up xf86-video-sis-0.9.1/src/sis_3daccel.c.orig xf86-video-sis-0.9.1/src/sis_3daccel.c +--- xf86-video-sis-0.9.1/src/sis_3daccel.c.orig 2007-08-10 04:22:16.000000000 -0400 ++++ xf86-video-sis-0.9.1/src/sis_3daccel.c 2010-01-27 15:21:54.000000000 -0500 +@@ -64,9 +64,9 @@ + # define SIS_NEED_ARRAY + # undef SISNEWRENDER + # ifdef XORG_VERSION_CURRENT +-# if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0) ++//# if XORG_VERSION_CURRENT > XORG_VERSION_NUMERIC(6,7,0,0,0) + # define SISNEWRENDER +-# endif ++//# endif + # endif + # endif + #endif +diff -p -up xf86-video-sis-0.9.1/src/sis_accel.c.orig xf86-video-sis-0.9.1/src/sis_accel.c +--- xf86-video-sis-0.9.1/src/sis_accel.c.orig 2007-05-29 22:12:02.000000000 -0400 ++++ xf86-video-sis-0.9.1/src/sis_accel.c 2010-01-27 15:21:54.000000000 -0500 +@@ -781,50 +781,50 @@ SiSAccelInit(ScreenPtr pScreen) + + #ifdef SIS_USE_EXA /* ----------------------- EXA ----------------------- */ + if(pSiS->useEXA) { +-#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) ++//#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) + + /* data */ +- pSiS->EXADriverPtr->card.memoryBase = pSiS->FbBase; +- pSiS->EXADriverPtr->card.memorySize = pSiS->maxxfbmem; +- pSiS->EXADriverPtr->card.offScreenBase = pScrn->displayWidth * pScrn->virtualY +- * (pScrn->bitsPerPixel >> 3); +- if(pSiS->EXADriverPtr->card.memorySize > pSiS->EXADriverPtr->card.offScreenBase) { +- pSiS->EXADriverPtr->card.flags = EXA_OFFSCREEN_PIXMAPS; +- } else { +- pSiS->NoXvideo = TRUE; +- xf86DrvMsg(pScrn->scrnIndex, X_ERROR, +- "Not enough video RAM for offscreen memory manager. Xv disabled\n"); +- } +-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) +- pSiS->EXADriverPtr->card.offscreenByteAlign = 8; /* src/dst: double quad word boundary */ +- pSiS->EXADriverPtr->card.offscreenPitch = 1; +-#else +- pSiS->EXADriverPtr->card.pixmapOffsetAlign = 8; /* src/dst: double quad word boundary */ +- pSiS->EXADriverPtr->card.pixmapPitchAlign = 8; /* could possibly be 1, but who knows for sure */ +-#endif +- pSiS->EXADriverPtr->card.maxX = 2047; +- pSiS->EXADriverPtr->card.maxY = 2047; ++// pSiS->EXADriverPtr->card.memoryBase = pSiS->FbBase; ++// pSiS->EXADriverPtr->card.memorySize = pSiS->maxxfbmem; ++// pSiS->EXADriverPtr->card.offScreenBase = pScrn->displayWidth * pScrn->virtualY ++// * (pScrn->bitsPerPixel >> 3); ++// if(pSiS->EXADriverPtr->card.memorySize > pSiS->EXADriverPtr->card.offScreenBase) { ++// pSiS->EXADriverPtr->card.flags = EXA_OFFSCREEN_PIXMAPS; ++// } else { ++// pSiS->NoXvideo = TRUE; ++// xf86DrvMsg(pScrn->scrnIndex, X_ERROR, ++// "Not enough video RAM for offscreen memory manager. Xv disabled\n"); ++// } ++//#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,8,2,0,0) ++// pSiS->EXADriverPtr->card.offscreenByteAlign = 8; /* src/dst: double quad word boundary */ ++// pSiS->EXADriverPtr->card.offscreenPitch = 1; ++//#else ++// pSiS->EXADriverPtr->card.pixmapOffsetAlign = 8; /* src/dst: double quad word boundary */ ++// pSiS->EXADriverPtr->card.pixmapPitchAlign = 8; /* could possibly be 1, but who knows for sure */ ++//#endif ++// pSiS->EXADriverPtr->card.maxX = 2047; ++// pSiS->EXADriverPtr->card.maxY = 2047; + + /* Sync */ +- pSiS->EXADriverPtr->accel.WaitMarker = SiSEXASync; ++// pSiS->EXADriverPtr->accel.WaitMarker = SiSEXASync; + + /* Solid fill */ +- pSiS->EXADriverPtr->accel.PrepareSolid = SiSPrepareSolid; +- pSiS->EXADriverPtr->accel.Solid = SiSSolid; +- pSiS->EXADriverPtr->accel.DoneSolid = SiSDoneSolid; ++// pSiS->EXADriverPtr->accel.PrepareSolid = SiSPrepareSolid; ++// pSiS->EXADriverPtr->accel.Solid = SiSSolid; ++// pSiS->EXADriverPtr->accel.DoneSolid = SiSDoneSolid; + + /* Copy */ +- pSiS->EXADriverPtr->accel.PrepareCopy = SiSPrepareCopy; +- pSiS->EXADriverPtr->accel.Copy = SiSCopy; +- pSiS->EXADriverPtr->accel.DoneCopy = SiSDoneCopy; ++// pSiS->EXADriverPtr->accel.PrepareCopy = SiSPrepareCopy; ++// pSiS->EXADriverPtr->accel.Copy = SiSCopy; ++// pSiS->EXADriverPtr->accel.DoneCopy = SiSDoneCopy; + + /* Composite not supported */ + + /* Upload, download to/from Screen */ +- pSiS->EXADriverPtr->accel.UploadToScreen = SiSUploadToScreen; +- pSiS->EXADriverPtr->accel.DownloadFromScreen = SiSDownloadFromScreen; ++// pSiS->EXADriverPtr->accel.UploadToScreen = SiSUploadToScreen; ++// pSiS->EXADriverPtr->accel.DownloadFromScreen = SiSDownloadFromScreen; + +-#else /*xorg>=7.0*/ ++//#else /*xorg>=7.0*/ + + pSiS->EXADriverPtr->exa_major = 2; + pSiS->EXADriverPtr->exa_minor = 0; +@@ -867,7 +867,7 @@ SiSAccelInit(ScreenPtr pScreen) + + #endif /*end of Xorg>=7.0 EXA Setting*/ + } +-#endif /* EXA */ ++//#endif /* EXA */ + + } /* NoAccel */ + +@@ -946,11 +946,11 @@ SiSAccelInit(ScreenPtr pScreen) + SiSScratchSave, pSiS); + if(pSiS->exa_scratch) { + pSiS->exa_scratch_next = pSiS->exa_scratch->offset; +- #if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) +- pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch; +- #else ++ //#if XORG_VERSION_CURRENT <= XORG_VERSION_NUMERIC(7,0,0,0,0) ++ // pSiS->EXADriverPtr->accel.UploadToScratch = SiSUploadToScratch; ++ //#else + pSiS->EXADriverPtr->UploadToScratch = SiSUploadToScratch; +- #endif ++ //#endif + } + + } else { +diff -p -up xf86-video-sis-0.9.1/src/sis_dri.c.orig xf86-video-sis-0.9.1/src/sis_dri.c +--- xf86-video-sis-0.9.1/src/sis_dri.c.orig 2008-11-04 08:27:14.000000000 -0500 ++++ xf86-video-sis-0.9.1/src/sis_dri.c 2010-01-27 15:21:54.000000000 -0500 +@@ -56,7 +56,8 @@ extern Bool drmSiSAgpInit(int driSubFD, + + #ifdef XORG_VERSION_CURRENT + #define SISHAVECREATEBUSID +-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,7,99,1,0) ++#if 0 ++//#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(6,7,99,1,0) + /*I.L. modified*/ + #ifndef XSERVER_LIBPCIACCESS + extern char *DRICreatePCIBusID(pciVideoPtr PciInfo); +diff -p -up xf86-video-sis-0.9.1/src/sis_driver.c.orig xf86-video-sis-0.9.1/src/sis_driver.c +--- xf86-video-sis-0.9.1/src/sis_driver.c.orig 2009-06-22 08:15:54.000000000 -0400 ++++ xf86-video-sis-0.9.1/src/sis_driver.c 2010-01-27 15:21:54.000000000 -0500 +@@ -140,6 +140,17 @@ static int pix24bpp = 0; + * an upper-case version of the driver name. + */ + ++#if XSERVER_LIBPCIACCESS ++#define SIS_DEVICE_MATCH(d, i)\ ++ {PCI_VENDOR_SIS, (d), PCI_MATCH_ANY, PCI_MATCH_ANY, 0, 0, (i) } ++ ++static const struct pci_id_match SIS_device_match[] = { ++ SIS_DEVICE_MATCH (PCI_CHIP_SIS670, 0), ++ SIS_DEVICE_MATCH (PCI_CHIP_SIS671, 0), ++ {0, 0, 0 }, ++ }; ++#endif ++ + #ifdef _X_EXPORT + _X_EXPORT + #endif +@@ -147,7 +158,11 @@ DriverRec SIS = { + SIS_CURRENT_VERSION, + SIS_DRIVER_NAME, + SISIdentify, ++#if XSERVER_LIBPCIACCESS ++ NULL, ++#else + SISProbe, ++#endif + SISAvailableOptions, + NULL, + 0 +@@ -155,6 +170,11 @@ DriverRec SIS = { + , + SISDriverFunc + #endif ++#if XSERVER_LIBPCIACCESS ++ , ++ SIS_device_match, ++ SIS_pci_probe ++#endif + }; + + static SymTabRec SISChipsets[] = { +@@ -453,7 +473,94 @@ SISDriverFunc(ScrnInfoPtr pScrn, SISDRIV + /****************************************************/ + /* Probe() */ + /****************************************************/ ++static Bool SIS_pci_probe (DriverPtr driver, int entity_num, struct pci_device *device, intptr_t match_data) ++{ ++ ScrnInfoPtr pScrn; ++#ifdef SISDUALHEAD ++ EntityInfoPtr pEnt; ++ Bool foundScreen = FALSE; ++#endif ++xf86DrvMsg(0, X_INFO, "SIS_pci_probe - begin, entity_num=%d\n", entity_num); ++xf86DrvMsg(0, X_INFO, " vendor_id=0x%x\n", device->vendor_id); ++xf86DrvMsg(0, X_INFO, " device_id=0x%x\n", device->device_id); ++xf86DrvMsg(0, X_INFO, " bus=%d\n", device->bus); ++xf86DrvMsg(0, X_INFO, " dev=%d\n", device->dev); ++xf86DrvMsg(0, X_INFO, " func=%d\n", device->func); ++ pScrn = NULL; ++ if((pScrn = xf86ConfigPciEntity(pScrn, 0, ++ entity_num, ++ SISPciChipsets, ++ NULL, NULL, NULL, NULL, NULL))) { ++ xf86DrvMsg(0, X_INFO, "SIS_pci_probe - ConfigPciEntity found\n"); ++ /* Fill in what we can of the ScrnInfoRec */ ++ pScrn->driverVersion = SIS_CURRENT_VERSION; ++ pScrn->driverName = SIS_DRIVER_NAME; ++ pScrn->name = SIS_NAME; ++ pScrn->Probe = NULL;//SISProbe; ++ pScrn->PreInit = SISPreInit; ++ pScrn->ScreenInit = SISScreenInit; ++ pScrn->SwitchMode = SISSwitchMode; ++ pScrn->AdjustFrame = SISAdjustFrame; ++ pScrn->EnterVT = SISEnterVT; ++ pScrn->LeaveVT = SISLeaveVT; ++ pScrn->FreeScreen = SISFreeScreen; ++ pScrn->ValidMode = SISValidMode; ++ pScrn->PMEvent = SISPMEvent; /*add PM function for ACPI hotkey,Ivans*/ ++#ifdef X_XF86MiscPassMessage ++// if(xf86GetVersion() >= XF86_VERSION_NUMERIC(4,3,99,2,0)) { ++// pScrn->HandleMessage = SISHandleMessage; ++// } ++#endif ++ foundScreen = TRUE; ++ } ++ #ifdef SISDUALHEAD ++ pEnt = xf86GetEntityInfo(entity_num); ++xf86DrvMsg(0, X_INFO, "SIS_pci_probe - GetEntityInfo chipset is 0x%x\n",pEnt->chipset); ++ switch(pEnt->chipset) { ++ case PCI_CHIP_SIS300: ++ case PCI_CHIP_SIS540: ++ case PCI_CHIP_SIS630: ++ case PCI_CHIP_SIS550: ++ case PCI_CHIP_SIS315: ++ case PCI_CHIP_SIS315H: ++ case PCI_CHIP_SIS315PRO: ++ case PCI_CHIP_SIS650: ++ case PCI_CHIP_SIS330: ++ case PCI_CHIP_SIS660: ++ case PCI_CHIP_SIS340: ++ case PCI_CHIP_SIS670: ++ case PCI_CHIP_SIS671: ++ case PCI_CHIP_XGIXG40: ++ { ++ SISEntPtr pSiSEnt = NULL; ++ DevUnion *pPriv; ++ ++ xf86SetEntitySharable(entity_num); ++ if(SISEntityIndex < 0) { ++ SISEntityIndex = xf86AllocateEntityPrivateIndex(); ++ } ++ pPriv = xf86GetEntityPrivate(pScrn->entityList[0], SISEntityIndex); ++ if(!pPriv->ptr) { ++ pPriv->ptr = xnfcalloc(sizeof(SISEntRec), 1); ++ pSiSEnt = pPriv->ptr; ++ memset(pSiSEnt, 0, sizeof(SISEntRec)); ++ pSiSEnt->lastInstance = -1; ++ } else { ++ pSiSEnt = pPriv->ptr; ++ } ++ pSiSEnt->lastInstance++; ++ xf86SetEntityInstanceForScreen(pScrn, pScrn->entityList[0], ++ pSiSEnt->lastInstance); ++ } ++ break; + ++ default: ++ break; ++ } ++#endif /* DUALHEAD */ ++xf86DrvMsg(0, X_INFO, "SIS_pci_probe - end\n"); ++ return foundScreen; ++} + + static Bool + SISProbe(DriverPtr drv, int flags) +@@ -464,7 +571,7 @@ SISProbe(DriverPtr drv, int flags) + int numDevSections; + int numUsed, numUsedSiS, numUsedXGI; + Bool foundScreen = FALSE; +- ++xf86DrvMsg(0, X_INFO, "SISPRobe() begin, flags=%d\n", flags); + /* + * The aim here is to find all cards that this driver can handle, + * and for the ones not already claimed by another driver, claim +@@ -490,6 +597,7 @@ SISProbe(DriverPtr drv, int flags) + * There's no matching device section in the config file, so quit + * now. + */ ++ xf86DrvMsg(0, X_INFO, "SISProbe - MatchDevice fail\n"); + return FALSE; + } + +@@ -526,14 +634,16 @@ SISProbe(DriverPtr drv, int flags) + xfree(devSections); + + numUsed = numUsedSiS + numUsedXGI; +- +- if(numUsed <= 0) ++xf86DrvMsg(0, X_INFO, "SISPRobe - test1\n"); ++ if(numUsed <= 0) { ++ xf86DrvMsg(0, X_INFO, "SISProbe - MatchPciInstances fail\n"); + return FALSE; ++ } + + if(flags & PROBE_DETECT) { + + foundScreen = TRUE; +- ++ xf86DrvMsg(0, X_INFO, "SISProbe - flags already probe"); + } else for(i = 0; i < numUsed; i++) { + + ScrnInfoPtr pScrn; +@@ -548,6 +658,7 @@ SISProbe(DriverPtr drv, int flags) + (i < numUsedSiS) ? usedChipsSiS[i] : usedChipsXGI[i-numUsedSiS], + (i < numUsedSiS) ? SISPciChipsets : XGIPciChipsets, + NULL, NULL, NULL, NULL, NULL))) { ++ xf86DrvMsg(0, X_INFO, "SISProbe - ConfigPciEntity found\n"); + /* Fill in what we can of the ScrnInfoRec */ + pScrn->driverVersion = SIS_CURRENT_VERSION; + pScrn->driverName = SIS_DRIVER_NAME; +@@ -563,16 +674,16 @@ SISProbe(DriverPtr drv, int flags) + pScrn->ValidMode = SISValidMode; + pScrn->PMEvent = SISPMEvent; /*add PM function for ACPI hotkey,Ivans*/ + #ifdef X_XF86MiscPassMessage +- if(xf86GetVersion() >= XF86_VERSION_NUMERIC(4,3,99,2,0)) { +- pScrn->HandleMessage = SISHandleMessage; ++ if(xf86GetVersion() >= XF86_VERSION_NUMERIC(4,3,99,2,0)) { ++// pScrn->HandleMessage = SISHandleMessage; + } + #endif + foundScreen = TRUE; + } +- ++xf86DrvMsg(0, X_INFO, "SISProbe - test2\n"); + #ifdef SISDUALHEAD + pEnt = xf86GetEntityInfo((i < numUsedSiS) ? usedChipsSiS[i] : usedChipsXGI[i-numUsedSiS]); +- ++ xf86DrvMsg(0, X_INFO, "SISProbe - GetEntityInfo done\n"); + switch(pEnt->chipset) { + case PCI_CHIP_SIS300: + case PCI_CHIP_SIS540: +@@ -620,7 +731,7 @@ SISProbe(DriverPtr drv, int flags) + + if(usedChipsSiS) xfree(usedChipsSiS); + if(usedChipsXGI) xfree(usedChipsXGI); +- ++xf86DrvMsg(0, X_INFO, "SISProbe end\n"); + return foundScreen; + } + +@@ -1306,7 +1417,11 @@ SiSReadROM(ScrnInfoPtr pScrn) + } + + if(readpci) { ++#ifndef XSERVER_LIBPCIACCESS + xf86ReadPciBIOS(0, pSiS->PciTag, 0, pSiS->BIOS, biossize); ++#else ++ pci_device_read_rom(pSiS->PciInfo, pSiS->BIOS); ++#endif + if(SISCheckBIOS(pSiS, mypciid, mypcivendor, biossize)) { + found = TRUE; + } +@@ -2224,8 +2339,7 @@ SiSSetSyncRangeFromEdid(ScrnInfoPtr pScr + { 2, 0x04, 56.6 }, + { 2, 0x02, 60.1 }, + { 2, 0x01, 80.1 } +- }; +- ++ }; + const myvddctiming myvtiming[11] = { + { 1, 0x02, 56 }, + { 1, 0x01, 60 }, +@@ -2240,11 +2354,6 @@ SiSSetSyncRangeFromEdid(ScrnInfoPtr pScr + { 2, 0x01, 75 } + }; + +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO, "SiSSetSyncRangeFromEdid\n"); +-#endif +- + if(flag) { /* HSync */ + + for(i = 0; i < 4; i++) { +@@ -2350,12 +2459,6 @@ SiSSetSyncRangeFromEdid(ScrnInfoPtr pScr + static Bool + SiSAllowSyncOverride(SISPtr pSiS, Bool fromDDC, int mfbcrt) + { +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO, "SiSAllowSyncOverride\n"); +-#endif +-// return TRUE; +- + if(!(pSiS->VBFlags2 & VB2_VIDEOBRIDGE)) return FALSE; + + #ifdef SISDUALHEAD +@@ -2382,11 +2485,10 @@ SiSAllowSyncOverride(SISPtr pSiS, Bool f + } + #endif + +-// PCF +-// if(!(pSiS->VBFlags & DISPTYPE_CRT1)) { ++ if(!(pSiS->VBFlags & DISPTYPE_CRT1)) { + if( (pSiS->VBFlags & CRT2_TV) || + ((pSiS->VBFlags & CRT2_LCD) && (!fromDDC)) ) return TRUE; +-// } else if((pSiS->VBFlags & CRT1_LCDA) && (!fromDDC)) return TRUE; ++ } else if((pSiS->VBFlags & CRT1_LCDA) && (!fromDDC)) return TRUE; + + return FALSE; + } +@@ -2394,8 +2496,6 @@ SiSAllowSyncOverride(SISPtr pSiS, Bool f + static Bool + SiSCheckForH(float hsync, MonPtr monitor) + { +- +- + int i; + for(i = 0; i < monitor->nHsync; i++) { + if((hsync > monitor->hsync[i].lo * (1.0 - SYNC_TOLERANCE)) && +@@ -2409,7 +2509,6 @@ SiSCheckForH(float hsync, MonPtr monitor + static Bool + SiSCheckForV(float vrefresh, MonPtr monitor) + { +- + int i; + for(i = 0; i < monitor->nVrefresh; i++) { + if((vrefresh > monitor->vrefresh[i].lo * (1.0 - SYNC_TOLERANCE)) && +@@ -2424,21 +2523,11 @@ static Bool + SiSCheckAndOverruleH(ScrnInfoPtr pScrn, MonPtr monitor) + { + DisplayModePtr mode = monitor->Modes; +-// PCF + float mymin = 30.0, mymax = 80.0, hsync; +- + Bool doit = FALSE; + +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO, "SiSCheckAndOverruleH\n"); +-#endif +- + for(hsync = mymin; hsync <= mymax; hsync += .5) { +- if(!SiSCheckForH(hsync, monitor)) +- { +- doit = TRUE; +- } ++ if(!SiSCheckForH(hsync, monitor)) doit = TRUE; + } + + if(mode) { +@@ -2461,7 +2550,6 @@ SiSCheckAndOverruleH(ScrnInfoPtr pScrn, + return TRUE; + } + +- + return FALSE; + } + +@@ -2469,20 +2557,11 @@ static Bool + SiSCheckAndOverruleV(ScrnInfoPtr pScrn, MonPtr monitor) + { + DisplayModePtr mode = monitor->Modes; +-// PCF +- float mymin = 57.0, mymax = 63.0, vrefresh; ++ float mymin = 59.0, mymax = 61.0, vrefresh; + Bool doit = FALSE, ret = FALSE; +- +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO, "SiSCheckAndOverruleV\n"); +-#endif + + for(vrefresh = mymin; vrefresh <= mymax; vrefresh += 1.0) { +- if(!SiSCheckForV(vrefresh, monitor)) +- { +- doit = TRUE; +- } ++ if(!SiSCheckForV(vrefresh, monitor)) doit = TRUE; + } + + if(mode) { +@@ -2515,7 +2594,6 @@ SiSCheckAndOverruleV(ScrnInfoPtr pScrn, + monitor->nVrefresh++; + ret = TRUE; + } +- + return ret; + } + +@@ -2529,11 +2607,6 @@ SiSFixupHVRanges(ScrnInfoPtr pScrn, int + static const char *saneh = "Correcting %s CRT%d monitor HSync range\n"; + static const char *sanev = "Correcting %s CRT%d monitor VRefresh range\n"; + int crtnum; +- +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO, "SiSFixupHVRanges\n"); +-#endif + + #ifdef SISDUALHEAD + if(pSiS->DualHeadMode) { +@@ -2610,8 +2683,7 @@ SiSFixupHVRanges(ScrnInfoPtr pScrn, int + } + } + } +-// PCF +-// return TRUE; ++ + return freqoverruled; + } + +@@ -2623,11 +2695,6 @@ SiSMakeOwnModeList(ScrnInfoPtr pScrn, Bo + Bool isfordvi, Bool *havecustommodes, Bool fakecrt2modes, Bool IsForCRT2) + { + DisplayModePtr tempmode, delmode, mymodes; +- +- // PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO, "SiSMakeOwnModeList\n"); +-#endif + + if((mymodes = SiSBuildBuiltInModeList(pScrn, includelcdmodes, isfordvi, fakecrt2modes, IsForCRT2))) { + if(!acceptcustommodes) { +@@ -2676,11 +2743,6 @@ SiSSetupModeListParmsCRT1(SISPtr pSiS, u + Bool *acceptcustommodes, Bool *includelcdmodes, Bool *isfordvi, + Bool *fakecrt2modes, Bool *IsForCRT2, Bool *AllowInterlace) + { +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO, "SiSSetupModeListParmsCRT1\n"); +-#endif +- + (*acceptcustommodes) = TRUE; /* Accept user modelines */ + (*includelcdmodes) = TRUE; /* Include modes reported by DDC */ + (*isfordvi) = FALSE; /* Is for digital DVI output */ +@@ -2815,11 +2877,6 @@ SiSReplaceModeList(ScrnInfoPtr pScrn, Cl + * -) crt2 device is not TV, and + * -) crt1 is not LCDA, unless bridge is TMDS/LCDA capable (301C) + */ +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO, "SiSReplaceModeList\n"); +-#endif +- + + if((pSiS->VGAEngine == SIS_300_VGA) || (pSiS->VGAEngine == SIS_315_VGA)) { + +@@ -2881,11 +2938,6 @@ SiSClearModesPrivate(DisplayModePtr mode + { + DisplayModePtr tempmode; + +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO, "SiSClearModesPrivate\n"); +-#endif +- + /* Make sure that the Private field is NULL */ + /* (This way we don't have to care for MergedFB + * when freeing the mode; just check the Private +@@ -2904,11 +2956,6 @@ SiSDuplicateMode(DisplayModePtr source) + { + DisplayModePtr dest = NULL; + +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO, "SiSDuplicateMode\n"); +-#endif +- + if(source) { + if((dest = xalloc(sizeof(DisplayModeRec)))) { + memcpy(dest, source, sizeof(DisplayModeRec)); +@@ -2972,11 +3019,6 @@ SiSBuildVesaModeList(ScrnInfoPtr pScrn, + SISPtr pSiS = SISPTR(pScrn); + int i = 0; + +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO, "SiSBuildVesaModeList\n"); +-#endif +- + while(vbe->VideoModePtr[i] != 0xffff) { + sisModeInfoPtr m; + VbeModeInfoBlock *mode; +@@ -3014,7 +3056,7 @@ SiSSetMinMaxPixelClock(ScrnInfoPtr pScrn + { + SISPtr pSiS = SISPTR(pScrn); + MessageType from; +- ++ + /* Set the min pixel clock */ + pSiS->MinClock = 5000; + if((pSiS->VGAEngine == SIS_300_VGA) || (pSiS->VGAEngine == SIS_315_VGA)) { +@@ -3061,11 +3103,6 @@ SiSRemoveUnsuitableModes(ScrnInfoPtr pSc + int maxUsedClock = 0; + static const char *notsuitablestr = "Not using mode \"%s\" (not suitable for %s mode)\n"; + +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO, "SiSRemoveUnsuitableModes\n"); +-#endif +- + if((p = first = initial)) { + + do { +@@ -3222,11 +3259,6 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + static const char *crtsetupstr = "*************************** CRT%d setup ***************************\n"; + #endif + +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO, "SISPreInit Start\n"); +-#endif +- + if(flags & PROBE_DETECT) { + + vbeInfoPtr pVbe; +@@ -4716,10 +4748,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + mymax = 8192 * 1024; + else if(total <= 32768) /* <= 32MB: Use 16MB for X */ + mymax = 16384 * 1024; +- else +-// PCF /* Otherwise: Use 20MB for X */ +-// mymax = 20 * 1024 * 1024; +- mymax = 20 * 1024 *1024; ++ else /* Otherwise: Use 20MB for X */ ++ mymax = 20 * 1024 * 1024; + /* availMem is right now adjusted to not use the UMA + * area. Make sure that our default doesn't reach + * into the UMA area either. +@@ -4758,9 +4788,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + if(pScrn->videoRam <= 65536) + pSiS->maxxfbmem = 16384 * 1024; /* On >=315 series and <=64MB, use 16MB */ + else +-// PCF +-// pSiS->maxxfbmem = 20 * 1024 * 1024; /* On >=315 series and > 64MB, use 20MB */ +- pSiS->maxxfbmem = 20 * 1024 * 1024; ++ pSiS->maxxfbmem = 20 * 1024 * 1024; /* On >=315 series and > 64MB, use 20MB */ + } else + pSiS->maxxfbmem = 12288 * 1024; /* On <315 series, use 12MB */ + +@@ -4980,7 +5008,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + * via CRT2.) + * (TODO: This might need some modification for the + * 307 bridges, if these are capable of driving +- * LCDs > via channel B) ++ * LCDs > 1600 via channel B) + */ + if((pSiS->SiS_SD_Flags & SiS_SD_SUPPORTLCDA) && + (pSiS->VBFlags & CRT2_LCD) && +@@ -4995,10 +5023,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + */ + if(pSiS->ChipType < SIS_662 || pSiS->ChipType >= XGI_20) pSiS->ForceCRT1Type = CRT1_LCDA; + pSiS->ForceCRT2Type = CRT2_TV; +-// PCF +-// } else if(pSiS->LCDwidth > 1600) { +- } else if(pSiS->LCDwidth > 1920) { +- ++ } else if(pSiS->LCDwidth > 1600) { + /* If LCD is > 1600, default to LCDA if we don't need CRT1/VGA for other head */ + Bool NeedCRT1VGA = FALSE; + #ifdef SISDUALHEAD +@@ -5591,11 +5616,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + clockRanges->minClock = pSiS->MinClock; + clockRanges->maxClock = pSiS->MaxClock; + clockRanges->clockIndex = -1; /* programmable */ +-// PCF +-// clockRanges->interlaceAllowed = TRUE; +-// clockRanges->doubleScanAllowed = TRUE; +- clockRanges->interlaceAllowed = FALSE; +- clockRanges->doubleScanAllowed = FALSE; ++ clockRanges->interlaceAllowed = TRUE; ++ clockRanges->doubleScanAllowed = TRUE; + + /* Replace default mode list */ + SiSReplaceModeList(pScrn, clockRanges, FALSE); +@@ -5623,11 +5645,8 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + break; + case SIS_300_VGA: + case SIS_315_VGA: +-// PCF + maxpitch = 4088; +- maxheight = 4096; +-// maxpitch = 1600; +-// maxheight = 1200; ++ maxheight = 4096; + break; + default: + maxpitch = 2048; +@@ -5688,12 +5707,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + pScrn->monitor->DDC = NULL; + } + #endif +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO,"xf86ValidateModes Start\n"); +- xf86DrvMsg(0, X_INFO,"virtualX = %d, virtualY = %d, maxpitch = %d, maxheight = %d, maxxfbmem = %ld \n", +- pScrn->display->virtualX,pScrn->display->virtualY,maxpitch,maxheight,pSiS->maxxfbmem/1024); +-#endif ++ + i = xf86ValidateModes(pScrn, + pScrn->monitor->Modes, + pScrn->display->modes, +@@ -5703,13 +5717,9 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + pScrn->bitsPerPixel * 8, + minheight, maxheight, + pScrn->display->virtualX, +- pScrn->display->virtualY, ++ pScrn->display->virtualY, + pSiS->maxxfbmem, + LOOKUP_BEST_REFRESH); +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO,"xf86ValidateModes End\n"); +-#endif + + pScrn->monitor->DDC = backupddc; + } +@@ -5745,28 +5755,17 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + #endif + + /* Prune the modes marked as invalid */ +-// PCF +-// xf86DrvMsg(0, X_INFO,"xf86PruneDriverModes Start\n"); + xf86PruneDriverModes(pScrn); +-// xf86DrvMsg(0, X_INFO,"xf86PruneDriverModes End\n"); +- + + if(i == 0 || pScrn->modes == NULL) { + SISErrorLog(pScrn, "No valid modes found - check VertRefresh/HorizSync\n"); + goto my_error_1; + } + +-// PCF +-// xf86DrvMsg(0, X_INFO,"xf86SetCrtcForModes Start\n"); + xf86SetCrtcForModes(pScrn, INTERLACE_HALVE_V); +-// xf86DrvMsg(0, X_INFO,"xf86SetCrtcForModes End\n"); +- + + /* Clear the modes' Private field */ +-// PCF +-// xf86DrvMsg(0, X_INFO,"SiSClearModesPrivate Start\n"); + SiSClearModesPrivate(pScrn->modes); +-// xf86DrvMsg(0, X_INFO,"SiSClearModesPrivate End\n"); + + /* Save virtualX/Y calculated by ValidateModes + * and overwrite them with our values assumed to +@@ -5823,23 +5822,9 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + } + + if(usemyprint) { +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO,"SiSPrintModes Start\n"); +-#endif + SiSPrintModes(pScrn, printfreq); +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO,"SiSPrintModes End\n"); +-#endif + } else { +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO,"xf86PrintModes Start\n"); +-#endif + xf86PrintModes(pScrn); +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO,"xf86PrintModes End\n"); +-#endif + } + } + +@@ -6072,10 +6057,7 @@ SISPreInit(ScrnInfoPtr pScrn, int flags) + + /*xf86DrvMsg(0,X_INFO,"CurrentMode=%d. \n",pSiS->Hkey_Device_Switch_State); + xf86DrvMsg(0,X_INFO,"Init_VBFlags=0X%x. \n",pSiS->VBFlags);*/ +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0,X_INFO,"SISPreInit End\n"); +-#endif ++ + return TRUE; + + /* ---- */ +@@ -7523,9 +7505,7 @@ SiSPreSetMode(ScrnInfoPtr pScrn, Display + xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, SISVERBLEVEL, "VBFlags=0x%x\n", pSiS->VBFlags); + + CR30 = 0x00; +-// PCF +-// CR31 &= ~0x60; /* Clear VB_Drivermode & VB_OutputDisable */ +- CR31 &= ~0x20; /* Clear VB_Drivermode & VB_OutputDisable */ ++ CR31 &= ~0x60; /* Clear VB_Drivermode & VB_OutputDisable */ + CR31 |= 0x04; /* Set VB_NotSimuMode (not for 30xB/1400x1050?) */ + CR35 = 0x00; + +@@ -8633,11 +8613,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo + SISEntPtr pSiSEnt = NULL; + #endif + +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO,"SISModeInit\n"); +-#endif +- + andSISIDXREG(SISCR,0x11,0x7f); /* Unlock CRTC registers */ + + SISModifyModeInfo(mode); /* Quick check of the mode parameters */ +@@ -8647,14 +8622,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo + } + + if(pSiS->UseVESA) { /* With VESA: */ +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO,"SISModeInit UseVESA\n"); +- xf86DrvMsg(0, X_INFO,"SISModeInit UseVESA\n"); +- xf86DrvMsg(0, X_INFO,"SISModeInit UseVESA\n"); +- xf86DrvMsg(0, X_INFO,"SISModeInit UseVESA\n"); +- xf86DrvMsg(0, X_INFO,"SISModeInit UseVESA\n"); +-#endif + + #ifdef SISDUALHEAD + /* No dual head mode when using VESA */ +@@ -8679,7 +8646,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo + SISErrorLog(pScrn, "SiSSetVESAMode() failed\n"); + return FALSE; + } +- + sisSaveUnlockExtRegisterLock(pSiS, NULL, NULL); + if(pSiS->VGAEngine == SIS_300_VGA || pSiS->VGAEngine == SIS_315_VGA) { + SiSPreSetMode(pScrn, mode, SIS_MODE_SIMU); +@@ -8697,21 +8663,11 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo + SiSVGAProtect(pScrn, TRUE); + (*pSiS->SiSRestore)(pScrn, &pSiS->ModeReg); + SiSVGAProtect(pScrn, FALSE); +-// xf86DrvMsg(0, X_INFO,"VESA DualHeadMode SetMode\n"); ++ + } else { /* Without VESA: */ +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO,"SISModeInit Without VESA\n"); +- xf86DrvMsg(0, X_INFO,"SISModeInit Without VESA\n"); +- xf86DrvMsg(0, X_INFO,"SISModeInit Without VESA\n"); +- xf86DrvMsg(0, X_INFO,"SISModeInit Without VESA\n"); +- xf86DrvMsg(0, X_INFO,"SISModeInit Without VESA\n"); +-#endif + + #ifdef SISDUALHEAD + if(pSiS->DualHeadMode) { +- +- xf86DrvMsg(0, X_INFO,"SISModeInit DualHeadMode\n"); + + if(!(*pSiS->ModeInit)(pScrn, mode)) { + SISErrorLog(pScrn, "ModeInit() failed\n"); +@@ -8730,10 +8686,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo + SISErrorLog(pScrn, "SiSBIOSSetModeCRT2() failed\n"); + return FALSE; + } +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO,"DualHeadMode SetCRT2\n"); +-#endif + SiSPostSetMode(pScrn, &pSiS->ModeReg); + if(pSiSEnt->pScrn_2) { + /* No need to go through pScrn->AdjustFrame; the coords +@@ -8752,11 +8704,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo + SISErrorLog(pScrn, "SiSBIOSSetModeCRT1() failed\n"); + return FALSE; + } +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO,"DualHeadMode SetCRT1\n"); +-#endif +- + SiS_SiSLVDSBackLight(pSiS, TRUE); + SiSPostSetMode(pScrn, &pSiS->ModeReg); + if(pSiSEnt->pScrn_1) { +@@ -8771,20 +8718,8 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo + + } else { + #endif +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO,"SISModeInit Other\n"); +- xf86DrvMsg(0, X_INFO,"SISModeInit Other\n"); +- xf86DrvMsg(0, X_INFO,"SISModeInit Other\n"); +- xf86DrvMsg(0, X_INFO,"SISModeInit Other\n"); +- xf86DrvMsg(0, X_INFO,"SISModeInit Other\n"); +-#endif + + if(pSiS->VGAEngine == SIS_300_VGA || pSiS->VGAEngine == SIS_315_VGA) { +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO,"SISModeInit SIS_315_VGA\n"); +-#endif + + if(!(*pSiS->ModeInit)(pScrn, mode)) { + SISErrorLog(pScrn, "ModeInit() failed\n"); +@@ -8795,10 +8730,7 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo + + #ifdef SISMERGED + if(pSiS->MergedFB) { +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO,"SISModeInit SISMERGED\n"); +-#endif ++ + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Setting MergedFB mode %dx%d\n", + mode->HDisplay, mode->VDisplay); + +@@ -8813,10 +8745,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo + SISErrorLog(pScrn, "SiSBIOSSetModeCRT1() failed\n"); + return FALSE; + } +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO,"SISMERGED SetCRT1\n"); +-#endif + + SiSPreSetMode(pScrn, mode, SIS_MODE_CRT2); + +@@ -8827,10 +8755,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo + SISErrorLog(pScrn, "SiSBIOSSetModeCRT2() failed\n"); + return FALSE; + } +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO,"SISMERGED SetCRT2\n"); +-#endif + + SiS_SiSLVDSBackLight(pSiS, TRUE); + +@@ -8838,25 +8762,9 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo + + } else { + #endif +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO,"SISModeInit Not SISMERGED\n"); +-#endif + + if((pSiS->VBFlags & CRT1_LCDA) || (!(mode->type & M_T_DEFAULT))) { +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO,"SISModeInit #1\n"); +- if(pSiS->VBFlags & CRT1_LCDA) +- { +- xf86DrvMsg(0, X_INFO,"SISModeInit #1 LCDA\n"); +- +- } +- else +- { +- xf86DrvMsg(0, X_INFO,"SISModeInit #1 LCDB\n"); +- } +-#endif ++ + pSiS->SiS_Pr->SiS_EnableBackLight = FALSE; + + SiSPreSetMode(pScrn, mode, SIS_MODE_CRT1); +@@ -8867,10 +8775,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo + SISErrorLog(pScrn, "SiSBIOSSetModeCRT1() failed\n"); + return FALSE; + } +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO,"NoVESA SetCRT1\n"); +-#endif + + SiSPreSetMode(pScrn, mode, SIS_MODE_CRT2); + +@@ -8880,28 +8784,10 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo + SISErrorLog(pScrn, "SiSBIOSSetModeCRT2() failed\n"); + return FALSE; + } +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO,"NoVESA SetCRT2\n"); +-#endif +- + + SiS_SiSLVDSBackLight(pSiS, TRUE); + + } else { +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO,"SISModeInit #2\n"); +- +- if(pSiS->VBFlags & CRT1_LCDA) +- { +- xf86DrvMsg(0, X_INFO,"SISModeInit #2 LCDA\n"); +- } +- else +- { +- xf86DrvMsg(0, X_INFO,"SISModeInit #2 LCDB\n"); +- } +-#endif + + pSiS->SiS_Pr->SiS_EnableBackLight = TRUE; + +@@ -8918,11 +8804,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo + #ifdef SISMERGED + } + #endif +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO,"SISModeInit #3\n"); +-#endif +- + SiSPostSetMode(pScrn, &pSiS->ModeReg); + #ifdef TWDEBUG + xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VBFlags %lx\n", pSiS->VBFlags); +@@ -8932,10 +8813,6 @@ SISModeInit(ScrnInfoPtr pScrn, DisplayMo + #endif + + } else { +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO,"SISModeInit Old method\n"); +-#endif + + /* For other chipsets, use the old method */ + +@@ -9147,7 +9024,7 @@ SISSaveScreenDH(ScreenPtr pScreen, int m + static void + SISDisplayPowerManagementSet(ScrnInfoPtr pScrn, int PowerManagementMode, int flags) + { +- SISPtr pSiS = SISPTR(pScrn); ++ SISPtr pSiS = SISPTR(pScrn); + Bool docrt1 = TRUE, docrt2 = TRUE, backlight = TRUE; + UChar sr1=0, cr17=0, cr63=0, pmreg=0, sr7=0; + UChar p1_13=0, p2_0=0, oldpmreg=0; +@@ -10237,7 +10114,6 @@ SISScreenInit(int scrnIndex, ScreenPtr p + static Bool + SiSValidLCDUserMode(SISPtr pSiS, unsigned int VBFlags, DisplayModePtr mode, Bool isforlcda) + { +- + if(mode->Flags & V_INTERLACE) return FALSE; + + if(mode->HDisplay > 2048) return FALSE; +@@ -10352,7 +10228,7 @@ SiS_CheckModeCRT1(ScrnInfoPtr pScrn, Dis + } + + } +- ++ + return(SiS_GetModeID(pSiS->VGAEngine, VBFlags, mode->HDisplay, mode->VDisplay, + i, pSiS->FSTN, pSiS->LCDwidth, pSiS->LCDheight)); + } +@@ -10370,12 +10246,8 @@ SiS_CheckModeCRT2(ScrnInfoPtr pScrn, Dis + xf86DrvMsg(0, X_INFO, "Inside CheckCalcModeIndex (VBFlags %lx, mode %dx%d)\n", + VBFlags,mode->HDisplay, mode->VDisplay); + #endif ++ + if(VBFlags & CRT2_LCD) { /* CRT2 is LCD */ +- +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0, X_INFO, "SiS_CheckModeCRT2 LCDwidth= %d, LCDheight= %d\n",pSiS->LCDwidth,pSiS->LCDheight); +-#endif + + if((pSiS->VBFlags2 & VB2_SISTMDSBRIDGE) && (!(pSiS->VBFlags2 & VB2_30xBDH))) { + +@@ -10403,7 +10275,6 @@ SiS_CheckModeCRT2(ScrnInfoPtr pScrn, Dis + return 0xfe; + + } +-// PCF + + if( ((mode->HDisplay <= pSiS->LCDwidth) && + (mode->VDisplay <= pSiS->LCDheight)) || +@@ -10415,15 +10286,11 @@ SiS_CheckModeCRT2(ScrnInfoPtr pScrn, Dis + (((mode->HDisplay == 1024) && (mode->HDisplay == 768)) || + ((mode->HDisplay == 800) && (mode->HDisplay == 600)))) || + ((pSiS->EnablePanel_1366x768)&&(pSiS->LCDwidth==1366)&&(mode->HDisplay==1368))) {/*let 1366x768 mode valid. Ivans@090109*/ +-/* +- if( (mode->HDisplay <= pSiS->LCDwidth) && +- (mode->VDisplay <= pSiS->LCDheight)) { +-*/ ++ + ModeIndex = SiS_GetModeID_LCD(pSiS->VGAEngine, VBFlags, mode->HDisplay, mode->VDisplay, i, + pSiS->FSTN, pSiS->SiS_Pr->SiS_CustomT, pSiS->LCDwidth, pSiS->LCDheight, + pSiS->VBFlags2); +-// PCF +-// xf86DrvMsg(0, X_INFO, "SiS_CheckModeCRT2 LCDwidth= %d, LCDheight= %d, ModeID= %x\n",pSiS->LCDwidth,pSiS->LCDheight,ModeIndex); ++ + } + + } else if(VBFlags & CRT2_TV) { /* CRT2 is TV */ +@@ -10514,7 +10381,7 @@ SISValidMode(int scrnIndex, DisplayModeP + if(SiS_CheckModeCRT2(pScrn, mode, pSiS->VBFlags, + pSiS->VBFlags3, pSiS->HaveCustomModes) < 0x14){ + #ifdef TWDEBUG +- xf86DrvMsg(0,X_INFO,"[SISValidMode()]: else condition. passing CheckModeCRT2 and MODE_Fail.\n"); ++ xf86DrvMsg(0,X_INFO,"[SISValidMode()]: else condition. passing CheckModeCRT2 and MODE_OK.\n"); + #endif + return MODE_BAD; + } +@@ -10629,18 +10496,12 @@ SISSwitchMode(int scrnIndex, DisplayMode + * (In non-MergedFB mode this is also here in order + * to get a cheap update of the HWCursor image) + */ +- +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0,X_INFO,"SISSwitchMode\n"); +-#endif + + if(!pSiS->skipswitchcheck) { + if(SISValidMode(scrnIndex, mode, TRUE, flags) != MODE_OK) { + return FALSE; + } + } +- + /* Mark for 3D full-screen bug */ + /* + #ifdef XF86DRI +@@ -11510,12 +11371,6 @@ SISHotkeySwitchMode(ScrnInfoPtr pScrn, B + int dotclock=65146; + int hdisplay=1024; + +-// PCF +-#ifdef TWDEBUG +- xf86DrvMsg(0,X_INFO,"SISHotkeySwitchMode\n"); +-#endif +- +- + if(!VidModeGetCurrentModeline(pScrn->scrnIndex,&hkeymode,&dotClock)) + return FALSE; + +diff -p -up xf86-video-sis-0.9.1/src/sis_driver.h.orig xf86-video-sis-0.9.1/src/sis_driver.h +--- xf86-video-sis-0.9.1/src/sis_driver.h.orig 2008-09-02 10:19:02.000000000 -0400 ++++ xf86-video-sis-0.9.1/src/sis_driver.h 2010-01-27 15:21:54.000000000 -0500 +@@ -779,6 +779,9 @@ static Bool SISSwitchMode(int scrnIndex, + static void SISNewAdjustFrame(int scrnIndex, int x, int y, int flags); + static Bool SISPMEvent(int scrnIndex, pmEvent event, Bool undo);/*APM-ACPI, adding by Ivans.*/ + ++#if XSERVER_LIBPCIACCESS ++static Bool SIS_pci_probe(DriverPtr driver, int entity_num, struct pci_device *device, intptr_t match_data); ++#endif + /* ACPI Device Switch functions */ + static Bool SISHotkeySwitchCRT1Status(ScrnInfoPtr pScrn,int onoff);/*hotkey pressing: switch CRT1 on/off*/ + static Bool SISHotkeySwitchCRT2Status(ScrnInfoPtr pScrn,ULong newvbflags ,ULong newvbflags3);/*LCD on/off*/ diff --git a/extra/xf86-video-sisimedia/xf86-video-sis-0.9.1-dump-regs-after-video-init.patch b/extra/xf86-video-sisimedia/xf86-video-sis-0.9.1-dump-regs-after-video-init.patch new file mode 100644 index 000000000..415985921 --- /dev/null +++ b/extra/xf86-video-sisimedia/xf86-video-sis-0.9.1-dump-regs-after-video-init.patch @@ -0,0 +1,89 @@ +--- xf86-video-sis-0.9.1/src/sis_driver.c.orig 2010-01-18 13:17:56.000000000 -0500 ++++ xf86-video-sis-0.9.1/src/sis_driver.c 2010-01-25 16:35:40.000000000 -0500 +@@ -11677,7 +11677,64 @@ SISPMEvent(int scrnIndex, pmEvent event, + return 1;/*TRUE*/ + } + ++void ++sis_print_registers(SISPtr pSiS) ++{ ++#define print(...) xf86ErrorFVerb(1, __VA_ARGS__) ++ auto void print_range(char *name, int base, int first, int last) { ++ int i, j; ++ unsigned char c; ++ char buffer[9]; ++ print("%s:\n", name); ++ buffer[8] = 0; ++ for (i = first; i <= last; i++) { ++ inSISIDXREG(base, i, c); ++ for (j = 0; j < 8; j++) ++ buffer[7 - j] = c & (1 << j) ? '1' : '0'; ++ print("\t%02x: %02x:%s\n", i, c, buffer); ++ } ++ } + ++ auto void print_range_int(char *name, int base, int first, int last) { ++ int i, j; ++ unsigned int l; ++ char buffer[33]; ++ print("%s:\n", name); ++ buffer[32] = 0; ++ for (i = first; i <= last; i += 4) { ++ l = inSISREGL(base + i); ++ for (j = 0; j < 32; j++) ++ buffer[31 - j] = l & (1 << j) ? '1' : '0'; ++ print("\t%02x: %08x:%s\n", i, l, buffer); ++ } ++ } + +- +- ++ print_range_int ("PCI: CNF00 - CNF1B", pSiS->RelIO, 0x00, 0x1b); ++ print_range_int ("PCI: CNF2C - CNF47", pSiS->RelIO, 0x2C, 0x47); ++ print_range_int ("AGP: CNF50 - CNF5B", pSiS->RelIO, 0x50, 0x5B); ++ print_range ("CRT1: SR05 - SR12", SISSR, 0x05, 0x12); ++ print_range ("CRT1: SR13 - SR16 (reserved)", SISSR, 0x13, 0x16); ++ print ("CRT1: SR19 - SR1A (reserved)\n"); ++ print_range ("CRT1: SR1B - SR3A", SISSR, 0x1b, 0x3a); ++ print ("CRT1: SR3B (reserved)\n"); ++ print_range ("CRT1: SR3C - SR3F", SISSR, 0x3c, 0x3f); ++ print_range ("CRT1: CR19 - CR1A", SISCR, 0x19, 0x1a); ++ print ("CRT1: CR1B - CR27 (undocumented?)\n"); ++ print_range ("CRT1: CR28 - CR2E", SISCR, 0x28, 0x2e); ++ print ("CRT1: CR2F (reserved)\n"); ++ print_range ("VGA BIOS: CR30 - CR3F", SISCR, 0x30, 0x3f); ++ print_range ("CRT1: CR40 - CR43", SISCR, 0x40, 0x43); ++ print ("CRT1: CR44 - CR45 (reserved)\n"); ++ print_range ("CRT1: CR46 - CR67", SISCR, 0x46, 0x67); ++ print ("CRT1: CR68 - CR6F (DRAM registers reserved for backward compatibility with 760)\n"); ++ print ("CRT1: CR70 - CR77 (undocumented?)\n"); ++ print_range ("SMA BIOS: CR78 - CR7F", SISCR, 0x78, 0x7f); ++ print_range_int ("CRT1: CR80 - CR9B", SISCR, 0x80, 0xb3); ++ print_range_int ("CRT1: CRC0 - CRF3", SISCR, 0xc0, 0xf3); ++ print_range ("CRT2: SIGNAL REGISTERS, PART1 00 - 45", SISPART1, 0x00, 0x45); ++ print_range ("CRT2: TV SIGNAL REGISTERS, PART2 00 - 4d", SISPART2, 0x00, 0x4d); ++ print_range ("CRT2: TV COPY PROTECTION, PART3 00 - 40", SISPART3, 0x00, 0x40); ++ print_range ("CRT2: SIGNAL REGISTERS, PART4 00 - 3A", SISPART4, 0x00, 0x3a); ++ print_range ("CRT2: PALETTE SIGNAL REGISTERS, PART5 00 - 00 (?)", SISPART5, 0x00, 0x00); ++#undef print ++} +--- xf86-video-sis-0.9.1/src/sis_video.c.orig 2010-01-18 13:17:56.000000000 -0500 ++++ xf86-video-sis-0.9.1/src/sis_video.c 2010-01-26 13:38:13.000000000 -0500 +@@ -129,6 +129,8 @@ + + #include "sis_video.h" + ++extern void sis_print_registers(SISPtr pSiS); ++ + void SiSInitMC(ScreenPtr pScreen); + + /********************************* +@@ -712,6 +714,8 @@ SISResetVideo(ScrnInfoPtr pScrn) + #ifdef SISMERGED + pPriv->mustresettap2 = TRUE; + #endif ++ ++ sis_print_registers(pSiS); + } + + diff --git a/extra/xf86-video-sisimedia/xserver19.patch b/extra/xf86-video-sisimedia/xserver19.patch new file mode 100644 index 000000000..67ef6f585 --- /dev/null +++ b/extra/xf86-video-sisimedia/xserver19.patch @@ -0,0 +1,30 @@ +Index: xf86-video-sis-0.9.1/src/sis_driver.c +=================================================================== +--- xf86-video-sis-0.9.1.orig/src/sis_driver.c ++++ xf86-video-sis-0.9.1/src/sis_driver.c +@@ -85,7 +85,6 @@ + #include "shadowfb.h" + #include "fb.h" + #include "micmap.h" +-#include "mibank.h" + #include "mipointer.h" + #include "mibstore.h" + #include "edid.h" +Index: xf86-video-sis-0.9.1/src/sis_mergedfb.c +=================================================================== +--- xf86-video-sis-0.9.1.orig/src/sis_mergedfb.c ++++ xf86-video-sis-0.9.1/src/sis_mergedfb.c +@@ -2948,11 +2948,11 @@ SiSXineramaExtensionInit(ScrnInfoPtr pSc + + while(SiSXineramaGeneration != serverGeneration) { + +- ClientType = CreateNewResourceType(SiSXineramaFreeClient); ++ ClientType = CreateNewResourceType(SiSXineramaFreeClient, "XineramaClient"); + if(!ClientType) + break; + +- EventType = CreateNewResourceType(SiSXineramaFreeEvents); ++ EventType = CreateNewResourceType(SiSXineramaFreeEvents, "XineramaEvents"); + if(!EventType) + break; + diff --git a/extra/xf86-video-sisusb/PKGBUILD b/extra/xf86-video-sisusb/PKGBUILD index 742f88476..2f60b97b4 100644 --- a/extra/xf86-video-sisusb/PKGBUILD +++ b/extra/xf86-video-sisusb/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 115377 2011-03-17 18:17:47Z andyrtr $ +# $Id: PKGBUILD 140300 2011-10-11 21:28:37Z jgc $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-sisusb pkgver=0.9.4 -pkgrel=4 +pkgrel=5 pkgdesc="X.org SiS USB video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.10.99.902') +conflicts=('xorg-server<1.10.99.902') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-tdfx/LICENSE b/extra/xf86-video-tdfx/LICENSE deleted file mode 100644 index 08b1adde5..000000000 --- a/extra/xf86-video-tdfx/LICENSE +++ /dev/null @@ -1,160 +0,0 @@ -Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. -All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sub license, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice (including the -next paragraph) shall be included in all copies or substantial portions -of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. -IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR -ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - -/* - * Copyright 2000 VA Linux Systems Inc., Fremont, California. - * - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * VA LINUX SYSTEMS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF - * OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - - -/* - * GLX Hardware Device Driver for Intel i810 - * Copyright (C) 1999 Keith Whitwell - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * KEITH WHITWELL, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE - * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * - */ - - -/* - * GLX Hardware Device Driver for Intel tdfx - * Copyright (C) 1999 Keith Whitwell - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * KEITH WHITWELL, OR ANY OTHER CONTRIBUTORS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE - * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * - */ - - -/* - * Mesa 3-D graphics library - * Version: 4.1 - * - * Copyright (C) 1999-2002 Brian Paul All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -/* Authors: - * Keith Whitwell <keith@tungstengraphics.com> - * Daniel Borca <dborca@users.sourceforge.net> - */ - - -/* - * Mesa 3-D graphics library - * Version: 5.1 - * - * Copyright (C) 1999-2003 Brian Paul All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -/* Authors: - * Keith Whitwell - * Daniel Borca - */ diff --git a/extra/xf86-video-tdfx/PKGBUILD b/extra/xf86-video-tdfx/PKGBUILD index eb32b5384..b14b9c702 100644 --- a/extra/xf86-video-tdfx/PKGBUILD +++ b/extra/xf86-video-tdfx/PKGBUILD @@ -1,29 +1,30 @@ -# $Id: PKGBUILD 115382 2011-03-17 18:19:40Z andyrtr $ +# $Id: PKGBUILD 140298 2011-10-11 21:28:35Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-tdfx pkgver=1.4.3 -pkgrel=6 +pkgrel=7 pkgdesc="X.org tdfx video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc' 'tdfx-dri') -makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 'glproto') +conflicts=('xorg-server<1.10.99.902') options=(!libtool) groups=('xorg-drivers' 'xorg') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - LICENSE) + copyright.patch) md5sums=('8161bbf2b100c21b609163f0010766b3' - '978e9486ffd4e4164c12dc68c84186e1') + 'a3be7ac534ceb846d3f155ddbe14378f') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/copyright.patch" ./configure --prefix=/usr --enable-dri make make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 "${srcdir}/LICENSE" "${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 7e36853f7..94b915cbe 100644 --- a/extra/xf86-video-trident/PKGBUILD +++ b/extra/xf86-video-trident/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 115385 2011-03-17 18:21:11Z andyrtr $ +# $Id: PKGBUILD 140296 2011-10-11 21:28:33Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-trident pkgver=1.3.4 -pkgrel=4 +pkgrel=5 pkgdesc="X.org Trident video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel' 'xf86dgaproto') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.10.99.902' 'xf86dgaproto') +conflicts=('xorg-server<1.10.99.902') groups=('xorg-drivers' 'xorg') options=(!libtool) source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) @@ -23,5 +23,5 @@ build() { make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1 + install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" } diff --git a/extra/xf86-video-tseng/PKGBUILD b/extra/xf86-video-tseng/PKGBUILD index ea81f157b..7701c55a3 100644 --- a/extra/xf86-video-tseng/PKGBUILD +++ b/extra/xf86-video-tseng/PKGBUILD @@ -1,23 +1,26 @@ -# $Id: PKGBUILD 115388 2011-03-17 18:22:47Z andyrtr $ +# $Id: PKGBUILD 140294 2011-10-11 21:28:31Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-tseng pkgver=1.2.4 -pkgrel=4 +pkgrel=5 pkgdesc="X.org tseng video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.10.99.902') +conflicts=('xorg-server<1.10.99.902') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('1b45f55657b2c92f30abb0769cae57fca98d93b7') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + fix-regression-from-pciaccess-conversion.patch) +sha1sums=('1b45f55657b2c92f30abb0769cae57fca98d93b7' + 'df7660ec18cce3e9f04a7c70f72c75daa947e4a9') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/fix-regression-from-pciaccess-conversion.patch" ./configure --prefix=/usr make make DESTDIR="${pkgdir}" install diff --git a/extra/xf86-video-unichrome/PKGBUILD b/extra/xf86-video-unichrome/PKGBUILD index 004ca502b..f5812b9fa 100644 --- a/extra/xf86-video-unichrome/PKGBUILD +++ b/extra/xf86-video-unichrome/PKGBUILD @@ -1,31 +1,26 @@ -# $Id: PKGBUILD 115391 2011-03-17 18:24:27Z andyrtr $ +# $Id: PKGBUILD 140292 2011-10-11 21:28:27Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-unichrome pkgver=0.2.7 -pkgrel=5 -_gitversion=cd12cce88ff886031c23c743569fba97eccace4e +pkgrel=6 +_gitversion=b917bee87db8a65b8e8da0ca12c24a176c9e9fb2 pkgdesc="Unichrome video drivers for X.Org" arch=(i686 x86_64 'mips64el') url="http://unichrome.sf.net/" license=('custom') depends=('glibc' 'unichrome-dri') -makedepends=('xorg-server-devel' 'libx11' 'libdrm' 'xf86driproto' 'mesa' 'libxvmc') +makedepends=('xorg-server-devel>=1.10.99.902' 'libx11' 'libdrm' 'xf86driproto' 'mesa' 'libxvmc' 'glproto') options=('!libtool') -conflicts=('xf86-video-via' 'openchrome' 'xf86-video-openchrome' 'xorg-server<1.10.0') -source=(http://cgit.freedesktop.org/~libv/${pkgname}/snapshot/${pkgname}-${_gitversion}.tar.bz2 - drm-include.patch - LICENSE) -md5sums=('c64332e6c386ed9a580116e131f288f4' - '4a9bf2e3ef338c170a2f58988ebb97dc' - '6ea7d64c87c5c32201a1e38e3336e44a') +conflicts=('xf86-video-via' 'openchrome' 'xf86-video-openchrome' 'xorg-server<1.10.99.902') +source=(http://cgit.freedesktop.org/~libv/${pkgname}/snapshot/${pkgname}-${_gitversion}.tar.bz2) +md5sums=('f7adef052de08a01af86e245d1932239') build() { cd "${srcdir}/${pkgname}-${_gitversion}" - patch -Np0 -i "${srcdir}/drm-include.patch" ./autogen.sh --prefix=/usr --enable-dri make make DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/" + install -m644 debian/copyright "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" } diff --git a/extra/xf86-video-unichrome/drm-include.patch b/extra/xf86-video-unichrome/drm-include.patch deleted file mode 100644 index edfe9a8af..000000000 --- a/extra/xf86-video-unichrome/drm-include.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/via_memory.h.orig 2010-05-09 16:17:00.143352805 +0200 -+++ src/via_memory.h 2010-05-09 16:17:14.433351301 +0200 -@@ -30,7 +30,7 @@ - - /* don't include local via_drm.h when using modular */ - #ifdef HAVE_CONFIG_H --#include "drm/via_drm.h" -+#include <via_drm.h> - #else - #include "via_drm.h" - #endif diff --git a/extra/xf86-video-v4l/PKGBUILD b/extra/xf86-video-v4l/PKGBUILD index 777732b84..24c61207a 100644 --- a/extra/xf86-video-v4l/PKGBUILD +++ b/extra/xf86-video-v4l/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 115394 2011-03-17 18:25:56Z andyrtr $ +# $Id: PKGBUILD 140290 2011-10-11 21:28:21Z jgc $ #Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-v4l pkgver=0.2.0 -pkgrel=8 +pkgrel=9 pkgdesc="X.org v4l video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" @@ -13,12 +13,17 @@ makedepends=('xorg-server-devel') conflicts=('xorg-server<1.10.0') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 LICENSE) +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + git-fixes.patch + LICENSE) md5sums=('2251ae2a0a905764941cd7b098e85ad1' + 'cdb7113a9564ea9202e847de88440540' '7d4d018f6bbff7e42672d1aabc75c5cf') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/git-fixes.patch" + autoreconf -fi ./configure --prefix=/usr make make DESTDIR="${pkgdir}" install diff --git a/extra/xf86-video-vesa/PKGBUILD b/extra/xf86-video-vesa/PKGBUILD index 474b78f57..c4f795970 100644 --- a/extra/xf86-video-vesa/PKGBUILD +++ b/extra/xf86-video-vesa/PKGBUILD @@ -1,23 +1,30 @@ -# $Id: PKGBUILD 115397 2011-03-17 18:27:20Z andyrtr $ +# $Id: PKGBUILD 140592 2011-10-17 09:55:09Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-vesa pkgver=2.3.0 -pkgrel=5 +pkgrel=7 pkgdesc="X.org vesa video driver" arch=(i686 x86_64 'mips64el') license=('custom') url="http://xorg.freedesktop.org/" depends=('glibc') -makedepends=('pkgconfig' 'xorg-server-devel') -conflicts=('xorg-server<1.10.0') +makedepends=('pkgconfig' 'xorg-server-devel>=1.10.99.902') +conflicts=('xorg-server<1.10.99.902') groups=('xorg-drivers' 'xorg') options=('!libtool') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('4689b7c295d7a8d7326302dafecb812739617134') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + git-fixes.patch + revert-kernelcheck.patch) +sha1sums=('4689b7c295d7a8d7326302dafecb812739617134' + '1e54ae50daa796ab0c29c8088f25e522dc6faa4a' + 'c14454521ac91aaa08aad8a6025d7720a613d54b') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/git-fixes.patch" + patch -Np1 -R -i "${srcdir}/revert-kernelcheck.patch" + autoreconf -fi ./configure --prefix=/usr make make DESTDIR="${pkgdir}" install diff --git a/extra/xf86-video-vesa/git-fixes.patch b/extra/xf86-video-vesa/git-fixes.patch new file mode 100644 index 000000000..c4f442265 --- /dev/null +++ b/extra/xf86-video-vesa/git-fixes.patch @@ -0,0 +1,444 @@ +diff --git a/COPYING b/COPYING +index 22b4b13..f101fb8 100644 +--- a/COPYING ++++ b/COPYING +@@ -1,4 +1,5 @@ + Copyright (c) 2000 by Conectiva S.A. (http://www.conectiva.com) ++Copyright 2008 Red Hat, Inc. + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), +diff --git a/configure.ac b/configure.ac +index ff4713d..2e4f542 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -20,45 +20,44 @@ + # + # Process this file with autoconf to produce a configure script + +-AC_PREREQ(2.57) ++# Initialize Autoconf ++AC_PREREQ([2.60]) + AC_INIT([xf86-video-vesa], +- 2.3.0, ++ [2.3.0], + [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], +- xf86-video-vesa) +- ++ [xf86-video-vesa]) + AC_CONFIG_SRCDIR([Makefile.am]) +-AM_CONFIG_HEADER([config.h]) ++AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_AUX_DIR(.) + ++# Initialize Automake + AM_INIT_AUTOMAKE([foreign dist-bzip2]) +- + AM_MAINTAINER_MODE + +-# Require xorg-macros: XORG_DEFAULT_OPTIONS ++# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS + m4_ifndef([XORG_MACROS_VERSION], +- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])]) +-XORG_MACROS_VERSION(1.3) ++ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])]) ++XORG_MACROS_VERSION(1.8) + XORG_DEFAULT_OPTIONS + +-# Checks for programs. ++# Initialize libtool + AC_DISABLE_STATIC + AC_PROG_LIBTOOL +-AC_PROG_CC + + AH_TOP([#include "xorg-server.h"]) + ++# Define a configure option for an alternate module directory + AC_ARG_WITH(xorg-module-dir, [ --with-xorg-module-dir=DIR ], + [ moduledir="$withval" ], + [ moduledir="$libdir/xorg/modules" ]) + AC_SUBST(moduledir) + +- +-# Checks for extensions ++# Store the list of server defined optional extensions in REQUIRED_MODULES + XORG_DRIVER_CHECK_EXT(RANDR, randrproto) + XORG_DRIVER_CHECK_EXT(RENDER, renderproto) + XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto) + +-# Checks for pkg-config packages ++# Obtain compiler/linker options for the driver dependencies + PKG_CHECK_MODULES(XORG, xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES) + PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1], + HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]), +@@ -93,21 +92,14 @@ if test "x$XSERVER_LIBPCIACCESS" = xyes; then + fi + AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) + +-CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' +-INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src' +-AC_SUBST([CFLAGS]) +-AC_SUBST([INCLUDES]) +- + # Checks for libraries. + +-# Checks for header files. +-AC_HEADER_STDC +- + DRIVER_NAME=vesa + AC_SUBST([DRIVER_NAME]) + +-AC_OUTPUT([ +- Makefile +- src/Makefile +- man/Makefile ++AC_CONFIG_FILES([ ++ Makefile ++ src/Makefile ++ man/Makefile + ]) ++AC_OUTPUT +diff --git a/man/Makefile.am b/man/Makefile.am +index f0eb29b..b3688ce 100644 +--- a/man/Makefile.am ++++ b/man/Makefile.am +@@ -1,27 +1,24 @@ + # + # Copyright 2005 Sun Microsystems, Inc. All rights reserved. +-# +-# Permission to use, copy, modify, distribute, and sell this software and its +-# documentation for any purpose is hereby granted without fee, provided that +-# the above copyright notice appear in all copies and that both that +-# copyright notice and this permission notice appear in supporting +-# documentation. +-# +-# The above copyright notice and this permission notice shall be included +-# in all copies or substantial portions of the Software. +-# +-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +-# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR +-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +-# OTHER DEALINGS IN THE SOFTWARE. +-# +-# Except as contained in this notice, the name of the copyright holders shall +-# not be used in advertising or otherwise to promote the sale, use or +-# other dealings in this Software without prior written authorization +-# from the copyright holders. ++# ++# Permission is hereby granted, free of charge, to any person obtaining a ++# copy of this software and associated documentation files (the "Software"), ++# to deal in the Software without restriction, including without limitation ++# the rights to use, copy, modify, merge, publish, distribute, sublicense, ++# and/or sell copies of the Software, and to permit persons to whom the ++# Software is furnished to do so, subject to the following conditions: ++# ++# The above copyright notice and this permission notice (including the next ++# paragraph) shall be included in all copies or substantial portions of the ++# Software. ++# ++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++# DEALINGS IN THE SOFTWARE. + # + + drivermandir = $(DRIVER_MAN_DIR) +@@ -34,25 +31,11 @@ EXTRA_DIST = @DRIVER_NAME@.man + + CLEANFILES = $(driverman_DATA) + +-SED = sed + +-# Strings to replace in man pages +-XORGRELSTRING = @PACKAGE_STRING@ +- XORGMANNAME = X Version 11 ++# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure + +-MAN_SUBSTS = \ +- -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ +- -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \ +- -e 's|__xservername__|Xorg|g' \ +- -e 's|__xconfigfile__|xorg.conf|g' \ +- -e 's|__projectroot__|$(prefix)|g' \ +- -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \ +- -e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \ +- -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \ +- -e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \ +- -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' + + SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man + + .man.$(DRIVER_MAN_SUFFIX): +- sed $(MAN_SUBSTS) < $< > $@ ++ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@ +diff --git a/man/vesa.man b/man/vesa.man +index 19cb766..ce4b369 100644 +--- a/man/vesa.man ++++ b/man/vesa.man +@@ -1,4 +1,3 @@ +-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.man,v 1.2 2001/01/27 18:20:56 dawes Exp $ + .\" shorthand for double quote that works everywhere. + .ds q \N'34' + .TH VESA __drivermansuffix__ __vendorversion__ +diff --git a/src/Makefile.am b/src/Makefile.am +index 88da8a2..dc702f0 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -24,6 +24,9 @@ + # -avoid-version prevents gratuitous .0.0.0 version numbers on the end + # _ladir passes a dummy rpath to libtool so the thing will actually link + # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc. ++ ++AM_CFLAGS = $(XORG_CFLAGS) $(PCIACCESS_CFLAGS) ++ + vesa_drv_la_LTLIBRARIES = vesa_drv.la + vesa_drv_la_LDFLAGS = -module -avoid-version + vesa_drv_ladir = @moduledir@/drivers +diff --git a/src/vesa.c b/src/vesa.c +index 034a019..61d3550 100644 +--- a/src/vesa.c ++++ b/src/vesa.c +@@ -281,7 +281,7 @@ static VESAPtr + VESAGetRec(ScrnInfoPtr pScrn) + { + if (!pScrn->driverPrivate) +- pScrn->driverPrivate = xcalloc(sizeof(VESARec), 1); ++ pScrn->driverPrivate = calloc(sizeof(VESARec), 1); + + return ((VESAPtr)pScrn->driverPrivate); + } +@@ -296,7 +296,7 @@ VESASetModeParameters(vbeInfoPtr pVbe, DisplayModePtr vbemode, + + data = (VbeModeInfoData *)vbemode->Private; + +- data->block = xcalloc(sizeof(VbeCRTCInfoBlock), 1); ++ data->block = calloc(sizeof(VbeCRTCInfoBlock), 1); + data->block->HorizontalTotal = ddcmode->HTotal; + data->block->HorizontalSyncStart = ddcmode->HSyncStart; + data->block->HorizontalSyncEnd = ddcmode->HSyncEnd; +@@ -317,6 +317,30 @@ VESASetModeParameters(vbeInfoPtr pVbe, DisplayModePtr vbemode, + (double)(ddcmode->HTotal * ddcmode->VTotal)); + } + ++/* ++ * Despite that VBE gives you pixel granularity for mode sizes, some BIOSes ++ * think they can only give sizes in multiples of character cells; and ++ * indeed, the reference CVT and GTF formulae only give results where ++ * (h % 8) == 0. Whatever, let's just try to cope. What we're looking for ++ * here is cases where the display says 1366x768 and the BIOS says 1360x768. ++ */ ++static Bool ++vesaModesCloseEnough(DisplayModePtr edid, DisplayModePtr vbe) ++{ ++ if (!(edid->type & M_T_DRIVER)) ++ return FALSE; ++ ++ /* never seen a height granularity... */ ++ if (edid->VDisplay != vbe->VDisplay) ++ return FALSE; ++ ++ if (edid->HDisplay >= vbe->HDisplay && ++ (edid->HDisplay & ~7) == (vbe->HDisplay & ~7)) ++ return TRUE; ++ ++ return FALSE; ++} ++ + static ModeStatus + VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass) + { +@@ -358,9 +382,7 @@ VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass) + */ + if (pScrn->monitor->DDC) { + for (mode = pScrn->monitor->Modes; mode; mode = mode->next) { +- if (mode->type & M_T_DRIVER && +- mode->HDisplay == p->HDisplay && +- mode->VDisplay == p->VDisplay) { ++ if (vesaModesCloseEnough(mode, p)) { + if (xf86CheckModeForMonitor(mode, mon) == MODE_OK) { + found = 1; + break; +@@ -391,7 +413,8 @@ VESAValidMode(int scrn, DisplayModePtr p, Bool flag, int pass) + for (v = mon->vrefresh[0].lo; v <= mon->vrefresh[0].hi; v++) { + mode = xf86GTFMode(p->HDisplay, p->VDisplay, v, 0, 0); + ret = xf86CheckModeForMonitor(mode, mon); +- xfree(mode); ++ free(mode->name); ++ free(mode); + if (ret == MODE_OK) + break; + } +@@ -431,8 +454,14 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev, + pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, + NULL, NULL, NULL, NULL, NULL); + if (pScrn != NULL) { +- VESAPtr pVesa = VESAGetRec(pScrn); ++ VESAPtr pVesa; ++ ++ if (pci_device_has_kernel_driver(dev)) { ++ ErrorF("vesa: Ignoring device with a bound kernel driver\n"); ++ return FALSE; ++ } + ++ pVesa = VESAGetRec(pScrn); + VESAInitScrn(pScrn); + pVesa->pciInfo = dev; + } +@@ -480,7 +509,7 @@ VESAProbe(DriverPtr drv, int flags) + } + } + } +- xfree(usedChips); ++ free(usedChips); + } + } + #endif +@@ -503,11 +532,11 @@ VESAProbe(DriverPtr drv, int flags) + foundScreen = TRUE; + } + } +- xfree(usedChips); ++ free(usedChips); + } + #endif + +- xfree(devSections); ++ free(devSections); + + return (foundScreen); + } +@@ -554,9 +583,9 @@ VESAFreeRec(ScrnInfoPtr pScrn) + VbeModeInfoData *data = (VbeModeInfoData*)mode->Private; + + if (data->block) +- xfree(data->block); ++ free(data->block); + +- xfree(data); ++ free(data); + + mode->Private = NULL; + } +@@ -564,12 +593,12 @@ VESAFreeRec(ScrnInfoPtr pScrn) + } while (mode && mode != pScrn->modes); + } + #endif +- xfree(pVesa->monitor); +- xfree(pVesa->vbeInfo); +- xfree(pVesa->pal); +- xfree(pVesa->savedPal); +- xfree(pVesa->fonts); +- xfree(pScrn->driverPrivate); ++ free(pVesa->monitor); ++ free(pVesa->vbeInfo); ++ free(pVesa->pal); ++ free(pVesa->savedPal); ++ free(pVesa->fonts); ++ free(pScrn->driverPrivate); + pScrn->driverPrivate = NULL; + } + +@@ -712,7 +741,7 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags) + else { + void *panelid = VBEReadPanelID(pVesa->pVbe); + VBEInterpretPanelID(pScrn->scrnIndex, panelid); +- xfree(panelid); ++ free(panelid); + } + #endif + +@@ -805,7 +834,7 @@ VESAPreInit(ScrnInfoPtr pScrn, int flags) + + /* options */ + xf86CollectOptions(pScrn, NULL); +- if (!(pVesa->Options = xalloc(sizeof(VESAOptions)))) { ++ if (!(pVesa->Options = malloc(sizeof(VESAOptions)))) { + vbeFree(pVesa->pVbe); + return FALSE; + } +@@ -940,7 +969,7 @@ VESAScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + pScrn->bitsPerPixel = 8; + + if (pVesa->shadowFB) { +- pVesa->shadow = xcalloc(1, pScrn->displayWidth * pScrn->virtualY * ++ pVesa->shadow = calloc(1, pScrn->displayWidth * pScrn->virtualY * + ((pScrn->bitsPerPixel + 7) / 8)); + if (!pVesa->shadow) { + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, +@@ -1119,10 +1148,10 @@ VESACloseScreen(int scrnIndex, ScreenPtr pScreen) + } + if (pVesa->shadowFB && pVesa->shadow) { + shadowRemove(pScreen, pScreen->GetScreenPixmap(pScreen)); +- xfree(pVesa->shadow); ++ free(pVesa->shadow); + } + if (pVesa->pDGAMode) { +- xfree(pVesa->pDGAMode); ++ free(pVesa->pDGAMode); + pVesa->pDGAMode = NULL; + pVesa->nDGAMode = 0; + } +@@ -1180,7 +1209,7 @@ VESASetMode(ScrnInfoPtr pScrn, DisplayModePtr pMode) + * Free it as it will not be any longer useful + */ + xf86ErrorF(", mode set without customized refresh.\n"); +- xfree(data->block); ++ free(data->block); + data->block = NULL; + data->mode &= ~(1 << 11); + } +@@ -1315,7 +1344,7 @@ VESALoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices, + int base; + + if (pVesa->pal == NULL) +- pVesa->pal = xcalloc(1, sizeof(CARD32) * 256); ++ pVesa->pal = calloc(1, sizeof(CARD32) * 256); + + for (i = 0, base = idx = indices[i]; i < numColors; i++, idx++) { + int j = indices[i]; +@@ -1414,7 +1443,7 @@ SaveFonts(ScrnInfoPtr pScrn) + if (attr10 & 0x01) + return; + +- pVesa->fonts = xalloc(16384); ++ pVesa->fonts = malloc(16384); + + /* save the registers that are needed here */ + miscOut = ReadMiscOut(); +@@ -1622,7 +1651,7 @@ VESASaveRestore(ScrnInfoPtr pScrn, vbeSaveRestoreFunction function) + && function == MODE_SAVE) { + /* don't rely on the memory not being touched */ + if (pVesa->pstate == NULL) +- pVesa->pstate = xalloc(pVesa->stateSize); ++ pVesa->pstate = malloc(pVesa->stateSize); + memcpy(pVesa->pstate, pVesa->state, pVesa->stateSize); + } + } +@@ -1737,7 +1766,7 @@ VESADGAAddModes(ScrnInfoPtr pScrn) + DGAModePtr pDGAMode; + + do { +- pDGAMode = xrealloc(pVesa->pDGAMode, ++ pDGAMode = realloc(pVesa->pDGAMode, + (pVesa->nDGAMode + 1) * sizeof(DGAModeRec)); + if (!pDGAMode) + break; +diff --git a/src/vesa.h b/src/vesa.h +index 4656e4c..89245b9 100644 +--- a/src/vesa.h ++++ b/src/vesa.h +@@ -25,8 +25,6 @@ + * Conectiva Linux. + * + * Authors: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> +- * +- * $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vesa/vesa.h,v 1.12 2002/08/06 13:46:27 dawes Exp $ + */ + + #ifndef _VESA_H_ diff --git a/extra/xf86-video-vesa/revert-kernelcheck.patch b/extra/xf86-video-vesa/revert-kernelcheck.patch new file mode 100644 index 000000000..37418cc3f --- /dev/null +++ b/extra/xf86-video-vesa/revert-kernelcheck.patch @@ -0,0 +1,31 @@ +From b1f7f190f9d4f2ab63d3e9ade3e7e04bb4b1f89f Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Wed, 08 Dec 2010 18:45:32 +0000 +Subject: Refuse to load if there's a kernel driver bound to the device + +Ported from the equivalent check in nv. + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/vesa.c b/src/vesa.c +index 168fde1..2523d76 100644 +--- a/src/vesa.c ++++ b/src/vesa.c +@@ -431,8 +431,14 @@ VESAPciProbe(DriverPtr drv, int entity_num, struct pci_device *dev, + pScrn = xf86ConfigPciEntity(NULL, 0, entity_num, NULL, + NULL, NULL, NULL, NULL, NULL); + if (pScrn != NULL) { +- VESAPtr pVesa = VESAGetRec(pScrn); ++ VESAPtr pVesa; + ++ if (pci_device_has_kernel_driver(dev)) { ++ ErrorF("vesa: Ignoring device with a bound kernel driver\n"); ++ return FALSE; ++ } ++ ++ pVesa = VESAGetRec(pScrn); + VESAInitScrn(pScrn); + pVesa->pciInfo = dev; + } +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/xf86-video-voodoo/PKGBUILD b/extra/xf86-video-voodoo/PKGBUILD index c69a03e85..dc958e86b 100644 --- a/extra/xf86-video-voodoo/PKGBUILD +++ b/extra/xf86-video-voodoo/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 115403 2011-03-17 18:35:27Z andyrtr $ +# $Id: PKGBUILD 140284 2011-10-11 21:28:14Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-voodoo pkgver=1.2.4 -pkgrel=4 +pkgrel=5 pkgdesc="X.org 3dfx Voodoo1/Voodoo2 2D video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel' 'xf86dgaproto') -conflicts=('xorg-server<1.10.0') +makedepends=('xorg-server-devel>=1.10.99.902' 'xf86dgaproto') +conflicts=('xorg-server<1.10.99.902') groups=('xorg-drivers' 'xorg') options=('!libtool') source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) diff --git a/extra/xf86-video-xgi/PKGBUILD b/extra/xf86-video-xgi/PKGBUILD index 2a177c9ab..eba790b99 100644 --- a/extra/xf86-video-xgi/PKGBUILD +++ b/extra/xf86-video-xgi/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 115406 2011-03-17 18:37:02Z andyrtr $ +# $Id: PKGBUILD 140280 2011-10-11 21:28:09Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-xgi pkgver=1.6.0 -pkgrel=3 +pkgrel=4 pkgdesc="X.org XGI video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'xf86dgaproto') +makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'glproto' 'mesa' 'xf86dgaproto') +conflicts=('xorg-server<1.10.99.902') options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('826f14d6ba799cd2aae9f0c818f84cf8b75f1ddb') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + git-fixes.patch) +sha1sums=('826f14d6ba799cd2aae9f0c818f84cf8b75f1ddb' + '61ce13325c69befaa710c3389a85a8aa9d1cf28d') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/git-fixes.patch" ./configure --prefix=/usr make make DESTDIR="${pkgdir}" install diff --git a/extra/xf86-video-xgi/git-fixes.patch b/extra/xf86-video-xgi/git-fixes.patch new file mode 100644 index 000000000..f15fea88a --- /dev/null +++ b/extra/xf86-video-xgi/git-fixes.patch @@ -0,0 +1,451 @@ +diff --git a/man/xgi.man b/man/xgi.man +index 19880f2..5699ae4 100644 +--- a/man/xgi.man ++++ b/man/xgi.man +@@ -1,4 +1,3 @@ +-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/xgi/xgi.man,v 1.14 2003/11/12 16:50:36 twini Exp $ + .\" shorthand for double quote that works everywhere. + .ds q \N'34' + .TH XGI __drivermansuffix__ __vendorversion__ +diff --git a/src/vb_init.c b/src/vb_init.c +index 8338410..50980c4 100755 +--- a/src/vb_init.c ++++ b/src/vb_init.c +@@ -131,6 +131,8 @@ static void XGINew_SetDRAMDefaultRegister340(PXGI_HW_DEVICE_INFO, USHORT, + static void XGINew_SetDRAMDefaultRegisterXG45(PXGI_HW_DEVICE_INFO, USHORT, + PVB_DEVICE_INFO); + static UCHAR XGINew_Get340DRAMType(PXGI_HW_DEVICE_INFO, PVB_DEVICE_INFO); ++/* horrible */ ++#define XGINew_GetXG20DRAMType XGINew_Get340DRAMType + + static int XGINew_SetDDRChannel(int index, UCHAR ChannelNo, + UCHAR XGINew_ChannelAB, const USHORT DRAMTYPE_TABLE[][5], +@@ -1451,7 +1453,7 @@ void XGINew_SetDRAMDefaultRegister340( PXGI_HW_DEVICE_INFO HwDeviceExtension , + } + + temp3 = 0 ; +- for( k = 0 ; k < 4 ; k++ ) ++ for( k = 1 ; k < 4 ; k++ ) + { + XGI_SetRegANDOR((XGIIOADDRESS) P3d4 , 0x6E , 0xFC , temp3 ) ; /* CR6E_D[1:0] select channel */ + temp2 = 0 ; +diff --git a/src/vgatypes.h b/src/vgatypes.h +index 8a60927..7484661 100755 +--- a/src/vgatypes.h ++++ b/src/vgatypes.h +@@ -1,5 +1,3 @@ +-/* $XFree86$ */ +-/* $XdotOrg$ */ + /* + * General type definitions for universal mode switching modules + * +diff --git a/src/xgi.h b/src/xgi.h +index 715502f..e818631 100755 +--- a/src/xgi.h ++++ b/src/xgi.h +@@ -981,6 +981,7 @@ int compute_vclk(int Clock, int *out_n, int *out_dn, int *out_div, + void XGI_WaitBeginRetrace(XGIIOADDRESS RelIO); + void XGI_WaitEndRetrace(XGIIOADDRESS RelIO); + ++#include <unistd.h> + /* 2005/11/21 added by jjtseng */ + #define DelayS(sec) usleep((sec)*1000000) + #define DelayMS(millisec) usleep((millisec)*1000) +diff --git a/src/xgi_accel.c b/src/xgi_accel.c +index c072691..4c298ed 100755 +--- a/src/xgi_accel.c ++++ b/src/xgi_accel.c +@@ -200,20 +200,7 @@ extern int FbDevExist; + #endif + + #if X_BYTE_ORDER == X_BIG_ENDIAN +-static CARD32 BE_SWAP32 (CARD32 val) +-{ +- PDEBUG(ErrorF("X_BIG_ENDIAN...\n")); +- if (CurrentColorDepth == 8) +- return ((((val) & 0x000000ff) << 24) | \ +- (((val) & 0x0000ff00) << 8) | \ +- (((val) & 0x00ff0000) >> 8) | \ +- (((val) & 0xff000000) >> 24)); +- if (CurrentColorDepth == 24) +- return val; +- if (CurrentColorDepth == 16) +- return ((((val) & 0x0000ffff) << 16) | \ +- (((val) & 0xffff0000) >> 16)); +-} ++#define BE_SWAP32(x) lswapl(x) + #else + static CARD32 BE_SWAP32 (CARD32 val) + { +diff --git a/src/xgi_dga.c b/src/xgi_dga.c +index 04f90aa..8bd84bc 100755 +--- a/src/xgi_dga.c ++++ b/src/xgi_dga.c +@@ -103,18 +103,18 @@ XGISetupDGAMode( + + if(pMode->HDisplay != otherPitch) { + +- newmodes = xrealloc(modes, (*num + 2) * sizeof(DGAModeRec)); ++ newmodes = realloc(modes, (*num + 2) * sizeof(DGAModeRec)); + oneMore = TRUE; + + } else { + +- newmodes = xrealloc(modes, (*num + 1) * sizeof(DGAModeRec)); ++ newmodes = realloc(modes, (*num + 1) * sizeof(DGAModeRec)); + oneMore = FALSE; + + } + + if(!newmodes) { +- xfree(modes); ++ free(modes); + return NULL; + } + modes = newmodes; +diff --git a/src/xgi_dri.c b/src/xgi_dri.c +index 93687e1..e575c19 100755 +--- a/src/xgi_dri.c ++++ b/src/xgi_dri.c +@@ -46,7 +46,6 @@ + + #include "xf86.h" + #include "xf86_OSproc.h" +-#include "xf86Priv.h" + + #include "xf86PciInfo.h" + #include "xf86Pci.h" +@@ -145,13 +144,13 @@ XGIInitVisualConfigs(ScreenPtr pScreen) + } + if (!(pXGIConfigs = (XGIConfigPrivPtr)xnfcalloc(sizeof(XGIConfigPrivRec), + numConfigs))) { +- xfree(pConfigs); ++ free(pConfigs); + return FALSE; + } + if (!(pXGIConfigPtrs = (XGIConfigPrivPtr*)xnfcalloc(sizeof(XGIConfigPrivPtr), + numConfigs))) { +- xfree(pConfigs); +- xfree(pXGIConfigs); ++ free(pConfigs); ++ free(pXGIConfigs); + return FALSE; + } + for (i=0; i<numConfigs; i++) +@@ -333,7 +332,7 @@ Bool XGIDRIScreenInit(ScreenPtr pScreen) + pDRIInfo->bufferRequests = DRI_ALL_WINDOWS; + + if (!DRIScreenInit(pScreen, pDRIInfo, &pXGI->drmSubFD)) { +- xfree(pDRIInfo->devPrivate); ++ free(pDRIInfo->devPrivate); + pDRIInfo->devPrivate=0; + DRIDestroyInfoRec(pXGI->pDRIInfo); + pXGI->pDRIInfo=0; +@@ -537,14 +536,14 @@ XGIDRICloseScreen(ScreenPtr pScreen) + + if (pXGI->pDRIInfo) { + if (pXGI->pDRIInfo->devPrivate) { +- xfree(pXGI->pDRIInfo->devPrivate); ++ free(pXGI->pDRIInfo->devPrivate); + pXGI->pDRIInfo->devPrivate=0; + } + DRIDestroyInfoRec(pXGI->pDRIInfo); + pXGI->pDRIInfo=0; + } +- if (pXGI->pVisualConfigs) xfree(pXGI->pVisualConfigs); +- if (pXGI->pVisualConfigsPriv) xfree(pXGI->pVisualConfigsPriv); ++ if (pXGI->pVisualConfigs) free(pXGI->pVisualConfigs); ++ if (pXGI->pVisualConfigsPriv) free(pXGI->pVisualConfigsPriv); + + if(pXGI->agpSize){ + /* ErrorF("Freeing agp memory\n"); */ +diff --git a/src/xgi_driver.c b/src/xgi_driver.c +index b4f83b8..b8b8679 100755 +--- a/src/xgi_driver.c ++++ b/src/xgi_driver.c +@@ -54,7 +54,7 @@ + #include "fb.h" + #include "micmap.h" + #include "xf86.h" +-#include "xf86Priv.h" ++#include "xf86Module.h" + #include "xf86_OSproc.h" + #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 + #include "xf86Resources.h" +@@ -106,6 +106,10 @@ + #include <unistd.h> + #endif + ++#ifndef DEFAULT_DPI ++#define DEFAULT_DPI 96 ++#endif ++ + /* Jong 01/22/2009; compiler error; type conflict */ + /* + #include <fcntl.h> +@@ -556,13 +560,13 @@ XGIFreeRec(ScrnInfoPtr pScrn) + * head. + */ + if (pXGIEnt->BIOS) +- xfree(pXGIEnt->BIOS); ++ free(pXGIEnt->BIOS); + pXGIEnt->BIOS = pXGI->BIOS = NULL; + if (pXGIEnt->XGI_Pr) +- xfree(pXGIEnt->XGI_Pr); ++ free(pXGIEnt->XGI_Pr); + pXGIEnt->XGI_Pr = pXGI->XGI_Pr = NULL; + if (pXGIEnt->RenderAccelArray) +- xfree(pXGIEnt->RenderAccelArray); ++ free(pXGIEnt->RenderAccelArray); + pXGIEnt->RenderAccelArray = pXGI->RenderAccelArray = NULL; + } + else { +@@ -573,19 +577,19 @@ XGIFreeRec(ScrnInfoPtr pScrn) + } + else { + if (pXGI->BIOS) +- xfree(pXGI->BIOS); ++ free(pXGI->BIOS); + pXGI->BIOS = NULL; + if (pXGI->XGI_Pr) +- xfree(pXGI->XGI_Pr); ++ free(pXGI->XGI_Pr); + pXGI->XGI_Pr = NULL; + if (pXGI->RenderAccelArray) +- xfree(pXGI->RenderAccelArray); ++ free(pXGI->RenderAccelArray); + pXGI->RenderAccelArray = NULL; + } + + #ifdef XGIMERGED + if (pXGI->MetaModes) +- xfree(pXGI->MetaModes); ++ free(pXGI->MetaModes); + pXGI->MetaModes = NULL; + + if (pXGI->CRT1Modes) { +@@ -595,8 +599,8 @@ XGIFreeRec(ScrnInfoPtr pScrn) + do { + DisplayModePtr p = pScrn->currentMode->next; + if (pScrn->currentMode->Private) +- xfree(pScrn->currentMode->Private); +- xfree(pScrn->currentMode); ++ free(pScrn->currentMode->Private); ++ free(pScrn->currentMode); + pScrn->currentMode = p; + } while (pScrn->currentMode != pScrn->modes); + } +@@ -612,7 +616,7 @@ XGIFreeRec(ScrnInfoPtr pScrn) + pXGI->pVbe = NULL; + if (pScrn->driverPrivate == NULL) + return; +- xfree(pScrn->driverPrivate); ++ free(pScrn->driverPrivate); + pScrn->driverPrivate = NULL; + } + +@@ -975,7 +979,7 @@ XGIProbe(DriverPtr drv, int flags) + numDevSections, drv, &usedChips); + + /* Free it since we don't need that list after this */ +- xfree(devSections); ++ free(devSections); + if (numUsed <= 0) + return FALSE; + +@@ -1015,7 +1019,7 @@ XGIProbe(DriverPtr drv, int flags) + + #endif + } +- xfree(usedChips); ++ free(usedChips); + + return foundScreen; + } +@@ -1044,11 +1048,11 @@ XGICopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest, + + ErrorF("XGICopyModeNLink()...Use Virtual Size-1\n"); + +- if (!((mode = xalloc(sizeof(DisplayModeRec))))) ++ if (!((mode = malloc(sizeof(DisplayModeRec))))) + return dest; + memcpy(mode, i, sizeof(DisplayModeRec)); +- if (!((mode->Private = xalloc(sizeof(XGIMergedDisplayModeRec))))) { +- xfree(mode); ++ if (!((mode->Private = malloc(sizeof(XGIMergedDisplayModeRec))))) { ++ free(mode); + return dest; + } + ((XGIMergedDisplayModePtr) mode->Private)->CRT1 = i; +@@ -1125,8 +1129,8 @@ XGICopyModeNLink(ScrnInfoPtr pScrn, DisplayModePtr dest, + xf86DrvMsg(pScrn->scrnIndex, X_ERROR, + "Skipped %dx%d, not enough video RAM or beyond hardware specs\n", + mode->HDisplay, mode->VDisplay); +- xfree(mode->Private); +- xfree(mode); ++ free(mode->Private); ++ free(mode); + + return dest; + } +@@ -1559,10 +1563,10 @@ XGIFreeCRT2Structs(XGIPtr pXGI) + pXGI->CRT2pScrn->monitor->Modes); + } + if (pXGI->CRT2pScrn->monitor->DDC) +- xfree(pXGI->CRT2pScrn->monitor->DDC); +- xfree(pXGI->CRT2pScrn->monitor); ++ free(pXGI->CRT2pScrn->monitor->DDC); ++ free(pXGI->CRT2pScrn->monitor); + } +- xfree(pXGI->CRT2pScrn); ++ free(pXGI->CRT2pScrn); + pXGI->CRT2pScrn = NULL; + } + } +@@ -2438,7 +2442,7 @@ XGIDDCPreInit(ScrnInfoPtr pScrn) + + #ifdef XGIMERGED + if (pXGI->MergedFB) { +- pXGI->CRT2pScrn->monitor = xalloc(sizeof(MonRec)); ++ pXGI->CRT2pScrn->monitor = malloc(sizeof(MonRec)); + if (pXGI->CRT2pScrn->monitor) { + DisplayModePtr tempm = NULL, currentm = NULL, newm = NULL; + memcpy(pXGI->CRT2pScrn->monitor, pScrn->monitor, sizeof(MonRec)); +@@ -2446,11 +2450,11 @@ XGIDDCPreInit(ScrnInfoPtr pScrn) + pXGI->CRT2pScrn->monitor->Modes = NULL; + tempm = pScrn->monitor->Modes; + while (tempm) { +- if (!(newm = xalloc(sizeof(DisplayModeRec)))) ++ if (!(newm = malloc(sizeof(DisplayModeRec)))) + break; + memcpy(newm, tempm, sizeof(DisplayModeRec)); +- if (!(newm->name = xalloc(strlen(tempm->name) + 1))) { +- xfree(newm); ++ if (!(newm->name = malloc(strlen(tempm->name) + 1))) { ++ free(newm); + break; + } + strcpy(newm->name, tempm->name); +@@ -2490,7 +2494,7 @@ XGIDDCPreInit(ScrnInfoPtr pScrn) + "Failed to allocate memory for CRT2 monitor, %s.\n", + mergeddisstr); + if (pXGI->CRT2pScrn) +- xfree(pXGI->CRT2pScrn); ++ free(pXGI->CRT2pScrn); + pXGI->CRT2pScrn = NULL; + pXGI->MergedFB = FALSE; + } +@@ -3540,7 +3544,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) + /* Do some MergedFB mode initialisation */ + #ifdef XGIMERGED + if (pXGI->MergedFB) { +- pXGI->CRT2pScrn = xalloc(sizeof(ScrnInfoRec)); ++ pXGI->CRT2pScrn = malloc(sizeof(ScrnInfoRec)); + if (!pXGI->CRT2pScrn) { + XGIErrorLog(pScrn, + "Failed to allocate memory for 2nd pScrn, %s\n", +@@ -3586,7 +3590,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) + XGIErrorLog(pScrn, mergednocrt1, mergeddisstr); + } + if (pXGI->CRT2pScrn) +- xfree(pXGI->CRT2pScrn); ++ free(pXGI->CRT2pScrn); + pXGI->CRT2pScrn = NULL; + pXGI->MergedFB = FALSE; + } +@@ -3627,7 +3631,7 @@ XGIPreInit(ScrnInfoPtr pScrn, int flags) + XGIErrorLog(pScrn, mergednocrt2, mergeddisstr); + } + if (pXGI->CRT2pScrn) +- xfree(pXGI->CRT2pScrn); ++ free(pXGI->CRT2pScrn); + pXGI->CRT2pScrn = NULL; + pXGI->MergedFB = FALSE; + } +@@ -4901,7 +4905,7 @@ XGIScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) + + if (pXGI->ShadowFB) { + pXGI->ShadowPitch = BitmapBytePad(pScrn->bitsPerPixel * width); +- pXGI->ShadowPtr = xalloc(pXGI->ShadowPitch * height); ++ pXGI->ShadowPtr = malloc(pXGI->ShadowPitch * height); + displayWidth = pXGI->ShadowPitch / (pScrn->bitsPerPixel >> 3); + FBStart = pXGI->ShadowPtr; + } +@@ -5777,17 +5781,17 @@ XGICloseScreen(int scrnIndex, ScreenPtr pScreen) + } + + if (pXGI->ShadowPtr) { +- xfree(pXGI->ShadowPtr); ++ free(pXGI->ShadowPtr); + pXGI->ShadowPtr = NULL; + } + + if (pXGI->DGAModes) { +- xfree(pXGI->DGAModes); ++ free(pXGI->DGAModes); + pXGI->DGAModes = NULL; + } + + if (pXGI->adaptor) { +- xfree(pXGI->adaptor); ++ free(pXGI->adaptor); + pXGI->adaptor = NULL; + pXGI->ResetXv = pXGI->ResetXvGamma = NULL; + } +diff --git a/src/xgi_opt.c b/src/xgi_opt.c +index 09346e4..c0608d5 100755 +--- a/src/xgi_opt.c ++++ b/src/xgi_opt.c +@@ -195,7 +195,7 @@ xgiOptions(ScrnInfoPtr pScrn) + xf86CollectOptions(pScrn, NULL); + + /* Process the options */ +- if(!(pXGI->Options = xalloc(sizeof(XGIOptions)))) return; ++ if(!(pXGI->Options = malloc(sizeof(XGIOptions)))) return; + + memcpy(pXGI->Options, XGIOptions, sizeof(XGIOptions)); + +diff --git a/src/xgi_setup.c b/src/xgi_setup.c +index c1d2cdc..6641b09 100755 +--- a/src/xgi_setup.c ++++ b/src/xgi_setup.c +@@ -678,7 +678,7 @@ bAccessVGAPCIInfo(PXGI_HW_DEVICE_INFO pHwDevInfo, ULONG ulOffset, ULONG ulSet, U + err = pci_device_cfg_write_u32(pXGI->PciInfo, *pulValue, + ulOffset & ~3); + } else { +- err = pci_device_cfg_write_u32(pXGI->PciInfo, pulValue, ++ err = pci_device_cfg_read_u32(pXGI->PciInfo, pulValue, + ulOffset & ~3); + } + +diff --git a/src/xgi_video.c b/src/xgi_video.c +index 31cffd5..df76d14 100755 +--- a/src/xgi_video.c ++++ b/src/xgi_video.c +@@ -142,7 +142,7 @@ void XGIInitVideo(ScreenPtr pScreen) + adaptors = &newAdaptor; + } else { + newAdaptors = /* need to free this someplace */ +- xalloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*)); ++ malloc((num_adaptors + 1) * sizeof(XF86VideoAdaptorPtr*)); + if(newAdaptors) { + memcpy(newAdaptors, adaptors, num_adaptors * + sizeof(XF86VideoAdaptorPtr)); +@@ -157,7 +157,7 @@ void XGIInitVideo(ScreenPtr pScreen) + xf86XVScreenInit(pScreen, adaptors, num_adaptors); + + if(newAdaptors) +- xfree(newAdaptors); ++ free(newAdaptors); + + } + +@@ -395,7 +395,7 @@ XGISetupImageVideo(ScreenPtr pScreen) + struct v4l2_standard standard; + # endif//VC + +- if(!(adapt = xcalloc(1, sizeof(XF86VideoAdaptorRec) + ++ if(!(adapt = calloc(1, sizeof(XF86VideoAdaptorRec) + + sizeof(XGIPortPrivRec) + + sizeof(DevUnion)))) + return NULL; diff --git a/extra/xf86-video-xgixp/PKGBUILD b/extra/xf86-video-xgixp/PKGBUILD index 7f98b9990..884a53446 100644 --- a/extra/xf86-video-xgixp/PKGBUILD +++ b/extra/xf86-video-xgixp/PKGBUILD @@ -1,22 +1,26 @@ -# $Id: PKGBUILD 115409 2011-03-17 18:38:51Z andyrtr $ +# $Id: PKGBUILD 140282 2011-10-11 21:28:12Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-xgixp pkgver=1.8.0 -pkgrel=3 +pkgrel=4 pkgdesc="X.org XGIXP video driver" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') depends=('glibc') -makedepends=('xorg-server-devel' 'libdrm' 'xf86driproto' 'mesa') +makedepends=('xorg-server-devel>=1.10.99.902' 'libdrm' 'xf86driproto' 'mesa' 'glproto') +conflicts=('xorg-server<1.10.99.902') options=('!libtool') groups=('xorg-drivers' 'xorg') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('67caeaa4c746572160208fe23c7257f62cb442a3') +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 + api-compat-fix-for-DRAWABLE_BUFFER.patch) +sha1sums=('67caeaa4c746572160208fe23c7257f62cb442a3' + 'ea140a13963bbf33cdff1ad75789d765867ec53b') build() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/api-compat-fix-for-DRAWABLE_BUFFER.patch" ./configure --prefix=/usr make make DESTDIR="${pkgdir}" install diff --git a/extra/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch b/extra/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch new file mode 100644 index 000000000..f8cb64673 --- /dev/null +++ b/extra/xf86-video-xgixp/api-compat-fix-for-DRAWABLE_BUFFER.patch @@ -0,0 +1,23 @@ +From 86258a6fd8fc8bb09a52ee446b37abe6bd0843ef Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Fri, 25 Mar 2011 22:46:55 +0000 +Subject: API compat fix for DRAWABLE_BUFFER + +Signed-off-by: Adam Jackson <ajax@redhat.com> +--- +diff --git a/src/xgi_driver.c b/src/xgi_driver.c +index e54d8c7..189b84a 100644 +--- a/src/xgi_driver.c ++++ b/src/xgi_driver.c +@@ -2708,7 +2708,9 @@ xg47_setup_fb_wrap(ReadMemoryProcPtr *read_ptr, + { + switch (pDraw->type) { + case DRAWABLE_WINDOW: ++#ifdef DRAWABLE_BUFFER + case DRAWABLE_BUFFER: ++#endif + *read_ptr = xg47_read_memory_swap_func; + *write_ptr = xg47_write_memory_swap_func; + break; +-- +cgit v0.8.3-6-g21f6 diff --git a/extra/xorg-server/PKGBUILD b/extra/xorg-server/PKGBUILD index 9a3abf9e0..29fa8a40d 100644 --- a/extra/xorg-server/PKGBUILD +++ b/extra/xorg-server/PKGBUILD @@ -1,43 +1,47 @@ -# $Id: PKGBUILD 138136 2011-09-17 08:05:32Z ibiru $ +# $Id: PKGBUILD 140277 2011-10-11 21:28:03Z jgc $ # 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.10.4 -pkgrel=1 +pkgver=1.11.1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org" makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' 'xorg-font-util' 'glproto' 'dri2proto') options=('!libtool') source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 - randr-compare-all-the-bytes-in-rrpostpendingproperties.patch - bg-none-revert.patch - xserver-1.10-pointer-barriers.patch autoconfig-nvidia.patch + autoconfig-sis.patch + revert-trapezoids.patch + git-fixes.patch xvfb-run xvfb-run.1 10-quirks.conf) -sha1sums=('857d6377025c77851a3cc5f8ec2ce84164a2fdc6' - '571f2925f2f3d1b5cdbb2e5a676205fcea256198' - '629c6d8d52126eab81ee1b72a9e4209535f8cb81' - '1b95e91384a57d966428c7db98ed06f4cc562f91' - 'f9328fd7bc931bb02c8909ecfcef35403de33782' +sha1sums=('ed0358b61294f1283aad42cf1e609752ceeffafd' + '0249b892f27243d8fe6fe6d226bf4c2391cedf49' + '962fecc159c128728f14e8ba231c5b00391ff4ac' + 'd9f7d9553e772c2682c15079019d30c658a4f83b' + 'd73125bf93aea09b0beb55e75c510b9f72f5d21a' 'c94f742d3f9cabf958ae58e4015d9dd185aabedc' '6838fc00ef4618c924a77e0fb03c05346080908a' '993798f3d22ad672d769dae5f48d1fa068d5578f') build() { cd "${srcdir}/${pkgbase}-${pkgver}" - # Add pointer barrier support, patch from Fedora - patch -Np1 -i "${srcdir}/xserver-1.10-pointer-barriers.patch" - - # Patches from ~ajax/xserver xserver-next branch - patch -Np1 -i "${srcdir}/bg-none-revert.patch" # Use nouveau/nv/nvidia drivers for nvidia devices patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" + # Use unofficial imedia SiS driver for supported SiS devices + patch -Np0 -i "${srcdir}/autoconfig-sis.patch" + + # Revert commit that causes huge slowdowns with binary nVidia driver + patch -Np1 -i "${srcdir}/revert-trapezoids.patch" + + # Add post-release patches from 1.11 branch + patch -Np1 -i "${srcdir}/git-fixes.patch" + autoreconf ./configure --prefix=/usr \ --enable-ipv6 \ @@ -84,7 +88,7 @@ package_xorg-server-common() { make -C xkb DESTDIR="${pkgdir}" install-data install -m755 -d "${pkgdir}/usr/share/man/man1" - install -m644 doc/man/Xserver.1 "${pkgdir}/usr/share/man/man1/" + install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/" install -m755 -d "${pkgdir}/usr/lib/xorg" install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/" diff --git a/extra/xorg-server/autoconfig-nvidia.patch b/extra/xorg-server/autoconfig-nvidia.patch index c56586d54..baa2eb601 100644 --- a/extra/xorg-server/autoconfig-nvidia.patch +++ b/extra/xorg-server/autoconfig-nvidia.patch @@ -1,78 +1,3 @@ -From a685b5cf34532cef96fc9b05f735088ac0c0c7ad Mon Sep 17 00:00:00 2001 -From: Fedora X Ninjas <x@fedoraproject.org> -Date: Tue, 16 Feb 2010 11:38:17 +1000 -Subject: [PATCH 08/17] autoconfig: select nouveau by default for NVIDIA GPUs - -Also, don't treat DRI setup failure as an error for nouveau. - -Modified by Archlinux: -Append nvidia driver to the list of prefered drivers ---- - glx/glxdri.c | 7 +++++-- - glx/glxdri2.c | 7 +++++-- - hw/xfree86/common/xf86AutoConfig.c | 19 ++++++++++++++++++- - 3 files changed, 28 insertions(+), 5 deletions(-) - ---- a/glx/glxdri.c -+++ b/glx/glxdri.c -@@ -978,6 +978,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) - const __DRIconfig **driConfigs; - const __DRIextension **extensions; - int i; -+ int from = X_ERROR; - - if (!xf86LoaderCheckSymbol("DRIQueryDirectRenderingCapable") || - !DRIQueryDirectRenderingCapable(pScreen, &isCapable) || -@@ -1057,7 +1058,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen) - - screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); - if (screen->driver == NULL) { -- LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n", -+ if (!strcmp(driverName, "nouveau")) -+ from = X_INFO; -+ LogMessage(from, "AIGLX error: dlopen of %s failed (%s)\n", - filename, dlerror()); - goto handle_error; - } -@@ -1193,7 +1196,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) - - free(screen); - -- LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n"); -+ LogMessage(from, "AIGLX: reverting to software rendering\n"); - - return NULL; - } ---- a/glx/glxdri2.c -+++ b/glx/glxdri2.c -@@ -708,6 +708,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) - const __DRIextension **extensions; - const __DRIconfig **driConfigs; - int i; -+ int from = X_ERROR; - - screen = calloc(1, sizeof *screen); - if (screen == NULL) -@@ -734,7 +735,9 @@ __glXDRIscreenProbe(ScreenPtr pScreen) - - screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL); - if (screen->driver == NULL) { -- LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n", -+ if (!strcmp(driverName, "nouveau")) -+ from = X_INFO; -+ LogMessage(from, "AIGLX error: dlopen of %s failed (%s)\n", - filename, dlerror()); - goto handle_error; - } -@@ -826,7 +829,7 @@ __glXDRIscreenProbe(ScreenPtr pScreen) - - free(screen); - -- LogMessage(X_ERROR, "AIGLX: reverting to software rendering\n"); -+ LogMessage(from, "AIGLX: reverting to software rendering\n"); - - return NULL; - } --- a/hw/xfree86/common/xf86pciBus.c +++ b/hw/xfree86/common/xf86pciBus.c @@ -1123,7 +1123,25 @@ videoPtrToDriverList(struct pci_device * diff --git a/extra/xorg-server/autoconfig-sis.patch b/extra/xorg-server/autoconfig-sis.patch new file mode 100644 index 000000000..d936efaaa --- /dev/null +++ b/extra/xorg-server/autoconfig-sis.patch @@ -0,0 +1,19 @@ +--- hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 ++++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 +@@ -1140,7 +1140,15 @@ + driverList[0] = "savage"; break; + } + break; +- case 0x1039: driverList[0] = "sis"; break; ++ case 0x1039: ++ switch (dev->device_id) ++ { ++ case 0x6350: case 0x6351: ++ driverList[0] = "sisimedia"; driverList[1] = "sis"; break; ++ default: ++ driverList[0] = "sis"; break; ++ } ++ break; + case 0x126f: driverList[0] = "siliconmotion"; break; + case 0x121a: + if (dev->device_id < 0x0003) diff --git a/extra/xorg-server/bg-none-revert.patch b/extra/xorg-server/bg-none-revert.patch deleted file mode 100644 index 1a38f1f41..000000000 --- a/extra/xorg-server/bg-none-revert.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 3bc6ed2d8c9028ec28015d05b60af67a194f3694 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Tue, 29 Mar 2011 14:09:46 +0000 -Subject: Revert "composite: Don't backfill non-bg-None windows" - -This reverts commit 6dd775f57d2f94f0ddaee324aeec33b9b66ed5bc. - -Bugzilla: https://bugs.freedesktop.org/34427 - -Acked-by: Alex Deucher <alexdeucher@gmail.com> -Signed-off-by: Adam Jackson <ajax@redhat.com> ---- -diff --git a/composite/compalloc.c b/composite/compalloc.c -index e4064f6..7164c0d 100644 ---- a/composite/compalloc.c -+++ b/composite/compalloc.c -@@ -508,17 +508,6 @@ compUnredirectOneSubwindow (WindowPtr pParent, WindowPtr pWin) - return Success; - } - --static int --bgNoneVisitWindow(WindowPtr pWin, void *null) --{ -- if (pWin->backgroundState != BackgroundPixmap) -- return WT_WALKCHILDREN; -- if (pWin->background.pixmap != None) -- return WT_WALKCHILDREN; -- -- return WT_STOPWALKING; --} -- - static PixmapPtr - compNewPixmap (WindowPtr pWin, int x, int y, int w, int h, Bool map) - { -@@ -539,21 +528,6 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h, Bool map) - if (!map) - return pPixmap; - -- /* -- * If there's no bg=None in the tree, we're done. -- * -- * We could optimize this more by collection the regions of all the -- * bg=None subwindows and feeding that in as the clip for the -- * CopyArea below, but since window trees are shallow these days it -- * might not be worth the effort. -- */ -- if (TraverseTree(pWin, bgNoneVisitWindow, NULL) == WT_NOMATCH) -- return pPixmap; -- -- /* -- * Copy bits from the parent into the new pixmap so that it will -- * have "reasonable" contents in case for background None areas. -- */ - if (pParent->drawable.depth == pWin->drawable.depth) - { - GCPtr pGC = GetScratchGC (pWin->drawable.depth, pScreen); --- -cgit v0.8.3-6-g21f6 diff --git a/extra/xorg-server/git-fixes.patch b/extra/xorg-server/git-fixes.patch new file mode 100644 index 000000000..3c59c27c9 --- /dev/null +++ b/extra/xorg-server/git-fixes.patch @@ -0,0 +1,288 @@ +From bd6ea85209e5ab80375d4ec9994d10a89fd1374a Mon Sep 17 00:00:00 2001 +From: Jamey Sharp <jamey@minilop.net> +Date: Wed, 15 Sep 2010 01:35:21 +0000 +Subject: Fix pixmap double-frees on error paths. + +If AddResource fails, it will automatically free the object that was +passed to it by calling the appropriate deleteFunc; and of course +FreeResource also calls the deleteFunc. In both cases it's wrong to call +the destroy hook manually. + +Commit by Jamey Sharp and Josh Triplett. + +Signed-off-by: Jamey Sharp <jamey@minilop.net> +Signed-off-by: Josh Triplett <josh@joshtriplett.org> +Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> +Reviewed-by: Aaron Plattner <aplattner@nvidia.com> +(cherry picked from commit 0f380a5005f800572773cd4667ce43c7459cc467) +--- +diff --git a/Xext/shm.c b/Xext/shm.c +index b08af82..4141a8f 100644 +--- a/Xext/shm.c ++++ b/Xext/shm.c +@@ -991,7 +991,6 @@ CreatePmap: + pMap->drawable.serialNumber = NEXT_SERIAL_NUMBER; + pMap->drawable.id = newPix->info[j].id; + if (!AddResource(newPix->info[j].id, RT_PIXMAP, (pointer)pMap)) { +- (*pScreen->DestroyPixmap)(pMap); + result = BadAlloc; + break; + } +@@ -1002,10 +1001,8 @@ CreatePmap: + } + + if(result == BadAlloc) { +- while(j--) { +- (*pScreen->DestroyPixmap)(pMap); ++ while(j--) + FreeResource(newPix->info[j].id, RT_NONE); +- } + free(newPix); + } else + AddResource(stuff->pid, XRT_PIXMAP, newPix); +@@ -1110,7 +1107,6 @@ CreatePmap: + { + return Success; + } +- pDraw->pScreen->DestroyPixmap(pMap); + } + return BadAlloc; + } +diff --git a/dix/dispatch.c b/dix/dispatch.c +index 192c8c3..f8200b1 100644 +--- a/dix/dispatch.c ++++ b/dix/dispatch.c +@@ -1419,7 +1419,6 @@ CreatePmap: + } + if (AddResource(stuff->pid, RT_PIXMAP, (pointer)pMap)) + return Success; +- (*pDraw->pScreen->DestroyPixmap)(pMap); + } + return BadAlloc; + } +-- +cgit v0.9.0.2-2-gbebe +From 347f5610ca023fb31485aa19c20607af8bf9c834 Mon Sep 17 00:00:00 2001 +From: Carlos Garnacho <carlosg@gnome.org> +Date: Tue, 30 Aug 2011 22:46:52 +0000 +Subject: Xi: Fix passive XI2 ungrabs on XIAll[Master]Devices + +The corresponding DeviceIntPtr wasn't being gotten properly, +resulting in BadDevice from dixLookupDevice(). + +Signed-off-by: Carlos Garnacho <carlosg@gnome.org> +Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +(cherry picked from commit f52d5cd374563544dafe29587411f345e31bbdf8) +--- +diff --git a/Xi/xipassivegrab.c b/Xi/xipassivegrab.c +index ae43433..5cdd8ac 100644 +--- a/Xi/xipassivegrab.c ++++ b/Xi/xipassivegrab.c +@@ -261,9 +261,16 @@ ProcXIPassiveUngrabDevice(ClientPtr client) + REQUEST(xXIPassiveUngrabDeviceReq); + REQUEST_AT_LEAST_SIZE(xXIPassiveUngrabDeviceReq); + +- rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess); +- if (rc != Success) +- return rc; ++ if (stuff->deviceid == XIAllDevices) ++ dev = inputInfo.all_devices; ++ else if (stuff->deviceid == XIAllMasterDevices) ++ dev = inputInfo.all_master_devices; ++ else ++ { ++ rc = dixLookupDevice(&dev, stuff->deviceid, client, DixGrabAccess); ++ if (rc != Success) ++ return rc; ++ } + + if (stuff->grab_type != XIGrabtypeButton && + stuff->grab_type != XIGrabtypeKeycode && +-- +cgit v0.9.0.2-2-gbebe +From e9ae33316012ffe9acfeeb7303ab3392c2ca2a2b Mon Sep 17 00:00:00 2001 +From: Sam Spilsbury <sam.spilsbury@canonical.com> +Date: Wed, 14 Sep 2011 01:58:34 +0000 +Subject: Remove the SendEvent bit (0x80) before doing range checks on event type. + +Some extension libraries may set this bit before converting the event to +wire protocol and as such range checking the event will cause an invalid +BadValue error to result. As the documentation suggests the the bit +should be "forced on", remove it before doing range checks and continue +to force it on in the server. + +Reviewed-by: Jamey Sharp <jamey@minilop.net> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> +(cherry picked from commit 2d2dce558d24eeea0eb011ec9ebaa6c5c2273c39) +--- +diff --git a/dix/events.c b/dix/events.c +index 8a4c6b9..9e58edb 100644 +--- a/dix/events.c ++++ b/dix/events.c +@@ -5224,6 +5224,8 @@ CloseDownEvents(void) + InputEventList = NULL; + } + ++#define SEND_EVENT_BIT 0x80 ++ + /** + * Server-side protocol handling for SendEvent request. + * +@@ -5241,6 +5243,16 @@ ProcSendEvent(ClientPtr client) + + REQUEST_SIZE_MATCH(xSendEventReq); + ++ /* libXext and other extension libraries may set the bit indicating ++ * that this event came from a SendEvent request so remove it ++ * since otherwise the event type may fail the range checks ++ * and cause an invalid BadValue error to be returned. ++ * ++ * This is safe to do since we later add the SendEvent bit (0x80) ++ * back in once we send the event to the client */ ++ ++ stuff->event.u.u.type &= ~(SEND_EVENT_BIT); ++ + /* The client's event type must be a core event type or one defined by an + extension. */ + +@@ -5298,7 +5310,7 @@ ProcSendEvent(ClientPtr client) + client->errorValue = stuff->propagate; + return BadValue; + } +- stuff->event.u.u.type |= 0x80; ++ stuff->event.u.u.type |= SEND_EVENT_BIT; + if (stuff->propagate) + { + for (;pWin; pWin = pWin->parent) +-- +cgit v0.9.0.2-2-gbebe +From b45e22675364915c32560c26404cf30d77ab68aa Mon Sep 17 00:00:00 2001 +From: Alan Hourihane <alanh@vmware.com> +Date: Wed, 05 Oct 2011 02:42:46 +0000 +Subject: dixfonts: Don't overwrite local c variable until new_closure is safely initialized. + +Signed-off-by: Alan Hourihane <alanh@vmware.com> +Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> +(cherry picked from commit 7a33c5b934382b5554f41ab1502514e91c9bc52e) +--- +diff --git a/dix/dixfonts.c b/dix/dixfonts.c +index fbac124..d2bcb84 100644 +--- a/dix/dixfonts.c ++++ b/dix/dixfonts.c +@@ -1302,31 +1302,30 @@ doPolyText(ClientPtr client, PTclosurePtr c) + goto bail; + } + *new_closure = *c; +- c = new_closure; + +- len = c->endReq - c->pElt; +- c->data = malloc(len); +- if (!c->data) ++ len = new_closure->endReq - new_closure->pElt; ++ new_closure->data = malloc(len); ++ if (!new_closure->data) + { +- free(c); ++ free(new_closure); + err = BadAlloc; + goto bail; + } +- memmove(c->data, c->pElt, len); +- c->pElt = c->data; +- c->endReq = c->pElt + len; ++ memmove(new_closure->data, new_closure->pElt, len); ++ new_closure->pElt = new_closure->data; ++ new_closure->endReq = new_closure->pElt + len; + + /* Step 2 */ + +- pGC = GetScratchGC(c->pGC->depth, c->pGC->pScreen); ++ pGC = GetScratchGC(new_closure->pGC->depth, new_closure->pGC->pScreen); + if (!pGC) + { +- free(c->data); +- free(c); ++ free(new_closure->data); ++ free(new_closure); + err = BadAlloc; + goto bail; + } +- if ((err = CopyGC(c->pGC, pGC, GCFunction | ++ if ((err = CopyGC(new_closure->pGC, pGC, GCFunction | + GCPlaneMask | GCForeground | + GCBackground | GCFillStyle | + GCTile | GCStipple | +@@ -1337,15 +1336,16 @@ doPolyText(ClientPtr client, PTclosurePtr c) + Success) + { + FreeScratchGC(pGC); +- free(c->data); +- free(c); ++ free(new_closure->data); ++ free(new_closure); + err = BadAlloc; + goto bail; + } ++ c = new_closure; + origGC = c->pGC; + c->pGC = pGC; + ValidateGC(c->pDraw, c->pGC); +- ++ + ClientSleep(client, (ClientSleepProcPtr)doPolyText, c); + + /* Set up to perform steps 3 and 4 */ +-- +cgit v0.9.0.2-2-gbebe +From bec15eb73a17fb47963ff6b747ea504f7dc05deb Mon Sep 17 00:00:00 2001 +From: Kirill Elagin <kirelagin@gmail.com> +Date: Tue, 04 Oct 2011 19:02:20 +0000 +Subject: Fix server crash due to invalid images + +See https://bugs.freedesktop.org/show_bug.cgi?id=39383 + +Signed-off-by: Kirill Elagin <kirelagin@gmail.com> +Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> +(cherry picked from commit 53611213396479abfdce0f7752681572e0d26d78) +--- +diff --git a/fb/fbpict.c b/fb/fbpict.c +index d1fd0cb..57c93fd 100644 +--- a/fb/fbpict.c ++++ b/fb/fbpict.c +@@ -163,7 +163,9 @@ create_bits_picture (PicturePtr pict, + (pixman_format_code_t)pict->format, + pixmap->drawable.width, pixmap->drawable.height, + (uint32_t *)bits, stride * sizeof (FbStride)); +- ++ ++ if (!image) ++ return NULL; + + #ifdef FB_ACCESS_WRAPPER + #if FB_SHIFT==5 +-- +cgit v0.9.0.2-2-gbebe +From 65469f5ea98074ab27ce0a2d482157b9d5c2cbc7 Mon Sep 17 00:00:00 2001 +From: vdb@picaros.org <vdb@picaros.org> +Date: Sat, 17 Sep 2011 16:55:47 +0000 +Subject: Fix a rare memory leak + +Signed-off-by: Servaas Vandenberghe <vdb@picaros.org> +Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> +(cherry picked from commit e4cddf509e1729e8ff40354275b65455111ad2bd) +--- +diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c +index c2814d4..3fae039 100644 +--- a/hw/xfree86/modes/xf86Crtc.c ++++ b/hw/xfree86/modes/xf86Crtc.c +@@ -133,6 +133,7 @@ xf86CrtcCreate (ScrnInfoPtr scrn, + crtcs = malloc((xf86_config->num_crtc + 1) * sizeof (xf86CrtcPtr)); + if (!crtcs) + { ++ free(crtc->gamma_red); + free(crtc); + return NULL; + } +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/xorg-server/revert-trapezoids.patch b/extra/xorg-server/revert-trapezoids.patch new file mode 100644 index 000000000..b9046c5cb --- /dev/null +++ b/extra/xorg-server/revert-trapezoids.patch @@ -0,0 +1,179 @@ +diff -ru a/fb/fbpict.c b/fb/fbpict.c +--- a/fb/fbpict.c 2011-08-01 01:44:24.000000000 +0200 ++++ b/fb/fbpict.c 2011-10-05 22:45:29.000000000 +0200 +@@ -364,7 +364,7 @@ + ps->Glyphs = miGlyphs; + ps->CompositeRects = miCompositeRects; + ps->RasterizeTrapezoid = fbRasterizeTrapezoid; +- ps->Trapezoids = fbTrapezoids; ++ ps->Trapezoids = miTrapezoids; + ps->AddTraps = fbAddTraps; + ps->AddTriangles = fbAddTriangles; + ps->Triangles = fbTriangles; +diff -ru a/render/mipict.c b/render/mipict.c +--- a/render/mipict.c 2011-04-04 05:19:50.000000000 +0200 ++++ b/render/mipict.c 2011-10-05 22:02:53.000000000 +0200 +@@ -573,6 +573,67 @@ + } + } + ++void ++miTrapezoids (CARD8 op, ++ PicturePtr pSrc, ++ PicturePtr pDst, ++ PictFormatPtr maskFormat, ++ INT16 xSrc, ++ INT16 ySrc, ++ int ntrap, ++ xTrapezoid *traps) ++{ ++ ScreenPtr pScreen = pDst->pDrawable->pScreen; ++ PictureScreenPtr ps = GetPictureScreen(pScreen); ++ ++ /* ++ * Check for solid alpha add ++ */ ++ if (op == PictOpAdd && miIsSolidAlpha (pSrc)) ++ { ++ for (; ntrap; ntrap--, traps++) ++ (*ps->RasterizeTrapezoid) (pDst, traps, 0, 0); ++ } ++ else if (maskFormat) ++ { ++ PicturePtr pPicture; ++ BoxRec bounds; ++ INT16 xDst, yDst; ++ INT16 xRel, yRel; ++ ++ xDst = traps[0].left.p1.x >> 16; ++ yDst = traps[0].left.p1.y >> 16; ++ ++ miTrapezoidBounds (ntrap, traps, &bounds); ++ if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2) ++ return; ++ pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat, ++ bounds.x2 - bounds.x1, ++ bounds.y2 - bounds.y1); ++ if (!pPicture) ++ return; ++ for (; ntrap; ntrap--, traps++) ++ (*ps->RasterizeTrapezoid) (pPicture, traps, ++ -bounds.x1, -bounds.y1); ++ xRel = bounds.x1 + xSrc - xDst; ++ yRel = bounds.y1 + ySrc - yDst; ++ CompositePicture (op, pSrc, pPicture, pDst, ++ xRel, yRel, 0, 0, bounds.x1, bounds.y1, ++ bounds.x2 - bounds.x1, ++ bounds.y2 - bounds.y1); ++ FreePicture (pPicture, 0); ++ } ++ else ++ { ++ if (pDst->polyEdge == PolyEdgeSharp) ++ maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1); ++ else ++ maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8); ++ for (; ntrap; ntrap--, traps++) ++ miTrapezoids (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps); ++ } ++} ++ + Bool + miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) + { +@@ -599,7 +660,7 @@ + ps->Composite = 0; /* requires DDX support */ + ps->Glyphs = miGlyphs; + ps->CompositeRects = miCompositeRects; +- ps->Trapezoids = 0; ++ ps->Trapezoids = miTrapezoids; + ps->Triangles = 0; + + ps->RasterizeTrapezoid = 0; /* requires DDX support */ +diff -ru a/render/mipict.h b/render/mipict.h +--- a/render/mipict.h 2011-04-04 05:19:50.000000000 +0200 ++++ b/render/mipict.h 2011-10-05 22:06:19.000000000 +0200 +@@ -129,6 +129,23 @@ + CARD32 pixel, + xRenderColor *color); + ++extern _X_EXPORT PicturePtr ++miCreateAlphaPicture (ScreenPtr pScreen, ++ PicturePtr pDst, ++ PictFormatPtr pPictFormat, ++ CARD16 width, ++ CARD16 height); ++ ++extern _X_EXPORT void ++miTrapezoids (CARD8 op, ++ PicturePtr pSrc, ++ PicturePtr pDst, ++ PictFormatPtr maskFormat, ++ INT16 xSrc, ++ INT16 ySrc, ++ int ntrap, ++ xTrapezoid *traps); ++ + extern _X_EXPORT Bool + miIsSolidAlpha (PicturePtr pSrc); + +diff -ru a/render/mitrap.c b/render/mitrap.c +--- a/render/mitrap.c 2011-04-04 05:19:50.000000000 +0200 ++++ b/render/mitrap.c 2011-10-05 22:05:29.000000000 +0200 +@@ -34,6 +34,55 @@ + #include "picturestr.h" + #include "mipict.h" + ++PicturePtr ++miCreateAlphaPicture (ScreenPtr pScreen, ++ PicturePtr pDst, ++ PictFormatPtr pPictFormat, ++ CARD16 width, ++ CARD16 height) ++{ ++ PixmapPtr pPixmap; ++ PicturePtr pPicture; ++ GCPtr pGC; ++ int error; ++ xRectangle rect; ++ ++ if (width > 32767 || height > 32767) ++ return 0; ++ ++ if (!pPictFormat) ++ { ++ if (pDst->polyEdge == PolyEdgeSharp) ++ pPictFormat = PictureMatchFormat (pScreen, 1, PICT_a1); ++ else ++ pPictFormat = PictureMatchFormat (pScreen, 8, PICT_a8); ++ if (!pPictFormat) ++ return 0; ++ } ++ ++ pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, ++ pPictFormat->depth, 0); ++ if (!pPixmap) ++ return 0; ++ pGC = GetScratchGC (pPixmap->drawable.depth, pScreen); ++ if (!pGC) ++ { ++ (*pScreen->DestroyPixmap) (pPixmap); ++ return 0; ++ } ++ ValidateGC (&pPixmap->drawable, pGC); ++ rect.x = 0; ++ rect.y = 0; ++ rect.width = width; ++ rect.height = height; ++ (*pGC->ops->PolyFillRect)(&pPixmap->drawable, pGC, 1, &rect); ++ FreeScratchGC (pGC); ++ pPicture = CreatePicture (0, &pPixmap->drawable, pPictFormat, ++ 0, 0, serverClient, &error); ++ (*pScreen->DestroyPixmap) (pPixmap); ++ return pPicture; ++} ++ + static xFixed + miLineFixedX (xLineFixed *l, xFixed y, Bool ceil) + { + diff --git a/extra/xorg-server/xserver-1.10-pointer-barriers.patch b/extra/xorg-server/xserver-1.10-pointer-barriers.patch deleted file mode 100644 index 099565436..000000000 --- a/extra/xorg-server/xserver-1.10-pointer-barriers.patch +++ /dev/null @@ -1,1054 +0,0 @@ -From 14f1112bec18ccece8e732fe6c200a56546230c7 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Thu, 17 Mar 2011 13:56:17 -0400 -Subject: [PATCH] CRTC confine and pointer barriers - ---- - dix/events.c | 7 + - dix/getevents.c | 12 +- - include/dix.h | 1 + - include/protocol-versions.h | 2 +- - mi/mipointer.c | 16 ++- - mi/mipointer.h | 6 + - randr/randr.c | 2 + - randr/randrstr.h | 4 + - randr/rrcrtc.c | 155 ++++++++++++++++ - test/Makefile.am | 4 +- - xfixes/cursor.c | 408 ++++++++++++++++++++++++++++++++++++++++++- - xfixes/xfixes.c | 24 ++- - xfixes/xfixes.h | 17 ++ - xfixes/xfixesint.h | 16 ++ - 14 files changed, 658 insertions(+), 16 deletions(-) - -diff --git a/dix/events.c b/dix/events.c -index 07f8b05..d2be84f 100644 ---- a/dix/events.c -+++ b/dix/events.c -@@ -328,6 +328,13 @@ IsMaster(DeviceIntPtr dev) - return dev->type == MASTER_POINTER || dev->type == MASTER_KEYBOARD; - } - -+Bool -+IsFloating(DeviceIntPtr dev) -+{ -+ return GetMaster(dev, MASTER_KEYBOARD) == NULL; -+} -+ -+ - /** - * Max event opcode. - */ -diff --git a/dix/getevents.c b/dix/getevents.c -index 794df42..c66e516 100644 ---- a/dix/getevents.c -+++ b/dix/getevents.c -@@ -812,7 +812,11 @@ accelPointer(DeviceIntPtr dev, int first, int num, int *valuators, CARD32 ms) - * miPointerSetPosition() and then scale back into device coordinates (if - * needed). miPSP will change x/y if the screen was crossed. - * -+ * The coordinates provided are always absolute. The parameter mode whether -+ * it was relative or absolute movement that landed us at those coordinates. -+ * - * @param dev The device to be moved. -+ * @param mode Movement mode (Absolute or Relative) - * @param x Pointer to current x-axis value, may be modified. - * @param y Pointer to current y-axis value, may be modified. - * @param x_frac Fractional part of current x-axis value, may be modified. -@@ -824,7 +828,8 @@ accelPointer(DeviceIntPtr dev, int first, int num, int *valuators, CARD32 ms) - * @param screeny_frac Fractional part of screen y coordinate, as above. - */ - static void --positionSprite(DeviceIntPtr dev, int *x, int *y, float x_frac, float y_frac, -+positionSprite(DeviceIntPtr dev, int mode, -+ int *x, int *y, float x_frac, float y_frac, - ScreenPtr scr, int *screenx, int *screeny, float *screenx_frac, float *screeny_frac) - { - int old_screenx, old_screeny; -@@ -863,7 +868,7 @@ positionSprite(DeviceIntPtr dev, int *x, int *y, float x_frac, float y_frac, - old_screeny = *screeny; - /* This takes care of crossing screens for us, as well as clipping - * to the current screen. */ -- miPointerSetPosition(dev, screenx, screeny); -+ _miPointerSetPosition(dev, mode, screenx, screeny); - - if (dev->u.master) { - dev->u.master->last.valuators[0] = *screenx; -@@ -1193,7 +1198,8 @@ GetPointerEvents(EventList *events, DeviceIntPtr pDev, int type, int buttons, - - set_raw_valuators(raw, &mask, raw->valuators.data); - -- positionSprite(pDev, &x, &y, x_frac, y_frac, scr, &cx, &cy, &cx_frac, &cy_frac); -+ positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative, -+ &x, &y, x_frac, y_frac, scr, &cx, &cy, &cx_frac, &cy_frac); - updateHistory(pDev, &mask, ms); - - /* Update the valuators with the true value sent to the client*/ -diff --git a/include/dix.h b/include/dix.h -index 12e4b59..3f99098 100644 ---- a/include/dix.h -+++ b/include/dix.h -@@ -570,6 +570,7 @@ extern Bool _X_EXPORT IsPointerDevice( DeviceIntPtr dev); - extern Bool _X_EXPORT IsKeyboardDevice(DeviceIntPtr dev); - extern Bool IsPointerEvent(InternalEvent *event); - extern _X_EXPORT Bool IsMaster(DeviceIntPtr dev); -+extern _X_EXPORT Bool IsFloating(DeviceIntPtr dev); - - extern _X_HIDDEN void CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master); - extern _X_HIDDEN int CorePointerProc(DeviceIntPtr dev, int what); -diff --git a/include/protocol-versions.h b/include/protocol-versions.h -index 1d33bdd..1dc66ad 100644 ---- a/include/protocol-versions.h -+++ b/include/protocol-versions.h -@@ -126,7 +126,7 @@ - #define SERVER_XF86VIDMODE_MINOR_VERSION 2 - - /* Fixes */ --#define SERVER_XFIXES_MAJOR_VERSION 4 -+#define SERVER_XFIXES_MAJOR_VERSION 5 - #define SERVER_XFIXES_MINOR_VERSION 0 - - /* X Input */ -diff --git a/mi/mipointer.c b/mi/mipointer.c -index 554397a..85f1949 100644 ---- a/mi/mipointer.c -+++ b/mi/mipointer.c -@@ -229,6 +229,10 @@ miPointerSetCursorPosition(DeviceIntPtr pDev, ScreenPtr pScreen, - SetupScreen (pScreen); - - GenerateEvent = generateEvent; -+ -+ if (pScreen->ConstrainCursorHarder) -+ pScreen->ConstrainCursorHarder(pDev, pScreen, Absolute, &x, &y); -+ - /* device dependent - must pend signal and call miPointerWarpCursor */ - (*pScreenPriv->screenFuncs->WarpCursor) (pDev, pScreen, x, y); - if (!generateEvent) -@@ -484,7 +488,7 @@ miPointerMoveNoEvent (DeviceIntPtr pDev, ScreenPtr pScreen, - } - - void --miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y) -+_miPointerSetPosition(DeviceIntPtr pDev, int mode, int *x, int *y) - { - miPointerScreenPtr pScreenPriv; - ScreenPtr pScreen; -@@ -529,6 +533,9 @@ miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y) - if (*y >= pPointer->limits.y2) - *y = pPointer->limits.y2 - 1; - -+ if (pScreen->ConstrainCursorHarder) -+ pScreen->ConstrainCursorHarder(pDev, pScreen, mode, x, y); -+ - if (pPointer->x == *x && pPointer->y == *y && - pPointer->pScreen == pScreen) - return; -@@ -536,6 +543,13 @@ miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y) - miPointerMoveNoEvent(pDev, pScreen, *x, *y); - } - -+/* ABI hack */ -+void -+miPointerSetPosition(DeviceIntPtr pDev, int *x, int *y) -+{ -+ _miPointerSetPosition(pDev, Absolute, x, y); -+} -+ - void - miPointerGetPosition(DeviceIntPtr pDev, int *x, int *y) - { -diff --git a/mi/mipointer.h b/mi/mipointer.h -index 3c86110..6b6010c 100644 ---- a/mi/mipointer.h -+++ b/mi/mipointer.h -@@ -131,6 +131,12 @@ extern _X_EXPORT void miPointerGetPosition( - - /* Moves the cursor to the specified position. May clip the co-ordinates: - * x and y are modified in-place. */ -+extern _X_EXPORT void _miPointerSetPosition( -+ DeviceIntPtr pDev, -+ int mode, -+ int *x, -+ int *y); -+ - extern _X_EXPORT void miPointerSetPosition( - DeviceIntPtr pDev, - int *x, -diff --git a/randr/randr.c b/randr/randr.c -index 6077705..d337129 100644 ---- a/randr/randr.c -+++ b/randr/randr.c -@@ -270,6 +270,8 @@ Bool RRScreenInit(ScreenPtr pScreen) - - wrap (pScrPriv, pScreen, CloseScreen, RRCloseScreen); - -+ pScreen->ConstrainCursorHarder = RRConstrainCursorHarder; -+ - pScrPriv->numOutputs = 0; - pScrPriv->outputs = NULL; - pScrPriv->numCrtcs = 0; -diff --git a/randr/randrstr.h b/randr/randrstr.h -index 7ea6080..d8dd37d 100644 ---- a/randr/randrstr.h -+++ b/randr/randrstr.h -@@ -297,6 +297,7 @@ typedef struct _rrScrPriv { - int rate; - int size; - #endif -+ Bool discontiguous; - } rrScrPrivRec, *rrScrPrivPtr; - - extern _X_EXPORT DevPrivateKeyRec rrPrivKeyRec; -@@ -700,6 +701,9 @@ ProcRRGetPanning (ClientPtr client); - int - ProcRRSetPanning (ClientPtr client); - -+void -+RRConstrainCursorHarder (DeviceIntPtr, ScreenPtr, int, int *, int *); -+ - /* rrdispatch.c */ - extern _X_EXPORT Bool - RRClientKnowsRates (ClientPtr pClient); -diff --git a/randr/rrcrtc.c b/randr/rrcrtc.c -index 98206a2..d4d8f2a 100644 ---- a/randr/rrcrtc.c -+++ b/randr/rrcrtc.c -@@ -1,5 +1,6 @@ - /* - * Copyright © 2006 Keith Packard -+ * Copyright 2010 Red Hat, Inc - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that -@@ -22,6 +23,7 @@ - - #include "randrstr.h" - #include "swaprep.h" -+#include "mipointer.h" - - RESTYPE RRCrtcType; - -@@ -292,6 +294,92 @@ RRCrtcPendingProperties (RRCrtcPtr crtc) - return FALSE; - } - -+static void -+crtc_bounds(RRCrtcPtr crtc, int *left, int *right, int *top, int *bottom) -+{ -+ *left = crtc->x; -+ *top = crtc->y; -+ -+ switch (crtc->rotation) { -+ case RR_Rotate_0: -+ case RR_Rotate_180: -+ default: -+ *right = crtc->x + crtc->mode->mode.width; -+ *bottom = crtc->y + crtc->mode->mode.height; -+ return; -+ case RR_Rotate_90: -+ case RR_Rotate_270: -+ *right = crtc->x + crtc->mode->mode.height; -+ *bottom = crtc->y + crtc->mode->mode.width; -+ return; -+ } -+} -+ -+/* overlapping counts as adjacent */ -+static Bool -+crtcs_adjacent(const RRCrtcPtr a, const RRCrtcPtr b) -+{ -+ /* left, right, top, bottom... */ -+ int al, ar, at, ab; -+ int bl, br, bt, bb; -+ int cl, cr, ct, cb; /* the overlap, if any */ -+ -+ crtc_bounds(a, &al, &ar, &at, &ab); -+ crtc_bounds(b, &bl, &br, &bt, &bb); -+ -+ cl = max(al, bl); -+ cr = min(ar, br); -+ ct = max(at, bt); -+ cb = min(ab, bb); -+ -+ return (cl <= cr) && (ct <= cb); -+} -+ -+/* Depth-first search and mark all CRTCs reachable from cur */ -+static void -+mark_crtcs (rrScrPrivPtr pScrPriv, int *reachable, int cur) -+{ -+ int i; -+ reachable[cur] = TRUE; -+ for (i = 0; i < pScrPriv->numCrtcs; ++i) { -+ if (reachable[i] || !pScrPriv->crtcs[i]->mode) -+ continue; -+ if (crtcs_adjacent(pScrPriv->crtcs[cur], pScrPriv->crtcs[i])) -+ mark_crtcs(pScrPriv, reachable, i); -+ } -+} -+ -+static void -+RRComputeContiguity (ScreenPtr pScreen) -+{ -+ rrScrPriv(pScreen); -+ Bool discontiguous = TRUE; -+ int i, n = pScrPriv->numCrtcs; -+ -+ int *reachable = calloc(n, sizeof(int)); -+ if (!reachable) -+ goto out; -+ -+ /* Find first enabled CRTC and start search for reachable CRTCs from it */ -+ for (i = 0; i < n; ++i) { -+ if (pScrPriv->crtcs[i]->mode) { -+ mark_crtcs(pScrPriv, reachable, i); -+ break; -+ } -+ } -+ -+ /* Check that all enabled CRTCs were marked as reachable */ -+ for (i = 0; i < n; ++i) -+ if (pScrPriv->crtcs[i]->mode && !reachable[i]) -+ goto out; -+ -+ discontiguous = FALSE; -+ -+out: -+ free(reachable); -+ pScrPriv->discontiguous = discontiguous; -+} -+ - /* - * Request that the Crtc be reconfigured - */ -@@ -306,6 +394,7 @@ RRCrtcSet (RRCrtcPtr crtc, - { - ScreenPtr pScreen = crtc->pScreen; - Bool ret = FALSE; -+ Bool recompute = TRUE; - rrScrPriv(pScreen); - - /* See if nothing changed */ -@@ -318,6 +407,7 @@ RRCrtcSet (RRCrtcPtr crtc, - !RRCrtcPendingProperties (crtc) && - !RRCrtcPendingTransform (crtc)) - { -+ recompute = FALSE; - ret = TRUE; - } - else -@@ -381,6 +471,10 @@ RRCrtcSet (RRCrtcPtr crtc, - RRPostPendingProperties (outputs[o]); - } - } -+ -+ if (recompute) -+ RRComputeContiguity(pScreen); -+ - return ret; - } - -@@ -1349,3 +1443,64 @@ ProcRRGetCrtcTransform (ClientPtr client) - free(reply); - return Success; - } -+ -+void -+RRConstrainCursorHarder(DeviceIntPtr pDev, ScreenPtr pScreen, int mode, int *x, int *y) -+{ -+ rrScrPriv (pScreen); -+ int i; -+ -+ /* intentional dead space -> let it float */ -+ if (pScrPriv->discontiguous) -+ return; -+ -+ /* if we're moving inside a crtc, we're fine */ -+ for (i = 0; i < pScrPriv->numCrtcs; i++) { -+ RRCrtcPtr crtc = pScrPriv->crtcs[i]; -+ -+ int left, right, top, bottom; -+ -+ if (!crtc->mode) -+ continue; -+ -+ crtc_bounds(crtc, &left, &right, &top, &bottom); -+ -+ if ((*x >= left) && (*x <= right) && (*y >= top) && (*y <= bottom)) -+ return; -+ } -+ -+ /* if we're trying to escape, clamp to the CRTC we're coming from */ -+ for (i = 0; i < pScrPriv->numCrtcs; i++) { -+ RRCrtcPtr crtc = pScrPriv->crtcs[i]; -+ int nx, ny; -+ int left, right, top, bottom; -+ -+ if (!crtc->mode) -+ continue; -+ -+ crtc_bounds(crtc, &left, &right, &top, &bottom); -+ miPointerGetPosition(pDev, &nx, &ny); -+ -+ if ((nx >= left) && (nx <= right) && (ny >= top) && (ny <= bottom)) { -+ if ((*x <= left) || (*x >= right)) { -+ int dx = *x - nx; -+ -+ if (dx > 0) -+ *x = right; -+ else if (dx < 0) -+ *x = left; -+ } -+ -+ if ((*y <= top) || (*y >= bottom)) { -+ int dy = *y - ny; -+ -+ if (dy > 0) -+ *y = bottom; -+ else if (dy < 0) -+ *y = top; -+ } -+ -+ return; -+ } -+ } -+} -diff --git a/test/Makefile.am b/test/Makefile.am -index 456221e..ccdb859 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -1,6 +1,6 @@ - if UNITTESTS - SUBDIRS= . xi2 --check_PROGRAMS = xkb input xtest -+check_PROGRAMS = xkb input xtest list fixes - check_LTLIBRARIES = libxservertest.la - - TESTS=$(check_PROGRAMS) -@@ -16,6 +16,8 @@ endif - xkb_LDADD=$(TEST_LDADD) - input_LDADD=$(TEST_LDADD) - xtest_LDADD=$(TEST_LDADD) -+list_LDADD=$(TEST_LDADD) -+fixes_LDADD=$(TEST_LDADD) - - libxservertest_la_LIBADD = \ - $(XSERVER_LIBS) \ -diff --git a/xfixes/cursor.c b/xfixes/cursor.c -index fb608f6..5c55c95 100644 ---- a/xfixes/cursor.c -+++ b/xfixes/cursor.c -@@ -1,5 +1,6 @@ - /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. -+ * Copyright 2010 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), -@@ -50,13 +51,16 @@ - #include "cursorstr.h" - #include "dixevents.h" - #include "servermd.h" -+#include "mipointer.h" - #include "inputstr.h" - #include "windowstr.h" - #include "xace.h" -+#include "list.h" - - static RESTYPE CursorClientType; - static RESTYPE CursorHideCountType; - static RESTYPE CursorWindowType; -+RESTYPE PointerBarrierType; - static CursorPtr CursorCurrent[MAXDEVICES]; - - static DevPrivateKeyRec CursorScreenPrivateKeyRec; -@@ -107,6 +111,14 @@ typedef struct _CursorHideCountRec { - XID resource; - } CursorHideCountRec; - -+typedef struct PointerBarrierClient *PointerBarrierClientPtr; -+ -+struct PointerBarrierClient { -+ ScreenPtr screen; -+ struct PointerBarrier barrier; -+ struct list entry; -+}; -+ - /* - * Wrap DisplayCursor to catch cursor change events - */ -@@ -114,7 +126,9 @@ typedef struct _CursorHideCountRec { - typedef struct _CursorScreen { - DisplayCursorProcPtr DisplayCursor; - CloseScreenProcPtr CloseScreen; -+ ConstrainCursorHarderProcPtr ConstrainCursorHarder; - CursorHideCountPtr pCursorHideCounts; -+ struct list barriers; - } CursorScreenRec, *CursorScreenPtr; - - #define GetCursorScreen(s) ((CursorScreenPtr)dixLookupPrivate(&(s)->devPrivates, CursorScreenPrivateKey)) -@@ -184,9 +198,11 @@ CursorCloseScreen (int index, ScreenPtr pScreen) - Bool ret; - CloseScreenProcPtr close_proc; - DisplayCursorProcPtr display_proc; -+ ConstrainCursorHarderProcPtr constrain_proc; - - Unwrap (cs, pScreen, CloseScreen, close_proc); - Unwrap (cs, pScreen, DisplayCursor, display_proc); -+ Unwrap (cs, pScreen, ConstrainCursorHarder, constrain_proc); - deleteCursorHideCountsForScreen(pScreen); - ret = (*pScreen->CloseScreen) (index, pScreen); - free(cs); -@@ -1029,6 +1045,391 @@ CursorFreeWindow (pointer data, XID id) - return 1; - } - -+static BOOL -+barrier_is_horizontal(const struct PointerBarrier *barrier) -+{ -+ return barrier->y1 == barrier->y2; -+} -+ -+static BOOL -+barrier_is_vertical(const struct PointerBarrier *barrier) -+{ -+ return barrier->x1 == barrier->x2; -+} -+ -+/** -+ * @return The set of barrier movement directions the movement vector -+ * x1/y1 → x2/y2 represents. -+ */ -+int -+barrier_get_direction(int x1, int y1, int x2, int y2) -+{ -+ int direction = 0; -+ -+ /* which way are we trying to go */ -+ if (x2 > x1) -+ direction |= BarrierPositiveX; -+ if (x2 < x1) -+ direction |= BarrierNegativeX; -+ if (y2 > y1) -+ direction |= BarrierPositiveY; -+ if (y2 < y1) -+ direction |= BarrierNegativeY; -+ -+ return direction; -+} -+ -+/** -+ * Test if the barrier may block movement in the direction defined by -+ * x1/y1 → x2/y2. This function only tests whether the directions could be -+ * blocked, it does not test if the barrier actually blocks the movement. -+ * -+ * @return TRUE if the barrier blocks the direction of movement or FALSE -+ * otherwise. -+ */ -+BOOL -+barrier_is_blocking_direction(const struct PointerBarrier *barrier, int direction) -+{ -+ /* Barriers define which way is ok, not which way is blocking */ -+ return (barrier->directions & direction) != direction; -+} -+ -+/** -+ * Test if the movement vector x1/y1 → x2/y2 is intersecting with the -+ * barrier. A movement vector with the startpoint or endpoint on the barrier -+ * itself counts as intersecting. -+ * -+ * @param x1 X start coordinate of movement vector -+ * @param y1 Y start coordinate of movement vector -+ * @param x2 X end coordinate of movement vector -+ * @param y2 Y end coordinate of movement vector -+ * @param[out] distance The distance between the start point and the -+ * intersection with the barrier (if applicable). -+ * @return TRUE if the barrier intersects with the given vector -+ */ -+BOOL -+barrier_is_blocking(const struct PointerBarrier *barrier, -+ int x1, int y1, int x2, int y2, -+ double *distance) -+{ -+ BOOL rc = FALSE; -+ float ua, ub, ud; -+ int dir = barrier_get_direction(x1, y1, x2, y2); -+ -+ /* Algorithm below doesn't handle edge cases well, hence the extra -+ * checks. */ -+ if (barrier_is_vertical(barrier)) { -+ /* handle immediate barrier adjacency, moving away */ -+ if (dir & BarrierPositiveX && x1 == barrier->x1) -+ return FALSE; -+ if (dir & BarrierNegativeX && x1 == (barrier->x1 - 1)) -+ return FALSE; -+ /* startpoint on barrier */ -+ if (x1 == barrier->x1 && y1 >= barrier->y1 && y1 <= barrier->y2) { -+ *distance = 0; -+ return TRUE; -+ } -+ /* endpoint on barrier */ -+ if (x2 == barrier->x1 && y2 >= barrier->y1 && y2 <= barrier->y2) { -+ *distance = abs(x2 - x1); -+ return TRUE; -+ } -+ } else { -+ /* handle immediate barrier adjacency, moving away */ -+ if (dir & BarrierPositiveY && y1 == barrier->y1) -+ return FALSE; -+ if (dir & BarrierNegativeY && y1 == (barrier->y1 - 1)) -+ return FALSE; -+ /* startpoint on barrier */ -+ if (y1 == barrier->y1 && x1 >= barrier->x1 && x1 <= barrier->x2) { -+ *distance = 0; -+ return TRUE; -+ } -+ /* endpoint on barrier */ -+ if (y2 == barrier->y1 && x2 >= barrier->x1 && x2 <= barrier->x2) { -+ *distance = abs(y2 - y1); -+ return TRUE; -+ } -+ } -+ -+ /* not an edge case, compute distance */ -+ ua = 0; -+ ud = (barrier->y2 - barrier->y1) * (x2 - x1) - (barrier->x2 - barrier->x1) * (y2 - y1); -+ if (ud != 0) { -+ ua = ((barrier->x2 - barrier->x1) * (y1 - barrier->y1) - -+ (barrier->y2 - barrier->y1) * (x1 - barrier->x1)) / ud; -+ ub = ((x2 - x1) * (y1 - barrier->y1) - -+ (y2 - y1) * (x1 - barrier->x1)) / ud; -+ if (ua < 0 || ua > 1 || ub < 0 || ub > 1) -+ ua = 0; -+ } -+ -+ if (ua > 0 && ua <= 1) -+ { -+ double ix = barrier->x1 + ua * (barrier->x2 - barrier->x1); -+ double iy = barrier->y1 + ua * (barrier->y2 - barrier->y1); -+ -+ *distance = sqrt(pow(x1 - ix, 2) + pow(y1 - iy, 2)); -+ rc = TRUE; -+ } -+ -+ return rc; -+} -+ -+/** -+ * Find the nearest barrier that is blocking movement from x1/y1 to x2/y2. -+ * -+ * @param dir Only barriers blocking movement in direction dir are checked -+ * @param x1 X start coordinate of movement vector -+ * @param y1 Y start coordinate of movement vector -+ * @param x2 X end coordinate of movement vector -+ * @param y2 Y end coordinate of movement vector -+ * @return The barrier nearest to the movement origin that blocks this movement. -+ */ -+static struct PointerBarrier* -+barrier_find_nearest(CursorScreenPtr cs, int dir, -+ int x1, int y1, int x2, int y2) -+{ -+ struct PointerBarrierClient *c; -+ struct PointerBarrier *nearest = NULL; -+ double min_distance = INT_MAX; /* can't get higher than that in X anyway */ -+ -+ list_for_each_entry(c, &cs->barriers, entry) { -+ struct PointerBarrier *b = &c->barrier; -+ double distance; -+ -+ if (!barrier_is_blocking_direction(b, dir)) -+ continue; -+ -+ if (barrier_is_blocking(b, x1, y1, x2, y2, &distance)) -+ { -+ if (min_distance > distance) -+ { -+ min_distance = distance; -+ nearest = b; -+ } -+ } -+ } -+ -+ return nearest; -+} -+ -+/** -+ * Clamp to the given barrier given the movement direction specified in dir. -+ * -+ * @param barrier The barrier to clamp to -+ * @param dir The movement direction -+ * @param[out] x The clamped x coordinate. -+ * @param[out] y The clamped x coordinate. -+ */ -+void -+barrier_clamp_to_barrier(struct PointerBarrier *barrier, int dir, int *x, int *y) -+{ -+ if (barrier_is_vertical(barrier)) { -+ if ((dir & BarrierNegativeX) & ~barrier->directions) -+ *x = barrier->x1; -+ if ((dir & BarrierPositiveX) & ~barrier->directions) -+ *x = barrier->x1 - 1; -+ } -+ if (barrier_is_horizontal(barrier)) -+ { -+ if ((dir & BarrierNegativeY) & ~barrier->directions) -+ *y = barrier->y1; -+ if ((dir & BarrierPositiveY) & ~barrier->directions) -+ *y = barrier->y1 - 1; -+ } -+} -+ -+static void -+CursorConstrainCursorHarder(DeviceIntPtr dev, ScreenPtr screen, int mode, int *x, int *y) -+{ -+ CursorScreenPtr cs = GetCursorScreen(screen); -+ -+ if (!list_is_empty(&cs->barriers) && !IsFloating(dev) && mode == Relative) { -+ int ox, oy; -+ int dir; -+ struct PointerBarrier *nearest = NULL; -+ -+ /* where are we coming from */ -+ miPointerGetPosition(dev, &ox, &oy); -+ -+ /* How this works: -+ * Given the origin and the movement vector, get the nearest barrier -+ * to the origin that is blocking the movement. -+ * Clamp to that barrier. -+ * Then, check from the clamped position to the original -+ * destination, again finding the nearest barrier and clamping. -+ */ -+ dir = barrier_get_direction(ox, oy, *x, *y); -+ -+ nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y); -+ if (nearest) { -+ barrier_clamp_to_barrier(nearest, dir, x, y); -+ -+ if (barrier_is_vertical(nearest)) { -+ dir &= ~(BarrierNegativeX | BarrierPositiveX); -+ ox = *x; -+ } else if (barrier_is_horizontal(nearest)) { -+ dir &= ~(BarrierNegativeY | BarrierPositiveY); -+ oy = *y; -+ } -+ -+ nearest = barrier_find_nearest(cs, dir, ox, oy, *x, *y); -+ if (nearest) { -+ barrier_clamp_to_barrier(nearest, dir, x, y); -+ } -+ } -+ } -+ -+ if (cs->ConstrainCursorHarder) { -+ screen->ConstrainCursorHarder = cs->ConstrainCursorHarder; -+ screen->ConstrainCursorHarder(dev, screen, mode, x, y); -+ screen->ConstrainCursorHarder = CursorConstrainCursorHarder; -+ } -+} -+ -+static struct PointerBarrierClient * -+CreatePointerBarrierClient(ScreenPtr screen, ClientPtr client, -+ xXFixesCreatePointerBarrierReq *stuff) -+{ -+ CursorScreenPtr cs = GetCursorScreen(screen); -+ struct PointerBarrierClient *ret = malloc(sizeof(*ret)); -+ -+ if (ret) { -+ ret->screen = screen; -+ ret->barrier.x1 = min(stuff->x1, stuff->x2); -+ ret->barrier.x2 = max(stuff->x1, stuff->x2); -+ ret->barrier.y1 = min(stuff->y1, stuff->y2); -+ ret->barrier.y2 = max(stuff->y1, stuff->y2); -+ ret->barrier.directions = stuff->directions & 0x0f; -+ if (barrier_is_horizontal(&ret->barrier)) -+ ret->barrier.directions &= ~(BarrierPositiveX | BarrierNegativeX); -+ if (barrier_is_vertical(&ret->barrier)) -+ ret->barrier.directions &= ~(BarrierPositiveY | BarrierNegativeY); -+ list_add(&ret->entry, &cs->barriers); -+ } -+ -+ return ret; -+} -+ -+int -+ProcXFixesCreatePointerBarrier (ClientPtr client) -+{ -+ int err; -+ WindowPtr pWin; -+ struct PointerBarrierClient *barrier; -+ struct PointerBarrier b; -+ REQUEST (xXFixesCreatePointerBarrierReq); -+ -+ REQUEST_SIZE_MATCH(xXFixesCreatePointerBarrierReq); -+ LEGAL_NEW_RESOURCE(stuff->barrier, client); -+ -+ err = dixLookupWindow(&pWin, stuff->window, client, DixReadAccess); -+ if (err != Success) { -+ client->errorValue = stuff->window; -+ return err; -+ } -+ -+ /* This sure does need fixing. */ -+ if (stuff->num_devices) -+ return BadImplementation; -+ -+ b.x1 = stuff->x1; -+ b.x2 = stuff->x2; -+ b.y1 = stuff->y1; -+ b.y2 = stuff->y2; -+ -+ if (!barrier_is_horizontal(&b) && !barrier_is_vertical(&b)) -+ return BadValue; -+ -+ /* no 0-sized barriers */ -+ if (barrier_is_horizontal(&b) && barrier_is_vertical(&b)) -+ return BadValue; -+ -+ if (!(barrier = CreatePointerBarrierClient(pWin->drawable.pScreen, -+ client, stuff))) -+ return BadAlloc; -+ -+ if (!AddResource(stuff->barrier, PointerBarrierType, &barrier->barrier)) -+ return BadAlloc; -+ -+ return Success; -+} -+ -+int -+SProcXFixesCreatePointerBarrier (ClientPtr client) -+{ -+ int n; -+ REQUEST(xXFixesCreatePointerBarrierReq); -+ -+ swaps(&stuff->length, n); -+ REQUEST_SIZE_MATCH(xXFixesCreatePointerBarrierReq); -+ swapl(&stuff->barrier, n); -+ swapl(&stuff->window, n); -+ swaps(&stuff->x1, n); -+ swaps(&stuff->y1, n); -+ swaps(&stuff->x2, n); -+ swaps(&stuff->y2, n); -+ swapl(&stuff->directions, n); -+ return ProcXFixesVector[stuff->xfixesReqType](client); -+} -+ -+static int -+CursorFreeBarrier(void *data, XID id) -+{ -+ struct PointerBarrierClient *b = NULL, *barrier; -+ ScreenPtr screen; -+ CursorScreenPtr cs; -+ -+ barrier = container_of(data, struct PointerBarrierClient, barrier); -+ screen = barrier->screen; -+ cs = GetCursorScreen(screen); -+ -+ /* find and unlink from the screen private */ -+ list_for_each_entry(b, &cs->barriers, entry) { -+ if (b == barrier) { -+ list_del(&b->entry); -+ break; -+ } -+ } -+ -+ free(barrier); -+ return Success; -+} -+ -+int -+ProcXFixesDestroyPointerBarrier (ClientPtr client) -+{ -+ int err; -+ void *barrier; -+ REQUEST (xXFixesDestroyPointerBarrierReq); -+ -+ REQUEST_SIZE_MATCH(xXFixesDestroyPointerBarrierReq); -+ -+ err = dixLookupResourceByType((void **)&barrier, stuff->barrier, -+ PointerBarrierType, client, -+ DixDestroyAccess); -+ if (err != Success) { -+ client->errorValue = stuff->barrier; -+ return err; -+ } -+ -+ FreeResource(stuff->barrier, RT_NONE); -+ return Success; -+} -+ -+int -+SProcXFixesDestroyPointerBarrier (ClientPtr client) -+{ -+ int n; -+ REQUEST(xXFixesDestroyPointerBarrierReq); -+ -+ swaps(&stuff->length, n); -+ REQUEST_SIZE_MATCH(xXFixesDestroyPointerBarrierReq); -+ swapl(&stuff->barrier, n); -+ return ProcXFixesVector[stuff->xfixesReqType](client); -+} -+ - Bool - XFixesCursorInit (void) - { -@@ -1048,8 +1449,10 @@ XFixesCursorInit (void) - cs = (CursorScreenPtr) calloc(1, sizeof (CursorScreenRec)); - if (!cs) - return FALSE; -+ list_init(&cs->barriers); - Wrap (cs, pScreen, CloseScreen, CursorCloseScreen); - Wrap (cs, pScreen, DisplayCursor, CursorDisplayCursor); -+ Wrap (cs, pScreen, ConstrainCursorHarder, CursorConstrainCursorHarder); - cs->pCursorHideCounts = NULL; - SetCursorScreen (pScreen, cs); - } -@@ -1059,7 +1462,10 @@ XFixesCursorInit (void) - "XFixesCursorHideCount"); - CursorWindowType = CreateNewResourceType(CursorFreeWindow, - "XFixesCursorWindow"); -+ PointerBarrierType = CreateNewResourceType(CursorFreeBarrier, -+ "XFixesPointerBarrier"); - -- return CursorClientType && CursorHideCountType && CursorWindowType; -+ return CursorClientType && CursorHideCountType && CursorWindowType && -+ PointerBarrierType; - } - -diff --git a/xfixes/xfixes.c b/xfixes/xfixes.c -index e8c7bf1..a57884b 100644 ---- a/xfixes/xfixes.c -+++ b/xfixes/xfixes.c -@@ -1,5 +1,6 @@ - /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. -+ * Copyright 2010 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), -@@ -47,10 +48,6 @@ - - #include "xfixesint.h" - #include "protocol-versions.h" --/* -- * Must use these instead of the constants from xfixeswire.h. They advertise -- * what we implement, not what the protocol headers define. -- */ - - static unsigned char XFixesReqCode; - int XFixesEventBase; -@@ -97,11 +94,12 @@ ProcXFixesQueryVersion(ClientPtr client) - - /* Major version controls available requests */ - static const int version_requests[] = { -- X_XFixesQueryVersion, /* before client sends QueryVersion */ -- X_XFixesGetCursorImage, /* Version 1 */ -- X_XFixesChangeCursorByName, /* Version 2 */ -- X_XFixesExpandRegion, /* Version 3 */ -- X_XFixesShowCursor, /* Version 4 */ -+ X_XFixesQueryVersion, /* before client sends QueryVersion */ -+ X_XFixesGetCursorImage, /* Version 1 */ -+ X_XFixesChangeCursorByName, /* Version 2 */ -+ X_XFixesExpandRegion, /* Version 3 */ -+ X_XFixesShowCursor, /* Version 4 */ -+ X_XFixesDestroyPointerBarrier, /* Version 5 */ - }; - - #define NUM_VERSION_REQUESTS (sizeof (version_requests) / sizeof (version_requests[0])) -@@ -142,6 +140,9 @@ int (*ProcXFixesVector[XFixesNumberRequests])(ClientPtr) = { - /*************** Version 4 ****************/ - ProcXFixesHideCursor, - ProcXFixesShowCursor, -+/*************** Version 5 ****************/ -+ ProcXFixesCreatePointerBarrier, -+ ProcXFixesDestroyPointerBarrier, - }; - - static int -@@ -205,6 +206,9 @@ static int (*SProcXFixesVector[XFixesNumberRequests])(ClientPtr) = { - /*************** Version 4 ****************/ - SProcXFixesHideCursor, - SProcXFixesShowCursor, -+/*************** Version 5 ****************/ -+ SProcXFixesCreatePointerBarrier, -+ SProcXFixesDestroyPointerBarrier, - }; - - static int -@@ -260,6 +264,8 @@ XFixesExtensionInit(void) - EventSwapVector[XFixesEventBase + XFixesCursorNotify] = - (EventSwapPtr) SXFixesCursorNotifyEvent; - SetResourceTypeErrorValue(RegionResType, XFixesErrorBase + BadRegion); -+ SetResourceTypeErrorValue(PointerBarrierType, -+ XFixesErrorBase + BadBarrier); - } - } - -diff --git a/xfixes/xfixes.h b/xfixes/xfixes.h -index 1638350..5765e64 100644 ---- a/xfixes/xfixes.h -+++ b/xfixes/xfixes.h -@@ -30,6 +30,7 @@ - #include "resource.h" - - extern _X_EXPORT RESTYPE RegionResType; -+extern _X_EXPORT RESTYPE PointerBarrierType; - extern _X_EXPORT int XFixesErrorBase; - - #define VERIFY_REGION(pRegion, rid, client, mode) \ -@@ -51,5 +52,21 @@ extern _X_EXPORT int XFixesErrorBase; - extern _X_EXPORT RegionPtr - XFixesRegionCopy (RegionPtr pRegion); - -+struct PointerBarrier { -+ CARD16 x1, x2, y1, y2; -+ CARD32 directions; -+}; -+ -+ -+extern int -+barrier_get_direction(int, int, int, int); -+extern BOOL -+barrier_is_blocking(const struct PointerBarrier*, int, int, int, int, double*); -+extern BOOL -+barrier_is_blocking_direction(const struct PointerBarrier*, int); -+extern void -+barrier_clamp_to_barrier(struct PointerBarrier *barrier, int dir, int *x, int *y); -+ -+ - - #endif /* _XFIXES_H_ */ -diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h -index d005369..6ba276e 100644 ---- a/xfixes/xfixesint.h -+++ b/xfixes/xfixesint.h -@@ -1,5 +1,6 @@ - /* - * Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved. -+ * Copyright 2010 Red Hat, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), -@@ -278,6 +279,21 @@ ProcXFixesShowCursor (ClientPtr client); - int - SProcXFixesShowCursor (ClientPtr client); - -+/* Version 5 */ -+ -+int -+ProcXFixesCreatePointerBarrier (ClientPtr client); -+ -+int -+SProcXFixesCreatePointerBarrier (ClientPtr client); -+ -+int -+ProcXFixesDestroyPointerBarrier (ClientPtr client); -+ -+int -+SProcXFixesDestroyPointerBarrier (ClientPtr client); -+ -+/* Xinerama */ - extern int (*PanoramiXSaveXFixesVector[XFixesNumberRequests])(ClientPtr); - void PanoramiXFixesInit (void); - void PanoramiXFixesReset (void); --- -1.7.4 - diff --git a/extra/xorg-xdm/PKGBUILD b/extra/xorg-xdm/PKGBUILD index ddce2fa0a..ac47ef1e2 100644 --- a/extra/xorg-xdm/PKGBUILD +++ b/extra/xorg-xdm/PKGBUILD @@ -1,30 +1,40 @@ -# $Id: PKGBUILD 105533 2011-01-10 11:03:46Z jgc $ +# $Id: PKGBUILD 140275 2011-10-11 21:28:00Z jgc $ # Maintainer: Alexander Baldeck <alexander@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=xorg-xdm -pkgver=1.1.10 -pkgrel=2 +pkgver=1.1.11 +pkgrel=1 pkgdesc="X Display Manager" arch=(i686 x86_64 'mips64el') url="http://xorg.freedesktop.org/" license=('custom') -depends=('pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft') -makedepends=('pkgconfig') +depends=('pam' 'libxaw' 'libxinerama' 'xorg-xrdb' 'xorg-sessreg' 'libxft' 'consolekit') +makedepends=('pkgconfig' 'xorg-util-macros') backup=(etc/X11/xdm/Xaccess etc/X11/xdm/Xresources etc/X11/xdm/Xservers etc/X11/xdm/xdm-config etc/pam.d/xdm etc/X11/xdm/Xsetup_0 etc/X11/xdm/Xsession) options=('!libtool') source=(${url}/releases/individual/app/xdm-${pkgver}.tar.bz2 Xsession-loginshell.patch Xsession-xsm.patch + xdm-consolekit.patch xdm.pam) -md5sums=('329383040cdbda5b5c8ce6c7e1120c97' +md5sums=('64a1af1f7eb69feae12e75d4cc3aaf19' '234ae568e7b22cbc09433bb396ff3d80' '2c30078c50bc653d72eb5114506eb313' + '46b11173b58e2241577d5ffd48ab8f8d' '419d6289ba6f851135f5c70c0e3cbec4') +sha256sums=('d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47' + 'fd3e7c20837b42a8ab111369fd6dc9612f9edb91c1f6904cca1d6a1fa3cfa0ff' + '77a1ce9bdf363591b72798db08b4df3589bd4e64737fd32cf9028f9245450edb' + '47190f311c97c0d85b1fcab47ee5a8575013db1200a5e30a57a7ea4ef3e0c23a' + '36cf924a893ef851855ebcdc5468523a9d182c3620698e01dffc35d05d74764b') build() { cd "${srcdir}/xdm-${pkgver}" patch -Np0 -i "${srcdir}/Xsession-loginshell.patch" patch -Np1 -i "${srcdir}/Xsession-xsm.patch" + patch -Np1 -i "${srcdir}/xdm-consolekit.patch" + + autoreconf -fi ./configure --prefix=/usr \ --disable-xdm-auth \ --disable-static \ diff --git a/extra/xorg-xdm/xdm-consolekit.patch b/extra/xorg-xdm/xdm-consolekit.patch new file mode 100644 index 000000000..7d85b97e0 --- /dev/null +++ b/extra/xorg-xdm/xdm-consolekit.patch @@ -0,0 +1,225 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -362,6 +362,20 @@ + + AM_CONDITIONAL(DYNAMIC_GREETER, test x$DYNAMIC_GREETER = xyes) + ++# ConsoleKit support ++AC_ARG_WITH(consolekit, AC_HELP_STRING([--with-consolekit], [Use ConsoleKit]), ++ [USE_CONSOLEKIT=$withval], [USE_CONSOLEKIT=yes]) ++if test x"$USE_CONSOLEKIT" != xno; then ++ PKG_CHECK_MODULES(CK_CONNECTOR, ck-connector, ++ [USE_CONSOLEKIT=yes], [USE_CONSOLEKIT=no]) ++ if test x"$USE_CONSOLEKIT" = xyes; then ++ AC_DEFINE([USE_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit]) ++ XDM_CFLAGS="$XDM_CFLAGS $CK_CONNECTOR_CFLAGS -DUSE_CONSOLEKIT" ++ XDM_LIBS="$XDM_LIBS $CK_CONNECTOR_LIBS" ++ fi ++fi ++dnl AM_CONDITIONAL(USE_CONSOLEKIT, test$USE_CONSOLEKIT = xyes) ++ + # + # XDM + # +--- a/xdm/session.c ++++ b/xdm/session.c +@@ -66,6 +66,11 @@ + #endif + #endif /* USE_PAM */ + ++#ifdef USE_CONSOLEKIT ++#include <ck-connector.h> ++#include <dbus/dbus.h> ++#endif ++ + #ifdef __SCO__ + #include <prot.h> + #endif +@@ -472,6 +477,97 @@ + } + } + ++#ifdef USE_CONSOLEKIT ++ ++static CkConnector *connector; ++ ++static int openCKSession(struct verify_info *verify, struct display *d) ++{ ++ int ret; ++ DBusError error; ++ char *remote_host_name = ""; ++ dbus_bool_t is_local; ++ char *display_name = ""; ++ char *display_device = ""; ++ char devtmp[16]; ++ ++ if (!use_consolekit) ++ return 1; ++ ++ is_local = d->displayType.location == Local; ++ if (d->peerlen > 0 && d->peer) ++ remote_host_name = d->peer; ++ if (d->name) ++ display_name = d->name; ++ /* how can we get the corresponding tty at best...? */ ++ if (d->windowPath) { ++ display_device = strchr(d->windowPath, ':'); ++ if (display_device && display_device[1]) ++ display_device++; ++ else ++ display_device = d->windowPath; ++ snprintf(devtmp, sizeof(devtmp), "/dev/tty%s", display_device); ++ display_device = devtmp; ++ } ++ ++ connector = ck_connector_new(); ++ if (!connector) { ++ LogOutOfMem("ck_connector"); ++ return 0; ++ } ++ ++ dbus_error_init(&error); ++ ret = ck_connector_open_session_with_parameters( ++ connector, &error, ++ "unix-user", &verify->uid, ++ "x11-display", &display_name, ++ "x11-display-device", &display_device, ++ "remote-host-name", &remote_host_name, ++ "is-local", &is_local, ++ NULL); ++ if (!ret) { ++ if (dbus_error_is_set(&error)) { ++ LogError("Dbus error: %s\n", error.message); ++ dbus_error_free(&error); ++ } else { ++ LogError("ConsoleKit error\n"); ++ } ++ LogError("console-kit-daemon not running?\n"); ++ ck_connector_unref(connector); ++ connector = NULL; ++ return 0; ++ } ++ ++ verify->userEnviron = setEnv(verify->userEnviron, ++ "XDG_SESSION_COOKIE", ck_connector_get_cookie(connector)); ++ return 1; ++} ++ ++static void closeCKSession(void) ++{ ++ DBusError error; ++ ++ if (!connector) ++ return; ++ ++ dbus_error_init(&error); ++ if (!ck_connector_close_session(connector, &error)) { ++ if (dbus_error_is_set(&error)) { ++ LogError("Dbus error: %s\n", error.message); ++ dbus_error_free(&error); ++ } else { ++ LogError("ConsoleKit close error\n"); ++ } ++ LogError("console-kit-daemon not running?\n"); ++ } ++ ck_connector_unref(connector); ++ connector = NULL; ++} ++#else ++#define openCKSession(v,d) 1 ++#define closeCKSession() ++#endif ++ + void + SessionExit (struct display *d, int status, int removeAuth) + { +@@ -486,6 +580,8 @@ + } + #endif + ++ closeCKSession(); ++ + /* make sure the server gets reset after the session is over */ + if (d->serverPid >= 2 && d->resetSignal) + kill (d->serverPid, d->resetSignal); +@@ -568,6 +664,10 @@ + #ifdef USE_PAM + if (pamh) pam_open_session(pamh, 0); + #endif ++ ++ if (!openCKSession(verify, d)) ++ return 0; ++ + switch (pid = fork ()) { + case 0: + CleanUpChild (); +--- a/include/dm.h ++++ b/include/dm.h +@@ -325,6 +325,9 @@ + extern char *prngdSocket; + extern int prngdPort; + # endif ++#ifdef USE_CONSOLEKIT ++extern int use_consolekit; ++#endif + + extern char *greeterLib; + extern char *willing; +--- a/xdm/resource.c ++++ b/xdm/resource.c +@@ -68,6 +68,9 @@ + char *prngdSocket; + int prngdPort; + #endif ++#ifdef USE_CONSOLEKIT ++int use_consolekit; ++#endif + + char *greeterLib; + char *willing; +@@ -258,6 +261,10 @@ + "false"} , + { "willing", "Willing", DM_STRING, &willing, + ""} , ++#ifdef USE_CONSOLEKIT ++{ "consoleKit", "ConsoleKit", DM_BOOL, (char **) &use_consolekit, ++ "true"} , ++#endif + }; + + # define NUM_DM_RESOURCES (sizeof DmResources / sizeof DmResources[0]) +@@ -440,7 +447,11 @@ + {"-debug", "*debugLevel", XrmoptionSepArg, (caddr_t) NULL }, + {"-xrm", NULL, XrmoptionResArg, (caddr_t) NULL }, + {"-daemon", ".daemonMode", XrmoptionNoArg, "true" }, +-{"-nodaemon", ".daemonMode", XrmoptionNoArg, "false" } ++{"-nodaemon", ".daemonMode", XrmoptionNoArg, "false" }, ++#ifdef USE_CONSOLEKIT ++{"-consolekit", ".consoleKit", XrmoptionNoArg, "true" }, ++{"-noconsolekit", ".consoleKit", XrmoptionNoArg, "false" } ++#endif + }; + + static int originalArgc; +--- a/man/xdm.man ++++ b/man/xdm.man +@@ -51,6 +51,8 @@ + ] [ + .B \-session + .I session_program ++] [ ++.B \-noconsolekit + ] + .SH DESCRIPTION + .I Xdm +@@ -218,6 +220,10 @@ + .IP "\fB\-xrm\fP \fIresource_specification\fP" + Allows an arbitrary resource to be specified, as in most + X Toolkit applications. ++.IP "\fB\-noconsolekit\fP" ++Specifies ``false'' as the value for the \fBDisplayManager.consoleKit\fP ++resource. ++This suppresses the session management using ConsoleKit. + .SH RESOURCES + At many stages the actions of + .I xdm diff --git a/extra/xorg-xinit/PKGBUILD b/extra/xorg-xinit/PKGBUILD index 4fb60183c..e313a264b 100644 --- a/extra/xorg-xinit/PKGBUILD +++ b/extra/xorg-xinit/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 113891 2011-03-10 19:11:37Z jgc $ +# $Id: PKGBUILD 140273 2011-10-11 21:27:57Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Alexander Baldeck <alexander@archlinux.org> pkgname=xorg-xinit -pkgver=1.3.0 -pkgrel=3 +pkgver=1.3.1 +pkgrel=1 pkgdesc="X.Org initialisation program " -arch=(i686 x86_64 'mips64el') +arch=('i686' 'x86_64' 'mips64el') license=('custom') url="http://xorg.freedesktop.org/" depends=('libx11' 'xorg-xauth') @@ -22,7 +22,7 @@ source=(${url}/releases/individual/app/xinit-${pkgver}.tar.bz2 xsession xserverrc) options=(!emptydirs) -md5sums=('bc4e8b7d1919597cc37a0d24aa149dda' +md5sums=('ee234056d8a3dbf37b61b4bcb35b88e4' 'abd072ec435ce084cf4e89c58f83d45c' 'c7b406c3c5c1e8011b3ac7d6b29c1a2c' '7873d97db30d6c279ed37e3559e7c59d' diff --git a/extra/xournal/PKGBUILD b/extra/xournal/PKGBUILD index 9337f08c5..76d0c7f1c 100644 --- a/extra/xournal/PKGBUILD +++ b/extra/xournal/PKGBUILD @@ -1,31 +1,35 @@ -# $Id: PKGBUILD 108182 2011-01-30 14:22:10Z ibiru $ -# Contributor: -# Maintainer: +# $Id: PKGBUILD 140585 2011-10-17 08:15:15Z jgc $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=xournal pkgver=0.4.5 -pkgrel=4 +pkgrel=5 pkgdesc='Notetaking and sketching application' arch=('i686' 'x86_64' 'mips64el') url='http://xournal.sourceforge.net/' license=('GPL') depends=('libgnomecanvas' 'poppler-glib' 'shared-mime-info' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('ghostscript: import PS/PDF files as bitmap backgrounds') -install=xournal.install source=("http://downloads.sourceforge.net/xournal/xournal-${pkgver}.tar.gz" - 'pdf-export-64.patch') + 'pdf-export-64.patch' + 'poppler-api.patch') sha1sums=('390cb275774469ed1b04b7268dd625bd456c895e' - 'f23f53b9f69ba8a5773c53d7bca99abf9d8504f8') + 'f23f53b9f69ba8a5773c53d7bca99abf9d8504f8' + '5aedd5610b42df96e964bb889d4bf0831c2080bc') +install=install build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../pdf-export-64.patch # from xournal CVS, see FS#21693 - ./configure --prefix=/usr - make + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -p1 -i ../pdf-export-64.patch # from xournal CVS, see FS#21693 + patch -p1 -i ../poppler-api.patch + + ./configure --prefix=/usr + make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install desktop-install + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install desktop-install } diff --git a/extra/xournal/xournal.install b/extra/xournal/install index dfcb68374..dfcb68374 100644 --- a/extra/xournal/xournal.install +++ b/extra/xournal/install diff --git a/extra/xournal/poppler-api.patch b/extra/xournal/poppler-api.patch new file mode 100644 index 000000000..9e33c7feb --- /dev/null +++ b/extra/xournal/poppler-api.patch @@ -0,0 +1,158 @@ +diff -aur old/src/xo-file.c new/src/xo-file.c +--- old/src/xo-file.c 2009-09-29 09:36:05.000000000 +1000 ++++ new/src/xo-file.c 2011-10-06 03:11:17.307822836 +1100 +@@ -975,6 +975,140 @@ + g_free(req); + } + ++/* ++ * Copied from http://cgit.freedesktop.org/poppler/poppler/tree/glib/poppler-page.cc?h=poppler-0.16#n617 ++ * as a temporary workaround to poppler removing depreciated functions while we wait for ++ * upstream to rewrite against cairo ++ */ ++static void ++copy_cairo_surface_to_pixbuf (cairo_surface_t *surface, GdkPixbuf *pixbuf) ++{ ++ int cairo_width, cairo_height, cairo_rowstride; ++ unsigned char *pixbuf_data, *dst, *cairo_data; ++ int pixbuf_rowstride, pixbuf_n_channels; ++ unsigned int *src; ++ int x, y; ++ ++ cairo_width = cairo_image_surface_get_width (surface); ++ cairo_height = cairo_image_surface_get_height (surface); ++ cairo_rowstride = cairo_image_surface_get_stride (surface); ++ cairo_data = cairo_image_surface_get_data (surface); ++ ++ pixbuf_data = gdk_pixbuf_get_pixels (pixbuf); ++ pixbuf_rowstride = gdk_pixbuf_get_rowstride (pixbuf); ++ pixbuf_n_channels = gdk_pixbuf_get_n_channels (pixbuf); ++ ++ if (cairo_width > gdk_pixbuf_get_width (pixbuf)) ++ cairo_width = gdk_pixbuf_get_width (pixbuf); ++ if (cairo_height > gdk_pixbuf_get_height (pixbuf)) ++ cairo_height = gdk_pixbuf_get_height (pixbuf); ++ for (y = 0; y < cairo_height; y++) ++ { ++ src = (unsigned int *) (cairo_data + y * cairo_rowstride); ++ dst = pixbuf_data + y * pixbuf_rowstride; ++ for (x = 0; x < cairo_width; x++) ++ { ++ dst[0] = (*src >> 16) & 0xff; ++ dst[1] = (*src >> 8) & 0xff; ++ dst[2] = (*src >> 0) & 0xff; ++ if (pixbuf_n_channels == 4) ++ dst[3] = (*src >> 24) & 0xff; ++ dst += pixbuf_n_channels; ++ src++; ++ } ++ } ++} ++ ++static void ++_poppler_page_render_to_pixbuf (PopplerPage *page, ++ int src_x, int src_y, ++ int src_width, int src_height, ++ double scale, ++ int rotation, ++ gboolean printing, ++ GdkPixbuf *pixbuf) ++{ ++ cairo_t *cr; ++ cairo_surface_t *surface; ++ ++ surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, ++ src_width, src_height); ++ cr = cairo_create (surface); ++ cairo_save (cr); ++ switch (rotation) { ++ case 90: ++ cairo_translate (cr, src_x + src_width, -src_y); ++ break; ++ case 180: ++ cairo_translate (cr, src_x + src_width, src_y + src_height); ++ break; ++ case 270: ++ cairo_translate (cr, -src_x, src_y + src_height); ++ break; ++ default: ++ cairo_translate (cr, -src_x, -src_y); ++ } ++ ++ if (scale != 1.0) ++ cairo_scale (cr, scale, scale); ++ ++ if (rotation != 0) ++ cairo_rotate (cr, rotation * G_PI / 180.0); ++ ++ if (printing) ++ poppler_page_render_for_printing (page, cr); ++ else ++ poppler_page_render (page, cr); ++ cairo_restore (cr); ++ ++ cairo_set_operator (cr, CAIRO_OPERATOR_DEST_OVER); ++ cairo_set_source_rgb (cr, 1., 1., 1.); ++ cairo_paint (cr); ++ ++ cairo_destroy (cr); ++ ++ copy_cairo_surface_to_pixbuf (surface, pixbuf); ++ cairo_surface_destroy (surface); ++} ++ ++/** ++ * poppler_page_render_to_pixbuf: ++ * @page: the page to render from ++ * @src_x: x coordinate of upper left corner ++ * @src_y: y coordinate of upper left corner ++ * @src_width: width of rectangle to render ++ * @src_height: height of rectangle to render ++ * @scale: scale specified as pixels per point ++ * @rotation: rotate the document by the specified degree ++ * @pixbuf: pixbuf to render into ++ * ++ * First scale the document to match the specified pixels per point, ++ * then render the rectangle given by the upper left corner at ++ * (src_x, src_y) and src_width and src_height. ++ * This function is for rendering a page that will be displayed. ++ * If you want to render a page that will be printed use ++ * poppler_page_render_to_pixbuf_for_printing() instead ++ * ++ * Deprecated: 0.16 ++ **/ ++void ++poppler_page_render_to_pixbuf (PopplerPage *page, ++ int src_x, int src_y, ++ int src_width, int src_height, ++ double scale, ++ int rotation, ++ GdkPixbuf *pixbuf) ++{ ++ g_return_if_fail (POPPLER_IS_PAGE (page)); ++ g_return_if_fail (scale > 0.0); ++ g_return_if_fail (pixbuf != NULL); ++ ++ _poppler_page_render_to_pixbuf (page, src_x, src_y, ++ src_width, src_height, ++ scale, rotation, ++ FALSE, ++ pixbuf); ++} + /* process a bg PDF request from the queue, and recurse */ + + gboolean bgpdf_scheduler_callback(gpointer data) +diff -aur old/src/xo-file.h new/src/xo-file.h +--- old/src/xo-file.h 2009-09-28 08:45:53.000000000 +1000 ++++ new/src/xo-file.h 2011-10-06 03:11:17.311156160 +1100 +@@ -36,3 +36,10 @@ + void init_config_default(void); + void load_config_from_file(void); + void save_config_to_file(void); ++ ++void poppler_page_render_to_pixbuf (PopplerPage *page, ++ int src_x, int src_y, ++ int src_width, int src_height, ++ double scale, ++ int rotation, ++ GdkPixbuf *pixbuf); diff --git a/extra/xulrunner/moz-639554.patch b/extra/xulrunner/moz-639554.patch deleted file mode 100644 index 30fe15c6e..000000000 --- a/extra/xulrunner/moz-639554.patch +++ /dev/null @@ -1,35 +0,0 @@ - -# HG changeset patch -# User Chris Coulson <chrisccoulson@ubuntu.com> -# Date 1306390403 -7200 -# Node ID 99672871e93003520189cfe3a684ebbea151cb4b -# Parent 831f8e040f381ed58441d8bf413f9845f26ce08e -Bug 639554 - Install sdk/bin with make install. r=bsmedberg - -diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk ---- a/toolkit/mozapps/installer/packager.mk -+++ b/toolkit/mozapps/installer/packager.mk -@@ -704,20 +704,22 @@ ifdef INSTALL_SDK # Here comes the hard - $(NSINSTALL) -D $(DESTDIR)$(includedir) - (cd $(DIST)/include && tar $(TAR_CREATE_FLAGS) - .) | \ - (cd $(DESTDIR)$(includedir) && tar -xf -) - $(NSINSTALL) -D $(DESTDIR)$(idldir) - (cd $(DIST)/idl && tar $(TAR_CREATE_FLAGS) - .) | \ - (cd $(DESTDIR)$(idldir) && tar -xf -) - # SDK directory is the libs + a bunch of symlinks - $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib -+ $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin - if test -f $(DIST)/include/xpcom-config.h; then \ - $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \ - fi - (cd $(DIST)/sdk/lib && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -) -+ (cd $(DIST)/sdk/bin && tar $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -) - $(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl - ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib - ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin - ln -s $(includedir) $(DESTDIR)$(sdkdir)/include - ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl - endif # INSTALL_SDK - - make-sdk: - diff --git a/extra/zile/PKGBUILD b/extra/zile/PKGBUILD index 98d67ea4d..364b40255 100644 --- a/extra/zile/PKGBUILD +++ b/extra/zile/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 135981 2011-08-21 03:51:34Z eric $ +# $Id: PKGBUILD 140498 2011-10-15 20:33:55Z kevin $ # Contributor: Tom Newsom <Jeepster@gmx.co.uk> # Maintainer: Kevin Piche <kevin@archlinux.org> pkgname=zile -pkgver=2.3.24 +pkgver=2.4.2 pkgrel=1 pkgdesc="A small, fast, and powerful Emacs clone" arch=(i686 x86_64 'mips64el') url="http://www.gnu.org/software/zile/" # Lua is not required, the author uses it to generate some source files. -depends=('ncurses') +depends=('gc' 'ncurses') license=('GPL') source=(http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz) -md5sums=('fe77d801ba69e0fb9b4914a04b9ff506') +md5sums=('2a68ac77cebbeca1eacf170ba9072dbe') build() { cd "${srcdir}"/${pkgname}-${pkgver} |