[oe-commits] org.oe.dev qt4: update qt/e and qt4-x11 to 4.4.1

[koen commit]

qt4: update qt/e and qt4-x11 to 4.4.1

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 45bd65b695cf5ba23eb106afe24d304318694f55
ViewMTN: http://monotone.openembedded.org/revision/info/45bd65b695cf5ba23eb106afe24d304318694f55
Files:
1
packages/qt4/qt-embedded-4.4.0
packages/qt4/qt-embedded-4.4.1
packages/qt4/qt-embedded_4.4.0.bb
packages/qt4/qt-embedded_4.4.1.bb
packages/qt4/qt4-x11-free-4.4.0
packages/qt4/qt4-x11-free-4.4.1
packages/qt4/qt4-x11-free_4.4.0.bb
packages/qt4/qt4-x11-free_4.4.1.bb
packages/qt4/qtopia-core_4.4.0.bb
packages/qt4/qtopia-core_4.4.1.bb
packages/qt4/qt-embedded-4.4.1/0001-cross-compile.patch
packages/qt4/qt4-x11-free-4.4.1/0001-cross-compile.patch
Diffs:

#
# mt diff -rfb8251202a8f666d6066a7268ab6bdc6e08c5a42 -r45bd65b695cf5ba23eb106afe24d304318694f55
#
#
#
# rename "packages/qt4/qt-embedded-4.4.0"
#     to "packages/qt4/qt-embedded-4.4.1"
# 
# rename "packages/qt4/qt-embedded_4.4.0.bb"
#     to "packages/qt4/qt-embedded_4.4.1.bb"
# 
# rename "packages/qt4/qt4-x11-free-4.4.0"
#     to "packages/qt4/qt4-x11-free-4.4.1"
# 
# rename "packages/qt4/qt4-x11-free_4.4.0.bb"
#     to "packages/qt4/qt4-x11-free_4.4.1.bb"
# 
# rename "packages/qt4/qtopia-core_4.4.0.bb"
#     to "packages/qt4/qtopia-core_4.4.1.bb"
# 
# patch "packages/qt4/qt-embedded-4.4.1/0001-cross-compile.patch"
#  from [2efe9cfa1a60cd53e732b11c53b902203fd7049c]
#    to [26d8a55edd82f434fd9c5dad007ac1e833f1cbb5]
# 
# patch "packages/qt4/qt-embedded_4.4.1.bb"
#  from [b18569128b0fbec67fb005585e346a2e604cf533]
#    to [459a2f77d308beb98a0a3259ec15a4cfa47968f9]
# 
# patch "packages/qt4/qt4-x11-free-4.4.1/0001-cross-compile.patch"
#  from [2efe9cfa1a60cd53e732b11c53b902203fd7049c]
#    to [26d8a55edd82f434fd9c5dad007ac1e833f1cbb5]
# 
# patch "packages/qt4/qtopia-core_4.4.1.bb"
#  from [1bd65f7336a5b9896b56d4d721d8dec8bcf8129a]
#    to [35c0f0cd78346ba1b921705dc2d93c32a3ec463d]
#
============================================================
--- packages/qt4/qt-embedded-4.4.1/0001-cross-compile.patch	2efe9cfa1a60cd53e732b11c53b902203fd7049c
+++ packages/qt4/qt-embedded-4.4.1/0001-cross-compile.patch	26d8a55edd82f434fd9c5dad007ac1e833f1cbb5
@@ -1,6 +1,6 @@
---- /tmp/configure	2008-07-08 10:01:36.000000000 +0200
-+++ qt-embedded-linux-opensource-src-4.4.0/configure	2008-07-08 10:23:04.000000000 +0200
-@@ -762,7 +762,7 @@
+--- /tmp/configure	2008-08-01 20:59:48.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.4.1/configure	2008-08-01 21:02:05.000000000 +0200
+@@ -765,7 +765,7 @@
              UNKNOWN_ARG=yes
          fi
          ;;
@@ -9,7 +9,7 @@
          VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
          shift
          VAL="$1"
-@@ -1179,7 +1179,10 @@
+@@ -1182,7 +1182,10 @@
      xplatform)
          XPLATFORM="$VAL"
          ;;
@@ -21,12 +21,12 @@
          if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
              CFG_DEBUG_RELEASE="$VAL"
          else
-@@ -2417,6 +2420,8 @@
-     ARCH=$HOST_ARCH
+@@ -2437,6 +2440,8 @@
+     CFG_ARCH=$CFG_HOST_ARCH
  fi
  
-+ARCH="$CROSSARCH"
++CFG_ARCH="$CROSSARCH"
 +
- if [ -d "$relpath/src/corelib/arch/$ARCH" ]; then
+ if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
      if [ "$OPT_VERBOSE" = "yes" ]; then
+         echo "    '$CFG_ARCH' is supported"
-         echo "    '$ARCH' is supported"
============================================================
--- packages/qt4/qt-embedded_4.4.0.bb	b18569128b0fbec67fb005585e346a2e604cf533
+++ packages/qt4/qt-embedded_4.4.1.bb	459a2f77d308beb98a0a3259ec15a4cfa47968f9
@@ -3,7 +3,7 @@ RPROVIDES_${PN} = "qtopia-core"
 PROVIDES += "qtopia-core"
 RPROVIDES_${PN} = "qtopia-core"
 
-PR = "r4"
+PR = "r0"
 
 SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-embedded-linux-opensource-src-${PV}.tar.bz2 \
            file://qconfig-oe.h \
============================================================
--- packages/qt4/qt4-x11-free-4.4.1/0001-cross-compile.patch	2efe9cfa1a60cd53e732b11c53b902203fd7049c
+++ packages/qt4/qt4-x11-free-4.4.1/0001-cross-compile.patch	26d8a55edd82f434fd9c5dad007ac1e833f1cbb5
@@ -1,6 +1,6 @@
---- /tmp/configure	2008-07-08 10:01:36.000000000 +0200
-+++ qt-embedded-linux-opensource-src-4.4.0/configure	2008-07-08 10:23:04.000000000 +0200
-@@ -762,7 +762,7 @@
+--- /tmp/configure	2008-08-01 20:59:48.000000000 +0200
++++ qt-embedded-linux-opensource-src-4.4.1/configure	2008-08-01 21:02:05.000000000 +0200
+@@ -765,7 +765,7 @@
              UNKNOWN_ARG=yes
          fi
          ;;
@@ -9,7 +9,7 @@
          VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
          shift
          VAL="$1"
-@@ -1179,7 +1179,10 @@
+@@ -1182,7 +1182,10 @@
      xplatform)
          XPLATFORM="$VAL"
          ;;
@@ -21,12 +21,12 @@
          if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
              CFG_DEBUG_RELEASE="$VAL"
          else
-@@ -2417,6 +2420,8 @@
-     ARCH=$HOST_ARCH
+@@ -2437,6 +2440,8 @@
+     CFG_ARCH=$CFG_HOST_ARCH
  fi
  
-+ARCH="$CROSSARCH"
++CFG_ARCH="$CROSSARCH"
 +
- if [ -d "$relpath/src/corelib/arch/$ARCH" ]; then
+ if [ -d "$relpath/src/corelib/arch/$CFG_ARCH" ]; then
      if [ "$OPT_VERBOSE" = "yes" ]; then
+         echo "    '$CFG_ARCH' is supported"
-         echo "    '$ARCH' is supported"
============================================================
--- packages/qt4/qtopia-core_4.4.0.bb	1bd65f7336a5b9896b56d4d721d8dec8bcf8129a
+++ packages/qt4/qtopia-core_4.4.1.bb	35c0f0cd78346ba1b921705dc2d93c32a3ec463d
@@ -2,5 +2,5 @@ DEFAULT_PREFERENCE_angstrom = "1"
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_angstrom = "1"
 
+#keep in sync with qt-embedded_${PV}.bb
+PR = "r0"
-#keep in sync with qt-embedded_4.4.0.bb
-PR = "r4"