Patch glucose dependencies

9 files changed, 91 insertions, 894 deletions

diff --git a/deps/gnutls/SPECS/gnutls.spec b/deps/gnutls/SPECS/gnutls.spec
deleted file mode 100644
index 148fd47..0000000
--- a/deps/gnutls/SPECS/gnutls.spec
+++ /dev/null
@@ -1,507 +0,0 @@
-#
-# spec file for package gnutls (Version 2.4.1)
-#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-# norootforbuild
-
-
-Name:           gnutls
-BuildRequires:  gcc-c++ libgcrypt-devel libopencdk-devel
-Version:        2.4.1
-Release:        25.1
-License:        GPL v3 or later; LGPL v2.1 or later
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Url:            http://www.gnutls.org/
-Source0:        %name-%version.tar.bz2
-Patch1:         gnutls-2.4.1-disable_cxx.patch
-Patch2:         CVE-2008-4989.patch
-Summary:        The GNU Transport Layer Security Library
-Group:          Productivity/Networking/Security
-AutoReqProv:    on
-# bug437293
-%ifarch ppc64
-Obsoletes:      gnutls-64bit
-%endif
-#
-
-%description
-The GnuTLS project aims to develop a library that provides a secure
-layer over a reliable transport layer. Currently the GnuTLS library
-implements the proposed standards of the IETF's TLS working group.
-
-
-
-Authors:
---------
-    Nikos Mavroyanopoulos
-    Fabio Fiorina
-    Timo Schulz
-    Andrew McDonald
-
-%package -n libgnutls26
-License:        LGPL v2.1 or later
-Summary:        The GNU Transport Layer Security Library
-Group:          Productivity/Networking/Security
-
-%description -n libgnutls26
-The GnuTLS project aims to develop a library that provides a secure
-layer over a reliable transport layer. Currently the GnuTLS library
-implements the proposed standards of the IETF's TLS working group.
-
-
-
-Authors:
---------
-    Nikos Mavroyanopoulos
-    Fabio Fiorina
-    Timo Schulz
-    Andrew McDonald
-
-%package -n libgnutls-extra26
-License:        GPL v3 or later
-Summary:        The GNU Transport Layer Security Library
-Group:          Productivity/Networking/Security
-
-%description -n libgnutls-extra26
-The GnuTLS project aims to develop a library that provides a secure
-layer over a reliable transport layer. Currently the GnuTLS library
-implements the proposed standards of the IETF's TLS working group.
-
-
-
-Authors:
---------
-    Nikos Mavroyanopoulos
-    Fabio Fiorina
-    Timo Schulz
-    Andrew McDonald
-
-%package -n libgnutls-devel
-License:        LGPL v2.1 or later
-Summary:        Development package for gnutls
-Group:          Development/Libraries/C and C++
-Requires:       libgnutls26 = %version glibc-devel libopencdk-devel libgcrypt-devel
-PreReq:         %install_info_prereq
-
-%description -n libgnutls-devel
-Files needed for software development using gnutls.
-
-
-
-Authors:
---------
-    Nikos Mavroyanopoulos
-    Fabio Fiorina
-    Timo Schulz
-    Andrew McDonald
-
-%package -n libgnutls-extra-devel
-License:        GPL v3 or later
-Summary:        The GNU Transport Layer Security Library
-Group:          Development/Libraries/C and C++
-Requires:       libgnutls-extra26 = %version libgnutls-devel
-# gnutls-devel last used in 10.3
-Obsoletes:      gnutls-devel < %version
-Provides:       gnutls-devel = %version
-# bug437293
-%ifarch ppc64
-Obsoletes:      gnutls-devel-64bit
-%endif
-#
-
-%description -n libgnutls-extra-devel
-The GnuTLS project aims to develop a library that provides a secure
-layer over a reliable transport layer. Currently the GnuTLS library
-implements the proposed standards of the IETF's TLS working group.
-
-
-
-Authors:
---------
-    Nikos Mavroyanopoulos
-    Fabio Fiorina
-    Timo Schulz
-    Andrew McDonald
-
-%prep
-%setup -q
-%patch1 -p1
-%patch2 -p1
-
-%build
-autoreconf -fi
-./configure --prefix=%_prefix \
-            --sysconfdir=%_sysconfdir \
-            --libdir=%_libdir \
-	    --mandir=%_mandir --infodir=%_infodir \
-	    --localstatedir=%_localstatedir \
-	    --with-included-libtasn1 \
-	    --without-lzo \
-	    --disable-srp-authentication \
-	    --disable-rpath \
-            CFLAGS="$RPM_OPT_FLAGS" \
-            CXXFLAGS="$RPM_OPT_FLAGS"
-make
-make check
-
-%install
-make DESTDIR=$RPM_BUILD_ROOT install
-rm -rf doc/examples/.deps doc/examples/.libs doc/examples/*.{o,lo,la} doc/examples/Makefile{,.in}
-find doc/examples -perm -111 -exec rm {} \;
-rm -rf %{buildroot}/usr/share/locale/en@{,bold}quot
-# Do not package static libs and libtool files
-rm -f %{buildroot}%{_libdir}/*.{a,la}
-%find_lang %name
-
-%clean
-rm -rf %buildroot
-
-%post -n libgnutls26
-/sbin/ldconfig
-
-%postun -n libgnutls26
-/sbin/ldconfig
-
-%post -n libgnutls-extra26
-/sbin/ldconfig
-
-%postun -n libgnutls-extra26
-/sbin/ldconfig
-
-%post -n libgnutls-devel
-%install_info --info-dir=%{_infodir} %{_infodir}/gnutls.info.gz
-
-%postun -n libgnutls-devel
-%install_info_delete --info-dir=%{_infodir} %{_infodir}/gnutls.info.gz
-
-%files -f %name.lang
-%defattr(-, root, root)
-%doc THANKS README NEWS ChangeLog COPYING.LIB COPYING AUTHORS doc/TODO
-%_bindir/certtool
-%_bindir/gnutls-cli
-%_bindir/gnutls-cli-debug
-%_bindir/gnutls-serv
-%_bindir/psktool
-%_mandir/man1/*
-
-%files -n libgnutls26
-%defattr(-,root,root)
-%_libdir/libgnutls.so.26*
-
-%files -n libgnutls-extra26
-%defattr(-,root,root)
-%_libdir/libgnutls-extra.so.26*
-%_libdir/libgnutls-openssl.so.26*
-
-%files -n libgnutls-devel
-%defattr(-, root, root)
-%_bindir/libgnutls-config
-%_includedir/*
-%_libdir/libgnutls.so
-%_datadir/aclocal/libgnutls.m4
-%_libdir/pkgconfig/gnutls.pc
-%_mandir/man3/*
-%_infodir/%{name}*
-%doc doc/examples doc/gnutls.html doc/*.png doc/gnutls.pdf doc/reference/html/*
-
-%files -n libgnutls-extra-devel
-%defattr(-, root, root)
-%_bindir/libgnutls-extra-config
-%_libdir/libgnutls-extra.so
-%_libdir/libgnutls-openssl.so
-%_datadir/aclocal/libgnutls-extra.m4
-%_libdir/pkgconfig/gnutls-extra.pc
-
-%changelog
-* Fri Mar 13 2009 jshi@suse.de
-- fix security bug [bnc#457938]
-  new CVE-2008-4989
-* Wed Dec 10 2008 olh@suse.de
-- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade
-  (bnc#437293)
-* Fri Nov 28 2008 jshi@suse.de
-- fix security bug [bnc#441856]
-  CVE-2008-4989
-* Thu Oct 30 2008 olh@suse.de
-- obsolete old -XXbit packages (bnc#437293)
-* Sat Aug  2 2008 meissner@suse.de
-- run testsuite
-* Thu Jul 17 2008 mkoenig@suse.de
-- update to version 2.4.1
-  * libgnutls: Fix local crash in gnutls_handshake
-  * libgnutls: Fix memory leaks when doing a re-handshake
-  * Fix compiler warnings
-  * Fix ordering of -I's to avoid opencdk.h conflict with
-    system headers
-  * srptool: Fix a problem where --verify check does not succeed
-- remove C++ wrapper lib, it is not usable without SRP
-- remove patch
-  gnutls-1.6.1-srptool.patch
-* Wed Jul  2 2008 mkoenig@suse.de
-- remove gnutls main package from baselibs.conf
-* Thu Jun 26 2008 mkoenig@suse.de
-- update to version 2.4.0
-  * The OpenPGP sub-system has been improved and now supports subkeys
-  * The PSK sub-system has been improved and now supports password
-    derivation and PSK identity hints
-  * The certtool --inder and --outder has been replaced
-    by --inraw and --outraw
-  * New APIs to access the raw X.509 Subject and Issuer DN's and
-    elements from the certificate credentials structure
-  * New APIs to improve working with username/passwords and PSK
-  * Names of constants to affect certificate printing changed
-  * The function gnutls_openpgp_privkey_get_id has been renamed to
-    gnutls_openpgp_privkey_get_key_id
-  * API/ABI changes in GnuTLS 2.4
-    All OpenPGP related functions have been moved from
-    libgnutls-extra to libgnutls, and several new functions have
-    been added
-- remove SRP functionality from C++ wrapper, otherwise it cannot
-  be linked against it
-- removed patches
-  gnutls-2.2.2-uninitialized.patch
-  gnutls-char-signedness.patch
-  gnutls-GNUTLS_SA_2008_1.patch
-* Mon Jun 23 2008 mkoenig@suse.de
-- disable SRP [bnc#65192]
-* Wed May 21 2008 mkoenig@suse.de
-- fix three security bugs [bnc#392947]
-  CVE-2008-1948 GNUTLS-SA-2008-1-1
-  Fix crash when sending invalid server name
-  CVE-2008-1949 GNUTLS-SA-2008-1-2
-  Fix crash when sending repeated client hellos
-  CVE-2008-1950 GNUTLS-SA-2008-1-3
-  Fix crash in cipher padding decoding for invalid record lengths
-* Thu May  8 2008 mkoenig@suse.de
-- fix build
-* Tue Apr 29 2008 cthiel@suse.de
-- obsolete gnutls-<arch> via baselibs.conf
-* Thu Apr 10 2008 ro@suse.de
-- added baselibs.conf file to build xxbit packages
-  for multilib support
-* Thu Apr  3 2008 mkoenig@suse.de
-- update to version 2.2.2
-  * Cipher priority string handling now handle strings that
-    starts with NULL
-  * Corrected memory leaks in session resuming and DHE ciphersuites
-  * Increased the default certificate verification chain limits and
-    allowed for checks without limitation
-  * Corrected the behaviour of gnutls_x509_crt_get_subject_alt_name()
-    and gnutls_x509_crt_get_subject_alt_name() to not null terminate
-    binary strings and return the proper size
-* Thu Jan 31 2008 mkoenig@suse.de
-- update to version 2.2.1
-  * Fixes the post_client_hello_function()
-  * Fix for certificate selection in servers with certificate callbacks
-  * certtool: Fixed data corruption when using --outder
-  * TLS authorization support removed.
-  * Corrected bug which did not allow a server to run without
-    supporting certificates
-  * Introduced gnutls_session_enable_compatibility_mode()
-  * Added gnutls_record_disable_padding() to allow servers talking to
-    buggy clients
-  * Fixed PKCS #3 parameter export
-  * Added support for Camellia cipher
-  * certtool: Add option --quick-random
-  * Added capability to set a callback after the client hello is
-    received by the server in order to adjust parameters before
-    the handshake
-  * certtool: Fixed data corruption when using --outder
-  * SRP was corrected to adhere to the latest draft
-  * Updated the DN parser
-  * Added support for DSA2 using libgcrypt 1.3.0
-  * Removed all the trustdb code from openpgp authentication.
-    We now use only the well-specified keyrings
-  * The gnutls_certificate_set_openpgp_* functions were modified
-    to include the format. This makes the interface consistent with
-    the x509 functions
-  * Introduced gnutls_session_enable_compatibility_mode()
-  * Added gnutls_set_default_priority2()
-  * Added priority functions that accept strings
-  * certtool: Add option --disable-quick-random to enable the
-    old behaviour of using /dev/random to generate keys
-  * Added the --v1 option to certtool, to allow generating X.509
-    version 1 certificates
-  * Fix PKCS#3 parameter export problem
-  * Fixed GNUTLS_E_UNKNOWN_ALGORITHM vs GNUTLS_E_UNKNOWN_HASH_ALGORITHM
-  * gnutls_certificate_set_x509_key_* can now read PKCS #8 unencrypted
-    private keys
-  * Introduced the GNUTLS_E_BASE64_UNEXPECTED_HEADER_ERROR error code
-  * Added the --to-p8 option to certtool to convert private keys
-    to PKCS #8 keys
-  * Corrected bug in decompression of expanded compression data
-  * The gnutls_*_convert_priority() functions were deprecated
-  * gnutls-cli and gnutls-serv now have a --priority option
-  * PKCS #8 parser can now encode/decode DSA keys
-  * Corrected a segfault when setting an empty gnutls_priority_t
-    at gnutls_priority_set()
-  * Added gnutls_x509_crt_get_subject_alt_name2()
-  * The GPL version has been changed from version 2 to version 3.
-    This affects the self-tests, command-line tools, the libgnutls-extra
-    library, the relevant guile parts, and the build environment
-- API and ABI modifications, library soname switch from 13 to 26
-- change package structure:
-  * branch off libgnutls-extra
-    since this is now GPLv3 or later while libgnutls remains
-    LGPLv2.1 or later
-  * gnutls license change to GPLv3
-- build without lzo support to avoid license problems
-  since lzo is currently GPLv2 only
-- removed merged patches:
-  gnutls-fix_size_t.patch
-* Tue Oct 23 2007 mkoenig@suse.de
-- update to version 2.0.1
-- change package layout to conform shlib policy:
-  rename gnutls-devel -> libgnutls-devel
-  new subpackage libgnutls13
-- removed patches:
-  gnutls-1.4.4-sign-callback.patch
-  gnutls-1.6.1-compiler_warnings.patch
-* Thu Aug 30 2007 mkoenig@suse.de
-- fix srptool [#208227]
-- fix some compiler warnings
-* Fri Aug  3 2007 hvogel@suse.de
-- Some additions for evolution smart card support
-* Thu May 10 2007 mkoenig@suse.de
-- Fix segfault on s390x [#97441]
-  gnutls-fix_size_t.patch
-* Tue Jan 23 2007 mkoenig@suse.de
-- update to new stable branch 1.6.1:
-  * Fix the list of trusted CAs that server's send to clients.
-  * Fix gnutls_certificate_set_x509_crl to initialize the CRL
-    before using it.
-  * Encode UID fields in DN's as DirectoryString.
-  * Fix ./configure failure with non-GCC compilers.
-  * A GnuTLS C++ library is part of the official distribution.
-  * New APIs for custom push/pull function error reporting.
-* Tue Oct 24 2006 mkoenig@suse.de
-- move developer related docs to devel package and remove
-  binary stuff from docs [#212454]
-* Tue Sep 19 2006 mkoenig@suse.de
-- update to version 1.4.4:
-  * bugfix release
-  * fixes security vulnerability [#206636] (CVE-2006-4790)
-* Thu Aug 31 2006 mkoenig@suse.de
-- update to new stable branch 1.4.1:
-  * The command line tools now use getaddrinfo and support IPv6.
-  * gnutls-cli can now recognize services and port numbers with
-    the -p option.
-  * Error messages are now translated using GNU Gettext.
-  * GnuTLS now support TLS Inner application (TLS/IA).
-  * API and ABI modifications:
-    + Support for DHE-PSK cipher suites has been added.
-    + Removed the RIPEMD ciphersuites.
-    + Remove GnuTLS 0.8.x compatibility functions.
-    + Support for TLS Pre-Shared Key (TLS-PSK) ciphersuites have
-    been added.
-    + Certtool now generate keys in unencrypted PKCS#8 format for
-    empty passwords.
-    + Certtool now accept --password for --key-info and encrypted
-    PKCS#8 keys.
-    + gnutls_x509_privkey_import_pkcs8 now accept unencrypted
-    PEM PKCS#8 keys,
-    + New function to set a X.509 private key and certificate
-    pairs, and/or CRLs, from an PKCS#12 file.
-    + New APIs to acceess the client and server random fields in
-    a session.
-    + New APIs to access the TLS Pseudo-Random-Function (PRF).
-    + New API to access the TLS master secret.
-    + The function gnutls_x509_crt_to_xml now return an internal
-    error.
-  * Several bugfixes:
-    + Corrected a bug in certtool for 64 bit machines.
-    + Fix gnutls-cli STARTTLS hang when SIGINT is sent too quickly.
-    + Fix crash in TLS resume code, caused by TLS/IA changes.
-    + Corrected bugs in gnutls_certificate_set_x509_crl() and
-    gnutls_certificate_set_x509_trust().
-    + Fixed bug in non-blocking gnutls_bye().
-    + Fix read of out bounds bug in DER parser.
-    + Fixed bug in OpenPGP authentication handshake.
-* Sat Feb 18 2006 ro@suse.de
-- cleanup doc directory (.deps,.libs)
-* Fri Feb 10 2006 hvogel@suse.de
-- Update to version 1.2.10. This release fixes several serious
-  bugs that would make the DER decoder in libtasn1 crash on
-  invalid input [#149897]. Including:
-  * Corrected a bug in certtool for 64 bit machines.
-  * Fix gnutls-cli STARTTLS hang when SIGINT is sent too quickly
-  * Corrected bugs in gnutls_certificate_set_x509_crl() and
-    gnutls_certificate_set_x509_trust(), that caused memory
-    corruption if more than one certificates were added.
-  * Fixed bug in non-blocking gnutls_bye(). gnutls_record_send()
-    will no longer invalidate a session if the underlying send
-    fails, but it will prevent future writes.
-* Wed Jan 25 2006 mls@suse.de
-- converted neededforbuild to BuildRequires
-* Tue Dec 20 2005 ro@suse.de
-- do not package /usr/share/info/dir
-* Fri Dec  9 2005 hvogel@suse.de
-- update to version 1.2.9
-* Tue Oct 25 2005 hvogel@suse.de
-- update to version 1.2.8
-* Mon Aug 22 2005 hvogel@suse.de
-- fix data type comparison [Bug #104617]
-* Sun Jul  3 2005 hvogel@suse.de
-- update to version 1.2.5
-* Wed Jun 29 2005 hvogel@suse.de
-- patch from mrueckert to use external lzo again
-* Thu Jun 23 2005 hvogel@suse.de
-- use %%install_info/%%install_info_delete
-* Tue Jun  7 2005 hvogel@suse.de
-- update to version 1.2.4
-* Fri Jun  3 2005 ro@suse.de
-- fix specfile (don't apply non-existant patch1)
-* Thu Jun  2 2005 hvogel@suse.de
-- use included minilzo
-* Wed May 25 2005 hvogel@suse.de
-- Update to version 1.2.3 (fixes gnutls DOS Bug #83481)
-- Include defines.h before gnutls.h, to pull in config.h, to make
-  sure memmem.h prototype memmem properly
-* Sat Jan 29 2005 hvogel@suse.de
-- Update to version 1.2.0
-* Wed Jan 19 2005 hvogel@suse.de
-- update to version 1.1.23
-- get rid of prebuild html/ps docu again, the devel packages has
-  man-pages now
-* Mon Dec 13 2004 hvogel@suse.de
-- update to version 1.0.23
-- make build of postscript/html docu configureable
-* Sat Oct 23 2004 hvogel@suse.de
-- move config script to the devel package
-* Thu Oct 14 2004 hvogel@suse.de
-- Update to version 1.0.21
-* Tue Sep 28 2004 hvogel@suse.de
-- add doc subpackage with prebuild html/ps docu (Bug #44496)
-* Mon Sep 27 2004 hvogel@suse.de
-- fix ac-quotation patch to include libgnutls-extra.m4 (Bug #46035)
-* Tue Aug 31 2004 kukuk@suse.de
-- Update to version 1.0.20
-* Mon Aug 30 2004 kukuk@suse.de
-- Add libopencdk-devel to neededforbuild
-* Thu Jul 15 2004 hvogel@suse.de
-- add libgcrypt-devel and lipgpg-error-devel to nfb
-* Wed May 19 2004 hvogel@suse.de
-- update to version 1.0.13
-* Fri May 14 2004 mmj@suse.de
-- Add C++ compiler to build
-- Don't remove buildroot when installing
-* Mon Mar  1 2004 hvogel@suse.de
-- update to version 1.0.8
-* Tue Feb 17 2004 hvogel@suse.de
-- update to version 1.0.6
-- fix autoconf quotations
-* Wed May 14 2003 schubi@suse.de
-- initial; Sourcecode received from XIMIAN
diff --git a/deps/icon-slicer/SOURCES/icon-slicer-0.3-attachpoints.patch b/deps/icon-slicer/SOURCES/icon-slicer-0.3-attachpoints.patch
deleted file mode 100644
index 5638add..0000000
--- a/deps/icon-slicer/SOURCES/icon-slicer-0.3-attachpoints.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -ur icon-slicer-0.3/src/main.c icon-slicer-0.3-attachpoints/src/main.c
---- icon-slicer-0.3/src/main.c	2003-06-25 22:17:32.000000000 +0200
-+++ icon-slicer-0.3-attachpoints/src/main.c	2004-09-30 10:16:43.884414198 +0200
-@@ -363,6 +363,35 @@
-     }
- }
- 
-+struct AttachPointCompare {
-+  int rowstride;
-+  const guchar *pixels;
-+};
-+
-+static gint
-+compare_attach_points     (gconstpointer  a,
-+			   gconstpointer  b,
-+			   gpointer       user_data)
-+{
-+  const ThemePoint *attach_point_a, *attach_point_b;
-+  struct AttachPointCompare *compare;
-+  guint8 red_a, red_b;
-+  
-+  attach_point_a = a;
-+  attach_point_b = b;
-+  compare = user_data;
-+
-+  red_a = compare->pixels[compare->rowstride * attach_point_a->y + 4*attach_point_a->x];
-+  red_b = compare->pixels[compare->rowstride * attach_point_b->y + 4*attach_point_b->x];
-+
-+  if (red_a > red_b)
-+    return -1;
-+  if (red_a == red_b)
-+    return 0;
-+  return 1;
-+}
-+
-+
- static void
- icon_fetch_attach_points (ThemeIcon         *icon,
- 			  ThemeIconInstance *instance,
-@@ -375,7 +404,8 @@
-   
-   const guchar *pixels;
-   int rowstride;
--
-+  struct AttachPointCompare compare;
-+  
-   theme_source_location_start (source, &icon->location, &start_x, &start_y);
-   image = theme_source_find_image (source, THEME_SOURCE_USE_ATTACH_POINTS);
-   if (!image)
-@@ -390,6 +420,8 @@
-   
-   rowstride = gdk_pixbuf_get_rowstride (image->image);
-   pixels = gdk_pixbuf_get_pixels (image->image) + start_y * rowstride + start_x * 4;
-+  compare.pixels = pixels;
-+  compare.rowstride = rowstride;
-   
-   for (j = 0; j < source->gridsize; j++)
-     {
-@@ -407,6 +439,10 @@
-       
-       pixels += rowstride;
-     }
-+
-+  instance->attach_points = g_slist_sort_with_data (instance->attach_points,
-+						    compare_attach_points,
-+						    &compare);
- }
- 
- static gboolean
diff --git a/deps/icon-slicer/SOURCES/icon-slicer-0.3-sugar-297.patch b/deps/icon-slicer/SOURCES/icon-slicer-0.3-sugar-297.patch
new file mode 100644
index 0000000..9cc769f
--- /dev/null
+++ b/deps/icon-slicer/SOURCES/icon-slicer-0.3-sugar-297.patch
@@ -0,0 +1,65 @@
+--- icon-slicer-0.3/src/main.c.orig	2003-06-25 20:17:32.000000000 +0000
++++ icon-slicer-0.3/src/main.c	2009-03-20 17:49:03.000000000 +0000
+@@ -89,7 +89,7 @@
+ {
+   ThemeImage *image = theme_source_find_image (source, frame_index);
+   int start_x, start_y;
+-  int i, j;
++  int x, y;
+   
+   const guchar *pixels;
+   int rowstride;
+@@ -103,7 +103,7 @@
+   if (n_channels == 3)
+     {
+       out->x = start_x;
+-      out->y = start_x;
++      out->y = start_y;
+       out->width = source->gridsize;
+       out->height = source->gridsize;
+       
+@@ -116,29 +116,29 @@
+       
+       pixels = gdk_pixbuf_get_pixels (image->image) + start_y * rowstride + start_x * 4;
+ 
+-      for (j = 0; j < source->gridsize; j++)
++      for (y = 0; y < source->gridsize; y++)
+ 	{
+-	  for (i = 0; i < source->gridsize; i++)
++	  for (x = 0; x < source->gridsize; x++)
+ 	    {
+-	      if (pixels[4*i + 3] > threshold)
++	      if (pixels[4*x + 3] > threshold)
+ 		{
+ 		  if (found)
+ 		    {
+-		      if (start_x + i < min_x)
+-			min_x = start_x + i;
+-		      if (start_x + i >= max_x)
+-			max_x = start_x + i + 1;
+-		      if (start_y + j < min_y)
+-			min_y = start_y + j;
+-		      if (start_y + j >= max_y)
+-			max_y = start_y + j + 1;
++		      if (start_x + x < min_x)
++			min_x = start_x + x;
++		      if (start_x + x >= max_x)
++			max_x = start_x + x + 1;
++		      if (start_y + y < min_y)
++			min_y = start_y + y;
++		      if (start_y + y >= max_y)
++			max_y = start_y + y + 1;
+ 		    }
+ 		  else
+ 		    {
+-		      min_x = start_x + i;
+-		      max_x = start_x + i + 1;
+-		      min_y = start_y + i;
+-		      max_y = start_y + i + 1;
++		      min_x = start_x + x;
++		      max_x = start_x + x + 1;
++		      min_y = start_y + y;
++		      max_y = start_y + y + 1;
+ 
+ 		      found = TRUE;
+ 		    }
diff --git a/deps/icon-slicer/SPECS/icon-slicer.spec b/deps/icon-slicer/SPECS/icon-slicer.spec
index 24fb028..6154683 100644
--- a/deps/icon-slicer/SPECS/icon-slicer.spec
+++ b/deps/icon-slicer/SPECS/icon-slicer.spec
@@ -7,7 +7,7 @@ Release: 3.2
 License: MIT
 Group: Development/Tools
 Source: icon-slicer-%{version}.tar.gz
-Patch1: icon-slicer-0.3-attachpoints.patch
+Patch1: icon-slicer-0.3-sugar-297.patch
 BuildRequires: gtk2-devel
 BuildRequires: popt-devel
 BuildRoot: %{_tmppath}/build-%{name}-root
@@ -18,7 +18,7 @@ themes
 
 %prep
 %setup -q
-%patch1 -p1 -b .attachpoints
+%patch1 -p1
 
 %build
 %configure
diff --git a/deps/python-telepathy/SPECS/python-telepathy.spec b/deps/python-telepathy/SPECS/python-telepathy.spec
index 9cd4f8f..b5b9ec0 100644
--- a/deps/python-telepathy/SPECS/python-telepathy.spec
+++ b/deps/python-telepathy/SPECS/python-telepathy.spec
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-telepathy
-Version:        0.15.6
-Release:        1.4
+Version:        0.15.7
+Release:        0
 Summary:        Python libraries for Telepathy
 
 Group:          Development/Languages
diff --git a/deps/telepathy-gabble/SOURCES/telepathy-gabble-0.7.26-uuid-include.patch b/deps/telepathy-gabble/SOURCES/telepathy-gabble-0.7.26-uuid-include.patch
new file mode 100644
index 0000000..2f9f8cc
--- /dev/null
+++ b/deps/telepathy-gabble/SOURCES/telepathy-gabble-0.7.26-uuid-include.patch
@@ -0,0 +1,11 @@
+--- telepathy-gabble-0.7.26/src/util.c.orig	2009-04-02 18:03:31.000000000 +0000
++++ telepathy-gabble-0.7.26/src/util.c	2009-04-22 05:14:48.000000000 +0000
+@@ -30,7 +30,7 @@
+ #include <telepathy-glib/handle-repo-dynamic.h>
+ 
+ #ifdef HAVE_UUID
+-# include <uuid.h>
++# include <uuid/uuid.h>
+ #endif
+ 
+ #define DEBUG_FLAG GABBLE_DEBUG_JID
diff --git a/deps/telepathy-gabble/SPECS/telepathy-gabble.spec b/deps/telepathy-gabble/SPECS/telepathy-gabble.spec
index 37a60ef..d2faef4 100644
--- a/deps/telepathy-gabble/SPECS/telepathy-gabble.spec
+++ b/deps/telepathy-gabble/SPECS/telepathy-gabble.spec
@@ -21,8 +21,8 @@
 Name:           telepathy-gabble
 Url:            http://telepathy.freedesktop.org/wiki/
 Summary:        XMPP connection manager for Telepathy
-Version:        0.7.24
-Release:        1.6
+Version:        0.7.26
+Release:        0
 License:        LGPL v2.1 or later
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  dbus-1-glib-devel
@@ -33,7 +33,8 @@ BuildRequires:  loudmouth-devel
 BuildRequires:  python-xml
 BuildRequires:  telepathy-glib-devel
 Group:          System/Libraries
-Source:         %{name}-%{version}.tar.bz2
+Source:         %{name}-%{version}.tar.gz
+Patch:          telepathy-gabble-0.7.26-uuid-include.patch
 
 %description
 Gabble is a Jabber/XMPP connection manager for the Telepathy framework,
@@ -77,6 +78,7 @@ Authors:
 
 %prep
 %setup -q 
+%patch -p1
 
 %build
 %configure --docdir=%{_docdir}/%{name}
@@ -107,247 +109,3 @@ rm -rf %buildroot
 %{_docdir}/%{name}/
 
 %changelog
-* Tue Mar 24 2009 vuntz@novell.com
-- Update to version 0.7.24:
-  + Enhancements:
-  - All messages on the Messages interface now have a message
-    token, using the XMPP id attribute. Identifiers for messages
-    that Gabble sends, and those it receives that lack one, are
-    generated with libuuid if available, or with a unique-ish
-    time-based fallback otherwise.
-  + Fixes:
-  - Fix SOCKS5 implementation to actually respect XEP-0065.
-  - Don't crash if Google relay responses arrive after the call
-    has ended (fdo#20764).
-  - Relax overly-strict checks made by CodecsUpdated.
-- Add libuuid-devel BuildRequires.
-* Tue Mar 17 2009 vuntz@novell.com
-- Update to version 0.7.23:
-  + Dependencies:
-  - telepathy-glib >= 0.7.26 is now required
-  - libsoup >= 2.4 is now required
-  + Enhancements:
-  - Add functionality to ask for a Google-specific relay session,
-    so Google Talk users can use Google's relay servers to make
-    and receive Jingle calls.
-  - The CodecsUpdated method, introduced in spec version 0.17.19
-    and used to send updated parameters for codecs such as Theora
-    and H264 to the other party in a call, is now implemented.
-  + Fixes:
-  - Fix flow control in tubes when using a SI fallback
-    bytestream.
-  - Implement flow control in bytestream IBB.
-  - Make GetHandle() correspond to the TargetHandle[Type]
-    properties on streamed media channels.
-- Add libsoup-devel BuildRequires.
-* Fri Mar  6 2009 vuntz@novell.com
-- Update to version 0.7.22:
-  + Dependencies:
-  - telepathy-glib 0.7.24 is now required
-  + Enhancements:
-  - Resolve STUN servers' IP addresses as required by
-    telepathy-spec changes currently under development
-  - Add NATTraversal, STUNServers and CreatedLocally properties
-    to Media.StreamHandler as required by telepathy-spec changes
-    currently under development
-  - Add fallback-stun-server, fallback-stun-port
-    ConnectionManager parameters
-  + Fixes:
-  - Correctly deal with streams that are added after a call is
-    accepted, fixing video streaming in calls that start off
-    audio-only
-  - fdo#20102: fix byte ordering of port in GibberListener
-  - Drain some swamps in Jingle call handling for better
-    maintainability, and improve Jingle regression test coverage
-  - Don't end calls a minute after an extra content is added, and
-    correctly set the creator attribute on contents. This has the
-    side-effect of not causing older Gabbles to assert.
-  - Improve Tubes test coverage, and fix various races in the
-    tests.
-* Sat Feb 21 2009 mboman@suse.de
-- Update to version 0.7.21:
-  + Implement new tube API for muc stream tubes
-  + Implement new tube API for 1-1 and muc D-Bus tubes
-  + Implement the Messages interface for Text channels.
-  + In multi-user chats, the point at which Sent is emitted has
-    changed. Previously, Sent was emitted when the message was
-    echoed back to you by the server; now, it is emitted (as is
-    Messages.MessageSent) when you send the message. When the
-    message is echoed, a delivery report is emitted with
-    Messages.MessageReceived, and Received is emitted with an
-    empty body and the Non_Text_Content flag set. Clients that
-    don't understand the Messages interface should just
-    immediately ack the ID in that signal
-  + fdo#20003: fix a crash starting Jingle calls on some 64-bit
-    platforms
-  + fdo#20133: fix various bugs where idle callbacks outlived
-    their user-data.
-  + Don't start sending video when the other side adds a video
-    stream.
-- Remove required versions for BuildRequires. We don't generally
-  use it in our .spec files
-- Set correct group for -doc package (Documentation/Other)
-- Add Requires %%{name}-%%{version} for -doc package
-* Wed Feb  4 2009 hfiguiere@suse.de
-- Update to version 0.7.20
-  + Implement the draft version of Location from telepathy-spec 0.17.19
-  + Announce generic tube capabilities when contacts support tubes
-  + Don't get confused if MUC services auto-rename us
-  + Don't get confused if we have to change our own nick in order to join a MUC
-  + Set the correct actor when Jingle sessions are terminated
-  + Don't omit offline, unknown and error from Statuses and GetStatuses()
-    (regression in 0.7.19)
-  + Close and ChannelClosed signals are now fired when a tube is closed (new API)
-* Mon Feb  2 2009 mboman@suse.de
-- Update to version 0.7.19:
-  + Don't crash when closing a muc channel containing an closed D-Bus tube.
-  + Don't resurrect removed streams if the call responder includes them in
-    session-accept
-  + Don't crash in calls if using glib with debugging enabled (fdo#19327).
-  + Don't crash when removing contact from known list (fdo#19524).
-  + Fix D-Bus muc tubes (dev.sugarlabs.org #60).
-  + Fix refcount leak in jingle code (fdo#19385).
-  + Don't crash if "offline" presence status is requested.
-* Wed Jan 28 2009 hfiguiere@suse.de
-- Bump dbus glib required version.
-* Fri Jan  9 2009 hfiguiere@suse.de
-- Update to version 0.7.18:
-  + Implement SOCKS5 bytestreams (XEP-0065) in stream tubes.
-  + Implement a stream initiation fallback mechanism allowing to use IBB if
-    we can't connect to peer using SOCKS5.
-  + Don't crash on setting presence if there are open MUC Tubes.
-  + Stream tube channel advertises the immutable channel properties,
-    including those not on the Channel interface.
-- Build requires dbus-1-glib-devel >= 0.78
-- Split documentation off.
-- Drop telepathy-gabble-64bits-crash.patch.
-* Fri Jan  9 2009 hfiguiere@suse.de
-- Add telepathy-gabble-64bits-crash.patch
-  + fix a crash on 64-bits. bnc#445874
-* Thu Jan  1 2009 mboman@suse.de
-- Update to version 0.7.17:
-  + Too many fixes/updtaes to list. Please see NEWS for details
-  + Fixes bnc#445874 (in 0.7.11)
-* Sun Oct 19 2008 mboman@suse.de
-- Update to version 0.7.10:
-  + Implement the newly official Requested, InitiatorHandle and InitiatorID
-    properties introduced in spec 0.17.13
-  + fdo#16922: stop shipping MD5 and SHA-1 implementations, and use
-    GChecksum instead, since we need GLib 2.16 anyway
-  + Add support for running tests with GObject refdbg enabled
-  + Add TargetID to allowed properties when requesting channels
-  + test-handles: stop asserting that the wrong error (InvalidArgument)
-    will be raised, and accept the correct error (InvalidHandle) too, since
-    this was fixed in telepathy-glib
-  + Some bugfixes in the OLPC code
-  + Use unsigned for booleans in bitfields (gboolean is signed, so
-    "gboolean foo:1" is not portable)
-* Mon Oct 13 2008 sbrabec@suse.cz
-- Signed-off.
-* Thu Oct  2 2008 dominique-opensuse@leuenberger.net
-- Update to version 0.7.9:
-  * Implement the Requests API introduced in spec 0.17.11 and extended in 0.17.12
-  * Save contacts' aliases into the roster for massive bandwidth savings (in
-    conjunction with avatar caching, this should mean we don't have to fetch
-    everyone's vCard every time we connect to the server)
-  * Merge support for the "gadget", an OLPC-specific server component that
-    supports browsing for buddies and activities
-  * When running tests under valgrind, use the same options as in telepathy-glib
-* Wed Aug 20 2008 hfiguiere@suse.de
-- Requires now telepathy-glib >= 0.7.14
-- Upgrade to 0.7.8
-  * Implement the Contacts interface for bulk contact-handle inspection
-  * Implement spec 0.17.9 (add the TargetID property to all channels)
-  * Start to port channel factories away from TpChannelFactoryIface in
-    preparation for implementing the Requests API
-  * Add a simple smoke-test for SimplePresence
-  * Use tp_debug_divert_messages() rather than our own copy of it, since we
-    now depend on a new enough telepathy-glib anyway
-  * Obey the Telepathy spec by giving 'dnd' presence type Presence_Type_Busy
-    and not Presence_Type_Away
-  * Use the pedantically correct marshaller for a GArray, since GObject 2.17
-    actually checks for POINTER vs BOXED (regression in 0.7.7)
-  * Remove unconditional debug messages in a few places
-* Fri Aug  8 2008 hfiguiere@suse.de
-- Upgrade to 0.7.7:
-  * Requires telepathy-glib >= 0.7.13
-  * Implement XEP-0115 version 1.5
-  * fd.o #14954: Set presence in MUCs to be the same as our global presence
-  * fd.o #14955: Set nickname in MUCs to be the same as our alias for ourselves
-  (as set with Aliasing)
-  * Fix a reference leak when using (new-style) TLS
-  * Fix a memory leak when invited to a MUC
-  * Fix a possible assertion failure when we're sent an invalid MUC invitation
-  * fd.o #16918: fix an access to freed memory when the vCard manager is
-  destroyed
-  * fd.o #14341: add a regression test (currently disabled, because the bug
-  is in Loudmouth)
-  * Port most of the regression tests to a more comprehensible API
-* Thu Jul 24 2008 hfiguiere@suse.de
-- Remove the requires and let Autoreqprov do it for us
-* Thu Jul 24 2008 hfiguiere@suse.de
-- Update to 0.7.6
-  * telepathy-glib >= 0.7.8 and loudmouth >= 1.3.2 are now required
-  * Implement the Hold API using telepathy-glib rather than as an extension
-  * fdo#15656: fix an inconsistency in audio/video capabilities
-  * fdo#15422: fix generation of extensions/extensions.html
-  * fdo#15904: fix a regression making the caller of an incoming call in
-    the remote pending set instead of the members one.
-  * fdo#15095: fix MUC contacts always appearing to be offline (and actually
-    include the patch this time) (regression in 0.7.0, probably)
-  * fdo#15311: update tests to work with python-twisted 8.0 (as seen in
-    current Debian unstable)
-  * Ignore components with ID != 1 in native candidates - we can only signal
-    one component, and Farsight 2 reports RTCP components along with RTP ones
-  * Don't assume that htmldir will be defined by autoconf (it's new in 2.59c,
-    and we only require >= 2.59; regression in 0.7.4)
-  * fdo#14467: aggregate MembersChanged signals when joining MUCs, so we
-    get one big signal rather than lots of single-contact signals, potentially
-    reducing client round-trips
-  * Re-enable some regression tests that were accidentally removed in 0.7.3
-  * Build documentation for our extensions to XMPP by default
-  * fdo#12791, Debian #446259: fix assertion failure with strange roster items
-  * fdo#14343: fix race condition that can lose messages between accepting
-    a D-Bus tube and actually connecting to it
-  * fdo#14602: update the StreamedMedia call API to telepathy-spec 0.17.3
-  * fdo#14806: when we add ourselves to the local-pending set for incoming
-    calls, set the caller as the actor
-  * fdo#15198: fix assertion failure when calling GetCapabilities on an invalid
-    handle
-  * When removing a media stream before the initiate is sent, send it if possible
-  * when blocking gtalk contacts, discard their presence
-  * disconnect the connection if we don't receive a reply to the discovery
-    request for server features
-  * stop using Automake 1.9 features, and prefer to autoreconf using 1.8 (if
-    available) to ensure that we don't accidentally re-add a 1.9 dependency
-  * make sure teardown of the disco object doesn't crash if one of its callbacks
-    causes it to be destroyed (bug exposed by test-disco-no-reply.py regression
-    test)
-  * Implements the current draft of the Hold interface, which will be in
-    telepathy-spec 0.17.4 if all goes well
-  * Only emit one AvatarRetrieved signal per contact, no matter how many
-    requests there were for their avatar (fdo#12465)
-  * Explicitly say we require GNU make, and turn off Automake portability
-    warnings (fdo#14020)
-  * Don't emit NewStreamHandler signals multiple times if Ready is called
-    multiple times on the SessionHandler (a bug in stream-engine used to
-    cause this to happen sometimes)
-  * Assorted code cleanup prompted by adding more gcc warnings
-* Fri Mar 14 2008 hfiguiere@suse.de
-- update to 0.7.2
-  + Tubes: a generic transport for collaborative applications
-  + Lot of bug fixes.
-  + Take advantage of telepathy-glib 0.6.1 changes
-  + Remove the -devel files
-* Tue Dec 25 2007 lrupp@suse.de
-- package static libraries in devel package
-  (Obsoletes: %%name-glib - dunno why they are needed at all)
-- beautify specfile
-- don't use obsolete %%run_ldconfig
-- package some files for doc
-* Mon May 14 2007 btimothy@suse.de
-- Add defattr to each %%files section.
-* Wed Apr  4 2007 maw@suse.de
-- Don't build as root.  Duh.
-* Tue Apr  3 2007 maw@suse.de
-- New package.
diff --git a/deps/telepathy-glib/SPECS/telepathy-glib.spec b/deps/telepathy-glib/SPECS/telepathy-glib.spec
index ad4fd23..b055ccb 100644
--- a/deps/telepathy-glib/SPECS/telepathy-glib.spec
+++ b/deps/telepathy-glib/SPECS/telepathy-glib.spec
@@ -24,14 +24,14 @@ BuildRequires:  dbus-1-glib-devel
 BuildRequires:  gtk-doc
 BuildRequires:  libxslt-devel
 BuildRequires:  python-xml
-Version:        0.7.28
-Release:        1.1
+Version:        0.7.29
+Release:        0
 License:        LGPL v2.1 or later
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define debug_package_requires libtelepathy-glib0 = %{version}-%{release}
 Summary:        Libraries for adding telepathy support to applications that use glib
 Group:          Development/Languages/C and C++
-Source:         telepathy-glib-%{version}.tar.bz2
+Source:         telepathy-glib-%{version}.tar.gz
 
 %description
 This package contains the libraries that make it easier to use some
diff --git a/deps/telepathy-salut/SPECS/telepathy-salut.spec b/deps/telepathy-salut/SPECS/telepathy-salut.spec
index 9c36244..a32bd7e 100644
--- a/deps/telepathy-salut/SPECS/telepathy-salut.spec
+++ b/deps/telepathy-salut/SPECS/telepathy-salut.spec
@@ -19,8 +19,8 @@
 
 
 Name:           telepathy-salut
-Version:        0.3.8
-Release:        1.7
+Version:        0.3.9
+Release:        1
 License:        GPL v2 or later
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cyrus-sasl-devel
@@ -36,7 +36,7 @@ BuildRequires:  telepathy-glib-devel
 Group:          System/Libraries
 Summary:        Link-local XMPP connection manager for Telepathy
 Requires:       dbus-1-glib
-Source:         %{name}-%{version}.tar.bz2
+Source:         %{name}-%{version}.tar.gz
 
 %description
 A connection manager for Telepathy that implement peer to peer XMPP
@@ -97,64 +97,3 @@ make %{?jobs:-j %jobs}
 %{_docdir}/%{name}
 
 %changelog
-* Sat Feb 21 2009 mboman@suse.de
-- Update to version 0.3.8:
-  + Switched to the stable version of the FileTransfer interface.
-    Clients (Empathy, Sugar...) have to be modified to use the
-    stable interface instead of the DRAFT one. Just the interface
-    name has been renamed so changes should be trivial
-  + Fix a crash when receiving an incoming XMPP connection from
-    a IPv6 address.
-- Remove export CFLAGS="$RPM_OPT_FLAGS" and export
-  CXXFLAGS="$CFLAGS". These are default
-- Remove required versions for BuildRequires. We don't generally
-  use it in our .spec files
-- Use %%makeinstall instead of 'make install...'
-- Split out documention into a -doc package
-- Use %%setup -q instead of %%setup -q -n %%{name}-%%{version} since
-  we don't change the name
-* Fri Jan  9 2009 hfiguiere@suse.de
-- Update to version 0.3.7
-  * State of pending file transfer channels is now automatically changed to
-    "Cancelled" if peer is disconnected.
-  * Uses libsoup 2.4 instead of the obsolete 2.2 version (fdo#18891).
-  * Don't crash if the XMPP connection is disconnected during a file transfer.
-  * Fix a race in stream tubes causing potential data lost.
-  * Fix various leaks including one leading to a crash (fdo#19181).
-- Remove telepathy-salut-fdo-18891.patch.
-* Thu Jan  1 2009 mboman@suse.de
-- Update to version 0.3.6:
-  + Implement org.freedesktop.Telepathy.Channel.Type.FileTransfer.DRAFT.
-  + All channels are now requestable using the new
-    org.freedesktop.Telepathy.Connection.Interface.Requests interface.
-  + Assertion failed in gibber_multicast_transport_disconnect when closing
-    a local pending room (fdo#18552).
-- Add telepathy-salut-fdo-18891.patch to make it build with current libsoup
-* Sun Oct 19 2008 mboman@suse.de
-- Update to version 0.3.5:
-  * Add a test framework
-  * Only announce OLPC activity we actually joined (dev.laptop.org #8441)
-* Fri Sep 26 2008 sbrabec@suse.cz
-- Removed loudmouth from Requires. loudmouth is not required any
-  more (and it was renamed).
-* Fri Sep 12 2008 maw@suse.de
-- Update to version 0.3.4:
-  + Implement the Contacts interface
-  + Implement the SimplePresence interface
-  + Implement spec 0.17.9 (Add various properties to all channels).
-* Sat Aug 23 2008 hfiguiere@suse.de
-- Fix directory owning (FTBS in factory)
-* Sat Aug 16 2008 hfiguiere@suse.de
-- Update to 0.3.3
-  * Fix clique, tubes and bonjour bugs
-  * Abstract Avahi
-- Set docdir to %%{_docdir}/%%{name}
-* Mon Mar 17 2008 hfiguiere@suse.de
-- Upgrade to 0.3.1
-  + Lot of fixes
-  + Update to the latest telepathy spec
-  + Use the latest Avahi API
-* Thu Oct 11 2007 sbrabec@suse.cz
-- Use binding specific avahi package.
-* Wed Apr  4 2007 maw@suse.de
-- Don't build as root, and some specfile cleanups.