From 415856bdd4f48ab4f2732996f0bae58595092bbe Mon Sep 17 00:00:00 2001 From: Parabola Date: Tue, 5 Apr 2011 14:26:38 +0000 Subject: Tue Apr 5 14:26:38 UTC 2011 --- .../debian_patches_01_build_system.diff | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 extra/qt-assistant-compat/debian_patches_01_build_system.diff (limited to 'extra/qt-assistant-compat/debian_patches_01_build_system.diff') diff --git a/extra/qt-assistant-compat/debian_patches_01_build_system.diff b/extra/qt-assistant-compat/debian_patches_01_build_system.diff new file mode 100644 index 000000000..3266ced61 --- /dev/null +++ b/extra/qt-assistant-compat/debian_patches_01_build_system.diff @@ -0,0 +1,48 @@ +Description: several workarounds for the build system which is completely broken +Author: Fathi Boudra + +--- a/compat.pro ++++ b/compat.pro +@@ -66,8 +66,6 @@ TRANSLATIONS = translations/assistant_ad + translations/assistant_adp_zh_CN.ts \ + translations/assistant_adp_zh_TW.ts + +-unix:!contains(QT_CONFIG, zlib):LIBS += -lz +- + contains(CONFIG, static): { + win32 { + exists($$[QT_INSTALL_PLUGINS]/imageformats/qjpeg.lib) { +@@ -81,3 +79,7 @@ contains(CONFIG, static): { + } + } + } ++ ++target.path = $$[QT_INSTALL_BINS] ++INSTALLS += target ++ +--- a/lib/lib.pro ++++ b/lib/lib.pro +@@ -16,8 +16,8 @@ HEADERS = qassistantclient.h \ + qassistantclient_global.h + SOURCES = qassistantclient.cpp + +-DESTDIR = ../../../../lib +-DLLDESTDIR = ../../../../bin ++DESTDIR = lib ++DLLDESTDIR = bin + + unix { + QMAKE_CFLAGS += $$QMAKE_CFLAGS_SHLIB +@@ -62,7 +62,7 @@ win32 { + } + + qt_install_headers { +- assistant_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES ++ assistant_headers.files = qassistantclient.h qassistantclient_global.h + assistant_headers.path = $$[QT_INSTALL_HEADERS]/QtAssistant + INSTALLS += assistant_headers + } +--- /dev/null ++++ b/lib/QtAssistant/qassistantclient_global.h +@@ -0,0 +1 @@ ++#include "../qassistantclient_global.h" -- cgit v1.2.3-54-g00ecf