[gentoo-commits] repo/gentoo:master commit in: games-util/wit/files/

[gentoo-commits] repo/gentoo:master commit in: games-util/wit/files/

[Michael Palimaka]

commit:     461b32d4ef5c6d7d5754cb6b74f9caaa85957000
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Aug 16 09:19:45 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep  2 15:12:46 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=461b32d4

games-util/wit: remove unused patch

 .../files/wit-2.30a-sizeof-pointer-memaccess.patch | 31 ----------------------
 1 file changed, 31 deletions(-)

diff --git a/games-util/wit/files/wit-2.30a-sizeof-pointer-memaccess.patch b/games-util/wit/files/wit-2.30a-sizeof-pointer-memaccess.patch
deleted file mode 100644
index 32ef56f8653..00000000000
--- a/games-util/wit/files/wit-2.30a-sizeof-pointer-memaccess.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- wit-2.30a/src/lib-file.c
-+++ wit-2.30a/src/lib-file.c
-@@ -3510,7 +3510,7 @@
-     DASSERT(fmap);
-     DASSERT(n_elem>0);
- 
--    memset(fmap,0,sizeof(fmap));
-+    memset(fmap,0,sizeof(*fmap));
- 
-     u64 last_off = 0;
-     while ( last_off < file->st.st_size )
---- wit-2.30a/src/wfuse.c
-+++ wit-2.30a/src/wfuse.c
-@@ -340,7 +340,7 @@
- 	    }
- 	    ResetWBFS(df->wbfs);
- 	    FREE(df->wbfs);
--	    memset(df,0,sizeof(df));
-+	    memset(df,0,sizeof(*df));
- 	    n_dfile--;
- 	}
- 
-@@ -352,7 +352,7 @@
- 
-     if (found_df)
-     {
--	memset(found_df,0,sizeof(found_df));
-+	memset(found_df,0,sizeof(*found_df));
- 	WBFS_t * wbfs = MALLOC(sizeof(*wbfs));
- 	InitializeWBFS(wbfs);
- 	enumError err = OpenWBFS(wbfs,source_file,false,true,0);

[gentoo-commits] repo/gentoo:master commit in: games-util/wit/files/

[Tim Harder]

commit:     79fc4e53c5ce05518a477b059400ea866d7d69e9
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  9 02:12:06 2019 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Fri Aug  9 02:13:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79fc4e53

games-util/wit: fix build failures due to ncurses linking

Closes: https://bugs.gentoo.org/690222

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 games-util/wit/files/wit-3.02a-makefile.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-util/wit/files/wit-3.02a-makefile.patch b/games-util/wit/files/wit-3.02a-makefile.patch
index 7d3be3fbd57..a0dea1405a6 100644
--- a/games-util/wit/files/wit-3.02a-makefile.patch
+++ b/games-util/wit/files/wit-3.02a-makefile.patch
@@ -1,5 +1,5 @@
 Don't link libdl into wfuse as it's unnecessary, use system bzip2, respect user
-CFLAGS, and use verbose build output.
+CFLAGS, use pkgconfig to determine ncurses libs, and use verbose build output.
 
 --- wiimms-iso-tools.source-3.02a/Makefile
 +++ wiimms-iso-tools.source-3.02a/Makefile
@@ -40,7 +40,7 @@ CFLAGS, and use verbose build output.
   LIBS		+= -lz
  endif
 -LIBS		+= -lm -lncurses $(XLIBS)
-+LIBS		+= -lm -lncurses -lbz2 $(XLIBS)
++LIBS		+= -lm $(shell pkg-config --libs ncurses) -lbz2 $(XLIBS)
  
  DISTRIB_RM	= ./wit-v$(VERSION)-r
  DISTRIB_BASE	= wit-v$(VERSION)-r$(REVISION_NEXT)