diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-10-26 11:10:05 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-10-26 11:10:05 +0000 |
commit | ab7be97305b2318e0cccf5dc8a43707c828708e6 (patch) | |
tree | 688032012fb3c28db4a7afa2005d3309d4c4ab0e /meta/packages/mozilla | |
parent | 31eef80d812e982676466523508f9cf966146d88 (diff) | |
download | poky-ab7be97305b2318e0cccf5dc8a43707c828708e6.tar.gz |
mozilla/: dropped unused files
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2991 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/mozilla')
-rw-r--r-- | meta/packages/mozilla/files/mozilla-firefox.desktop | 11 | ||||
-rw-r--r-- | meta/packages/mozilla/files/mozilla-firefox.png | bin | 4323 -> 0 bytes | |||
-rw-r--r-- | meta/packages/mozilla/files/mozilla-thunderbird.desktop | 11 | ||||
-rw-r--r-- | meta/packages/mozilla/files/mozilla-thunderbird.png | bin | 6499 -> 0 bytes | |||
-rw-r--r-- | meta/packages/mozilla/files/no-xmb.patch | 18 | ||||
-rw-r--r-- | meta/packages/mozilla/files/xptcstubs.patch | 19 | ||||
-rw-r--r-- | meta/packages/mozilla/minimo/host_ldflags_fix.patch | 56 |
7 files changed, 0 insertions, 115 deletions
diff --git a/meta/packages/mozilla/files/mozilla-firefox.desktop b/meta/packages/mozilla/files/mozilla-firefox.desktop deleted file mode 100644 index 00c0ea4fa3..0000000000 --- a/meta/packages/mozilla/files/mozilla-firefox.desktop +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | [Desktop Entry] | ||
2 | Name=Firefox Browser | ||
3 | Comment=Firefox Web Browser | ||
4 | Exec=firefox | ||
5 | Terminal=false | ||
6 | MultipleArgs=false | ||
7 | Type=Application | ||
8 | Icon=mozilla-firefox.png | ||
9 | Categories=Application;Internet; | ||
10 | SingleInstance=true | ||
11 | |||
diff --git a/meta/packages/mozilla/files/mozilla-firefox.png b/meta/packages/mozilla/files/mozilla-firefox.png deleted file mode 100644 index f8b2e2192b..0000000000 --- a/meta/packages/mozilla/files/mozilla-firefox.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/meta/packages/mozilla/files/mozilla-thunderbird.desktop b/meta/packages/mozilla/files/mozilla-thunderbird.desktop deleted file mode 100644 index 61615d94c2..0000000000 --- a/meta/packages/mozilla/files/mozilla-thunderbird.desktop +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | [Desktop Entry] | ||
2 | Name=Thunderbird Email Client | ||
3 | Comment=Thunderbird Email Client | ||
4 | Exec=thunderbird | ||
5 | Terminal=false | ||
6 | MultipleArgs=false | ||
7 | Type=Application | ||
8 | Icon=mozilla-thunderbird.png | ||
9 | Categories=Application;Internet; | ||
10 | SingleInstance=true | ||
11 | |||
diff --git a/meta/packages/mozilla/files/mozilla-thunderbird.png b/meta/packages/mozilla/files/mozilla-thunderbird.png deleted file mode 100644 index 90ff395ff5..0000000000 --- a/meta/packages/mozilla/files/mozilla-thunderbird.png +++ /dev/null | |||
Binary files differ | |||
diff --git a/meta/packages/mozilla/files/no-xmb.patch b/meta/packages/mozilla/files/no-xmb.patch deleted file mode 100644 index 1b909a677c..0000000000 --- a/meta/packages/mozilla/files/no-xmb.patch +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | --- mozilla/gfx/src/gtk/nsGdkUtils.cpp.old 2004-07-02 09:33:33.000000000 +0100 | ||
2 | +++ mozilla/gfx/src/gtk/nsGdkUtils.cpp 2004-07-02 09:33:34.000000000 +0100 | ||
3 | @@ -115,6 +115,7 @@ | ||
4 | #endif /* MOZ_WIDGET_GTK2 */ | ||
5 | } | ||
6 | } | ||
7 | +#if 0 | ||
8 | else if (font->type == GDK_FONT_FONTSET) | ||
9 | { | ||
10 | #ifdef MOZ_WIDGET_GTK | ||
11 | @@ -128,6 +129,7 @@ | ||
12 | fontset, GDK_GC_XGC(gc), x, y, text, text_length); | ||
13 | #endif /* MOZ_WIDGET_GTK2 */ | ||
14 | } | ||
15 | +#endif | ||
16 | else | ||
17 | g_error("undefined font type\n"); | ||
18 | } | ||
diff --git a/meta/packages/mozilla/files/xptcstubs.patch b/meta/packages/mozilla/files/xptcstubs.patch deleted file mode 100644 index 7517acef27..0000000000 --- a/meta/packages/mozilla/files/xptcstubs.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | Index: xptcstubs_arm.cpp | ||
2 | =================================================================== | ||
3 | RCS file: /cvsroot/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp,v | ||
4 | retrieving revision 1.7 | ||
5 | diff -u -r1.7 xptcstubs_arm.cpp | ||
6 | --- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 18 Apr 2004 14:18:18 -0000 1.7 | ||
7 | +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp 4 May 2004 18:36:44 -0000 | ||
8 | @@ -45,9 +45,9 @@ | ||
9 | #endif | ||
10 | |||
11 | /* Specify explicitly a symbol for this function, don't try to guess the c++ mangled symbol. */ | ||
12 | -static nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); | ||
13 | +nsresult PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) asm("_PrepareAndDispatch"); | ||
14 | |||
15 | -static nsresult | ||
16 | +nsresult | ||
17 | PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint32* args) | ||
18 | { | ||
19 | #define PARAM_BUFFER_COUNT 16 | ||
diff --git a/meta/packages/mozilla/minimo/host_ldflags_fix.patch b/meta/packages/mozilla/minimo/host_ldflags_fix.patch deleted file mode 100644 index de48d8eb8e..0000000000 --- a/meta/packages/mozilla/minimo/host_ldflags_fix.patch +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | diff -Naur mozilla_old/configure mozilla/configure | ||
2 | --- mozilla_old/configure 2006-06-03 23:44:17.000000000 +0300 | ||
3 | +++ mozilla/configure 2006-06-07 00:16:15.000000000 +0300 | ||
4 | @@ -18755,11 +18755,18 @@ | ||
5 | |||
6 | if test -n "$CROSS_COMPILE"; then | ||
7 | if test -z "$HOST_LIBIDL_CONFIG"; then | ||
8 | + echo "HOST_LIBIDL_CONFIG not defined" | ||
9 | HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" | ||
10 | fi | ||
11 | - if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then | ||
12 | + if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no" && test -n "$HOST_PKG_CONFIG_PATH"; then | ||
13 | + echo "using $HOST_LIBIDL_CONFIG as HOST_LIBIDL_CONFIG with HOST_PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH" | ||
14 | + _SAVE_PKG_CONFIG_PATH=$PKG_CONFIG_PATH | ||
15 | + PKG_CONFIG_PATH=$HOST_PKG_CONFIG_PATH | ||
16 | HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags` | ||
17 | + echo "HOST_LIBIDL_CFLAGS = $HOST_LIBIDL_CFLAGS" | ||
18 | HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs` | ||
19 | + echo "HOST_LIBIDL_LIBS = $HOST_LIBIDL_LIBS" | ||
20 | + PKG_CONFIG_PATH=$_SAVE_PKG_CONFIG_PATH | ||
21 | else | ||
22 | HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS" | ||
23 | HOST_LIBIDL_LIBS="$LIBIDL_LIBS" | ||
24 | diff -Naur mozilla_old/configure.in mozilla/configure.in | ||
25 | --- mozilla_old/configure.in 2006-06-03 23:35:20.000000000 +0300 | ||
26 | +++ mozilla/configure.in 2006-06-07 00:10:26.000000000 +0300 | ||
27 | @@ -6870,12 +6870,17 @@ | ||
28 | |||
29 | if test -n "$CROSS_COMPILE"; then | ||
30 | if test -z "$HOST_LIBIDL_CONFIG"; then | ||
31 | + AC_MSG_WARN([HOST_LIBIDL_CONFIG not defined]) | ||
32 | HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG" | ||
33 | fi | ||
34 | if test -n "$HOST_LIBIDL_CONFIG" && test "$HOST_LIBIDL_CONFIG" != "no"; then | ||
35 | + AC_MSG_WARN([using $HOST_LIBIDL_CONFIG as config for libIDL on host]) | ||
36 | HOST_LIBIDL_CFLAGS=`${HOST_LIBIDL_CONFIG} --cflags` | ||
37 | + AC_MSG_WARN([HOST_LIBIDL_CFLAGS=$HOST_LIBIDL_CFLAGS]) | ||
38 | HOST_LIBIDL_LIBS=`${HOST_LIBIDL_CONFIG} --libs` | ||
39 | + AC_MSG_WARN([HOST_LIBIDL_LIBS=$HOST_LIBIDL_LIBS]) | ||
40 | else | ||
41 | + AC_MSG_WARN([no config for libIDL found, using LIBIDL_CFLAGS and LIBIDL_LIBS]) | ||
42 | HOST_LIBIDL_CFLAGS="$LIBIDL_CFLAGS" | ||
43 | HOST_LIBIDL_LIBS="$LIBIDL_LIBS" | ||
44 | fi | ||
45 | diff -Naur mozilla_old/nsprpub/config/rules.mk mozilla/nsprpub/config/rules.mk | ||
46 | --- mozilla_old/nsprpub/config/rules.mk 2006-02-22 04:33:33.000000000 +0200 | ||
47 | +++ mozilla/nsprpub/config/rules.mk 2006-06-07 00:07:06.000000000 +0300 | ||
48 | @@ -90,6 +90,8 @@ | ||
49 | CFLAGS=$(HOST_CFLAGS) | ||
50 | CXXFLAGS=$(HOST_CXXFLAGS) | ||
51 | LDFLAGS=$(HOST_LDFLAGS) | ||
52 | +RANLIB=$(HOST_RANLIB) | ||
53 | +AR=$(HOST_AR) | ||
54 | endif | ||
55 | endif | ||
56 | endif | ||