From 27617dde3560e2fe97989670725eb19747a0f48d Mon Sep 17 00:00:00 2001 From: Li xin Date: Tue, 10 May 2016 08:36:43 +0300 Subject: qtchooser: add new recipe qtchooser is a wrapper used to select between Qt binary versions. Signed-off-by: Li Xin Signed-off-by: Martin Jansa --- .../0001-Makefile-install-the-man-dir.patch | 35 ++++++++++++++++++++++ recipes-qt/qtchooser/qtchooser_git.bb | 30 +++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 recipes-qt/qtchooser/qtchooser/0001-Makefile-install-the-man-dir.patch create mode 100644 recipes-qt/qtchooser/qtchooser_git.bb diff --git a/recipes-qt/qtchooser/qtchooser/0001-Makefile-install-the-man-dir.patch b/recipes-qt/qtchooser/qtchooser/0001-Makefile-install-the-man-dir.patch new file mode 100644 index 00000000..8e8e1c69 --- /dev/null +++ b/recipes-qt/qtchooser/qtchooser/0001-Makefile-install-the-man-dir.patch @@ -0,0 +1,35 @@ +From 3f142e100cc3dd69b816ce79152760c823cb86e9 Mon Sep 17 00:00:00 2001 +From: Li Xin +Date: Fri, 29 Apr 2016 12:41:34 +0900 +Subject: [PATCH] Makefile: install the man dir + +upstream-status: backported + +Signed-off-by: Li Xin +--- + Makefile | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/Makefile b/Makefile +index 20b9100..1fd8cd3 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,5 +1,6 @@ + prefix = /usr + bindir = $(prefix)/bin ++MKDIR = mkdir -p + TOOLS = assistant \ + designer \ + lconvert \ +@@ -56,6 +57,8 @@ install: + case `uname -s` in Darwin) \ + for tool in $(MACTOOLS); do ln -sf qtchooser "$(INSTALL_ROOT)$(bindir)/$$tool"; done \ + ;; esac ++ $(MKDIR) $(INSTALL_ROOT)$(prefix)/share/man/man1 ++ install -m 644 -p doc/qtchooser.1 $(INSTALL_ROOT)$(prefix)/share/man/man1 + + uninstall: + cd src/qtchooser && $(MAKE) uninstall +-- +1.8.4.2 + diff --git a/recipes-qt/qtchooser/qtchooser_git.bb b/recipes-qt/qtchooser/qtchooser_git.bb new file mode 100644 index 00000000..68b1c808 --- /dev/null +++ b/recipes-qt/qtchooser/qtchooser_git.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Wrapper to select between Qt development binary versions" +HOMEPAGE = "http://macieira.org/qtchooser" +LICENSE = "LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | GPL-3.0" +SRC_URI = "git://code.qt.io/qt/qtchooser.git;branch=master \ + file://0001-Makefile-install-the-man-dir.patch" + +LIC_FILES_CHKSUM = " \ + file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ + file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \ +" +S = "${WORKDIR}/git" +SRCREV = "4717841185d34bbe450e3b24445f2d35e3325a6a" +PV = "39+git${SRCREV}" + +inherit pkgconfig + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake install INSTALL_ROOT=${D} + #install configure file + install -d ${D}${sysconfdir}/xdg/qtchooser/ + install -m 0644 ${S}/tests/auto/qtchooser/testdata/config2/qtchooser/*.conf \ + ${D}${sysconfdir}/xdg/qtchooser/ + install -m 0644 ${S}/tests/auto/qtchooser/testdata/default/qtchooser/default.conf \ + ${D}${sysconfdir}/xdg/qtchooser/ +} -- cgit v1.2.3