diff options
Diffstat (limited to 'extra')
78 files changed, 0 insertions, 11525 deletions
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/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/beagle/PKGBUILD b/extra/beagle/PKGBUILD deleted file mode 100644 index 37bfe2b29..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) -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/bug-buddy/PKGBUILD b/extra/bug-buddy/PKGBUILD deleted file mode 100644 index 871b6e10e..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) -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/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/dssi/LICENSE b/extra/dssi/LICENSE deleted file mode 100644 index ddef4f23b..000000000 --- a/extra/dssi/LICENSE +++ /dev/null @@ -1,77 +0,0 @@ -Licensing ---------- - -The DSSI API itself (dssi.h) is licensed under the GNU Lesser General -Public License. See COPYING for details. - -The jack-dssi-host is provided under a BSD-style license. This means -you can do anything you want with it so long as you retain the -copyright attribution and license information. See the source files -for details. - -Licensing for the files in the examples directory may vary: please -check the individual files for details. Most of them are in the -public domain, which means you can use them for anything you want. - - - -/* jack-dssi-host.c - * - * DSSI Soft Synth Interface - * - * This is a host for DSSI plugins. It listens for MIDI events on an - * ALSA sequencer port, delivers them to DSSI synths and outputs the - * result via JACK. - * - * This program expects the names of up to 16 DSSI synth plugins, in - * the form '<dll-name>:<label>',* to be provided on the command line. - * If just '<dll-name>' is provided, the first plugin in the DLL is - * is used. MIDI channels are assigned to each plugin instance, in - * order, beginning with channel 0 (zero-based). A plugin may be - * easily instantiated multiple times by preceding its name and label - * with a dash followed immediately by the desired number of instances, - * e.g. '-3 my_plugins.so:zoomy' would create three instances of the - * 'zoomy' plugin. - */ - -/* - * Copyright 2004, 2009 Chris Cannam, Steve Harris and Sean Bolton. - * - * Permission to use, copy, modify, distribute, and sell this software - * for any purpose is hereby granted without fee, provided that the - * above copyright notice and this permission notice are included in - * all copies or substantial portions of the software. - */ - - -/* - * This program is in the public domain - * - * $Id: dssi_osc_send.c,v 1.5 2004/07/04 22:24:51 smbolton Exp $ - */ - -/* - * This program is in the public domain - * - * $Id: dssi_osc_update.c,v 1.6 2005/10/12 17:08:26 smbolton Exp $ - */ - -/* less_trivial_synth.c - - DSSI Soft Synth Interface - Constructed by Chris Cannam, Steve Harris and Sean Bolton - - This is an example DSSI synth plugin written by Steve Harris. - - This example file is in the public domain. -*/ - -/* trivial_sampler.c - - DSSI Soft Synth Interface - Constructed by Chris Cannam, Steve Harris and Sean Bolton - - A straightforward DSSI plugin sampler. - - This example file is in the public domain. -*/ 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-sharp/PKGBUILD b/extra/evolution-sharp/PKGBUILD deleted file mode 100644 index be2ea4a02..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) -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 5fd841ba1..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) -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/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/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/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 bbe207fa1..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) -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/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-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/gok/PKGBUILD b/extra/gok/PKGBUILD deleted file mode 100644 index 062ce91b4..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) -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/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/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/keytouch-editor/PKGBUILD b/extra/keytouch-editor/PKGBUILD deleted file mode 100644 index 7f43ca092..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') -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 bfc3d182f..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') -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/libbeagle/PKGBUILD b/extra/libbeagle/PKGBUILD deleted file mode 100644 index 699fe639f..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) -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/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/libffi/PKGBUILD b/extra/libffi/PKGBUILD deleted file mode 100644 index 167c7498a..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') -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/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/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/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/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/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/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/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/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/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-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-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-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/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-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/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-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-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-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/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/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/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: - |