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-simulation/senken/files: senken-0.3.0-as-needed.patch senken-0.3.0-warnings.patch
Date: Thu, 30 Oct 2014 15:31:48
Message-Id: 20141030153143.855BE913C@oystercatcher.gentoo.org
1 mr_bones_ 14/10/30 15:31:43
2
3 Modified: senken-0.3.0-as-needed.patch
4 Added: senken-0.3.0-warnings.patch
5 Log:
6 EAPI=5; tidy; fix underlinking again (bug #527462)
7
8 (Portage version: 2.2.8-r2/cvs/Linux x86_64, unsigned Manifest commit)
9
10 Revision Changes Path
11 1.2 games-simulation/senken/files/senken-0.3.0-as-needed.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/senken/files/senken-0.3.0-as-needed.patch?rev=1.2&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/senken/files/senken-0.3.0-as-needed.patch?rev=1.2&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/senken/files/senken-0.3.0-as-needed.patch?r1=1.1&r2=1.2
16
17 Index: senken-0.3.0-as-needed.patch
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/games-simulation/senken/files/senken-0.3.0-as-needed.patch,v
20 retrieving revision 1.1
21 retrieving revision 1.2
22 diff -u -r1.1 -r1.2
23 --- senken-0.3.0-as-needed.patch 11 Feb 2009 13:05:34 -0000 1.1
24 +++ senken-0.3.0-as-needed.patch 30 Oct 2014 15:31:43 -0000 1.2
25 @@ -1,5 +1,6 @@
26 ---- server/Makefile.in.old 2009-02-11 12:45:10.000000000 +0100
27 -+++ server/Makefile.in 2009-02-11 12:45:18.000000000 +0100
28 +diff -ru senken-0.3.0.orig/server/Makefile.in senken-0.3.0/server/Makefile.in
29 +--- senken-0.3.0.orig/server/Makefile.in 2003-11-20 02:30:15.000000000 -0500
30 ++++ senken-0.3.0/server/Makefile.in 2014-10-30 10:58:51.202157036 -0400
31 @@ -10,7 +10,7 @@
32
33 DEFS = @DEFS@
34 @@ -9,3 +10,15 @@
35
36 prefix = @prefix@
37 exec_prefix = @exec_prefix@
38 +diff -ru senken-0.3.0.orig/src/Makefile.in senken-0.3.0/src/Makefile.in
39 +--- senken-0.3.0.orig/src/Makefile.in 2003-11-20 02:30:16.000000000 -0500
40 ++++ senken-0.3.0/src/Makefile.in 2014-10-30 10:59:05.154704393 -0400
41 +@@ -8,7 +8,7 @@
42 +
43 + DEFS = @DEFS@
44 + CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @GTK_CFLAGS@
45 +-LIBS = ../lib/libsenken.a @LIBS@ @GTK_LIBS@
46 ++LIBS = ../lib/libsenken.a @LIBS@ @GTK_LIBS@ -lm
47 +
48 + prefix = @prefix@
49 + exec_prefix = @exec_prefix@
50
51
52
53 1.1 games-simulation/senken/files/senken-0.3.0-warnings.patch
54
55 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/senken/files/senken-0.3.0-warnings.patch?rev=1.1&view=markup
56 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-simulation/senken/files/senken-0.3.0-warnings.patch?rev=1.1&content-type=text/plain
57
58 Index: senken-0.3.0-warnings.patch
59 ===================================================================
60 diff -ru senken-0.3.0.orig/server/protocol.c senken-0.3.0/server/protocol.c
61 --- senken-0.3.0.orig/server/protocol.c 2003-11-20 02:30:15.000000000 -0500
62 +++ senken-0.3.0/server/protocol.c 2014-10-30 11:04:39.831848871 -0400
63 @@ -294,7 +294,7 @@
64 /*
65 * If transaction active just save this for later
66 */
67 - if (connection_txn_active) {
68 + if (connection_txn_active(conn)) {
69 set_op_t *op = calloc(1, sizeof(set_op_t));
70 int r;
71
72 diff -ru senken-0.3.0.orig/src/gtkhelp_reports.c senken-0.3.0/src/gtkhelp_reports.c
73 --- senken-0.3.0.orig/src/gtkhelp_reports.c 2003-11-20 02:30:16.000000000 -0500
74 +++ senken-0.3.0/src/gtkhelp_reports.c 2014-10-30 11:06:43.795828908 -0400
75 @@ -1,3 +1,4 @@
76 +#include <string.h>
77 #include <gtk/gtk.h>
78 #include <gdk/gdk.h>
79
80 diff -ru senken-0.3.0.orig/src/main.c senken-0.3.0/src/main.c
81 --- senken-0.3.0.orig/src/main.c 2003-11-20 02:30:16.000000000 -0500
82 +++ senken-0.3.0/src/main.c 2014-10-30 11:06:28.147336339 -0400
83 @@ -25,6 +25,7 @@
84 # include <config.h>
85 #endif
86
87 +#include <string.h>
88 #include <unistd.h>
89 #include <signal.h>
90 #include <gtk/gtk.h>