commit: 14fc2e8417f7cc70736135da8286a716438bba17 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Oct 24 04:22:23 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Oct 24 04:22:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14fc2e84
media-libs/libcaca: drop mistakenly committed patch Fixes: e4d9018ad6d87a731a9fd621561cad1b170aec89 (my fault) Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/libcaca/files/foo | 77 -------------------------------------------- 1 file changed, 77 deletions(-) diff --git a/media-libs/libcaca/files/foo b/media-libs/libcaca/files/foo deleted file mode 100644 index d35de1aa7d2..00000000000 --- a/media-libs/libcaca/files/foo +++ /dev/null @@ -1,77 +0,0 @@ -diff --git a/src/common-image.c b/src/common-image.c -index 7059bf4..d40eba1 100644 ---- a/src/common-image.c -+++ b/src/common-image.c -@@ -22,6 +22,7 @@ - #endif - - #include "caca.h" -+#include "caca_internals.h" - - #include "common-image.h" - -diff --git a/src/Makefile.am b/src/Makefile.am -index 5f0b22f..2f48f27 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -11,7 +11,7 @@ noinst_PROGRAMS = cacadraw - - cacademo_SOURCES = cacademo.c texture.h - cacademo_LDADD = ../caca/libcaca.la ../caca/libcaca.la --cacademo_LDFLAGS = @MATH_LIBS@ -+cacademo_LIBS = @MATH_LIBS@ - - cacafire_SOURCES = aafire.c - cacafire_LDADD = ../caca/libcaca.la ../caca/libcaca.la -@@ -19,7 +19,7 @@ cacafire_LDADD = ../caca/libcaca.la ../caca/libcaca.la - cacaview_SOURCES = cacaview.c common-image.c common-image.h - cacaview_LDADD = ../caca/libcaca.la ../caca/libcaca.la - cacaview_CFLAGS = $(IMLIB2_CFLAGS) --cacaview_LDFLAGS = $(IMLIB2_LIBS) -+cacaview_LIBS = $(IMLIB2_LIBS) - - cacadraw_SOURCES = cacadraw.c - cacadraw_LDADD = ../caca/libcaca.la ../caca/libcaca.la -@@ -37,7 +37,7 @@ cacaclock_LDADD = ../caca/libcaca.la - img2txt_SOURCES = img2txt.c common-image.c common-image.h - img2txt_LDADD = ../caca/libcaca.la - img2txt_CFLAGS = $(IMLIB2_CFLAGS) --img2txt_LDFLAGS = $(IMLIB2_LIBS) -+img2txt_LIBS = $(IMLIB2_LIBS) - - if USE_NETWORK - fcntl_programs = cacaserver -diff --git a/src/Makefile.am b/src/Makefile.am -index 2f48f27..725ad36 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -10,16 +10,14 @@ bin_PROGRAMS = cacademo cacafire cacaplay cacaview img2txt cacaclock $(fcntl_pro - noinst_PROGRAMS = cacadraw - - cacademo_SOURCES = cacademo.c texture.h --cacademo_LDADD = ../caca/libcaca.la ../caca/libcaca.la --cacademo_LIBS = @MATH_LIBS@ -+cacademo_LDADD = ../caca/libcaca.la @MATH_LIBS@ - - cacafire_SOURCES = aafire.c - cacafire_LDADD = ../caca/libcaca.la ../caca/libcaca.la - - cacaview_SOURCES = cacaview.c common-image.c common-image.h --cacaview_LDADD = ../caca/libcaca.la ../caca/libcaca.la -+cacaview_LDADD = ../caca/libcaca.la $(IMLIB2_LIBS) - cacaview_CFLAGS = $(IMLIB2_CFLAGS) --cacaview_LIBS = $(IMLIB2_LIBS) - - cacadraw_SOURCES = cacadraw.c - cacadraw_LDADD = ../caca/libcaca.la ../caca/libcaca.la -@@ -35,9 +33,8 @@ cacaclock_LDADD = ../caca/libcaca.la - - - img2txt_SOURCES = img2txt.c common-image.c common-image.h --img2txt_LDADD = ../caca/libcaca.la -+img2txt_LDADD = ../caca/libcaca.la $(IMLIB2_LIBS) - img2txt_CFLAGS = $(IMLIB2_CFLAGS) --img2txt_LIBS = $(IMLIB2_LIBS) - - if USE_NETWORK - fcntl_programs = cacaserver
