Skip to content

Commit

Permalink
Bug 1575420 - Replace MOZ_WIDGET_TOOLKIT value of "gtk3" with "gtk". …
Browse files Browse the repository at this point in the history 
…r=froydnj

Differential Revision: https://phabricator.services.mozilla.com/D42765

--HG--
extra : moz-landing-system : lando
  • Loading branch information
@glandium
glandium committed Aug 21, 2019
1 parent b0a22e4 commit 66d7fe9
Show file tree
Hide file tree
Showing 85 changed files with 130 additions and 144 deletions.
2 changes: 1 addition & 1 deletion accessible/aom/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ LOCAL_INCLUDES += [
'/accessible/generic',
]

if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
LOCAL_INCLUDES += [
'/accessible/atk',
]
Expand Down
2 changes: 1 addition & 1 deletion accessible/atk/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ LOCAL_INCLUDES += [

FINAL_LIBRARY = 'xul'

if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
CFLAGS += CONFIG['TK_CFLAGS']
CXXFLAGS += CONFIG['TK_CFLAGS']

Expand Down
2 changes: 1 addition & 1 deletion accessible/base/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ LOCAL_INCLUDES += [
'/layout/xul/tree/',
]

if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
LOCAL_INCLUDES += [
'/accessible/atk',
]
Expand Down
2 changes: 1 addition & 1 deletion accessible/generic/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ else:
'/accessible/ipc/other',
]

if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
LOCAL_INCLUDES += [
'/accessible/atk',
]
Expand Down
2 changes: 1 addition & 1 deletion accessible/html/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ LOCAL_INCLUDES += [
'/layout/xul',
]

if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
LOCAL_INCLUDES += [
'/accessible/atk',
]
Expand Down
2 changes: 1 addition & 1 deletion accessible/ipc/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ else:
LOCAL_INCLUDES += [
'/accessible/ipc/other',
]
if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
LOCAL_INCLUDES += [
'/accessible/atk',
]
Expand Down
2 changes: 1 addition & 1 deletion accessible/ipc/other/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ if CONFIG['ACCESSIBILITY']:
'../../xpcom',
]

if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
LOCAL_INCLUDES += [
'/accessible/atk',
]
Expand Down
2 changes: 1 addition & 1 deletion accessible/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']

if 'gtk' in toolkit:
if toolkit == 'gtk':
DIRS += ['atk']
elif toolkit == 'windows':
DIRS += ['windows']
Expand Down
2 changes: 1 addition & 1 deletion accessible/xpcom/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ LOCAL_INCLUDES += [
'/accessible/generic',
]

if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
LOCAL_INCLUDES += [
'/accessible/atk',
]
Expand Down
2 changes: 1 addition & 1 deletion accessible/xul/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ LOCAL_INCLUDES += [
'/layout/xul/tree',
]

if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
LOCAL_INCLUDES += [
'/accessible/atk',
]
Expand Down
2 changes: 1 addition & 1 deletion browser/base/content/browser-tabsintitlebar.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var TabsInTitlebar;
case "cocoa":
isSupported = true;
break;
case "gtk3":
case "gtk":
isSupported = window.matchMedia("(-moz-gtk-csd-available)").matches;
break;
}
Expand Down
4 changes: 2 additions & 2 deletions browser/base/content/test/contextMenu/browser.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ skip-if = os == "linux" || os == "mac" #Bug 1444631
[browser_contextmenu_childprocess.js]
[browser_contextmenu.js]
tags = fullscreen clipboard
skip-if = toolkit == "gtk3" || verify || (os == "win" && processor == "aarch64") # disabled on Linux due to bug 513558, aarch64 due to 1531590
skip-if = toolkit == "gtk" || verify || (os == "win" && processor == "aarch64") # disabled on Linux due to bug 513558, aarch64 due to 1531590
[browser_contextmenu_input.js]
skip-if = toolkit == "gtk3" || (os == "win" && processor == "aarch64") # disabled on Linux due to bug 513558, aarch64 due to 1533161
skip-if = toolkit == "gtk" || (os == "win" && processor == "aarch64") # disabled on Linux due to bug 513558, aarch64 due to 1533161
2 changes: 1 addition & 1 deletion browser/base/content/test/plugins/browser-rs-blocklist.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ support-files =
[browser_bug812562.js]
[browser_clearplugindata.js]
[browser_CTP_context_menu.js]
skip-if = fission || toolkit == "gtk3" # fails intermittently on Linux (bug 909342)
skip-if = fission || toolkit == "gtk" # fails intermittently on Linux (bug 909342)
[browser_CTP_crashreporting.js]
skip-if = !crashreporter || verify || os == 'win' # bug 1442837
[browser_CTP_drag_drop.js]
Expand Down
2 changes: 1 addition & 1 deletion browser/base/content/test/plugins/browser.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ tags = blocklist
[browser_clearplugindata.js]
tags = blocklist
[browser_CTP_context_menu.js]
skip-if = fission || toolkit == "gtk3" # fails intermittently on Linux (bug 909342)
skip-if = fission || toolkit == "gtk" # fails intermittently on Linux (bug 909342)
tags = blocklist
[browser_CTP_crashreporting.js]
skip-if = !crashreporter || verify || os == 'win' # bug 1442837
Expand Down
4 changes: 2 additions & 2 deletions browser/base/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ DEFINES['MOZ_APP_VERSION_DISPLAY'] = CONFIG['MOZ_APP_VERSION_DISPLAY']

DEFINES['APP_LICENSE_BLOCK'] = '%s/content/overrides/app-license.html' % SRCDIR

if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk3', 'cocoa'):
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk', 'cocoa'):
DEFINES['CONTEXT_COPY_IMAGE_CONTENTS'] = 1

if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk3'):
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('windows', 'gtk'):
DEFINES['MENUBAR_CAN_AUTOHIDE'] = 1

JAR_MANIFESTS += ['jar.mn']
2 changes: 1 addition & 1 deletion browser/branding/branding-common.mozbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ def FirefoxBranding():
'VisualElements_150.png',
'VisualElements_70.png',
]
elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
FINAL_TARGET_FILES.chrome.icons.default += [
'default128.png',
'default16.png',
Expand Down
2 changes: 1 addition & 1 deletion browser/components/build/components.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ shell_service_contracts = [
'@mozilla.org/toolkit/shell-service;1',
]

if TOOLKIT == 'gtk3':
if TOOLKIT == 'gtk':
Classes += [
{
'cid': '{63c7b9f4-0cc8-43f8-b666-0a661655cb73}',
Expand Down
2 changes: 1 addition & 1 deletion browser/components/preferences/in-content/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
DEFINES[var] = CONFIG[var]

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

JAR_MANIFESTS += ['jar.mn']
2 changes: 1 addition & 1 deletion browser/components/preferences/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ BROWSER_CHROME_MANIFESTS += [
for var in ('MOZ_APP_NAME', 'MOZ_MACBUNDLE_NAME'):
DEFINES[var] = CONFIG[var]

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

JAR_MANIFESTS += ['jar.mn']
Expand Down
2 changes: 1 addition & 1 deletion browser/components/shell/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
SOURCES += [
'nsMacShellService.cpp',
]
elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
XPIDL_SOURCES += [
'nsIGNOMEShellService.idl',
]
Expand Down
5 changes: 1 addition & 4 deletions browser/installer/Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,8 @@ ifdef MOZ_LAYOUT_DEBUGGER
DEFINES += -DMOZ_LAYOUT_DEBUGGER=1
endif

ifneq (,$(filter gtk%,$(MOZ_WIDGET_TOOLKIT)))
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
DEFINES += -DMOZ_GTK=1
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk3)
DEFINES += -DMOZ_GTK3=1
endif
endif

ifdef MOZ_SYSTEM_NSPR
Expand Down
2 changes: 1 addition & 1 deletion browser/installer/package-manifest.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
@BINPATH@/ucrtbase.dll
#endif
#endif
#ifdef MOZ_GTK3
#ifdef MOZ_GTK
@BINPATH@/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
@BINPATH@/gtk2/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
#ifdef MOZ_WAYLAND
Expand Down
2 changes: 1 addition & 1 deletion browser/themes/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']

if toolkit == 'cocoa':
DIRS += ['osx']
elif toolkit == 'gtk3':
elif toolkit == 'gtk':
DIRS += ['linux']
else:
DIRS += ['windows']
Expand Down
2 changes: 1 addition & 1 deletion chrome/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ LOCAL_INCLUDES += [
'/xpcom/components'
]

if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
CXXFLAGS += CONFIG['TK_CFLAGS']

with Files("**"):
Expand Down
2 changes: 1 addition & 1 deletion config/recurse.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ endif

# Interdependencies that moz.build world don't know about yet for compilation.
# Note some others are hardcoded or "guessed" in recursivemake.py and emitter.py
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk3)
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk)
toolkit/library/target: widget/gtk/mozgtk/gtk3/target
endif
endif
Expand Down
2 changes: 1 addition & 1 deletion dom/geolocation/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
LOCAL_INCLUDES += [
'/dom/system/windows',
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
if CONFIG['MOZ_GPSD']:
LOCAL_INCLUDES += [
'/dom/system/linux',
Expand Down
2 changes: 1 addition & 1 deletion dom/ipc/tests/mochitest.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ skip-if = e10s || toolkit == 'android'
[test_child_docshell.html]
skip-if = toolkit == 'cocoa' # cocoa: disabled due to hangs, see changeset 6852e7c47edf
[test_CrashService_crash.html]
skip-if = !(crashreporter && !e10s && (toolkit == 'gtk3' || toolkit == 'cocoa' || toolkit == 'windows'))
skip-if = !(crashreporter && !e10s && (toolkit == 'gtk' || toolkit == 'cocoa' || toolkit == 'windows'))
[test_temporaryfile_stream.html]
skip-if = !e10s || toolkit == 'android' || (os == "win" && processor == "aarch64") # Bug 1525959, aarch64 due to 1531150
support-files =
Expand Down
2 changes: 1 addition & 1 deletion dom/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ TEST_DIRS += [
'imptests',
]

if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'cocoa', 'windows'):
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'cocoa', 'windows'):
TEST_DIRS += ['plugins/test']

SPHINX_TREES['dom'] = 'docs'
2 changes: 1 addition & 1 deletion dom/plugins/ipc/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT':

DEFINES['FORCE_PR_LOG'] = True

if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gtk3':
if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gtk':
CXXFLAGS += CONFIG['TK_CFLAGS']
else:
# Force build against gtk+2 for struct offsets and such.
Expand Down
6 changes: 3 additions & 3 deletions dom/plugins/test/mochitest/mochitest.ini
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ support-files = cocoa_focus.html
skip-if = toolkit != "cocoa" # Bug 1194534
support-files = cocoa_window_focus.html
[test_copyText.html]
skip-if = toolkit != "gtk3"
skip-if = toolkit != "gtk"
[test_crash_nested_loop.html]
skip-if = toolkit != "gtk3"
skip-if = toolkit != "gtk"
[test_crashing.html]
skip-if = !crashreporter
[test_crashing2.html]
Expand Down Expand Up @@ -149,6 +149,6 @@ skip-if = !(os == "win" && processor == "x86_64") || verify
[test_windowless_ime.html]
skip-if = os != "win" || (os == "win" && processor == "aarch64") # aarch64 due to 1536350
[test_x11_error_crash.html]
skip-if = !crashreporter || e10s || toolkit != "gtk3"
skip-if = !crashreporter || e10s || toolkit != "gtk"
[test_zero_opacity.html]
skip-if = os == "win" && webrender # win/webrender bug 1296400
2 changes: 1 addition & 1 deletion dom/plugins/test/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ DIRS += ['testplugin']

XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']

if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk3', 'cocoa', 'windows'):
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk', 'cocoa', 'windows'):
MOCHITEST_MANIFESTS += ['mochitest/mochitest.ini']
MOCHITEST_CHROME_MANIFESTS += ['mochitest/chrome.ini']
BROWSER_CHROME_MANIFESTS += ['mochitest/browser.ini']
Expand Down
4 changes: 2 additions & 2 deletions dom/plugins/test/testplugin/testplugin.mozbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if toolkit == 'cocoa':
UNIFIED_SOURCES += [
'nptest_macosx.mm'
]
elif toolkit == 'gtk3':
elif toolkit == 'gtk':
UNIFIED_SOURCES += [
'nptest_gtk2.cpp',
]
Expand Down Expand Up @@ -47,7 +47,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' and CONFIG['TARGET_CPU'] == 'x86_64':
OS_LIBS += ['-framework Carbon']

if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
CXXFLAGS += CONFIG['MOZ_GTK2_CFLAGS']
CFLAGS += CONFIG['MOZ_GTK2_CFLAGS']
OS_LIBS += CONFIG['MOZ_GTK2_LIBS']
Expand Down
2 changes: 1 addition & 1 deletion dom/system/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ elif toolkit == 'cocoa':
DIRS += ['mac']
elif toolkit == 'android':
DIRS += ['android']
elif toolkit == 'gtk3':
elif toolkit == 'gtk':
DIRS += ['linux']

if toolkit != 'cocoa':
Expand Down
2 changes: 1 addition & 1 deletion dom/xbl/builtin/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
DIRS += ['mac']
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
DIRS += ['android']
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
DIRS += ['unix']
else:
DIRS += ['emacs']
Expand Down
8 changes: 4 additions & 4 deletions gfx/2d/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'windows':
'JobScheduler_posix.cpp',
]

if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk3'):
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk'):
EXPORTS.mozilla.gfx += [
'UnscaledFontFreeType.h',
]
Expand All @@ -111,7 +111,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk3'):
'UnscaledFontFreeType.cpp',
]

if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
SOURCES += [
'ScaledFontFontconfig.cpp',
]
Expand Down Expand Up @@ -240,12 +240,12 @@ FINAL_LIBRARY = 'xul'
for var in ('USE_CAIRO', 'MOZ2D_HAS_MOZ_CAIRO'):
DEFINES[var] = True

if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk3'):
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk'):
DEFINES['MOZ_ENABLE_FREETYPE'] = True

CXXFLAGS += CONFIG['MOZ_CAIRO_CFLAGS']

if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk3'):
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('android', 'gtk'):
CXXFLAGS += CONFIG['CAIRO_FT_CFLAGS']

LOCAL_INCLUDES += CONFIG['SKIA_INCLUDES']
Expand Down
2 changes: 1 addition & 1 deletion gfx/cairo/cairo/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'beos':
SOURCES += [
'cairo-beos-surface.cpp',
]
elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
EXPORTS.cairo += [
'cairo-ps.h',
]
Expand Down
2 changes: 1 addition & 1 deletion gfx/gl/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
gl_provider = 'CGL'
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
gl_provider = 'EAGL'
elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
if CONFIG['MOZ_EGL_XRENDER_COMPOSITE']:
gl_provider = 'EGL'
else:
Expand Down
2 changes: 1 addition & 1 deletion gfx/harfbuzz/src/moz.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ UNIFIED_SOURCES += [
'hb-warning.cc',
]

if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
EXPORTS.harfbuzz += [
'hb-glib.h',
]
Expand Down
Loading

0 comments on commit 66d7fe9

Please sign in to comment.