From 06ee16333e1948b7ef0b652f8331a5f816d8d708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sun, 1 Feb 2015 13:09:43 +0100 Subject: [PATCH] hawaii-shell --- ...1-native-build-and-install-enhancedqdbusxml2cpp-only.patch | 0 ...-make-build-process-find-native-enhancedqdbusxml2cpp.patch | 0 .../0003-add-fPIC-to-libHawaiiQtXDG-compiler-options.patch | 0 ...Add-an-option-ENABLE_MAINLINE_QTXDG-to-use-mainline-.patch | 0 recipes-hawaii/{shell => hawaii-shell}/hawaii-shell-native.bb | 0 recipes-hawaii/{shell => hawaii-shell}/hawaii-shell.bb | 2 -- recipes-hawaii/{shell => hawaii-shell}/hawaii-shell.inc | 4 ++-- 7 files changed, 2 insertions(+), 4 deletions(-) rename recipes-hawaii/{shell => hawaii-shell}/files/0001-native-build-and-install-enhancedqdbusxml2cpp-only.patch (100%) rename recipes-hawaii/{shell => hawaii-shell}/files/0002-make-build-process-find-native-enhancedqdbusxml2cpp.patch (100%) rename recipes-hawaii/{shell => hawaii-shell}/files/0003-add-fPIC-to-libHawaiiQtXDG-compiler-options.patch (100%) rename recipes-hawaii/{shell => hawaii-shell}/files/0004-Add-an-option-ENABLE_MAINLINE_QTXDG-to-use-mainline-.patch (100%) rename recipes-hawaii/{shell => hawaii-shell}/hawaii-shell-native.bb (100%) rename recipes-hawaii/{shell => hawaii-shell}/hawaii-shell.bb (84%) rename recipes-hawaii/{shell => hawaii-shell}/hawaii-shell.inc (83%) diff --git a/recipes-hawaii/shell/files/0001-native-build-and-install-enhancedqdbusxml2cpp-only.patch b/recipes-hawaii/hawaii-shell/files/0001-native-build-and-install-enhancedqdbusxml2cpp-only.patch similarity index 100% rename from recipes-hawaii/shell/files/0001-native-build-and-install-enhancedqdbusxml2cpp-only.patch rename to recipes-hawaii/hawaii-shell/files/0001-native-build-and-install-enhancedqdbusxml2cpp-only.patch diff --git a/recipes-hawaii/shell/files/0002-make-build-process-find-native-enhancedqdbusxml2cpp.patch b/recipes-hawaii/hawaii-shell/files/0002-make-build-process-find-native-enhancedqdbusxml2cpp.patch similarity index 100% rename from recipes-hawaii/shell/files/0002-make-build-process-find-native-enhancedqdbusxml2cpp.patch rename to recipes-hawaii/hawaii-shell/files/0002-make-build-process-find-native-enhancedqdbusxml2cpp.patch diff --git a/recipes-hawaii/shell/files/0003-add-fPIC-to-libHawaiiQtXDG-compiler-options.patch b/recipes-hawaii/hawaii-shell/files/0003-add-fPIC-to-libHawaiiQtXDG-compiler-options.patch similarity index 100% rename from recipes-hawaii/shell/files/0003-add-fPIC-to-libHawaiiQtXDG-compiler-options.patch rename to recipes-hawaii/hawaii-shell/files/0003-add-fPIC-to-libHawaiiQtXDG-compiler-options.patch diff --git a/recipes-hawaii/shell/files/0004-Add-an-option-ENABLE_MAINLINE_QTXDG-to-use-mainline-.patch b/recipes-hawaii/hawaii-shell/files/0004-Add-an-option-ENABLE_MAINLINE_QTXDG-to-use-mainline-.patch similarity index 100% rename from recipes-hawaii/shell/files/0004-Add-an-option-ENABLE_MAINLINE_QTXDG-to-use-mainline-.patch rename to recipes-hawaii/hawaii-shell/files/0004-Add-an-option-ENABLE_MAINLINE_QTXDG-to-use-mainline-.patch diff --git a/recipes-hawaii/shell/hawaii-shell-native.bb b/recipes-hawaii/hawaii-shell/hawaii-shell-native.bb similarity index 100% rename from recipes-hawaii/shell/hawaii-shell-native.bb rename to recipes-hawaii/hawaii-shell/hawaii-shell-native.bb diff --git a/recipes-hawaii/shell/hawaii-shell.bb b/recipes-hawaii/hawaii-shell/hawaii-shell.bb similarity index 84% rename from recipes-hawaii/shell/hawaii-shell.bb rename to recipes-hawaii/hawaii-shell/hawaii-shell.bb index fcc14e42..f364a318 100644 --- a/recipes-hawaii/shell/hawaii-shell.bb +++ b/recipes-hawaii/hawaii-shell/hawaii-shell.bb @@ -21,8 +21,6 @@ DEPENDS += " \ SRC_URI += " \ file://0002-make-build-process-find-native-enhancedqdbusxml2cpp.patch \ - file://0003-add-fPIC-to-libHawaiiQtXDG-compiler-options.patch \ - file://0004-Add-an-option-ENABLE_MAINLINE_QTXDG-to-use-mainline-.patch \ " EXTRA_OECMAKE += "-DENABLE_MAINLINE_QTXDG=ON" diff --git a/recipes-hawaii/shell/hawaii-shell.inc b/recipes-hawaii/hawaii-shell/hawaii-shell.inc similarity index 83% rename from recipes-hawaii/shell/hawaii-shell.inc rename to recipes-hawaii/hawaii-shell/hawaii-shell.inc index ecfe5b14..43d0b683 100644 --- a/recipes-hawaii/shell/hawaii-shell.inc +++ b/recipes-hawaii/hawaii-shell/hawaii-shell.inc @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = " \ inherit cmake_qt5 pythonnative SRC_URI = "git://github.com/hawaii-desktop/${BPN}.git;protocol=git;branch=master" -SRCREV = "d5e24344c942b496e828cafddfa44f86b3af5a61" -PV = "0.5.90+git${SRCPV}" +SRCREV = "00d454fb651ea8d8a949a7a94fbda8d906bf3e43" +PV = "0.3.90+git${SRCPV}" S = "${WORKDIR}/git"