summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarri Nieminen <moikkis@gmail.com>2017-02-25 20:13:38 +0200
committerDavid Seifert <soap@gentoo.org>2017-02-28 20:10:37 +0100
commitda2b848f594f74c10e1f97dc4429fa1abd607e79 (patch)
tree8076f1a4cab62f1eca82df90ea3fe066b1ee7390 /x11-misc/fbpanel/files
parentx11-misc/xplanet: Fix build with gcc6, bug #594804 (diff)
downloadgentoo-da2b848f594f74c10e1f97dc4429fa1abd607e79.tar.gz
gentoo-da2b848f594f74c10e1f97dc4429fa1abd607e79.tar.bz2
gentoo-da2b848f594f74c10e1f97dc4429fa1abd607e79.zip
x11-misc/fbpanel: Version bump to 7.0
Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/4085
Diffstat (limited to 'x11-misc/fbpanel/files')
-rw-r--r--x11-misc/fbpanel/files/fbpanel-7.0-clang.patch57
-rw-r--r--x11-misc/fbpanel/files/fbpanel-7.0-shebangs.patch120
2 files changed, 177 insertions, 0 deletions
diff --git a/x11-misc/fbpanel/files/fbpanel-7.0-clang.patch b/x11-misc/fbpanel/files/fbpanel-7.0-clang.patch
new file mode 100644
index 000000000000..69347c0f3aa9
--- /dev/null
+++ b/x11-misc/fbpanel/files/fbpanel-7.0-clang.patch
@@ -0,0 +1,57 @@
+diff -u -r fbpanel-7.0/plugins/battery/power_supply.c fbpanel-7.0-3/plugins/battery/power_supply.c
+--- fbpanel-7.0/plugins/battery/power_supply.c 2015-12-05 08:34:19.000000000 +0200
++++ fbpanel-7.0-3/plugins/battery/power_supply.c 2017-02-25 14:52:55.431202738 +0200
+@@ -154,7 +154,7 @@
+ tmp->path = path;
+ tmp->name = NULL;
+ tmp->status = NULL;
+- tmp->capacity = -1.0d;
++ tmp->capacity = -1.0f;
+ return tmp;
+ }
+
+@@ -206,12 +206,12 @@
+ bat->capacity = g_ascii_strtod(tmp_value, NULL);
+ } else { // for older kernels
+ tmp_value = (gchar*) g_hash_table_lookup(hash, SYS_ACPI_UEVENT_BAT_ENERGY_NOW_KEY);
+- gdouble tmp = -1.0d;
++ gdouble tmp = -1.0f;
+ if (tmp_value != NULL) { // ac off
+ tmp = g_ascii_strtod(tmp_value, NULL);
+ tmp_value = (gchar*) g_hash_table_lookup(hash, SYS_ACPI_UEVENT_BAT_ENERGY_FULL_KEY);
+- if (tmp_value != NULL && tmp > 0.0d) {
+- tmp = tmp / g_ascii_strtod(tmp_value, NULL) * 100.0d;
++ if (tmp_value != NULL && tmp > 0.0f) {
++ tmp = tmp / g_ascii_strtod(tmp_value, NULL) * 100.0f;
+ bat->capacity = tmp;
+ }
+ } else {
+@@ -219,8 +219,8 @@
+ if (tmp_value != NULL) { // ac on
+ tmp = g_ascii_strtod(tmp_value, NULL);
+ tmp_value = (gchar*) g_hash_table_lookup(hash, SYS_ACPI_UEVENT_BAT_CHARGE_FULL_KEY);
+- if (tmp_value != NULL && tmp > 0.0d) {
+- tmp = tmp / g_ascii_strtod(tmp_value, NULL) * 100.0d;
++ if (tmp_value != NULL && tmp > 0.0f) {
++ tmp = tmp / g_ascii_strtod(tmp_value, NULL) * 100.0f;
+ bat->capacity = tmp;
+ }
+ }
+@@ -327,7 +327,7 @@
+ extern gdouble
+ power_supply_get_bat_capacity(power_supply* ps)
+ {
+- gdouble total_bat_capacity = 0.0d;
++ gdouble total_bat_capacity = 0.0f;
+ guint bat_count = 0;
+ GSequenceIter* it;
+ bat* battery;
+@@ -335,7 +335,7 @@
+ it = g_sequence_get_begin_iter(ps->bat_list);
+ while (!g_sequence_iter_is_end(it)) {
+ battery = (bat*) g_sequence_get(it);
+- if (battery->capacity > 0.0d) {
++ if (battery->capacity > 0.0f) {
+ total_bat_capacity = total_bat_capacity + battery->capacity;
+ }
+ bat_count++;
diff --git a/x11-misc/fbpanel/files/fbpanel-7.0-shebangs.patch b/x11-misc/fbpanel/files/fbpanel-7.0-shebangs.patch
new file mode 100644
index 000000000000..cdbe998e0660
--- /dev/null
+++ b/x11-misc/fbpanel/files/fbpanel-7.0-shebangs.patch
@@ -0,0 +1,120 @@
+--- a/.config/help
++++ b/.config/help
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python2
+
+ import re, os, sys, textwrap
+ # Formats help message
+--- a/.config/repl.py
++++ b/.config/repl.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python2
+
+ import re, sys
+
+--- a/.config/tar.py
++++ b/.config/tar.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python2
+
+ import subprocess as sp
+ import re, tempfile
+--- a/configure
++++ b/configure
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/env python2
+
+ import sys
+ if sys.version_info < (2, 7):
+--- a/exec/make_profile.in
++++ b/exec/make_profile.in
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ umask 0077
+ # new profile directory
+--- a/exec/xlogout
++++ b/exec/xlogout
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ # xlogout - logs user out of its X session
+ # Linux specific since uses /proc
+--- a/scripts/endianess.sh
++++ b/scripts/endianess.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ # When cross compiling, you may put cross compiler directory
+ # in PATH before native gcc (aka spoofing), or you may set CC
+--- a/scripts/install_locale.sh
++++ b/scripts/install_locale.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ dir=/tmp/lo-$$
+ mkdir $dir
+--- a/scripts/install_locale.sh.in
++++ b/scripts/install_locale.sh.in
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ dir=/tmp/lo-$$
+ mkdir $dir
+--- a/scripts/install.sh
++++ b/scripts/install.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ usage ()
+ {
+--- a/scripts/mk_tar
++++ b/scripts/mk_tar
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+
+ function info()
+--- a/scripts/rfs-pkg-config
++++ b/scripts/rfs-pkg-config
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ # Tt runs pkg-config in a way that everything is searched under RFS
+ # but reported including full path. Suitable for cross-compiling
+--- a/scripts/update-proj.sh
++++ b/scripts/update-proj.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/usr/bin/env bash
+
+ function usage ()
+ {
+--- a/www/plugins/mk_gallery
++++ b/www/plugins/mk_gallery
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/env sh
+
+ echo > "$1"
+ #echo '<table cellpadding="0" cellspacing="0" border="0" align="left" bgcolor="#ffffff">' >> "$1"
+--- a/www/shots/mk_gallery
++++ b/www/shots/mk_gallery
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/env sh
+
+ function help ()
+ {