mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

Back out the update of 1.12.2. Our Xorg stuff doesn't work with newer cairo

Browse Source 
very well to some certain machines, which those have to be fixed first before
we can update cairo. Bump the PORTEPOCH.

Reported by:	several
This commit is contained in:
Jeremy Messenger 2012-05-26 03:54:11 +00:00
parent 08e98d320e
commit d68719279f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=297468
3 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
graphics/cairo/Makefile
View File

@ -7,17 +7,16 @@
# #
PORTNAME= cairo PORTNAME= cairo
PORTVERSION= 1.12.2 PORTVERSION= 1.10.2
PORTREVISION= 0 PORTREVISION= 3
PORTEPOCH?= 1 PORTEPOCH?= 2
CATEGORIES= graphics CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/releases/ MASTER_SITES= http://cairographics.org/releases/
#MASTER_SITES= http://cairographics.org/snapshots/
MAINTAINER= gnome@FreeBSD.org MAINTAINER= gnome@FreeBSD.org
COMMENT= Vector graphics library with cross-device output support COMMENT= Vector graphics library with cross-device output support
USE_XZ= yes
.if !defined(REFERENCE_PORT) .if !defined(REFERENCE_PORT)
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
@ -79,16 +78,13 @@ PLIST_SUB+= GLIB="@comment "
.endif .endif
post-patch: post-patch:
@${REINPLACE_CMD} -e '/test/s/==/=/g ; /LIBS/s/-lrt// ; \ @${REINPLACE_CMD} -e '/test/s/==/=/g' \
/LIBS/s|-ldld||g ; /LIBS/s|-ldl||g' \ -e '/LIBS/s/-lrt//' \
${WRKSRC}/configure ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|-lcairo|-lcairo ${PTHREAD_LIBS}|' \ @${REINPLACE_CMD} -e 's|-lcairo|-lcairo ${PTHREAD_LIBS}|' \
${WRKSRC}/src/*.pc.in ${WRKSRC}/src/*.pc.in
@${REINPLACE_CMD} -e '/@CAIRO_HAS_PNG_FUNCTIONS_TRUE@.*=/d' \ @${REINPLACE_CMD} -e '/@CAIRO_HAS_PNG_FUNCTIONS_TRUE@.*=/d' \
${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in
@${REINPLACE_CMD} -e 's|-ldl||g' \
${WRKSRC}/util/*/Makefile.in \
${WRKSRC}/boilerplate/Makefile.in
.if defined(WITH_GL) .if defined(WITH_GL)
@${REINPLACE_CMD} 's|@CAIRO_CFLAGS@|-I$$(top_srcdir)/src/glew &|' \ @${REINPLACE_CMD} 's|@CAIRO_CFLAGS@|-I$$(top_srcdir)/src/glew &|' \
${WRKSRC}/src/Makefile.in ${WRKSRC}/src/Makefile.in

4
graphics/cairo/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (cairo-1.12.2.tar.xz) = b786bc4a70542bcb09f2d9d13e5e6a0c86408cbf6d1edde5f0de807eecf93f96 SHA256 (cairo-1.10.2.tar.gz) = 32018c7998358eebc2ad578ff8d8559d34fc80252095f110a572ed23d989fc41
SIZE (cairo-1.12.2.tar.xz) = 42051584 SIZE (cairo-1.10.2.tar.gz) = 23558405

20
graphics/cairo/pkg-plist
View File

@ -1,4 +1,3 @@
bin/cairo-sphinx
bin/cairo-trace bin/cairo-trace
include/cairo/cairo-deprecated.h include/cairo/cairo-deprecated.h
include/cairo/cairo-features.h include/cairo/cairo-features.h
@ -8,7 +7,6 @@ include/cairo/cairo-ft.h
include/cairo/cairo-pdf.h include/cairo/cairo-pdf.h
include/cairo/cairo-ps.h include/cairo/cairo-ps.h
include/cairo/cairo-script-interpreter.h include/cairo/cairo-script-interpreter.h
include/cairo/cairo-script.h
include/cairo/cairo-svg.h include/cairo/cairo-svg.h
include/cairo/cairo-tee.h include/cairo/cairo-tee.h
include/cairo/cairo-version.h include/cairo/cairo-version.h
@ -16,14 +14,6 @@ include/cairo/cairo-version.h
%%X11%%include/cairo/cairo-xlib-xrender.h %%X11%%include/cairo/cairo-xlib-xrender.h
%%X11%%include/cairo/cairo-xlib.h %%X11%%include/cairo/cairo-xlib.h
include/cairo/cairo.h include/cairo/cairo.h
lib/cairo/cairo-fdr.a
lib/cairo/cairo-fdr.la
lib/cairo/cairo-fdr.so
lib/cairo/cairo-fdr.so.0
lib/cairo/cairo-sphinx.a
lib/cairo/cairo-sphinx.la
lib/cairo/cairo-sphinx.so
lib/cairo/cairo-sphinx.so.0
lib/cairo/libcairo-trace.a lib/cairo/libcairo-trace.a
lib/cairo/libcairo-trace.la lib/cairo/libcairo-trace.la
lib/cairo/libcairo-trace.so lib/cairo/libcairo-trace.so
@ -40,6 +30,7 @@ lib/libcairo.a
lib/libcairo.la lib/libcairo.la
lib/libcairo.so lib/libcairo.so
lib/libcairo.so.2 lib/libcairo.so.2
libdata/pkgconfig/cairo.pc
libdata/pkgconfig/cairo-fc.pc libdata/pkgconfig/cairo-fc.pc
libdata/pkgconfig/cairo-ft.pc libdata/pkgconfig/cairo-ft.pc
%%GL%%libdata/pkgconfig/cairo-gl.pc %%GL%%libdata/pkgconfig/cairo-gl.pc
@ -48,13 +39,12 @@ libdata/pkgconfig/cairo-ft.pc
libdata/pkgconfig/cairo-pdf.pc libdata/pkgconfig/cairo-pdf.pc
libdata/pkgconfig/cairo-png.pc libdata/pkgconfig/cairo-png.pc
libdata/pkgconfig/cairo-ps.pc libdata/pkgconfig/cairo-ps.pc
libdata/pkgconfig/cairo-script.pc
libdata/pkgconfig/cairo-svg.pc libdata/pkgconfig/cairo-svg.pc
libdata/pkgconfig/cairo-tee.pc libdata/pkgconfig/cairo-tee.pc
%%XCB%%libdata/pkgconfig/cairo-xcb-shm.pc
%%XCB%%libdata/pkgconfig/cairo-xcb.pc %%XCB%%libdata/pkgconfig/cairo-xcb.pc
%%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc %%XCB%%libdata/pkgconfig/cairo-xcb-shm.pc
%%X11%%libdata/pkgconfig/cairo-xlib.pc %%X11%%libdata/pkgconfig/cairo-xlib.pc
libdata/pkgconfig/cairo.pc @comment %%X11%%%%XCB%%libdata/pkgconfig/cairo-xlib-xcb.pc
@dirrm lib/cairo %%X11%%libdata/pkgconfig/cairo-xlib-xrender.pc
@dirrm include/cairo @dirrm include/cairo
@dirrm lib/cairo