commit xfce4-panel-plugin-cpugraph for openSUSE:Factory

Hello community, here is the log from the commit of package xfce4-panel-plugin-cpugraph for openSUSE:Factory checked in at 2012-07-02 21:36:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-panel-plugin-cpugraph (Old) and /work/SRC/openSUSE:Factory/.xfce4-panel-plugin-cpugraph.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfce4-panel-plugin-cpugraph", Maintainer is "xfce-maintainers@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-panel-plugin-cpugraph/xfce4-panel-plugin-cpugraph.changes 2012-07-02 11:26:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-panel-plugin-cpugraph.new/xfce4-panel-plugin-cpugraph.changes 2012-07-02 21:36:12.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Jul 2 15:21:09 UTC 2012 - gber@opensuse.org + +- update to version 1.0.4 + - fix build failure with xfce4-panel 4.8 +- added xfce4-panel-plugin-cpugrap-only-set-color-if-enabled.patch + in order to only set bar color if bars are enabled (bxo#907, + backported from upstream git) + +------------------------------------------------------------------- Old: ---- xfce4-cpugraph-plugin-1.0.3.tar.bz2 New: ---- xfce4-cpugraph-plugin-1.0.4.tar.bz2 xfce4-panel-plugin-cpugrap-only-set-color-if-enabled.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-panel-plugin-cpugraph.spec ++++++ --- /var/tmp/diff_new_pack.b4YrsO/_old 2012-07-02 21:36:13.000000000 +0200 +++ /var/tmp/diff_new_pack.b4YrsO/_new 2012-07-02 21:36:13.000000000 +0200 @@ -20,13 +20,15 @@ %define plugin_name xfce4-cpugraph-plugin Name: xfce4-panel-plugin-cpugraph -Version: 1.0.3 +Version: 1.0.4 Release: 0 Summary: CPU Graph Plugin for the Xfce Panel License: GPL-2.0+ Group: System/GUI/XFCE Url: http://goodies.xfce.org/projects/panel-plugins/xfce4-cpugraph-plugin Source0: http://archive.xfce.org/src/panel-plugins/%{plugin_name}/1.0/%{plugin_name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM xfce4-panel-plugin-cpugrap-only-set-color-if-enabled.patch bxo#9071 gber@opensuse.org -- Only set bar color if bars are enabled (backported from upstream git) +Patch0: xfce4-panel-plugin-cpugrap-only-set-color-if-enabled.patch BuildRequires: fdupes BuildRequires: intltool BuildRequires: pkgconfig(gtk+-2.0) @@ -44,6 +46,7 @@ %prep %setup -q -n %{plugin_name}-%{version} +%patch0 -p1 %build %configure --disable-static ++++++ xfce4-cpugraph-plugin-1.0.3.tar.bz2 -> xfce4-cpugraph-plugin-1.0.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-cpugraph-plugin-1.0.3/ChangeLog new/xfce4-cpugraph-plugin-1.0.4/ChangeLog --- old/xfce4-cpugraph-plugin-1.0.3/ChangeLog 2012-06-30 11:14:38.000000000 +0200 +++ new/xfce4-cpugraph-plugin-1.0.4/ChangeLog 2012-07-02 16:06:17.000000000 +0200 @@ -1,3 +1,23 @@ +commit 95997aef92a29ee155ac442965915927950bfdfc +Author: Landry Breuil +Date: Mon Jul 2 16:06:00 2012 +0200 + + Updates for 1.0.4 + +commit da421d085e420de9840bd4331c91069f9998be24 +Author: Landry Breuil +Date: Mon Jul 2 16:00:09 2012 +0200 + + use AUTOMAKE_OPTIONS to set dist-bzip2 target + +commit 50f47c7d5797cbd81dc68fd41a1bd328db2e5255 +Author: Landry Breuil +Date: Mon Jul 2 15:58:17 2012 +0200 + + Fix FTBFS with panel 4.8. + + While here simplifiy 4.9 mode-changed callback codepath. + commit 9be0ab867b0f085191503f83492db2f9cbfb1761 Author: Landry Breuil Date: Sat Jun 30 11:13:49 2012 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-cpugraph-plugin-1.0.3/Makefile.am new/xfce4-cpugraph-plugin-1.0.4/Makefile.am --- old/xfce4-cpugraph-plugin-1.0.3/Makefile.am 2012-04-18 22:57:21.000000000 +0200 +++ new/xfce4-cpugraph-plugin-1.0.4/Makefile.am 2012-07-02 15:29:20.000000000 +0200 @@ -5,11 +5,7 @@ distclean-local: rm -rf *.cache *~ -dist-bz2: dist - zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2 - -distcheck-bz2: distcheck - zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2 +AUTOMAKE_OPTIONS = 1.8 dist-bzip2 .PHONY: ChangeLog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-cpugraph-plugin-1.0.3/Makefile.in new/xfce4-cpugraph-plugin-1.0.4/Makefile.in --- old/xfce4-cpugraph-plugin-1.0.3/Makefile.in 2012-06-30 09:51:21.000000000 +0200 +++ new/xfce4-cpugraph-plugin-1.0.4/Makefile.in 2012-07-02 16:01:25.000000000 +0200 @@ -68,7 +68,7 @@ { test ! -d $(distdir) \ || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ && rm -fr $(distdir); }; } -DIST_ARCHIVES = $(distdir).tar.gz +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print @@ -244,6 +244,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ SUBDIRS = panel-plugin po icons +AUTOMAKE_OPTIONS = 1.8 dist-bzip2 EXTRA_DIST = \ README \ intltool-extract.in \ @@ -508,7 +509,6 @@ dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) - dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) @@ -528,6 +528,7 @@ dist dist-all: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then @@ -700,12 +701,6 @@ distclean-local: rm -rf *.cache *~ -dist-bz2: dist - zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2 - -distcheck-bz2: distcheck - zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2 - .PHONY: ChangeLog ChangeLog: Makefile diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-cpugraph-plugin-1.0.3/NEWS new/xfce4-cpugraph-plugin-1.0.4/NEWS --- old/xfce4-cpugraph-plugin-1.0.3/NEWS 2012-06-29 22:19:15.000000000 +0200 +++ new/xfce4-cpugraph-plugin-1.0.4/NEWS 2012-07-02 16:00:47.000000000 +0200 @@ -1,3 +1,7 @@ +1.0.4 (2/7/2012) +===== +- Fix FTBFS with panel 4.8 + 1.0.3 (30/6/2012) ===== - Better compliance with panel plugin HIG diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-cpugraph-plugin-1.0.3/configure new/xfce4-cpugraph-plugin-1.0.4/configure --- old/xfce4-cpugraph-plugin-1.0.3/configure 2012-06-30 09:51:23.000000000 +0200 +++ new/xfce4-cpugraph-plugin-1.0.4/configure 2012-07-02 16:01:27.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for xfce4-cpugraph-plugin 1.0.3. +# Generated by GNU Autoconf 2.61 for xfce4-cpugraph-plugin 1.0.4. # # Report bugs to . # @@ -594,8 +594,8 @@ # Identity of this package. PACKAGE_NAME='xfce4-cpugraph-plugin' PACKAGE_TARNAME='xfce4-cpugraph-plugin' -PACKAGE_VERSION='1.0.3' -PACKAGE_STRING='xfce4-cpugraph-plugin 1.0.3' +PACKAGE_VERSION='1.0.4' +PACKAGE_STRING='xfce4-cpugraph-plugin 1.0.4' PACKAGE_BUGREPORT='goodies-dev@xfce.org' # Factoring default headers for most tests. @@ -1319,7 +1319,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xfce4-cpugraph-plugin 1.0.3 to adapt to many kinds of systems. +\`configure' configures xfce4-cpugraph-plugin 1.0.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1389,7 +1389,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xfce4-cpugraph-plugin 1.0.3:";; + short | recursive ) echo "Configuration of xfce4-cpugraph-plugin 1.0.4:";; esac cat <<\_ACEOF @@ -1497,7 +1497,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xfce4-cpugraph-plugin configure 1.0.3 +xfce4-cpugraph-plugin configure 1.0.4 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1511,7 +1511,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xfce4-cpugraph-plugin $as_me 1.0.3, which was +It was created by xfce4-cpugraph-plugin $as_me 1.0.4, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -3686,7 +3686,7 @@ -CPUGRAPH_VERSION=1.0.3 +CPUGRAPH_VERSION=1.0.4 am__api_version="1.9" ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -16640,7 +16640,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xfce4-cpugraph-plugin $as_me 1.0.3, which was +This file was extended by xfce4-cpugraph-plugin $as_me 1.0.4, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16693,7 +16693,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xfce4-cpugraph-plugin config.status 1.0.3 +xfce4-cpugraph-plugin config.status 1.0.4 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-cpugraph-plugin-1.0.3/configure.ac new/xfce4-cpugraph-plugin-1.0.4/configure.ac --- old/xfce4-cpugraph-plugin-1.0.3/configure.ac 2012-06-30 09:50:48.000000000 +0200 +++ new/xfce4-cpugraph-plugin-1.0.4/configure.ac 2012-07-02 16:00:51.000000000 +0200 @@ -10,7 +10,7 @@ dnl 2004 Alexander Nordfelth dnl -m4_define([cpugraph_version],[1.0.3]) +m4_define([cpugraph_version],[1.0.4]) AC_INIT([xfce4-cpugraph-plugin], [cpugraph_version], [goodies-dev@xfce.org]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xfce4-cpugraph-plugin-1.0.3/panel-plugin/cpu.c new/xfce4-cpugraph-plugin-1.0.4/panel-plugin/cpu.c --- old/xfce4-cpugraph-plugin-1.0.3/panel-plugin/cpu.c 2012-06-30 11:12:05.000000000 +0200 +++ new/xfce4-cpugraph-plugin-1.0.4/panel-plugin/cpu.c 2012-07-02 15:57:01.000000000 +0200 @@ -281,18 +281,17 @@ #ifdef HAS_PANEL_49 static void mode_cb( XfcePanelPlugin * plugin, XfcePanelPluginMode mode, CPUGraph *base ) { - GtkOrientation panel_orientation = xfce_panel_plugin_get_orientation (plugin); - GtkOrientation orientation = (mode == XFCE_PANEL_PLUGIN_MODE_VERTICAL) ? - GTK_ORIENTATION_VERTICAL : GTK_ORIENTATION_HORIZONTAL; + GtkOrientation orientation = (mode == XFCE_PANEL_PLUGIN_MODE_HORIZONTAL) ? + GTK_ORIENTATION_HORIZONTAL : GTK_ORIENTATION_VERTICAL; - xfce_hvbox_set_orientation( XFCE_HVBOX( base->box ), panel_orientation ); + xfce_hvbox_set_orientation( XFCE_HVBOX( base->box ), xfce_panel_plugin_get_orientation (plugin)); #else static void orientation_cb( XfcePanelPlugin * plugin, GtkOrientation orientation, CPUGraph *base ) { xfce_hvbox_set_orientation( XFCE_HVBOX( base->box ), orientation ); #endif if( base->has_bars ) - set_bars_orientation( base, panel_orientation ); + set_bars_orientation( base, orientation ); size_cb( plugin, xfce_panel_plugin_get_size( base->plugin ), base); } ++++++ xfce4-panel-plugin-cpugrap-only-set-color-if-enabled.patch ++++++

From 25b2e1e8deec574201092559901d6154dc608ab7 Mon Sep 17 00:00:00 2001 From: Landry Breuil Date: Mon, 02 Jul 2012 15:12:03 +0000 Subject: Only set bar color if bars are enabled (bug #9071)

--- diff --git a/panel-plugin/cpu.c b/panel-plugin/cpu.c index b1030c2..c454124 100644 --- a/panel-plugin/cpu.c +++ b/panel-plugin/cpu.c @@ -517,7 +517,7 @@ void set_color( CPUGraph *base, guint number, GdkColor color ) gtk_widget_modify_bg( base->draw_area, GTK_STATE_INSENSITIVE, &base->colors[0] ); gtk_widget_modify_bg( base->draw_area, GTK_STATE_NORMAL, &base->colors[0] ); } - if( number == 4 ) + if( number == 4 && base->has_bars ) { n = nb_bars( base ); -- cgit v0.9.0.3 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org