From fb7fe0575cd86bab21bf51107eed54c4aab21480 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Thu, 10 May 2007 13:48:16 +0000 Subject: minimo_cvs.bb : update to 0.2+SRCDATE taken from poky, added PE = "1" as ipkg thinkgs 0.016>0.02 minimo_0.016+cvs.bb : removed as _cvs is more uptodate. --- packages/mozilla/minimo/minimo.patch | 843 +++++++++++++---------------------- packages/mozilla/minimo_0.016+cvs.bb | 150 ------- packages/mozilla/minimo_cvs.bb | 178 ++++++-- 3 files changed, 456 insertions(+), 715 deletions(-) delete mode 100644 packages/mozilla/minimo_0.016+cvs.bb (limited to 'packages') diff --git a/packages/mozilla/minimo/minimo.patch b/packages/mozilla/minimo/minimo.patch index a1f9291167..8894ee7f45 100644 --- a/packages/mozilla/minimo/minimo.patch +++ b/packages/mozilla/minimo/minimo.patch @@ -1,567 +1,356 @@ Index: mozilla/content/html/content/src/nsFormSubmission.cpp =================================================================== -RCS file: /cvsroot/mozilla/content/html/content/src/nsFormSubmission.cpp,v -retrieving revision 1.46 -diff --context=3 -r1.46 nsFormSubmission.cpp -*** mozilla/content/html/content/src/nsFormSubmission.cpp 13 Jul 2005 16:55:59 -0000 1.46 ---- mozilla/content/html/content/src/nsFormSubmission.cpp 21 Jul 2006 00:27:14 -0000 -*************** -*** 1315,1325 **** - nsresult rv = NS_OK; - - nsCAutoString charset(aCharset); -- // canonical name is passed so that we just have to check against -- // *our* canonical names listed in charsetaliases.properties -- if (charset.EqualsLiteral("ISO-8859-1")) { -- charset.AssignLiteral("windows-1252"); -- } - - // use UTF-8 for UTF-16* and UTF-32* (per WHATWG and existing practice of - // MS IE/Opera). ---- 1315,1320 ---- +--- mozilla.orig/content/html/content/src/nsFormSubmission.cpp 2005-07-13 18:55:59.000000000 +0200 ++++ mozilla/content/html/content/src/nsFormSubmission.cpp 2007-05-10 12:11:20.000000000 +0200 +@@ -1315,11 +1315,6 @@ + nsresult rv = NS_OK; + + nsCAutoString charset(aCharset); +- // canonical name is passed so that we just have to check against +- // *our* canonical names listed in charsetaliases.properties +- if (charset.EqualsLiteral("ISO-8859-1")) { +- charset.AssignLiteral("windows-1252"); +- } + + // use UTF-8 for UTF-16* and UTF-32* (per WHATWG and existing practice of + // MS IE/Opera). Index: mozilla/embedding/base/Makefile.in =================================================================== -RCS file: /cvsroot/mozilla/embedding/base/Makefile.in,v -retrieving revision 1.34.8.2 -diff --context=3 -r1.34.8.2 Makefile.in -*** mozilla/embedding/base/Makefile.in 14 Feb 2006 05:28:31 -0000 1.34.8.2 ---- mozilla/embedding/base/Makefile.in 21 Jul 2006 00:27:14 -0000 -*************** -*** 43,48 **** ---- 43,49 ---- - - MODULE = embed_base - LIBRARY_NAME = embed_base_s -+ EXPORT_LIBRARY = 1 - XPIDL_MODULE = embed_base - - include $(DEPTH)/config/autoconf.mk +--- mozilla.orig/embedding/base/Makefile.in 2006-02-14 06:28:31.000000000 +0100 ++++ mozilla/embedding/base/Makefile.in 2007-05-10 12:11:20.000000000 +0200 +@@ -43,6 +43,7 @@ + + MODULE = embed_base + LIBRARY_NAME = embed_base_s ++EXPORT_LIBRARY = 1 + XPIDL_MODULE = embed_base + + include $(DEPTH)/config/autoconf.mk Index: mozilla/js/src/Makefile.in =================================================================== -RCS file: /cvsroot/mozilla/js/src/Makefile.in,v -retrieving revision 3.95.4.4 -diff --context=3 -r3.95.4.4 Makefile.in -*** mozilla/js/src/Makefile.in 7 Jul 2006 02:12:02 -0000 3.95.4.4 ---- mozilla/js/src/Makefile.in 21 Jul 2006 00:27:14 -0000 -*************** -*** 46,51 **** ---- 46,52 ---- - - MODULE = js - LIBRARY_NAME = mozjs -+ EXPORT_LIBRARY = 1 - LIB_IS_C_ONLY = 1 - GRE_MODULE = 1 - +--- mozilla.orig/js/src/Makefile.in 2006-07-28 00:56:20.000000000 +0200 ++++ mozilla/js/src/Makefile.in 2007-05-10 12:11:21.000000000 +0200 +@@ -46,6 +46,7 @@ + + MODULE = js + LIBRARY_NAME = mozjs ++EXPORT_LIBRARY = 1 + LIB_IS_C_ONLY = 1 + GRE_MODULE = 1 + Index: mozilla/minimo/Makefile.in =================================================================== -RCS file: /cvsroot/mozilla/minimo/Makefile.in,v -retrieving revision 1.1.2.2 -diff --context=3 -r1.1.2.2 Makefile.in -*** mozilla/minimo/Makefile.in 29 Jun 2006 06:11:30 -0000 1.1.2.2 ---- mozilla/minimo/Makefile.in 21 Jul 2006 00:27:14 -0000 -*************** -*** 41,46 **** - - include $(DEPTH)/config/autoconf.mk - -! DIRS = config components chrome locales customization base - - include $(topsrcdir)/config/rules.mk ---- 41,46 ---- - - include $(DEPTH)/config/autoconf.mk - -! DIRS = config chrome locales customization base - - include $(topsrcdir)/config/rules.mk +--- mozilla.orig/minimo/Makefile.in 2006-07-24 21:40:53.000000000 +0200 ++++ mozilla/minimo/Makefile.in 2007-05-10 12:13:46.000000000 +0200 +@@ -41,6 +41,6 @@ + + include $(DEPTH)/config/autoconf.mk + +-DIRS = config components chrome locales customization base extensions ++DIRS = config chrome locales customization base extensions + + include $(topsrcdir)/config/rules.mk Index: mozilla/minimo/base/Makefile.in =================================================================== -RCS file: /cvsroot/mozilla/minimo/base/Makefile.in,v -retrieving revision 1.3.2.7 -diff --context=3 -r1.3.2.7 Makefile.in -*** mozilla/minimo/base/Makefile.in 18 Apr 2006 21:04:38 -0000 1.3.2.7 ---- mozilla/minimo/base/Makefile.in 21 Jul 2006 00:27:14 -0000 -*************** -*** 95,101 **** - - # this should move into the toolkit! - LOCAL_INCLUDES = -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/ -- CPPSRCS += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp - - ifdef WINCE - RCINCLUDE = wince/SplashScreen.rc ---- 95,100 ---- -*************** -*** 139,148 **** - endif - - -- FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-comps -- FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-names -- FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-libs -- - include $(topsrcdir)/config/static-config.mk - - EXTRA_DEPS += $(STATIC_EXTRA_DEPS) ---- 138,143 ---- -*************** -*** 176,189 **** - # (same as in mozilla/js/src/Makefile.in) - ifdef WINCE - LDFLAGS += -OPT:NOICF - endif - -- export:: -- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp . -- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp . -- -- -- GARBAGE += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp - - ifdef WINCE - package:: ---- 171,181 ---- - # (same as in mozilla/js/src/Makefile.in) - ifdef WINCE - LDFLAGS += -OPT:NOICF -+ else -+ # Hack to work around libxpcom_core.a / libunicharutil_s.a link order problem. -+ LDFLAGS += -u NS_StringGetData_P -u NS_StringGetMutableData_P - endif - - - ifdef WINCE - package:: +--- mozilla.orig/minimo/base/Makefile.in 2006-08-09 17:42:26.000000000 +0200 ++++ mozilla/minimo/base/Makefile.in 2007-05-10 12:11:21.000000000 +0200 +@@ -96,7 +96,6 @@ + + # this should move into the toolkit! + LOCAL_INCLUDES = -I$(srcdir) -I$(topsrcdir)/xpfe/browser/src/ +-CPPSRCS += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp + + ifdef WINCE + RCINCLUDE = wince/SplashScreen.rc +@@ -143,10 +142,6 @@ + endif + + +-FINAL_LINK_COMPS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-comps +-FINAL_LINK_COMP_NAMES=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-names +-FINAL_LINK_LIBS=$(topsrcdir)/minimo/base/$(FINAL_PLATFORM)/minimo-link-libs +- + include $(topsrcdir)/config/static-config.mk + + EXTRA_DEPS += $(STATIC_EXTRA_DEPS) +@@ -180,14 +175,11 @@ + # (same as in mozilla/js/src/Makefile.in) + ifdef WINCE + LDFLAGS += -OPT:NOICF ++else ++# Hack to work around libxpcom_core.a / libunicharutil_s.a link order problem. ++LDFLAGS += -u NS_StringGetData_P -u NS_StringGetMutableData_P + endif + +-export:: +- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserStatusFilter.cpp . +- $(NSINSTALL) $(topsrcdir)/xpfe/browser/src/nsBrowserInstance.cpp . +- +- +-GARBAGE += nsBrowserStatusFilter.cpp nsBrowserInstance.cpp + + ifdef WINCE + package:: Index: mozilla/minimo/base/Minimo.cpp =================================================================== -RCS file: /cvsroot/mozilla/minimo/base/Minimo.cpp,v -retrieving revision 1.1.2.11 -diff --context=3 -r1.1.2.11 Minimo.cpp -*** mozilla/minimo/base/Minimo.cpp 11 Jul 2006 19:37:05 -0000 1.1.2.11 ---- mozilla/minimo/base/Minimo.cpp 21 Jul 2006 00:27:15 -0000 -*************** -*** 781,789 **** - CreateListenerWindow(); - #endif - -! #ifdef MOZ_WIDGET_GTK2 - gtk_set_locale(); - gtk_init(&argc, &argv); - #endif - - #ifdef HACKY_PRE_LOAD_LIBRARY ---- 781,794 ---- - CreateListenerWindow(); - #endif - -! #if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_GTK2) -! #if defined(MOZ_WIDGET_GTK) - gtk_set_locale(); -+ #endif - gtk_init(&argc, &argv); -+ -+ gtk_widget_set_default_visual(gdk_rgb_get_visual()); -+ gtk_widget_set_default_colormap(gdk_rgb_get_cmap()); - #endif - - #ifdef HACKY_PRE_LOAD_LIBRARY +--- mozilla.orig/minimo/base/Minimo.cpp 2006-10-27 22:30:36.000000000 +0200 ++++ mozilla/minimo/base/Minimo.cpp 2007-05-10 12:13:21.000000000 +0200 +@@ -813,6 +813,8 @@ + #ifdef MOZ_WIDGET_GTK2 + gtk_set_locale(); + gtk_init(&argc, &argv); ++ gtk_widget_set_default_visual(gdk_rgb_get_visual()); ++ gtk_widget_set_default_colormap(gdk_rgb_get_cmap()); + #endif + + #ifdef HACKY_PRE_LOAD_LIBRARY Index: mozilla/minimo/base/SplashScreen.cpp =================================================================== -RCS file: /cvsroot/mozilla/minimo/base/SplashScreen.cpp,v -retrieving revision 1.1.2.3 -diff --context=3 -r1.1.2.3 SplashScreen.cpp -*** mozilla/minimo/base/SplashScreen.cpp 11 Jul 2006 18:44:17 -0000 1.1.2.3 ---- mozilla/minimo/base/SplashScreen.cpp 21 Jul 2006 00:27:15 -0000 -*************** -*** 180,188 **** ---- 180,203 ---- - void KillSplashScreen() {} - void GetScreenSize(unsigned long* x, unsigned long* y) - { -+ #ifdef MOZ_WIDGET_GTK2 -+ GdkDisplay* display = gdk_display_get_default(); -+ if (display != NULL) -+ { -+ GdkScreen *screen; -+ screen = gdk_display_get_default_screen(display); -+ *x = gdk_screen_get_width(screen); -+ *y = gdk_screen_get_height(screen); -+ } -+ else -+ { -+ #endif - // we need to figure this out. - *x = 240; - *y = 320; -+ #ifdef MOZ_WIDGET_GTK2 -+ } -+ #endif - } - - -Index: mozilla/minimo/chrome/content/minimo.js -=================================================================== -RCS file: /cvsroot/mozilla/minimo/chrome/content/minimo.js,v -retrieving revision 1.9.2.90 -diff --context=3 -r1.9.2.90 minimo.js -*** mozilla/minimo/chrome/content/minimo.js 11 Jul 2006 19:37:04 -0000 1.9.2.90 ---- mozilla/minimo/chrome/content/minimo.js 21 Jul 2006 00:27:16 -0000 -*************** -*** 1313,1319 **** - 43 const FIND_LINKS = 2; - http://lxr.mozilla.org/mozilla/source/toolkit/components/typeaheadfind/content/findBar.js - */ -! gBrowser.fastFind.find(vQuery,0); - } - } catch (e) { - onErrorHandler(e); ---- 1313,1319 ---- - 43 const FIND_LINKS = 2; - http://lxr.mozilla.org/mozilla/source/toolkit/components/typeaheadfind/content/findBar.js - */ -! gBrowser.fastFind.find(vQuery,0,this.mHasFocus); - } - } catch (e) { - onErrorHandler(e); -*************** -*** 1324,1330 **** - - function DoBrowserFindNext() { - try { -! gBrowser.fastFind.findNext(); - } catch (e) { - onErrorHandler(e); - } ---- 1324,1330 ---- - - function DoBrowserFindNext() { - try { -! gBrowser.fastFind.findNext(this.mHasFocus); - } catch (e) { - onErrorHandler(e); - } +--- mozilla.orig/minimo/base/SplashScreen.cpp 2006-08-21 21:00:24.000000000 +0200 ++++ mozilla/minimo/base/SplashScreen.cpp 2007-05-10 12:11:22.000000000 +0200 +@@ -202,9 +202,24 @@ + void KillSplashScreen() {} + void GetScreenSize(unsigned long* x, unsigned long* y) + { ++#ifdef MOZ_WIDGET_GTK2 ++ GdkDisplay* display = gdk_display_get_default(); ++ if (display != NULL) ++ { ++ GdkScreen *screen; ++ screen = gdk_display_get_default_screen(display); ++ *x = gdk_screen_get_width(screen); ++ *y = gdk_screen_get_height(screen); ++ } ++ else ++ { ++#endif + // we need to figure this out. + *x = 240; + *y = 320; ++#ifdef MOZ_WIDGET_GTK2 ++ } ++#endif + } + + Index: mozilla/minimo/config/linux_package.sh =================================================================== -RCS file: /cvsroot/mozilla/minimo/config/linux_package.sh,v -retrieving revision 1.8.2.3 -diff --context=3 -r1.8.2.3 linux_package.sh -*** mozilla/minimo/config/linux_package.sh 30 Jun 2006 16:35:19 -0000 1.8.2.3 ---- mozilla/minimo/config/linux_package.sh 21 Jul 2006 00:27:16 -0000 -*************** -*** 29,37 **** - cp -pRL bin/libnssckbi.so minimo - cp -pRL bin/libsmime3.so minimo - cp -pRL bin/libsoftokn3.so minimo -- cp -pRL bin/libsoftokn3.chk minimo - cp -pRL bin/libfreebl3.so minimo -- cp -pRL bin/libfreebl3.chk minimo - cp -pRL bin/libssl3.so minimo - - mkdir -p minimo/chrome ---- 29,35 ---- -*************** -*** 62,69 **** - cp -pRL bin/components/nsHelperAppDlg.js minimo/components - cp -pRL bin/components/nsProgressDialog.js minimo/components - -- cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components -- - mkdir -p minimo/greprefs - cp -pRL bin/greprefs/* minimo/greprefs - ---- 60,65 ---- -*************** -*** 80,86 **** - - echo Linking XPT files. - -! bin/xpt_link minimo/components/all.xpt bin/components/*.xpt - - echo Chewing on chrome - ---- 76,82 ---- - - echo Linking XPT files. - -! host/bin/host_xpt_link minimo/components/all.xpt bin/components/*.xpt - - echo Chewing on chrome - +--- mozilla.orig/minimo/config/linux_package.sh 2006-06-30 18:35:19.000000000 +0200 ++++ mozilla/minimo/config/linux_package.sh 2007-05-10 12:11:22.000000000 +0200 +@@ -29,9 +29,7 @@ + cp -pRL bin/libnssckbi.so minimo + cp -pRL bin/libsmime3.so minimo + cp -pRL bin/libsoftokn3.so minimo +-cp -pRL bin/libsoftokn3.chk minimo + cp -pRL bin/libfreebl3.so minimo +-cp -pRL bin/libfreebl3.chk minimo + cp -pRL bin/libssl3.so minimo + + mkdir -p minimo/chrome +@@ -62,8 +60,6 @@ + cp -pRL bin/components/nsHelperAppDlg.js minimo/components + cp -pRL bin/components/nsProgressDialog.js minimo/components + +-cp -pRL bin/extensions/spatial-navigation@extensions.mozilla.org/components/* minimo/components +- + mkdir -p minimo/greprefs + cp -pRL bin/greprefs/* minimo/greprefs + +@@ -80,7 +76,7 @@ + + echo Linking XPT files. + +-bin/xpt_link minimo/components/all.xpt bin/components/*.xpt ++host/bin/host_xpt_link minimo/components/all.xpt bin/components/*.xpt + + echo Chewing on chrome + Index: mozilla/profile/dirserviceprovider/src/Makefile.in =================================================================== -RCS file: /cvsroot/mozilla/profile/dirserviceprovider/src/Makefile.in,v -retrieving revision 1.7 -diff --context=3 -r1.7 Makefile.in -*** mozilla/profile/dirserviceprovider/src/Makefile.in 6 Apr 2005 03:35:21 -0000 1.7 ---- mozilla/profile/dirserviceprovider/src/Makefile.in 21 Jul 2006 00:27:16 -0000 -*************** -*** 44,49 **** ---- 44,50 ---- - - MODULE = profdirserviceprovider - LIBRARY_NAME = profdirserviceprovider_s -+ EXPORT_LIBRARY = 1 - MOZILLA_INTERNAL_API = 1 - - REQUIRES = xpcom \ +--- mozilla.orig/profile/dirserviceprovider/src/Makefile.in 2005-04-06 05:35:21.000000000 +0200 ++++ mozilla/profile/dirserviceprovider/src/Makefile.in 2007-05-10 12:11:23.000000000 +0200 +@@ -44,6 +44,7 @@ + + MODULE = profdirserviceprovider + LIBRARY_NAME = profdirserviceprovider_s ++EXPORT_LIBRARY = 1 + MOZILLA_INTERNAL_API = 1 + + REQUIRES = xpcom \ Index: mozilla/security/coreconf/Linux.mk =================================================================== -RCS file: /cvsroot/mozilla/security/coreconf/Linux.mk,v -retrieving revision 1.18.18.1 -diff --context=3 -r1.18.18.1 Linux.mk -*** mozilla/security/coreconf/Linux.mk 3 Feb 2006 22:26:36 -0000 1.18.18.1 ---- mozilla/security/coreconf/Linux.mk 21 Jul 2006 00:27:16 -0000 -*************** -*** 117,122 **** ---- 117,126 ---- - OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE - CPU_ARCH = mips - else -+ ifeq ($(OS_TEST),arm) -+ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -+ CPU_ARCH = arm -+ else - OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE - CPU_ARCH = x86 - endif -*************** -*** 133,138 **** ---- 137,143 ---- - endif - endif - endif -+ endif - - - LIBC_TAG = _glibc +--- mozilla.orig/security/coreconf/Linux.mk 2006-02-03 23:26:36.000000000 +0100 ++++ mozilla/security/coreconf/Linux.mk 2007-05-10 12:11:23.000000000 +0200 +@@ -117,6 +117,10 @@ + OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE + CPU_ARCH = mips + else ++ifeq ($(OS_TEST),arm) ++ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE ++ CPU_ARCH = arm ++else + OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE + CPU_ARCH = x86 + endif +@@ -133,6 +137,7 @@ + endif + endif + endif ++endif + + + LIBC_TAG = _glibc Index: mozilla/security/coreconf/arch.mk =================================================================== -RCS file: /cvsroot/mozilla/security/coreconf/arch.mk,v -retrieving revision 1.17.14.2 -diff --context=3 -r1.17.14.2 arch.mk -*** mozilla/security/coreconf/arch.mk 3 Feb 2006 22:26:36 -0000 1.17.14.2 ---- mozilla/security/coreconf/arch.mk 21 Jul 2006 00:27:16 -0000 -*************** -*** 60,77 **** - 64BIT_TAG= - endif - -! OS_ARCH := $(subst /,_,$(shell uname -s)) - - # - # Attempt to differentiate between sparc and x86 Solaris - # - -! OS_TEST := $(shell uname -m) -! ifeq ($(OS_TEST),i86pc) -! OS_RELEASE := $(shell uname -r)_$(OS_TEST) -! else -! OS_RELEASE := $(shell uname -r) -! endif - - # - # Force the IRIX64 machines to use IRIX. ---- 60,73 ---- - 64BIT_TAG= - endif - -! OS_ARCH := Linux - - # - # Attempt to differentiate between sparc and x86 Solaris - # - -! OS_TEST := arm -! OS_RELEASE := 2.6 - - # - # Force the IRIX64 machines to use IRIX. +--- mozilla.orig/security/coreconf/arch.mk 2006-02-03 23:26:36.000000000 +0100 ++++ mozilla/security/coreconf/arch.mk 2007-05-10 12:11:24.000000000 +0200 +@@ -60,18 +60,14 @@ + 64BIT_TAG= + endif + +-OS_ARCH := $(subst /,_,$(shell uname -s)) ++OS_ARCH := Linux + + # + # Attempt to differentiate between sparc and x86 Solaris + # + +-OS_TEST := $(shell uname -m) +-ifeq ($(OS_TEST),i86pc) +- OS_RELEASE := $(shell uname -r)_$(OS_TEST) +-else +- OS_RELEASE := $(shell uname -r) +-endif ++OS_TEST := arm ++OS_RELEASE := 2.6 + + # + # Force the IRIX64 machines to use IRIX. Index: mozilla/toolkit/components/build/Makefile.in =================================================================== -RCS file: /cvsroot/mozilla/toolkit/components/build/Makefile.in,v -retrieving revision 1.24.2.10 -diff --context=3 -r1.24.2.10 Makefile.in -*** mozilla/toolkit/components/build/Makefile.in 13 Jul 2006 20:08:29 -0000 1.24.2.10 ---- mozilla/toolkit/components/build/Makefile.in 21 Jul 2006 00:27:17 -0000 -*************** -*** 112,118 **** - $(NULL) - - SHARED_LIBRARY_LIBS = \ -- ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \ - $(NULL) - - ifdef MOZ_XPINSTALL ---- 112,117 ---- +--- mozilla.orig/toolkit/components/build/Makefile.in 2006-07-13 22:08:29.000000000 +0200 ++++ mozilla/toolkit/components/build/Makefile.in 2007-05-10 12:11:27.000000000 +0200 +@@ -112,7 +112,6 @@ + $(NULL) + + SHARED_LIBRARY_LIBS = \ +- ../startup/src/$(LIB_PREFIX)appstartup_s.$(LIB_SUFFIX) \ + $(NULL) + + ifdef MOZ_XPINSTALL Index: mozilla/toolkit/components/startup/src/Makefile.in =================================================================== -RCS file: /cvsroot/mozilla/toolkit/components/startup/src/Makefile.in,v -retrieving revision 1.7 -diff --context=3 -r1.7 Makefile.in -*** mozilla/toolkit/components/startup/src/Makefile.in 27 Jul 2005 20:42:44 -0000 1.7 ---- mozilla/toolkit/components/startup/src/Makefile.in 21 Jul 2006 00:27:17 -0000 -*************** -*** 43,48 **** ---- 43,49 ---- - - MODULE = toolkitcomps - LIBRARY_NAME = appstartup_s -+ EXPORT_LIBRARY = 1 - FORCE_STATIC_LIB = 1 - LIBXUL_LIBRARY = 1 - +--- mozilla.orig/toolkit/components/startup/src/Makefile.in 2005-07-27 22:42:44.000000000 +0200 ++++ mozilla/toolkit/components/startup/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200 +@@ -43,6 +43,7 @@ + + MODULE = toolkitcomps + LIBRARY_NAME = appstartup_s ++EXPORT_LIBRARY = 1 + FORCE_STATIC_LIB = 1 + LIBXUL_LIBRARY = 1 + Index: mozilla/toolkit/xre/Makefile.in =================================================================== -RCS file: /cvsroot/mozilla/toolkit/xre/Makefile.in,v -retrieving revision 1.48.2.3 -diff --context=3 -r1.48.2.3 Makefile.in -*** mozilla/toolkit/xre/Makefile.in 30 Sep 2005 19:52:44 -0000 1.48.2.3 ---- mozilla/toolkit/xre/Makefile.in 21 Jul 2006 00:27:17 -0000 -*************** -*** 45,51 **** - - MODULE = xulapp - LIBRARY_NAME = xulapp_s -- EXPORT_LIBRARY = 1 - LIBXUL_LIBRARY = 1 - - REQUIRES = \ ---- 45,50 ---- -*************** -*** 176,189 **** - - include $(topsrcdir)/config/rules.mk - -- ifdef BUILD_STATIC_LIBS -- export:: -- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMP_NAMES) Apprunner -- # embedding/browser/gtk/src/Makefile.in sucks! we need to add an empty line to -- # FINAL_LINK_COMPS to keep the two lists in sync :-( -- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) "" -- endif -- - LOCAL_INCLUDES += \ - -I$(srcdir) \ - -I$(topsrcdir)/xpfe/bootstrap \ ---- 175,180 ---- +--- mozilla.orig/toolkit/xre/Makefile.in 2007-02-06 08:13:20.000000000 +0100 ++++ mozilla/toolkit/xre/Makefile.in 2007-05-10 12:11:27.000000000 +0200 +@@ -45,7 +45,6 @@ + + MODULE = xulapp + LIBRARY_NAME = xulapp_s +-EXPORT_LIBRARY = 1 + LIBXUL_LIBRARY = 1 + + REQUIRES = \ +@@ -180,14 +179,6 @@ + + include $(topsrcdir)/config/rules.mk + +-ifdef BUILD_STATIC_LIBS +-export:: +- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMP_NAMES) Apprunner +-# embedding/browser/gtk/src/Makefile.in sucks! we need to add an empty line to +-# FINAL_LINK_COMPS to keep the two lists in sync :-( +- @$(PERL) -I$(MOZILLA_DIR)/config $(MOZILLA_DIR)/config/build-list.pl $(FINAL_LINK_COMPS) "" +-endif +- + LOCAL_INCLUDES += \ + -I$(srcdir) \ + -I$(topsrcdir)/xpfe/bootstrap \ Index: mozilla/xpcom/build/Makefile.in =================================================================== -RCS file: /cvsroot/mozilla/xpcom/build/Makefile.in,v -retrieving revision 1.90.2.2 -diff --context=3 -r1.90.2.2 Makefile.in -*** mozilla/xpcom/build/Makefile.in 29 Jan 2006 16:51:02 -0000 1.90.2.2 ---- mozilla/xpcom/build/Makefile.in 21 Jul 2006 00:27:17 -0000 -*************** -*** 61,67 **** - endif - - # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list -! #EXPORT_LIBRARY = 1 - GRE_MODULE = 1 - MOZILLA_INTERNAL_API = 1 - ---- 61,67 ---- - endif - - # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list -! EXPORT_LIBRARY = 1 - GRE_MODULE = 1 - MOZILLA_INTERNAL_API = 1 - +--- mozilla.orig/xpcom/build/Makefile.in 2006-01-29 17:51:02.000000000 +0100 ++++ mozilla/xpcom/build/Makefile.in 2007-05-10 12:11:27.000000000 +0200 +@@ -61,7 +61,7 @@ + endif + + # Do not set EXPORT_LIBRARY as we do not want xpcom in the static libs list +-#EXPORT_LIBRARY = 1 ++EXPORT_LIBRARY = 1 + GRE_MODULE = 1 + MOZILLA_INTERNAL_API = 1 + Index: mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp =================================================================== -RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp,v -retrieving revision 1.7 -diff --context=3 -r1.7 xptcstubs_arm.cpp -*** mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 18 Apr 2004 14:18:18 -0000 1.7 ---- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 21 Jul 2006 00:27:17 -0000 -*************** -*** 45,53 **** - #endif - - /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */ -! static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); - -! static nsresult - PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) - { - #define PARAM_BUFFER_COUNT 16 ---- 45,53 ---- - #endif - - /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */ -! nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); - -! nsresult - PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) - { - #define PARAM_BUFFER_COUNT 16 +--- mozilla.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 2004-04-18 16:18:18.000000000 +0200 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 2007-05-10 12:11:27.000000000 +0200 +@@ -45,9 +45,9 @@ + #endif + + /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */ +-static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); ++nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); + +-static nsresult ++nsresult + PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) + { + #define PARAM_BUFFER_COUNT 16 Index: mozilla/xpfe/browser/src/Makefile.in =================================================================== -RCS file: /cvsroot/mozilla/xpfe/browser/src/Makefile.in,v -retrieving revision 1.70 -diff --context=3 -r1.70 Makefile.in -*** mozilla/xpfe/browser/src/Makefile.in 18 Mar 2005 21:23:45 -0000 1.70 ---- mozilla/xpfe/browser/src/Makefile.in 21 Jul 2006 00:27:17 -0000 -*************** -*** 44,49 **** ---- 44,50 ---- - - MODULE = browser - LIBRARY_NAME = mozbrwsr_s -+ EXPORT_LIBRARY = 1 - FORCE_STATIC_LIB = 1 - LIBXUL_LIBRARY = 1 - MODULE_NAME = nsBrowserModule +--- mozilla.orig/xpfe/browser/src/Makefile.in 2005-03-18 22:23:45.000000000 +0100 ++++ mozilla/xpfe/browser/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200 +@@ -44,6 +44,7 @@ + + MODULE = browser + LIBRARY_NAME = mozbrwsr_s ++EXPORT_LIBRARY = 1 + FORCE_STATIC_LIB = 1 + LIBXUL_LIBRARY = 1 + MODULE_NAME = nsBrowserModule Index: mozilla/xpfe/components/build/Makefile.in =================================================================== -RCS file: /cvsroot/mozilla/xpfe/components/build/Makefile.in,v -retrieving revision 1.69.8.1 -diff --context=3 -r1.69.8.1 Makefile.in -*** mozilla/xpfe/components/build/Makefile.in 27 Sep 2005 00:15:25 -0000 1.69.8.1 ---- mozilla/xpfe/components/build/Makefile.in 21 Jul 2006 00:27:17 -0000 -*************** -*** 44,50 **** - - MODULE = appcomps - LIBRARY_NAME = appcomps -- EXPORT_LIBRARY = 1 - IS_COMPONENT = 1 - MODULE_NAME = application - LIBXUL_LIBRARY = 1 ---- 44,49 ---- +--- mozilla.orig/xpfe/components/build/Makefile.in 2005-09-27 02:15:25.000000000 +0200 ++++ mozilla/xpfe/components/build/Makefile.in 2007-05-10 12:11:27.000000000 +0200 +@@ -44,7 +44,6 @@ + + MODULE = appcomps + LIBRARY_NAME = appcomps +-EXPORT_LIBRARY = 1 + IS_COMPONENT = 1 + MODULE_NAME = application + LIBXUL_LIBRARY = 1 Index: mozilla/xpfe/components/filepicker/src/Makefile.in =================================================================== -RCS file: /cvsroot/mozilla/xpfe/components/filepicker/src/Makefile.in,v -retrieving revision 1.9.8.1 -diff --context=3 -r1.9.8.1 Makefile.in -*** mozilla/xpfe/components/filepicker/src/Makefile.in 22 May 2006 16:29:32 -0000 1.9.8.1 ---- mozilla/xpfe/components/filepicker/src/Makefile.in 21 Jul 2006 00:27:17 -0000 -*************** -*** 47,53 **** - MODULE = filepicker - LIBRARY_NAME = fileview - SHORT_LIBNAME = fileview -- EXPORT_LIBRARY = 1 - IS_COMPONENT = 1 - MODULE_NAME = nsFileViewModule - MOZILLA_INTERNAL_API = 1 ---- 47,52 ---- +--- mozilla.orig/xpfe/components/filepicker/src/Makefile.in 2006-05-22 18:29:32.000000000 +0200 ++++ mozilla/xpfe/components/filepicker/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200 +@@ -47,7 +47,6 @@ + MODULE = filepicker + LIBRARY_NAME = fileview + SHORT_LIBNAME = fileview +-EXPORT_LIBRARY = 1 + IS_COMPONENT = 1 + MODULE_NAME = nsFileViewModule + MOZILLA_INTERNAL_API = 1 Index: mozilla/xpfe/components/find/src/Makefile.in =================================================================== -RCS file: /cvsroot/mozilla/xpfe/components/find/src/Makefile.in,v -retrieving revision 1.37 -diff --context=3 -r1.37 Makefile.in -*** mozilla/xpfe/components/find/src/Makefile.in 18 Mar 2005 21:23:46 -0000 1.37 ---- mozilla/xpfe/components/find/src/Makefile.in 21 Jul 2006 00:27:17 -0000 -*************** -*** 45,51 **** - MODULE = appcomps - XPIDL_MODULE = mozfind - LIBRARY_NAME = mozfind -- EXPORT_LIBRARY = 1 - IS_COMPONENT = 1 - MODULE_NAME = nsFindComponent - LIBXUL_LIBRARY = 1 ---- 45,50 ---- +--- mozilla.orig/xpfe/components/find/src/Makefile.in 2005-03-18 22:23:46.000000000 +0100 ++++ mozilla/xpfe/components/find/src/Makefile.in 2007-05-10 12:11:27.000000000 +0200 +@@ -45,7 +45,6 @@ + MODULE = appcomps + XPIDL_MODULE = mozfind + LIBRARY_NAME = mozfind +-EXPORT_LIBRARY = 1 + IS_COMPONENT = 1 + MODULE_NAME = nsFindComponent + LIBXUL_LIBRARY = 1 diff --git a/packages/mozilla/minimo_0.016+cvs.bb b/packages/mozilla/minimo_0.016+cvs.bb deleted file mode 100644 index ad44c0523e..0000000000 --- a/packages/mozilla/minimo_0.016+cvs.bb +++ /dev/null @@ -1,150 +0,0 @@ -DESCRIPTION = "A minimal version of the Mozilla web browser for mobile devices" -SECTION = "x11/network" -LICENSE = "MPL/GPL/LGPL" -HOMEPAGE = "http://www.mozilla.org/projects/minimo/" -PRIORITY = "optional" - -DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+" - -CVSSVR="cvs-mirror.mozilla.org" -BRTAG = "MOZILLA_1_8_BRANCH" -MOZDATE = "20060720" - -PV = "0.016+cvs${MOZDATE}" -PR = "r5" - -SRC_URI = "cvs://anonymous@${CVSSVR}/cvsroot;module=mozilla;tag=${BRTAG};date=${MOZDATE} \ - file://minimo.patch;patch=1 \ - file://bug-322806.diff;patch=1 \ - file://mozconfig file://minimo \ - file://eabi-fix.patch;patch=1 \ - file://eabi-fix2.patch;patch=1 \ - file://eabi-fix3.patch;patch=1 \ - file://minimo.desktop file://minimo.png" - -inherit autotools - -S = "${WORKDIR}/mozilla" - -export MOZCONFIG = "${WORKDIR}/mozconfig" - -export CROSS_COMPILE="1" -export ac_cv_prog_HOST_CC="${BUILD_CC}" -export ac_cv_prog_HOST_CFLAGS="${BUILD_CFLAGS}" -export ac_cv_prog_HOST_CXX="${BUILD_CXX}" -export ac_cv_prog_HOST_CXXFLAGS="${BUILD_CXXFLAGS}" - -mozdir="${libdir}/mozilla-minimo" - -EXTRA_OECONF += "--build=${BUILD_SYS} --host=${BUILD_SYS} --target=${TARGET_SYS} " - -do_configure() { - cd ${S} - oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure - sed -i s:${TARGET_PREFIX}strip:echo:g config/autoconf.mk -} - -do_compile() { - cd ${S} - oe_runmake -f client.mk build -} - -do_install() { - cd ${WORKDIR} - - install -d ${D}${bindir} - install -m 0755 minimo ${D}${bindir} - - install -d ${D}${datadir}/applications - install -m 0644 minimo.desktop ${D}${datadir}/applications - - install -d ${D}/${datadir}/pixmaps - install -m 0644 minimo.png ${D}${datadir}/pixmaps - - cd ${S} - - ./minimo/config/linux_package.sh ${S} ${S}/minimo/config - - cd dist/minimo - - install -d ${D}${mozdir} - install -m 0755 minimo ${D}${mozdir} - install -m 0755 libfreebl3.so ${D}${mozdir} - install -m 0755 libnspr4.so ${D}${mozdir} - install -m 0755 libnss3.so ${D}${mozdir} - install -m 0755 libnssckbi.so ${D}${mozdir} - install -m 0755 libplc4.so ${D}${mozdir} - install -m 0755 libplds4.so ${D}${mozdir} - install -m 0755 libsmime3.so ${D}${mozdir} - install -m 0755 libsoftokn3.so ${D}${mozdir} - install -m 0755 libssl3.so ${D}${mozdir} - - install -d ${D}${mozdir}/chrome - install -m 0644 chrome/classic.jar ${D}${mozdir}/chrome - install -m 0644 chrome/classic.manifest ${D}${mozdir}/chrome - install -m 0644 chrome/en-US.jar ${D}${mozdir}/chrome - install -m 0644 chrome/en-US.manifest ${D}${mozdir}/chrome - install -m 0644 chrome/minimo-skin-vga.jar ${D}${mozdir}/chrome - install -m 0644 chrome/minimo-skin-vga.manifest ${D}${mozdir}/chrome - install -m 0644 chrome/minimo-skin.jar ${D}${mozdir}/chrome - install -m 0644 chrome/minimo-skin.manifest ${D}${mozdir}/chrome - install -m 0644 chrome/minimo.jar ${D}${mozdir}/chrome - install -m 0644 chrome/minimo.manifest ${D}${mozdir}/chrome - install -m 0644 chrome/pippki.jar ${D}${mozdir}/chrome - install -m 0644 chrome/pippki.manifest ${D}${mozdir}/chrome - install -m 0644 chrome/toolkit.jar ${D}${mozdir}/chrome - install -m 0644 chrome/toolkit.manifest ${D}${mozdir}/chrome - - install -d ${D}${mozdir}/components - install -m 0644 components/all.xpt ${D}${mozdir}/components - install -m 0644 components/nsHelperAppDlg.js ${D}${mozdir}/components - install -m 0644 components/nsProgressDialog.js ${D}${mozdir}/components - - install -d ${D}${mozdir}/greprefs - install -m 0644 greprefs/all.js ${D}${mozdir}/greprefs - install -m 0644 greprefs/security-prefs.js ${D}${mozdir}/greprefs - - install -d ${D}${mozdir}/res - install -m 0644 res/forms.css ${D}${mozdir}/res - install -m 0644 res/html.css ${D}${mozdir}/res - install -m 0644 res/quirk.css ${D}${mozdir}/res - install -m 0644 res/ua.css ${D}${mozdir}/res - install -m 0644 res/arrow.gif ${D}${mozdir}/res - install -m 0644 res/arrowd.gif ${D}${mozdir}/res - install -m 0644 res/broken-image.gif ${D}${mozdir}/res - install -m 0644 res/loading-image.gif ${D}${mozdir}/res - install -m 0644 res/charsetData.properties ${D}${mozdir}/res - install -m 0644 res/charsetalias.properties ${D}${mozdir}/res - install -m 0644 res/langGroups.properties ${D}${mozdir}/res - install -m 0644 res/language.properties ${D}${mozdir}/res - install -m 0644 res/unixcharset.properties ${D}${mozdir}/res - - install -d ${D}${mozdir}/res/dtd - install -m 0644 res/dtd/xhtml11.dtd ${D}${mozdir}/res/dtd - - install -d ${D}${mozdir}/res/entityTables - install -m 0644 res/entityTables/html40Latin1.properties ${D}${mozdir}/res/entityTables - install -m 0644 res/entityTables/html40Special.properties ${D}${mozdir}/res/entityTables - install -m 0644 res/entityTables/html40Symbols.properties ${D}${mozdir}/res/entityTables - install -m 0644 res/entityTables/htmlEntityVersions.properties ${D}${mozdir}/res/entityTables - install -m 0644 res/entityTables/transliterate.properties ${D}${mozdir}/res/entityTables - - install -d ${D}${mozdir}/res/fonts - install -m 0644 res/fonts/fontEncoding.properties ${D}${mozdir}/res/fonts - install -m 0644 res/fonts/pangoFontEncoding.properties ${D}${mozdir}/res/fonts - - install -d ${D}${mozdir}/res/html - install -m 0644 res/html/gopher-audio.gif ${D}${mozdir}/res/html - install -m 0644 res/html/gopher-binary.gif ${D}${mozdir}/res/html - install -m 0644 res/html/gopher-find.gif ${D}${mozdir}/res/html - install -m 0644 res/html/gopher-image.gif ${D}${mozdir}/res/html - install -m 0644 res/html/gopher-menu.gif ${D}${mozdir}/res/html - install -m 0644 res/html/gopher-movie.gif ${D}${mozdir}/res/html - install -m 0644 res/html/gopher-sound.gif ${D}${mozdir}/res/html - install -m 0644 res/html/gopher-telnet.gif ${D}${mozdir}/res/html - install -m 0644 res/html/gopher-text.gif ${D}${mozdir}/res/html - install -m 0644 res/html/gopher-unknown.gif ${D}${mozdir}/res/html -} - -FILES_${PN}-dbg += "${libdir}/mozilla-minimo/.debug*" -FILES_${PN} += "${mozdir}" diff --git a/packages/mozilla/minimo_cvs.bb b/packages/mozilla/minimo_cvs.bb index 2d6744a6c1..834192ad0f 100644 --- a/packages/mozilla/minimo_cvs.bb +++ b/packages/mozilla/minimo_cvs.bb @@ -1,49 +1,151 @@ -DESCRIPTION = "A minimal version of the Mozilla web browser" -HOMEPAGE="http://www.mozilla.org/projects/minimo/" -SRC_URI = "cvs://anonymous@cvs-mirror.mozilla.org/cvsroot;module=mozilla \ - file://no-xmb.patch;patch=1 \ - file://host_ldflags_fix.patch;patch=1 \ - file://minimo.png file://minimo.desktop" -S = "${WORKDIR}/mozilla" -SECTION = "x11" +DESCRIPTION = "A minimal version of the Mozilla web browser for mobile devices" +SECTION = "x11/network" +LICENSE = "MPL/GPL/LGPL" +HOMEPAGE = "http://www.mozilla.org/projects/minimo/" PRIORITY = "optional" -PV = "0.0+cvs${SRCDATE}" -FILES_${PN} += "${libdir}/mozilla-minimo" -PR = "r8" -LICENSE = "MPL/LGPL/GPL" -inherit mozilla +DEPENDS = "libxrender xt xft fontconfig freetype libidl dbus-glib pango atk gtk+ libidl-native" + +CVSSVR="cvs-mirror.mozilla.org" +BRTAG = "MOZILLA_1_8_BRANCH" +MOZDATE = "20070510" + +PV = "0.02+cvs${MOZDATE}" +PE = "1" + +SRC_URI = "cvs://anonymous@${CVSSVR}/cvsroot;module=mozilla;tag=${BRTAG};date=${MOZDATE} \ + file://minimo.patch;patch=1 \ + file://bug-322806.diff;patch=1 \ + file://mozconfig file://minimo \ + file://eabi-fix.patch;patch=1 \ + file://eabi-fix2.patch;patch=1 \ + file://eabi-fix3.patch;patch=1 \ + file://minimo.desktop file://minimo.png" + +inherit autotools + +S = "${WORKDIR}/mozilla" + +export MOZCONFIG = "${WORKDIR}/mozconfig" -EXTRA_OECONF += "--enable-application=minimo --disable-native-uconv" -export MOZ_CO_PROJECT="minimo" +export CROSS_COMPILE="1" +export ac_cv_prog_HOST_CC="${BUILD_CC}" +export ac_cv_prog_HOST_CFLAGS="${BUILD_CFLAGS}" +export ac_cv_prog_HOST_CXX="${BUILD_CXX}" +export ac_cv_prog_HOST_CXXFLAGS="${BUILD_CXXFLAGS}" +export HOST_LIBIDL_CONFIG = "libIDL-config-2" -export MINIMO="1" -export MOZ_OBJDIR="${WORKDIR}/build-${TARGET_SYS}" +mozdir="${libdir}/mozilla-minimo" -require mozilla-cvs.inc +EXTRA_OECONF += "--build=${BUILD_SYS} --host=${BUILD_SYS} --target=${TARGET_SYS} " -do_compile () { - mozilla_do_compile +do_configure() { + cd ${S} + oe_runmake -f client.mk CONFIGURE_ARGS="${EXTRA_OECONF}" configure + sed -i s:${TARGET_PREFIX}strip:echo:g config/autoconf.mk } -mozdir="${D}${libdir}/mozilla-minimo" +do_compile() { + cd ${S} + oe_runmake -f client.mk build +} + +do_install() { + cd ${WORKDIR} + + install -d ${D}${bindir} + install -m 0755 minimo ${D}${bindir} + + install -d ${D}${datadir}/applications + install -m 0644 minimo.desktop ${D}${datadir}/applications + + install -d ${D}/${datadir}/pixmaps + install -m 0644 minimo.png ${D}${datadir}/pixmaps -do_install () { - cd $MOZ_OBJDIR/minimo/base - oe_runmake package cd ${S} - mkdir -p ${mozdir} - cp -RL $MOZ_OBJDIR/dist/minimo/* ${mozdir}/ - mkdir -p ${D}${datadir}/applications - install -m 0644 ${WORKDIR}/minimo.desktop ${D}${datadir}/applications/minimo.desktop - mkdir -p ${D}${datadir}/pixmaps - install -m 0644 ${WORKDIR}/minimo.png ${D}${datadir}/pixmaps/minimo.png - mkdir -p ${D}${bindir} - echo "#!/bin/sh" > ${D}${bindir}/Minimo - cat >>${D}${bindir}/Minimo << EOF -cd ${libdir}/mozilla-minimo -export LD_LIBRARY_PATH=${libdir}/mozilla-minimo -exec ./minimo -EOF - chmod 755 ${D}${bindir}/Minimo + + ./minimo/config/linux_package.sh ${S} ${S}/minimo/config + + cd dist/minimo + + install -d ${D}${mozdir} + install -m 0755 minimo ${D}${mozdir} + install -m 0755 libfreebl3.so ${D}${mozdir} + install -m 0755 libnspr4.so ${D}${mozdir} + install -m 0755 libnss3.so ${D}${mozdir} + install -m 0755 libnssckbi.so ${D}${mozdir} + install -m 0755 libplc4.so ${D}${mozdir} + install -m 0755 libplds4.so ${D}${mozdir} + install -m 0755 libsmime3.so ${D}${mozdir} + install -m 0755 libsoftokn3.so ${D}${mozdir} + install -m 0755 libssl3.so ${D}${mozdir} + + install -d ${D}${mozdir}/chrome + install -m 0644 chrome/classic.jar ${D}${mozdir}/chrome + install -m 0644 chrome/classic.manifest ${D}${mozdir}/chrome + install -m 0644 chrome/en-US.jar ${D}${mozdir}/chrome + install -m 0644 chrome/en-US.manifest ${D}${mozdir}/chrome + install -m 0644 chrome/minimo-skin-vga.jar ${D}${mozdir}/chrome + install -m 0644 chrome/minimo-skin-vga.manifest ${D}${mozdir}/chrome + install -m 0644 chrome/minimo-skin.jar ${D}${mozdir}/chrome + install -m 0644 chrome/minimo-skin.manifest ${D}${mozdir}/chrome + install -m 0644 chrome/minimo.jar ${D}${mozdir}/chrome + install -m 0644 chrome/minimo.manifest ${D}${mozdir}/chrome + install -m 0644 chrome/pippki.jar ${D}${mozdir}/chrome + install -m 0644 chrome/pippki.manifest ${D}${mozdir}/chrome + install -m 0644 chrome/toolkit.jar ${D}${mozdir}/chrome + install -m 0644 chrome/toolkit.manifest ${D}${mozdir}/chrome + + install -d ${D}${mozdir}/components + install -m 0644 components/all.xpt ${D}${mozdir}/components + install -m 0644 components/nsHelperAppDlg.js ${D}${mozdir}/components + install -m 0644 components/nsProgressDialog.js ${D}${mozdir}/components + + install -d ${D}${mozdir}/greprefs + install -m 0644 greprefs/all.js ${D}${mozdir}/greprefs + install -m 0644 greprefs/security-prefs.js ${D}${mozdir}/greprefs + + install -d ${D}${mozdir}/res + install -m 0644 res/forms.css ${D}${mozdir}/res + install -m 0644 res/html.css ${D}${mozdir}/res + install -m 0644 res/quirk.css ${D}${mozdir}/res + install -m 0644 res/ua.css ${D}${mozdir}/res + install -m 0644 res/arrow.gif ${D}${mozdir}/res + install -m 0644 res/arrowd.gif ${D}${mozdir}/res + install -m 0644 res/broken-image.gif ${D}${mozdir}/res + install -m 0644 res/loading-image.gif ${D}${mozdir}/res + install -m 0644 res/charsetData.properties ${D}${mozdir}/res + install -m 0644 res/charsetalias.properties ${D}${mozdir}/res + install -m 0644 res/langGroups.properties ${D}${mozdir}/res + install -m 0644 res/language.properties ${D}${mozdir}/res + install -m 0644 res/unixcharset.properties ${D}${mozdir}/res + + install -d ${D}${mozdir}/res/dtd + install -m 0644 res/dtd/xhtml11.dtd ${D}${mozdir}/res/dtd + + install -d ${D}${mozdir}/res/entityTables + install -m 0644 res/entityTables/html40Latin1.properties ${D}${mozdir}/res/entityTables + install -m 0644 res/entityTables/html40Special.properties ${D}${mozdir}/res/entityTables + install -m 0644 res/entityTables/html40Symbols.properties ${D}${mozdir}/res/entityTables + install -m 0644 res/entityTables/htmlEntityVersions.properties ${D}${mozdir}/res/entityTables + install -m 0644 res/entityTables/transliterate.properties ${D}${mozdir}/res/entityTables + + install -d ${D}${mozdir}/res/fonts + install -m 0644 res/fonts/fontEncoding.properties ${D}${mozdir}/res/fonts + install -m 0644 res/fonts/pangoFontEncoding.properties ${D}${mozdir}/res/fonts + + install -d ${D}${mozdir}/res/html + install -m 0644 res/html/gopher-audio.gif ${D}${mozdir}/res/html + install -m 0644 res/html/gopher-binary.gif ${D}${mozdir}/res/html + install -m 0644 res/html/gopher-find.gif ${D}${mozdir}/res/html + install -m 0644 res/html/gopher-image.gif ${D}${mozdir}/res/html + install -m 0644 res/html/gopher-menu.gif ${D}${mozdir}/res/html + install -m 0644 res/html/gopher-movie.gif ${D}${mozdir}/res/html + install -m 0644 res/html/gopher-sound.gif ${D}${mozdir}/res/html + install -m 0644 res/html/gopher-telnet.gif ${D}${mozdir}/res/html + install -m 0644 res/html/gopher-text.gif ${D}${mozdir}/res/html + install -m 0644 res/html/gopher-unknown.gif ${D}${mozdir}/res/html } + +FILES_${PN}-dbg += "${libdir}/mozilla-minimo/.debug*" +FILES_${PN} += "${mozdir}" -- cgit v1.2.3 From 3675b6af66fdab4701b21adca8ee18d4ed4f5a1d Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Thu, 10 May 2007 15:34:14 +0000 Subject: packages/{qmake,uicmoc}: Update qmake and uic/moc from Qt4.1.2 to 4.2.3 Version 4.2 is needed to compile the WebKit/Gdk port. Update the checksums.ini containing the md5/shasum of my download. Install qmake as qmake2 and qmake-qt4 to follow the debian naming of this binary. --- packages/qmake/qmake2-native-2.00a/.mtn2git_empty | 0 .../qmake/qmake2-native-2.00a/linux-oe-qmake.conf | 90 ----------- packages/qmake/qmake2-native-2.01a/.mtn2git_empty | 0 .../qmake/qmake2-native-2.01a/linux-oe-qmake.conf | 90 +++++++++++ packages/qmake/qmake2-native_2.00a.bb | 49 ------ packages/qmake/qmake2-native_2.01a.bb | 49 ++++++ .../uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty | 0 .../uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch | 179 --------------------- .../uicmoc/uicmoc4-native-4.2.3/.mtn2git_empty | 0 .../uicmoc/uicmoc4-native-4.2.3/fix-mkspecs.patch | 179 +++++++++++++++++++++ packages/uicmoc/uicmoc4-native_4.1.1.bb | 42 ----- packages/uicmoc/uicmoc4-native_4.2.3.bb | 41 +++++ 12 files changed, 359 insertions(+), 360 deletions(-) delete mode 100644 packages/qmake/qmake2-native-2.00a/.mtn2git_empty delete mode 100644 packages/qmake/qmake2-native-2.00a/linux-oe-qmake.conf create mode 100644 packages/qmake/qmake2-native-2.01a/.mtn2git_empty create mode 100644 packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf delete mode 100644 packages/qmake/qmake2-native_2.00a.bb create mode 100644 packages/qmake/qmake2-native_2.01a.bb delete mode 100644 packages/uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty delete mode 100644 packages/uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch create mode 100644 packages/uicmoc/uicmoc4-native-4.2.3/.mtn2git_empty create mode 100644 packages/uicmoc/uicmoc4-native-4.2.3/fix-mkspecs.patch delete mode 100644 packages/uicmoc/uicmoc4-native_4.1.1.bb create mode 100644 packages/uicmoc/uicmoc4-native_4.2.3.bb (limited to 'packages') diff --git a/packages/qmake/qmake2-native-2.00a/.mtn2git_empty b/packages/qmake/qmake2-native-2.00a/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/qmake/qmake2-native-2.00a/linux-oe-qmake.conf b/packages/qmake/qmake2-native-2.00a/linux-oe-qmake.conf deleted file mode 100644 index d803f036fc..0000000000 --- a/packages/qmake/qmake2-native-2.00a/linux-oe-qmake.conf +++ /dev/null @@ -1,90 +0,0 @@ -# -# qmake configuration for linux-oe-g++ / OpenEmbedded Build System / http://openembedded.org -# - -MAKEFILE_GENERATOR = UNIX -TEMPLATE = app -CONFIG += qt warn_on release incremental link_prl -QT += core gui -QMAKE_INCREMENTAL_STYLE = sublib - -QMAKE_CC = $(OE_QMAKE_CC) -QMAKE_LEX = flex -QMAKE_LEXFLAGS = -QMAKE_YACC = yacc -QMAKE_YACCFLAGS = -d -QMAKE_YACCFLAGS_MANGLE = -p $base -b $base -QMAKE_YACC_HEADER = $base.tab.h -QMAKE_YACC_SOURCE = $base.tab.c -QMAKE_CFLAGS = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) -QMAKE_CFLAGS_DEPS = -M -QMAKE_CFLAGS_WARN_ON = -Wall -W -QMAKE_CFLAGS_WARN_OFF = -QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) -QMAKE_CFLAGS_DEBUG = -g -QMAKE_CFLAGS_SHLIB = -fPIC -QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses -QMAKE_CFLAGS_THREAD = -D_REENTRANT -QMAKE_CFLAGS_HIDESYMS = -fvisibility=hidden - -QMAKE_CXX = $(OE_QMAKE_CXX) -QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA) -QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS -QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB -QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD -QMAKE_CXXFLAGS_HIDESYMS = $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden - -QMAKE_INCDIR = -QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = $(OE_QMAKE_INCDIR_X11) -QMAKE_LIBDIR_X11 = $(OE_QMAKE_LIBDIR_X11) -QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) -QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) -QMAKE_INCDIR_OPENGL = -QMAKE_LIBDIR_OPENGL = - -QMAKE_LINK = $(OE_QMAKE_LINK) -QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) -QMAKE_LFLAGS = $(OE_QMAKE_LDFLAGS) $(LFLAGS_EXTRA) -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-link, - -QMAKE_LIBS = $(LIBS_EXTRA) -QMAKE_LIBS_DYNLOAD = -ldl -QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) -QMAKE_LIBS_X11SM = -QMAKE_LIBS_QT = -l$(OE_QMAKE_LIBS_QT) -QMAKE_LIBS_QT_THREAD = -l$(OE_QMAKE_LIBS_QT)-mt -QMAKE_LIBS_QT_OPENGL = -lqgl -QMAKE_LIBS_THREAD = -lpthread - -QMAKE_MOC = $(OE_QMAKE_MOC) -QMAKE_UIC = $(OE_QMAKE_UIC) - -QMAKE_AR = $(OE_QMAKE_AR) cqs -QMAKE_RANLIB = - -QMAKE_TAR = tar -cf -QMAKE_GZIP = gzip -9f - -QMAKE_COPY = cp -f -QMAKE_COPY_FILE = $(COPY) -QMAKE_COPY_DIR = $(COPY) -r -QMAKE_MOVE = mv -f -QMAKE_DEL_FILE = rm -f -QMAKE_DEL_DIR = rmdir -QMAKE_STRIP = $(OE_QMAKE_STRIP) -QMAKE_STRIPFLAGS_LIB += --strip-unneeded -QMAKE_CHK_DIR_EXISTS = test -d -QMAKE_MKDIR = mkdir -p - diff --git a/packages/qmake/qmake2-native-2.01a/.mtn2git_empty b/packages/qmake/qmake2-native-2.01a/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf b/packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf new file mode 100644 index 0000000000..d803f036fc --- /dev/null +++ b/packages/qmake/qmake2-native-2.01a/linux-oe-qmake.conf @@ -0,0 +1,90 @@ +# +# qmake configuration for linux-oe-g++ / OpenEmbedded Build System / http://openembedded.org +# + +MAKEFILE_GENERATOR = UNIX +TEMPLATE = app +CONFIG += qt warn_on release incremental link_prl +QT += core gui +QMAKE_INCREMENTAL_STYLE = sublib + +QMAKE_CC = $(OE_QMAKE_CC) +QMAKE_LEX = flex +QMAKE_LEXFLAGS = +QMAKE_YACC = yacc +QMAKE_YACCFLAGS = -d +QMAKE_YACCFLAGS_MANGLE = -p $base -b $base +QMAKE_YACC_HEADER = $base.tab.h +QMAKE_YACC_SOURCE = $base.tab.c +QMAKE_CFLAGS = -pipe $(OE_QMAKE_CFLAGS) $(CFLAGS_EXTRA) +QMAKE_CFLAGS_DEPS = -M +QMAKE_CFLAGS_WARN_ON = -Wall -W +QMAKE_CFLAGS_WARN_OFF = +QMAKE_CFLAGS_RELEASE = $(if $(CFLAGS_RELEASE),$(CFLAGS_RELEASE), -O2) +QMAKE_CFLAGS_DEBUG = -g +QMAKE_CFLAGS_SHLIB = -fPIC +QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses +QMAKE_CFLAGS_THREAD = -D_REENTRANT +QMAKE_CFLAGS_HIDESYMS = -fvisibility=hidden + +QMAKE_CXX = $(OE_QMAKE_CXX) +QMAKE_CXXFLAGS = $$QMAKE_CFLAGS $(OE_QMAKE_CXXFLAGS) $(CXXFLAGS_EXTRA) +QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS +QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON +QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF +QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE +QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG +QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB +QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC +QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD +QMAKE_CXXFLAGS_HIDESYMS = $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden + +QMAKE_INCDIR = +QMAKE_LIBDIR = +QMAKE_INCDIR_X11 = $(OE_QMAKE_INCDIR_X11) +QMAKE_LIBDIR_X11 = $(OE_QMAKE_LIBDIR_X11) +QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT) +QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT) +QMAKE_INCDIR_OPENGL = +QMAKE_LIBDIR_OPENGL = + +QMAKE_LINK = $(OE_QMAKE_LINK) +QMAKE_LINK_SHLIB = $(OE_QMAKE_LINK) +QMAKE_LFLAGS = $(OE_QMAKE_LDFLAGS) $(LFLAGS_EXTRA) +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-link, + +QMAKE_LIBS = $(LIBS_EXTRA) +QMAKE_LIBS_DYNLOAD = -ldl +QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11) +QMAKE_LIBS_X11SM = +QMAKE_LIBS_QT = -l$(OE_QMAKE_LIBS_QT) +QMAKE_LIBS_QT_THREAD = -l$(OE_QMAKE_LIBS_QT)-mt +QMAKE_LIBS_QT_OPENGL = -lqgl +QMAKE_LIBS_THREAD = -lpthread + +QMAKE_MOC = $(OE_QMAKE_MOC) +QMAKE_UIC = $(OE_QMAKE_UIC) + +QMAKE_AR = $(OE_QMAKE_AR) cqs +QMAKE_RANLIB = + +QMAKE_TAR = tar -cf +QMAKE_GZIP = gzip -9f + +QMAKE_COPY = cp -f +QMAKE_COPY_FILE = $(COPY) +QMAKE_COPY_DIR = $(COPY) -r +QMAKE_MOVE = mv -f +QMAKE_DEL_FILE = rm -f +QMAKE_DEL_DIR = rmdir +QMAKE_STRIP = $(OE_QMAKE_STRIP) +QMAKE_STRIPFLAGS_LIB += --strip-unneeded +QMAKE_CHK_DIR_EXISTS = test -d +QMAKE_MKDIR = mkdir -p + diff --git a/packages/qmake/qmake2-native_2.00a.bb b/packages/qmake/qmake2-native_2.00a.bb deleted file mode 100644 index 306891e9af..0000000000 --- a/packages/qmake/qmake2-native_2.00a.bb +++ /dev/null @@ -1,49 +0,0 @@ -DESCRIPTION = "TrollTech Makefile Generator" -PRIORITY = "optional" -HOMEPAGE = "http://www.trolltech.com" -SECTION = "devel" -LICENSE = "GPL QPL" -PR = "r2" - -QTVER = "qt-x11-opensource-src-4.1.1" - -SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \ - file://linux-oe-qmake.conf" -S = "${WORKDIR}/${QTVER}" - -# we need the real target system here -CROSS_SYS := "${TARGET_SYS}" -inherit autotools native - -export QTDIR = "${S}" -EXTRA_OEMAKE = "-e" - -do_configure() { - # Install the OE build templates - for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ - do - install -d ${S}/mkspecs/$template - install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf - ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h - done - - QMAKESPEC= - PLATFORM=${HOST_OS}-oe-g++ - export PLATFORM - # yes, TARGET_SYS is correct, because this is a 'cross'-qmake-native :) :M: - echo yes | ./configure -prefix ${STAGING_DIR}/${CROSS_SYS}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed" -} - -do_compile() { - : -} - -do_stage() { - install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2 - install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/ - cp -PfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/ -} - -do_install() { - : -} diff --git a/packages/qmake/qmake2-native_2.01a.bb b/packages/qmake/qmake2-native_2.01a.bb new file mode 100644 index 0000000000..dab5b6a3b4 --- /dev/null +++ b/packages/qmake/qmake2-native_2.01a.bb @@ -0,0 +1,49 @@ +DESCRIPTION = "TrollTech Makefile Generator" +PRIORITY = "optional" +HOMEPAGE = "http://www.trolltech.com" +SECTION = "devel" +LICENSE = "GPL QPL" + +QTVER = "qt-x11-opensource-src-4.2.3" + +SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/${QTVER}.tar.gz \ + file://linux-oe-qmake.conf" +S = "${WORKDIR}/${QTVER}" + +# we need the real target system here +CROSS_SYS := "${TARGET_SYS}" +inherit autotools native + +export QTDIR = "${S}" +EXTRA_OEMAKE = "-e" + +do_configure() { + # Install the OE build templates + for template in linux-oe-g++ linux-uclibc-oe-g++ linux-gnueabi-oe-g++ + do + install -d ${S}/mkspecs/$template + install -m 0644 ${WORKDIR}/linux-oe-qmake.conf ${S}/mkspecs/$template/qmake.conf + ln -sf ../linux-g++/qplatformdefs.h ${S}/mkspecs/$template/qplatformdefs.h + done + + QMAKESPEC= + PLATFORM=${HOST_OS}-oe-g++ + export PLATFORM + # yes, TARGET_SYS is correct, because this is a 'cross'-qmake-native :) :M: + echo yes | ./configure -prefix ${STAGING_DIR}/${CROSS_SYS}/qt4 ${EXTRA_OECONF} || die "Configuring qt failed" +} + +do_compile() { + : +} + +do_stage() { + install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake2 + install -m 0755 bin/qmake ${STAGING_BINDIR}/qmake-qt4 + install -d ${STAGING_DIR}/${CROSS_SYS}/qt4/ + cp -PfR mkspecs ${STAGING_DIR}/${CROSS_SYS}/qt4/ +} + +do_install() { + : +} diff --git a/packages/uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty b/packages/uicmoc/uicmoc4-native-4.1.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch b/packages/uicmoc/uicmoc4-native-4.1.1/fix-mkspecs.patch deleted file mode 100644 index 491edde370..0000000000 --- a/packages/uicmoc/uicmoc4-native-4.1.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.2.3/.mtn2git_empty b/packages/uicmoc/uicmoc4-native-4.2.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/uicmoc/uicmoc4-native-4.2.3/fix-mkspecs.patch b/packages/uicmoc/uicmoc4-native-4.2.3/fix-mkspecs.patch new file mode 100644 index 0000000000..491edde370 --- /dev/null +++ b/packages/uicmoc/uicmoc4-native-4.2.3/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.1.1.bb b/packages/uicmoc/uicmoc4-native_4.1.1.bb deleted file mode 100644 index 59bdd1bc40..0000000000 --- a/packages/uicmoc/uicmoc4-native_4.1.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 = "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 -} diff --git a/packages/uicmoc/uicmoc4-native_4.2.3.bb b/packages/uicmoc/uicmoc4-native_4.2.3.bb new file mode 100644 index 0000000000..341b092e29 --- /dev/null +++ b/packages/uicmoc/uicmoc4-native_4.2.3.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "User-Interface-, Meta-Object-, and Resource Compiler for Qt/[X11|Mac|Embedded] version 4.x" +SECTION = "libs" +PRIORITY = "optional" +LICENSE = "GPL QPL" + +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 From e02b1a6c93d67c3d9d6ef7c4f0fd48177bdc5835 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Thu, 10 May 2007 16:49:55 +0000 Subject: packages/gperf: Add GNU perfect hash generator. This is needed for WebKit Add GNU gperf. The acinclude.m4 is a copy of the original aclocal.m4. The checksum was generated on a verified binary. I decided to trust the signature as it was signed by Daniel Jacobowitz. --- packages/gperf/.mtn2git_empty | 0 packages/gperf/files/.mtn2git_empty | 0 packages/gperf/files/autoreconf.patch | 435 ++++++++++++++++++++++++++++++++++ packages/gperf/gperf-native_3.0.3.bb | 10 + packages/gperf/gperf_3.0.3.bb | 8 + 5 files changed, 453 insertions(+) create mode 100644 packages/gperf/.mtn2git_empty create mode 100644 packages/gperf/files/.mtn2git_empty create mode 100644 packages/gperf/files/autoreconf.patch create mode 100644 packages/gperf/gperf-native_3.0.3.bb create mode 100644 packages/gperf/gperf_3.0.3.bb (limited to 'packages') diff --git a/packages/gperf/.mtn2git_empty b/packages/gperf/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gperf/files/.mtn2git_empty b/packages/gperf/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gperf/files/autoreconf.patch b/packages/gperf/files/autoreconf.patch new file mode 100644 index 0000000000..432023067b --- /dev/null +++ b/packages/gperf/files/autoreconf.patch @@ -0,0 +1,435 @@ +Index: gperf-3.0.3/configure.ac +=================================================================== +--- gperf-3.0.3.orig/configure.ac 2007-05-10 18:34:15.000000000 +0200 ++++ gperf-3.0.3/configure.ac 2007-05-10 18:34:26.000000000 +0200 +@@ -21,7 +21,7 @@ + dnl If not, write to the Free Software Foundation, Inc., + dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +-AC_PREREQ([2.60]) ++AC_PREREQ([2.59]) + AC_INIT(doc/gperf.1) + AC_PROG_MAKE_SET + AC_OBJEXT +Index: gperf-3.0.3/doc/configure.ac +=================================================================== +--- gperf-3.0.3.orig/doc/configure.ac 2007-05-10 18:34:30.000000000 +0200 ++++ gperf-3.0.3/doc/configure.ac 2007-05-10 18:34:37.000000000 +0200 +@@ -21,7 +21,7 @@ + dnl If not, write to the Free Software Foundation, Inc., + dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +-AC_PREREQ([2.60]) ++AC_PREREQ([2.59]) + AC_INIT(gperf.1) + PACKAGE=gperf + AC_SUBST(PACKAGE) +Index: gperf-3.0.3/lib/configure.ac +=================================================================== +--- gperf-3.0.3.orig/lib/configure.ac 2007-05-10 18:34:41.000000000 +0200 ++++ gperf-3.0.3/lib/configure.ac 2007-05-10 18:34:46.000000000 +0200 +@@ -21,7 +21,7 @@ + dnl If not, write to the Free Software Foundation, Inc., + dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +-AC_PREREQ([2.60]) ++AC_PREREQ([2.59]) + AC_INIT(hash.cc) + AC_PROG_MAKE_SET + dnl +Index: gperf-3.0.3/src/configure.ac +=================================================================== +--- gperf-3.0.3.orig/src/configure.ac 2007-05-10 18:34:53.000000000 +0200 ++++ gperf-3.0.3/src/configure.ac 2007-05-10 18:34:58.000000000 +0200 +@@ -21,7 +21,7 @@ + dnl If not, write to the Free Software Foundation, Inc., + dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +-AC_PREREQ([2.60]) ++AC_PREREQ([2.59]) + AC_INIT(main.cc) + AC_CONFIG_HEADER(config.h) + AC_PROG_MAKE_SET +Index: gperf-3.0.3/tests/configure.ac +=================================================================== +--- gperf-3.0.3.orig/tests/configure.ac 2007-05-10 18:35:03.000000000 +0200 ++++ gperf-3.0.3/tests/configure.ac 2007-05-10 18:35:08.000000000 +0200 +@@ -21,7 +21,7 @@ + dnl If not, write to the Free Software Foundation, Inc., + dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +-AC_PREREQ([2.60]) ++AC_PREREQ([2.59]) + AC_INIT(c-parse.gperf) + AC_PROG_MAKE_SET + dnl +Index: gperf-3.0.3/acinclude.m4 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gperf-3.0.3/acinclude.m4 2007-05-10 18:36:09.000000000 +0200 +@@ -0,0 +1,69 @@ ++AC_PREREQ(2.12) ++ ++AC_DEFUN(CL_PROG_INSTALL, ++[dnl This is mostly copied from AC_PROG_INSTALL. ++# Find a good install program. We prefer a C program (faster), ++# so one script is as good as another. But avoid the broken or ++# incompatible versions: ++# SysV /etc/install, /usr/sbin/install ++# SunOS /usr/etc/install ++# IRIX /sbin/install ++# AIX /bin/install ++# AFS /usr/afsws/bin/install, which mishandles nonexistent args ++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" ++# ./install, which can be erroneously created by make from ./install.sh. ++AC_MSG_CHECKING(for a BSD compatible install) ++if test -z "$INSTALL"; then ++AC_CACHE_VAL(cl_cv_path_install, ++[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in $PATH; do ++ # Account for people who put trailing slashes in PATH elements. ++ case "$ac_dir/" in ++ /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; ++ *) ++ # OSF1 and SCO ODT 3.0 have their own names for install. ++ for ac_prog in ginstall installbsd scoinst install; do ++ if test -f $ac_dir/$ac_prog; then ++ if test $ac_prog = install && ++ grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then ++ # AIX install. It has an incompatible calling convention. ++ # OSF/1 installbsd also uses dspmsg, but is usable. ++ : ++ else ++ if test $ac_prog = installbsd && ++ grep src/bos $ac_dir/$ac_prog >/dev/null 2>&1; then ++ # AIX installbsd doesn't work without option "-g". ++ : ++ else ++ cl_cv_path_install="$ac_dir/$ac_prog -c" ++ break 2 ++ fi ++ fi ++ fi ++ done ++ ;; ++ esac ++ done ++ IFS="$ac_save_ifs" ++ # As a last resort, use cp. ++ test -z "$cl_cv_path_install" && cl_cv_path_install="cp" ++])dnl ++ INSTALL="$cl_cv_path_install" ++fi ++dnl We do special magic for INSTALL instead of AC_SUBST, to get ++dnl relative paths right. ++AC_MSG_RESULT($INSTALL) ++AC_SUBST(INSTALL)dnl ++# Use test -z because SunOS4 sh mishandles braces in ${var-val}. ++# It thinks the first close brace ends the variable substitution. ++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='$(INSTALL)' ++AC_SUBST(INSTALL_PROGRAM)dnl ++if test -z "$INSTALL_DATA"; then ++ case "$INSTALL" in ++ cp | */cp ) INSTALL_DATA='$(INSTALL)' ;; ++ * ) INSTALL_DATA='$(INSTALL) -m 644' ;; ++ esac ++fi ++AC_SUBST(INSTALL_DATA)dnl ++]) ++ +Index: gperf-3.0.3/doc/acinclude.m4 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gperf-3.0.3/doc/acinclude.m4 2007-05-10 18:36:11.000000000 +0200 +@@ -0,0 +1,69 @@ ++AC_PREREQ(2.12) ++ ++AC_DEFUN(CL_PROG_INSTALL, ++[dnl This is mostly copied from AC_PROG_INSTALL. ++# Find a good install program. We prefer a C program (faster), ++# so one script is as good as another. But avoid the broken or ++# incompatible versions: ++# SysV /etc/install, /usr/sbin/install ++# SunOS /usr/etc/install ++# IRIX /sbin/install ++# AIX /bin/install ++# AFS /usr/afsws/bin/install, which mishandles nonexistent args ++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" ++# ./install, which can be erroneously created by make from ./install.sh. ++AC_MSG_CHECKING(for a BSD compatible install) ++if test -z "$INSTALL"; then ++AC_CACHE_VAL(cl_cv_path_install, ++[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in $PATH; do ++ # Account for people who put trailing slashes in PATH elements. ++ case "$ac_dir/" in ++ /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; ++ *) ++ # OSF1 and SCO ODT 3.0 have their own names for install. ++ for ac_prog in ginstall installbsd scoinst install; do ++ if test -f $ac_dir/$ac_prog; then ++ if test $ac_prog = install && ++ grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then ++ # AIX install. It has an incompatible calling convention. ++ # OSF/1 installbsd also uses dspmsg, but is usable. ++ : ++ else ++ if test $ac_prog = installbsd && ++ grep src/bos $ac_dir/$ac_prog >/dev/null 2>&1; then ++ # AIX installbsd doesn't work without option "-g". ++ : ++ else ++ cl_cv_path_install="$ac_dir/$ac_prog -c" ++ break 2 ++ fi ++ fi ++ fi ++ done ++ ;; ++ esac ++ done ++ IFS="$ac_save_ifs" ++ # As a last resort, use cp. ++ test -z "$cl_cv_path_install" && cl_cv_path_install="cp" ++])dnl ++ INSTALL="$cl_cv_path_install" ++fi ++dnl We do special magic for INSTALL instead of AC_SUBST, to get ++dnl relative paths right. ++AC_MSG_RESULT($INSTALL) ++AC_SUBST(INSTALL)dnl ++# Use test -z because SunOS4 sh mishandles braces in ${var-val}. ++# It thinks the first close brace ends the variable substitution. ++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='$(INSTALL)' ++AC_SUBST(INSTALL_PROGRAM)dnl ++if test -z "$INSTALL_DATA"; then ++ case "$INSTALL" in ++ cp | */cp ) INSTALL_DATA='$(INSTALL)' ;; ++ * ) INSTALL_DATA='$(INSTALL) -m 644' ;; ++ esac ++fi ++AC_SUBST(INSTALL_DATA)dnl ++]) ++ +Index: gperf-3.0.3/lib/acinclude.m4 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gperf-3.0.3/lib/acinclude.m4 2007-05-10 18:36:14.000000000 +0200 +@@ -0,0 +1,69 @@ ++AC_PREREQ(2.12) ++ ++AC_DEFUN(CL_PROG_INSTALL, ++[dnl This is mostly copied from AC_PROG_INSTALL. ++# Find a good install program. We prefer a C program (faster), ++# so one script is as good as another. But avoid the broken or ++# incompatible versions: ++# SysV /etc/install, /usr/sbin/install ++# SunOS /usr/etc/install ++# IRIX /sbin/install ++# AIX /bin/install ++# AFS /usr/afsws/bin/install, which mishandles nonexistent args ++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" ++# ./install, which can be erroneously created by make from ./install.sh. ++AC_MSG_CHECKING(for a BSD compatible install) ++if test -z "$INSTALL"; then ++AC_CACHE_VAL(cl_cv_path_install, ++[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in $PATH; do ++ # Account for people who put trailing slashes in PATH elements. ++ case "$ac_dir/" in ++ /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; ++ *) ++ # OSF1 and SCO ODT 3.0 have their own names for install. ++ for ac_prog in ginstall installbsd scoinst install; do ++ if test -f $ac_dir/$ac_prog; then ++ if test $ac_prog = install && ++ grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then ++ # AIX install. It has an incompatible calling convention. ++ # OSF/1 installbsd also uses dspmsg, but is usable. ++ : ++ else ++ if test $ac_prog = installbsd && ++ grep src/bos $ac_dir/$ac_prog >/dev/null 2>&1; then ++ # AIX installbsd doesn't work without option "-g". ++ : ++ else ++ cl_cv_path_install="$ac_dir/$ac_prog -c" ++ break 2 ++ fi ++ fi ++ fi ++ done ++ ;; ++ esac ++ done ++ IFS="$ac_save_ifs" ++ # As a last resort, use cp. ++ test -z "$cl_cv_path_install" && cl_cv_path_install="cp" ++])dnl ++ INSTALL="$cl_cv_path_install" ++fi ++dnl We do special magic for INSTALL instead of AC_SUBST, to get ++dnl relative paths right. ++AC_MSG_RESULT($INSTALL) ++AC_SUBST(INSTALL)dnl ++# Use test -z because SunOS4 sh mishandles braces in ${var-val}. ++# It thinks the first close brace ends the variable substitution. ++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='$(INSTALL)' ++AC_SUBST(INSTALL_PROGRAM)dnl ++if test -z "$INSTALL_DATA"; then ++ case "$INSTALL" in ++ cp | */cp ) INSTALL_DATA='$(INSTALL)' ;; ++ * ) INSTALL_DATA='$(INSTALL) -m 644' ;; ++ esac ++fi ++AC_SUBST(INSTALL_DATA)dnl ++]) ++ +Index: gperf-3.0.3/src/acinclude.m4 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gperf-3.0.3/src/acinclude.m4 2007-05-10 18:36:12.000000000 +0200 +@@ -0,0 +1,69 @@ ++AC_PREREQ(2.12) ++ ++AC_DEFUN(CL_PROG_INSTALL, ++[dnl This is mostly copied from AC_PROG_INSTALL. ++# Find a good install program. We prefer a C program (faster), ++# so one script is as good as another. But avoid the broken or ++# incompatible versions: ++# SysV /etc/install, /usr/sbin/install ++# SunOS /usr/etc/install ++# IRIX /sbin/install ++# AIX /bin/install ++# AFS /usr/afsws/bin/install, which mishandles nonexistent args ++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" ++# ./install, which can be erroneously created by make from ./install.sh. ++AC_MSG_CHECKING(for a BSD compatible install) ++if test -z "$INSTALL"; then ++AC_CACHE_VAL(cl_cv_path_install, ++[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in $PATH; do ++ # Account for people who put trailing slashes in PATH elements. ++ case "$ac_dir/" in ++ /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; ++ *) ++ # OSF1 and SCO ODT 3.0 have their own names for install. ++ for ac_prog in ginstall installbsd scoinst install; do ++ if test -f $ac_dir/$ac_prog; then ++ if test $ac_prog = install && ++ grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then ++ # AIX install. It has an incompatible calling convention. ++ # OSF/1 installbsd also uses dspmsg, but is usable. ++ : ++ else ++ if test $ac_prog = installbsd && ++ grep src/bos $ac_dir/$ac_prog >/dev/null 2>&1; then ++ # AIX installbsd doesn't work without option "-g". ++ : ++ else ++ cl_cv_path_install="$ac_dir/$ac_prog -c" ++ break 2 ++ fi ++ fi ++ fi ++ done ++ ;; ++ esac ++ done ++ IFS="$ac_save_ifs" ++ # As a last resort, use cp. ++ test -z "$cl_cv_path_install" && cl_cv_path_install="cp" ++])dnl ++ INSTALL="$cl_cv_path_install" ++fi ++dnl We do special magic for INSTALL instead of AC_SUBST, to get ++dnl relative paths right. ++AC_MSG_RESULT($INSTALL) ++AC_SUBST(INSTALL)dnl ++# Use test -z because SunOS4 sh mishandles braces in ${var-val}. ++# It thinks the first close brace ends the variable substitution. ++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='$(INSTALL)' ++AC_SUBST(INSTALL_PROGRAM)dnl ++if test -z "$INSTALL_DATA"; then ++ case "$INSTALL" in ++ cp | */cp ) INSTALL_DATA='$(INSTALL)' ;; ++ * ) INSTALL_DATA='$(INSTALL) -m 644' ;; ++ esac ++fi ++AC_SUBST(INSTALL_DATA)dnl ++]) ++ +Index: gperf-3.0.3/tests/acinclude.m4 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gperf-3.0.3/tests/acinclude.m4 2007-05-10 18:36:16.000000000 +0200 +@@ -0,0 +1,69 @@ ++AC_PREREQ(2.12) ++ ++AC_DEFUN(CL_PROG_INSTALL, ++[dnl This is mostly copied from AC_PROG_INSTALL. ++# Find a good install program. We prefer a C program (faster), ++# so one script is as good as another. But avoid the broken or ++# incompatible versions: ++# SysV /etc/install, /usr/sbin/install ++# SunOS /usr/etc/install ++# IRIX /sbin/install ++# AIX /bin/install ++# AFS /usr/afsws/bin/install, which mishandles nonexistent args ++# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" ++# ./install, which can be erroneously created by make from ./install.sh. ++AC_MSG_CHECKING(for a BSD compatible install) ++if test -z "$INSTALL"; then ++AC_CACHE_VAL(cl_cv_path_install, ++[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in $PATH; do ++ # Account for people who put trailing slashes in PATH elements. ++ case "$ac_dir/" in ++ /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; ++ *) ++ # OSF1 and SCO ODT 3.0 have their own names for install. ++ for ac_prog in ginstall installbsd scoinst install; do ++ if test -f $ac_dir/$ac_prog; then ++ if test $ac_prog = install && ++ grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then ++ # AIX install. It has an incompatible calling convention. ++ # OSF/1 installbsd also uses dspmsg, but is usable. ++ : ++ else ++ if test $ac_prog = installbsd && ++ grep src/bos $ac_dir/$ac_prog >/dev/null 2>&1; then ++ # AIX installbsd doesn't work without option "-g". ++ : ++ else ++ cl_cv_path_install="$ac_dir/$ac_prog -c" ++ break 2 ++ fi ++ fi ++ fi ++ done ++ ;; ++ esac ++ done ++ IFS="$ac_save_ifs" ++ # As a last resort, use cp. ++ test -z "$cl_cv_path_install" && cl_cv_path_install="cp" ++])dnl ++ INSTALL="$cl_cv_path_install" ++fi ++dnl We do special magic for INSTALL instead of AC_SUBST, to get ++dnl relative paths right. ++AC_MSG_RESULT($INSTALL) ++AC_SUBST(INSTALL)dnl ++# Use test -z because SunOS4 sh mishandles braces in ${var-val}. ++# It thinks the first close brace ends the variable substitution. ++test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='$(INSTALL)' ++AC_SUBST(INSTALL_PROGRAM)dnl ++if test -z "$INSTALL_DATA"; then ++ case "$INSTALL" in ++ cp | */cp ) INSTALL_DATA='$(INSTALL)' ;; ++ * ) INSTALL_DATA='$(INSTALL) -m 644' ;; ++ esac ++fi ++AC_SUBST(INSTALL_DATA)dnl ++]) ++ diff --git a/packages/gperf/gperf-native_3.0.3.bb b/packages/gperf/gperf-native_3.0.3.bb new file mode 100644 index 0000000000..103d1aa3c2 --- /dev/null +++ b/packages/gperf/gperf-native_3.0.3.bb @@ -0,0 +1,10 @@ +require gperf_${PV}.bb + +S = "${WORKDIR}/gperf-${PV}" + +inherit native + +do_stage() { + install -d ${STAGING_BINDIR_NATIVE} + install ${S}/src/gperf ${STAGING_BINDIR_NATIVE} +} diff --git a/packages/gperf/gperf_3.0.3.bb b/packages/gperf/gperf_3.0.3.bb new file mode 100644 index 0000000000..7abfb8fbfb --- /dev/null +++ b/packages/gperf/gperf_3.0.3.bb @@ -0,0 +1,8 @@ +HOMEPAGE = "http://www.gnu.org/software/gperf" +LICENSE = "GPL" +SUMMARY = "Generate a perfect hash function from a set of keywords" + +SRC_URI = "${GNU_MIRROR}/gperf/gperf-${PV}.tar.gz \ + file://autoreconf.patch;patch=1" + +inherit autotools -- cgit v1.2.3 From 93843ed1c7d031d15884741b4fa23488e2b98bfc Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Thu, 10 May 2007 17:21:25 +0000 Subject: xdm: added missing dependency on libxaw --- packages/xorg-app/xdm_1.1.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-app/xdm_1.1.3.bb b/packages/xorg-app/xdm_1.1.3.bb index 7b4195e3d8..5df9fdd7bf 100644 --- a/packages/xorg-app/xdm_1.1.3.bb +++ b/packages/xorg-app/xdm_1.1.3.bb @@ -3,6 +3,6 @@ PE = "1" DESCRIPTION = "X display manager" -DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt" +DEPENDS += " libxmu libxinerama libxpm libxdmcp libxau virtual/libx11 libxext libxdmcp libxt libxaw" EXTRA_OECONF += " --with-random-device=/dev/urandom" -- cgit v1.2.3 From 2156cef6d35c92e12a53ac9d166619bb1035d947 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Thu, 10 May 2007 17:37:49 +0000 Subject: xfce4-dev-tools: added package, because libxfce4util needs it. --- packages/xfce/xfce4-dev-tools.inc | 12 ++++++++++++ packages/xfce/xfce4-dev-tools_4.4.0.bb | 1 + 2 files changed, 13 insertions(+) create mode 100644 packages/xfce/xfce4-dev-tools.inc create mode 100644 packages/xfce/xfce4-dev-tools_4.4.0.bb (limited to 'packages') diff --git a/packages/xfce/xfce4-dev-tools.inc b/packages/xfce/xfce4-dev-tools.inc new file mode 100644 index 0000000000..03f64e39e5 --- /dev/null +++ b/packages/xfce/xfce4-dev-tools.inc @@ -0,0 +1,12 @@ +DESCRIPTION = "Xfce4 development tools" +SECTION = "x11/libs" +LICENSE = "GPL" + +inherit xfce pkgconfig + +do_stage() { + install -d ${STAGING_DATADIR}/aclocal + install -m 644 m4macros/*.m4 ${STAGING_DATADIR}/aclocal/ +} + +FILES_${PN}-dev += " ${datadir}/xfce4/dev-tools/m4macros/*.m4" diff --git a/packages/xfce/xfce4-dev-tools_4.4.0.bb b/packages/xfce/xfce4-dev-tools_4.4.0.bb new file mode 100644 index 0000000000..bd54419686 --- /dev/null +++ b/packages/xfce/xfce4-dev-tools_4.4.0.bb @@ -0,0 +1 @@ +require ${PN}.inc -- cgit v1.2.3 From dd9e6aae1c7bf6c7ad76105a752dd87c44677431 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Thu, 10 May 2007 17:39:08 +0000 Subject: libxfce4util: added xfce4-dev-tools as a dependency and expanded list of headers being staged. --- packages/xfce/libxfce4util.inc | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'packages') diff --git a/packages/xfce/libxfce4util.inc b/packages/xfce/libxfce4util.inc index b30c8f9445..d5dd6d6565 100644 --- a/packages/xfce/libxfce4util.inc +++ b/packages/xfce/libxfce4util.inc @@ -5,20 +5,17 @@ DESCRIPTION = "Basic utility library for Xfce4" SECTION = "x11/libs" LICENSE = "GPL" -DEPENDS = "glib-2.0" +DEPENDS = "glib-2.0 xfce4-dev-tools" inherit xfce pkgconfig -XFCE_HEADERS="debug.h utf8.h xfce-generics.h xfce-resource.h \ - i18n.h util.h xfce-kiosk.h libxfce4util-config.h \ - xfce-desktopentry.h xfce-miscutils.h libxfce4util.h \ - xfce-fileutils.h xfce-rc.h" - MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4" do_stage() { install -d ${STAGING_LIBDIR} ${STAGING_INCDIR}/libxfce4util - for file in ${XFCE_HEADERS}; do + # The line below expands to the list of headers that native makefile + # would install. Complain and/or fix if it's not portable enough + for file in $(eval $(make -n -C libxfce4util install|grep "^list='[^.]\\+.h"|cut -d\; -f1); echo $list); do install -m 644 libxfce4util/$file ${STAGING_INCDIR}/libxfce4util done -- cgit v1.2.3 From e507cdb48294fea5ca7c2afc6d2e814facdacfe8 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Thu, 10 May 2007 20:18:53 +0000 Subject: opie-irdaapplet: added patch to take operator precedence into account. --- packages/opie-irdaapplet/files/.mtn2git_empty | 0 packages/opie-irdaapplet/files/learning-cpp.patch | 13 +++++++++++++ packages/opie-irdaapplet/opie-irdaapplet_cvs.bb | 4 +++- 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 packages/opie-irdaapplet/files/.mtn2git_empty create mode 100644 packages/opie-irdaapplet/files/learning-cpp.patch (limited to 'packages') diff --git a/packages/opie-irdaapplet/files/.mtn2git_empty b/packages/opie-irdaapplet/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-irdaapplet/files/learning-cpp.patch b/packages/opie-irdaapplet/files/learning-cpp.patch new file mode 100644 index 0000000000..60e46fd133 --- /dev/null +++ b/packages/opie-irdaapplet/files/learning-cpp.patch @@ -0,0 +1,13 @@ +diff --git a/irda.cpp b/irda.cpp +index d57104b..848ddb4 100644 +--- a/irda.cpp ++++ b/irda.cpp +@@ -54,7 +54,7 @@ IrdaApplet::IrdaApplet ( QWidget *parent, const char *name ) : + setFixedHeight( AppLnk::smallIconSize() ); + setFixedWidth( AppLnk::smallIconSize() ); + +- if (m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP ) == -1) ++ if ( ( m_sockfd = ::socket ( PF_INET, SOCK_DGRAM, IPPROTO_IP ) ) == -1) + perror ( "failed grabbing IrDA socket" ); + + m_irdaOnPixmap = diff --git a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb index 539d4555e1..c841c50fe6 100644 --- a/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb +++ b/packages/opie-irdaapplet/opie-irdaapplet_cvs.bb @@ -1,8 +1,10 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" +PR = r1 SRC_URI = "${HANDHELDS_CVS};module=opie/core/applets/irdaapplet \ ${HANDHELDS_CVS};module=opie/pics \ ${HANDHELDS_CVS};module=opie/sounds \ - ${HANDHELDS_CVS};module=opie/apps" + ${HANDHELDS_CVS};module=opie/apps \ + file://learning-cpp.patch;patch=1" -- cgit v1.2.3 From 242485f1bf19d1b1a6ba08e74afc98d160135bf3 Mon Sep 17 00:00:00 2001 From: Michael Krelin Date: Thu, 10 May 2007 21:33:20 +0000 Subject: directfb: fixed to build on recent kernels wrt PAGE_SIZE definition and corrected typo in patch filename --- packages/directfb/directfb_1.0.0.bb | 7 ++++--- packages/directfb/files/getpagesize.patch | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 packages/directfb/files/getpagesize.patch (limited to 'packages') diff --git a/packages/directfb/directfb_1.0.0.bb b/packages/directfb/directfb_1.0.0.bb index 5effeb8de6..cbeede90ab 100644 --- a/packages/directfb/directfb_1.0.0.bb +++ b/packages/directfb/directfb_1.0.0.bb @@ -7,12 +7,13 @@ SECTION = "libs" LICENSE = "LGPL" HOMEPAGE = "http://directfb.org" DEPENDS = "jpeg libpng freetype zlib tslib" -PR = "r2" +PR = "r3" RV = "1.0-0" SRC_URI = "http://www.directfb.org/download/DirectFB/DirectFB-${PV}.tar.gz \ - file://fix-pkgconfig-cflags.patch;patch=1 \ - file://mkdfiff.patch;patch=1" + file://fix-pkgconfig-specs.patch;patch=1 \ + file://mkdfiff.patch;patch=1 \ + file://getpagesize.patch;patch=1" S = "${WORKDIR}/DirectFB-1.0.0" diff --git a/packages/directfb/files/getpagesize.patch b/packages/directfb/files/getpagesize.patch new file mode 100644 index 0000000000..256b8db290 --- /dev/null +++ b/packages/directfb/files/getpagesize.patch @@ -0,0 +1,16 @@ +diff --git a/lib/direct/system.c b/lib/direct/system.c +index 8dd3f12..0731fa2 100644 +--- a/lib/direct/system.c ++++ b/lib/direct/system.c +@@ -36,8 +36,9 @@ + + #if HAVE_ASM_PAGE_H + #include +-#else +-#define PAGE_SIZE sysconf( _SC_PAGESIZE ) ++#endif ++#ifndef PAGE_SIZE ++# define PAGE_SIZE (getpagesize()) + #endif + + -- cgit v1.2.3