vcs.maemo.org Git - oespirit1/blob - sapwood/mer-changes.patch

   1 --- sapwood-3.1.1-2+0m5/debian/control
   2 +++ sapwood-3.1.1-2+0m5/debian/control
   3 @@ -3,7 +3,7 @@
   4  Priority: optional
   5  Maintainer: Tommi Komulainen <tommi.komulainen@nokia.com>
   6  Standards-Version: 3.6.0
   7 -Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev (>= 2.8.0), upstart-dev
   8 +Build-Depends: debhelper (>> 4.0.0), libgtk2.0-dev (>= 2.8.0), upstart-dev, automake, autoconf, libtool
   9
  10  Package: gtk2-engines-sapwood
  11  Architecture: any
  12 --- sapwood-3.1.1-2+0m5/debian/changelog
  13 +++ sapwood-3.1.1-2+0m5/debian/changelog
  14 @@ -1,3 +1,10 @@
  15 +sapwood (3.1.1-2+0m5-mer1) jaunty; urgency=low
  16 +
  17 +  * Add automake, libtool, autoconf to build-dep
  18 +  * Fix bad alignment on < ARMv6, causing crashes on 770 (thanks to RST38h)
  19 +
  20 + -- Carsten V. Munk <cvm@cs.au.dk>  Thu, 21 May 2009 19:58:41 +0000
  21 +
  22  sapwood (3.1.1-2+0m5) unstable; urgency=low
  23
  24    * This entry has been added by BIFH queue processor
  25 --- sapwood-3.1.1-2+0m5/engine/sapwood-pixmap.c
  26 +++ sapwood-3.1.1-2+0m5/engine/sapwood-pixmap.c
  27 @@ -91,14 +91,19 @@
  28                               GError    **err)
  29  {
  30    SapwoodPixmap     *self;
  31 -  char               buf[ sizeof(PixbufOpenRequest) + PATH_MAX + 1 ] = {0};
  32 -  PixbufOpenRequest *req = (PixbufOpenRequest *) buf;
  33    PixbufOpenResponse rep;
  34    int                flen;
  35    int                i, j;
  36 +  struct
  37 +  {
  38 +    PixbufOpenRequest request;
  39 +    char namebuf[PATH_MAX+1];
  40 +  } req;
  41
  42 +  memset(&req, 0, sizeof(req));
  43 +
  44    /* marshal request */
  45 -  flen = g_strlcpy (req->filename, filename, PATH_MAX);
  46 +  flen = g_strlcpy (req.request.filename, filename, PATH_MAX);
  47    if (flen > PATH_MAX)
  48      {
  49        g_set_error (err, SAPWOOD_CLIENT_ERROR, SAPWOOD_CLIENT_ERROR_UNKNOWN,
  50 @@ -106,14 +111,14 @@
  51        return NULL;
  52      }
  53
  54 -  req->base.op       = PIXBUF_OP_OPEN;
  55 -  req->base.length   = sizeof(*req) + flen + 1;
  56 -  req->border_left   = border_left;
  57 -  req->border_right  = border_right;
  58 -  req->border_top    = border_top;
  59 -  req->border_bottom = border_bottom;
  60 +  req.request.base.op       = PIXBUF_OP_OPEN;
  61 +  req.request.base.length   = sizeof(PixbufOpenRequest) + flen + 1;
  62 +  req.request.border_left   = border_left;
  63 +  req.request.border_right  = border_right;
  64 +  req.request.border_top    = border_top;
  65 +  req.request.border_bottom = border_bottom;
  66
  67 -  if (!pixbuf_proto_request ((char*)req,  req->base.length,
  68 +  if (!pixbuf_proto_request ((char*)&req,  req.request.base.length,
  69                              (char*)&rep, sizeof(rep), err))
  70      return NULL;
  71