[Pkg-octave-commit] [SCM] qtoctave branch, master, updated. 1dfa0c6d8de06026de751df9134d37eb77a84e7b

[Thomas Weber]

The following commit has been merged in the master branch:
commit 26cf3cb889f597fcdfca07a9412c4f7a6d77df2b
Author: Thomas Weber <tweber at debian.org>
Date:   Sun Jun 6 09:34:50 2010 +0200

    New patch build-widgetserver: include widgetserver in CMake build

diff --git a/debian/changelog b/debian/changelog
index 41193c1..35c2067 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ qtoctave (0.9.1-1) UNRELEASED; urgency=low
   * New patches:
     + generate_qm_files: ensure that l10n files get built
     + install-supplementary-docs: install more docs, mostly for qtoctave-utils
+    + build-widgetserver: widgetserver wasn't included in newer CMake build,
+      this fixes this
 
   [ Thomas Weber ]
   * debian/control: Remove Rafael Laboissiere from Uploaders (Closes: #571914)
diff --git a/debian/patches/build-widgetserver b/debian/patches/build-widgetserver
new file mode 100644
index 0000000..17d92a6
--- /dev/null
+++ b/debian/patches/build-widgetserver
@@ -0,0 +1,98 @@
+From: Jordi Gutiérrez Hermoso <jordigh at gmail.com>
+Subject: widgetserver wasn't included in newer CMake build, this fixes this
+Forwarded: http://lists.alioth.debian.org/pipermail/pkg-octave-devel/2010-June/007430.html
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -38,6 +38,7 @@
+ 
+ add_subdirectory (qtoctave_pkg/src)
+ add_subdirectory (xmlwidget/qt4)
++add_subdirectory (widgetserver)
+ add_subdirectory (easy_plot)
+ add_subdirectory (simple_rcs)
+ add_subdirectory (qtjs)
+--- /dev/null
++++ b/widgetserver/CMakeLists.txt
+@@ -0,0 +1,11 @@
++add_subdirectory(widgetserver)
++
++install(
++  DIRECTORY doc
++  DESTINATION share/doc/qtoctave-utils/widgetserver
++)
++
++install(
++  FILES "leeme.txt" "readme.txt"
++  DESTINATION share/doc/qtoctave-utils/widgetserver
++)
+--- /dev/null
++++ b/widgetserver/widgetserver/CMakeLists.txt
+@@ -0,0 +1,48 @@
++FIND_PACKAGE(Qt4 REQUIRED)
++
++MESSAGE (STATUS "Use file: ${QT_USE_FILE}")
++
++SET(QT_USE_QTXML 1)
++
++include(UseQt4)
++
++include_directories(${QT_INCLUDE_DIR})
++include_directories(${QT_QT_INCLUDE_DIR})
++include_directories(${QT_QTCORE_INCLUDE_DIR})
++include_directories(${QT_QTGUI_INCLUDE_DIR})
++include_directories(${QT_QTXML_INCLUDE_DIR})
++include_directories(${CMAKE_CURRENT_BINARY_DIR})
++include_directories(${QT_QTSCRIPT_INCLUDE_DIR})
++include_directories(${QT_QTUITOOLS_INCLUDE_DIR})
++
++FILE(GLOB widgetserver_moc_headers *.h  )
++FILE(GLOB widgetserver_sources *.cpp )
++
++# run moc on these files:
++QT4_WRAP_CPP( widgetserver_moc_sources ${widgetserver_moc_headers} )
++
++add_executable(widgetserver
++       ${widgetserver_sources}  ${widgetserver_moc_sources} ${widgetserver_moc_headers}
++)
++
++SET_TARGET_PROPERTIES(widgetserver
++       PROPERTIES INSTALL_RPATH ":usr/lib"
++       BUILD_WITH_INSTALL_RPATH true
++       INSTALL_RPATH_USE_LINK_PATH true
++)
++
++TARGET_LINK_LIBRARIES(widgetserver
++       ${Qt4_LIBRARIES}
++       ${QT_QTCORE_LIBRARY}
++       ${QT_QTGUI_LIBRARY}
++       ${QT_QTXML_LIBRARY}
++       ${QT_QTSCRIPT_LIBRARY}
++       ${QT_QTUITOOLS_LIBRARY}
++)
++
++
++install (
++       TARGETS widgetserver
++       RUNTIME DESTINATION bin
++       )
++
+--- a/widgetserver/widgetserver/input.h
++++ b/widgetserver/widgetserver/input.h
+@@ -4,6 +4,7 @@
+ #include <QThread>
+ #include "process.h"
+ #include "buffer.h"
++#include <cstdio>
+ 
+ class Input:public QThread
+ {
+--- a/widgetserver/widgetserver/process.h
++++ b/widgetserver/widgetserver/process.h
+@@ -5,6 +5,7 @@
+ #include <QMap>
+ #include <QWidget>
+ #include <QBuffer>
++#include <cstdio>
+ 
+ 
+ class Widget: public QObject
diff --git a/debian/patches/series b/debian/patches/series
index e5fc328..8637f16 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ use_octave_htmldoc
 build-out-of-source
 generate_qm_files
 install-supplementary-docs
+build-widgetserver

-- 
qtoctave