diff --git a/jafar-qdisplay/Makefile b/jafar-qdisplay/Makefile index 93a2516662851cf233fa43d8bd1ec4b1c42e800b..d2c80868ae38af268e565d1905a4c3596bfa7a33 100644 --- a/jafar-qdisplay/Makefile +++ b/jafar-qdisplay/Makefile @@ -5,6 +5,7 @@ PKGVERSION= 0.1 DISTNAME= jafar-qdisplay-0.1 PKGNAME= jafar-qdisplay-0.1 +PKGREVISION= 1 CATEGORIES= wip MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=jafar-qdisplay/} MAINTAINER= jafar@laas.fr diff --git a/jafar-qdisplay/distinfo b/jafar-qdisplay/distinfo index 300b371c3d65a5b9d72cf111645df1548f8025e2..6aee6d9c61c2efcb6e65331e408cf97847b10bba 100644 --- a/jafar-qdisplay/distinfo +++ b/jafar-qdisplay/distinfo @@ -1,3 +1,4 @@ SHA1 (jafar-qdisplay-0.1.tar.gz) = b924f46513953a11d4d0aa4eb882cd665ce4bb33 RMD160 (jafar-qdisplay-0.1.tar.gz) = 5cdc3f27b35ed0ea6362c137e8077104d6b089e7 Size (jafar-qdisplay-0.1.tar.gz) = 57884 bytes +SHA1 (patch-aa) = dd18a19d730f50c3f59afc21427154ef1a32430b diff --git a/jafar-qdisplay/patches/patch-aa b/jafar-qdisplay/patches/patch-aa new file mode 100644 index 0000000000000000000000000000000000000000..7dc32329138d6205f4914290ca2b1a7c65eeb8a4 --- /dev/null +++ b/jafar-qdisplay/patches/patch-aa @@ -0,0 +1,53 @@ +Generate correctly with the right MOC and UI the preprocessed files for Qt + +--- CMakeLists.txt.orig 2012-02-01 13:41:45.962204118 +0100 ++++ CMakeLists.txt 2012-02-01 13:47:36.974193113 +0100 +@@ -102,6 +102,48 @@ + set(Qt4_LIBS ${QT_LIBRARIES}) + endif(QT4_FOUND) + ++#------------------------------------------------------------------------------ ++# Regenerate Qt MOC and UI files ++#------------------------------------------------------------------------------ ++ ++include(${QT_USE_FILE}) ++ ++string(TOUPPER "${JAFAR_MODULENAME}_WRAPPED_HEADERS" QTUI_H_SRC) ++string(TOUPPER "${JAFAR_MODULENAME}_WRAPPED_CPPS" QT_MOC_SRCS) ++ ++#generate headers from ui files ++file(GLOB UI_FILES ${jafar-qdisplay_SOURCE_DIR}/src/*.ui) ++# QT4_WRAP_UI(${QTUI_H_SRC} ${UI_FILES}) ++foreach(ui_file ${UI_FILES}) ++ get_filename_component(generated_header ${ui_file} NAME_WE) ++ set(generated_header ${jafar-qdisplay_SOURCE_DIR}/src/${generated_header}.h) ++execute_process( ++ COMMAND ${QT_UIC_EXECUTABLE} ${ui_file} -o ${generated_header} ++ OUTPUT_FILE ${generated_header} ++ INPUT_FILE ${ui_file} ++ ) ++ set(${QTUI_H_SRC} ${${QTUI_H_SRC}} ${generated_header}) ++endforeach(ui_file) ++ ++# generate moc files from headers contining \"Q_OBJECT\" ++file(GLOB HEADERS "${jafar-qdisplay_SOURCE_DIR}/include/qdisplay/*.hpp" "${jafar-qdisplay_SOURCE_DIR}/src/*.hpp") ++foreach(header ${HEADERS}) ++file(STRINGS ${header} Q_OBJECT_STRING REGEX "Q_OBJECT") ++if(NOT("${Q_OBJECT_STRING}" STREQUAL "")) ++ get_filename_component(generated_moc ${header} NAME_WE) ++ set(generated_moc ${jafar-qdisplay_SOURCE_DIR}/src/${generated_moc}.moc) ++ ++ set(MYCPPFLAGS "${CPPFLAGS}") ++ string(STRIP "${MYCPPFLAGS}" MYCPPFLAGS) ++ string(REPLACE " " ";" MYCPPFLAGS "${MYCPPFLAGS}") ++ execute_process( ++ COMMAND ${QT_MOC_EXECUTABLE} ${MYCPPFLAGS} ${header} -o ${generated_moc} ++ ) ++ set(${QT_MOC_SRCS} ${${QT_MOC_SRCS}} ${generated_moc}) ++# QT4_GENERATE_MOC(${header} ${jafar-qdisplay_SOURCE_DIR}/src/${HEADER_NAME}.moc) ++endif(NOT("${Q_OBJECT_STRING}" STREQUAL "")) ++endforeach(header) ++ + #----------------------------------------------------------------------------- + # Check for Boost + #-----------------------------------------------------------------------------