Author: onlyjob Date: 2014-09-20 01:50:50 +0000 (Sat, 20 Sep 2014) New Revision: 18076
Added: trunk/packages/ginkgocadx/trunk/debian/patches/ginkgocadx-wxdebug.patch Modified: trunk/packages/ginkgocadx/trunk/debian/changelog trunk/packages/ginkgocadx/trunk/debian/patches/series trunk/packages/ginkgocadx/trunk/debian/rules Log: wx3.0 run-time compatibility fixes + changelog update: * build with "-DNDEBUG". * "ginkgocadx-wxdebug.patch". Thanks, Olly Betts. Modified: trunk/packages/ginkgocadx/trunk/debian/changelog =================================================================== --- trunk/packages/ginkgocadx/trunk/debian/changelog 2014-09-19 20:00:02 UTC (rev 18075) +++ trunk/packages/ginkgocadx/trunk/debian/changelog 2014-09-20 01:50:50 UTC (rev 18076) @@ -1,9 +1,11 @@ -ginkgocadx (3.7.0.1465.37+dfsg-1) UNRELEASED; urgency=low +ginkgocadx (3.7.0.1465.37+dfsg-1) unstable; urgency=low * New upstream release [June 2014] (Closes: #740703). * Updated patches; added new "skip-cn-translation.patch". + * Fixed wx3.0 compatibility by building with "-DNDEBUG" and + "ginkgocadx-wxdebug.patch". Thanks, Olly Betts. - -- Dmitry Smirnov <[email protected]> Mon, 15 Sep 2014 22:08:53 +1000 + -- Dmitry Smirnov <[email protected]> Sat, 20 Sep 2014 03:45:20 +1000 ginkgocadx (3.6.1.1367.34+dfsg-1) unstable; urgency=medium Added: trunk/packages/ginkgocadx/trunk/debian/patches/ginkgocadx-wxdebug.patch =================================================================== --- trunk/packages/ginkgocadx/trunk/debian/patches/ginkgocadx-wxdebug.patch (rev 0) +++ trunk/packages/ginkgocadx/trunk/debian/patches/ginkgocadx-wxdebug.patch 2014-09-20 01:50:50 UTC (rev 18076) @@ -0,0 +1,29 @@ +Last-Update: 2014-09-20 +Forwarded: yes +Author: Olly Betts <[email protected]> +Description: Fix degfaults with wxwidgets3.0 + "export DEB_CPPFLAGS_MAINT_APPEND=-DNDEBUG" ir required for this patch to work. + + ~~~~ + /usr/include/wx-3.0/wx/strvararg.h(456): assert "(argtype & (wxFormatStringSpecifier<T>::value)) == argtype" failed in wxArgNormalizer(): format specifier doesn't match argument type + Trace/breakpoint trap + ~~~~ + +--- a/src/cadxcore/api/initwx.cpp ++++ b/src/cadxcore/api/initwx.cpp +@@ -218,13 +218,15 @@ + IMPLEMENT_APP_NO_MAIN(Ginkgo) + #if defined(_WIN32) + int WINAPI InitWX(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) + { ++ wxDISABLE_DEBUG_SUPPORT(); + return wxEntry(hInstance, hPrevInstance, lpCmdLine, nCmdShow); + } + #else + int InitWX(int argc, char** argv) + { ++ wxDISABLE_DEBUG_SUPPORT(); + return wxEntry(argc, argv); + } + #endif + Modified: trunk/packages/ginkgocadx/trunk/debian/patches/series =================================================================== --- trunk/packages/ginkgocadx/trunk/debian/patches/series 2014-09-19 20:00:02 UTC (rev 18075) +++ trunk/packages/ginkgocadx/trunk/debian/patches/series 2014-09-20 01:50:50 UTC (rev 18076) @@ -2,3 +2,4 @@ skip-cn-translation.patch unbundle-libjsoncpp.patch wx3.0-compat.patch +ginkgocadx-wxdebug.patch Modified: trunk/packages/ginkgocadx/trunk/debian/rules =================================================================== --- trunk/packages/ginkgocadx/trunk/debian/rules 2014-09-19 20:00:02 UTC (rev 18075) +++ trunk/packages/ginkgocadx/trunk/debian/rules 2014-09-20 01:50:50 UTC (rev 18076) @@ -8,6 +8,10 @@ # minimise needless linking export DEB_LDFLAGS_MAINT_APPEND= -Wl,--as-needed +## Disable wx3.0 WXDEBUG checks, as happened by default in wx2.8. +## (This is necessary to avoid segfaults with wx3.0). +export DEB_CPPFLAGS_MAINT_APPEND=-DNDEBUG + PKD = $(abspath $(dir $(MAKEFILE_LIST))) PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source)) VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{Version:\s*([\d\.]+)}') _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
