Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/asciijump/PKGBUILD
	community/cairo-compmgr/PKGBUILD
	community/cwiid/PKGBUILD
	community/darcs/PKGBUILD
	community/gadmin-samba/PKGBUILD
	community/gstm/PKGBUILD
	community/haskell-dbus/PKGBUILD
	community/haskell-mmap/PKGBUILD
	community/lastfm-client/PKGBUILD
	community/libtar/PKGBUILD
	community/mget/PKGBUILD
	community/nexuiz/PKGBUILD
	community/pstreams/PKGBUILD
	community/pyglet/PKGBUILD
	community/python-html5lib/PKGBUILD
	community/python-pychm/PKGBUILD
	community/qoauth/PKGBUILD
	community/quilt/PKGBUILD
	community/stormbaancoureur/PKGBUILD
	community/winegame/PKGBUILD
	community/winestuff/PKGBUILD
	community/xdg-user-dirs/PKGBUILD
	core/libfetch/PKGBUILD
	extra/acpi/PKGBUILD
	extra/alex/PKGBUILD
	extra/allegro/PKGBUILD
	extra/capi4k-utils/PKGBUILD
	extra/erlang/PKGBUILD
	extra/ettercap/PKGBUILD
	extra/gftp/PKGBUILD
	extra/gimp-refocus/PKGBUILD
	extra/happy/PKGBUILD
	extra/haskell-cgi/PKGBUILD
	extra/haskell-deepseq/PKGBUILD
	extra/haskell-fgl/PKGBUILD
	extra/haskell-glut/PKGBUILD
	extra/haskell-haskell-src/PKGBUILD
	extra/haskell-html/PKGBUILD
	extra/haskell-hunit/PKGBUILD
	extra/haskell-opengl/PKGBUILD
	extra/haskell-parallel/PKGBUILD
	extra/haskell-platform/PKGBUILD
	extra/haskell-quickcheck/PKGBUILD
	extra/haskell-regex-base/PKGBUILD
	extra/haskell-regex-compat/PKGBUILD
	extra/haskell-regex-posix/PKGBUILD
	extra/haskell-stm/PKGBUILD
	extra/haskell-syb/PKGBUILD
	extra/haskell-xhtml/PKGBUILD
	extra/libnet/PKGBUILD
	extra/linux_logo/PKGBUILD
	extra/mailman/PKGBUILD
	extra/midori/PKGBUILD
	extra/ntrack/PKGBUILD
	extra/pwgen/PKGBUILD
	extra/qtcurve-gtk2/PKGBUILD
	extra/qtcurve-kde4/PKGBUILD
	extra/ristretto/PKGBUILD
	extra/rxvt-unicode/PKGBUILD
	extra/telepathy-sofiasip/PKGBUILD
	extra/tightvnc/PKGBUILD
	extra/vsftpd/PKGBUILD
	extra/windowmaker-crm-git/PKGBUILD
	libre/aufs2-libre/PKGBUILD
	libre/calibre-libre/PKGBUILD
	libre/calibre-libre/calibre-mount-helper
	libre/calibre-libre/calibre.install
	libre/calibre-libre/desktop_integration.patch
	libre/ffmpeg-libre/PKGBUILD
	mozilla-testing/iceweasel-libre/PKGBUILD
	mozilla-testing/iceweasel-libre/libre.patch
	mozilla-testing/iceweasel-libre/mozconfig
	~lukeshu/openni-unstable/PKGBUILD

1 files changed, 0 insertions, 57 deletions

diff --git a/community/lastfm-client/qt46.diff b/community/lastfm-client/qt46.diff
deleted file mode 100644
index b2370abee..000000000
--- a/community/lastfm-client/qt46.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-Fix some text/icon display issues with Qt 4.6
---- a/src/libUnicorn/draglabel.cpp
-+++ b/src/libUnicorn/draglabel.cpp
-@@ -324,6 +324,11 @@
-     {
-         rect.setHeight( fm.height() );
-     }
-+    // Qt 4.6 seems to have problems with the width too
-+    if ( fm.width( d.m_text ) > rect.width() )
-+    {
-+        rect.setWidth( fm.width( d.m_text ) );
-+    }
- 
-     // boundingRect sometimes returns negative values so make sure it's at 0, 0
-     rect.moveTo( 0, 0 );
---- a/src/settingsdialog.cpp
-+++ b/src/settingsdialog.cpp
-@@ -140,29 +140,29 @@
-         UnicornUtils::qtLanguageToLfmLangCode( QLocale::Japanese ) );
- 
-     // Add icons to sidebar
--    pixmap.load( MooseUtils::dataPath( "/icons/options_account.png" ) );
-+    //pixmap.load( MooseUtils::dataPath( "/icons/options_account.png" ) );
-     //pixmap.scaled( 48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
--    ui.pageList->item( 0 )->setIcon( pixmap );
-+    ui.pageList->item( 0 )->setIcon( QPixmap( MooseUtils::dataPath( "/icons/options_account.png" ) ) );
- 
--    pixmap.load( MooseUtils::dataPath( "/icons/options_radio.png" ) );
-+    //pixmap.load( MooseUtils::dataPath( "/icons/options_radio.png" ) );
-     //pixmap.scaled( 48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
--    ui.pageList->item( 1 )->setIcon( pixmap );
-+    ui.pageList->item( 1 )->setIcon( QPixmap( MooseUtils::dataPath( "/icons/options_radio.png" ) ) );
- 
-     #ifdef HIDE_RADIO
-         ui.pageList->setItemHidden( ui.pageList->item( 1 ), true );
-     #endif // HIDE_RADIO
- 
--    pixmap.load( MooseUtils::dataPath( "/icons/options_scrobbling.png" ) );
-+    //pixmap.load( MooseUtils::dataPath( "/icons/options_scrobbling.png" ) );
-     //pixmap.scaled( 48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
--    ui.pageList->item( 2 )->setIcon( pixmap );
-+    ui.pageList->item( 2 )->setIcon( QPixmap( MooseUtils::dataPath( "/icons/options_scrobbling.png" ) ) );
- 
--    pixmap.load( MooseUtils::dataPath( "/icons/options_connection.png" ) );
-+    //pixmap.load( MooseUtils::dataPath( "/icons/options_connection.png" ) );
-     //pixmap.scaled( 48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
--    ui.pageList->item( 3 )->setIcon( pixmap );
-+    ui.pageList->item( 3 )->setIcon( QPixmap( MooseUtils::dataPath( "/icons/options_connection.png" ) ) );
- 
--    pixmap.load( MooseUtils::dataPath( "/icons/options_mediadevices.png" ) );
-+    //pixmap.load( MooseUtils::dataPath( "/icons/options_mediadevices.png" ) );
-     //pixmap.scaled( 48, 48, Qt::IgnoreAspectRatio, Qt::SmoothTransformation );
--    ui.pageList->item( 4 )->setIcon( pixmap );
-+    ui.pageList->item( 4 )->setIcon( QPixmap( MooseUtils::dataPath( "/icons/options_mediadevices.png" ) ) );
- 
-     #ifdef Q_WS_X11
-     ui.pageList->setRowHidden( 4, true );