All of lore.kernel.org
 help / color / mirror / Atom feed
* [meta-qt5][PATCH] qtchooser: add new recipe
@ 2016-04-29  5:58 Li Xin
  2016-05-02  8:37 ` Jonathan Liu
  0 siblings, 1 reply; 3+ messages in thread
From: Li Xin @ 2016-04-29  5:58 UTC (permalink / raw)
  To: openembedded-devel

qtchooser is a wrapper used to select between Qt binary versions.

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
---
 .../0001-Makefile-install-the-man-dir.patch        | 35 ++++++++++++++++++++++
 recipes-qt/qtchooser/qtchooser_39.bb               | 24 +++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 recipes-qt/qtchooser/qtchooser/0001-Makefile-install-the-man-dir.patch
 create mode 100644 recipes-qt/qtchooser/qtchooser_39.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 0000000..8e8e1c6
--- /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 <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_39.bb b/recipes-qt/qtchooser/qtchooser_39.bb
new file mode 100644
index 0000000..7fceb9c
--- /dev/null
+++ b/recipes-qt/qtchooser/qtchooser_39.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Wrapper to select between Qt development binary versions"
+HOMEPAGE = "http://macieira.org/qtchooser"
+LICENSE = "LGPLv2 | GPLv3"
+SRC_URI = "http://macieira.org/qtchooser/${BP}-g4717841.tar.gz \
+           file://0001-Makefile-install-the-man-dir.patch"
+SRC_URI[md5sum] = "fcf1b5e8373147e48ce72b9c1ffe3d10"
+SRC_URI[sha256sum] = "4681d0561bf96599bf9bf5eb25103d07ee8f045f31576dc2e72b8529587a67c6"
+
+LIC_FILES_CHKSUM = " \
+    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
+    file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
+    file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
+"
+S = "${WORKDIR}/${BP}-g4717841"
+
+inherit pkgconfig
+
+do_compile() {
+    oe_runmake
+}
+
+do_install() {
+    oe_runmake install INSTALL_ROOT=${D}
+}
-- 
1.8.4.2





^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [meta-qt5][PATCH] qtchooser: add new recipe
  2016-04-29  5:58 [meta-qt5][PATCH] qtchooser: add new recipe Li Xin
@ 2016-05-02  8:37 ` Jonathan Liu
  2016-05-10  5:36   ` [meta-qt5][PATCH v2] " Li Xin
  0 siblings, 1 reply; 3+ messages in thread
From: Jonathan Liu @ 2016-05-02  8:37 UTC (permalink / raw)
  To: OpenEmbedded Devel List

Hi Li,

On 29 April 2016 at 15:58, Li Xin <lixin.fnst@cn.fujitsu.com> wrote:
> qtchooser is a wrapper used to select between Qt binary versions.
>
> Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
> ---
>  .../0001-Makefile-install-the-man-dir.patch        | 35 ++++++++++++++++++++++
>  recipes-qt/qtchooser/qtchooser_39.bb               | 24 +++++++++++++++
>  2 files changed, 59 insertions(+)
>  create mode 100644 recipes-qt/qtchooser/qtchooser/0001-Makefile-install-the-man-dir.patch
>  create mode 100644 recipes-qt/qtchooser/qtchooser_39.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 0000000..8e8e1c6
> --- /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 <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_39.bb b/recipes-qt/qtchooser/qtchooser_39.bb
> new file mode 100644
> index 0000000..7fceb9c
> --- /dev/null
> +++ b/recipes-qt/qtchooser/qtchooser_39.bb
> @@ -0,0 +1,24 @@
> +DESCRIPTION = "Wrapper to select between Qt development binary versions"
> +HOMEPAGE = "http://macieira.org/qtchooser"
> +LICENSE = "LGPLv2 | GPLv3"
> +SRC_URI = "http://macieira.org/qtchooser/${BP}-g4717841.tar.gz \
> +           file://0001-Makefile-install-the-man-dir.patch"
> +SRC_URI[md5sum] = "fcf1b5e8373147e48ce72b9c1ffe3d10"
> +SRC_URI[sha256sum] = "4681d0561bf96599bf9bf5eb25103d07ee8f045f31576dc2e72b8529587a67c6"
> +
> +LIC_FILES_CHKSUM = " \
> +    file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
> +    file://LICENSE.GPL;md5=d32239bcb673463ab874e80d47fae504 \
> +    file://LICENSE.LGPL;md5=4193e7f1d47a858f6b7c0f1ee66161de \
> +"
> +S = "${WORKDIR}/${BP}-g4717841"
> +
> +inherit pkgconfig
> +
> +do_compile() {
> +    oe_runmake
> +}
> +
> +do_install() {
> +    oe_runmake install INSTALL_ROOT=${D}
> +}
> --
> 1.8.4.2

Wouldn't it be better to use the latest version from
http://code.qt.io/cgit/qt/qtchooser.git/?

Regards,
Jonathan


^ permalink raw reply	[flat|nested] 3+ messages in thread

* [meta-qt5][PATCH v2] qtchooser: add new recipe
  2016-05-02  8:37 ` Jonathan Liu
@ 2016-05-10  5:36   ` Li Xin
  0 siblings, 0 replies; 3+ messages in thread
From: Li Xin @ 2016-05-10  5:36 UTC (permalink / raw)
  To: openembedded-devel

qtchooser is a wrapper used to select between Qt binary versions.

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
---
 .../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 0000000..8e8e1c6
--- /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 <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
new file mode 100644
index 0000000..68b1c80
--- /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/
+}
-- 
1.8.4.2





^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2016-05-10  5:37 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-04-29  5:58 [meta-qt5][PATCH] qtchooser: add new recipe Li Xin
2016-05-02  8:37 ` Jonathan Liu
2016-05-10  5:36   ` [meta-qt5][PATCH v2] " Li Xin

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.