diff options
Diffstat (limited to 'gnome-extra/gnome-utils')
6 files changed, 333 insertions, 2 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/Manifest b/gnome-extra/gnome-utils/Manifest index 7e5f0859359e..61cd77bbe48d 100644 --- a/gnome-extra/gnome-utils/Manifest +++ b/gnome-extra/gnome-utils/Manifest @@ -1,4 +1,19 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX gnome-utils-2.32.0-fix-uninitialized.patch 903 RMD160 bd78aea0fd11c764e7816bbe4ff9ecf2aa008bc3 SHA1 60b5875f874fbb6da90db7ef6d99199e3f637514 SHA256 e4ded0888d6350452ffc4053edd3c5133fc86807c76c4a6f9d2e311ec2fe3919 +AUX gnome-utils-2.32.0-new-icons.patch 5478 RMD160 157d0dbe228aa773e7ef6783ad940ca4737d1e25 SHA1 00b3b9cdba1e81bfc6ff044652a479bd2524d45b SHA256 9410f0dd5cc2f7484330f5fdaa336355e0b43cd5501ec118db5d14136f870b36 +AUX gnome-utils-2.32.0-new-icons2.patch 564 RMD160 7000ac4e61e129ab40d8d0a09740e02ca81b4a4c SHA1 d22775a821161dcece3d6152b35b1b3f69f74ce6 SHA256 31edf1380334941fc092d21be21ba320fdaf0de0498268f981fcbf798d20f3ca +DIST gnome-utils-2.32.0-icons.tar.xz 153632 RMD160 3e0f88fced7ab807a425de67ce90834894a41b70 SHA1 231f49f11233c1bf5f95763f12d1447fee2c222c SHA256 234e86914fa49daf3b11ffe7efb7090a3caf4146dce41414724b597e0e9c508e DIST gnome-utils-2.32.0.tar.bz2 7705320 RMD160 c25667eec2ba4fd0d704c10a92e2e6b071eb1bfc SHA1 68ef7e12280969bde9bee4bbd566ad4ab0572e77 SHA256 033a55cf442096b28ea6292043354feafe000d1e5f4ebb962a9b6d72eb9a93fa EBUILD gnome-utils-2.32.0-r1.ebuild 2097 RMD160 254ec2cd5e9b4184c4f7d08beec62d1bec052396 SHA1 d11d4ff6afad8411f5e34dd36c34cf44384cb7e5 SHA256 3515ead2b8df786dc635d16dce6bec826f28e1303343ed763442e33298c045b7 -MISC ChangeLog 27259 RMD160 66cf5fe5df26e89a18b3b4480ea721843ccc75c5 SHA1 01aa17e7165d5db4ddceea92724b3d5fd54f803c SHA256 bdc255361e781c6a206b471c927066451e10c3e576cf8d40e7b483f2a5c39f41 +EBUILD gnome-utils-2.32.0-r2.ebuild 2511 RMD160 1a1ec63b35743078f7710de952a0b22425e00fc3 SHA1 c0afe5340d19d569cf54e4b367796490d39458d3 SHA256 fb8fddd9df5e165811c017ecc0ea301157d3588404c2134794ac94378918903d +MISC ChangeLog 27692 RMD160 19356e1ae1d8d4171f5694b7cbd844a586a689c7 SHA1 929fbb62c1acb6947d7cab8d2a2847ce68e8ced3 SHA256 f85260ce3b95afa83d4743718774794d8092593351e8d297d02fad38740247bb MISC metadata.xml 305 RMD160 c788a49e4dc8332a8f5a5a79268ed2bff3d164c8 SHA1 9aa1970fee27c41f0eebf198f94b1fa41b3644b9 SHA256 3c6d345a89e0c8dbacd26f232e8220bd2558bc90cff9041e3e07f2f44ce4bb85 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk3zXT8ACgkQCaWpQKGI+9Tq6wCfQaoynqn6eEjoxWams0ZEXy1Z +CCsAnRtX1givcl80kkEeay8M/t8blV03 +=tG4f +-----END PGP SIGNATURE----- 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 +} |