medit-full/bindings2.diff

   1 diff -ru medit-0.10.5.orig/cmake/modules/FindMooPython.cmake medit-0.10.5/cmake/modules/FindMooPython.cmake
   2 --- medit-0.10.5.orig/cmake/modules/FindMooPython.cmake 2010-12-06 01:50:43.000000000 -0500
   3 +++ medit-0.10.5/cmake/modules/FindMooPython.cmake      2010-12-06 01:50:53.000000000 -0500
   4 @@ -1,9 +1,10 @@
   5  MOO_OPTION(MOO_ENABLE_PYTHON TRUE "Enable Python" HEADER TRUE)
   6
   7 -SET(PYTHON_DEV_FOUND FALSE)
   8 +SET(PYTHON_DEV_FOUND TRUE)
   9
  10  MACRO(MOO_GET_PYTHON_SYSCONFIG_VAR var value error)
  11    SET(${error} FALSE)
  12 +  SET(${value} "/usr/include/python2.7")
  13    EXECUTE_PROCESS(COMMAND "${PYTHON_EXECUTABLE}" -c "import distutils.sysconfig; print distutils.sysconfig.get_config_vars('${var}')[0]"
  14                    RESULT_VARIABLE _moo_gpsv_result
  15                    OUTPUT_VARIABLE _moo_gpsv_output
  16 @@ -12,30 +13,21 @@
  17    IF(_moo_gpsv_result EQUAL 0)
  18      SET(${value} "${_moo_gpsv_output}")
  19    ELSE(_moo_gpsv_result EQUAL 0)
  20 -    SET(${error} TRUE)
  21 +    SET(${error} FALSE)
  22    ENDIF(_moo_gpsv_result EQUAL 0)
  23  ENDMACRO(MOO_GET_PYTHON_SYSCONFIG_VAR)
  24
  25 -IF(MOO_ENABLE_PYTHON)
  26 -  PKG_CHECK_MODULES(PYGTK pygtk-2.0)
  27 -  IF(PYGTK_FOUND)
  28 -    _MOO_GET_PKG_CONFIG_VARIABLE(PYGTK_DEFS_DIR defsdir pygtk-2.0)
  29 -    _MOO_GET_PKG_CONFIG_VARIABLE(PYGTK_CODEGEN_DIR codegendir pygtk-2.0)
  30 -    MOO_GET_PYTHON_SYSCONFIG_VAR("INCLUDEPY" _moo_fp_includepy _moo_fp_error)
  31 -    IF(NOT _moo_fp_error)
  32 -      MOO_GET_PYTHON_SYSCONFIG_VAR("VERSION" _moo_fp_pyversion _moo_fp_error)
  33 -    ENDIF(NOT _moo_fp_error)
  34 -    IF(NOT _moo_fp_error AND WIN32)
  35 -      MOO_GET_PYTHON_SYSCONFIG_VAR("prefix" _moo_fp_pyprefix _moo_fp_error)
  36 -    ENDIF(NOT _moo_fp_error AND WIN32)
  37 -    IF(NOT _moo_fp_error)
  38 -      SET(PYTHON_LIBRARIES "python${_moo_fp_pyversion}")
  39 -      FILE(TO_CMAKE_PATH "${_moo_fp_includepy}" PYTHON_INCLUDE_DIRS)
  40 -      FILE(TO_CMAKE_PATH "${_moo_fp_pyprefix}/libs" PYTHON_LIBRARY_DIRS)
  41 -      SET(PYTHON_DEV_FOUND TRUE)
  42 -    ENDIF(NOT _moo_fp_error)
  43 -  ENDIF(PYGTK_FOUND)
  44 -ENDIF(MOO_ENABLE_PYTHON)
  45 +PKG_CHECK_MODULES(PYGTK pygtk-2.0)
  46 +IF(PYGTK_FOUND)
  47 +  _MOO_GET_PKG_CONFIG_VARIABLE(PYGTK_DEFS_DIR defsdir pygtk-2.0)
  48 +  _MOO_GET_PKG_CONFIG_VARIABLE(PYGTK_CODEGEN_DIR codegendir pygtk-2.0)
  49 +  MOO_GET_PYTHON_SYSCONFIG_VAR("INCLUDEPY" _moo_fp_includepy _moo_fp_error)
  50 +  MOO_GET_PYTHON_SYSCONFIG_VAR("VERSION" _moo_fp_pyversion _moo_fp_error)
  51 +  SET(PYTHON_LIBRARIES "python2.7")
  52 +  FILE(TO_CMAKE_PATH "${_moo_fp_includepy}" PYTHON_INCLUDE_DIRS)
  53 +  FILE(TO_CMAKE_PATH "${_moo_fp_pyprefix}/libs" PYTHON_LIBRARY_DIRS)
  54 +  SET(PYTHON_DEV_FOUND TRUE)
  55 +ENDIF(PYGTK_FOUND)
  56
  57  MOO_DEBUG(STATUS "PYTHON_DEV_FOUND = ${PYTHON_DEV_FOUND}")
  58
  59 diff -ru medit-0.10.5.orig/cmake/moo-libs.cmake medit-0.10.5/cmake/moo-libs.cmake
  60 --- medit-0.10.5.orig/cmake/moo-libs.cmake      2010-12-06 01:50:43.000000000 -0500
  61 +++ medit-0.10.5/cmake/moo-libs.cmake   2010-12-06 01:56:55.000000000 -0500
  62 @@ -48,7 +48,7 @@
  63  #
  64  # ENDMACRO(MOO_ADD_SOURCE_FILE_SET)
  65
  66 -MACRO(MOO_ADD_LIBRARY libname)
  67 +MACRO(MOO_ADD_STATIC_LIBRARY libname)
  68    STRING(TOUPPER ${libname} _mal_mod)
  69    GET_DIRECTORY_PROPERTY(_mal_stamps MOO_STAMPS)
  70    GET_DIRECTORY_PROPERTY(_mal_built_sources MOO_BUILT_SOURCES)
  71 @@ -60,10 +60,17 @@
  72  #     ENDIF("${_moo_source_file}" MATCHES ".*[.]c$")
  73  #   ENDFOREACH(_moo_source_file)
  74    ADD_LIBRARY(${libname} STATIC ${ARGN} ${${_mal_mod}_SOURCES} ${_mal_stamps} ${_mal_built_sources})
  75 -ENDMACRO(MOO_ADD_LIBRARY)
  76 +ENDMACRO(MOO_ADD_STATIC_LIBRARY)
  77 +
  78 +MACRO(MOO_ADD_SHARED_LIBRARY libname)
  79 +  STRING(TOUPPER ${libname} _mal_mod)
  80 +  GET_DIRECTORY_PROPERTY(_mal_stamps MOO_STAMPS)
  81 +  GET_DIRECTORY_PROPERTY(_mal_built_sources MOO_BUILT_SOURCES)
  82 +  ADD_LIBRARY(${libname} SHARED ${ARGN} ${${_mal_mod}_SOURCES} ${_mal_stamps} ${_mal_built_sources})
  83 +ENDMACRO(MOO_ADD_SHARED_LIBRARY)
  84
  85  MACRO(MOO_ADD_MOO_CODE_MODULE)
  86 -  MOO_ADD_LIBRARY(${ARGN})
  87 +  MOO_ADD_SHARED_LIBRARY(${ARGN})
  88    INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
  89  ENDMACRO(MOO_ADD_MOO_CODE_MODULE)
  90
  91 diff -ru medit-0.10.5.orig/medit/CMakeLists.txt medit-0.10.5/medit/CMakeLists.txt
  92 --- medit-0.10.5.orig/medit/CMakeLists.txt      2010-12-06 01:50:43.000000000 -0500
  93 +++ medit-0.10.5/medit/CMakeLists.txt   2010-12-06 02:06:20.000000000 -0500
  94 @@ -6,29 +6,51 @@
  95    ADD_DEFINITIONS(-DSRCDIR="${CMAKE_SOURCE_DIR}/medit")
  96  ENDIF(MOO_ENABLE_UNIT_TESTS)
  97
  98 -IF(MOO_ENABLE_PYTHON)
  99 -  SET(moopythonlib moopython)
 100 -ENDIF(MOO_ENABLE_PYTHON)
 101 -
 102  SET(MEDIT_SOURCES mem-debug.h run-tests.h parse.h main.c)
 103 -SET(medit_libs
 104 +
 105 +SET(MOOMOD_SOURCES
 106 +  ../plugins/moopython/moo-mod.c
 107 +  ../plugins/moopython/moopython-api.h
 108 +  ../plugins/moopython/moopython-utils.h
 109 +  ../plugins/moopython/moopython-utils.c
 110 +  ../plugins/moopython/moopython-loader.h
 111 +  ../plugins/moopython/moopython-loader.c
 112 +  ../plugins/moopython/pygtk/mooapp-mod.c
 113 +  ../plugins/moopython/pygtk/mooedit-mod.c
 114 +  ../plugins/moopython/pygtk/mooutils-mod.c
 115 +  ../plugins/moopython/pygtk/mooapp-pygtk.c
 116 +  ../plugins/moopython/pygtk/mooedit-pygtk.c
 117 +  ../plugins/moopython/pygtk/mooutils-pygtk.c
 118 +  ../plugins/moopython/pygtk/moo-pygtk.c
 119 +  ../plugins/moopython/pygtk/moo-pygtk.h
 120 +)
 121 +
 122 +SET(medit_plugins
 123    meditplugins
 124 -  ${moopythonlib}
 125 +  moopython
 126 +)
 127 +
 128 +SET(medit_libs
 129    moousertools
 130    mooapp
 131 -  smclient
 132 +  moosmclient
 133    mooedit
 134 -  gtksourceview
 135 +  moogtksourceview
 136    moofileview
 137    moolua
 138    mooutils
 139 -  xdgmime
 140 +  mooxdgmime
 141    moo
 142  )
 143
 144  MOO_WIN32_RESOURCE(medit.rc.in medit MEDIT_SOURCES medit_libs)
 145
 146 -INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
 147 +INCLUDE_DIRECTORIES(
 148 +  ${CMAKE_SOURCE_DIR}
 149 +  ${PYTHON_INCLUDE_DIRS}
 150 +  ${PYGTK_INCLUDE_DIRS}
 151 +  ${MOO_SOURCE_DIR}/plugins
 152 +)
 153
 154  IF(MOO_OS_LINUX)
 155    LIST(APPEND MOO_DEP_LIBS m dl)
 156 @@ -39,12 +61,13 @@
 157  ENDIF(NOT MOO_ENABLE_UNIT_TESTS)
 158
 159  ADD_EXECUTABLE(medit ${MEDIT_WIN32} ${MEDIT_SOURCES})
 160 -TARGET_LINK_LIBRARIES(medit ${medit_libs} ${MOO_DEP_LIBS})
 161 +ADD_LIBRARY(moomod SHARED ${MOOMOD_SOURCES})
 162 +TARGET_LINK_LIBRARIES(medit ${medit_plugins} ${medit_libs} ${MOO_DEP_LIBS})
 163 +TARGET_LINK_LIBRARIES(moomod ${medit_libs} ${MOO_DEP_LIBS})
 164  INSTALL(TARGETS medit DESTINATION ${BINDIR})
 165 +INSTALL(TARGETS moomod DESTINATION ${LIBDIR}/python2.7/site-packages)
 166
 167 -IF(MOO_ENABLE_PYTHON)
 168 -  ADD_DEPENDENCIES(medit python-plugins-ini)
 169 -ENDIF(MOO_ENABLE_PYTHON)
 170 +ADD_DEPENDENCIES(medit python-plugins-ini)
 171
 172  FIND_PACKAGE(MooDesktopFile)
 173  MOO_INSTALL_DESKTOP_FILE(medit.desktop.in)
 174 Only in medit-0.10.5/medit: CMakeLists.txt.orig
 175 Only in medit-0.10.5/medit: CMakeLists.txt.rej
 176 diff -ru medit-0.10.5.orig/moo/CMakeLists.txt medit-0.10.5/moo/CMakeLists.txt
 177 --- medit-0.10.5.orig/moo/CMakeLists.txt        2010-12-06 01:50:42.000000000 -0500
 178 +++ medit-0.10.5/moo/CMakeLists.txt     2010-12-06 01:50:53.000000000 -0500
 179 @@ -41,4 +41,5 @@
 180    LIST(APPEND MOO_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/moo.def)
 181  ENDIF(MSVC)
 182
 183 -MOO_ADD_LIBRARY(moo)
 184 +MOO_ADD_SHARED_LIBRARY(moo)
 185 +INSTALL(TARGETS moo DESTINATION ${LIBDIR})
 186 \ No newline at end of file
 187 diff -ru medit-0.10.5.orig/moo/mooapp/CMakeLists.txt medit-0.10.5/moo/mooapp/CMakeLists.txt
 188 --- medit-0.10.5.orig/moo/mooapp/CMakeLists.txt 2010-12-06 01:50:42.000000000 -0500
 189 +++ medit-0.10.5/moo/mooapp/CMakeLists.txt      2010-12-06 01:50:53.000000000 -0500
 190 @@ -27,5 +27,5 @@
 191  )
 192
 193  MOO_ADD_MOO_CODE_MODULE(mooapp)
 194 -
 195 +INSTALL(TARGETS mooapp DESTINATION ${LIBDIR})
 196  ADD_SUBDIRECTORY(smclient)
 197 diff -ru medit-0.10.5.orig/moo/mooapp/smclient/CMakeLists.txt medit-0.10.5/moo/mooapp/smclient/CMakeLists.txt
 198 --- medit-0.10.5.orig/moo/mooapp/smclient/CMakeLists.txt        2010-12-06 01:50:42.000000000 -0500
 199 +++ medit-0.10.5/moo/mooapp/smclient/CMakeLists.txt     2010-12-06 01:50:53.000000000 -0500
 200 @@ -1,4 +1,4 @@
 201 -SET(SMCLIENT_SOURCES
 202 +SET(MOOSMCLIENT_SOURCES
 203    eggsmclient.c
 204    eggsmclient.h
 205    eggsmclient-mangle.h
 206 @@ -6,14 +6,14 @@
 207  )
 208
 209  IF(WIN32)
 210 -  LIST(APPEND SMCLIENT_SOURCES eggsmclient-win32.c)
 211 +  LIST(APPEND MOOSMCLIENT_SOURCES eggsmclient-win32.c)
 212  ELSEIF(APPLE)
 213 -  LIST(APPEND SMCLIENT_SOURCES eggsmclient-dummy.c)
 214 +  LIST(APPEND MOOSMCLIENT_SOURCES eggsmclient-dummy.c)
 215  ELSE(WIN32)
 216    MOO_ADD_COMPILE_DEFINITIONS(-DEGG_SM_CLIENT_BACKEND_XSMP)
 217 -  LIST(APPEND SMCLIENT_SOURCES eggsmclient-xsmp.c eggdesktopfile.h eggdesktopfile.c)
 218 +  LIST(APPEND MOOSMCLIENT_SOURCES eggsmclient-xsmp.c eggdesktopfile.h eggdesktopfile.c)
 219  ENDIF(WIN32)
 220
 221 -MOO_ADD_MOO_CODE_MODULE(smclient)
 222 -
 223 +MOO_ADD_MOO_CODE_MODULE(moosmclient)
 224 +INSTALL(TARGETS moosmclient DESTINATION ${LIBDIR})
 225  # -%- strip:true -%-
 226 diff -ru medit-0.10.5.orig/moo/mooedit/CMakeLists.txt medit-0.10.5/moo/mooedit/CMakeLists.txt
 227 --- medit-0.10.5.orig/moo/mooedit/CMakeLists.txt        2010-12-06 01:50:42.000000000 -0500
 228 +++ medit-0.10.5/moo/mooedit/CMakeLists.txt     2010-12-06 01:50:53.000000000 -0500
 229 @@ -124,6 +124,6 @@
 230  ADD_SUBDIRECTORY(langs)
 231
 232  MOO_ADD_MOO_CODE_MODULE(mooedit)
 233 -ADD_DEPENDENCIES(mooedit gtksourceview)
 234 -
 235 +ADD_DEPENDENCIES(mooedit moogtksourceview)
 236 +INSTALL(TARGETS mooedit DESTINATION ${LIBDIR})
 237  # -%- strip:true -%-
 238 diff -ru medit-0.10.5.orig/moo/mooedit/gtksourceview/CMakeLists.txt medit-0.10.5/moo/mooedit/gtksourceview/CMakeLists.txt
 239 --- medit-0.10.5.orig/moo/mooedit/gtksourceview/CMakeLists.txt  2010-12-06 01:50:42.000000000 -0500
 240 +++ medit-0.10.5/moo/mooedit/gtksourceview/CMakeLists.txt       2010-12-06 01:50:53.000000000 -0500
 241 @@ -37,12 +37,12 @@
 242
 243  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 244
 245 -SET(GTKSOURCEVIEW_SOURCES
 246 +SET(MOOGTKSOURCEVIEW_SOURCES
 247    gtksourceview-i18n.h
 248    gtksourceview-marshal.h
 249    gtksourceview-api.h
 250  )
 251
 252 -MOO_ADD_MOO_CODE_MODULE(gtksourceview)
 253 -
 254 +MOO_ADD_MOO_CODE_MODULE(moogtksourceview)
 255 +INSTALL(TARGETS moogtksourceview DESTINATION ${LIBDIR})
 256  # -%- strip:true -%-
 257 diff -ru medit-0.10.5.orig/moo/moofileview/CMakeLists.txt medit-0.10.5/moo/moofileview/CMakeLists.txt
 258 --- medit-0.10.5.orig/moo/moofileview/CMakeLists.txt    2010-12-06 01:50:43.000000000 -0500
 259 +++ medit-0.10.5/moo/moofileview/CMakeLists.txt 2010-12-06 01:50:53.000000000 -0500
 260 @@ -42,5 +42,5 @@
 261  MOO_GEN_UIXML(moofileview.xml)
 262
 263  MOO_ADD_MOO_CODE_MODULE(moofileview)
 264 -
 265 +INSTALL(TARGETS moofileview DESTINATION ${LIBDIR})
 266  # -%- strip:true -%-
 267 diff -ru medit-0.10.5.orig/moo/moolua/CMakeLists.txt medit-0.10.5/moo/moolua/CMakeLists.txt
 268 --- medit-0.10.5.orig/moo/moolua/CMakeLists.txt 2010-12-06 01:50:42.000000000 -0500
 269 +++ medit-0.10.5/moo/moolua/CMakeLists.txt      2010-12-06 01:50:53.000000000 -0500
 270 @@ -16,5 +16,5 @@
 271  )
 272
 273  MOO_ADD_MOO_CODE_MODULE(moolua)
 274 -
 275 +INSTALL(TARGETS moolua DESTINATION ${LIBDIR})
 276  # -%- strip:true -%-
 277 diff -ru medit-0.10.5.orig/moo/mooutils/CMakeLists.txt medit-0.10.5/moo/mooutils/CMakeLists.txt
 278 --- medit-0.10.5.orig/moo/mooutils/CMakeLists.txt       2010-12-06 01:50:42.000000000 -0500
 279 +++ medit-0.10.5/moo/mooutils/CMakeLists.txt    2010-12-06 01:50:53.000000000 -0500
 280 @@ -209,7 +209,7 @@
 281  )
 282
 283  MOO_ADD_MOO_CODE_MODULE(mooutils)
 284 -
 285 +INSTALL(TARGETS mooutils DESTINATION ${LIBDIR})
 286  ADD_SUBDIRECTORY(xdgmime)
 287
 288  # -%- strip:true -%-
 289 diff -ru medit-0.10.5.orig/moo/mooutils/xdgmime/CMakeLists.txt medit-0.10.5/moo/mooutils/xdgmime/CMakeLists.txt
 290 --- medit-0.10.5.orig/moo/mooutils/xdgmime/CMakeLists.txt       2010-12-06 01:50:42.000000000 -0500
 291 +++ medit-0.10.5/moo/mooutils/xdgmime/CMakeLists.txt    2010-12-06 01:50:53.000000000 -0500
 292 @@ -1,4 +1,4 @@
 293 -SET(XDGMIME_SOURCES
 294 +SET(MOOXDGMIME_SOURCES
 295    xdgmimealias.c
 296    xdgmimealias.h
 297    xdgmime.c
 298 @@ -16,6 +16,6 @@
 299    xdgmimeparent.h
 300  )
 301
 302 -MOO_ADD_MOO_CODE_MODULE(xdgmime)
 303 -
 304 +MOO_ADD_MOO_CODE_MODULE(mooxdgmime)
 305 +INSTALL(TARGETS mooxdgmime DESTINATION ${LIBDIR})
 306  # -%- strip:true -%-
 307 diff -ru medit-0.10.5.orig/plugins/CMakeLists.txt medit-0.10.5/plugins/CMakeLists.txt
 308 --- medit-0.10.5.orig/plugins/CMakeLists.txt    2010-12-06 01:50:43.000000000 -0500
 309 +++ medit-0.10.5/plugins/CMakeLists.txt 2010-12-06 01:50:53.000000000 -0500
 310 @@ -64,10 +64,8 @@
 311    glade/moogrep.glade
 312  )
 313
 314 -MOO_ADD_LIBRARY(meditplugins)
 315 +MOO_ADD_STATIC_LIBRARY(meditplugins)
 316
 317 -IF(MOO_ENABLE_PYTHON)
 318 -  ADD_SUBDIRECTORY(moopython)
 319 -ENDIF(MOO_ENABLE_PYTHON)
 320 +ADD_SUBDIRECTORY(moopython)
 321
 322  # -%- strip:true -%-
 323 diff -ru medit-0.10.5.orig/plugins/moopython/CMakeLists.txt medit-0.10.5/plugins/moopython/CMakeLists.txt
 324 --- medit-0.10.5.orig/plugins/moopython/CMakeLists.txt  2010-12-06 01:50:43.000000000 -0500
 325 +++ medit-0.10.5/plugins/moopython/CMakeLists.txt       2010-12-06 01:50:53.000000000 -0500
 326 @@ -161,6 +161,6 @@
 327  #      $(PYGTK_CFLAGS)
 328
 329  INCLUDE_DIRECTORIES(${MOO_SOURCE_DIR})
 330 -MOO_ADD_LIBRARY(moopython ${MOOPYTHON_SOURCES} ${MOOPYGTK_SOURCES})
 331 +MOO_ADD_STATIC_LIBRARY(moopython ${MOOPYTHON_SOURCES} ${MOOPYGTK_SOURCES})
 332
 333  # -%- strip:true, indent-width:2 -%-
 334 diff -ru medit-0.10.5.orig/plugins/usertools/CMakeLists.txt medit-0.10.5/plugins/usertools/CMakeLists.txt
 335 --- medit-0.10.5.orig/plugins/usertools/CMakeLists.txt  2010-12-06 01:50:43.000000000 -0500
 336 +++ medit-0.10.5/plugins/usertools/CMakeLists.txt       2010-12-06 01:50:53.000000000 -0500
 337 @@ -43,5 +43,5 @@
 338  MOO_GEN_ENUMS(moousertools)
 339
 340  MOO_ADD_MOO_CODE_MODULE(moousertools)
 341 -
 342 +INSTALL(TARGETS moousertools DESTINATION ${LIBDIR})
 343  # -%- strip:true -%-