diff options
| author |   Saleem Abdulrasool <compnerd@gentoo.org> | 2006-07-19 04:24:42 +0000 |
|---|---|---|
| committer | Saleem Abdulrasool <compnerd@gentoo.org> | 2006-07-19 04:24:42 +0000 |
| commit | 0063945e958c057bdf0048a7e1062c0a6cdf452c (patch) | |
| tree | 1b0591f36f0cb80b00b26e46b50115f650df7386 /dev-java/swt | |
| parent | fix check_disk patch (diff) | |
| download | historical-0063945e958c057bdf0048a7e1062c0a6cdf452c.tar.gz historical-0063945e958c057bdf0048a7e1062c0a6cdf452c.tar.bz2 historical-0063945e958c057bdf0048a7e1062c0a6cdf452c.zip | |
fix cairo signededness patch; wont someone please give me an x86_64 box?
Package-Manager: portage-2.1.1_pre3-r1
Diffstat (limited to 'dev-java/swt')
| -rw-r--r-- | dev-java/swt/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/swt/files/swt-3.2-cairo-signedness-x86.patch | 11 | ||||
| -rw-r--r-- | dev-java/swt/files/swt-3.2-cairo-signedness-x86_64.patch | 11 | ||||
| -rw-r--r-- | dev-java/swt/swt-3.2.ebuild | 9 |
4 files changed, 36 insertions, 3 deletions
diff --git a/dev-java/swt/ChangeLog b/dev-java/swt/ChangeLog index 654947659f06..a1f3e3313e6b 100644 --- a/dev-java/swt/ChangeLog +++ b/dev-java/swt/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/swt # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.36 2006/07/19 03:39:11 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/ChangeLog,v 1.37 2006/07/19 04:24:42 compnerd Exp $ + + 19 Jul 2006; Saleem Abdulrasool <compnerd@gentoo.org> + -files/swt-3.2-cairo-signedness.patch, + +files/swt-3.2-cairo-signedness-x86_64.patch, + +files/swt-3.2-cairo-signedness-x86.patch, swt-3.2.ebuild: + Fix cairo signededness patch for x86_64 19 Jul 2006; Saleem Abdulrasool <compnerd@gentoo.org> swt-3.2.ebuild: Remove extraneous JAVA_HOME declaration diff --git a/dev-java/swt/files/swt-3.2-cairo-signedness-x86.patch b/dev-java/swt/files/swt-3.2-cairo-signedness-x86.patch new file mode 100644 index 000000000000..e7bc1d505dda --- /dev/null +++ b/dev-java/swt/files/swt-3.2-cairo-signedness-x86.patch @@ -0,0 +1,11 @@ +--- cairo.c 2006-07-16 19:16:27.000000000 -0500 ++++ cairo.c 2006-07-16 19:18:15.000000000 -0500 +@@ -533,7 +533,7 @@ + { + jint rc = 0; + Cairo_NATIVE_ENTER(env, that, cairo_1image_1surface_1create_1for_1data_FUNC); +- rc = (jint)cairo_image_surface_create_for_data((char *)arg0, arg1, arg2, arg3, arg4); ++ rc = (jint)cairo_image_surface_create_for_data((unsigned char *)arg0, arg1, arg2, arg3, arg4); + Cairo_NATIVE_EXIT(env, that, cairo_1image_1surface_1create_1for_1data_FUNC); + return rc; + } diff --git a/dev-java/swt/files/swt-3.2-cairo-signedness-x86_64.patch b/dev-java/swt/files/swt-3.2-cairo-signedness-x86_64.patch new file mode 100644 index 000000000000..1a560bf1e483 --- /dev/null +++ b/dev-java/swt/files/swt-3.2-cairo-signedness-x86_64.patch @@ -0,0 +1,11 @@ +--- cairo.c 2006-07-17 16:02:31.000000000 +0200 ++++ cairo.c 2006-07-17 16:02:46.000000000 +0200 +@@ -533,7 +533,7 @@ + { + jlong rc = 0; + Cairo_NATIVE_ENTER(env, that, cairo_1image_1surface_1create_1for_1data_FUNC); +- rc = (jlong)cairo_image_surface_create_for_data((char *)arg0, arg1, arg2, arg3, arg4); ++ rc = (jlong)cairo_image_surface_create_for_data((unsigned char *)arg0, arg1, arg2, arg3, arg4); + Cairo_NATIVE_EXIT(env, that, cairo_1image_1surface_1create_1for_1data_FUNC); + return rc; + } diff --git a/dev-java/swt/swt-3.2.ebuild b/dev-java/swt/swt-3.2.ebuild index 2c0f197a508c..11a749b079c9 100644 --- a/dev-java/swt/swt-3.2.ebuild +++ b/dev-java/swt/swt-3.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.2.ebuild,v 1.2 2006/07/19 03:39:11 compnerd Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/swt/swt-3.2.ebuild,v 1.3 2006/07/19 04:24:42 compnerd Exp $ inherit eutils java-pkg @@ -69,7 +69,12 @@ src_unpack() { # Patch for GCC 4.x warnings epatch ${FILESDIR}/${PN}-3.2-gcc-4.x-warning-fix.patch - epatch ${FILESDIR}/${PN}-3.2-cairo-signedness.patch + + if [[ ${ARCH} == "amd64" ]] ; then + epatch ${FILESDIR}/${PN}-3.2-cairo-signedness-x86_64.patch + else + epatch ${FILESDIR}/${PN}-3.2-cairo-signedness-x86.patch + fi } src_compile() { |