equal
deleted
inserted
replaced
18 # |
18 # |
19 # CDDL HEADER END |
19 # CDDL HEADER END |
20 # |
20 # |
21 |
21 |
22 # |
22 # |
23 # Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. |
23 # Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. |
24 # |
24 # |
25 |
25 |
26 BUILD_BITS = 64 |
26 BUILD_BITS = 64 |
27 # All components using gobject-introspection must be built with gcc as |
27 # All components using gobject-introspection must be built with gcc as |
28 # gobject-introspection does not produce correct results when using Studio. |
28 # gobject-introspection does not produce correct results when using Studio. |
61 CONFIGURE_OPTIONS += --without-cheese |
61 CONFIGURE_OPTIONS += --without-cheese |
62 |
62 |
63 # Needed due to patch to configure.ac. |
63 # Needed due to patch to configure.ac. |
64 COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv); |
64 COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fiv); |
65 |
65 |
66 # Delete this when build servers are installed with gnome-settings-daemon |
|
67 GSD_BASE = $(WS_COMPONENTS)/gnome/gnome-settings-daemon/build/prototype/$(MACH) |
|
68 PKG_CONFIG_PATHS += $(GSD_BASE)$(PKG_CONFIG_PATH.$(BITS)) |
|
69 CPPFLAGS += -I$(GSD_BASE)/usr/include/gnome-settings-daemon-3.0 |
|
70 LD_OPTIONS += -L $(GSD_BASE)$(USRLIB.$(BITS)) |
|
71 |
|
72 UNINSTALLED_DEPS = gnome-settings-daemon libgweather |
|
73 DEPENDED += $(UNINSTALLED_DEPS:%=../%/build/manifest-$(MACH)-*.depend) |
|
74 REQUIRED_PACKAGES += $(shell $(GSED) -n -e '/GSED/d' -e 's/REQUIRED_PACKAGES += //p' $(UNINSTALLED_DEPS:%=../%/Makefile)) |
|
75 #end Delete |
|
76 |
|
77 |
|
78 # Use the GNOME 3 libnotify even though the GNOME 2 one is still the default |
66 # Use the GNOME 3 libnotify even though the GNOME 2 one is still the default |
79 PKG_CONFIG_PATHS.32 += /usr/lib/pkgconfig/libnotify-4 |
67 PKG_CONFIG_PATHS.32 += /usr/lib/pkgconfig/libnotify-4 |
80 PKG_CONFIG_PATHS.64 += /usr/lib/$(MACH64)/pkgconfig/libnotify-4 |
68 PKG_CONFIG_PATHS.64 += /usr/lib/$(MACH64)/pkgconfig/libnotify-4 |
81 PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS)) |
69 PKG_CONFIG_PATHS += $(PKG_CONFIG_PATHS.$(BITS)) |
82 LD_OPTIONS.32 += -L /usr/lib/libnotify-4 -R /usr/lib/libnotify-4 |
70 LD_OPTIONS.32 += -L /usr/lib/libnotify-4 -R /usr/lib/libnotify-4 |
93 REQUIRED_PACKAGES += library/desktop/colord-gtk |
81 REQUIRED_PACKAGES += library/desktop/colord-gtk |
94 REQUIRED_PACKAGES += library/desktop/gdk-pixbuf |
82 REQUIRED_PACKAGES += library/desktop/gdk-pixbuf |
95 REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection |
83 REQUIRED_PACKAGES += library/desktop/gobject/gobject-introspection |
96 REQUIRED_PACKAGES += library/desktop/grilo |
84 REQUIRED_PACKAGES += library/desktop/grilo |
97 REQUIRED_PACKAGES += library/desktop/gtk3 |
85 REQUIRED_PACKAGES += library/desktop/gtk3 |
|
86 REQUIRED_PACKAGES += library/desktop/libgweather |
98 REQUIRED_PACKAGES += library/desktop/pango |
87 REQUIRED_PACKAGES += library/desktop/pango |
99 REQUIRED_PACKAGES += library/desktop/xdg/libcanberra |
88 REQUIRED_PACKAGES += library/desktop/xdg/libcanberra |
100 REQUIRED_PACKAGES += library/glib2 |
89 REQUIRED_PACKAGES += library/glib2 |
101 REQUIRED_PACKAGES += library/gnome/gnome-desktop |
90 REQUIRED_PACKAGES += library/gnome/gnome-desktop |
102 REQUIRED_PACKAGES += library/gnome/gnome-online-accounts |
91 REQUIRED_PACKAGES += library/gnome/gnome-online-accounts |