[SCM] gammaray packaging branch, master, updated. debian/1.2.1-1-5-g770ef92

[Jakub Adam]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/gammaray.git;a=commitdiff;h=770ef92

The following commit has been merged in the master branch:
commit 770ef92d985dea6a998b66e363cb59ee3e308da7
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Wed Sep 5 20:14:51 2012 +0200

    Don't build core/hooking/*.cpp.
    
    Function overwriter is used only on Windows and Mac, disabling it fixes
    building GammaRay on other archs than i386 and amd64.
---
 debian/changelog                                   |    3 +
 debian/patches/dont-build-functionoverwriter.patch |   62 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 66 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 60d364a..979412c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ gammaray (1.2.1-2) UNRELEASED; urgency=low
   * Build-depend on libgraphviz-dev instead of dummy transitional
     graphviz-dev.
   * Fix build on GNU Hurd.
+  * Don't build core/hooking/*.cpp. Function overwriter is used only on
+    Windows and Mac, disabling it fixes building GammaRay on other archs
+    than i386 and amd64.
 
  -- Jakub Adam <jakub.adam at ktknet.cz>  Mon, 03 Sep 2012 08:53:49 +0200
 
diff --git a/debian/patches/dont-build-functionoverwriter.patch b/debian/patches/dont-build-functionoverwriter.patch
new file mode 100644
index 0000000..76d44bb
--- /dev/null
+++ b/debian/patches/dont-build-functionoverwriter.patch
@@ -0,0 +1,62 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Wed, 5 Sep 2012 20:04:22 +0200
+Subject: dont-build-functionoverwriter
+
+---
+ core/CMakeLists.txt |   15 ++++++++++-----
+ core/probe.cpp      |    2 ++
+ 2 files changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index 6aadfbf..10d81e3 100644
+--- a/core/CMakeLists.txt
++++ b/core/CMakeLists.txt
+@@ -53,11 +53,6 @@ set(gammaray_srcs
+   propertyeditor/propertypaletteeditor.cpp
+   propertyeditor/palettedialog.cpp
+ 
+-  hooking/abstractfunctionoverwriter.cpp
+-  hooking/functionoverwriterfactory.cpp
+-  hooking/winfunctionoverwriter.cpp
+-  hooking/unixfunctionoverwriter.cpp
+-
+   tools/modelinspector/modeltester.cpp
+   tools/modelinspector/modelmodel.cpp
+   tools/modelinspector/modelcellmodel.cpp
+@@ -105,6 +100,16 @@ set(gammaray_srcs
+   tools/styleinspector/dynamicproxystyle.cpp
+ )
+ 
++if(WIN32 OR APPLE)
++  set(gammaray_srcs
++    ${gammaray_srcs}
++    hooking/abstractfunctionoverwriter.cpp
++    hooking/functionoverwriterfactory.cpp
++    hooking/winfunctionoverwriter.cpp
++    hooking/unixfunctionoverwriter.cpp
++  )
++endif()
++
+ if(HAVE_PRIVATE_QT_HEADERS)
+   set(gammaray_srcs
+     ${gammaray_srcs}
+diff --git a/core/probe.cpp b/core/probe.cpp
+index dafeb23..be32b8b 100644
+--- a/core/probe.cpp
++++ b/core/probe.cpp
+@@ -711,6 +711,7 @@ Q_DECL_EXPORT const char *myFlagLocation(const char *method)
+ }
+ #endif
+ 
++#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
+ void overwriteQtFunctions()
+ {
+   functionsOverwritten = true;
+@@ -739,6 +740,7 @@ void overwriteQtFunctions()
+ #endif
+ #endif
+ }
++#endif
+ 
+ #ifdef Q_OS_WIN
+ extern "C" Q_DECL_EXPORT void gammaray_probe_inject();
diff --git a/debian/patches/series b/debian/patches/series
index 19d7a3b..f9c4326 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ harfbuzz-search-path.patch
 find-widget-export-actions-when-attaching.patch
 gammaray-probe-versioned-soname.patch
 gnu-hurd-build-fix.patch
+dont-build-functionoverwriter.patch

-- 
gammaray packaging