qt-gstreamer/fix-boost-1.48.patch

   1 diff -ur ./src/QGlib/CMakeLists.txt ../RELEASE-0.10.1-FIXED/src/QGlib/CMakeLists.txt
   2 --- ./src/QGlib/CMakeLists.txt  2011-01-23 13:35:19.000000000 +0100
   3 +++ ../RELEASE-0.10.1-FIXED/src/QGlib/CMakeLists.txt    2011-12-21 03:17:38.446929193 +0100
   4 @@ -29,6 +29,10 @@
   5      error.h       Error
   6  )
   7
   8 +set(QtGLib_MOC_HEADERS
   9 +    connect.h
  10 +)
  11 +
  12  file(GLOB QtGLib_CODEGEN_HEADERS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.h")
  13  list(REMOVE_ITEM QtGLib_CODEGEN_HEADERS "connectimpl.h" "emitimpl.h")
  14
  15 @@ -45,7 +49,8 @@
  16  run_codegen("QGlib" "${QtGLib_CODEGEN_INCLUDES}" "${QtGLib_CODEGEN_HEADERS}")
  17
  18  # Build and link QtGLib
  19 -automoc4_add_library(QtGLib ${SHARED_OR_STATIC} ${QtGLib_SRCS})
  20 +qt4_wrap_cpp(QtGLib_MOC_SRCS ${QtGLib_MOC_HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
  21 +add_library(QtGLib ${SHARED_OR_STATIC} ${QtGLib_SRCS} ${QtGLib_MOC_SRCS})
  22  set_target_properties(QtGLib PROPERTIES OUTPUT_NAME QtGLib-${QTGLIB_API_VERSION}
  23                                            SOVERSION ${QTGLIB_SOVERSION}
  24                                              VERSION ${QTGSTREAMER_VERSION})
  25 diff -ur ./src/QGlib/connect.cpp ../RELEASE-0.10.1-FIXED/src/QGlib/connect.cpp
  26 --- ./src/QGlib/connect.cpp     2011-01-23 13:35:19.000000000 +0100
  27 +++ ../RELEASE-0.10.1-FIXED/src/QGlib/connect.cpp       2011-12-21 03:17:51.583595779 +0100
  28 @@ -505,5 +505,3 @@
  29
  30  } //namespace Private
  31  } //namespace QGlib
  32 -
  33 -#include "connect.moc"
  34 diff -ur ./src/QGst/CMakeLists.txt ../RELEASE-0.10.1-FIXED/src/QGst/CMakeLists.txt
  35 --- ./src/QGst/CMakeLists.txt   2011-01-23 13:35:19.000000000 +0100
  36 +++ ../RELEASE-0.10.1-FIXED/src/QGst/CMakeLists.txt     2011-12-21 03:18:11.010262334 +0100
  37 @@ -37,6 +37,10 @@
  38      Ui/videowidget.cpp
  39  )
  40
  41 +set(QtGStreamerUi_MOC_HEADERS
  42 +    Ui/videowidget.h
  43 +)
  44 +
  45  set(QtGStreamerUtils_SRCS
  46      Utils/applicationsink.cpp
  47      Utils/applicationsource.cpp
  48 @@ -126,7 +130,8 @@
  49  target_link_libraries(QtGStreamer LINK_INTERFACE_LIBRARIES ${QTGLIB_LIBRARY})
  50
  51  # Build and link QtGStreamerUi
  52 -automoc4_add_library(QtGStreamerUi ${SHARED_OR_STATIC} ${QtGStreamerUi_SRCS})
  53 +qt4_wrap_cpp(QtGStreamerUi_MOC_SRCS ${QtGStreamerUi_MOC_HEADERS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
  54 +add_library(QtGStreamerUi ${SHARED_OR_STATIC} ${QtGStreamerUi_SRCS} ${QtGStreamerUi_HEADERS})
  55  set_target_properties(QtGStreamerUi PROPERTIES OUTPUT_NAME QtGStreamerUi-${QTGSTREAMER_API_VERSION}
  56                                                   SOVERSION ${QTGSTREAMER_UI_SOVERSION}
  57                                                     VERSION ${QTGSTREAMER_VERSION})