From 106b275a737d82c767dc18861b9c006db2e11ddd Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Sat, 5 May 2007 15:20:43 +0000 Subject: gpe-ownerinfo: unify --- packages/gpe-ownerinfo/gpe-ownerinfo.inc | 13 +++++++++++++ packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb | 12 +----------- packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb | 12 +----------- packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb | 12 +----------- packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb | 12 +----------- packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb | 12 +----------- packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb | 12 +----------- packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb | 12 ++---------- 8 files changed, 21 insertions(+), 76 deletions(-) create mode 100644 packages/gpe-ownerinfo/gpe-ownerinfo.inc diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo.inc b/packages/gpe-ownerinfo/gpe-ownerinfo.inc new file mode 100644 index 0000000000..704044f09b --- /dev/null +++ b/packages/gpe-ownerinfo/gpe-ownerinfo.inc @@ -0,0 +1,13 @@ +inherit gpe + +DESCRIPTION = "GPE owner information dialog" +SECTION = "gpe" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ libgpewidget" + +do_stage () { + oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} + install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ +} + diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb index 2eb1b947a8..c5d8184cbf 100644 --- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb +++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.23.bb @@ -1,13 +1,3 @@ -inherit gpe +require gpe-ownerinfo.inc -DESCRIPTION = "GPE owner information dialog" -SECTION = "gpe" -PRIORITY = "optional" -DEPENDS = "gtk+ libgpewidget" -LICENSE = "GPL" PR = "r1" - -do_stage () { - oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} - install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ -} diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb index e0709fe1ed..e63a6172a2 100644 --- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb +++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.24.bb @@ -1,15 +1,5 @@ -inherit gpe +require gpe-ownerinfo.inc -DESCRIPTION = "GPE owner information dialog" -SECTION = "gpe" -PRIORITY = "optional" -DEPENDS = "gtk+ libgpewidget" PR = "r2" -LICENSE = "GPL" SRC_URI += "file://fixloop.patch;patch=1;pnum=0" - -do_stage () { - oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} - install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ -} diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb index f04b9c19be..e7ef651bc4 100644 --- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb +++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.25.bb @@ -1,13 +1,3 @@ -inherit gpe +require gpe-ownerinfo.inc -DESCRIPTION = "GPE owner information dialog" -SECTION = "gpe" -PRIORITY = "optional" -DEPENDS = "gtk+ libgpewidget" -LICENSE = "GPL" PR = "r0" - -do_stage () { - oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} - install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ -} diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb index f04b9c19be..e7ef651bc4 100644 --- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb +++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.26.bb @@ -1,13 +1,3 @@ -inherit gpe +require gpe-ownerinfo.inc -DESCRIPTION = "GPE owner information dialog" -SECTION = "gpe" -PRIORITY = "optional" -DEPENDS = "gtk+ libgpewidget" -LICENSE = "GPL" PR = "r0" - -do_stage () { - oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} - install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ -} diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb index f04b9c19be..e7ef651bc4 100644 --- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb +++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.27.bb @@ -1,13 +1,3 @@ -inherit gpe +require gpe-ownerinfo.inc -DESCRIPTION = "GPE owner information dialog" -SECTION = "gpe" -PRIORITY = "optional" -DEPENDS = "gtk+ libgpewidget" -LICENSE = "GPL" PR = "r0" - -do_stage () { - oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} - install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ -} diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb index e17c6a6798..b00cc7cc66 100644 --- a/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb +++ b/packages/gpe-ownerinfo/gpe-ownerinfo_0.28.bb @@ -1,15 +1,5 @@ -inherit gpe +require gpe-ownerinfo.inc -DESCRIPTION = "GPE owner information dialog" -SECTION = "gpe" -PRIORITY = "optional" -DEPENDS = "gtk+ libgpewidget" -LICENSE = "GPL" PR = "r1" SRC_URI += "file://compile.patch;patch=1" - -do_stage () { - oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} - install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ -} diff --git a/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb b/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb index 90fb6faf14..036f70eaf1 100644 --- a/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb +++ b/packages/gpe-ownerinfo/gpe-ownerinfo_svn.bb @@ -1,8 +1,5 @@ -DESCRIPTION = "GPE owner information dialog" -SECTION = "gpe" -PRIORITY = "optional" -LICENSE = "GPL" -DEPENDS = "gtk+ libgpewidget" +require gpe-ownerinfo.inc + PR = "r1" PV = "0.28+svn-${SRCDATE}" @@ -12,8 +9,3 @@ SRC_URI += "${GPE_SVN} \ file://svn-build.patch;patch=1" S = "${WORKDIR}/${PN}" - -do_stage () { - oe_libinstall -a libgpe-ownerinfo ${STAGING_LIBDIR} - install -m 0644 gpe-ownerinfo.h ${STAGING_INCDIR}/ -} -- cgit v1.2.3 From 15df48be127ab405f0696157b522a4d2a6048c22 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 7 May 2007 11:29:02 +0000 Subject: packages/mozilla/* : removing old broken detritous --- packages/mozilla/firefox-1.5.0.6/.mtn2git_empty | 0 packages/mozilla/firefox-1.5.0.6/mozconfig | 53 ------------ packages/mozilla/firefox-2.0.0.1/.mtn2git_empty | 0 .../firefox-2.0.0.1/jsautocfg-dontoverwrite.patch | 23 ------ .../firefox-2.0.0.1/jsdtoa-float-type.patch | 13 --- packages/mozilla/firefox-2.0.0.1/mozconfig | 57 ------------- .../mozilla/firefox-2.0.0.1/mult-crash-fix.patch | 14 ---- .../mozilla/firefox-2.0.0.1/security-cross.patch | 93 ---------------------- .../mozilla/firefox-2.0.0.1/xptcinvoke-arm.patch | 11 --- packages/mozilla/firefox-2.0.0.1/xptcstubs.patch | 13 --- packages/mozilla/firefox-2.0/.mtn2git_empty | 0 .../firefox-2.0/jsautocfg-dontoverwrite.patch | 23 ------ packages/mozilla/firefox-2.0/mozconfig | 53 ------------ packages/mozilla/firefox-2.0/security-cross.patch | 93 ---------------------- packages/mozilla/firefox_1.5.0.6.bb | 18 ----- packages/mozilla/firefox_2.0.0.1.bb | 37 --------- packages/mozilla/firefox_2.0.bb | 35 -------- 17 files changed, 536 deletions(-) delete mode 100644 packages/mozilla/firefox-1.5.0.6/.mtn2git_empty delete mode 100644 packages/mozilla/firefox-1.5.0.6/mozconfig delete mode 100644 packages/mozilla/firefox-2.0.0.1/.mtn2git_empty delete mode 100644 packages/mozilla/firefox-2.0.0.1/jsautocfg-dontoverwrite.patch delete mode 100644 packages/mozilla/firefox-2.0.0.1/jsdtoa-float-type.patch delete mode 100644 packages/mozilla/firefox-2.0.0.1/mozconfig delete mode 100644 packages/mozilla/firefox-2.0.0.1/mult-crash-fix.patch delete mode 100644 packages/mozilla/firefox-2.0.0.1/security-cross.patch delete mode 100644 packages/mozilla/firefox-2.0.0.1/xptcinvoke-arm.patch delete mode 100644 packages/mozilla/firefox-2.0.0.1/xptcstubs.patch delete mode 100644 packages/mozilla/firefox-2.0/.mtn2git_empty delete mode 100644 packages/mozilla/firefox-2.0/jsautocfg-dontoverwrite.patch delete mode 100644 packages/mozilla/firefox-2.0/mozconfig delete mode 100644 packages/mozilla/firefox-2.0/security-cross.patch delete mode 100644 packages/mozilla/firefox_1.5.0.6.bb delete mode 100644 packages/mozilla/firefox_2.0.0.1.bb delete mode 100644 packages/mozilla/firefox_2.0.bb diff --git a/packages/mozilla/firefox-1.5.0.6/.mtn2git_empty b/packages/mozilla/firefox-1.5.0.6/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/mozilla/firefox-1.5.0.6/mozconfig b/packages/mozilla/firefox-1.5.0.6/mozconfig deleted file mode 100644 index 025b396ac7..0000000000 --- a/packages/mozilla/firefox-1.5.0.6/mozconfig +++ /dev/null @@ -1,53 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -# use GTK+-2 widget set with XFT font rendering -ac_add_options --enable-default-toolkit=gtk2 -ac_add_options --enable-xft -ac_add_options --disable-freetype2 - -# enable minimal profile support -ac_add_options --disable-profilesharing -ac_add_options --disable-profilelocking -ac_add_options --enable-single-profile - -ac_add_options --with-system-zlib -ac_add_options --with-system-jpeg -ac_add_options --with-system-png - -ac_add_options --disable-accessibility -ac_add_options --disable-composer -#ac_add_options --enable-plaintext-editor-only -ac_add_options --disable-mailnews -ac_add_options --disable-ldap -#ac_add_options --disable-postscript -ac_add_options --disable-mathml -ac_add_options --disable-jsd -ac_add_options --disable-installer -ac_add_options --disable-xprint -ac_add_options --disable-necko-disk-cache - -# configure necko to allocate smaller network buffers -ac_add_options --enable-necko-small-buffers - -# disable debug logging and tests -#ac_add_options --disable-dtd-debug -ac_add_options --disable-logging -ac_add_options --disable-debug -ac_add_options --disable-gtktest -ac_add_options --disable-tests - -# build crypto module (PSM + NSS) -ac_add_options --enable-crypto - -# build minimal set of protocol handlers -ac_add_options --enable-necko-protocols=http,file,res,jar,ftp,about,viewsource - -# build minimal set of image decoders -ac_add_options --enable-image-decoders=png,gif,jpeg - -#ac_add_options --enable-reorder -#ac_add_options --enable-elf-dynstr-gc - -# enable static build -#ac_add_options --disable-shared -#ac_add_options --enable-static diff --git a/packages/mozilla/firefox-2.0.0.1/.mtn2git_empty b/packages/mozilla/firefox-2.0.0.1/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/mozilla/firefox-2.0.0.1/jsautocfg-dontoverwrite.patch b/packages/mozilla/firefox-2.0.0.1/jsautocfg-dontoverwrite.patch deleted file mode 100644 index 39978cfd11..0000000000 --- a/packages/mozilla/firefox-2.0.0.1/jsautocfg-dontoverwrite.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 -+++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 -@@ -319,20 +319,8 @@ - - jsopcode.h jsopcode.c: jsopcode.tbl - --ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) - jsautocfg.h: - touch $@ --else --ifeq ($(OS_ARCH),WINCE) --jsautocfg.h: -- touch $@ --else --jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) -- @rm -f $@ jsautocfg.tmp -- ./jscpucfg > jsautocfg.tmp -- mv jsautocfg.tmp $@ --endif --endif - - # jscpucfg is a strange target - # Needs to be built with the host compiler but needs to include diff --git a/packages/mozilla/firefox-2.0.0.1/jsdtoa-float-type.patch b/packages/mozilla/firefox-2.0.0.1/jsdtoa-float-type.patch deleted file mode 100644 index 028900fa1b..0000000000 --- a/packages/mozilla/firefox-2.0.0.1/jsdtoa-float-type.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: mozilla/js/src/jsdtoa.c -=================================================================== ---- mozilla.orig/js/src/jsdtoa.c -+++ mozilla/js/src/jsdtoa.c -@@ -175,7 +175,7 @@ - * #define NO_IEEE_Scale to disable new (Feb. 1997) logic in strtod that - * avoids underflows on inputs whose result does not underflow. - */ --#ifdef IS_LITTLE_ENDIAN -+#if defined(IS_LITTLE_ENDIAN) && (!defined(__arm__) || defined(__VFP_FP__)) - #define IEEE_8087 - #else - #define IEEE_MC68k diff --git a/packages/mozilla/firefox-2.0.0.1/mozconfig b/packages/mozilla/firefox-2.0.0.1/mozconfig deleted file mode 100644 index 9737330a77..0000000000 --- a/packages/mozilla/firefox-2.0.0.1/mozconfig +++ /dev/null @@ -1,57 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -# use GTK+-2 widget set with XFT font rendering -ac_add_options --enable-default-toolkit=gtk2 -ac_add_options --enable-xft -ac_add_options --disable-freetype2 - -# enable minimal profile support -ac_add_options --disable-profilesharing -ac_add_options --disable-profilelocking -ac_add_options --enable-single-profile - -ac_add_options --with-system-zlib -ac_add_options --with-system-jpeg -ac_add_options --with-system-png - -ac_add_options --disable-accessibility -ac_add_options --disable-composer -#ac_add_options --enable-plaintext-editor-only -ac_add_options --disable-mailnews -ac_add_options --disable-ldap -#ac_add_options --disable-postscript -ac_add_options --disable-mathml -ac_add_options --disable-jsd -ac_add_options --disable-installer -ac_add_options --disable-xprint -ac_add_options --disable-necko-disk-cache - -# configure necko to allocate smaller network buffers -ac_add_options --enable-necko-small-buffers - -# disable debug logging and tests -#ac_add_options --disable-dtd-debug -ac_add_options --disable-logging -ac_add_options --enable-debug=-ggdb -ac_add_options --disable-gtktest -ac_add_options --disable-tests -ac_add_options --disable-printing -ac_add_options --disable-gnomevfs -ac_add_options --disable-gnomeui - -# build crypto module (PSM + NSS) -ac_add_options --enable-crypto - -# build minimal set of protocol handlers -ac_add_options --enable-necko-protocols=http,file,res,jar,ftp,about,viewsource - -# build minimal set of image decoders -ac_add_options --enable-image-decoders=png,gif,jpeg - -#ac_add_options --enable-reorder -#ac_add_options --enable-elf-dynstr-gc - -# enable static build -#ac_add_options --disable-shared -#ac_add_options --enable-static -ac_add_options --enable-optimize=-O1 diff --git a/packages/mozilla/firefox-2.0.0.1/mult-crash-fix.patch b/packages/mozilla/firefox-2.0.0.1/mult-crash-fix.patch deleted file mode 100644 index cb30f896ed..0000000000 --- a/packages/mozilla/firefox-2.0.0.1/mult-crash-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-nsprpub_pr_src_misc_prdtoa_c,v 1.1 2005/11/03 00:59:43 pvalchev Exp $ -Index: mozilla/nsprpub/pr/src/misc/prdtoa.c -=================================================================== ---- mozilla.orig/nsprpub/pr/src/misc/prdtoa.c -+++ mozilla/nsprpub/pr/src/misc/prdtoa.c -@@ -855,7 +855,7 @@ mult - wc = wa + wb; - if (wc > a->maxwds) - k++; -- c = Balloc(k); -+ c = Balloc(k*2); - for(x = c->x, xa = x + wc; x < xa; x++) - *x = 0; - xa = a->x; diff --git a/packages/mozilla/firefox-2.0.0.1/security-cross.patch b/packages/mozilla/firefox-2.0.0.1/security-cross.patch deleted file mode 100644 index 56c8d04a9e..0000000000 --- a/packages/mozilla/firefox-2.0.0.1/security-cross.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- mozilla/security/coreconf/Linux.mk.orig 2006-12-12 10:53:12.000000000 +0000 -+++ mozilla/security/coreconf/Linux.mk 2006-12-12 10:54:13.000000000 +0000 -@@ -52,88 +52,8 @@ - - DEFAULT_COMPILER = gcc - --ifeq ($(OS_TEST),m68k) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = m68k --else --ifeq ($(OS_TEST),ppc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --ifeq ($(USE_64),1) -- ARCHFLAG = -m64 --endif --else --ifeq ($(OS_TEST),ppc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --else --ifeq ($(OS_TEST),alpha) -- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = alpha --else --ifeq ($(OS_TEST),ia64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ia64 --else --ifeq ($(OS_TEST),x86_64) --ifeq ($(USE_64),1) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = x86_64 --else -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 -- ARCHFLAG = -m32 --endif --else --ifeq ($(OS_TEST),sparc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq ($(OS_TEST),sparc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq (,$(filter-out arm% sa110,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = arm --else --ifeq ($(OS_TEST),parisc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),parisc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),s390) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390 --else --ifeq ($(OS_TEST),s390x) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390x --else --ifeq ($(OS_TEST),mips) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = mips --else -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif -- -+OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -+CPU_ARCH = - - LIBC_TAG = _glibc - diff --git a/packages/mozilla/firefox-2.0.0.1/xptcinvoke-arm.patch b/packages/mozilla/firefox-2.0.0.1/xptcinvoke-arm.patch deleted file mode 100644 index bc0c6f4e5c..0000000000 --- a/packages/mozilla/firefox-2.0.0.1/xptcinvoke-arm.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- iceweasel-2.0.0.1+dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp -+++ iceweasel-2.0.0.1+dfsg/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp -@@ -212,7 +212,7 @@ - "add sp, sp, r4 \n\t" /* restore stack pointer */ - "mov %0, r0 \n\t" /* the result... */ - : "=r" (result) -- : "r" (&my_params) -+ : "r" (&my_params), "m" (my_params) - : "r0", "r1", "r2", "r3", "r4", "ip", "lr", "sp" - ); - diff --git a/packages/mozilla/firefox-2.0.0.1/xptcstubs.patch b/packages/mozilla/firefox-2.0.0.1/xptcstubs.patch deleted file mode 100644 index f2645690f4..0000000000 --- a/packages/mozilla/firefox-2.0.0.1/xptcstubs.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- iceweasel-2.0.0.1+dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp -+++ iceweasel-2.0.0.1+dfsg/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp -@@ -45,7 +45,8 @@ - #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) asm("_PrepareAndDispatch") -+__attribute__((used)); - - static nsresult - PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) - diff --git a/packages/mozilla/firefox-2.0/.mtn2git_empty b/packages/mozilla/firefox-2.0/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/mozilla/firefox-2.0/jsautocfg-dontoverwrite.patch b/packages/mozilla/firefox-2.0/jsautocfg-dontoverwrite.patch deleted file mode 100644 index 39978cfd11..0000000000 --- a/packages/mozilla/firefox-2.0/jsautocfg-dontoverwrite.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 -+++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 -@@ -319,20 +319,8 @@ - - jsopcode.h jsopcode.c: jsopcode.tbl - --ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) - jsautocfg.h: - touch $@ --else --ifeq ($(OS_ARCH),WINCE) --jsautocfg.h: -- touch $@ --else --jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) -- @rm -f $@ jsautocfg.tmp -- ./jscpucfg > jsautocfg.tmp -- mv jsautocfg.tmp $@ --endif --endif - - # jscpucfg is a strange target - # Needs to be built with the host compiler but needs to include diff --git a/packages/mozilla/firefox-2.0/mozconfig b/packages/mozilla/firefox-2.0/mozconfig deleted file mode 100644 index 025b396ac7..0000000000 --- a/packages/mozilla/firefox-2.0/mozconfig +++ /dev/null @@ -1,53 +0,0 @@ -. $topsrcdir/browser/config/mozconfig - -# use GTK+-2 widget set with XFT font rendering -ac_add_options --enable-default-toolkit=gtk2 -ac_add_options --enable-xft -ac_add_options --disable-freetype2 - -# enable minimal profile support -ac_add_options --disable-profilesharing -ac_add_options --disable-profilelocking -ac_add_options --enable-single-profile - -ac_add_options --with-system-zlib -ac_add_options --with-system-jpeg -ac_add_options --with-system-png - -ac_add_options --disable-accessibility -ac_add_options --disable-composer -#ac_add_options --enable-plaintext-editor-only -ac_add_options --disable-mailnews -ac_add_options --disable-ldap -#ac_add_options --disable-postscript -ac_add_options --disable-mathml -ac_add_options --disable-jsd -ac_add_options --disable-installer -ac_add_options --disable-xprint -ac_add_options --disable-necko-disk-cache - -# configure necko to allocate smaller network buffers -ac_add_options --enable-necko-small-buffers - -# disable debug logging and tests -#ac_add_options --disable-dtd-debug -ac_add_options --disable-logging -ac_add_options --disable-debug -ac_add_options --disable-gtktest -ac_add_options --disable-tests - -# build crypto module (PSM + NSS) -ac_add_options --enable-crypto - -# build minimal set of protocol handlers -ac_add_options --enable-necko-protocols=http,file,res,jar,ftp,about,viewsource - -# build minimal set of image decoders -ac_add_options --enable-image-decoders=png,gif,jpeg - -#ac_add_options --enable-reorder -#ac_add_options --enable-elf-dynstr-gc - -# enable static build -#ac_add_options --disable-shared -#ac_add_options --enable-static diff --git a/packages/mozilla/firefox-2.0/security-cross.patch b/packages/mozilla/firefox-2.0/security-cross.patch deleted file mode 100644 index 56c8d04a9e..0000000000 --- a/packages/mozilla/firefox-2.0/security-cross.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- mozilla/security/coreconf/Linux.mk.orig 2006-12-12 10:53:12.000000000 +0000 -+++ mozilla/security/coreconf/Linux.mk 2006-12-12 10:54:13.000000000 +0000 -@@ -52,88 +52,8 @@ - - DEFAULT_COMPILER = gcc - --ifeq ($(OS_TEST),m68k) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = m68k --else --ifeq ($(OS_TEST),ppc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --ifeq ($(USE_64),1) -- ARCHFLAG = -m64 --endif --else --ifeq ($(OS_TEST),ppc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ppc --else --ifeq ($(OS_TEST),alpha) -- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = alpha --else --ifeq ($(OS_TEST),ia64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = ia64 --else --ifeq ($(OS_TEST),x86_64) --ifeq ($(USE_64),1) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = x86_64 --else -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 -- ARCHFLAG = -m32 --endif --else --ifeq ($(OS_TEST),sparc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq ($(OS_TEST),sparc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = sparc --else --ifeq (,$(filter-out arm% sa110,$(OS_TEST))) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = arm --else --ifeq ($(OS_TEST),parisc) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),parisc64) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = hppa --else --ifeq ($(OS_TEST),s390) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390 --else --ifeq ($(OS_TEST),s390x) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = s390x --else --ifeq ($(OS_TEST),mips) -- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -- CPU_ARCH = mips --else -- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE -- CPU_ARCH = x86 --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif --endif -- -+OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE -+CPU_ARCH = - - LIBC_TAG = _glibc - diff --git a/packages/mozilla/firefox_1.5.0.6.bb b/packages/mozilla/firefox_1.5.0.6.bb deleted file mode 100644 index 5f21212bd5..0000000000 --- a/packages/mozilla/firefox_1.5.0.6.bb +++ /dev/null @@ -1,18 +0,0 @@ -PR = "r1" -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ - file://xptcstubs.patch;patch=1 \ - file://no-xmb.patch;patch=1 \ - file://jsautocfg.h \ - file://extensions-hack.patch;patch=1" - -S = "${WORKDIR}/mozilla" -DEFAULT_PREFERENCE = "-1" - -inherit mozilla - -require firefox.inc - -do_compile_prepend() { - cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ -} - diff --git a/packages/mozilla/firefox_2.0.0.1.bb b/packages/mozilla/firefox_2.0.0.1.bb deleted file mode 100644 index db3c0f4902..0000000000 --- a/packages/mozilla/firefox_2.0.0.1.bb +++ /dev/null @@ -1,37 +0,0 @@ -PR = "r1" -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ - file://xptcstubs.patch;patch=1 \ - file://no-xmb.patch;patch=1 \ - file://jsautocfg.h \ - file://extensions-hack.patch;patch=1 \ - file://security-cross.patch;patch=1 \ - file://jsautocfg-dontoverwrite.patch;patch=1 \ - file://xptcinvoke-arm.patch;patch=1 \ - file://jsdtoa-float-type.patch;patch=1 \ - " -S = "${WORKDIR}/mozilla" -DEFAULT_PREFERENCE = "-1" - -inherit mozilla - -require firefox.inc - -do_compile_prepend() { - cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ - - sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk -} - -do_stage() { - - install -d ${STAGING_INCDIR}/${P} - cd dist/sdk/include - headers=`find . -name "*.h"` - for f in $headers - do - install -D -m 0644 $f ${STAGING_INCDIR}/${P}/$f - done - # removes 2 lines that call absent headers - sed -e '178,179d' ${STAGING_INCDIR}/${P}/nsIServiceManager.h -} - diff --git a/packages/mozilla/firefox_2.0.bb b/packages/mozilla/firefox_2.0.bb deleted file mode 100644 index c8fbccc2bf..0000000000 --- a/packages/mozilla/firefox_2.0.bb +++ /dev/null @@ -1,35 +0,0 @@ -PR = "r1" -SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ - file://xptcstubs.patch;patch=1 \ - file://no-xmb.patch;patch=1 \ - file://jsautocfg.h \ - file://extensions-hack.patch;patch=1 \ - file://security-cross.patch;patch=1 \ - file://jsautocfg-dontoverwrite.patch;patch=1" - -S = "${WORKDIR}/mozilla" -DEFAULT_PREFERENCE = "-1" - -inherit mozilla - -require firefox.inc - -do_compile_prepend() { - cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ - - sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk -} - -do_stage() { - - install -d ${STAGING_INCDIR}/${P} - cd dist/sdk/include - headers=`find . -name "*.h"` - for f in $headers - do - install -m 0644 $f ${STAGING_INCDIR}/${P}/$f - done - # removes 2 lines that call absent headers - sed -e '178,179d' ${STAGING_INCDIR}/${P}/nsIServiceManager.h -} - -- cgit v1.2.3 From 9bde98efe0f773f113eefe26762c2fd1bcc64b16 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Mon, 7 May 2007 11:31:23 +0000 Subject: firefox_1.0.7.bb : add patch from http://article.gmane.org/gmane.linux.debian.ports.arm/4082 by Lennert Buytenhek fix a small QA issue firefox_2.0.0.3 : new version with same patch as above added. --- packages/mozilla/firefox-1.0.7/mozilla-eabi.patch | 28 +++++++ .../mozilla/firefox-1.0.7/xptcinvoke-arm.patch | 11 +++ packages/mozilla/firefox-2.0.0.3/.mtn2git_empty | 0 .../firefox-2.0.0.3/jsautocfg-dontoverwrite.patch | 23 ++++++ .../firefox-2.0.0.3/jsdtoa-float-type.patch | 13 +++ packages/mozilla/firefox-2.0.0.3/mozconfig | 57 +++++++++++++ .../mozilla/firefox-2.0.0.3/mozilla-eabi.patch | 42 ++++++++++ .../mozilla/firefox-2.0.0.3/mult-crash-fix.patch | 14 ++++ .../mozilla/firefox-2.0.0.3/security-cross.patch | 93 ++++++++++++++++++++++ .../mozilla/firefox-2.0.0.3/xptcinvoke-arm.patch | 11 +++ packages/mozilla/firefox-2.0.0.3/xptcstubs.patch | 13 +++ packages/mozilla/firefox_1.0.7.bb | 6 +- packages/mozilla/firefox_2.0.0.3.bb | 37 +++++++++ 13 files changed, 347 insertions(+), 1 deletion(-) create mode 100644 packages/mozilla/firefox-1.0.7/mozilla-eabi.patch create mode 100644 packages/mozilla/firefox-1.0.7/xptcinvoke-arm.patch create mode 100644 packages/mozilla/firefox-2.0.0.3/.mtn2git_empty create mode 100644 packages/mozilla/firefox-2.0.0.3/jsautocfg-dontoverwrite.patch create mode 100644 packages/mozilla/firefox-2.0.0.3/jsdtoa-float-type.patch create mode 100644 packages/mozilla/firefox-2.0.0.3/mozconfig create mode 100644 packages/mozilla/firefox-2.0.0.3/mozilla-eabi.patch create mode 100644 packages/mozilla/firefox-2.0.0.3/mult-crash-fix.patch create mode 100644 packages/mozilla/firefox-2.0.0.3/security-cross.patch create mode 100644 packages/mozilla/firefox-2.0.0.3/xptcinvoke-arm.patch create mode 100644 packages/mozilla/firefox-2.0.0.3/xptcstubs.patch create mode 100644 packages/mozilla/firefox_2.0.0.3.bb diff --git a/packages/mozilla/firefox-1.0.7/mozilla-eabi.patch b/packages/mozilla/firefox-1.0.7/mozilla-eabi.patch new file mode 100644 index 0000000000..c12f6ef04e --- /dev/null +++ b/packages/mozilla/firefox-1.0.7/mozilla-eabi.patch @@ -0,0 +1,28 @@ +Index: mozilla/nsprpub/pr/src/misc/prdtoa.c +=================================================================== +--- mozilla.orig/nsprpub/pr/src/misc/prdtoa.c 2004-03-12 07:30:50.000000000 +0000 ++++ mozilla/nsprpub/pr/src/misc/prdtoa.c 2007-05-07 11:35:10.000000000 +0100 +@@ -132,8 +132,8 @@ + * is not strictly legal and can cause trouble with aggressively + * optimizing compilers (e.g., gcc 2.95.1 under -O2). + */ +-#if defined(__arm) || defined(__arm__) || defined(__arm26__) \ +- || defined(__arm32__) ++#if (defined(__arm) || defined(__arm__) || defined(__arm26__) \ ++ || defined(__arm32__)) && !defined(__ARM_EABI__) && !defined(__ARMEB__) + #define IEEE_ARM + #elif defined(IS_LITTLE_ENDIAN) + #define IEEE_8087 +Index: mozilla/nsprpub/pr/include/md/_linux.h +=================================================================== +--- mozilla.orig/nsprpub/pr/include/md/_linux.h 2005-05-04 19:06:17.000000000 +0100 ++++ mozilla/nsprpub/pr/include/md/_linux.h 2007-05-07 11:34:16.000000000 +0100 +@@ -285,7 +285,7 @@ + #error "Linux/MIPS pre-glibc2 not supported yet" + #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ + +-#elif defined(__arm__) ++#elif defined(__arm__) && !defined(__ARM_EABI__) + /* ARM/Linux */ + #if defined(__GLIBC__) && __GLIBC__ >= 2 + #define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20] diff --git a/packages/mozilla/firefox-1.0.7/xptcinvoke-arm.patch b/packages/mozilla/firefox-1.0.7/xptcinvoke-arm.patch new file mode 100644 index 0000000000..bc0c6f4e5c --- /dev/null +++ b/packages/mozilla/firefox-1.0.7/xptcinvoke-arm.patch @@ -0,0 +1,11 @@ +--- iceweasel-2.0.0.1+dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp ++++ iceweasel-2.0.0.1+dfsg/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp +@@ -212,7 +212,7 @@ + "add sp, sp, r4 \n\t" /* restore stack pointer */ + "mov %0, r0 \n\t" /* the result... */ + : "=r" (result) +- : "r" (&my_params) ++ : "r" (&my_params), "m" (my_params) + : "r0", "r1", "r2", "r3", "r4", "ip", "lr", "sp" + ); + diff --git a/packages/mozilla/firefox-2.0.0.3/.mtn2git_empty b/packages/mozilla/firefox-2.0.0.3/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/mozilla/firefox-2.0.0.3/jsautocfg-dontoverwrite.patch b/packages/mozilla/firefox-2.0.0.3/jsautocfg-dontoverwrite.patch new file mode 100644 index 0000000000..39978cfd11 --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.3/jsautocfg-dontoverwrite.patch @@ -0,0 +1,23 @@ +--- mozilla/js/src/Makefile.in.orig 2006-12-12 11:46:02.000000000 +0000 ++++ mozilla/js/src/Makefile.in 2006-12-12 11:46:27.000000000 +0000 +@@ -319,20 +319,8 @@ + + jsopcode.h jsopcode.c: jsopcode.tbl + +-ifeq (,$(CROSS_COMPILE)$(filter-out WINNT,$(OS_ARCH))) + jsautocfg.h: + touch $@ +-else +-ifeq ($(OS_ARCH),WINCE) +-jsautocfg.h: +- touch $@ +-else +-jsautocfg.h: jscpucfg$(HOST_BIN_SUFFIX) +- @rm -f $@ jsautocfg.tmp +- ./jscpucfg > jsautocfg.tmp +- mv jsautocfg.tmp $@ +-endif +-endif + + # jscpucfg is a strange target + # Needs to be built with the host compiler but needs to include diff --git a/packages/mozilla/firefox-2.0.0.3/jsdtoa-float-type.patch b/packages/mozilla/firefox-2.0.0.3/jsdtoa-float-type.patch new file mode 100644 index 0000000000..028900fa1b --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.3/jsdtoa-float-type.patch @@ -0,0 +1,13 @@ +Index: mozilla/js/src/jsdtoa.c +=================================================================== +--- mozilla.orig/js/src/jsdtoa.c ++++ mozilla/js/src/jsdtoa.c +@@ -175,7 +175,7 @@ + * #define NO_IEEE_Scale to disable new (Feb. 1997) logic in strtod that + * avoids underflows on inputs whose result does not underflow. + */ +-#ifdef IS_LITTLE_ENDIAN ++#if defined(IS_LITTLE_ENDIAN) && (!defined(__arm__) || defined(__VFP_FP__)) + #define IEEE_8087 + #else + #define IEEE_MC68k diff --git a/packages/mozilla/firefox-2.0.0.3/mozconfig b/packages/mozilla/firefox-2.0.0.3/mozconfig new file mode 100644 index 0000000000..9737330a77 --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.3/mozconfig @@ -0,0 +1,57 @@ +. $topsrcdir/browser/config/mozconfig + +# use GTK+-2 widget set with XFT font rendering +ac_add_options --enable-default-toolkit=gtk2 +ac_add_options --enable-xft +ac_add_options --disable-freetype2 + +# enable minimal profile support +ac_add_options --disable-profilesharing +ac_add_options --disable-profilelocking +ac_add_options --enable-single-profile + +ac_add_options --with-system-zlib +ac_add_options --with-system-jpeg +ac_add_options --with-system-png + +ac_add_options --disable-accessibility +ac_add_options --disable-composer +#ac_add_options --enable-plaintext-editor-only +ac_add_options --disable-mailnews +ac_add_options --disable-ldap +#ac_add_options --disable-postscript +ac_add_options --disable-mathml +ac_add_options --disable-jsd +ac_add_options --disable-installer +ac_add_options --disable-xprint +ac_add_options --disable-necko-disk-cache + +# configure necko to allocate smaller network buffers +ac_add_options --enable-necko-small-buffers + +# disable debug logging and tests +#ac_add_options --disable-dtd-debug +ac_add_options --disable-logging +ac_add_options --enable-debug=-ggdb +ac_add_options --disable-gtktest +ac_add_options --disable-tests +ac_add_options --disable-printing +ac_add_options --disable-gnomevfs +ac_add_options --disable-gnomeui + +# build crypto module (PSM + NSS) +ac_add_options --enable-crypto + +# build minimal set of protocol handlers +ac_add_options --enable-necko-protocols=http,file,res,jar,ftp,about,viewsource + +# build minimal set of image decoders +ac_add_options --enable-image-decoders=png,gif,jpeg + +#ac_add_options --enable-reorder +#ac_add_options --enable-elf-dynstr-gc + +# enable static build +#ac_add_options --disable-shared +#ac_add_options --enable-static +ac_add_options --enable-optimize=-O1 diff --git a/packages/mozilla/firefox-2.0.0.3/mozilla-eabi.patch b/packages/mozilla/firefox-2.0.0.3/mozilla-eabi.patch new file mode 100644 index 0000000000..fe9adf088e --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.3/mozilla-eabi.patch @@ -0,0 +1,42 @@ +--- nspr-4.6.6/mozilla/nsprpub/pr/src/misc/prdtoa.c.orig 2007-05-06 02:39:00.000000000 +0200 ++++ nspr-4.6.6/mozilla/nsprpub/pr/src/misc/prdtoa.c 2007-05-06 02:39:22.000000000 +0200 +@@ -59,8 +59,8 @@ + /* FIXME: deal with freelist and p5s. */ + } + +-#if defined(__arm) || defined(__arm__) || defined(__arm26__) \ +- || defined(__arm32__) ++#if (defined(__arm) || defined(__arm__) || defined(__arm26__) \ ++ || defined(__arm32__)) && !defined(__ARM_EABI__) && !defined(__ARMEB__) + #define IEEE_ARM + #elif defined(IS_LITTLE_ENDIAN) + #define IEEE_8087 +--- nspr-4.6.6/mozilla/nsprpub/pr/include/md/_linux.h.orig 2007-05-06 02:39:45.000000000 +0200 ++++ nspr-4.6.6/mozilla/nsprpub/pr/include/md/_linux.h 2007-05-06 02:40:57.000000000 +0200 +@@ -346,7 +346,7 @@ + #error "Linux/MIPS pre-glibc2 not supported yet" + #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ + +-#elif defined(__arm__) ++#elif defined(__arm__) && !defined(__ARM_EABI__) + /* ARM/Linux */ + #if defined(__GLIBC__) && __GLIBC__ >= 2 + #define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[20] + -358,6 +358,18 + #error "ARM/Linux pre-glibc2 not supported yet" + #endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ + ++#elif defined(__arm__) && defined(__ARM_EABI__) ++/* ARM/Linux */ ++#if defined(__GLIBC__) && __GLIBC__ >= 2 ++#define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[8] ++#define _MD_SET_FP(_t, val) ((_t)->md.context[0].__jmpbuf[7] = (val)) ++#define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t)) ++#define _MD_GET_FP_PTR(_t) (&(_t)->md.context[0].__jmpbuf[7]) ++#define _MD_SP_TYPE __ptr_t ++#else ++#error "ARM/Linux pre-glibc2 not supported yet" ++#endif /* defined(__GLIBC__) && __GLIBC__ >= 2 */ ++ + #else + diff --git a/packages/mozilla/firefox-2.0.0.3/mult-crash-fix.patch b/packages/mozilla/firefox-2.0.0.3/mult-crash-fix.patch new file mode 100644 index 0000000000..cb30f896ed --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.3/mult-crash-fix.patch @@ -0,0 +1,14 @@ +$OpenBSD: patch-nsprpub_pr_src_misc_prdtoa_c,v 1.1 2005/11/03 00:59:43 pvalchev Exp $ +Index: mozilla/nsprpub/pr/src/misc/prdtoa.c +=================================================================== +--- mozilla.orig/nsprpub/pr/src/misc/prdtoa.c ++++ mozilla/nsprpub/pr/src/misc/prdtoa.c +@@ -855,7 +855,7 @@ mult + wc = wa + wb; + if (wc > a->maxwds) + k++; +- c = Balloc(k); ++ c = Balloc(k*2); + for(x = c->x, xa = x + wc; x < xa; x++) + *x = 0; + xa = a->x; diff --git a/packages/mozilla/firefox-2.0.0.3/security-cross.patch b/packages/mozilla/firefox-2.0.0.3/security-cross.patch new file mode 100644 index 0000000000..56c8d04a9e --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.3/security-cross.patch @@ -0,0 +1,93 @@ +--- mozilla/security/coreconf/Linux.mk.orig 2006-12-12 10:53:12.000000000 +0000 ++++ mozilla/security/coreconf/Linux.mk 2006-12-12 10:54:13.000000000 +0000 +@@ -52,88 +52,8 @@ + + DEFAULT_COMPILER = gcc + +-ifeq ($(OS_TEST),m68k) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = m68k +-else +-ifeq ($(OS_TEST),ppc64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = ppc +-ifeq ($(USE_64),1) +- ARCHFLAG = -m64 +-endif +-else +-ifeq ($(OS_TEST),ppc) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = ppc +-else +-ifeq ($(OS_TEST),alpha) +- OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = alpha +-else +-ifeq ($(OS_TEST),ia64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = ia64 +-else +-ifeq ($(OS_TEST),x86_64) +-ifeq ($(USE_64),1) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = x86_64 +-else +- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE +- CPU_ARCH = x86 +- ARCHFLAG = -m32 +-endif +-else +-ifeq ($(OS_TEST),sparc) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = sparc +-else +-ifeq ($(OS_TEST),sparc64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = sparc +-else +-ifeq (,$(filter-out arm% sa110,$(OS_TEST))) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = arm +-else +-ifeq ($(OS_TEST),parisc) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = hppa +-else +-ifeq ($(OS_TEST),parisc64) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = hppa +-else +-ifeq ($(OS_TEST),s390) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = s390 +-else +-ifeq ($(OS_TEST),s390x) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = s390x +-else +-ifeq ($(OS_TEST),mips) +- OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE +- CPU_ARCH = mips +-else +- OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE +- CPU_ARCH = x86 +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +-endif +- ++OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE ++CPU_ARCH = + + LIBC_TAG = _glibc + diff --git a/packages/mozilla/firefox-2.0.0.3/xptcinvoke-arm.patch b/packages/mozilla/firefox-2.0.0.3/xptcinvoke-arm.patch new file mode 100644 index 0000000000..bc0c6f4e5c --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.3/xptcinvoke-arm.patch @@ -0,0 +1,11 @@ +--- iceweasel-2.0.0.1+dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp ++++ iceweasel-2.0.0.1+dfsg/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp +@@ -212,7 +212,7 @@ + "add sp, sp, r4 \n\t" /* restore stack pointer */ + "mov %0, r0 \n\t" /* the result... */ + : "=r" (result) +- : "r" (&my_params) ++ : "r" (&my_params), "m" (my_params) + : "r0", "r1", "r2", "r3", "r4", "ip", "lr", "sp" + ); + diff --git a/packages/mozilla/firefox-2.0.0.3/xptcstubs.patch b/packages/mozilla/firefox-2.0.0.3/xptcstubs.patch new file mode 100644 index 0000000000..f2645690f4 --- /dev/null +++ b/packages/mozilla/firefox-2.0.0.3/xptcstubs.patch @@ -0,0 +1,13 @@ +--- iceweasel-2.0.0.1+dfsg.orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp ++++ iceweasel-2.0.0.1+dfsg/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp +@@ -45,7 +45,8 @@ + #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) asm("_PrepareAndDispatch") ++__attribute__((used)); + + static nsresult + PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) + diff --git a/packages/mozilla/firefox_1.0.7.bb b/packages/mozilla/firefox_1.0.7.bb index 3a82dafd92..dd4d734f89 100644 --- a/packages/mozilla/firefox_1.0.7.bb +++ b/packages/mozilla/firefox_1.0.7.bb @@ -5,7 +5,9 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/ file://firefox-cc-fix.patch;patch=1 \ file://jsautocfg.h \ file://extensions-hack.patch;patch=1 \ - file://firefox-1.0-gcc4-compile.patch;patch=1;pnum=0" + file://firefox-1.0-gcc4-compile.patch;patch=1;pnum=0 \ + file://xptcinvoke-arm.patch;patch=1 \ + file://mozilla-eabi.patch;patch=1" S = "${WORKDIR}/mozilla" @@ -13,6 +15,8 @@ inherit mozilla require firefox.inc +EXTRA_OECONF += " --with-gssapi=${STAGINGLIBDIR}/../" + do_compile_prepend() { cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ } diff --git a/packages/mozilla/firefox_2.0.0.3.bb b/packages/mozilla/firefox_2.0.0.3.bb new file mode 100644 index 0000000000..db3729c274 --- /dev/null +++ b/packages/mozilla/firefox_2.0.0.3.bb @@ -0,0 +1,37 @@ +PR = "r1" +SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \ + file://xptcstubs.patch;patch=1 \ + file://no-xmb.patch;patch=1 \ + file://jsautocfg.h \ + file://extensions-hack.patch;patch=1 \ + file://security-cross.patch;patch=1 \ + file://jsautocfg-dontoverwrite.patch;patch=1 \ + file://xptcinvoke-arm.patch;patch=1 \ + file://mozilla-eabi.patch;patch=1;pnum=2 \ + " +S = "${WORKDIR}/mozilla" +DEFAULT_PREFERENCE = "-1" + +inherit mozilla + +require firefox.inc + +do_compile_prepend() { + cp ${WORKDIR}/jsautocfg.h ${S}/js/src/ + + sed -i "s|CPU_ARCH =|CPU_ARCH = ${TARGET_ARCH}|" security/coreconf/Linux.mk +} + +do_stage() { + + install -d ${STAGING_INCDIR}/${P} + cd dist/sdk/include + headers=`find . -name "*.h"` + for f in $headers + do + install -D -m 0644 $f ${STAGING_INCDIR}/${P}/$f + done + # removes 2 lines that call absent headers + sed -e '178,179d' ${STAGING_INCDIR}/${P}/nsIServiceManager.h +} + -- cgit v1.2.3 From de2533a6a8aef13f003384d1654980bbb434b67b Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 May 2007 12:12:11 +0000 Subject: angstrom-x11-image: add task-base-wifi --- packages/angstrom/angstrom-x11-image.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/angstrom/angstrom-x11-image.bb b/packages/angstrom/angstrom-x11-image.bb index c5d2675b60..14e83818a0 100644 --- a/packages/angstrom/angstrom-x11-image.bb +++ b/packages/angstrom/angstrom-x11-image.bb @@ -1,6 +1,6 @@ #Angstrom X11 image LICENSE = "MIT" -PR = "r6" +PR = "r8" PREFERRED_PROVIDER_libgpewidget ?= "libgpewidget" PREFERRED_PROVIDER_tslib ?= "tslib" @@ -8,7 +8,7 @@ PREFERRED_PROVIDER_virtual/libsdl ?= "libsdl-x11" PREFERRED_PROVIDER_virtual/libxine ?= "libxine-x11" PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11" -ANGSTROM_EXTRA_INSTALL ?= "" +ANGSTROM_EXTRA_INSTALL ?= "hal gstreamer" XSERVER ?= "xserver-kdrive-fbdev" export IMAGE_BASENAME = "x11-image" @@ -17,6 +17,7 @@ DEPENDS = "task-base" RDEPENDS = "\ ${XSERVER} \ task-base \ + task-base-wifi \ angstrom-x11-base-depends \ angstrom-gpe-task-base \ angstrom-gpe-task-settings \ -- cgit v1.2.3 From 4bd652681d099c3bc0bd7fbfda386b780816fe4c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 May 2007 13:23:47 +0000 Subject: bcm2035tool: takes BDADDR as a commandline argument. Patch from Jan Herman --- packages/bluez/bcm2035-tool/.mtn2git_empty | 0 packages/bluez/bcm2035-tool/addr-as-arg.patch | 104 ++++++++++++++++++++++++++ packages/bluez/bcm2035-tool_0.0.bb | 6 +- 3 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 packages/bluez/bcm2035-tool/.mtn2git_empty create mode 100644 packages/bluez/bcm2035-tool/addr-as-arg.patch diff --git a/packages/bluez/bcm2035-tool/.mtn2git_empty b/packages/bluez/bcm2035-tool/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/bluez/bcm2035-tool/addr-as-arg.patch b/packages/bluez/bcm2035-tool/addr-as-arg.patch new file mode 100644 index 0000000000..28618c5bbb --- /dev/null +++ b/packages/bluez/bcm2035-tool/addr-as-arg.patch @@ -0,0 +1,104 @@ +--- bcm2035-tool/bcm2035-tool.c 2007/05/07 12:48:06 2000 ++++ bcm2035-tool/bcm2035-tool.c 2007/05/07 12:55:47 2001 +@@ -1,6 +1,8 @@ +-/* bcm2035-tool - bcm2035 tool for Motorola EZX phones ++/* bcm2035-tool + * + * (C) 2007 by Daniel Ribeiro ++ * ++ * MAC address as argument extension by: Jan Herman <2hp@seznam.cz> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 +@@ -17,10 +19,10 @@ + * + */ + ++/* Default MAC address */ ++#define BDADDR "\x06\x05\x04\x03\x02\x01" + + //#define PATCH_FIRMWARE +-#define BDADDR "\xab\x89\x67\x45\x23\x01" +- + + #include + #include +@@ -33,6 +35,7 @@ + #include + #include + #include "bcm2035-tool.h" ++//#include "bluetooth.h" + + #ifdef PATCH_FIRMWARE + #include "motorola_patches.h" +@@ -180,18 +183,51 @@ + + } + ++void mac2hex(const char *mac, u_char *dst) ++{ ++ ++ int i; ++ long l; ++ char *pp; ++ ++ while (isspace(*mac)) ++ mac++; ++ ++ /* expect 6 hex octets separated by ':' or space/NUL if last octet */ ++ for (i = 0; i < 6; i++) { ++ l = strtol(mac, &pp, 16); ++ if (pp == mac || l > 0xFF || l < 0) ++ return; ++ if (!(*pp == ':' || (i == 5 && (isspace(*pp) || *pp == '\0')))) ++ return; ++ /* 5-i swaps hex chars */ ++ dst[5-i] = (u_char) l; ++ mac = pp + 1; ++ } ++ } ++ ++char bdaddr[6]; ++ + int main(int argc, char **argv) + { + int fd, i; + struct termios term; + char buf[1024]; +- char bdaddr[6]; +- +- if (argc < 2) { +- printf("use: %s \n", argv[0]); ++ ++ if (argc < 3) { ++ printf("BCM2035 Tool:\n"); ++ printf("Usage: %s \n", argv[0]); + exit(1); + } + ++ if (strlen(argv[2]) < 17) { ++ printf("invalid argument %s!\n", argv[2]); ++ exit(1); ++ } ++ ++ /* Converts MAC address to swapped HEX */ ++ mac2hex(argv[2], bdaddr); ++ + fd = open (argv[1], O_RDWR | O_NOCTTY ); + + if(fd < 0) exit(-1); +@@ -212,7 +248,7 @@ + #endif + set_baud(fd, 460800); + +- send_cmd(fd, CMD_SET_BDADDR, BDADDR, 6); ++ send_cmd(fd, CMD_SET_BDADDR, bdaddr, 6); + + i = N_HCI; + if (ioctl(fd, TIOCSETD, &i) < 0) { +@@ -228,5 +264,3 @@ + while (1) sleep(999999999); + return 0; + } +- +- diff --git a/packages/bluez/bcm2035-tool_0.0.bb b/packages/bluez/bcm2035-tool_0.0.bb index bd3c9012ec..636841de6f 100644 --- a/packages/bluez/bcm2035-tool_0.0.bb +++ b/packages/bluez/bcm2035-tool_0.0.bb @@ -1,9 +1,11 @@ DESCRIPTION = "Bluetooth firmware poker for bccm2035 chips (motorola phones and palms)" LICENSE = "GPLv2" -SRC_URI = "http://people.openezx.org/wyrm/bcm2035-tool.tgz" +PR = "r1" -# Note: everyone will have the same BDADDR for the time being +SRC_URI = "http://people.openezx.org/wyrm/bcm2035-tool.tgz \ + file://addr-as-arg.patch;patch=1 \ + " S = "${WORKDIR}/${PN}" -- cgit v1.2.3 From 840675f5036042778054dab3cc0d138874877d73 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 May 2007 14:44:29 +0000 Subject: fuse 2.5.3: fix FILES for libfuse --- packages/fuse/fuse_2.5.3.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/fuse/fuse_2.5.3.bb b/packages/fuse/fuse_2.5.3.bb index 5f5ce701d3..b3f45381a0 100644 --- a/packages/fuse/fuse_2.5.3.bb +++ b/packages/fuse/fuse_2.5.3.bb @@ -1,10 +1,10 @@ require fuse.inc -PR = "r1" +PR = "r2" #package utils in a sperate package and stop debian.bbclass renaming it to libfuse-utils, we want it to be fuse-utils PACKAGES += "fuse-utils" -FILES_${PN} = "${libdir}/*.so*" +FILES_${PN} = "${libdir}/*.so.*" FILES_${PN}-dev += "${libdir}/*.la" FILES_fuse-utils = "${bindir} ${base_sbindir}" DEBIAN_NOAUTONAME_fuse-utils = "1" -- cgit v1.2.3 From 78e64ab514fbc640d7c2d557c29cf9d407f09d75 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 May 2007 16:16:21 +0000 Subject: libxcb: fix FILES, spotted by Junqian Gordon Xu --- packages/xcb/libxcb_0.9.93.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/xcb/libxcb_0.9.93.bb b/packages/xcb/libxcb_0.9.93.bb index 5f5f870482..5b926d093f 100644 --- a/packages/xcb/libxcb_0.9.93.bb +++ b/packages/xcb/libxcb_0.9.93.bb @@ -2,7 +2,7 @@ DESCRIPTION = "XCB: an X protocol C binding" SECTION = "x11/libs" LICENSE = "MIT-X" HOMEPAGE = "http://xcb.freedesktop.org" -PR = "r1" +PR = "r2" PARALLEL_MAKE = "" DEPENDS = "xcb-proto libxau libxslt-native" @@ -18,7 +18,7 @@ PACKAGES =+ "libxcb-composite libxcb-damage libxcb-dpms libxcb-glx \ FILES_${PN} = "${libdir}/libxcb.so.*" #FILES_${PN}-dev = "${libdir}/libxcb.* ${libdir}/pkgconfig/*.pc ${includedir}/xcb/*.h" -FILES_libxcb-composite = "${libdir}/libxcb-composite.so*" +FILES_libxcb-composite = "${libdir}/libxcb-composite.so.*" FILES_libxcb-damage = "${libdir}/libxcb-damage.so.*" FILES_libxcb-dpms = "${libdir}/libxcb-dpms.so.*" FILES_libxcb-glx = "${libdir}/libxcb-glx.so.*" -- cgit v1.2.3 From 5c26128521303cbf8d77621d758daeba9e2c73f8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 May 2007 16:50:46 +0000 Subject: ep93xx-kernel: fix do_deploy --- packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb b/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb index 81c359f7fa..4c39b0fc90 100644 --- a/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb +++ b/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb @@ -51,6 +51,7 @@ do_deploy() { do_deploy[dirs] = "${S}" -addtask deploy before do_build after do_compile +addtask deploy before do_package after do_install + -- cgit v1.2.3 From 6114ba8eaa8d149324204d27d574462f43c52856 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Mon, 7 May 2007 16:52:44 +0000 Subject: openssl: fix FILES, spotted by Junqian Gordon Xu --- packages/openssl/openssl-native_0.9.7g.bb | 2 +- packages/openssl/openssl.inc | 4 ++-- packages/openssl/openssl_0.9.7e.bb | 2 +- packages/openssl/openssl_0.9.7g.bb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/openssl/openssl-native_0.9.7g.bb b/packages/openssl/openssl-native_0.9.7g.bb index dd4ba1a5ef..115d4011d9 100644 --- a/packages/openssl/openssl-native_0.9.7g.bb +++ b/packages/openssl/openssl-native_0.9.7g.bb @@ -2,7 +2,7 @@ inherit pkgconfig native require openssl.inc -PR = "r0" +PR = "r1" SRC_URI += "file://debian.patch;patch=1 \ file://armeb.patch;patch=1;pnum=0 \ diff --git a/packages/openssl/openssl.inc b/packages/openssl/openssl.inc index e7e3b37e3c..9c648f0ba8 100644 --- a/packages/openssl/openssl.inc +++ b/packages/openssl/openssl.inc @@ -18,8 +18,8 @@ export EX_LIBS = "-lgcc -ldl -L${STAGING_LIBDIR}" export AS = "${CC} -c" PACKAGES =+ "libcrypto libssl" -FILES_libcrypto = "${libdir}/libcrypto.so*" -FILES_libssl = "${libdir}/libssl.so*" +FILES_libcrypto = "${libdir}/libcrypto.so.*" +FILES_libssl = "${libdir}/libssl.so.*" do_compile () { cd util diff --git a/packages/openssl/openssl_0.9.7e.bb b/packages/openssl/openssl_0.9.7e.bb index d9b8d91cdc..a7d3670758 100644 --- a/packages/openssl/openssl_0.9.7e.bb +++ b/packages/openssl/openssl_0.9.7e.bb @@ -1,6 +1,6 @@ require openssl.inc -PR = "r4" +PR = "r5" SRC_URI += "file://debian.patch;patch=1 \ file://armeb.patch;patch=1 \ diff --git a/packages/openssl/openssl_0.9.7g.bb b/packages/openssl/openssl_0.9.7g.bb index 4af1fbfd48..cc9162c1cf 100644 --- a/packages/openssl/openssl_0.9.7g.bb +++ b/packages/openssl/openssl_0.9.7g.bb @@ -2,7 +2,7 @@ inherit pkgconfig require openssl.inc -PR = "r2" +PR = "r3" SRC_URI += "file://debian.patch;patch=1 \ file://armeb.patch;patch=1;pnum=0 \ -- cgit v1.2.3 From 6a03b70703bd0f335b9709c0b2386858f7b82291 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 7 May 2007 17:34:46 +0000 Subject: linux 2.6.20: drop Simpad and Progear support --- packages/linux/linux/progear/progear_bl-r6.patch | 200 -- .../linux/simpad/linux-2.6.20.SIMpad-mq200.patch | 2303 -------------------- .../linux-2.6.20.SIMpad-ucb1x00-switches.patch | 189 -- packages/linux/linux_2.6.20.bb | 11 +- 4 files changed, 1 insertion(+), 2702 deletions(-) delete mode 100644 packages/linux/linux/progear/progear_bl-r6.patch delete mode 100644 packages/linux/linux/simpad/linux-2.6.20.SIMpad-mq200.patch delete mode 100644 packages/linux/linux/simpad/linux-2.6.20.SIMpad-ucb1x00-switches.patch diff --git a/packages/linux/linux/progear/progear_bl-r6.patch b/packages/linux/linux/progear/progear_bl-r6.patch deleted file mode 100644 index 6ac01714b7..0000000000 --- a/packages/linux/linux/progear/progear_bl-r6.patch +++ /dev/null @@ -1,200 +0,0 @@ -From: Marcin Juszkiewicz - -Add control of LCD backlight for Frontpath ProGear HX1050+. -Patch is based on http://downloads.sf.net/progear/progear-lcd-0.2.tar.gz -driver by M Schacht. - -Signed-Off-By: Marcin Juszkiewicz - ---- -Patch follow kernel version 2.6.20 - - Kconfig | 8 +++ - Makefile | 1 - progear_bl.c | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 163 insertions(+) - -Index: git/drivers/video/backlight/Kconfig -=================================================================== ---- git.orig/drivers/video/backlight/Kconfig 2006-12-29 17:31:36.511043439 +0100 -+++ git/drivers/video/backlight/Kconfig 2007-02-07 08:57:31.020095845 +0100 -@@ -66,3 +66,11 @@ - If you have a HP Jornada 680, say y to enable the - backlight driver. - -+config BACKLIGHT_PROGEAR -+ tristate "Frontpath ProGear Backlight Driver" -+ depends on BACKLIGHT_DEVICE && PCI && X86 -+ default y -+ help -+ If you have a Frontpath ProGear say Y to enable the -+ backlight driver. -+ -Index: git/drivers/video/backlight/progear_bl.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ git/drivers/video/backlight/progear_bl.c 2007-02-07 08:55:46.813993140 +0100 -@@ -0,0 +1,154 @@ -+/* -+ * Backlight Driver for Frontpath ProGear HX1050+ -+ * -+ * Copyright (c) 2006 Marcin Juszkiewicz -+ * -+ * Based on Progear LCD driver by M Schacht -+ * -+ * -+ * Based on Sharp's Corgi Backlight Driver -+ * Based on Backlight Driver for HP Jornada 680 -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License version 2 as -+ * published by the Free Software Foundation. -+ * -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#define PMU_LPCR 0xB0 -+#define SB_MPS1 0x61 -+#define HW_LEVEL_MAX 0x77 -+#define HW_LEVEL_MIN 0x4f -+ -+static struct pci_dev *pmu_dev = NULL; -+static struct pci_dev *sb_dev = NULL; -+ -+static int progearbl_set_intensity(struct backlight_device *bd) -+{ -+ int intensity = bd->props->brightness; -+ -+ if (bd->props->power != FB_BLANK_UNBLANK) -+ intensity = 0; -+ if (bd->props->fb_blank != FB_BLANK_UNBLANK) -+ intensity = 0; -+ -+ pci_write_config_byte(pmu_dev, PMU_LPCR, intensity + HW_LEVEL_MIN); -+ -+ return 0; -+} -+ -+static int progearbl_get_intensity(struct backlight_device *bd) -+{ -+ u8 intensity; -+ pci_read_config_byte(pmu_dev, PMU_LPCR, &intensity); -+ -+ return intensity - HW_LEVEL_MIN; -+} -+ -+static struct backlight_properties progearbl_data = { -+ .owner = THIS_MODULE, -+ .get_brightness = progearbl_get_intensity, -+ .update_status = progearbl_set_intensity, -+}; -+ -+static int progearbl_probe(struct platform_device *pdev) -+{ -+ u8 temp; -+ struct backlight_device *progear_backlight_device; -+ -+ pmu_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M7101, 0); -+ if (!pmu_dev) { -+ printk("ALI M7101 PMU not found.\n"); -+ return -ENODEV; -+ } -+ -+ sb_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, 0); -+ if (!sb_dev) { -+ printk("ALI 1533 SB not found.\n"); -+ pci_dev_put(pmu_dev); -+ return -ENODEV; -+ } -+ -+ /* Set SB_MPS1 to enable brightness control. */ -+ pci_read_config_byte(sb_dev, SB_MPS1, &temp); -+ pci_write_config_byte(sb_dev, SB_MPS1, temp | 0x20); -+ -+ progear_backlight_device = backlight_device_register("progear-bl", -+ &pdev->dev, NULL, -+ &progearbl_data); -+ if (IS_ERR(progear_backlight_device)) -+ return PTR_ERR(progear_backlight_device); -+ -+ platform_set_drvdata(pdev, progear_backlight_device); -+ -+ progearbl_data.power = FB_BLANK_UNBLANK; -+ progearbl_data.brightness = HW_LEVEL_MAX - HW_LEVEL_MIN; -+ progearbl_data.max_brightness = HW_LEVEL_MAX - HW_LEVEL_MIN; -+ progearbl_set_intensity(progear_backlight_device); -+ -+ return 0; -+} -+ -+static int progearbl_remove(struct platform_device *pdev) -+{ -+ struct backlight_device *bd = platform_get_drvdata(pdev); -+ backlight_device_unregister(bd); -+ -+ return 0; -+} -+ -+static struct platform_driver progearbl_driver = { -+ .probe = progearbl_probe, -+ .remove = progearbl_remove, -+ .driver = { -+ .name = "progear-bl", -+ }, -+}; -+ -+static struct platform_device *progearbl_device; -+ -+static int __init progearbl_init(void) -+{ -+ int ret = platform_driver_register(&progearbl_driver); -+ -+ if (!ret) { -+ progearbl_device = platform_device_alloc("progear-bl", -1); -+ if (!progearbl_device) -+ return -ENOMEM; -+ -+ ret = platform_device_add(progearbl_device); -+ -+ if (ret) { -+ platform_device_put(progearbl_device); -+ platform_driver_unregister(&progearbl_driver); -+ } -+ } -+ -+ return ret; -+} -+ -+static void __exit progearbl_exit(void) -+{ -+ pci_dev_put(pmu_dev); -+ pci_dev_put(sb_dev); -+ -+ platform_device_unregister(progearbl_device); -+ platform_driver_unregister(&progearbl_driver); -+} -+ -+module_init(progearbl_init); -+module_exit(progearbl_exit); -+ -+MODULE_AUTHOR("Marcin Juszkiewicz "); -+MODULE_DESCRIPTION("ProGear Backlight Driver"); -+MODULE_LICENSE("GPL"); -Index: git/drivers/video/backlight/Makefile -=================================================================== ---- git.orig/drivers/video/backlight/Makefile 2006-12-29 17:31:36.511043439 +0100 -+++ git/drivers/video/backlight/Makefile 2007-02-06 21:34:54.503712923 +0100 -@@ -5,3 +5,4 @@ - obj-$(CONFIG_BACKLIGHT_CORGI) += corgi_bl.o - obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o - obj-$(CONFIG_BACKLIGHT_LOCOMO) += locomolcd.o -+obj-$(CONFIG_BACKLIGHT_PROGEAR) += progear_bl.o diff --git a/packages/linux/linux/simpad/linux-2.6.20.SIMpad-mq200.patch b/packages/linux/linux/simpad/linux-2.6.20.SIMpad-mq200.patch deleted file mode 100644 index 841cf4566c..0000000000 --- a/packages/linux/linux/simpad/linux-2.6.20.SIMpad-mq200.patch +++ /dev/null @@ -1,2303 +0,0 @@ -diff -uNr linux-2.6.20.vanilla/drivers/video/Kconfig linux-2.6.20/drivers/video/Kconfig ---- linux-2.6.20.vanilla/drivers/video/Kconfig 2007-03-24 21:25:52.000000000 +0100 -+++ linux-2.6.20/drivers/video/Kconfig 2007-03-28 22:53:44.000000000 +0200 -@@ -1147,6 +1147,15 @@ - help - If you have a S3 Trio say Y. Say N for S3 Virge. - -+config FB_MQ200 -+ bool "MQ200 Driver" -+ depends on (FB = y) && ARM && ARCH_SA1100 -+ select FB_CFB_FILLRECT -+ select FB_CFB_COPYAREA -+ select FB_CFB_IMAGEBLIT -+ help -+ This is a MQ200 driver tested only on Siemens SIMpads. -+ - config FB_SAVAGE - tristate "S3 Savage support" - depends on FB && PCI && EXPERIMENTAL -diff -uNr linux-2.6.20.vanilla/drivers/video/Makefile linux-2.6.20/drivers/video/Makefile ---- linux-2.6.20.vanilla/drivers/video/Makefile 2007-03-24 21:25:52.000000000 +0100 -+++ linux-2.6.20/drivers/video/Makefile 2007-03-28 22:53:44.000000000 +0200 -@@ -30,6 +30,7 @@ - obj-$(CONFIG_FB_PM2) += pm2fb.o - obj-$(CONFIG_FB_PM3) += pm3fb.o - -+obj-$(CONFIG_FB_MQ200) += mq200/ - obj-$(CONFIG_FB_MATROX) += matrox/ - obj-$(CONFIG_FB_RIVA) += riva/ vgastate.o - obj-$(CONFIG_FB_NVIDIA) += nvidia/ -diff -uNr linux-2.6.20.vanilla/drivers/video/backlight/Kconfig linux-2.6.20/drivers/video/backlight/Kconfig ---- linux-2.6.20.vanilla/drivers/video/backlight/Kconfig 2007-03-24 21:25:53.000000000 +0100 -+++ linux-2.6.20/drivers/video/backlight/Kconfig 2007-03-28 22:53:44.000000000 +0200 -@@ -66,3 +66,10 @@ - If you have a HP Jornada 680, say y to enable the - backlight driver. - -+config FB_MQ200_LCD -+ bool "MQ200 LCD class implemetation" -+ depends on SA1100_SIMPAD && LCD_DEVICE -+ -+config FB_MQ200_BACKLIGHT -+ bool "MQ200 Backlight class implementation" -+ depends on SA1100_SIMPAD && BACKLIGHT_DEVICE -diff -uNr linux-2.6.20.vanilla/drivers/video/backlight/Makefile linux-2.6.20/drivers/video/backlight/Makefile ---- linux-2.6.20.vanilla/drivers/video/backlight/Makefile 2007-03-24 21:25:53.000000000 +0100 -+++ linux-2.6.20/drivers/video/backlight/Makefile 2007-03-28 22:53:44.000000000 +0200 -@@ -5,3 +5,5 @@ - obj-$(CONFIG_BACKLIGHT_CORGI) += corgi_bl.o - obj-$(CONFIG_BACKLIGHT_HP680) += hp680_bl.o - obj-$(CONFIG_BACKLIGHT_LOCOMO) += locomolcd.o -+obj-$(CONFIG_FB_MQ200_BACKLIGHT) += simpad_bl.o -+obj-$(CONFIG_FB_MQ200_LCD) += simpad_lcd.o -diff -uNr linux-2.6.20.vanilla/drivers/video/backlight/simpad_bl.c linux-2.6.20/drivers/video/backlight/simpad_bl.c ---- linux-2.6.20.vanilla/drivers/video/backlight/simpad_bl.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.20/drivers/video/backlight/simpad_bl.c 2007-03-28 22:53:44.000000000 +0200 -@@ -0,0 +1,109 @@ -+/* -+ * GPLv2 backlight_device_register -+ * -+ * 2007/03/24 mrdata -+ * - added .brightness=127 in -+ * struct backlight_properties simpad_bl_props() -+ */ -+#include