summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-plugins/wmmixer/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-plugins/wmmixer/files')
-rw-r--r--x11-plugins/wmmixer/files/wmmixer-1.7-respect_flags.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/x11-plugins/wmmixer/files/wmmixer-1.7-respect_flags.patch b/x11-plugins/wmmixer/files/wmmixer-1.7-respect_flags.patch
new file mode 100644
index 000000000000..feb03166dddd
--- /dev/null
+++ b/x11-plugins/wmmixer/files/wmmixer-1.7-respect_flags.patch
@@ -0,0 +1,34 @@
+--- Makefile.orig 2012-08-21 11:03:31.028266807 +0200
++++ Makefile 2012-08-21 11:05:06.808876995 +0200
+@@ -1,19 +1,12 @@
+ # $Id$
+
+-prefix = /usr/local
++prefix = /usr
+ exec_prefix = ${prefix}
+ bindir = ${exec_prefix}/bin
+ mandir = ${prefix}/share/man
+
+-DESTDIR =
+-
+-CXX = g++
+-CXXFLAGS = -O -Wall
+-EXTRA_LIBS = -L/usr/X11R6/lib -lX11 -lXpm -lXext
+-
+-
+-LD = g++
+-LDFLAGS = -o $(EXECUTABLE) $(CXXFLAGS)
++CXX ?= g++
++LIBS = -lX11 -lXpm -lXext
+
+ EXECUTABLE = wmmixer
+ OBJS = xhandler.o mixctl.o wmmixer.o exception.o
+@@ -26,7 +19,7 @@
+ $(CXX) $(CXXFLAGS) -c -o $@ $<
+
+ $(EXECUTABLE): $(OBJS)
+- $(LD) $(LDFLAGS) $(OBJS) $(EXTRA_LIBDIRS) $(EXTRA_LIBS)
++ $(CXX) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXECUTABLE)
+
+ all: $(EXECUTABLE)
+