зеркало из https://github.com/mozilla/pjs.git
Bug 247204 - lock up at start when using threaded GTK2 libraries (i.e. gconf). Patch by Walter Meinl <wuno@lsvw.de>, r+sr=roc.
This commit is contained in:
Родитель
8a0d584765
Коммит
f44c4f809e
|
@ -93,8 +93,8 @@ endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifneq (,$(MOZ_ENABLE_GTK2))
|
ifdef MOZ_ENABLE_GTK2
|
||||||
STATIC_EXTRA_LIBS += $(XLDFLAGS) $(XT_LIBS)
|
STATIC_EXTRA_LIBS += $(XLDFLAGS) $(XT_LIBS) -lgthread-2.0
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef MOZ_ENABLE_XFT
|
ifdef MOZ_ENABLE_XFT
|
||||||
|
@ -105,6 +105,10 @@ ifdef MOZ_ENABLE_PANGO
|
||||||
STATIC_EXTRA_LIBS += $(MOZ_PANGO_LIBS)
|
STATIC_EXTRA_LIBS += $(MOZ_PANGO_LIBS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
|
||||||
|
STATIC_EXTRA_LIBS += $(MOZ_STARTUP_NOTIFICATION_LIBS)
|
||||||
|
endif
|
||||||
|
|
||||||
# Component Makefile always brings in this.
|
# Component Makefile always brings in this.
|
||||||
# STATIC_EXTRA_LIBS += $(TK_LIBS)
|
# STATIC_EXTRA_LIBS += $(TK_LIBS)
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче