net-im/emesene/files/mail-client/mozilla-thunderbird/files/666_mozilla-glitz-cairo.patch

   1 #make the damn thing compile with cairo-gtk2 and system cairo/glitz
   2
   3 --- gfx/thebes/src/Makefile.in.orig     2007-04-27 05:51:49.000000000 +0200
   4 +++ gfx/thebes/src/Makefile.in  2007-04-27 05:57:04.000000000 +0200
   5 @@ -12,8 +12,6 @@
   6  EXPORT_LIBRARY = 1
   7
   8  REQUIRES = \
   9 -       cairo \
  10 -       libpixman \
  11         string \
  12         pref \
  13         xpcom \
  14 @@ -113,10 +114,13 @@
  15  endif
  16
  17  ifdef MOZ_ENABLE_GLITZ
  18 -REQUIRES +=    glitz
  19  CPPSRCS +=     gfxGlitzSurface.cpp
  20
  21 +
  22 +ifneq ($(MOZ_WIDGET_TOOLKIT),gtk2)
  23 +REQUIRES +=    glitz
  24  SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)mozglitz.$(LIB_SUFFIX)
  25 +endif
  26
  27  ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
  28  REQUIRES +=    glitzwgl
  29 @@ -124,11 +128,6 @@
  30  OS_LIBS += opengl32.lib
  31  endif
  32
  33 -ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
  34 -REQUIRES +=    glitzglx
  35 -SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)mozglitzglx.$(LIB_SUFFIX)
  36 -endif
  37 -
  38  ifneq (,$(filter $(MOZ_WIDGET_TOOLKIT),mac cocoa))
  39  REQUIRES +=    glitzagl
  40  SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)mozglitzagl.$(LIB_SUFFIX)
  41 --- configure.in.orig   2007-04-27 06:24:26.000000000 +0200
  42 +++ configure.in        2007-04-27 06:24:04.000000000 +0200
  43 @@ -6981,7 +6981,11 @@
  44          fi
  45      fi
  46  else
  47 -   PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION freetype2 fontconfig)
  48 +   if test "$MOZ_ENABLE_GLITZ"; then
  49 +       PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION glitz-glx glitz freetype2 fontconfig)
  50 +   else
  51 +       PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION freetype2 fontconfig)
  52 +   fi
  53     MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS
  54     MOZ_CAIRO_LIBS=$CAIRO_LIBS
  55  fi
  56
  57 --- widget/src/gtk2/Makefile.in.orig    2007-06-18 00:29:12.000000000 +0200
  58 +++ widget/src/gtk2/Makefile.in 2007-06-18 00:30:04.000000000 +0200
  59 @@ -129,6 +129,7 @@
  60                 $(XLIBS) \
  61                 $(MOZ_GTK2_LIBS) \
  62                 -lthebes \
  63 +               $(MOZ_CAIRO_LIBS) \
  64                 $(LCMS_LIBS) \
  65                 $(NULL)
  66
  67 --- config/system-headers.orig  2007-07-22 17:28:01.000000000 +0200
  68 +++ config/system-headers       2007-07-22 17:29:21.000000000 +0200
  69 @@ -85,6 +85,8 @@
  70  cairo-win32.h
  71  cairo-xlib.h
  72  cairo-xlib-xrender.h
  73 +glitz.h
  74 +glitz-glx.h
  75  #endif
  76  callconv.h
  77  Carbon/Carbon.h