[Pkg-wmaker-commits] [wmauda] 01/02: New upstream version 0.9

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmauda.

commit 731bee7ddd7594c48c623697e6900007e84750f3
Author: Doug Torrance <dtorrance at piedmont.edu>
Date:   Thu Jul 6 21:10:12 2017 -0400

    New upstream version 0.9
---
 AUTHORS  | 13 ++++++++-----
 Makefile |  4 ++--
 config.h |  2 --
 wmauda.c | 12 +++++++++---
 4 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 17a37e6..f28345b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,12 +1,15 @@
-Michael Stewart <michael at alteredeclipse.org>
-	Current Maintainer
-	GTK2 Port
-
 Christian Birchinger <joker at netswarm.net>
+	Current Maintainer
 	GTK2 Port
 	Audacious Port
 	Artwork
 
+Rodolfo kix Garcia <kix at kix.es>
+	Patches for recent Audacious compatibility
+
+Michael Stewart <michael at alteredeclipse.org>
+	GTK2 Port
+
 George Averill <nhjm449 at gmail.com>
 	Artwork
 
@@ -15,4 +18,4 @@ Mikael Alm
 Olle Hallnas
 Thomas Nilsson
 4Front Technologies
-	Original wmxmms source
+Original wmxmms source
diff --git a/Makefile b/Makefile
index 5958f1b..87e61b1 100644
--- a/Makefile
+++ b/Makefile
@@ -7,14 +7,14 @@ INSTALL_DIR	:= $(PREFIX)/bin
 PIXMAP_DIR	:= $(PREFIX)/share/pixmaps
 MANPAGE_DIR	:= $(PREFIX)/share/man/man1
 
-CFLAGS 	+= $(shell pkg-config audacious --cflags) $(shell pkg-config dbus-1 --cflags)
+CFLAGS 	+= $(shell pkg-config audacious --cflags) $(shell pkg-config dbus-1 --cflags) -DPIXMAP_DIR="\"$(PIXMAP_DIR)\""
 LIBS 	:= $(shell pkg-config audacious --libs) $(shell pkg-config audclient --libs)  $(shell pkg-config dbus-1 --libs)
 
 CFLAGS  += $(shell pkg-config gtk+-2.0 --cflags)
 LIBS    += $(shell pkg-config gtk+-2.0 --libs)
 
 OBJS 	= wmauda.o
-HEADERS = config.h dock-master.xpm
+HEADERS = dock-master.xpm
 
 wmauda:	$(OBJS) $(HEADERS)
 	$(CC) -o wmauda $(OBJS) $(CFLAGS) $(LIBS)
diff --git a/config.h b/config.h
deleted file mode 100644
index 22ea9ba..0000000
--- a/config.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#define DATA_DIR "/usr/share/pixmaps"
-#define VERSION "0.6"
diff --git a/wmauda.c b/wmauda.c
index f2b83b0..dcea597 100644
--- a/wmauda.c
+++ b/wmauda.c
@@ -29,12 +29,18 @@
 #include <audacious/dbus.h>
 #include <audacious/audctrl.h>
 
-#include "config.h"
-
 #include "dock-master.xpm"
 
 #include <getopt.h>
 
+#ifndef VERSION
+# define VERSION "0.9"
+#endif
+
+#ifndef PIXMAP_DIR
+# define PIXMAP_DIR "/usr/local/share/pixmaps"
+#endif
+
 typedef struct
 {
 	int x, y, width, height, pressed_x, pressed_y, normal_x, normal_y;
@@ -731,7 +737,7 @@ void init(void)
 	gdk_draw_rectangle(launch_mask, mask_gc, TRUE, 0, 0, -1, -1);
 
 	if (!icon_name)
-		icon_name = g_strdup_printf("%s/wmauda.xpm", DATA_DIR);
+		icon_name = g_strdup_printf("%s/wmauda.xpm", PIXMAP_DIR);
 	pixmap = gdk_pixmap_create_from_xpm(icon_win->window, &mask,
 					    NULL, icon_name);
 	if (!pixmap)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmauda.git