diff options
author | dsainty <dsainty@pkgsrc.org> | 2002-12-31 06:59:51 +0000 |
---|---|---|
committer | dsainty <dsainty@pkgsrc.org> | 2002-12-31 06:59:51 +0000 |
commit | 4716e095c6dbf6544334653dcf61bad540d07255 (patch) | |
tree | b55a34a61c8d38a7f035faaba10c8f20259793ff /emulators/palmosemulator/patches | |
parent | 8cf950baa055b66bc599d00b6adc6a43e8ca1873 (diff) | |
download | pkgsrc-4716e095c6dbf6544334653dcf61bad540d07255.tar.gz |
Palm OS Emulator, version 3.5
Diffstat (limited to 'emulators/palmosemulator/patches')
-rw-r--r-- | emulators/palmosemulator/patches/patch-aa | 107 | ||||
-rw-r--r-- | emulators/palmosemulator/patches/patch-ab | 24 | ||||
-rw-r--r-- | emulators/palmosemulator/patches/patch-ac | 16 | ||||
-rw-r--r-- | emulators/palmosemulator/patches/patch-ad | 23 | ||||
-rw-r--r-- | emulators/palmosemulator/patches/patch-ae | 16 | ||||
-rw-r--r-- | emulators/palmosemulator/patches/patch-af | 17 | ||||
-rw-r--r-- | emulators/palmosemulator/patches/patch-ag | 36 |
7 files changed, 239 insertions, 0 deletions
diff --git a/emulators/palmosemulator/patches/patch-aa b/emulators/palmosemulator/patches/patch-aa new file mode 100644 index 00000000000..b06e7edc9ca --- /dev/null +++ b/emulators/palmosemulator/patches/patch-aa @@ -0,0 +1,107 @@ +$NetBSD: patch-aa,v 1.1.1.1 2002/12/31 06:59:54 dsainty Exp $ + +--- SrcShared/omnithread/omnithread.h.orig Sat Mar 30 01:11:07 2002 ++++ SrcShared/omnithread/omnithread.h Sat Nov 23 23:43:30 2002 +@@ -64,102 +64,8 @@ + // + + +-#if defined(__arm__) && defined(__atmos__) + #include <omnithread/posix.h> + +-#elif defined(__alpha__) && defined(__osf1__) +-#include <omnithread/posix.h> +- +-#elif defined(__powerpc__) && defined(__aix__) +-#include <omnithread/posix.h> +- +-#elif defined(__hpux__) +-#include <omnithread/posix.h> +- +-#elif defined(__WIN32__) +-#include <omnithread/nt.h> +- +-#ifdef _MSC_VER +- +-// Using MSVC++ to compile. If compiling library as a DLL, +-// define _OMNITHREAD_DLL. If compiling as a statuc library, define +-// _WINSTATIC +-// If compiling an application that is to be statically linked to omnithread, +-// define _WINSTATIC (if the application is to be dynamically linked, +-// there is no need to define any of these macros). +- +-#if defined (_OMNITHREAD_DLL) && defined(_WINSTATIC) +-#error "Both _OMNITHREAD_DLL and _WINSTATIC are defined." +-#elif defined(_OMNITHREAD_DLL) +-#define _OMNITHREAD_NTDLL_ __declspec(dllexport) +-#elif !defined(_WINSTATIC) +-#define _OMNITHREAD_NTDLL_ __declspec(dllimport) +-#elif defined(_WINSTATIC) +-#define _OMNITHREAD_NTDLL_ +-#endif +- // _OMNITHREAD_DLL && _WINSTATIC +- +-#else +- +-// Not using MSVC++ to compile +-#define _OMNITHREAD_NTDLL_ +- +-#endif +- // _MSC_VER +- +-#elif defined(__sun__) +-#include <omnithread/solaris.h> +- +-#elif defined(__sunos__) +-#if __OSVERSION__ != 5 +-// XXX Workaround for SUN C++ compiler (seen on 4.2) Template.DB code +-// regeneration bug. See omniORB2/CORBA_sysdep.h for details. +-#if !defined(__SUNPRO_CC) || __OSVERSION__ != '5' +-#error "Only SunOS 5.x or later is supported." +-#endif +-#endif +-#ifdef UsePthread +-#include <omnithread/posix.h> +-#else +-#include <omnithread/solaris.h> +-#endif +- +-#elif defined(__linux__) +-#include <omnithread/posix.h> +- +-#elif defined(__nextstep__) +-#include <omnithread/mach.h> +- +-#elif defined(__VMS) +-#include <omnithread/posix.h> +- +-#elif defined(__SINIX__) +-#include <omnithread/posix.h> +- +-#elif defined(__osr5__) +-#include <omnithread/posix.h> +- +-#elif defined(__irix__) +-#include <omnithread/posix.h> +- +-#elif defined(macintosh) +-#include <null_thread.h> +- +-#elif defined(__QNXNTO__) +-#include <omnithread/posix.h> +- +-#elif defined(__svr4__) +-#include <omnithread/posix.h> +- +-#elif defined(__FreeBSD__) +-#include <omnithread/posix.h> +- +-#elif defined(__bsdi__) +-#include <omnithread/posix.h> +- +-#else +-#error "No implementation header file" +-#endif + + #if !defined(__WIN32__) + #define _OMNITHREAD_NTDLL_ diff --git a/emulators/palmosemulator/patches/patch-ab b/emulators/palmosemulator/patches/patch-ab new file mode 100644 index 00000000000..5a49b4c747b --- /dev/null +++ b/emulators/palmosemulator/patches/patch-ab @@ -0,0 +1,24 @@ +$NetBSD: patch-ab,v 1.1.1.1 2002/12/31 06:59:54 dsainty Exp $ + +--- BuildUnix/configure.orig Sat Nov 23 23:54:59 2002 ++++ BuildUnix/configure Sun Nov 24 00:57:08 2002 +@@ -3180,6 +3180,11 @@ + THREAD_LIBS="-lpthread" + ;; + ++*-netbsd*) ++ THREAD_FLAGS="-D_REENTRANT -DPthreadDraftVersion=10" ++ THREAD_LIBS="-lpthread" ++ ;; ++ + *-nto*) + THREAD_FLAGS="-D_REENTRANT -DPthreadDraftVersion=10" + THREAD_LIBS="" +@@ -3853,6 +3858,7 @@ + s%@CXXCPP@%$CXXCPP%g + s%@GLLIB@%$GLLIB%g + s%@AR@%$AR%g ++s%@PACKAGE_SKINS_DIR@%$PACKAGE_SKINS_DIR%g + s%@POSER_CFLAGS@%$POSER_CFLAGS%g + s%@POSER_CXXFLAGS@%$POSER_CXXFLAGS%g + s%@THREAD_FLAGS@%$THREAD_FLAGS%g diff --git a/emulators/palmosemulator/patches/patch-ac b/emulators/palmosemulator/patches/patch-ac new file mode 100644 index 00000000000..02299d92502 --- /dev/null +++ b/emulators/palmosemulator/patches/patch-ac @@ -0,0 +1,16 @@ +$NetBSD: patch-ac,v 1.1.1.1 2002/12/31 06:59:54 dsainty Exp $ + +--- SrcShared/Skins.cpp.orig Sat Mar 30 01:11:17 2002 ++++ SrcShared/Skins.cpp Sun Nov 24 02:01:04 2002 +@@ -1163,6 +1163,11 @@ + if (!scanDir.Exists ()) + scanDir = EmDirRef (EmDirRef::GetEmulatorDirectory (), "skins"); + ++#ifdef PACKAGE_SKINS_DIR ++ if (!scanDir.Exists ()) ++ scanDir = EmDirRef (PACKAGE_SKINS_DIR); ++#endif ++ + #if PLATFORM_UNIX + // On Unix, also look in the /usr/local/share/pose and /usr/share/pose directories. + diff --git a/emulators/palmosemulator/patches/patch-ad b/emulators/palmosemulator/patches/patch-ad new file mode 100644 index 00000000000..e950c3499ab --- /dev/null +++ b/emulators/palmosemulator/patches/patch-ad @@ -0,0 +1,23 @@ +$NetBSD: patch-ad,v 1.1.1.1 2002/12/31 06:59:54 dsainty Exp $ + +--- BuildUnix/Makefile.in.orig Sat Mar 30 01:11:21 2002 ++++ BuildUnix/Makefile.in Sun Nov 24 02:24:49 2002 +@@ -70,6 +70,7 @@ + GLLIB = @GLLIB@ + MAKEINFO = @MAKEINFO@ + PACKAGE = @PACKAGE@ ++PACKAGE_SKINS_FLAGS = -DPACKAGE_SKINS_DIR="\"@PACKAGE_SKINS_DIR@\"" + POSER_CFLAGS = @POSER_CFLAGS@ + POSER_CXXFLAGS = @POSER_CXXFLAGS@ + RANLIB = @RANLIB@ +@@ -85,8 +86,8 @@ + VPATH = $(srcdir)/../SrcUnix: $(srcdir)/../SrcShared: $(srcdir)/../SrcShared/Hardware: $(srcdir)/../SrcShared/Hardware/TRG: $(srcdir)/../SrcShared/omnithread: $(srcdir)/../SrcShared/Palm/Platform/Core/System/Src: $(srcdir)/../SrcShared/Patches: $(srcdir)/../SrcShared/UAE: + + +-CFLAGS = $(POSER_CFLAGS) $(LOCAL_CFLAGS) $(FLAGS) $(THREAD_FLAGS) $(X_CFLAGS) +-CXXFLAGS = $(POSER_CXXFLAGS) $(LOCAL_CFLAGS) $(FLAGS) $(THREAD_FLAGS) $(X_CFLAGS) ++CFLAGS = $(POSER_CFLAGS) $(LOCAL_CFLAGS) $(FLAGS) $(THREAD_FLAGS) $(PACKAGE_SKINS_FLAGS) $(X_CFLAGS) ++CXXFLAGS = $(POSER_CXXFLAGS) $(LOCAL_CFLAGS) $(FLAGS) $(THREAD_FLAGS) $(PACKAGE_SKINS_FLAGS) $(X_CFLAGS) + INCLUDES = -I$(srcdir)/../SrcShared -I$(srcdir)/../SrcShared/Hardware -I$(srcdir)/../SrcShared/Hardware/TRG -I$(srcdir)/../SrcShared/Palm/Device -I$(srcdir)/../SrcShared/Palm/Platform -I$(srcdir)/../SrcShared/Palm/Platform/Core/Hardware/IncsPrv -I$(srcdir)/../SrcShared/Palm/Platform/Core/System/IncsPrv -I$(srcdir)/../SrcShared/Palm/Platform/Incs -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Core -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Core/Hardware -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Core/System -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Core/UI -I$(srcdir)/../SrcShared/Palm/Platform/Incs/Libraries -I$(srcdir)/../SrcShared/Gzip -I$(srcdir)/../SrcShared/jpeg -I$(srcdir)/../SrcShared/omnithread -I$(srcdir)/../SrcShared/Patches -I$(srcdir)/../SrcShared/UAE -I$(srcdir)/../SrcUnix -I$(srcdir)/../SrcUnix/espws-2.0 + + SRC_UNIX = EmApplicationFltk.cpp EmApplicationFltk.h EmCommonUnix.h EmDirRefUnix.cpp EmDirRefUnix.h EmDlgFltk.cpp EmDlgFltk.h EmDocumentUnix.cpp EmDocumentUnix.h EmFileRefUnix.cpp EmFileRefUnix.h EmMenusFltk.cpp EmMenusFltk.h EmPixMapUnix.cpp EmPixMapUnix.h EmTransportSerialUnix.cpp EmTransportSerialUnix.h EmTransportUSBUnix.cpp EmTransportUSBUnix.h EmWindowFltk.cpp EmWindowFltk.h Platform_Unix.cpp jconfig.h diff --git a/emulators/palmosemulator/patches/patch-ae b/emulators/palmosemulator/patches/patch-ae new file mode 100644 index 00000000000..ba648f8e115 --- /dev/null +++ b/emulators/palmosemulator/patches/patch-ae @@ -0,0 +1,16 @@ +$NetBSD: patch-ae,v 1.1.1.1 2002/12/31 06:59:56 dsainty Exp $ + +Without this patch, ROM transfers tend to not get very far due to consistently +lost characters. + +--- SrcUnix/EmTransportSerialUnix.cpp.orig Sat Mar 30 01:11:19 2002 ++++ SrcUnix/EmTransportSerialUnix.cpp Sun Nov 24 05:42:39 2002 +@@ -220,7 +220,7 @@ + // Programming Mini-Howto") says to turn off these for "raw" (as opposed to + // "canonical") mode. + +- io.c_lflag &= ~(ICANON | ECHO | ISIG); ++ io.c_lflag &= ~(ICANON | ECHO | ISIG | IEXTEN); + + // The UNIX Programming FAQ (<www://www.faqs.org/faqs/unix-faq/programmer/faq/>) + // recommends just setting all the c_iflags and c_oflags to zero. diff --git a/emulators/palmosemulator/patches/patch-af b/emulators/palmosemulator/patches/patch-af new file mode 100644 index 00000000000..3432e0cf510 --- /dev/null +++ b/emulators/palmosemulator/patches/patch-af @@ -0,0 +1,17 @@ +$NetBSD: patch-af,v 1.1.1.1 2002/12/31 06:59:57 dsainty Exp $ + +Without this patch and with non-preemptive threads, the emulator hangs on the +first stylus event (mouse click). Even worse, it hangs with the mouse +grabbed. Strategies for reducing the number of calls to yield() may improve +emulation performance. + +--- SrcShared/Hardware/EmCPU68K.cpp.orig Sun Nov 24 17:47:03 2002 ++++ SrcShared/Hardware/EmCPU68K.cpp Sun Nov 24 17:34:23 2002 +@@ -136,6 +136,7 @@ + if (sleeping || ((++counter & 0x7FFF) == 0)) \ + { \ + this->CycleSlowly (sleeping); \ ++ omni_thread::yield(); \ + } \ + } \ + } diff --git a/emulators/palmosemulator/patches/patch-ag b/emulators/palmosemulator/patches/patch-ag new file mode 100644 index 00000000000..9de2d9f3462 --- /dev/null +++ b/emulators/palmosemulator/patches/patch-ag @@ -0,0 +1,36 @@ +$NetBSD: patch-ag,v 1.1.1.1 2002/12/31 06:59:57 dsainty Exp $ + +This patch prevents the emulator from grabbing the mouse. It isn't clear why +the emulator does grab the mouse, a fairly bad-mannered thing for an +application to do. + +There doesn't appear to be any actual reason for doing so, and if the emulator +hangs for any reason with the mouse grab in-force, it tends to disable the +entire X session. + +--- SrcShared/EmWindow.cpp.orig Sun Dec 1 16:05:17 2002 ++++ SrcShared/EmWindow.cpp Sun Dec 1 16:05:00 2002 +@@ -229,11 +229,6 @@ + if (down && (fCurrentButton == kElement_None)) + { + what = ::SkinTestPoint (where); +- +- if ((what != kElement_Frame) && (what != kElement_None)) +- { +- this->HostMouseCapture (); +- } + } + + // If the pen is up, or if we were already in the progress of tracking +@@ -288,11 +283,6 @@ + fCurrentButton = what; + else + fCurrentButton = kElement_None; +- +- if (fCurrentButton == kElement_None) +- { +- this->HostMouseRelease (); +- } + } + + |