Skip to content

Commit

Permalink
Bug 1186782 - [IM] Fix undefined reference to vtable for mozilla::mai…
Browse files Browse the repository at this point in the history 
…l::DirectoryProvider r=florian a=me for CLOSED TREE
  • Loading branch information
Ian Neal committed Jul 27, 2015
1 parent dcd1a3d commit c76c3c4
Show file tree
Hide file tree
Showing 12 changed files with 26 additions and 19 deletions.
8 changes: 4 additions & 4 deletions im/app/Makefile.in
View file
Expand Up @@ -86,14 +86,14 @@ endif # ! WinNT

endif # LIBXUL_SDK

ifneq (,$(filter windows gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
ifneq (,$(filter windows gtk gtk2 gtk3,$(MOZ_WIDGET_TOOLKIT)))
ifneq (,$(filter windows,$(MOZ_WIDGET_TOOLKIT)))
ICON_SUFFIX=.ico
else
ICON_SUFFIX=.png
endif

ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
ifdef MOZ_WIDGET_GTK
ICON_DIR=gtk
else
ICON_DIR=$(MOZ_WIDGET_TOOLKIT)
Expand Down Expand Up @@ -125,7 +125,7 @@ libs:: $(addprefix $(DIST)/branding/,$(BRANDED_ICON_FILES))
$(INSTALL) $^ $(DIST)/bin/chrome/icons/default
endif

ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
ifdef MOZ_WIDGET_GTK
libs::
$(INSTALL) $(DIST)/branding/default16.png $(DIST)/bin/chrome/icons/default
endif
Expand All @@ -140,7 +140,7 @@ GARBAGE += $(MOZ_APP_NAME)
GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, all.js all-instantbird.js channel-prefs.js)
endif

ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
ifndef MOZ_WIDGET_GTK
ICON_FILES = \
$(DIST)/branding/default16.png \
$(DIST)/branding/mozicon128.png \
Expand Down
2 changes: 1 addition & 1 deletion im/app/profile/moz.build
View file
Expand Up @@ -5,7 +5,7 @@

DIRS += ['extensions']

if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'mac', 'cocoa'):
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'mac', 'cocoa'):
DEFINES['HAVE_SHELL_SERVICE'] = 1

FINAL_TARGET_FILES.defaults.profile += [
Expand Down
4 changes: 2 additions & 2 deletions im/branding/halloween/Makefile.in
View file
Expand Up @@ -23,7 +23,7 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
cp $(srcdir)/disk.icns $(DIST)/branding/disk.icns
# cp $(srcdir)/license.r $(DIST)/branding/license.r
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
ifdef MOZ_WIDGET_GTK
cp $(srcdir)/mozicon128.png $(DIST)/branding/mozicon128.png
cp $(srcdir)/mozicon16.xpm $(DIST)/branding/mozicon16.xpm
cp $(srcdir)/mozicon50.xpm $(DIST)/branding/mozicon50.xpm
Expand All @@ -36,7 +36,7 @@ ifeq ($(OS_ARCH),WINNT)
cp $(srcdir)/windows/convWindow.ico $(DIST)/branding/convWindow.ico
cp $(srcdir)/windows/default.ico $(DIST)/branding/default.ico
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
ifdef MOZ_WIDGET_GTK
cp $(srcdir)/gtk/blistWindow.png $(DIST)/branding/blistWindow.png
cp $(srcdir)/gtk/blistWindow16.png $(DIST)/branding/blistWindow16.png
cp $(srcdir)/gtk/blistWindow48.png $(DIST)/branding/blistWindow48.png
Expand Down
4 changes: 2 additions & 2 deletions im/branding/nightly/Makefile.in
View file
Expand Up @@ -23,7 +23,7 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
cp $(srcdir)/disk.icns $(DIST)/branding/disk.icns
# cp $(srcdir)/license.r $(DIST)/branding/license.r
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
ifdef MOZ_WIDGET_GTK
cp $(srcdir)/mozicon128.png $(DIST)/branding/mozicon128.png
cp $(srcdir)/mozicon16.xpm $(DIST)/branding/mozicon16.xpm
cp $(srcdir)/mozicon50.xpm $(DIST)/branding/mozicon50.xpm
Expand All @@ -36,7 +36,7 @@ ifeq ($(OS_ARCH),WINNT)
cp $(srcdir)/windows/convWindow.ico $(DIST)/branding/convWindow.ico
cp $(srcdir)/windows/default.ico $(DIST)/branding/default.ico
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
ifdef MOZ_WIDGET_GTK
cp $(srcdir)/gtk/blistWindow.png $(DIST)/branding/blistWindow.png
cp $(srcdir)/gtk/blistWindow16.png $(DIST)/branding/blistWindow16.png
cp $(srcdir)/gtk/blistWindow48.png $(DIST)/branding/blistWindow48.png
Expand Down
2 changes: 1 addition & 1 deletion im/build.mk
View file
Expand Up @@ -22,7 +22,7 @@ else
ifeq ($(OS_ARCH),WINNT)
PKG_SUFFIX = .zip
else
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
ifdef MOZ_WIDGET_GTK
PKG_SUFFIX = .tar.bz2
else
PKG_SUFFIX = .tar.gz
Expand Down
2 changes: 1 addition & 1 deletion im/components/mintrayr/moz.build
View file
Expand Up @@ -17,7 +17,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
RCFILE = 'resources.rc'
RESFILE = 'resources.res'

elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
elif CONFIG['MOZ_WIDGET_GTK']:
SOURCES += ['trayPlatformGtk2.cpp']
OS_LIBS += CONFIG['TK_LIBS']
OS_LIBS += CONFIG['XLIBS']
Expand Down
2 changes: 1 addition & 1 deletion im/components/moz.build
View file
Expand Up @@ -3,7 +3,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.

if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2'):
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
DIRS += ['mintrayr']

EXTRA_COMPONENTS += [
Expand Down
2 changes: 1 addition & 1 deletion im/content/moz.build
View file
Expand Up @@ -9,7 +9,7 @@ JAR_MANIFESTS += ['jar.mn']
for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
DEFINES[var] = CONFIG[var]

#if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'mac', 'cocoa'):
#if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3', 'mac', 'cocoa'):
# DEFINES['HAVE_SHELL_SERVICE'] = 1

if CONFIG['MOZ_UPDATER']:
Expand Down
2 changes: 1 addition & 1 deletion im/content/preferences/applications.js
View file
Expand Up @@ -9,7 +9,7 @@
// Constants & Enumeration Values

/*
#ifdef MOZ_WIDGET_GTK2
#ifdef MOZ_WIDGET_GTK
*/
const ICON_URL_APP = "moz-icon://dummy.exe?size=16";
/*
Expand Down
7 changes: 5 additions & 2 deletions im/installer/Makefile.in
View file
Expand Up @@ -31,8 +31,11 @@ ifdef MOZ_ENABLE_GNOME_COMPONENT
DEFINES += -DMOZ_ENABLE_GNOME_COMPONENT=1
endif

ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT))
DEFINES += -DMOZ_GTK2=1
ifdef MOZ_WIDGET_GTK
DEFINES += -DMOZ_GTK=1
ifdef MOZ_ENABLE_GTK3
DEFINES += -DMOZ_GTK3=1
endif
endif

ifdef _MSC_VER
Expand Down
6 changes: 5 additions & 1 deletion im/installer/package-manifest.in
View file
Expand Up @@ -152,6 +152,10 @@
@RESPATH@/icons/*.png
#endif
#endif
#ifdef MOZ_GTK3
@BINPATH@/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
@BINPATH@/@DLL_PREFIX@mozgtk2@DLL_SUFFIX@
#endif

;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
; Instantbird Specific Files
Expand Down Expand Up @@ -434,7 +438,7 @@
#ifdef UNIX_BUT_NOT_MAC
@RESPATH@/components/toolkitremote.xpt
#endif
#ifdef MOZ_GTK2
#ifdef MOZ_GTK
@RESPATH@/components/filepicker.xpt
@RESPATH@/components/nsFilePicker.js
@RESPATH@/components/nsFilePicker.manifest
Expand Down
4 changes: 2 additions & 2 deletions other-licenses/branding/instantbird/Makefile.in
View file
Expand Up @@ -28,7 +28,7 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
cp $(srcdir)/disk.icns $(DIST)/branding/disk.icns
# cp $(srcdir)/license.r $(DIST)/branding/license.r
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
ifdef MOZ_WIDGET_GTK
cp $(srcdir)/mozicon128.png $(DIST)/branding/mozicon128.png
cp $(srcdir)/mozicon16.xpm $(DIST)/branding/mozicon16.xpm
cp $(srcdir)/mozicon50.xpm $(DIST)/branding/mozicon50.xpm
Expand All @@ -41,7 +41,7 @@ ifeq ($(OS_ARCH),WINNT)
cp $(srcdir)/windows/convWindow.ico $(DIST)/branding/convWindow.ico
cp $(srcdir)/windows/default.ico $(DIST)/branding/default.ico
endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
ifdef MOZ_WIDGET_GTK
cp $(srcdir)/gtk/blistWindow.png $(DIST)/branding/blistWindow.png
cp $(srcdir)/gtk/blistWindow16.png $(DIST)/branding/blistWindow16.png
cp $(srcdir)/gtk/blistWindow48.png $(DIST)/branding/blistWindow48.png
Expand Down

0 comments on commit c76c3c4

Please sign in to comment.