Add patch for amd64 by aballier, see bug #154877.

Package-Manager: portage-2.1.2_rc1-r7

diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index eca14a23387d3e26cd9521acaa4c296a48cb2732..d8e3d62a56e31a4989c4c2994f3d6edcf7532b4c 100644 (file)
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/fltk
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.74 2006/08/09 20:26:06 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/ChangeLog,v 1.75 2006/11/15 11:46:20 nelchael Exp $
+
+  15 Nov 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/fltk-1.1.7-amd64.patch, fltk-1.1.7.ebuild:
+  Add patch for amd64 by aballier, see bug #154877.
 
   09 Aug 2006; Krzysiek Pawlik <nelchael@gentoo.org> -files/libs-1.6.diff,
   -files/Fl_Help_View.cxx.patch, -fltk-1.1.6.ebuild:

diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 45b6787bfac2074648996ae316685f8f46428c5a..085ab40cf87a5e10bfb5213906bf646cde36e05f 100644 (file)
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -1,19 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX fltk-1.1.7-amd64.patch 2433 RMD160 fb625474ff36b75a35394862b45653c30c6728e5 SHA1 f28f8a87f62e006a7544ff029d62e89a8d87a39c SHA256 25619bc596b59824d4e5737b0796f2e79ea6f2ca1dc4aabaa69702be1bf80e10
+MD5 1f3423427a6ce99b42ffb62c19b1c45d files/fltk-1.1.7-amd64.patch 2433
+RMD160 fb625474ff36b75a35394862b45653c30c6728e5 files/fltk-1.1.7-amd64.patch 2433
+SHA256 25619bc596b59824d4e5737b0796f2e79ea6f2ca1dc4aabaa69702be1bf80e10 files/fltk-1.1.7-amd64.patch 2433
 AUX libs-1.7.diff 960 RMD160 3874beff965b46c4a60e99ba5bb90c563b3501f7 SHA1 136301dbfa9b9a3dc5cad303b53b79c019c942c8 SHA256 bd95ae19749cdeb04701ff91cc97e5c6c4b7bad5c9d07a80af02d98f01d88330
 MD5 29c93504c8cba00eee5622ecbf61f134 files/libs-1.7.diff 960
 RMD160 3874beff965b46c4a60e99ba5bb90c563b3501f7 files/libs-1.7.diff 960
 SHA256 bd95ae19749cdeb04701ff91cc97e5c6c4b7bad5c9d07a80af02d98f01d88330 files/libs-1.7.diff 960
 DIST fltk-1.1.7-source.tar.bz2 2060757 RMD160 a539a1c6bb3363e54bc82c7995037c5d8ede9dd7 SHA1 16b174522920403af1e4ccddd36daaefda3765c8 SHA256 855a97e35da823f205253b865758715872cd2c7720e4dcf134a3b6dc18bfb96a
-EBUILD fltk-1.1.7.ebuild 2457 RMD160 65ad7e9107863300cd3f63499704321bc79b22ac SHA1 3b69d9b2478ee452682300a46fea2bbc844fa5b1 SHA256 9b5e950a191efa84049f335289461d5a46e053e310e172285add3e6d8de01637
-MD5 a0e390045c24613293b250df08198ef6 fltk-1.1.7.ebuild 2457
-RMD160 65ad7e9107863300cd3f63499704321bc79b22ac fltk-1.1.7.ebuild 2457
-SHA256 9b5e950a191efa84049f335289461d5a46e053e310e172285add3e6d8de01637 fltk-1.1.7.ebuild 2457
-MISC ChangeLog 9845 RMD160 c4dc1e63bf9c25141ed338bc90ecfe526784b05c SHA1 b35052429f548f76ee8c8be2ec6759a00c2ae830 SHA256 04a49f8e3b79af6f2f858bd272dcc288e3e6e34b6d8c88a648bd33767e0969ce
-MD5 e842d0d7e9bf1308271d598bc984d073 ChangeLog 9845
-RMD160 c4dc1e63bf9c25141ed338bc90ecfe526784b05c ChangeLog 9845
-SHA256 04a49f8e3b79af6f2f858bd272dcc288e3e6e34b6d8c88a648bd33767e0969ce ChangeLog 9845
+EBUILD fltk-1.1.7.ebuild 2545 RMD160 2e33db560059c1f40556578fc33b1aa7a22c9d28 SHA1 457f7d5d4e1df596c2ace3580c36d2da084dcd37 SHA256 ee6780b7fb411f2a877f7c52f1adf368bb36b56bf0cf7652c851e2e838c158bb
+MD5 5be54aa3f202af98a32dfbb2a8fb0522 fltk-1.1.7.ebuild 2545
+RMD160 2e33db560059c1f40556578fc33b1aa7a22c9d28 fltk-1.1.7.ebuild 2545
+SHA256 ee6780b7fb411f2a877f7c52f1adf368bb36b56bf0cf7652c851e2e838c158bb fltk-1.1.7.ebuild 2545
+MISC ChangeLog 10003 RMD160 a58a4cf6b3cd208363aafeebeb9ef9b288a290ab SHA1 e1972c5c467a1c42fd352f99d0de9f5b69bc03e3 SHA256 ebe92ec0b3d438aa25db76ddb34e9707651854d168a6f232e970ead84028c207
+MD5 40096022f33bf3d8a9f6c5517cacec09 ChangeLog 10003
+RMD160 a58a4cf6b3cd208363aafeebeb9ef9b288a290ab ChangeLog 10003
+SHA256 ebe92ec0b3d438aa25db76ddb34e9707651854d168a6f232e970ead84028c207 ChangeLog 10003
 MISC metadata.xml 314 RMD160 24115a7758bbd2c07da47a2ffe4b79bc31cefa59 SHA1 1a4ff85c48bc39f8fac4fafc8ae06c34a290bab2 SHA256 91972db8a2f941249874f23c38338b0c7aa06cc29802074571a3582fb5269516
 MD5 aeb16984ffc07732d37c5974c14f28de metadata.xml 314
 RMD160 24115a7758bbd2c07da47a2ffe4b79bc31cefa59 metadata.xml 314
@@ -24,7 +28,7 @@ SHA256 613c60277ccfb5adef1c1a6e37c073066872fcf368b663f2ee04193ee1821276 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFE2kT5go/w9rxVVVERAmToAJ41Oxj8WqSfSr7gttibDmPaFSbOFwCgrj4q
-PSQKHXYtuqnu5XNwQeV0lTM=
-=0IS9
+iD8DBQFFWv4dgo/w9rxVVVERAqszAKCq6iqy/sWU5FvRSDDZ9lUcoe5ipQCfbGib
+T0hZedTZheKLZvIQ3YBMbnU=
+=dobT
 -----END PGP SIGNATURE-----

diff --git a/x11-libs/fltk/files/fltk-1.1.7-amd64.patch b/x11-libs/fltk/files/fltk-1.1.7-amd64.patch
new file mode 100644 (file)
index 0000000..f1c334d
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.1.7-amd64.patch
@@ -0,0 +1,73 @@
+--- fltk-1.1.7/test/cursor.cxx.old     2006-11-12 14:00:36.000000000 +0100
++++ fltk-1.1.7/test/cursor.cxx 2006-11-12 14:00:46.000000000 +0100
+@@ -39,7 +39,7 @@
+ Fl_Hor_Value_Slider *cursor_slider;
+ 
+ void choice_cb(Fl_Widget *, void *v) {
+-  cursor = (Fl_Cursor)(int)v;
++  cursor = (Fl_Cursor)(long)v;
+   cursor_slider->value(cursor);
+   fl_cursor(cursor,fg,bg);
+ }
+--- fltk-1.1.7/test/input.cxx.old      2006-11-12 14:01:27.000000000 +0100
++++ fltk-1.1.7/test/input.cxx  2006-11-12 14:01:37.000000000 +0100
+@@ -61,7 +61,7 @@
+ 
+ void color_cb(Fl_Widget* button, void* v) {
+   Fl_Color c;
+-  switch ((int)v) {
++  switch ((long)v) {
+   case 0: c = FL_BACKGROUND2_COLOR; break;
+   case 1: c = FL_SELECTION_COLOR; break;
+   default: c = FL_FOREGROUND_COLOR; break;
+--- fltk-1.1.7/test/keyboard.cxx.old   2006-11-12 14:02:10.000000000 +0100
++++ fltk-1.1.7/test/keyboard.cxx       2006-11-12 14:02:30.000000000 +0100
+@@ -105,11 +105,11 @@
+     for (int i = 0; i < window->children(); i++) {
+       Fl_Widget* b = window->child(i);
+       if (b->callback() == (Fl_Callback*)key_cb) {
+-      int i = int(b->user_data());
++      long i = long(b->user_data());
+       if (!i) i = b->label()[0];
+       ((Fl_Button*)b)->value(Fl::event_key(i));
+       } else if (b->callback() == (Fl_Callback*)shift_cb) {
+-      int i = int(b->user_data());
++      long i = long(b->user_data());
+       ((Fl_Button*)b)->value(Fl::event_state(i));
+       }
+     }
+--- fltk-1.1.7/test/line_style.cxx.old 2006-11-12 14:03:00.000000000 +0100
++++ fltk-1.1.7/test/line_style.cxx     2006-11-12 14:03:18.000000000 +0100
+@@ -54,9 +54,9 @@
+   buf[3] = char(sliders[7]->value());
+   buf[4] = 0;
+   fl_line_style(
+-    (int)(choice[0]->mvalue()->user_data()) +
+-    (int)(choice[1]->mvalue()->user_data()) +
+-    (int)(choice[2]->mvalue()->user_data()),
++    (long)(choice[0]->mvalue()->user_data()) +
++    (long)(choice[1]->mvalue()->user_data()) +
++    (long)(choice[2]->mvalue()->user_data()),
+     (int)(sliders[3]->value()),
+     buf);
+   fl_rect(10,10,w()-20,h()-20);
+--- fltk-1.1.7/test/scroll.cxx.old     2006-11-12 14:03:55.000000000 +0100
++++ fltk-1.1.7/test/scroll.cxx 2006-11-12 14:04:19.000000000 +0100
+@@ -71,7 +71,7 @@
+ }
+ 
+ void type_cb(Fl_Widget*, void* v) {
+-  thescroll->type(int(v));
++  thescroll->type(long(v));
+   thescroll->redraw();
+ }
+ 
+@@ -87,7 +87,7 @@
+ };
+ 
+ void align_cb(Fl_Widget*, void* v) {
+-  thescroll->scrollbar.align(int(v));
++  thescroll->scrollbar.align(long(v));
+   thescroll->redraw();
+ }
+ 

diff --git a/x11-libs/fltk/fltk-1.1.7.ebuild b/x11-libs/fltk/fltk-1.1.7.ebuild
index 88b0ca65efba987baf2a20029355eef45df4998d..7360e127c26b924318dd98b6d3bce5a1f26ec032 100644 (file)
--- a/x11-libs/fltk/fltk-1.1.7.ebuild
+++ b/x11-libs/fltk/fltk-1.1.7.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.7.ebuild,v 1.10 2006/08/09 19:49:08 jer Exp $
-
-IUSE="noxft opengl debug"
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/fltk/fltk-1.1.7.ebuild,v 1.11 2006/11/15 11:46:20 nelchael Exp $
 
 inherit eutils toolchain-funcs multilib
 
@@ -21,6 +19,8 @@ SLOT="${PV_MAJOR}.${PV_MINOR}"
 INCDIR=/usr/include/fltk-${SLOT}
 LIBDIR=/usr/$(get_libdir)/fltk-${SLOT}
 
+IUSE="noxft opengl debug"
+
 DEPEND="|| ( (
                x11-libs/libXext
                x11-libs/libICE
@@ -36,7 +36,10 @@ DEPEND="|| ( (
 src_unpack() {
        unpack ${A}
        cd ${S}
-       epatch ${FILESDIR}/libs-1.7.diff || die "patch failed"
+       epatch "${FILESDIR}/libs-1.7.diff" || die "patch failed"
+       use amd64 && {
+               epatch "${FILESDIR}/${P}-amd64.patch" || die "patch failed"
+       }
 }
 
 src_compile() {