|
2053
|
1 |
--- configure.ac.orig 2009-08-10 22:08:25.875016944 -0700
|
|
|
2 |
+++ configure.ac 2009-08-10 22:09:12.553657753 -0700
|
|
|
3 |
@@ -81,7 +81,7 @@
|
|
|
4 |
PKG_CHECK_MODULES(LIBX11, [x11])
|
|
|
5 |
PKG_CHECK_MODULES(COMPOSITE, [xcomposite])
|
|
|
6 |
PKG_CHECK_MODULES(XRENDER, [xrender])
|
|
|
7 |
-# cairo-menu, notification-daemon
|
|
|
8 |
+# notification-daemon
|
|
|
9 |
PKG_CHECK_MODULES(LIBSEXY, [libsexy])
|
|
|
10 |
PKG_CHECK_MODULES(LIBNOTIFY, [libnotify])
|
|
|
11 |
# standalone-launcher, taskmand, taskmand-applet
|
|
|
12 |
@@ -89,7 +89,7 @@
|
|
|
13 |
# awn-terminal
|
|
|
14 |
PKG_CHECK_MODULES(VTE, [vte])
|
|
|
15 |
|
|
|
16 |
-# awn-system-monitor, cairo-menu, filebrowser, notification-daemon
|
|
|
17 |
+# awn-system-monitor, filebrowser, notification-daemon
|
|
|
18 |
if test "$with_gconf" != "no" -a "$config_backend" != "GConf"; then
|
|
|
19 |
PKG_CHECK_MODULES(GCONF, [gconf-2.0])
|
|
|
20 |
gconf=gconf-2.0
|
|
|
21 |
@@ -100,14 +100,14 @@
|
|
|
22 |
PKG_CHECK_MODULES(GNOMEUI, [libgnomeui-2.0])
|
|
|
23 |
# filebrowser
|
|
|
24 |
PKG_CHECK_MODULES(GNOME_DESKTOP, [gnome-desktop-2.0])
|
|
|
25 |
-# filebrowser, cairo-menu, trash
|
|
|
26 |
+# filebrowser, trash
|
|
|
27 |
PKG_CHECK_MODULES(GNOME_VFS, [gnome-vfs-2.0])
|
|
|
28 |
# awn-system-monitor
|
|
|
29 |
PKG_CHECK_MODULES(GTOP, [libgtop-2.0])
|
|
|
30 |
fi
|
|
|
31 |
|
|
|
32 |
if test "$with_gnome" != "no"; then
|
|
|
33 |
-# main-menu, cairo-menu
|
|
|
34 |
+# main-menu
|
|
|
35 |
PKG_CHECK_MODULES(GNOME_MENU, [libgnome-menu])
|
|
|
36 |
fi
|
|
|
37 |
|
|
|
38 |
@@ -289,8 +289,6 @@
|
|
|
39 |
src/awnterm/Makefile
|
|
|
40 |
src/awnterm/awnterm.desktop.in
|
|
|
41 |
src/battery-applet/Makefile
|
|
|
42 |
-src/cairo-menu/Makefile
|
|
|
43 |
-src/cairo-menu/cairo_main_menu.desktop.in
|
|
|
44 |
src/calendar/Makefile
|
|
|
45 |
src/calendar/google/Makefile
|
|
|
46 |
src/calendar/google/atom/Makefile
|
|
|
47 |
--- src/Makefile.in.orig 2009-08-10 22:08:31.451299741 -0700
|
|
|
48 |
+++ src/Makefile.in 2009-08-10 22:09:24.074017178 -0700
|
|
|
49 |
@@ -35,7 +35,6 @@
|
|
|
50 |
# --with-gnome --with-gconf
|
|
|
51 |
@WITH_GCONF_TRUE@@WITH_GNOME_TRUE@am__append_1 = \
|
|
|
52 |
@WITH_GCONF_TRUE@@WITH_GNOME_TRUE@ awnsystemmonitor \
|
|
|
53 |
-@WITH_GCONF_TRUE@@WITH_GNOME_TRUE@ cairo-menu \
|
|
|
54 |
@WITH_GCONF_TRUE@@WITH_GNOME_TRUE@ calendar \
|
|
|
55 |
@WITH_GCONF_TRUE@@WITH_GNOME_TRUE@ filebrowser \
|
|
|
56 |
@WITH_GCONF_TRUE@@WITH_GNOME_TRUE@ $(NULL)
|
|
|
57 |
@@ -86,7 +85,7 @@
|
|
|
58 |
media-icon-next media-icon-play media-player notification-area \
|
|
|
59 |
places pynot pynot-rgba python-test quit-applet separator \
|
|
|
60 |
shiny-switcher showdesktop to-do tomboy-applet \
|
|
|
61 |
- weather wobblyzini awnsystemmonitor cairo-menu \
|
|
|
62 |
+ weather wobblyzini awnsystemmonitor \
|
|
|
63 |
calendar filebrowser \
|
|
|
64 |
notification-daemon media-control digg main-menu \
|
|
|
65 |
MiMenu pandora rtm trash vala-test webapplet
|