summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-03-29 13:42:09 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-03-29 13:42:09 +0000
commit625af418604ed72ab53c850effd75b79146127c7 (patch)
tree8a457f756c500a0d4161866be71f9cd6c902a3b0
parent1c5f4e12f098c086752379d0e35ef23f25292180 (diff)
parentc157ad6287aa649414f24cbf3170c9e9ed7b41a6 (diff)
merge of 880318acc987af76af9d75d11ad618c846ec19b6
and e7ac37620f70e9c84aa128f610b17504d6c115fd
-rw-r--r--packages/uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty (renamed from packages/uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty)0
-rw-r--r--packages/uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch (renamed from packages/uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch)0
-rw-r--r--packages/uicmoc/uicmoc4-native_4.1.1.bb (renamed from packages/uicmoc/uicmoc4-native_4.0.1.bb)6
3 files changed, 3 insertions, 3 deletions
diff --git a/packages/uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty b/packages/uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty
+++ b/packages/uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty
diff --git a/packages/uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch b/packages/uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch
index 491edde370..491edde370 100644
--- a/packages/uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch
+++ b/packages/uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch
diff --git a/packages/uicmoc/uicmoc4-native_4.0.1.bb b/packages/uicmoc/uicmoc4-native_4.1.1.bb
index 399215c0eb..59bdd1bc40 100644
--- a/packages/uicmoc/uicmoc4-native_4.0.1.bb
+++ b/packages/uicmoc/uicmoc4-native_4.1.1.bb
@@ -2,10 +2,10 @@ DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "GPL QPL"
-PR = "r1"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz"
-SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz \
- file://fix-mkspecs.patch;patch=1 "
S = "${WORKDIR}/qt-x11-opensource-src-${PV}"
inherit native