Author: onlyjob Date: 2014-09-15 14:20:53 +0000 (Mon, 15 Sep 2014) New Revision: 18029
Added: trunk/packages/ginkgocadx/trunk/debian/patches/skip-cn-translation.patch Modified: trunk/packages/ginkgocadx/trunk/debian/changelog trunk/packages/ginkgocadx/trunk/debian/patches/fix-wx.patch trunk/packages/ginkgocadx/trunk/debian/patches/series trunk/packages/ginkgocadx/trunk/debian/patches/unbundle-libjsoncpp.patch trunk/packages/ginkgocadx/trunk/debian/patches/wx3.0-compat.patch Log: New upstream release [3.7.0.1465.37] + changelog summary Modified: trunk/packages/ginkgocadx/trunk/debian/changelog =================================================================== --- trunk/packages/ginkgocadx/trunk/debian/changelog 2014-09-15 12:48:10 UTC (rev 18028) +++ trunk/packages/ginkgocadx/trunk/debian/changelog 2014-09-15 14:20:53 UTC (rev 18029) @@ -1,3 +1,10 @@ +ginkgocadx (3.7.0.1465.37+dfsg-1) UNRELEASED; urgency=low + + * New upstream release [June 2014] (Closes: #740703). + * Updated patches; added new "skip-cn-translation.patch". + + -- Dmitry Smirnov <[email protected]> Mon, 15 Sep 2014 22:08:53 +1000 + ginkgocadx (3.6.1.1367.34+dfsg-1) unstable; urgency=medium * New upstream version (adapt patches) Modified: trunk/packages/ginkgocadx/trunk/debian/patches/fix-wx.patch =================================================================== --- trunk/packages/ginkgocadx/trunk/debian/patches/fix-wx.patch 2014-09-15 12:48:10 UTC (rev 18028) +++ trunk/packages/ginkgocadx/trunk/debian/patches/fix-wx.patch 2014-09-15 14:20:53 UTC (rev 18029) @@ -1,18 +1,22 @@ -Last-Update: 2014-06-21 -Forwarded: no +Last-Update: 2014-09-15 +Forwarded: yes Author: Dmitry Smirnov <[email protected]> -Description: fix FTBFS due to missing "-lwx_gtk2u_html-2.8" - /usr/bin/ld: ../cadxcore/libCADxCore.a(aboutdialogbase.cpp.o): undefined reference to symbol 'wxEVT_COMMAND_HTML_LINK_CLICKED@@WXU_2.8' - /usr/lib/x86_64-linux-gnu/libwx_gtk2u_html-2.8.so.0: error adding symbols: DSO missing from command line +Description: fix FTBFS + ~~~~ + /tmp/buildd/ginkgocadx-3.7.0.1465.37+dfsg/src/cadxcore/main/gui/paneltags/paneltagsbase.cpp:21: undefined reference to `wxPropertyGrid::wxPropertyGrid(wxWindow*, int, wxPoint const&, wxSize const&, long, wxString const&)' + collect2: error: ld returned 1 exit status + ginkgocadx/CMakeFiles/ginkgocadx.dir/build.make:147: recipe for target 'ginkgocadx/ginkgocadx' failed + ~~~~ --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -53,7 +53,7 @@ ENDIF() +@@ -53,8 +53,9 @@ IF(NOT USE_CUSTOM_WX) MESSAGE("Using system wxWidgets") --FIND_PACKAGE(wxWidgets 3.0.0 COMPONENTS core base gl net xml aui adv richtext xrc REQUIRED) -+FIND_PACKAGE(wxWidgets 3.0.0 COMPONENTS core base html propgrid gl net xml aui adv richtext xrc REQUIRED) + FIND_PACKAGE(wxWidgets 3.0.0 COMPONENTS core base html gl net xml aui adv richtext xrc REQUIRED) ++FIND_PACKAGE(wxWidgets 3.0.0 COMPONENTS core base html gl net xml aui adv richtext xrc propgrid REQUIRED) ELSE() MESSAGE("Using custom wxWidgets") SET_CUSTOM_wxWidgets_PACKAGE() + ENDIF() Modified: trunk/packages/ginkgocadx/trunk/debian/patches/series =================================================================== --- trunk/packages/ginkgocadx/trunk/debian/patches/series 2014-09-15 12:48:10 UTC (rev 18028) +++ trunk/packages/ginkgocadx/trunk/debian/patches/series 2014-09-15 14:20:53 UTC (rev 18029) @@ -1,3 +1,4 @@ fix-wx.patch +skip-cn-translation.patch unbundle-libjsoncpp.patch wx3.0-compat.patch Added: trunk/packages/ginkgocadx/trunk/debian/patches/skip-cn-translation.patch =================================================================== --- trunk/packages/ginkgocadx/trunk/debian/patches/skip-cn-translation.patch (rev 0) +++ trunk/packages/ginkgocadx/trunk/debian/patches/skip-cn-translation.patch 2014-09-15 14:20:53 UTC (rev 18029) @@ -0,0 +1,39 @@ +Last-Update: 2014-09-15 +Forwarded: yes +Author: Dmitry Smirnov <[email protected]> +Description: fix FTBFS + ~~~~ + CMake Error at cadxcore/cmake_install.cmake:104 (file): + file INSTALL cannot find + "/tmp/buildd/ginkgocadx-3.7.0.1465.37+dfsg/src/cadxcore/lang/cn/cadxcore.mo". + Call Stack (most recent call first): + cmake_install.cmake:37 (include) + + Makefile:69: recipe for target 'install' failed + ~~~~ + +--- a/src/cadxcore/CMakeLists.txt ++++ b/src/cadxcore/CMakeLists.txt +@@ -251,10 +251,8 @@ + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources/files/magnifier_bar DESTINATION share/ginkgocadx/resources/cadxcore) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources/files/menu_icons DESTINATION share/ginkgocadx/resources/cadxcore) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources/files/progress_bar DESTINATION share/ginkgocadx/resources/cadxcore) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources/files/windowlevel_bar DESTINATION share/ginkgocadx/resources/cadxcore) +-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/cn/cadxcore.mo DESTINATION share/ginkgocadx/lang/cn) +-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/cn/wxstd.mo DESTINATION share/ginkgocadx/lang/cn) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/de/cadxcore.mo DESTINATION share/ginkgocadx/lang/de) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/de/wxstd.mo DESTINATION share/ginkgocadx/lang/de) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/el/wxstd.mo DESTINATION share/ginkgocadx/lang/el) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/el/cadxcore.mo DESTINATION share/ginkgocadx/lang/el) +--- a/src/visualizator/CMakeLists.txt ++++ b/src/visualizator/CMakeLists.txt +@@ -128,9 +128,8 @@ + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources/files/logos DESTINATION share/ginkgocadx/resources/visualizator) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources/files/synchronization_bar DESTINATION share/ginkgocadx/resources/visualizator) + INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/resources/files/tool_icons DESTINATION share/ginkgocadx/resources/visualizator) + +-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/cn/visualizator.mo DESTINATION share/ginkgocadx/lang/cn) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/de/visualizator.mo DESTINATION share/ginkgocadx/lang/es) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/de/visualizator.mo DESTINATION share/ginkgocadx/lang/de) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/el/visualizator.mo DESTINATION share/ginkgocadx/lang/el) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/es/visualizator.mo DESTINATION share/ginkgocadx/lang/es) Modified: trunk/packages/ginkgocadx/trunk/debian/patches/unbundle-libjsoncpp.patch =================================================================== --- trunk/packages/ginkgocadx/trunk/debian/patches/unbundle-libjsoncpp.patch 2014-09-15 12:48:10 UTC (rev 18028) +++ trunk/packages/ginkgocadx/trunk/debian/patches/unbundle-libjsoncpp.patch 2014-09-15 14:20:53 UTC (rev 18029) @@ -5,7 +5,8 @@ --- a/src/cadxcore/CMakeLists.txt +++ b/src/cadxcore/CMakeLists.txt -@@ -78,7 +78,6 @@ IF(NOT USE_SYSTEM_SQLITE) +@@ -77,9 +77,8 @@ + IF(NOT USE_SYSTEM_SQLITE) AUX_SOURCE_DIRECTORY(sqlite SRCS) ENDIF() @@ -13,7 +14,9 @@ AUX_SOURCE_DIRECTORY(endpoint SRCS) -@@ -137,13 +136,19 @@ SET(${PROJECT_NAME}_INCLUDE_DIR + AUX_SOURCE_DIRECTORY(vtk SRCS) +@@ -136,15 +135,21 @@ + ${CMAKE_CURRENT_SOURCE_DIR}/wx ${CMAKE_CURRENT_SOURCE_DIR}/wx/VTK ${CMAKE_CURRENT_SOURCE_DIR}/VTKInria3D ${CMAKE_CURRENT_SOURCE_DIR}/VTKInria3D/wxVTK @@ -34,7 +37,9 @@ ADD_DEFINITIONS(${libcurl_defines}) INCLUDE_DIRECTORIES(${libcurl_INCLUDE_DIR}) LINK_DIRECTORIES(${libcurl_DIR}) -@@ -262,6 +267,8 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR + #MESSAGE("LIBCURLLibx = ${libcurl_LIBRARIES} LIBCURL_include = ${libcurl_INCLUDE_DIR} LIBCURL_LINK_DIR= ${libcurl_DIR} LIBCURL_DEFINES=${libcurl_defines}") +@@ -270,8 +275,10 @@ + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/tr/wxstd.mo DESTINATION share/ginkgocadx/lang/tr) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/tr/cadxcore.mo DESTINATION share/ginkgocadx/lang/tr) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/resources/conformance.xml DESTINATION share/ginkgocadx) ################ LIBS ################ @@ -43,3 +48,4 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${libcurl_LIBRARIES}) TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${wxWidgets_LIBRARIES}) + Modified: trunk/packages/ginkgocadx/trunk/debian/patches/wx3.0-compat.patch =================================================================== --- trunk/packages/ginkgocadx/trunk/debian/patches/wx3.0-compat.patch 2014-09-15 12:48:10 UTC (rev 18028) +++ trunk/packages/ginkgocadx/trunk/debian/patches/wx3.0-compat.patch 2014-09-15 14:20:53 UTC (rev 18029) @@ -1,12 +1,20 @@ -Description: Fix to build with wxwidgets3.0 +Last-Update: 2014-06-21 +Forwarded: yes Author: Olly Betts <[email protected]> Bug-Debian: http://bugs.debian.org/749487 -Forwarded: no -Last-Update: 2014-06-21 +Description: Fix to build with wxwidgets3.0 + ~~~~ + /tmp/buildd/ginkgocadx-3.7.0.1465.37+dfsg/src/cadxcore/VTKInria3D/wxVTK/wxVTKRenderWindowInteractor.cpp:153:36: fatal error: wx/gtk/private/win_gtk.h: No such file or directory + #include <wx/gtk/private/win_gtk.h> + ^ + compilation terminated. + cadxcore/CMakeFiles/CADxCore.dir/build.make:8705: recipe for target 'cadxcore/CMakeFiles/CADxCore.dir/VTKInria3D/wxVTK/wxVTKRenderWindowInteractor.cpp.o' failed + ~~~~ ---- ginkgocadx-3.6.1.1367.34+dfsg.orig/src/cadxcore/VTKInria3D/wxVTK/wxVTKRenderWindowInteractor.cpp -+++ ginkgocadx-3.6.1.1367.34+dfsg/src/cadxcore/VTKInria3D/wxVTK/wxVTKRenderWindowInteractor.cpp -@@ -148,7 +148,9 @@ wxWindow* wxGetTopLevelParent(wxWindow * +--- a/src/cadxcore/VTKInria3D/wxVTK/wxVTKRenderWindowInteractor.cpp ++++ b/src/cadxcore/VTKInria3D/wxVTK/wxVTKRenderWindowInteractor.cpp +@@ -147,9 +147,11 @@ + # include <gdk/gdkx.h> // GDK_WINDOW_XWINDOW is found here in wxWidgets 2.8.0 # include "gdk/gdkprivate.h" #if wxCHECK_VERSION(2, 8, 0) #ifdef __WXGTK20__ @@ -17,3 +25,4 @@ #include <gtk/gtk.h> #include <wx/gtk/private/win_gtk.h> #else + #include <wx/gtk/win_gtk.h> _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
