Contents of /trunk/gnome-disk-utility/patches/gnome-disk-utility-3.10.0-make-gsd-conditional.patch
Parent Directory
| 
Revision Log
Revision 2316 -
(show annotations)
(download)
Sat Oct 26 11:09:23 2013 UTC (10 years, 6 months ago) by niro
File size: 1068 byte(s)
Sat Oct 26 11:09:23 2013 UTC (10 years, 6 months ago) by niro
File size: 1068 byte(s)
-rediffed for 3.10.0
| 1 | diff -Naur gnome-disk-utility-3.10.0/configure.ac gnome-disk-utility-3.10.0-magellan/configure.ac |
| 2 | --- gnome-disk-utility-3.10.0/configure.ac 2013-09-28 19:28:49.000000000 +0000 |
| 3 | +++ gnome-disk-utility-3.10.0-magellan/configure.ac 2013-10-26 13:57:32.393000000 +0000 |
| 4 | @@ -120,7 +120,6 @@ |
| 5 | PKG_CHECK_MODULES(PWQUALITY, [pwquality >= $PWQUALITY_REQUIRED]) |
| 6 | PKG_CHECK_MODULES(CANBERRA, [libcanberra-gtk3 >= $CANBERRA_REQUIRED]) |
| 7 | PKG_CHECK_MODULES(LIBDVDREAD, [dvdread >= $LIBDVDREAD_REQUIRED]) |
| 8 | -PKG_CHECK_MODULES(GSD_PLUGIN, [gnome-settings-daemon >= $GSD_PLUGIN_REQUIRED]) |
| 9 | PKG_CHECK_MODULES(LIBNOTIFY, [libnotify >= $LIBNOTIFY_REQUIRED]) |
| 10 | PKG_CHECK_MODULES(LIBLZMA, [liblzma >= $LIBLZMA_REQUIRED]) |
| 11 | |
| 12 | @@ -157,6 +156,7 @@ |
| 13 | AC_ARG_ENABLE(gsd_plugin, AS_HELP_STRING([--disable-gsd-plugin],[don't build gnome-settings-daemon plug-in])) |
| 14 | msg_gsd_plugin=no |
| 15 | if test "x$enable_gsd_plugin" != "xno"; then |
| 16 | + PKG_CHECK_MODULES(GSD_PLUGIN, [gnome-settings-daemon >= $GSD_PLUGIN_REQUIRED]) |
| 17 | msg_gsd_plugin=yes |
| 18 | fi |
| 19 | AM_CONDITIONAL(USE_GSD_PLUGIN, [test "$msg_gsd_plugin" = "yes"]) |