[Goodies-commits] r6873 - in xfce4-power-manager/trunk: . libxfpm
Ali Abdallah
aliov at xfce.org
Mon Mar 9 13:22:36 CET 2009
Author: aliov
Date: 2009-03-09 12:22:36 +0000 (Mon, 09 Mar 2009)
New Revision: 6873
Modified:
xfce4-power-manager/trunk/ChangeLog
xfce4-power-manager/trunk/INSTALL
xfce4-power-manager/trunk/configure.ac.in
xfce4-power-manager/trunk/libxfpm/hal-ctx.c
xfce4-power-manager/trunk/libxfpm/xfpm-string.c
Log:
Bump xfce dependencies version to 4.6.0
Modified: xfce4-power-manager/trunk/ChangeLog
===================================================================
--- xfce4-power-manager/trunk/ChangeLog 2009-03-09 09:33:13 UTC (rev 6872)
+++ xfce4-power-manager/trunk/ChangeLog 2009-03-09 12:22:36 UTC (rev 6873)
@@ -1,4 +1,7 @@
+2009-03-09 13:22 Ali aliov at xfce.org
+ * : Bump xfce dependencies version to 4.6.0
+
2009-03-09 10:33 Ali aliov at xfce.org
* : Fix a Gtk Warning in the settings dialog
Modified: xfce4-power-manager/trunk/INSTALL
===================================================================
--- xfce4-power-manager/trunk/INSTALL 2009-03-09 09:33:13 UTC (rev 6872)
+++ xfce4-power-manager/trunk/INSTALL 2009-03-09 12:22:36 UTC (rev 6873)
@@ -2,15 +2,15 @@
*************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007 Free Software Foundation, Inc.
+2006, 2007, 2008 Free Software Foundation, Inc.
-This file is free documentation; the Free Software Foundation gives
+ This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
-Briefly, the shell commands `./configure; make; make install' should
+ Briefly, the shell commands `./configure; make; make install' should
configure, build, and install this package. The following
more-detailed instructions are generic; see the `README' file for
instructions specific to this package.
@@ -73,9 +73,9 @@
Compilers and Options
=====================
-Some systems require unusual options for compilation or linking that the
-`configure' script does not know about. Run `./configure --help' for
-details on some of the pertinent environment variables.
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
@@ -88,7 +88,7 @@
Compiling For Multiple Architectures
====================================
-You can compile the package for more than one kind of computer at the
+ You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
@@ -100,10 +100,24 @@
installed the package for one architecture, use `make distclean' before
reconfiguring for another architecture.
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
Installation Names
==================
-By default, `make install' installs the package's commands under
+ By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
@@ -126,7 +140,7 @@
Optional Features
=================
-Some packages pay attention to `--enable-FEATURE' options to
+ Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@@ -138,14 +152,36 @@
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
Specifying the System Type
==========================
-There may be some features `configure' cannot figure out automatically,
-but needs to determine by the type of machine the package will run on.
-Usually, assuming the package is built to be run on the _same_
-architectures, `configure' can figure that out, but if it prints a
-message saying it cannot guess the machine type, give it the
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@@ -171,9 +207,9 @@
Sharing Defaults
================
-If you want to set default values for `configure' scripts to share, you
-can create a site shell script called `config.site' that gives default
-values for variables like `CC', `cache_file', and `prefix'.
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
@@ -182,7 +218,7 @@
Defining Variables
==================
-Variables not defined in a site shell script can be set in the
+ Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
@@ -201,12 +237,20 @@
`configure' Invocation
======================
-`configure' recognizes the following options to control how it operates.
+ `configure' recognizes the following options to control how it
+operates.
`--help'
`-h'
- Print a summary of the options to `configure', and exit.
+ Print a summary of all of the options to `configure', and exit.
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
`--version'
`-V'
Print the version of Autoconf used to generate the `configure'
@@ -232,6 +276,16 @@
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
Modified: xfce4-power-manager/trunk/configure.ac.in
===================================================================
--- xfce4-power-manager/trunk/configure.ac.in 2009-03-09 09:33:13 UTC (rev 6872)
+++ xfce4-power-manager/trunk/configure.ac.in 2009-03-09 12:22:36 UTC (rev 6873)
@@ -55,16 +55,19 @@
m4_define([gtk_minimum_version], [2.10.0])
m4_define([glib_minimum_version], [2.14.0])
m4_define([dbus_minimum_version], [0.60])
+m4_define([dbus_glib_minimum_version], [0.70])
m4_define([hal_minimum_version], [0.5.6])
-m4_define([xfconf_minimum_version], [4.5.90])
-m4_define([libxfcegui4_minimum_version],[4.4.1])
-m4_define([libxfce4util_minimum_version],[4.4.1])
-m4_define([libxfce4panel_minimum_version],[4.4.0])
+
+m4_define([xfconf_minimum_version], [4.6.0])
+m4_define([libxfcegui4_minimum_version],[4.6.0])
+m4_define([libxfce4util_minimum_version],[4.6.0])
+m4_define([libxfce4panel_minimum_version],[4.6.0])
m4_define([glade_minimum_version], [2.0.0])
-m4_define([dbus_glib_minimum_version], [0.70])
+
m4_define([libnotify_minimum_version], [0.4.1])
+
XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [gtk_minimum_version])
XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [glib_minimum_version])
XDT_CHECK_PACKAGE([DBUS], [dbus-1], [dbus_minimum_version])
Modified: xfce4-power-manager/trunk/libxfpm/hal-ctx.c
===================================================================
--- xfce4-power-manager/trunk/libxfpm/hal-ctx.c 2009-03-09 09:33:13 UTC (rev 6872)
+++ xfce4-power-manager/trunk/libxfpm/hal-ctx.c 2009-03-09 12:22:36 UTC (rev 6873)
@@ -141,7 +141,8 @@
}
/*
- *
+ * Set a user data to be collected on signals
+ * with libhal_ctx_get_user_data
*/
void hal_ctx_set_user_data (HalCtx *ctx, void *data)
{
@@ -184,6 +185,10 @@
libhal_ctx_set_device_property_modified(ctx->priv->context, callback);
}
+/*
+ * Watch all the devices monitored by HAL
+ *
+ */
gboolean hal_ctx_watch_all (HalCtx *ctx)
{
g_return_val_if_fail(HAL_IS_CTX(ctx), FALSE);
@@ -194,9 +199,15 @@
libhal_device_property_watch_all(ctx->priv->context, &error);
+ HAL_CTX_CHECK_DBUS_ERROR(error)
+
return TRUE;
}
+
+/*
+ * Add a watch for a unique device
+ */
gboolean hal_ctx_watch_device (HalCtx *ctx, const gchar *udi)
{
g_return_val_if_fail(HAL_IS_CTX(ctx), FALSE);
Modified: xfce4-power-manager/trunk/libxfpm/xfpm-string.c
===================================================================
--- xfce4-power-manager/trunk/libxfpm/xfpm-string.c 2009-03-09 09:33:13 UTC (rev 6872)
+++ xfce4-power-manager/trunk/libxfpm/xfpm-string.c 2009-03-09 12:22:36 UTC (rev 6873)
@@ -18,6 +18,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include "xfpm-string.h"
gint xfpm_strcmp (const gchar *str1, const gchar *str2)
More information about the Goodies-commits
mailing list