From d6bbecbd03acc1314491bb5af0fb5b220ae8c667 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Wed, 23 Jun 2010 11:57:48 +0000 Subject: Version bump Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- gnome-base/gnome-panel/ChangeLog | 9 +- .../files/gnome-panel-2.30.0-panels-unhidden.patch | 46 --------- .../gnome-panel/gnome-panel-2.30.0-r1.ebuild | 104 --------------------- gnome-base/gnome-panel/gnome-panel-2.30.2.ebuild | 101 ++++++++++++++++++++ gnome-base/libgnomekbd/ChangeLog | 10 +- .../files/libgnomekbd-2.30.1-kbd-crash.patch | 46 --------- .../libgnomekbd-2.30.1-notification-area.patch | 24 ----- gnome-base/libgnomekbd/libgnomekbd-2.30.1.ebuild | 49 ---------- gnome-base/libgnomekbd/libgnomekbd-2.30.2.ebuild | 39 ++++++++ 9 files changed, 157 insertions(+), 271 deletions(-) delete mode 100644 gnome-base/gnome-panel/files/gnome-panel-2.30.0-panels-unhidden.patch delete mode 100644 gnome-base/gnome-panel/gnome-panel-2.30.0-r1.ebuild create mode 100644 gnome-base/gnome-panel/gnome-panel-2.30.2.ebuild delete mode 100644 gnome-base/libgnomekbd/files/libgnomekbd-2.30.1-kbd-crash.patch delete mode 100644 gnome-base/libgnomekbd/files/libgnomekbd-2.30.1-notification-area.patch delete mode 100644 gnome-base/libgnomekbd/libgnomekbd-2.30.1.ebuild create mode 100644 gnome-base/libgnomekbd/libgnomekbd-2.30.2.ebuild (limited to 'gnome-base') diff --git a/gnome-base/gnome-panel/ChangeLog b/gnome-base/gnome-panel/ChangeLog index 0bd29c571321..27b722968d51 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-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.303 2010/06/13 17:59:45 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-panel/ChangeLog,v 1.304 2010/06/23 11:54:31 pacho Exp $ + +*gnome-panel-2.30.2 (23 Jun 2010) + + 23 Jun 2010; Pacho Ramos -gnome-panel-2.30.0-r1.ebuild, + -files/gnome-panel-2.30.0-panels-unhidden.patch, + +gnome-panel-2.30.2.ebuild: + Version bump with updated translations and fixes, remove old. *gnome-panel-2.30.0-r1 (13 Jun 2010) diff --git a/gnome-base/gnome-panel/files/gnome-panel-2.30.0-panels-unhidden.patch b/gnome-base/gnome-panel/files/gnome-panel-2.30.0-panels-unhidden.patch deleted file mode 100644 index cf5cad0ec3ac..000000000000 --- a/gnome-base/gnome-panel/files/gnome-panel-2.30.0-panels-unhidden.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 3cb6a14614a85c1fa6f68e3cde1d19e84325e132 Mon Sep 17 00:00:00 2001 -From: Vincent Untz -Date: Wed, 26 May 2010 15:00:24 +0000 -Subject: [panel] Make sure that newly-created panels become unhidden - -The patch from a7412dfa introduces a bug where new panels will never get -notified that they should start doing their initial animation; they'll -always stay hidden. ---- -diff --git a/gnome-panel/applet.c b/gnome-panel/applet.c -index 7c36e87..ee16df5 100644 ---- a/gnome-panel/applet.c -+++ b/gnome-panel/applet.c -@@ -1033,18 +1033,18 @@ panel_applet_compare (const PanelAppletToLoad *a, - void - panel_applet_load_queued_applets (gboolean initial_load) - { -- if (initial_load) { -- if (!panel_applets_to_load) { -- panel_applet_queue_initial_unhide_toplevels (NULL); -- return; -- } else { -- /* Install a timeout to make sure we don't block the -- * unhiding because of an applet that doesn't load */ -- panel_applet_unhide_toplevels_timeout = -- g_timeout_add_seconds (UNHIDE_TOPLEVELS_TIMEOUT_SECONDS, -- panel_applet_queue_initial_unhide_toplevels, -- NULL); -- } -+ if (!panel_applets_to_load) { -+ panel_applet_queue_initial_unhide_toplevels (NULL); -+ return; -+ } -+ -+ if (initial_load && panel_applets_to_load) { -+ /* Install a timeout to make sure we don't block the -+ * unhiding because of an applet that doesn't load */ -+ panel_applet_unhide_toplevels_timeout = -+ g_timeout_add_seconds (UNHIDE_TOPLEVELS_TIMEOUT_SECONDS, -+ panel_applet_queue_initial_unhide_toplevels, -+ NULL); - } - - panel_applets_to_load = g_slist_sort (panel_applets_to_load, --- -cgit v0.8.3.1 diff --git a/gnome-base/gnome-panel/gnome-panel-2.30.0-r1.ebuild b/gnome-base/gnome-panel/gnome-panel-2.30.0-r1.ebuild deleted file mode 100644 index 4ecad9d3b3af..000000000000 --- a/gnome-base/gnome-panel/gnome-panel-2.30.0-r1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2010 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.30.0-r1.ebuild,v 1.1 2010/06/13 17:59:45 pacho Exp $ - -EAPI="3" -GCONF_DEBUG="no" - -inherit autotools eutils gnome2 - -DESCRIPTION="The GNOME panel" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2 FDL-1.1 LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="doc eds networkmanager policykit" - -RDEPEND="dev-lang/python - >=gnome-base/gnome-desktop-2.26.0 - >=x11-libs/pango-1.15.4 - >=dev-libs/glib-2.18.0 - >=x11-libs/gtk+-2.19.7 - >=dev-libs/libgweather-2.27.90 - dev-libs/libxml2 - >=gnome-base/libgnome-2.13 - >=gnome-base/libgnomeui-2.5.4 - >=gnome-base/libbonoboui-2.1.1 - >=gnome-base/orbit-2.4 - >=x11-libs/libwnck-2.19.5 - >=gnome-base/gconf-2.6.1 - >=media-libs/libcanberra-0.23[gtk] - >=gnome-base/gnome-menus-2.27.92 - >=gnome-base/libbonobo-2.20.4 - gnome-base/librsvg - >=dev-libs/dbus-glib-0.71 - >=sys-apps/dbus-1.1.2 - >=x11-libs/cairo-1 - x11-libs/libXau - >=x11-libs/libXrandr-1.2 - eds? ( >=gnome-extra/evolution-data-server-1.6 ) - networkmanager? ( >=net-misc/networkmanager-0.6 ) - policykit? ( >=sys-auth/polkit-0.91 )" -DEPEND="${RDEPEND} - >=dev-lang/perl-5 - gnome-base/gnome-common - >=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 - dev-util/gtk-doc-am - doc? ( >=dev-util/gtk-doc-1 )" - -DOCS="AUTHORS ChangeLog HACKING NEWS README" - -pkg_setup() { - G2CONF="${G2CONF} - --disable-static - --disable-scrollkeeper - --disable-schemas-install - --with-in-process-applets=clock,notification-area,wncklet - $(use_enable policykit polkit) - $(use_enable networkmanager network-manager) - $(use_enable eds)" -} - -src_prepare() { - gnome2_src_prepare - - # FIXME: tarball generated with broken gtk-doc, revisit me. - if use doc; then - sed "/^TARGET_DIR/i \GTKDOC_REBASE=${EPREFIX}/usr/bin/gtkdoc-rebase" \ - -i gtk-doc.make || die "sed 1 failed" - else - sed "/^TARGET_DIR/i \GTKDOC_REBASE=$(type -P true)" \ - -i gtk-doc.make || die "sed 2 failed" - fi - - # Make sure that newly-created panels become unhidden - epatch "${FILESDIR}/${P}-panels-unhidden.patch" - - # Make it libtool-1 compatible, bug #271652 - rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed" - - intltoolize --force --copy --automake || die "intltoolize failed" - 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 -} diff --git a/gnome-base/gnome-panel/gnome-panel-2.30.2.ebuild b/gnome-base/gnome-panel/gnome-panel-2.30.2.ebuild new file mode 100644 index 000000000000..a5ee521da429 --- /dev/null +++ b/gnome-base/gnome-panel/gnome-panel-2.30.2.ebuild @@ -0,0 +1,101 @@ +# Copyright 1999-2010 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.30.2.ebuild,v 1.1 2010/06/23 11:54:31 pacho Exp $ + +EAPI="3" +GCONF_DEBUG="no" + +inherit autotools gnome2 + +DESCRIPTION="The GNOME panel" +HOMEPAGE="http://www.gnome.org/" + +LICENSE="GPL-2 FDL-1.1 LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="doc eds networkmanager policykit" + +RDEPEND="dev-lang/python + >=gnome-base/gnome-desktop-2.26.0 + >=x11-libs/pango-1.15.4 + >=dev-libs/glib-2.18.0 + >=x11-libs/gtk+-2.19.7 + >=dev-libs/libgweather-2.27.90 + dev-libs/libxml2 + >=gnome-base/libgnome-2.13 + >=gnome-base/libgnomeui-2.5.4 + >=gnome-base/libbonoboui-2.1.1 + >=gnome-base/orbit-2.4 + >=x11-libs/libwnck-2.19.5 + >=gnome-base/gconf-2.6.1 + >=media-libs/libcanberra-0.23[gtk] + >=gnome-base/gnome-menus-2.27.92 + >=gnome-base/libbonobo-2.20.4 + gnome-base/librsvg + >=dev-libs/dbus-glib-0.71 + >=sys-apps/dbus-1.1.2 + >=x11-libs/cairo-1 + x11-libs/libXau + >=x11-libs/libXrandr-1.2 + eds? ( >=gnome-extra/evolution-data-server-1.6 ) + networkmanager? ( >=net-misc/networkmanager-0.6 ) + policykit? ( >=sys-auth/polkit-0.91 )" +DEPEND="${RDEPEND} + >=dev-lang/perl-5 + gnome-base/gnome-common + >=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 + dev-util/gtk-doc-am + doc? ( >=dev-util/gtk-doc-1 )" + +DOCS="AUTHORS ChangeLog HACKING NEWS README" + +pkg_setup() { + G2CONF="${G2CONF} + --disable-static + --disable-scrollkeeper + --disable-schemas-install + --with-in-process-applets=clock,notification-area,wncklet + $(use_enable policykit polkit) + $(use_enable networkmanager network-manager) + $(use_enable eds)" +} + +src_prepare() { + gnome2_src_prepare + + # FIXME: tarball generated with broken gtk-doc, revisit me. + if use doc; then + sed "/^TARGET_DIR/i \GTKDOC_REBASE=${EPREFIX}/usr/bin/gtkdoc-rebase" \ + -i gtk-doc.make || die "sed 1 failed" + else + sed "/^TARGET_DIR/i \GTKDOC_REBASE=$(type -P true)" \ + -i gtk-doc.make || die "sed 2 failed" + fi + + # Make it libtool-1 compatible, bug #271652 + rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed" + + intltoolize --force --copy --automake || die "intltoolize failed" + 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 +} diff --git a/gnome-base/libgnomekbd/ChangeLog b/gnome-base/libgnomekbd/ChangeLog index cd6713953132..78d94839b13f 100644 --- a/gnome-base/libgnomekbd/ChangeLog +++ b/gnome-base/libgnomekbd/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for gnome-base/libgnomekbd # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.71 2010/06/13 16:47:46 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/ChangeLog,v 1.72 2010/06/23 11:57:48 pacho Exp $ + +*libgnomekbd-2.30.2 (23 Jun 2010) + + 23 Jun 2010; Pacho Ramos -libgnomekbd-2.30.1.ebuild, + -files/libgnomekbd-2.30.1-kbd-crash.patch, + -files/libgnomekbd-2.30.1-notification-area.patch, + +libgnomekbd-2.30.2.ebuild: + Version bump with updated translations and fixes, remove old. *libgnomekbd-2.30.1 (13 Jun 2010) diff --git a/gnome-base/libgnomekbd/files/libgnomekbd-2.30.1-kbd-crash.patch b/gnome-base/libgnomekbd/files/libgnomekbd-2.30.1-kbd-crash.patch deleted file mode 100644 index 44626a6339bc..000000000000 --- a/gnome-base/libgnomekbd/files/libgnomekbd-2.30.1-kbd-crash.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4f9c7b401e948756fbe76a56a7619052f8acae42 Mon Sep 17 00:00:00 2001 -From: Sergey V. Udaltsov -Date: Tue, 04 May 2010 23:36:04 +0000 -Subject: Do not crash on kbd plug in - -There is funny race condition in X - when _XKB_RULES_NAMES is already -loaded from sysconfig while actual XKB config is still not changed (from -user config). This commit should fix -https://bugzilla.gnome.org/show_bug.cgi?id=617643 ---- -diff --git a/libgnomekbd/gkbd-indicator.c b/libgnomekbd/gkbd-indicator.c -index 5def369..f6064fa 100644 ---- a/libgnomekbd/gkbd-indicator.c -+++ b/libgnomekbd/gkbd-indicator.c -@@ -318,7 +318,7 @@ gkbd_indicator_extract_layout_name (int group, XklEngine * engine, - gchar ** short_group_names, - gchar ** full_group_names) - { -- char *layout_name; -+ char *layout_name = NULL; - if (group < g_strv_length (short_group_names)) { - if (xkl_engine_get_features (engine) & - XKLF_MULTIPLE_LAYOUTS_SUPPORTED) { -@@ -352,7 +352,7 @@ gkbd_indicator_extract_layout_name (int group, XklEngine * engine, - } - - if (layout_name == NULL) -- layout_name = g_strdup ("??"); -+ layout_name = g_strdup (""); - - return layout_name; - } -diff --git a/libgnomekbd/gkbd-status.c b/libgnomekbd/gkbd-status.c -index 90731af..efcad6a 100644 ---- a/libgnomekbd/gkbd-status.c -+++ b/libgnomekbd/gkbd-status.c -@@ -152,6 +152,7 @@ gkbd_status_render_cairo (cairo_t * cr, int group) - cairo_font_options_t *fo; - static GHashTable *ln2cnt_map = NULL; - -+ xkl_debug (160, "Rendering cairo for group %d\n", group); - if (globals.ind_cfg.background_color != NULL && - globals.ind_cfg.background_color[0] != 0) { - if (sscanf --- -cgit v0.8.3.1 diff --git a/gnome-base/libgnomekbd/files/libgnomekbd-2.30.1-notification-area.patch b/gnome-base/libgnomekbd/files/libgnomekbd-2.30.1-notification-area.patch deleted file mode 100644 index 9acda770ea9f..000000000000 --- a/gnome-base/libgnomekbd/files/libgnomekbd-2.30.1-notification-area.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8dbeec103124f9de1ed515ef50ff79eff3ecd52c Mon Sep 17 00:00:00 2001 -From: Sergey V. Udaltsov -Date: Sun, 25 Apr 2010 22:59:53 +0000 -Subject: Provide the proper place in NA by using the name - -The name "keyboard" is known to the NA applet - so it positions the icon -properly, on the right side, after all apps ---- -diff --git a/libgnomekbd/gkbd-status.c b/libgnomekbd/gkbd-status.c -index efcad6a..5e62ae9 100644 ---- a/libgnomekbd/gkbd-status.c -+++ b/libgnomekbd/gkbd-status.c -@@ -632,6 +632,9 @@ gkbd_status_init (GkbdStatus * gki) - - gki->priv = g_new0 (GkbdStatusPrivate, 1); - -+ /* This should give NA a hint about the order */ -+ gtk_status_icon_set_name (GTK_STATUS_ICON(gki), "keyboard"); -+ - xkl_debug (100, "Initiating the widget startup process for %p\n", - gki); - --- -cgit v0.8.3.1 diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.30.1.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.30.1.ebuild deleted file mode 100644 index 06a9a7eb7e40..000000000000 --- a/gnome-base/libgnomekbd/libgnomekbd-2.30.1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.30.1.ebuild,v 1.1 2010/06/13 16:47:46 pacho Exp $ - -EAPI="2" -GCONF_DEBUG="no" - -inherit eutils gnome2 multilib - -DESCRIPTION="Gnome keyboard configuration library" -HOMEPAGE="http://www.gnome.org" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="" - -RDEPEND=">=dev-libs/glib-2.18 - >=sys-apps/dbus-0.92 - >=dev-libs/dbus-glib-0.34 - >=gnome-base/gconf-2.14 - >=x11-libs/gtk+-2.18 - >=x11-libs/libxklavier-5.0" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.35 - >=dev-util/pkgconfig-0.19" - -DOCS="AUTHORS ChangeLog NEWS README" - -pkg_setup() { - # Only user interaction required graphical tests at the time of 2.22.0 - not useful for us - G2CONF="${G2CONF} --disable-tests --disable-static" -} - -src_prepare() { - gnome2_src_prepare - - # Do not crash on kbd plug in; upstream bug 617643 - epatch "${FILESDIR}/${P}-kbd-crash.patch" - - # Provide the proper place in NA by using the name - epatch "${FILESDIR}/${P}-notification-area.patch" -} - -src_compile() { - # FreeBSD doesn't like -j, upstream? bug #???? - use x86-fbsd && MAKEOPTS="${MAKEOPTS} -j1" - gnome2_src_compile -} diff --git a/gnome-base/libgnomekbd/libgnomekbd-2.30.2.ebuild b/gnome-base/libgnomekbd/libgnomekbd-2.30.2.ebuild new file mode 100644 index 000000000000..87b1584699a9 --- /dev/null +++ b/gnome-base/libgnomekbd/libgnomekbd-2.30.2.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-2.30.2.ebuild,v 1.1 2010/06/23 11:57:48 pacho Exp $ + +EAPI="2" +GCONF_DEBUG="no" + +inherit gnome2 multilib + +DESCRIPTION="Gnome keyboard configuration library" +HOMEPAGE="http://www.gnome.org" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="" + +RDEPEND=">=dev-libs/glib-2.18 + >=sys-apps/dbus-0.92 + >=dev-libs/dbus-glib-0.34 + >=gnome-base/gconf-2.14 + >=x11-libs/gtk+-2.18 + >=x11-libs/libxklavier-5.0" +DEPEND="${RDEPEND} + >=dev-util/intltool-0.35 + >=dev-util/pkgconfig-0.19" + +DOCS="AUTHORS ChangeLog NEWS README" + +pkg_setup() { + # Only user interaction required graphical tests at the time of 2.22.0 - not useful for us + G2CONF="${G2CONF} --disable-tests --disable-static" +} + +src_compile() { + # FreeBSD doesn't like -j, upstream? bug #???? + use x86-fbsd && MAKEOPTS="${MAKEOPTS} -j1" + gnome2_src_compile +} -- cgit v1.2.3-65-gdbad