diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2010-08-19 19:40:47 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2010-08-19 19:40:47 -0400 |
| commit | 3e639558478a24424496a234b61e0e86d68cc650 (patch) | |
| tree | cd1f1ece920f619c392ef1c04c1080b7f63cf01a | |
| parent | 6c6c75c216bc9df7960b1fc4205ec15e4d43d0b0 (diff) | |
| download | gnome-applets-3e639558478a24424496a234b61e0e86d68cc650.tar.gz gnome-applets-3e639558478a24424496a234b61e0e86d68cc650.tar.xz gnome-applets-3e639558478a24424496a234b61e0e86d68cc650.zip | |
fix patch
| -rw-r--r-- | gnome-applets-2.15.2-use-old-modemlights.patch | 45 |
1 files changed, 41 insertions, 4 deletions
diff --git a/gnome-applets-2.15.2-use-old-modemlights.patch b/gnome-applets-2.15.2-use-old-modemlights.patch index 5f9bc50..f0bef45 100644 --- a/gnome-applets-2.15.2-use-old-modemlights.patch +++ b/gnome-applets-2.15.2-use-old-modemlights.patch @@ -1,6 +1,32 @@ ---- gnome-applets-2.15.2/configure.in.use-old-modemlights 2006-07-26 11:36:14.000000000 -0400 -+++ gnome-applets-2.15.2/configure.in 2006-08-03 19:31:07.000000000 -0400 -@@ -575,6 +575,7 @@ +diff -up gnome-applets-2.31.90.1/configure.in.use-old-modemlights gnome-applets-2.31.90.1/configure.in +--- gnome-applets-2.31.90.1/configure.in.use-old-modemlights 2010-08-18 18:30:01.000000000 -0400 ++++ gnome-applets-2.31.90.1/configure.in 2010-08-19 19:40:12.344849004 -0400 +@@ -126,6 +126,11 @@ PKG_CHECK_MODULES(GNOME_APPLETS3, libpan + AC_SUBST(GNOME_APPLETS3_CFLAGS) + AC_SUBST(GNOME_APPLETS3_LIBS) + ++dnl -- check for libgnome (required) ------------------------------------------ ++PKG_CHECK_MODULES(GNOME_LIBS2, libgnome-2.0 libgnomeui-2.0) ++AC_SUBST(GNOME_LIBS2_CFLAGS) ++AC_SUBST(GNOME_LIBS2_LIBS) ++ + dnl -- check for gnome-desktop (required) ------------------------------------- + PKG_CHECK_MODULES(GNOMEDESKTOP, gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) + AC_SUBST(GNOMEDESKTOP_CFLAGS) +@@ -407,12 +412,10 @@ if test x$disable_battstat = xno; then + case "${host}" in + powerpc-*-linux*) + NEED_LIBAPM=yes +- AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no]) + ;; + # list of supported OS cores that use libapm + *-*-linux*) + NEED_LIBAPM=yes +- AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no]) + ;; + # list of supported OS cores that do not use libapm + i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu) +@@ -554,14 +557,16 @@ fi AM_CONDITIONAL(BUILD_CPUFREQ_APPLET, test x$build_cpufreq_applet = xyes) AM_CONDITIONAL(BUILD_CPUFREQ_SELECTOR, test x$enable_selector = xyes) AM_CONDITIONAL(CPUFREQ_SELECTOR_SUID, test x$suid = xyes) @@ -8,7 +34,18 @@ dnl *************************************************************************** dnl *** invest-applet specific checks *** -@@ -697,6 +698,9 @@ + dnl *************************************************************************** + + if test "x$HAVE_PYGTK" = "xyes" -a "x$HAVE_PYHDRS" = "xyes"; then +- AM_CHECK_PYMOD(gnomeapplet,, +- BUILD_INVEST_APPLET="yes", BUILD_INVEST_APPLET="no") ++dnl AM_CHECK_PYMOD(gnomeapplet,, ++dnl BUILD_INVEST_APPLET="yes", BUILD_INVEST_APPLET="no") ++ BUILD_INVEST_APPLET="yes" + else + BUILD_INVEST_APPLET="no" + fi +@@ -688,6 +693,9 @@ mini-commander/help/Makefile drivemount/Makefile drivemount/help/Makefile modemlights/Makefile |