Tue Oct 11 07:35:50 2011 UTC ()
Pullup ticket #3546 - requested by dholland
x11/efltk: build fix

Revisions pulled up:
- x11/efltk/Makefile                                            1.22
- x11/efltk/distinfo                                            1.8-1.9
- x11/efltk/patches/patch-ah                                    1.3
- x11/efltk/patches/patch-configure_in                          1.1
- x11/efltk/patches/patch-efltk_Fl__Int__List_h                 1.2
- x11/efltk/patches/patch-efltk_db_Fl__Params_h                 1.2
- x11/efltk/patches/patch-src_widgets_Fl__Calendar_cpp          1.2
- x11/efltk/patches/patch-src_widgets_Fl__Input_cpp             1.2
- x11/efltk/patches/patch-src_widgets_Fl__Text__Editor_cpp      1.2

---
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Sun Oct  9 06:40:39 UTC 2011

   Modified Files:
   	pkgsrc/x11/efltk: distinfo
   	pkgsrc/x11/efltk/patches: patch-ah
   Added Files:
   	pkgsrc/x11/efltk/patches: patch-configure_in

   Log Message:
   Use pkg-config to find libXft, not xft-config, as xft-config has
   disappeared from recent libXft. Fixes the native X build.

   (XXX: will this break the build for really old libXft? Does this need
   to learn to use both?)

---
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Sun Oct  9 07:00:43 UTC 2011

   Modified Files:
   	pkgsrc/x11/efltk: Makefile

   Log Message:
   Oops, forgot to add pkg-config to USE_TOOLS

---
   Module Name:	pkgsrc
   Committed By:	dholland
   Date:		Tue Oct 11 00:29:41 UTC 2011

   Modified Files:
   	pkgsrc/x11/efltk: distinfo
   	pkgsrc/x11/efltk/patches: patch-efltk_Fl__Int__List_h
   	    patch-efltk_db_Fl__Params_h patch-src_widgets_Fl__Calendar_cpp
   	    patch-src_widgets_Fl__Input_cpp
   	    patch-src_widgets_Fl__Text__Editor_cpp

   Log Message:
   PR 45258 strikes again. Really fix build this time.


(tron)
diff -r1.21 -r1.21.4.1 pkgsrc/x11/efltk/Makefile
diff -r1.7 -r1.7.2.1 pkgsrc/x11/efltk/distinfo
diff -r1.2 -r1.2.50.1 pkgsrc/x11/efltk/patches/patch-ah
diff -r0 -r1.2.2.2 pkgsrc/x11/efltk/patches/patch-configure_in
diff -r1.1 -r1.1.2.1 pkgsrc/x11/efltk/patches/patch-efltk_Fl__Int__List_h
diff -r1.1 -r1.1.2.1 pkgsrc/x11/efltk/patches/patch-efltk_db_Fl__Params_h
diff -r1.1 -r1.1.2.1 pkgsrc/x11/efltk/patches/patch-src_widgets_Fl__Calendar_cpp
diff -r1.1 -r1.1.2.1 pkgsrc/x11/efltk/patches/patch-src_widgets_Fl__Input_cpp
diff -r1.1 -r1.1.2.1 pkgsrc/x11/efltk/patches/patch-src_widgets_Fl__Text__Editor_cpp
cvs diff -r1.21 -r1.21.4.1 pkgsrc/x11/efltk/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/efltk/Makefile 2011/05/21 08:18:16 1.21
+++ pkgsrc/x11/efltk/Makefile 2011/10/11 07:35:50 1.21.4.1
@@ -1,34 +1,34 @@ @@ -1,34 +1,34 @@
1# $NetBSD: Makefile,v 1.21 2011/05/21 08:18:16 obache Exp $ 1# $NetBSD: Makefile,v 1.21.4.1 2011/10/11 07:35:50 tron Exp $
2# 2#
3 3
4DISTNAME= efltk-2.0.5 4DISTNAME= efltk-2.0.5
5PKGREVISION= 12 5PKGREVISION= 12
6CATEGORIES= x11 6CATEGORIES= x11
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ede/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ede/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://ede.sourceforge.net/ 11HOMEPAGE= http://ede.sourceforge.net/
12COMMENT= Extended Fast Light Toolkit 12COMMENT= Extended Fast Light Toolkit
13LICENSE= gnu-lgpl-v2 # or later 13LICENSE= gnu-lgpl-v2 # or later
14 14
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17WRKSRC= ${WRKDIR}/efltk 17WRKSRC= ${WRKDIR}/efltk
18GNU_CONFIGURE= yes 18GNU_CONFIGURE= yes
19USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
20USE_PKGLOCALEDIR= yes 20USE_PKGLOCALEDIR= yes
21USE_TOOLS+= gmake msgfmt 21USE_TOOLS+= gmake msgfmt pkg-config
22USE_LIBTOOL= yes 22USE_LIBTOOL= yes
23 23
24CONFIGURE_ARGS+= --enable-iconv 24CONFIGURE_ARGS+= --enable-iconv
25CONFIGURE_ARGS+= --enable-xft 25CONFIGURE_ARGS+= --enable-xft
26CONFIGURE_ARGS+= --enable-plugins 26CONFIGURE_ARGS+= --enable-plugins
27CONFIGURE_ARGS+= --disable-unixODBC 27CONFIGURE_ARGS+= --disable-unixODBC
28CONFIGURE_ARGS+= --disable-shared 28CONFIGURE_ARGS+= --disable-shared
29 29
30INSTALL_MAKE_FLAGS+= INSTALL_PREFIX=${DESTDIR:Q} 30INSTALL_MAKE_FLAGS+= INSTALL_PREFIX=${DESTDIR:Q}
31 31
32.include "options.mk" 32.include "options.mk"
33 33
34.include "../../devel/gettext-lib/buildlink3.mk" 34.include "../../devel/gettext-lib/buildlink3.mk"
cvs diff -r1.7 -r1.7.2.1 pkgsrc/x11/efltk/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/efltk/distinfo 2011/10/02 03:44:10 1.7
+++ pkgsrc/x11/efltk/distinfo 2011/10/11 07:35:50 1.7.2.1
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1$NetBSD: distinfo,v 1.7 2011/10/02 03:44:10 dholland Exp $ 1$NetBSD: distinfo,v 1.7.2.1 2011/10/11 07:35:50 tron Exp $
2 2
3SHA1 (efltk-2.0.5.tar.bz2) = 26f7124b384d0bfe3d28a73cbdf0111432b08d99 3SHA1 (efltk-2.0.5.tar.bz2) = 26f7124b384d0bfe3d28a73cbdf0111432b08d99
4RMD160 (efltk-2.0.5.tar.bz2) = 7efa711d0df8a01ee402e1866286265d294778e8 4RMD160 (efltk-2.0.5.tar.bz2) = 7efa711d0df8a01ee402e1866286265d294778e8
5Size (efltk-2.0.5.tar.bz2) = 1241294 bytes 5Size (efltk-2.0.5.tar.bz2) = 1241294 bytes
6SHA1 (patch-aa) = d87f595661c465fc315b643241b22ef65926906e 6SHA1 (patch-aa) = d87f595661c465fc315b643241b22ef65926906e
7SHA1 (patch-ab) = 27a6870c068c8ea44089955a7d3c0492191f23ba 7SHA1 (patch-ab) = 27a6870c068c8ea44089955a7d3c0492191f23ba
8SHA1 (patch-ac) = cf4474ff83f9630f6b310bc3df0fc16adaff7138 8SHA1 (patch-ac) = cf4474ff83f9630f6b310bc3df0fc16adaff7138
9SHA1 (patch-ad) = 41911884bc0eaa6a4de869b90d62c9ee27d1908b 9SHA1 (patch-ad) = 41911884bc0eaa6a4de869b90d62c9ee27d1908b
10SHA1 (patch-ae) = 45f32b9d098736443a3d9b405b6fe17da624d9fc 10SHA1 (patch-ae) = 45f32b9d098736443a3d9b405b6fe17da624d9fc
11SHA1 (patch-af) = 2fe44ea57e0579dcfa43ba597e52161c70f67efd 11SHA1 (patch-af) = 2fe44ea57e0579dcfa43ba597e52161c70f67efd
12SHA1 (patch-ag) = 29799b2b0aeffbca82dbc98cb1e06eb62a7e595a 12SHA1 (patch-ag) = 29799b2b0aeffbca82dbc98cb1e06eb62a7e595a
13SHA1 (patch-ah) = 63bacecefa0cece0cbcbf229c886231f2907c0a8 13SHA1 (patch-ah) = 32768bef3acc3e19b151fbfb87ad63d34cd2ec09
 14SHA1 (patch-configure_in) = 4d5fad7b0b89e80f6a4e4958a3bdc3c6de572bd5
14SHA1 (patch-efltk_Fl__Flags_h) = 589ea469042b1271cc9591680f55db6858025db2 15SHA1 (patch-efltk_Fl__Flags_h) = 589ea469042b1271cc9591680f55db6858025db2
15SHA1 (patch-efltk_Fl__Int__List_h) = 766ae82ee67a90def27e0882b815e918b8cc6ca3 16SHA1 (patch-efltk_Fl__Int__List_h) = 8883eb41310736fae2a4a7d90119284d14ebe2fe
16SHA1 (patch-efltk_Fl__Text__Buffer.h) = 16eb6b48d0f06ac0f2074a0b61a782db7757663e 17SHA1 (patch-efltk_Fl__Text__Buffer.h) = 16eb6b48d0f06ac0f2074a0b61a782db7757663e
17SHA1 (patch-efltk_Fl__Widget_h) = a35acb6f3af14bd2fabbe1c67b92e80fe561a366 18SHA1 (patch-efltk_Fl__Widget_h) = a35acb6f3af14bd2fabbe1c67b92e80fe561a366
18SHA1 (patch-efltk_Fl__Window.h) = b97f04435b88e05ec4f642b0615575cf8d279dd7 19SHA1 (patch-efltk_Fl__Window.h) = b97f04435b88e05ec4f642b0615575cf8d279dd7
19SHA1 (patch-efltk_db_Fl__Params_h) = 3e16bd8ddf1b700cc9ba516e312dc797f26e6546 20SHA1 (patch-efltk_db_Fl__Params_h) = 9bb8574d1558f6ca753e0d9845b6fdaebeac38b4
20SHA1 (patch-src_core_fl__draw__pixmap_cpp) = cd31ac6d730b257bb3e76c9525ad92f9ea0fa3aa 21SHA1 (patch-src_core_fl__draw__pixmap_cpp) = cd31ac6d730b257bb3e76c9525ad92f9ea0fa3aa
21SHA1 (patch-src_images_Fl__Png.cpp) = 0c2d3bf30a5542274048784aaf32256cc5466dea 22SHA1 (patch-src_images_Fl__Png.cpp) = 0c2d3bf30a5542274048784aaf32256cc5466dea
22SHA1 (patch-src_widgets_Fl__Calendar_cpp) = fc0f83c5f64c074b0e33783cac5aaa072b21c999 23SHA1 (patch-src_widgets_Fl__Calendar_cpp) = fb44e30fbed6a48ccd0d07348440df503a7e945e
23SHA1 (patch-src_widgets_Fl__Input_cpp) = 33c0eb6c582aeae66a40bd993ac7e5616a6fdf72 24SHA1 (patch-src_widgets_Fl__Input_cpp) = d1f30bf63ef2000a6b676d5a6205d93ddf1347f3
24SHA1 (patch-src_widgets_Fl__Text__Editor_cpp) = fff83662ee1efe9370e366aa12bf34cb7d26e165 25SHA1 (patch-src_widgets_Fl__Text__Editor_cpp) = 6dc9f71019612cbac0fe5fffe0388069d8d23e3b
cvs diff -r1.2 -r1.2.50.1 pkgsrc/x11/efltk/patches/patch-ah (expand / switch to unified diff)

--- pkgsrc/x11/efltk/patches/patch-ah 2006/03/08 11:29:50 1.2
+++ pkgsrc/x11/efltk/patches/patch-ah 2011/10/11 07:35:50 1.2.50.1
@@ -1,17 +1,35 @@ @@ -1,17 +1,35 @@
1$NetBSD: patch-ah,v 1.2 2006/03/08 11:29:50 joerg Exp $ 1$NetBSD: patch-ah,v 1.2.50.1 2011/10/11 07:35:50 tron Exp $
2 2
3--- configure.orig 2006-02-18 14:10:57.000000000 +0000 3- use pkg-config to find libXft, not xft-config, as xft-config has
 4disappeared from recent libXft. (XXX: will this break the build for
 5really old libXft? Does this need to learn to use both?)
 6
 7- use proper pthreads. (warning: this change is not reflected in
 8the configure.in patch)
 9
 10--- configure.orig 2005-04-29 16:31:42.000000000 +0000
4+++ configure 11+++ configure
 12@@ -5513,8 +5513,8 @@ if test "${enable_xft+set}" = set; then
 13 #define USE_XFT 1
 14 _ACEOF
 15
 16- LDLIBS="$LDLIBS `xft-config --libs`"
 17- CXXFLAGS="$CXXFLAGS `xft-config --cflags`"
 18+ LDLIBS="$LDLIBS `pkg-config --libs xft`"
 19+ CXXFLAGS="$CXXFLAGS `pkg-config --cflags xft`"
 20 fi
 21 fi;
 22
5@@ -8295,13 +8295,13 @@ if test $ac_cv_lib_c_pthread_create = ye 23@@ -8295,13 +8295,13 @@ if test $ac_cv_lib_c_pthread_create = ye
6 \ 24 \
7 have_pthread=yes 25 have_pthread=yes
8 else 26 else
9- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 27- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
10-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6 28-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
11+ echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5 29+ echo "$as_me:$LINENO: checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5
12+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6 30+echo $ECHO_N "checking for pthread_create in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6
13 if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then 31 if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
14 echo $ECHO_N "(cached) $ECHO_C" >&6 32 echo $ECHO_N "(cached) $ECHO_C" >&6
15 else 33 else
16 ac_check_lib_save_LIBS=$LIBS 34 ac_check_lib_save_LIBS=$LIBS
17-LIBS="-lpthread $LIBS" 35-LIBS="-lpthread $LIBS"
File Added: pkgsrc/x11/efltk/patches/patch-configure_in
$NetBSD: patch-configure_in,v 1.2.2.2 2011/10/11 07:35:50 tron Exp $

- use pkg-config to find libXft, not xft-config, as xft-config has
disappeared from recent libXft. (XXX: will this break the build for
really old libXft? Does this need to learn to use both?)

--- configure.in~	2005-04-29 16:13:18.000000000 +0000
+++ configure.in
@@ -147,8 +147,8 @@ fi])
 
 AC_ARG_ENABLE(xft, [  --enable-xft            enable XWindow XFT extension],[if eval "test x$enable_xft = xyes"; then
 	AC_DEFINE(USE_XFT)
-	LDLIBS="$LDLIBS `xft-config --libs`"
-        CXXFLAGS="$CXXFLAGS `xft-config --cflags`"
+	LDLIBS="$LDLIBS `pkg-config --libs xft`"
+        CXXFLAGS="$CXXFLAGS `pkg-config --cflags xft`"
 fi])
 
 AC_ARG_ENABLE(debug, [  --enable-debug          compile with debug rather than optimized],[if eval "test x$enable_debug = xyes"; then
cvs diff -r1.1 -r1.1.2.1 pkgsrc/x11/efltk/patches/patch-efltk_Fl__Int__List_h (expand / switch to unified diff)

--- pkgsrc/x11/efltk/patches/patch-efltk_Fl__Int__List_h 2011/10/02 03:44:10 1.1
+++ pkgsrc/x11/efltk/patches/patch-efltk_Fl__Int__List_h 2011/10/11 07:35:50 1.1.2.1
@@ -1,15 +1,24 @@ @@ -1,15 +1,24 @@
1$NetBSD: patch-efltk_Fl__Int__List_h,v 1.1 2011/10/02 03:44:10 dholland Exp $ 1$NetBSD: patch-efltk_Fl__Int__List_h,v 1.1.2.1 2011/10/11 07:35:50 tron Exp $
2 2
3- fix LP64 build 3- fix LP64 build
4 4
5--- efltk/Fl_Int_List.h~ 2003-07-03 20:36:35.000000000 +0000 5--- efltk/Fl_Int_List.h.orig 2003-07-03 20:36:35.000000000 +0000
6+++ efltk/Fl_Int_List.h 6+++ efltk/Fl_Int_List.h
7@@ -43,7 +43,7 @@ public: 7@@ -22,6 +22,8 @@
 8 #ifndef _FL_INT_LIST_H_
 9 #define _FL_INT_LIST_H_
 10
 11+#include <stdint.h>
 12+
 13 #include "Fl_Ptr_List.h"
 14
 15 /** Fl_Int_List */
 16@@ -43,7 +45,7 @@ public:
8 char *to_string(const char *separator=","); 17 char *to_string(const char *separator=",");
9 void from_string(const char * s, const char * separator=","); 18 void from_string(const char * s, const char * separator=",");
10  19
11- int item(uint index) const { return (int)Fl_Ptr_List::item(index); } 20- int item(uint index) const { return (int)Fl_Ptr_List::item(index); }
12+ int item(uint index) const { return (int)(intptr_t)Fl_Ptr_List::item(index); } 21+ int item(uint index) const { return (int)(intptr_t)Fl_Ptr_List::item(index); }
13 int &operator [](uint ind) const { return (int&)items[ind]; } 22 int &operator [](uint ind) const { return (int&)items[ind]; }
14 }; 23 };
15  24
cvs diff -r1.1 -r1.1.2.1 pkgsrc/x11/efltk/patches/patch-efltk_db_Fl__Params_h (expand / switch to unified diff)

--- pkgsrc/x11/efltk/patches/patch-efltk_db_Fl__Params_h 2011/10/02 03:44:10 1.1
+++ pkgsrc/x11/efltk/patches/patch-efltk_db_Fl__Params_h 2011/10/11 07:35:50 1.1.2.1
@@ -1,15 +1,24 @@ @@ -1,15 +1,24 @@
1$NetBSD: patch-efltk_db_Fl__Params_h,v 1.1 2011/10/02 03:44:10 dholland Exp $ 1$NetBSD: patch-efltk_db_Fl__Params_h,v 1.1.2.1 2011/10/11 07:35:50 tron Exp $
2 2
3- fix LP64 build 3- fix LP64 build
4 4
5--- efltk/db/Fl_Params.h~ 2003-04-23 17:56:23.000000000 +0000 5--- efltk/db/Fl_Params.h.orig 2003-04-23 17:56:23.000000000 +0000
6+++ efltk/db/Fl_Params.h 6+++ efltk/db/Fl_Params.h
7@@ -45,7 +45,7 @@ public: 7@@ -18,6 +18,8 @@
 8 #ifndef _FL_PARAMS_H_
 9 #define _FL_PARAMS_H_
 10
 11+#include <stdint.h>
 12+
 13 #include "../Fl_String.h"
 14 #include "../Fl_Variant.h"
 15 #include "../Fl_Ptr_List.h"
 16@@ -45,7 +47,7 @@ public:
8 void bind_clear() { m_bindParamIndexes.clear(); } 17 void bind_clear() { m_bindParamIndexes.clear(); }
9 void bind_add(unsigned bindIndex); 18 void bind_add(unsigned bindIndex);
10 unsigned bind_count() { return m_bindParamIndexes.count(); } 19 unsigned bind_count() { return m_bindParamIndexes.count(); }
11- unsigned bind_index(unsigned ind) { return (unsigned)m_bindParamIndexes[ind]; } 20- unsigned bind_index(unsigned ind) { return (unsigned)m_bindParamIndexes[ind]; }
12+ unsigned bind_index(unsigned ind) { return (unsigned)(uintptr_t)m_bindParamIndexes[ind]; } 21+ unsigned bind_index(unsigned ind) { return (unsigned)(uintptr_t)m_bindParamIndexes[ind]; }
13  22
14 // ASSIGNMENT OPERATORS 23 // ASSIGNMENT OPERATORS
15 Fl_Variant& operator =(const Fl_Variant &C) { 24 Fl_Variant& operator =(const Fl_Variant &C) {
cvs diff -r1.1 -r1.1.2.1 pkgsrc/x11/efltk/patches/patch-src_widgets_Fl__Calendar_cpp (expand / switch to unified diff)

--- pkgsrc/x11/efltk/patches/patch-src_widgets_Fl__Calendar_cpp 2011/10/02 03:44:10 1.1
+++ pkgsrc/x11/efltk/patches/patch-src_widgets_Fl__Calendar_cpp 2011/10/11 07:35:50 1.1.2.1
@@ -1,20 +1,29 @@ @@ -1,20 +1,29 @@
1$NetBSD: patch-src_widgets_Fl__Calendar_cpp,v 1.1 2011/10/02 03:44:10 dholland Exp $ 1$NetBSD: patch-src_widgets_Fl__Calendar_cpp,v 1.1.2.1 2011/10/11 07:35:50 tron Exp $
2 2
3- fix LP64 build 3- fix LP64 build
4 4
5--- src/widgets/Fl_Calendar.cpp~ 2003-05-30 08:46:58.000000000 +0000 5--- src/widgets/Fl_Calendar.cpp.orig 2003-05-30 08:46:58.000000000 +0000
6+++ src/widgets/Fl_Calendar.cpp 6+++ src/widgets/Fl_Calendar.cpp
7@@ -43,13 +43,13 @@ static const int monthChanges[4] = { 7@@ -15,6 +15,8 @@
 8 * *
 9 ***************************************************************************/
 10
 11+#include <stdint.h>
 12+
 13 #include <efltk/Fl_Calendar.h>
 14 #include <efltk/Fl.h>
 15
 16@@ -43,13 +45,13 @@ static const int monthChanges[4] = {
8 // Callback function for day buttons 17 // Callback function for day buttons
9 void Fl_Calendar::cbDayButtonClicked(Fl_Widget *button, void *param) { 18 void Fl_Calendar::cbDayButtonClicked(Fl_Widget *button, void *param) {
10 Fl_Calendar *c = (Fl_Calendar *)button->parent()->parent(); 19 Fl_Calendar *c = (Fl_Calendar *)button->parent()->parent();
11- c->dayButtonClicked((unsigned)param); 20- c->dayButtonClicked((unsigned)param);
12+ c->dayButtonClicked((unsigned)(uintptr_t)param); 21+ c->dayButtonClicked((unsigned)(uintptr_t)param);
13 } 22 }
14  23
15 // Callback function for switch buttons 24 // Callback function for switch buttons
16 void Fl_Calendar::cbSwitchButtonClicked(Fl_Widget *button, void *param) { 25 void Fl_Calendar::cbSwitchButtonClicked(Fl_Widget *button, void *param) {
17 Fl_Calendar *c = (Fl_Calendar *)button->parent(); 26 Fl_Calendar *c = (Fl_Calendar *)button->parent();
18- c->switchButtonClicked((int)param); 27- c->switchButtonClicked((int)param);
19+ c->switchButtonClicked((int)(intptr_t)param); 28+ c->switchButtonClicked((int)(intptr_t)param);
20 } 29 }
cvs diff -r1.1 -r1.1.2.1 pkgsrc/x11/efltk/patches/patch-src_widgets_Fl__Input_cpp (expand / switch to unified diff)

--- pkgsrc/x11/efltk/patches/patch-src_widgets_Fl__Input_cpp 2011/10/02 03:44:10 1.1
+++ pkgsrc/x11/efltk/patches/patch-src_widgets_Fl__Input_cpp 2011/10/11 07:35:50 1.1.2.1
@@ -1,15 +1,23 @@ @@ -1,15 +1,23 @@
1$NetBSD: patch-src_widgets_Fl__Input_cpp,v 1.1 2011/10/02 03:44:10 dholland Exp $ 1$NetBSD: patch-src_widgets_Fl__Input_cpp,v 1.1.2.1 2011/10/11 07:35:50 tron Exp $
2 2
3- fix LP64 build 3- fix LP64 build
4 4
5--- src/widgets/Fl_Input.cpp~ 2003-06-22 21:36:13.000000000 +0000 5--- src/widgets/Fl_Input.cpp.orig 2003-06-22 21:36:13.000000000 +0000
6+++ src/widgets/Fl_Input.cpp 6+++ src/widgets/Fl_Input.cpp
7@@ -59,7 +59,7 @@ static Fl_Menu_ *menu_ = &menu; 7@@ -40,6 +40,7 @@
 8 // For NLS stuff
 9 #include "../core/fl_internal.h"
 10
 11+#include <stdint.h>
 12 #include <string.h>
 13 #include <stdlib.h>
 14 #include <ctype.h>
 15@@ -59,7 +60,7 @@ static Fl_Menu_ *menu_ = &menu;
8 static void cb_menu(Fl_Widget *w, void *d) 16 static void cb_menu(Fl_Widget *w, void *d)
9 { 17 {
10 if(!menu_widget) return; 18 if(!menu_widget) return;
11- switch((int)d) { 19- switch((int)d) {
12+ switch((int)(intptr_t)d) { 20+ switch((int)(intptr_t)d) {
13 case CUT: 21 case CUT:
14 menu_widget->copy(true); 22 menu_widget->copy(true);
15 menu_widget->cut(); 23 menu_widget->cut();
cvs diff -r1.1 -r1.1.2.1 pkgsrc/x11/efltk/patches/patch-src_widgets_Fl__Text__Editor_cpp (expand / switch to unified diff)

--- pkgsrc/x11/efltk/patches/patch-src_widgets_Fl__Text__Editor_cpp 2011/10/02 03:44:10 1.1
+++ pkgsrc/x11/efltk/patches/patch-src_widgets_Fl__Text__Editor_cpp 2011/10/11 07:35:50 1.1.2.1
@@ -1,15 +1,23 @@ @@ -1,15 +1,23 @@
1$NetBSD: patch-src_widgets_Fl__Text__Editor_cpp,v 1.1 2011/10/02 03:44:10 dholland Exp $ 1$NetBSD: patch-src_widgets_Fl__Text__Editor_cpp,v 1.1.2.1 2011/10/11 07:35:50 tron Exp $
2 2
3- fix LP64 build 3- fix LP64 build
4 4
5--- src/widgets/Fl_Text_Editor.cpp~ 2003-06-16 19:41:23.000000000 +0000 5--- src/widgets/Fl_Text_Editor.cpp.orig 2003-06-16 19:41:23.000000000 +0000
6+++ src/widgets/Fl_Text_Editor.cpp 6+++ src/widgets/Fl_Text_Editor.cpp
7@@ -45,7 +45,7 @@ static void cb_menu(Fl_Widget *w, void * 7@@ -26,6 +26,7 @@
 8 #include <efltk/Fl.h>
 9 #include <efltk/Fl_Text_Editor.h>
 10 #include <efltk/Fl_Style.h>
 11+#include <stdint.h>
 12 #include <stdio.h>
 13 #include <stdlib.h>
 14 #include <string.h>
 15@@ -45,7 +46,7 @@ static void cb_menu(Fl_Widget *w, void *
8 { 16 {
9 if(!menu_widget) return; 17 if(!menu_widget) return;
10 char *selection = 0; 18 char *selection = 0;
11- switch((int)d) { 19- switch((int)d) {
12+ switch((int)(intptr_t)d) { 20+ switch((int)(intptr_t)d) {
13 case COPY: 21 case COPY:
14 selection = (char *)menu_widget->buffer()->selection_text(); 22 selection = (char *)menu_widget->buffer()->selection_text();
15 if(*selection) { 23 if(*selection) {