OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Steffen Weinreich
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   05-Oct-2005 20:40:01
  Branch: HEAD                             Handle: 2005100519400100

  Modified files:
    openpkg-src/cairo       cairo.patch cairo.spec

  Log:
    upgrading package: cairo 1.0.0 -> 1.0.2

  Summary:
    Revision    Changes     Path
    1.9         +29 -18     openpkg-src/cairo/cairo.patch
    1.16        +2  -2      openpkg-src/cairo/cairo.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/cairo/cairo.patch
  ============================================================================
  $ cvs diff -u -r1.8 -r1.9 cairo.patch
  --- openpkg-src/cairo/cairo.patch     26 Sep 2005 13:26:32 -0000      1.8
  +++ openpkg-src/cairo/cairo.patch     5 Oct 2005 18:40:01 -0000       1.9
  @@ -1,27 +1,38 @@
   Index: pixman/src/pixman.h
  ---- pixman/src/pixman.h.orig 2005-08-10 21:36:51 +0200
  -+++ pixman/src/pixman.h      2005-09-26 15:07:00 +0200
  -@@ -81,13 +81,21 @@
  +--- pixman/src/pixman.h.orig 2005-10-03 22:44:42 +0200
  ++++ pixman/src/pixman.h      2005-10-05 20:37:17 +0200
  +@@ -80,6 +80,7 @@
  +  * PERFORMANCE OF THIS SOFTWARE.
     */
    
  - 
   +#include "config.h"
  -+
  + 
    #if defined (__SVR4) && defined (__sun)
    # include <sys/int_types.h>
  +@@ -95,7 +96,13 @@
  +   typedef __int64 int64_t;
  +   typedef unsigned __int64 uint64_t;
    #else
  - # if defined (__OpenBSD__) || defined (_AIX)
  - #  include <inttypes.h>
  --# else 
  --#  include <stdint.h>
  -+# else
  -+#  if   HAVE_STDINT_H
  -+#   include <stdint.h>
  -+#  elif HAVE_INTTYPES_H
  -+#   include <inttypes.h>
  -+#  elif HAVE_SYS_INT_TYPES_H
  -+#   include <sys/int_types.h>
  -+#  endif
  - # endif
  +-# include <stdint.h>
  ++# if   HAVE_STDINT_H
  ++#  include <stdint.h>
  ++# elif HAVE_INTTYPES_H
  ++#  include <inttypes.h>
  ++# elif HAVE_SYS_INT_TYPES_H
  ++#  include <sys/int_types.h>
  ++# endif
  + #endif
  + 
  + #include "pixman-remap.h"
  +Index: src/cairoint.h
  +--- src/cairoint.h.orig      2005-10-03 22:44:43 +0200
  ++++ src/cairoint.h   2005-10-05 20:37:56 +0200
  +@@ -149,8 +149,6 @@
    #endif
    
  + #ifndef CAIRO_MUTEX_DECLARE
  +-# error "No mutex declarations. Cairo will not work with multiple threads." 
\
  +-    "(Remove this #error directive to acknowledge & accept this 
limitation)."
  + # define CAIRO_MUTEX_DECLARE(name)
  + # define CAIRO_MUTEX_DECLARE_GLOBAL(name)
  + # define CAIRO_MUTEX_LOCK(name)
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/cairo/cairo.spec
  ============================================================================
  $ cvs diff -u -r1.15 -r1.16 cairo.spec
  --- openpkg-src/cairo/cairo.spec      26 Sep 2005 13:26:32 -0000      1.15
  +++ openpkg-src/cairo/cairo.spec      5 Oct 2005 18:40:01 -0000       1.16
  @@ -32,8 +32,8 @@
   Class:        PLUS
   Group:        XWindow
   License:      MIT-style
  -Version:      1.0.0
  -Release:      20050926
  +Version:      1.0.2
  +Release:      20051005
   
   #   package options
   %option       with_pdf   yes
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to