diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-11-05 04:53:48 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2005-11-05 04:53:48 +0000 |
commit | e18151212d3326dbf04797c6d5300fb1211ee875 (patch) | |
tree | 1ca56d6a4227efdb653cc8e2b2cbedbbc8de3d88 /x11 | |
parent | Add bsdav 1.3, BSD native set of programs for audio and video reading (diff) |
Presenting GNOME 2.12 for FreeBSD. The release is chock full of bug fixes
and new features. Don't believe me? Then see for yourself at
http://www.gnome.org/start/2.12/notes/en/.
DO NOT USE portupgrade by itself to upgrade to GNOME 2.12. Instead, use
the gnome_upgrade.sh script from
http://www.marcuscom.com/downloads/gnome_upgrade212.sh. This script will
circumvent some potential pitfalls users can see if they use portupgrade
by itself.
In keeping with tradition, GNOME 2.12 for FreeBSD comes with a special
splash screen. The winner of this release's contest is
Dominique Goncalves <dominique.goncalves@gmail.com>. His splash screen
was inspired by http://art.gnome.org/contests/2.12-splash/83.
The FreeBSD GNOME Team would lank to thank the following users for
their contributions to this release:
Matthew Luckie <mjl@luckie.org.nz>
ade
sajd on #freebsd-gnome
Caelian on #freebsd-gnome
mnag
Yasuda Keisuke <kysd@po.harenet.ne.jp>
Mark Hobden <markhobden@gmail.com>
Sergey Akifyev <asa@agava.com>
Andreas Kohn
For more information on GNOME on FreeBSD, checkout
http://www.FreeBSD.org/gnome/. The 2.12 documentation will be
posted shortly.
Notes
Notes:
svn path=/head/; revision=147261
Diffstat (limited to 'x11')
93 files changed, 2761 insertions, 4317 deletions
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 79b2c9131064..606142c11566 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -3,14 +3,15 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnomeapplets2/Makefile,v 1.94 2005/10/08 19:41:40 marcus Exp $ # PORTNAME= gnomeapplets2 -PORTVERSION= 2.10.1 -PORTREVISION= 3 +PORTVERSION= 2.12.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-applets/2.10 +MASTER_SITE_SUBDIR= sources/gnome-applets/2.12 DISTNAME= gnome-applets-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -28,10 +29,11 @@ USE_X_PREFIX= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 INSTALLS_OMF= yes +INSTALLS_ICONS= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \ - gail + gail gnomedocutils USE_GSTREAMER= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ FREEBSD_SYS=${FREEBSD_SYS} @@ -52,22 +54,6 @@ PLIST_SUB= BATTERY="@comment " .else GCONF_SCHEMAS+= battstat.schemas PLIST_SUB= BATTERY="" - -.if ${OSVERSION} < 600019 -.if ${OSVERSION} < 503105 || ${OSVERSION} >= 600000 -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} " W A R N I N G" - @${ECHO_MSG} "*****************************************************" - @${ECHO_MSG} "* gnomeapplets2 requires that you have your kernel *" - @${ECHO_MSG} "* sources installed. If your kernel sources *" - @${ECHO_MSG} "* are somewhere other than /usr/src/sys, you *" - @${ECHO_MSG} "* may set the FREEBSD_SYS variable to the *" - @${ECHO_MSG} "* correct path. *" - @${ECHO_MSG} "*****************************************************" - @${ECHO_MSG} "" -.endif -.endif .endif .if ${ARCH} != "i386" && ${ARCH} != "amd64" diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo index 543fc30599f3..ad6838c15a4d 100644 --- a/x11/gnome-applets/distinfo +++ b/x11/gnome-applets/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-applets-2.10.1.tar.bz2) = da9cd75f77972c96eec9551d41878a7f -SIZE (gnome2/gnome-applets-2.10.1.tar.bz2) = 6250092 +MD5 (gnome2/gnome-applets-2.12.1.tar.bz2) = 06dd0b634d7092fa8af2ce302f68f912 +SIZE (gnome2/gnome-applets-2.12.1.tar.bz2) = 5369404 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 diff --git a/x11/gnome-applets/files/patch-battstat-acpi b/x11/gnome-applets/files/patch-battstat-acpi deleted file mode 100644 index 903e8b951d11..000000000000 --- a/x11/gnome-applets/files/patch-battstat-acpi +++ /dev/null @@ -1,576 +0,0 @@ ---- battstat/Makefile.in.orig Mon Jan 24 20:20:49 2005 -+++ battstat/Makefile.in Mon Jan 24 20:22:02 2005 -@@ -55,9 +55,10 @@ - PROGRAMS = $(libexec_PROGRAMS) - am_battstat_applet_2_OBJECTS = properties.$(OBJEXT) \ - battstat_applet.$(OBJEXT) power-management.$(OBJEXT) \ -- acpi-linux.$(OBJEXT) -+ acpi-freebsd.$(OBJEXT) acpi-linux.$(OBJEXT) - battstat_applet_2_OBJECTS = $(am_battstat_applet_2_OBJECTS) - am__DEPENDENCIES_1 = -+ACPIINC = @ACPIINC@ - @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@am__DEPENDENCIES_2 = \ - @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@ apmlib/libapm.a - battstat_applet_2_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -@@ -66,6 +67,7 @@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/acpi-linux.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/acpi-freebsd.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/battstat_applet.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/power-management.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/properties.Po -@@ -336,6 +338,7 @@ - $(GNOME_APPLETS_CFLAGS) \ - $(LIBGLADE_CFLAGS) \ - $(APMINC) \ -+ $(ACPIINC) \ - -DG_LOG_DOMAIN=\"battstat_applet\" - - battstat_applet_2_SOURCES = \ -@@ -345,7 +348,9 @@ - battstat_applet.c \ - power-management.c \ - acpi-linux.c \ -- acpi-linux.h -+ acpi-linux.h \ -+ acpi-freebsd.c \ -+ acpi-freebsd.h - - battstat_applet_2_LDADD = \ - $(GNOME_APPLETS_LIBS) \ -@@ -439,6 +444,7 @@ - -rm -f *.tab.c - - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-linux.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-freebsd.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/battstat_applet.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/power-management.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/properties.Po@am__quote@ ---- battstat/battstat_applet.c.orig Mon Jan 24 12:51:51 2005 -+++ battstat/battstat_applet.c Mon Jan 24 20:20:50 2005 -@@ -953,6 +953,7 @@ - "Seth Nickell <snickell@stanford.edu> (GNOME2 port)", - "Davyd Madeley <davyd@madeley.id.au>", - "Ryan Lortie <desrt@desrt.ca>", -+ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD ACPI support)", - NULL - }; - ---- battstat/properties.c.orig Fri Jan 14 23:38:18 2005 -+++ battstat/properties.c Mon Mar 14 19:49:26 2005 -@@ -27,7 +27,7 @@ - - #include <stdio.h> - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) && defined(__i386__) - #include <machine/apm_bios.h> - #elif defined(__NetBSD__) || defined(__OpenBSD__) - #include <sys/param.h> -@@ -61,6 +61,9 @@ - #include <panel-applet-gconf.h> - /*#include <status-docklet.h>*/ - -+#if defined(__FreeBSD__) && !defined(__i386__) -+#include "acpi-freebsd.h" -+#endif - #include "battstat.h" - - #ifndef gettext_noop ---- battstat/acpi-freebsd.c.orig Sun Jul 3 16:00:01 2005 -+++ battstat/acpi-freebsd.c Sun Jul 3 16:23:26 2005 -@@ -0,0 +1,280 @@ -+/* battstat A GNOME battery meter for laptops. -+ * Copyright (C) 2000 by Jörgen Pehrson <jp@spektr.eu.org> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. -+ * -+ $Id: patch-battstat-acpi,v 1.13 2005/02/28 08:02:03 marcus Exp $ -+ */ -+ -+/* -+ * ACPI battery functions for FreeBSD >= 5.2. -+ * September 2004 by Joe Marcus Clarke <marcus@FreeBSD.org> -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include <config.h> -+#endif -+ -+#ifdef __FreeBSD__ -+ -+#include <stdio.h> -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <sys/sysctl.h> -+#include <sys/un.h> -+#include <sys/ioctl.h> -+#if defined(__i386__) -+#include <machine/apm_bios.h> -+#endif -+#include <stdlib.h> -+#include <errno.h> -+#include <unistd.h> -+#include <fcntl.h> -+#include <glib.h> -+ -+#include <dev/acpica/acpiio.h> -+ -+#include "acpi-freebsd.h" -+ -+static gboolean -+update_ac_info(struct acpi_info * acpiinfo) -+{ -+ int acline; -+ size_t len = sizeof(acline); -+ -+ acpiinfo->ac_online = FALSE; -+ -+ if (sysctlbyname(ACPI_ACLINE, &acline, &len, NULL, 0) == -1) { -+ return FALSE; -+ } -+ -+ acpiinfo->ac_online = acline ? TRUE : FALSE; -+ -+ return TRUE; -+} -+ -+static gboolean -+update_battery_info(struct acpi_info * acpiinfo) -+{ -+ union acpi_battery_ioctl_arg battio; -+ int i; -+ -+ /* We really don't have to do this here. All of the relevant battery -+ * info can be obtained through sysctl. However, one day, the rate -+ * may be useful to get time left to full charge. -+ */ -+ -+ for(i = BATT_MIN; i < BATT_MAX; i++) { -+ battio.unit = i; -+ if (ioctl(acpiinfo->acpifd, ACPIIO_CMBAT_GET_BIF, &battio) == -1) { -+ continue; -+ } -+ -+ acpiinfo->max_capacity += battio.bif.lfcap; -+ acpiinfo->low_capacity += battio.bif.wcap; -+ acpiinfo->critical_capacity += battio.bif.lcap; -+ } -+ -+ return TRUE; -+} -+ -+gboolean -+acpi_freebsd_init(struct acpi_info * acpiinfo) -+{ -+ int acpi_fd; -+ int event_fd; -+ -+ g_assert(acpiinfo); -+ -+ if (acpiinfo->acpifd == -1) { -+ acpi_fd = open(ACPIDEV, O_RDONLY); -+ if (acpi_fd >= 0) { -+ acpiinfo->acpifd = acpi_fd; -+ } -+ else { -+ acpiinfo->acpifd = -1; -+ return FALSE; -+ } -+ } -+ -+ event_fd = socket(PF_UNIX, SOCK_STREAM, 0); -+ if (event_fd >= 0) { -+ struct sockaddr_un addr; -+ addr.sun_family = AF_UNIX; -+ strcpy(addr.sun_path, "/var/run/devd.pipe"); -+ if (connect(event_fd, (struct sockaddr *) &addr, sizeof(addr)) == 0) { -+ acpiinfo->event_fd = event_fd; -+ acpiinfo->event_inited = TRUE; -+ acpiinfo->channel = g_io_channel_unix_new(event_fd); -+ } -+ else { -+ close(event_fd); -+ acpiinfo->event_fd = -1; -+ acpiinfo->event_inited = FALSE; -+ } -+ } -+ -+ update_battery_info(acpiinfo); -+ update_ac_info(acpiinfo); -+ -+ return TRUE; -+} -+ -+#define ACPI_EVENT_IGNORE 0 -+#define ACPI_EVENT_AC 1 -+#define ACPI_EVENT_BATTERY_INFO 2 -+ -+static int parse_acpi_event(GString *buffer) -+{ -+ if (strstr(buffer->str, "system=ACPI")) { -+ if (strstr(buffer->str, "subsystem=ACAD")) -+ return ACPI_EVENT_AC; -+ if (strstr(buffer->str, "subsystem=CMBAT")) -+ return ACPI_EVENT_BATTERY_INFO; -+ } -+ -+ return ACPI_EVENT_IGNORE; -+} -+ -+void acpi_freebsd_update(struct acpi_info *acpiinfo) -+{ -+ /* XXX This is needed for systems where devd does not have permissions -+ * to allow for event-driven updates. -+ */ -+ update_ac_info(acpiinfo); -+ update_battery_info(acpiinfo); -+} -+ -+gboolean acpi_process_event(struct acpi_info *acpiinfo, gboolean *read_error) -+{ -+ gsize i; -+ int evt; -+ gboolean result = FALSE; -+ GString *buffer; -+ GIOStatus stat; -+ buffer = g_string_new(NULL); -+ -+ *read_error = FALSE; -+ stat = g_io_channel_read_line_string(acpiinfo->channel, buffer, &i, NULL); -+ -+ if (stat == G_IO_STATUS_ERROR || stat == G_IO_STATUS_EOF) { -+ *read_error = TRUE; -+ g_string_free(buffer, TRUE); -+ return FALSE; -+ } -+ -+ evt = parse_acpi_event(buffer); -+ switch (evt) { -+ case ACPI_EVENT_AC: -+ update_ac_info(acpiinfo); -+ result = TRUE; -+ break; -+ case ACPI_EVENT_BATTERY_INFO: -+ update_battery_info(acpiinfo); -+ result = TRUE; -+ break; -+ } -+ -+ g_string_free(buffer, TRUE); -+ return result; -+} -+ -+void -+acpi_freebsd_cleanup(struct acpi_info * acpiinfo) -+{ -+ g_assert(acpiinfo); -+ -+ if (acpiinfo->acpifd >= 0) { -+ close(acpiinfo->acpifd); -+ acpiinfo->acpifd = -1; -+ } -+ -+ if (acpiinfo->event_fd >= 0) { -+ g_io_channel_unref(acpiinfo->channel); -+ close(acpiinfo->event_fd); -+ acpiinfo->event_fd = -1; -+ } -+} -+ -+gboolean -+acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo) -+{ -+ int time; -+ int life; -+ int acline; -+ int state; -+ size_t len; -+ int rate; -+ int remain; -+ union acpi_battery_ioctl_arg battio; -+ gboolean charging; -+ int i; -+ -+ g_assert(acpiinfo); -+ -+ charging = FALSE; -+ -+ for(i = BATT_MIN; i < BATT_MAX; i++) { -+ battio.unit = i; -+ if (ioctl(acpiinfo->acpifd, ACPIIO_CMBAT_GET_BST, &battio) == -1) { -+ continue; -+ } -+ -+ remain += battio.bst.cap; -+ rate += battio.bst.rate; -+ } -+ -+ len = sizeof(time); -+ if (sysctlbyname(ACPI_TIME, &time, &len, NULL, 0) == -1) { -+ return FALSE; -+ } -+ -+ len = sizeof(life); -+ if (sysctlbyname(ACPI_LIFE, &life, &len, NULL, 0) == -1) { -+ return FALSE; -+ } -+ -+ len = sizeof(state); -+ if (sysctlbyname(ACPI_STATE, &state, &len, NULL, 0) == -1) { -+ return FALSE; -+ } -+ -+ apminfo->ai_acline = acpiinfo->ac_online ? 1 : 0; -+ if (state & ACPI_BATT_STAT_CHARGING) { -+ apminfo->ai_batt_stat = 3; -+ charging = TRUE; -+ } -+ else if (state & ACPI_BATT_STAT_CRITICAL) { -+ /* Add a special check here since FreeBSD's ACPI interface will tell us -+ * when the battery is critical. -+ */ -+ apminfo->ai_batt_stat = 2; -+ } -+ else { -+ apminfo->ai_batt_stat = remain < acpiinfo->low_capacity ? 1 : remain < acpiinfo->critical_capacity ? 2 : 0; -+ } -+ apminfo->ai_batt_life = life; -+ if (!charging) { -+ apminfo->ai_batt_time = time; -+ } -+ else if (charging && rate > 0) { -+ apminfo->ai_batt_time = (int) ((acpiinfo->max_capacity-remain)/(float)rate); -+ } -+ else -+ apminfo->ai_batt_time = -1; -+ -+ return TRUE; -+} -+#endif ---- battstat/acpi-freebsd.h.orig Sun Jul 3 16:00:01 2005 -+++ battstat/acpi-freebsd.h Sun Jul 3 16:23:56 2005 -@@ -0,0 +1,60 @@ -+/* -+ * Copyright (C) 2004 by Joe Marcus Clarke <marcus@FreeBSD.org> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef __ACPI_FREEBSD_H__ -+#define __ACPI_FREEBSD_H__ -+ -+#define ACPIDEV "/dev/acpi" -+ -+#define BATT_MIN 0 -+#define BATT_MAX 64 -+ -+#define ACPI_ACLINE "hw.acpi.acline" -+#define ACPI_TIME "hw.acpi.battery.time" -+#define ACPI_LIFE "hw.acpi.battery.life" -+#define ACPI_STATE "hw.acpi.battery.state" -+ -+/* XXX: AMD64 does not have machine/apm_bios.h. */ -+#if !defined(__i386__) -+struct apm_info { -+ guint ai_acline; -+ guint ai_batt_stat; -+ guint ai_batt_life; -+ int ai_batt_time; -+ guint ai_status; -+}; -+#endif -+ -+struct acpi_info { -+ gboolean ac_online; -+ gboolean event_inited; -+ int acpifd; -+ int event_fd; -+ int max_capacity; -+ int low_capacity; -+ int critical_capacity; -+ GIOChannel * channel; -+}; -+ -+gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo); -+void acpi_freebsd_update(struct acpi_info * acpiinfo); -+gboolean acpi_process_event(struct acpi_info * acpiinfo, gboolean *read_error); -+gboolean acpi_freebsd_init(struct acpi_info * acpiinfo); -+void acpi_freebsd_cleanup(struct acpi_info * acpiinfo); -+ -+#endif /* __ACPI_FREEBSD_H__ */ ---- battstat/power-management.c.orig Sun Mar 20 05:20:55 2005 -+++ battstat/power-management.c Sun Jul 3 16:21:42 2005 -@@ -73,12 +73,42 @@ static int pm_initialised; - * the problem might be. This error message is not to be freed. - */ - --#ifdef __FreeBSD__ -- -+#if defined(__FreeBSD__) -+#if defined(__i386__) - #include <machine/apm_bios.h> -+#endif -+#include "acpi-freebsd.h" -+ -+static struct acpi_info acpiinfo; -+static gboolean using_acpi; -+static int acpi_count; -+static int acpiwatch; -+static struct apm_info apminfo; -+ -+gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info *acpiinfo); - - #define APMDEVICE "/dev/apm" - -+static gboolean acpi_callback (GIOChannel * chan, GIOCondition cond, gpointer data) -+{ -+ gboolean read_error; -+ -+ if (cond & (G_IO_ERR | G_IO_HUP)) { -+ acpi_freebsd_cleanup(&acpiinfo); -+ return FALSE; -+ } -+ -+ if (acpi_process_event(&acpiinfo, &read_error)) { -+ acpi_freebsd_read(&apminfo, &acpiinfo); -+ } -+ else if (read_error) { -+ acpi_freebsd_cleanup(&acpiinfo); -+ return FALSE; -+ } -+ -+ return TRUE; -+} -+ - static const char * - apm_readinfo (BatteryStatus *status) - { -@@ -86,32 +116,56 @@ apm_readinfo (BatteryStatus *status) - FreeBSD. Each time this functions is called (once every second) - the APM device is opened, read from and then closed. - */ -- struct apm_info apminfo; - int fd; - - if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n"); - -- fd = open(APMDEVICE, O_RDONLY); -- if (fd == -1) -- { -- pm_initialised = 0; -- return ERR_OPEN_APMDEV; -+ if (using_acpi && (!acpiinfo.event_inited || acpiinfo.event_fd >= 0)) { -+ if (acpi_count <= 0) { -+ acpi_count = 30; -+ if (!acpiinfo.event_inited) { -+ acpi_freebsd_update(&acpiinfo); -+ } -+ acpi_freebsd_read(&apminfo, &acpiinfo); -+ } -+ acpi_count--; -+ } -+ else if (using_acpi && acpiinfo.event_inited) { -+ if (acpi_freebsd_init(&acpiinfo)) { -+ acpiwatch = g_io_add_watch (acpiinfo.channel, -+ G_IO_IN | G_IO_ERR | G_IO_HUP, -+ acpi_callback, NULL); -+ acpi_freebsd_read(&apminfo, &acpiinfo); -+ } - } -+ else { -+#if defined(__i386__) -+ fd = open(APMDEVICE, O_RDONLY); -+ if (fd == -1) { -+ return ERR_OPEN_APMDEV; -+ } - -- if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1) -- err(1, "ioctl(APMIO_GETINFO)"); -+ if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1) -+ err(1, "ioctl(APMIO_GETINFO)"); - -- close(fd); -+ close(fd); - -- if(apminfo.ai_status == 0) -- return ERR_APM_E; -+ if(apminfo.ai_status == 0) -+ return ERR_APM_E; -+#else -+ return ERR_OPEN_APMDEV; -+#endif -+ } - - status->present = TRUE; - status->on_ac_power = apminfo.ai_acline ? 1 : 0; - status->state = apminfo.ai_batt_stat; - status->percent = apminfo.ai_batt_life; - status->charging = (status->state == 3) ? TRUE : FALSE; -- status->minutes = apminfo.ai_batt_time; -+ if (using_acpi) -+ status->minutes = apminfo.ai_batt_time; -+ else -+ status->minutes = (int) (apminfo.ai_batt_time/60.0); - - return NULL; - } -@@ -339,6 +393,19 @@ power_management_initialise( void ) - G_IO_IN | G_IO_ERR | G_IO_HUP, - acpi_callback, NULL); - } -+#elif defined(__FreeBSD__) -+ if (acpi_freebsd_init(&acpiinfo)) { -+ using_acpi = TRUE; -+ acpi_count = 0; -+ } -+ else -+ using_acpi = FALSE; -+ -+ if (using_acpi && acpiinfo.event_fd >= 0) { -+ acpiwatch = g_io_add_watch (acpiinfo.channel, -+ G_IO_IN | G_IO_ERR | G_IO_HUP, -+ acpi_callback, NULL); -+ } - #endif - pm_initialised = 1; - -@@ -360,6 +427,13 @@ power_management_cleanup( void ) - g_source_remove(acpiwatch); - acpiwatch = 0; - acpi_linux_cleanup(&acpiinfo); -+ } -+#elif defined(__FreeBSD__) -+ if (using_acpi) { -+ if (acpiwatch != 0) -+ g_source_remove(acpiwatch); -+ acpiwatch = 0; -+ acpi_freebsd_cleanup(&acpiinfo); - } - #endif - diff --git a/x11/gnome-applets/files/patch-battstat_acpi-freebsd.c b/x11/gnome-applets/files/patch-battstat_acpi-freebsd.c new file mode 100644 index 000000000000..48746fa03bbd --- /dev/null +++ b/x11/gnome-applets/files/patch-battstat_acpi-freebsd.c @@ -0,0 +1,152 @@ +--- battstat/acpi-freebsd.c.orig Sun Jul 3 16:41:26 2005 ++++ battstat/acpi-freebsd.c Sun Jul 3 16:49:55 2005 +@@ -31,9 +31,13 @@ + + #include <stdio.h> + #include <sys/types.h> ++#include <sys/socket.h> + #include <sys/sysctl.h> ++#include <sys/un.h> + #include <sys/ioctl.h> ++#if defined(__i386__) + #include <machine/apm_bios.h> ++#endif + #include <stdlib.h> + #include <errno.h> + #include <unistd.h> +@@ -92,16 +96,36 @@ gboolean + acpi_freebsd_init(struct acpi_info * acpiinfo) + { + int acpi_fd; ++ int event_fd; + + g_assert(acpiinfo); + +- acpi_fd = open(ACPIDEV, O_RDONLY); +- if (acpi_fd >= 0) { +- acpiinfo->acpifd = acpi_fd; ++ if (acpiinfo->acpifd == -1) { ++ acpi_fd = open(ACPIDEV, O_RDONLY); ++ if (acpi_fd >= 0) { ++ acpiinfo->acpifd = acpi_fd; ++ } ++ else { ++ acpiinfo->acpifd = -1; ++ return FALSE; ++ } + } +- else { +- acpiinfo->acpifd = -1; +- return FALSE; ++ ++ event_fd = socket(PF_UNIX, SOCK_STREAM, 0); ++ if (event_fd >= 0) { ++ struct sockaddr_un addr; ++ addr.sun_family = AF_UNIX; ++ strcpy(addr.sun_path, "/var/run/devd.pipe"); ++ if (connect(event_fd, (struct sockaddr *) &addr, sizeof(addr)) == 0) { ++ acpiinfo->event_fd = event_fd; ++ acpiinfo->event_inited = TRUE; ++ acpiinfo->channel = g_io_channel_unix_new(event_fd); ++ } ++ else { ++ close(event_fd); ++ acpiinfo->event_fd = -1; ++ acpiinfo->event_inited = FALSE; ++ } + } + + update_battery_info(acpiinfo); +@@ -110,6 +134,65 @@ acpi_freebsd_init(struct acpi_info * acp + return TRUE; + } + ++#define ACPI_EVENT_IGNORE 0 ++#define ACPI_EVENT_AC 1 ++#define ACPI_EVENT_BATTERY_INFO 2 ++ ++static int parse_acpi_event(GString *buffer) ++{ ++ if (strstr(buffer->str, "system=ACPI")) { ++ if (strstr(buffer->str, "subsystem=ACAD")) ++ return ACPI_EVENT_AC; ++ if (strstr(buffer->str, "subsystem=CMBAT")) ++ return ACPI_EVENT_BATTERY_INFO; ++ } ++ ++ return ACPI_EVENT_IGNORE; ++} ++ ++void acpi_freebsd_update(struct acpi_info *acpiinfo) ++{ ++ /* XXX This is needed for systems where devd does not have permissions ++ * to allow for event-driven updates. ++ */ ++ update_ac_info(acpiinfo); ++ update_battery_info(acpiinfo); ++} ++ ++gboolean acpi_process_event(struct acpi_info *acpiinfo, gboolean *read_error) ++{ ++ gsize i; ++ int evt; ++ gboolean result = FALSE; ++ GString *buffer; ++ GIOStatus stat; ++ buffer = g_string_new(NULL); ++ ++ *read_error = FALSE; ++ stat = g_io_channel_read_line_string(acpiinfo->channel, buffer, &i, NULL); ++ ++ if (stat == G_IO_STATUS_ERROR || stat == G_IO_STATUS_EOF) { ++ *read_error = TRUE; ++ g_string_free(buffer, TRUE); ++ return FALSE; ++ } ++ ++ evt = parse_acpi_event(buffer); ++ switch (evt) { ++ case ACPI_EVENT_AC: ++ update_ac_info(acpiinfo); ++ result = TRUE; ++ break; ++ case ACPI_EVENT_BATTERY_INFO: ++ update_battery_info(acpiinfo); ++ result = TRUE; ++ break; ++ } ++ ++ g_string_free(buffer, TRUE); ++ return result; ++} ++ + void + acpi_freebsd_cleanup(struct acpi_info * acpiinfo) + { +@@ -119,21 +202,12 @@ acpi_freebsd_cleanup(struct acpi_info * + close(acpiinfo->acpifd); + acpiinfo->acpifd = -1; + } +-} + +-/* XXX This is a hack since user-land applications can't get ACPI events yet. +- * Devd provides this (or supposedly provides this), but you need to be +- * root to access devd. +- */ +-gboolean +-acpi_process_event(struct acpi_info * acpiinfo) +-{ +- g_assert(acpiinfo); +- +- update_ac_info(acpiinfo); +- update_battery_info(acpiinfo); +- +- return TRUE; ++ if (acpiinfo->event_fd >= 0) { ++ g_io_channel_unref(acpiinfo->channel); ++ close(acpiinfo->event_fd); ++ acpiinfo->event_fd = -1; ++ } + } + + gboolean diff --git a/x11/gnome-applets/files/patch-battstat_acpi-freebsd.h b/x11/gnome-applets/files/patch-battstat_acpi-freebsd.h new file mode 100644 index 000000000000..918cd59eb241 --- /dev/null +++ b/x11/gnome-applets/files/patch-battstat_acpi-freebsd.h @@ -0,0 +1,78 @@ +--- battstat/acpi-freebsd.h.orig Sun Jul 3 16:50:22 2005 ++++ battstat/acpi-freebsd.h Sun Jul 3 16:54:14 2005 +@@ -29,61 +29,31 @@ + #define ACPI_LIFE "hw.acpi.battery.life" + #define ACPI_STATE "hw.acpi.battery.state" + +-struct acpi_info { +- gboolean ac_online; +- int acpifd; +- int max_capacity; +- int low_capacity; +- int critical_capacity; ++/* XXX: AMD64 does not have machine/apm_bios.h. */ ++#if !defined(__i386__) ++struct apm_info { ++ guint ai_acline; ++ guint ai_batt_stat; ++ guint ai_batt_life; ++ int ai_batt_time; ++ guint ai_status; + }; +- +-gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo); +-gboolean acpi_process_event(struct acpi_info * acpiinfo); +-gboolean acpi_freebsd_init(struct acpi_info * acpiinfo); +-void acpi_freebsd_cleanup(struct acpi_info * acpiinfo); +- +-#endif /* __ACPI_FREEBSD_H__ */ +-/* +- * Copyright (C) 2004 by Joe Marcus Clarke <marcus@FreeBSD.org> +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2 of the License, or +- * (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. +- */ +- +-#ifndef __ACPI_FREEBSD_H__ +-#define __ACPI_FREEBSD_H__ +- +-#define ACPIDEV "/dev/acpi" +- +-#define BATT_MIN 0 +-#define BATT_MAX 64 +- +-#define ACPI_ACLINE "hw.acpi.acline" +-#define ACPI_TIME "hw.acpi.battery.time" +-#define ACPI_LIFE "hw.acpi.battery.life" +-#define ACPI_STATE "hw.acpi.battery.state" ++#endif + + struct acpi_info { + gboolean ac_online; ++ gboolean event_inited; + int acpifd; ++ int event_fd; + int max_capacity; + int low_capacity; + int critical_capacity; ++ GIOChannel * channel; + }; + + gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo); +-gboolean acpi_process_event(struct acpi_info * acpiinfo); ++void acpi_freebsd_update(struct acpi_info * acpiinfo); ++gboolean acpi_process_event(struct acpi_info * acpiinfo, gboolean *read_error); + gboolean acpi_freebsd_init(struct acpi_info * acpiinfo); + void acpi_freebsd_cleanup(struct acpi_info * acpiinfo); + diff --git a/x11/gnome-applets/files/patch-battstat_battstat.schemas.in b/x11/gnome-applets/files/patch-battstat_battstat.schemas.in deleted file mode 100644 index a6bed2361540..000000000000 --- a/x11/gnome-applets/files/patch-battstat_battstat.schemas.in +++ /dev/null @@ -1,11 +0,0 @@ ---- battstat/battstat.schemas.in.orig Fri Oct 1 16:22:39 2004 -+++ battstat/battstat.schemas.in Fri Oct 1 16:22:46 2004 -@@ -115,7 +115,7 @@ - <key>/schemas/apps/battstat-applet/prefs/suspend_command</key> - <owner>battstat-applet</owner> - <type>string</type> -- <default>/usr/bin/apm -s</default> -+ <default>/usr/sbin/zzz</default> - <locale name="C"> - <short>Suspend Command</short> - <long>Command to send to suspend the computer</long> diff --git a/x11/gnome-applets/files/patch-battstat_battstat_applet.c b/x11/gnome-applets/files/patch-battstat_battstat_applet.c new file mode 100644 index 000000000000..a95b7b569a09 --- /dev/null +++ b/x11/gnome-applets/files/patch-battstat_battstat_applet.c @@ -0,0 +1,21 @@ +--- battstat/battstat_applet.c.orig Fri Aug 19 22:13:49 2005 ++++ battstat/battstat_applet.c Tue Aug 23 20:37:13 2005 +@@ -430,14 +430,14 @@ battery_full_notify (GtkWidget *applet) + static void + battery_full_dialog (GtkWidget *applet) + { +- /* first attempt to use libnotify */ +- if (battery_full_notify (applet)) +- return; +- + GtkWidget *dialog, *hbox, *image, *label; + GdkPixbuf *pixbuf; + + gchar *new_label; ++ /* first attempt to use libnotify */ ++ if (battery_full_notify (applet)) ++ return; ++ + dialog = gtk_dialog_new_with_buttons ( + _("Battery Notice"), + NULL, diff --git a/x11/gnome-applets/files/patch-battstat_power-management.c b/x11/gnome-applets/files/patch-battstat_power-management.c new file mode 100644 index 000000000000..9cea2d65b8fb --- /dev/null +++ b/x11/gnome-applets/files/patch-battstat_power-management.c @@ -0,0 +1,123 @@ +--- battstat/power-management.c.orig Thu Aug 25 23:45:47 2005 ++++ battstat/power-management.c Tue Aug 30 01:28:40 2005 +@@ -61,9 +61,7 @@ + + static const char *apm_readinfo (BatteryStatus *status); + static int pm_initialised; +-#ifdef HAVE_HAL +-static int using_hal; +-#endif ++static int using_hal = FALSE; + + /* + * What follows is a series of platform-specific apm_readinfo functions +@@ -173,16 +171,40 @@ apm_readinfo (BatteryStatus *status) + + #elif __FreeBSD__ + ++#if defined(__i386__) + #include <machine/apm_bios.h> ++#endif + #include "acpi-freebsd.h" + + static struct acpi_info acpiinfo; + static gboolean using_acpi; + static int acpi_count; ++static int acpiwatch; + static struct apm_info apminfo; + ++gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info *acpiinfo); ++ + #define APMDEVICE "/dev/apm" + ++static gboolean acpi_callback (GIOChannel * chan, GIOCondition cond, gpointer data) ++{ ++ gboolean read_error; ++ if (cond & (G_IO_ERR | G_IO_HUP)) { ++ acpi_freebsd_cleanup(&acpiinfo); ++ return FALSE; ++ } ++ ++ if (acpi_process_event(&acpiinfo, &read_error)) { ++ acpi_freebsd_read(&apminfo, &acpiinfo); ++ } ++ else if (read_error) { ++ acpi_freebsd_cleanup(&acpiinfo); ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ + static const char * + apm_readinfo (BatteryStatus *status) + { +@@ -190,21 +212,27 @@ apm_readinfo (BatteryStatus *status) + + if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n"); + +- if (using_acpi) { ++ if (using_acpi && (!acpiinfo.event_inited || acpiinfo.event_fd >= 0)) { + if (acpi_count <= 0) { + acpi_count = 30; +- acpi_process_event(&acpiinfo); ++ if (!acpiinfo.event_inited) { ++ acpi_freebsd_update(&acpiinfo); ++ } + if (acpi_freebsd_read(&apminfo, &acpiinfo) == FALSE) + return ERR_FREEBSD_ACPI; + } + acpi_count--; + } +- else +- { +- /* This is how I read the information from the APM subsystem under +- FreeBSD. Each time this functions is called (once every second) +- the APM device is opened, read from and then closed. +- */ ++ else if (using_acpi && acpiinfo.event_inited) { ++ if (acpi_freebsd_init(&acpiinfo)) { ++ acpiwatch = g_io_add_watch (acpiinfo.channel, ++ G_IO_IN | G_IO_ERR | G_IO_HUP, ++ acpi_callback, NULL); ++ acpi_freebsd_read(&apminfo, &acpiinfo); ++ } ++ } ++ else { ++#if defined(__i386__) + fd = open(APMDEVICE, O_RDONLY); + if (fd == -1) { + return ERR_OPEN_APMDEV; +@@ -217,6 +245,9 @@ apm_readinfo (BatteryStatus *status) + + if(apminfo.ai_status == 0) + return ERR_APM_E; ++#else ++ return ERR_OPEN_APMDEV; ++#endif + } + + status->present = TRUE; +@@ -480,6 +511,12 @@ power_management_initialise( int no_hal + } + else + using_acpi = FALSE; ++ ++ if (using_acpi && acpiinfo.event_fd >= 0) { ++ acpiwatch = g_io_add_watch (acpiinfo.channel, ++ G_IO_IN | G_IO_ERR | G_IO_HUP, ++ acpi_callback, NULL); ++ } + #endif + pm_initialised = 1; + +@@ -513,6 +550,9 @@ power_management_cleanup( void ) + } + #elif defined(__FreeBSD__) + if (using_acpi) { ++ if (acpiwatch != 0) ++ g_source_remove(acpiwatch); ++ acpiwatch = 0; + acpi_freebsd_cleanup(&acpiinfo); + } + #endif diff --git a/x11/gnome-applets/files/patch-cpufreq-freebsd b/x11/gnome-applets/files/patch-cpufreq-freebsd index 48f2ebb6c5b1..4bed0298db89 100644 --- a/x11/gnome-applets/files/patch-cpufreq-freebsd +++ b/x11/gnome-applets/files/patch-cpufreq-freebsd @@ -1,37 +1,3 @@ ---- cpufreq/src/Makefile.in.orig Sun Feb 13 01:00:35 2005 -+++ cpufreq/src/Makefile.in Sun Feb 13 01:01:31 2005 -@@ -55,6 +55,7 @@ - cpufreq-prefs.$(OBJEXT) cpufreq-popup.$(OBJEXT) \ - cpufreq-monitor.$(OBJEXT) cpufreq-monitor-factory.$(OBJEXT) \ - cpufreq-monitor-procfs.$(OBJEXT) \ -+ cpufreq-monitor-sysctl.$(OBJEXT) \ - cpufreq-monitor-sysfs.$(OBJEXT) \ - cpufreq-monitor-cpuinfo.$(OBJEXT) - cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS) -@@ -68,6 +69,7 @@ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-factory.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-procfs.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysctl.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysfs.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-popup.Po \ -@@ -336,6 +338,7 @@ - cpufreq-monitor-protected.h \ - cpufreq-monitor-factory.c cpufreq-monitor-factory.h \ - cpufreq-monitor-procfs.c cpufreq-monitor-procfs.h \ -+ cpufreq-monitor-sysctl.c cpufreq-monitor-sysctl.h \ - cpufreq-monitor-sysfs.c cpufreq-monitor-sysfs.h \ - cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h - -@@ -419,6 +422,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysctl.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysfs.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-popup.Po@am__quote@ --- cpufreq/src/cpufreq-monitor-sysctl.h.orig Sun Feb 13 01:00:25 2005 +++ cpufreq/src/cpufreq-monitor-sysctl.h Sat Feb 12 20:25:21 2005 @@ -0,0 +1,48 @@ @@ -83,111 +49,6 @@ +CPUFreqMonitor *cpufreq_monitor_sysctl_new (guint cpu); + +#endif /* __CPUFREQ_MONITOR_SYSCTL_H__ */ ---- cpufreq/src/cpufreq-monitor-cpuinfo.c.orig Fri Dec 31 14:39:04 2004 -+++ cpufreq/src/cpufreq-monitor-cpuinfo.c Sun Feb 13 23:58:38 2005 -@@ -22,6 +22,10 @@ - #include <glib/gi18n.h> - #include <libgnomevfs/gnome-vfs.h> - -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <sys/sysctl.h> -+#endif /* __FreeBSD__ */ - #include <string.h> - - #include "cpufreq-monitor-cpuinfo.h" -@@ -102,6 +106,7 @@ - static gboolean - cpufreq_monitor_cpuinfo_get (gpointer gdata) - { -+#ifndef __FreeBSD__ - GnomeVFSHandle *handle; - GnomeVFSFileSize bytes_read; - GnomeVFSResult result; -@@ -109,6 +114,9 @@ - gchar **lines; - gchar buffer[256]; - gchar *p; -+#else -+ size_t len; -+#endif /* __FreeBSD__ */ - gchar *freq, *perc, *unit, *governor; - gint cpu, i; - CPUFreqMonitorCPUInfo *monitor; -@@ -118,6 +126,7 @@ - - private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor)); - -+#ifndef __FreeBSD__ - uri = gnome_vfs_get_uri_from_local_path ("/proc/cpuinfo"); - - result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ); -@@ -178,6 +187,12 @@ - - g_strfreev (lines); - g_free (file); -+#else -+ len = sizeof (cpu); -+ -+ if (sysctlbyname ("hw.clockrate", &cpu, &len, NULL, 0) == -1) -+ return FALSE; -+#endif /* __FreeBSD__ */ - - governor = g_strdup (_("Frequency Scaling Unsupported")); - freq = parent_class->get_human_readable_freq (cpu * 1000); /* kHz are expected*/ ---- cpufreq/src/cpufreq-monitor-factory.c.orig Mon Dec 27 12:53:46 2004 -+++ cpufreq/src/cpufreq-monitor-factory.c Sun Feb 13 23:58:44 2005 -@@ -16,13 +16,21 @@ - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Authors : Carlos García Campos <carlosgc@gnome.org> -+ * Joe Marcus Clarke <marcus@FreeBSD.org> - */ - - #include <glib.h> -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <sys/sysctl.h> -+#endif /* __FreeBSD__ */ - - #include "cpufreq-applet.h" - #include "cpufreq-monitor-sysfs.h" - #include "cpufreq-monitor-procfs.h" -+#ifdef __FreeBSD__ -+#include "cpufreq-monitor-sysctl.h" -+#endif /* __FreeBSD__ */ - #include "cpufreq-monitor-cpuinfo.h" - #include "cpufreq-monitor-factory.h" - -@@ -30,6 +38,7 @@ - cpufreq_monitor_factory_create_monitor (guint cpu) - { - CPUFreqMonitor *monitor = NULL; -+#ifndef __FreeBSD__ - - if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ - monitor = cpufreq_monitor_sysfs_new (cpu); -@@ -48,6 +57,20 @@ - - monitor = cpufreq_monitor_cpuinfo_new (cpu); - } -+#else -+ size_t len; -+ -+ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { -+ monitor = cpufreq_monitor_sysctl_new (cpu); -+ } else { -+ cpufreq_applet_display_error (_("CPU frequency scaling unsupported"), -+ _("You will not be able to modify the frequency of your machine. " -+ "Your machine may be misconfigured or not have hardware support " -+ "for CPU frequency scaling.")); -+ -+ monitor = cpufreq_monitor_cpuinfo_new (cpu); -+ } -+#endif /* __FreeBSD__ */ - - return monitor; - } --- cpufreq/src/cpufreq-monitor-sysctl.c.orig Sun Feb 13 03:52:42 2005 +++ cpufreq/src/cpufreq-monitor-sysctl.c Mon Feb 14 00:42:07 2005 @@ -0,0 +1,269 @@ @@ -460,9 +321,114 @@ + return private->available_freqs; +} +#endif /* __FreeBSD__ */ ---- cpufreq/src/cpufreq-applet.c.orig Fri Jan 14 23:38:20 2005 -+++ cpufreq/src/cpufreq-applet.c Mon Feb 14 00:47:36 2005 -@@ -16,6 +16,7 @@ +--- cpufreq/src/cpufreq-monitor-factory.c.orig Thu Apr 14 12:11:06 2005 ++++ cpufreq/src/cpufreq-monitor-factory.c Sun Jul 3 17:09:15 2005 +@@ -17,13 +17,21 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Authors : Carlos García Campos <carlosgc@gnome.org> ++ * Joe Marcus Clarke <marcus@FreeBSD.org> + */ + + #include <glib.h> ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#include <sys/sysctl.h> ++#endif /* __FreeBSD__ */ + + #include "cpufreq-applet.h" + #include "cpufreq-monitor-sysfs.h" + #include "cpufreq-monitor-procfs.h" ++#ifdef __FreeBSD__ ++#include "cpufreq-monitor-sysctl.h" ++#endif /* __FreeBSD__ */ + #include "cpufreq-monitor-cpuinfo.h" + #include "cpufreq-monitor-factory.h" + +@@ -31,6 +39,7 @@ CPUFreqMonitor * + cpufreq_monitor_factory_create_monitor (guint cpu) + { + CPUFreqMonitor *monitor = NULL; ++#ifndef __FreeBSD__ + + if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ + monitor = cpufreq_monitor_sysfs_new (cpu); +@@ -49,6 +58,20 @@ cpufreq_monitor_factory_create_monitor ( + + monitor = cpufreq_monitor_cpuinfo_new (cpu); + } ++#else ++ size_t len; ++ ++ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { ++ monitor = cpufreq_monitor_sysctl_new (cpu); ++ } else { ++ cpufreq_applet_display_error (_("CPU frequency scaling unsupported"), ++ _("You will not be able to modify the frequency of your machine. " ++ "Your machine may be misconfigured or not have hardware support " ++ "for CPU frequency scaling.")); ++ ++ monitor = cpufreq_monitor_cpuinfo_new (cpu); ++ } ++#endif /* __FreeBSD__ */ + + return monitor; + } +--- cpufreq/src/cpufreq-monitor-cpuinfo.c.orig Thu Apr 14 12:11:06 2005 ++++ cpufreq/src/cpufreq-monitor-cpuinfo.c Sun Jul 3 17:07:16 2005 +@@ -23,6 +23,10 @@ + #include <glib/gi18n.h> + #include <libgnomevfs/gnome-vfs.h> + ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#include <sys/sysctl.h> ++#endif /* __FreeBSD__ */ + #include <string.h> + #include <stdio.h> + +@@ -104,6 +108,7 @@ cpufreq_monitor_cpuinfo_new (guint cpu) + static gboolean + cpufreq_monitor_cpuinfo_get (gpointer gdata) + { ++#ifndef __FreeBSD__ + GnomeVFSHandle *handle; + GnomeVFSFileSize bytes_read; + GnomeVFSResult result; +@@ -111,6 +116,9 @@ cpufreq_monitor_cpuinfo_get (gpointer gd + gchar **lines; + gchar buffer[256]; + gchar *p; ++#else ++ size_t len; ++#endif /* __FreeBSD__ */ + gchar *freq, *perc, *unit, *governor; + gint cpu, i; + CPUFreqMonitorCPUInfo *monitor; +@@ -120,6 +128,7 @@ cpufreq_monitor_cpuinfo_get (gpointer gd + + private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor)); + ++#ifndef __FreeBSD__ + uri = gnome_vfs_get_uri_from_local_path ("/proc/cpuinfo"); + + result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ); +@@ -180,6 +189,12 @@ cpufreq_monitor_cpuinfo_get (gpointer gd + + g_strfreev (lines); + g_free (file); ++#else ++ len = sizeof (cpu); ++ ++ if (sysctlbyname ("hw.clockrate", &cpu, &len, NULL, 0) == -1) ++ return FALSE; ++#endif /* __FreeBSD__ */ + + governor = g_strdup (_("Frequency Scaling Unsupported")); + freq = parent_class->get_human_readable_freq (cpu * 1000); /* kHz are expected*/ +--- cpufreq/src/cpufreq-applet.c.orig Thu Apr 14 12:11:06 2005 ++++ cpufreq/src/cpufreq-applet.c Sun Jul 3 17:28:43 2005 +@@ -17,6 +17,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * Authors : Carlos García Campos <carlosgc@gnome.org> @@ -470,7 +436,7 @@ */ #include <config.h> -@@ -25,6 +26,10 @@ +@@ -26,6 +27,10 @@ #include <panel-applet-gconf.h> #include <glade/glade.h> #include <glib/gi18n.h> @@ -481,34 +447,82 @@ #include <string.h> #include "cpufreq-applet.h" -@@ -192,6 +197,7 @@ +@@ -193,6 +198,7 @@ cpufreq_applet_about_cb (BonoboUICompone { - static const gchar *authors[] = { - "Carlos Garcia Campos <carlosgc@gnome.org>", -+ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD support)", - NULL - }; - static const gchar *documenters[] = { -@@ -231,6 +237,7 @@ - cpufreq_applet_get_max_cpu () + static const gchar *authors[] = { + "Carlos Garcia Campos <carlosgc@gnome.org>", ++ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD support)", + NULL + }; + static const gchar *documenters[] = { +@@ -233,6 +239,7 @@ static gint + cpufreq_applet_get_max_cpu (void) { - gint mcpu = -1; + gint mcpu = -1; +#ifndef __FreeBSD__ - gchar *file = NULL; + gchar *file = NULL; - do { -@@ -253,6 +260,14 @@ - } while (g_file_test (file, G_FILE_TEST_EXISTS)); - g_free (file); - mcpu --; + do { +@@ -242,11 +249,20 @@ cpufreq_applet_get_max_cpu (void) + } while (g_file_test (file, G_FILE_TEST_EXISTS)); + g_free (file); + mcpu --; +#else -+ size_t len; ++ size_t len; + -+ len = sizeof (mcpu); ++ len = sizeof (mcpu); + -+ sysctlbyname ("hw.ncpu", &mcpu, &len, NULL, 0); -+ mcpu --; ++ sysctlbyname ("hw.ncpu", &mcpu, &len, NULL, 0); ++ mcpu --; +#endif /* __FreeBSD__ */ - if (mcpu >= 0) - return mcpu; + if (mcpu >= 0) + return mcpu; + + mcpu = -1; ++#ifndef __FreeBSD__ + file = NULL; + do { + if (file) g_free (file); +@@ -255,6 +271,7 @@ cpufreq_applet_get_max_cpu (void) + } while (g_file_test (file, G_FILE_TEST_EXISTS)); + g_free (file); + mcpu --; ++#endif + + if (mcpu >= 0) + return mcpu; +--- cpufreq/src/Makefile.in.orig Tue Oct 4 00:11:26 2005 ++++ cpufreq/src/Makefile.in Tue Oct 4 00:20:37 2005 +@@ -57,6 +57,7 @@ + cpufreq-prefs.$(OBJEXT) cpufreq-popup.$(OBJEXT) \ + cpufreq-monitor.$(OBJEXT) cpufreq-monitor-factory.$(OBJEXT) \ + cpufreq-monitor-procfs.$(OBJEXT) \ ++ cpufreq-monitor-sysctl.$(OBJEXT) \ + cpufreq-monitor-sysfs.$(OBJEXT) \ + cpufreq-monitor-cpuinfo.$(OBJEXT) + cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS) +@@ -71,6 +72,7 @@ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-factory.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-procfs.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysfs.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysctl.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-popup.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-prefs.Po +@@ -358,6 +360,7 @@ + cpufreq-monitor-protected.h \ + cpufreq-monitor-factory.c cpufreq-monitor-factory.h \ + cpufreq-monitor-procfs.c cpufreq-monitor-procfs.h \ ++ cpufreq-monitor-sysctl.c cpufreq-monitor-sysctl.h \ + cpufreq-monitor-sysfs.c cpufreq-monitor-sysfs.h \ + cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h + +@@ -441,6 +444,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysctl.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysfs.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-popup.Po@am__quote@ diff --git a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd index f577a0fed39b..d25df35e2b5d 100644 --- a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd +++ b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd @@ -1,38 +1,3 @@ ---- cpufreq/src/cpufreq-selector/Makefile.in.orig Mon Feb 14 00:26:10 2005 -+++ cpufreq/src/cpufreq-selector/Makefile.in Mon Feb 14 00:26:58 2005 -@@ -53,7 +53,7 @@ - PROGRAMS = $(bin_PROGRAMS) - am_cpufreq_selector_OBJECTS = cpufreq.$(OBJEXT) \ - cpufreq-sysfs.$(OBJEXT) cpufreq-procfs.$(OBJEXT) \ -- main.$(OBJEXT) -+ cpufreq-sysctl.$(OBJEXT) main.$(OBJEXT) - cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS) - am__DEPENDENCIES_1 = - cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) -@@ -61,6 +61,7 @@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-procfs.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysctl.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysfs.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq.Po ./$(DEPDIR)/main.Po - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -310,6 +311,7 @@ - cpufreq.c cpufreq.h \ - cpufreq-sysfs.c cpufreq-sysfs.h \ - cpufreq-procfs.c cpufreq-procfs.h \ -+ cpufreq-sysctl.c cpufreq-sysctl.h \ - main.c - - cpufreq_selector_LDADD = $(CPUFREQ_SELECTOR_LIBS) -lpopt -@@ -385,6 +387,7 @@ - -rm -f *.tab.c - - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-procfs.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysctl.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysfs.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ --- cpufreq/src/cpufreq-selector/cpufreq-sysctl.h.orig Mon Feb 14 00:38:57 2005 +++ cpufreq/src/cpufreq-selector/cpufreq-sysctl.h Mon Feb 14 00:21:39 2005 @@ -0,0 +1,51 @@ @@ -87,52 +52,6 @@ +CPUFreqSysctl *cpufreq_sysctl_new (); + +#endif /* __CPUFREQ_SYSCTL_H__ */ ---- cpufreq/src/cpufreq-selector/main.c.orig Mon Feb 14 00:22:12 2005 -+++ cpufreq/src/cpufreq-selector/main.c Mon Feb 14 00:26:04 2005 -@@ -16,6 +16,7 @@ - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Authors : Carlos García Campos <carlosgc@gnome.org> -+ * Joe Marcus Clarke <marcus@FreeBSD.org> - */ - - #include <glib-object.h> -@@ -26,6 +27,9 @@ - #include "cpufreq.h" - #include "cpufreq-sysfs.h" - #include "cpufreq-procfs.h" -+#ifdef __FreeBSD__ -+#include "cpufreq-sysctl.h" -+#endif /* __FreeBSD__ */ - - gint - main (gint argc, gchar **argv) -@@ -35,6 +39,9 @@ - gulong frequency = 0; - poptContext ctx; - gint nextopt; -+#ifdef __FreeBSD__ -+ size_t len; -+#endif /* __FreeBSD__ */ - CPUFreq *cfq; - - struct poptOption options[] = { -@@ -76,10 +83,15 @@ - - poptFreeContext(ctx); - -+#ifndef __FreeBSD__ - if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ - cfq = CPUFREQ (cpufreq_sysfs_new ()); - } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */ - cfq = CPUFREQ (cpufreq_procfs_new ()); -+#else -+ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { -+ cfq = CPUFREQ (cpufreq_sysctl_new ()); -+#endif /* __FreeBSD __ */ - } else { - g_print ("No cpufreq support\n"); - return 1; --- cpufreq/src/cpufreq-selector/cpufreq-sysctl.c.orig Mon Feb 14 00:38:52 2005 +++ cpufreq/src/cpufreq-selector/cpufreq-sysctl.c Mon Feb 14 00:44:43 2005 @@ -0,0 +1,235 @@ @@ -371,3 +290,84 @@ + + g_free (governor); +} +--- cpufreq/src/cpufreq-selector/main.c.orig Sun Apr 3 12:03:13 2005 ++++ cpufreq/src/cpufreq-selector/main.c Sun Jul 3 17:16:19 2005 +@@ -17,6 +17,7 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Authors : Carlos García Campos <carlosgc@gnome.org> ++ * Joe Marcus Clarke <marcus@FreeBSD.org> + */ + + #include <glib-object.h> +@@ -26,6 +27,9 @@ + #include "cpufreq.h" + #include "cpufreq-sysfs.h" + #include "cpufreq-procfs.h" ++#ifdef __FreeBSD__ ++#include "cpufreq-sysctl.h" ++#endif /* __FreeBSD__ */ + + gint + main (gint argc, gchar **argv) +@@ -34,6 +38,9 @@ main (gint argc, gchar **argv) + static gint cpu = 0; + static gchar *governor = NULL; + static gulong frequency = 0; ++#ifdef __FreeBSD__ ++ size_t len; ++#endif /* __FreeBSD__ */ + GError *error = NULL; + CPUFreq *cfq; + +@@ -71,10 +78,15 @@ main (gint argc, gchar **argv) + + g_option_context_free (context); + ++#ifndef __FreeBSD__ + if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ + cfq = CPUFREQ (cpufreq_sysfs_new ()); + } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */ + cfq = CPUFREQ (cpufreq_procfs_new ()); ++#else ++ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { ++ cfq = CPUFREQ (cpufreq_sysctl_new ()); ++#endif /* __FreeBSD__ */ + } else { + g_print ("No cpufreq support\n"); + return 1; +--- cpufreq/src/cpufreq-selector/Makefile.in.orig Tue Oct 4 00:21:25 2005 ++++ cpufreq/src/cpufreq-selector/Makefile.in Tue Oct 4 00:27:54 2005 +@@ -55,7 +55,7 @@ + PROGRAMS = $(bin_PROGRAMS) + am_cpufreq_selector_OBJECTS = cpufreq.$(OBJEXT) \ + cpufreq-sysfs.$(OBJEXT) cpufreq-procfs.$(OBJEXT) \ +- main.$(OBJEXT) ++ cpufreq-sysctl.$(OBJEXT) main.$(OBJEXT) + cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS) + am__DEPENDENCIES_1 = + cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) +@@ -64,6 +64,7 @@ + am__depfiles_maybe = depfiles + @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-procfs.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysfs.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysctl.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq.Po ./$(DEPDIR)/main.Po + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -332,6 +333,7 @@ + cpufreq.c cpufreq.h \ + cpufreq-sysfs.c cpufreq-sysfs.h \ + cpufreq-procfs.c cpufreq-procfs.h \ ++ cpufreq-sysctl.c cpufreq-sysctl.h \ + main.c + + cpufreq_selector_LDADD = $(CPUFREQ_SELECTOR_LIBS) -lpopt +@@ -407,6 +409,7 @@ + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-procfs.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysctl.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysfs.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ diff --git a/x11/gnome-applets/files/patch-drivemount_drive-button.c b/x11/gnome-applets/files/patch-drivemount_drive-button.c new file mode 100644 index 000000000000..f26e3121ee4b --- /dev/null +++ b/x11/gnome-applets/files/patch-drivemount_drive-button.c @@ -0,0 +1,48 @@ +--- drivemount/drive-button.c.orig Tue Aug 23 05:16:27 2005 ++++ drivemount/drive-button.c Tue Aug 23 20:37:43 2005 +@@ -24,6 +24,7 @@ + # include <config.h> + #endif + ++#include <string.h> + #include "drive-button.h" + #include <glib/gi18n.h> + #include <gdk/gdkkeysyms.h> +@@ -710,11 +711,13 @@ run_command (DriveButton *self, const ch + + GList *volumes; + GnomeVFSVolume *volume; ++ char *uri; ++ char *mount_path; + + volumes = gnome_vfs_drive_get_mounted_volumes (self->drive); + volume = GNOME_VFS_VOLUME (volumes->data); +- char *uri = gnome_vfs_volume_get_activation_uri (volume); +- char *mount_path = gnome_vfs_get_local_path_from_uri (uri); ++ uri = gnome_vfs_volume_get_activation_uri (volume); ++ mount_path = gnome_vfs_get_local_path_from_uri (uri); + g_free (uri); + + gnome_vfs_drive_get_display_name (self->drive); +@@ -794,6 +797,11 @@ drive_button_ensure_popup (DriveButton * + char *display_name, *tmp, *label; + int action; + GtkWidget *item; ++ GList *volumes; ++ GnomeVFSVolume *volume = NULL; ++ GnomeVFSDeviceType volume_type; ++ GCallback callback; ++ const char *action_icon = GTK_STOCK_OPEN; + + if (self->popup_menu) return; + +@@ -869,8 +877,7 @@ drive_button_ensure_popup (DriveButton * + g_free (display_name); + display_name = tmp; + +- GCallback callback = G_CALLBACK (open_drive); +- const char *action_icon = GTK_STOCK_OPEN; ++ callback = G_CALLBACK (open_drive); + + switch (device_type) { + case GNOME_VFS_DEVICE_TYPE_VIDEO_DVD: diff --git a/x11/gnome-applets/files/patch-gswitchit_gswitchit-applet.c b/x11/gnome-applets/files/patch-gswitchit_gswitchit-applet.c new file mode 100644 index 000000000000..5abf18032f00 --- /dev/null +++ b/x11/gnome-applets/files/patch-gswitchit_gswitchit-applet.c @@ -0,0 +1,61 @@ +--- gswitchit/gswitchit-applet.c.orig Sun Aug 7 18:07:33 2005 ++++ gswitchit/gswitchit-applet.c Sun Aug 7 18:10:07 2005 +@@ -331,6 +331,10 @@ GSwitchItAppletPrepareDrawing (GSwitchIt + XklConfigItem configItem; + GtkWidget *align, *label; + static GHashTable *shortDescrs = NULL; ++ gpointer pcounter = NULL; ++ char *prevLayoutName = NULL; ++ char *labelTitle = NULL; ++ int counter = 0; + if (group == 0) + shortDescrs = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, NULL); +@@ -363,10 +367,6 @@ GSwitchItAppletPrepareDrawing (GSwitchIt + if (layoutName == NULL) + layoutName = g_strdup ("?"); + +- gpointer pcounter = NULL; +- char *prevLayoutName = NULL; +- char *labelTitle = NULL; +- int counter = 0; + if (g_hash_table_lookup_extended (shortDescrs, layoutName, + (gpointer*)&prevLayoutName, &pcounter)) + { +@@ -599,6 +599,13 @@ GSwitchItAppletCmdPreview (BonoboUICompo + groupsLevels, groupsLevels + 1, groupsLevels + 2, groupsLevels + 3 }; + XklState *xklState = XklGetCurrentState (); + gpointer p = g_hash_table_lookup (globals.previewDialogs, GINT_TO_POINTER (xklState->group)); ++#ifdef HAVE_XKB ++ GladeXML *gladeData; ++ GtkWidget *dialog; ++ GtkWidget *kbdraw; ++ XkbComponentNamesRec componentNames; ++ XklConfigRec xklData; ++#endif + if (p != NULL) + { + /* existing window */ +@@ -606,11 +613,10 @@ GSwitchItAppletCmdPreview (BonoboUICompo + return; + } + #ifdef HAVE_XKB +- GladeXML *gladeData = glade_xml_new (GNOME_GLADEDIR "/gswitchit.glade", "gswitchit_layout_view", NULL); +- GtkWidget *dialog = ++ gladeData = glade_xml_new (GNOME_GLADEDIR "/gswitchit.glade", "gswitchit_layout_view", NULL); ++ dialog = + glade_xml_get_widget (gladeData, "gswitchit_layout_view"); +- GtkWidget *kbdraw = keyboard_drawing_new (); +- XkbComponentNamesRec componentNames; ++ kbdraw = keyboard_drawing_new (); + + if (xklState->group >= 0 && + xklState->group < g_slist_length (globals.groupNames)) +@@ -624,7 +630,6 @@ GSwitchItAppletCmdPreview (BonoboUICompo + + keyboard_drawing_set_groups_levels (KEYBOARD_DRAWING (kbdraw), pGroupsLevels); + +- XklConfigRec xklData; + XklConfigRecInit (&xklData); + if (XklConfigGetFromServer (&xklData)) + { diff --git a/x11/gnome-applets/files/patch-gweather_weather.c b/x11/gnome-applets/files/patch-gweather_weather.c deleted file mode 100644 index cdc1921ab4c7..000000000000 --- a/x11/gnome-applets/files/patch-gweather_weather.c +++ /dev/null @@ -1,12 +0,0 @@ ---- gweather/weather.c.orig Tue Mar 1 04:34:33 2005 -+++ gweather/weather.c Tue Mar 1 12:36:54 2005 -@@ -20,7 +20,9 @@ - #include <string.h> - #include <ctype.h> - #include <math.h> -+#ifndef __FreeBSD__ - #include <values.h> -+#endif - - #ifdef __FreeBSD__ - #include <sys/types.h> diff --git a/x11/gnome-applets/files/patch-mixer_applet.c b/x11/gnome-applets/files/patch-mixer_applet.c new file mode 100644 index 000000000000..178c7d5a31a1 --- /dev/null +++ b/x11/gnome-applets/files/patch-mixer_applet.c @@ -0,0 +1,11 @@ +--- mixer/applet.c.orig Tue Oct 4 00:15:40 2005 ++++ mixer/applet.c Tue Oct 4 00:16:09 2005 +@@ -953,7 +953,7 @@ gnome_volume_applet_adjust_volume (GstMi + + volumes = g_new (gint, track->num_channels); + for (n = 0; n < track->num_channels; n++) +- volumes[n] = lrintf (volume); ++ volumes[n] = (int)rint (volume); + gst_mixer_set_volume (mixer, track, volumes); + g_free (volumes); + } diff --git a/x11/gnome-applets/files/patch-modemlights_modem-applet.c b/x11/gnome-applets/files/patch-modemlights_modem-applet.c deleted file mode 100644 index f4fb13717732..000000000000 --- a/x11/gnome-applets/files/patch-modemlights_modem-applet.c +++ /dev/null @@ -1,22 +0,0 @@ ---- modemlights/modem-applet.c.orig Fri Jan 14 00:06:52 2005 -+++ modemlights/modem-applet.c Fri Jan 14 00:08:28 2005 -@@ -24,12 +24,19 @@ - - #include <panel-applet.h> - #include <fcntl.h> -+#ifndef __FreeBSD__ - #include <pty.h> -+#endif - #include <sys/poll.h> - #include <sys/types.h> - #include <sys/wait.h> - #include <libxml/tree.h> - #include <glade/glade.h> -+#ifdef __FreeBSD__ -+#include <sys/ioctl.h> -+#include <termios.h> -+#include <libutil.h> -+#endif - - #include "modem-applet.h" - diff --git a/x11/gnome-applets/files/patch-stickynotes_stickynotes_applet_callbacks.c b/x11/gnome-applets/files/patch-stickynotes_stickynotes_applet_callbacks.c new file mode 100644 index 000000000000..718f52a0dd67 --- /dev/null +++ b/x11/gnome-applets/files/patch-stickynotes_stickynotes_applet_callbacks.c @@ -0,0 +1,18 @@ +--- stickynotes/stickynotes_applet_callbacks.c.orig Wed Jul 13 18:57:03 2005 ++++ stickynotes/stickynotes_applet_callbacks.c Wed Jul 13 18:57:13 2005 +@@ -153,6 +153,7 @@ gboolean applet_check_click_on_desktop_c + { + static Window desktop_window = 0; + static Display *dpy; ++ XEvent event; + + if (desktop_window == 0) { + desktop_window = get_desktop_window (); +@@ -162,7 +163,6 @@ gboolean applet_check_click_on_desktop_c + * at every click on the desktop */ + XSelectInput(dpy, desktop_window, PropertyChangeMask); + } +- XEvent event; + + if (XCheckWindowEvent(dpy, desktop_window, PropertyChangeMask, &event) == True) { + stickynote_show_notes (FALSE); diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist index 209107a6d038..cc8600d5da3c 100644 --- a/x11/gnome-applets/pkg-plist +++ b/x11/gnome-applets/pkg-plist @@ -34,16 +34,16 @@ libexec/gnome-keyboard-applet libexec/gtik2_applet2 libexec/gweather-applet-2 libexec/mini_commander_applet -libexec/modem_applet libexec/mixer_applet2 +libexec/modem_applet libexec/multiload-applet-2 libexec/null_applet libexec/stickynotes_applet libexec/trashapplet share/gnome/gnome-2.0/ui/GNOME_AccessxApplet.xml %%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml -share/gnome/gnome-2.0/ui/GNOME_CharpickerApplet.xml %%CPUFREQ%%share/gnome/gnome-2.0/ui/GNOME_CPUFreqApplet.xml +share/gnome/gnome-2.0/ui/GNOME_CharpickerApplet.xml share/gnome/gnome-2.0/ui/GNOME_DriveMountApplet.xml share/gnome/gnome-2.0/ui/GNOME_GSwitchItApplet.xml share/gnome/gnome-2.0/ui/GNOME_GWeatherApplet.xml @@ -53,8 +53,8 @@ share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml share/gnome/gnome-2.0/ui/GNOME_ModemLights.xml share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml -share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml share/gnome/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml +share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml share/gnome/gnome-applets/geyes/Bizarre/Bizarre-eye.png share/gnome/gnome-applets/geyes/Bizarre/Bizarre-pupil.png share/gnome/gnome-applets/geyes/Bizarre/config @@ -73,313 +73,160 @@ share/gnome/gnome-applets/geyes/Horrid/horrid_pupil.png %%BATTERY%%share/gnome/gnome-applets/glade/battstat_applet.glade %%CPUFREQ%%share/gnome/gnome-applets/glade/cpufreq-preferences.glade share/gnome/gnome-applets/glade/gswitchit-plugins.glade -share/gnome/gnome-applets/glade/gswitchit-properties.glade +share/gnome/gnome-applets/glade/gswitchit.glade share/gnome/gnome-applets/glade/mini-commander.glade share/gnome/gnome-applets/glade/modemlights.glade share/gnome/gnome-applets/glade/stickynotes.glade +share/gnome/gnome-applets/glade/trashapplet.glade share/gnome/gnome-applets/gweather/Locations.xml share/gnome/gnome-applets/gweather/locations.dtd share/gnome/help/accessx-status/C/accessx-status.xml share/gnome/help/accessx-status/C/figures/accessx-status-applet.png +share/gnome/help/accessx-status/C/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/C/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/C/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/C/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-windows-key.png share/gnome/help/accessx-status/C/legal.xml -share/gnome/help/accessx-status/eu/accessx-status.xml -share/gnome/help/accessx-status/eu/figures/accessx-status-applet.png -share/gnome/help/accessx-status/eu/legal.xml +share/gnome/help/accessx-status/es/accessx-status.xml +share/gnome/help/accessx-status/es/figures/accessx-status-applet.png +share/gnome/help/accessx-status/es/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/es/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/es/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/es/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-windows-key.png +share/gnome/help/accessx-status/fr/accessx-status.xml +share/gnome/help/accessx-status/fr/figures/accessx-status-applet.png +share/gnome/help/accessx-status/fr/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/fr/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/fr/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/fr/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-windows-key.png share/gnome/help/accessx-status/uk/accessx-status.xml share/gnome/help/accessx-status/uk/figures/accessx-status-applet.png -share/gnome/help/accessx-status/uk/legal.xml +share/gnome/help/accessx-status/uk/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/uk/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/uk/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/uk/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png %%BATTERY%%share/gnome/help/battstat/C/battstat.xml -%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-preferences.png -%%BATTERY%%share/gnome/help/battstat/C/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/C/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/C/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/C/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/C/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/C/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet-expanded.png %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/C/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/C/figures/warning_small.png +%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-credits-hal.png +%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-preferences.png +%%BATTERY%%share/gnome/help/battstat/C/figures/context-menu.png %%BATTERY%%share/gnome/help/battstat/C/legal.xml -%%BATTERY%%share/gnome/help/battstat/de/battstat.xml -%%BATTERY%%share/gnome/help/battstat/de/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/de/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/de/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/de/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/de/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/de/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/de/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/de/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/de/legal.xml %%BATTERY%%share/gnome/help/battstat/es/battstat.xml -%%BATTERY%%share/gnome/help/battstat/es/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/es/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/es/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/es/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/es/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/es/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet-expanded.png %%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/es/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/es/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/es/legal.xml -%%BATTERY%%share/gnome/help/battstat/eu/battstat.xml -%%BATTERY%%share/gnome/help/battstat/eu/figures/battstat-apperance.png -%%BATTERY%%share/gnome/help/battstat/eu/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/eu/figures/battstat-general.png -%%BATTERY%%share/gnome/help/battstat/eu/legal.xml -%%BATTERY%%share/gnome/help/battstat/fr/battstat.xml -%%BATTERY%%share/gnome/help/battstat/fr/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/fr/legal.xml -%%BATTERY%%share/gnome/help/battstat/it/battstat.xml -%%BATTERY%%share/gnome/help/battstat/it/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/it/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/it/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/it/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/it/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/it/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/it/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/it/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/it/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/it/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/it/legal.xml -%%BATTERY%%share/gnome/help/battstat/ja/battstat.xml -%%BATTERY%%share/gnome/help/battstat/ja/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/ja/legal.xml -%%BATTERY%%share/gnome/help/battstat/ko/battstat.xml -%%BATTERY%%share/gnome/help/battstat/ko/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/ko/legal.xml -%%BATTERY%%share/gnome/help/battstat/sv/battstat.xml -%%BATTERY%%share/gnome/help/battstat/sv/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/sv/legal.xml +%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-credits-hal.png +%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-preferences.png +%%BATTERY%%share/gnome/help/battstat/es/figures/context-menu.png %%BATTERY%%share/gnome/help/battstat/uk/battstat.xml -%%BATTERY%%share/gnome/help/battstat/uk/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet-expanded.png %%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-credits-hal.png %%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-preferences.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/uk/legal.xml -%%BATTERY%%share/gnome/help/battstat/zh_CN/battstat.xml -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/legal.xml -%%BATTERY%%share/gnome/help/battstat/zh_HK/battstat.xml -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/legal.xml -%%BATTERY%%share/gnome/help/battstat/zh_TW/battstat.xml -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/legal.xml +%%BATTERY%%share/gnome/help/battstat/uk/figures/context-menu.png share/gnome/help/char-palette/C/char-palette.xml share/gnome/help/char-palette/C/figures/charpalette_applet.png share/gnome/help/char-palette/C/figures/charpalette_chargroup.png -share/gnome/help/char-palette/C/figures/charpick_characters.png share/gnome/help/char-palette/C/figures/charpick-preferences.png +share/gnome/help/char-palette/C/figures/charpick_characters.png share/gnome/help/char-palette/C/legal.xml -share/gnome/help/char-palette/de/char-palette.xml -share/gnome/help/char-palette/de/figures/charpalette_applet.png -share/gnome/help/char-palette/de/figures/charpalette_chargroup.png -share/gnome/help/char-palette/de/figures/charpick_applet.png -share/gnome/help/char-palette/de/figures/charpick_characters.png -share/gnome/help/char-palette/de/figures/charpick_chargroup.png -share/gnome/help/char-palette/de/legal.xml share/gnome/help/char-palette/es/char-palette.xml share/gnome/help/char-palette/es/figures/charpalette_applet.png share/gnome/help/char-palette/es/figures/charpalette_chargroup.png -share/gnome/help/char-palette/es/figures/charpick_applet.png +share/gnome/help/char-palette/es/figures/charpick-preferences.png share/gnome/help/char-palette/es/figures/charpick_characters.png -share/gnome/help/char-palette/es/figures/charpick_chargroup.png -share/gnome/help/char-palette/es/legal.xml -share/gnome/help/char-palette/eu/char-palette.xml -share/gnome/help/char-palette/eu/figures/charpalette_applet.png -share/gnome/help/char-palette/eu/figures/charpalette_chargroup.png -share/gnome/help/char-palette/eu/figures/charpick_characters.png -share/gnome/help/char-palette/eu/legal.xml -share/gnome/help/char-palette/fr/char-palette.xml -share/gnome/help/char-palette/fr/figures/charpalette_applet.png -share/gnome/help/char-palette/fr/figures/charpalette_chargroup.png -share/gnome/help/char-palette/fr/figures/charpick_applet.png -share/gnome/help/char-palette/fr/figures/charpick_characters.png -share/gnome/help/char-palette/fr/figures/charpick_chargroup.png -share/gnome/help/char-palette/fr/legal.xml share/gnome/help/char-palette/it/char-palette.xml share/gnome/help/char-palette/it/figures/charpalette_applet.png share/gnome/help/char-palette/it/figures/charpalette_chargroup.png -share/gnome/help/char-palette/it/figures/charpick_applet.png +share/gnome/help/char-palette/it/figures/charpick-preferences.png share/gnome/help/char-palette/it/figures/charpick_characters.png -share/gnome/help/char-palette/it/figures/charpick_chargroup.png -share/gnome/help/char-palette/it/legal.xml -share/gnome/help/char-palette/ja/char-palette.xml -share/gnome/help/char-palette/ja/figures/charpalette_applet.png -share/gnome/help/char-palette/ja/legal.xml -share/gnome/help/char-palette/ko/char-palette.xml -share/gnome/help/char-palette/ko/figures/charpalette_applet.png -share/gnome/help/char-palette/ko/figures/charpalette_chargroup.png -share/gnome/help/char-palette/ko/figures/charpick_applet.png -share/gnome/help/char-palette/ko/figures/charpick_characters.png -share/gnome/help/char-palette/ko/figures/charpick_chargroup.png -share/gnome/help/char-palette/ko/legal.xml -share/gnome/help/char-palette/sv/char-palette.xml -share/gnome/help/char-palette/sv/figures/charpalette_applet.png -share/gnome/help/char-palette/sv/figures/charpalette_chargroup.png -share/gnome/help/char-palette/sv/figures/charpick_applet.png -share/gnome/help/char-palette/sv/figures/charpick_characters.png -share/gnome/help/char-palette/sv/figures/charpick_chargroup.png -share/gnome/help/char-palette/sv/legal.xml +share/gnome/help/char-palette/nl/char-palette.xml +share/gnome/help/char-palette/nl/figures/charpalette_applet.png +share/gnome/help/char-palette/nl/figures/charpalette_chargroup.png +share/gnome/help/char-palette/nl/figures/charpick-preferences.png +share/gnome/help/char-palette/nl/figures/charpick_characters.png +share/gnome/help/char-palette/pt_BR/char-palette.xml +share/gnome/help/char-palette/pt_BR/figures/charpalette_applet.png +share/gnome/help/char-palette/pt_BR/figures/charpalette_chargroup.png +share/gnome/help/char-palette/pt_BR/figures/charpick-preferences.png +share/gnome/help/char-palette/pt_BR/figures/charpick_characters.png share/gnome/help/char-palette/uk/char-palette.xml share/gnome/help/char-palette/uk/figures/charpalette_applet.png share/gnome/help/char-palette/uk/figures/charpalette_chargroup.png share/gnome/help/char-palette/uk/figures/charpick-preferences.png share/gnome/help/char-palette/uk/figures/charpick_characters.png -share/gnome/help/char-palette/uk/legal.xml -share/gnome/help/char-palette/zh_CN/char-palette.xml -share/gnome/help/char-palette/zh_CN/figures/charpalette_applet.png -share/gnome/help/char-palette/zh_CN/figures/charpalette_chargroup.png -share/gnome/help/char-palette/zh_CN/figures/charpick_applet.png -share/gnome/help/char-palette/zh_CN/figures/charpick_characters.png -share/gnome/help/char-palette/zh_CN/figures/charpick_chargroup.png -share/gnome/help/char-palette/zh_CN/legal.xml -share/gnome/help/char-palette/zh_HK/char-palette.xml -share/gnome/help/char-palette/zh_HK/figures/charpalette_applet.png -share/gnome/help/char-palette/zh_HK/figures/charpalette_chargroup.png -share/gnome/help/char-palette/zh_HK/legal.xml -share/gnome/help/char-palette/zh_TW/char-palette.xml -share/gnome/help/char-palette/zh_TW/figures/charpalette_applet.png -share/gnome/help/char-palette/zh_TW/figures/charpalette_chargroup.png -share/gnome/help/char-palette/zh_TW/figures/charpick_applet.png -share/gnome/help/char-palette/zh_TW/figures/charpick_characters.png -share/gnome/help/char-palette/zh_TW/figures/charpick_chargroup.png -share/gnome/help/char-palette/zh_TW/legal.xml share/gnome/help/command-line/C/command-line.xml share/gnome/help/command-line/C/figures/command-line.png share/gnome/help/command-line/C/figures/prefs-macros.png share/gnome/help/command-line/C/figures/prefs.png share/gnome/help/command-line/C/legal.xml -share/gnome/help/command-line/de/command-line.xml -share/gnome/help/command-line/de/figures/command-line.png -share/gnome/help/command-line/de/legal.xml share/gnome/help/command-line/es/command-line.xml share/gnome/help/command-line/es/figures/command-line.png -share/gnome/help/command-line/es/legal.xml -share/gnome/help/command-line/eu/command-line.xml -share/gnome/help/command-line/eu/figures/command-line.png -share/gnome/help/command-line/eu/legal.xml -share/gnome/help/command-line/fr/command-line.xml -share/gnome/help/command-line/fr/figures/command-line.png -share/gnome/help/command-line/fr/legal.xml -share/gnome/help/command-line/it/command-line.xml -share/gnome/help/command-line/it/figures/command-line.png -share/gnome/help/command-line/it/legal.xml -share/gnome/help/command-line/ja/command-line.xml -share/gnome/help/command-line/ja/figures/command-line.png -share/gnome/help/command-line/ja/legal.xml -share/gnome/help/command-line/ko/command-line.xml -share/gnome/help/command-line/ko/figures/command-line.png -share/gnome/help/command-line/ko/legal.xml -share/gnome/help/command-line/sv/command-line.xml -share/gnome/help/command-line/sv/figures/command-line.png -share/gnome/help/command-line/sv/legal.xml +share/gnome/help/command-line/es/figures/prefs-macros.png +share/gnome/help/command-line/es/figures/prefs.png +share/gnome/help/command-line/pt_BR/command-line.xml +share/gnome/help/command-line/pt_BR/figures/command-line.png +share/gnome/help/command-line/pt_BR/figures/prefs-macros.png +share/gnome/help/command-line/pt_BR/figures/prefs.png share/gnome/help/command-line/uk/command-line.xml share/gnome/help/command-line/uk/figures/command-line.png share/gnome/help/command-line/uk/figures/prefs-macros.png share/gnome/help/command-line/uk/figures/prefs.png -share/gnome/help/command-line/uk/legal.xml -share/gnome/help/command-line/zh_CN/command-line.xml -share/gnome/help/command-line/zh_CN/figures/command-line.png -share/gnome/help/command-line/zh_CN/legal.xml -share/gnome/help/command-line/zh_HK/command-line.xml -share/gnome/help/command-line/zh_HK/figures/command-line.png -share/gnome/help/command-line/zh_HK/legal.xml -share/gnome/help/command-line/zh_TW/command-line.xml -share/gnome/help/command-line/zh_TW/figures/command-line.png -share/gnome/help/command-line/zh_TW/legal.xml %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/cpufreq-applet.xml %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-100.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-25.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-50.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-75.png -%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-preferences-smp.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-selector-both.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/legal.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/cpufreq-applet.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-100.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-25.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-50.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-preferences-smp.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector-both.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/cpufreq-applet.xml %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-100.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-25.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-50.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-preferences-smp.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-selector-both.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-selector.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet.png -%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/legal.xml share/gnome/help/drivemount/C/drivemount.xml share/gnome/help/drivemount/C/figures/drivemount-applet_eject.png share/gnome/help/drivemount/C/figures/drivemount-applet_example.png @@ -387,184 +234,56 @@ share/gnome/help/drivemount/C/figures/drivemount-applet_mount.png share/gnome/help/drivemount/C/figures/drivemount-applet_open.png share/gnome/help/drivemount/C/figures/drivemount-applet_status.png share/gnome/help/drivemount/C/legal.xml -share/gnome/help/drivemount/de/drivemount.xml -share/gnome/help/drivemount/de/figures/drivemount-applet_window.png -share/gnome/help/drivemount/de/figures/drivemount_applet_all.png -share/gnome/help/drivemount/de/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/de/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/de/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/de/legal.xml share/gnome/help/drivemount/es/drivemount.xml -share/gnome/help/drivemount/es/figures/drivemount-applet_window.png -share/gnome/help/drivemount/es/figures/drivemount_applet_all.png -share/gnome/help/drivemount/es/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/es/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/es/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/es/legal.xml -share/gnome/help/drivemount/eu/drivemount.xml -share/gnome/help/drivemount/eu/figures/drivemount_applet_all.png -share/gnome/help/drivemount/eu/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/eu/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/eu/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/eu/legal.xml -share/gnome/help/drivemount/fr/drivemount.xml -share/gnome/help/drivemount/fr/figures/drivemount-applet_window.png -share/gnome/help/drivemount/fr/figures/drivemount_applet_all.png -share/gnome/help/drivemount/fr/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/fr/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/fr/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/fr/legal.xml +share/gnome/help/drivemount/es/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/es/figures/drivemount-applet_example.png +share/gnome/help/drivemount/es/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/es/figures/drivemount-applet_open.png +share/gnome/help/drivemount/es/figures/drivemount-applet_status.png share/gnome/help/drivemount/it/drivemount.xml -share/gnome/help/drivemount/it/figures/drivemount-applet_window.png -share/gnome/help/drivemount/it/figures/drivemount_applet_all.png -share/gnome/help/drivemount/it/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/it/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/it/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/it/legal.xml -share/gnome/help/drivemount/ja/drivemount.xml -share/gnome/help/drivemount/ja/figures/drivemount-applet_window.png -share/gnome/help/drivemount/ja/figures/drivemount_applet_all.png -share/gnome/help/drivemount/ja/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/ja/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/ja/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/ja/legal.xml -share/gnome/help/drivemount/ko/drivemount.xml -share/gnome/help/drivemount/ko/figures/drivemount-applet_window.png -share/gnome/help/drivemount/ko/figures/drivemount_applet_all.png -share/gnome/help/drivemount/ko/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/ko/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/ko/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/ko/legal.xml -share/gnome/help/drivemount/sv/drivemount.xml -share/gnome/help/drivemount/sv/figures/drivemount-applet_window.png -share/gnome/help/drivemount/sv/figures/drivemount_applet_all.png -share/gnome/help/drivemount/sv/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/sv/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/sv/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/sv/legal.xml +share/gnome/help/drivemount/it/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/it/figures/drivemount-applet_example.png +share/gnome/help/drivemount/it/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/it/figures/drivemount-applet_open.png +share/gnome/help/drivemount/it/figures/drivemount-applet_status.png +share/gnome/help/drivemount/pa/drivemount.xml +share/gnome/help/drivemount/pa/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/pa/figures/drivemount-applet_example.png +share/gnome/help/drivemount/pa/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/pa/figures/drivemount-applet_open.png +share/gnome/help/drivemount/pa/figures/drivemount-applet_status.png share/gnome/help/drivemount/uk/drivemount.xml share/gnome/help/drivemount/uk/figures/drivemount-applet_eject.png share/gnome/help/drivemount/uk/figures/drivemount-applet_example.png share/gnome/help/drivemount/uk/figures/drivemount-applet_mount.png share/gnome/help/drivemount/uk/figures/drivemount-applet_open.png share/gnome/help/drivemount/uk/figures/drivemount-applet_status.png -share/gnome/help/drivemount/uk/legal.xml -share/gnome/help/drivemount/zh_CN/drivemount.xml -share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_window.png -share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_all.png -share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/zh_CN/legal.xml -share/gnome/help/drivemount/zh_HK/drivemount.xml -share/gnome/help/drivemount/zh_HK/figures/drivemount-applet_window.png -share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_all.png -share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/zh_HK/legal.xml -share/gnome/help/drivemount/zh_TW/drivemount.xml -share/gnome/help/drivemount/zh_TW/figures/drivemount-applet_window.png -share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_all.png -share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/zh_TW/legal.xml share/gnome/help/geyes/C/figures/geyes_applet.png share/gnome/help/geyes/C/geyes.xml share/gnome/help/geyes/C/legal.xml -share/gnome/help/geyes/de/figures/geyes_applet.png -share/gnome/help/geyes/de/figures/geyes_settings.png -share/gnome/help/geyes/de/geyes.xml -share/gnome/help/geyes/de/legal.xml share/gnome/help/geyes/es/figures/geyes_applet.png -share/gnome/help/geyes/es/figures/geyes_settings.png share/gnome/help/geyes/es/geyes.xml -share/gnome/help/geyes/es/legal.xml -share/gnome/help/geyes/eu/figures/geyes_applet.png -share/gnome/help/geyes/eu/geyes.xml -share/gnome/help/geyes/eu/legal.xml -share/gnome/help/geyes/fr/figures/geyes_applet.png -share/gnome/help/geyes/fr/figures/geyes_settings.png -share/gnome/help/geyes/fr/geyes.xml -share/gnome/help/geyes/fr/legal.xml share/gnome/help/geyes/it/figures/geyes_applet.png -share/gnome/help/geyes/it/figures/geyes_settings.png share/gnome/help/geyes/it/geyes.xml -share/gnome/help/geyes/it/legal.xml -share/gnome/help/geyes/ja/figures/geyes_applet.png -share/gnome/help/geyes/ja/figures/geyes_settings.png -share/gnome/help/geyes/ja/geyes.xml -share/gnome/help/geyes/ja/legal.xml -share/gnome/help/geyes/ko/figures/geyes_applet.png -share/gnome/help/geyes/ko/figures/geyes_settings.png -share/gnome/help/geyes/ko/geyes.xml -share/gnome/help/geyes/ko/legal.xml -share/gnome/help/geyes/sv/figures/geyes_applet.png -share/gnome/help/geyes/sv/figures/geyes_settings.png -share/gnome/help/geyes/sv/geyes.xml -share/gnome/help/geyes/sv/legal.xml share/gnome/help/geyes/uk/figures/geyes_applet.png share/gnome/help/geyes/uk/geyes.xml -share/gnome/help/geyes/uk/legal.xml -share/gnome/help/geyes/zh_CN/figures/geyes_applet.png -share/gnome/help/geyes/zh_CN/figures/geyes_settings.png -share/gnome/help/geyes/zh_CN/geyes.xml -share/gnome/help/geyes/zh_CN/legal.xml -share/gnome/help/geyes/zh_HK/figures/geyes_applet.png -share/gnome/help/geyes/zh_HK/geyes.xml -share/gnome/help/geyes/zh_HK/legal.xml -share/gnome/help/geyes/zh_TW/figures/geyes_applet.png -share/gnome/help/geyes/zh_TW/figures/geyes_settings.png -share/gnome/help/geyes/zh_TW/geyes.xml -share/gnome/help/geyes/zh_TW/legal.xml share/gnome/help/gswitchit/C/gswitchit.xml share/gnome/help/gswitchit/C/legal.xml +share/gnome/help/gswitchit/es/gswitchit.xml +share/gnome/help/gswitchit/fr/gswitchit.xml share/gnome/help/gswitchit/uk/gswitchit.xml -share/gnome/help/gswitchit/uk/legal.xml share/gnome/help/gtik2_applet2/C/figures/gtik_applet.png share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml share/gnome/help/gtik2_applet2/C/legal.xml -share/gnome/help/gtik2_applet2/de/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/de/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/de/legal.xml share/gnome/help/gtik2_applet2/es/figures/gtik_applet.png share/gnome/help/gtik2_applet2/es/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/es/legal.xml -share/gnome/help/gtik2_applet2/eu/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/eu/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/eu/legal.xml -share/gnome/help/gtik2_applet2/fr/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/fr/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/fr/legal.xml -share/gnome/help/gtik2_applet2/it/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/it/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/it/legal.xml -share/gnome/help/gtik2_applet2/ja/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/ja/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/ja/legal.xml -share/gnome/help/gtik2_applet2/ko/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/ko/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/ko/legal.xml -share/gnome/help/gtik2_applet2/sv/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/sv/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/sv/legal.xml share/gnome/help/gtik2_applet2/uk/figures/gtik_applet.png share/gnome/help/gtik2_applet2/uk/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/uk/legal.xml -share/gnome/help/gtik2_applet2/zh_CN/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/zh_CN/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/zh_CN/legal.xml -share/gnome/help/gtik2_applet2/zh_HK/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/zh_HK/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/zh_HK/legal.xml -share/gnome/help/gtik2_applet2/zh_TW/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/zh_TW/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/zh_TW/legal.xml -share/gnome/help/gweather/C/figures/gweather_applet.png share/gnome/help/gweather/C/figures/gweather-details.png +share/gnome/help/gweather/C/figures/gweather-menu-prefs.png share/gnome/help/gweather/C/figures/gweather-prefs-general.png share/gnome/help/gweather/C/figures/gweather-prefs-locations.png +share/gnome/help/gweather/C/figures/gweather_applet.png share/gnome/help/gweather/C/figures/stock_weather-cloudy.png share/gnome/help/gweather/C/figures/stock_weather-few-clouds.png share/gnome/help/gweather/C/figures/stock_weather-fog.png @@ -576,47 +295,23 @@ share/gnome/help/gweather/C/figures/stock_weather-storm.png share/gnome/help/gweather/C/figures/stock_weather-sunny.png share/gnome/help/gweather/C/gweather.xml share/gnome/help/gweather/C/legal.xml -share/gnome/help/gweather/de/figures/gweather_applet.png -share/gnome/help/gweather/de/figures/gweather_settings.png -share/gnome/help/gweather/de/figures/gweather_weather.png -share/gnome/help/gweather/de/gweather.xml -share/gnome/help/gweather/de/legal.xml +share/gnome/help/gweather/es/figures/gweather-details.png +share/gnome/help/gweather/es/figures/gweather-menu-prefs.png +share/gnome/help/gweather/es/figures/gweather-prefs-general.png +share/gnome/help/gweather/es/figures/gweather-prefs-locations.png share/gnome/help/gweather/es/figures/gweather_applet.png -share/gnome/help/gweather/es/figures/gweather_settings.png -share/gnome/help/gweather/es/figures/gweather_weather.png +share/gnome/help/gweather/es/figures/stock_weather-cloudy.png +share/gnome/help/gweather/es/figures/stock_weather-few-clouds.png +share/gnome/help/gweather/es/figures/stock_weather-fog.png +share/gnome/help/gweather/es/figures/stock_weather-night-clear.png +share/gnome/help/gweather/es/figures/stock_weather-night-few-clouds.png +share/gnome/help/gweather/es/figures/stock_weather-showers.png +share/gnome/help/gweather/es/figures/stock_weather-snow.png +share/gnome/help/gweather/es/figures/stock_weather-storm.png +share/gnome/help/gweather/es/figures/stock_weather-sunny.png share/gnome/help/gweather/es/gweather.xml -share/gnome/help/gweather/es/legal.xml -share/gnome/help/gweather/eu/figures/gweather_applet.png -share/gnome/help/gweather/eu/figures/gweather_settings.png -share/gnome/help/gweather/eu/figures/gweather_weather.png -share/gnome/help/gweather/eu/gweather.xml -share/gnome/help/gweather/eu/legal.xml -share/gnome/help/gweather/fr/figures/gweather_applet.png -share/gnome/help/gweather/fr/figures/gweather_settings.png -share/gnome/help/gweather/fr/figures/gweather_weather.png -share/gnome/help/gweather/fr/gweather.xml -share/gnome/help/gweather/fr/legal.xml -share/gnome/help/gweather/it/figures/gweather_applet.png -share/gnome/help/gweather/it/figures/gweather_settings.png -share/gnome/help/gweather/it/figures/gweather_weather.png -share/gnome/help/gweather/it/gweather.xml -share/gnome/help/gweather/it/legal.xml -share/gnome/help/gweather/ja/figures/gweather_applet.png -share/gnome/help/gweather/ja/figures/gweather_settings.png -share/gnome/help/gweather/ja/figures/gweather_weather.png -share/gnome/help/gweather/ja/gweather.xml -share/gnome/help/gweather/ja/legal.xml -share/gnome/help/gweather/ko/figures/gweather_applet.png -share/gnome/help/gweather/ko/figures/gweather_settings.png -share/gnome/help/gweather/ko/figures/gweather_weather.png -share/gnome/help/gweather/ko/gweather.xml -share/gnome/help/gweather/ko/legal.xml -share/gnome/help/gweather/sv/figures/gweather_applet.png -share/gnome/help/gweather/sv/figures/gweather_settings.png -share/gnome/help/gweather/sv/figures/gweather_weather.png -share/gnome/help/gweather/sv/gweather.xml -share/gnome/help/gweather/sv/legal.xml share/gnome/help/gweather/uk/figures/gweather-details.png +share/gnome/help/gweather/uk/figures/gweather-menu-prefs.png share/gnome/help/gweather/uk/figures/gweather-prefs-general.png share/gnome/help/gweather/uk/figures/gweather-prefs-locations.png share/gnome/help/gweather/uk/figures/gweather_applet.png @@ -630,306 +325,112 @@ share/gnome/help/gweather/uk/figures/stock_weather-snow.png share/gnome/help/gweather/uk/figures/stock_weather-storm.png share/gnome/help/gweather/uk/figures/stock_weather-sunny.png share/gnome/help/gweather/uk/gweather.xml -share/gnome/help/gweather/uk/legal.xml -share/gnome/help/gweather/zh_CN/figures/gweather_applet.png -share/gnome/help/gweather/zh_CN/figures/gweather_settings.png -share/gnome/help/gweather/zh_CN/figures/gweather_weather.png -share/gnome/help/gweather/zh_CN/gweather.xml -share/gnome/help/gweather/zh_CN/legal.xml -share/gnome/help/gweather/zh_HK/figures/gweather_applet.png -share/gnome/help/gweather/zh_HK/figures/gweather_settings.png -share/gnome/help/gweather/zh_HK/figures/gweather_weather.png -share/gnome/help/gweather/zh_HK/gweather.xml -share/gnome/help/gweather/zh_HK/legal.xml -share/gnome/help/gweather/zh_TW/figures/gweather_applet.png -share/gnome/help/gweather/zh_TW/figures/gweather_settings.png -share/gnome/help/gweather/zh_TW/figures/gweather_weather.png -share/gnome/help/gweather/zh_TW/gweather.xml -share/gnome/help/gweather/zh_TW/legal.xml share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/C/legal.xml share/gnome/help/mixer_applet2/C/mixer_applet2.xml -share/gnome/help/mixer_applet2/de/figures/mixer_applet.png -share/gnome/help/mixer_applet2/de/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/de/legal.xml -share/gnome/help/mixer_applet2/de/mixer_applet2.xml -share/gnome/help/mixer_applet2/es/figures/mixer_applet.png share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/es/legal.xml share/gnome/help/mixer_applet2/es/mixer_applet2.xml -share/gnome/help/mixer_applet2/eu/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/eu/legal.xml -share/gnome/help/mixer_applet2/eu/mixer_applet2.xml -share/gnome/help/mixer_applet2/fr/figures/mixer_applet.png -share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/fr/legal.xml -share/gnome/help/mixer_applet2/fr/mixer_applet2.xml -share/gnome/help/mixer_applet2/it/figures/mixer_applet.png -share/gnome/help/mixer_applet2/it/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/it/legal.xml -share/gnome/help/mixer_applet2/it/mixer_applet2.xml -share/gnome/help/mixer_applet2/ja/figures/mixer_applet.png -share/gnome/help/mixer_applet2/ja/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/ja/legal.xml -share/gnome/help/mixer_applet2/ja/mixer_applet2.xml -share/gnome/help/mixer_applet2/ko/figures/mixer_applet.png -share/gnome/help/mixer_applet2/ko/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/ko/legal.xml -share/gnome/help/mixer_applet2/ko/mixer_applet2.xml -share/gnome/help/mixer_applet2/sv/figures/mixer_applet.png -share/gnome/help/mixer_applet2/sv/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/sv/legal.xml -share/gnome/help/mixer_applet2/sv/mixer_applet2.xml share/gnome/help/mixer_applet2/uk/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/uk/legal.xml share/gnome/help/mixer_applet2/uk/mixer_applet2.xml -share/gnome/help/mixer_applet2/zh_CN/figures/mixer_applet.png -share/gnome/help/mixer_applet2/zh_CN/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/zh_CN/legal.xml -share/gnome/help/mixer_applet2/zh_CN/mixer_applet2.xml -share/gnome/help/mixer_applet2/zh_HK/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/zh_HK/legal.xml -share/gnome/help/mixer_applet2/zh_HK/mixer_applet2.xml -share/gnome/help/mixer_applet2/zh_TW/figures/mixer_applet.png -share/gnome/help/mixer_applet2/zh_TW/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/zh_TW/legal.xml -share/gnome/help/mixer_applet2/zh_TW/mixer_applet2.xml share/gnome/help/multiload/C/figures/multiload-preferences.png share/gnome/help/multiload/C/figures/system-monitor-applet_window.png share/gnome/help/multiload/C/figures/system_monitor.png share/gnome/help/multiload/C/legal.xml share/gnome/help/multiload/C/multiload.xml -share/gnome/help/multiload/de/figures/system-monitor-applet_window.png -share/gnome/help/multiload/de/legal.xml -share/gnome/help/multiload/de/multiload.xml +share/gnome/help/multiload/es/figures/multiload-preferences.png share/gnome/help/multiload/es/figures/system-monitor-applet_window.png -share/gnome/help/multiload/es/legal.xml +share/gnome/help/multiload/es/figures/system_monitor.png share/gnome/help/multiload/es/multiload.xml -share/gnome/help/multiload/eu/figures/system_monitor.png -share/gnome/help/multiload/eu/figures/system_monitor_prefs.png -share/gnome/help/multiload/eu/legal.xml -share/gnome/help/multiload/eu/multiload.xml -share/gnome/help/multiload/fr/figures/system-monitor-applet_window.png -share/gnome/help/multiload/fr/legal.xml -share/gnome/help/multiload/fr/multiload.xml -share/gnome/help/multiload/it/figures/system-monitor-applet_window.png -share/gnome/help/multiload/it/legal.xml -share/gnome/help/multiload/it/multiload.xml -share/gnome/help/multiload/ja/figures/system-monitor-applet_window.png -share/gnome/help/multiload/ja/legal.xml -share/gnome/help/multiload/ja/multiload.xml -share/gnome/help/multiload/ko/figures/system-monitor-applet_window.png -share/gnome/help/multiload/ko/legal.xml -share/gnome/help/multiload/ko/multiload.xml -share/gnome/help/multiload/sv/figures/system-monitor-applet_window.png -share/gnome/help/multiload/sv/legal.xml -share/gnome/help/multiload/sv/multiload.xml share/gnome/help/multiload/uk/figures/multiload-preferences.png share/gnome/help/multiload/uk/figures/system-monitor-applet_window.png share/gnome/help/multiload/uk/figures/system_monitor.png -share/gnome/help/multiload/uk/legal.xml share/gnome/help/multiload/uk/multiload.xml -share/gnome/help/multiload/zh_CN/figures/system-monitor-applet_window.png -share/gnome/help/multiload/zh_CN/legal.xml -share/gnome/help/multiload/zh_CN/multiload.xml -share/gnome/help/multiload/zh_HK/figures/system-monitor-applet_window.png -share/gnome/help/multiload/zh_HK/legal.xml -share/gnome/help/multiload/zh_HK/multiload.xml -share/gnome/help/multiload/zh_TW/figures/system-monitor-applet_window.png -share/gnome/help/multiload/zh_TW/legal.xml -share/gnome/help/multiload/zh_TW/multiload.xml -share/gnome/help/stickynotes_applet/C/legal.xml -share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/C/figures/stickynote-left-menu.png -share/gnome/help/stickynotes_applet/C/figures/stickynote-right-menu.png +share/gnome/help/stickynotes_applet/C/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/C/figures/stickynote-right-menu-new.png share/gnome/help/stickynotes_applet/C/figures/stickynotes-note-prefs.png share/gnome/help/stickynotes_applet/C/figures/stickynotes-prefs.png share/gnome/help/stickynotes_applet/C/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/de/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/de/legal.xml -share/gnome/help/stickynotes_applet/de/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/C/legal.xml +share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/es/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/es/figures/stickynote-right-menu-new.png +share/gnome/help/stickynotes_applet/es/figures/stickynotes-note-prefs.png +share/gnome/help/stickynotes_applet/es/figures/stickynotes-prefs.png share/gnome/help/stickynotes_applet/es/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/es/legal.xml share/gnome/help/stickynotes_applet/es/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/eu/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/eu/legal.xml -share/gnome/help/stickynotes_applet/eu/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/fr/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/fr/legal.xml -share/gnome/help/stickynotes_applet/fr/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/it/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/it/legal.xml -share/gnome/help/stickynotes_applet/it/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/ja/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/ja/legal.xml -share/gnome/help/stickynotes_applet/ja/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/ko/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/ko/legal.xml -share/gnome/help/stickynotes_applet/ko/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/sv/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/sv/legal.xml -share/gnome/help/stickynotes_applet/sv/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/uk/figures/stickynote-left-menu.png -share/gnome/help/stickynotes_applet/uk/figures/stickynote-right-menu.png +share/gnome/help/stickynotes_applet/uk/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/uk/figures/stickynote-right-menu-new.png share/gnome/help/stickynotes_applet/uk/figures/stickynotes-note-prefs.png share/gnome/help/stickynotes_applet/uk/figures/stickynotes-prefs.png share/gnome/help/stickynotes_applet/uk/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/uk/legal.xml share/gnome/help/stickynotes_applet/uk/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/zh_CN/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/zh_CN/legal.xml -share/gnome/help/stickynotes_applet/zh_CN/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/zh_HK/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/zh_HK/legal.xml -share/gnome/help/stickynotes_applet/zh_HK/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/zh_TW/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/zh_TW/legal.xml -share/gnome/help/stickynotes_applet/zh_TW/stickynotes_applet.xml -share/gnome/help/trashapplet/C/legal.xml share/gnome/help/trashapplet/C/figures/trash-applet.png +share/gnome/help/trashapplet/C/legal.xml share/gnome/help/trashapplet/C/trashapplet.xml +share/gnome/help/trashapplet/es/figures/trash-applet.png +share/gnome/help/trashapplet/es/trashapplet.xml +share/gnome/help/trashapplet/fr/figures/trash-applet.png +share/gnome/help/trashapplet/fr/trashapplet.xml +share/gnome/help/trashapplet/it/figures/trash-applet.png +share/gnome/help/trashapplet/it/trashapplet.xml +share/gnome/help/trashapplet/pa/figures/trash-applet.png +share/gnome/help/trashapplet/pa/trashapplet.xml share/gnome/help/trashapplet/uk/figures/trash-applet.png -share/gnome/help/trashapplet/uk/legal.xml share/gnome/help/trashapplet/uk/trashapplet.xml -share/gnome/omf/gnome-applets/accessx-status-C.omf -share/gnome/omf/gnome-applets/accessx-status-uk.omf -share/gnome/omf/gnome-applets/accessx-status-eu.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-de.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-es.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-eu.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-fr.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-it.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-ja.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-ko.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-sv.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-uk.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_CN.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_HK.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_TW.omf -share/gnome/omf/gnome-applets/char-palette-C.omf -share/gnome/omf/gnome-applets/char-palette-de.omf -share/gnome/omf/gnome-applets/char-palette-es.omf -share/gnome/omf/gnome-applets/char-palette-eu.omf -share/gnome/omf/gnome-applets/char-palette-fr.omf -share/gnome/omf/gnome-applets/char-palette-it.omf -share/gnome/omf/gnome-applets/char-palette-ja.omf -share/gnome/omf/gnome-applets/char-palette-ko.omf -share/gnome/omf/gnome-applets/char-palette-sv.omf -share/gnome/omf/gnome-applets/char-palette-uk.omf -share/gnome/omf/gnome-applets/char-palette-zh_CN.omf -share/gnome/omf/gnome-applets/char-palette-zh_HK.omf -share/gnome/omf/gnome-applets/char-palette-zh_TW.omf -share/gnome/omf/gnome-applets/command-line-C.omf -share/gnome/omf/gnome-applets/command-line-de.omf -share/gnome/omf/gnome-applets/command-line-es.omf -share/gnome/omf/gnome-applets/command-line-eu.omf -share/gnome/omf/gnome-applets/command-line-fr.omf -share/gnome/omf/gnome-applets/command-line-it.omf -share/gnome/omf/gnome-applets/command-line-ja.omf -share/gnome/omf/gnome-applets/command-line-ko.omf -share/gnome/omf/gnome-applets/command-line-sv.omf -share/gnome/omf/gnome-applets/command-line-uk.omf -share/gnome/omf/gnome-applets/command-line-zh_CN.omf -share/gnome/omf/gnome-applets/command-line-zh_HK.omf -share/gnome/omf/gnome-applets/command-line-zh_TW.omf -%%CPUFREQ%%share/gnome/omf/gnome-applets/cpufreq-applet-C.omf -%%CPUFREQ%%share/gnome/omf/gnome-applets/cpufreq-applet-uk.omf -share/gnome/omf/gnome-applets/drivemount-C.omf -share/gnome/omf/gnome-applets/drivemount-de.omf -share/gnome/omf/gnome-applets/drivemount-es.omf -share/gnome/omf/gnome-applets/drivemount-eu.omf -share/gnome/omf/gnome-applets/drivemount-fr.omf -share/gnome/omf/gnome-applets/drivemount-it.omf -share/gnome/omf/gnome-applets/drivemount-ja.omf -share/gnome/omf/gnome-applets/drivemount-ko.omf -share/gnome/omf/gnome-applets/drivemount-sv.omf -share/gnome/omf/gnome-applets/drivemount-uk.omf -share/gnome/omf/gnome-applets/drivemount-zh_CN.omf -share/gnome/omf/gnome-applets/drivemount-zh_HK.omf -share/gnome/omf/gnome-applets/drivemount-zh_TW.omf -share/gnome/omf/gnome-applets/geyes-C.omf -share/gnome/omf/gnome-applets/geyes-de.omf -share/gnome/omf/gnome-applets/geyes-es.omf -share/gnome/omf/gnome-applets/geyes-eu.omf -share/gnome/omf/gnome-applets/geyes-fr.omf -share/gnome/omf/gnome-applets/geyes-it.omf -share/gnome/omf/gnome-applets/geyes-ja.omf -share/gnome/omf/gnome-applets/geyes-ko.omf -share/gnome/omf/gnome-applets/geyes-sv.omf -share/gnome/omf/gnome-applets/geyes-uk.omf -share/gnome/omf/gnome-applets/geyes-zh_CN.omf -share/gnome/omf/gnome-applets/geyes-zh_HK.omf -share/gnome/omf/gnome-applets/geyes-zh_TW.omf -share/gnome/omf/gnome-applets/gswitchit-C.omf -share/gnome/omf/gnome-applets/gswitchit-uk.omf -share/gnome/omf/gnome-applets/gtik2_applet2-C.omf -share/gnome/omf/gnome-applets/gtik2_applet2-de.omf -share/gnome/omf/gnome-applets/gtik2_applet2-es.omf -share/gnome/omf/gnome-applets/gtik2_applet2-eu.omf -share/gnome/omf/gnome-applets/gtik2_applet2-fr.omf -share/gnome/omf/gnome-applets/gtik2_applet2-it.omf -share/gnome/omf/gnome-applets/gtik2_applet2-ja.omf -share/gnome/omf/gnome-applets/gtik2_applet2-ko.omf -share/gnome/omf/gnome-applets/gtik2_applet2-sv.omf -share/gnome/omf/gnome-applets/gtik2_applet2-uk.omf -share/gnome/omf/gnome-applets/gtik2_applet2-zh_CN.omf -share/gnome/omf/gnome-applets/gtik2_applet2-zh_HK.omf -share/gnome/omf/gnome-applets/gtik2_applet2-zh_TW.omf -share/gnome/omf/gnome-applets/gweather-C.omf -share/gnome/omf/gnome-applets/gweather-de.omf -share/gnome/omf/gnome-applets/gweather-es.omf -share/gnome/omf/gnome-applets/gweather-eu.omf -share/gnome/omf/gnome-applets/gweather-fr.omf -share/gnome/omf/gnome-applets/gweather-it.omf -share/gnome/omf/gnome-applets/gweather-ja.omf -share/gnome/omf/gnome-applets/gweather-ko.omf -share/gnome/omf/gnome-applets/gweather-sv.omf -share/gnome/omf/gnome-applets/gweather-uk.omf -share/gnome/omf/gnome-applets/gweather-zh_CN.omf -share/gnome/omf/gnome-applets/gweather-zh_HK.omf -share/gnome/omf/gnome-applets/gweather-zh_TW.omf -share/gnome/omf/gnome-applets/mixer_applet2-C.omf -share/gnome/omf/gnome-applets/mixer_applet2-de.omf -share/gnome/omf/gnome-applets/mixer_applet2-es.omf -share/gnome/omf/gnome-applets/mixer_applet2-eu.omf -share/gnome/omf/gnome-applets/mixer_applet2-fr.omf -share/gnome/omf/gnome-applets/mixer_applet2-it.omf -share/gnome/omf/gnome-applets/mixer_applet2-ja.omf -share/gnome/omf/gnome-applets/mixer_applet2-ko.omf -share/gnome/omf/gnome-applets/mixer_applet2-sv.omf -share/gnome/omf/gnome-applets/mixer_applet2-uk.omf -share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf -share/gnome/omf/gnome-applets/mixer_applet2-zh_HK.omf -share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf -share/gnome/omf/gnome-applets/multiload-C.omf -share/gnome/omf/gnome-applets/multiload-de.omf -share/gnome/omf/gnome-applets/multiload-es.omf -share/gnome/omf/gnome-applets/multiload-eu.omf -share/gnome/omf/gnome-applets/multiload-fr.omf -share/gnome/omf/gnome-applets/multiload-it.omf -share/gnome/omf/gnome-applets/multiload-ja.omf -share/gnome/omf/gnome-applets/multiload-ko.omf -share/gnome/omf/gnome-applets/multiload-sv.omf -share/gnome/omf/gnome-applets/multiload-uk.omf -share/gnome/omf/gnome-applets/multiload-zh_CN.omf -share/gnome/omf/gnome-applets/multiload-zh_HK.omf -share/gnome/omf/gnome-applets/multiload-zh_TW.omf -share/gnome/omf/gnome-applets/stickynotes_applet-C.omf -share/gnome/omf/gnome-applets/stickynotes_applet-de.omf -share/gnome/omf/gnome-applets/stickynotes_applet-es.omf -share/gnome/omf/gnome-applets/stickynotes_applet-eu.omf -share/gnome/omf/gnome-applets/stickynotes_applet-fr.omf -share/gnome/omf/gnome-applets/stickynotes_applet-it.omf -share/gnome/omf/gnome-applets/stickynotes_applet-ja.omf -share/gnome/omf/gnome-applets/stickynotes_applet-ko.omf -share/gnome/omf/gnome-applets/stickynotes_applet-sv.omf -share/gnome/omf/gnome-applets/stickynotes_applet-uk.omf -share/gnome/omf/gnome-applets/stickynotes_applet-zh_CN.omf -share/gnome/omf/gnome-applets/stickynotes_applet-zh_HK.omf -share/gnome/omf/gnome-applets/stickynotes_applet-zh_TW.omf -share/gnome/omf/gnome-applets/trashapplet-C.omf -share/gnome/omf/gnome-applets/trashapplet-uk.omf +share/gnome/omf/accessx-status/accessx-status-C.omf +share/gnome/omf/accessx-status/accessx-status-es.omf +share/gnome/omf/accessx-status/accessx-status-fr.omf +share/gnome/omf/accessx-status/accessx-status-uk.omf +%%BATTERY%%share/gnome/omf/battstat/battstat-C.omf +%%BATTERY%%share/gnome/omf/battstat/battstat-es.omf +%%BATTERY%%share/gnome/omf/battstat/battstat-uk.omf +share/gnome/omf/char-palette/char-palette-C.omf +share/gnome/omf/char-palette/char-palette-es.omf +share/gnome/omf/char-palette/char-palette-it.omf +share/gnome/omf/char-palette/char-palette-nl.omf +share/gnome/omf/char-palette/char-palette-pt_BR.omf +share/gnome/omf/char-palette/char-palette-uk.omf +share/gnome/omf/command-line/command-line-C.omf +share/gnome/omf/command-line/command-line-es.omf +share/gnome/omf/command-line/command-line-pt_BR.omf +share/gnome/omf/command-line/command-line-uk.omf +%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-C.omf +%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-es.omf +%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-uk.omf +share/gnome/omf/drivemount/drivemount-C.omf +share/gnome/omf/drivemount/drivemount-es.omf +share/gnome/omf/drivemount/drivemount-it.omf +share/gnome/omf/drivemount/drivemount-pa.omf +share/gnome/omf/drivemount/drivemount-uk.omf +share/gnome/omf/geyes/geyes-C.omf +share/gnome/omf/geyes/geyes-es.omf +share/gnome/omf/geyes/geyes-it.omf +share/gnome/omf/geyes/geyes-uk.omf +share/gnome/omf/gswitchit/gswitchit-C.omf +share/gnome/omf/gswitchit/gswitchit-es.omf +share/gnome/omf/gswitchit/gswitchit-fr.omf +share/gnome/omf/gswitchit/gswitchit-uk.omf +share/gnome/omf/gtik2_applet2/gtik2_applet2-C.omf +share/gnome/omf/gtik2_applet2/gtik2_applet2-es.omf +share/gnome/omf/gtik2_applet2/gtik2_applet2-uk.omf +share/gnome/omf/gweather/gweather-C.omf +share/gnome/omf/gweather/gweather-es.omf +share/gnome/omf/gweather/gweather-uk.omf +share/gnome/omf/mixer_applet2/mixer_applet2-C.omf +share/gnome/omf/mixer_applet2/mixer_applet2-es.omf +share/gnome/omf/mixer_applet2/mixer_applet2-uk.omf +share/gnome/omf/multiload/multiload-C.omf +share/gnome/omf/multiload/multiload-es.omf +share/gnome/omf/multiload/multiload-uk.omf +share/gnome/omf/stickynotes_applet/stickynotes_applet-C.omf +share/gnome/omf/stickynotes_applet/stickynotes_applet-es.omf +share/gnome/omf/stickynotes_applet/stickynotes_applet-uk.omf +share/gnome/omf/trashapplet/trashapplet-C.omf +share/gnome/omf/trashapplet/trashapplet-es.omf +share/gnome/omf/trashapplet/trashapplet-fr.omf +share/gnome/omf/trashapplet/trashapplet-it.omf +share/gnome/omf/trashapplet/trashapplet-pa.omf +share/gnome/omf/trashapplet/trashapplet-uk.omf share/gnome/pixmaps/accessx-status-applet/ax-applet.png share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png share/gnome/pixmaps/accessx-status-applet/ax-key-base.png @@ -1102,6 +603,7 @@ share/locale/he/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hu/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/hy/LC_MESSAGES/gnome-applets-2.0.mo share/locale/id/LC_MESSAGES/gnome-applets-2.0.mo share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo @@ -1114,6 +616,7 @@ share/locale/ml/LC_MESSAGES/gnome-applets-2.0.mo share/locale/mn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nb/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/ne/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/no/LC_MESSAGES/gnome-applets-2.0.mo @@ -1131,312 +634,167 @@ share/locale/sr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sr@Latn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sv/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ta/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/te/LC_MESSAGES/gnome-applets-2.0.mo share/locale/th/LC_MESSAGES/gnome-applets-2.0.mo share/locale/tr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/uk/LC_MESSAGES/gnome-applets-2.0.mo share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/xh/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo -@dirrm share/gnome/help/stickynotes_applet/uk/figures -@dirrm share/gnome/help/stickynotes_applet/uk +@unexec /bin/rmdir %D/share/locale/xh/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/xh 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/te/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/te 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/rw 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/48x48 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons 2>/dev/null || /usr/bin/true @dirrm share/gnome/pixmaps/stickynotes -%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk/figures -%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk %%CPUFREQ%%@dirrm share/gnome/pixmaps/cpufreq-applet @dirrm share/gnome/pixmaps/accessx-status-applet -@dirrm share/gnome/omf/gnome-applets -@dirrm share/gnome/help/trashapplet/C/figures -@dirrm share/gnome/help/trashapplet/C +@dirrm share/gnome/omf/trashapplet +@dirrm share/gnome/omf/stickynotes_applet +@dirrm share/gnome/omf/multiload +@dirrm share/gnome/omf/mixer_applet2 +@dirrm share/gnome/omf/gweather +@dirrm share/gnome/omf/gtik2_applet2 +@dirrm share/gnome/omf/gswitchit +@dirrm share/gnome/omf/geyes +@dirrm share/gnome/omf/drivemount +%%CPUFREQ%%@dirrm share/gnome/omf/cpufreq-applet +@dirrm share/gnome/omf/command-line +@dirrm share/gnome/omf/char-palette +%%BATTERY%%@dirrm share/gnome/omf/battstat +@dirrm share/gnome/omf/accessx-status @dirrm share/gnome/help/trashapplet/uk/figures @dirrm share/gnome/help/trashapplet/uk +@dirrm share/gnome/help/trashapplet/pa/figures +@dirrm share/gnome/help/trashapplet/pa +@dirrm share/gnome/help/trashapplet/fr/figures +@dirrm share/gnome/help/trashapplet/fr +@dirrm share/gnome/help/trashapplet/it/figures +@dirrm share/gnome/help/trashapplet/it +@dirrm share/gnome/help/trashapplet/es/figures +@dirrm share/gnome/help/trashapplet/es +@dirrm share/gnome/help/trashapplet/C/figures +@dirrm share/gnome/help/trashapplet/C @dirrm share/gnome/help/trashapplet -@dirrm share/gnome/help/stickynotes_applet/zh_TW/figures -@dirrm share/gnome/help/stickynotes_applet/zh_TW -@dirrm share/gnome/help/stickynotes_applet/zh_HK/figures -@dirrm share/gnome/help/stickynotes_applet/zh_HK -@dirrm share/gnome/help/stickynotes_applet/zh_CN/figures -@dirrm share/gnome/help/stickynotes_applet/zh_CN -@dirrm share/gnome/help/stickynotes_applet/sv/figures -@dirrm share/gnome/help/stickynotes_applet/sv -@dirrm share/gnome/help/stickynotes_applet/ko/figures -@dirrm share/gnome/help/stickynotes_applet/ko -@dirrm share/gnome/help/stickynotes_applet/ja/figures -@dirrm share/gnome/help/stickynotes_applet/ja -@dirrm share/gnome/help/stickynotes_applet/it/figures -@dirrm share/gnome/help/stickynotes_applet/it -@dirrm share/gnome/help/stickynotes_applet/fr/figures -@dirrm share/gnome/help/stickynotes_applet/fr -@dirrm share/gnome/help/stickynotes_applet/eu/figures -@dirrm share/gnome/help/stickynotes_applet/eu +@dirrm share/gnome/help/stickynotes_applet/uk/figures +@dirrm share/gnome/help/stickynotes_applet/uk @dirrm share/gnome/help/stickynotes_applet/es/figures @dirrm share/gnome/help/stickynotes_applet/es -@dirrm share/gnome/help/stickynotes_applet/de/figures -@dirrm share/gnome/help/stickynotes_applet/de @dirrm share/gnome/help/stickynotes_applet/C/figures @dirrm share/gnome/help/stickynotes_applet/C @dirrm share/gnome/help/stickynotes_applet -@dirrm share/gnome/help/multiload/zh_TW/figures -@dirrm share/gnome/help/multiload/zh_TW -@dirrm share/gnome/help/multiload/zh_HK/figures -@dirrm share/gnome/help/multiload/zh_HK -@dirrm share/gnome/help/multiload/zh_CN/figures -@dirrm share/gnome/help/multiload/zh_CN @dirrm share/gnome/help/multiload/uk/figures @dirrm share/gnome/help/multiload/uk -@dirrm share/gnome/help/multiload/sv/figures -@dirrm share/gnome/help/multiload/sv -@dirrm share/gnome/help/multiload/ko/figures -@dirrm share/gnome/help/multiload/ko -@dirrm share/gnome/help/multiload/ja/figures -@dirrm share/gnome/help/multiload/ja -@dirrm share/gnome/help/multiload/it/figures -@dirrm share/gnome/help/multiload/it -@dirrm share/gnome/help/multiload/fr/figures -@dirrm share/gnome/help/multiload/fr -@dirrm share/gnome/help/multiload/eu/figures -@dirrm share/gnome/help/multiload/eu @dirrm share/gnome/help/multiload/es/figures @dirrm share/gnome/help/multiload/es -@dirrm share/gnome/help/multiload/de/figures -@dirrm share/gnome/help/multiload/de @dirrm share/gnome/help/multiload/C/figures @dirrm share/gnome/help/multiload/C @dirrm share/gnome/help/multiload -@dirrm share/gnome/help/mixer_applet2/zh_TW/figures -@dirrm share/gnome/help/mixer_applet2/zh_TW -@dirrm share/gnome/help/mixer_applet2/zh_HK/figures -@dirrm share/gnome/help/mixer_applet2/zh_HK -@dirrm share/gnome/help/mixer_applet2/zh_CN/figures -@dirrm share/gnome/help/mixer_applet2/zh_CN @dirrm share/gnome/help/mixer_applet2/uk/figures @dirrm share/gnome/help/mixer_applet2/uk -@dirrm share/gnome/help/mixer_applet2/sv/figures -@dirrm share/gnome/help/mixer_applet2/sv -@dirrm share/gnome/help/mixer_applet2/ko/figures -@dirrm share/gnome/help/mixer_applet2/ko -@dirrm share/gnome/help/mixer_applet2/ja/figures -@dirrm share/gnome/help/mixer_applet2/ja -@dirrm share/gnome/help/mixer_applet2/it/figures -@dirrm share/gnome/help/mixer_applet2/it -@dirrm share/gnome/help/mixer_applet2/fr/figures -@dirrm share/gnome/help/mixer_applet2/fr -@dirrm share/gnome/help/mixer_applet2/eu/figures -@dirrm share/gnome/help/mixer_applet2/eu @dirrm share/gnome/help/mixer_applet2/es/figures @dirrm share/gnome/help/mixer_applet2/es -@dirrm share/gnome/help/mixer_applet2/de/figures -@dirrm share/gnome/help/mixer_applet2/de @dirrm share/gnome/help/mixer_applet2/C/figures @dirrm share/gnome/help/mixer_applet2/C @dirrm share/gnome/help/mixer_applet2 -@dirrm share/gnome/help/gweather/zh_TW/figures -@dirrm share/gnome/help/gweather/zh_TW -@dirrm share/gnome/help/gweather/zh_HK/figures -@dirrm share/gnome/help/gweather/zh_HK -@dirrm share/gnome/help/gweather/zh_CN/figures -@dirrm share/gnome/help/gweather/zh_CN @dirrm share/gnome/help/gweather/uk/figures @dirrm share/gnome/help/gweather/uk -@dirrm share/gnome/help/gweather/sv/figures -@dirrm share/gnome/help/gweather/sv -@dirrm share/gnome/help/gweather/ko/figures -@dirrm share/gnome/help/gweather/ko -@dirrm share/gnome/help/gweather/ja/figures -@dirrm share/gnome/help/gweather/ja -@dirrm share/gnome/help/gweather/it/figures -@dirrm share/gnome/help/gweather/it -@dirrm share/gnome/help/gweather/fr/figures -@dirrm share/gnome/help/gweather/fr -@dirrm share/gnome/help/gweather/eu/figures -@dirrm share/gnome/help/gweather/eu @dirrm share/gnome/help/gweather/es/figures @dirrm share/gnome/help/gweather/es -@dirrm share/gnome/help/gweather/de/figures -@dirrm share/gnome/help/gweather/de @dirrm share/gnome/help/gweather/C/figures @dirrm share/gnome/help/gweather/C @dirrm share/gnome/help/gweather -@dirrm share/gnome/help/gtik2_applet2/zh_TW/figures -@dirrm share/gnome/help/gtik2_applet2/zh_TW -@dirrm share/gnome/help/gtik2_applet2/zh_HK/figures -@dirrm share/gnome/help/gtik2_applet2/zh_HK -@dirrm share/gnome/help/gtik2_applet2/zh_CN/figures -@dirrm share/gnome/help/gtik2_applet2/zh_CN @dirrm share/gnome/help/gtik2_applet2/uk/figures @dirrm share/gnome/help/gtik2_applet2/uk -@dirrm share/gnome/help/gtik2_applet2/sv/figures -@dirrm share/gnome/help/gtik2_applet2/sv -@dirrm share/gnome/help/gtik2_applet2/ko/figures -@dirrm share/gnome/help/gtik2_applet2/ko -@dirrm share/gnome/help/gtik2_applet2/ja/figures -@dirrm share/gnome/help/gtik2_applet2/ja -@dirrm share/gnome/help/gtik2_applet2/it/figures -@dirrm share/gnome/help/gtik2_applet2/it -@dirrm share/gnome/help/gtik2_applet2/fr/figures -@dirrm share/gnome/help/gtik2_applet2/fr -@dirrm share/gnome/help/gtik2_applet2/eu/figures -@dirrm share/gnome/help/gtik2_applet2/eu @dirrm share/gnome/help/gtik2_applet2/es/figures @dirrm share/gnome/help/gtik2_applet2/es -@dirrm share/gnome/help/gtik2_applet2/de/figures -@dirrm share/gnome/help/gtik2_applet2/de @dirrm share/gnome/help/gtik2_applet2/C/figures @dirrm share/gnome/help/gtik2_applet2/C @dirrm share/gnome/help/gtik2_applet2 -@dirrm share/gnome/help/gswitchit/C @dirrm share/gnome/help/gswitchit/uk +@dirrm share/gnome/help/gswitchit/fr +@dirrm share/gnome/help/gswitchit/es +@dirrm share/gnome/help/gswitchit/C @dirrm share/gnome/help/gswitchit -@dirrm share/gnome/help/geyes/zh_TW/figures -@dirrm share/gnome/help/geyes/zh_TW -@dirrm share/gnome/help/geyes/zh_HK/figures -@dirrm share/gnome/help/geyes/zh_HK -@dirrm share/gnome/help/geyes/zh_CN/figures -@dirrm share/gnome/help/geyes/zh_CN @dirrm share/gnome/help/geyes/uk/figures @dirrm share/gnome/help/geyes/uk -@dirrm share/gnome/help/geyes/sv/figures -@dirrm share/gnome/help/geyes/sv -@dirrm share/gnome/help/geyes/ko/figures -@dirrm share/gnome/help/geyes/ko -@dirrm share/gnome/help/geyes/ja/figures -@dirrm share/gnome/help/geyes/ja @dirrm share/gnome/help/geyes/it/figures @dirrm share/gnome/help/geyes/it -@dirrm share/gnome/help/geyes/fr/figures -@dirrm share/gnome/help/geyes/fr -@dirrm share/gnome/help/geyes/eu/figures -@dirrm share/gnome/help/geyes/eu @dirrm share/gnome/help/geyes/es/figures @dirrm share/gnome/help/geyes/es -@dirrm share/gnome/help/geyes/de/figures -@dirrm share/gnome/help/geyes/de @dirrm share/gnome/help/geyes/C/figures @dirrm share/gnome/help/geyes/C @dirrm share/gnome/help/geyes -@dirrm share/gnome/help/drivemount/zh_TW/figures -@dirrm share/gnome/help/drivemount/zh_TW -@dirrm share/gnome/help/drivemount/zh_HK/figures -@dirrm share/gnome/help/drivemount/zh_HK -@dirrm share/gnome/help/drivemount/zh_CN/figures -@dirrm share/gnome/help/drivemount/zh_CN @dirrm share/gnome/help/drivemount/uk/figures @dirrm share/gnome/help/drivemount/uk -@dirrm share/gnome/help/drivemount/sv/figures -@dirrm share/gnome/help/drivemount/sv -@dirrm share/gnome/help/drivemount/ko/figures -@dirrm share/gnome/help/drivemount/ko -@dirrm share/gnome/help/drivemount/ja/figures -@dirrm share/gnome/help/drivemount/ja +@dirrm share/gnome/help/drivemount/pa/figures +@dirrm share/gnome/help/drivemount/pa @dirrm share/gnome/help/drivemount/it/figures @dirrm share/gnome/help/drivemount/it -@dirrm share/gnome/help/drivemount/fr/figures -@dirrm share/gnome/help/drivemount/fr -@dirrm share/gnome/help/drivemount/eu/figures -@dirrm share/gnome/help/drivemount/eu @dirrm share/gnome/help/drivemount/es/figures @dirrm share/gnome/help/drivemount/es -@dirrm share/gnome/help/drivemount/de/figures -@dirrm share/gnome/help/drivemount/de @dirrm share/gnome/help/drivemount/C/figures @dirrm share/gnome/help/drivemount/C @dirrm share/gnome/help/drivemount +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C/figures %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet -@dirrm share/gnome/help/command-line/zh_TW/figures -@dirrm share/gnome/help/command-line/zh_TW -@dirrm share/gnome/help/command-line/zh_HK/figures -@dirrm share/gnome/help/command-line/zh_HK -@dirrm share/gnome/help/command-line/zh_CN/figures -@dirrm share/gnome/help/command-line/zh_CN @dirrm share/gnome/help/command-line/uk/figures @dirrm share/gnome/help/command-line/uk -@dirrm share/gnome/help/command-line/sv/figures -@dirrm share/gnome/help/command-line/sv -@dirrm share/gnome/help/command-line/ko/figures -@dirrm share/gnome/help/command-line/ko -@dirrm share/gnome/help/command-line/ja/figures -@dirrm share/gnome/help/command-line/ja -@dirrm share/gnome/help/command-line/it/figures -@dirrm share/gnome/help/command-line/it -@dirrm share/gnome/help/command-line/fr/figures -@dirrm share/gnome/help/command-line/fr -@dirrm share/gnome/help/command-line/eu/figures -@dirrm share/gnome/help/command-line/eu +@dirrm share/gnome/help/command-line/pt_BR/figures +@dirrm share/gnome/help/command-line/pt_BR @dirrm share/gnome/help/command-line/es/figures @dirrm share/gnome/help/command-line/es -@dirrm share/gnome/help/command-line/de/figures -@dirrm share/gnome/help/command-line/de @dirrm share/gnome/help/command-line/C/figures @dirrm share/gnome/help/command-line/C @dirrm share/gnome/help/command-line -@dirrm share/gnome/help/char-palette/zh_TW/figures -@dirrm share/gnome/help/char-palette/zh_TW -@dirrm share/gnome/help/char-palette/zh_HK/figures -@dirrm share/gnome/help/char-palette/zh_HK -@dirrm share/gnome/help/char-palette/zh_CN/figures -@dirrm share/gnome/help/char-palette/zh_CN @dirrm share/gnome/help/char-palette/uk/figures @dirrm share/gnome/help/char-palette/uk -@dirrm share/gnome/help/char-palette/sv/figures -@dirrm share/gnome/help/char-palette/sv -@dirrm share/gnome/help/char-palette/ko/figures -@dirrm share/gnome/help/char-palette/ko -@dirrm share/gnome/help/char-palette/ja/figures -@dirrm share/gnome/help/char-palette/ja +@dirrm share/gnome/help/char-palette/pt_BR/figures +@dirrm share/gnome/help/char-palette/pt_BR +@dirrm share/gnome/help/char-palette/nl/figures +@dirrm share/gnome/help/char-palette/nl @dirrm share/gnome/help/char-palette/it/figures @dirrm share/gnome/help/char-palette/it -@dirrm share/gnome/help/char-palette/fr/figures -@dirrm share/gnome/help/char-palette/fr -@dirrm share/gnome/help/char-palette/eu/figures -@dirrm share/gnome/help/char-palette/eu @dirrm share/gnome/help/char-palette/es/figures @dirrm share/gnome/help/char-palette/es -@dirrm share/gnome/help/char-palette/de/figures -@dirrm share/gnome/help/char-palette/de @dirrm share/gnome/help/char-palette/C/figures @dirrm share/gnome/help/char-palette/C @dirrm share/gnome/help/char-palette -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_TW/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_TW -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_HK/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_HK -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_CN/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_CN %%BATTERY%%@dirrm share/gnome/help/battstat/uk/figures %%BATTERY%%@dirrm share/gnome/help/battstat/uk -%%BATTERY%%@dirrm share/gnome/help/battstat/sv/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/sv -%%BATTERY%%@dirrm share/gnome/help/battstat/ko/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/ko -%%BATTERY%%@dirrm share/gnome/help/battstat/ja/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/ja -%%BATTERY%%@dirrm share/gnome/help/battstat/it/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/it -%%BATTERY%%@dirrm share/gnome/help/battstat/fr/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/fr -%%BATTERY%%@dirrm share/gnome/help/battstat/eu/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/eu %%BATTERY%%@dirrm share/gnome/help/battstat/es/figures %%BATTERY%%@dirrm share/gnome/help/battstat/es -%%BATTERY%%@dirrm share/gnome/help/battstat/de/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/de %%BATTERY%%@dirrm share/gnome/help/battstat/C/figures %%BATTERY%%@dirrm share/gnome/help/battstat/C %%BATTERY%%@dirrm share/gnome/help/battstat -@dirrm share/gnome/help/accessx-status/eu/figures -@dirrm share/gnome/help/accessx-status/eu -@dirrm share/gnome/help/accessx-status/C/figures -@dirrm share/gnome/help/accessx-status/C @dirrm share/gnome/help/accessx-status/uk/figures @dirrm share/gnome/help/accessx-status/uk +@dirrm share/gnome/help/accessx-status/fr/figures +@dirrm share/gnome/help/accessx-status/fr +@dirrm share/gnome/help/accessx-status/es/figures +@dirrm share/gnome/help/accessx-status/es +@dirrm share/gnome/help/accessx-status/C/figures +@dirrm share/gnome/help/accessx-status/C @dirrm share/gnome/help/accessx-status @dirrm share/gnome/gnome-applets/gweather @dirrm share/gnome/gnome-applets/glade @dirrm share/gnome/gnome-applets/geyes/Horrid -@dirrm share/gnome/gnome-applets/geyes/Default @dirrm share/gnome/gnome-applets/geyes/Default-tiny +@dirrm share/gnome/gnome-applets/geyes/Default @dirrm share/gnome/gnome-applets/geyes/Bloodshot @dirrm share/gnome/gnome-applets/geyes/Bizarre @dirrm share/gnome/gnome-applets/geyes diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile index 8bea9955e870..523f3533fdef 100644 --- a/x11/gnome-desktop/Makefile +++ b/x11/gnome-desktop/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnomedesktop/Makefile,v 1.74 2005/10/03 15:18:36 ahze Exp $ # PORTNAME= gnomedesktop -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-desktop/2.10 +MASTER_SITE_SUBDIR= sources/gnome-desktop/2.12 DISTNAME= gnome-desktop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,13 +21,14 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils \ + ltverhack GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes USE_BISON= yes INSTALLS_OMF= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" \ --with-kde-datadir=${LOCALBASE}/share CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo index 833f7a4f71cc..1af6b593cb77 100644 --- a/x11/gnome-desktop/distinfo +++ b/x11/gnome-desktop/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-desktop-2.10.2.tar.bz2) = b912a6878ea307af9e3d015864ec0678 -SIZE (gnome2/gnome-desktop-2.10.2.tar.bz2) = 985248 +MD5 (gnome2/gnome-desktop-2.12.1.tar.bz2) = e6841d3a401ec2f5aa17a0529ba4bf55 +SIZE (gnome2/gnome-desktop-2.12.1.tar.bz2) = 1033105 diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist index e1f8d73ee3bd..cf05af1ec158 100644 --- a/x11/gnome-desktop/pkg-plist +++ b/x11/gnome-desktop/pkg-plist @@ -4,10 +4,10 @@ include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h include/gnome-desktop-2.0/libgnomeui/gnome-hint.h lib/libgnome-desktop-2.a lib/libgnome-desktop-2.so -lib/libgnome-desktop-2.so.4 +lib/libgnome-desktop-2.so.2 libdata/pkgconfig/gnome-desktop-2.0.pc share/gnome/applications/gnome-about.desktop -share/gnome/gnome-about/gnome-64.gif +share/gnome/gnome-about/gnome-64.png share/gnome/gnome-about/gnome-version.xml share/gnome/gnome-about/headers/header-bg-ancient01a.png share/gnome/gnome-about/headers/header-bg-city01.png @@ -19,21 +19,27 @@ share/gnome/gnome-about/headers/header-bg-mountains01.png share/gnome/gnome-about/headers/header-bg-snow01.png share/gnome/gnome-about/headers/header-bg-sunset01.png share/gnome/help/fdl/C/fdl.xml -share/gnome/help/fdl/eu/fdl.xml +share/gnome/help/fdl/es/fdl.xml share/gnome/help/gnome-feedback/C/gnome-feedback.xml -share/gnome/help/gnome-feedback/eu/gnome-feedback.xml +share/gnome/help/gnome-feedback/es/gnome-feedback.xml share/gnome/help/gpl/C/gpl.xml -share/gnome/help/gpl/eu/gpl.xml +share/gnome/help/gpl/es/gpl.xml +share/gnome/help/gpl/fi/gpl.xml +share/gnome/help/gpl/pa/gpl.xml share/gnome/help/lgpl/C/lgpl.xml -share/gnome/help/lgpl/eu/lgpl.xml -share/gnome/omf/gnome-desktop/fdl-C.omf -share/gnome/omf/gnome-desktop/fdl-eu.omf -share/gnome/omf/gnome-desktop/gnome-feedback-C.omf -share/gnome/omf/gnome-desktop/gnome-feedback-eu.omf -share/gnome/omf/gnome-desktop/gpl-C.omf -share/gnome/omf/gnome-desktop/gpl-eu.omf -share/gnome/omf/gnome-desktop/lgpl-C.omf -share/gnome/omf/gnome-desktop/lgpl-eu.omf +share/gnome/help/lgpl/es/lgpl.xml +share/gnome/help/lgpl/pa/lgpl.xml +share/gnome/omf/fdl/fdl-C.omf +share/gnome/omf/fdl/fdl-es.omf +share/gnome/omf/gnome-feedback/gnome-feedback-C.omf +share/gnome/omf/gnome-feedback/gnome-feedback-es.omf +share/gnome/omf/gpl/gpl-C.omf +share/gnome/omf/gpl/gpl-es.omf +share/gnome/omf/gpl/gpl-fi.omf +share/gnome/omf/gpl/gpl-pa.omf +share/gnome/omf/lgpl/lgpl-C.omf +share/gnome/omf/lgpl/lgpl-es.omf +share/gnome/omf/lgpl/lgpl-pa.omf share/gnome/pixmaps/apple-green.png share/gnome/pixmaps/apple-red.png share/gnome/pixmaps/gnome-aorta.png @@ -145,6 +151,7 @@ share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/kn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/ku/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/li/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo @@ -178,6 +185,7 @@ share/locale/te/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/tk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/ug/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo @@ -189,17 +197,25 @@ share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo @unexec rmdir %D/share/locale/yo/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/yo 2> /dev/null || true -@unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/te 2> /dev/null || true +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true +@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ku 2> /dev/null || true @unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/hy 2> /dev/null || true -@dirrm share/gnome/omf/gnome-desktop -@dirrm share/gnome/help/lgpl/eu -@dirrm share/gnome/help/gpl/eu -@dirrm share/gnome/help/gnome-feedback/eu +@dirrm share/gnome/omf/lgpl +@dirrm share/gnome/omf/gpl +@dirrm share/gnome/omf/gnome-feedback +@dirrm share/gnome/omf/fdl +@dirrm share/gnome/help/lgpl/pa +@dirrm share/gnome/help/lgpl/es +@dirrm share/gnome/help/gpl/pa +@dirrm share/gnome/help/gpl/fi +@dirrm share/gnome/help/gpl/es +@dirrm share/gnome/help/fdl/es +@dirrm share/gnome/help/gnome-feedback/es @dirrm share/gnome/help/gnome-feedback/C @dirrm share/gnome/help/gnome-feedback -@dirrm share/gnome/help/fdl/eu @dirrm share/gnome/gnome-about/headers @dirrm include/gnome-desktop-2.0/libgnomeui @dirrm include/gnome-desktop-2.0/libgnome diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile index c0415bed871e..5a8ffe48ff43 100644 --- a/x11/gnome-menus/Makefile +++ b/x11/gnome-menus/Makefile @@ -3,14 +3,15 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnome-menus/Makefile,v 1.21 2005/09/08 18:04:51 marcus Exp $ # PORTNAME= gnome-menus -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.0 PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -20,8 +21,9 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack intlhack gnomevfs2 -USE_LIBTOOL_VER=15 +USE_GNOME= gnomeprefix gnomehack intlhack gnomevfs2 ltverhack +USE_AUTOTOOLS= libtool:15 +USE_PYTHON= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -32,6 +34,8 @@ post-patch: ${WRKSRC}/layout/settings.menu @${SED} -e 's|/usr/local|${LOCALBASE}|g' \ < ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory + @${REINPLACE_CMD} -e s'|%%X11BASE%%|${X11BASE}|g' \ + ${WRKSRC}/simple-editor/GMenuSimpleEditor/menutreemodel.py post-install: @${MKDIR} ${PREFIX}/share/gnome/desktop-directories diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo index e7d3ff4072eb..df5f80bb947d 100644 --- a/x11/gnome-menus/distinfo +++ b/x11/gnome-menus/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-menus-2.10.2.tar.bz2) = 97b0ad03ea219cc8f5c02585db1d237e -SIZE (gnome2/gnome-menus-2.10.2.tar.bz2) = 350941 +MD5 (gnome2/gnome-menus-2.12.0.tar.bz2) = 615392c4f729f70c03aa3aa7dbe40a95 +SIZE (gnome2/gnome-menus-2.12.0.tar.bz2) = 393280 diff --git a/x11/gnome-menus/files/patch-Makefile.in b/x11/gnome-menus/files/patch-Makefile.in new file mode 100644 index 000000000000..510f1140fb48 --- /dev/null +++ b/x11/gnome-menus/files/patch-Makefile.in @@ -0,0 +1,11 @@ +--- Makefile.in.orig Thu Sep 8 13:59:53 2005 ++++ Makefile.in Thu Sep 8 14:00:08 2005 +@@ -205,7 +205,7 @@ + target_alias = @target_alias@ + NULL = + +-@HAVE_PYTHON_TRUE@PYTHON_SUBDIRS = python simple-editor ++@HAVE_PYTHON_TRUE@PYTHON_SUBDIRS = python + + ALL_SUBDIRS = \ + po \ diff --git a/x11/gnome-menus/files/patch-bugzilla-312502 b/x11/gnome-menus/files/patch-bugzilla-312502 deleted file mode 100644 index 0fa77890b7a9..000000000000 --- a/x11/gnome-menus/files/patch-bugzilla-312502 +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -p -r1.7.4.1 desktop-entries.c ---- libmenu/desktop-entries.c 5 Apr 2005 21:04:31 -0000 1.7.4.1 -+++ libmenu/desktop-entries.c 5 Aug 2005 07:57:37 -0000 -@@ -554,7 +554,7 @@ desktop_entry_add_legacy_category (Deskt - for (; entry->categories[i]; i++); - } - -- categories = g_new0 (GQuark, i + 1); -+ categories = g_new0 (GQuark, i + 2); - - i = 0; - if (entry->categories != NULL) diff --git a/x11/gnome-menus/files/patch-layout::settings.menu b/x11/gnome-menus/files/patch-layout::settings.menu index ae086261bc6e..115f03ce7599 100644 --- a/x11/gnome-menus/files/patch-layout::settings.menu +++ b/x11/gnome-menus/files/patch-layout::settings.menu @@ -1,16 +1,6 @@ ---- layout/settings.menu.orig Tue Jun 28 03:49:13 2005 -+++ layout/settings.menu Tue Jun 28 03:50:07 2005 -@@ -10,9 +10,6 @@ - <DefaultAppDirs/> - <DefaultDirectoryDirs/> - -- <!-- Read in overrides and child menus from applications-merged/ --> -- <DefaultMergeDirs/> -- - <!-- Merge in these other files as submenus --> - <Menu> - <Name>Preferences</Name> -@@ -25,10 +22,19 @@ +--- layout/settings.menu.orig Thu Apr 14 17:36:13 2005 ++++ layout/settings.menu Tue May 17 18:42:56 2005 +@@ -25,10 +25,19 @@ <Directory>System-Settings.directory</Directory> <Include> <And> @@ -26,7 +16,7 @@ </Include> </Menu> <!-- End System Settings --> + -+ <!-- Read in overrides and child menus from applications-merged/ --> ++ <!-- Read in overrides and child menus from settings-merged/ --> + <DefaultMergeDirs/> </Menu> <!-- End Applications --> diff --git a/x11/gnome-menus/files/patch-libmenu::menu-tree.c b/x11/gnome-menus/files/patch-libmenu::menu-tree.c deleted file mode 100644 index bd405098f5fa..000000000000 --- a/x11/gnome-menus/files/patch-libmenu::menu-tree.c +++ /dev/null @@ -1,172 +0,0 @@ ---- libmenu/menu-tree.c.orig Tue Jun 28 04:05:19 2005 -+++ libmenu/menu-tree.c Tue Jun 28 04:05:42 2005 -@@ -67,6 +67,12 @@ - gpointer user_data; - } MenuTreeMonitor; - -+typedef struct -+{ -+ MenuTreeDirectory *directory; -+ GSList *list; -+} MenuTreeListifyForeachData; -+ - struct MenuTreeDirectory - { - MenuTreeDirectory *parent; -@@ -75,6 +81,7 @@ - char *name; - - GSList *entries; -+ GSList *excluded_entries; - GSList *subdirs; - - guint refcount : 24; -@@ -750,17 +757,15 @@ - } - } - --GSList * --menu_tree_directory_get_entries (MenuTreeDirectory *directory) -+static GSList * -+copy_and_ref_entry_list (GSList *list) - { - GSList *retval; - GSList *tmp; - -- g_return_val_if_fail (directory != NULL, NULL); -- - retval = NULL; - -- tmp = directory->entries; -+ tmp = list; - while (tmp != NULL) - { - retval = g_slist_prepend (retval, -@@ -773,6 +778,22 @@ - } - - GSList * -+menu_tree_directory_get_entries (MenuTreeDirectory *directory) -+{ -+ g_return_val_if_fail (directory != NULL, NULL); -+ -+ return copy_and_ref_entry_list (directory->entries); -+} -+ -+GSList * -+menu_tree_directory_get_excluded_entries (MenuTreeDirectory *directory) -+{ -+ g_return_val_if_fail (directory != NULL, NULL); -+ -+ return copy_and_ref_entry_list (directory->excluded_entries); -+} -+ -+GSList * - menu_tree_directory_get_subdirs (MenuTreeDirectory *directory) - { - GSList *retval; -@@ -939,6 +960,7 @@ - retval->name = g_strdup (name); - retval->directory_entry = NULL; - retval->entries = NULL; -+ retval->excluded_entries = NULL; - retval->subdirs = NULL; - retval->only_unallocated = FALSE; - retval->refcount = 1; -@@ -2554,16 +2576,21 @@ - } - - static void --entries_listify_foreach (const char *desktop_file_id, -- DesktopEntry *desktop_entry, -- MenuTreeDirectory *directory) -+entries_listify_foreach (const char *desktop_file_id, -+ DesktopEntry *desktop_entry, -+ MenuTreeListifyForeachData *foreach_data) - { - MenuTreeEntry *entry; - -- entry = menu_tree_entry_new (directory, desktop_entry, desktop_file_id); -+ g_return_if_fail (foreach_data); -+ g_return_if_fail (foreach_data->directory); -+ -+ entry = menu_tree_entry_new (foreach_data->directory, -+ desktop_entry, -+ desktop_file_id); - -- directory->entries = g_slist_prepend (directory->entries, -- entry); -+ foreach_data->list = g_slist_prepend (foreach_data->list, -+ entry); - } - - static MenuTreeDirectory * -@@ -2576,11 +2603,14 @@ - MenuTreeDirectory *directory; - DesktopEntrySet *entry_pool; - DesktopEntrySet *entries; -+ DesktopEntrySet *excluded_entries; - gboolean deleted; - DesktopEntrySet *allocated_set; - gboolean only_unallocated; - GSList *tmp; - -+ MenuTreeListifyForeachData foreach_data; -+ - g_assert (menu_layout_node_get_type (layout) == MENU_LAYOUT_NODE_MENU); - g_assert (menu_layout_node_menu_get_name (layout) != NULL); - -@@ -2594,6 +2624,7 @@ - only_unallocated = FALSE; - - entries = desktop_entry_set_new (); -+ excluded_entries = desktop_entry_set_new (); - allocated_set = desktop_entry_set_new (); - - entry_pool = desktop_entry_set_new (); -@@ -2644,6 +2675,7 @@ - if (rule_set != NULL) - { - desktop_entry_set_union (entries, rule_set); -+ desktop_entry_set_subtract (excluded_entries, rule_set); - desktop_entry_set_union (allocated_set, rule_set); - desktop_entry_set_unref (rule_set); - } -@@ -2676,6 +2708,7 @@ - if (rule_set != NULL) - { - desktop_entry_set_subtract (entries, rule_set); -+ desktop_entry_set_union (excluded_entries, rule_set); - desktop_entry_set_unref (rule_set); - } - -@@ -2775,14 +2808,28 @@ - if (deleted) - { - desktop_entry_set_unref (entries); -+ desktop_entry_set_unref (excluded_entries); - menu_tree_directory_unref (directory); - return NULL; - } - -+ foreach_data.directory = directory; -+ foreach_data.list = NULL; - desktop_entry_set_foreach (entries, - (DesktopEntrySetForeachFunc) entries_listify_foreach, -- directory); -+ &foreach_data); - desktop_entry_set_unref (entries); -+ -+ directory->entries = foreach_data.list; -+ -+ foreach_data.directory = directory; -+ foreach_data.list = NULL; -+ desktop_entry_set_foreach (excluded_entries, -+ (DesktopEntrySetForeachFunc) entries_listify_foreach, -+ &foreach_data); -+ desktop_entry_set_unref (excluded_entries); -+ -+ directory->excluded_entries = foreach_data.list; - - tmp = directory->entries; - while (tmp != NULL) diff --git a/x11/gnome-menus/files/patch-libmenu::menu-tree.h b/x11/gnome-menus/files/patch-libmenu::menu-tree.h deleted file mode 100644 index e5f5ae76691d..000000000000 --- a/x11/gnome-menus/files/patch-libmenu::menu-tree.h +++ /dev/null @@ -1,14 +0,0 @@ ---- libmenu/menu-tree.h.orig Wed Jan 12 15:23:52 2005 -+++ libmenu/menu-tree.h Tue Mar 1 01:24:17 2005 -@@ -44,8 +44,9 @@ - MenuTreeDirectory *menu_tree_get_directory_from_path (MenuTree *tree, - const char *path); - --GSList *menu_tree_directory_get_entries (MenuTreeDirectory *directory); --GSList *menu_tree_directory_get_subdirs (MenuTreeDirectory *directory); -+GSList *menu_tree_directory_get_entries (MenuTreeDirectory *directory); -+GSList *menu_tree_directory_get_excluded_entries (MenuTreeDirectory *directory); -+GSList *menu_tree_directory_get_subdirs (MenuTreeDirectory *directory); - - MenuTreeDirectory *menu_tree_directory_ref (MenuTreeDirectory *directory); - void menu_tree_directory_unref (MenuTreeDirectory *directory); diff --git a/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py new file mode 100644 index 000000000000..2306f060952e --- /dev/null +++ b/x11/gnome-menus/files/patch-simple-editor_GMenuSimpleEditor_menutreemodel.py @@ -0,0 +1,20 @@ +--- simple-editor/GMenuSimpleEditor/menutreemodel.py.orig Mon Apr 11 05:36:04 2005 ++++ simple-editor/GMenuSimpleEditor/menutreemodel.py Tue Sep 6 11:04:46 2005 +@@ -29,7 +29,7 @@ + if os.environ.has_key ("XDG_CONFIG_DIRS"): + conf_dirs = os.environ["XDG_CONFIG_DIRS"] + if not conf_dirs: +- conf_dirs = "/etc/xdg" ++ conf_dirs = "%%X11BASE%%/etc/xdg" + + for conf_dir in conf_dirs.split (":"): + menu_file_path = os.path.join (conf_dir, "menus", menu_file) +@@ -51,7 +51,7 @@ + if os.environ.has_key ("XDG_DATA_DIRS"): + data_dirs = os.environ["XDG_DATA_DIRS"] + if not data_dirs: +- data_dirs = "/usr/local/share/:/usr/share/" ++ data_dirs = "%%X11BASE%%/share/gnome/:/usr/local/share/gnome/:%%X11BASE%%/share/:/usr/local/share/:/usr/share/" + + for data_dir in data_dirs.split (":"): + retval = load_icon_from_path (os.path.join (data_dir, "pixmaps", icon_value)) diff --git a/x11/gnome-menus/pkg-descr b/x11/gnome-menus/pkg-descr index 3f2b7c336c7f..7b27b4e2e339 100644 --- a/x11/gnome-menus/pkg-descr +++ b/x11/gnome-menus/pkg-descr @@ -10,3 +10,5 @@ Also contained here are the GNOME menu layout configuration files, .directory files and assorted menu related utility programs. -- gnome-menus README + +WWW: http://www.freedesktop.org/Standards/menu-spec diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist index 231a097159a2..82b691c297f3 100644 --- a/x11/gnome-menus/pkg-plist +++ b/x11/gnome-menus/pkg-plist @@ -2,16 +2,18 @@ bin/gnome-menu-spec-test etc/xdg/menus/applications.menu etc/xdg/menus/preferences.menu etc/xdg/menus/settings.menu -include/gnome-menus/menu-tree.h +include/gnome-menus/gmenu-tree.h lib/libgnome-menu.a lib/libgnome-menu.so -lib/libgnome-menu.so.0 +lib/libgnome-menu.so.2 +%%PYTHON_SITELIBDIR%%/gmenu.so libdata/pkgconfig/libgnome-menu.pc share/gnome/desktop-directories/Accessibility.directory share/gnome/desktop-directories/Accessories.directory share/gnome/desktop-directories/Applications.directory +share/gnome/desktop-directories/Desktop.directory share/gnome/desktop-directories/Development.directory -share/gnome/desktop-directories/Edutainment.directory +share/gnome/desktop-directories/Education.directory share/gnome/desktop-directories/Games.directory share/gnome/desktop-directories/Graphics.directory share/gnome/desktop-directories/Internet.directory @@ -19,6 +21,7 @@ share/gnome/desktop-directories/KDE.directory share/gnome/desktop-directories/Multimedia.directory share/gnome/desktop-directories/Office.directory share/gnome/desktop-directories/Other.directory +share/gnome/desktop-directories/Preferences.directory share/gnome/desktop-directories/Settings-Accessibility.directory share/gnome/desktop-directories/Settings.directory share/gnome/desktop-directories/System-Settings.directory @@ -44,12 +47,14 @@ share/locale/gu/LC_MESSAGES/gnome-menus.mo share/locale/he/LC_MESSAGES/gnome-menus.mo share/locale/hi/LC_MESSAGES/gnome-menus.mo share/locale/hu/LC_MESSAGES/gnome-menus.mo +share/locale/hy/LC_MESSAGES/gnome-menus.mo share/locale/id/LC_MESSAGES/gnome-menus.mo share/locale/it/LC_MESSAGES/gnome-menus.mo share/locale/ja/LC_MESSAGES/gnome-menus.mo share/locale/ko/LC_MESSAGES/gnome-menus.mo share/locale/lt/LC_MESSAGES/gnome-menus.mo share/locale/mk/LC_MESSAGES/gnome-menus.mo +share/locale/mr/LC_MESSAGES/gnome-menus.mo share/locale/ms/LC_MESSAGES/gnome-menus.mo share/locale/nb/LC_MESSAGES/gnome-menus.mo share/locale/ne/LC_MESSAGES/gnome-menus.mo @@ -64,7 +69,6 @@ share/locale/ro/LC_MESSAGES/gnome-menus.mo share/locale/ru/LC_MESSAGES/gnome-menus.mo share/locale/rw/LC_MESSAGES/gnome-menus.mo share/locale/sk/LC_MESSAGES/gnome-menus.mo -share/locale/sl/LC_MESSAGES/gnome-menus.mo share/locale/sq/LC_MESSAGES/gnome-menus.mo share/locale/sr/LC_MESSAGES/gnome-menus.mo share/locale/sr@Latn/LC_MESSAGES/gnome-menus.mo @@ -80,7 +84,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo @unexec rmdir %D/share/locale/xh 2> /dev/null || true @unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/rw 2> /dev/null || true +@unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/mr 2> /dev/null || true +@unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/hy 2> /dev/null || true @dirrm share/gnome/desktop-directories @dirrm include/gnome-menus @dirrm etc/xdg/menus @dirrm etc/xdg +@unexec rmdir %D/%%PYTHON_SITELIBDIR%% 2> /dev/null || true +@unexec rmdir %D/%%PYTHON_LIBDIR%% 2> /dev/null || true diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index de413e237e36..91d3d77eba18 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -3,30 +3,35 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnomepanel/Makefile,v 1.109 2005/10/08 19:41:40 marcus Exp $ # PORTNAME= gnomepanel -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-panel/2.10 +MASTER_SITE_SUBDIR= sources/gnome-panel/2.12 DISTNAME= gnome-panel-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Panel component for the GNOME 2 Desktop +RUN_DEPENDS= gnome-menu-editor:${PORTSDIR}/deskutils/gnome-menu-editor + USE_BZIP2= yes INSTALLS_OMF= yes INSTALLS_SHLIB= yes +INSTALLS_ICONS= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \ - libwnck gnomemenus + libwnck gnomemenus gnomedocutils ltverhack WANT_GNOME= yes GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share \ --with-kde-docdir=${LOCALBASE}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -54,6 +59,8 @@ CONFIGURE_ARGS+=--disable-eds .endif post-patch: + @${REINPLACE_CMD} -e 's|evolution.desktop|evolution-2.4.desktop|g' \ + ${WRKSRC}/gnome-panel/panel-default-setup.entries.in .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \ ( ${OSVERSION} < 503101 ) .for po in da.po it.po zh_CN.po zh_TW.po diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo index ddbc3312644e..ca8232c0a3a4 100644 --- a/x11/gnome-panel/distinfo +++ b/x11/gnome-panel/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-panel-2.10.2.tar.bz2) = c1756cac74a4c8b45ce3b9a884515baa -SIZE (gnome2/gnome-panel-2.10.2.tar.bz2) = 2366827 +MD5 (gnome2/gnome-panel-2.12.1.tar.bz2) = a532717e8ac7f67b7198c256909cd7dd +SIZE (gnome2/gnome-panel-2.12.1.tar.bz2) = 2468498 diff --git a/x11/gnome-panel/files/patch-gnome-panel::GNOME_Panel.server.in b/x11/gnome-panel/files/patch-gnome-panel::GNOME_Panel.server.in deleted file mode 100644 index b89c57317f90..000000000000 --- a/x11/gnome-panel/files/patch-gnome-panel::GNOME_Panel.server.in +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- gnome-panel/GNOME_Panel.server.in 2002/05/09 21:00:58 1.1 -+++ gnome-panel/GNOME_Panel.server.in 2002/05/09 21:01:11 -@@ -1,6 +1,6 @@ - <oaf_info> - --<oaf_server iid="OAFIID:GNOME_PanelShell" type="exe" location="panel-2"> -+<oaf_server iid="OAFIID:GNOME_PanelShell" type="exe" location="gnome-panel"> - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Vertigo/PanelShell:1.0"/> - <item value="IDL:Bonobo/Unknown:1.0"/> diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist index dc44baa958e0..e77d26d94c58 100644 --- a/x11/gnome-panel/pkg-plist +++ b/x11/gnome-panel/pkg-plist @@ -12,7 +12,7 @@ include/panel-2.0/panel-applet-gconf.h include/panel-2.0/panel-applet.h lib/libpanel-applet-2.a lib/libpanel-applet-2.so -lib/libpanel-applet-2.so.1 +lib/libpanel-applet-2.so.0 libdata/bonobo/servers/GNOME_ClockApplet_Factory.server libdata/bonobo/servers/GNOME_FishApplet_Factory.server libdata/bonobo/servers/GNOME_NotificationAreaApplet.server @@ -71,6 +71,15 @@ share/gnome/help/clock/ja/legal.xml share/gnome/help/clock/ko/clock.xml share/gnome/help/clock/ko/figures/clock_applet.png share/gnome/help/clock/ko/legal.xml +share/gnome/help/clock/nl/clock.xml +share/gnome/help/clock/nl/figures/clock_applet.png +share/gnome/help/clock/nl/legal.xml +share/gnome/help/clock/pa/clock.xml +share/gnome/help/clock/pa/figures/clock_applet.png +share/gnome/help/clock/pa/legal.xml +share/gnome/help/clock/sr/clock.xml +share/gnome/help/clock/sr/figures/clock_applet.png +share/gnome/help/clock/sr/legal.xml share/gnome/help/clock/sv/clock.xml share/gnome/help/clock/sv/figures/clock_applet.png share/gnome/help/clock/sv/legal.xml @@ -83,25 +92,14 @@ share/gnome/help/clock/zh_CN/legal.xml share/gnome/help/clock/zh_TW/clock.xml share/gnome/help/clock/zh_TW/figures/clock_applet.png share/gnome/help/clock/zh_TW/legal.xml -share/gnome/help/fish-applet-2/C/figures/fish_applet.png -share/gnome/help/fish-applet-2/C/fish-applet-2.xml -share/gnome/help/fish-applet-2/C/legal.xml share/gnome/help/fish-applet-2/de/figures/fish_applet.png share/gnome/help/fish-applet-2/de/figures/fish_settings.png share/gnome/help/fish-applet-2/de/fish-applet-2.xml share/gnome/help/fish-applet-2/de/legal.xml -share/gnome/help/fish-applet-2/es/figures/fish_applet.png -share/gnome/help/fish-applet-2/es/figures/fish_settings.png -share/gnome/help/fish-applet-2/es/fish-applet-2.xml -share/gnome/help/fish-applet-2/es/legal.xml share/gnome/help/fish-applet-2/fr/figures/fish_applet.png share/gnome/help/fish-applet-2/fr/figures/fish_settings.png share/gnome/help/fish-applet-2/fr/fish-applet-2.xml share/gnome/help/fish-applet-2/fr/legal.xml -share/gnome/help/fish-applet-2/it/figures/fish_applet.png -share/gnome/help/fish-applet-2/it/figures/fish_settings.png -share/gnome/help/fish-applet-2/it/fish-applet-2.xml -share/gnome/help/fish-applet-2/it/legal.xml share/gnome/help/fish-applet-2/ja/figures/fish_applet.png share/gnome/help/fish-applet-2/ja/fish-applet-2.xml share/gnome/help/fish-applet-2/ja/legal.xml @@ -113,9 +111,6 @@ share/gnome/help/fish-applet-2/sv/figures/fish_applet.png share/gnome/help/fish-applet-2/sv/figures/fish_settings.png share/gnome/help/fish-applet-2/sv/fish-applet-2.xml share/gnome/help/fish-applet-2/sv/legal.xml -share/gnome/help/fish-applet-2/uk/figures/fish_applet.png -share/gnome/help/fish-applet-2/uk/fish-applet-2.xml -share/gnome/help/fish-applet-2/uk/legal.xml share/gnome/help/fish-applet-2/zh_CN/figures/fish_applet.png share/gnome/help/fish-applet-2/zh_CN/figures/fish_settings.png share/gnome/help/fish-applet-2/zh_CN/fish-applet-2.xml @@ -124,6 +119,18 @@ share/gnome/help/fish-applet-2/zh_TW/figures/fish_applet.png share/gnome/help/fish-applet-2/zh_TW/figures/fish_settings.png share/gnome/help/fish-applet-2/zh_TW/fish-applet-2.xml share/gnome/help/fish-applet-2/zh_TW/legal.xml +share/gnome/help/fish/C/figures/fish_applet.png +share/gnome/help/fish/C/fish.xml +share/gnome/help/fish/C/legal.xml +share/gnome/help/fish/es/figures/fish_applet.png +share/gnome/help/fish/es/fish.xml +share/gnome/help/fish/es/legal.xml +share/gnome/help/fish/it/figures/fish_applet.png +share/gnome/help/fish/it/fish.xml +share/gnome/help/fish/it/legal.xml +share/gnome/help/fish/uk/figures/fish_applet.png +share/gnome/help/fish/uk/fish.xml +share/gnome/help/fish/uk/legal.xml share/gnome/help/window-list/C/figures/window_list_applet.png share/gnome/help/window-list/C/figures/window_list_group_applet.png share/gnome/help/window-list/C/legal.xml @@ -134,7 +141,6 @@ share/gnome/help/window-list/de/figures/window_list_group_applet.png share/gnome/help/window-list/de/legal.xml share/gnome/help/window-list/de/window-list.xml share/gnome/help/window-list/es/figures/window_list_applet.png -share/gnome/help/window-list/es/figures/window_list_group.png share/gnome/help/window-list/es/figures/window_list_group_applet.png share/gnome/help/window-list/es/legal.xml share/gnome/help/window-list/es/window-list.xml @@ -144,7 +150,6 @@ share/gnome/help/window-list/fr/figures/window_list_group_applet.png share/gnome/help/window-list/fr/legal.xml share/gnome/help/window-list/fr/window-list.xml share/gnome/help/window-list/it/figures/window_list_applet.png -share/gnome/help/window-list/it/figures/window_list_group.png share/gnome/help/window-list/it/figures/window_list_group_applet.png share/gnome/help/window-list/it/legal.xml share/gnome/help/window-list/it/window-list.xml @@ -158,8 +163,8 @@ share/gnome/help/window-list/ko/figures/window_list_group_applet.png share/gnome/help/window-list/ko/legal.xml share/gnome/help/window-list/ko/window-list.xml share/gnome/help/window-list/sv/figures/window_list_applet.png -share/gnome/help/window-list/sv/figures/window_list_group.png share/gnome/help/window-list/sv/figures/window_list_group_applet.png +share/gnome/help/window-list/sv/figures/window_list_group.png share/gnome/help/window-list/sv/legal.xml share/gnome/help/window-list/sv/window-list.xml share/gnome/help/window-list/uk/figures/window_list_applet.png @@ -184,7 +189,6 @@ share/gnome/help/workspace-switcher/de/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/de/legal.xml share/gnome/help/workspace-switcher/de/workspace-switcher.xml share/gnome/help/workspace-switcher/es/figures/workspace_switcher_applet.png -share/gnome/help/workspace-switcher/es/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/es/legal.xml share/gnome/help/workspace-switcher/es/workspace-switcher.xml share/gnome/help/workspace-switcher/fr/figures/workspace_switcher_applet.png @@ -192,7 +196,6 @@ share/gnome/help/workspace-switcher/fr/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/fr/legal.xml share/gnome/help/workspace-switcher/fr/workspace-switcher.xml share/gnome/help/workspace-switcher/it/figures/workspace_switcher_applet.png -share/gnome/help/workspace-switcher/it/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/it/legal.xml share/gnome/help/workspace-switcher/it/workspace-switcher.xml share/gnome/help/workspace-switcher/ja/figures/workspace_switcher_applet.png @@ -202,6 +205,9 @@ share/gnome/help/workspace-switcher/ko/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/ko/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/ko/legal.xml share/gnome/help/workspace-switcher/ko/workspace-switcher.xml +share/gnome/help/workspace-switcher/nl/figures/workspace_switcher_applet.png +share/gnome/help/workspace-switcher/nl/legal.xml +share/gnome/help/workspace-switcher/nl/workspace-switcher.xml share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/sv/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/sv/legal.xml @@ -218,50 +224,61 @@ share/gnome/help/workspace-switcher/zh_TW/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/zh_TW/legal.xml share/gnome/help/workspace-switcher/zh_TW/workspace-switcher.xml share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl -share/gnome/omf/gnome-panel/clock-C.omf +share/gnome/omf/clock/clock-C.omf +share/gnome/omf/clock/clock-de.omf +share/gnome/omf/clock/clock-es.omf +share/gnome/omf/clock/clock-it.omf +share/gnome/omf/clock/clock-fr.omf +share/gnome/omf/clock/clock-ja.omf +share/gnome/omf/clock/clock-ko.omf +share/gnome/omf/clock/clock-nl.omf +share/gnome/omf/clock/clock-pa.omf +share/gnome/omf/clock/clock-sr.omf +share/gnome/omf/clock/clock-sv.omf +share/gnome/omf/clock/clock-uk.omf +share/gnome/omf/clock/clock-zh_CN.omf +share/gnome/omf/clock/clock-zh_TW.omf +share/gnome/omf/fish/fish-C.omf +share/gnome/omf/fish/fish-es.omf +share/gnome/omf/fish/fish-it.omf +share/gnome/omf/fish/fish-uk.omf share/gnome/omf/gnome-panel/clock-de.omf -share/gnome/omf/gnome-panel/clock-es.omf share/gnome/omf/gnome-panel/clock-fr.omf -share/gnome/omf/gnome-panel/clock-it.omf share/gnome/omf/gnome-panel/clock-ja.omf share/gnome/omf/gnome-panel/clock-ko.omf share/gnome/omf/gnome-panel/clock-sv.omf -share/gnome/omf/gnome-panel/clock-uk.omf share/gnome/omf/gnome-panel/clock-zh_CN.omf share/gnome/omf/gnome-panel/clock-zh_TW.omf -share/gnome/omf/gnome-panel/fish-applet-2-C.omf share/gnome/omf/gnome-panel/fish-applet-2-de.omf -share/gnome/omf/gnome-panel/fish-applet-2-es.omf share/gnome/omf/gnome-panel/fish-applet-2-fr.omf -share/gnome/omf/gnome-panel/fish-applet-2-it.omf share/gnome/omf/gnome-panel/fish-applet-2-ja.omf share/gnome/omf/gnome-panel/fish-applet-2-ko.omf share/gnome/omf/gnome-panel/fish-applet-2-sv.omf -share/gnome/omf/gnome-panel/fish-applet-2-uk.omf share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf -share/gnome/omf/gnome-panel/window-list-C.omf share/gnome/omf/gnome-panel/window-list-de.omf -share/gnome/omf/gnome-panel/window-list-es.omf share/gnome/omf/gnome-panel/window-list-fr.omf -share/gnome/omf/gnome-panel/window-list-it.omf share/gnome/omf/gnome-panel/window-list-ja.omf share/gnome/omf/gnome-panel/window-list-ko.omf share/gnome/omf/gnome-panel/window-list-sv.omf -share/gnome/omf/gnome-panel/window-list-uk.omf share/gnome/omf/gnome-panel/window-list-zh_CN.omf share/gnome/omf/gnome-panel/window-list-zh_TW.omf -share/gnome/omf/gnome-panel/workspace-switcher-C.omf share/gnome/omf/gnome-panel/workspace-switcher-de.omf -share/gnome/omf/gnome-panel/workspace-switcher-es.omf share/gnome/omf/gnome-panel/workspace-switcher-fr.omf -share/gnome/omf/gnome-panel/workspace-switcher-it.omf share/gnome/omf/gnome-panel/workspace-switcher-ja.omf share/gnome/omf/gnome-panel/workspace-switcher-ko.omf share/gnome/omf/gnome-panel/workspace-switcher-sv.omf -share/gnome/omf/gnome-panel/workspace-switcher-uk.omf share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf +share/gnome/omf/window-list/window-list-C.omf +share/gnome/omf/window-list/window-list-es.omf +share/gnome/omf/window-list/window-list-it.omf +share/gnome/omf/window-list/window-list-uk.omf +share/gnome/omf/workspace-switcher/workspace-switcher-C.omf +share/gnome/omf/workspace-switcher/workspace-switcher-es.omf +share/gnome/omf/workspace-switcher/workspace-switcher-it.omf +share/gnome/omf/workspace-switcher/workspace-switcher-nl.omf +share/gnome/omf/workspace-switcher/workspace-switcher-uk.omf share/gnome/panel/glade/fish.glade share/gnome/panel/glade/panel-properties-dialog.glade share/gnome/panel/glade/panel-run-dialog.glade @@ -313,6 +330,7 @@ share/locale/id/LC_MESSAGES/gnome-panel-2.0.mo share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/ku/LC_MESSAGES/gnome-panel-2.0.mo share/locale/li/LC_MESSAGES/gnome-panel-2.0.mo share/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo @@ -344,6 +362,7 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sr@ije/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sv/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ta/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/te/LC_MESSAGES/gnome-panel-2.0.mo share/locale/th/LC_MESSAGES/gnome-panel-2.0.mo share/locale/tr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/uk/LC_MESSAGES/gnome-panel-2.0.mo @@ -374,7 +393,11 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true @dirrm share/gnome/panel/pixmaps @dirrm share/gnome/panel/glade +@dirrm share/gnome/omf/workspace-switcher +@dirrm share/gnome/omf/window-list @dirrm share/gnome/omf/gnome-panel +@dirrm share/gnome/omf/fish +@dirrm share/gnome/omf/clock @dirrm share/gnome/idl/gnome-panel-2.0 @dirrm share/gnome/help/workspace-switcher/zh_TW/figures @dirrm share/gnome/help/workspace-switcher/zh_TW @@ -384,6 +407,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/workspace-switcher/uk @dirrm share/gnome/help/workspace-switcher/sv/figures @dirrm share/gnome/help/workspace-switcher/sv +@dirrm share/gnome/help/workspace-switcher/nl/figures +@dirrm share/gnome/help/workspace-switcher/nl @dirrm share/gnome/help/workspace-switcher/ko/figures @dirrm share/gnome/help/workspace-switcher/ko @dirrm share/gnome/help/workspace-switcher/ja/figures @@ -426,25 +451,26 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/fish-applet-2/zh_TW @dirrm share/gnome/help/fish-applet-2/zh_CN/figures @dirrm share/gnome/help/fish-applet-2/zh_CN -@dirrm share/gnome/help/fish-applet-2/uk/figures -@dirrm share/gnome/help/fish-applet-2/uk @dirrm share/gnome/help/fish-applet-2/sv/figures @dirrm share/gnome/help/fish-applet-2/sv @dirrm share/gnome/help/fish-applet-2/ko/figures @dirrm share/gnome/help/fish-applet-2/ko @dirrm share/gnome/help/fish-applet-2/ja/figures @dirrm share/gnome/help/fish-applet-2/ja -@dirrm share/gnome/help/fish-applet-2/it/figures -@dirrm share/gnome/help/fish-applet-2/it @dirrm share/gnome/help/fish-applet-2/fr/figures @dirrm share/gnome/help/fish-applet-2/fr -@dirrm share/gnome/help/fish-applet-2/es/figures -@dirrm share/gnome/help/fish-applet-2/es @dirrm share/gnome/help/fish-applet-2/de/figures @dirrm share/gnome/help/fish-applet-2/de -@dirrm share/gnome/help/fish-applet-2/C/figures -@dirrm share/gnome/help/fish-applet-2/C @dirrm share/gnome/help/fish-applet-2 +@dirrm share/gnome/help/fish/uk/figures +@dirrm share/gnome/help/fish/uk +@dirrm share/gnome/help/fish/it/figures +@dirrm share/gnome/help/fish/it +@dirrm share/gnome/help/fish/es/figures +@dirrm share/gnome/help/fish/es +@dirrm share/gnome/help/fish/C/figures +@dirrm share/gnome/help/fish/C +@dirrm share/gnome/help/fish @dirrm share/gnome/help/clock/zh_TW/figures @dirrm share/gnome/help/clock/zh_TW @dirrm share/gnome/help/clock/zh_CN/figures @@ -453,6 +479,12 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/clock/uk @dirrm share/gnome/help/clock/sv/figures @dirrm share/gnome/help/clock/sv +@dirrm share/gnome/help/clock/sr/figures +@dirrm share/gnome/help/clock/sr +@dirrm share/gnome/help/clock/pa/figures +@dirrm share/gnome/help/clock/pa +@dirrm share/gnome/help/clock/nl/figures +@dirrm share/gnome/help/clock/nl @dirrm share/gnome/help/clock/ko/figures @dirrm share/gnome/help/clock/ko @dirrm share/gnome/help/clock/ja/figures diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 1f48df2e0f83..274a00a9a3ed 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -3,16 +3,18 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnomesession/Makefile,v 1.67 2005/10/31 19:46:29 adamw Exp $ # PORTNAME= gnomesession -PORTVERSION= 2.10.0 +PORTVERSION= 2.12.0 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ ${MASTER_SITE_LOCAL:S/$/:local/} \ - http://people.FreeBSD.org/~pav/:local -MASTER_SITE_SUBDIR= sources/gnome-session/2.10 \ - pav/:local + http://people.FreeBSD.org/~adamw/images/gnome_splashes/2.12/:local +MASTER_SITE_SUBDIR= sources/gnome-session/2.12 \ + adamw/:local DISTNAME= gnome-session-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${SPLASHES}:local @@ -26,16 +28,16 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 \ - session-properties.1 gnome-session-save.1 +MAN1= gnome-session.1 gnome-wm.1 session-properties.1 \ + gnome-session-save.1 MAN5= default.session.5 GCONF_SCHEMAS= gnome-session.schemas -SPLASHES= freebsd-splashes-gnome-2.10.tar +SPLASHES= freebsd-splashes-gnome-2.12.1.tar post-extract: cd ${WRKDIR} && ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES} @@ -43,10 +45,10 @@ post-extract: post-install: ${INSTALL_DATA} ${WRKSRC}/gnome-session/gnome-splash.png \ ${PREFIX}/share/gnome/pixmaps/splash/original-gnome-splash.png - ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.10/franz_klammer-2.png \ + ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/domix-splash-2.12.png \ ${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png -.for splash in adamw.png banana_flex.png franco_malatacca.jpg franz_klammer-1.png franz_klammer-3.png radek.png - ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.10/${splash} \ +.for splash in MaMBaNgGaoX-2.12.png adamw-piggy-2.12.png adamw-trophy-2.12.png andreas-slogan-2.12.png andreas-splash-2.12.png domix-splash-2.12.png domix-splash2-2.12.png mumija-2.12.png mumija2-2.12.png mumija3-2.12.png tremulant-2.12.png tremulant-blood-2.12.png tremulant-brushed-metal-2.12.png + ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/${splash} \ ${PREFIX}/share/gnome/pixmaps/splash .endfor diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index 5f305e45c84f..cfcfc5533884 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,4 +1,4 @@ -MD5 (gnome2/gnome-session-2.10.0.tar.bz2) = cbeb2db49dac11bf8088e6b025265fff -SIZE (gnome2/gnome-session-2.10.0.tar.bz2) = 796754 -MD5 (gnome2/freebsd-splashes-gnome-2.10.tar) = 92cfd1945f9a48dd8df3981935e9ef34 -SIZE (gnome2/freebsd-splashes-gnome-2.10.tar) = 462336 +MD5 (gnome2/gnome-session-2.12.0.tar.bz2) = 835e9340d23e139430224b931ff4c597 +SIZE (gnome2/gnome-session-2.12.0.tar.bz2) = 864397 +MD5 (gnome2/freebsd-splashes-gnome-2.12.1.tar) = 4a098f0f2295c3333acff185d4bed5aa +SIZE (gnome2/freebsd-splashes-gnome-2.12.1.tar) = 1280000 diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist index 999c30043083..17d898f1ee23 100644 --- a/x11/gnome-session/pkg-plist +++ b/x11/gnome-session/pkg-plist @@ -2,19 +2,25 @@ bin/gnome-session bin/gnome-session-properties bin/gnome-session-remove bin/gnome-session-save -bin/gnome-smproxy bin/gnome-wm share/gnome/applications/session-properties.desktop share/gnome/default.session share/gnome/default.wm -share/gnome/pixmaps/splash/adamw.png -share/gnome/pixmaps/splash/banana_flex.png -share/gnome/pixmaps/splash/franco_malatacca.jpg -share/gnome/pixmaps/splash/franz_klammer-1.png -share/gnome/pixmaps/splash/franz_klammer-3.png +share/gnome/pixmaps/splash/MaMBaNgGaoX-2.12.png +share/gnome/pixmaps/splash/adamw-piggy-2.12.png +share/gnome/pixmaps/splash/adamw-trophy-2.12.png +share/gnome/pixmaps/splash/andreas-slogan-2.12.png +share/gnome/pixmaps/splash/andreas-splash-2.12.png +share/gnome/pixmaps/splash/domix-splash-2.12.png +share/gnome/pixmaps/splash/domix-splash2-2.12.png share/gnome/pixmaps/splash/gnome-splash.png +share/gnome/pixmaps/splash/mumija-2.12.png +share/gnome/pixmaps/splash/mumija2-2.12.png +share/gnome/pixmaps/splash/mumija3-2.12.png share/gnome/pixmaps/splash/original-gnome-splash.png -share/gnome/pixmaps/splash/radek.png +share/gnome/pixmaps/splash/tremulant-2.12.png +share/gnome/pixmaps/splash/tremulant-blood-2.12.png +share/gnome/pixmaps/splash/tremulant-brushed-metal-2.12.png share/locale/af/LC_MESSAGES/gnome-session-2.0.mo share/locale/am/LC_MESSAGES/gnome-session-2.0.mo share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo @@ -45,6 +51,7 @@ share/locale/he/LC_MESSAGES/gnome-session-2.0.mo share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo share/locale/hr/LC_MESSAGES/gnome-session-2.0.mo share/locale/hu/LC_MESSAGES/gnome-session-2.0.mo +share/locale/hy/LC_MESSAGES/gnome-session-2.0.mo share/locale/id/LC_MESSAGES/gnome-session-2.0.mo share/locale/is/LC_MESSAGES/gnome-session-2.0.mo share/locale/it/LC_MESSAGES/gnome-session-2.0.mo @@ -82,9 +89,12 @@ share/locale/th/LC_MESSAGES/gnome-session-2.0.mo share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo +share/locale/rw/LC_MESSAGES/gnome-session-2.0.mo share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo +@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile index 6a58361c7fcc..f6dded8a0189 100644 --- a/x11/gnome-terminal/Makefile +++ b/x11/gnome-terminal/Makefile @@ -3,14 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnometerminal/Makefile,v 1.52 2005/10/14 20:39:58 adamw Exp $ # PORTNAME= gnometerminal -PORTVERSION= 2.10.0 -PORTREVISION= 1 +PORTVERSION= 2.12.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-terminal/2.10 +MASTER_SITE_SUBDIR= sources/gnome-terminal/2.12 DISTNAME= gnome-terminal-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -23,7 +23,7 @@ USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui vte -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo index bb6a1fa2132f..13b21339bab4 100644 --- a/x11/gnome-terminal/distinfo +++ b/x11/gnome-terminal/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-terminal-2.10.0.tar.bz2) = 062744daca0c7f708b8c52f47b5db0d1 -SIZE (gnome2/gnome-terminal-2.10.0.tar.bz2) = 2334171 +MD5 (gnome2/gnome-terminal-2.12.0.tar.bz2) = 483c9397dd165845e2528a80e3df6dfc +SIZE (gnome2/gnome-terminal-2.12.0.tar.bz2) = 1684178 diff --git a/x11/gnome-terminal/files/patch-src::terminal-screen.c b/x11/gnome-terminal/files/patch-src::terminal-screen.c index c7cf1b8ce449..0198f748c37d 100644 --- a/x11/gnome-terminal/files/patch-src::terminal-screen.c +++ b/x11/gnome-terminal/files/patch-src::terminal-screen.c @@ -1,27 +1,23 @@ ---- src/terminal-screen.c.orig Thu Mar 3 15:13:08 2005 -+++ src/terminal-screen.c Wed Mar 16 03:11:08 2005 -@@ -246,18 +246,18 @@ - #define USER "[" USERCHARS "]+(:["PASSCHARS "]+)?" +--- src/terminal-screen.c.orig Fri Jul 1 20:37:58 2005 ++++ src/terminal-screen.c Tue Jul 5 13:26:21 2005 +@@ -248,16 +248,16 @@ terminal_screen_init (TerminalScreen *sc + #define URLPATH "/[" PATHCHARS "]*[^]'.}>) \t\r\n,\\\"]" terminal_widget_match_add (screen->priv->term, -- "\\<(" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?" -- "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?\\>", FLAVOR_AS_IS); -+ "[[:<:]](" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?" -+ "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?[[:>:]]", FLAVOR_AS_IS); +- "\\<(" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_AS_IS); ++ "[[:<:]](" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_AS_IS); terminal_widget_match_add (screen->priv->term, -- "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?" -- "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?\\>", FLAVOR_DEFAULT_TO_HTTP); -+ "[[:<:]](www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?" -+ "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?[[:>:]]", FLAVOR_DEFAULT_TO_HTTP); +- "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_DEFAULT_TO_HTTP); ++ "[[:<:]]<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_DEFAULT_TO_HTTP); terminal_widget_match_add (screen->priv->term, - "\\<(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>", FLAVOR_MAILTO); -+ "[[:<:]](mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+[[:>:]]", FLAVOR_MAILTO); ++ "[[:<:]](mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>", FLAVOR_MAILTO); terminal_widget_match_add (screen->priv->term, - "\\<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS); -+ "[[:<:]]news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+@[" HOSTCHARS ".]+(:[0-9]+)?[[:>:]]", FLAVOR_AS_IS); ++ "[[:<:]]<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS); terminal_screen_setup_dnd (screen); diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist index 22d4a5870a1e..721f659b8cd1 100644 --- a/x11/gnome-terminal/pkg-plist +++ b/x11/gnome-terminal/pkg-plist @@ -103,6 +103,7 @@ share/locale/he/LC_MESSAGES/gnome-terminal.mo share/locale/hi/LC_MESSAGES/gnome-terminal.mo share/locale/hr/LC_MESSAGES/gnome-terminal.mo share/locale/hu/LC_MESSAGES/gnome-terminal.mo +share/locale/hy/LC_MESSAGES/gnome-terminal.mo share/locale/id/LC_MESSAGES/gnome-terminal.mo share/locale/it/LC_MESSAGES/gnome-terminal.mo share/locale/ja/LC_MESSAGES/gnome-terminal.mo @@ -124,6 +125,7 @@ share/locale/pt/LC_MESSAGES/gnome-terminal.mo share/locale/pt_BR/LC_MESSAGES/gnome-terminal.mo share/locale/ro/LC_MESSAGES/gnome-terminal.mo share/locale/ru/LC_MESSAGES/gnome-terminal.mo +share/locale/rw/LC_MESSAGES/gnome-terminal.mo share/locale/sk/LC_MESSAGES/gnome-terminal.mo share/locale/sl/LC_MESSAGES/gnome-terminal.mo share/locale/sq/LC_MESSAGES/gnome-terminal.mo @@ -136,6 +138,7 @@ share/locale/tr/LC_MESSAGES/gnome-terminal.mo share/locale/uk/LC_MESSAGES/gnome-terminal.mo share/locale/vi/LC_MESSAGES/gnome-terminal.mo share/locale/wa/LC_MESSAGES/gnome-terminal.mo +share/locale/xh/LC_MESSAGES/gnome-terminal.mo share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo @dirrm share/gnome/omf/gnome-terminal diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile index 735baf420383..a5bb628cf551 100644 --- a/x11/gnome2-fifth-toe/Makefile +++ b/x11/gnome2-fifth-toe/Makefile @@ -3,16 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnome2-fifth-toe/Makefile,v 1.73 2005/08/26 03:21:23 marcus Exp $ # -PORTNAME= gnome2-fifth-toe -PORTVERSION= 2.10.2 +PORTREVISION= 0 CATEGORIES= x11 gnome -MASTER_SITES= # empty -DISTFILES= # empty -EXTRACT_ONLY= # empty +PKGNAMESUFFIX= -fifth-toe -MAINTAINER= gnome@FreeBSD.org COMMENT= Additional GNOME 2 applications not included in the core desktop RUN_DEPENDS= pan:${PORTSDIR}/news/pan2 \ @@ -35,14 +32,14 @@ RUN_DEPENDS= pan:${PORTSDIR}/news/pan2 \ jamboree:${PORTSDIR}/audio/jamboree \ ${X11BASE}/share/gnome/pixmaps/glines/classic.png:${PORTSDIR}/games/gnomegames2-extra-data \ nautilus-sendto:${PORTSDIR}/deskutils/nautilus-sendto \ - evince:${PORTSDIR}/graphics/evince \ goobox:${PORTSDIR}/audio/goobox \ - inkscape:${PORTSDIR}/graphics/inkscape + inkscape:${PORTSDIR}/graphics/inkscape \ + gpdf:${PORTSDIR}/graphics/gpdf \ + ggv:${PORTSDIR}/print/ggv -.include <bsd.port.pre.mk> +MASTERDIR= ${.CURDIR}/../gnome2 +GNOME_SLAVE= yes -NO_BUILD= yes +DESCR= ${.CURDIR}/pkg-descr -do-install: # empty - -.include <bsd.port.post.mk> +.include "${MASTERDIR}/Makefile" diff --git a/x11/gnome2-fifth-toe/pkg-plist b/x11/gnome2-fifth-toe/pkg-plist deleted file mode 100644 index 549a621fec0c..000000000000 --- a/x11/gnome2-fifth-toe/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -@comment this plist intentionally left empty diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile index 924d5e1957b7..dab054657c59 100644 --- a/x11/gnome2-lite/Makefile +++ b/x11/gnome2-lite/Makefile @@ -3,17 +3,13 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnome2-lite/Makefile,v 1.43 2005/09/25 23:58:48 marcus Exp $ # -PORTNAME= gnome2 -PORTVERSION= 2.10.2 +PORTREVISION= 0 CATEGORIES= x11 gnome -MASTER_SITES= # empty PKGNAMESUFFIX= -lite -DISTFILES= # empty -EXTRACT_ONLY= # empty -MAINTAINER= gnome@FreeBSD.org COMMENT= The "meta-port" of the GNOME desktop slimmed down for FreeBSD releases RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 \ @@ -26,12 +22,11 @@ RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 gnome-system-monitor:${PORTSDIR}/sysutils/gnomesystemmonitor \ nautilus:${PORTSDIR}/x11-fm/nautilus2 \ yelp:${PORTSDIR}/x11/yelp \ - ${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome \ ${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnomeuserdocs2 \ ${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnomeaudio2 \ file-roller:${PORTSDIR}/archivers/fileroller \ ${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \ - ggv:${PORTSDIR}/print/ggv \ + evince:${PORTSDIR}/graphics/evince \ gcalctool:${PORTSDIR}/math/gcalctool \ gucharmap:${PORTSDIR}/deskutils/gucharmap \ ${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \ @@ -39,23 +34,10 @@ RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \ totem:${PORTSDIR}/multimedia/totem-gstreamer -NO_BUILD= yes - -USE_PYTHON= yes - +MASTERDIR= ${.CURDIR}/../gnome2 CONFLICTS= gnome2-[0-9]* -.if !defined(BATCH) && !defined(PACKAGE_BUILDING) -pre-configure: - @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL -.endif - -do-install: # empty - -.include <bsd.port.pre.mk> - -.if ${ARCH} == "i386" || ${OSVERSION} > 500035 -RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany -.endif +DESCR= ${.CURDIR}/pkg-descr +PKGMESSAGE= ${.CURDIR}/pkg-message -.include <bsd.port.post.mk> +.include "${MASTERDIR}/Makefile" diff --git a/x11/gnome2-lite/pkg-install b/x11/gnome2-lite/pkg-install deleted file mode 100644 index 3040e98bde7b..000000000000 --- a/x11/gnome2-lite/pkg-install +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -PATH=/bin:/usr/bin:/sbin:/usr/sbin:${PATH} -export PATH - -if [ "$2" = "PRE-INSTALL" ]; then - GNOME_ONE_DESKTOP="gnomecore gnomeapplets gnomemedia gnomeutils gtop libgtop sawfish nautilus xalf gnomegames gnomeaudio" - for package in ${GNOME_ONE_DESKTOP}; do - if pkg_info | grep "^${package}-[0-9]" >/dev/null 2>&1; then - echo "${package} was detected on the system. This package is part of the GNOME 1.x" - echo "desktop, and cannot coexist with the GNOME 2 desktop." - echo "" - echo "Please deinstall the GNOME 1.x desktop before installing this package." - false - fi - done -fi diff --git a/x11/gnome2-lite/pkg-plist b/x11/gnome2-lite/pkg-plist deleted file mode 100644 index 549a621fec0c..000000000000 --- a/x11/gnome2-lite/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -@comment this plist intentionally left empty diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile index 4b379118ed97..cc02dd203188 100644 --- a/x11/gnome2-power-tools/Makefile +++ b/x11/gnome2-power-tools/Makefile @@ -3,22 +3,17 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnome2-power-tools/Makefile,v 1.62 2005/10/06 01:26:06 marcus Exp $ # -PORTNAME= gnome2-power-tools -PORTVERSION= 2.10.2 -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= x11 gnome -MASTER_SITES= # empty -DISTFILES= # empty -EXTRACT_ONLY= # empty +PKGNAMESUFFIX= -power-tools -MAINTAINER= gnome@FreeBSD.org COMMENT= "Geektoys" for the GNOME 2 power user -RUN_DEPENDS= ${X11BASE}/lib/epiphany-1.6/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \ +RUN_DEPENDS= ${X11BASE}/lib/epiphany/1.8/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \ gnome-pkgview:${PORTSDIR}/sysutils/gnome-pkgview \ - ${X11BASE}/libexec/quick-lounge-applet:${PORTSDIR}/misc/quick-lounge-applet \ ${X11BASE}/libexec/netspeed_applet2:${PORTSDIR}/net/netspeed_applet \ ${LOCALBASE}/sbin/gkrellmd:${PORTSDIR}/sysutils/gkrellm2 \ splashsetter:${PORTSDIR}/deskutils/splashsetter \ @@ -28,12 +23,21 @@ RUN_DEPENDS= ${X11BASE}/lib/epiphany-1.6/extensions/libgesturesextension.so:${PO gnomesu:${PORTSDIR}/security/libgnomesu \ bpm:${PORTSDIR}/sysutils/bpm \ gnome-file-share-properties:${PORTSDIR}/www/gnome-user-share \ - gnome-keyring-manager:${PORTSDIR}/security/gnomekeyringmanager \ gnome-menu-editor:${PORTSDIR}/deskutils/gnome-menu-editor \ + serpentine:${PORTSDIR}/sysutils/serpentine \ + devilspie:${PORTSDIR}/x11-wm/devilspie \ + ${X11BASE}/lib/nautilus/extensions-1.0/libnautilus-open-terminal.so:${PORTSDIR}/deskutils/nautilus-open-terminal \ + gtweakui-menus:${PORTSDIR}/deskutils/gtweakui \ + gnome-art:${PORTSDIR}/x11-themes/gnome-art \ + ${X11BASE}/libdata/bonobo/servers/DeskbarApplet.server:${PORTSDIR}/deskutils/deskbar-applet \ + brightside:${PORTSDIR}/x11/brightside \ + evolution-gconf-filter-exchange:${PORTSDIR}/devel/evolution-gconf-tools \ + ${X11BASE}/libexec/quick-lounge-applet:${PORTSDIR}/misc/quick-lounge-applet \ eiciel:${PORTSDIR}/sysutils/eiciel -NO_BUILD= yes +MASTERDIR= ${.CURDIR}/../gnome2 +GNOME_SLAVE= yes -do-install: # empty +DESCR= ${.CURDIR}/pkg-descr -.include <bsd.port.mk> +.include "${MASTERDIR}/Makefile" diff --git a/x11/gnome2-power-tools/pkg-plist b/x11/gnome2-power-tools/pkg-plist deleted file mode 100644 index 549a621fec0c..000000000000 --- a/x11/gnome2-power-tools/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -@comment this plist intentionally left empty diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index a9420a1ba5f5..029271f2e21f 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -3,19 +3,21 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnome2/Makefile,v 1.122 2005/10/06 01:26:06 marcus Exp $ # PORTNAME= gnome2 -PORTVERSION= 2.10.2 -CATEGORIES= x11 gnome +PORTVERSION= 2.12.1 +PORTREVISION?= 0 +CATEGORIES?= x11 gnome MASTER_SITES= # empty DISTFILES= # empty EXTRACT_ONLY= # empty MAINTAINER= gnome@FreeBSD.org -COMMENT= The "meta-port" for the GNOME 2 integrated X11 desktop +COMMENT?= The "meta-port" for the GNOME 2 integrated X11 desktop -RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 \ +RUN_DEPENDS?= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 \ gnome-cd:${PORTSDIR}/audio/gnomemedia2 \ gnome-dictionary:${PORTSDIR}/deskutils/gnomeutils2 \ eog:${PORTSDIR}/graphics/eog \ @@ -29,15 +31,12 @@ RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 nautilus:${PORTSDIR}/x11-fm/nautilus2 \ yelp:${PORTSDIR}/x11/yelp \ ${X11BASE}/sbin/gdm:${PORTSDIR}/x11/gdm \ - ${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome \ ${X11BASE}/share/gnome/help/user-guide/C/user-guide.xml:${PORTSDIR}/misc/gnomeuserdocs2 \ ${X11BASE}/share/gnome/sounds/question.wav:${PORTSDIR}/audio/gnomeaudio2 \ ${X11BASE}/libdata/pkgconfig/libgail-gnome.pc:${PORTSDIR}/x11-toolkits/libgail-gnome \ file-roller:${PORTSDIR}/archivers/fileroller \ ${X11BASE}/share/themes/HighContrast/gtk-2.0/gtkrc:${PORTSDIR}/x11-themes/gnome-themes \ - ggv:${PORTSDIR}/print/ggv \ gok:${PORTSDIR}/accessibility/gok \ - gpdf:${PORTSDIR}/graphics/gpdf \ nautilus-cd-burner:${PORTSDIR}/sysutils/nautilus-cd-burner \ gcalctool:${PORTSDIR}/math/gcalctool \ gucharmap:${PORTSDIR}/deskutils/gucharmap \ @@ -46,34 +45,53 @@ RUN_DEPENDS= ${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 gnopernicus:${PORTSDIR}/accessibility/gnopernicus \ ${X11BASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnomenetstatus \ dasher:${PORTSDIR}/accessibility/dasher \ - evolution-2.2:${PORTSDIR}/mail/evolution \ + evolution-2.4:${PORTSDIR}/mail/evolution \ ${X11BASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \ network-admin:${PORTSDIR}/sysutils/gnomesystemtools \ gnome-nettool:${PORTSDIR}/net/gnomenettool \ vino-session:${PORTSDIR}/net/vino \ - ximian-connector-setup-2.2:${PORTSDIR}/mail/ximian-connector \ + ximian-connector-setup-2.4:${PORTSDIR}/mail/evolution-exchange \ ${X11BASE}/lib/gstreamer-0.8/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \ + ${X11BASE}/lib/gstreamer-0.8/libgstgconfelements.so:${PORTSDIR}/devel/gstreamer-plugins-gconf \ totem:${PORTSDIR}/multimedia/totem-gstreamer \ gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \ ${X11BASE}/share/gnome/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \ sound-juicer:${PORTSDIR}/audio/sound-juicer \ - ${X11BASE}/libdata/pkgconfig/libgtkhtml-2.0.pc:${PORTSDIR}/www/libgtkhtml + gnome-keyring-manager:${PORTSDIR}/security/gnomekeyringmanager \ + ${X11BASE}/libdata/pkgconfig/libgtkhtml-2.0.pc:${PORTSDIR}/www/libgtkhtml \ + evince:${PORTSDIR}/graphics/evince NO_BUILD= yes +.if !defined(GNOME_SLAVE) USE_PYTHON= yes +.endif -.if !defined(BATCH) && !defined(PACKAGE_BUILDING) +.if !defined(BATCH) && !defined(PACKAGE_BUILDING) && !defined(GNOME_SLAVE) pre-configure: @${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .endif +.if !defined(GNOME_SLAVE) || ${.CURDIR:T}=="gnome2-lite" +OPTIONS= GNOME_SCREENSAVER "Use gnome-screensaver as screensaver app" off +.endif + do-install: # empty .include <bsd.port.pre.mk> +.if !defined(GNOME_SLAVE) .if ${ARCH} == "i386" || ${OSVERSION} > 500035 RUN_DEPENDS+= epiphany:${PORTSDIR}/www/epiphany .endif +.endif + +.if ${.CURDIR}==${MASTERDIR} || ${.CURDIR:T}=="gnome2-lite" +.if !defined(WITH_GNOME_SCREENSAVER) +RUN_DEPENDS+= ${X11BASE}/share/gnome/applications/gnome-screensaver-properties.desktop:${PORTSDIR}/x11/xscreensaver-gnome +.else +RUN_DEPENDS+= gnome-screensaver:${PORTSDIR}/x11/gnome-screensaver +.endif +.endif .include <bsd.port.post.mk> diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile index 79b2c9131064..606142c11566 100644 --- a/x11/gnomeapplets2/Makefile +++ b/x11/gnomeapplets2/Makefile @@ -3,14 +3,15 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnomeapplets2/Makefile,v 1.94 2005/10/08 19:41:40 marcus Exp $ # PORTNAME= gnomeapplets2 -PORTVERSION= 2.10.1 -PORTREVISION= 3 +PORTVERSION= 2.12.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-applets/2.10 +MASTER_SITE_SUBDIR= sources/gnome-applets/2.12 DISTNAME= gnome-applets-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -28,10 +29,11 @@ USE_X_PREFIX= yes USE_GMAKE= yes GNOME_DESKTOP_VERSION=2 INSTALLS_OMF= yes +INSTALLS_ICONS= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomepanel \ - gail + gail gnomedocutils USE_GSTREAMER= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ FREEBSD_SYS=${FREEBSD_SYS} @@ -52,22 +54,6 @@ PLIST_SUB= BATTERY="@comment " .else GCONF_SCHEMAS+= battstat.schemas PLIST_SUB= BATTERY="" - -.if ${OSVERSION} < 600019 -.if ${OSVERSION} < 503105 || ${OSVERSION} >= 600000 -pre-everything:: - @${ECHO_MSG} "" - @${ECHO_MSG} " W A R N I N G" - @${ECHO_MSG} "*****************************************************" - @${ECHO_MSG} "* gnomeapplets2 requires that you have your kernel *" - @${ECHO_MSG} "* sources installed. If your kernel sources *" - @${ECHO_MSG} "* are somewhere other than /usr/src/sys, you *" - @${ECHO_MSG} "* may set the FREEBSD_SYS variable to the *" - @${ECHO_MSG} "* correct path. *" - @${ECHO_MSG} "*****************************************************" - @${ECHO_MSG} "" -.endif -.endif .endif .if ${ARCH} != "i386" && ${ARCH} != "amd64" diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo index 543fc30599f3..ad6838c15a4d 100644 --- a/x11/gnomeapplets2/distinfo +++ b/x11/gnomeapplets2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-applets-2.10.1.tar.bz2) = da9cd75f77972c96eec9551d41878a7f -SIZE (gnome2/gnome-applets-2.10.1.tar.bz2) = 6250092 +MD5 (gnome2/gnome-applets-2.12.1.tar.bz2) = 06dd0b634d7092fa8af2ce302f68f912 +SIZE (gnome2/gnome-applets-2.12.1.tar.bz2) = 5369404 diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa index 9e8038833e85..48b84e4569f6 100644 --- a/x11/gnomeapplets2/files/patch-aa +++ b/x11/gnomeapplets2/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 diff --git a/x11/gnomeapplets2/files/patch-battstat-acpi b/x11/gnomeapplets2/files/patch-battstat-acpi deleted file mode 100644 index 903e8b951d11..000000000000 --- a/x11/gnomeapplets2/files/patch-battstat-acpi +++ /dev/null @@ -1,576 +0,0 @@ ---- battstat/Makefile.in.orig Mon Jan 24 20:20:49 2005 -+++ battstat/Makefile.in Mon Jan 24 20:22:02 2005 -@@ -55,9 +55,10 @@ - PROGRAMS = $(libexec_PROGRAMS) - am_battstat_applet_2_OBJECTS = properties.$(OBJEXT) \ - battstat_applet.$(OBJEXT) power-management.$(OBJEXT) \ -- acpi-linux.$(OBJEXT) -+ acpi-freebsd.$(OBJEXT) acpi-linux.$(OBJEXT) - battstat_applet_2_OBJECTS = $(am_battstat_applet_2_OBJECTS) - am__DEPENDENCIES_1 = -+ACPIINC = @ACPIINC@ - @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@am__DEPENDENCIES_2 = \ - @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@ apmlib/libapm.a - battstat_applet_2_DEPENDENCIES = $(am__DEPENDENCIES_1) \ -@@ -66,6 +67,7 @@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/acpi-linux.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/acpi-freebsd.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/battstat_applet.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/power-management.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/properties.Po -@@ -336,6 +338,7 @@ - $(GNOME_APPLETS_CFLAGS) \ - $(LIBGLADE_CFLAGS) \ - $(APMINC) \ -+ $(ACPIINC) \ - -DG_LOG_DOMAIN=\"battstat_applet\" - - battstat_applet_2_SOURCES = \ -@@ -345,7 +348,9 @@ - battstat_applet.c \ - power-management.c \ - acpi-linux.c \ -- acpi-linux.h -+ acpi-linux.h \ -+ acpi-freebsd.c \ -+ acpi-freebsd.h - - battstat_applet_2_LDADD = \ - $(GNOME_APPLETS_LIBS) \ -@@ -439,6 +444,7 @@ - -rm -f *.tab.c - - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-linux.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-freebsd.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/battstat_applet.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/power-management.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/properties.Po@am__quote@ ---- battstat/battstat_applet.c.orig Mon Jan 24 12:51:51 2005 -+++ battstat/battstat_applet.c Mon Jan 24 20:20:50 2005 -@@ -953,6 +953,7 @@ - "Seth Nickell <snickell@stanford.edu> (GNOME2 port)", - "Davyd Madeley <davyd@madeley.id.au>", - "Ryan Lortie <desrt@desrt.ca>", -+ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD ACPI support)", - NULL - }; - ---- battstat/properties.c.orig Fri Jan 14 23:38:18 2005 -+++ battstat/properties.c Mon Mar 14 19:49:26 2005 -@@ -27,7 +27,7 @@ - - #include <stdio.h> - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) && defined(__i386__) - #include <machine/apm_bios.h> - #elif defined(__NetBSD__) || defined(__OpenBSD__) - #include <sys/param.h> -@@ -61,6 +61,9 @@ - #include <panel-applet-gconf.h> - /*#include <status-docklet.h>*/ - -+#if defined(__FreeBSD__) && !defined(__i386__) -+#include "acpi-freebsd.h" -+#endif - #include "battstat.h" - - #ifndef gettext_noop ---- battstat/acpi-freebsd.c.orig Sun Jul 3 16:00:01 2005 -+++ battstat/acpi-freebsd.c Sun Jul 3 16:23:26 2005 -@@ -0,0 +1,280 @@ -+/* battstat A GNOME battery meter for laptops. -+ * Copyright (C) 2000 by Jörgen Pehrson <jp@spektr.eu.org> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. -+ * -+ $Id: patch-battstat-acpi,v 1.13 2005/02/28 08:02:03 marcus Exp $ -+ */ -+ -+/* -+ * ACPI battery functions for FreeBSD >= 5.2. -+ * September 2004 by Joe Marcus Clarke <marcus@FreeBSD.org> -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include <config.h> -+#endif -+ -+#ifdef __FreeBSD__ -+ -+#include <stdio.h> -+#include <sys/types.h> -+#include <sys/socket.h> -+#include <sys/sysctl.h> -+#include <sys/un.h> -+#include <sys/ioctl.h> -+#if defined(__i386__) -+#include <machine/apm_bios.h> -+#endif -+#include <stdlib.h> -+#include <errno.h> -+#include <unistd.h> -+#include <fcntl.h> -+#include <glib.h> -+ -+#include <dev/acpica/acpiio.h> -+ -+#include "acpi-freebsd.h" -+ -+static gboolean -+update_ac_info(struct acpi_info * acpiinfo) -+{ -+ int acline; -+ size_t len = sizeof(acline); -+ -+ acpiinfo->ac_online = FALSE; -+ -+ if (sysctlbyname(ACPI_ACLINE, &acline, &len, NULL, 0) == -1) { -+ return FALSE; -+ } -+ -+ acpiinfo->ac_online = acline ? TRUE : FALSE; -+ -+ return TRUE; -+} -+ -+static gboolean -+update_battery_info(struct acpi_info * acpiinfo) -+{ -+ union acpi_battery_ioctl_arg battio; -+ int i; -+ -+ /* We really don't have to do this here. All of the relevant battery -+ * info can be obtained through sysctl. However, one day, the rate -+ * may be useful to get time left to full charge. -+ */ -+ -+ for(i = BATT_MIN; i < BATT_MAX; i++) { -+ battio.unit = i; -+ if (ioctl(acpiinfo->acpifd, ACPIIO_CMBAT_GET_BIF, &battio) == -1) { -+ continue; -+ } -+ -+ acpiinfo->max_capacity += battio.bif.lfcap; -+ acpiinfo->low_capacity += battio.bif.wcap; -+ acpiinfo->critical_capacity += battio.bif.lcap; -+ } -+ -+ return TRUE; -+} -+ -+gboolean -+acpi_freebsd_init(struct acpi_info * acpiinfo) -+{ -+ int acpi_fd; -+ int event_fd; -+ -+ g_assert(acpiinfo); -+ -+ if (acpiinfo->acpifd == -1) { -+ acpi_fd = open(ACPIDEV, O_RDONLY); -+ if (acpi_fd >= 0) { -+ acpiinfo->acpifd = acpi_fd; -+ } -+ else { -+ acpiinfo->acpifd = -1; -+ return FALSE; -+ } -+ } -+ -+ event_fd = socket(PF_UNIX, SOCK_STREAM, 0); -+ if (event_fd >= 0) { -+ struct sockaddr_un addr; -+ addr.sun_family = AF_UNIX; -+ strcpy(addr.sun_path, "/var/run/devd.pipe"); -+ if (connect(event_fd, (struct sockaddr *) &addr, sizeof(addr)) == 0) { -+ acpiinfo->event_fd = event_fd; -+ acpiinfo->event_inited = TRUE; -+ acpiinfo->channel = g_io_channel_unix_new(event_fd); -+ } -+ else { -+ close(event_fd); -+ acpiinfo->event_fd = -1; -+ acpiinfo->event_inited = FALSE; -+ } -+ } -+ -+ update_battery_info(acpiinfo); -+ update_ac_info(acpiinfo); -+ -+ return TRUE; -+} -+ -+#define ACPI_EVENT_IGNORE 0 -+#define ACPI_EVENT_AC 1 -+#define ACPI_EVENT_BATTERY_INFO 2 -+ -+static int parse_acpi_event(GString *buffer) -+{ -+ if (strstr(buffer->str, "system=ACPI")) { -+ if (strstr(buffer->str, "subsystem=ACAD")) -+ return ACPI_EVENT_AC; -+ if (strstr(buffer->str, "subsystem=CMBAT")) -+ return ACPI_EVENT_BATTERY_INFO; -+ } -+ -+ return ACPI_EVENT_IGNORE; -+} -+ -+void acpi_freebsd_update(struct acpi_info *acpiinfo) -+{ -+ /* XXX This is needed for systems where devd does not have permissions -+ * to allow for event-driven updates. -+ */ -+ update_ac_info(acpiinfo); -+ update_battery_info(acpiinfo); -+} -+ -+gboolean acpi_process_event(struct acpi_info *acpiinfo, gboolean *read_error) -+{ -+ gsize i; -+ int evt; -+ gboolean result = FALSE; -+ GString *buffer; -+ GIOStatus stat; -+ buffer = g_string_new(NULL); -+ -+ *read_error = FALSE; -+ stat = g_io_channel_read_line_string(acpiinfo->channel, buffer, &i, NULL); -+ -+ if (stat == G_IO_STATUS_ERROR || stat == G_IO_STATUS_EOF) { -+ *read_error = TRUE; -+ g_string_free(buffer, TRUE); -+ return FALSE; -+ } -+ -+ evt = parse_acpi_event(buffer); -+ switch (evt) { -+ case ACPI_EVENT_AC: -+ update_ac_info(acpiinfo); -+ result = TRUE; -+ break; -+ case ACPI_EVENT_BATTERY_INFO: -+ update_battery_info(acpiinfo); -+ result = TRUE; -+ break; -+ } -+ -+ g_string_free(buffer, TRUE); -+ return result; -+} -+ -+void -+acpi_freebsd_cleanup(struct acpi_info * acpiinfo) -+{ -+ g_assert(acpiinfo); -+ -+ if (acpiinfo->acpifd >= 0) { -+ close(acpiinfo->acpifd); -+ acpiinfo->acpifd = -1; -+ } -+ -+ if (acpiinfo->event_fd >= 0) { -+ g_io_channel_unref(acpiinfo->channel); -+ close(acpiinfo->event_fd); -+ acpiinfo->event_fd = -1; -+ } -+} -+ -+gboolean -+acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo) -+{ -+ int time; -+ int life; -+ int acline; -+ int state; -+ size_t len; -+ int rate; -+ int remain; -+ union acpi_battery_ioctl_arg battio; -+ gboolean charging; -+ int i; -+ -+ g_assert(acpiinfo); -+ -+ charging = FALSE; -+ -+ for(i = BATT_MIN; i < BATT_MAX; i++) { -+ battio.unit = i; -+ if (ioctl(acpiinfo->acpifd, ACPIIO_CMBAT_GET_BST, &battio) == -1) { -+ continue; -+ } -+ -+ remain += battio.bst.cap; -+ rate += battio.bst.rate; -+ } -+ -+ len = sizeof(time); -+ if (sysctlbyname(ACPI_TIME, &time, &len, NULL, 0) == -1) { -+ return FALSE; -+ } -+ -+ len = sizeof(life); -+ if (sysctlbyname(ACPI_LIFE, &life, &len, NULL, 0) == -1) { -+ return FALSE; -+ } -+ -+ len = sizeof(state); -+ if (sysctlbyname(ACPI_STATE, &state, &len, NULL, 0) == -1) { -+ return FALSE; -+ } -+ -+ apminfo->ai_acline = acpiinfo->ac_online ? 1 : 0; -+ if (state & ACPI_BATT_STAT_CHARGING) { -+ apminfo->ai_batt_stat = 3; -+ charging = TRUE; -+ } -+ else if (state & ACPI_BATT_STAT_CRITICAL) { -+ /* Add a special check here since FreeBSD's ACPI interface will tell us -+ * when the battery is critical. -+ */ -+ apminfo->ai_batt_stat = 2; -+ } -+ else { -+ apminfo->ai_batt_stat = remain < acpiinfo->low_capacity ? 1 : remain < acpiinfo->critical_capacity ? 2 : 0; -+ } -+ apminfo->ai_batt_life = life; -+ if (!charging) { -+ apminfo->ai_batt_time = time; -+ } -+ else if (charging && rate > 0) { -+ apminfo->ai_batt_time = (int) ((acpiinfo->max_capacity-remain)/(float)rate); -+ } -+ else -+ apminfo->ai_batt_time = -1; -+ -+ return TRUE; -+} -+#endif ---- battstat/acpi-freebsd.h.orig Sun Jul 3 16:00:01 2005 -+++ battstat/acpi-freebsd.h Sun Jul 3 16:23:56 2005 -@@ -0,0 +1,60 @@ -+/* -+ * Copyright (C) 2004 by Joe Marcus Clarke <marcus@FreeBSD.org> -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. -+ */ -+ -+#ifndef __ACPI_FREEBSD_H__ -+#define __ACPI_FREEBSD_H__ -+ -+#define ACPIDEV "/dev/acpi" -+ -+#define BATT_MIN 0 -+#define BATT_MAX 64 -+ -+#define ACPI_ACLINE "hw.acpi.acline" -+#define ACPI_TIME "hw.acpi.battery.time" -+#define ACPI_LIFE "hw.acpi.battery.life" -+#define ACPI_STATE "hw.acpi.battery.state" -+ -+/* XXX: AMD64 does not have machine/apm_bios.h. */ -+#if !defined(__i386__) -+struct apm_info { -+ guint ai_acline; -+ guint ai_batt_stat; -+ guint ai_batt_life; -+ int ai_batt_time; -+ guint ai_status; -+}; -+#endif -+ -+struct acpi_info { -+ gboolean ac_online; -+ gboolean event_inited; -+ int acpifd; -+ int event_fd; -+ int max_capacity; -+ int low_capacity; -+ int critical_capacity; -+ GIOChannel * channel; -+}; -+ -+gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo); -+void acpi_freebsd_update(struct acpi_info * acpiinfo); -+gboolean acpi_process_event(struct acpi_info * acpiinfo, gboolean *read_error); -+gboolean acpi_freebsd_init(struct acpi_info * acpiinfo); -+void acpi_freebsd_cleanup(struct acpi_info * acpiinfo); -+ -+#endif /* __ACPI_FREEBSD_H__ */ ---- battstat/power-management.c.orig Sun Mar 20 05:20:55 2005 -+++ battstat/power-management.c Sun Jul 3 16:21:42 2005 -@@ -73,12 +73,42 @@ static int pm_initialised; - * the problem might be. This error message is not to be freed. - */ - --#ifdef __FreeBSD__ -- -+#if defined(__FreeBSD__) -+#if defined(__i386__) - #include <machine/apm_bios.h> -+#endif -+#include "acpi-freebsd.h" -+ -+static struct acpi_info acpiinfo; -+static gboolean using_acpi; -+static int acpi_count; -+static int acpiwatch; -+static struct apm_info apminfo; -+ -+gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info *acpiinfo); - - #define APMDEVICE "/dev/apm" - -+static gboolean acpi_callback (GIOChannel * chan, GIOCondition cond, gpointer data) -+{ -+ gboolean read_error; -+ -+ if (cond & (G_IO_ERR | G_IO_HUP)) { -+ acpi_freebsd_cleanup(&acpiinfo); -+ return FALSE; -+ } -+ -+ if (acpi_process_event(&acpiinfo, &read_error)) { -+ acpi_freebsd_read(&apminfo, &acpiinfo); -+ } -+ else if (read_error) { -+ acpi_freebsd_cleanup(&acpiinfo); -+ return FALSE; -+ } -+ -+ return TRUE; -+} -+ - static const char * - apm_readinfo (BatteryStatus *status) - { -@@ -86,32 +116,56 @@ apm_readinfo (BatteryStatus *status) - FreeBSD. Each time this functions is called (once every second) - the APM device is opened, read from and then closed. - */ -- struct apm_info apminfo; - int fd; - - if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n"); - -- fd = open(APMDEVICE, O_RDONLY); -- if (fd == -1) -- { -- pm_initialised = 0; -- return ERR_OPEN_APMDEV; -+ if (using_acpi && (!acpiinfo.event_inited || acpiinfo.event_fd >= 0)) { -+ if (acpi_count <= 0) { -+ acpi_count = 30; -+ if (!acpiinfo.event_inited) { -+ acpi_freebsd_update(&acpiinfo); -+ } -+ acpi_freebsd_read(&apminfo, &acpiinfo); -+ } -+ acpi_count--; -+ } -+ else if (using_acpi && acpiinfo.event_inited) { -+ if (acpi_freebsd_init(&acpiinfo)) { -+ acpiwatch = g_io_add_watch (acpiinfo.channel, -+ G_IO_IN | G_IO_ERR | G_IO_HUP, -+ acpi_callback, NULL); -+ acpi_freebsd_read(&apminfo, &acpiinfo); -+ } - } -+ else { -+#if defined(__i386__) -+ fd = open(APMDEVICE, O_RDONLY); -+ if (fd == -1) { -+ return ERR_OPEN_APMDEV; -+ } - -- if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1) -- err(1, "ioctl(APMIO_GETINFO)"); -+ if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1) -+ err(1, "ioctl(APMIO_GETINFO)"); - -- close(fd); -+ close(fd); - -- if(apminfo.ai_status == 0) -- return ERR_APM_E; -+ if(apminfo.ai_status == 0) -+ return ERR_APM_E; -+#else -+ return ERR_OPEN_APMDEV; -+#endif -+ } - - status->present = TRUE; - status->on_ac_power = apminfo.ai_acline ? 1 : 0; - status->state = apminfo.ai_batt_stat; - status->percent = apminfo.ai_batt_life; - status->charging = (status->state == 3) ? TRUE : FALSE; -- status->minutes = apminfo.ai_batt_time; -+ if (using_acpi) -+ status->minutes = apminfo.ai_batt_time; -+ else -+ status->minutes = (int) (apminfo.ai_batt_time/60.0); - - return NULL; - } -@@ -339,6 +393,19 @@ power_management_initialise( void ) - G_IO_IN | G_IO_ERR | G_IO_HUP, - acpi_callback, NULL); - } -+#elif defined(__FreeBSD__) -+ if (acpi_freebsd_init(&acpiinfo)) { -+ using_acpi = TRUE; -+ acpi_count = 0; -+ } -+ else -+ using_acpi = FALSE; -+ -+ if (using_acpi && acpiinfo.event_fd >= 0) { -+ acpiwatch = g_io_add_watch (acpiinfo.channel, -+ G_IO_IN | G_IO_ERR | G_IO_HUP, -+ acpi_callback, NULL); -+ } - #endif - pm_initialised = 1; - -@@ -360,6 +427,13 @@ power_management_cleanup( void ) - g_source_remove(acpiwatch); - acpiwatch = 0; - acpi_linux_cleanup(&acpiinfo); -+ } -+#elif defined(__FreeBSD__) -+ if (using_acpi) { -+ if (acpiwatch != 0) -+ g_source_remove(acpiwatch); -+ acpiwatch = 0; -+ acpi_freebsd_cleanup(&acpiinfo); - } - #endif - diff --git a/x11/gnomeapplets2/files/patch-battstat_acpi-freebsd.c b/x11/gnomeapplets2/files/patch-battstat_acpi-freebsd.c new file mode 100644 index 000000000000..48746fa03bbd --- /dev/null +++ b/x11/gnomeapplets2/files/patch-battstat_acpi-freebsd.c @@ -0,0 +1,152 @@ +--- battstat/acpi-freebsd.c.orig Sun Jul 3 16:41:26 2005 ++++ battstat/acpi-freebsd.c Sun Jul 3 16:49:55 2005 +@@ -31,9 +31,13 @@ + + #include <stdio.h> + #include <sys/types.h> ++#include <sys/socket.h> + #include <sys/sysctl.h> ++#include <sys/un.h> + #include <sys/ioctl.h> ++#if defined(__i386__) + #include <machine/apm_bios.h> ++#endif + #include <stdlib.h> + #include <errno.h> + #include <unistd.h> +@@ -92,16 +96,36 @@ gboolean + acpi_freebsd_init(struct acpi_info * acpiinfo) + { + int acpi_fd; ++ int event_fd; + + g_assert(acpiinfo); + +- acpi_fd = open(ACPIDEV, O_RDONLY); +- if (acpi_fd >= 0) { +- acpiinfo->acpifd = acpi_fd; ++ if (acpiinfo->acpifd == -1) { ++ acpi_fd = open(ACPIDEV, O_RDONLY); ++ if (acpi_fd >= 0) { ++ acpiinfo->acpifd = acpi_fd; ++ } ++ else { ++ acpiinfo->acpifd = -1; ++ return FALSE; ++ } + } +- else { +- acpiinfo->acpifd = -1; +- return FALSE; ++ ++ event_fd = socket(PF_UNIX, SOCK_STREAM, 0); ++ if (event_fd >= 0) { ++ struct sockaddr_un addr; ++ addr.sun_family = AF_UNIX; ++ strcpy(addr.sun_path, "/var/run/devd.pipe"); ++ if (connect(event_fd, (struct sockaddr *) &addr, sizeof(addr)) == 0) { ++ acpiinfo->event_fd = event_fd; ++ acpiinfo->event_inited = TRUE; ++ acpiinfo->channel = g_io_channel_unix_new(event_fd); ++ } ++ else { ++ close(event_fd); ++ acpiinfo->event_fd = -1; ++ acpiinfo->event_inited = FALSE; ++ } + } + + update_battery_info(acpiinfo); +@@ -110,6 +134,65 @@ acpi_freebsd_init(struct acpi_info * acp + return TRUE; + } + ++#define ACPI_EVENT_IGNORE 0 ++#define ACPI_EVENT_AC 1 ++#define ACPI_EVENT_BATTERY_INFO 2 ++ ++static int parse_acpi_event(GString *buffer) ++{ ++ if (strstr(buffer->str, "system=ACPI")) { ++ if (strstr(buffer->str, "subsystem=ACAD")) ++ return ACPI_EVENT_AC; ++ if (strstr(buffer->str, "subsystem=CMBAT")) ++ return ACPI_EVENT_BATTERY_INFO; ++ } ++ ++ return ACPI_EVENT_IGNORE; ++} ++ ++void acpi_freebsd_update(struct acpi_info *acpiinfo) ++{ ++ /* XXX This is needed for systems where devd does not have permissions ++ * to allow for event-driven updates. ++ */ ++ update_ac_info(acpiinfo); ++ update_battery_info(acpiinfo); ++} ++ ++gboolean acpi_process_event(struct acpi_info *acpiinfo, gboolean *read_error) ++{ ++ gsize i; ++ int evt; ++ gboolean result = FALSE; ++ GString *buffer; ++ GIOStatus stat; ++ buffer = g_string_new(NULL); ++ ++ *read_error = FALSE; ++ stat = g_io_channel_read_line_string(acpiinfo->channel, buffer, &i, NULL); ++ ++ if (stat == G_IO_STATUS_ERROR || stat == G_IO_STATUS_EOF) { ++ *read_error = TRUE; ++ g_string_free(buffer, TRUE); ++ return FALSE; ++ } ++ ++ evt = parse_acpi_event(buffer); ++ switch (evt) { ++ case ACPI_EVENT_AC: ++ update_ac_info(acpiinfo); ++ result = TRUE; ++ break; ++ case ACPI_EVENT_BATTERY_INFO: ++ update_battery_info(acpiinfo); ++ result = TRUE; ++ break; ++ } ++ ++ g_string_free(buffer, TRUE); ++ return result; ++} ++ + void + acpi_freebsd_cleanup(struct acpi_info * acpiinfo) + { +@@ -119,21 +202,12 @@ acpi_freebsd_cleanup(struct acpi_info * + close(acpiinfo->acpifd); + acpiinfo->acpifd = -1; + } +-} + +-/* XXX This is a hack since user-land applications can't get ACPI events yet. +- * Devd provides this (or supposedly provides this), but you need to be +- * root to access devd. +- */ +-gboolean +-acpi_process_event(struct acpi_info * acpiinfo) +-{ +- g_assert(acpiinfo); +- +- update_ac_info(acpiinfo); +- update_battery_info(acpiinfo); +- +- return TRUE; ++ if (acpiinfo->event_fd >= 0) { ++ g_io_channel_unref(acpiinfo->channel); ++ close(acpiinfo->event_fd); ++ acpiinfo->event_fd = -1; ++ } + } + + gboolean diff --git a/x11/gnomeapplets2/files/patch-battstat_acpi-freebsd.h b/x11/gnomeapplets2/files/patch-battstat_acpi-freebsd.h new file mode 100644 index 000000000000..918cd59eb241 --- /dev/null +++ b/x11/gnomeapplets2/files/patch-battstat_acpi-freebsd.h @@ -0,0 +1,78 @@ +--- battstat/acpi-freebsd.h.orig Sun Jul 3 16:50:22 2005 ++++ battstat/acpi-freebsd.h Sun Jul 3 16:54:14 2005 +@@ -29,61 +29,31 @@ + #define ACPI_LIFE "hw.acpi.battery.life" + #define ACPI_STATE "hw.acpi.battery.state" + +-struct acpi_info { +- gboolean ac_online; +- int acpifd; +- int max_capacity; +- int low_capacity; +- int critical_capacity; ++/* XXX: AMD64 does not have machine/apm_bios.h. */ ++#if !defined(__i386__) ++struct apm_info { ++ guint ai_acline; ++ guint ai_batt_stat; ++ guint ai_batt_life; ++ int ai_batt_time; ++ guint ai_status; + }; +- +-gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo); +-gboolean acpi_process_event(struct acpi_info * acpiinfo); +-gboolean acpi_freebsd_init(struct acpi_info * acpiinfo); +-void acpi_freebsd_cleanup(struct acpi_info * acpiinfo); +- +-#endif /* __ACPI_FREEBSD_H__ */ +-/* +- * Copyright (C) 2004 by Joe Marcus Clarke <marcus@FreeBSD.org> +- * +- * This program is free software; you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation; either version 2 of the License, or +- * (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA. +- */ +- +-#ifndef __ACPI_FREEBSD_H__ +-#define __ACPI_FREEBSD_H__ +- +-#define ACPIDEV "/dev/acpi" +- +-#define BATT_MIN 0 +-#define BATT_MAX 64 +- +-#define ACPI_ACLINE "hw.acpi.acline" +-#define ACPI_TIME "hw.acpi.battery.time" +-#define ACPI_LIFE "hw.acpi.battery.life" +-#define ACPI_STATE "hw.acpi.battery.state" ++#endif + + struct acpi_info { + gboolean ac_online; ++ gboolean event_inited; + int acpifd; ++ int event_fd; + int max_capacity; + int low_capacity; + int critical_capacity; ++ GIOChannel * channel; + }; + + gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info * acpiinfo); +-gboolean acpi_process_event(struct acpi_info * acpiinfo); ++void acpi_freebsd_update(struct acpi_info * acpiinfo); ++gboolean acpi_process_event(struct acpi_info * acpiinfo, gboolean *read_error); + gboolean acpi_freebsd_init(struct acpi_info * acpiinfo); + void acpi_freebsd_cleanup(struct acpi_info * acpiinfo); + diff --git a/x11/gnomeapplets2/files/patch-battstat_battstat.schemas.in b/x11/gnomeapplets2/files/patch-battstat_battstat.schemas.in deleted file mode 100644 index a6bed2361540..000000000000 --- a/x11/gnomeapplets2/files/patch-battstat_battstat.schemas.in +++ /dev/null @@ -1,11 +0,0 @@ ---- battstat/battstat.schemas.in.orig Fri Oct 1 16:22:39 2004 -+++ battstat/battstat.schemas.in Fri Oct 1 16:22:46 2004 -@@ -115,7 +115,7 @@ - <key>/schemas/apps/battstat-applet/prefs/suspend_command</key> - <owner>battstat-applet</owner> - <type>string</type> -- <default>/usr/bin/apm -s</default> -+ <default>/usr/sbin/zzz</default> - <locale name="C"> - <short>Suspend Command</short> - <long>Command to send to suspend the computer</long> diff --git a/x11/gnomeapplets2/files/patch-battstat_battstat_applet.c b/x11/gnomeapplets2/files/patch-battstat_battstat_applet.c new file mode 100644 index 000000000000..a95b7b569a09 --- /dev/null +++ b/x11/gnomeapplets2/files/patch-battstat_battstat_applet.c @@ -0,0 +1,21 @@ +--- battstat/battstat_applet.c.orig Fri Aug 19 22:13:49 2005 ++++ battstat/battstat_applet.c Tue Aug 23 20:37:13 2005 +@@ -430,14 +430,14 @@ battery_full_notify (GtkWidget *applet) + static void + battery_full_dialog (GtkWidget *applet) + { +- /* first attempt to use libnotify */ +- if (battery_full_notify (applet)) +- return; +- + GtkWidget *dialog, *hbox, *image, *label; + GdkPixbuf *pixbuf; + + gchar *new_label; ++ /* first attempt to use libnotify */ ++ if (battery_full_notify (applet)) ++ return; ++ + dialog = gtk_dialog_new_with_buttons ( + _("Battery Notice"), + NULL, diff --git a/x11/gnomeapplets2/files/patch-battstat_power-management.c b/x11/gnomeapplets2/files/patch-battstat_power-management.c new file mode 100644 index 000000000000..9cea2d65b8fb --- /dev/null +++ b/x11/gnomeapplets2/files/patch-battstat_power-management.c @@ -0,0 +1,123 @@ +--- battstat/power-management.c.orig Thu Aug 25 23:45:47 2005 ++++ battstat/power-management.c Tue Aug 30 01:28:40 2005 +@@ -61,9 +61,7 @@ + + static const char *apm_readinfo (BatteryStatus *status); + static int pm_initialised; +-#ifdef HAVE_HAL +-static int using_hal; +-#endif ++static int using_hal = FALSE; + + /* + * What follows is a series of platform-specific apm_readinfo functions +@@ -173,16 +171,40 @@ apm_readinfo (BatteryStatus *status) + + #elif __FreeBSD__ + ++#if defined(__i386__) + #include <machine/apm_bios.h> ++#endif + #include "acpi-freebsd.h" + + static struct acpi_info acpiinfo; + static gboolean using_acpi; + static int acpi_count; ++static int acpiwatch; + static struct apm_info apminfo; + ++gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info *acpiinfo); ++ + #define APMDEVICE "/dev/apm" + ++static gboolean acpi_callback (GIOChannel * chan, GIOCondition cond, gpointer data) ++{ ++ gboolean read_error; ++ if (cond & (G_IO_ERR | G_IO_HUP)) { ++ acpi_freebsd_cleanup(&acpiinfo); ++ return FALSE; ++ } ++ ++ if (acpi_process_event(&acpiinfo, &read_error)) { ++ acpi_freebsd_read(&apminfo, &acpiinfo); ++ } ++ else if (read_error) { ++ acpi_freebsd_cleanup(&acpiinfo); ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ + static const char * + apm_readinfo (BatteryStatus *status) + { +@@ -190,21 +212,27 @@ apm_readinfo (BatteryStatus *status) + + if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n"); + +- if (using_acpi) { ++ if (using_acpi && (!acpiinfo.event_inited || acpiinfo.event_fd >= 0)) { + if (acpi_count <= 0) { + acpi_count = 30; +- acpi_process_event(&acpiinfo); ++ if (!acpiinfo.event_inited) { ++ acpi_freebsd_update(&acpiinfo); ++ } + if (acpi_freebsd_read(&apminfo, &acpiinfo) == FALSE) + return ERR_FREEBSD_ACPI; + } + acpi_count--; + } +- else +- { +- /* This is how I read the information from the APM subsystem under +- FreeBSD. Each time this functions is called (once every second) +- the APM device is opened, read from and then closed. +- */ ++ else if (using_acpi && acpiinfo.event_inited) { ++ if (acpi_freebsd_init(&acpiinfo)) { ++ acpiwatch = g_io_add_watch (acpiinfo.channel, ++ G_IO_IN | G_IO_ERR | G_IO_HUP, ++ acpi_callback, NULL); ++ acpi_freebsd_read(&apminfo, &acpiinfo); ++ } ++ } ++ else { ++#if defined(__i386__) + fd = open(APMDEVICE, O_RDONLY); + if (fd == -1) { + return ERR_OPEN_APMDEV; +@@ -217,6 +245,9 @@ apm_readinfo (BatteryStatus *status) + + if(apminfo.ai_status == 0) + return ERR_APM_E; ++#else ++ return ERR_OPEN_APMDEV; ++#endif + } + + status->present = TRUE; +@@ -480,6 +511,12 @@ power_management_initialise( int no_hal + } + else + using_acpi = FALSE; ++ ++ if (using_acpi && acpiinfo.event_fd >= 0) { ++ acpiwatch = g_io_add_watch (acpiinfo.channel, ++ G_IO_IN | G_IO_ERR | G_IO_HUP, ++ acpi_callback, NULL); ++ } + #endif + pm_initialised = 1; + +@@ -513,6 +550,9 @@ power_management_cleanup( void ) + } + #elif defined(__FreeBSD__) + if (using_acpi) { ++ if (acpiwatch != 0) ++ g_source_remove(acpiwatch); ++ acpiwatch = 0; + acpi_freebsd_cleanup(&acpiinfo); + } + #endif diff --git a/x11/gnomeapplets2/files/patch-cpufreq-freebsd b/x11/gnomeapplets2/files/patch-cpufreq-freebsd index 48f2ebb6c5b1..4bed0298db89 100644 --- a/x11/gnomeapplets2/files/patch-cpufreq-freebsd +++ b/x11/gnomeapplets2/files/patch-cpufreq-freebsd @@ -1,37 +1,3 @@ ---- cpufreq/src/Makefile.in.orig Sun Feb 13 01:00:35 2005 -+++ cpufreq/src/Makefile.in Sun Feb 13 01:01:31 2005 -@@ -55,6 +55,7 @@ - cpufreq-prefs.$(OBJEXT) cpufreq-popup.$(OBJEXT) \ - cpufreq-monitor.$(OBJEXT) cpufreq-monitor-factory.$(OBJEXT) \ - cpufreq-monitor-procfs.$(OBJEXT) \ -+ cpufreq-monitor-sysctl.$(OBJEXT) \ - cpufreq-monitor-sysfs.$(OBJEXT) \ - cpufreq-monitor-cpuinfo.$(OBJEXT) - cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS) -@@ -68,6 +69,7 @@ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-factory.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-procfs.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysctl.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysfs.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-popup.Po \ -@@ -336,6 +338,7 @@ - cpufreq-monitor-protected.h \ - cpufreq-monitor-factory.c cpufreq-monitor-factory.h \ - cpufreq-monitor-procfs.c cpufreq-monitor-procfs.h \ -+ cpufreq-monitor-sysctl.c cpufreq-monitor-sysctl.h \ - cpufreq-monitor-sysfs.c cpufreq-monitor-sysfs.h \ - cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h - -@@ -419,6 +422,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysctl.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysfs.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-popup.Po@am__quote@ --- cpufreq/src/cpufreq-monitor-sysctl.h.orig Sun Feb 13 01:00:25 2005 +++ cpufreq/src/cpufreq-monitor-sysctl.h Sat Feb 12 20:25:21 2005 @@ -0,0 +1,48 @@ @@ -83,111 +49,6 @@ +CPUFreqMonitor *cpufreq_monitor_sysctl_new (guint cpu); + +#endif /* __CPUFREQ_MONITOR_SYSCTL_H__ */ ---- cpufreq/src/cpufreq-monitor-cpuinfo.c.orig Fri Dec 31 14:39:04 2004 -+++ cpufreq/src/cpufreq-monitor-cpuinfo.c Sun Feb 13 23:58:38 2005 -@@ -22,6 +22,10 @@ - #include <glib/gi18n.h> - #include <libgnomevfs/gnome-vfs.h> - -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <sys/sysctl.h> -+#endif /* __FreeBSD__ */ - #include <string.h> - - #include "cpufreq-monitor-cpuinfo.h" -@@ -102,6 +106,7 @@ - static gboolean - cpufreq_monitor_cpuinfo_get (gpointer gdata) - { -+#ifndef __FreeBSD__ - GnomeVFSHandle *handle; - GnomeVFSFileSize bytes_read; - GnomeVFSResult result; -@@ -109,6 +114,9 @@ - gchar **lines; - gchar buffer[256]; - gchar *p; -+#else -+ size_t len; -+#endif /* __FreeBSD__ */ - gchar *freq, *perc, *unit, *governor; - gint cpu, i; - CPUFreqMonitorCPUInfo *monitor; -@@ -118,6 +126,7 @@ - - private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor)); - -+#ifndef __FreeBSD__ - uri = gnome_vfs_get_uri_from_local_path ("/proc/cpuinfo"); - - result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ); -@@ -178,6 +187,12 @@ - - g_strfreev (lines); - g_free (file); -+#else -+ len = sizeof (cpu); -+ -+ if (sysctlbyname ("hw.clockrate", &cpu, &len, NULL, 0) == -1) -+ return FALSE; -+#endif /* __FreeBSD__ */ - - governor = g_strdup (_("Frequency Scaling Unsupported")); - freq = parent_class->get_human_readable_freq (cpu * 1000); /* kHz are expected*/ ---- cpufreq/src/cpufreq-monitor-factory.c.orig Mon Dec 27 12:53:46 2004 -+++ cpufreq/src/cpufreq-monitor-factory.c Sun Feb 13 23:58:44 2005 -@@ -16,13 +16,21 @@ - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Authors : Carlos García Campos <carlosgc@gnome.org> -+ * Joe Marcus Clarke <marcus@FreeBSD.org> - */ - - #include <glib.h> -+#ifdef __FreeBSD__ -+#include <sys/types.h> -+#include <sys/sysctl.h> -+#endif /* __FreeBSD__ */ - - #include "cpufreq-applet.h" - #include "cpufreq-monitor-sysfs.h" - #include "cpufreq-monitor-procfs.h" -+#ifdef __FreeBSD__ -+#include "cpufreq-monitor-sysctl.h" -+#endif /* __FreeBSD__ */ - #include "cpufreq-monitor-cpuinfo.h" - #include "cpufreq-monitor-factory.h" - -@@ -30,6 +38,7 @@ - cpufreq_monitor_factory_create_monitor (guint cpu) - { - CPUFreqMonitor *monitor = NULL; -+#ifndef __FreeBSD__ - - if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ - monitor = cpufreq_monitor_sysfs_new (cpu); -@@ -48,6 +57,20 @@ - - monitor = cpufreq_monitor_cpuinfo_new (cpu); - } -+#else -+ size_t len; -+ -+ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { -+ monitor = cpufreq_monitor_sysctl_new (cpu); -+ } else { -+ cpufreq_applet_display_error (_("CPU frequency scaling unsupported"), -+ _("You will not be able to modify the frequency of your machine. " -+ "Your machine may be misconfigured or not have hardware support " -+ "for CPU frequency scaling.")); -+ -+ monitor = cpufreq_monitor_cpuinfo_new (cpu); -+ } -+#endif /* __FreeBSD__ */ - - return monitor; - } --- cpufreq/src/cpufreq-monitor-sysctl.c.orig Sun Feb 13 03:52:42 2005 +++ cpufreq/src/cpufreq-monitor-sysctl.c Mon Feb 14 00:42:07 2005 @@ -0,0 +1,269 @@ @@ -460,9 +321,114 @@ + return private->available_freqs; +} +#endif /* __FreeBSD__ */ ---- cpufreq/src/cpufreq-applet.c.orig Fri Jan 14 23:38:20 2005 -+++ cpufreq/src/cpufreq-applet.c Mon Feb 14 00:47:36 2005 -@@ -16,6 +16,7 @@ +--- cpufreq/src/cpufreq-monitor-factory.c.orig Thu Apr 14 12:11:06 2005 ++++ cpufreq/src/cpufreq-monitor-factory.c Sun Jul 3 17:09:15 2005 +@@ -17,13 +17,21 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Authors : Carlos García Campos <carlosgc@gnome.org> ++ * Joe Marcus Clarke <marcus@FreeBSD.org> + */ + + #include <glib.h> ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#include <sys/sysctl.h> ++#endif /* __FreeBSD__ */ + + #include "cpufreq-applet.h" + #include "cpufreq-monitor-sysfs.h" + #include "cpufreq-monitor-procfs.h" ++#ifdef __FreeBSD__ ++#include "cpufreq-monitor-sysctl.h" ++#endif /* __FreeBSD__ */ + #include "cpufreq-monitor-cpuinfo.h" + #include "cpufreq-monitor-factory.h" + +@@ -31,6 +39,7 @@ CPUFreqMonitor * + cpufreq_monitor_factory_create_monitor (guint cpu) + { + CPUFreqMonitor *monitor = NULL; ++#ifndef __FreeBSD__ + + if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ + monitor = cpufreq_monitor_sysfs_new (cpu); +@@ -49,6 +58,20 @@ cpufreq_monitor_factory_create_monitor ( + + monitor = cpufreq_monitor_cpuinfo_new (cpu); + } ++#else ++ size_t len; ++ ++ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { ++ monitor = cpufreq_monitor_sysctl_new (cpu); ++ } else { ++ cpufreq_applet_display_error (_("CPU frequency scaling unsupported"), ++ _("You will not be able to modify the frequency of your machine. " ++ "Your machine may be misconfigured or not have hardware support " ++ "for CPU frequency scaling.")); ++ ++ monitor = cpufreq_monitor_cpuinfo_new (cpu); ++ } ++#endif /* __FreeBSD__ */ + + return monitor; + } +--- cpufreq/src/cpufreq-monitor-cpuinfo.c.orig Thu Apr 14 12:11:06 2005 ++++ cpufreq/src/cpufreq-monitor-cpuinfo.c Sun Jul 3 17:07:16 2005 +@@ -23,6 +23,10 @@ + #include <glib/gi18n.h> + #include <libgnomevfs/gnome-vfs.h> + ++#ifdef __FreeBSD__ ++#include <sys/types.h> ++#include <sys/sysctl.h> ++#endif /* __FreeBSD__ */ + #include <string.h> + #include <stdio.h> + +@@ -104,6 +108,7 @@ cpufreq_monitor_cpuinfo_new (guint cpu) + static gboolean + cpufreq_monitor_cpuinfo_get (gpointer gdata) + { ++#ifndef __FreeBSD__ + GnomeVFSHandle *handle; + GnomeVFSFileSize bytes_read; + GnomeVFSResult result; +@@ -111,6 +116,9 @@ cpufreq_monitor_cpuinfo_get (gpointer gd + gchar **lines; + gchar buffer[256]; + gchar *p; ++#else ++ size_t len; ++#endif /* __FreeBSD__ */ + gchar *freq, *perc, *unit, *governor; + gint cpu, i; + CPUFreqMonitorCPUInfo *monitor; +@@ -120,6 +128,7 @@ cpufreq_monitor_cpuinfo_get (gpointer gd + + private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor)); + ++#ifndef __FreeBSD__ + uri = gnome_vfs_get_uri_from_local_path ("/proc/cpuinfo"); + + result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ); +@@ -180,6 +189,12 @@ cpufreq_monitor_cpuinfo_get (gpointer gd + + g_strfreev (lines); + g_free (file); ++#else ++ len = sizeof (cpu); ++ ++ if (sysctlbyname ("hw.clockrate", &cpu, &len, NULL, 0) == -1) ++ return FALSE; ++#endif /* __FreeBSD__ */ + + governor = g_strdup (_("Frequency Scaling Unsupported")); + freq = parent_class->get_human_readable_freq (cpu * 1000); /* kHz are expected*/ +--- cpufreq/src/cpufreq-applet.c.orig Thu Apr 14 12:11:06 2005 ++++ cpufreq/src/cpufreq-applet.c Sun Jul 3 17:28:43 2005 +@@ -17,6 +17,7 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * * Authors : Carlos García Campos <carlosgc@gnome.org> @@ -470,7 +436,7 @@ */ #include <config.h> -@@ -25,6 +26,10 @@ +@@ -26,6 +27,10 @@ #include <panel-applet-gconf.h> #include <glade/glade.h> #include <glib/gi18n.h> @@ -481,34 +447,82 @@ #include <string.h> #include "cpufreq-applet.h" -@@ -192,6 +197,7 @@ +@@ -193,6 +198,7 @@ cpufreq_applet_about_cb (BonoboUICompone { - static const gchar *authors[] = { - "Carlos Garcia Campos <carlosgc@gnome.org>", -+ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD support)", - NULL - }; - static const gchar *documenters[] = { -@@ -231,6 +237,7 @@ - cpufreq_applet_get_max_cpu () + static const gchar *authors[] = { + "Carlos Garcia Campos <carlosgc@gnome.org>", ++ "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD support)", + NULL + }; + static const gchar *documenters[] = { +@@ -233,6 +239,7 @@ static gint + cpufreq_applet_get_max_cpu (void) { - gint mcpu = -1; + gint mcpu = -1; +#ifndef __FreeBSD__ - gchar *file = NULL; + gchar *file = NULL; - do { -@@ -253,6 +260,14 @@ - } while (g_file_test (file, G_FILE_TEST_EXISTS)); - g_free (file); - mcpu --; + do { +@@ -242,11 +249,20 @@ cpufreq_applet_get_max_cpu (void) + } while (g_file_test (file, G_FILE_TEST_EXISTS)); + g_free (file); + mcpu --; +#else -+ size_t len; ++ size_t len; + -+ len = sizeof (mcpu); ++ len = sizeof (mcpu); + -+ sysctlbyname ("hw.ncpu", &mcpu, &len, NULL, 0); -+ mcpu --; ++ sysctlbyname ("hw.ncpu", &mcpu, &len, NULL, 0); ++ mcpu --; +#endif /* __FreeBSD__ */ - if (mcpu >= 0) - return mcpu; + if (mcpu >= 0) + return mcpu; + + mcpu = -1; ++#ifndef __FreeBSD__ + file = NULL; + do { + if (file) g_free (file); +@@ -255,6 +271,7 @@ cpufreq_applet_get_max_cpu (void) + } while (g_file_test (file, G_FILE_TEST_EXISTS)); + g_free (file); + mcpu --; ++#endif + + if (mcpu >= 0) + return mcpu; +--- cpufreq/src/Makefile.in.orig Tue Oct 4 00:11:26 2005 ++++ cpufreq/src/Makefile.in Tue Oct 4 00:20:37 2005 +@@ -57,6 +57,7 @@ + cpufreq-prefs.$(OBJEXT) cpufreq-popup.$(OBJEXT) \ + cpufreq-monitor.$(OBJEXT) cpufreq-monitor-factory.$(OBJEXT) \ + cpufreq-monitor-procfs.$(OBJEXT) \ ++ cpufreq-monitor-sysctl.$(OBJEXT) \ + cpufreq-monitor-sysfs.$(OBJEXT) \ + cpufreq-monitor-cpuinfo.$(OBJEXT) + cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS) +@@ -71,6 +72,7 @@ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-factory.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-procfs.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysfs.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor-sysctl.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-monitor.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-popup.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-prefs.Po +@@ -358,6 +360,7 @@ + cpufreq-monitor-protected.h \ + cpufreq-monitor-factory.c cpufreq-monitor-factory.h \ + cpufreq-monitor-procfs.c cpufreq-monitor-procfs.h \ ++ cpufreq-monitor-sysctl.c cpufreq-monitor-sysctl.h \ + cpufreq-monitor-sysfs.c cpufreq-monitor-sysfs.h \ + cpufreq-monitor-cpuinfo.c cpufreq-monitor-cpuinfo.h + +@@ -441,6 +444,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysctl.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysfs.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-popup.Po@am__quote@ diff --git a/x11/gnomeapplets2/files/patch-cpufreq-selector-freebsd b/x11/gnomeapplets2/files/patch-cpufreq-selector-freebsd index f577a0fed39b..d25df35e2b5d 100644 --- a/x11/gnomeapplets2/files/patch-cpufreq-selector-freebsd +++ b/x11/gnomeapplets2/files/patch-cpufreq-selector-freebsd @@ -1,38 +1,3 @@ ---- cpufreq/src/cpufreq-selector/Makefile.in.orig Mon Feb 14 00:26:10 2005 -+++ cpufreq/src/cpufreq-selector/Makefile.in Mon Feb 14 00:26:58 2005 -@@ -53,7 +53,7 @@ - PROGRAMS = $(bin_PROGRAMS) - am_cpufreq_selector_OBJECTS = cpufreq.$(OBJEXT) \ - cpufreq-sysfs.$(OBJEXT) cpufreq-procfs.$(OBJEXT) \ -- main.$(OBJEXT) -+ cpufreq-sysctl.$(OBJEXT) main.$(OBJEXT) - cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS) - am__DEPENDENCIES_1 = - cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) -@@ -61,6 +61,7 @@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-procfs.Po \ -+@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysctl.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysfs.Po \ - @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq.Po ./$(DEPDIR)/main.Po - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -@@ -310,6 +311,7 @@ - cpufreq.c cpufreq.h \ - cpufreq-sysfs.c cpufreq-sysfs.h \ - cpufreq-procfs.c cpufreq-procfs.h \ -+ cpufreq-sysctl.c cpufreq-sysctl.h \ - main.c - - cpufreq_selector_LDADD = $(CPUFREQ_SELECTOR_LIBS) -lpopt -@@ -385,6 +387,7 @@ - -rm -f *.tab.c - - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-procfs.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysctl.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysfs.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ --- cpufreq/src/cpufreq-selector/cpufreq-sysctl.h.orig Mon Feb 14 00:38:57 2005 +++ cpufreq/src/cpufreq-selector/cpufreq-sysctl.h Mon Feb 14 00:21:39 2005 @@ -0,0 +1,51 @@ @@ -87,52 +52,6 @@ +CPUFreqSysctl *cpufreq_sysctl_new (); + +#endif /* __CPUFREQ_SYSCTL_H__ */ ---- cpufreq/src/cpufreq-selector/main.c.orig Mon Feb 14 00:22:12 2005 -+++ cpufreq/src/cpufreq-selector/main.c Mon Feb 14 00:26:04 2005 -@@ -16,6 +16,7 @@ - * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * Authors : Carlos García Campos <carlosgc@gnome.org> -+ * Joe Marcus Clarke <marcus@FreeBSD.org> - */ - - #include <glib-object.h> -@@ -26,6 +27,9 @@ - #include "cpufreq.h" - #include "cpufreq-sysfs.h" - #include "cpufreq-procfs.h" -+#ifdef __FreeBSD__ -+#include "cpufreq-sysctl.h" -+#endif /* __FreeBSD__ */ - - gint - main (gint argc, gchar **argv) -@@ -35,6 +39,9 @@ - gulong frequency = 0; - poptContext ctx; - gint nextopt; -+#ifdef __FreeBSD__ -+ size_t len; -+#endif /* __FreeBSD__ */ - CPUFreq *cfq; - - struct poptOption options[] = { -@@ -76,10 +83,15 @@ - - poptFreeContext(ctx); - -+#ifndef __FreeBSD__ - if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ - cfq = CPUFREQ (cpufreq_sysfs_new ()); - } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */ - cfq = CPUFREQ (cpufreq_procfs_new ()); -+#else -+ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { -+ cfq = CPUFREQ (cpufreq_sysctl_new ()); -+#endif /* __FreeBSD __ */ - } else { - g_print ("No cpufreq support\n"); - return 1; --- cpufreq/src/cpufreq-selector/cpufreq-sysctl.c.orig Mon Feb 14 00:38:52 2005 +++ cpufreq/src/cpufreq-selector/cpufreq-sysctl.c Mon Feb 14 00:44:43 2005 @@ -0,0 +1,235 @@ @@ -371,3 +290,84 @@ + + g_free (governor); +} +--- cpufreq/src/cpufreq-selector/main.c.orig Sun Apr 3 12:03:13 2005 ++++ cpufreq/src/cpufreq-selector/main.c Sun Jul 3 17:16:19 2005 +@@ -17,6 +17,7 @@ + * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * + * Authors : Carlos García Campos <carlosgc@gnome.org> ++ * Joe Marcus Clarke <marcus@FreeBSD.org> + */ + + #include <glib-object.h> +@@ -26,6 +27,9 @@ + #include "cpufreq.h" + #include "cpufreq-sysfs.h" + #include "cpufreq-procfs.h" ++#ifdef __FreeBSD__ ++#include "cpufreq-sysctl.h" ++#endif /* __FreeBSD__ */ + + gint + main (gint argc, gchar **argv) +@@ -34,6 +38,9 @@ main (gint argc, gchar **argv) + static gint cpu = 0; + static gchar *governor = NULL; + static gulong frequency = 0; ++#ifdef __FreeBSD__ ++ size_t len; ++#endif /* __FreeBSD__ */ + GError *error = NULL; + CPUFreq *cfq; + +@@ -71,10 +78,15 @@ main (gint argc, gchar **argv) + + g_option_context_free (context); + ++#ifndef __FreeBSD__ + if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ + cfq = CPUFREQ (cpufreq_sysfs_new ()); + } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */ + cfq = CPUFREQ (cpufreq_procfs_new ()); ++#else ++ if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) { ++ cfq = CPUFREQ (cpufreq_sysctl_new ()); ++#endif /* __FreeBSD__ */ + } else { + g_print ("No cpufreq support\n"); + return 1; +--- cpufreq/src/cpufreq-selector/Makefile.in.orig Tue Oct 4 00:21:25 2005 ++++ cpufreq/src/cpufreq-selector/Makefile.in Tue Oct 4 00:27:54 2005 +@@ -55,7 +55,7 @@ + PROGRAMS = $(bin_PROGRAMS) + am_cpufreq_selector_OBJECTS = cpufreq.$(OBJEXT) \ + cpufreq-sysfs.$(OBJEXT) cpufreq-procfs.$(OBJEXT) \ +- main.$(OBJEXT) ++ cpufreq-sysctl.$(OBJEXT) main.$(OBJEXT) + cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS) + am__DEPENDENCIES_1 = + cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) +@@ -64,6 +64,7 @@ + am__depfiles_maybe = depfiles + @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-procfs.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysfs.Po \ ++@AMDEP_TRUE@ ./$(DEPDIR)/cpufreq-sysctl.Po \ + @AMDEP_TRUE@ ./$(DEPDIR)/cpufreq.Po ./$(DEPDIR)/main.Po + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -332,6 +333,7 @@ + cpufreq.c cpufreq.h \ + cpufreq-sysfs.c cpufreq-sysfs.h \ + cpufreq-procfs.c cpufreq-procfs.h \ ++ cpufreq-sysctl.c cpufreq-sysctl.h \ + main.c + + cpufreq_selector_LDADD = $(CPUFREQ_SELECTOR_LIBS) -lpopt +@@ -407,6 +409,7 @@ + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-procfs.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysctl.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysfs.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ diff --git a/x11/gnomeapplets2/files/patch-drivemount_drive-button.c b/x11/gnomeapplets2/files/patch-drivemount_drive-button.c new file mode 100644 index 000000000000..f26e3121ee4b --- /dev/null +++ b/x11/gnomeapplets2/files/patch-drivemount_drive-button.c @@ -0,0 +1,48 @@ +--- drivemount/drive-button.c.orig Tue Aug 23 05:16:27 2005 ++++ drivemount/drive-button.c Tue Aug 23 20:37:43 2005 +@@ -24,6 +24,7 @@ + # include <config.h> + #endif + ++#include <string.h> + #include "drive-button.h" + #include <glib/gi18n.h> + #include <gdk/gdkkeysyms.h> +@@ -710,11 +711,13 @@ run_command (DriveButton *self, const ch + + GList *volumes; + GnomeVFSVolume *volume; ++ char *uri; ++ char *mount_path; + + volumes = gnome_vfs_drive_get_mounted_volumes (self->drive); + volume = GNOME_VFS_VOLUME (volumes->data); +- char *uri = gnome_vfs_volume_get_activation_uri (volume); +- char *mount_path = gnome_vfs_get_local_path_from_uri (uri); ++ uri = gnome_vfs_volume_get_activation_uri (volume); ++ mount_path = gnome_vfs_get_local_path_from_uri (uri); + g_free (uri); + + gnome_vfs_drive_get_display_name (self->drive); +@@ -794,6 +797,11 @@ drive_button_ensure_popup (DriveButton * + char *display_name, *tmp, *label; + int action; + GtkWidget *item; ++ GList *volumes; ++ GnomeVFSVolume *volume = NULL; ++ GnomeVFSDeviceType volume_type; ++ GCallback callback; ++ const char *action_icon = GTK_STOCK_OPEN; + + if (self->popup_menu) return; + +@@ -869,8 +877,7 @@ drive_button_ensure_popup (DriveButton * + g_free (display_name); + display_name = tmp; + +- GCallback callback = G_CALLBACK (open_drive); +- const char *action_icon = GTK_STOCK_OPEN; ++ callback = G_CALLBACK (open_drive); + + switch (device_type) { + case GNOME_VFS_DEVICE_TYPE_VIDEO_DVD: diff --git a/x11/gnomeapplets2/files/patch-gswitchit_gswitchit-applet.c b/x11/gnomeapplets2/files/patch-gswitchit_gswitchit-applet.c new file mode 100644 index 000000000000..5abf18032f00 --- /dev/null +++ b/x11/gnomeapplets2/files/patch-gswitchit_gswitchit-applet.c @@ -0,0 +1,61 @@ +--- gswitchit/gswitchit-applet.c.orig Sun Aug 7 18:07:33 2005 ++++ gswitchit/gswitchit-applet.c Sun Aug 7 18:10:07 2005 +@@ -331,6 +331,10 @@ GSwitchItAppletPrepareDrawing (GSwitchIt + XklConfigItem configItem; + GtkWidget *align, *label; + static GHashTable *shortDescrs = NULL; ++ gpointer pcounter = NULL; ++ char *prevLayoutName = NULL; ++ char *labelTitle = NULL; ++ int counter = 0; + if (group == 0) + shortDescrs = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, NULL); +@@ -363,10 +367,6 @@ GSwitchItAppletPrepareDrawing (GSwitchIt + if (layoutName == NULL) + layoutName = g_strdup ("?"); + +- gpointer pcounter = NULL; +- char *prevLayoutName = NULL; +- char *labelTitle = NULL; +- int counter = 0; + if (g_hash_table_lookup_extended (shortDescrs, layoutName, + (gpointer*)&prevLayoutName, &pcounter)) + { +@@ -599,6 +599,13 @@ GSwitchItAppletCmdPreview (BonoboUICompo + groupsLevels, groupsLevels + 1, groupsLevels + 2, groupsLevels + 3 }; + XklState *xklState = XklGetCurrentState (); + gpointer p = g_hash_table_lookup (globals.previewDialogs, GINT_TO_POINTER (xklState->group)); ++#ifdef HAVE_XKB ++ GladeXML *gladeData; ++ GtkWidget *dialog; ++ GtkWidget *kbdraw; ++ XkbComponentNamesRec componentNames; ++ XklConfigRec xklData; ++#endif + if (p != NULL) + { + /* existing window */ +@@ -606,11 +613,10 @@ GSwitchItAppletCmdPreview (BonoboUICompo + return; + } + #ifdef HAVE_XKB +- GladeXML *gladeData = glade_xml_new (GNOME_GLADEDIR "/gswitchit.glade", "gswitchit_layout_view", NULL); +- GtkWidget *dialog = ++ gladeData = glade_xml_new (GNOME_GLADEDIR "/gswitchit.glade", "gswitchit_layout_view", NULL); ++ dialog = + glade_xml_get_widget (gladeData, "gswitchit_layout_view"); +- GtkWidget *kbdraw = keyboard_drawing_new (); +- XkbComponentNamesRec componentNames; ++ kbdraw = keyboard_drawing_new (); + + if (xklState->group >= 0 && + xklState->group < g_slist_length (globals.groupNames)) +@@ -624,7 +630,6 @@ GSwitchItAppletCmdPreview (BonoboUICompo + + keyboard_drawing_set_groups_levels (KEYBOARD_DRAWING (kbdraw), pGroupsLevels); + +- XklConfigRec xklData; + XklConfigRecInit (&xklData); + if (XklConfigGetFromServer (&xklData)) + { diff --git a/x11/gnomeapplets2/files/patch-gweather_weather.c b/x11/gnomeapplets2/files/patch-gweather_weather.c deleted file mode 100644 index cdc1921ab4c7..000000000000 --- a/x11/gnomeapplets2/files/patch-gweather_weather.c +++ /dev/null @@ -1,12 +0,0 @@ ---- gweather/weather.c.orig Tue Mar 1 04:34:33 2005 -+++ gweather/weather.c Tue Mar 1 12:36:54 2005 -@@ -20,7 +20,9 @@ - #include <string.h> - #include <ctype.h> - #include <math.h> -+#ifndef __FreeBSD__ - #include <values.h> -+#endif - - #ifdef __FreeBSD__ - #include <sys/types.h> diff --git a/x11/gnomeapplets2/files/patch-mixer_applet.c b/x11/gnomeapplets2/files/patch-mixer_applet.c new file mode 100644 index 000000000000..178c7d5a31a1 --- /dev/null +++ b/x11/gnomeapplets2/files/patch-mixer_applet.c @@ -0,0 +1,11 @@ +--- mixer/applet.c.orig Tue Oct 4 00:15:40 2005 ++++ mixer/applet.c Tue Oct 4 00:16:09 2005 +@@ -953,7 +953,7 @@ gnome_volume_applet_adjust_volume (GstMi + + volumes = g_new (gint, track->num_channels); + for (n = 0; n < track->num_channels; n++) +- volumes[n] = lrintf (volume); ++ volumes[n] = (int)rint (volume); + gst_mixer_set_volume (mixer, track, volumes); + g_free (volumes); + } diff --git a/x11/gnomeapplets2/files/patch-modemlights_modem-applet.c b/x11/gnomeapplets2/files/patch-modemlights_modem-applet.c deleted file mode 100644 index f4fb13717732..000000000000 --- a/x11/gnomeapplets2/files/patch-modemlights_modem-applet.c +++ /dev/null @@ -1,22 +0,0 @@ ---- modemlights/modem-applet.c.orig Fri Jan 14 00:06:52 2005 -+++ modemlights/modem-applet.c Fri Jan 14 00:08:28 2005 -@@ -24,12 +24,19 @@ - - #include <panel-applet.h> - #include <fcntl.h> -+#ifndef __FreeBSD__ - #include <pty.h> -+#endif - #include <sys/poll.h> - #include <sys/types.h> - #include <sys/wait.h> - #include <libxml/tree.h> - #include <glade/glade.h> -+#ifdef __FreeBSD__ -+#include <sys/ioctl.h> -+#include <termios.h> -+#include <libutil.h> -+#endif - - #include "modem-applet.h" - diff --git a/x11/gnomeapplets2/files/patch-stickynotes_stickynotes_applet_callbacks.c b/x11/gnomeapplets2/files/patch-stickynotes_stickynotes_applet_callbacks.c new file mode 100644 index 000000000000..718f52a0dd67 --- /dev/null +++ b/x11/gnomeapplets2/files/patch-stickynotes_stickynotes_applet_callbacks.c @@ -0,0 +1,18 @@ +--- stickynotes/stickynotes_applet_callbacks.c.orig Wed Jul 13 18:57:03 2005 ++++ stickynotes/stickynotes_applet_callbacks.c Wed Jul 13 18:57:13 2005 +@@ -153,6 +153,7 @@ gboolean applet_check_click_on_desktop_c + { + static Window desktop_window = 0; + static Display *dpy; ++ XEvent event; + + if (desktop_window == 0) { + desktop_window = get_desktop_window (); +@@ -162,7 +163,6 @@ gboolean applet_check_click_on_desktop_c + * at every click on the desktop */ + XSelectInput(dpy, desktop_window, PropertyChangeMask); + } +- XEvent event; + + if (XCheckWindowEvent(dpy, desktop_window, PropertyChangeMask, &event) == True) { + stickynote_show_notes (FALSE); diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist index 209107a6d038..cc8600d5da3c 100644 --- a/x11/gnomeapplets2/pkg-plist +++ b/x11/gnomeapplets2/pkg-plist @@ -34,16 +34,16 @@ libexec/gnome-keyboard-applet libexec/gtik2_applet2 libexec/gweather-applet-2 libexec/mini_commander_applet -libexec/modem_applet libexec/mixer_applet2 +libexec/modem_applet libexec/multiload-applet-2 libexec/null_applet libexec/stickynotes_applet libexec/trashapplet share/gnome/gnome-2.0/ui/GNOME_AccessxApplet.xml %%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml -share/gnome/gnome-2.0/ui/GNOME_CharpickerApplet.xml %%CPUFREQ%%share/gnome/gnome-2.0/ui/GNOME_CPUFreqApplet.xml +share/gnome/gnome-2.0/ui/GNOME_CharpickerApplet.xml share/gnome/gnome-2.0/ui/GNOME_DriveMountApplet.xml share/gnome/gnome-2.0/ui/GNOME_GSwitchItApplet.xml share/gnome/gnome-2.0/ui/GNOME_GWeatherApplet.xml @@ -53,8 +53,8 @@ share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml share/gnome/gnome-2.0/ui/GNOME_ModemLights.xml share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml -share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml share/gnome/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml +share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml share/gnome/gnome-applets/geyes/Bizarre/Bizarre-eye.png share/gnome/gnome-applets/geyes/Bizarre/Bizarre-pupil.png share/gnome/gnome-applets/geyes/Bizarre/config @@ -73,313 +73,160 @@ share/gnome/gnome-applets/geyes/Horrid/horrid_pupil.png %%BATTERY%%share/gnome/gnome-applets/glade/battstat_applet.glade %%CPUFREQ%%share/gnome/gnome-applets/glade/cpufreq-preferences.glade share/gnome/gnome-applets/glade/gswitchit-plugins.glade -share/gnome/gnome-applets/glade/gswitchit-properties.glade +share/gnome/gnome-applets/glade/gswitchit.glade share/gnome/gnome-applets/glade/mini-commander.glade share/gnome/gnome-applets/glade/modemlights.glade share/gnome/gnome-applets/glade/stickynotes.glade +share/gnome/gnome-applets/glade/trashapplet.glade share/gnome/gnome-applets/gweather/Locations.xml share/gnome/gnome-applets/gweather/locations.dtd share/gnome/help/accessx-status/C/accessx-status.xml share/gnome/help/accessx-status/C/figures/accessx-status-applet.png +share/gnome/help/accessx-status/C/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/C/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/C/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/C/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/C/figures/accessx_sticky-windows-key.png share/gnome/help/accessx-status/C/legal.xml -share/gnome/help/accessx-status/eu/accessx-status.xml -share/gnome/help/accessx-status/eu/figures/accessx-status-applet.png -share/gnome/help/accessx-status/eu/legal.xml +share/gnome/help/accessx-status/es/accessx-status.xml +share/gnome/help/accessx-status/es/figures/accessx-status-applet.png +share/gnome/help/accessx-status/es/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/es/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/es/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/es/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/es/figures/accessx_sticky-windows-key.png +share/gnome/help/accessx-status/fr/accessx-status.xml +share/gnome/help/accessx-status/fr/figures/accessx-status-applet.png +share/gnome/help/accessx-status/fr/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/fr/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/fr/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/fr/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/fr/figures/accessx_sticky-windows-key.png share/gnome/help/accessx-status/uk/accessx-status.xml share/gnome/help/accessx-status/uk/figures/accessx-status-applet.png -share/gnome/help/accessx-status/uk/legal.xml +share/gnome/help/accessx-status/uk/figures/accessx-status-disabled.png +share/gnome/help/accessx-status/uk/figures/accessx_bounce-keys.png +share/gnome/help/accessx-status/uk/figures/accessx_mouse-keys.png +share/gnome/help/accessx-status/uk/figures/accessx_slow-keys.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-altGr-key.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-ctrl-key.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-keys.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-meta-key.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-shift-key.png +share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png %%BATTERY%%share/gnome/help/battstat/C/battstat.xml -%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-preferences.png -%%BATTERY%%share/gnome/help/battstat/C/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/C/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/C/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/C/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/C/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/C/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet-expanded.png %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/C/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/C/figures/warning_small.png +%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-credits-hal.png +%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-preferences.png +%%BATTERY%%share/gnome/help/battstat/C/figures/context-menu.png %%BATTERY%%share/gnome/help/battstat/C/legal.xml -%%BATTERY%%share/gnome/help/battstat/de/battstat.xml -%%BATTERY%%share/gnome/help/battstat/de/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/de/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/de/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/de/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/de/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/de/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/de/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/de/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/de/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/de/legal.xml %%BATTERY%%share/gnome/help/battstat/es/battstat.xml -%%BATTERY%%share/gnome/help/battstat/es/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/es/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/es/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/es/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/es/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/es/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet-expanded.png %%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/es/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/es/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/es/legal.xml -%%BATTERY%%share/gnome/help/battstat/eu/battstat.xml -%%BATTERY%%share/gnome/help/battstat/eu/figures/battstat-apperance.png -%%BATTERY%%share/gnome/help/battstat/eu/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/eu/figures/battstat-general.png -%%BATTERY%%share/gnome/help/battstat/eu/legal.xml -%%BATTERY%%share/gnome/help/battstat/fr/battstat.xml -%%BATTERY%%share/gnome/help/battstat/fr/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/fr/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/fr/legal.xml -%%BATTERY%%share/gnome/help/battstat/it/battstat.xml -%%BATTERY%%share/gnome/help/battstat/it/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/it/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/it/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/it/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/it/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/it/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/it/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/it/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/it/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/it/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/it/legal.xml -%%BATTERY%%share/gnome/help/battstat/ja/battstat.xml -%%BATTERY%%share/gnome/help/battstat/ja/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/ja/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/ja/legal.xml -%%BATTERY%%share/gnome/help/battstat/ko/battstat.xml -%%BATTERY%%share/gnome/help/battstat/ko/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/ko/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/ko/legal.xml -%%BATTERY%%share/gnome/help/battstat/sv/battstat.xml -%%BATTERY%%share/gnome/help/battstat/sv/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/sv/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/sv/legal.xml +%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-credits-hal.png +%%BATTERY%%share/gnome/help/battstat/es/figures/battstat-preferences.png +%%BATTERY%%share/gnome/help/battstat/es/figures/context-menu.png %%BATTERY%%share/gnome/help/battstat/uk/battstat.xml -%%BATTERY%%share/gnome/help/battstat/uk/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/battery_small.png +%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet-expanded.png %%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet_window.png +%%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-credits-hal.png %%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-preferences.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/uk/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/uk/legal.xml -%%BATTERY%%share/gnome/help/battstat/zh_CN/battstat.xml -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/zh_CN/legal.xml -%%BATTERY%%share/gnome/help/battstat/zh_HK/battstat.xml -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/zh_HK/legal.xml -%%BATTERY%%share/gnome/help/battstat/zh_TW/battstat.xml -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/ac_small.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_green.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_orange.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_red.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/batt_yellow.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battery_small.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battstat-applet.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/battstat-applet_window.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/flash_small.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/figures/warning_small.png -%%BATTERY%%share/gnome/help/battstat/zh_TW/legal.xml +%%BATTERY%%share/gnome/help/battstat/uk/figures/context-menu.png share/gnome/help/char-palette/C/char-palette.xml share/gnome/help/char-palette/C/figures/charpalette_applet.png share/gnome/help/char-palette/C/figures/charpalette_chargroup.png -share/gnome/help/char-palette/C/figures/charpick_characters.png share/gnome/help/char-palette/C/figures/charpick-preferences.png +share/gnome/help/char-palette/C/figures/charpick_characters.png share/gnome/help/char-palette/C/legal.xml -share/gnome/help/char-palette/de/char-palette.xml -share/gnome/help/char-palette/de/figures/charpalette_applet.png -share/gnome/help/char-palette/de/figures/charpalette_chargroup.png -share/gnome/help/char-palette/de/figures/charpick_applet.png -share/gnome/help/char-palette/de/figures/charpick_characters.png -share/gnome/help/char-palette/de/figures/charpick_chargroup.png -share/gnome/help/char-palette/de/legal.xml share/gnome/help/char-palette/es/char-palette.xml share/gnome/help/char-palette/es/figures/charpalette_applet.png share/gnome/help/char-palette/es/figures/charpalette_chargroup.png -share/gnome/help/char-palette/es/figures/charpick_applet.png +share/gnome/help/char-palette/es/figures/charpick-preferences.png share/gnome/help/char-palette/es/figures/charpick_characters.png -share/gnome/help/char-palette/es/figures/charpick_chargroup.png -share/gnome/help/char-palette/es/legal.xml -share/gnome/help/char-palette/eu/char-palette.xml -share/gnome/help/char-palette/eu/figures/charpalette_applet.png -share/gnome/help/char-palette/eu/figures/charpalette_chargroup.png -share/gnome/help/char-palette/eu/figures/charpick_characters.png -share/gnome/help/char-palette/eu/legal.xml -share/gnome/help/char-palette/fr/char-palette.xml -share/gnome/help/char-palette/fr/figures/charpalette_applet.png -share/gnome/help/char-palette/fr/figures/charpalette_chargroup.png -share/gnome/help/char-palette/fr/figures/charpick_applet.png -share/gnome/help/char-palette/fr/figures/charpick_characters.png -share/gnome/help/char-palette/fr/figures/charpick_chargroup.png -share/gnome/help/char-palette/fr/legal.xml share/gnome/help/char-palette/it/char-palette.xml share/gnome/help/char-palette/it/figures/charpalette_applet.png share/gnome/help/char-palette/it/figures/charpalette_chargroup.png -share/gnome/help/char-palette/it/figures/charpick_applet.png +share/gnome/help/char-palette/it/figures/charpick-preferences.png share/gnome/help/char-palette/it/figures/charpick_characters.png -share/gnome/help/char-palette/it/figures/charpick_chargroup.png -share/gnome/help/char-palette/it/legal.xml -share/gnome/help/char-palette/ja/char-palette.xml -share/gnome/help/char-palette/ja/figures/charpalette_applet.png -share/gnome/help/char-palette/ja/legal.xml -share/gnome/help/char-palette/ko/char-palette.xml -share/gnome/help/char-palette/ko/figures/charpalette_applet.png -share/gnome/help/char-palette/ko/figures/charpalette_chargroup.png -share/gnome/help/char-palette/ko/figures/charpick_applet.png -share/gnome/help/char-palette/ko/figures/charpick_characters.png -share/gnome/help/char-palette/ko/figures/charpick_chargroup.png -share/gnome/help/char-palette/ko/legal.xml -share/gnome/help/char-palette/sv/char-palette.xml -share/gnome/help/char-palette/sv/figures/charpalette_applet.png -share/gnome/help/char-palette/sv/figures/charpalette_chargroup.png -share/gnome/help/char-palette/sv/figures/charpick_applet.png -share/gnome/help/char-palette/sv/figures/charpick_characters.png -share/gnome/help/char-palette/sv/figures/charpick_chargroup.png -share/gnome/help/char-palette/sv/legal.xml +share/gnome/help/char-palette/nl/char-palette.xml +share/gnome/help/char-palette/nl/figures/charpalette_applet.png +share/gnome/help/char-palette/nl/figures/charpalette_chargroup.png +share/gnome/help/char-palette/nl/figures/charpick-preferences.png +share/gnome/help/char-palette/nl/figures/charpick_characters.png +share/gnome/help/char-palette/pt_BR/char-palette.xml +share/gnome/help/char-palette/pt_BR/figures/charpalette_applet.png +share/gnome/help/char-palette/pt_BR/figures/charpalette_chargroup.png +share/gnome/help/char-palette/pt_BR/figures/charpick-preferences.png +share/gnome/help/char-palette/pt_BR/figures/charpick_characters.png share/gnome/help/char-palette/uk/char-palette.xml share/gnome/help/char-palette/uk/figures/charpalette_applet.png share/gnome/help/char-palette/uk/figures/charpalette_chargroup.png share/gnome/help/char-palette/uk/figures/charpick-preferences.png share/gnome/help/char-palette/uk/figures/charpick_characters.png -share/gnome/help/char-palette/uk/legal.xml -share/gnome/help/char-palette/zh_CN/char-palette.xml -share/gnome/help/char-palette/zh_CN/figures/charpalette_applet.png -share/gnome/help/char-palette/zh_CN/figures/charpalette_chargroup.png -share/gnome/help/char-palette/zh_CN/figures/charpick_applet.png -share/gnome/help/char-palette/zh_CN/figures/charpick_characters.png -share/gnome/help/char-palette/zh_CN/figures/charpick_chargroup.png -share/gnome/help/char-palette/zh_CN/legal.xml -share/gnome/help/char-palette/zh_HK/char-palette.xml -share/gnome/help/char-palette/zh_HK/figures/charpalette_applet.png -share/gnome/help/char-palette/zh_HK/figures/charpalette_chargroup.png -share/gnome/help/char-palette/zh_HK/legal.xml -share/gnome/help/char-palette/zh_TW/char-palette.xml -share/gnome/help/char-palette/zh_TW/figures/charpalette_applet.png -share/gnome/help/char-palette/zh_TW/figures/charpalette_chargroup.png -share/gnome/help/char-palette/zh_TW/figures/charpick_applet.png -share/gnome/help/char-palette/zh_TW/figures/charpick_characters.png -share/gnome/help/char-palette/zh_TW/figures/charpick_chargroup.png -share/gnome/help/char-palette/zh_TW/legal.xml share/gnome/help/command-line/C/command-line.xml share/gnome/help/command-line/C/figures/command-line.png share/gnome/help/command-line/C/figures/prefs-macros.png share/gnome/help/command-line/C/figures/prefs.png share/gnome/help/command-line/C/legal.xml -share/gnome/help/command-line/de/command-line.xml -share/gnome/help/command-line/de/figures/command-line.png -share/gnome/help/command-line/de/legal.xml share/gnome/help/command-line/es/command-line.xml share/gnome/help/command-line/es/figures/command-line.png -share/gnome/help/command-line/es/legal.xml -share/gnome/help/command-line/eu/command-line.xml -share/gnome/help/command-line/eu/figures/command-line.png -share/gnome/help/command-line/eu/legal.xml -share/gnome/help/command-line/fr/command-line.xml -share/gnome/help/command-line/fr/figures/command-line.png -share/gnome/help/command-line/fr/legal.xml -share/gnome/help/command-line/it/command-line.xml -share/gnome/help/command-line/it/figures/command-line.png -share/gnome/help/command-line/it/legal.xml -share/gnome/help/command-line/ja/command-line.xml -share/gnome/help/command-line/ja/figures/command-line.png -share/gnome/help/command-line/ja/legal.xml -share/gnome/help/command-line/ko/command-line.xml -share/gnome/help/command-line/ko/figures/command-line.png -share/gnome/help/command-line/ko/legal.xml -share/gnome/help/command-line/sv/command-line.xml -share/gnome/help/command-line/sv/figures/command-line.png -share/gnome/help/command-line/sv/legal.xml +share/gnome/help/command-line/es/figures/prefs-macros.png +share/gnome/help/command-line/es/figures/prefs.png +share/gnome/help/command-line/pt_BR/command-line.xml +share/gnome/help/command-line/pt_BR/figures/command-line.png +share/gnome/help/command-line/pt_BR/figures/prefs-macros.png +share/gnome/help/command-line/pt_BR/figures/prefs.png share/gnome/help/command-line/uk/command-line.xml share/gnome/help/command-line/uk/figures/command-line.png share/gnome/help/command-line/uk/figures/prefs-macros.png share/gnome/help/command-line/uk/figures/prefs.png -share/gnome/help/command-line/uk/legal.xml -share/gnome/help/command-line/zh_CN/command-line.xml -share/gnome/help/command-line/zh_CN/figures/command-line.png -share/gnome/help/command-line/zh_CN/legal.xml -share/gnome/help/command-line/zh_HK/command-line.xml -share/gnome/help/command-line/zh_HK/figures/command-line.png -share/gnome/help/command-line/zh_HK/legal.xml -share/gnome/help/command-line/zh_TW/command-line.xml -share/gnome/help/command-line/zh_TW/figures/command-line.png -share/gnome/help/command-line/zh_TW/legal.xml %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/cpufreq-applet.xml %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-100.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-25.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-50.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-75.png -%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-preferences-smp.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-selector-both.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/legal.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/cpufreq-applet.xml +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-100.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-25.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-50.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-preferences-smp.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector-both.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/cpufreq-applet.xml %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-100.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-25.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-50.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-75.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-preferences-smp.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-preferences.png +%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-selector-both.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-selector.png %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet.png -%%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/legal.xml share/gnome/help/drivemount/C/drivemount.xml share/gnome/help/drivemount/C/figures/drivemount-applet_eject.png share/gnome/help/drivemount/C/figures/drivemount-applet_example.png @@ -387,184 +234,56 @@ share/gnome/help/drivemount/C/figures/drivemount-applet_mount.png share/gnome/help/drivemount/C/figures/drivemount-applet_open.png share/gnome/help/drivemount/C/figures/drivemount-applet_status.png share/gnome/help/drivemount/C/legal.xml -share/gnome/help/drivemount/de/drivemount.xml -share/gnome/help/drivemount/de/figures/drivemount-applet_window.png -share/gnome/help/drivemount/de/figures/drivemount_applet_all.png -share/gnome/help/drivemount/de/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/de/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/de/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/de/legal.xml share/gnome/help/drivemount/es/drivemount.xml -share/gnome/help/drivemount/es/figures/drivemount-applet_window.png -share/gnome/help/drivemount/es/figures/drivemount_applet_all.png -share/gnome/help/drivemount/es/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/es/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/es/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/es/legal.xml -share/gnome/help/drivemount/eu/drivemount.xml -share/gnome/help/drivemount/eu/figures/drivemount_applet_all.png -share/gnome/help/drivemount/eu/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/eu/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/eu/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/eu/legal.xml -share/gnome/help/drivemount/fr/drivemount.xml -share/gnome/help/drivemount/fr/figures/drivemount-applet_window.png -share/gnome/help/drivemount/fr/figures/drivemount_applet_all.png -share/gnome/help/drivemount/fr/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/fr/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/fr/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/fr/legal.xml +share/gnome/help/drivemount/es/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/es/figures/drivemount-applet_example.png +share/gnome/help/drivemount/es/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/es/figures/drivemount-applet_open.png +share/gnome/help/drivemount/es/figures/drivemount-applet_status.png share/gnome/help/drivemount/it/drivemount.xml -share/gnome/help/drivemount/it/figures/drivemount-applet_window.png -share/gnome/help/drivemount/it/figures/drivemount_applet_all.png -share/gnome/help/drivemount/it/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/it/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/it/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/it/legal.xml -share/gnome/help/drivemount/ja/drivemount.xml -share/gnome/help/drivemount/ja/figures/drivemount-applet_window.png -share/gnome/help/drivemount/ja/figures/drivemount_applet_all.png -share/gnome/help/drivemount/ja/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/ja/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/ja/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/ja/legal.xml -share/gnome/help/drivemount/ko/drivemount.xml -share/gnome/help/drivemount/ko/figures/drivemount-applet_window.png -share/gnome/help/drivemount/ko/figures/drivemount_applet_all.png -share/gnome/help/drivemount/ko/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/ko/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/ko/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/ko/legal.xml -share/gnome/help/drivemount/sv/drivemount.xml -share/gnome/help/drivemount/sv/figures/drivemount-applet_window.png -share/gnome/help/drivemount/sv/figures/drivemount_applet_all.png -share/gnome/help/drivemount/sv/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/sv/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/sv/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/sv/legal.xml +share/gnome/help/drivemount/it/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/it/figures/drivemount-applet_example.png +share/gnome/help/drivemount/it/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/it/figures/drivemount-applet_open.png +share/gnome/help/drivemount/it/figures/drivemount-applet_status.png +share/gnome/help/drivemount/pa/drivemount.xml +share/gnome/help/drivemount/pa/figures/drivemount-applet_eject.png +share/gnome/help/drivemount/pa/figures/drivemount-applet_example.png +share/gnome/help/drivemount/pa/figures/drivemount-applet_mount.png +share/gnome/help/drivemount/pa/figures/drivemount-applet_open.png +share/gnome/help/drivemount/pa/figures/drivemount-applet_status.png share/gnome/help/drivemount/uk/drivemount.xml share/gnome/help/drivemount/uk/figures/drivemount-applet_eject.png share/gnome/help/drivemount/uk/figures/drivemount-applet_example.png share/gnome/help/drivemount/uk/figures/drivemount-applet_mount.png share/gnome/help/drivemount/uk/figures/drivemount-applet_open.png share/gnome/help/drivemount/uk/figures/drivemount-applet_status.png -share/gnome/help/drivemount/uk/legal.xml -share/gnome/help/drivemount/zh_CN/drivemount.xml -share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_window.png -share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_all.png -share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/zh_CN/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/zh_CN/legal.xml -share/gnome/help/drivemount/zh_HK/drivemount.xml -share/gnome/help/drivemount/zh_HK/figures/drivemount-applet_window.png -share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_all.png -share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/zh_HK/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/zh_HK/legal.xml -share/gnome/help/drivemount/zh_TW/drivemount.xml -share/gnome/help/drivemount/zh_TW/figures/drivemount-applet_window.png -share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_all.png -share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_floppy.png -share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_settings.png -share/gnome/help/drivemount/zh_TW/figures/drivemount_applet_tooltip.png -share/gnome/help/drivemount/zh_TW/legal.xml share/gnome/help/geyes/C/figures/geyes_applet.png share/gnome/help/geyes/C/geyes.xml share/gnome/help/geyes/C/legal.xml -share/gnome/help/geyes/de/figures/geyes_applet.png -share/gnome/help/geyes/de/figures/geyes_settings.png -share/gnome/help/geyes/de/geyes.xml -share/gnome/help/geyes/de/legal.xml share/gnome/help/geyes/es/figures/geyes_applet.png -share/gnome/help/geyes/es/figures/geyes_settings.png share/gnome/help/geyes/es/geyes.xml -share/gnome/help/geyes/es/legal.xml -share/gnome/help/geyes/eu/figures/geyes_applet.png -share/gnome/help/geyes/eu/geyes.xml -share/gnome/help/geyes/eu/legal.xml -share/gnome/help/geyes/fr/figures/geyes_applet.png -share/gnome/help/geyes/fr/figures/geyes_settings.png -share/gnome/help/geyes/fr/geyes.xml -share/gnome/help/geyes/fr/legal.xml share/gnome/help/geyes/it/figures/geyes_applet.png -share/gnome/help/geyes/it/figures/geyes_settings.png share/gnome/help/geyes/it/geyes.xml -share/gnome/help/geyes/it/legal.xml -share/gnome/help/geyes/ja/figures/geyes_applet.png -share/gnome/help/geyes/ja/figures/geyes_settings.png -share/gnome/help/geyes/ja/geyes.xml -share/gnome/help/geyes/ja/legal.xml -share/gnome/help/geyes/ko/figures/geyes_applet.png -share/gnome/help/geyes/ko/figures/geyes_settings.png -share/gnome/help/geyes/ko/geyes.xml -share/gnome/help/geyes/ko/legal.xml -share/gnome/help/geyes/sv/figures/geyes_applet.png -share/gnome/help/geyes/sv/figures/geyes_settings.png -share/gnome/help/geyes/sv/geyes.xml -share/gnome/help/geyes/sv/legal.xml share/gnome/help/geyes/uk/figures/geyes_applet.png share/gnome/help/geyes/uk/geyes.xml -share/gnome/help/geyes/uk/legal.xml -share/gnome/help/geyes/zh_CN/figures/geyes_applet.png -share/gnome/help/geyes/zh_CN/figures/geyes_settings.png -share/gnome/help/geyes/zh_CN/geyes.xml -share/gnome/help/geyes/zh_CN/legal.xml -share/gnome/help/geyes/zh_HK/figures/geyes_applet.png -share/gnome/help/geyes/zh_HK/geyes.xml -share/gnome/help/geyes/zh_HK/legal.xml -share/gnome/help/geyes/zh_TW/figures/geyes_applet.png -share/gnome/help/geyes/zh_TW/figures/geyes_settings.png -share/gnome/help/geyes/zh_TW/geyes.xml -share/gnome/help/geyes/zh_TW/legal.xml share/gnome/help/gswitchit/C/gswitchit.xml share/gnome/help/gswitchit/C/legal.xml +share/gnome/help/gswitchit/es/gswitchit.xml +share/gnome/help/gswitchit/fr/gswitchit.xml share/gnome/help/gswitchit/uk/gswitchit.xml -share/gnome/help/gswitchit/uk/legal.xml share/gnome/help/gtik2_applet2/C/figures/gtik_applet.png share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml share/gnome/help/gtik2_applet2/C/legal.xml -share/gnome/help/gtik2_applet2/de/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/de/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/de/legal.xml share/gnome/help/gtik2_applet2/es/figures/gtik_applet.png share/gnome/help/gtik2_applet2/es/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/es/legal.xml -share/gnome/help/gtik2_applet2/eu/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/eu/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/eu/legal.xml -share/gnome/help/gtik2_applet2/fr/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/fr/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/fr/legal.xml -share/gnome/help/gtik2_applet2/it/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/it/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/it/legal.xml -share/gnome/help/gtik2_applet2/ja/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/ja/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/ja/legal.xml -share/gnome/help/gtik2_applet2/ko/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/ko/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/ko/legal.xml -share/gnome/help/gtik2_applet2/sv/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/sv/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/sv/legal.xml share/gnome/help/gtik2_applet2/uk/figures/gtik_applet.png share/gnome/help/gtik2_applet2/uk/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/uk/legal.xml -share/gnome/help/gtik2_applet2/zh_CN/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/zh_CN/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/zh_CN/legal.xml -share/gnome/help/gtik2_applet2/zh_HK/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/zh_HK/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/zh_HK/legal.xml -share/gnome/help/gtik2_applet2/zh_TW/figures/gtik_applet.png -share/gnome/help/gtik2_applet2/zh_TW/gtik2_applet2.xml -share/gnome/help/gtik2_applet2/zh_TW/legal.xml -share/gnome/help/gweather/C/figures/gweather_applet.png share/gnome/help/gweather/C/figures/gweather-details.png +share/gnome/help/gweather/C/figures/gweather-menu-prefs.png share/gnome/help/gweather/C/figures/gweather-prefs-general.png share/gnome/help/gweather/C/figures/gweather-prefs-locations.png +share/gnome/help/gweather/C/figures/gweather_applet.png share/gnome/help/gweather/C/figures/stock_weather-cloudy.png share/gnome/help/gweather/C/figures/stock_weather-few-clouds.png share/gnome/help/gweather/C/figures/stock_weather-fog.png @@ -576,47 +295,23 @@ share/gnome/help/gweather/C/figures/stock_weather-storm.png share/gnome/help/gweather/C/figures/stock_weather-sunny.png share/gnome/help/gweather/C/gweather.xml share/gnome/help/gweather/C/legal.xml -share/gnome/help/gweather/de/figures/gweather_applet.png -share/gnome/help/gweather/de/figures/gweather_settings.png -share/gnome/help/gweather/de/figures/gweather_weather.png -share/gnome/help/gweather/de/gweather.xml -share/gnome/help/gweather/de/legal.xml +share/gnome/help/gweather/es/figures/gweather-details.png +share/gnome/help/gweather/es/figures/gweather-menu-prefs.png +share/gnome/help/gweather/es/figures/gweather-prefs-general.png +share/gnome/help/gweather/es/figures/gweather-prefs-locations.png share/gnome/help/gweather/es/figures/gweather_applet.png -share/gnome/help/gweather/es/figures/gweather_settings.png -share/gnome/help/gweather/es/figures/gweather_weather.png +share/gnome/help/gweather/es/figures/stock_weather-cloudy.png +share/gnome/help/gweather/es/figures/stock_weather-few-clouds.png +share/gnome/help/gweather/es/figures/stock_weather-fog.png +share/gnome/help/gweather/es/figures/stock_weather-night-clear.png +share/gnome/help/gweather/es/figures/stock_weather-night-few-clouds.png +share/gnome/help/gweather/es/figures/stock_weather-showers.png +share/gnome/help/gweather/es/figures/stock_weather-snow.png +share/gnome/help/gweather/es/figures/stock_weather-storm.png +share/gnome/help/gweather/es/figures/stock_weather-sunny.png share/gnome/help/gweather/es/gweather.xml -share/gnome/help/gweather/es/legal.xml -share/gnome/help/gweather/eu/figures/gweather_applet.png -share/gnome/help/gweather/eu/figures/gweather_settings.png -share/gnome/help/gweather/eu/figures/gweather_weather.png -share/gnome/help/gweather/eu/gweather.xml -share/gnome/help/gweather/eu/legal.xml -share/gnome/help/gweather/fr/figures/gweather_applet.png -share/gnome/help/gweather/fr/figures/gweather_settings.png -share/gnome/help/gweather/fr/figures/gweather_weather.png -share/gnome/help/gweather/fr/gweather.xml -share/gnome/help/gweather/fr/legal.xml -share/gnome/help/gweather/it/figures/gweather_applet.png -share/gnome/help/gweather/it/figures/gweather_settings.png -share/gnome/help/gweather/it/figures/gweather_weather.png -share/gnome/help/gweather/it/gweather.xml -share/gnome/help/gweather/it/legal.xml -share/gnome/help/gweather/ja/figures/gweather_applet.png -share/gnome/help/gweather/ja/figures/gweather_settings.png -share/gnome/help/gweather/ja/figures/gweather_weather.png -share/gnome/help/gweather/ja/gweather.xml -share/gnome/help/gweather/ja/legal.xml -share/gnome/help/gweather/ko/figures/gweather_applet.png -share/gnome/help/gweather/ko/figures/gweather_settings.png -share/gnome/help/gweather/ko/figures/gweather_weather.png -share/gnome/help/gweather/ko/gweather.xml -share/gnome/help/gweather/ko/legal.xml -share/gnome/help/gweather/sv/figures/gweather_applet.png -share/gnome/help/gweather/sv/figures/gweather_settings.png -share/gnome/help/gweather/sv/figures/gweather_weather.png -share/gnome/help/gweather/sv/gweather.xml -share/gnome/help/gweather/sv/legal.xml share/gnome/help/gweather/uk/figures/gweather-details.png +share/gnome/help/gweather/uk/figures/gweather-menu-prefs.png share/gnome/help/gweather/uk/figures/gweather-prefs-general.png share/gnome/help/gweather/uk/figures/gweather-prefs-locations.png share/gnome/help/gweather/uk/figures/gweather_applet.png @@ -630,306 +325,112 @@ share/gnome/help/gweather/uk/figures/stock_weather-snow.png share/gnome/help/gweather/uk/figures/stock_weather-storm.png share/gnome/help/gweather/uk/figures/stock_weather-sunny.png share/gnome/help/gweather/uk/gweather.xml -share/gnome/help/gweather/uk/legal.xml -share/gnome/help/gweather/zh_CN/figures/gweather_applet.png -share/gnome/help/gweather/zh_CN/figures/gweather_settings.png -share/gnome/help/gweather/zh_CN/figures/gweather_weather.png -share/gnome/help/gweather/zh_CN/gweather.xml -share/gnome/help/gweather/zh_CN/legal.xml -share/gnome/help/gweather/zh_HK/figures/gweather_applet.png -share/gnome/help/gweather/zh_HK/figures/gweather_settings.png -share/gnome/help/gweather/zh_HK/figures/gweather_weather.png -share/gnome/help/gweather/zh_HK/gweather.xml -share/gnome/help/gweather/zh_HK/legal.xml -share/gnome/help/gweather/zh_TW/figures/gweather_applet.png -share/gnome/help/gweather/zh_TW/figures/gweather_settings.png -share/gnome/help/gweather/zh_TW/figures/gweather_weather.png -share/gnome/help/gweather/zh_TW/gweather.xml -share/gnome/help/gweather/zh_TW/legal.xml share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png share/gnome/help/mixer_applet2/C/legal.xml share/gnome/help/mixer_applet2/C/mixer_applet2.xml -share/gnome/help/mixer_applet2/de/figures/mixer_applet.png -share/gnome/help/mixer_applet2/de/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/de/legal.xml -share/gnome/help/mixer_applet2/de/mixer_applet2.xml -share/gnome/help/mixer_applet2/es/figures/mixer_applet.png share/gnome/help/mixer_applet2/es/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/es/legal.xml share/gnome/help/mixer_applet2/es/mixer_applet2.xml -share/gnome/help/mixer_applet2/eu/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/eu/legal.xml -share/gnome/help/mixer_applet2/eu/mixer_applet2.xml -share/gnome/help/mixer_applet2/fr/figures/mixer_applet.png -share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/fr/legal.xml -share/gnome/help/mixer_applet2/fr/mixer_applet2.xml -share/gnome/help/mixer_applet2/it/figures/mixer_applet.png -share/gnome/help/mixer_applet2/it/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/it/legal.xml -share/gnome/help/mixer_applet2/it/mixer_applet2.xml -share/gnome/help/mixer_applet2/ja/figures/mixer_applet.png -share/gnome/help/mixer_applet2/ja/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/ja/legal.xml -share/gnome/help/mixer_applet2/ja/mixer_applet2.xml -share/gnome/help/mixer_applet2/ko/figures/mixer_applet.png -share/gnome/help/mixer_applet2/ko/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/ko/legal.xml -share/gnome/help/mixer_applet2/ko/mixer_applet2.xml -share/gnome/help/mixer_applet2/sv/figures/mixer_applet.png -share/gnome/help/mixer_applet2/sv/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/sv/legal.xml -share/gnome/help/mixer_applet2/sv/mixer_applet2.xml share/gnome/help/mixer_applet2/uk/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/uk/legal.xml share/gnome/help/mixer_applet2/uk/mixer_applet2.xml -share/gnome/help/mixer_applet2/zh_CN/figures/mixer_applet.png -share/gnome/help/mixer_applet2/zh_CN/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/zh_CN/legal.xml -share/gnome/help/mixer_applet2/zh_CN/mixer_applet2.xml -share/gnome/help/mixer_applet2/zh_HK/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/zh_HK/legal.xml -share/gnome/help/mixer_applet2/zh_HK/mixer_applet2.xml -share/gnome/help/mixer_applet2/zh_TW/figures/mixer_applet.png -share/gnome/help/mixer_applet2/zh_TW/figures/volumecontrol_applet.png -share/gnome/help/mixer_applet2/zh_TW/legal.xml -share/gnome/help/mixer_applet2/zh_TW/mixer_applet2.xml share/gnome/help/multiload/C/figures/multiload-preferences.png share/gnome/help/multiload/C/figures/system-monitor-applet_window.png share/gnome/help/multiload/C/figures/system_monitor.png share/gnome/help/multiload/C/legal.xml share/gnome/help/multiload/C/multiload.xml -share/gnome/help/multiload/de/figures/system-monitor-applet_window.png -share/gnome/help/multiload/de/legal.xml -share/gnome/help/multiload/de/multiload.xml +share/gnome/help/multiload/es/figures/multiload-preferences.png share/gnome/help/multiload/es/figures/system-monitor-applet_window.png -share/gnome/help/multiload/es/legal.xml +share/gnome/help/multiload/es/figures/system_monitor.png share/gnome/help/multiload/es/multiload.xml -share/gnome/help/multiload/eu/figures/system_monitor.png -share/gnome/help/multiload/eu/figures/system_monitor_prefs.png -share/gnome/help/multiload/eu/legal.xml -share/gnome/help/multiload/eu/multiload.xml -share/gnome/help/multiload/fr/figures/system-monitor-applet_window.png -share/gnome/help/multiload/fr/legal.xml -share/gnome/help/multiload/fr/multiload.xml -share/gnome/help/multiload/it/figures/system-monitor-applet_window.png -share/gnome/help/multiload/it/legal.xml -share/gnome/help/multiload/it/multiload.xml -share/gnome/help/multiload/ja/figures/system-monitor-applet_window.png -share/gnome/help/multiload/ja/legal.xml -share/gnome/help/multiload/ja/multiload.xml -share/gnome/help/multiload/ko/figures/system-monitor-applet_window.png -share/gnome/help/multiload/ko/legal.xml -share/gnome/help/multiload/ko/multiload.xml -share/gnome/help/multiload/sv/figures/system-monitor-applet_window.png -share/gnome/help/multiload/sv/legal.xml -share/gnome/help/multiload/sv/multiload.xml share/gnome/help/multiload/uk/figures/multiload-preferences.png share/gnome/help/multiload/uk/figures/system-monitor-applet_window.png share/gnome/help/multiload/uk/figures/system_monitor.png -share/gnome/help/multiload/uk/legal.xml share/gnome/help/multiload/uk/multiload.xml -share/gnome/help/multiload/zh_CN/figures/system-monitor-applet_window.png -share/gnome/help/multiload/zh_CN/legal.xml -share/gnome/help/multiload/zh_CN/multiload.xml -share/gnome/help/multiload/zh_HK/figures/system-monitor-applet_window.png -share/gnome/help/multiload/zh_HK/legal.xml -share/gnome/help/multiload/zh_HK/multiload.xml -share/gnome/help/multiload/zh_TW/figures/system-monitor-applet_window.png -share/gnome/help/multiload/zh_TW/legal.xml -share/gnome/help/multiload/zh_TW/multiload.xml -share/gnome/help/stickynotes_applet/C/legal.xml -share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/C/figures/stickynote-left-menu.png -share/gnome/help/stickynotes_applet/C/figures/stickynote-right-menu.png +share/gnome/help/stickynotes_applet/C/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/C/figures/stickynote-right-menu-new.png share/gnome/help/stickynotes_applet/C/figures/stickynotes-note-prefs.png share/gnome/help/stickynotes_applet/C/figures/stickynotes-prefs.png share/gnome/help/stickynotes_applet/C/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/de/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/de/legal.xml -share/gnome/help/stickynotes_applet/de/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/C/legal.xml +share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml +share/gnome/help/stickynotes_applet/es/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/es/figures/stickynote-right-menu-new.png +share/gnome/help/stickynotes_applet/es/figures/stickynotes-note-prefs.png +share/gnome/help/stickynotes_applet/es/figures/stickynotes-prefs.png share/gnome/help/stickynotes_applet/es/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/es/legal.xml share/gnome/help/stickynotes_applet/es/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/eu/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/eu/legal.xml -share/gnome/help/stickynotes_applet/eu/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/fr/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/fr/legal.xml -share/gnome/help/stickynotes_applet/fr/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/it/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/it/legal.xml -share/gnome/help/stickynotes_applet/it/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/ja/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/ja/legal.xml -share/gnome/help/stickynotes_applet/ja/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/ko/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/ko/legal.xml -share/gnome/help/stickynotes_applet/ko/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/sv/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/sv/legal.xml -share/gnome/help/stickynotes_applet/sv/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/uk/figures/stickynote-left-menu.png -share/gnome/help/stickynotes_applet/uk/figures/stickynote-right-menu.png +share/gnome/help/stickynotes_applet/uk/figures/stickynote-right-menu-lock.png +share/gnome/help/stickynotes_applet/uk/figures/stickynote-right-menu-new.png share/gnome/help/stickynotes_applet/uk/figures/stickynotes-note-prefs.png share/gnome/help/stickynotes_applet/uk/figures/stickynotes-prefs.png share/gnome/help/stickynotes_applet/uk/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/uk/legal.xml share/gnome/help/stickynotes_applet/uk/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/zh_CN/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/zh_CN/legal.xml -share/gnome/help/stickynotes_applet/zh_CN/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/zh_HK/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/zh_HK/legal.xml -share/gnome/help/stickynotes_applet/zh_HK/stickynotes_applet.xml -share/gnome/help/stickynotes_applet/zh_TW/figures/stickynotes_applet.png -share/gnome/help/stickynotes_applet/zh_TW/legal.xml -share/gnome/help/stickynotes_applet/zh_TW/stickynotes_applet.xml -share/gnome/help/trashapplet/C/legal.xml share/gnome/help/trashapplet/C/figures/trash-applet.png +share/gnome/help/trashapplet/C/legal.xml share/gnome/help/trashapplet/C/trashapplet.xml +share/gnome/help/trashapplet/es/figures/trash-applet.png +share/gnome/help/trashapplet/es/trashapplet.xml +share/gnome/help/trashapplet/fr/figures/trash-applet.png +share/gnome/help/trashapplet/fr/trashapplet.xml +share/gnome/help/trashapplet/it/figures/trash-applet.png +share/gnome/help/trashapplet/it/trashapplet.xml +share/gnome/help/trashapplet/pa/figures/trash-applet.png +share/gnome/help/trashapplet/pa/trashapplet.xml share/gnome/help/trashapplet/uk/figures/trash-applet.png -share/gnome/help/trashapplet/uk/legal.xml share/gnome/help/trashapplet/uk/trashapplet.xml -share/gnome/omf/gnome-applets/accessx-status-C.omf -share/gnome/omf/gnome-applets/accessx-status-uk.omf -share/gnome/omf/gnome-applets/accessx-status-eu.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-de.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-es.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-eu.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-fr.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-it.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-ja.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-ko.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-sv.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-uk.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_CN.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_HK.omf -%%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_TW.omf -share/gnome/omf/gnome-applets/char-palette-C.omf -share/gnome/omf/gnome-applets/char-palette-de.omf -share/gnome/omf/gnome-applets/char-palette-es.omf -share/gnome/omf/gnome-applets/char-palette-eu.omf -share/gnome/omf/gnome-applets/char-palette-fr.omf -share/gnome/omf/gnome-applets/char-palette-it.omf -share/gnome/omf/gnome-applets/char-palette-ja.omf -share/gnome/omf/gnome-applets/char-palette-ko.omf -share/gnome/omf/gnome-applets/char-palette-sv.omf -share/gnome/omf/gnome-applets/char-palette-uk.omf -share/gnome/omf/gnome-applets/char-palette-zh_CN.omf -share/gnome/omf/gnome-applets/char-palette-zh_HK.omf -share/gnome/omf/gnome-applets/char-palette-zh_TW.omf -share/gnome/omf/gnome-applets/command-line-C.omf -share/gnome/omf/gnome-applets/command-line-de.omf -share/gnome/omf/gnome-applets/command-line-es.omf -share/gnome/omf/gnome-applets/command-line-eu.omf -share/gnome/omf/gnome-applets/command-line-fr.omf -share/gnome/omf/gnome-applets/command-line-it.omf -share/gnome/omf/gnome-applets/command-line-ja.omf -share/gnome/omf/gnome-applets/command-line-ko.omf -share/gnome/omf/gnome-applets/command-line-sv.omf -share/gnome/omf/gnome-applets/command-line-uk.omf -share/gnome/omf/gnome-applets/command-line-zh_CN.omf -share/gnome/omf/gnome-applets/command-line-zh_HK.omf -share/gnome/omf/gnome-applets/command-line-zh_TW.omf -%%CPUFREQ%%share/gnome/omf/gnome-applets/cpufreq-applet-C.omf -%%CPUFREQ%%share/gnome/omf/gnome-applets/cpufreq-applet-uk.omf -share/gnome/omf/gnome-applets/drivemount-C.omf -share/gnome/omf/gnome-applets/drivemount-de.omf -share/gnome/omf/gnome-applets/drivemount-es.omf -share/gnome/omf/gnome-applets/drivemount-eu.omf -share/gnome/omf/gnome-applets/drivemount-fr.omf -share/gnome/omf/gnome-applets/drivemount-it.omf -share/gnome/omf/gnome-applets/drivemount-ja.omf -share/gnome/omf/gnome-applets/drivemount-ko.omf -share/gnome/omf/gnome-applets/drivemount-sv.omf -share/gnome/omf/gnome-applets/drivemount-uk.omf -share/gnome/omf/gnome-applets/drivemount-zh_CN.omf -share/gnome/omf/gnome-applets/drivemount-zh_HK.omf -share/gnome/omf/gnome-applets/drivemount-zh_TW.omf -share/gnome/omf/gnome-applets/geyes-C.omf -share/gnome/omf/gnome-applets/geyes-de.omf -share/gnome/omf/gnome-applets/geyes-es.omf -share/gnome/omf/gnome-applets/geyes-eu.omf -share/gnome/omf/gnome-applets/geyes-fr.omf -share/gnome/omf/gnome-applets/geyes-it.omf -share/gnome/omf/gnome-applets/geyes-ja.omf -share/gnome/omf/gnome-applets/geyes-ko.omf -share/gnome/omf/gnome-applets/geyes-sv.omf -share/gnome/omf/gnome-applets/geyes-uk.omf -share/gnome/omf/gnome-applets/geyes-zh_CN.omf -share/gnome/omf/gnome-applets/geyes-zh_HK.omf -share/gnome/omf/gnome-applets/geyes-zh_TW.omf -share/gnome/omf/gnome-applets/gswitchit-C.omf -share/gnome/omf/gnome-applets/gswitchit-uk.omf -share/gnome/omf/gnome-applets/gtik2_applet2-C.omf -share/gnome/omf/gnome-applets/gtik2_applet2-de.omf -share/gnome/omf/gnome-applets/gtik2_applet2-es.omf -share/gnome/omf/gnome-applets/gtik2_applet2-eu.omf -share/gnome/omf/gnome-applets/gtik2_applet2-fr.omf -share/gnome/omf/gnome-applets/gtik2_applet2-it.omf -share/gnome/omf/gnome-applets/gtik2_applet2-ja.omf -share/gnome/omf/gnome-applets/gtik2_applet2-ko.omf -share/gnome/omf/gnome-applets/gtik2_applet2-sv.omf -share/gnome/omf/gnome-applets/gtik2_applet2-uk.omf -share/gnome/omf/gnome-applets/gtik2_applet2-zh_CN.omf -share/gnome/omf/gnome-applets/gtik2_applet2-zh_HK.omf -share/gnome/omf/gnome-applets/gtik2_applet2-zh_TW.omf -share/gnome/omf/gnome-applets/gweather-C.omf -share/gnome/omf/gnome-applets/gweather-de.omf -share/gnome/omf/gnome-applets/gweather-es.omf -share/gnome/omf/gnome-applets/gweather-eu.omf -share/gnome/omf/gnome-applets/gweather-fr.omf -share/gnome/omf/gnome-applets/gweather-it.omf -share/gnome/omf/gnome-applets/gweather-ja.omf -share/gnome/omf/gnome-applets/gweather-ko.omf -share/gnome/omf/gnome-applets/gweather-sv.omf -share/gnome/omf/gnome-applets/gweather-uk.omf -share/gnome/omf/gnome-applets/gweather-zh_CN.omf -share/gnome/omf/gnome-applets/gweather-zh_HK.omf -share/gnome/omf/gnome-applets/gweather-zh_TW.omf -share/gnome/omf/gnome-applets/mixer_applet2-C.omf -share/gnome/omf/gnome-applets/mixer_applet2-de.omf -share/gnome/omf/gnome-applets/mixer_applet2-es.omf -share/gnome/omf/gnome-applets/mixer_applet2-eu.omf -share/gnome/omf/gnome-applets/mixer_applet2-fr.omf -share/gnome/omf/gnome-applets/mixer_applet2-it.omf -share/gnome/omf/gnome-applets/mixer_applet2-ja.omf -share/gnome/omf/gnome-applets/mixer_applet2-ko.omf -share/gnome/omf/gnome-applets/mixer_applet2-sv.omf -share/gnome/omf/gnome-applets/mixer_applet2-uk.omf -share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf -share/gnome/omf/gnome-applets/mixer_applet2-zh_HK.omf -share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf -share/gnome/omf/gnome-applets/multiload-C.omf -share/gnome/omf/gnome-applets/multiload-de.omf -share/gnome/omf/gnome-applets/multiload-es.omf -share/gnome/omf/gnome-applets/multiload-eu.omf -share/gnome/omf/gnome-applets/multiload-fr.omf -share/gnome/omf/gnome-applets/multiload-it.omf -share/gnome/omf/gnome-applets/multiload-ja.omf -share/gnome/omf/gnome-applets/multiload-ko.omf -share/gnome/omf/gnome-applets/multiload-sv.omf -share/gnome/omf/gnome-applets/multiload-uk.omf -share/gnome/omf/gnome-applets/multiload-zh_CN.omf -share/gnome/omf/gnome-applets/multiload-zh_HK.omf -share/gnome/omf/gnome-applets/multiload-zh_TW.omf -share/gnome/omf/gnome-applets/stickynotes_applet-C.omf -share/gnome/omf/gnome-applets/stickynotes_applet-de.omf -share/gnome/omf/gnome-applets/stickynotes_applet-es.omf -share/gnome/omf/gnome-applets/stickynotes_applet-eu.omf -share/gnome/omf/gnome-applets/stickynotes_applet-fr.omf -share/gnome/omf/gnome-applets/stickynotes_applet-it.omf -share/gnome/omf/gnome-applets/stickynotes_applet-ja.omf -share/gnome/omf/gnome-applets/stickynotes_applet-ko.omf -share/gnome/omf/gnome-applets/stickynotes_applet-sv.omf -share/gnome/omf/gnome-applets/stickynotes_applet-uk.omf -share/gnome/omf/gnome-applets/stickynotes_applet-zh_CN.omf -share/gnome/omf/gnome-applets/stickynotes_applet-zh_HK.omf -share/gnome/omf/gnome-applets/stickynotes_applet-zh_TW.omf -share/gnome/omf/gnome-applets/trashapplet-C.omf -share/gnome/omf/gnome-applets/trashapplet-uk.omf +share/gnome/omf/accessx-status/accessx-status-C.omf +share/gnome/omf/accessx-status/accessx-status-es.omf +share/gnome/omf/accessx-status/accessx-status-fr.omf +share/gnome/omf/accessx-status/accessx-status-uk.omf +%%BATTERY%%share/gnome/omf/battstat/battstat-C.omf +%%BATTERY%%share/gnome/omf/battstat/battstat-es.omf +%%BATTERY%%share/gnome/omf/battstat/battstat-uk.omf +share/gnome/omf/char-palette/char-palette-C.omf +share/gnome/omf/char-palette/char-palette-es.omf +share/gnome/omf/char-palette/char-palette-it.omf +share/gnome/omf/char-palette/char-palette-nl.omf +share/gnome/omf/char-palette/char-palette-pt_BR.omf +share/gnome/omf/char-palette/char-palette-uk.omf +share/gnome/omf/command-line/command-line-C.omf +share/gnome/omf/command-line/command-line-es.omf +share/gnome/omf/command-line/command-line-pt_BR.omf +share/gnome/omf/command-line/command-line-uk.omf +%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-C.omf +%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-es.omf +%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-uk.omf +share/gnome/omf/drivemount/drivemount-C.omf +share/gnome/omf/drivemount/drivemount-es.omf +share/gnome/omf/drivemount/drivemount-it.omf +share/gnome/omf/drivemount/drivemount-pa.omf +share/gnome/omf/drivemount/drivemount-uk.omf +share/gnome/omf/geyes/geyes-C.omf +share/gnome/omf/geyes/geyes-es.omf +share/gnome/omf/geyes/geyes-it.omf +share/gnome/omf/geyes/geyes-uk.omf +share/gnome/omf/gswitchit/gswitchit-C.omf +share/gnome/omf/gswitchit/gswitchit-es.omf +share/gnome/omf/gswitchit/gswitchit-fr.omf +share/gnome/omf/gswitchit/gswitchit-uk.omf +share/gnome/omf/gtik2_applet2/gtik2_applet2-C.omf +share/gnome/omf/gtik2_applet2/gtik2_applet2-es.omf +share/gnome/omf/gtik2_applet2/gtik2_applet2-uk.omf +share/gnome/omf/gweather/gweather-C.omf +share/gnome/omf/gweather/gweather-es.omf +share/gnome/omf/gweather/gweather-uk.omf +share/gnome/omf/mixer_applet2/mixer_applet2-C.omf +share/gnome/omf/mixer_applet2/mixer_applet2-es.omf +share/gnome/omf/mixer_applet2/mixer_applet2-uk.omf +share/gnome/omf/multiload/multiload-C.omf +share/gnome/omf/multiload/multiload-es.omf +share/gnome/omf/multiload/multiload-uk.omf +share/gnome/omf/stickynotes_applet/stickynotes_applet-C.omf +share/gnome/omf/stickynotes_applet/stickynotes_applet-es.omf +share/gnome/omf/stickynotes_applet/stickynotes_applet-uk.omf +share/gnome/omf/trashapplet/trashapplet-C.omf +share/gnome/omf/trashapplet/trashapplet-es.omf +share/gnome/omf/trashapplet/trashapplet-fr.omf +share/gnome/omf/trashapplet/trashapplet-it.omf +share/gnome/omf/trashapplet/trashapplet-pa.omf +share/gnome/omf/trashapplet/trashapplet-uk.omf share/gnome/pixmaps/accessx-status-applet/ax-applet.png share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png share/gnome/pixmaps/accessx-status-applet/ax-key-base.png @@ -1102,6 +603,7 @@ share/locale/he/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/hu/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/hy/LC_MESSAGES/gnome-applets-2.0.mo share/locale/id/LC_MESSAGES/gnome-applets-2.0.mo share/locale/is/LC_MESSAGES/gnome-applets-2.0.mo share/locale/it/LC_MESSAGES/gnome-applets-2.0.mo @@ -1114,6 +616,7 @@ share/locale/ml/LC_MESSAGES/gnome-applets-2.0.mo share/locale/mn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nb/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/ne/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/no/LC_MESSAGES/gnome-applets-2.0.mo @@ -1131,312 +634,167 @@ share/locale/sr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sr@Latn/LC_MESSAGES/gnome-applets-2.0.mo share/locale/sv/LC_MESSAGES/gnome-applets-2.0.mo share/locale/ta/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/te/LC_MESSAGES/gnome-applets-2.0.mo share/locale/th/LC_MESSAGES/gnome-applets-2.0.mo share/locale/tr/LC_MESSAGES/gnome-applets-2.0.mo share/locale/uk/LC_MESSAGES/gnome-applets-2.0.mo share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo +share/locale/xh/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo -@dirrm share/gnome/help/stickynotes_applet/uk/figures -@dirrm share/gnome/help/stickynotes_applet/uk +@unexec /bin/rmdir %D/share/locale/xh/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/xh 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/te/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/te 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/rw/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/rw 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor/48x48 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons/hicolor 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/icons 2>/dev/null || /usr/bin/true @dirrm share/gnome/pixmaps/stickynotes -%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk/figures -%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk %%CPUFREQ%%@dirrm share/gnome/pixmaps/cpufreq-applet @dirrm share/gnome/pixmaps/accessx-status-applet -@dirrm share/gnome/omf/gnome-applets -@dirrm share/gnome/help/trashapplet/C/figures -@dirrm share/gnome/help/trashapplet/C +@dirrm share/gnome/omf/trashapplet +@dirrm share/gnome/omf/stickynotes_applet +@dirrm share/gnome/omf/multiload +@dirrm share/gnome/omf/mixer_applet2 +@dirrm share/gnome/omf/gweather +@dirrm share/gnome/omf/gtik2_applet2 +@dirrm share/gnome/omf/gswitchit +@dirrm share/gnome/omf/geyes +@dirrm share/gnome/omf/drivemount +%%CPUFREQ%%@dirrm share/gnome/omf/cpufreq-applet +@dirrm share/gnome/omf/command-line +@dirrm share/gnome/omf/char-palette +%%BATTERY%%@dirrm share/gnome/omf/battstat +@dirrm share/gnome/omf/accessx-status @dirrm share/gnome/help/trashapplet/uk/figures @dirrm share/gnome/help/trashapplet/uk +@dirrm share/gnome/help/trashapplet/pa/figures +@dirrm share/gnome/help/trashapplet/pa +@dirrm share/gnome/help/trashapplet/fr/figures +@dirrm share/gnome/help/trashapplet/fr +@dirrm share/gnome/help/trashapplet/it/figures +@dirrm share/gnome/help/trashapplet/it +@dirrm share/gnome/help/trashapplet/es/figures +@dirrm share/gnome/help/trashapplet/es +@dirrm share/gnome/help/trashapplet/C/figures +@dirrm share/gnome/help/trashapplet/C @dirrm share/gnome/help/trashapplet -@dirrm share/gnome/help/stickynotes_applet/zh_TW/figures -@dirrm share/gnome/help/stickynotes_applet/zh_TW -@dirrm share/gnome/help/stickynotes_applet/zh_HK/figures -@dirrm share/gnome/help/stickynotes_applet/zh_HK -@dirrm share/gnome/help/stickynotes_applet/zh_CN/figures -@dirrm share/gnome/help/stickynotes_applet/zh_CN -@dirrm share/gnome/help/stickynotes_applet/sv/figures -@dirrm share/gnome/help/stickynotes_applet/sv -@dirrm share/gnome/help/stickynotes_applet/ko/figures -@dirrm share/gnome/help/stickynotes_applet/ko -@dirrm share/gnome/help/stickynotes_applet/ja/figures -@dirrm share/gnome/help/stickynotes_applet/ja -@dirrm share/gnome/help/stickynotes_applet/it/figures -@dirrm share/gnome/help/stickynotes_applet/it -@dirrm share/gnome/help/stickynotes_applet/fr/figures -@dirrm share/gnome/help/stickynotes_applet/fr -@dirrm share/gnome/help/stickynotes_applet/eu/figures -@dirrm share/gnome/help/stickynotes_applet/eu +@dirrm share/gnome/help/stickynotes_applet/uk/figures +@dirrm share/gnome/help/stickynotes_applet/uk @dirrm share/gnome/help/stickynotes_applet/es/figures @dirrm share/gnome/help/stickynotes_applet/es -@dirrm share/gnome/help/stickynotes_applet/de/figures -@dirrm share/gnome/help/stickynotes_applet/de @dirrm share/gnome/help/stickynotes_applet/C/figures @dirrm share/gnome/help/stickynotes_applet/C @dirrm share/gnome/help/stickynotes_applet -@dirrm share/gnome/help/multiload/zh_TW/figures -@dirrm share/gnome/help/multiload/zh_TW -@dirrm share/gnome/help/multiload/zh_HK/figures -@dirrm share/gnome/help/multiload/zh_HK -@dirrm share/gnome/help/multiload/zh_CN/figures -@dirrm share/gnome/help/multiload/zh_CN @dirrm share/gnome/help/multiload/uk/figures @dirrm share/gnome/help/multiload/uk -@dirrm share/gnome/help/multiload/sv/figures -@dirrm share/gnome/help/multiload/sv -@dirrm share/gnome/help/multiload/ko/figures -@dirrm share/gnome/help/multiload/ko -@dirrm share/gnome/help/multiload/ja/figures -@dirrm share/gnome/help/multiload/ja -@dirrm share/gnome/help/multiload/it/figures -@dirrm share/gnome/help/multiload/it -@dirrm share/gnome/help/multiload/fr/figures -@dirrm share/gnome/help/multiload/fr -@dirrm share/gnome/help/multiload/eu/figures -@dirrm share/gnome/help/multiload/eu @dirrm share/gnome/help/multiload/es/figures @dirrm share/gnome/help/multiload/es -@dirrm share/gnome/help/multiload/de/figures -@dirrm share/gnome/help/multiload/de @dirrm share/gnome/help/multiload/C/figures @dirrm share/gnome/help/multiload/C @dirrm share/gnome/help/multiload -@dirrm share/gnome/help/mixer_applet2/zh_TW/figures -@dirrm share/gnome/help/mixer_applet2/zh_TW -@dirrm share/gnome/help/mixer_applet2/zh_HK/figures -@dirrm share/gnome/help/mixer_applet2/zh_HK -@dirrm share/gnome/help/mixer_applet2/zh_CN/figures -@dirrm share/gnome/help/mixer_applet2/zh_CN @dirrm share/gnome/help/mixer_applet2/uk/figures @dirrm share/gnome/help/mixer_applet2/uk -@dirrm share/gnome/help/mixer_applet2/sv/figures -@dirrm share/gnome/help/mixer_applet2/sv -@dirrm share/gnome/help/mixer_applet2/ko/figures -@dirrm share/gnome/help/mixer_applet2/ko -@dirrm share/gnome/help/mixer_applet2/ja/figures -@dirrm share/gnome/help/mixer_applet2/ja -@dirrm share/gnome/help/mixer_applet2/it/figures -@dirrm share/gnome/help/mixer_applet2/it -@dirrm share/gnome/help/mixer_applet2/fr/figures -@dirrm share/gnome/help/mixer_applet2/fr -@dirrm share/gnome/help/mixer_applet2/eu/figures -@dirrm share/gnome/help/mixer_applet2/eu @dirrm share/gnome/help/mixer_applet2/es/figures @dirrm share/gnome/help/mixer_applet2/es -@dirrm share/gnome/help/mixer_applet2/de/figures -@dirrm share/gnome/help/mixer_applet2/de @dirrm share/gnome/help/mixer_applet2/C/figures @dirrm share/gnome/help/mixer_applet2/C @dirrm share/gnome/help/mixer_applet2 -@dirrm share/gnome/help/gweather/zh_TW/figures -@dirrm share/gnome/help/gweather/zh_TW -@dirrm share/gnome/help/gweather/zh_HK/figures -@dirrm share/gnome/help/gweather/zh_HK -@dirrm share/gnome/help/gweather/zh_CN/figures -@dirrm share/gnome/help/gweather/zh_CN @dirrm share/gnome/help/gweather/uk/figures @dirrm share/gnome/help/gweather/uk -@dirrm share/gnome/help/gweather/sv/figures -@dirrm share/gnome/help/gweather/sv -@dirrm share/gnome/help/gweather/ko/figures -@dirrm share/gnome/help/gweather/ko -@dirrm share/gnome/help/gweather/ja/figures -@dirrm share/gnome/help/gweather/ja -@dirrm share/gnome/help/gweather/it/figures -@dirrm share/gnome/help/gweather/it -@dirrm share/gnome/help/gweather/fr/figures -@dirrm share/gnome/help/gweather/fr -@dirrm share/gnome/help/gweather/eu/figures -@dirrm share/gnome/help/gweather/eu @dirrm share/gnome/help/gweather/es/figures @dirrm share/gnome/help/gweather/es -@dirrm share/gnome/help/gweather/de/figures -@dirrm share/gnome/help/gweather/de @dirrm share/gnome/help/gweather/C/figures @dirrm share/gnome/help/gweather/C @dirrm share/gnome/help/gweather -@dirrm share/gnome/help/gtik2_applet2/zh_TW/figures -@dirrm share/gnome/help/gtik2_applet2/zh_TW -@dirrm share/gnome/help/gtik2_applet2/zh_HK/figures -@dirrm share/gnome/help/gtik2_applet2/zh_HK -@dirrm share/gnome/help/gtik2_applet2/zh_CN/figures -@dirrm share/gnome/help/gtik2_applet2/zh_CN @dirrm share/gnome/help/gtik2_applet2/uk/figures @dirrm share/gnome/help/gtik2_applet2/uk -@dirrm share/gnome/help/gtik2_applet2/sv/figures -@dirrm share/gnome/help/gtik2_applet2/sv -@dirrm share/gnome/help/gtik2_applet2/ko/figures -@dirrm share/gnome/help/gtik2_applet2/ko -@dirrm share/gnome/help/gtik2_applet2/ja/figures -@dirrm share/gnome/help/gtik2_applet2/ja -@dirrm share/gnome/help/gtik2_applet2/it/figures -@dirrm share/gnome/help/gtik2_applet2/it -@dirrm share/gnome/help/gtik2_applet2/fr/figures -@dirrm share/gnome/help/gtik2_applet2/fr -@dirrm share/gnome/help/gtik2_applet2/eu/figures -@dirrm share/gnome/help/gtik2_applet2/eu @dirrm share/gnome/help/gtik2_applet2/es/figures @dirrm share/gnome/help/gtik2_applet2/es -@dirrm share/gnome/help/gtik2_applet2/de/figures -@dirrm share/gnome/help/gtik2_applet2/de @dirrm share/gnome/help/gtik2_applet2/C/figures @dirrm share/gnome/help/gtik2_applet2/C @dirrm share/gnome/help/gtik2_applet2 -@dirrm share/gnome/help/gswitchit/C @dirrm share/gnome/help/gswitchit/uk +@dirrm share/gnome/help/gswitchit/fr +@dirrm share/gnome/help/gswitchit/es +@dirrm share/gnome/help/gswitchit/C @dirrm share/gnome/help/gswitchit -@dirrm share/gnome/help/geyes/zh_TW/figures -@dirrm share/gnome/help/geyes/zh_TW -@dirrm share/gnome/help/geyes/zh_HK/figures -@dirrm share/gnome/help/geyes/zh_HK -@dirrm share/gnome/help/geyes/zh_CN/figures -@dirrm share/gnome/help/geyes/zh_CN @dirrm share/gnome/help/geyes/uk/figures @dirrm share/gnome/help/geyes/uk -@dirrm share/gnome/help/geyes/sv/figures -@dirrm share/gnome/help/geyes/sv -@dirrm share/gnome/help/geyes/ko/figures -@dirrm share/gnome/help/geyes/ko -@dirrm share/gnome/help/geyes/ja/figures -@dirrm share/gnome/help/geyes/ja @dirrm share/gnome/help/geyes/it/figures @dirrm share/gnome/help/geyes/it -@dirrm share/gnome/help/geyes/fr/figures -@dirrm share/gnome/help/geyes/fr -@dirrm share/gnome/help/geyes/eu/figures -@dirrm share/gnome/help/geyes/eu @dirrm share/gnome/help/geyes/es/figures @dirrm share/gnome/help/geyes/es -@dirrm share/gnome/help/geyes/de/figures -@dirrm share/gnome/help/geyes/de @dirrm share/gnome/help/geyes/C/figures @dirrm share/gnome/help/geyes/C @dirrm share/gnome/help/geyes -@dirrm share/gnome/help/drivemount/zh_TW/figures -@dirrm share/gnome/help/drivemount/zh_TW -@dirrm share/gnome/help/drivemount/zh_HK/figures -@dirrm share/gnome/help/drivemount/zh_HK -@dirrm share/gnome/help/drivemount/zh_CN/figures -@dirrm share/gnome/help/drivemount/zh_CN @dirrm share/gnome/help/drivemount/uk/figures @dirrm share/gnome/help/drivemount/uk -@dirrm share/gnome/help/drivemount/sv/figures -@dirrm share/gnome/help/drivemount/sv -@dirrm share/gnome/help/drivemount/ko/figures -@dirrm share/gnome/help/drivemount/ko -@dirrm share/gnome/help/drivemount/ja/figures -@dirrm share/gnome/help/drivemount/ja +@dirrm share/gnome/help/drivemount/pa/figures +@dirrm share/gnome/help/drivemount/pa @dirrm share/gnome/help/drivemount/it/figures @dirrm share/gnome/help/drivemount/it -@dirrm share/gnome/help/drivemount/fr/figures -@dirrm share/gnome/help/drivemount/fr -@dirrm share/gnome/help/drivemount/eu/figures -@dirrm share/gnome/help/drivemount/eu @dirrm share/gnome/help/drivemount/es/figures @dirrm share/gnome/help/drivemount/es -@dirrm share/gnome/help/drivemount/de/figures -@dirrm share/gnome/help/drivemount/de @dirrm share/gnome/help/drivemount/C/figures @dirrm share/gnome/help/drivemount/C @dirrm share/gnome/help/drivemount +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es/figures +%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C/figures %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet -@dirrm share/gnome/help/command-line/zh_TW/figures -@dirrm share/gnome/help/command-line/zh_TW -@dirrm share/gnome/help/command-line/zh_HK/figures -@dirrm share/gnome/help/command-line/zh_HK -@dirrm share/gnome/help/command-line/zh_CN/figures -@dirrm share/gnome/help/command-line/zh_CN @dirrm share/gnome/help/command-line/uk/figures @dirrm share/gnome/help/command-line/uk -@dirrm share/gnome/help/command-line/sv/figures -@dirrm share/gnome/help/command-line/sv -@dirrm share/gnome/help/command-line/ko/figures -@dirrm share/gnome/help/command-line/ko -@dirrm share/gnome/help/command-line/ja/figures -@dirrm share/gnome/help/command-line/ja -@dirrm share/gnome/help/command-line/it/figures -@dirrm share/gnome/help/command-line/it -@dirrm share/gnome/help/command-line/fr/figures -@dirrm share/gnome/help/command-line/fr -@dirrm share/gnome/help/command-line/eu/figures -@dirrm share/gnome/help/command-line/eu +@dirrm share/gnome/help/command-line/pt_BR/figures +@dirrm share/gnome/help/command-line/pt_BR @dirrm share/gnome/help/command-line/es/figures @dirrm share/gnome/help/command-line/es -@dirrm share/gnome/help/command-line/de/figures -@dirrm share/gnome/help/command-line/de @dirrm share/gnome/help/command-line/C/figures @dirrm share/gnome/help/command-line/C @dirrm share/gnome/help/command-line -@dirrm share/gnome/help/char-palette/zh_TW/figures -@dirrm share/gnome/help/char-palette/zh_TW -@dirrm share/gnome/help/char-palette/zh_HK/figures -@dirrm share/gnome/help/char-palette/zh_HK -@dirrm share/gnome/help/char-palette/zh_CN/figures -@dirrm share/gnome/help/char-palette/zh_CN @dirrm share/gnome/help/char-palette/uk/figures @dirrm share/gnome/help/char-palette/uk -@dirrm share/gnome/help/char-palette/sv/figures -@dirrm share/gnome/help/char-palette/sv -@dirrm share/gnome/help/char-palette/ko/figures -@dirrm share/gnome/help/char-palette/ko -@dirrm share/gnome/help/char-palette/ja/figures -@dirrm share/gnome/help/char-palette/ja +@dirrm share/gnome/help/char-palette/pt_BR/figures +@dirrm share/gnome/help/char-palette/pt_BR +@dirrm share/gnome/help/char-palette/nl/figures +@dirrm share/gnome/help/char-palette/nl @dirrm share/gnome/help/char-palette/it/figures @dirrm share/gnome/help/char-palette/it -@dirrm share/gnome/help/char-palette/fr/figures -@dirrm share/gnome/help/char-palette/fr -@dirrm share/gnome/help/char-palette/eu/figures -@dirrm share/gnome/help/char-palette/eu @dirrm share/gnome/help/char-palette/es/figures @dirrm share/gnome/help/char-palette/es -@dirrm share/gnome/help/char-palette/de/figures -@dirrm share/gnome/help/char-palette/de @dirrm share/gnome/help/char-palette/C/figures @dirrm share/gnome/help/char-palette/C @dirrm share/gnome/help/char-palette -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_TW/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_TW -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_HK/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_HK -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_CN/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/zh_CN %%BATTERY%%@dirrm share/gnome/help/battstat/uk/figures %%BATTERY%%@dirrm share/gnome/help/battstat/uk -%%BATTERY%%@dirrm share/gnome/help/battstat/sv/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/sv -%%BATTERY%%@dirrm share/gnome/help/battstat/ko/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/ko -%%BATTERY%%@dirrm share/gnome/help/battstat/ja/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/ja -%%BATTERY%%@dirrm share/gnome/help/battstat/it/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/it -%%BATTERY%%@dirrm share/gnome/help/battstat/fr/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/fr -%%BATTERY%%@dirrm share/gnome/help/battstat/eu/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/eu %%BATTERY%%@dirrm share/gnome/help/battstat/es/figures %%BATTERY%%@dirrm share/gnome/help/battstat/es -%%BATTERY%%@dirrm share/gnome/help/battstat/de/figures -%%BATTERY%%@dirrm share/gnome/help/battstat/de %%BATTERY%%@dirrm share/gnome/help/battstat/C/figures %%BATTERY%%@dirrm share/gnome/help/battstat/C %%BATTERY%%@dirrm share/gnome/help/battstat -@dirrm share/gnome/help/accessx-status/eu/figures -@dirrm share/gnome/help/accessx-status/eu -@dirrm share/gnome/help/accessx-status/C/figures -@dirrm share/gnome/help/accessx-status/C @dirrm share/gnome/help/accessx-status/uk/figures @dirrm share/gnome/help/accessx-status/uk +@dirrm share/gnome/help/accessx-status/fr/figures +@dirrm share/gnome/help/accessx-status/fr +@dirrm share/gnome/help/accessx-status/es/figures +@dirrm share/gnome/help/accessx-status/es +@dirrm share/gnome/help/accessx-status/C/figures +@dirrm share/gnome/help/accessx-status/C @dirrm share/gnome/help/accessx-status @dirrm share/gnome/gnome-applets/gweather @dirrm share/gnome/gnome-applets/glade @dirrm share/gnome/gnome-applets/geyes/Horrid -@dirrm share/gnome/gnome-applets/geyes/Default @dirrm share/gnome/gnome-applets/geyes/Default-tiny +@dirrm share/gnome/gnome-applets/geyes/Default @dirrm share/gnome/gnome-applets/geyes/Bloodshot @dirrm share/gnome/gnome-applets/geyes/Bizarre @dirrm share/gnome/gnome-applets/geyes diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile index 8bea9955e870..523f3533fdef 100644 --- a/x11/gnomedesktop/Makefile +++ b/x11/gnomedesktop/Makefile @@ -3,13 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnomedesktop/Makefile,v 1.74 2005/10/03 15:18:36 ahze Exp $ # PORTNAME= gnomedesktop -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-desktop/2.10 +MASTER_SITE_SUBDIR= sources/gnome-desktop/2.12 DISTNAME= gnome-desktop-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -20,13 +21,14 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_XPM= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils \ + ltverhack GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes USE_BISON= yes INSTALLS_OMF= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-gnome-distributor="FreeBSD GNOME Project" \ --with-kde-datadir=${LOCALBASE}/share CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo index 833f7a4f71cc..1af6b593cb77 100644 --- a/x11/gnomedesktop/distinfo +++ b/x11/gnomedesktop/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-desktop-2.10.2.tar.bz2) = b912a6878ea307af9e3d015864ec0678 -SIZE (gnome2/gnome-desktop-2.10.2.tar.bz2) = 985248 +MD5 (gnome2/gnome-desktop-2.12.1.tar.bz2) = e6841d3a401ec2f5aa17a0529ba4bf55 +SIZE (gnome2/gnome-desktop-2.12.1.tar.bz2) = 1033105 diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist index e1f8d73ee3bd..cf05af1ec158 100644 --- a/x11/gnomedesktop/pkg-plist +++ b/x11/gnomedesktop/pkg-plist @@ -4,10 +4,10 @@ include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h include/gnome-desktop-2.0/libgnomeui/gnome-hint.h lib/libgnome-desktop-2.a lib/libgnome-desktop-2.so -lib/libgnome-desktop-2.so.4 +lib/libgnome-desktop-2.so.2 libdata/pkgconfig/gnome-desktop-2.0.pc share/gnome/applications/gnome-about.desktop -share/gnome/gnome-about/gnome-64.gif +share/gnome/gnome-about/gnome-64.png share/gnome/gnome-about/gnome-version.xml share/gnome/gnome-about/headers/header-bg-ancient01a.png share/gnome/gnome-about/headers/header-bg-city01.png @@ -19,21 +19,27 @@ share/gnome/gnome-about/headers/header-bg-mountains01.png share/gnome/gnome-about/headers/header-bg-snow01.png share/gnome/gnome-about/headers/header-bg-sunset01.png share/gnome/help/fdl/C/fdl.xml -share/gnome/help/fdl/eu/fdl.xml +share/gnome/help/fdl/es/fdl.xml share/gnome/help/gnome-feedback/C/gnome-feedback.xml -share/gnome/help/gnome-feedback/eu/gnome-feedback.xml +share/gnome/help/gnome-feedback/es/gnome-feedback.xml share/gnome/help/gpl/C/gpl.xml -share/gnome/help/gpl/eu/gpl.xml +share/gnome/help/gpl/es/gpl.xml +share/gnome/help/gpl/fi/gpl.xml +share/gnome/help/gpl/pa/gpl.xml share/gnome/help/lgpl/C/lgpl.xml -share/gnome/help/lgpl/eu/lgpl.xml -share/gnome/omf/gnome-desktop/fdl-C.omf -share/gnome/omf/gnome-desktop/fdl-eu.omf -share/gnome/omf/gnome-desktop/gnome-feedback-C.omf -share/gnome/omf/gnome-desktop/gnome-feedback-eu.omf -share/gnome/omf/gnome-desktop/gpl-C.omf -share/gnome/omf/gnome-desktop/gpl-eu.omf -share/gnome/omf/gnome-desktop/lgpl-C.omf -share/gnome/omf/gnome-desktop/lgpl-eu.omf +share/gnome/help/lgpl/es/lgpl.xml +share/gnome/help/lgpl/pa/lgpl.xml +share/gnome/omf/fdl/fdl-C.omf +share/gnome/omf/fdl/fdl-es.omf +share/gnome/omf/gnome-feedback/gnome-feedback-C.omf +share/gnome/omf/gnome-feedback/gnome-feedback-es.omf +share/gnome/omf/gpl/gpl-C.omf +share/gnome/omf/gpl/gpl-es.omf +share/gnome/omf/gpl/gpl-fi.omf +share/gnome/omf/gpl/gpl-pa.omf +share/gnome/omf/lgpl/lgpl-C.omf +share/gnome/omf/lgpl/lgpl-es.omf +share/gnome/omf/lgpl/lgpl-pa.omf share/gnome/pixmaps/apple-green.png share/gnome/pixmaps/apple-red.png share/gnome/pixmaps/gnome-aorta.png @@ -145,6 +151,7 @@ share/locale/it/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ja/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/kn/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/ko/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/ku/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/li/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lt/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/lv/LC_MESSAGES/gnome-desktop-2.0.mo @@ -178,6 +185,7 @@ share/locale/te/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/th/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/tk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo +share/locale/ug/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo @@ -189,17 +197,25 @@ share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo @unexec rmdir %D/share/locale/yo/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/yo 2> /dev/null || true -@unexec rmdir %D/share/locale/te/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/te 2> /dev/null || true +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true +@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ku 2> /dev/null || true @unexec rmdir %D/share/locale/hy/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/hy 2> /dev/null || true -@dirrm share/gnome/omf/gnome-desktop -@dirrm share/gnome/help/lgpl/eu -@dirrm share/gnome/help/gpl/eu -@dirrm share/gnome/help/gnome-feedback/eu +@dirrm share/gnome/omf/lgpl +@dirrm share/gnome/omf/gpl +@dirrm share/gnome/omf/gnome-feedback +@dirrm share/gnome/omf/fdl +@dirrm share/gnome/help/lgpl/pa +@dirrm share/gnome/help/lgpl/es +@dirrm share/gnome/help/gpl/pa +@dirrm share/gnome/help/gpl/fi +@dirrm share/gnome/help/gpl/es +@dirrm share/gnome/help/fdl/es +@dirrm share/gnome/help/gnome-feedback/es @dirrm share/gnome/help/gnome-feedback/C @dirrm share/gnome/help/gnome-feedback -@dirrm share/gnome/help/fdl/eu @dirrm share/gnome/gnome-about/headers @dirrm include/gnome-desktop-2.0/libgnomeui @dirrm include/gnome-desktop-2.0/libgnome diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile index de413e237e36..91d3d77eba18 100644 --- a/x11/gnomepanel/Makefile +++ b/x11/gnomepanel/Makefile @@ -3,30 +3,35 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnomepanel/Makefile,v 1.109 2005/10/08 19:41:40 marcus Exp $ # PORTNAME= gnomepanel -PORTVERSION= 2.10.2 +PORTVERSION= 2.12.1 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-panel/2.10 +MASTER_SITE_SUBDIR= sources/gnome-panel/2.12 DISTNAME= gnome-panel-${PORTVERSION} DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= Panel component for the GNOME 2 Desktop +RUN_DEPENDS= gnome-menu-editor:${PORTSDIR}/deskutils/gnome-menu-editor + USE_BZIP2= yes INSTALLS_OMF= yes INSTALLS_SHLIB= yes +INSTALLS_ICONS= yes USE_X_PREFIX= yes USE_REINPLACE= yes USE_GNOME= gnomeprefix gnomehack intlhack gnomedesktop \ - libwnck gnomemenus + libwnck gnomemenus gnomedocutils ltverhack WANT_GNOME= yes GNOME_DESKTOP_VERSION=2 USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ARGS= --with-kde-datadir=${LOCALBASE}/share \ --with-kde-docdir=${LOCALBASE}/share/doc CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -54,6 +59,8 @@ CONFIGURE_ARGS+=--disable-eds .endif post-patch: + @${REINPLACE_CMD} -e 's|evolution.desktop|evolution-2.4.desktop|g' \ + ${WRKSRC}/gnome-panel/panel-default-setup.entries.in .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \ ( ${OSVERSION} < 503101 ) .for po in da.po it.po zh_CN.po zh_TW.po diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo index ddbc3312644e..ca8232c0a3a4 100644 --- a/x11/gnomepanel/distinfo +++ b/x11/gnomepanel/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-panel-2.10.2.tar.bz2) = c1756cac74a4c8b45ce3b9a884515baa -SIZE (gnome2/gnome-panel-2.10.2.tar.bz2) = 2366827 +MD5 (gnome2/gnome-panel-2.12.1.tar.bz2) = a532717e8ac7f67b7198c256909cd7dd +SIZE (gnome2/gnome-panel-2.12.1.tar.bz2) = 2468498 diff --git a/x11/gnomepanel/files/patch-gnome-panel::GNOME_Panel.server.in b/x11/gnomepanel/files/patch-gnome-panel::GNOME_Panel.server.in deleted file mode 100644 index b89c57317f90..000000000000 --- a/x11/gnomepanel/files/patch-gnome-panel::GNOME_Panel.server.in +++ /dev/null @@ -1,13 +0,0 @@ - -$FreeBSD$ - ---- gnome-panel/GNOME_Panel.server.in 2002/05/09 21:00:58 1.1 -+++ gnome-panel/GNOME_Panel.server.in 2002/05/09 21:01:11 -@@ -1,6 +1,6 @@ - <oaf_info> - --<oaf_server iid="OAFIID:GNOME_PanelShell" type="exe" location="panel-2"> -+<oaf_server iid="OAFIID:GNOME_PanelShell" type="exe" location="gnome-panel"> - <oaf_attribute name="repo_ids" type="stringv"> - <item value="IDL:GNOME/Vertigo/PanelShell:1.0"/> - <item value="IDL:Bonobo/Unknown:1.0"/> diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist index dc44baa958e0..e77d26d94c58 100644 --- a/x11/gnomepanel/pkg-plist +++ b/x11/gnomepanel/pkg-plist @@ -12,7 +12,7 @@ include/panel-2.0/panel-applet-gconf.h include/panel-2.0/panel-applet.h lib/libpanel-applet-2.a lib/libpanel-applet-2.so -lib/libpanel-applet-2.so.1 +lib/libpanel-applet-2.so.0 libdata/bonobo/servers/GNOME_ClockApplet_Factory.server libdata/bonobo/servers/GNOME_FishApplet_Factory.server libdata/bonobo/servers/GNOME_NotificationAreaApplet.server @@ -71,6 +71,15 @@ share/gnome/help/clock/ja/legal.xml share/gnome/help/clock/ko/clock.xml share/gnome/help/clock/ko/figures/clock_applet.png share/gnome/help/clock/ko/legal.xml +share/gnome/help/clock/nl/clock.xml +share/gnome/help/clock/nl/figures/clock_applet.png +share/gnome/help/clock/nl/legal.xml +share/gnome/help/clock/pa/clock.xml +share/gnome/help/clock/pa/figures/clock_applet.png +share/gnome/help/clock/pa/legal.xml +share/gnome/help/clock/sr/clock.xml +share/gnome/help/clock/sr/figures/clock_applet.png +share/gnome/help/clock/sr/legal.xml share/gnome/help/clock/sv/clock.xml share/gnome/help/clock/sv/figures/clock_applet.png share/gnome/help/clock/sv/legal.xml @@ -83,25 +92,14 @@ share/gnome/help/clock/zh_CN/legal.xml share/gnome/help/clock/zh_TW/clock.xml share/gnome/help/clock/zh_TW/figures/clock_applet.png share/gnome/help/clock/zh_TW/legal.xml -share/gnome/help/fish-applet-2/C/figures/fish_applet.png -share/gnome/help/fish-applet-2/C/fish-applet-2.xml -share/gnome/help/fish-applet-2/C/legal.xml share/gnome/help/fish-applet-2/de/figures/fish_applet.png share/gnome/help/fish-applet-2/de/figures/fish_settings.png share/gnome/help/fish-applet-2/de/fish-applet-2.xml share/gnome/help/fish-applet-2/de/legal.xml -share/gnome/help/fish-applet-2/es/figures/fish_applet.png -share/gnome/help/fish-applet-2/es/figures/fish_settings.png -share/gnome/help/fish-applet-2/es/fish-applet-2.xml -share/gnome/help/fish-applet-2/es/legal.xml share/gnome/help/fish-applet-2/fr/figures/fish_applet.png share/gnome/help/fish-applet-2/fr/figures/fish_settings.png share/gnome/help/fish-applet-2/fr/fish-applet-2.xml share/gnome/help/fish-applet-2/fr/legal.xml -share/gnome/help/fish-applet-2/it/figures/fish_applet.png -share/gnome/help/fish-applet-2/it/figures/fish_settings.png -share/gnome/help/fish-applet-2/it/fish-applet-2.xml -share/gnome/help/fish-applet-2/it/legal.xml share/gnome/help/fish-applet-2/ja/figures/fish_applet.png share/gnome/help/fish-applet-2/ja/fish-applet-2.xml share/gnome/help/fish-applet-2/ja/legal.xml @@ -113,9 +111,6 @@ share/gnome/help/fish-applet-2/sv/figures/fish_applet.png share/gnome/help/fish-applet-2/sv/figures/fish_settings.png share/gnome/help/fish-applet-2/sv/fish-applet-2.xml share/gnome/help/fish-applet-2/sv/legal.xml -share/gnome/help/fish-applet-2/uk/figures/fish_applet.png -share/gnome/help/fish-applet-2/uk/fish-applet-2.xml -share/gnome/help/fish-applet-2/uk/legal.xml share/gnome/help/fish-applet-2/zh_CN/figures/fish_applet.png share/gnome/help/fish-applet-2/zh_CN/figures/fish_settings.png share/gnome/help/fish-applet-2/zh_CN/fish-applet-2.xml @@ -124,6 +119,18 @@ share/gnome/help/fish-applet-2/zh_TW/figures/fish_applet.png share/gnome/help/fish-applet-2/zh_TW/figures/fish_settings.png share/gnome/help/fish-applet-2/zh_TW/fish-applet-2.xml share/gnome/help/fish-applet-2/zh_TW/legal.xml +share/gnome/help/fish/C/figures/fish_applet.png +share/gnome/help/fish/C/fish.xml +share/gnome/help/fish/C/legal.xml +share/gnome/help/fish/es/figures/fish_applet.png +share/gnome/help/fish/es/fish.xml +share/gnome/help/fish/es/legal.xml +share/gnome/help/fish/it/figures/fish_applet.png +share/gnome/help/fish/it/fish.xml +share/gnome/help/fish/it/legal.xml +share/gnome/help/fish/uk/figures/fish_applet.png +share/gnome/help/fish/uk/fish.xml +share/gnome/help/fish/uk/legal.xml share/gnome/help/window-list/C/figures/window_list_applet.png share/gnome/help/window-list/C/figures/window_list_group_applet.png share/gnome/help/window-list/C/legal.xml @@ -134,7 +141,6 @@ share/gnome/help/window-list/de/figures/window_list_group_applet.png share/gnome/help/window-list/de/legal.xml share/gnome/help/window-list/de/window-list.xml share/gnome/help/window-list/es/figures/window_list_applet.png -share/gnome/help/window-list/es/figures/window_list_group.png share/gnome/help/window-list/es/figures/window_list_group_applet.png share/gnome/help/window-list/es/legal.xml share/gnome/help/window-list/es/window-list.xml @@ -144,7 +150,6 @@ share/gnome/help/window-list/fr/figures/window_list_group_applet.png share/gnome/help/window-list/fr/legal.xml share/gnome/help/window-list/fr/window-list.xml share/gnome/help/window-list/it/figures/window_list_applet.png -share/gnome/help/window-list/it/figures/window_list_group.png share/gnome/help/window-list/it/figures/window_list_group_applet.png share/gnome/help/window-list/it/legal.xml share/gnome/help/window-list/it/window-list.xml @@ -158,8 +163,8 @@ share/gnome/help/window-list/ko/figures/window_list_group_applet.png share/gnome/help/window-list/ko/legal.xml share/gnome/help/window-list/ko/window-list.xml share/gnome/help/window-list/sv/figures/window_list_applet.png -share/gnome/help/window-list/sv/figures/window_list_group.png share/gnome/help/window-list/sv/figures/window_list_group_applet.png +share/gnome/help/window-list/sv/figures/window_list_group.png share/gnome/help/window-list/sv/legal.xml share/gnome/help/window-list/sv/window-list.xml share/gnome/help/window-list/uk/figures/window_list_applet.png @@ -184,7 +189,6 @@ share/gnome/help/workspace-switcher/de/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/de/legal.xml share/gnome/help/workspace-switcher/de/workspace-switcher.xml share/gnome/help/workspace-switcher/es/figures/workspace_switcher_applet.png -share/gnome/help/workspace-switcher/es/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/es/legal.xml share/gnome/help/workspace-switcher/es/workspace-switcher.xml share/gnome/help/workspace-switcher/fr/figures/workspace_switcher_applet.png @@ -192,7 +196,6 @@ share/gnome/help/workspace-switcher/fr/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/fr/legal.xml share/gnome/help/workspace-switcher/fr/workspace-switcher.xml share/gnome/help/workspace-switcher/it/figures/workspace_switcher_applet.png -share/gnome/help/workspace-switcher/it/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/it/legal.xml share/gnome/help/workspace-switcher/it/workspace-switcher.xml share/gnome/help/workspace-switcher/ja/figures/workspace_switcher_applet.png @@ -202,6 +205,9 @@ share/gnome/help/workspace-switcher/ko/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/ko/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/ko/legal.xml share/gnome/help/workspace-switcher/ko/workspace-switcher.xml +share/gnome/help/workspace-switcher/nl/figures/workspace_switcher_applet.png +share/gnome/help/workspace-switcher/nl/legal.xml +share/gnome/help/workspace-switcher/nl/workspace-switcher.xml share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png share/gnome/help/workspace-switcher/sv/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/sv/legal.xml @@ -218,50 +224,61 @@ share/gnome/help/workspace-switcher/zh_TW/figures/workspacelist_applet.png share/gnome/help/workspace-switcher/zh_TW/legal.xml share/gnome/help/workspace-switcher/zh_TW/workspace-switcher.xml share/gnome/idl/gnome-panel-2.0/GNOME_Panel.idl -share/gnome/omf/gnome-panel/clock-C.omf +share/gnome/omf/clock/clock-C.omf +share/gnome/omf/clock/clock-de.omf +share/gnome/omf/clock/clock-es.omf +share/gnome/omf/clock/clock-it.omf +share/gnome/omf/clock/clock-fr.omf +share/gnome/omf/clock/clock-ja.omf +share/gnome/omf/clock/clock-ko.omf +share/gnome/omf/clock/clock-nl.omf +share/gnome/omf/clock/clock-pa.omf +share/gnome/omf/clock/clock-sr.omf +share/gnome/omf/clock/clock-sv.omf +share/gnome/omf/clock/clock-uk.omf +share/gnome/omf/clock/clock-zh_CN.omf +share/gnome/omf/clock/clock-zh_TW.omf +share/gnome/omf/fish/fish-C.omf +share/gnome/omf/fish/fish-es.omf +share/gnome/omf/fish/fish-it.omf +share/gnome/omf/fish/fish-uk.omf share/gnome/omf/gnome-panel/clock-de.omf -share/gnome/omf/gnome-panel/clock-es.omf share/gnome/omf/gnome-panel/clock-fr.omf -share/gnome/omf/gnome-panel/clock-it.omf share/gnome/omf/gnome-panel/clock-ja.omf share/gnome/omf/gnome-panel/clock-ko.omf share/gnome/omf/gnome-panel/clock-sv.omf -share/gnome/omf/gnome-panel/clock-uk.omf share/gnome/omf/gnome-panel/clock-zh_CN.omf share/gnome/omf/gnome-panel/clock-zh_TW.omf -share/gnome/omf/gnome-panel/fish-applet-2-C.omf share/gnome/omf/gnome-panel/fish-applet-2-de.omf -share/gnome/omf/gnome-panel/fish-applet-2-es.omf share/gnome/omf/gnome-panel/fish-applet-2-fr.omf -share/gnome/omf/gnome-panel/fish-applet-2-it.omf share/gnome/omf/gnome-panel/fish-applet-2-ja.omf share/gnome/omf/gnome-panel/fish-applet-2-ko.omf share/gnome/omf/gnome-panel/fish-applet-2-sv.omf -share/gnome/omf/gnome-panel/fish-applet-2-uk.omf share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf -share/gnome/omf/gnome-panel/window-list-C.omf share/gnome/omf/gnome-panel/window-list-de.omf -share/gnome/omf/gnome-panel/window-list-es.omf share/gnome/omf/gnome-panel/window-list-fr.omf -share/gnome/omf/gnome-panel/window-list-it.omf share/gnome/omf/gnome-panel/window-list-ja.omf share/gnome/omf/gnome-panel/window-list-ko.omf share/gnome/omf/gnome-panel/window-list-sv.omf -share/gnome/omf/gnome-panel/window-list-uk.omf share/gnome/omf/gnome-panel/window-list-zh_CN.omf share/gnome/omf/gnome-panel/window-list-zh_TW.omf -share/gnome/omf/gnome-panel/workspace-switcher-C.omf share/gnome/omf/gnome-panel/workspace-switcher-de.omf -share/gnome/omf/gnome-panel/workspace-switcher-es.omf share/gnome/omf/gnome-panel/workspace-switcher-fr.omf -share/gnome/omf/gnome-panel/workspace-switcher-it.omf share/gnome/omf/gnome-panel/workspace-switcher-ja.omf share/gnome/omf/gnome-panel/workspace-switcher-ko.omf share/gnome/omf/gnome-panel/workspace-switcher-sv.omf -share/gnome/omf/gnome-panel/workspace-switcher-uk.omf share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf +share/gnome/omf/window-list/window-list-C.omf +share/gnome/omf/window-list/window-list-es.omf +share/gnome/omf/window-list/window-list-it.omf +share/gnome/omf/window-list/window-list-uk.omf +share/gnome/omf/workspace-switcher/workspace-switcher-C.omf +share/gnome/omf/workspace-switcher/workspace-switcher-es.omf +share/gnome/omf/workspace-switcher/workspace-switcher-it.omf +share/gnome/omf/workspace-switcher/workspace-switcher-nl.omf +share/gnome/omf/workspace-switcher/workspace-switcher-uk.omf share/gnome/panel/glade/fish.glade share/gnome/panel/glade/panel-properties-dialog.glade share/gnome/panel/glade/panel-run-dialog.glade @@ -313,6 +330,7 @@ share/locale/id/LC_MESSAGES/gnome-panel-2.0.mo share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ko/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/ku/LC_MESSAGES/gnome-panel-2.0.mo share/locale/li/LC_MESSAGES/gnome-panel-2.0.mo share/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo @@ -344,6 +362,7 @@ share/locale/sr@Latn/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sr@ije/LC_MESSAGES/gnome-panel-2.0.mo share/locale/sv/LC_MESSAGES/gnome-panel-2.0.mo share/locale/ta/LC_MESSAGES/gnome-panel-2.0.mo +share/locale/te/LC_MESSAGES/gnome-panel-2.0.mo share/locale/th/LC_MESSAGES/gnome-panel-2.0.mo share/locale/tr/LC_MESSAGES/gnome-panel-2.0.mo share/locale/uk/LC_MESSAGES/gnome-panel-2.0.mo @@ -374,7 +393,11 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true @dirrm share/gnome/panel/pixmaps @dirrm share/gnome/panel/glade +@dirrm share/gnome/omf/workspace-switcher +@dirrm share/gnome/omf/window-list @dirrm share/gnome/omf/gnome-panel +@dirrm share/gnome/omf/fish +@dirrm share/gnome/omf/clock @dirrm share/gnome/idl/gnome-panel-2.0 @dirrm share/gnome/help/workspace-switcher/zh_TW/figures @dirrm share/gnome/help/workspace-switcher/zh_TW @@ -384,6 +407,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/workspace-switcher/uk @dirrm share/gnome/help/workspace-switcher/sv/figures @dirrm share/gnome/help/workspace-switcher/sv +@dirrm share/gnome/help/workspace-switcher/nl/figures +@dirrm share/gnome/help/workspace-switcher/nl @dirrm share/gnome/help/workspace-switcher/ko/figures @dirrm share/gnome/help/workspace-switcher/ko @dirrm share/gnome/help/workspace-switcher/ja/figures @@ -426,25 +451,26 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/fish-applet-2/zh_TW @dirrm share/gnome/help/fish-applet-2/zh_CN/figures @dirrm share/gnome/help/fish-applet-2/zh_CN -@dirrm share/gnome/help/fish-applet-2/uk/figures -@dirrm share/gnome/help/fish-applet-2/uk @dirrm share/gnome/help/fish-applet-2/sv/figures @dirrm share/gnome/help/fish-applet-2/sv @dirrm share/gnome/help/fish-applet-2/ko/figures @dirrm share/gnome/help/fish-applet-2/ko @dirrm share/gnome/help/fish-applet-2/ja/figures @dirrm share/gnome/help/fish-applet-2/ja -@dirrm share/gnome/help/fish-applet-2/it/figures -@dirrm share/gnome/help/fish-applet-2/it @dirrm share/gnome/help/fish-applet-2/fr/figures @dirrm share/gnome/help/fish-applet-2/fr -@dirrm share/gnome/help/fish-applet-2/es/figures -@dirrm share/gnome/help/fish-applet-2/es @dirrm share/gnome/help/fish-applet-2/de/figures @dirrm share/gnome/help/fish-applet-2/de -@dirrm share/gnome/help/fish-applet-2/C/figures -@dirrm share/gnome/help/fish-applet-2/C @dirrm share/gnome/help/fish-applet-2 +@dirrm share/gnome/help/fish/uk/figures +@dirrm share/gnome/help/fish/uk +@dirrm share/gnome/help/fish/it/figures +@dirrm share/gnome/help/fish/it +@dirrm share/gnome/help/fish/es/figures +@dirrm share/gnome/help/fish/es +@dirrm share/gnome/help/fish/C/figures +@dirrm share/gnome/help/fish/C +@dirrm share/gnome/help/fish @dirrm share/gnome/help/clock/zh_TW/figures @dirrm share/gnome/help/clock/zh_TW @dirrm share/gnome/help/clock/zh_CN/figures @@ -453,6 +479,12 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo @dirrm share/gnome/help/clock/uk @dirrm share/gnome/help/clock/sv/figures @dirrm share/gnome/help/clock/sv +@dirrm share/gnome/help/clock/sr/figures +@dirrm share/gnome/help/clock/sr +@dirrm share/gnome/help/clock/pa/figures +@dirrm share/gnome/help/clock/pa +@dirrm share/gnome/help/clock/nl/figures +@dirrm share/gnome/help/clock/nl @dirrm share/gnome/help/clock/ko/figures @dirrm share/gnome/help/clock/ko @dirrm share/gnome/help/clock/ja/figures diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile index 1f48df2e0f83..274a00a9a3ed 100644 --- a/x11/gnomesession/Makefile +++ b/x11/gnomesession/Makefile @@ -3,16 +3,18 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnomesession/Makefile,v 1.67 2005/10/31 19:46:29 adamw Exp $ # PORTNAME= gnomesession -PORTVERSION= 2.10.0 +PORTVERSION= 2.12.0 +PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ ${MASTER_SITE_LOCAL:S/$/:local/} \ - http://people.FreeBSD.org/~pav/:local -MASTER_SITE_SUBDIR= sources/gnome-session/2.10 \ - pav/:local + http://people.FreeBSD.org/~adamw/images/gnome_splashes/2.12/:local +MASTER_SITE_SUBDIR= sources/gnome-session/2.12 \ + adamw/:local DISTNAME= gnome-session-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${SPLASHES}:local @@ -26,16 +28,16 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui USE_GMAKE= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -MAN1= gnome-session.1 gnome-smproxy.1 gnome-wm.1 \ - session-properties.1 gnome-session-save.1 +MAN1= gnome-session.1 gnome-wm.1 session-properties.1 \ + gnome-session-save.1 MAN5= default.session.5 GCONF_SCHEMAS= gnome-session.schemas -SPLASHES= freebsd-splashes-gnome-2.10.tar +SPLASHES= freebsd-splashes-gnome-2.12.1.tar post-extract: cd ${WRKDIR} && ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES} @@ -43,10 +45,10 @@ post-extract: post-install: ${INSTALL_DATA} ${WRKSRC}/gnome-session/gnome-splash.png \ ${PREFIX}/share/gnome/pixmaps/splash/original-gnome-splash.png - ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.10/franz_klammer-2.png \ + ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/domix-splash-2.12.png \ ${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png -.for splash in adamw.png banana_flex.png franco_malatacca.jpg franz_klammer-1.png franz_klammer-3.png radek.png - ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.10/${splash} \ +.for splash in MaMBaNgGaoX-2.12.png adamw-piggy-2.12.png adamw-trophy-2.12.png andreas-slogan-2.12.png andreas-splash-2.12.png domix-splash-2.12.png domix-splash2-2.12.png mumija-2.12.png mumija2-2.12.png mumija3-2.12.png tremulant-2.12.png tremulant-blood-2.12.png tremulant-brushed-metal-2.12.png + ${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.12/${splash} \ ${PREFIX}/share/gnome/pixmaps/splash .endfor diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo index 5f305e45c84f..cfcfc5533884 100644 --- a/x11/gnomesession/distinfo +++ b/x11/gnomesession/distinfo @@ -1,4 +1,4 @@ -MD5 (gnome2/gnome-session-2.10.0.tar.bz2) = cbeb2db49dac11bf8088e6b025265fff -SIZE (gnome2/gnome-session-2.10.0.tar.bz2) = 796754 -MD5 (gnome2/freebsd-splashes-gnome-2.10.tar) = 92cfd1945f9a48dd8df3981935e9ef34 -SIZE (gnome2/freebsd-splashes-gnome-2.10.tar) = 462336 +MD5 (gnome2/gnome-session-2.12.0.tar.bz2) = 835e9340d23e139430224b931ff4c597 +SIZE (gnome2/gnome-session-2.12.0.tar.bz2) = 864397 +MD5 (gnome2/freebsd-splashes-gnome-2.12.1.tar) = 4a098f0f2295c3333acff185d4bed5aa +SIZE (gnome2/freebsd-splashes-gnome-2.12.1.tar) = 1280000 diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist index 999c30043083..17d898f1ee23 100644 --- a/x11/gnomesession/pkg-plist +++ b/x11/gnomesession/pkg-plist @@ -2,19 +2,25 @@ bin/gnome-session bin/gnome-session-properties bin/gnome-session-remove bin/gnome-session-save -bin/gnome-smproxy bin/gnome-wm share/gnome/applications/session-properties.desktop share/gnome/default.session share/gnome/default.wm -share/gnome/pixmaps/splash/adamw.png -share/gnome/pixmaps/splash/banana_flex.png -share/gnome/pixmaps/splash/franco_malatacca.jpg -share/gnome/pixmaps/splash/franz_klammer-1.png -share/gnome/pixmaps/splash/franz_klammer-3.png +share/gnome/pixmaps/splash/MaMBaNgGaoX-2.12.png +share/gnome/pixmaps/splash/adamw-piggy-2.12.png +share/gnome/pixmaps/splash/adamw-trophy-2.12.png +share/gnome/pixmaps/splash/andreas-slogan-2.12.png +share/gnome/pixmaps/splash/andreas-splash-2.12.png +share/gnome/pixmaps/splash/domix-splash-2.12.png +share/gnome/pixmaps/splash/domix-splash2-2.12.png share/gnome/pixmaps/splash/gnome-splash.png +share/gnome/pixmaps/splash/mumija-2.12.png +share/gnome/pixmaps/splash/mumija2-2.12.png +share/gnome/pixmaps/splash/mumija3-2.12.png share/gnome/pixmaps/splash/original-gnome-splash.png -share/gnome/pixmaps/splash/radek.png +share/gnome/pixmaps/splash/tremulant-2.12.png +share/gnome/pixmaps/splash/tremulant-blood-2.12.png +share/gnome/pixmaps/splash/tremulant-brushed-metal-2.12.png share/locale/af/LC_MESSAGES/gnome-session-2.0.mo share/locale/am/LC_MESSAGES/gnome-session-2.0.mo share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo @@ -45,6 +51,7 @@ share/locale/he/LC_MESSAGES/gnome-session-2.0.mo share/locale/hi/LC_MESSAGES/gnome-session-2.0.mo share/locale/hr/LC_MESSAGES/gnome-session-2.0.mo share/locale/hu/LC_MESSAGES/gnome-session-2.0.mo +share/locale/hy/LC_MESSAGES/gnome-session-2.0.mo share/locale/id/LC_MESSAGES/gnome-session-2.0.mo share/locale/is/LC_MESSAGES/gnome-session-2.0.mo share/locale/it/LC_MESSAGES/gnome-session-2.0.mo @@ -82,9 +89,12 @@ share/locale/th/LC_MESSAGES/gnome-session-2.0.mo share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo +share/locale/rw/LC_MESSAGES/gnome-session-2.0.mo share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo +@unexec /bin/rmdir %D/share/locale/hy/LC_MESSAGES 2>/dev/null || /usr/bin/true +@unexec /bin/rmdir %D/share/locale/hy 2>/dev/null || /usr/bin/true diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile index 6a58361c7fcc..f6dded8a0189 100644 --- a/x11/gnometerminal/Makefile +++ b/x11/gnometerminal/Makefile @@ -3,14 +3,14 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/gnometerminal/Makefile,v 1.52 2005/10/14 20:39:58 adamw Exp $ # PORTNAME= gnometerminal -PORTVERSION= 2.10.0 -PORTREVISION= 1 +PORTVERSION= 2.12.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/gnome-terminal/2.10 +MASTER_SITE_SUBDIR= sources/gnome-terminal/2.12 DISTNAME= gnome-terminal-${PORTVERSION} DIST_SUBDIR= gnome2 @@ -23,7 +23,7 @@ USE_X_PREFIX= yes USE_REINPLACE= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui vte -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" diff --git a/x11/gnometerminal/distinfo b/x11/gnometerminal/distinfo index bb6a1fa2132f..13b21339bab4 100644 --- a/x11/gnometerminal/distinfo +++ b/x11/gnometerminal/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/gnome-terminal-2.10.0.tar.bz2) = 062744daca0c7f708b8c52f47b5db0d1 -SIZE (gnome2/gnome-terminal-2.10.0.tar.bz2) = 2334171 +MD5 (gnome2/gnome-terminal-2.12.0.tar.bz2) = 483c9397dd165845e2528a80e3df6dfc +SIZE (gnome2/gnome-terminal-2.12.0.tar.bz2) = 1684178 diff --git a/x11/gnometerminal/files/patch-src::terminal-screen.c b/x11/gnometerminal/files/patch-src::terminal-screen.c index c7cf1b8ce449..0198f748c37d 100644 --- a/x11/gnometerminal/files/patch-src::terminal-screen.c +++ b/x11/gnometerminal/files/patch-src::terminal-screen.c @@ -1,27 +1,23 @@ ---- src/terminal-screen.c.orig Thu Mar 3 15:13:08 2005 -+++ src/terminal-screen.c Wed Mar 16 03:11:08 2005 -@@ -246,18 +246,18 @@ - #define USER "[" USERCHARS "]+(:["PASSCHARS "]+)?" +--- src/terminal-screen.c.orig Fri Jul 1 20:37:58 2005 ++++ src/terminal-screen.c Tue Jul 5 13:26:21 2005 +@@ -248,16 +248,16 @@ terminal_screen_init (TerminalScreen *sc + #define URLPATH "/[" PATHCHARS "]*[^]'.}>) \t\r\n,\\\"]" terminal_widget_match_add (screen->priv->term, -- "\\<(" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?" -- "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?\\>", FLAVOR_AS_IS); -+ "[[:<:]](" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?" -+ "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?[[:>:]]", FLAVOR_AS_IS); +- "\\<(" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_AS_IS); ++ "[[:<:]](" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_AS_IS); terminal_widget_match_add (screen->priv->term, -- "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?" -- "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?\\>", FLAVOR_DEFAULT_TO_HTTP); -+ "[[:<:]](www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?" -+ "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?[[:>:]]", FLAVOR_DEFAULT_TO_HTTP); +- "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_DEFAULT_TO_HTTP); ++ "[[:<:]]<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?(" URLPATH ")?", FLAVOR_DEFAULT_TO_HTTP); terminal_widget_match_add (screen->priv->term, - "\\<(mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>", FLAVOR_MAILTO); -+ "[[:<:]](mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+[[:>:]]", FLAVOR_MAILTO); ++ "[[:<:]](mailto:)?[a-z0-9][a-z0-9.-]*@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>", FLAVOR_MAILTO); terminal_widget_match_add (screen->priv->term, - "\\<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS); -+ "[[:<:]]news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+@[" HOSTCHARS ".]+(:[0-9]+)?[[:>:]]", FLAVOR_AS_IS); ++ "[[:<:]]<news:[-A-Z\\^_a-z{|}~!\"#$%&'()*+,./0-9;:=?`]+@[" HOSTCHARS ".]+(:[0-9]+)?\\>", FLAVOR_AS_IS); terminal_screen_setup_dnd (screen); diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist index 22d4a5870a1e..721f659b8cd1 100644 --- a/x11/gnometerminal/pkg-plist +++ b/x11/gnometerminal/pkg-plist @@ -103,6 +103,7 @@ share/locale/he/LC_MESSAGES/gnome-terminal.mo share/locale/hi/LC_MESSAGES/gnome-terminal.mo share/locale/hr/LC_MESSAGES/gnome-terminal.mo share/locale/hu/LC_MESSAGES/gnome-terminal.mo +share/locale/hy/LC_MESSAGES/gnome-terminal.mo share/locale/id/LC_MESSAGES/gnome-terminal.mo share/locale/it/LC_MESSAGES/gnome-terminal.mo share/locale/ja/LC_MESSAGES/gnome-terminal.mo @@ -124,6 +125,7 @@ share/locale/pt/LC_MESSAGES/gnome-terminal.mo share/locale/pt_BR/LC_MESSAGES/gnome-terminal.mo share/locale/ro/LC_MESSAGES/gnome-terminal.mo share/locale/ru/LC_MESSAGES/gnome-terminal.mo +share/locale/rw/LC_MESSAGES/gnome-terminal.mo share/locale/sk/LC_MESSAGES/gnome-terminal.mo share/locale/sl/LC_MESSAGES/gnome-terminal.mo share/locale/sq/LC_MESSAGES/gnome-terminal.mo @@ -136,6 +138,7 @@ share/locale/tr/LC_MESSAGES/gnome-terminal.mo share/locale/uk/LC_MESSAGES/gnome-terminal.mo share/locale/vi/LC_MESSAGES/gnome-terminal.mo share/locale/wa/LC_MESSAGES/gnome-terminal.mo +share/locale/xh/LC_MESSAGES/gnome-terminal.mo share/locale/zh_CN/LC_MESSAGES/gnome-terminal.mo share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo @dirrm share/gnome/omf/gnome-terminal diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 829fdefb2c54..9c95010e7c45 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -3,13 +3,14 @@ # Whom: Yukihiro Nakai <Nakai@technologist.com> # # $FreeBSD$ +# $MCom: ports/x11/libgnome/Makefile,v 1.61 2005/09/07 16:21:36 marcus Exp $ # PORTNAME= libgnome -PORTVERSION= 2.10.1 +PORTVERSION= 2.12.0.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org @@ -24,15 +25,17 @@ USE_REINPLACE= yes USE_XPM= yes USE_GMAKE= yes USE_GNOME= gnomeprefix gnomehack intlhack esound \ - gnomevfs2 libxslt + gnomevfs2 libxslt ltverhack USE_BISON= yes INSTALLS_SHLIB= yes -USE_LIBTOOL_VER=15 +USE_AUTOTOOLS= libtool:15 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" SUB_FILES= pkg-deinstall +MAN7= gnome-options.7 + GCONF_SCHEMAS= desktop_gnome_accessibility_keyboard.schemas \ desktop_gnome_accessibility_startup.schemas \ desktop_gnome_applications_browser.schemas \ diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo index 6b7941d329d7..cd9f710f0d4a 100644 --- a/x11/libgnome/distinfo +++ b/x11/libgnome/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/libgnome-2.10.1.tar.bz2) = dfb1a9b5fd25da8680a166c83ce0b6a8 -SIZE (gnome2/libgnome-2.10.1.tar.bz2) = 1227721 +MD5 (gnome2/libgnome-2.12.0.1.tar.bz2) = f239a7ab132d2ec9039bb2537cca1e92 +SIZE (gnome2/libgnome-2.12.0.1.tar.bz2) = 955235 diff --git a/x11/libgnome/files/patch-ag b/x11/libgnome/files/patch-ag index 157a59be15ac..2caedc380d59 100644 --- a/x11/libgnome/files/patch-ag +++ b/x11/libgnome/files/patch-ag @@ -1,5 +1,6 @@ $FreeBSD$ + $MCom: ports/x11/libgnome/files/patch-ag,v 1.18 2005/07/04 00:15:01 marcus Exp $ --- libgnome/gnome-util.c 2002/03/19 17:16:21 1.1 +++ libgnome/gnome-util.c 2002/03/19 17:21:31 diff --git a/x11/libgnome/files/pkg-deinstall.in b/x11/libgnome/files/pkg-deinstall.in index 0ac463865c7f..adb5cef39218 100644 --- a/x11/libgnome/files/pkg-deinstall.in +++ b/x11/libgnome/files/pkg-deinstall.in @@ -1,6 +1,7 @@ #!/bin/sh # # $FreeBSD$ +# $MCom: ports/x11/libgnome/files/pkg-deinstall.in,v 1.2 2005/07/04 00:15:01 marcus Exp $ # # Restore gconf keys of gnomevfs2. diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist index 9df5db77e9a7..57c04872a299 100644 --- a/x11/libgnome/pkg-plist +++ b/x11/libgnome/pkg-plist @@ -19,7 +19,7 @@ include/libgnome-2.0/libgnome/libgnometypebuiltins.h lib/bonobo/monikers/libmoniker_extra_2.so lib/libgnome-2.a lib/libgnome-2.so -lib/libgnome-2.so.1000 +lib/libgnome-2.so.0 libdata/bonobo/servers/GNOME_Moniker_std.server libdata/pkgconfig/libgnome-2.0.pc %%PORTDOCS%%%%DOCSDIR%%/ch01s02.html @@ -46,6 +46,7 @@ libdata/pkgconfig/libgnome-2.0.pc %%PORTDOCS%%%%DOCSDIR%%/libgnome.devhelp %%PORTDOCS%%%%DOCSDIR%%/libgnome.html %%PORTDOCS%%%%DOCSDIR%%/right.png +%%PORTDOCS%%%%DOCSDIR%%/style.css %%PORTDOCS%%%%DOCSDIR%%/up.png share/locale/am/LC_MESSAGES/libgnome-2.0.mo share/locale/ar/LC_MESSAGES/libgnome-2.0.mo @@ -115,14 +116,6 @@ share/locale/xh/LC_MESSAGES/libgnome-2.0.mo share/locale/yi/LC_MESSAGES/libgnome-2.0.mo share/locale/zh_CN/LC_MESSAGES/libgnome-2.0.mo share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo -@unexec rmdir %D/share/locale/yi/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/yi 2> /dev/null || true -@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/xh 2> /dev/null || true -@unexec rmdir %D/share/locale/sr@ije/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/sr@ije 2> /dev/null || true -@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true -@unexec rmdir %D/share/locale/rw 2> /dev/null || true -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm include/libgnome-2.0/libgnome @dirrm include/libgnome-2.0 +%%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile index 98532139cc2f..a80939317c25 100644 --- a/x11/yelp/Makefile +++ b/x11/yelp/Makefile @@ -3,39 +3,38 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports/x11/yelp/Makefile,v 1.63 2005/10/09 00:42:45 marcus Exp $ # PORTNAME= yelp -PORTVERSION= 2.10.0 +PORTVERSION= 2.12.1 PORTREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= A help browser for the GNOME 2 desktop -BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils \ - ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} -RUN_DEPENDS= ${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils \ - ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} +BUILD_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} +RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA} -MOZILLA= mozilla +MOZILLA= firefox HEADERS_SUFX= .if !defined(WITH_MOZILLA) -MOZILLA= mozilla +MOZILLA= firefox HEADERS_SUFX= .else -.if ${WITH_MOZILLA}=="firefox" -MOZILLA= firefox +.if ${WITH_MOZILLA}=="mozilla" +MOZILLA= mozilla .else .if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2" MOZILLA= mozilla-devel HEADERS_SUFX= -devel .else -MOZILLA= mozilla +MOZILLA= firefox HEADERS_SUFX= .endif .endif @@ -45,8 +44,9 @@ USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes USE_REINPLACE= yes -USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui -USE_LIBTOOL_VER=15 +USE_GNOME= gnomeprefix gnomehack intlhack libgnomeui gnomedocutils +USE_AUTOTOOLS= libtool:15 +INSTALLS_ICONS= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" CONFIGURE_ARGS= --with-mozilla=${MOZILLA} @@ -75,11 +75,11 @@ CONFIGURE_ARGS+=--enable-info pre-everything:: @${ECHO_MSG} "" - @${ECHO_MSG} " By default yelp uses www/mozilla for html rendering, but you can" + @${ECHO_MSG} " By default yelp uses www/firefox for html rendering, but you can" @${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:" @${ECHO_MSG} @${ECHO_MSG} " mozilla-devel " - @${ECHO_MSG} " firefox " + @${ECHO_MSG} " mozilla" @${ECHO_MSG} "" post-patch: diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo index 118e19b6486c..3a2d0eca6b3f 100644 --- a/x11/yelp/distinfo +++ b/x11/yelp/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/yelp-2.10.0.tar.bz2) = 326f85c8c0fd944e782a37b0589036c5 -SIZE (gnome2/yelp-2.10.0.tar.bz2) = 790852 +MD5 (gnome2/yelp-2.12.1.tar.bz2) = d6a9c142ca367447f06cee003b6d8a5d +SIZE (gnome2/yelp-2.12.1.tar.bz2) = 815483 diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist index c26d1638c222..b51798ea50fa 100644 --- a/x11/yelp/pkg-plist +++ b/x11/yelp/pkg-plist @@ -26,6 +26,8 @@ share/gnome/yelp/xslt/db2html.xsl share/gnome/yelp/xslt/info2html.xsl share/gnome/yelp/xslt/man2html.xsl share/gnome/yelp/xslt/toc2html.xsl +share/gnome/yelp/xslt/yelp-common.xsl +share/gnome/yelp/yelp.js share/icons/hicolor/192x192/apps/yelp-icon-big.png share/locale/af/LC_MESSAGES/yelp.mo share/locale/am/LC_MESSAGES/yelp.mo @@ -64,6 +66,7 @@ share/locale/ja/LC_MESSAGES/yelp.mo share/locale/ka/LC_MESSAGES/yelp.mo share/locale/kn/LC_MESSAGES/yelp.mo share/locale/ko/LC_MESSAGES/yelp.mo +share/locale/ku/LC_MESSAGES/yelp.mo share/locale/li/LC_MESSAGES/yelp.mo share/locale/lt/LC_MESSAGES/yelp.mo share/locale/lv/LC_MESSAGES/yelp.mo @@ -111,6 +114,8 @@ share/locale/zu/LC_MESSAGES/yelp.mo @unexec rmdir %D/share/locale/nso 2> /dev/null || true @unexec rmdir %D/share/locale/mr/LC_MESSAGES 2> /dev/null || true @unexec rmdir %D/share/locale/mr 2> /dev/null || true +@unexec rmdir %D/share/locale/ku/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ku 2> /dev/null || true @dirrm share/gnome/yelp/xslt @dirrm share/gnome/yelp/ui @dirrm share/gnome/yelp/icons diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile index 966d951dd6c1..8cd704bb0960 100644 --- a/x11/zenity/Makefile +++ b/x11/zenity/Makefile @@ -3,16 +3,17 @@ # Whom: Franz Klammer <klammer@webonaut.com> # # $FreeBSD$ +# $MCom: ports/x11/zenity/Makefile,v 1.46 2005/10/30 23:07:09 marcus Exp $ # PORTNAME= zenity -PORTVERSION= 2.10.0 +PORTVERSION= 2.12.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.10 -DIST_SUBDIR= gnome2 +MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.12 +DIST_SUBDIR= gnome2 -MAINTAINER= klammer@webonaut.com +MAINTAINER= gnome@FreeBSD.org COMMENT= Display GNOME dialogs from the command line BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper @@ -21,7 +22,7 @@ RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= gnomeprefix gnomehack libgnomecanvas gconf2 +USE_GNOME= gnomeprefix gnomehack libgnomecanvas gconf2 gnomedocutils USE_BZIP2= yes GNU_CONFIGURE= yes USE_REINPLACE= yes diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo index ea553b6190df..31b12945eca0 100644 --- a/x11/zenity/distinfo +++ b/x11/zenity/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/zenity-2.10.0.tar.bz2) = 2e501bba72b6e7d4f951080b9e5f675b -SIZE (gnome2/zenity-2.10.0.tar.bz2) = 742206 +MD5 (gnome2/zenity-2.12.1.tar.bz2) = d8fbcf326e42b5dae70a570fad024947 +SIZE (gnome2/zenity-2.12.1.tar.bz2) = 896002 diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist index 879d5604c2cf..d2276349c61b 100644 --- a/x11/zenity/pkg-plist +++ b/x11/zenity/pkg-plist @@ -13,20 +13,46 @@ share/gnome/help/zenity/C/figures/zenity-text-screenshot.png share/gnome/help/zenity/C/figures/zenity-warning-screenshot.png share/gnome/help/zenity/C/legal.xml share/gnome/help/zenity/C/zenity.xml -share/gnome/help/zenity/sr/figures/zenity-calendar-screenshot.png -share/gnome/help/zenity/sr/figures/zenity-entry-screenshot.png -share/gnome/help/zenity/sr/figures/zenity-error-screenshot.png -share/gnome/help/zenity/sr/figures/zenity-fileselection-screenshot.png -share/gnome/help/zenity/sr/figures/zenity-information-screenshot.png -share/gnome/help/zenity/sr/figures/zenity-list-screenshot.png -share/gnome/help/zenity/sr/figures/zenity-progress-screenshot.png -share/gnome/help/zenity/sr/figures/zenity-question-screenshot.png -share/gnome/help/zenity/sr/figures/zenity-text-screenshot.png -share/gnome/help/zenity/sr/figures/zenity-warning-screenshot.png -share/gnome/help/zenity/sr/legal.xml -share/gnome/help/zenity/sr/zenity.xml +share/gnome/help/zenity/es/figures/zenity-calendar-screenshot.png +share/gnome/help/zenity/es/figures/zenity-entry-screenshot.png +share/gnome/help/zenity/es/figures/zenity-error-screenshot.png +share/gnome/help/zenity/es/figures/zenity-fileselection-screenshot.png +share/gnome/help/zenity/es/figures/zenity-information-screenshot.png +share/gnome/help/zenity/es/figures/zenity-list-screenshot.png +share/gnome/help/zenity/es/figures/zenity-notification-screenshot.png +share/gnome/help/zenity/es/figures/zenity-progress-screenshot.png +share/gnome/help/zenity/es/figures/zenity-question-screenshot.png +share/gnome/help/zenity/es/figures/zenity-text-screenshot.png +share/gnome/help/zenity/es/figures/zenity-warning-screenshot.png +share/gnome/help/zenity/es/zenity.xml +share/gnome/help/zenity/fr/figures/zenity-calendar-screenshot.png +share/gnome/help/zenity/fr/figures/zenity-entry-screenshot.png +share/gnome/help/zenity/fr/figures/zenity-error-screenshot.png +share/gnome/help/zenity/fr/figures/zenity-fileselection-screenshot.png +share/gnome/help/zenity/fr/figures/zenity-information-screenshot.png +share/gnome/help/zenity/fr/figures/zenity-list-screenshot.png +share/gnome/help/zenity/fr/figures/zenity-notification-screenshot.png +share/gnome/help/zenity/fr/figures/zenity-progress-screenshot.png +share/gnome/help/zenity/fr/figures/zenity-question-screenshot.png +share/gnome/help/zenity/fr/figures/zenity-text-screenshot.png +share/gnome/help/zenity/fr/figures/zenity-warning-screenshot.png +share/gnome/help/zenity/fr/zenity.xml +share/gnome/help/zenity/uk/figures/zenity-calendar-screenshot.png +share/gnome/help/zenity/uk/figures/zenity-entry-screenshot.png +share/gnome/help/zenity/uk/figures/zenity-error-screenshot.png +share/gnome/help/zenity/uk/figures/zenity-fileselection-screenshot.png +share/gnome/help/zenity/uk/figures/zenity-information-screenshot.png +share/gnome/help/zenity/uk/figures/zenity-list-screenshot.png +share/gnome/help/zenity/uk/figures/zenity-notification-screenshot.png +share/gnome/help/zenity/uk/figures/zenity-progress-screenshot.png +share/gnome/help/zenity/uk/figures/zenity-question-screenshot.png +share/gnome/help/zenity/uk/figures/zenity-text-screenshot.png +share/gnome/help/zenity/uk/figures/zenity-warning-screenshot.png +share/gnome/help/zenity/uk/zenity.xml share/gnome/omf/zenity/zenity-C.omf -share/gnome/omf/zenity/zenity-sr.omf +share/gnome/omf/zenity/zenity-es.omf +share/gnome/omf/zenity/zenity-fr.omf +share/gnome/omf/zenity/zenity-uk.omf share/gnome/zenity/clothes/gnome-tshirt.png share/gnome/zenity/clothes/hawaii-shirt.png share/gnome/zenity/clothes/monk.png @@ -65,6 +91,7 @@ share/locale/fr/LC_MESSAGES/zenity-0.1.mo share/locale/ga/LC_MESSAGES/zenity-0.1.mo share/locale/gl/LC_MESSAGES/zenity-0.1.mo share/locale/gu/LC_MESSAGES/zenity-0.1.mo +share/locale/he/LC_MESSAGES/zenity-0.1.mo share/locale/hi/LC_MESSAGES/zenity-0.1.mo share/locale/hr/LC_MESSAGES/zenity-0.1.mo share/locale/hu/LC_MESSAGES/zenity-0.1.mo @@ -91,6 +118,7 @@ share/locale/pt/LC_MESSAGES/zenity-0.1.mo share/locale/pt_BR/LC_MESSAGES/zenity-0.1.mo share/locale/ro/LC_MESSAGES/zenity-0.1.mo share/locale/ru/LC_MESSAGES/zenity-0.1.mo +share/locale/rw/LC_MESSAGES/zenity-0.1.mo share/locale/sk/LC_MESSAGES/zenity-0.1.mo share/locale/sl/LC_MESSAGES/zenity-0.1.mo share/locale/sq/LC_MESSAGES/zenity-0.1.mo @@ -100,15 +128,23 @@ share/locale/sv/LC_MESSAGES/zenity-0.1.mo share/locale/ta/LC_MESSAGES/zenity-0.1.mo share/locale/th/LC_MESSAGES/zenity-0.1.mo share/locale/tr/LC_MESSAGES/zenity-0.1.mo +share/locale/ug/LC_MESSAGES/zenity-0.1.mo share/locale/uk/LC_MESSAGES/zenity-0.1.mo share/locale/vi/LC_MESSAGES/zenity-0.1.mo +share/locale/xh/LC_MESSAGES/zenity-0.1.mo share/locale/zh_CN/LC_MESSAGES/zenity-0.1.mo share/locale/zh_TW/LC_MESSAGES/zenity-0.1.mo +@unexec rmdir %D/share/locale/ug/LC_MESSAGES 2> /dev/null || true +@unexec rmdir %D/share/locale/ug 2> /dev/null || true @dirrm share/gnome/zenity/clothes @dirrm share/gnome/zenity @dirrm share/gnome/omf/zenity -@dirrm share/gnome/help/zenity/sr/figures -@dirrm share/gnome/help/zenity/sr +@dirrm share/gnome/help/zenity/uk/figures +@dirrm share/gnome/help/zenity/uk +@dirrm share/gnome/help/zenity/fr/figures +@dirrm share/gnome/help/zenity/fr +@dirrm share/gnome/help/zenity/es/figures +@dirrm share/gnome/help/zenity/es @dirrm share/gnome/help/zenity/C/figures @dirrm share/gnome/help/zenity/C @dirrm share/gnome/help/zenity |