diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-11-27 15:48:20 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-07 13:40:14 +0000 |
commit | 8b11ed8a75a15328bbd22d100a976cc669b84b58 (patch) | |
tree | 9b93d0fcd8fd973943ca61f126cae47066113922 /meta/recipes-qt/qt-apps | |
parent | 0baadc8a98daa14090b04e728fb5a44af3f545c8 (diff) | |
download | poky-8b11ed8a75a15328bbd22d100a976cc669b84b58.tar.gz |
qt4: remove recipes and classes
Qt4 is no longer supportd upstream, but it is still needed for LSB compliancy.
Qt4 recipes have been moved to a separate meta-qt4 layer to be consistent with
meta-qt3 and meta-qt5.
(From OE-Core rev: cb89d2b25b4edb1241bc5426a69a6bc44df9be2c)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt/qt-apps')
-rw-r--r-- | meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch | 18 | ||||
-rw-r--r-- | meta/recipes-qt/qt-apps/fotowall_0.9.bb | 29 | ||||
-rw-r--r-- | meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch | 26 | ||||
-rw-r--r-- | meta/recipes-qt/qt-apps/qmmp_0.8.6.bb | 72 | ||||
-rw-r--r-- | meta/recipes-qt/qt-apps/quicky_0.4.bb | 21 |
5 files changed, 0 insertions, 166 deletions
diff --git a/meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch b/meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch deleted file mode 100644 index d8b2b2347b..0000000000 --- a/meta/recipes-qt/qt-apps/fotowall/ExportWizard-depends-on-ui_wizard.patch +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | App/ExportWizard.cpp depends on wizard.h which depends on ui_wizard. The last one | ||
2 | should be already generated before compiling ExportWizard.cpp. | ||
3 | |||
4 | Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> | ||
5 | Upstream-Status: Pending | ||
6 | |||
7 | Index: Fotowall-0.9/App/ExportWizard.cpp | ||
8 | =================================================================== | ||
9 | --- Fotowall-0.9.orig/App/ExportWizard.cpp 2009-11-30 13:21:31.000000000 +0200 | ||
10 | +++ Fotowall-0.9/App/ExportWizard.cpp 2012-05-10 17:12:06.765230830 +0300 | ||
11 | @@ -23,6 +23,7 @@ | ||
12 | #include "imageloaderqt.h" | ||
13 | #include "posterazorcore.h" | ||
14 | #include "wizard.h" | ||
15 | +#include "ui_wizard.h" | ||
16 | |||
17 | #include <QDesktopServices> | ||
18 | #include <QDesktopWidget> | ||
diff --git a/meta/recipes-qt/qt-apps/fotowall_0.9.bb b/meta/recipes-qt/qt-apps/fotowall_0.9.bb deleted file mode 100644 index 3af026525b..0000000000 --- a/meta/recipes-qt/qt-apps/fotowall_0.9.bb +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | SUMMARY = "Creative photo display application" | ||
2 | DESCRIPTION = "Fotowall is a creative tool that allows you to layout your photos or pictures \ | ||
3 | in a personal way. You can add pictures, then resize, move, change colors, text, shadows, etc.." | ||
4 | |||
5 | HOMEPAGE = "http://www.enricoros.com/opensource/fotowall" | ||
6 | LICENSE = "GPLv2+" | ||
7 | LIC_FILES_CHKSUM = "file://GPL_V2;md5=79808397c3355f163c012616125c9e26 \ | ||
8 | file://main.cpp;beginline=6;endline=11;md5=b569acc2bf8974a3082b58fc53b9d8dc" | ||
9 | SECTION = "x11/apps" | ||
10 | |||
11 | PR = "r4" | ||
12 | |||
13 | SRCREV = "06d5a4142c599604d9a9fd64727b6945eb8cd3da" | ||
14 | SRC_URI = "git://github.com/enricoros/fotowall.git \ | ||
15 | file://ExportWizard-depends-on-ui_wizard.patch \ | ||
16 | " | ||
17 | |||
18 | S = "${WORKDIR}/git" | ||
19 | |||
20 | inherit qt4x11 | ||
21 | |||
22 | EXTRA_QMAKEVARS_PRE = "CONFIG+=no-webcam" | ||
23 | |||
24 | do_install() { | ||
25 | oe_runmake INSTALL_ROOT=${D} install | ||
26 | } | ||
27 | |||
28 | # Ensure we have some plugins for some useful image formats | ||
29 | RRECOMMENDS_${PN} += "qt4-plugin-imageformat-gif qt4-plugin-imageformat-jpeg qt4-plugin-imageformat-tiff" | ||
diff --git a/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch b/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch deleted file mode 100644 index 2bb5bb11cc..0000000000 --- a/meta/recipes-qt/qt-apps/qmmp/no-host-paths.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | Do not include /usr/include host paths | ||
2 | |||
3 | These were added upstream apparently for freebsd support, but trigger | ||
4 | compiler warnings during the build and could be dangerous, so remove | ||
5 | them. | ||
6 | |||
7 | Upstream-Status: Inappropriate [cross] | ||
8 | |||
9 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
10 | |||
11 | Update patch for version 0.7.4. | ||
12 | |||
13 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
14 | |||
15 | --- qmmp-0.7.4/CMakeLists.txt 2014-01-10 09:59:44.971837746 +0800 | ||
16 | +++ qmmp-0.7.4/CMakeLists.txt.new 2014-01-10 10:24:51.855837566 +0800 | ||
17 | @@ -1,9 +1,5 @@ | ||
18 | cmake_minimum_required(VERSION 2.6.0) | ||
19 | |||
20 | -#freebsd support | ||
21 | -include_directories(SYSTEM /usr/local/include) | ||
22 | -SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include) | ||
23 | - | ||
24 | #extract version from qmmp.h | ||
25 | FILE(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/src/qmmp/qmmp.h" | ||
26 | QMMP_VERSION_DATA REGEX "^#define[ \t]+QMMP_VERSION_[A-Z]+[ \t]+[0-9]+.*$") | ||
diff --git a/meta/recipes-qt/qt-apps/qmmp_0.8.6.bb b/meta/recipes-qt/qt-apps/qmmp_0.8.6.bb deleted file mode 100644 index 6c1e2121cf..0000000000 --- a/meta/recipes-qt/qt-apps/qmmp_0.8.6.bb +++ /dev/null | |||
@@ -1,72 +0,0 @@ | |||
1 | SUMMARY = "Qt-based Multimedia Player" | ||
2 | DESCRIPTION = "Qmmp is an audio player, written with the help of the Qt library. The user interface is similar to Winamp or XMMS." | ||
3 | HOMEPAGE = "http://qmmp.ylsoftware.com" | ||
4 | LICENSE = "GPLv2" | ||
5 | LICENSE_FLAGS = "commercial" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
7 | SECTION = "multimedia" | ||
8 | |||
9 | DEPENDS = "taglib libmad libvorbis libogg alsa-lib libsndfile1 libsamplerate0 curl" | ||
10 | |||
11 | SRC_URI = "http://qmmp.ylsoftware.com/files/${BP}.tar.bz2 \ | ||
12 | file://no-host-paths.patch \ | ||
13 | " | ||
14 | |||
15 | SRC_URI[md5sum] = "67e96e89c61b7432e5a12f555db702b1" | ||
16 | SRC_URI[sha256sum] = "0daea3f0a0df7b34089513c2c57413c82816ab8892bddabf49c18a7956255449" | ||
17 | inherit cmake qt4x11 | ||
18 | |||
19 | QMMP_PLUGIN_OPTIONS ??= "\ | ||
20 | -DUSE_MMS:BOOL=FALSE \ | ||
21 | -DUSE_MPC:BOOL=FALSE \ | ||
22 | -DUSE_MODPLUG:BOOL=FALSE \ | ||
23 | -DUSE_WAVPACK:BOOL=FALSE \ | ||
24 | -DUSE_FFMPEG:BOOL=FALSE \ | ||
25 | -DUSE_AAC:BOOL=FALSE \ | ||
26 | -DUSE_CDA:BOOL=FALSE \ | ||
27 | -DUSE_MIDI:BOOL=FALSE \ | ||
28 | -DUSE_GME:BOOL=FALSE \ | ||
29 | -DUSE_OSS4:BOOL=FALSE \ | ||
30 | -DUSE_JACK:BOOL=FALSE \ | ||
31 | -DUSE_BS2B:BOOL=FALSE \ | ||
32 | -DUSE_PROJECTM:BOOL=FALSE \ | ||
33 | -DUSE_ENCA:BOOL=FALSE \ | ||
34 | " | ||
35 | |||
36 | export EXTRA_OECMAKE = "-DQT_QMAKE_EXECUTABLE=${OE_QMAKE_QMAKE} \ | ||
37 | -DQT_LRELEASE_EXECUTABLE=${OE_QMAKE_LRELEASE} \ | ||
38 | -DQT_MOC_EXECUTABLE=${OE_QMAKE_MOC} \ | ||
39 | -DQT_UIC_EXECUTABLE=${OE_QMAKE_UIC} \ | ||
40 | -DQT_RCC_EXECUTABLE=${OE_QMAKE_RCC} \ | ||
41 | -DQT_LIBRARY_DIR=${OE_QMAKE_LIBDIR_QT} \ | ||
42 | -DQT_HEADERS_DIR=${OE_QMAKE_INCDIR_QT} \ | ||
43 | -DQT_QTCORE_INCLUDE_DIR=${OE_QMAKE_INCDIR_QT}/QtCore \ | ||
44 | ${QMMP_PLUGIN_OPTIONS} \ | ||
45 | " | ||
46 | |||
47 | do_configure() { | ||
48 | # Ensure we get the cmake configure and not qmake | ||
49 | cmake_do_configure | ||
50 | } | ||
51 | |||
52 | PACKAGES_DYNAMIC += "^qmmp-plugin-.* " | ||
53 | |||
54 | python populate_packages_prepend () { | ||
55 | qmmp_libdir = d.expand('${libdir}/qmmp') | ||
56 | gd = d.expand('${D}/${libdir}/qmmp') | ||
57 | plug_dirs = os.listdir(gd) | ||
58 | |||
59 | for plug_dir in plug_dirs: | ||
60 | g_plug_dir = os.path.join(qmmp_libdir,plug_dir) | ||
61 | do_split_packages(d, g_plug_dir, '^lib(.*)\.so$', 'qmmp-plugin-' + plug_dir.lower() + '-%s', 'Qmmp ' + plug_dir + ' plugin for %s') | ||
62 | } | ||
63 | |||
64 | FILES_${PN} = "\ | ||
65 | ${bindir}/qmmp \ | ||
66 | ${libdir}/lib*${SOLIBS} \ | ||
67 | ${datadir}/icons/* \ | ||
68 | ${datadir}/qmmp/images/* \ | ||
69 | ${datadir}/applications/* \ | ||
70 | " | ||
71 | |||
72 | RDEPENDS_${PN} += "taglib alsa-lib libmad curl libicui18n" | ||
diff --git a/meta/recipes-qt/qt-apps/quicky_0.4.bb b/meta/recipes-qt/qt-apps/quicky_0.4.bb deleted file mode 100644 index 3c7a4f09d0..0000000000 --- a/meta/recipes-qt/qt-apps/quicky_0.4.bb +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | SUMMARY = "A simple note-taking application with Wiki-style syntax and behaviour" | ||
2 | HOMEPAGE = "http://qt-apps.org/content/show.php/Quicky?content=80325" | ||
3 | LICENSE = "GPLv2+" | ||
4 | LIC_FILES_CHKSUM = "file://version.h;endline=19;md5=878bdaff438dab86298301fd1a210e14" | ||
5 | SECTION = "x11/apps" | ||
6 | |||
7 | PR = "r2" | ||
8 | |||
9 | SRC_URI = "http://qt-apps.org/CONTENT/content-files/80325-quicky-0.4.tar.gz" | ||
10 | |||
11 | SRC_URI[md5sum] = "824d9e477ee9c4994f73a3cb215161d9" | ||
12 | SRC_URI[sha256sum] = "9c66376e0035d44547612bf629890769a6178c3e7eafbcf95f1c6207ac0f352a" | ||
13 | |||
14 | UPSTREAM_CHECK_URI = "http://qt-apps.org/content/download.php?content=80325&id=1&tan=10417482" | ||
15 | |||
16 | inherit qt4x11 | ||
17 | |||
18 | do_install() { | ||
19 | install -d ${D}${bindir} | ||
20 | install -m 0755 ${S}/${BPN} ${D}${bindir} | ||
21 | } | ||