From 6fbec692cdecf5141c58657672409c167c85f0fc Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Thu, 17 Jan 2008 11:19:03 +0000 Subject: [PATCH] Stefan Fiedler: update thunderbird, apply same patch as for firefox use configure for builds [2007112017425011851] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8930 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/x11/thunderbird/cairo-linkage.patch | 97 +++++++++++++++++++++ package/x11/thunderbird/thunderbird.conf | 43 ++++----- package/x11/thunderbird/thunderbird.desc | 4 +- 3 files changed, 116 insertions(+), 28 deletions(-) create mode 100644 package/x11/thunderbird/cairo-linkage.patch diff --git a/package/x11/thunderbird/cairo-linkage.patch b/package/x11/thunderbird/cairo-linkage.patch new file mode 100644 index 000000000..f81af283e --- /dev/null +++ b/package/x11/thunderbird/cairo-linkage.patch @@ -0,0 +1,97 @@ +--- mozilla/configure.in.bak 2007-04-27 12:06:53.000000000 -0700 ++++ mozilla/configure.in 2007-04-27 13:51:40.000000000 -0700 +@@ -6731,12 +6731,29 @@ if test "$MOZ_SVG_RENDERER_CAIRO" -o "$M + PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION) + MOZ_CAIRO_CFLAGS=$CAIRO_CFLAGS + MOZ_CAIRO_LIBS=$CAIRO_LIBS ++ ++ if test "$MOZ_X11"; then ++ if test "$MOZ_SVG_RENDERER_CAIRO"; then ++ PKG_CHECK_MODULES(CAIRO_XLIB, cairo-xlib >= $CAIRO_VERSION,,:) ++ MOZ_CAIRO_XLIB_CFLAGS=$CAIRO_XLIB_CFLAGS ++ MOZ_CAIRO_XLIB_LIBS="$XLDFLAGS $CAIRO_XLIB_LIBS" ++ fi ++ if test "$MOZ_ENABLE_CANVAS"; then ++ PKG_CHECK_MODULES(CAIRO_XRENDER, cairo-xlib-xrender >= $CAIRO_VERSION,,:) ++ MOZ_CAIRO_XRENDER_CFLAGS=$CAIRO_XRENDER_CFLAGS ++ MOZ_CAIRO_XRENDER_LIBS="$XLDFLAGS $CAIRO_XRENDER_LIBS" ++ fi ++ fi + fi + fi + + AC_SUBST(MOZ_TREE_CAIRO) + AC_SUBST(MOZ_CAIRO_CFLAGS) + AC_SUBST(MOZ_CAIRO_LIBS) ++AC_SUBST(MOZ_CAIRO_XLIB_CFLAGS) ++AC_SUBST(MOZ_CAIRO_XLIB_LIBS) ++AC_SUBST(MOZ_CAIRO_XRENDER_CFLAGS) ++AC_SUBST(MOZ_CAIRO_XRENDER_LIBS) + + dnl ======================================================== + dnl disable xul +--- mozilla/layout/build/Makefile.in.bak 2007-04-27 12:13:22.000000000 -0700 ++++ mozilla/layout/build/Makefile.in 2007-04-27 13:53:00.000000000 -0700 +@@ -234,6 +234,17 @@ EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \ + $(NULL) + endif + ++ifdef MOZ_X11 ++ifdef MOZ_SVG_RENDERER_CAIRO ++EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_XLIB_LIBS) \ ++ $(NULL) ++endif ++ifdef MOZ_ENABLE_CANVAS ++EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_XRENDER_LIBS) \ ++ $(NULL) ++endif ++endif ++ + ifneq (,$(filter mac cocoa gtk,$(MOZ_WIDGET_TOOLKIT))) + EXTRA_DSO_LDOPTS += \ + $(TK_LIBS) \ +--- mozilla/layout/svg/renderer/src/cairo/Makefile.in.bak 2007-04-27 13:55:51.000000000 -0700 ++++ mozilla/layout/svg/renderer/src/cairo/Makefile.in 2007-04-27 13:49:51.000000000 -0700 +@@ -93,6 +93,11 @@ LOCAL_INCLUDES = \ + -I$(topsrcdir)/gfx/src \ + $(NULL) + ++ifdef MOZ_X11 ++CFLAGS += $(MOZ_CAIRO_XLIB_CFLAGS) ++CXXFLAGS += $(MOZ_CAIRO_XLIB_CFLAGS) ++endif ++ + ifdef MOZ_ENABLE_GTK + LOCAL_INCLUDES += -I$(topsrcdir)/gfx/src/gtk + CFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) +--- mozilla/config/autoconf.mk.in.bak 2007-04-27 12:12:12.000000000 -0700 ++++ mozilla/config/autoconf.mk.in 2007-04-27 13:47:28.000000000 -0700 +@@ -207,6 +207,8 @@ MOZ_SVG_RENDERER_CAIRO = @MOZ_SVG_RENDER + MOZ_LIBART_CFLAGS = @MOZ_LIBART_CFLAGS@ + MOZ_ENABLE_CANVAS = @MOZ_ENABLE_CANVAS@ + MOZ_CAIRO_CFLAGS = @MOZ_CAIRO_CFLAGS@ ++MOZ_CAIRO_XLIB_CFLAGS = @MOZ_CAIRO_XLIB_CFLAGS@ ++MOZ_CAIRO_XRENDER_CFLAGS = @MOZ_CAIRO_XRENDER_CFLAGS@ + TX_EXE = @TX_EXE@ + + # Mac's don't like / in a #include, so we include the libart +@@ -218,6 +220,8 @@ endif + endif + MOZ_LIBART_LIBS = @MOZ_LIBART_LIBS@ + MOZ_CAIRO_LIBS = @MOZ_CAIRO_LIBS@ ++MOZ_CAIRO_XLIB_LIBS = @MOZ_CAIRO_XLIB_LIBS@ ++MOZ_CAIRO_XRENDER_LIBS = @MOZ_CAIRO_XRENDER_LIBS@ + + MOZ_ENABLE_GNOMEUI = @MOZ_ENABLE_GNOMEUI@ + MOZ_GNOMEUI_CFLAGS = @MOZ_GNOMEUI_CFLAGS@ +--- mozilla/content/canvas/src/Makefile.in.bak 2007-04-27 12:25:38.000000000 -0700 ++++ mozilla/content/canvas/src/Makefile.in 2007-04-27 12:25:00.000000000 -0700 +@@ -94,7 +94,7 @@ FORCE_STATIC_LIB = 1 + + include $(topsrcdir)/config/rules.mk + +-CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(TK_CFLAGS) ++CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_CAIRO_XRENDER_CFLAGS) $(TK_CFLAGS) + + ifneq (,$(filter mac cocoa,$(MOZ_GFX_TOOLKIT))) + # needed for nsDrawingSurfaceMac.h diff --git a/package/x11/thunderbird/thunderbird.conf b/package/x11/thunderbird/thunderbird.conf index b7bbd2a1a..94f7236db 100644 --- a/package/x11/thunderbird/thunderbird.conf +++ b/package/x11/thunderbird/thunderbird.conf @@ -1,3 +1,4 @@ +#!/bin/bash # --- ROCK-COPYRIGHT-NOTE-BEGIN --- # # This copyright note is auto-generated by ./scripts/Create-CopyPatch. @@ -20,34 +21,24 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- -if [ $prefix_auto = 1 ] ; then - prefix="opt/thunderbird" - set_confopt -fi +var_append extraconfopt " " '--enable-application=mail' -[ "$ROCKCFG_PKG_GLIBC_BRANCH" = "glibc24" ] && \ - var_append patchfiles " " "${confdir}/bugfix-323853.diff" +var_append extraconfopt " " '--enable-image-decoders=all' +var_append extraconfopt " " '--enable-image-encoders=all' -# inherit all the complex mozilla stuff -. package/x11/mozilla/mozilla.conf +var_append extraconfopt " " '--enable-canvas' +var_append extraconfopt " " '--enable-mathml' +var_append extraconfopt " " '--enable-svg' -# and overwrite the main function -moz_main() { - # maybe obsolete ... to be checked - export MOZILLA_OFFICIAL=1 BUILD_OFFICIAL=1 - export MOZILLA_FIVE_HOME=$libdir/thunderbird-$ver +pkginstalled libjpeg && var_append extraconfopt " " '--with-system-jpeg' +pkginstalled zlib && var_append extraconfopt " " '--with-system-zlib' +pkginstalled libpng && var_append extraconfopt " " '--with-system-png' +pkginstalled nspr && var_append extraconfopt ' ' '--with-system-nspr --with-system-nss' - moz_fixup - moz_implant_version - - cat >> .mozconfig <<-EOT -. \$topsrcdir/mail/config/mozconfig -EOT - - moz_configure - - moz_build - moz_install - moz_register -} +pkginstalled pango && var_append extraconfopt ' ' '--enable-pango' +pkginstalled cairo && var_append extraconfopt " " '--enable-system-cairo' +# We need to recreate configure after gnome-linkage.patch is applied. +# Remove the hook together with the patch when it is no longer needed. +versionhotfix 2.0.0.9 +hook_add preconf 3 "autoconf-213" diff --git a/package/x11/thunderbird/thunderbird.desc b/package/x11/thunderbird/thunderbird.desc index 742c31896..8e202ee02 100644 --- a/package/x11/thunderbird/thunderbird.desc +++ b/package/x11/thunderbird/thunderbird.desc @@ -37,7 +37,7 @@ [L] MPL [S] Stable -[V] 2.0.0.6 +[V] 2.0.0.9 [P] X --?--5---9 245.500 -[D] 3030990976 thunderbird-2.0.0.6-source.tar.bz2 ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.6/source/ +[D] 3684627358 thunderbird-2.0.0.9-source.tar.bz2 ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.9/source/