diff --git a/x11-libs/cairo/cairo-1.10.0.recipe b/x11-libs/cairo/cairo-1.10.0.recipe deleted file mode 100644 index 196990cfd..000000000 --- a/x11-libs/cairo/cairo-1.10.0.recipe +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION=" -Cairo is a 2D graphics library with support for multiple output devices. -" -HOMEPAGE="http://cairographics.org" -SRC_URI="http://cairographics.org/releases/cairo-1.10.0.tar.gz" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="freetype >= 2.3.11 - fontconfig >= 2.8.0 - pixman >= 0.18.4" -CHECKSUM_MD5="70a2ece66cf473d976e2db0f75bf199e" -BUILD() -{ - cd cairo-1.10.0 - libtoolize --force --copy --install - aclocal -I build - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-beos - make -} - -INSTALL() -{ - cd cairo-1.10.0 - make install -} - -LICENSE="GNU LGPL v2.1 - MPL v1.1" -COPYRIGHT="2000, 2002, 2004-2007 Keith Packard - 2002-2003 University of Southern California - 2004-2010 Red Hat, Inc. - 2005-2010 Mozilla Corporation - 2006-2009 Adrian Johnson - 2007-2009 Chris Wilson - 2009-2010 Intel Corporation - 2002-2010 many others" diff --git a/x11-libs/cairo/cairo-1.12.16.recipe b/x11-libs/cairo/cairo-1.12.16.recipe index 48ea246ab..4fbe646bd 100644 --- a/x11-libs/cairo/cairo-1.12.16.recipe +++ b/x11-libs/cairo/cairo-1.12.16.recipe @@ -28,8 +28,13 @@ MPL v1.1 SRC_URI="http://cairographics.org/releases/cairo-$portVersion.tar.xz" CHECKSUM_SHA256="2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846" REVISION="1" -ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86 x86_64" +if [ $effectiveTargetArchitecture != x86_gcc2 ]; then + # x86_gcc2 is fine as primary target architecture as long as we're building + # for a different secondary architecture. + ARCHITECTURES="$ARCHITECTURES x86_gcc2" +fi +SECONDARY_ARCHITECTURES="x86" PATCHES="cairo-$portVersion.patchset" diff --git a/x11-libs/cairo/cairo-1.8.10.recipe b/x11-libs/cairo/cairo-1.8.10.recipe deleted file mode 100644 index d3715de56..000000000 --- a/x11-libs/cairo/cairo-1.8.10.recipe +++ /dev/null @@ -1,37 +0,0 @@ -DESCRIPTION=" -Cairo is a 2D graphics library with support for multiple output devices. -" -HOMEPAGE="http://cairographics.org" -SRC_URI="http://cairographics.org/releases/cairo-1.8.10.tar.gz" -REVISION="1" -STATUS_HAIKU="broken" -DEPEND="freetype >= 2.3.11 - fontconfig >= 2.8.0 - pixman >= 0.17.2" -CHECKSUM_MD5="b60a82f405f9400bbfdcf850b1728d25" -BUILD() -{ - cd cairo-1.8.10 - libtoolize --force --copy --install - aclocal -I build - autoconf - automake - ./configure --prefix=`finddir B_COMMON_DIRECTORY` --enable-beos - make -} - -INSTALL() -{ - cd cairo-1.8.10 - make install -} - -LICENSE="GNU LGPL v2.1 - MPL v1.1" -COPYRIGHT="2000, 2002, 2004-2007 Keith Packard - 2002-2003 University of Southern California - 2004-2008 Red Hat, Inc. - 2005-2008 Mozilla Corporation - 2006-2008 Adrian Johnson - 2007-2008 Chris Wilson - and many others" diff --git a/x11-libs/cairo/patches/cairo-1.10.0.patch b/x11-libs/cairo/patches/cairo-1.10.0.patch deleted file mode 100644 index e0779ea42..000000000 --- a/x11-libs/cairo/patches/cairo-1.10.0.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -urN cairo-1.10.0/configure.ac cairo-1.10.0-haiku/configure.ac ---- cairo-1.10.0/configure.ac 2010-02-19 18:38:03.064487424 +0000 -+++ cairo-1.10.0-haiku/configure.ac 2010-06-19 08:32:47.591134720 +0000 -@@ -148,6 +148,11 @@ - AC_CHECK_LIB(be,main,beos_LIBS="$beos_LIBS -lbe") - AC_CHECK_LIB(zeta,main,beos_LIBS="$beos_LIBS -lzeta") - ;; -+ *-*-haiku) -+ beos_LIBS="" -+ AC_CHECK_LIB(be,main,beos_LIBS="$beos_LIBS -lbe") -+ AC_CHECK_LIB(network,main,beos_LIBS="$beos_LIBS -lnetwork") -+ ;; - *) - use_beos="no (requires a BeOS platform)" - ;; diff --git a/x11-libs/cairo/patches/cairo-1.8.10.patch b/x11-libs/cairo/patches/cairo-1.8.10.patch deleted file mode 100644 index 1bc088794..000000000 --- a/x11-libs/cairo/patches/cairo-1.8.10.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -urN cairo-1.8.10/boilerplate/Makefile.sources cairo-1.8.10-haiku/boilerplate/Makefile.sources ---- cairo-1.8.10/boilerplate/Makefile.sources 2010-02-19 18:38:03.033030144 +0000 -+++ cairo-1.8.10-haiku/boilerplate/Makefile.sources 2010-06-19 08:30:22.477364224 +0000 -@@ -19,7 +19,7 @@ - # automake is stupid enough to always use c++ linker if we enable the - # following lines, even if beos surface is not enabled. Disable it for now. - cairo_boilerplate_beos_private = cairo-boilerplate-beos-private.h --#libcairoboilerplate_la_SOURCES += cairo-boilerplate-beos.cpp -+cairo_boilerplate_beos_sources = cairo-boilerplate-beos.cpp - - cairo_boilerplate_directfb_private = cairo-boilerplate-directfb-private.h - cairo_boilerplate_directfb_sources = cairo-boilerplate-directfb.c -diff -urN cairo-1.8.10/configure.ac cairo-1.8.10-haiku/configure.ac ---- cairo-1.8.10/configure.ac 2010-02-19 18:38:03.064487424 +0000 -+++ cairo-1.8.10-haiku/configure.ac 2010-06-19 08:32:47.591134720 +0000 -@@ -140,7 +140,7 @@ - - dnl =========================================================================== - --CAIRO_ENABLE_SURFACE_BACKEND(beos, BeOS/Zeta, no, [ -+CAIRO_ENABLE_SURFACE_BACKEND(beos, BeOS/Zeta/Haiku, no, [ - case "$host" in - *-*-beos) - beos_LIBS="" -@@ -148,6 +148,11 @@ - AC_CHECK_LIB(be,main,beos_LIBS="$beos_LIBS -lbe") - AC_CHECK_LIB(zeta,main,beos_LIBS="$beos_LIBS -lzeta") - ;; -+ *-*-haiku) -+ beos_LIBS="" -+ AC_CHECK_LIB(be,main,beos_LIBS="$beos_LIBS -lbe") -+ AC_CHECK_LIB(network,main,beos_LIBS="$beos_LIBS -lnetwork") -+ ;; - *) - use_beos="no (requires a BeOS platform)" - ;; diff --git a/x11-libs/cairo/patches/cairo-1.8.4-haiku.diff b/x11-libs/cairo/patches/cairo-1.8.4-haiku.diff deleted file mode 100644 index 270666515..000000000 --- a/x11-libs/cairo/patches/cairo-1.8.4-haiku.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN cairo-1.8.4/configure.ac cairo-1.8.4-haiku/configure.ac ---- cairo-1.8.4/configure.ac 2008-12-19 00:44:28.000000000 -0800 -+++ cairo-1.8.4-haiku/configure.ac 2008-12-19 00:29:17.000000000 -0800 -@@ -142,7 +142,7 @@ - - CAIRO_ENABLE_SURFACE_BACKEND(beos, BeOS/Zeta, no, [ - case "$host" in -- *-*-beos) -+ *-*-beos| *-*-haiku*) - beos_LIBS="" - dnl Add libbe and libzeta if available - AC_CHECK_LIB(be,main,beos_LIBS="$beos_LIBS -lbe")