Updated xfce to 4.2.1.1

General:

* Don't use G_INLINE_FUNC in the source code, which fixes several weird
  build errors.

libxfce4util:

* Fix a problem with NFS mounted home directories in Solaris (#724)

xfce4-session:

* Fix RedHat shutdown code (#703)

xfdesktop:

* fix handling of quoted commands in the desktop menu (#776)
* fix handling of .desktop files with no Categories list (#776)
* add "edit menu" button to panel plugin prefs (#554), and ability to change
  the button tooltip (#764)
* fix broken panel plugin behavior when trying to track the default desktop
  menu. there's a new option to either follow the default menu, or use a
  static menu file (#778)
* fix bug where xfdesktop would crash if the windowlist was opened, then a
  window was destroyed, and then that window was selected from the list (#672)
* fix "unique" attribute of system menu inclusion

xffm:

* ensure posix.1-1996 compatibility (#695)
* fix for crash on opening fstab on solaris (#726)
* avoid a showstopper gtk-2.4 bug (scaling gdkpixbufs from svg images).
  This is bugzilla #751 report. Not all gtk showstopper bugs from svg
  can be avoided. In particular with office/mobile_phone_01.svg. This
  file will also crash rox
* allow relative paths for icon resolution (xfce4-modules)
* validate utf error messages (#737)
* don't quote paths that are already quoted.
* change smb-share icon to proper icon
* fix borked overwrite warning dialog message
* bug fixes for keyboardnavigation to close bug #795
* separate remove and paste button in toolbar to avoid confusing the
  remove confirmation dialog with the overwrite confirmation dialog
* fix translation problems in several languages, including
  brazilian-portuguese
* fill in some missing spanish translation strings
* fix for bug #524 (crashing xffm by mounting cdrom and trying to open it
  in the other treeview before mount is complete)

xfcalendar:

* remembering of its position (bug #691 and #789)
* warning box for preventing users to loose their changes (#714 and #738)
* possibility to show/hide xfcalendar in taskbar, pager and systray (#719)
* possibility to choose to either show or hide the calendar window when
  xfcalendar is launched (it remembered before the status when leaving)

xfce4-panel:

* Save configuration file only on exit
* Fix double click on inactive item in dialog (#739)
* 64bit fix
* Clock applet tweak (#716, hopefully)

xfprint:

* remove FILE backend and add a print-to-file entry in the printing dialog
* multiple bugfixes (#816, #817, #818, #820) in the BSD-LPR backend

4 files changed, 15 insertions, 8 deletions

diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile
index 5be2204abea..56807a1de3d 100644
--- a/x11/xfce4-panel/Makefile
+++ b/x11/xfce4-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/01/17 12:56:14 martti Exp $
+# $NetBSD: Makefile,v 1.15 2005/03/18 07:59:09 martti Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -6,6 +6,8 @@ DISTNAME=	xfce4-panel-${XFCE4_VERSION}
 CATEGORIES=	x11
 COMMENT=	XFce4 panel
 
+XFCE4_VERSION=	4.2.1.1
+
 PKGCONFIG_OVERRIDE=	panel/xfce4-panel-1.0.pc.in
 PTHREAD_AUTO_VARS=	yes
 
diff --git a/x11/xfce4-panel/PLIST b/x11/xfce4-panel/PLIST
index deba2e92ff0..37cdaad1453 100644
--- a/x11/xfce4-panel/PLIST
+++ b/x11/xfce4-panel/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.9 2005/01/17 12:56:14 martti Exp $
+@comment $NetBSD: PLIST,v 1.10 2005/03/18 07:59:09 martti Exp $
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xfce4-panel.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/xfce4-panel.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xfce4-panel.mo
@@ -43,11 +44,14 @@ etc/xdg/xfce4/panel/contents.xml
 etc/xdg/xfce4/panel/contents.xml.ar
 etc/xdg/xfce4/panel/contents.xml.az
 etc/xdg/xfce4/panel/contents.xml.ca
+etc/xdg/xfce4/panel/contents.xml.da
 etc/xdg/xfce4/panel/contents.xml.eu
+etc/xdg/xfce4/panel/contents.xml.fi
 etc/xdg/xfce4/panel/contents.xml.fr
 etc/xdg/xfce4/panel/contents.xml.he
 etc/xdg/xfce4/panel/contents.xml.hu
 etc/xdg/xfce4/panel/contents.xml.it
+etc/xdg/xfce4/panel/contents.xml.ja
 etc/xdg/xfce4/panel/contents.xml.ko
 etc/xdg/xfce4/panel/contents.xml.lt
 etc/xdg/xfce4/panel/contents.xml.ms
@@ -57,6 +61,7 @@ etc/xdg/xfce4/panel/contents.xml.ru
 etc/xdg/xfce4/panel/contents.xml.sk
 etc/xdg/xfce4/panel/contents.xml.tr
 etc/xdg/xfce4/panel/contents.xml.vi
+etc/xdg/xfce4/panel/contents.xml.zh_CN
 etc/xdg/xfce4/panel/contents.xml.zh_TW
 include/xfce4/panel/add-control-dialog.h
 include/xfce4/panel/controls.h
diff --git a/x11/xfce4-panel/buildlink3.mk b/x11/xfce4-panel/buildlink3.mk
index c0ba8b888be..36a8f535049 100644
--- a/x11/xfce4-panel/buildlink3.mk
+++ b/x11/xfce4-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2005/01/17 12:56:14 martti Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/03/18 07:59:09 martti Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 XFCE4_PANEL_BUILDLINK3_MK:=	${XFCE4_PANEL_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nxfce4-panel}
 BUILDLINK_PACKAGES+=	xfce4-panel
 
 .if !empty(XFCE4_PANEL_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.xfce4-panel+=		xfce4-panel>=4.2.0
+BUILDLINK_DEPENDS.xfce4-panel+=		xfce4-panel>=4.2.1.1
 BUILDLINK_PKGSRCDIR.xfce4-panel?=	../../x11/xfce4-panel
 .endif	# XFCE4_PANEL_BUILDLINK3_MK
 
diff --git a/x11/xfce4-panel/distinfo b/x11/xfce4-panel/distinfo
index 96d4f491b0a..a857de6ffd5 100644
--- a/x11/xfce4-panel/distinfo
+++ b/x11/xfce4-panel/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2005/02/23 17:36:22 wiz Exp $
+$NetBSD: distinfo,v 1.10 2005/03/18 07:59:09 martti Exp $
 
-SHA1 (xfce4-panel-4.2.0.tar.gz) = d4975b117bbe8eafc27eebfe557a423398d35e76
-RMD160 (xfce4-panel-4.2.0.tar.gz) = 6f3e2e9c6ab28255a72a904c2bcb900853282004
-Size (xfce4-panel-4.2.0.tar.gz) = 871179 bytes
+SHA1 (xfce4-panel-4.2.1.1.tar.gz) = 63db0319212eb58e24ef6d4d812febbcc0fd376a
+RMD160 (xfce4-panel-4.2.1.1.tar.gz) = 51996ed497dbc55c73745dad074a6fe24f1b49f0
+Size (xfce4-panel-4.2.1.1.tar.gz) = 836191 bytes