Bug 1430483 - Remove no longer valid gtk2 build options from SeaMonkey. r=ewong
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Sun, 14 Jan 2018 11:15:00 +0100
changeset 30975 b866cf8e5eb40f3f338e5ce99b0f0c81225f4a5f
parent 30974 454c0dee503358f5647869b66259af9e1bdda47e
child 30976 d0d84ec8115f051a5f8a8e0dbdef5cc9ff463628
push id383
push userclokep@gmail.com
push dateMon, 07 May 2018 21:52:48 +0000
reviewersewong
bugs1430483
Bug 1430483 - Remove no longer valid gtk2 build options from SeaMonkey. r=ewong
suite/branding/nightly/moz.build
suite/browser/test/mochitest/mochitest.ini
suite/installer/Makefile.in
suite/installer/package-manifest.in
suite/installer/removed-files.in
suite/shell/src/moz.build
--- a/suite/branding/nightly/moz.build
+++ b/suite/branding/nightly/moz.build
@@ -2,23 +2,23 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 
 JAR_MANIFESTS += ['jar.mn']
 
 # Note: mac icons are handled in /suite/app during the final application
 # packaging
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk2', 'gtk3'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk3'):
     if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
         icon_suffix = '.ico'
     else:
         icon_suffix = '.png'
 
-    if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+    if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
         icon_dir = 'gtk'
     else:
         icon_dir = CONFIG['MOZ_WIDGET_TOOLKIT']
 
     desktop_icons = [
         'abcardWindow',
         'ablistWindow',
         'addressbookWindow',
--- a/suite/browser/test/mochitest/mochitest.ini
+++ b/suite/browser/test/mochitest/mochitest.ini
@@ -6,12 +6,12 @@ support-files =
 [test_bug364677.html]
 support-files = bug364677-data.xml bug364677-data.xml^headers^
 [test_bug395533.html]
 support-files = bug395533-data.txt
 [test_bug436801.html]
 support-files = bug436801-data.xml
 [test_contextmenu.html]
 support-files = audio.ogg ctxmenu-image.png subtst_contextmenu.html video.ogg
-skip-if = toolkit == "gtk2" || toolkit == "gtk3" || (os == 'mac' && os_version != '10.6') # disabled on Linux due to bug 513558, on Mac after 10.6 due to bug 792304
+skip-if = os != "win" # disabled on Linux due to bug 513558, on Mac after 10.6 due to bug 792304
 [test_feed_discovery.html]
 support-files = feed_discovery.html
 [test_registerHandler.html]
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -56,21 +56,18 @@ endif
 ifdef MOZ_CALENDAR
 DEFINES += -DMOZ_CALENDAR=1
 endif
 
 ifdef MOZ_DEBUG
 DEFINES += -DMOZ_DEBUG=1
 endif
 
-ifneq (,$(filter gtk%,$(MOZ_WIDGET_TOOLKIT)))
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk3)
 DEFINES += -DMOZ_GTK=1
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk3)
-DEFINES += -DMOZ_GTK3=1
-endif
 endif
 
 ifdef MOZ_DEBUGQA
 DEFINES += -DMOZ_PACKAGE_DEBUGQA=1
 endif
 
 ifdef MOZ_IRC
 DEFINES += -DMOZ_IRC=1
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -137,17 +137,17 @@
 @BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
 #endif
 #endif
 @BINPATH@/@DLL_PREFIX@lgpllibs@DLL_SUFFIX@
 #ifdef MOZ_FFVPX
 @BINPATH@/@DLL_PREFIX@mozavutil@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@mozavcodec@DLL_SUFFIX@
 #endif
-#ifdef MOZ_GTK3
+#ifdef MOZ_GTK
 @BINPATH@/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
 @BINPATH@/gtk2/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
 #ifdef MOZ_WAYLAND
 @BINPATH@/@DLL_PREFIX@mozwayland@DLL_SUFFIX@
 #endif
 #endif
 @RESPATH@/license.txt
 @RESPATH@/blocklist.xml
--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -1203,17 +1203,16 @@ components/@DLL_PREFIX@unixproxy@DLL_SUF
 @DIR_MACOS@components/@DLL_PREFIX@storagecomps@DLL_SUFFIX@
 @DIR_MACOS@components/@DLL_PREFIX@system-pref@DLL_SUFFIX@
 @DIR_MACOS@components/@DLL_PREFIX@tkautocomplete@DLL_SUFFIX@
 @DIR_MACOS@components/@DLL_PREFIX@toolkitcomps@DLL_SUFFIX@
 @DIR_MACOS@components/@DLL_PREFIX@txmgr@DLL_SUFFIX@
 @DIR_MACOS@components/@DLL_PREFIX@uconv@DLL_SUFFIX@
 @DIR_MACOS@components/@DLL_PREFIX@universalchardet@DLL_SUFFIX@
 @DIR_MACOS@components/@DLL_PREFIX@webbrwsr@DLL_SUFFIX@
-@DIR_MACOS@components/@DLL_PREFIX@widget_gtk2@DLL_SUFFIX@
 @DIR_MACOS@components/@DLL_PREFIX@windowds@DLL_SUFFIX@
 @DIR_MACOS@components/@DLL_PREFIX@xpautocomplete@DLL_SUFFIX@
 @DIR_MACOS@components/@DLL_PREFIX@zipwriter@DLL_SUFFIX@
 #ifdef XP_MACOSX
   @DIR_MACOS@components/libalerts.dylib
   @DIR_MACOS@components/libalerts_s.dylib
   @DIR_MACOS@components/libwidget_mac.dylib
 #elifdef XP_WIN
--- a/suite/shell/src/moz.build
+++ b/suite/shell/src/moz.build
@@ -13,17 +13,17 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     OS_LIBS += [
         'ole32',
         'version',
         'uuid',
         'shell32',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     SOURCES += ['nsMacShellService.cpp']
-elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
     SOURCES += ['nsGNOMEShellService.cpp']
 
 if SOURCES:
     EXTRA_COMPONENTS += [
         'nsSetDefault.js',
         'nsSetDefault.manifest',
     ]