Skip to contentSkip to conversation

Minor fix to qt4 -dbg packages

PATCH Applied Mark Hatle 3 participants 4 messages Sep 7, 2012 – Sep 12, 2012

lore
Share & tools
lore

Mark Hatle

author
#0 lore raw

cover Minor fix to qt4 -dbg packages

The following changes since commit 0de1827a9601143b090f751ea702fdb65a936b77:

classes/mirrors: remove bogus gnutls mirror (2012-09-07 14:51:10 +0100)

are available in the git repository at:
git://git.yoctoproject.org/poky-contrib mhatle/qt4
http://git.yoctoproject.org/cgit.cgi//log/?h=mhatle/qt4

Mark Hatle (1):
qt4: Update qt4.inc to remove staticdev deps in -dbg packages

 meta/recipes-qt/qt4/qt4-embedded.inc |    2 +-
 meta/recipes-qt/qt4/qt4-x11-free.inc |    2 +-
 meta/recipes-qt/qt4/qt4.inc          |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
Signature · 1 line
1.7.3.4
author
#1 lore raw

PATCH 1/1 qt4: Update qt4.inc to remove staticdev deps in -dbg packages

It appears that the qt4.inc had a copy/paste error relating to creating a list of staticdev packages, that caused them to show up as dependencies in the -dbg package.

Signed-off-by Mark Hatle <[email protected]>
---
 meta/recipes-qt/qt4/qt4-embedded.inc |    2 +-
 meta/recipes-qt/qt4/qt4-x11-free.inc |    2 +-
 meta/recipes-qt/qt4/qt4.inc          |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-qt/qt4/qt4-embedded.inc +1 -1
index de1b88e..53eb652 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is
 SECTION = "libs"
 HOMEPAGE = "http://qt.nokia.com"
 DEPENDS += "directfb tslib"
-INC_PR = "r47"
+INC_PR = "r48"
 
 QT_BASE_LIB  ?= "libqt-embedded"
meta/recipes-qt/qt4/qt4-x11-free.inc +1 -1
index e229b85..0ae74f7 100644
@@ -6,7 +6,7 @@ SECTION = "x11/libs"
 DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
 PROVIDES += "qt4-x11"
 
-INC_PR = "r45"
+INC_PR = "r46"
 
 QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
 QT_GLFLAGS_qemux86 = "-opengl"
meta/recipes-qt/qt4/qt4.inc +1 -1
index b8c6baf..ba231ba 100644
@@ -61,7 +61,7 @@ python __anonymous () {
         staticdev_packages.append("%s-staticdev" % pkg)
     for name in d.getVar("OTHER_PACKAGES", True).split():
         dbg_packages.append("%s-dbg" % name)
-        dbg_packages.append("%s-staticdev" % name)
+        staticdev_packages.append("%s-staticdev" % name)
 
     for name in d.getVar("QT_EXTRA_LIBS", True).split():
         pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt", "").replace("_", "-") + "4"
Signature · 1 line
1.7.3.4
Acked-by on v1 1/1
#2 lore raw

Re: [PATCH 1/1] qt4: Update qt4.inc to remove staticdev deps in -dbg packages

Quoted 50 lines · On Friday 07 September 2012 17:07:11 Mark Hatle wrote:

It appears that the qt4.inc had a copy/paste error relating to creating a list of staticdev packages, that caused them to show up as dependencies in the -dbg package.

Signed-off-by Mark Hatle <[email protected]>
---
 meta/recipes-qt/qt4/qt4-embedded.inc |    2 +-
 meta/recipes-qt/qt4/qt4-x11-free.inc |    2 +-
 meta/recipes-qt/qt4/qt4.inc          |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
(quoted diff) +0 -0

b/meta/recipes-qt/qt4/qt4-embedded.inc index de1b88e..53eb652 100644

meta/recipes-qt/qt4/qt4-embedded.inc +0 -0
@@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application

framework -- this is SECTION = "libs"
HOMEPAGE = "http://qt.nokia.com"
DEPENDS += "directfb tslib"

meta/recipes-qt/qt4/qt4-embedded.inc +1 -1
-INC_PR = "r47"
+INC_PR = "r48"
 
 QT_BASE_LIB  ?= "libqt-embedded"
(quoted diff) +0 -0

b/meta/recipes-qt/qt4/qt4-x11-free.inc index e229b85..0ae74f7 100644

meta/recipes-qt/qt4/qt4-x11-free.inc +0 -0
@@ -6,7 +6,7 @@ SECTION = "x11/libs"
 DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext

libxrender libxrandr libxcursor" PROVIDES += "qt4-x11"

meta/recipes-qt/qt4/qt4-x11-free.inc +1 -1
-INC_PR = "r45"
+INC_PR = "r46"
 
 QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl',

'-no-opengl', d)} " QT_GLFLAGS_qemux86 = "-opengl"

meta/recipes-qt/qt4/qt4.inc +1 -1
index b8c6baf..ba231ba 100644
@@ -61,7 +61,7 @@ python __anonymous () {
         staticdev_packages.append("%s-staticdev" % pkg)
     for name in d.getVar("OTHER_PACKAGES", True).split():
         dbg_packages.append("%s-dbg" % name)
-        dbg_packages.append("%s-staticdev" % name)
+        staticdev_packages.append("%s-staticdev" % name)
 
     for name in d.getVar("QT_EXTRA_LIBS", True).split():
         pkg = d.getVar("QT_BASE_LIB", True) + name.lower().replace("qt",
Quoted 1 line

"").replace("_", "-") + "4"

Acked-by Paul Eggleton <[email protected]>

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
Applied
#3 lore raw
In reply to Mark Hatle
Quoted 8 lines · Mark Hatle

The following changes since commit 0de1827a9601143b090f751ea702fdb65a936b77:

   classes/mirrors: remove bogus gnutls mirror (2012-09-07 14:51:10 +0100)

are available in the git repository at:

   git://git.yoctoproject.org/poky-contrib mhatle/qt4
   http://git.yoctoproject.org/cgit.cgi//log/?h=mhatle/qt4
Quoted 8 lines

Mark Hatle (1):
qt4: Update qt4.inc to remove staticdev deps in -dbg packages

  meta/recipes-qt/qt4/qt4-embedded.inc |    2 +-
  meta/recipes-qt/qt4/qt4-x11-free.inc |    2 +-
  meta/recipes-qt/qt4/qt4.inc          |    2 +-
  3 files changed, 3 insertions(+), 3 deletions(-)

Merged into OE-Core

Thanks
Sau!