From b30e9d419af926c2623844edb0e05f74482a8f0e Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Wed, 31 Jul 2013 18:39:47 +1000
Subject: packages qt qtbase: install pkgconfig files in standard location

---
 src/qt.mk     | 12 ++++++++++++
 src/qtbase.mk | 16 +++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/qt.mk b/src/qt.mk
index 13d5a48..b279e98 100644
--- a/src/qt.mk
+++ b/src/qt.mk
@@ -84,4 +84,16 @@ define $(PKG)_BUILD
     cd               '$(1)/test-qt' && '$(PREFIX)/$(TARGET)/qt/bin/qmake' '$(PWD)/$(2).pro'
     $(MAKE)       -C '$(1)/test-qt' -j '$(JOBS)'
     $(INSTALL) -m755 '$(1)/test-qt/release/test-qt.exe' '$(PREFIX)/$(TARGET)/bin/'
+
+    # copy pkg-config files to standard directory
+    cp '$(PREFIX)/$(TARGET)'/qt/lib/pkgconfig/* '$(PREFIX)/$(TARGET)'/lib/pkgconfig/
+
+    # build test the manual way
+    mkdir '$(1)/test-$(PKG)-pkgconfig'
+    '$(PREFIX)/$(TARGET)/qt/bin/uic' -o '$(1)/test-$(PKG)-pkgconfig/ui_qt-test.h' '$(TOP_DIR)/src/qt-test.ui'
+    '$(TARGET)-g++' \
+        -W -Wall -Werror -std=c++0x -pedantic \
+        '$(TOP_DIR)/src/qt-test.cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG)-pkgconfig.exe' \
+        -I'$(1)/test-$(PKG)-pkgconfig' \
+        `'$(TARGET)-pkg-config' QtGui --cflags --libs`
 endef
diff --git a/src/qtbase.mk b/src/qtbase.mk
index 78198f3..d85b82b 100644
--- a/src/qtbase.mk
+++ b/src/qtbase.mk
@@ -51,7 +51,9 @@ define $(PKG)_BUILD
             -dbus-linked \
             -v
 
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
+    # invoke qmake with removed debug options as a workaround for
+    # https://bugreports.qt-project.org/browse/QTBUG-30898
+    $(MAKE) -C '$(1)' -j '$(JOBS)' QMAKE="$(1)/bin/qmake CONFIG-='debug debug_and_release'"
     rm -rf '$(PREFIX)/$(TARGET)/qt5'
     $(MAKE) -C '$(1)' -j 1 install
 
@@ -59,4 +61,16 @@ define $(PKG)_BUILD
     cd               '$(1)/test-qt' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qt-test.pro'
     $(MAKE)       -C '$(1)/test-qt' -j '$(JOBS)'
     $(INSTALL) -m755 '$(1)/test-qt/release/test-qt5.exe' '$(PREFIX)/$(TARGET)/bin/'
+
+    # copy pkg-config files to standard directory
+    cp '$(PREFIX)/$(TARGET)'/qt5/lib/pkgconfig/* '$(PREFIX)/$(TARGET)'/lib/pkgconfig/
+
+    # build test the manual way
+    mkdir '$(1)/test-$(PKG)-pkgconfig'
+    '$(PREFIX)/$(TARGET)/qt5/bin/uic' -o '$(1)/test-$(PKG)-pkgconfig/ui_qt-test.h' '$(TOP_DIR)/src/qt-test.ui'
+    '$(TARGET)-g++' \
+        -W -Wall -Werror -std=c++0x -pedantic \
+        '$(TOP_DIR)/src/qt-test.cpp' -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG)-pkgconfig.exe' \
+        -I'$(1)/test-$(PKG)-pkgconfig' \
+        `'$(TARGET)-pkg-config' Qt5Widgets --cflags --libs`
 endef
-- 
cgit v0.12