From 1b221fd4d5c6e5a7e86977941614c295f49d5012 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Thu, 29 Aug 2013 09:18:25 +0200 Subject: new project qtservice --- index.html | 4 ++ src/qtservice-1-fixes.patch | 115 ++++++++++++++++++++++++++++++++++++++++++++ src/qtservice.mk | 21 ++++++++ 3 files changed, 140 insertions(+) create mode 100644 src/qtservice-1-fixes.patch create mode 100644 src/qtservice.mk diff --git a/index.html b/index.html index 95b92b3..a2d8c9d 100644 --- a/index.html +++ b/index.html @@ -2036,6 +2036,10 @@ local-pkg-list: $(LOCAL_PKG_LIST) Qt + qtservice + Qt Solutions + + qtsvg Qt diff --git a/src/qtservice-1-fixes.patch b/src/qtservice-1-fixes.patch new file mode 100644 index 0000000..5713f57 --- /dev/null +++ b/src/qtservice-1-fixes.patch @@ -0,0 +1,115 @@ +This file is part of MXE. +See index.html for further information. + +From 431dd674645bbee5ea34d65aa4095f07890af088 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Thu, 29 Aug 2013 09:27:08 +0200 +Subject: [PATCH 1/4] qtservice: fixes for static build + + +diff --git a/qtservice/buildlib/buildlib.pro b/qtservice/buildlib/buildlib.pro +index 1e51cc1..c427a56 100644 +--- a/qtservice/buildlib/buildlib.pro ++++ b/qtservice/buildlib/buildlib.pro +@@ -5,7 +5,7 @@ win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all + include(../src/qtservice.pri) + TARGET = $$QTSERVICE_LIBNAME + DESTDIR = $$QTSERVICE_LIBDIR +-win32 { ++win32:shared { + DLLDESTDIR = $$[QT_INSTALL_BINS] + QMAKE_DISTCLEAN += $$[QT_INSTALL_BINS]\\$${QTSERVICE_LIBNAME}.dll + } +diff --git a/qtservice/src/qtservice.pri b/qtservice/src/qtservice.pri +index 0945298..0475e0f 100644 +--- a/qtservice/src/qtservice.pri ++++ b/qtservice/src/qtservice.pri +@@ -15,7 +15,7 @@ qtservice-uselib:!qtservice-buildlib { + unix:SOURCES += $$PWD/qtservice_unix.cpp $$PWD/qtunixsocket.cpp $$PWD/qtunixserversocket.cpp + } + +-win32 { +- qtservice-buildlib:shared:DEFINES += QT_QTSERVICE_EXPORT ++win32:shared { ++ qtservice-buildlib:DEFINES += QT_QTSERVICE_EXPORT + else:qtservice-uselib:DEFINES += QT_QTSERVICE_IMPORT + } +-- +1.8.1.4 + + +From 539cadf46856af75becb54b40f65f617ae6dbf1f Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Thu, 29 Aug 2013 09:31:40 +0200 +Subject: [PATCH 2/4] qtservice: build as static lib and generate .prl + + +diff --git a/qtservice/buildlib/buildlib.pro b/qtservice/buildlib/buildlib.pro +index c427a56..8335202 100644 +--- a/qtservice/buildlib/buildlib.pro ++++ b/qtservice/buildlib/buildlib.pro +@@ -1,7 +1,7 @@ + TEMPLATE=lib +-CONFIG += qt dll qtservice-buildlib ++CONFIG += qt staticlib qtservice-buildlib + mac:CONFIG += absolute_library_soname +-win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all ++win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all create_prl + include(../src/qtservice.pri) + TARGET = $$QTSERVICE_LIBNAME + DESTDIR = $$QTSERVICE_LIBDIR +-- +1.8.1.4 + + +From 01626c8c0f528e6642110b15dab658ad49b8075b Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Thu, 29 Aug 2013 09:44:49 +0200 +Subject: [PATCH 3/4] qtservice: no debug + + +diff --git a/qtservice/buildlib/buildlib.pro b/qtservice/buildlib/buildlib.pro +index 8335202..370156a 100644 +--- a/qtservice/buildlib/buildlib.pro ++++ b/qtservice/buildlib/buildlib.pro +@@ -1,7 +1,7 @@ + TEMPLATE=lib + CONFIG += qt staticlib qtservice-buildlib + mac:CONFIG += absolute_library_soname +-win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all create_prl ++win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += create_prl + include(../src/qtservice.pri) + TARGET = $$QTSERVICE_LIBNAME + DESTDIR = $$QTSERVICE_LIBDIR +-- +1.8.1.4 + + +From 005eb0eb8275b6e50c814343e7fdb3d2c99f13d5 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Thu, 29 Aug 2013 11:32:45 +0200 +Subject: [PATCH 4/4] qtservice: install to Qt directory + + +diff --git a/qtservice/buildlib/buildlib.pro b/qtservice/buildlib/buildlib.pro +index 370156a..4180e83 100644 +--- a/qtservice/buildlib/buildlib.pro ++++ b/qtservice/buildlib/buildlib.pro +@@ -4,10 +4,11 @@ mac:CONFIG += absolute_library_soname + win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += create_prl + include(../src/qtservice.pri) + TARGET = $$QTSERVICE_LIBNAME +-DESTDIR = $$QTSERVICE_LIBDIR + win32:shared { + DLLDESTDIR = $$[QT_INSTALL_BINS] + QMAKE_DISTCLEAN += $$[QT_INSTALL_BINS]\\$${QTSERVICE_LIBNAME}.dll + } +-target.path = $$DESTDIR +-INSTALLS += target ++target.path = $$[QT_INSTALL_LIBS] ++headers.path = $$[QT_INSTALL_HEADERS] ++headers.files += ../src/qtservice.h ++INSTALLS += target headers +-- +1.8.1.4 + diff --git a/src/qtservice.mk b/src/qtservice.mk new file mode 100644 index 0000000..6f9683c --- /dev/null +++ b/src/qtservice.mk @@ -0,0 +1,21 @@ +# This file is part of MXE. +# See index.html for further information. +PKG := qtservice +$(PKG)_IGNORE := +$(PKG)_VERSION := 4ac977553f2b04a54feb74ebcbc90ef255d38895 +$(PKG)_CHECKSUM := b3a185696066dc8f1792de83aa8d7187fb416580 +$(PKG)_SUBDIR := qt-solutions-qt-solutions +$(PKG)_FILE := $($(PKG)_VERSION).tar.gz +$(PKG)_URL := https://qt.gitorious.org/qt-solutions/qt-solutions/archive/$($(PKG)_FILE) +$(PKG)_DEPS := gcc qtbase + +define $(PKG)_UPDATE + echo 'Warning: Updates are temporarily disabled for package qtservice.' >&2; + echo $(qtservice_VERSION) +endef + +define $(PKG)_BUILD + cd '$(1)/qtservice/buildlib' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' + $(MAKE) -C '$(1)/qtservice/buildlib' -j '$(JOBS)' + $(MAKE) -C '$(1)/qtservice/buildlib' -j 1 install +endef -- cgit v0.12