diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-07-27 13:04:33 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-04-13 13:42:35 +0200 |
| commit | b3be596efaea39a75f48a3d5b32bf3a0df4e9e60 (patch) | |
| tree | 2c80a52e656f1d4dc4362a295974d3939d3c95f0 | |
| parent | d4e7f73d04e8448d326b6f89908701e304e37d65 (diff) | |
| -rw-r--r-- | recipes-qt/qtchooser/qtchooser/0001-Makefile-install-the-man-dir.patch | 35 | ||||
| -rw-r--r-- | recipes-qt/qtchooser/qtchooser_git.bb | 5 |
2 files changed, 2 insertions, 38 deletions
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 deleted file mode 100644 index 8e8e1c69..00000000 --- a/recipes-qt/qtchooser/qtchooser/0001-Makefile-install-the-man-dir.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 3f142e100cc3dd69b816ce79152760c823cb86e9 Mon Sep 17 00:00:00 2001 -From: Li Xin <lixin.fnst@cn.fujitsu.com> -Date: Fri, 29 Apr 2016 12:41:34 +0900 -Subject: [PATCH] Makefile: install the man dir - -upstream-status: backported - -Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> ---- - 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 index e745e8ad..06b1ae91 100644 --- a/recipes-qt/qtchooser/qtchooser_git.bb +++ b/recipes-qt/qtchooser/qtchooser_git.bb @@ -1,8 +1,7 @@ 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/cgit/qtsdk/qtchooser.git;branch=master \ - file://0001-Makefile-install-the-man-dir.patch" +SRC_URI = "git://code.qt.io/cgit/qtsdk/qtchooser.git" LIC_FILES_CHKSUM = " \ file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \ @@ -11,7 +10,7 @@ LIC_FILES_CHKSUM = " \ " S = "${WORKDIR}/git" SRCREV = "a1b6736e4f2daf86cd1626004d40ef57db85fbb5" -#PV = "39+git${SRCREV}" +PV = "39+git${SRCPV}" inherit pkgconfig |