diff options
Diffstat (limited to 'x11/gnome-applets/files/patch-aa')
| -rw-r--r-- | x11/gnome-applets/files/patch-aa | 84 |
1 files changed, 36 insertions, 48 deletions
diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa index 9e8038833e85..48b84e4569f6 100644 --- a/x11/gnome-applets/files/patch-aa +++ b/x11/gnome-applets/files/patch-aa @@ -1,15 +1,6 @@ ---- configure.orig Tue Mar 1 12:35:29 2005 -+++ configure Tue Mar 1 12:36:09 2005 -@@ -463,7 +463,7 @@ - # include <unistd.h> - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE XSLTPROC GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE LIBWNCK_CFLAGS LIBWNCK_LIBS INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE GNOMELOCALEDIR USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE GUCHARMAP_CFLAGS GUCHARMAP_LIBS APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE SU_TOOL STB_SCRIPTS_DIR APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE MODEMLIGHTS_LIBS CPUFREQ_SELECTOR_CFLAGS CPUFREQ_SELECTOR_LIBS BUILD_CPUFREQ_APPLET_TRUE BUILD_CPUFREQ_APPLET_FALSE BUILD_CPUFREQ_SELECTOR_TRUE BUILD_CPUFREQ_SELECTOR_FALSE CPUFREQ_SELECTOR_SUID_TRUE CPUFREQ_SELECTOR_SUID_FALSE ACLOCAL_AMFLAGS iconsdir pixmapsdir pkgdatadir gladedir GNOME_ICONDIR GNOME_PIXMAPSDIR GNOME_GLADEDIR DATADIR SYSCONFDIR LIBDIR PREFIX LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE XSLTPROC GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE LIBWNCK_CFLAGS LIBWNCK_LIBS INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE GNOMELOCALEDIR USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE ACPIINC HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE GUCHARMAP_CFLAGS GUCHARMAP_LIBS APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE SU_TOOL STB_SCRIPTS_DIR APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE MODEMLIGHTS_LIBS CPUFREQ_SELECTOR_CFLAGS CPUFREQ_SELECTOR_LIBS BUILD_CPUFREQ_APPLET_TRUE BUILD_CPUFREQ_APPLET_FALSE BUILD_CPUFREQ_SELECTOR_TRUE BUILD_CPUFREQ_SELECTOR_FALSE CPUFREQ_SELECTOR_SUID_TRUE CPUFREQ_SELECTOR_SUID_FALSE ACLOCAL_AMFLAGS iconsdir pixmapsdir pkgdatadir gladedir GNOME_ICONDIR GNOME_PIXMAPSDIR GNOME_GLADEDIR DATADIR SYSCONFDIR LIBDIR PREFIX LIBOBJS LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -23136,8 +23136,7 @@ +--- configure.orig Sat Jul 16 12:55:48 2005 ++++ configure Sat Jul 16 13:04:33 2005 +@@ -23272,8 +23272,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -19,30 +10,35 @@ GNOMELOCALEDIR="$ac_define_dir" -@@ -24838,6 +24837,7 @@ - - HAVE_LIBAPM=no - NEED_LIBAPM=no -+ACPIINC= - build_battstat_applet=no - - if test x$disable_battstat = xno; then -@@ -24989,7 +24989,12 @@ +@@ -25126,7 +25125,7 @@ ;; # list of supported OS cores that do not use libapm -- *-*-freebsd*|*-*-netbsd*|*-*-openbsd*) +- i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*) + i386-*-freebsd*|amd64-*-freebsd*|*-*-netbsd*|*-*-openbsd*) -+ if [ -n "${FREEBSD_SYS}" ]; then -+ ACPIINC="-I${FREEBSD_SYS}" -+ else -+ ACPIINC="-I/usr/src/sys" -+ fi - ;; - *) - echo "warning: ${host} is not supported by battstat_applet, not building" >&2 -@@ -25795,6 +25800,9 @@ - *linux*) + if -n "${OS_SYS}" ; then + ACPIINC="-I${OS_SYS}" + else +@@ -25406,7 +25405,7 @@ + APPLET_MIXER_FALSE= + fi + +-if test x"$P_MIXER" == x"mixer"; then ++if test x"$P_MIXER" = x"mixer"; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 + else +@@ -25983,7 +25982,7 @@ + fi + + +-if test "x$SU_TOOL" == "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then ++if test "x$SU_TOOL" = "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then + { echo "$as_me:$LINENO: WARNING: *** \`modemlights' applet will not be built ***" >&5 + echo "$as_me: WARNING: *** \`modemlights' applet will not be built ***" >&2;} + else +@@ -26119,6 +26118,9 @@ + echo "${ECHO_T}yes" >&6 build_cpufreq_applet=yes ;; + i386-*-freebsd*|amd64-*-freebsd*) @@ -51,7 +47,7 @@ *) echo "warning: ${host} is not supported by cpufreq applet, not building" >&2 build_cpufreq_applet=no -@@ -26085,7 +26093,7 @@ +@@ -26409,7 +26411,7 @@ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" @@ -60,7 +56,7 @@ pixmapsdir="${datadir}/pixmaps" -@@ -26099,8 +26107,7 @@ +@@ -26423,8 +26425,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -70,7 +66,7 @@ GNOME_ICONDIR="$ac_define_dir" -@@ -26112,8 +26119,7 @@ +@@ -26436,8 +26437,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -80,7 +76,7 @@ GNOME_PIXMAPSDIR="$ac_define_dir" -@@ -26125,8 +26131,7 @@ +@@ -26449,8 +26449,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -90,7 +86,7 @@ GNOME_GLADEDIR="$ac_define_dir" -@@ -26138,8 +26143,7 @@ +@@ -26462,8 +26461,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -100,7 +96,7 @@ DATADIR="$ac_define_dir" -@@ -26151,8 +26155,7 @@ +@@ -26475,8 +26473,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -110,7 +106,7 @@ SYSCONFDIR="$ac_define_dir" -@@ -26164,8 +26167,7 @@ +@@ -26488,8 +26485,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -120,7 +116,7 @@ LIBDIR="$ac_define_dir" -@@ -26177,8 +26179,7 @@ +@@ -26501,8 +26497,7 @@ test "x$prefix" = xNONE && prefix="$ac_default_prefix" test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' @@ -130,11 +126,3 @@ PREFIX="$ac_define_dir" -@@ -27311,6 +27312,7 @@ - s,@GKB_SUN_FALSE@,$GKB_SUN_FALSE,;t t - s,@HAVE_LIBAPM@,$HAVE_LIBAPM,;t t - s,@NEED_LIBAPM@,$NEED_LIBAPM,;t t -+s,@ACPIINC@,$ACPIINC,;t t - s,@HAVE_LIBAPM_TRUE@,$HAVE_LIBAPM_TRUE,;t t - s,@HAVE_LIBAPM_FALSE@,$HAVE_LIBAPM_FALSE,;t t - s,@NEED_LIBAPM_TRUE@,$NEED_LIBAPM_TRUE,;t t |