Added ebuilds for kogaion desktop

10 files changed, 459 insertions, 0 deletions

diff --git a/app-admin/conky-full/files/conky-1.8.1-acpitemp.patch b/app-admin/conky-full/files/conky-1.8.1-acpitemp.patch
new file mode 100644
index 00000000..9632b99e
--- /dev/null
+++ b/app-admin/conky-full/files/conky-1.8.1-acpitemp.patch
@@ -0,0 +1,81 @@
+From 1b90218c339467770254aba03e3f0a3acc4af4b0 Mon Sep 17 00:00:00 2001
+From: Nikolas Garofil <nikolas@garofil.be>
+Date: Wed, 10 Nov 2010 18:22:22 +0100
+Subject: [PATCH] Let $acpitemp use /sys instead of /proc
+
+From the 2.6.36 changelog (http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.36):
+Mark the ACPI thermal procfs I/F deprecated, because /sys/class/thermal/ is already available and has been working for years w/o any problem.
+The ACPI thermal procfs I/F will be removed in 2.6.37
+---
+ src/linux.cc |   26 ++++++++++++--------------
+ 1 files changed, 12 insertions(+), 14 deletions(-)
+
+diff --git a/src/linux.cc b/src/linux.cc
+index ae97f48..bfb0063 100644
+--- a/src/linux.c
++++ b/src/linux.c
+@@ -1449,26 +1449,20 @@ critical (S5):           73 C
+ passive:                 73 C: tc1=4 tc2=3 tsp=40 devices=0xcdf6e6c0
+ */
+ 
+-#define ACPI_THERMAL_DIR "/proc/acpi/thermal_zone/"
+-#define ACPI_THERMAL_FORMAT "/proc/acpi/thermal_zone/%s/temperature"
++#define ACPI_THERMAL_ZONE_DEFAULT "thermal_zone0"
++#define ACPI_THERMAL_FORMAT "/sys/class/thermal/%s/temp"
+ 
+ int open_acpi_temperature(const char *name)
+ {
+ 	char path[256];
+-	char buf[256];
+ 	int fd;
+ 
+ 	if (name == NULL || strcmp(name, "*") == 0) {
+-		static int rep = 0;
+-
+-		if (!get_first_file_in_a_directory(ACPI_THERMAL_DIR, buf, &rep)) {
+-			return -1;
+-		}
+-		name = buf;
++		snprintf(path, 255, ACPI_THERMAL_FORMAT, ACPI_THERMAL_ZONE_DEFAULT);
++	} else {
++		snprintf(path, 255, ACPI_THERMAL_FORMAT, name);
+ 	}
+ 
+-	snprintf(path, 255, ACPI_THERMAL_FORMAT, name);
+-
+ 	fd = open(path, O_RDONLY);
+ 	if (fd < 0) {
+ 		NORM_ERR("can't open '%s': %s", path, strerror(errno));
+@@ -1480,6 +1474,9 @@ int open_acpi_temperature(const char *name)
+ static double last_acpi_temp;
+ static double last_acpi_temp_time;
+ 
++//the maximum length of the string inside a ACPI_THERMAL_FORMAT file including the ending 0
++#define MAXTHERMZONELEN 6
++
+ double get_acpi_temperature(int fd)
+ {
+ 	if (fd <= 0) {
+@@ -1497,15 +1494,16 @@ double get_acpi_temperature(int fd)
+ 
+ 	/* read */
+ 	{
+-		char buf[256];
++		char buf[MAXTHERMZONELEN];
+ 		int n;
+ 
+-		n = read(fd, buf, 255);
++		n = read(fd, buf, MAXTHERMZONELEN-1);
+ 		if (n < 0) {
+ 			NORM_ERR("can't read fd %d: %s", fd, strerror(errno));
+ 		} else {
+ 			buf[n] = '\0';
+-			sscanf(buf, "temperature: %lf", &last_acpi_temp);
++			sscanf(buf, "%lf", &last_acpi_temp);
++			last_acpi_temp /= 1000;
+ 		}
+ 	}
+ 
+-- 
+1.7.0.4
+
diff --git a/app-admin/conky-full/files/conky-1.8.1-battery-time.patch b/app-admin/conky-full/files/conky-1.8.1-battery-time.patch
new file mode 100644
index 00000000..66e37958
--- /dev/null
+++ b/app-admin/conky-full/files/conky-1.8.1-battery-time.patch
@@ -0,0 +1,11 @@
+--- a/src/linux.c.old	2012-01-12 08:18:58.525502553 -0500
++++ b/src/linux.c	2012-01-12 08:19:29.786069277 -0500
+@@ -1671,6 +1671,8 @@ void get_battery_stuff(char *buffer, uns
+  			the tradition! */
+  			else if (strncmp(buf, "POWER_SUPPLY_CURRENT_NOW=", 25) == 0)
+  				sscanf(buf, "POWER_SUPPLY_CURRENT_NOW=%d", &present_rate);
++			else if (strncmp(buf, "POWER_SUPPLY_POWER_NOW=", 23) == 0)
++				sscanf(buf, "POWER_SUPPLY_POWER_NOW=%d", &present_rate);
+  			else if (strncmp(buf, "POWER_SUPPLY_ENERGY_NOW=", 24) == 0)
+  				sscanf(buf, "POWER_SUPPLY_ENERGY_NOW=%d", &remaining_capacity);
+  			else if (strncmp(buf, "POWER_SUPPLY_ENERGY_FULL=", 25) == 0)
diff --git a/app-admin/conky-full/files/conky-1.8.1-curl-headers.patch b/app-admin/conky-full/files/conky-1.8.1-curl-headers.patch
new file mode 100644
index 00000000..5de2de14
--- /dev/null
+++ b/app-admin/conky-full/files/conky-1.8.1-curl-headers.patch
@@ -0,0 +1,24 @@
+diff --git a/src/ccurl_thread.c b/src/ccurl_thread.c
+index 10e73a6..9bea299 100644
+--- a/src/ccurl_thread.c
++++ b/src/ccurl_thread.c
+@@ -33,7 +33,6 @@
+ #endif /* DEBUG */
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ /*
+diff --git a/src/eve.c b/src/eve.c
+index dc07264..f62a5f6 100644
+--- a/src/eve.c
++++ b/src/eve.c
+@@ -37,7 +37,6 @@
+ #include <libxml/xmlwriter.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <time.h>
diff --git a/app-admin/conky-full/files/conky-1.8.1-lua-5.2.patch b/app-admin/conky-full/files/conky-1.8.1-lua-5.2.patch
new file mode 100644
index 00000000..956b0397
--- /dev/null
+++ b/app-admin/conky-full/files/conky-1.8.1-lua-5.2.patch
@@ -0,0 +1,26 @@
+From 83bf5e3f853918583e519fbba455a79242be9c7c Mon Sep 17 00:00:00 2001
+From: Brenden Matthews <brenden@diddyinc.com>
+Date: Wed, 7 Mar 2012 11:11:12 -0800
+Subject: [PATCH] Build fix for Lua >=5.2.
+
+See Gentoo bug at https://bugs.gentoo.org/show_bug.cgi?id=407089.
+---
+ src/llua.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/llua.c b/src/llua.c
+index 8f1df3c..383c279 100644
+--- a/src/llua.c
++++ b/src/llua.c
+@@ -92,7 +92,7 @@ void llua_init(void)
+ 	const char *libs = PACKAGE_LIBDIR"/lib?.so;";
+ 	char *old_path, *new_path;
+ 	if (lua_L) return;
+-	lua_L = lua_open();
++	lua_L = luaL_newstate();
+ 
+ 	/* add our library path to the lua package.cpath global var */
+ 	luaL_openlibs(lua_L);
+-- 
+1.7.0.4
+
diff --git a/app-admin/conky-full/files/conky-1.8.1-maxinterfaces.patch b/app-admin/conky-full/files/conky-1.8.1-maxinterfaces.patch
new file mode 100644
index 00000000..6f2097e1
--- /dev/null
+++ b/app-admin/conky-full/files/conky-1.8.1-maxinterfaces.patch
@@ -0,0 +1,41 @@
+From f6aac5981e70118dc28b3c7a1fe6065955fe3dcb Mon Sep 17 00:00:00 2001
+From: Pavel Labath <pavelo@centrum.sk>
+Date: Tue, 25 Oct 2011 18:53:09 +0200
+Subject: [PATCH] Increase MAX_NET_INTERFACES to 64
+
+also change a magic constant in net_stat.h to reflect the fact that it depends on
+MAX_NET_INTERFACES. For more info, see sf.net #2872682 and gentoo bug #384505
+---
+ configure.ac.in |    2 +-
+ src/net_stat.h  |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac.in b/configure.ac.in
+index 0f00237..d52d998 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -802,7 +802,7 @@ AC_DEFINE(CONFIG_FILE, "$HOME/.conkyrc", [Configfile of the user])
+ AC_DEFINE(MAX_SPECIALS_DEFAULT, 512, [Default maximum number of special things, e.g. fonts, offsets, aligns, etc.])
+ AC_DEFINE(MAX_USER_TEXT_DEFAULT, 16384, [Default maximum size of config TEXT buffer, i.e. below TEXT line.])
+ AC_DEFINE(DEFAULT_TEXT_BUFFER_SIZE, 256, [Default size used for temporary, static text buffers])
+-AC_DEFINE(MAX_NET_INTERFACES, 16, [Maximum number of network devices])
++AC_DEFINE(MAX_NET_INTERFACES, 64, [Maximum number of network devices])
+ 
+ dnl
+ dnl Some functions
+diff --git a/src/net_stat.h b/src/net_stat.h
+index 463e7db..6f5533c 100644
+--- a/src/net_stat.h
++++ b/src/net_stat.h
+@@ -41,7 +41,7 @@ struct net_stat {
+         double recv_speed, trans_speed;
+         struct sockaddr addr;
+ #if defined(__linux__)
+-        char addrs[273];
++        char addrs[17 * MAX_NET_INTERFACES + 1];
+ #endif /* __linux__ */
+         double net_rec[15], net_trans[15];
+         // wireless extensions
+-- 
+1.7.0.4
+
diff --git a/app-admin/conky-full/files/conky-1.8.1-nvidia-x.patch b/app-admin/conky-full/files/conky-1.8.1-nvidia-x.patch
new file mode 100644
index 00000000..b56cee5f
--- /dev/null
+++ b/app-admin/conky-full/files/conky-1.8.1-nvidia-x.patch
@@ -0,0 +1,33 @@
+From b72004787038371098a745c9358e8e1552d945d5 Mon Sep 17 00:00:00 2001
+From: Brenden Matthews <brenden@diddyinc.com>
+Date: Wed, 6 Oct 2010 11:49:27 -0700
+Subject: [PATCH] Bulid fix for nvidia support.
+
+See http://bugs.gentoo.org/show_bug.cgi?id=339971 for details.
+---
+ src/nvidia.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/src/nvidia.c b/src/nvidia.c
+index 8a6423e..5f378d8 100644
+--- a/src/nvidia.c
++++ b/src/nvidia.c
+@@ -32,6 +32,7 @@
+ #include "logging.h"
+ #include "nvidia.h"
+ #include "temphelper.h"
++#include "x11.h"
+ #include <NVCtrl/NVCtrlLib.h>
+ 
+ const int nvidia_query_to_attr[] = {NV_CTRL_GPU_CORE_TEMPERATURE,
+@@ -145,5 +146,6 @@ void set_nvidia_display(const char *disp)
+ 		if ((nvdisplay = XOpenDisplay(disp)) == NULL) {
+ 			CRIT_ERR(NULL, NULL, "can't open nvidia display: %s", XDisplayName(disp));
+ 		}
+-	}	
++	}
+ }
++
+-- 
+1.7.0.4
+
diff --git a/app-admin/conky-full/files/conky-1.8.1-secunia-SA43225.patch b/app-admin/conky-full/files/conky-1.8.1-secunia-SA43225.patch
new file mode 100644
index 00000000..81272bd3
--- /dev/null
+++ b/app-admin/conky-full/files/conky-1.8.1-secunia-SA43225.patch
@@ -0,0 +1,72 @@
+--- src/eve.c	2011-02-12 13:26:34.636269667 +0100
++++ src/eve.c	2011-02-12 13:26:48.242936334 +0100
+@@ -254,19 +254,6 @@
+ 	}
+ }
+ 
+-static int file_exists(const char *filename)
+-{
+-	struct stat fi;
+-
+-	if ((stat(filename, &fi)) == 0) {
+-		if (fi.st_size > 0)
+-			return 1;
+-		else
+-			return 0;
+-	} else
+-		return 0;
+-}
+-
+ static void writeSkilltree(char *content, const char *filename)
+ {
+ 	FILE *fp = fopen(filename, "w");
+@@ -283,13 +270,12 @@
+ 	xmlDocPtr doc = 0;
+ 	xmlNodePtr root = 0;
+ 
+-	if (!file_exists(file)) {
+-		skilltree = getXmlFromAPI(NULL, NULL, NULL, EVEURL_SKILLTREE);
+-		writeSkilltree(skilltree, file);
+-		free(skilltree);
+-	}
++	skilltree = getXmlFromAPI(NULL, NULL, NULL, EVEURL_SKILLTREE);
++	writeSkilltree(skilltree, file);
++	free(skilltree);
+ 
+ 	doc = xmlReadFile(file, NULL, 0);
++	unlink(file);
+ 	if (!doc)
+ 		return NULL;
+ 
+@@ -340,7 +326,7 @@
+ static char *eve(char *userid, char *apikey, char *charid)
+ {
+ 	Character *chr = NULL;
+-	const char *skillfile = "/tmp/.cesf";
++	char skillfile[] = "/tmp/.cesfXXXXXX";
+ 	int i = 0;
+ 	char *output = 0;
+ 	char *timel = 0;
+@@ -348,6 +334,7 @@
+ 	char *content = 0;
+ 	time_t now = 0;
+ 	char *error = 0;
++	int tmp_fd, old_umask;
+ 
+ 
+ 	for (i = 0; i < MAXCHARS; i++) {
+@@ -400,6 +387,14 @@
+ 
+ 		output = (char *)malloc(200 * sizeof(char));
+ 		timel = formatTime(&chr->ends);
++		old_umask = umask(0066);
++		tmp_fd = mkstemp(skillfile);
++		umask(old_umask);
++		if (tmp_fd == -1) {
++			error = strdup("Cannot create temporary file");
++			return error;
++		}
++		close(tmp_fd);
+ 		skill = getSkillname(skillfile, chr->skill);
+ 
+ 		chr->skillname = strdup(skill);
diff --git a/app-admin/conky-full/files/conky-1.8.1-utf8-scroll.patch b/app-admin/conky-full/files/conky-1.8.1-utf8-scroll.patch
new file mode 100644
index 00000000..8b9e1e8f
--- /dev/null
+++ b/app-admin/conky-full/files/conky-1.8.1-utf8-scroll.patch
@@ -0,0 +1,104 @@
+From b1f6a30bcce020b3c377434137de9856a09b899a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Fri, 11 Nov 2011 11:27:43 +0100
+Subject: [PATCH] Make scroll UTF-8 aware.  Fixes bug #3134941.
+
+---
+ src/scroll.c |   44 ++++++++++++++++++++++++++++++++++++++++++--
+ 1 files changed, 42 insertions(+), 2 deletions(-)
+
+diff --git a/src/scroll.c b/src/scroll.c
+index f78f807..738db0d 100644
+--- a/src/scroll.c
++++ b/src/scroll.c
+@@ -34,12 +34,33 @@
+ 
+ struct scroll_data {
+ 	char *text;
++	unsigned int show_orig;
+ 	unsigned int show;
+ 	unsigned int step;
+ 	unsigned int start;
+ 	long resetcolor;
+ };
+ 
++int utf8_charlen(char c) {
++	unsigned char uc = (unsigned char) c;
++	int len = 0;
++
++	if ((uc & 0x80) == 0)
++		return 1;
++
++	while ((uc & 0x80) != 0) {
++		++len;
++		uc <<= 1;
++	}
++
++	return (len > 0 && len <= 4) ? len : -1;
++}
++
++int is_utf8_char_tail(char c) {
++	unsigned char uc = (unsigned char) c;
++	return (uc & 0xc0) == 0x80;
++}
++
+ void parse_scroll_arg(struct text_object *obj, const char *arg, void *free_at_crash)
+ {
+ 	struct scroll_data *sd;
+@@ -60,15 +81,18 @@ void parse_scroll_arg(struct text_object *obj, const char *arg, void *free_at_cr
+ 		sd->step = 1;
+ 	}
+ 	sd->text = malloc(strlen(arg + n1) + sd->show + 1);
++	// sd->show value may change when there are UTF-8 chars to be shown, so
++	// save its origin value
++	sd->show_orig = sd->show;
+ 
+ 	if (strlen(arg) > sd->show) {
+ 		for(n2 = 0; (unsigned int) n2 < sd->show; n2++) {
+-		    sd->text[n2] = ' ';
++			sd->text[n2] = ' ';
+ 		}
+ 		sd->text[n2] = 0;
+ 	}
+ 	else
+-	    sd->text[0] = 0;
++		sd->text[0] = 0;
+ 
+ 	strcat(sd->text, arg + n1);
+ 	sd->start = 0;
+@@ -82,9 +106,13 @@ void print_scroll(struct text_object *obj, char *p, int p_max_size, struct infor
+ {
+ 	struct scroll_data *sd = obj->data.opaque;
+ 	unsigned int j, colorchanges = 0, frontcolorchanges = 0, visibcolorchanges = 0, strend;
++	int charlen = 0;
++	unsigned int utf8lenfix = 0;
+ 	char *pwithcolors;
+ 	char buf[max_user_text];
+ 
++	sd->show = sd->show_orig;
++
+ 	if (!sd)
+ 		return;
+ 
+@@ -109,6 +137,18 @@ void print_scroll(struct text_object *obj, char *p, int p_max_size, struct infor
+ 	while(*(buf + sd->start) == SPECIAL_CHAR) {
+ 		sd->start++;
+ 	}
++	//skip parts of UTF-8 character which messes up display
++	while(is_utf8_char_tail(*(buf + sd->start))) {
++		sd->start++;
++	}
++	//extend length to be shown for wide characters
++	j = 0;
++	while(j < sd->show + visibcolorchanges + utf8lenfix) {
++		charlen = utf8_charlen(*(buf + sd->start + j));
++		utf8lenfix += (charlen > 1 ? charlen - 1 : 0);
++		j += charlen;
++	}
++	sd->show = sd->show_orig + utf8lenfix;
+ 	//place all chars that should be visible in p, including colorchanges
+ 	for(j=0; j < sd->show + visibcolorchanges; j++) {
+ 		p[j] = *(buf + sd->start + j);
+-- 
+1.7.8.rc1
+
diff --git a/app-admin/conky-full/files/conky-1.8.1-xmms2.patch b/app-admin/conky-full/files/conky-1.8.1-xmms2.patch
new file mode 100644
index 00000000..a1b03d45
--- /dev/null
+++ b/app-admin/conky-full/files/conky-1.8.1-xmms2.patch
@@ -0,0 +1,36 @@
+From 8dd9b91bb2751abccc02b53cefd0ab8f0e3b957d Mon Sep 17 00:00:00 2001
+From: Brenden Matthews <brenden@diddyinc.com>
+Date: Thu, 14 Oct 2010 16:51:53 -0700
+Subject: [PATCH] Build fix for XMMS2.
+
+This resolves bug 3085691, see:
+https://sourceforge.net/tracker/index.php?func=detail&aid=3085691&group_id=143975&atid=757308
+---
+ src/xmms2.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/xmms2.c b/src/xmms2.c
+index 521bffa..94f13f9 100644
+--- a/src/xmms2.c
++++ b/src/xmms2.c
+@@ -223,7 +223,7 @@ int handle_playback_state_change(xmmsv_t *value, void *p)
+ 				break;
+ 			case XMMS_PLAYBACK_STATUS_STOP:
+ 				strncpy(ptr->xmms2.status, "Stopped", text_buffer_size - 1);
+-				ptr->xmms2.elapsed = ptr->xmms2.progress = ptr->xmms2.percent = 0;
++ 				ptr->xmms2.elapsed = ptr->xmms2.progress = 0;
+ 				break;
+ 			default:
+ 				strncpy(ptr->xmms2.status, "Unknown", text_buffer_size - 1);
+@@ -232,7 +232,7 @@ int handle_playback_state_change(xmmsv_t *value, void *p)
+ 	return TRUE;
+ }
+ 
+-int handle_playlist_loaded(xmmsv_t *value, void *p) 
++int handle_playlist_loaded(xmmsv_t *value, void *p)
+ {
+ 	struct information *ptr = p;
+ 	const char *c, *errbuf;
+-- 
+1.7.0.4
+
diff --git a/app-admin/conky-full/files/conky-1.9.0-ncurses.patch b/app-admin/conky-full/files/conky-1.9.0-ncurses.patch
new file mode 100644
index 00000000..91043ed4
--- /dev/null
+++ b/app-admin/conky-full/files/conky-1.9.0-ncurses.patch
@@ -0,0 +1,31 @@
+From fd9462da5ed12369fc6a72e42ebc45c6707403fb Mon Sep 17 00:00:00 2001
+From: Pavel Labath <pavelo@centrum.sk>
+Date: Fri, 13 Jul 2012 13:41:09 +0200
+Subject: [PATCH] Fix "conky failes to build with --disable-ncurses" (sf.net #3541329)
+
+---
+ src/conky.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/conky.c b/src/conky.c
+index c5b4bed..17fe1a7 100644
+--- a/src/conky.c
++++ b/src/conky.c
+@@ -885,12 +885,12 @@ void generate_text_internal(char *p, int p_max_size,
+ 			OBJ(cpu) {
+ 				if (cur->cpu_usage) {
+ 					if (obj->data.i > info.cpu_count) {
+-						static bool warned = false;
++						static int warned = 0;
+ 						if(!warned) {
+ 							NORM_ERR("obj->data.i %i info.cpu_count %i",
+ 									obj->data.i, info.cpu_count);
+ 							NORM_ERR("attempting to use more CPUs than you have!");
+-							warned = true;
++							warned = 1;
+ 						}
+ 					} else  {
+ 						percent_print(p, p_max_size,
+-- 
+1.7.0.4
+