1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
|
diff -ur d4x-2.5.7.1.orig/configure d4x-2.5.7.1/configure
--- d4x-2.5.7.1.orig/configure 2006-04-12 19:48:29.000000000 +0300
+++ d4x-2.5.7.1/configure 2007-10-28 10:56:11.000000000 +0200
@@ -18398,11 +18398,6 @@
cat >>confdefs.h <<\_ACEOF
-#define GTK_DISABLE_DEPRECATED
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
#define _FILE_OFFSET_BITS 64
_ACEOF
diff -ur d4x-2.5.7.1.orig/configure.ac d4x-2.5.7.1/configure.ac
--- d4x-2.5.7.1.orig/configure.ac 2005-11-05 01:35:38.000000000 +0200
+++ d4x-2.5.7.1/configure.ac 2007-10-28 10:56:11.000000000 +0200
@@ -298,7 +298,6 @@
# Other needed defines
AC_DEFINE(_REENTRANT, , [Enable reenrant code of glibc])
-AC_DEFINE(GTK_DISABLE_DEPRECATED, , [Enable warnings about deprecated functions usage])
AC_DEFINE(_FILE_OFFSET_BITS, 64, [To support files over 2GB])
# Prepare all requiered flags
Only in d4x-2.5.7.1: de.po
diff -ur d4x-2.5.7.1.orig/main/face/list.cc d4x-2.5.7.1/main/face/list.cc
--- d4x-2.5.7.1.orig/main/face/list.cc 2006-03-20 02:29:41.000000000 +0200
+++ d4x-2.5.7.1/main/face/list.cc 2007-10-28 10:56:11.000000000 +0200
@@ -8,7 +8,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
-#define GTK_DISABLE_DEPRECATED
#include <stdio.h>
#include <gtk/gtk.h>
diff -ur d4x-2.5.7.1.orig/main/face/prefs.cc d4x-2.5.7.1/main/face/prefs.cc
--- d4x-2.5.7.1.orig/main/face/prefs.cc 2005-11-05 21:03:19.000000000 +0200
+++ d4x-2.5.7.1/main/face/prefs.cc 2007-10-28 11:04:15.000000000 +0200
@@ -9,6 +9,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*/
+#include <libintl.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include "../ntlocale.h"
diff -ur d4x-2.5.7.1.orig/main/signal.cc d4x-2.5.7.1/main/signal.cc
--- d4x-2.5.7.1.orig/main/signal.cc 2006-04-05 23:11:43.000000000 +0300
+++ d4x-2.5.7.1/main/signal.cc 2007-10-28 10:56:11.000000000 +0200
@@ -89,7 +89,7 @@
void my_pthreads_mutex_init(pthread_mutex_t *lock){
-#if defined(__linux__)
+#if defined(__linux__) || defined(__GLIBC__)
/* manual page for mutexes said that mutexes in linux is fast by
default...
*/
diff -ur d4x-2.5.7.1.orig/main/socket.cc d4x-2.5.7.1/main/socket.cc
--- d4x-2.5.7.1.orig/main/socket.cc 2006-04-09 15:39:25.000000000 +0300
+++ d4x-2.5.7.1/main/socket.cc 2007-10-28 10:56:11.000000000 +0200
@@ -165,10 +165,10 @@
return(SOCKET_CANT_ALLOCATE);
int a=1;
setsockopt(fd,SOL_SOCKET,SO_KEEPALIVE,(char *)&a,sizeof(a));
- setsockopt(fd,SOL_SOCKET,SO_KEEPALIVE,(char *)&a,sizeof(a));
+ //setsockopt(fd,SOL_SOCKET,SO_KEEPALIVE,(char *)&a,sizeof(a));
size_t sl=2000; //set receive buffer to default+30% MTU size
- setsockopt(fd,SOL_SOCKET,SO_RCVBUF,(char *)&sl,sizeof(sl));
+ //setsockopt(fd,SOL_SOCKET,SO_RCVBUF,(char *)&sl,sizeof(sl));
if (!connect_impl())
return(SOCKET_CANT_CONNECT);
diff -ur d4x-2.5.7.1.orig/Makefile.am d4x-2.5.7.1/Makefile.am
--- d4x-2.5.7.1.orig/Makefile.am 2005-08-30 04:48:55.000000000 +0300
+++ d4x-2.5.7.1/Makefile.am 2007-10-28 11:28:02.000000000 +0200
@@ -4,7 +4,7 @@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = DOC intl main po share
+SUBDIRS = intl main po share
# Extra files/dirs to be included in distribution
EXTRA_DIST = $(top_srcdir)/admin/Makefile.template \
diff -ur d4x-2.5.7.1.orig/Makefile.in d4x-2.5.7.1/Makefile.in
--- d4x-2.5.7.1.orig/Makefile.in 2006-04-12 19:48:32.000000000 +0300
+++ d4x-2.5.7.1/Makefile.in 2007-10-28 11:27:53.000000000 +0200
@@ -256,7 +256,7 @@
target_os = @target_os@
target_vendor = @target_vendor@
ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = DOC intl main po share
+SUBDIRS = intl main po share
# Extra files/dirs to be included in distribution
EXTRA_DIST = $(top_srcdir)/admin/Makefile.template \
|
