Pass the correct month to Evolution command line from clock applet, thanks to walt for noticing.

Package-Manager: portage-2.1.10.5/cvs/Linux x86_64

4 files changed, 156 insertions, 6 deletions

diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog
index 610f468f3298..fb2566e7ff0e 100644
--- a/gnome-base/gnome-panel/ChangeLog
+++ b/gnome-base/gnome-panel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-panel
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.335 2011/07/14 10:24:08 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.336 2011/07/14 12:34:22 pacho Exp $
+
+*gnome-panel-2.32.1-r3 (14 Jul 2011)
+
+  14 Jul 2011; Pacho Ramos <pacho@gentoo.org> +gnome-panel-2.32.1-r3.ebuild,
+  +files/gnome-panel-2.32.1-evo-month.patch:
+  Pass the correct month to Evolution command line from clock applet, thanks to
+  walt for noticing.
 
   14 Jul 2011; Thomas Kahle <tomka@gentoo.org> gnome-panel-2.32.1-r2.ebuild:
   x86 stable per bug 369909
diff --git a/gnome-base/gnome-panel/Manifest b/gnome-base/gnome-panel/Manifest
index b73684f15f77..0ab9e1889db5 100644
--- a/gnome-base/gnome-panel/Manifest
+++ b/gnome-base/gnome-panel/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX gnome-panel-2.32.1-as-needed.patch 1030 RMD160 4c22c1f159fdf618d10ba6a0290beb3389f2c61d SHA1 3836698dfd6650873220e448f5a5e1ff0ba8b2c7 SHA256 c311d13448ced0c74470f9c655fda55fc056245831f5a800f5493a5a4de19bf5
+AUX gnome-panel-2.32.1-evo-month.patch 810 RMD160 d454e7609af4997dc73bfa06b3d45c1bf3986de5 SHA1 a039eb21e74f0d02c654affa1a839a21ef9a8ce2 SHA256 1b2854b64df8b628654a91b563b3846914a8ba7c9f2f5bf9f890e5a9a18f9238
 AUX gnome-panel-2.32.1-fix-multiscreen.patch 7513 RMD160 a211a3cbed6c572ae98377f34afae33b3bd0b840 SHA1 679f8f263c1f8de2a9aac159fad81bbbaa20098b SHA256 5bdb4fe08e79bc504b29aa4752bfb563b26870571f419cef447ebfe8c639dcb2
 AUX gnome-panel-2.32.1-fix-multiscreen2.patch 1451 RMD160 dcf898a075215ee807960b91d671fb6be8b6598f SHA1 d3433f9559060fbb99bbfb8ab66b8f0c637e9a80 SHA256 fd9cf2e5a0374fc8d68f9f30117d5c502e510eb8eb11fcea021594f7549bca89
 DIST gnome-panel-2.32.1-patches.tar.bz2 6686 RMD160 b5b4c18d36ad135eb49c154a4539b815b33cc73d SHA1 7c13dad85a3e8ffe861d05e1560d715052e92a6e SHA256 b0e2f59e370a2a7da2cd5fd1513cc50cf2bf210fac765e05603d81f91e7bbcea
@@ -9,12 +10,13 @@ DIST gnome-panel-2.32.1.tar.bz2 3132156 RMD160 03a440cee7e219b42a0375ae2d2d53fbd
 DIST introspection-20110205.m4.tar.bz2 1220 RMD160 c520adf7edf0e56012138208b45bed9df2a3e62f SHA1 092adcee1acce39e89069db0f3e8b4cb7ad89dea SHA256 4394a606d380ae5315872ede35387f104da5fad96794d29c45c444a9d481d8b2
 EBUILD gnome-panel-2.32.1-r1.ebuild 3540 RMD160 e64751f8016bdde33f7ba03d20d7d4c4603f8ad1 SHA1 2c40ede1007a896acca8b0c9fd832a1e87b4ffe9 SHA256 65f8b6cfa69b55a903f54b3a8744887b9f232a9a7467dcac28971a5054c2907f
 EBUILD gnome-panel-2.32.1-r2.ebuild 3576 RMD160 9810b89b5fcc5ab499876e6331fe9c715b606316 SHA1 94ecc6395b0df2cd86c08e1381fea878c6b4426a SHA256 f9251a9a2fb8623147d5e08260edbb2a489afd79b2ca3c156288024fbef5fd8d
-MISC ChangeLog 47094 RMD160 53deaf9f58177ecaaf002fada9d62860a810befb SHA1 0f5f36671f3b60696b6a5748cff71e061417ee79 SHA256 8dcc3227f5aa28303d408e3294efa3b4ea0395efd4e4c18b7fc19d0ecd69a9e9
+EBUILD gnome-panel-2.32.1-r3.ebuild 3634 RMD160 94695eb177f2423d207e3a9e2909dc002698cbf9 SHA1 3d4263648c0e41f4eb747db1ef61e464e807e789 SHA256 96e6c3ddd134a0474cbf87aa6b061e8d78ddab3fa36e0185636954fcf7650b6b
+MISC ChangeLog 47356 RMD160 63280e56432571d71a6c8c5a651dc77bcff64e16 SHA1 d6e27fd2be7af0a88e895af94c5c575cbd36c6b0 SHA256 8d1bf264eee8979cec30c19cd4bd6e98492dd92eeeb860035a729d893d3cb0c2
 MISC metadata.xml 374 RMD160 9f8a135b00284a040f08bf8e7899cccab4151f16 SHA1 bbb2909c690abb23de3685b93e48c1497adbf688 SHA256 69c9f86e95c7553d0ff7f84838cde89d1537206aa0de8869ee6a1aeec3cde403
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk4ew7IACgkQodBTJSDyo655aAD/TJ/G/tuIUl/MrvwMQMqB2a9H
-vdKwjkbl0qxxuTquKhMA/0Fsf/IqpaH6AEyk9fQ+P3hJWjJ+2Weqkh6ymCM83wpC
-=msaF
+iEYEARECAAYFAk4e4lQACgkQCaWpQKGI+9QZ7gCeJ8JHxIfopQUCdkok/HgIChU8
+HI8Anigeg/UG9HTKu9IvDBpv4b+fvAgC
+=qzpS
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.32.1-evo-month.patch b/gnome-base/gnome-panel/files/gnome-panel-2.32.1-evo-month.patch
new file mode 100644
index 000000000000..531de79be316
--- /dev/null
+++ b/gnome-base/gnome-panel/files/gnome-panel-2.32.1-evo-month.patch
@@ -0,0 +1,23 @@
+From 241e288c0a9d30f9f2e8d608b0bbd950c1ac959c Mon Sep 17 00:00:00 2001
+From: Rodrigo Moya <rodrigo@gnome-db.org>
+Date: Mon, 02 May 2011 13:55:19 +0000
+Subject: clock applet: Pass the correct month to Evolution command line
+
+gtk_calendar_get_date returns the month between 0 and 11, so we need to add
+1 to the month being passed to Evolution
+---
+diff --git a/applets/clock/calendar-window.c b/applets/clock/calendar-window.c
+index c01bd6a..548b91b 100644
+--- a/applets/clock/calendar-window.c
++++ b/applets/clock/calendar-window.c
+@@ -1245,7 +1245,7 @@ calendar_day_activated (GtkCalendar    *calendar,
+ 
+ 	argument = g_strdup_printf ("calendar:///?startdate="
+ 				    "%.4d%.2d%.2d",
+-				    year, month, day);
++				    year, month + 1, day);
+ 
+ 	clock_launch_calendar_app (calwin, argument);
+ 
+--
+cgit v0.9
diff --git a/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild b/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild
new file mode 100644
index 000000000000..ee3bbbf859fc
--- /dev/null
+++ b/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/gnome-panel-2.32.1-r3.ebuild,v 1.1 2011/07/14 12:34:22 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+PYTHON_DEPEND="2:2.4"
+
+inherit gnome2 python eutils autotools
+
+DESCRIPTION="The GNOME panel"
+HOMEPAGE="http://www.gnome.org/"
+SRC_URI="${SRC_URI} mirror://gentoo/introspection-20110205.m4.tar.bz2
+	http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.bz2"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+bonobo doc eds +introspection networkmanager"
+
+RDEPEND=">=gnome-base/gnome-desktop-2.26:2
+	>=x11-libs/pango-1.15.4[introspection?]
+	>=dev-libs/glib-2.25.12:2
+	>=x11-libs/gtk+-2.22:2[introspection?]
+	>=dev-libs/libgweather-2.27.90:2
+	dev-libs/libxml2:2
+	>=gnome-base/gconf-2.6.1:2[introspection?]
+	>=media-libs/libcanberra-0.23[gtk]
+	>=gnome-base/gnome-menus-2.27.92
+	gnome-base/librsvg:2
+	>=dev-libs/dbus-glib-0.80
+	>=sys-apps/dbus-1.1.2
+	>=x11-libs/cairo-1
+	x11-libs/libXau
+	>=x11-libs/libXrandr-1.2
+	bonobo? (
+		>=gnome-base/libbonobo-2.20.4
+		>=gnome-base/libbonoboui-2.1.1
+		>=gnome-base/orbit-2.4
+		>=x11-libs/libwnck-2.19.5:1 )
+	eds? ( >=gnome-extra/evolution-data-server-1.6 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+	networkmanager? ( >=net-misc/networkmanager-0.6.7 )"
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	>=app-text/gnome-doc-utils-0.3.2
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.40
+	~app-text/docbook-xml-dtd-4.1.2
+	doc? ( >=dev-util/gtk-doc-1 )
+	gnome-base/gnome-common
+	dev-util/gtk-doc-am"
+# eautoreconf needs
+#	gnome-base/gnome-common
+#	dev-util/gtk-doc-am
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-deprecation-flags
+		--disable-static
+		--disable-scrollkeeper
+		--disable-schemas-install
+		$(use_enable bonobo)
+		$(use_enable networkmanager network-manager)
+		$(use_enable introspection)
+		$(use_enable eds)"
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	python_set_active_version 2
+}
+
+src_unpack() {
+	# If gobject-introspection is installed, we don't need the extra .m4
+	if has_version "dev-libs/gobject-introspection"; then
+		unpack ${P}.tar.bz2 ${P}-patches.tar.bz2
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# List the objects before the libraries to fix build with --as-needed
+	epatch "${FILESDIR}/${P}-as-needed.patch"
+
+	# Try to improve panel behavior on multiscreen systems, bug #348253, upstream #632369
+	epatch "${FILESDIR}/${PN}-2.32.1-fix-multiscreen.patch"
+	epatch "${FILESDIR}/${PN}-2.32.1-fix-multiscreen2.patch"
+
+	# Apply multiple bugfixes from 2.32 and master branches
+	# Also use gnome-applications.menu instead of applications.menu as it's the default value for us.
+	epatch "${WORKDIR}/${P}-patches"/*.patch
+
+	# clock applet: Pass the correct month to Evolution command line
+	epatch "${FILESDIR}/${PN}-2.32.1-evo-month.patch"
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	AT_M4DIR=${WORKDIR} eautoreconf
+}
+
+pkg_postinst() {
+	local entries="${EROOT}etc/gconf/schemas/panel-default-setup.entries"
+	local gconftool="${EROOT}usr/bin/gconftool-2"
+
+	if [ -e "$entries" ]; then
+		einfo "Setting panel gconf defaults..."
+
+		GCONF_CONFIG_SOURCE="$("${gconftool}" --get-default-source | sed "s;:/;:${ROOT};")"
+
+		"${gconftool}" --direct --config-source \
+			"${GCONF_CONFIG_SOURCE}" --load="${entries}"
+	fi
+
+	# Calling this late so it doesn't process the GConf schemas file we already
+	# took care of.
+	gnome2_pkg_postinst
+}