From 2386e0d74a9406d00dbbbab84a0e97a276fcf4b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Sat, 10 Mar 2012 20:47:17 -0200 Subject: ~emulatorman/xchat-xsys-noaudacious --- ~emulatorman/xchat-xsys-noaudacious/PKGBUILD | 25 +++ .../xchat-xsys-noaudacious/no-audacious.patch | 244 +++++++++++++++++++++ .../xchat-xsys-parabola.patch | 37 ++++ 3 files changed, 306 insertions(+) create mode 100644 ~emulatorman/xchat-xsys-noaudacious/PKGBUILD create mode 100644 ~emulatorman/xchat-xsys-noaudacious/no-audacious.patch create mode 100644 ~emulatorman/xchat-xsys-noaudacious/xchat-xsys-parabola.patch (limited to '~emulatorman') diff --git a/~emulatorman/xchat-xsys-noaudacious/PKGBUILD b/~emulatorman/xchat-xsys-noaudacious/PKGBUILD new file mode 100644 index 000000000..977999a38 --- /dev/null +++ b/~emulatorman/xchat-xsys-noaudacious/PKGBUILD @@ -0,0 +1,25 @@ +# Contributor: Gökmen Görgen +# Contributor (Parabola): André Silva +pkgname=xchat-xsys-noaudacious +pkgver=2.2.0 +pkgrel=3 +pkgdesc="Sysinfo plugin without audacious for X-Chat" +url="http://dev.gentoo.org/~chainsaw/xsys" +depends=('xchat-libre' 'pciutils') +arch=('i686' 'x86_64') +source=(http://dev.gentoo.org/~chainsaw/xsys/download/xsys-$pkgver.tar.bz2 xchat-xsys-parabola.patch no-audacious.patch) +md5sums=('d57def00f96c7389ab593c009595f6f4' '4d22883f24606dbab588d685c553e5a1' '588e5f6d9037a07385079a5cf6ee2dbe') +license=('GPL') + +build() { + cd $srcdir/xsys-$pkgver + patch -p1 -i ../no-audacious.patch || return 1 + sed -i -e "s:/usr/share/misc/:/usr/share/hwdata/:" Makefile + sed -i -e "s:-O2 -Wall:${CFLAGS} -Wall:" Makefile + sed -i -e "s:#BUTTON:BUTTON:" Makefile + sed -i -e "s:# FOR AUDACIOUS # ::g" Makefile + patch -p1 -i ../xchat-xsys-parabola.patch || return 1 + make || return 1 + mkdir -p $pkgdir/usr/lib/xchat/plugins + cp xsys-$pkgver.so $pkgdir/usr/lib/xchat/plugins +} diff --git a/~emulatorman/xchat-xsys-noaudacious/no-audacious.patch b/~emulatorman/xchat-xsys-noaudacious/no-audacious.patch new file mode 100644 index 000000000..749234e7a --- /dev/null +++ b/~emulatorman/xchat-xsys-noaudacious/no-audacious.patch @@ -0,0 +1,244 @@ +diff -uNr xsys-2.2.0.ORIG/Makefile xsys-2.2.0/Makefile +--- xsys-2.2.0.ORIG/Makefile 2008-01-30 11:53:56.000000000 +0000 ++++ xsys-2.2.0/Makefile 2008-01-30 11:59:39.000000000 +0000 +@@ -10,7 +10,6 @@ + VER_PATCH = 0 + CC = gcc + CFLAGS += -O2 -Wall -fPIC +-CFLAGS += $(shell pkg-config dbus-1 --cflags) $(shell pkg-config glib-2.0 --cflags) + CFLAGS += -DVER_MINOR=$(VER_MINOR) -DVER_MAJOR=$(VER_MAJOR) -DVER_PATCH=$(VER_PATCH) \ + -DVER_STRING=\"$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)\" -DPCIIDS=\"$(PCIIDS)\" $(BUTTON) + LDFLAGS = $(CFLAGS) -shared +@@ -20,7 +19,7 @@ + ALL : $(LIBRARY) + + $(LIBRARY) : $(OBJECTS) +- $(CC) $(LDFLAGS) -o $(LIBRARY) $(OBJECTS) -lpci $(shell pkg-config dbus-1 --libs) $(shell pkg-config glib-2.0 --libs) -laudclient ++ $(CC) $(LDFLAGS) -o $(LIBRARY) $(OBJECTS) -lpci + + xsys.o : xsys.c + parse.o : parse.c +diff -uNr xsys-2.2.0.ORIG/parse.h xsys-2.2.0/parse.h +--- xsys-2.2.0.ORIG/parse.h 2008-01-30 11:53:56.000000000 +0000 ++++ xsys-2.2.0/parse.h 2008-01-30 11:58:03.000000000 +0000 +@@ -33,7 +33,6 @@ + int xs_parse_video(char *vid_card); + int xs_parse_agpbridge(char *agp_bridge); + int xs_parse_ether(char *ethernet_card); +-int xs_parse_xmms_info(char **title, unsigned int *songtime, unsigned int *playtime); + int xs_parse_distro(char *name); + int xs_parse_hwmon_chip(char *chip); + int xs_parse_hwmon_temp(char *temp, unsigned int *sensor); +diff -uNr xsys-2.2.0.ORIG/xsys.c xsys-2.2.0/xsys.c +--- xsys-2.2.0.ORIG/xsys.c 2008-01-30 11:53:56.000000000 +0000 ++++ xsys-2.2.0/xsys.c 2008-01-30 12:00:36.000000000 +0000 +@@ -28,24 +28,17 @@ + #include "parse.h" + #include "match.h" + #include "xsys.h" +-#include +-#include + + static xchat_plugin *ph; + + static char format[bsize] = "%B%1%B[%2]"; +-static char playing[42] = "now_playing"; + unsigned int percentages = 1; +-static unsigned int action = 0; + + static void load_config(); + static void save_config(); +-static gboolean dbus_init(void); + + static int format_cb (char *word[], char *word_eol[], void *userdata); +-static int playing_cb (char *word[], char *word_eol[], void *userdata); + static int percentages_cb (char *word[], char *word_eol[], void *userdata); +-static int action_cb (char *word[], char *word_eol[], void *userdata); + static int sysinfo_cb (char *word[], char *word_eol[], void *userdata); + static int xsys_cb (char *word[], char *word_eol[], void *userdata); + static int cpuinfo_cb (char *word[], char *word_eol[], void *userdata); +@@ -62,22 +55,17 @@ + #if 0 + static int hwmon_cb (char *word[], char *word_eol[], void *userdata); + #endif +-static int np_cb (char *word[], char *word_eol[], void *userdata); +-static DBusGProxy *dbus_proxy = NULL; +-static DBusGConnection *connection = NULL; + + int xchat_plugin_init(xchat_plugin *plugin_handle, char **plugin_name, + char **plugin_desc, char **plugin_version, char *arg) + { + ph = plugin_handle; + *plugin_name = "X-Sys_2"; +- *plugin_desc = "A sysinfo/audacious plugin"; ++ *plugin_desc = "A sysinfo plugin"; + *plugin_version = VER_STRING; + + xchat_hook_command(ph, "XSYS2FORMAT",XCHAT_PRI_NORM, format_cb, NULL, NULL); +- xchat_hook_command(ph, "PLAYING", XCHAT_PRI_NORM, playing_cb, NULL, NULL); + xchat_hook_command(ph, "PERCENTAGES",XCHAT_PRI_NORM, percentages_cb, NULL, NULL); +- xchat_hook_command(ph, "NPACTION", XCHAT_PRI_NORM, action_cb, NULL, NULL); + xchat_hook_command(ph, "SYSINFO", XCHAT_PRI_NORM, sysinfo_cb, NULL, (void *) 0); + xchat_hook_command(ph, "ESYSINFO", XCHAT_PRI_NORM, sysinfo_cb, NULL, (void *) 1); + xchat_hook_command(ph, "XSYS", XCHAT_PRI_NORM, xsys_cb, NULL, (void *) 0); +@@ -108,13 +96,6 @@ + xchat_hook_command(ph, "HWMON", XCHAT_PRI_NORM, hwmon_cb, NULL, (void *) 0); + xchat_hook_command(ph, "EHWMON", XCHAT_PRI_NORM, hwmon_cb, NULL, (void *) 1); + #endif +- if (dbus_init()) +- { +- xchat_hook_command(ph, "NP", XCHAT_PRI_NORM, np_cb, NULL, (void *) 0); +- xchat_hook_command(ph, "ENP", XCHAT_PRI_NORM, np_cb, NULL, (void *) 1); +- xchat_printf(ph, "D-Bus MPRIS support initialized", VER_STRING); +- } +- + load_config(); + + xchat_printf(ph, "X-Sys %s Loaded Succesfully", VER_STRING); +@@ -122,11 +103,6 @@ + return 1; + } + +-static void xchat_plugin_deinit() +-{ +- /* blahblahblah */ +-} +- + static void save_config() + { + FILE *fp; +@@ -139,9 +115,7 @@ + return; + } + fprintf(fp, "format: %s\n", format); +- fprintf(fp, "playing: %s\n", playing); + fprintf(fp, "percentages: %i\n", percentages); +- fprintf(fp, "action: %i\n", action); + fclose(fp); + return; + } +@@ -158,30 +132,11 @@ + while(fgets(buffer, bsize, fp) != NULL) + { + find_match_char(buffer, "format", format); +- find_match_char(buffer, "playing", playing); + find_match_int(buffer, "percentages", &percentages); +- find_match_int(buffer, "action", &action); + } + fclose(fp); + } + +-static gboolean dbus_init(void) +-{ +- GError *error = NULL; +- +- connection = dbus_g_bus_get(DBUS_BUS_SESSION, &error); +- if (connection == NULL) +- return FALSE; +- +- dbus_proxy = dbus_g_proxy_new_for_name(connection, AUDACIOUS_DBUS_SERVICE, +- AUDACIOUS_DBUS_PATH, +- AUDACIOUS_DBUS_INTERFACE); +- if (dbus_proxy == NULL) +- return FALSE; +- +- return TRUE; +-} +- + static int format_cb(char *word[], char *word_eol[], void *userdata) + { + if(*(word[2]) == '\0') +@@ -194,18 +149,6 @@ + return XCHAT_EAT_ALL; + } + +-static int playing_cb(char *word[], char *word_eol[], void *userdata) +-{ +- if(*(word[2]) == '\0') +- xchat_printf(ph, "Current playing string:\n%s", playing); +- else +- { +- strncpy(playing, word_eol[2], 42); +- save_config(); +- } +- return XCHAT_EAT_ALL; +-} +- + static int percentages_cb(char *word[], char *word_eol[], void *userdata) + { + if(*(word[2]) == '\0') +@@ -221,21 +164,6 @@ + return XCHAT_EAT_ALL; + } + +-static int action_cb(char *word[], char *word_eol[], void *userdata) +-{ +- if(*(word[2]) == '\0') +- if (action != 0) +- xchat_printf(ph, "Now playing action currently enabled"); +- else +- xchat_printf(ph, "Now playing action currently disabled"); +- else +- { +- action = atoi(word[2]); +- save_config(); +- } +- return XCHAT_EAT_ALL; +-} +- + static int sysinfo_cb(char *word[], char *word_eol[], void *userdata) + { + char sysinfo[bsize], buffer[bsize], cpu_model[bsize], cpu_cache[bsize], cpu_vendor[bsize]; +@@ -683,52 +611,3 @@ + return XCHAT_EAT_ALL; + } + #endif +- +-static int np_cb(char *word[], char *word_eol[], void *userdata) +-{ +- char *buffer = NULL, title[bsize], length[42]; +- int pos, len, p = audacious_remote_get_playlist_pos(dbus_proxy); +- +- if (!audacious_remote_is_running(dbus_proxy)) +- { +- xchat_printf(ph, "Audacious is not currently running"); +- return XCHAT_EAT_ALL; +- } +- +- pos = audacious_remote_get_output_time(dbus_proxy); +- len = audacious_remote_get_playlist_time(dbus_proxy, p); +- buffer = decruft_filename(audacious_remote_get_playlist_title(dbus_proxy, p)); +- +- strncpy(title, buffer, bsize); +- +- if (action != 0) +- flat_format_output(playing, title, format); +- else +- format_output(playing, title, format); +- strcat(title, "\017 "); +- +- if(len == -1) +- snprintf(length, 42, "%d:%02d/stream", +- ((pos/1000)-((pos/1000)%60))/60, (pos/1000)%60); +- else +- snprintf(length, 42, "%d:%02d/%d:%02d", +- ((pos/1000)-((pos/1000)%60))/60, (pos/1000)%60, +- ((len/1000)-((len/1000)%60))/60, (len/1000)%60); +- +- if (action != 0) +- flat_format_output("length", length, format); +- else +- format_output("length", length, format); +- strncat(title, length, bsize); +- +- if ((action != 0) && (long)userdata) +- xchat_printf(ph, "You are %s", title); +- else if (action != 0) +- xchat_commandf(ph, "me is %s", title); +- else if ((long)userdata) +- xchat_printf(ph, "%s", title); +- else +- xchat_commandf(ph, "say %s", title); +- +- return XCHAT_EAT_ALL; +-} diff --git a/~emulatorman/xchat-xsys-noaudacious/xchat-xsys-parabola.patch b/~emulatorman/xchat-xsys-noaudacious/xchat-xsys-parabola.patch new file mode 100644 index 000000000..a3b905be9 --- /dev/null +++ b/~emulatorman/xchat-xsys-noaudacious/xchat-xsys-parabola.patch @@ -0,0 +1,37 @@ +--- xsys-2.2.0/parse.c 2007-11-12 18:42:20.000000000 -0200 ++++ xsys-2.2.0.new/parse.c 2012-03-10 20:36:46.301892322 -0200 +@@ -389,32 +389,8 @@ + } + snprintf(buffer, bsize, "%s \"%s\" %s", id, codename, release); + } +- else if((fp = fopen("/etc/make.conf", "r")) != NULL) +- { +- char keywords[bsize]; +- while(fgets(buffer, bsize, fp) != NULL) +- find_match_char(buffer, "ACCEPT_KEYWORDS", keywords); +- if (strstr(keywords, "\"") == NULL) +- snprintf(buffer, bsize, "Gentoo Linux (stable)"); +- else +- snprintf(buffer, bsize, "Gentoo Linux %s", keywords); +- } +- else if((fp = fopen("/etc/redhat-release", "r")) != NULL) +- fgets(buffer, bsize, fp); +- else if((fp = fopen("/etc/slackware-version", "r")) != NULL) +- fgets(buffer, bsize, fp); +- else if((fp = fopen("/etc/mandrake-release", "r")) != NULL) +- fgets(buffer, bsize, fp); +- else if((fp = fopen("/etc/debian_version", "r")) != NULL) +- { +- char release[bsize]; +- fgets(release, bsize, fp); +- snprintf(buffer, bsize, "Debian %s", release); +- } +- else if((fp = fopen("/etc/SuSE-release", "r")) != NULL) +- fgets(buffer, bsize, fp); +- else if((fp = fopen("/etc/turbolinux-release", "r")) != NULL) +- fgets(buffer, bsize, fp); ++ else if((fp = fopen("/etc/arch-release", "r")) != NULL) ++ snprintf(buffer, bsize, "Parabola GNU/Linux-libre"); + else + snprintf(buffer, bsize, "Unknown Distro"); + if(fp != NULL) fclose(fp); -- cgit v1.2.3-2-g168b