From c8d7c21c9d8e0209cdc08fd6a74d63bc2332bb98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Neumann?= Date: Mon, 26 Nov 2012 17:33:44 +0100 Subject: No need for special cairo version --- x11-libs/cairo/Manifest | 6 - x11-libs/cairo/cairo-1.10.2-r2.ebuild | 160 --------------------- .../cairo/files/cairo-1.10.0-buggy_gradients.patch | 17 --- x11-libs/cairo/files/cairo-1.10.2-interix.patch | 36 ----- x11-libs/cairo/files/cairo-1.10.2-qt-surface.patch | 55 ------- x11-libs/cairo/files/cairo-1.8.8-interix.patch | 16 --- 6 files changed, 290 deletions(-) delete mode 100644 x11-libs/cairo/Manifest delete mode 100644 x11-libs/cairo/cairo-1.10.2-r2.ebuild delete mode 100644 x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch delete mode 100644 x11-libs/cairo/files/cairo-1.10.2-interix.patch delete mode 100644 x11-libs/cairo/files/cairo-1.10.2-qt-surface.patch delete mode 100644 x11-libs/cairo/files/cairo-1.8.8-interix.patch diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest deleted file mode 100644 index 78d509f..0000000 --- a/x11-libs/cairo/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX cairo-1.10.0-buggy_gradients.patch 581 RMD160 077fb7a18c2840c0d637d2161ca9d244cb69608b SHA1 45f4b6a834cb9f1c153f092fba18416d257d71c7 SHA256 3b622bb250b996ea5f5adc5c899af343e0efba5c477fa0e51fdbb720a8dd1b18 -AUX cairo-1.10.2-interix.patch 1235 RMD160 83803df650e8381649b11bd3c81dd0c6ee5f8e53 SHA1 d6b731fc8aa0c9461e62a9afc1431782d3af433b SHA256 d915d69e2eb96f6a4bef1de0c493ed9face7b5d6a79194ab9f2a7f3d85b799ea -AUX cairo-1.10.2-qt-surface.patch 2687 RMD160 9ffc2924070a7dfa917a2b05b11de1fcca571dab SHA1 6ce6a6047d6f8420ea3044d036e7d10c6ac98c61 SHA256 fb96199ec7a4cf8527726be8d0333ed883183b56960832218eca1c9ef2e05dbd -AUX cairo-1.8.8-interix.patch 619 RMD160 9bb28c5a88aa1f2776d32ac7020aef4ba93872b5 SHA1 857a4d2be0118a6d2d0d80388b5963a5f768341d SHA256 505be82a1a0b7f963cb49ff85ecf1fa1389a4e43621df76b91fc1529616b2299 -DIST cairo-1.10.2.tar.gz 23558405 RMD160 8c8de00120398fe2b3a60a08ff59a464b2eebf47 SHA1 ccce5ae03f99c505db97c286a0c9a90a926d3c6e SHA256 32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41 -EBUILD cairo-1.10.2-r2.ebuild 4217 RMD160 807ba27d63a3df32333c1c31da22714898847a46 SHA1 15163cf7ac62b8985e9f3829bc98c850deea11c0 SHA256 b8ba03fbd1f4aaca55d19160a7875a5b7fde0bee3cc14979fb706f4f281fd88f diff --git a/x11-libs/cairo/cairo-1.10.2-r2.ebuild b/x11-libs/cairo/cairo-1.10.2-r2.ebuild deleted file mode 100644 index 7bb9e89..0000000 --- a/x11-libs/cairo/cairo-1.10.2-r2.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.10.2-r2.ebuild,v 1.6 2012/05/05 09:21:15 maekke Exp $ - -EAPI=3 - -EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo" -[[ ${PV} == *9999 ]] && GIT_ECLASS="git" - -inherit eutils flag-o-matic autotools ${GIT_ECLASS} - -DESCRIPTION="A vector graphics library with cross-device output support" -HOMEPAGE="http://cairographics.org/" -[[ ${PV} == *9999 ]] || SRC_URI="http://cairographics.org/releases/${P}.tar.gz" - -LICENSE="|| ( LGPL-2.1 MPL-1.1 )" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="X aqua debug directfb doc drm gallium +glib opengl openvg qt4 static-libs +svg xcb" - -# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it -RESTRICT="test" - -RDEPEND="media-libs/fontconfig - media-libs/freetype:2 - media-libs/libpng:0 - sys-libs/zlib - >=x11-libs/pixman-0.18.4 - directfb? ( dev-libs/DirectFB ) - glib? ( dev-libs/glib:2 ) - opengl? ( virtual/opengl ) - openvg? ( media-libs/mesa[gallium] ) - qt4? ( >=x11-libs/qt-gui-4.8:4 ) - svg? ( dev-libs/libxml2 ) - X? ( - >=x11-libs/libXrender-0.6 - x11-libs/libXext - x11-libs/libX11 - x11-libs/libXft - drm? ( - >=sys-fs/udev-136 - gallium? ( media-libs/mesa[gallium] ) - ) - ) - xcb? ( - x11-libs/libxcb - x11-libs/xcb-util - )" -DEPEND="${RDEPEND} - virtual/pkgconfig - >=sys-devel/libtool-2 - doc? ( - >=dev-util/gtk-doc-1.6 - ~app-text/docbook-xml-dtd-4.2 - ) - X? ( - x11-proto/renderproto - drm? ( - x11-proto/xproto - >=x11-proto/xextproto-7.1 - ) - )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-1.8.8-interix.patch - epatch "${FILESDIR}"/${PN}-1.10.0-buggy_gradients.patch - epatch "${FILESDIR}"/${P}-interix.patch - epatch "${FILESDIR}"/${P}-qt-surface.patch - epatch_user - - # Slightly messed build system YAY - if [[ ${PV} == *9999* ]]; then - touch boilerplate/Makefile.am.features - touch src/Makefile.am.features - touch ChangeLog - fi - - # We need to run elibtoolize to ensure correct so versioning on FreeBSD - # upgraded to an eautoreconf for the above interix patch. - eautoreconf -} - -src_configure() { - local myopts - - # SuperH doesn't have native atomics yet - use sh && myopts+=" --disable-atomic" - - [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT - - # tracing fails to compile, because Solaris' libelf doesn't do large files - [[ ${CHOST} == *-solaris* ]] && myopts+=" --disable-trace" - - # 128-bits long arithemetic functions are missing - [[ ${CHOST} == powerpc*-*-darwin* ]] && filter-flags -mcpu=* - - #gets rid of fbmmx.c inlining warnings - append-flags -finline-limit=1200 - - if use X; then - myopts+=" - --enable-tee=yes - $(use_enable drm) - " - - if use drm; then - myopts+=" - $(use_enable gallium) - $(use_enable xcb xcb-drm) - " - else - use gallium && ewarn "Gallium use requires drm use enabled. So disabling for now." - myopts+=" - --disable-gallium - --disable-xcb-drm - " - fi - else - use drm && ewarn "drm use requires X use enabled. So disabling for now." - myopts+=" - --disable-drm - --disable-gallium - --disable-xcb-drm - " - fi - - # --disable-xcb-lib: - # do not override good xlib backed by hardforcing rendering over xcb - econf \ - --disable-dependency-tracking \ - $(use_with X x) \ - $(use_enable X xlib) \ - $(use_enable X xlib-xrender) \ - $(use_enable aqua quartz) \ - $(use_enable aqua quartz-image) \ - $(use_enable debug test-surfaces) \ - $(use_enable directfb) \ - $(use_enable glib gobject) \ - $(use_enable doc gtk-doc) \ - $(use_enable openvg vg) \ - $(use_enable opengl gl) \ - $(use_enable qt4 qt) \ - $(use_enable static-libs static) \ - $(use_enable svg) \ - $(use_enable xcb) \ - $(use_enable xcb xcb-shm) \ - --enable-ft \ - --enable-pdf \ - --enable-png \ - --enable-ps \ - --disable-xlib-xcb \ - ${myopts} -} - -src_install() { - # parallel make install fails - emake -j1 DESTDIR="${D}" install || die - find "${ED}" -name '*.la' -exec rm -f {} + - dodoc AUTHORS ChangeLog NEWS README || die -} diff --git a/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch b/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch deleted file mode 100644 index a58c2f8..0000000 --- a/x11-libs/cairo/files/cairo-1.10.0-buggy_gradients.patch +++ /dev/null @@ -1,17 +0,0 @@ -http://repos.archlinux.org/wsvn/packages/cairo/trunk/cairo-1.10.0-buggy_gradients.patch -http://bugs.gentoo.org/336696 - ---- src/cairo-xlib-display.c -+++ src/cairo-xlib-display.c -@@ -353,11 +353,7 @@ - /* Prior to Render 0.10, there is no protocol support for gradients and - * we call function stubs instead, which would silently consume the drawing. - */ --#if RENDER_MAJOR == 0 && RENDER_MINOR < 10 - display->buggy_gradients = TRUE; --#else -- display->buggy_gradients = FALSE; --#endif - display->buggy_pad_reflect = FALSE; - display->buggy_repeat = FALSE; - diff --git a/x11-libs/cairo/files/cairo-1.10.2-interix.patch b/x11-libs/cairo/files/cairo-1.10.2-interix.patch deleted file mode 100644 index 3333e3e..0000000 --- a/x11-libs/cairo/files/cairo-1.10.2-interix.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 95f6f7a174ca096a3d3dbe84ff220d166d1e2baa -Author: Uli Schlachter -Date: Fri Oct 22 11:54:57 2010 +0200 - - Make both versions of _cairo_lround consistent again - - Commit c0008242b0f made cairo use libm's lround instead of its own _cairo_lround - by default. However, since commit ce58f874 from 2006, _cairo_lround does - arithmetic rounding instead of away-from-zero rounding (before said commit, it - was using baker's rounding). - - So to make the rounding of _cairo_lround be independent from - DISABLE_SOME_FLOATING_POINT, we have to use another function. Turns out that - _cairo_round already does the same thing that _cairo_lround does. Their only - difference is the return type. - - Signed-off-by: Uli Schlachter - Signed-off-by: Chris Wilson - -diff --git a/src/cairoint.h b/src/cairoint.h -index 53c87e5..539d92e 100644 ---- a/src/cairoint.h -+++ b/src/cairoint.h -@@ -968,7 +968,11 @@ _cairo_round (double r) - cairo_private int - _cairo_lround (double d) cairo_const; - #else --#define _cairo_lround lround -+static inline int cairo_const -+_cairo_lround (double r) -+{ -+ return _cairo_round (r); -+} - #endif - - cairo_private uint16_t diff --git a/x11-libs/cairo/files/cairo-1.10.2-qt-surface.patch b/x11-libs/cairo/files/cairo-1.10.2-qt-surface.patch deleted file mode 100644 index cf0b57a..0000000 --- a/x11-libs/cairo/files/cairo-1.10.2-qt-surface.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -ruN cairo-1.10.2-0-vanilla/src/cairo-qt-surface.cpp cairo-1.10.2/src/cairo-qt-surface.cpp ---- cairo-1.10.2-0-vanilla/src/cairo-qt-surface.cpp 2010-12-25 15:21:34.000000000 +0100 -+++ cairo-1.10.2/src/cairo-qt-surface.cpp 2011-12-20 22:59:30.000000000 +0100 -@@ -61,7 +61,9 @@ - #include - #include - --#if (QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)) || defined(QT_GLYPHS_API_BACKPORT) -+#if (QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)) -+#include -+#elif (QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)) || defined(QT_GLYPHS_API_BACKPORT) - extern void qt_draw_glyphs(QPainter *, const quint32 *glyphs, const QPointF *positions, int count); - #endif - -@@ -1370,7 +1372,39 @@ - cairo_clip_t *clip, - int *remaining_glyphs) - { --#if (QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)) || defined(QT_GLYPHS_API_BACKPORT) -+#if (QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)) && !defined(QT_NO_RAWFONT) -+ cairo_qt_surface_t *qs = (cairo_qt_surface_t *) abstract_surface; -+ -+ // pick out the colour to use from the cairo source -+ cairo_solid_pattern_t *solid = (cairo_solid_pattern_t*) source; -+ // documentation says you have to freeze the cache, but I don't believe it -+ _cairo_scaled_font_freeze_cache(scaled_font); -+ -+ QColor tempColour(solid->color.red * 255, solid->color.green * 255, solid->color.blue * 255); -+ QVector positions(num_glyphs); -+ QVector glyphss(num_glyphs); -+ FT_Face face = cairo_ft_scaled_font_lock_face (scaled_font); -+ const FT_Size_Metrics& ftMetrics = face->size->metrics; -+ QFont font(face->family_name); -+ font.setStyleStrategy(QFont::NoFontMerging); -+ font.setBold(face->style_flags & FT_STYLE_FLAG_BOLD); -+ font.setItalic(face->style_flags & FT_STYLE_FLAG_ITALIC); -+ font.setKerning(face->face_flags & FT_FACE_FLAG_KERNING); -+ font.setPixelSize(ftMetrics.y_ppem); -+ cairo_ft_scaled_font_unlock_face(scaled_font); -+ qs->p->setFont(font); -+ qs->p->setPen(tempColour); -+ for (int currentGlyph = 0; currentGlyph < num_glyphs; currentGlyph++) { -+ positions.append(QPointF(glyphs[currentGlyph].x, glyphs[currentGlyph].y)); -+ glyphss.append(glyphs[currentGlyph].index); -+ } -+ QGlyphRun qglyphs; -+ qglyphs.setGlyphIndexes(glyphss); -+ qglyphs.setPositions(positions); -+ qs->p->drawGlyphRun(QPointF(), qglyphs); -+ _cairo_scaled_font_thaw_cache(scaled_font); -+ return CAIRO_INT_STATUS_SUCCESS; -+#elif (QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)) || defined(QT_GLYPHS_API_BACKPORT) - cairo_qt_surface_t *qs = (cairo_qt_surface_t *) abstract_surface; - - // pick out the colour to use from the cairo source diff --git a/x11-libs/cairo/files/cairo-1.8.8-interix.patch b/x11-libs/cairo/files/cairo-1.8.8-interix.patch deleted file mode 100644 index dc20714..0000000 --- a/x11-libs/cairo/files/cairo-1.8.8-interix.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ru cairo-1.8.8.orig/build/configure.ac.tools cairo-1.8.8/build/configure.ac.tools ---- cairo-1.8.8.orig/build/configure.ac.tools 2009-09-30 13:36:42 +0200 -+++ cairo-1.8.8/build/configure.ac.tools 2009-09-30 13:50:50 +0200 -@@ -21,5 +21,12 @@ - *) PKGCONFIG_REQUIRES="Requires.private"; ;; - esac - -+dnl hmm... on interix, things go really bad with Requires.private, since libpng12 -+dnl is missing on the final link commands, so gtk+'s configure checks for cairo -+dnl fail miserably with unresolved symbols to it. -+case "$host_os" in -+interix*) PKGCONFIG_REQUIRES="Requires" ;; -+esac -+ - AC_SUBST(PKGCONFIG_REQUIRES) - -- cgit v1.2.3