summaryrefslogtreecommitdiff
path: root/x11-toolkits/pango/files/patch-64bit_safe
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2010-05-10 21:19:08 +0000
committerKoop Mast <kwm@FreeBSD.org>2010-05-10 21:19:08 +0000
commit48e62d9a379cd45a15f6ae89d564f81b3c13d16e (patch)
treeb627baa77f19bb1eab2fa4dee08aab1908131cd0 /x11-toolkits/pango/files/patch-64bit_safe
parentRegister conflict between opal and opal3. (diff)
Presenting GNOME 2.30.1 for FreeBSD. The offical release notes for this
release can be found at http://library.gnome.org/misc/release-notes/2.30/ . This release brings initial PackageKit support, Upower (replaces power management part of hal), cuse4bsd integration with HAL and cheese, and a faster Evolution. Sadly GNOME 2.30.x will be the last release with FreeBSD 6.X support. This will also be the last of the 2.x releases. The next release will be the highly-anticipated GNOME 3.0 which will bring with it a new UI experience. Currently, there are a few bugs with GNOME 2.30 that may be of note for our users. Be sure to consult the UPGRADING note or the 2.30 upgrade FAQ at http://www.freebsd.org/gnome/docs/faq230.html for specific upgrading instructions, and the up-to-date list of known issues. This release features commits by avl, ahze, bland, marcus, mezz, and myself. The FreeBSD GNOME Team would like to thank Anders F Bjorklund for doing the initual packagekit porting. And the following contributors & testers for there help with this release: Eric L. Chen Vladimir Grebenschikov Sergio de Almeida Lenzi DomiX walder crsd Kevin Oberman Michal Varga Pavel Plesov Bapt kevin and ITetcu for two exp-run PR: ports/143852 ports/145347 ports/144980 ports/145830 ports/145511
Diffstat (limited to 'x11-toolkits/pango/files/patch-64bit_safe')
-rw-r--r--x11-toolkits/pango/files/patch-64bit_safe48
1 files changed, 0 insertions, 48 deletions
diff --git a/x11-toolkits/pango/files/patch-64bit_safe b/x11-toolkits/pango/files/patch-64bit_safe
deleted file mode 100644
index 54c00ddc82ea..000000000000
--- a/x11-toolkits/pango/files/patch-64bit_safe
+++ /dev/null
@@ -1,48 +0,0 @@
-From 952847a6e2d53b33cea39d13255fd0f7c8075942 Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod <behdad@behdad.org>
-Date: Tue, 23 Feb 2010 21:44:55 +0000
-Subject: Make blob unlocking 64bit-safe
-
-Bug 604128 - Applications crash when displaying Hebrew characters
----
-diff --git a/pango/opentype/hb-blob.c b/pango/opentype/hb-blob.c
-index 107cd43..3348a38 100644
---- pango.orig/opentype/hb-blob.c
-+++ pango/opentype/hb-blob.c
-@@ -243,18 +243,18 @@ static hb_bool_t
- _try_make_writable_inplace_unix_locked (hb_blob_t *blob)
- {
- #if defined(HAVE_SYS_MMAN_H) && defined(HAVE_MPROTECT)
-- unsigned int pagesize = -1, mask, length;
-+ uintptr_t pagesize = -1, mask, length;
- const char *addr;
-
- #if defined(HAVE_SYSCONF) && defined(_SC_PAGE_SIZE)
-- pagesize = (unsigned int) sysconf (_SC_PAGE_SIZE);
-+ pagesize = (uintptr_t) sysconf (_SC_PAGE_SIZE);
- #elif defined(HAVE_SYSCONF) && defined(_SC_PAGESIZE)
-- pagesize = (unsigned int) sysconf (_SC_PAGESIZE);
-+ pagesize = (uintptr_t) sysconf (_SC_PAGESIZE);
- #elif defined(HAVE_GETPAGESIZE)
-- pagesize = (unsigned int) getpagesize ();
-+ pagesize = (uintptr_t) getpagesize ();
- #endif
-
-- if ((unsigned int) -1 == pagesize) {
-+ if ((uintptr_t) -1L == pagesize) {
- #if HB_DEBUG_BLOB
- fprintf (stderr, "%p %s: failed to get pagesize: %s\n", blob, __FUNCTION__, strerror (errno));
- #endif
-@@ -265,8 +265,8 @@ _try_make_writable_inplace_unix_locked (hb_blob_t *blob)
- #endif
-
- mask = ~(pagesize-1);
-- addr = (const char *) (((size_t) blob->data) & mask);
-- length = (const char *) (((size_t) blob->data + blob->length + pagesize-1) & mask) - addr;
-+ addr = (const char *) (((uintptr_t) blob->data) & mask);
-+ length = (const char *) (((uintptr_t) blob->data + blob->length + pagesize-1) & mask) - addr;
- #if HB_DEBUG_BLOB
- fprintf (stderr, "%p %s: calling mprotect on [%p..%p] (%d bytes)\n",
- blob, __FUNCTION__,
---
-cgit v0.8.3.1