summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2018-05-11 17:48:56 +0200
committerLars Wendler <polynomial-c@gentoo.org>2018-05-11 17:48:56 +0200
commitf820eff8bf92cdc55898df2dfb3d83d2aae2568d (patch)
treee4c9f645c7f80c70e41df8799ec87bf08c06f157 /app-misc/wcd/files/wcd-6.0.2-gentoo.patch
parentapp-admin/keepassxc: Bump to version 2.3.3 (diff)
downloadgentoo-f820eff8bf92cdc55898df2dfb3d83d2aae2568d.tar.gz
gentoo-f820eff8bf92cdc55898df2dfb3d83d2aae2568d.tar.bz2
gentoo-f820eff8bf92cdc55898df2dfb3d83d2aae2568d.zip
app-misc/wcd: Bump to version 6.0.2
Package-Manager: Portage-2.3.36, Repoman-2.3.9
Diffstat (limited to 'app-misc/wcd/files/wcd-6.0.2-gentoo.patch')
-rw-r--r--app-misc/wcd/files/wcd-6.0.2-gentoo.patch67
1 files changed, 67 insertions, 0 deletions
diff --git a/app-misc/wcd/files/wcd-6.0.2-gentoo.patch b/app-misc/wcd/files/wcd-6.0.2-gentoo.patch
new file mode 100644
index 00000000000..ecd7c530f15
--- /dev/null
+++ b/app-misc/wcd/files/wcd-6.0.2-gentoo.patch
@@ -0,0 +1,67 @@
+--- wcd-6.0.2/src/Makefile
++++ wcd-6.0.2/src/Makefile
+@@ -45,12 +45,12 @@
+
+ CC ?= gcc
+ STATIC =
+-STRIP = strip
++STRIP =
+
+ ENABLE_NLS = 1
+
+ PACKAGE = wcd
+-EXT = .exe
++EXT =
+ PROGRAM = $(PACKAGE)$(EXT)
+ BIN = $(PROGRAM)
+
+@@ -328,9 +328,9 @@
+ # possible values: ncurses, curses, pdcurses, pdcursesw or <empty>
+
+ ifdef UCS
+- CURSES = ncursesw
++ CURSES = $(shell pkg-config --libs ncursesw)
+ else
+- CURSES = ncurses
++ CURSES = $(shell pkg-config --libs ncurses)
+ endif
+
+
+@@ -360,7 +360,7 @@
+
+ ifneq (,$(CURSES))
+ DEFS_CURSES = -DWCD_USECURSES
+- LIB_CURSES = -l$(CURSES)
++ LIB_CURSES = $(CURSES)
+ ifeq (os/2,$(OS))
+ LIB_CURSES += -ltinfo
+ endif
+@@ -458,15 +458,15 @@
+
+ LDFLAGS_USER =
+ LDFLAGS ?=
+-LDFLAGS += $(RPM_LD_FLAGS) \
++LIBS = $(RPM_LD_FLAGS) \
+ $(LDFLAGS_EXTRA) \
+ $(NLFLAG) \
+ $(LDFLAG_STATIC) \
+ $(LDFLAGS_USER)
+
+-LIBS = $(LIB_CURSES) \
+- $(LIB_UNISTRING) \
+- $(LIBS_EXTRA)
++LIBS += $(LIB_CURSES) \
++ $(LIB_UNISTRING) \
++ $(LIBS_EXTRA)
+
+ DEFS_USER =
+ DEFS = $(DEF_UNIX) $(DEFS_CURSES) $(EXTRA_DEFS) $(DEFS_USER)
+@@ -523,7 +523,7 @@
+
+ $(BIN): $(OBJS1)
+ $(MAKE) status
+- $(CC) $(OBJS1) $(LDFLAGS) $(LIBS) -o $@
++ $(CC) $(LDFLAGS) $(OBJS1) -o $@ $(LIBS)
+
+ %.o: %.c
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) -c $< -o $@