diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2016-08-25 14:50:09 +0200 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2016-08-25 14:53:59 +0200 |
| commit | b1dcecd9b4e1f25bae9bd8483a8c476520dab10c (patch) | |
| tree | 67ece8185d36eb089fa03df7846a0624b6612645 /x11-plugins/gkrellm-volume/files | |
| parent | x11-plugins/gkrellm-volume: Drop old (diff) | |
| download | gentoo-b1dcecd9b4e1f25bae9bd8483a8c476520dab10c.tar.gz gentoo-b1dcecd9b4e1f25bae9bd8483a8c476520dab10c.tar.bz2 gentoo-b1dcecd9b4e1f25bae9bd8483a8c476520dab10c.zip | |
x11-plugins/gkrellm-volume: Respect LDFLAGS, fix gcc calls and fix dependencies (#422543 by Michael Mair-Keimberger (iamnr3))
Package-Manager: portage-2.3.0
Diffstat (limited to 'x11-plugins/gkrellm-volume/files')
| -rw-r--r-- | x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-Respect-LDFLAGS.patch | 13 | ||||
| -rw-r--r-- | x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-makefile.patch | 57 |
2 files changed, 57 insertions, 13 deletions
diff --git a/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-Respect-LDFLAGS.patch b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-Respect-LDFLAGS.patch deleted file mode 100644 index 1d711fb74946..000000000000 --- a/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-Respect-LDFLAGS.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index 7a9821d..db02cad 100644 ---- a/Makefile -+++ b/Makefile -@@ -18,6 +18,8 @@ FLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE) - LIBS = $(GTK_LIB) - LFLAGS = -shared - -+LFLAGS += $(LDFLAGS) -+ - OBJS = volume.o mixer.o oss_mixer.o - - ifeq ($(enable_alsa),1) diff --git a/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-makefile.patch b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-makefile.patch new file mode 100644 index 000000000000..23d822ca7fc8 --- /dev/null +++ b/x11-plugins/gkrellm-volume/files/gkrellm-volume-2.1.13-makefile.patch @@ -0,0 +1,57 @@ +--- a/Makefile 2004-08-19 22:07:27.000000000 +0200 ++++ b/Makefile_new 2013-03-16 21:16:03.919755685 +0100 +@@ -3,7 +3,7 @@ + PACKAGE ?= gkrellm-volume + LOCALEDIR ?= /usr/local/share/locale + +-FLAGS += -DPACKAGE="\"$(PACKAGE)\"" ++CFLAGS += -DPACKAGE="\"$(PACKAGE)\"" + export PACKAGE LOCALEDIR + + GTK_CONFIG = pkg-config gtk+-2.0 +@@ -14,31 +14,32 @@ + GTK_CFLAGS = `$(GTK_CONFIG) --cflags` + GTK_LIB = `$(GTK_CONFIG) --libs` + +-FLAGS = -O2 -Wall -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE) ++CFLAGS := $(CFLAGS) -fPIC $(GTK_CFLAGS) $(GKRELLM_INCLUDE) + LIBS = $(GTK_LIB) + LFLAGS = -shared ++LFLAGS += $(LDFLAGS) + + OBJS = volume.o mixer.o oss_mixer.o + + ifeq ($(enable_alsa),1) +- FLAGS += -DALSA ++ CFLAGS += -DALSA + LIBS += -lasound + OBJS += alsa_mixer.o + endif + + ifeq ($(enable_nls),1) +- FLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\" ++ CFLAGS += -DENABLE_NLS -DLOCALEDIR=\"$(LOCALEDIR)\" + export enable_nls + endif + +-CC = gcc $(CFLAGS) $(FLAGS) ++CC = $(CC) + + INSTALL = install -c + INSTALL_PROGRAM = $(INSTALL) -s + + all: volume.so + (cd po && ${MAKE} all ) +- ++ + volume.so: $(OBJS) + $(CC) $(OBJS) -o volume.so $(LIBS) $(LFLAGS) + +@@ -50,5 +51,4 @@ + (cd po && ${MAKE} install) + $(INSTALL_PROGRAM) volume.so $(PLUGIN_DIR) + +-%.c.o: %.c +- ++%.c.o: %.c +\ No newline at end of file |