From eb3e23a1c96bc6b5738c8aa0ec023b93dc035880 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Wed, 29 Mar 2006 13:02:31 +0000 Subject: uicmoc4: upgrade from 4.0.1 to 4.1.1 NOTE: fix-mkspecs needs to be upgraded, 64bit platform patch needs to be added --- .../uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty | 0 .../uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch | 179 --------------------- .../uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty | 0 .../uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch | 179 +++++++++++++++++++++ packages/uicmoc/uicmoc4-native_4.0.1.bb | 42 ----- packages/uicmoc/uicmoc4-native_4.1.1.bb | 42 +++++ 6 files changed, 221 insertions(+), 221 deletions(-) delete mode 100644 packages/uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty delete mode 100644 packages/uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch create mode 100644 packages/uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty create mode 100644 packages/uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch delete mode 100644 packages/uicmoc/uicmoc4-native_4.0.1.bb create mode 100644 packages/uicmoc/uicmoc4-native_4.1.1.bb (limited to 'packages') diff --git a/packages/uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty b/packages/uicmoc/uicmoc4-native-4.0.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch b/packages/uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch deleted file mode 100644 index 491edde370..0000000000 --- a/packages/uicmoc/uicmoc4-native-4.0.1/fix-mkspecs.patch +++ /dev/null @@ -1,179 +0,0 @@ -Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/qws/linux-arm-g++/qmake.conf -=================================================================== ---- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/qws/linux-arm-g++/qmake.conf 2005-06-06 16:35:19.000000000 +0200 -+++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/qws/linux-arm-g++/qmake.conf 2005-06-15 21:26:15.000000000 +0200 -@@ -8,12 +8,12 @@ - QT += core gui network - QMAKE_INCREMENTAL_STYLE = sublib - --QMAKE_CC = arm-linux-gcc -+QMAKE_CC = $(CCACHE) arm-linux-gcc - QMAKE_LEX = flex - QMAKE_LEXFLAGS = - QMAKE_YACC = yacc - QMAKE_YACCFLAGS = -d --QMAKE_CFLAGS = -pipe -+QMAKE_CFLAGS = -pipe $(EXTRA_CFLAGS) - QMAKE_CFLAGS_WARN_ON = -Wall -W - QMAKE_CFLAGS_WARN_OFF = - QMAKE_CFLAGS_RELEASE = -O2 -@@ -22,8 +22,8 @@ - QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - QMAKE_CFLAGS_THREAD = -D_REENTRANT - --QMAKE_CXX = arm-linux-g++ --QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -fno-exceptions -fno-rtti -+QMAKE_CXX = $(CCACHE) arm-linux-g++ -+QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -fno-exceptions -fno-rtti $(EXTRA_CXXFLAGS) - QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON - QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF - QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -@@ -45,14 +45,14 @@ - - QMAKE_LINK = arm-linux-g++ - QMAKE_LINK_SHLIB = arm-linux-g++ --QMAKE_LFLAGS = -+QMAKE_LFLAGS = $(EXTRA_LFLAGS) - QMAKE_LFLAGS_RELEASE = - QMAKE_LFLAGS_DEBUG = - QMAKE_LFLAGS_SHLIB = -shared - QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB - QMAKE_LFLAGS_SONAME = -Wl,-soname, - QMAKE_LFLAGS_THREAD = --QMAKE_RPATH = -Wl,-rpath, -+QMAKE_RPATH = -Wl,-rpath-link, - - QMAKE_LIBS = - QMAKE_LIBS_DYNLOAD = -ldl -Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++/qmake.conf -=================================================================== ---- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/freebsd-g++/qmake.conf 2005-06-06 16:34:59.000000000 +0200 -+++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++/qmake.conf 2005-06-15 21:41:52.000000000 +0200 -@@ -7,7 +7,7 @@ - CONFIG += qt warn_on release link_prl - QT += core gui - --QMAKE_CC = gcc -+QMAKE_CC = $(CCACHE) gcc - QMAKE_LEX = flex - QMAKE_LEXFLAGS = - QMAKE_YACC = yacc -@@ -22,7 +22,7 @@ - QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE - --QMAKE_CXX = g++ -+QMAKE_CXX = $(CCACHE) g++ - QMAKE_CXXFLAGS = $$QMAKE_CFLAGS - QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS - QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++34/qmake.conf -=================================================================== ---- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/freebsd-g++34/qmake.conf 2005-06-06 16:34:59.000000000 +0200 -+++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++34/qmake.conf 2005-06-15 21:42:13.000000000 +0200 -@@ -7,7 +7,7 @@ - CONFIG += qt warn_on release link_prl - QT += core gui - --QMAKE_CC = gcc34 -+QMAKE_CC = $(CCACHE) gcc34 - QMAKE_LEX = flex - QMAKE_LEXFLAGS = - QMAKE_YACC = yacc -@@ -22,7 +22,7 @@ - QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE - --QMAKE_CXX = g++34 -+QMAKE_CXX = $(CCACHE) g++34 - QMAKE_CXXFLAGS = $$QMAKE_CFLAGS - QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS - QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++40/qmake.conf -=================================================================== ---- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/freebsd-g++40/qmake.conf 2005-06-06 16:34:59.000000000 +0200 -+++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++40/qmake.conf 2005-06-15 21:42:44.000000000 +0200 -@@ -7,7 +7,7 @@ - CONFIG += qt warn_on release link_prl - QT += core gui - --QMAKE_CC = gcc40 -+QMAKE_CC = $(CCACHE) gcc40 - QMAKE_LEX = flex - QMAKE_LEXFLAGS = - QMAKE_YACC = yacc -@@ -22,7 +22,7 @@ - QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE - --QMAKE_CXX = g++40 -+QMAKE_CXX = $(CCACHE) g++40 - QMAKE_CXXFLAGS = $$QMAKE_CFLAGS - QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS - QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-32/qmake.conf -=================================================================== ---- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/linux-g++-32/qmake.conf 2005-06-06 16:35:00.000000000 +0200 -+++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-32/qmake.conf 2005-06-15 21:40:50.000000000 +0200 -@@ -8,7 +8,7 @@ - QT += core gui - QMAKE_INCREMENTAL_STYLE = sublib - --QMAKE_CC = gcc -+QMAKE_CC = $(CCACHE) gcc - QMAKE_LEX = flex - QMAKE_LEXFLAGS = - QMAKE_YACC = yacc -@@ -27,7 +27,7 @@ - QMAKE_CFLAGS_THREAD = -D_REENTRANT - QMAKE_CFLAGS_HIDESYMS = -fvisibility=hidden - --QMAKE_CXX = g++ -+QMAKE_CXX = $(CCACHE) g++ - QMAKE_CXXFLAGS = $$QMAKE_CFLAGS - QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS - QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-64/qmake.conf -=================================================================== ---- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/linux-g++-64/qmake.conf 2005-06-06 16:35:00.000000000 +0200 -+++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-64/qmake.conf 2005-06-15 21:41:10.000000000 +0200 -@@ -11,7 +11,7 @@ - QT += core gui - QMAKE_INCREMENTAL_STYLE = sublib - --QMAKE_CC = gcc -+QMAKE_CC = $(CCACHE) gcc - QMAKE_LEX = flex - QMAKE_LEXFLAGS = - QMAKE_YACC = yacc -@@ -26,7 +26,7 @@ - QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses - QMAKE_CFLAGS_THREAD = -D_REENTRANT - --QMAKE_CXX = g++ -+QMAKE_CXX = $(CCACHE) g++ - QMAKE_CXXFLAGS = $$QMAKE_CFLAGS - QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS - QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++/qmake.conf -=================================================================== ---- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/linux-g++/qmake.conf 2005-06-06 16:35:00.000000000 +0200 -+++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++/qmake.conf 2005-06-15 21:40:24.000000000 +0200 -@@ -8,7 +8,7 @@ - QT += core gui - QMAKE_INCREMENTAL_STYLE = sublib - --QMAKE_CC = gcc -+QMAKE_CC = $(CCACHE) gcc - QMAKE_LEX = flex - QMAKE_LEXFLAGS = - QMAKE_YACC = yacc -@@ -27,7 +27,7 @@ - QMAKE_CFLAGS_THREAD = -D_REENTRANT - QMAKE_CFLAGS_HIDESYMS = -fvisibility=hidden - --QMAKE_CXX = g++ -+QMAKE_CXX = $(CCACHE) g++ - QMAKE_CXXFLAGS = $$QMAKE_CFLAGS - QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS - QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON diff --git a/packages/uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty b/packages/uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch b/packages/uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch new file mode 100644 index 0000000000..491edde370 --- /dev/null +++ b/packages/uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch @@ -0,0 +1,179 @@ +Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/qws/linux-arm-g++/qmake.conf +=================================================================== +--- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/qws/linux-arm-g++/qmake.conf 2005-06-06 16:35:19.000000000 +0200 ++++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/qws/linux-arm-g++/qmake.conf 2005-06-15 21:26:15.000000000 +0200 +@@ -8,12 +8,12 @@ + QT += core gui network + QMAKE_INCREMENTAL_STYLE = sublib + +-QMAKE_CC = arm-linux-gcc ++QMAKE_CC = $(CCACHE) arm-linux-gcc + QMAKE_LEX = flex + QMAKE_LEXFLAGS = + QMAKE_YACC = yacc + QMAKE_YACCFLAGS = -d +-QMAKE_CFLAGS = -pipe ++QMAKE_CFLAGS = -pipe $(EXTRA_CFLAGS) + QMAKE_CFLAGS_WARN_ON = -Wall -W + QMAKE_CFLAGS_WARN_OFF = + QMAKE_CFLAGS_RELEASE = -O2 +@@ -22,8 +22,8 @@ + QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses + QMAKE_CFLAGS_THREAD = -D_REENTRANT + +-QMAKE_CXX = arm-linux-g++ +-QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -fno-exceptions -fno-rtti ++QMAKE_CXX = $(CCACHE) arm-linux-g++ ++QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -fno-exceptions -fno-rtti $(EXTRA_CXXFLAGS) + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON + QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF + QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE +@@ -45,14 +45,14 @@ + + QMAKE_LINK = arm-linux-g++ + QMAKE_LINK_SHLIB = arm-linux-g++ +-QMAKE_LFLAGS = ++QMAKE_LFLAGS = $(EXTRA_LFLAGS) + QMAKE_LFLAGS_RELEASE = + QMAKE_LFLAGS_DEBUG = + QMAKE_LFLAGS_SHLIB = -shared + QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB + QMAKE_LFLAGS_SONAME = -Wl,-soname, + QMAKE_LFLAGS_THREAD = +-QMAKE_RPATH = -Wl,-rpath, ++QMAKE_RPATH = -Wl,-rpath-link, + + QMAKE_LIBS = + QMAKE_LIBS_DYNLOAD = -ldl +Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++/qmake.conf +=================================================================== +--- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/freebsd-g++/qmake.conf 2005-06-06 16:34:59.000000000 +0200 ++++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++/qmake.conf 2005-06-15 21:41:52.000000000 +0200 +@@ -7,7 +7,7 @@ + CONFIG += qt warn_on release link_prl + QT += core gui + +-QMAKE_CC = gcc ++QMAKE_CC = $(CCACHE) gcc + QMAKE_LEX = flex + QMAKE_LEXFLAGS = + QMAKE_YACC = yacc +@@ -22,7 +22,7 @@ + QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses + QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE + +-QMAKE_CXX = g++ ++QMAKE_CXX = $(CCACHE) g++ + QMAKE_CXXFLAGS = $$QMAKE_CFLAGS + QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON +Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++34/qmake.conf +=================================================================== +--- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/freebsd-g++34/qmake.conf 2005-06-06 16:34:59.000000000 +0200 ++++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++34/qmake.conf 2005-06-15 21:42:13.000000000 +0200 +@@ -7,7 +7,7 @@ + CONFIG += qt warn_on release link_prl + QT += core gui + +-QMAKE_CC = gcc34 ++QMAKE_CC = $(CCACHE) gcc34 + QMAKE_LEX = flex + QMAKE_LEXFLAGS = + QMAKE_YACC = yacc +@@ -22,7 +22,7 @@ + QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses + QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE + +-QMAKE_CXX = g++34 ++QMAKE_CXX = $(CCACHE) g++34 + QMAKE_CXXFLAGS = $$QMAKE_CFLAGS + QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON +Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++40/qmake.conf +=================================================================== +--- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/freebsd-g++40/qmake.conf 2005-06-06 16:34:59.000000000 +0200 ++++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/freebsd-g++40/qmake.conf 2005-06-15 21:42:44.000000000 +0200 +@@ -7,7 +7,7 @@ + CONFIG += qt warn_on release link_prl + QT += core gui + +-QMAKE_CC = gcc40 ++QMAKE_CC = $(CCACHE) gcc40 + QMAKE_LEX = flex + QMAKE_LEXFLAGS = + QMAKE_YACC = yacc +@@ -22,7 +22,7 @@ + QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses + QMAKE_CFLAGS_THREAD = -pthread -D_THREAD_SAFE + +-QMAKE_CXX = g++40 ++QMAKE_CXX = $(CCACHE) g++40 + QMAKE_CXXFLAGS = $$QMAKE_CFLAGS + QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON +Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-32/qmake.conf +=================================================================== +--- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/linux-g++-32/qmake.conf 2005-06-06 16:35:00.000000000 +0200 ++++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-32/qmake.conf 2005-06-15 21:40:50.000000000 +0200 +@@ -8,7 +8,7 @@ + QT += core gui + QMAKE_INCREMENTAL_STYLE = sublib + +-QMAKE_CC = gcc ++QMAKE_CC = $(CCACHE) gcc + QMAKE_LEX = flex + QMAKE_LEXFLAGS = + QMAKE_YACC = yacc +@@ -27,7 +27,7 @@ + QMAKE_CFLAGS_THREAD = -D_REENTRANT + QMAKE_CFLAGS_HIDESYMS = -fvisibility=hidden + +-QMAKE_CXX = g++ ++QMAKE_CXX = $(CCACHE) g++ + QMAKE_CXXFLAGS = $$QMAKE_CFLAGS + QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON +Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-64/qmake.conf +=================================================================== +--- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/linux-g++-64/qmake.conf 2005-06-06 16:35:00.000000000 +0200 ++++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++-64/qmake.conf 2005-06-15 21:41:10.000000000 +0200 +@@ -11,7 +11,7 @@ + QT += core gui + QMAKE_INCREMENTAL_STYLE = sublib + +-QMAKE_CC = gcc ++QMAKE_CC = $(CCACHE) gcc + QMAKE_LEX = flex + QMAKE_LEXFLAGS = + QMAKE_YACC = yacc +@@ -26,7 +26,7 @@ + QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses + QMAKE_CFLAGS_THREAD = -D_REENTRANT + +-QMAKE_CXX = g++ ++QMAKE_CXX = $(CCACHE) g++ + QMAKE_CXXFLAGS = $$QMAKE_CFLAGS + QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON +Index: qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++/qmake.conf +=================================================================== +--- qt-x11-opensource-desktop-4.0.0-rc1.orig/mkspecs/linux-g++/qmake.conf 2005-06-06 16:35:00.000000000 +0200 ++++ qt-x11-opensource-desktop-4.0.0-rc1/mkspecs/linux-g++/qmake.conf 2005-06-15 21:40:24.000000000 +0200 +@@ -8,7 +8,7 @@ + QT += core gui + QMAKE_INCREMENTAL_STYLE = sublib + +-QMAKE_CC = gcc ++QMAKE_CC = $(CCACHE) gcc + QMAKE_LEX = flex + QMAKE_LEXFLAGS = + QMAKE_YACC = yacc +@@ -27,7 +27,7 @@ + QMAKE_CFLAGS_THREAD = -D_REENTRANT + QMAKE_CFLAGS_HIDESYMS = -fvisibility=hidden + +-QMAKE_CXX = g++ ++QMAKE_CXX = $(CCACHE) g++ + QMAKE_CXXFLAGS = $$QMAKE_CFLAGS + QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS + QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON diff --git a/packages/uicmoc/uicmoc4-native_4.0.1.bb b/packages/uicmoc/uicmoc4-native_4.0.1.bb deleted file mode 100644 index 399215c0eb..0000000000 --- a/packages/uicmoc/uicmoc4-native_4.0.1.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x" -SECTION = "libs" -PRIORITY = "optional" -LICENSE = "GPL QPL" -PR = "r1" - -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 - -EXTRA_OECONF = "-qt-libjpeg -qt-gif -system-zlib \ - -no-nis -no-cups -no-exceptions \ - -no-accessibility -no-libjpeg \ - -no-nas-sound -no-sm \ - -no-xshape -no-xinerama \ - -no-xcursor -no-xrandr \ - -no-xrender -no-fontconfig \ - -no-tablet -no-xkb \ - -no-libpng \ - -verbose -release -fast -static " -EXTRA_OEMAKE = " " - -do_configure() { - echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" -} - -do_compile() { - unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS - cd ${S}/src/tools/moc && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/corelib && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/xml && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/tools/uic && oe_runmake CC="${CC}" CXX="${CXX}" - cd ${S}/src/tools/rcc && oe_runmake CC="${CC}" CXX="${CXX}" -} - -do_stage() { - install -m 0755 bin/moc ${STAGING_BINDIR}/moc4 - install -m 0755 bin/uic ${STAGING_BINDIR}/uic4 - install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4 -} diff --git a/packages/uicmoc/uicmoc4-native_4.1.1.bb b/packages/uicmoc/uicmoc4-native_4.1.1.bb new file mode 100644 index 0000000000..59bdd1bc40 --- /dev/null +++ b/packages/uicmoc/uicmoc4-native_4.1.1.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL QPL" +PR = "r0" + +SRC_URI = "ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-${PV}.tar.gz" + +S = "${WORKDIR}/qt-x11-opensource-src-${PV}" + +inherit native + +EXTRA_OECONF = "-qt-libjpeg -qt-gif -system-zlib \ + -no-nis -no-cups -no-exceptions \ + -no-accessibility -no-libjpeg \ + -no-nas-sound -no-sm \ + -no-xshape -no-xinerama \ + -no-xcursor -no-xrandr \ + -no-xrender -no-fontconfig \ + -no-tablet -no-xkb \ + -no-libpng \ + -verbose -release -fast -static " +EXTRA_OEMAKE = " " + +do_configure() { + echo yes | ./configure ${EXTRA_OECONF} || die "Configuring qt failed. EXTRA_OECONF was ${EXTRA_OECONF}" +} + +do_compile() { + unset CC CXX CFLAGS LFLAGS CXXFLAGS CPPFLAGS + cd ${S}/src/tools/moc && oe_runmake CC="${CC}" CXX="${CXX}" + cd ${S}/src/corelib && oe_runmake CC="${CC}" CXX="${CXX}" + cd ${S}/src/xml && oe_runmake CC="${CC}" CXX="${CXX}" + cd ${S}/src/tools/uic && oe_runmake CC="${CC}" CXX="${CXX}" + cd ${S}/src/tools/rcc && oe_runmake CC="${CC}" CXX="${CXX}" +} + +do_stage() { + install -m 0755 bin/moc ${STAGING_BINDIR}/moc4 + install -m 0755 bin/uic ${STAGING_BINDIR}/uic4 + install -m 0755 bin/rcc ${STAGING_BINDIR}/rcc4 +} -- cgit v1.2.3