1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300
|
Description: Upstream changes introduced in version 4.5~~svn1145508-1
This patch has been created by dpkg-source during the package build.
Here's the last changelog entry, hopefully it gives details on why
those changes were made:
.
qt4-perl (4.5~~svn1145508-1) unstable; urgency=low
.
* Initial release
.
The person named in the Author field signed this changelog entry.
Author: Sune Vuorela <sune@debian.org>
---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:
Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>
--- qt4-perl-4.5~~svn1145508.orig/CMakeLists.txt
+++ qt4-perl-4.5~~svn1145508/CMakeLists.txt
@@ -1,13 +1,22 @@
project(Perl)
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules )
+
+include(MacroOptionalAddBindings)
+
+
find_package(Perl)
find_package(PerlLibs)
+find_package(Qt4)
+
if (NOT PERL_FOUND OR NOT PERL_LIBRARY)
return()
endif (NOT PERL_FOUND OR NOT PERL_LIBRARY)
-add_definitions(-DDEBUG)
+#add_definitions(-DDEBUG)
+
+include_directories(${OT4_INCLUDE_DIRS})
include (FindPerlMore)
set(CUSTOM_PERL_SITE_ARCH_DIR ${PERL_SITE_ARCH_DIR} CACHE DIR "Custom installation directory for perl binary extension")
@@ -19,9 +28,9 @@ macro_optional_add_bindings(QT_QTTEST_FO
macro_optional_add_bindings(QT_QTXML_FOUND "QtXml" qtxml)
macro_optional_add_bindings(QT_QTNETWORK_FOUND "QtNetwork" qtnetwork)
-macro_optional_add_bindings(KDE4_FOUND "KDECore" kdecore)
-macro_optional_add_bindings(KDE4_FOUND "KDEUi" kdeui)
-macro_optional_add_bindings(KDE4_FOUND "KIO" kio)
-macro_optional_add_bindings(KDE4_FOUND "Plasma" plasma)
+#macro_optional_add_bindings(KDE4_FOUND "KDECore" kdecore)
+#macro_optional_add_bindings(KDE4_FOUND "KDEUi" kdeui)
+#macro_optional_add_bindings(KDE4_FOUND "KIO" kio)
+#macro_optional_add_bindings(KDE4_FOUND "Plasma" plasma)
macro_display_bindings_log()
--- qt4-perl-4.5~~svn1145508.orig/qtxml/src/CMakeLists.txt
+++ qt4-perl-4.5~~svn1145508/qtxml/src/CMakeLists.txt
@@ -1,12 +1,12 @@
include_directories(
${CMAKE_SOURCE_DIR}/smoke
- ${CMAKE_SOURCE_DIR}/perl/qtcore/src
+ ${CMAKE_SOURCE_DIR}/qtcore/src
${PERL_INCLUDE_PATH}
${QT_INCLUDES} )
# Run doxsubpp.pl to run xsubpp on QtXml4.xs
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/QtXml4.c
- COMMAND ${PERL_EXECUTABLE} ARGS ${CMAKE_SOURCE_DIR}/perl/qtcore/src/doxsubpp.pl ${PERL_EXECUTABLE} QtXml4.xs ${CMAKE_CURRENT_BINARY_DIR}/QtXml4.c
+ COMMAND ${PERL_EXECUTABLE} ARGS ${CMAKE_SOURCE_DIR}//qtcore/src/doxsubpp.pl ${PERL_EXECUTABLE} QtXml4.xs ${CMAKE_CURRENT_BINARY_DIR}/QtXml4.c
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/QtXml4.xs
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
--- qt4-perl-4.5~~svn1145508.orig/qtgui/src/CMakeLists.txt
+++ qt4-perl-4.5~~svn1145508/qtgui/src/CMakeLists.txt
@@ -1,12 +1,17 @@
+
+
+
+
+
include_directories(
${CMAKE_SOURCE_DIR}/smoke
- ${CMAKE_SOURCE_DIR}/perl/qtcore/src
+ ${CMAKE_SOURCE_DIR}/qtcore/src
${PERL_INCLUDE_PATH}
${QT_INCLUDES} )
# Run doxsubpp.pl to run xsubpp on QtGui4.xs
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/QtGui4.c
- COMMAND ${PERL_EXECUTABLE} ARGS ${CMAKE_SOURCE_DIR}/perl/qtcore/src/doxsubpp.pl ${PERL_EXECUTABLE} QtGui4.xs ${CMAKE_CURRENT_BINARY_DIR}/QtGui4.c
+ COMMAND ${PERL_EXECUTABLE} ARGS ${CMAKE_SOURCE_DIR}/qtcore/src/doxsubpp.pl ${PERL_EXECUTABLE} QtGui4.xs ${CMAKE_CURRENT_BINARY_DIR}/QtGui4.c
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/QtGui4.xs
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
--- qt4-perl-4.5~~svn1145508.orig/qttest/CMakeLists.txt
+++ qt4-perl-4.5~~svn1145508/qttest/CMakeLists.txt
@@ -3,13 +3,15 @@ include_directories( ${QT_INCLUDES} )
# Run doxsubpp.pl to run xsubpp on QtTest4.xs
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/QtTest4.c
- COMMAND ${PERL_EXECUTABLE} ARGS ${CMAKE_SOURCE_DIR}/perl/qtcore/src/doxsubpp.pl ${PERL_EXECUTABLE} QtTest4.xs ${CMAKE_CURRENT_BINARY_DIR}/QtTest4.c
+ COMMAND ${PERL_EXECUTABLE} ARGS ${CMAKE_SOURCE_DIR}/qtcore/src/doxsubpp.pl ${PERL_EXECUTABLE} QtTest4.xs ${CMAKE_CURRENT_BINARY_DIR}/QtTest4.c
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/QtTest4.xs
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
# Make sure we build Qt4.c as c++ code
set(CMAKE_C_COMPILER ${CMAKE_CXX_COMPILER})
+include_directories(${CMAKE_SOURCE_DIR}/qtcore/src)
+
set(CMAKE_C_FLAGS ${PERL_CXX_FLAGS})
set(perlqttest4_LIBRARY_SRC ${CMAKE_CURRENT_BINARY_DIR}/QtTest4.c qttest4handlers.cpp)
--- /dev/null
+++ qt4-perl-4.5~~svn1145508/cmake/modules/MacroOptionalAddBindings.cmake
@@ -0,0 +1,47 @@
+# Copyright (c) 2010 Maciej Mrozowski <reavertm@gmail.com>
+#
+# Redistribution and use is allowed according to the terms of the GPL license.
+
+# Conditionally enable bindings.
+# Pass -DDISABLE_<component_name>=ON to disable certain binding even if its dependencies are found.
+# CMake project needs to be set before using this macro.
+# Macro sets following variables:
+# ${CMAKE_PROJECT_NAME}_ENABLED - list of enabled bindings
+# ${CMAKE_PROJECT_NAME}_DISABLED - list of disabled bindings
+# Usage:
+# macro_optional_add_bindings(<component_found> <component_name> <subdir1> [<subdir2> ...])
+#
+# Example:
+# project(SMOKE)
+# [...]
+# macro_optional_add_bindings(NEPOMUK_FOUND "Nepomuk" nepomuk nepomukquery)
+# [...]
+# macro_display_bindings_log()
+macro(MACRO_OPTIONAL_ADD_BINDINGS _component_found _component_name)
+ get_property(_PREFIX VARIABLE PROPERTY PROJECT_NAME)
+ if(${_component_found} AND NOT DISABLE_${_component_name})
+ foreach(_subdir ${ARGN})
+ add_subdirectory(${_subdir})
+ endforeach(_subdir ${ARGN})
+ list(APPEND ${_PREFIX}_ENABLED ${_component_name})
+ else(${_component_found} AND NOT DISABLE_${_component_name})
+ list(APPEND ${_PREFIX}_DISABLED ${_component_name})
+ endif(${_component_found} AND NOT DISABLE_${_component_name})
+ unset(_PREFIX)
+endmacro(MACRO_OPTIONAL_ADD_BINDINGS)
+
+# Show bindings summary
+# Usage:
+# macro_display_bindings_log()
+macro(MACRO_DISPLAY_BINDINGS_LOG)
+ get_property(_PREFIX VARIABLE PROPERTY PROJECT_NAME)
+ if (${_PREFIX}_ENABLED)
+ list(SORT ${_PREFIX}_ENABLED)
+ endif (${_PREFIX}_ENABLED)
+ if (${_PREFIX}_DISABLED)
+ list(SORT ${_PREFIX}_DISABLED)
+ endif (${_PREFIX}_DISABLED)
+ message(STATUS "Build ${_PREFIX} bindings: ${${_PREFIX}_ENABLED}")
+ message(STATUS "Skip ${_PREFIX} bindings: ${${_PREFIX}_DISABLED}")
+ unset(_PREFIX)
+endmacro(MACRO_DISPLAY_BINDINGS_LOG)
--- /dev/null
+++ qt4-perl-4.5~~svn1145508/cmake/modules/FindPerlMore.cmake
@@ -0,0 +1,78 @@
+# - Find Perl
+# This module finds detailed info about how Perl is installed and determines
+# where the include files and libraries are. This code sets the following
+# variables:
+#
+# PERL_INCLUDE_PATH = path to where perl.h can be found
+
+if(PERL_INCLUDE_PATH)
+ # Already in cache, be silent
+ SET(PERL_HEADERS_FOUND TRUE)
+endif (PERL_INCLUDE_PATH)
+
+IF(PERL_EXECUTABLE)
+ EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{archlib}"
+ OUTPUT_VARIABLE PERL_ARCH_LIB_DIR)
+
+ EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{sitearch}"
+ OUTPUT_VARIABLE PERL_SITE_ARCH_DIR)
+
+ EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{vendorarch}"
+ OUTPUT_VARIABLE PERL_VENDOR_ARCH_DIR)
+
+ EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{sitelib}"
+ OUTPUT_VARIABLE PERL_SITE_LIB_DIR)
+
+ EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{vendorlib}"
+ OUTPUT_VARIABLE PERL_VENDOR_LIB_DIR)
+
+ EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{version}"
+ OUTPUT_VARIABLE PERL_VERSION)
+
+ EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{ccflags}"
+ OUTPUT_VARIABLE PERL_CXX_FLAGS)
+
+ EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{ccdlflags}"
+ OUTPUT_VARIABLE PERL_CCDL_FLAGS)
+
+ EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -MFile::Spec -e "print '-L' . File::Spec->catdir(\$Config{archlibexp}, 'CORE')"
+ OUTPUT_VARIABLE PERL_EXTRA_LIB_PATHS)
+
+ EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -MConfig -e "print \$Config{libs}"
+ OUTPUT_VARIABLE PERL_LIBS)
+
+ FIND_PATH(PERL_INCLUDE_PATH
+ NAMES perl.h
+ PATHS ${PERL_ARCH_LIB_DIR}/CORE
+ )
+
+ if(PERL_INCLUDE_PATH)
+ SET(PERL_HEADERS_FOUND TRUE)
+ endif (PERL_INCLUDE_PATH)
+
+ MARK_AS_ADVANCED(
+ PERL_INCLUDE_PATH
+ )
+ENDIF(PERL_EXECUTABLE)
+
+IF(PERL_HEADERS_FOUND)
+ IF(NOT PERL_FIND_QUIETLY)
+ MESSAGE(STATUS "Perl headers found: ${PERL_INCLUDE_PATH}")
+ ENDIF(NOT PERL_FIND_QUIETLY)
+ELSE(PERL_HEADERS_FOUND)
+ IF(PERL_FIND_HEADERS_REQUIRED)
+ MESSAGE(FATAL_ERROR "Could not find Perl headers")
+ ENDIF(PERL_FIND_HEADERS_REQUIRED)
+ENDIF(PERL_HEADERS_FOUND)
+
+IF ( PERL_LIBRARY MATCHES .*-NOTFOUND )
+ EXECUTE_PROCESS ( COMMAND ${PERL_EXECUTABLE}
+ -MConfig -e "print \$Config{libperl}"
+ OUTPUT_VARIABLE PERL_OUTPUT
+ RESULT_VARIABLE PERL_RETURN_VALUE )
+ IF ( NOT PERL_RETURN_VALUE )
+ FIND_LIBRARY ( PERL_LIBRARY NAMES ${PERL_OUTPUT}
+ PATHS ${PERL_INCLUDE_PATH} )
+ ENDIF ( NOT PERL_RETURN_VALUE )
+ENDIF ( PERL_LIBRARY MATCHES .*-NOTFOUND )
+
--- qt4-perl-4.5~~svn1145508.orig/qtnetwork/src/CMakeLists.txt
+++ qt4-perl-4.5~~svn1145508/qtnetwork/src/CMakeLists.txt
@@ -1,12 +1,12 @@
include_directories(
${CMAKE_SOURCE_DIR}/smoke
- ${CMAKE_SOURCE_DIR}/perl/qtcore/src
+ ${CMAKE_SOURCE_DIR}/qtcore/src
${PERL_INCLUDE_PATH}
${QT_INCLUDES} )
# Run doxsubpp.pl to run xsubpp on QtNetwork4.xs
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/QtNetwork4.c
- COMMAND ${PERL_EXECUTABLE} ARGS ${CMAKE_SOURCE_DIR}/perl/qtcore/src/doxsubpp.pl ${PERL_EXECUTABLE} QtNetwork4.xs ${CMAKE_CURRENT_BINARY_DIR}/QtNetwork4.c
+ COMMAND ${PERL_EXECUTABLE} ARGS ${CMAKE_SOURCE_DIR}/qtcore/src/doxsubpp.pl ${PERL_EXECUTABLE} QtNetwork4.xs ${CMAKE_CURRENT_BINARY_DIR}/QtNetwork4.c
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/QtNetwork4.xs
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
--- qt4-perl-4.5~~svn1145508.orig/qtcore/tools/puic/CMakeLists.txt
+++ qt4-perl-4.5~~svn1145508/qtcore/tools/puic/CMakeLists.txt
@@ -1,6 +1,9 @@
include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/perl )
+
+
+find_package(Qt4 REQUIRED)
+include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/perl ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTXML_INCLUDE_DIR})
########### next target ###############
--- qt4-perl-4.5~~svn1145508.orig/qtcore/src/CMakeLists.txt
+++ qt4-perl-4.5~~svn1145508/qtcore/src/CMakeLists.txt
@@ -34,12 +34,11 @@ target_link_libraries(perlqtcore4
${QT_QTNETWORK_LIBRARY}
${QT_QTDBUS_LIBRARY}
${PERL_LIBRARY}
- smokebase
smokeqtcore
smokeqtgui
smokeqtnetwork
smokeqtdbus
- ${PERL_LIBS})
+ perl)
set_target_properties(perlqtcore4 PROPERTIES OUTPUT_NAME "QtCore4")
set_target_properties(perlqtcore4 PROPERTIES PREFIX "")
|