* [PATCH 1/7] gnupg: Update to 2.0.20
2013-05-22 0:40 [PATCH 0/7] Package Updates Saul Wold
@ 2013-05-22 0:40 ` Saul Wold
2013-05-22 0:40 ` [PATCH 2/7] desktop-file-utils: Update to 0.21 Saul Wold
` (5 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Saul Wold @ 2013-05-22 0:40 UTC (permalink / raw)
To: openembedded-core
Removed obsolete patch
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../gnupg/gnupg-2.0.19/GnuPG2-CVE-2012-6085.patch | 63 ----------------------
.../gnupg/{gnupg_2.0.19.bb => gnupg_2.0.20.bb} | 8 ++-
2 files changed, 3 insertions(+), 68 deletions(-)
delete mode 100644 meta/recipes-support/gnupg/gnupg-2.0.19/GnuPG2-CVE-2012-6085.patch
rename meta/recipes-support/gnupg/{gnupg_2.0.19.bb => gnupg_2.0.20.bb} (80%)
diff --git a/meta/recipes-support/gnupg/gnupg-2.0.19/GnuPG2-CVE-2012-6085.patch b/meta/recipes-support/gnupg/gnupg-2.0.19/GnuPG2-CVE-2012-6085.patch
deleted file mode 100644
index 64c3034..0000000
--- a/meta/recipes-support/gnupg/gnupg-2.0.19/GnuPG2-CVE-2012-6085.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-commit 498882296ffac7987c644aaf2a0aa108a2925471
-Author: Werner Koch <wk@gnupg.org>
-Date: Thu Dec 20 09:43:41 2012 +0100
-
- gpg: Import only packets which are allowed in a keyblock.
-
- * g10/import.c (valid_keyblock_packet): New.
- (read_block): Store only valid packets.
- --
-
- A corrupted key, which for example included a mangled public key
- encrypted packet, used to corrupt the keyring. This change skips all
- packets which are not allowed in a keyblock.
-
- GnuPG-bug-id: 1455
-
- (cherry-picked from commit 3a4b96e665fa639772854058737ee3d54ba0694e)
-
-Upstream-Status: Backport
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-
-diff --git a/g10/import.c b/g10/import.c
-index ba2439d..ad112d6 100644
---- a/g10/import.c
-+++ b/g10/import.c
-@@ -347,6 +347,27 @@ import_print_stats (void *hd)
- }
-
-
-+/* Return true if PKTTYPE is valid in a keyblock. */
-+static int
-+valid_keyblock_packet (int pkttype)
-+{
-+ switch (pkttype)
-+ {
-+ case PKT_PUBLIC_KEY:
-+ case PKT_PUBLIC_SUBKEY:
-+ case PKT_SECRET_KEY:
-+ case PKT_SECRET_SUBKEY:
-+ case PKT_SIGNATURE:
-+ case PKT_USER_ID:
-+ case PKT_ATTRIBUTE:
-+ case PKT_RING_TRUST:
-+ return 1;
-+ default:
-+ return 0;
-+ }
-+}
-+
-+
- /****************
- * Read the next keyblock from stream A.
- * PENDING_PKT should be initialzed to NULL
-@@ -424,7 +445,7 @@ read_block( IOBUF a, PACKET **pending_pkt, KBNODE *ret_root )
- }
- in_cert = 1;
- default:
-- if( in_cert ) {
-+ if (in_cert && valid_keyblock_packet (pkt->pkttype)) {
- if( !root )
- root = new_kbnode( pkt );
- else
diff --git a/meta/recipes-support/gnupg/gnupg_2.0.19.bb b/meta/recipes-support/gnupg/gnupg_2.0.20.bb
similarity index 80%
rename from meta/recipes-support/gnupg/gnupg_2.0.19.bb
rename to meta/recipes-support/gnupg/gnupg_2.0.20.bb
index 593250a..87acd00 100644
--- a/meta/recipes-support/gnupg/gnupg_2.0.19.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.0.20.bb
@@ -7,15 +7,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
DEPENDS = "${PTH} libassuan libksba zlib bzip2 readline libgcrypt"
PTH = "pth"
PTH_libc-uclibc = "npth"
-PR = "r5"
inherit autotools gettext
-SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \
- file://GnuPG2-CVE-2012-6085.patch"
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2"
-SRC_URI[md5sum] = "6a8589381ca1b0c1a921e9955f42b016"
-SRC_URI[sha256sum] = "efa23a8a925adb51c7d3b708c25b6d000300f5ce37de9bdec6453be7b419c622"
+SRC_URI[md5sum] = "9d18ee71bb0b10d40d1c8a393bdd7a89"
+SRC_URI[sha256sum] = "6e949b7f062cab8a3cf0910f91ecf04cabaad458c0aeeec66298651b8b04b79a"
EXTRA_OECONF = "--disable-ldap \
--disable-ccid-driver \
--
1.8.1.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 2/7] desktop-file-utils: Update to 0.21
2013-05-22 0:40 [PATCH 0/7] Package Updates Saul Wold
2013-05-22 0:40 ` [PATCH 1/7] gnupg: Update to 2.0.20 Saul Wold
@ 2013-05-22 0:40 ` Saul Wold
2013-05-22 0:40 ` [PATCH 3/7] mklibs: Update to 0.1.37 Saul Wold
` (4 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Saul Wold @ 2013-05-22 0:40 UTC (permalink / raw)
To: openembedded-core
COPYING had formating and Address changes
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
...-utils-native_0.15.bb => desktop-file-utils-native_0.21.bb} | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
rename meta/recipes-devtools/desktop-file-utils/{desktop-file-utils-native_0.15.bb => desktop-file-utils-native_0.21.bb} (57%)
diff --git a/meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.15.bb b/meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.21.bb
similarity index 57%
rename from meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.15.bb
rename to meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.21.bb
index b971c7e..13f1db6 100644
--- a/meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.15.bb
+++ b/meta/recipes-devtools/desktop-file-utils/desktop-file-utils-native_0.21.bb
@@ -3,14 +3,14 @@ HOMEPAGE = "http://www.freedesktop.org/wiki/Software/desktop-file-utils"
DESCRIPTION = "command line utilities to work with *.desktop files"
LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
DEPENDS = "glib-2.0-native"
-SRC_URI = "http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${PV}.tar.gz"
+SRC_URI = "http://freedesktop.org/software/desktop-file-utils/releases/desktop-file-utils-${PV}.tar.xz"
+
+SRC_URI[md5sum] = "fda5c312c9fb3b8d818fb54f2c34db82"
+SRC_URI[sha256sum] = "b6c9b860538ef1cffbcdfbc9cb578f85a080ad8c1207c8b3a39e9fd183f9782b"
inherit autotools native
S = "${WORKDIR}/desktop-file-utils-${PV}"
-
-SRC_URI[md5sum] = "2fe8ebe222fc33cd4a959415495b7eed"
-SRC_URI[sha256sum] = "c463d851fb057acd53800cfc4f8ae39dcbcad7f03b4bd547288e95b6de53b022"
--
1.8.1.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 3/7] mklibs: Update to 0.1.37
2013-05-22 0:40 [PATCH 0/7] Package Updates Saul Wold
2013-05-22 0:40 ` [PATCH 1/7] gnupg: Update to 2.0.20 Saul Wold
2013-05-22 0:40 ` [PATCH 2/7] desktop-file-utils: Update to 0.21 Saul Wold
@ 2013-05-22 0:40 ` Saul Wold
2013-05-22 0:40 ` [PATCH 4/7] libnl: Update to 3.2.22 Saul Wold
` (3 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Saul Wold @ 2013-05-22 0:40 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../mklibs/{mklibs-native_0.1.35.bb => mklibs-native_0.1.37.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-devtools/mklibs/{mklibs-native_0.1.35.bb => mklibs-native_0.1.37.bb} (80%)
diff --git a/meta/recipes-devtools/mklibs/mklibs-native_0.1.35.bb b/meta/recipes-devtools/mklibs/mklibs-native_0.1.37.bb
similarity index 80%
rename from meta/recipes-devtools/mklibs/mklibs-native_0.1.35.bb
rename to meta/recipes-devtools/mklibs/mklibs-native_0.1.37.bb
index b9cbd84..c37ea87 100644
--- a/meta/recipes-devtools/mklibs/mklibs-native_0.1.35.bb
+++ b/meta/recipes-devtools/mklibs/mklibs-native_0.1.37.bb
@@ -10,8 +10,8 @@ SRC_URI = "http://ftp.de.debian.org/debian/pool/main/m/mklibs/${BPN}_${PV}.tar.g
file://fix_STT_GNU_IFUNC.patch\
"
-SRC_URI[md5sum] = "3d2a4bd0bbf5ba964b0a1ecdafd1ea9a"
-SRC_URI[sha256sum] = "ccb1023dc1729c5a37ca6c3eca8e4bac3491116763c8820dfce8eea4845c8567"
+SRC_URI[md5sum] = "099cc99d51f09ea51e58a56e62a46af7"
+SRC_URI[sha256sum] = "9b2ef35618b1c2def1ca7a0a92c2b3029ef7f2080d894b6d1dbb3f313684d3a3"
inherit autotools gettext native pythonnative
--
1.8.1.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 4/7] libnl: Update to 3.2.22
2013-05-22 0:40 [PATCH 0/7] Package Updates Saul Wold
` (2 preceding siblings ...)
2013-05-22 0:40 ` [PATCH 3/7] mklibs: Update to 0.1.37 Saul Wold
@ 2013-05-22 0:40 ` Saul Wold
2013-05-22 0:40 ` [PATCH 5/7] mc: Update to 4.8.8 Saul Wold
` (2 subsequent siblings)
6 siblings, 0 replies; 11+ messages in thread
From: Saul Wold @ 2013-05-22 0:40 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-support/libnl/{libnl_3.2.21.bb => libnl_3.2.22.bb} | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename meta/recipes-support/libnl/{libnl_3.2.21.bb => libnl_3.2.22.bb} (90%)
diff --git a/meta/recipes-support/libnl/libnl_3.2.21.bb b/meta/recipes-support/libnl/libnl_3.2.22.bb
similarity index 90%
rename from meta/recipes-support/libnl/libnl_3.2.21.bb
rename to meta/recipes-support/libnl/libnl_3.2.22.bb
index 1e97603..36e98e1 100644
--- a/meta/recipes-support/libnl/libnl_3.2.21.bb
+++ b/meta/recipes-support/libnl/libnl_3.2.22.bb
@@ -3,7 +3,6 @@ HOMEPAGE = "http://www.infradead.org/~tgr/libnl/"
SECTION = "libs/network"
PE = "1"
-PR = "r0"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
@@ -14,8 +13,8 @@ SRC_URI = "http://www.infradead.org/~tgr/${BPN}/files/${BP}.tar.gz \
file://fix-pktloc_syntax_h-race.patch \
file://fix-pc-file.patch "
-SRC_URI[md5sum] = "6fe7136558a9071e70673dcda38545b3"
-SRC_URI[sha256sum] = "2dc80f043116ec8610d9d418f5f5e9283f3d9a3a48b8d51a8cb0146b3f279604"
+SRC_URI[md5sum] = "2e1c889494d274aca24ce5f6a748e66e"
+SRC_URI[sha256sum] = "c7c5f267dfeae0c1a530bf96b71fb7c8dbbb07d54beef49b6712d8d6166f629b"
inherit autotools pkgconfig
--
1.8.1.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 5/7] mc: Update to 4.8.8
2013-05-22 0:40 [PATCH 0/7] Package Updates Saul Wold
` (3 preceding siblings ...)
2013-05-22 0:40 ` [PATCH 4/7] libnl: Update to 3.2.22 Saul Wold
@ 2013-05-22 0:40 ` Saul Wold
2013-05-22 0:40 ` [PATCH 6/7] resolvconf: Update to 1.72 Saul Wold
2013-05-22 0:40 ` [PATCH 7/7] cmake: Update to 2.8.11 Saul Wold
6 siblings, 0 replies; 11+ messages in thread
From: Saul Wold @ 2013-05-22 0:40 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-extended/mc/{mc_4.8.7.bb => mc_4.8.8.bb} | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
rename meta/recipes-extended/mc/{mc_4.8.7.bb => mc_4.8.8.bb} (81%)
diff --git a/meta/recipes-extended/mc/mc_4.8.7.bb b/meta/recipes-extended/mc/mc_4.8.8.bb
similarity index 81%
rename from meta/recipes-extended/mc/mc_4.8.7.bb
rename to meta/recipes-extended/mc/mc_4.8.8.bb
index 0e8f3c1..20ae797 100644
--- a/meta/recipes-extended/mc/mc_4.8.7.bb
+++ b/meta/recipes-extended/mc/mc_4.8.8.bb
@@ -6,12 +6,10 @@ SECTION = "console/utils"
DEPENDS = "ncurses glib-2.0"
RDEPENDS_${PN} = "ncurses-terminfo"
-PR = "r0"
-
SRC_URI = "http://www.midnight-commander.org/downloads/${BPN}-${PV}.tar.bz2"
-SRC_URI[md5sum] = "b113e50682293a953141134969dba785"
-SRC_URI[sha256sum] = "4e9c45925b47650dac58d7556a89c3e9b4275e48976b6c13b63c2f8eed3a383b"
+SRC_URI[md5sum] = "324ff5a192d30d3a3b234c130550eb0a"
+SRC_URI[sha256sum] = "7b5e6f90e6709d1c1bcb4a2bf6d2a62b9494adef3ff4325ffdb3551c29e42a1c"
inherit autotools gettext
--
1.8.1.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 6/7] resolvconf: Update to 1.72
2013-05-22 0:40 [PATCH 0/7] Package Updates Saul Wold
` (4 preceding siblings ...)
2013-05-22 0:40 ` [PATCH 5/7] mc: Update to 4.8.8 Saul Wold
@ 2013-05-22 0:40 ` Saul Wold
2013-05-22 0:40 ` [PATCH 7/7] cmake: Update to 2.8.11 Saul Wold
6 siblings, 0 replies; 11+ messages in thread
From: Saul Wold @ 2013-05-22 0:40 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../resolvconf/{resolvconf_1.71.bb => resolvconf_1.72.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-connectivity/resolvconf/{resolvconf_1.71.bb => resolvconf_1.72.bb} (88%)
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.71.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb
similarity index 88%
rename from meta/recipes-connectivity/resolvconf/resolvconf_1.71.bb
rename to meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb
index d342a6e..a96dbff 100644
--- a/meta/recipes-connectivity/resolvconf/resolvconf_1.71.bb
+++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.72.bb
@@ -13,8 +13,8 @@ RDEPENDS_${PN} = "bash"
SRC_URI = "${DEBIAN_MIRROR}/main/r/resolvconf/resolvconf_${PV}.tar.gz"
-SRC_URI[md5sum] = "f073ab06b11584c8af86e7f84a56680e"
-SRC_URI[sha256sum] = "f2ec30a0e89330c6cbc3117efd60639da8305782979844ee4a1906e4b0ca230c"
+SRC_URI[md5sum] = "6bf631213c97f89261d997c78f7b9506"
+SRC_URI[sha256sum] = "196e8b5ef0a0282bf99e156113b058e65dd7f889cf4aea16597cddeef7e7cd43"
inherit allarch
--
1.8.1.4
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 7/7] cmake: Update to 2.8.11
2013-05-22 0:40 [PATCH 0/7] Package Updates Saul Wold
` (5 preceding siblings ...)
2013-05-22 0:40 ` [PATCH 6/7] resolvconf: Update to 1.72 Saul Wold
@ 2013-05-22 0:40 ` Saul Wold
2013-05-22 13:13 ` Otavio Salvador
6 siblings, 1 reply; 11+ messages in thread
From: Saul Wold @ 2013-05-22 0:40 UTC (permalink / raw)
To: openembedded-core
Rebased support-oe-qt4-tools-names as some of the changes where
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../cmake/cmake-native_2.8.10.2.bb | 7 ---
meta/recipes-devtools/cmake/cmake-native_2.8.11.bb | 5 ++
meta/recipes-devtools/cmake/cmake.inc | 2 -
.../cmake/cmake/support-oe-qt4-tools-names.patch | 70 +++++-----------------
.../cmake/{cmake_2.8.10.2.bb => cmake_2.8.11.bb} | 6 +-
5 files changed, 21 insertions(+), 69 deletions(-)
delete mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.10.2.bb
create mode 100644 meta/recipes-devtools/cmake/cmake-native_2.8.11.bb
rename meta/recipes-devtools/cmake/{cmake_2.8.10.2.bb => cmake_2.8.11.bb} (86%)
diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.10.2.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.10.2.bb
deleted file mode 100644
index 01860a7..0000000
--- a/meta/recipes-devtools/cmake/cmake-native_2.8.10.2.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require cmake.inc
-inherit native
-
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "097278785da7182ec0aea8769d06860c"
-SRC_URI[sha256sum] = "ce524fb39da06ee6d47534bbcec6e0b50422e18b62abc4781a4ba72ea2910eb1"
diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.11.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.11.bb
new file mode 100644
index 0000000..dfe103f
--- /dev/null
+++ b/meta/recipes-devtools/cmake/cmake-native_2.8.11.bb
@@ -0,0 +1,5 @@
+require cmake.inc
+inherit native
+
+SRC_URI[md5sum] = "be6008f2299613d23fe82ab53ef7472e"
+SRC_URI[sha256sum] = "20d0d3661797fa82c19e7a75c7315c640e001cb3238331ca170bb0fae27feee5"
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc
index b2cba5e..6144d51 100644
--- a/meta/recipes-devtools/cmake/cmake.inc
+++ b/meta/recipes-devtools/cmake/cmake.inc
@@ -9,8 +9,6 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://Copyright.txt;md5=bb2fa3a08736b842556f6171bb9e8ae1 \
file://Source/cmake.h;beginline=1;endline=10;md5=341736dae83c9e344b53eeb1bc7d7bc2"
-INC_PR = "r1"
-
CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV',1).split('.')[0:2])}"
SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \
diff --git a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch
index 258971b..0e311f7 100644
--- a/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch
+++ b/meta/recipes-devtools/cmake/cmake/support-oe-qt4-tools-names.patch
@@ -11,36 +11,20 @@ Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-Index: cmake-2.8.10.1/Modules/FindQt4.cmake
+Index: cmake-2.8.11/Modules/FindQt4.cmake
===================================================================
---- cmake-2.8.10.1.orig/Modules/FindQt4.cmake
-+++ cmake-2.8.10.1/Modules/FindQt4.cmake
-@@ -497,7 +497,7 @@ get_filename_component(qt_install_versio
- # check for qmake
- # Debian uses qmake-qt4
- # macports' Qt uses qmake-mac
--find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac
-+find_program(QT_QMAKE_EXECUTABLE NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac
- PATHS
- ENV QTDIR
- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]"
-@@ -982,13 +982,13 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
- endif()
+--- cmake-2.8.11.orig/Modules/FindQt4.cmake
++++ cmake-2.8.11/Modules/FindQt4.cmake
+@@ -569,7 +569,7 @@ endfunction()
- find_program(QT_MOC_EXECUTABLE
-- NAMES moc-qt4 moc
-+ NAMES moc-qt4 moc4 moc
- PATHS ${QT_BINARY_DIR}
- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
- )
+ set(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
- find_program(QT_UIC_EXECUTABLE
-- NAMES uic-qt4 uic
-+ NAMES uic-qt4 uic4 uic
- PATHS ${QT_BINARY_DIR}
- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
- )
-@@ -1000,49 +1000,49 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
+-set(_QT4_QMAKE_NAMES qmake qmake4 qmake-qt4 qmake-mac)
++set(_QT4_QMAKE_NAMES qmake qmake2 qmake4 qmake-qt4 qmake-mac)
+ _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION)
+
+ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
+@@ -1157,19 +1157,19 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
)
find_program(QT_RCC_EXECUTABLE
@@ -59,42 +43,16 @@ Index: cmake-2.8.10.1/Modules/FindQt4.cmake
find_program(QT_DBUSXML2CPP_EXECUTABLE
- NAMES qdbusxml2cpp
-+ NAMES qdbusxml2cpp4 qdbusxml2cpp
- PATHS ${QT_BINARY_DIR}
- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
- )
-
- find_program(QT_LUPDATE_EXECUTABLE
-- NAMES lupdate-qt4 lupdate
-+ NAMES lupdate-qt4 lupdate4 lupdate
++ NAMES qdbusxml2cp4 qdbusxml2cpp
PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
)
-
- find_program(QT_LRELEASE_EXECUTABLE
-- NAMES lrelease-qt4 lrelease
-+ NAMES lrelease-qt4 lrelease4 lrelease
- PATHS ${QT_BINARY_DIR}
- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+@@ -1187,7 +1187,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
)
find_program(QT_QCOLLECTIONGENERATOR_EXECUTABLE
- NAMES qcollectiongenerator-qt4 qcollectiongenerator
-+ NAMES qcollectiongenerator-qt4 qcollectiongenerator4 qcollectiongenerator
- PATHS ${QT_BINARY_DIR}
- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
- )
-
- find_program(QT_DESIGNER_EXECUTABLE
-- NAMES designer-qt4 designer
-+ NAMES designer-qt4 designer4 designer
- PATHS ${QT_BINARY_DIR}
- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
- )
-
- find_program(QT_LINGUIST_EXECUTABLE
-- NAMES linguist-qt4 linguist
-+ NAMES linguist-qt4 linguist4 linguist
++ NAMES qcollectiongenerator-qt4 qcollectiongenerator qcollectiongenerator4
PATHS ${QT_BINARY_DIR}
NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
)
diff --git a/meta/recipes-devtools/cmake/cmake_2.8.10.2.bb b/meta/recipes-devtools/cmake/cmake_2.8.11.bb
similarity index 86%
rename from meta/recipes-devtools/cmake/cmake_2.8.10.2.bb
rename to meta/recipes-devtools/cmake/cmake_2.8.11.bb
index 65f75b4..bc07155 100644
--- a/meta/recipes-devtools/cmake/cmake_2.8.10.2.bb
+++ b/meta/recipes-devtools/cmake/cmake_2.8.11.bb
@@ -4,12 +4,10 @@ inherit cmake
DEPENDS += "curl expat zlib libarchive ncurses"
-PR = "${INC_PR}.0"
-
SRC_URI += "file://dont-run-cross-binaries.patch"
-SRC_URI[md5sum] = "097278785da7182ec0aea8769d06860c"
-SRC_URI[sha256sum] = "ce524fb39da06ee6d47534bbcec6e0b50422e18b62abc4781a4ba72ea2910eb1"
+SRC_URI[md5sum] = "be6008f2299613d23fe82ab53ef7472e"
+SRC_URI[sha256sum] = "20d0d3661797fa82c19e7a75c7315c640e001cb3238331ca170bb0fae27feee5"
# Strip ${prefix} from ${docdir}, set result into docdir_stripped
python () {
--
1.8.1.4
^ permalink raw reply related [flat|nested] 11+ messages in thread