fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-04-24 23:10:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge in '1.6'

Browse source 
This gets us a fix for not linking with g++ from 1.6.4

We don't take from 1.6.4 the revert of the addition of
missing locking from the GC cache, (meanwhile, we've
already got a corrected fix for this).

Conflicts:

	src/cairo-xlib-screen.c
This commit is contained in:
Carl Worth 2008-04-14 16:39:27 -07:00
commit 9db764c732
3 changed files with 31 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
NEWS
View file

@ -1,3 +1,32 @@
Release 1.6.4 (2008-04-11 Carl Worth <cworth@cworth.org>)
=========================================================
The cairo community is wildly embarrassed to announce the 1.6.4
release of the cairo graphics library. This release reverts the xlib
locking change introduced in 1.6.4, (and the application crashes that
it caused). The community would be glad to sack its current release
manager and is accepting applications for someone who could do the job
with more discipline.
Revert 'add missing locking in cairo-xlib'
------------------------------------------
This change was introduced in cairo 1.6.2, but also introduced a bug
which causes many cairo-xlib applications to crash, (with a
segmentation fault inside of XSetClipMask). Instead of attempting
another fix for the broken fix, the change in 1.6.2 has been
reverted. The original bug which the change was addressing has been
present since at least cairo 1.4, so it is not expected that leaving
this bug unfixed will cause any new problems for applications moving
from cairo 1.4 to cairo 1.6.
At this point, the code of cairo 1.6.4 differs from cairo 1.6.0 only
in the fix for the PostScript-printer crashes.
Tweak build to avoid linking with g++
-------------------------------------
Cairo 1.6.4 avoids a quirk in automake that was causing the cairo
library to be linked with g++ and linked against libstdc++ even when
only C source files were compiled for the library.
Release 1.6.2 (2008-04-11 Carl Worth <cworth@cworth.org>)
=========================================================
The cairo community is pleased (but somewhat sheepish) to announce the

4
configure.in
View file

@ -7,7 +7,7 @@ dnl For the micro number: odd => in-progress development (from git)
dnl even => tar-file snapshot or release
m4_define(cairo_version_major, 1)
m4_define(cairo_version_minor, 6)
m4_define(cairo_version_micro, 3)
m4_define(cairo_version_micro, 5)
AC_INIT([cairo],
cairo_version_major.cairo_version_minor.cairo_version_micro,
@ -30,7 +30,7 @@ LT_CURRENT=19
# Increment any time the source changes; set to
# 0 if you increment CURRENT
LT_REVISION=4
LT_REVISION=5
# Increment if any interfaces have been added; set to 0
# if any interfaces have been removed. removal has

1
src/Makefile.am
View file

@ -235,7 +235,6 @@ beos_sources = cairo-beos-surface.cpp
cairo_all_sources += $(beos_headers) $(beos_sources)
if CAIRO_HAS_BEOS_SURFACE
cairo_headers += $(beos_headers)
cairo_sources += $(beos_sources)
backend_pkgconfigs += cairo-beos.pc
noinst_LTLIBRARIES = libcairo_beos.la