[arch-commits] Commit in sensors-applet/trunk (PKGBUILD gtk38.patch)
Balló György
bgyorgy at nymeria.archlinux.org
Sun Apr 28 20:21:16 UTC 2013
Date: Sunday, April 28, 2013 @ 22:21:16
Author: bgyorgy
Revision: 89359
upgpkg: sensors-applet 3.0.0-3
Fix compatibility with GTK+ 3.8
Added:
sensors-applet/trunk/gtk38.patch
Modified:
sensors-applet/trunk/PKGBUILD
-------------+
PKGBUILD | 14 +++++-
gtk38.patch | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 138 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-04-28 19:51:48 UTC (rev 89358)
+++ PKGBUILD 2013-04-28 20:21:16 UTC (rev 89359)
@@ -3,7 +3,7 @@
pkgname=sensors-applet
pkgver=3.0.0
-pkgrel=2
+pkgrel=3
pkgdesc="Applet for GNOME Panel to display readings from hardware sensors, including CPU temperature, fan speeds and voltage readings"
arch=('i686' 'x86_64')
url="http://sensors-applet.sourceforge.net/"
@@ -14,12 +14,20 @@
'udisks: get HDD temperatures')
options=('!libtool')
install=$pkgname.install
-source=(http://downloads.sourceforge.net/sensors-applet/$pkgname-$pkgver.tar.gz)
-md5sums=('425078fc1ff5a98af1547e039002a73f')
+source=(http://downloads.sourceforge.net/sensors-applet/$pkgname-$pkgver.tar.gz
+ gtk38.patch)
+md5sums=('425078fc1ff5a98af1547e039002a73f'
+ '7289cb0acd5c05daf824df6a90967240')
build() {
cd "$srcdir/$pkgname-$pkgver"
+ # Enable reprecations
+ sed -i '/CFLAGS+=/d' configure{,.ac}
+
+ # Fix compatibility with GTK+ 3.8
+ patch -Np1 -i "$srcdir/gtk38.patch"
+
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \
--disable-static --disable-scrollkeeper --with-nvidia=no
make
Added: gtk38.patch
===================================================================
--- gtk38.patch (rev 0)
+++ gtk38.patch 2013-04-28 20:21:16 UTC (rev 89359)
@@ -0,0 +1,127 @@
+diff -Naur sensors-applet-3.0.0.orig/sensors-applet/sensors-applet.c sensors-applet-3.0.0/sensors-applet/sensors-applet.c
+--- sensors-applet-3.0.0.orig/sensors-applet/sensors-applet.c 2011-11-03 12:33:36.000000000 +0100
++++ sensors-applet-3.0.0/sensors-applet/sensors-applet.c 2013-04-28 20:08:31.002620583 +0200
+@@ -641,122 +641,8 @@
+ /* get the first active sensor */
+ first_sensor = (ActiveSensor *)sensors_applet->active_sensors->data;
+
+- switch (display_mode) {
+- case DISPLAY_VALUE:
+- gtk_widget_size_request(GTK_WIDGET(first_sensor->value),
+- &req);
+- value_width = req.width + COLUMN_SPACING;
+- value_height = req.height + ROW_SPACING;
++ num_sensors_per_group = 1;
+
+- /* make sure all widths and heights are non zero,
+- * otherwise will get a divide by zero exception below
+- * - is a non critical error since can happen when
+- * elements first added to list, so simply return - is
+- * not a programming error */
+- if (value_width == 0 && value_height == 0) {
+- return;
+- }
+-
+- num_sensors_per_group = (sensors_applet->size /
+- (horizontal ? value_height :
+- value_width));
+- break;
+-
+- case DISPLAY_LABEL_WITH_VALUE:
+- /* even though we end up packing the event boxes into the
+- * panel, these dont give back request sizes, so need to ask
+- * widgets directly */
+- gtk_widget_size_request(GTK_WIDGET(first_sensor->value),
+- &req);
+- value_width = req.width + COLUMN_SPACING;
+- value_height = req.height + ROW_SPACING;
+-
+- gtk_widget_size_request(GTK_WIDGET(first_sensor->label),
+- &req);
+- label_width = req.width + COLUMN_SPACING;
+- label_height = req.height + ROW_SPACING;
+-
+- /* make sure all widths and heights are non zero, otherwise
+- * will get a divide by zero exception below
+- * - is a non critical error since can happen when
+- * elements first added to list, so simply return - is
+- * not a programming error */
+- if (!(label_width && label_height &&
+- value_width && value_height)) {
+- return;
+- }
+-
+- switch (layout_mode) {
+- case VALUE_BESIDE_LABEL:
+- num_sensors_per_group = (sensors_applet->size /
+- (horizontal ? MAX(label_height, value_height) :
+- (label_width + value_width)));
+- break;
+- case VALUE_BELOW_LABEL:
+- num_sensors_per_group = (sensors_applet->size /
+- (horizontal ? (label_height + value_height) :
+- MAX(label_width, value_width)));
+-
+-
+- break;
+- }
+- break;
+-
+- case DISPLAY_ICON_WITH_VALUE:
+- gtk_widget_size_request(GTK_WIDGET(first_sensor->value),
+- &req);
+- value_width = req.width + COLUMN_SPACING;
+- value_height = req.height + ROW_SPACING;
+-
+- gtk_widget_size_request(GTK_WIDGET(first_sensor->icon),
+- &req);
+- icon_width = req.width + COLUMN_SPACING;
+- icon_height = req.height + ROW_SPACING;
+-
+- //watch out if num_sensors_per_group is correctly computed
+- //while icon_height is 0
+- if (!(icon_width &&
+- value_width && value_height)) {
+- return;
+- }
+-
+-
+- switch (layout_mode) {
+- case VALUE_BESIDE_LABEL:
+- num_sensors_per_group = (sensors_applet->size /
+- (horizontal ? MAX(icon_height, value_height) :
+- (icon_width + value_width)));
+- break;
+- case VALUE_BELOW_LABEL:
+- num_sensors_per_group = (sensors_applet->size /
+- (horizontal ? (icon_height + value_height) :
+- MAX(icon_width, value_width)));
+-
+-
+- break;
+- }
+- break;
+-
+- case DISPLAY_ICON:
+- gtk_widget_size_request(GTK_WIDGET(first_sensor->icon),
+- &req);
+- icon_width = req.width + COLUMN_SPACING;
+- icon_height = req.height + ROW_SPACING;
+- if (!(icon_width && icon_height)) {
+- return;
+- }
+-
+- num_sensors_per_group = (sensors_applet->size /
+- (horizontal ? icon_height :
+- icon_width));
+- break;
+-
+- case DISPLAY_GRAPH:
+- /* only show graphs in a line like System Monitor
+- * applet */
+- num_sensors_per_group = 1;
+- break;
+- }
+ /* ensure always atleast 1 sensor per group */
+ if (num_sensors_per_group < 1) {
+ /* force a better layout */
More information about the arch-commits
mailing list