diff options
author | Pacho Ramos <pacho@gentoo.org> | 2011-06-11 12:19:05 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2011-06-11 12:19:05 +0000 |
commit | fa8933aaa497b096f061722d6fff420f975e6bbd (patch) | |
tree | 288f9881166773fa0311aa7e9fb64de7f148770c | |
parent | arm stable, bug #369403 (diff) | |
download | gentoo-2-fa8933aaa497b096f061722d6fff420f975e6bbd.tar.gz gentoo-2-fa8933aaa497b096f061722d6fff420f975e6bbd.tar.bz2 gentoo-2-fa8933aaa497b096f061722d6fff420f975e6bbd.zip |
Revision bump backporting a patch also used un OpenBSD to fix uninitialized variable preventing crashes, also install updated icons (fixing bug #369785 by Jani Kananen).
(Portage version: 2.1.9.50/cvs/Linux x86_64)
5 files changed, 317 insertions, 1 deletions
diff --git a/gnome-extra/gnome-utils/ChangeLog b/gnome-extra/gnome-utils/ChangeLog index 81c2e1ee3760..5b9d90acc10d 100644 --- a/gnome-extra/gnome-utils/ChangeLog +++ b/gnome-extra/gnome-utils/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for gnome-extra/gnome-utils # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.216 2011/03/23 08:14:44 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.217 2011/06/11 12:19:04 pacho Exp $ + +*gnome-utils-2.32.0-r2 (11 Jun 2011) + + 11 Jun 2011; Pacho Ramos <pacho@gentoo.org> +gnome-utils-2.32.0-r2.ebuild, + +files/gnome-utils-2.32.0-fix-uninitialized.patch, + +files/gnome-utils-2.32.0-new-icons.patch, + +files/gnome-utils-2.32.0-new-icons2.patch: + Revision bump backporting a patch also used un OpenBSD to fix uninitialized + variable preventing crashes, also install updated icons (fixing bug #369785 + by Jani Kananen). 23 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> -gnome-utils-2.30.0.ebuild, gnome-utils-2.32.0-r1.ebuild: diff --git a/gnome-extra/gnome-utils/files/gnome-utils-2.32.0-fix-uninitialized.patch b/gnome-extra/gnome-utils/files/gnome-utils-2.32.0-fix-uninitialized.patch new file mode 100644 index 000000000000..de6328cb94e3 --- /dev/null +++ b/gnome-extra/gnome-utils/files/gnome-utils-2.32.0-fix-uninitialized.patch @@ -0,0 +1,30 @@ +From 731213444231504c558216930a0bfe5010a2ea67 Mon Sep 17 00:00:00 2001 +From: Paolo Borelli <pborelli@gnome.org> +Date: Fri, 05 Nov 2010 23:52:30 +0000 +Subject: [logview] Fix uninitialized variable + +If buffer_lines is empty date is never initialized. +--- +diff --git a/logview/logview-utils.c b/logview/logview-utils.c +index cd43f07..793a89d 100644 +--- a/logview/logview-utils.c ++++ b/logview/logview-utils.c +@@ -136,7 +136,8 @@ log_read_dates (const char **buffer_lines, time_t current) + { + int current_year, offsetyear, i, n, rangemin, rangemax, timestamp_len = 0; + GSList *days = NULL; +- GDate *date, *newdate; ++ GDate *date = NULL; ++ GDate *newdate; + struct tm *tmptm; + char *date_string; + Day *day; +@@ -274,4 +275,4 @@ log_read_dates (const char **buffer_lines, time_t current) + days = g_slist_sort (days, days_compare); + + return days; +-} +\ No newline at end of file ++} +-- +cgit v0.9 diff --git a/gnome-extra/gnome-utils/files/gnome-utils-2.32.0-new-icons.patch b/gnome-extra/gnome-utils/files/gnome-utils-2.32.0-new-icons.patch new file mode 100644 index 000000000000..951d709e7d8f --- /dev/null +++ b/gnome-extra/gnome-utils/files/gnome-utils-2.32.0-new-icons.patch @@ -0,0 +1,169 @@ +From 440b7c685f17ab79396944c010bf4e508325e7a8 Mon Sep 17 00:00:00 2001 +From: Cosimo Cecchi <cosimoc@gnome.org> +Date: Wed, 16 Mar 2011 15:48:49 +0000 +Subject: logview: add new high-res icon + +Courtesy of Lapo Calamandrei. + +https://bugzilla.gnome.org/show_bug.cgi?id=643986 +--- +diff --git a/configure.ac b/configure.ac +index ffe068f..5284219 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -376,6 +376,7 @@ AC_CONFIG_FILES([ + + logview/Makefile + logview/data/Makefile ++ logview/data/icons/Makefile + logview/tests/Makefile + logview/help/Makefile + +diff --git a/logview/data/Makefile.am b/logview/data/Makefile.am +index 5507d63..efa3671 100644 +--- a/logview/data/Makefile.am ++++ b/logview/data/Makefile.am +@@ -1,3 +1,5 @@ ++SUBDIRS=icons ++ + xmldir = $(pkgdatadir) + xml_DATA = logview-toolbar.xml logview-filter.ui + +diff --git a/logview/data/gnome-system-log.desktop.in.in b/logview/data/gnome-system-log.desktop.in.in +index aafdd94..1375969 100644 +--- a/logview/data/gnome-system-log.desktop.in.in ++++ b/logview/data/gnome-system-log.desktop.in.in +@@ -2,7 +2,7 @@ + _Name=Log File Viewer + _Comment=View or monitor system log files + Exec=gnome-system-log +-Icon=logviewer ++Icon=logview + Terminal=false + Type=Application + StartupNotify=true +diff --git a/logview/data/icons/Makefile.am b/logview/data/icons/Makefile.am +new file mode 100644 +index 0000000..5131cf9 +--- a/dev/null ++++ b/logview/data/icons/Makefile.am +@@ -0,0 +1,61 @@ ++NULL = ++ ++public_icons_themes = \ ++ hicolor \ ++ $(NULL) ++ ++public_icons = \ ++ hicolor_apps_16x16_logview.png \ ++ hicolor_apps_22x22_logview.png \ ++ hicolor_apps_32x32_logview.png \ ++ hicolor_apps_48x48_logview.png \ ++ hicolor_apps_256x256_logview.png \ ++ $(NULL) ++ ++noinst_DATA = \ ++ $(NULL) ++ ++EXTRA_DIST = \ ++ $(public_icons) \ ++ $(noinst_DATA) \ ++ $(NULL) ++ ++############################################################################### ++ ++gtk_update_icon_cache = gtk-update-icon-cache -f -t ++ ++update-icon-cache: ++ @-if test -z "$(DESTDIR)"; then \ ++ echo "Updating Gtk icon cache."; \ ++ for theme in $(public_icons_themes); do \ ++ $(gtk_update_icon_cache) $(datadir)/icons/$$theme; \ ++ done; \ ++ else \ ++ echo "*** Icon cache not updated. After (un)install, run this:"; \ ++ for theme in $(public_icons_themes); do \ ++ echo "*** $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \ ++ done; \ ++ fi ++ ++install-icons: ++ for icon in $(public_icons); do \ ++ THEME=`echo $$icon | cut -d_ -f1`; \ ++ CONTEXT=`echo $$icon | cut -d_ -f2`; \ ++ SIZE=`echo $$icon | cut -d_ -f3`; \ ++ ICONFILE=`echo $$icon | cut -d_ -f4`; \ ++ mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ ++ $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ ++ done ++ ++uninstall-icons: ++ -for icon in $(public_icons); do \ ++ THEME=`echo $$icon | cut -d_ -f1`; \ ++ CONTEXT=`echo $$icon | cut -d_ -f2`; \ ++ SIZE=`echo $$icon | cut -d_ -f3`; \ ++ ICONFILE=`echo $$icon | cut -d_ -f4`; \ ++ rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ ++ done ++ ++install-data-local: install-icons update-icon-cache ++ ++uninstall-local: uninstall-icons update-icon-cache +diff --git a/logview/data/icons/hicolor_apps_16x16_logview.png b/logview/data/icons/hicolor_apps_16x16_logview.png +new file mode 100644 +index 0000000..34638e0 +--- a/dev/null ++++ b/logview/data/icons/hicolor_apps_16x16_logview.png +Binary files differ +diff --git a/logview/data/icons/hicolor_apps_22x22_logview.png b/logview/data/icons/hicolor_apps_22x22_logview.png +new file mode 100644 +index 0000000..ff6fad5 +--- a/dev/null ++++ b/logview/data/icons/hicolor_apps_22x22_logview.png +Binary files differ +diff --git a/logview/data/icons/hicolor_apps_256x256_logview.png b/logview/data/icons/hicolor_apps_256x256_logview.png +new file mode 100644 +index 0000000..45334bf +--- a/dev/null ++++ b/logview/data/icons/hicolor_apps_256x256_logview.png +Binary files differ +diff --git a/logview/data/icons/hicolor_apps_32x32_logview.png b/logview/data/icons/hicolor_apps_32x32_logview.png +new file mode 100644 +index 0000000..943028d +--- a/dev/null ++++ b/logview/data/icons/hicolor_apps_32x32_logview.png +Binary files differ +diff --git a/logview/data/icons/hicolor_apps_48x48_logview.png b/logview/data/icons/hicolor_apps_48x48_logview.png +new file mode 100644 +index 0000000..b00429e +--- a/dev/null ++++ b/logview/data/icons/hicolor_apps_48x48_logview.png +Binary files differ +diff --git a/logview/logview-app.c b/logview/logview-app.c +index a4a5415..6ce64bb 100644 +--- a/logview/logview-app.c ++++ b/logview/logview-app.c +@@ -75,7 +75,7 @@ logview_app_set_window (LogviewApp *app) + retval = TRUE; + } + +- gtk_window_set_default_icon_name ("logviewer"); ++ gtk_window_set_default_icon_name ("logview"); + + return retval; + } +diff --git a/logview/logview-window.c b/logview/logview-window.c +index 50eca54..9398cf8 100644 +--- a/logview/logview-window.c ++++ b/logview/logview-window.c +@@ -768,7 +768,7 @@ logview_about (GtkWidget *widget, GtkWidget *window) + "translator_credits", strcmp (logview_about_translator_credits, + "translator-credits") != 0 ? + logview_about_translator_credits : NULL, +- "logo_icon_name", "logviewer", ++ "logo_icon_name", "logview", + NULL); + g_free (license_trans); + +-- +cgit v0.9 diff --git a/gnome-extra/gnome-utils/files/gnome-utils-2.32.0-new-icons2.patch b/gnome-extra/gnome-utils/files/gnome-utils-2.32.0-new-icons2.patch new file mode 100644 index 000000000000..072463b5a1ae --- /dev/null +++ b/gnome-extra/gnome-utils/files/gnome-utils-2.32.0-new-icons2.patch @@ -0,0 +1,22 @@ +From 104f536687255ac939ab4e779081ef30aa033d15 Mon Sep 17 00:00:00 2001 +From: Cosimo Cecchi <cosimoc@gnome.org> +Date: Mon, 21 Mar 2011 16:50:00 +0000 +Subject: logview: ship the SVG source for the new hires icon + +--- +(limited to 'logview/data/icons/Makefile.am') + +diff --git a/logview/data/icons/Makefile.am b/logview/data/icons/Makefile.am +index 5131cf9..65be8d4 100644 +--- a/logview/data/icons/Makefile.am ++++ b/logview/data/icons/Makefile.am +@@ -13,6 +13,7 @@ public_icons = \ + $(NULL) + + noinst_DATA = \ ++ logview.svg \ + $(NULL) + + EXTRA_DIST = \ +-- +cgit v0.9 diff --git a/gnome-extra/gnome-utils/gnome-utils-2.32.0-r2.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.32.0-r2.ebuild new file mode 100644 index 000000000000..a9d0e6c4cfad --- /dev/null +++ b/gnome-extra/gnome-utils/gnome-utils-2.32.0-r2.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.32.0-r2.ebuild,v 1.1 2011/06/11 12:19:04 pacho Exp $ + +EAPI="4" +GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" +GNOME_TARBALL_SUFFIX="bz2" + +inherit gnome2 eutils autotools + +DESCRIPTION="Utilities for the Gnome desktop" +HOMEPAGE="https://live.gnome.org/GnomeUtils" +SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-icons.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" +IUSE="bonobo doc ipv6 test" + +RDEPEND=">=dev-libs/glib-2.20:2 + >=x11-libs/gtk+-2.20:2 + >=gnome-base/libgtop-2.12 + >=gnome-base/gconf-2:2 + >=media-libs/libcanberra-0.4[gtk] + x11-libs/libXext + x11-libs/libX11 + bonobo? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) )" + +DEPEND="${RDEPEND} + x11-proto/xextproto + app-text/gnome-doc-utils + app-text/scrollkeeper + >=dev-util/intltool-0.40 + >=dev-util/pkgconfig-0.9 + doc? ( >=dev-util/gtk-doc-1.10 ) + dev-util/gtk-doc-am + gnome-base/gnome-common" + +pkg_setup() { + if ! use debug; then + G2CONF="${G2CONF} --enable-debug=minimum" + fi + + G2CONF="${G2CONF} + $(use_enable ipv6) + $(use_enable bonobo gdict-applet) + --disable-maintainer-flags + --enable-zlib + --disable-static + --disable-schemas-install + --disable-scrollkeeper" + DOCS="AUTHORS ChangeLog NEWS README THANKS" +} + +src_prepare() { + gnome2_src_prepare + + # Fix uninitialized variable preventing crashes (already fixed in master) + epatch "${FILESDIR}/${P}-fix-uninitialized.patch" + + # Provide updated icons + epatch "${FILESDIR}/${P}-new-icons.patch" + epatch "${FILESDIR}/${P}-new-icons2.patch" + + # Remove idiotic -D.*DISABLE_DEPRECATED cflags + # This method is kinda prone to breakage. Recheck carefully with next bump. + # bug 339074 + find . -iname 'Makefile.am' -exec \ + sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed" + # Do Makefile.in after Makefile.am to avoid automake maintainer-mode + find . -iname 'Makefile.in' -exec \ + sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed" + + if ! use test ; then + sed -e 's/ tests//' -i logview/Makefile.{am,in} || die "sed 2 failed" + fi + + # Fix intltoolize broken file, see upstream #577133 + sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \ + || die "sed failed" + + intltoolize --force --copy --automake || die "intltoolize failed" + eautoreconf +} |