Skip to content

Commit 3de9e6a

Browse files
dougtdougt
committed
Bug 906072 - Remove Maemo port. r=romaxa, r=ted, r=johns
1 parent e19ec5b commit 3de9e6a

File tree

114 files changed

+71
-3199
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+71
-3199
lines changed

‎browser/installer/Makefile.in‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,6 @@ ifndef LIBXUL_SDK
101101
INSTALL_SDK = 1
102102
endif
103103

104-
GENERATE_CACHE = 1
105-
106104
include $(topsrcdir)/toolkit/mozapps/installer/signing.mk
107105
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
108106

‎build/autoconf/arch.m4‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,6 @@ if test -z "$MOZ_ARCH"; then
3737
MOZ_ARCH=toolchain-default
3838
MOZ_THUMB=yes
3939
;;
40-
arm-*)
41-
if test -n "$MOZ_PLATFORM_MAEMO"; then
42-
MOZ_THUMB=no
43-
MOZ_ARCH=armv7-a
44-
MOZ_FLOAT_ABI=softfp
45-
fi
46-
if test "$MOZ_PLATFORM_MAEMO" = 6; then
47-
MOZ_THUMB=yes
48-
fi
49-
;;
5040
esac
5141
fi
5242

‎config/system-headers‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1059,21 +1059,9 @@ hunspell.hxx
10591059
#if MOZ_NATIVE_BZ2==1
10601060
bzlib.h
10611061
#endif
1062-
#if MOZ_PLATFORM_MAEMO==5
1063-
hildon-uri.h
1064-
hildon-mime.h
1065-
hildon-file-chooser-dialog.h
1066-
libosso.h
1067-
osso-mem.h
1068-
#endif
10691062
#ifdef MOZ_ENABLE_GIO
10701063
gio/gio.h
10711064
#endif
1072-
#ifdef MOZ_ENABLE_LIBCONIC
1073-
conic/conicconnection.h
1074-
conic/conicconnectionevent.h
1075-
conic/conicstatisticsevent.h
1076-
#endif
10771065
#if MOZ_NATIVE_LIBEVENT==1
10781066
event.h
10791067
#else
@@ -1082,9 +1070,6 @@ sys/event.h
10821070
#ifdef MOZ_ENABLE_LIBPROXY
10831071
proxy.h
10841072
#endif
1085-
#if MOZ_PLATFORM_MAEMO==6
1086-
contentaction/contentaction.h
1087-
#endif
10881073
#ifdef MOZ_ENABLE_CONTENTMANAGER
10891074
SelectSingleContentItemPage.h
10901075
SelectMultipleContentItemsPage.h

‎configure.in‎

Lines changed: 16 additions & 182 deletions
Original file line numberDiff line numberDiff line change
@@ -4818,6 +4818,8 @@ incorrect])
48184818
MOZ_ENABLE_QTMOBILITY=1
48194819
MOZ_QT_CFLAGS="$MOZ_QT_CFLAGS $_QTMOBILITY_CFLAGS"
48204820
MOZ_QT_LIBS="$MOZ_QT_LIBS $_QTMOBILITY_LIBS"
4821+
AC_DEFINE(MOZ_ENABLE_QTMOBILITY)
4822+
AC_SUBST(MOZ_ENABLE_QTMOBILITY)
48214823
else
48224824
AC_CHECK_LIB(QtSensors, main, [
48234825
MOZ_ENABLE_QTMOBILITY=1
@@ -4828,8 +4830,20 @@ incorrect])
48284830
MOZ_QT_LIBS="$MOZ_QT_LIBS -lQtSensors -lQtFeedback -lQtLocation"
48294831
])
48304832
fi
4831-
if test "$MOZ_ENABLE_QTMOBILITY"; then
4832-
AC_DEFINE(MOZ_ENABLE_QTMOBILITY)
4833+
4834+
if test "$MOZ_ENABLE_CONTENTACTION"; then
4835+
MOZ_ENABLE_CONTENTACTION=1
4836+
AC_DEFINE(MOZ_ENABLE_CONTENTACTION)
4837+
fi
4838+
4839+
MOZ_ENABLE_CONTENTACTION=
4840+
PKG_CHECK_MODULES(LIBCONTENTACTION, contentaction-0.1, _LIB_FOUND=1, _LIB_FOUND=)
4841+
if test "$MOZ_ENABLE_CONTENTACTION"; then
4842+
MOZ_ENABLE_CONTENTACTION=1
4843+
MOZ_QT_CFLAGS="$MOZ_QT_CFLAGS $_CONTENTACTION_CFLAGS"
4844+
MOZ_QT_LIBS="$MOZ_QT_LIBS $_CONTENTACTION_LIBS"
4845+
AC_DEFINE(MOZ_ENABLE_CONTENTACTION)
4846+
AC_SUBST(MOZ_ENABLE_CONTENTACTION)
48334847
fi
48344848
fi
48354849

@@ -6765,185 +6779,6 @@ MOZ_ARG_DISABLE_BOOL(zipwriter,
67656779
MOZ_ZIPWRITER=1 )
67666780
AC_SUBST(MOZ_ZIPWRITER)
67676781

6768-
dnl ========================================================
6769-
dnl = libconic
6770-
dnl ========================================================
6771-
dnl superseded by QtNetwork starting from 4.7
6772-
MOZ_ENABLE_LIBCONIC=1
6773-
6774-
if test -n "$MOZ_ENABLE_QT"; then
6775-
if test "$MOZ_ENABLE_QTNETWORK"; then
6776-
MOZ_ENABLE_LIBCONIC=
6777-
fi
6778-
fi
6779-
6780-
MOZ_ARG_DISABLE_BOOL(libconic,
6781-
[ --disable-libconic Disable libconic],
6782-
MOZ_ENABLE_LIBCONIC=,
6783-
MOZ_ENABLE_LIBCONIC=1 )
6784-
6785-
if test -n "$MOZ_ENABLE_LIBCONIC"; then
6786-
PKG_CHECK_MODULES(LIBCONIC, conic,
6787-
MOZ_ENABLE_LIBCONIC=1,
6788-
MOZ_ENABLE_LIBCONIC=)
6789-
fi
6790-
if test "$MOZ_ENABLE_LIBCONIC"; then
6791-
AC_DEFINE(MOZ_ENABLE_LIBCONIC)
6792-
fi
6793-
6794-
AC_SUBST(MOZ_ENABLE_LIBCONIC)
6795-
AC_SUBST(LIBCONIC_CFLAGS)
6796-
AC_SUBST(LIBCONIC_LIBS)
6797-
6798-
dnl ========================================================
6799-
dnl = Maemo checks
6800-
dnl ========================================================
6801-
6802-
MAEMO_SDK_TARGET_VER=-1
6803-
6804-
MOZ_ARG_WITH_STRING(maemo-version,
6805-
[ --with-maemo-version=MAEMO_SDK_TARGET_VER
6806-
Maemo SDK Version],
6807-
MAEMO_SDK_TARGET_VER=$withval)
6808-
6809-
case "$MAEMO_SDK_TARGET_VER" in
6810-
5)
6811-
MOZ_PLATFORM_MAEMO=5
6812-
;;
6813-
6814-
6)
6815-
MOZ_PLATFORM_MAEMO=6
6816-
;;
6817-
6818-
-1)
6819-
dnl We aren't compiling for Maemo, move on.
6820-
;;
6821-
*)
6822-
AC_MSG_ERROR([Unknown Maemo Version. Try setting --with-maemo-version to 5 or 6.])
6823-
;;
6824-
esac
6825-
6826-
if test $MOZ_PLATFORM_MAEMO; then
6827-
AC_DEFINE_UNQUOTED([MOZ_PLATFORM_MAEMO], $MOZ_PLATFORM_MAEMO)
6828-
6829-
if test -z "$MOZ_ENABLE_DBUS"; then
6830-
AC_MSG_ERROR([DBus is required when building for Maemo])
6831-
fi
6832-
6833-
MOZ_GFX_OPTIMIZE_MOBILE=1
6834-
MOZ_GL_DEFAULT_PROVIDER=EGL
6835-
MOZ_MAEMO_LIBLOCATION=
6836-
6837-
if test $MOZ_PLATFORM_MAEMO = 5; then
6838-
dnl if we have Xcomposite we should also have Xdamage and Xfixes
6839-
MOZ_CHECK_HEADERS([X11/extensions/Xdamage.h], [],
6840-
[AC_MSG_ERROR([Couldn't find X11/extensions/Xdamage.h which is required for composited plugins.])])
6841-
AC_CHECK_LIB(Xcomposite, XCompositeRedirectWindow, [XCOMPOSITE_LIBS="-lXcomposite -lXdamage -lXfixes"],
6842-
[MISSING_X="$MISSING_X -lXcomposite"], $XLIBS)
6843-
6844-
AC_SUBST(XCOMPOSITE_LIBS)
6845-
6846-
PKG_CHECK_MODULES(LIBHILDONMIME,libhildonmime, _LIB_FOUND=1, _LIB_FOUND=)
6847-
MOZ_PLATFORM_MAEMO_LIBS="$MOZ_PLATFORM_MAEMO_LIBS $LIBHILDONMIME_LIBS"
6848-
MOZ_PLATFORM_MAEMO_CFLAGS="$MOZ_PLATFORM_MAEMO_CFLAGS $LIBHILDONMIME_CFLAGS"
6849-
if test -z "$_LIB_FOUND"; then
6850-
AC_MSG_ERROR([Hildon Mime is required when building for Maemo])
6851-
fi
6852-
6853-
6854-
PKG_CHECK_MODULES(LIBOSSO,libosso, _LIB_FOUND=1, _LIB_FOUND=)
6855-
MOZ_PLATFORM_MAEMO_LIBS="$MOZ_PLATFORM_MAEMO_LIBS $LIBOSSO_LIBS"
6856-
MOZ_PLATFORM_MAEMO_CFLAGS="$MOZ_PLATFORM_MAEMO_CFLAGS $LIBOSSO_CFLAGS"
6857-
if test -z "$_LIB_FOUND"; then
6858-
AC_MSG_ERROR([LibOSSO is required when building for Maemo])
6859-
fi
6860-
6861-
PKG_CHECK_MODULES(LIBHILDONFM,hildon-fm-2, _LIB_FOUND=1, _LIB_FOUND=)
6862-
MOZ_PLATFORM_MAEMO_LIBS="$MOZ_PLATFORM_MAEMO_LIBS $LIBHILDONFM_LIBS"
6863-
MOZ_PLATFORM_MAEMO_CFLAGS="$MOZ_PLATFORM_MAEMO_CFLAGS $LIBHILDONFM_CFLAGS"
6864-
if test -z "$_LIB_FOUND"; then
6865-
AC_MSG_ERROR([Hildon FM-2 is required when building for Maemo])
6866-
fi
6867-
6868-
fi
6869-
if test $MOZ_PLATFORM_MAEMO = 6; then
6870-
6871-
PKG_CHECK_MODULES(LIBCONTENTMANAGER, ContentManager QtSparql,
6872-
_LIB_FOUND=1,
6873-
_LIB_FOUND=)
6874-
if test "$_LIB_FOUND"; then
6875-
MOZ_PLATFORM_MAEMO_LIBS="$MOZ_PLATFORM_MAEMO_LIBS $LIBCONTENTMANAGER_LIBS"
6876-
MOZ_PLATFORM_MAEMO_CFLAGS="$MOZ_PLATFORM_MAEMO_CFLAGS $LIBCONTENTMANAGER_CFLAGS"
6877-
MOZ_ENABLE_CONTENTMANAGER=1
6878-
AC_DEFINE(MOZ_ENABLE_CONTENTMANAGER)
6879-
else
6880-
AC_MSG_WARN([Cannot find libcontentmanager and or QtSparql building for Maemo 6])
6881-
fi
6882-
AC_SUBST(MOZ_ENABLE_CONTENTMANAGER)
6883-
6884-
dnl ========================================================
6885-
dnl = Enable meego libcontentaction
6886-
dnl ========================================================
6887-
MOZ_ARG_ENABLE_BOOL(meegocontentaction,
6888-
[ --enable-meegocontentaction Enable meegocontentaction support],
6889-
MOZ_MEEGOCONTENTACTION=1,
6890-
MOZ_MEEGOCONTENTACTION=)
6891-
6892-
if test -n "$MOZ_MEEGOCONTENTACTION"; then
6893-
6894-
PKG_CHECK_MODULES(LIBCONTENTACTION, contentaction-0.1, _LIB_FOUND=1, _LIB_FOUND=)
6895-
if test "$_LIB_FOUND"; then
6896-
MOZ_PLATFORM_MAEMO_LIBS="$MOZ_PLATFORM_MAEMO_LIBS $LIBCONTENTACTION_LIBS"
6897-
MOZ_PLATFORM_MAEMO_CFLAGS="$MOZ_PLATFORM_MAEMO_CFLAGS $LIBCONTENTACTION_CFLAGS"
6898-
MOZ_ENABLE_CONTENTACTION=1
6899-
AC_DEFINE(MOZ_ENABLE_CONTENTACTION)
6900-
AC_SUBST(MOZ_ENABLE_CONTENTACTION)
6901-
fi
6902-
fi
6903-
6904-
MOZ_ARG_ENABLE_BOOL(meegotouch,
6905-
[ --enable-meegotouch Enable meegotouch support],
6906-
MOZ_MEEGOTOUCHENABLED=1,
6907-
MOZ_MEEGOTOUCHENABLED=)
6908-
6909-
if test -n "$MOZ_MEEGOTOUCHENABLED"; then
6910-
PKG_CHECK_MODULES(MOZ_MEEGOTOUCH, meegotouchcore, _LIB_FOUND=1, _LIB_FOUND=)
6911-
if test "$_LIB_FOUND"; then
6912-
MOZ_QT_CFLAGS="$MOZ_MEEGOTOUCH_CFLAGS $MOZ_QT_CFLAGS"
6913-
MOZ_QT_LIBS="$MOZ_MEEGOTOUCH_LIBS $MOZ_QT_LIBS"
6914-
AC_DEFINE(MOZ_ENABLE_MEEGOTOUCH)
6915-
else
6916-
AC_MSG_WARN([Cannot meegotouchcore-dev. Disabling Meegotouch support.])
6917-
fi
6918-
fi
6919-
fi
6920-
6921-
PKG_CHECK_MODULES(LIBLOCATION,liblocation, _LIB_FOUND=1, _LIB_FOUND=)
6922-
MOZ_PLATFORM_MAEMO_LIBS="$MOZ_PLATFORM_MAEMO_LIBS $LIBLOCATION_LIBS"
6923-
MOZ_PLATFORM_MAEMO_CFLAGS="$MOZ_PLATFORM_MAEMO_CFLAGS $LIBLOCATION_CFLAGS"
6924-
if test "$_LIB_FOUND"; then
6925-
MOZ_MAEMO_LIBLOCATION=1
6926-
AC_DEFINE(MOZ_MAEMO_LIBLOCATION)
6927-
else
6928-
AC_MSG_WARN([Cannot liblocation-dev. Disabling Maemo geolocation.])
6929-
fi
6930-
AC_SUBST(MOZ_MAEMO_LIBLOCATION)
6931-
6932-
PKG_CHECK_MODULES(LIBMEEGOTOUCHSHARE, ShareUiInterface-maemo-meegotouch >= 0.3.31 mdatauri, _LIB_FOUND=1, _LIB_FOUND=)
6933-
MOZ_PLATFORM_MAEMO_LIBS="$MOZ_PLATFORM_MAEMO_LIBS $LIBMEEGOTOUCHSHARE_LIBS"
6934-
MOZ_PLATFORM_MAEMO_CFLAGS="$MOZ_PLATFORM_MAEMO_CFLAGS $LIBMEEGOTOUCHSHARE_CFLAGS"
6935-
if test "$_LIB_FOUND"; then
6936-
MOZ_ENABLE_MEEGOTOUCHSHARE=1
6937-
AC_DEFINE(MOZ_ENABLE_MEEGOTOUCHSHARE)
6938-
else
6939-
AC_MSG_WARN([Cannot find maemo-meegotouch-interfaces-dev or libmdatauri-dev. Disabling meegotouch share ui.])
6940-
fi
6941-
AC_SUBST(MOZ_ENABLE_MEEGOTOUCHSHARE)
6942-
6943-
AC_SUBST(MOZ_PLATFORM_MAEMO_LIBS)
6944-
AC_SUBST(MOZ_PLATFORM_MAEMO_CFLAGS)
6945-
fi
6946-
69476782
dnl ========================================================
69486783
dnl GL provider
69496784
dnl ========================================================
@@ -8614,7 +8449,6 @@ AC_SUBST(FILTER)
86148449
AC_SUBST(BIN_FLAGS)
86158450
AC_SUBST(MOZ_WIDGET_TOOLKIT)
86168451
AC_SUBST(MOZ_UPDATE_XTERM)
8617-
AC_SUBST(MOZ_PLATFORM_MAEMO)
86188452
AC_SUBST(MOZ_AUTH_EXTENSION)
86198453
AC_SUBST(MOZ_PERMISSIONS)
86208454
AC_SUBST(MOZ_PREF_EXTENSIONS)

‎content/base/src/nsGkAtomList.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2012,7 +2012,6 @@ GK_ATOM(mac_lion_theme, "mac-lion-theme")
20122012
GK_ATOM(windows_compositor, "windows-compositor")
20132013
GK_ATOM(windows_glass, "windows-glass")
20142014
GK_ATOM(touch_enabled, "touch-enabled")
2015-
GK_ATOM(maemo_classic, "maemo-classic")
20162015
GK_ATOM(menubar_drag, "menubar-drag")
20172016
GK_ATOM(swipe_animation_enabled, "swipe-animation-enabled")
20182017
GK_ATOM(physical_home_button, "physical-home-button")
@@ -2053,7 +2052,6 @@ GK_ATOM(_moz_windows_glass, "-moz-windows-glass")
20532052
GK_ATOM(_moz_windows_theme, "-moz-windows-theme")
20542053
GK_ATOM(_moz_os_version, "-moz-os-version")
20552054
GK_ATOM(_moz_touch_enabled, "-moz-touch-enabled")
2056-
GK_ATOM(_moz_maemo_classic, "-moz-maemo-classic")
20572055
GK_ATOM(_moz_menubar_drag, "-moz-menubar-drag")
20582056
GK_ATOM(_moz_device_pixel_ratio, "-moz-device-pixel-ratio")
20592057
GK_ATOM(_moz_device_orientation, "-moz-device-orientation")

‎content/base/src/nsObjectLoadingContent.cpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2676,12 +2676,6 @@ DoDelayedStop(nsPluginInstanceOwner* aInstanceOwner,
26762676
nsObjectLoadingContent* aContent,
26772677
bool aDelayedStop)
26782678
{
2679-
#if (MOZ_PLATFORM_MAEMO==5)
2680-
// Don't delay stop on Maemo/Hildon (bug 530739).
2681-
if (aDelayedStop && aInstanceOwner->MatchPluginName("Shockwave Flash"))
2682-
return false;
2683-
#endif
2684-
26852679
// Don't delay stopping QuickTime (bug 425157), Flip4Mac (bug 426524),
26862680
// XStandard (bug 430219), CMISS Zinc (bug 429604).
26872681
if (aDelayedStop

‎dom/plugins/base/PluginPRLibrary.cpp‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -260,17 +260,6 @@ PluginPRLibrary::AsyncSetWindow(NPP instance, NPWindow* window)
260260
return NS_ERROR_NOT_IMPLEMENTED;
261261
}
262262

263-
#if defined(MOZ_WIDGET_QT) && (MOZ_PLATFORM_MAEMO == 6)
264-
nsresult
265-
PluginPRLibrary::HandleGUIEvent(NPP instance, const nsGUIEvent& anEvent,
266-
bool* handled)
267-
{
268-
nsNPAPIPluginInstance* inst = (nsNPAPIPluginInstance*)instance->ndata;
269-
NS_ENSURE_TRUE(inst, NS_ERROR_NULL_POINTER);
270-
return NS_ERROR_NOT_IMPLEMENTED;
271-
}
272-
#endif
273-
274263
nsresult
275264
PluginPRLibrary::GetImageContainer(NPP instance, ImageContainer** aContainer)
276265
{

‎dom/plugins/base/PluginPRLibrary.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,6 @@ class PluginPRLibrary : public PluginLibrary
121121
const nsIntRect&, gfxContext** aCtx) MOZ_OVERRIDE;
122122
virtual nsresult EndUpdateBackground(NPP instance,
123123
gfxContext* aCtx, const nsIntRect&) MOZ_OVERRIDE;
124-
#if defined(MOZ_WIDGET_QT) && (MOZ_PLATFORM_MAEMO == 6)
125-
virtual nsresult HandleGUIEvent(NPP instance,
126-
const nsGUIEvent& anEvent, bool* handled);
127-
#endif
128-
129124
virtual void GetLibraryPath(nsACString& aPath) { aPath.Assign(mFilePath); }
130125

131126
private:

‎dom/plugins/base/npapi.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -386,9 +386,6 @@ typedef enum {
386386
, NPPVpluginCoreAnimationLayer = 1003
387387
#endif
388388

389-
#if defined(MOZ_PLATFORM_MAEMO) && ((MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6))
390-
, NPPVpluginWindowlessLocalBool = 2002
391-
#endif
392389
} NPPVariable;
393390

394391
/*
@@ -447,9 +444,6 @@ typedef enum {
447444
, NPNVsupportsCompositingCoreAnimationPluginsBool = 74656 /* TRUE if the browser supports
448445
CA model compositing */
449446
#endif
450-
#if defined(MOZ_PLATFORM_MAEMO) && ((MOZ_PLATFORM_MAEMO == 5) || (MOZ_PLATFORM_MAEMO == 6))
451-
, NPNVSupportsWindowlessLocal = 2002
452-
#endif
453447
} NPNVariable;
454448

455449
typedef enum {

‎dom/plugins/base/nsNPAPIPluginInstance.cpp‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1203,23 +1203,6 @@ nsNPAPIPluginInstance::AsyncSetWindow(NPWindow* window)
12031203
return library->AsyncSetWindow(&mNPP, window);
12041204
}
12051205

1206-
#if defined(MOZ_WIDGET_QT) && (MOZ_PLATFORM_MAEMO == 6)
1207-
nsresult
1208-
nsNPAPIPluginInstance::HandleGUIEvent(const nsGUIEvent& anEvent, bool* handled)
1209-
{
1210-
if (RUNNING != mRunning) {
1211-
*handled = false;
1212-
return NS_OK;
1213-
}
1214-
1215-
AutoPluginLibraryCall library(this);
1216-
if (!library)
1217-
return NS_ERROR_FAILURE;
1218-
1219-
return library->HandleGUIEvent(&mNPP, anEvent, handled);
1220-
}
1221-
#endif
1222-
12231206
nsresult
12241207
nsNPAPIPluginInstance::GetImageContainer(ImageContainer**aContainer)
12251208
{

0 commit comments

Comments
 (0)