Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	extra/libdvbpsi/PKGBUILD

4 files changed, 27 insertions, 37 deletions

diff --git a/community/ccid/PKGBUILD b/community/ccid/PKGBUILD
index ffdf67f1d..79f03f0a4 100644
--- a/community/ccid/PKGBUILD
+++ b/community/ccid/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 82451 2013-01-18 08:29:46Z giovanni $
+# $Id: PKGBUILD 89650 2013-05-01 05:38:53Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Daniel Plaza <daniel.plaza.espi@gmail.com>
 
 pkgname=ccid
-pkgver=1.4.9
+pkgver=1.4.10
 pkgrel=1
 pkgdesc="A generic USB Chip/Smart Card Interface Devices driver"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,8 +12,8 @@ license=('LGPL' 'GPL')
 depends=('pcsclite' 'libusbx')
 makedepends=('pkg-config')
 backup=(etc/reader.conf.d/libccidtwin)
-source=("https://alioth.debian.org/frs/download.php/3864/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('1afd9cc6fb1676d1fdd605d10c70d08e')
+source=("https://alioth.debian.org/frs/download.php/3897/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('5372e8593624dee837269bf86e4b8b06')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/cinnamon/PKGBUILD b/community/cinnamon/PKGBUILD
index 90ac2a69d..6cd9aa702 100644
--- a/community/cinnamon/PKGBUILD
+++ b/community/cinnamon/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 89546 2013-04-29 22:36:26Z bgyorgy $
+# $Id: PKGBUILD 89648 2013-04-30 22:18:11Z faidoc $
 # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com>
 # Contributor: M0Rf30
 # Contributor: unifiedlinux
 # Contributor: CReimer
 
 pkgname=cinnamon
-pkgver=1.7.7
-pkgrel=2
+pkgver=1.7.8
+pkgrel=1
 pkgdesc="Linux desktop which provides advanced innovative features and a traditional user experience"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cinnamon.linuxmint.com/"
@@ -30,12 +30,12 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/Cinnamon/tarball/
         "gnome-3.8.patch"
         "switch-applications.patch"
         "fallback-helpers.patch")
-md5sums=('a0ed2648d1d95edeac2e45e2c11508fe'
-         '2b1ece84416c3e4de030be15f1774d82'
-         'c3f25b06d345d9d36c197cd96e08f496'
-         '75c7e0d8d0e6fc4861753ce27e0438c8'
-         '3880fa4c5234771644e5b57a1ade4456'
-         '0dac5a546bf16921a4fdde8525366a24')
+sha256sums=('812042c6b7685e2054602a29ed190f8efc07f67f92be1bc496358307534cb969'
+            'a0c05c995102b16f1060cbd43931eeaefeafd0265a0335e4ca14a143bd4c8c30'
+            'ee5694bdc997ffa35a817f691b15bae13747137d35ec2aecd0da298d7edbe426'
+            '0971ac14bc31167d3b94ea93e608c5d49518a12b89f40c97f84d80e715657aa3'
+            '921a1f63d2890dd54c149aa27a3d3209ac2fb843be597ae4ef3b4621e76a2262'
+            'fc8e8f5b7772ff331212280b0d4cf624c5ca2a442e8e8defc319cc2f2b060f2e')
 
 build() {
   cd ${srcdir}/linuxmint-Cinnamon*
diff --git a/community/cinnamon/gnome-3.8.patch b/community/cinnamon/gnome-3.8.patch
index e455a835e..4053a151b 100644
--- a/community/cinnamon/gnome-3.8.patch
+++ b/community/cinnamon/gnome-3.8.patch
@@ -196,11 +196,9 @@ index f12f8c5..939ea70 100644
    <schema id="org.cinnamon.screensaver" path="/org/cinnamon/screensaver/">
      <key name="default-message" type="s">
        <default>""</default>
-diff --git a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
-index f964aed..4a38c84 100644
---- a/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
-+++ b/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py
-@@ -232,11 +232,11 @@ def getFirstFileFromBackgroundXml(self, filename):
+--- linuxmint-Cinnamon-a464dc9.orig/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py 2013-04-30 18:01:56.000000000 +0200
++++ linuxmint-Cinnamon-a464dc9/files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py  2013-04-30 23:36:46.718385152 +0200
+@@ -232,11 +232,11 @@
      
  
  class BackgroundWallpaperPane (Gtk.VBox):
@@ -214,7 +212,7 @@ index f964aed..4a38c84 100644
          self._sidepage = sidepage
          
          scw = Gtk.ScrolledWindow()
-@@ -263,15 +263,15 @@ def _on_selection_changed(self, iconview):
+@@ -263,15 +263,15 @@
          if wallpaper:
              for key in wallpaper:
                  if key == "filename":
@@ -235,16 +233,7 @@ index f964aed..4a38c84 100644
              if (not "metadataFile" in wallpaper) or (wallpaper["metadataFile"] == ""):
                  self._sidepage.remove_wallpaper_button.set_sensitive(True)
      
-@@ -364,7 +364,7 @@ def run(self):
-         return res
- 
- class BackgroundSlideshowPane(Gtk.Table):
--    def __init__(self, sidepage, gnome_background_schema, cinnamon_background_schema):
-+    def __init__(self, sidepage, cinnamon_background_schema):
-         Gtk.Table.__init__(self)
-         self.set_col_spacings(5)
-         self.set_row_spacings(5)
-@@ -445,12 +445,11 @@ def _do_update_list(self, folder, recursive, delay, transition_duration = 0):
+@@ -445,12 +445,11 @@
              f = open(filename, "w")
              f.write(xml_data)
              f.close()
@@ -253,23 +242,23 @@ index f964aed..4a38c84 100644
  
  class BackgroundSidePage (SidePage):
      def __init__(self, name, icon, keywords, advanced, content_box):
-         SidePage.__init__(self, name, icon, keywords, advanced, content_box, True)
+         SidePage.__init__(self, name, icon, keywords, advanced, content_box, -1)
 -        self._gnome_background_schema = Gio.Settings("org.gnome.desktop.background")
          self._cinnamon_background_schema = Gio.Settings("org.cinnamon.background")
          self._add_wallpapers_dialog = AddWallpapersDialog()
          
-@@ -515,8 +514,8 @@ def build(self, advanced):
+@@ -515,8 +514,8 @@
          self.mainbox.set_visible_window(False)
          self.content_box.pack_start(self.mainbox, True, True, 3)
          
 -        self.wallpaper_pane = BackgroundWallpaperPane(self, self._gnome_background_schema)
 -        self.slideshow_pane = BackgroundSlideshowPane(self, self._gnome_background_schema, self._cinnamon_background_schema)
 +        self.wallpaper_pane = BackgroundWallpaperPane(self, self._cinnamon_background_schema)
-+        self.slideshow_pane = BackgroundSlideshowPane(self, self._cinnamon_background_schema)
++        self.slideshow_pane = BackgroundSlideshowPane(self, self._cinnamon_background_schema, self._cinnamon_background_schema)
          if self._cinnamon_background_schema["mode"] == "slideshow":
              self.mainbox.add(self.slideshow_pane)
          else:
-@@ -536,21 +535,21 @@ def build(self, advanced):
+@@ -536,21 +535,21 @@
          l = Gtk.Label(_("Picture aspect"))
          l.set_alignment(0, 0.5)
          advanced_options_box.pack_start(l, False, False, 0)
@@ -295,6 +284,7 @@ index f964aed..4a38c84 100644
          hbox.pack_start(self.secondary_color, False, False, 2)
          advanced_options_box.pack_start(hbox, False, False, 0)
          self.content_box.show_all()
+
 diff --git a/js/ui/main.js b/js/ui/main.js
 index 74154ab..99aee95 100644
 --- a/js/ui/main.js
diff --git a/community/python-sqlalchemy/PKGBUILD b/community/python-sqlalchemy/PKGBUILD
index c356a53c3..6efe35668 100644
--- a/community/python-sqlalchemy/PKGBUILD
+++ b/community/python-sqlalchemy/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 87107 2013-03-27 11:07:21Z jelle $ 
+# $Id: PKGBUILD 89654 2013-05-01 16:07:24Z jelle $ 
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgbase=python-sqlalchemy
 pkgname=('python-sqlalchemy' 'python2-sqlalchemy')
-pkgver=0.8.0
+pkgver=0.8.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el') # python2 package contain .so
 url="http://www.sqlalchemy.org/"
 license=('custom: MIT')
 makedepends=('python' 'python2' 'python-distribute' 'python2-distribute' 'python-nose' 'python2-nose')
-source=("http://downloads.sourceforge.net/sourceforge/sqlalchemy/SQLAlchemy-$pkgver.tar.gz")
-md5sums=('3fb0b62e5d6ef4a022414f4233519ee2')
+source=(http://downloads.sourceforge.net/sourceforge/sqlalchemy/SQLAlchemy-$pkgver.tar.gz)
+md5sums=('8e27886edc49e69921af77c2274caa41')
 
 build() {
   cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver