diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
| commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
| tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /dev-games/guichan/files | |
| parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) | |
gentoo resync : 28.04.2021
Diffstat (limited to 'dev-games/guichan/files')
3 files changed, 54 insertions, 6 deletions
diff --git a/dev-games/guichan/files/guichan-0.8.2-as-needed.patch b/dev-games/guichan/files/guichan-0.8.2-as-needed.patch index 79eb563c0f8d..c4d8228e9ac6 100644 --- a/dev-games/guichan/files/guichan-0.8.2-as-needed.patch +++ b/dev-games/guichan/files/guichan-0.8.2-as-needed.patch @@ -1,13 +1,13 @@ ---- src/Makefile.am -+++ src/Makefile.am +--- a/src/Makefile.am ++++ b/src/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = widgets @GUICHAN_EXTRADIRS@ hge openlayer contrib +SUBDIRS = widgets . @GUICHAN_EXTRADIRS@ hge openlayer contrib INCLUDES = -I$(top_srcdir)/include ---- src/sdl/Makefile.am -+++ src/sdl/Makefile.am +--- a/src/sdl/Makefile.am ++++ b/src/sdl/Makefile.am @@ -6,6 +6,8 @@ libguichan_sdl_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) diff --git a/dev-games/guichan/files/guichan-0.8.2-automake-1.13.patch b/dev-games/guichan/files/guichan-0.8.2-automake-1.13.patch index e2f46097b82a..abc0d80ef62d 100644 --- a/dev-games/guichan/files/guichan-0.8.2-automake-1.13.patch +++ b/dev-games/guichan/files/guichan-0.8.2-automake-1.13.patch @@ -1,5 +1,5 @@ ---- guichan-0.8.2/configure.in -+++ guichan-0.8.2/configure.in +--- a/configure.in ++++ b/configure.in @@ -38,7 +38,7 @@ AC_SUBST(LT_AGE) diff --git a/dev-games/guichan/files/guichan-0.8.2-slibtool-undefined-references.patch b/dev-games/guichan/files/guichan-0.8.2-slibtool-undefined-references.patch new file mode 100644 index 000000000000..bec3cc9bb484 --- /dev/null +++ b/dev-games/guichan/files/guichan-0.8.2-slibtool-undefined-references.patch @@ -0,0 +1,48 @@ +https://bugs.gentoo.org/779040 + +commit a1e784de2edc4784c440246998fb8ad28065cc39 +Author: orbea <orbea@riseup.net> +Date: Tue Mar 30 07:34:15 2021 -0700 + + build: Fix the build with -no-undefined. + +--- a/src/allegro/Makefile.am ++++ b/src/allegro/Makefile.am +@@ -3,6 +3,7 @@ lib_LTLIBRARIES = libguichan_allegro.la + INCLUDES = -I$(top_srcdir)/include + + libguichan_allegro_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) ++libguichan_allegro_la_LIBADD = $(top_srcdir)/src/libguichan.la -lalleg + + libguichan_allegro_la_SOURCES = \ + allegro.cpp \ +@@ -10,4 +11,4 @@ libguichan_allegro_la_SOURCES = \ + allegrographics.cpp \ + allegroimage.cpp \ + allegroimageloader.cpp \ +- allegroinput.cpp +\ No newline at end of file ++ allegroinput.cpp +--- a/src/opengl/Makefile.am ++++ b/src/opengl/Makefile.am +@@ -3,6 +3,7 @@ lib_LTLIBRARIES = libguichan_opengl.la + INCLUDES = -I$(top_srcdir)/include + + libguichan_opengl_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) ++libguichan_opengl_la_LIBADD = $(top_srcdir)/src/libguichan.la -lGL + + libguichan_opengl_la_SOURCES = \ + opengl.cpp \ +diff --git a/src/sdl/Makefile.am b/src/sdl/Makefile.am +index 61b3d50..728ca3c 100644 +--- a/src/sdl/Makefile.am ++++ b/src/sdl/Makefile.am +@@ -6,7 +6,7 @@ INCLUDES = -I$(top_srcdir)/include + + libguichan_sdl_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + +-libguichan_sdl_la_LIBADD = -lSDL_image -L$(top_srcdir)/src -lguichan ++libguichan_sdl_la_LIBADD = $(top_srcdir)/src/libguichan.la -lSDL -lSDL_image + + libguichan_sdl_la_SOURCES = \ + sdl.cpp \ |