From e552393ff4c10d98ba0d48c752adedb381585e2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 6 Nov 2015 18:57:29 +0100 Subject: [PATCH] qtermwidget and qterminal became members of lxqt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [1] http://sourceforge.net/p/lxde/mailman/message/34596414/ Signed-off-by: Andreas Müller --- recipes-lxqt/packagegroups/lxqt-world.bb | 2 ++ recipes-lxqt/packagegroups/packagegroup-lxqt-base.bb | 1 - .../qterminal/qterminal_git.bb | 2 +- .../qtermwidget/qtermwidget_git.bb | 2 +- .../recipes-qterminal/packagegroups/qterminal-world.bb | 10 ---------- recipes-support/packagegroups/meta-qt5-extra-world.bb | 1 - 6 files changed, 4 insertions(+), 14 deletions(-) rename {recipes-misc/recipes-qterminal => recipes-lxqt}/qterminal/qterminal_git.bb (91%) rename {recipes-misc/recipes-qterminal => recipes-lxqt}/qtermwidget/qtermwidget_git.bb (91%) delete mode 100644 recipes-misc/recipes-qterminal/packagegroups/qterminal-world.bb diff --git a/recipes-lxqt/packagegroups/lxqt-world.bb b/recipes-lxqt/packagegroups/lxqt-world.bb index 98d09fe4..c805d56a 100644 --- a/recipes-lxqt/packagegroups/lxqt-world.bb +++ b/recipes-lxqt/packagegroups/lxqt-world.bb @@ -27,4 +27,6 @@ RDEPENDS_${PN} = " \ menu-cache \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "obconf-qt", "",d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pcmanfm-qt", "",d)} \ + qtermwidget \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qterminal", "",d)} \ " diff --git a/recipes-lxqt/packagegroups/packagegroup-lxqt-base.bb b/recipes-lxqt/packagegroups/packagegroup-lxqt-base.bb index 1f36d48f..38c42e30 100644 --- a/recipes-lxqt/packagegroups/packagegroup-lxqt-base.bb +++ b/recipes-lxqt/packagegroups/packagegroup-lxqt-base.bb @@ -10,7 +10,6 @@ RDEPENDS_${PN} = " \ qtimageformats-plugins \ \ lxqt-world \ - qterminal-world \ oxygen-icons \ \ openbox \ diff --git a/recipes-misc/recipes-qterminal/qterminal/qterminal_git.bb b/recipes-lxqt/qterminal/qterminal_git.bb similarity index 91% rename from recipes-misc/recipes-qterminal/qterminal/qterminal_git.bb rename to recipes-lxqt/qterminal/qterminal_git.bb index 62e921ba..3dde2f9f 100644 --- a/recipes-misc/recipes-qterminal/qterminal/qterminal_git.bb +++ b/recipes-lxqt/qterminal/qterminal_git.bb @@ -8,7 +8,7 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS = "qtbase qttools-native qtermwidget" -SRC_URI = "git://github.com/qterminal/${BPN}.git" +SRC_URI = "git://github.com/lxde/${BPN}.git" SRCREV = "7f2c9e03e193df4d98cfb665d2acfa45e7153d91" PV = "0.6.0+git${SRCPV}" diff --git a/recipes-misc/recipes-qterminal/qtermwidget/qtermwidget_git.bb b/recipes-lxqt/qtermwidget/qtermwidget_git.bb similarity index 91% rename from recipes-misc/recipes-qterminal/qtermwidget/qtermwidget_git.bb rename to recipes-lxqt/qtermwidget/qtermwidget_git.bb index bb5c94e6..214e9054 100644 --- a/recipes-misc/recipes-qterminal/qtermwidget/qtermwidget_git.bb +++ b/recipes-lxqt/qtermwidget/qtermwidget_git.bb @@ -6,7 +6,7 @@ inherit cmake_qt5 cmake-lib cmake-extra-sanity DEPENDS = "qtbase" -SRC_URI = "git://github.com/qterminal/${BPN}.git" +SRC_URI = "git://github.com/lxde/${BPN}.git" SRCREV = "72ffc262eb6cd5deaf3489068f7fe6a91f734998" PV = "0.6.0+git${SRCPV}" diff --git a/recipes-misc/recipes-qterminal/packagegroups/qterminal-world.bb b/recipes-misc/recipes-qterminal/packagegroups/qterminal-world.bb deleted file mode 100644 index a1c3de67..00000000 --- a/recipes-misc/recipes-qterminal/packagegroups/qterminal-world.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "QTerminal collection" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" - -inherit packagegroup - -RDEPENDS_${PN} = " \ - qtermwidget \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qterminal", "",d)} \ -" diff --git a/recipes-support/packagegroups/meta-qt5-extra-world.bb b/recipes-support/packagegroups/meta-qt5-extra-world.bb index 53a2a530..a02036cc 100644 --- a/recipes-support/packagegroups/meta-qt5-extra-world.bb +++ b/recipes-support/packagegroups/meta-qt5-extra-world.bb @@ -11,6 +11,5 @@ RDEPENDS_${PN} = " \ hexalate \ kde-world \ lxqt-world \ - qterminal-world \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "sddm", "",d)} \ "