Updating branch refs/heads/master to 61eba531ec7daa0e38b3d9b89c1c34a4cbac976f (commit) from 7d11392ef6d626519e5c6ef317b681df61637ca6 (commit)
commit 61eba531ec7daa0e38b3d9b89c1c34a4cbac976f Author: Landry Breuil <lan...@xfce.org> Date: Wed Feb 13 22:30:03 2013 +0100 Port to libxfce4ui. (bug #8064) Joachim Wiedorn sent a very similar patch, thanks too! INSTALL | 53 +++++++++++++++++++-------------------- configure.ac.in | 29 ++++++++++----------- panel-plugin/Makefile.am | 4 +- panel-plugin/datetime-dialog.c | 8 +++--- panel-plugin/datetime.c | 2 +- 5 files changed, 47 insertions(+), 49 deletions(-) diff --git a/INSTALL b/INSTALL index d3c5b40..23e5f25 100644 --- a/INSTALL +++ b/INSTALL @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007 Free Software Foundation, Inc. +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free +Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -10,10 +10,7 @@ unlimited permission to copy, distribute and modify it. Basic Installation ================== -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. +These are generic installation instructions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -26,9 +23,9 @@ debugging `configure'). It can also use an optional file (typically called `config.cache' and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. Caching is +the results of its tests to speed up reconfiguring. (Caching is disabled by default to prevent problems with accidental use of stale -cache files. +cache files.) If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail @@ -38,17 +35,20 @@ some point `config.cache' contains results you don't want to keep, you may remove or edit it. The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You need `configure.ac' if -you want to change it or regenerate `configure' using a newer version -of `autoconf'. +`configure' by a program called `autoconf'. You only need +`configure.ac' if you want to change it or regenerate `configure' using +a newer version of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. + `./configure' to configure the package for your system. If you're + using `csh' on an old version of System V, you might need to type + `sh ./configure' instead to prevent `csh' from trying to execute + `configure' itself. - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. + Running `configure' takes awhile. While running, it prints some + messages telling which features it is checking for. 2. Type `make' to compile the package. @@ -67,9 +67,6 @@ The simplest way to compile this package is: all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. - Compilers and Options ===================== @@ -81,7 +78,7 @@ details on some of the pertinent environment variables. by setting variables in the command line or in the environment. Here is an example: - ./configure CC=c99 CFLAGS=-g LIBS=-lposix + ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix *Note Defining Variables::, for more details. @@ -90,15 +87,17 @@ Compiling For Multiple Architectures 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 +own directory. To do this, you must use a version of `make' that +supports the `VPATH' variable, such as GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - With a non-GNU `make', it is safer to compile the package for one -architecture at a time in the source code directory. After you have -installed the package for one architecture, use `make distclean' before -reconfiguring for another architecture. + If you have to use a `make' that does not support the `VPATH' +variable, you have to compile the package for one architecture at a +time in the source code directory. After you have installed the +package for one architecture, use `make distclean' before reconfiguring +for another architecture. Installation Names ================== @@ -191,12 +190,12 @@ them in the `configure' command line, using `VAR=value'. For example: ./configure CC=/usr/local2/bin/gcc causes the specified `gcc' to be used as the C compiler (unless it is -overridden in the site shell script). +overridden in the site shell script). Here is a another example: -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: + /bin/bash ./configure CONFIG_SHELL=/bin/bash - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash +Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent +configuration-related scripts to be executed by `/bin/bash'. `configure' Invocation ====================== diff --git a/configure.ac.in b/configure.ac.in index 4d58211..98b394a 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -15,33 +15,32 @@ AM_CONFIG_HEADER([config.h]) AM_MAINTAINER_MODE() dnl Check for UNIX variants -AC_AIX() -AC_ISC_POSIX() -AC_MINIX() +AC_AIX +AC_ISC_POSIX AM_CONDITIONAL([HAVE_CYGWIN], [test "`uname | grep \"CYGWIN\"`" != ""]) dnl check for basic programs -AC_PROG_CC() -AC_PROG_INSTALL() -AC_PROG_INTLTOOL() -AC_PROG_LIBTOOL() +AC_PROG_CC +AC_PROG_INSTALL +AC_PROG_INTLTOOL + +dnl Initialize libtools +LT_PREREQ([2.2.6]) +LT_INIT([disable-static]) dnl Check for i18n support XDT_I18N([@LINGUAS@]) dnl Check for required packages -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0]) -XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.99.2]) -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99.2]) -XDT_CHECK_PACKAGE([LIBXFCE4PANEL],[libxfce4panel-1.0],[4.3.99.2]) - -dnl check for optional packages/versions -XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL_46], [libxfce4panel-1.0], [4.5.92], [libxfce4panel46], [Take advantage of Xfce 4.6 panel changes]) +XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0]) +XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0]) +XDT_CHECK_PACKAGE([LIBXFCE4PANEL],[libxfce4panel-1.0],[4.8.0]) #CFLAGS="$CFLAGS -Wall -Werror" dnl Check for debugging support -BM_DEBUG_SUPPORT() +XDT_FEATURE_DEBUG AC_OUTPUT([ Makefile diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index 4005f85..6f0bb00 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -16,7 +16,7 @@ libdatetime_la_CFLAGS = \ -DLOCALEDIR=\"$(localedir)\" \ $(GTK_CFLAGS) \ $(LIBXFCE4PANEL_CFLAGS) \ - $(LIBXFCEGUI4_CFLAGS) \ + $(LIBXFCE4UI_CFLAGS) \ $(LIBXFCE4UTIL_CFLAGS) libdatetime_la_LDFLAGS = \ @@ -31,7 +31,7 @@ endif libdatetime_la_LIBADD = \ $(GTK_LIBS) \ $(LIBXFCE4PANEL_LIBS) \ - $(LIBXFCEGUI4_LIBS) \ + $(LIBXFCE4UI_LIBS) \ $(LIBXFCE4UTIL_LIBS) desktopdir = $(datadir)/xfce4/panel-plugins diff --git a/panel-plugin/datetime-dialog.c b/panel-plugin/datetime-dialog.c index 193587e..4ef3ab8 100644 --- a/panel-plugin/datetime-dialog.c +++ b/panel-plugin/datetime-dialog.c @@ -28,7 +28,7 @@ #include <string.h> /* xfce includes */ -#include <libxfcegui4/libxfcegui4.h> +#include <libxfce4ui/libxfce4ui.h> #include <libxfce4util/libxfce4util.h> #include <libxfce4panel/xfce-panel-plugin.h> @@ -388,7 +388,7 @@ datetime_properties_dialog(XfcePanelPlugin *plugin, t_datetime * datetime) /* * layout frame */ - frame = xfce_create_framebox(_("Layout"), &bin); + frame = xfce_gtk_frame_box_new(_("Layout"), &bin); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), frame, FALSE, FALSE, 0); gtk_container_set_border_width(GTK_CONTAINER(frame), 6); @@ -422,7 +422,7 @@ datetime_properties_dialog(XfcePanelPlugin *plugin, t_datetime * datetime) /* * Date frame */ - datetime->date_frame = xfce_create_framebox(_("Date"), &bin); + datetime->date_frame = xfce_gtk_frame_box_new(_("Date"), &bin); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), datetime->date_frame, FALSE, FALSE, 0); gtk_container_set_border_width(GTK_CONTAINER(datetime->date_frame), 6); @@ -525,7 +525,7 @@ datetime_properties_dialog(XfcePanelPlugin *plugin, t_datetime * datetime) /* * time frame */ - datetime->time_frame = xfce_create_framebox(_("Time"), &bin); + datetime->time_frame = xfce_gtk_frame_box_new(_("Time"), &bin); gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), datetime->time_frame, FALSE, FALSE, 0); gtk_container_set_border_width(GTK_CONTAINER(datetime->time_frame), 6); diff --git a/panel-plugin/datetime.c b/panel-plugin/datetime.c index 30ee04a..031166a 100644 --- a/panel-plugin/datetime.c +++ b/panel-plugin/datetime.c @@ -28,7 +28,7 @@ #include <string.h> /* xfce includes */ -#include <libxfcegui4/libxfcegui4.h> +#include <libxfce4ui/libxfce4ui.h> #include <libxfce4util/libxfce4util.h> #include <libxfce4panel/xfce-panel-plugin.h> #include <libxfce4panel/xfce-panel-convenience.h> _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits