Gentoo Archives: gentoo-commits

From: "Michael Sterrett (mr_bones_)" <mr_bones_@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in games-rpg/daimonin-client/files: daimonin-client-0.10.5-datadir.patch daimonin-client-0.10.5-nozlib.patch
Date: Wed, 01 Dec 2010 20:26:36
Message-Id: 20101201202627.7B29420057@flycatcher.gentoo.org
1 mr_bones_ 10/12/01 20:26:27
2
3 Added: daimonin-client-0.10.5-datadir.patch
4 daimonin-client-0.10.5-nozlib.patch
5 Log:
6 version bump - ebuild submitted by Simon in bug #338055
7
8 (Portage version: 2.1.9.24/cvs/Linux i686)
9
10 Revision Changes Path
11 1.1 games-rpg/daimonin-client/files/daimonin-client-0.10.5-datadir.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/daimonin-client/files/daimonin-client-0.10.5-datadir.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/daimonin-client/files/daimonin-client-0.10.5-datadir.patch?rev=1.1&content-type=text/plain
15
16 Index: daimonin-client-0.10.5-datadir.patch
17 ===================================================================
18 --- main.c.old 2010-08-24 19:32:55.000000000 +0200
19 +++ main.c 2010-09-19 18:49:54.000000000 +0200
20 @@ -2386,7 +2386,7 @@
21
22 /* Add the base dir to the search path. The base dir is where all the
23 * defaults are (or should be). */
24 - if (!PHYSFS_addToSearchPath(PHYSFS_getBaseDir(), 1))
25 + if (!PHYSFS_addToSearchPath(SYSPATH, 1))
26 {
27 LOG(LOG_MSG, "%s\n", PHYSFS_getLastError());
28 }
29 @@ -2545,13 +2545,13 @@
30
31 /* Prepend the user dir to the search path. This means files are read from
32 * this location in preference to the defaults. */
33 - if (strcmp(PHYSFS_getBaseDir(), home))
34 - {
35 + /*if (strcmp(PHYSFS_getBaseDir(), home))
36 + {*/
37 if (!PHYSFS_addToSearchPath(home, 0))
38 {
39 LOG(LOG_ERROR, "%s\n", PHYSFS_getLastError());
40 }
41 - }
42 + //}
43
44 /* Prepend any add-on packs to the search path. This means files are read
45 * from these locations in preference to the defaults and the user dir. */
46
47
48
49 1.1 games-rpg/daimonin-client/files/daimonin-client-0.10.5-nozlib.patch
50
51 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/daimonin-client/files/daimonin-client-0.10.5-nozlib.patch?rev=1.1&view=markup
52 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-rpg/daimonin-client/files/daimonin-client-0.10.5-nozlib.patch?rev=1.1&content-type=text/plain
53
54 Index: daimonin-client-0.10.5-nozlib.patch
55 ===================================================================
56 --- Makefile.am.old 2010-12-01 14:39:11.605648458 -0500
57 +++ Makefile.am 2010-12-01 14:41:59.875915880 -0500
58 @@ -2,23 +2,18 @@
59 daimonin_PROGRAMS = daimonin daimonin-updater
60
61 daimonin_SOURCES = \
62 - ../../src/adler32.c \
63 ../../src/anim.c \
64 ../../src/book.c \
65 ../../src/buddy.c \
66 ../../src/chatfilter.c \
67 ../../src/client.c \
68 ../../src/commands.c \
69 - ../../src/crc32.c \
70 ../../src/dialog.c \
71 ../../src/event.c \
72 ../../src/filewrap.c \
73 ../../src/font.c \
74 ../../src/group.c \
75 ../../src/ignore.c \
76 - ../../src/inffast.c \
77 - ../../src/inflate.c \
78 - ../../src/inftrees.c \
79 ../../src/interface.c \
80 ../../src/inventory.c \
81 ../../src/item.c \
82 @@ -35,11 +30,9 @@
83 ../../src/sprite.c \
84 ../../src/textwin.c \
85 ../../src/tile_stretcher.c \
86 - ../../src/uncompr.c \
87 ../../src/wrapper.c \
88 - ../../src/widget.c \
89 - ../../src/zutil.c
90 -daimonin_LDADD = -lSDL_mixer -lSDL_image @SDL_LIBS@ @EXTRA_LIBS@ @PHYSFS_LIBS@
91 + ../../src/widget.c
92 +daimonin_LDADD = -lSDL_mixer -lSDL_image @SDL_LIBS@ @EXTRA_LIBS@ @PHYSFS_LIBS@ -lz
93 daimonin_OBJDIR = objs
94
95 daimonin_updater_SOURCES = \