summaryrefslogtreecommitdiff
path: root/app-i18n/xvnkb/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2021-10-20 10:22:14 +0100
committerV3n3RiX <venerix@koprulu.sector>2021-10-20 10:22:14 +0100
commit46eedbedafdb0040c37884982d4c775ce277fb7b (patch)
treedb33a91259730be84999e13a8d8168c799f50ac0 /app-i18n/xvnkb/files
parente23a08d0c97a0cc415aaa165da840b056f93c997 (diff)
gentoo resync : 20.10.2021
Diffstat (limited to 'app-i18n/xvnkb/files')
-rw-r--r--app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch30
-rw-r--r--app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch8
-rw-r--r--app-i18n/xvnkb/files/xvnkb-cc.patch10
3 files changed, 42 insertions, 6 deletions
diff --git a/app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch b/app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch
new file mode 100644
index 000000000000..8cae65fda777
--- /dev/null
+++ b/app-i18n/xvnkb/files/xvnkb-0.2.11-ldflags.patch
@@ -0,0 +1,30 @@
+--- a/Makefile.common
++++ b/Makefile.common
+@@ -19,10 +19,10 @@
+ $(CC) -fpic $(CFLAGS) $(FPTR) $(VK_OPT) -DVERSION=\"$(VERSION)\" -Wall -I$(XLIB_INC) -c $<
+
+ $(CORE): $(CORE_OBJS)
+- $(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) -lX11
++ $(CC) $(CFLAGS) $(DLFLAGS) $(CORE_OBJS) -o $@ -L$(XLIB_PATH) $(LIBDL) $(LDFLAGS) -lX11
+
+ $(GUI): $(GUI_OBJS)
+- $(CC) $(CFLAGS) $(GUI_OBJS) -o $@ -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS)
++ $(CC) $(CFLAGS) $(GUI_OBJS) -o $@ -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) $(LDFLAGS)
+
+ main: $(CORE) $(GUI)
+ @echo >/dev/null
+--- a/tools/Makefile.common
++++ b/tools/Makefile.common
+@@ -16,10 +16,10 @@
+ $(CC) $(CFLAGS) $(DEFS) -Wall -I$(XLIB_INC) -c $<
+
+ xvnkb_ctrl: $(CONTROL_OBJS)
+- $(CC) $(CFLAGS) -o $@ $(CONTROL_OBJS) -L$(XLIB_PATH) $(LIBS)
++ $(CC) $(CFLAGS) -o $@ $(CONTROL_OBJS) -L$(XLIB_PATH) $(LIBS) $(LDFLAGS)
+
+ xvnkb_setup: $(SETUP_OBJS)
+- $(CC) $(CFLAGS) -o $@ $(SETUP_OBJS) -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS)
++ $(CC) $(CFLAGS) -o $@ $(SETUP_OBJS) -L$(XLIB_PATH) $(LIBS) $(XFT_LIBS) $(LDFLAGS)
+
+ main-tools: $(TOOLS)
+
diff --git a/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch b/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch
index f089f0dde899..b954b2914178 100644
--- a/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch
+++ b/app-i18n/xvnkb/files/xvnkb-0.2.9a-ldflags.patch
@@ -1,8 +1,6 @@
-diff --git a/Makefile.common b/Makefile.common
-index 06f0b78..d9f8976 100644
--- a/Makefile.common
+++ b/Makefile.common
-@@ -19,10 +19,10 @@ all: do-it-all
+@@ -19,10 +19,10 @@
$(CC) -fpic $(CFLAGS) $(FPTR) $(VK_OPT) -DVERSION=\"$(VERSION)\" -Wall -I$(XLIB_INC) -c $<
$(CORE): $(CORE_OBJS)
@@ -15,11 +13,9 @@ index 06f0b78..d9f8976 100644
main: $(CORE) $(GUI)
@echo >/dev/null
-diff --git a/tools/Makefile.common b/tools/Makefile.common
-index fe16cc1..16ec511 100644
--- a/tools/Makefile.common
+++ b/tools/Makefile.common
-@@ -16,10 +16,10 @@ all: do-it-all
+@@ -16,10 +16,10 @@
$(CC) $(CFLAGS) $(DEFS) -Wall -I$(XLIB_INC) -c $<
xvnkb_ctrl: $(CONTROL_OBJS)
diff --git a/app-i18n/xvnkb/files/xvnkb-cc.patch b/app-i18n/xvnkb/files/xvnkb-cc.patch
new file mode 100644
index 000000000000..1104998f7883
--- /dev/null
+++ b/app-i18n/xvnkb/files/xvnkb-cc.patch
@@ -0,0 +1,10 @@
+--- a/tools/Makefile.common
++++ b/tools/Makefile.common
+@@ -49,6 +49,6 @@
+ Makefile.dep:
+ @echo
+ @echo -n Create $@ ...
+- @gcc -I$(XLIB_INC) -MM *.c > $@
++ @$(CC) -I$(XLIB_INC) -MM *.c > $@
+ @echo " done"
+ @echo