Fix linker failure due to gcc inline issue (gcc-inline.patch). Fix broken unicode builds (wxtranslate.patch).
Signed-off-by: Johan Hovold <johan.hov...@lundinova.se> --- conf/checksums.ini | 4 +++ recipes/wxsqlite3/wxsqlite3-1.9.7/gcc-inline.patch | 29 ++++++++++++++++++++ .../wxsqlite3/wxsqlite3-1.9.7/wxtranslate.patch | 11 +++++++ recipes/wxsqlite3/wxsqlite3_1.9.7.bb | 23 +++++++++++++++ 4 files changed, 67 insertions(+), 0 deletions(-) create mode 100644 recipes/wxsqlite3/wxsqlite3-1.9.7/gcc-inline.patch create mode 100644 recipes/wxsqlite3/wxsqlite3-1.9.7/wxtranslate.patch create mode 100644 recipes/wxsqlite3/wxsqlite3_1.9.7.bb diff --git a/conf/checksums.ini b/conf/checksums.ini index 10ce619..211965b 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -27390,6 +27390,10 @@ sha256=9b4096bb1e273914adf101182c27d457f46fcc44d1b3ea027bae3d34ace8c6f7 md5=3ad40ea2b1728eefa94f60beb9951ff7 sha256=9b4096bb1e273914adf101182c27d457f46fcc44d1b3ea027bae3d34ace8c6f7 +[http://downloads.sourceforge.net/wxcode/wxsqlite3-1.9.7.tar.gz] +md5=2e1bec387bbdf50c632649d041b32a4a +sha256=eaee8290c1f386413f5cb1e1af9ec4e7573c1dcce2760d79f4276497a75c4f64 + [http://xorg.freedesktop.org/releases/individual/app/x11perf-1.4.1.tar.bz2] md5=fd06c8b8e3572a0e14af65a49e0dd7d1 sha256=c81819618ec596fda55b950ef80f2ee02e5ce149ea99f1f741cedb459b4d3064 diff --git a/recipes/wxsqlite3/wxsqlite3-1.9.7/gcc-inline.patch b/recipes/wxsqlite3/wxsqlite3-1.9.7/gcc-inline.patch new file mode 100644 index 0000000..10338ad --- /dev/null +++ b/recipes/wxsqlite3/wxsqlite3-1.9.7/gcc-inline.patch @@ -0,0 +1,29 @@ +diff -pru wxsqlite3-1.9.7.orig/include/wx/wxsqlite3.h wxsqlite3-1.9.7/include/wx/wxsqlite3.h +--- wxsqlite3-1.9.7.orig/include/wx/wxsqlite3.h 2009-11-09 20:59:38.000000000 +0100 ++++ wxsqlite3-1.9.7/include/wx/wxsqlite3.h 2009-12-06 17:19:58.000000000 +0100 +@@ -94,7 +94,7 @@ public: + int GetExtendedErrorCode() const { return m_errorCode; } + + /// Get error message associated with the exception +- const wxString GetMessage() const { return m_errorMessage; } ++ const wxString GetMessage() const; + + /// Convert error code to error message + static const wxString ErrorCodeAsString(int errorCode); +Only in wxsqlite3-1.9.7: patches +diff -pru wxsqlite3-1.9.7.orig/src/wxsqlite3.cpp wxsqlite3-1.9.7/src/wxsqlite3.cpp +--- wxsqlite3-1.9.7.orig/src/wxsqlite3.cpp 2009-11-09 20:59:38.000000000 +0100 ++++ wxsqlite3-1.9.7/src/wxsqlite3.cpp 2009-12-06 17:58:01.000000000 +0100 +@@ -263,6 +263,11 @@ wxSQLite3Exception::~wxSQLite3Exception( + { + } + ++const wxString wxSQLite3Exception::GetMessage() const ++{ ++ return m_errorMessage; ++} ++ + // ---------------------------------------------------------------------------- + // wxSQLite3StatementBuffer: class providing a statement buffer + // for use with the SQLite3 vmprintf function +Only in wxsqlite3-1.9.7/src: .wxsqlite3.cpp.swp diff --git a/recipes/wxsqlite3/wxsqlite3-1.9.7/wxtranslate.patch b/recipes/wxsqlite3/wxsqlite3-1.9.7/wxtranslate.patch new file mode 100644 index 0000000..b40511c --- /dev/null +++ b/recipes/wxsqlite3/wxsqlite3-1.9.7/wxtranslate.patch @@ -0,0 +1,11 @@ +--- wxsqlite3-1.9.7.orig/src/wxsqlite3.cpp 2009-11-09 20:59:38.000000000 +0100 ++++ wxsqlite3-1.9.7/src/wxsqlite3.cpp 2009-12-06 17:58:35.000000000 +0100 +@@ -94,6 +94,8 @@ static void InitSQLite3DLL() + + // Error messages + ++#undef wxTRANSLATE ++#define wxTRANSLATE wxT + const wxChar* wxERRMSG_NODB = wxTRANSLATE("No Database opened"); + const wxChar* wxERRMSG_NOSTMT = wxTRANSLATE("Statement not accessible"); + const wxChar* wxERRMSG_NOMEM = wxTRANSLATE("Out of memory"); diff --git a/recipes/wxsqlite3/wxsqlite3_1.9.7.bb b/recipes/wxsqlite3/wxsqlite3_1.9.7.bb new file mode 100644 index 0000000..a848393 --- /dev/null +++ b/recipes/wxsqlite3/wxsqlite3_1.9.7.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "A wxWindows wrapper for the sqlite database." +HOMEPAGE = "http://wxcode.sourceforge.net/components/wxsqlite3"; +SECTION = "libs" +LICENSE = "wxWindows" +DEPENDS = "sqlite3 wxwidgets" + +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/wxcode/wxsqlite3-${PV}.tar.gz \ + file://gcc-inline.patch;patch=1 \ + file://wxtranslate.patch;patch=1 \ + " + +inherit autotools + +EXTRA_OECONF = "--with-sqlite3-prefix=${STAGING_LIBDIR}" + +do_install() { + oe_runmake 'DESTDIR=${D}' install + newincludedir=${D}/${includedir}/wx-$(wx-config --release) + mkdir "$newincludedir" + mv ${D}/${includedir}/wx "$newincludedir" +} -- 1.6.5.6 _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
