Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Samuli Suominen (drac)" <drac@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-misc/d4x/files: d4x-2.5.7.1-gentoo.patch digest-d4x-2.5.7.1-r2 d4x-2.5.6-libintl_fix.patch digest-d4x-2.5.6
Date: Sun, 28 Oct 2007 10:11:54
Message-Id: E1Im57S-0001FJ-R0@stork.gentoo.org
1 drac 07/10/28 10:11:46
2
3 Added: d4x-2.5.7.1-gentoo.patch digest-d4x-2.5.7.1-r2
4 Removed: d4x-2.5.6-libintl_fix.patch digest-d4x-2.5.6
5 Log:
6 New ebuild and patch for #111769, #130479 and #193360 plus more.
7 (Portage version: 2.1.3.16)
8
9 Revision Changes Path
10 1.1 net-misc/d4x/files/d4x-2.5.7.1-gentoo.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/d4x/files/d4x-2.5.7.1-gentoo.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/d4x/files/d4x-2.5.7.1-gentoo.patch?rev=1.1&content-type=text/plain
14
15 Index: d4x-2.5.7.1-gentoo.patch
16 ===================================================================
17 diff -ur d4x-2.5.7.1.orig/configure d4x-2.5.7.1/configure
18 --- d4x-2.5.7.1.orig/configure 2006-04-12 19:48:29.000000000 +0300
19 +++ d4x-2.5.7.1/configure 2007-10-28 10:56:11.000000000 +0200
20 @@ -18398,11 +18398,6 @@
21
22
23 cat >>confdefs.h <<\_ACEOF
24 -#define GTK_DISABLE_DEPRECATED
25 -_ACEOF
26 -
27 -
28 -cat >>confdefs.h <<\_ACEOF
29 #define _FILE_OFFSET_BITS 64
30 _ACEOF
31
32 diff -ur d4x-2.5.7.1.orig/configure.ac d4x-2.5.7.1/configure.ac
33 --- d4x-2.5.7.1.orig/configure.ac 2005-11-05 01:35:38.000000000 +0200
34 +++ d4x-2.5.7.1/configure.ac 2007-10-28 10:56:11.000000000 +0200
35 @@ -298,7 +298,6 @@
36
37 # Other needed defines
38 AC_DEFINE(_REENTRANT, , [Enable reenrant code of glibc])
39 -AC_DEFINE(GTK_DISABLE_DEPRECATED, , [Enable warnings about deprecated functions usage])
40 AC_DEFINE(_FILE_OFFSET_BITS, 64, [To support files over 2GB])
41
42 # Prepare all requiered flags
43 Only in d4x-2.5.7.1: de.po
44 diff -ur d4x-2.5.7.1.orig/main/face/list.cc d4x-2.5.7.1/main/face/list.cc
45 --- d4x-2.5.7.1.orig/main/face/list.cc 2006-03-20 02:29:41.000000000 +0200
46 +++ d4x-2.5.7.1/main/face/list.cc 2007-10-28 10:56:11.000000000 +0200
47 @@ -8,7 +8,6 @@
48 * but WITHOUT ANY WARRANTY; without even the implied warranty of
49 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
50 */
51 -#define GTK_DISABLE_DEPRECATED
52
53 #include <stdio.h>
54 #include <gtk/gtk.h>
55 diff -ur d4x-2.5.7.1.orig/main/face/prefs.cc d4x-2.5.7.1/main/face/prefs.cc
56 --- d4x-2.5.7.1.orig/main/face/prefs.cc 2005-11-05 21:03:19.000000000 +0200
57 +++ d4x-2.5.7.1/main/face/prefs.cc 2007-10-28 11:04:15.000000000 +0200
58 @@ -9,6 +9,7 @@
59 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
60 */
61
62 +#include <libintl.h>
63 #include <gtk/gtk.h>
64 #include <gdk/gdkkeysyms.h>
65 #include "../ntlocale.h"
66 diff -ur d4x-2.5.7.1.orig/main/signal.cc d4x-2.5.7.1/main/signal.cc
67 --- d4x-2.5.7.1.orig/main/signal.cc 2006-04-05 23:11:43.000000000 +0300
68 +++ d4x-2.5.7.1/main/signal.cc 2007-10-28 10:56:11.000000000 +0200
69 @@ -89,7 +89,7 @@
70
71
72 void my_pthreads_mutex_init(pthread_mutex_t *lock){
73 -#if defined(__linux__)
74 +#if defined(__linux__) || defined(__GLIBC__)
75 /* manual page for mutexes said that mutexes in linux is fast by
76 default...
77 */
78 diff -ur d4x-2.5.7.1.orig/main/socket.cc d4x-2.5.7.1/main/socket.cc
79 --- d4x-2.5.7.1.orig/main/socket.cc 2006-04-09 15:39:25.000000000 +0300
80 +++ d4x-2.5.7.1/main/socket.cc 2007-10-28 10:56:11.000000000 +0200
81 @@ -165,10 +165,10 @@
82 return(SOCKET_CANT_ALLOCATE);
83 int a=1;
84 setsockopt(fd,SOL_SOCKET,SO_KEEPALIVE,(char *)&a,sizeof(a));
85 - setsockopt(fd,SOL_SOCKET,SO_KEEPALIVE,(char *)&a,sizeof(a));
86 + //setsockopt(fd,SOL_SOCKET,SO_KEEPALIVE,(char *)&a,sizeof(a));
87
88 size_t sl=2000; //set receive buffer to default+30% MTU size
89 - setsockopt(fd,SOL_SOCKET,SO_RCVBUF,(char *)&sl,sizeof(sl));
90 + //setsockopt(fd,SOL_SOCKET,SO_RCVBUF,(char *)&sl,sizeof(sl));
91
92 if (!connect_impl())
93 return(SOCKET_CANT_CONNECT);
94 diff -ur d4x-2.5.7.1.orig/Makefile.am d4x-2.5.7.1/Makefile.am
95 --- d4x-2.5.7.1.orig/Makefile.am 2005-08-30 04:48:55.000000000 +0300
96 +++ d4x-2.5.7.1/Makefile.am 2007-10-28 11:28:02.000000000 +0200
97 @@ -4,7 +4,7 @@
98
99 ACLOCAL_AMFLAGS = -I m4
100
101 -SUBDIRS = DOC intl main po share
102 +SUBDIRS = intl main po share
103
104 # Extra files/dirs to be included in distribution
105 EXTRA_DIST = $(top_srcdir)/admin/Makefile.template \
106 diff -ur d4x-2.5.7.1.orig/Makefile.in d4x-2.5.7.1/Makefile.in
107 --- d4x-2.5.7.1.orig/Makefile.in 2006-04-12 19:48:32.000000000 +0300
108 +++ d4x-2.5.7.1/Makefile.in 2007-10-28 11:27:53.000000000 +0200
109 @@ -256,7 +256,7 @@
110 target_os = @target_os@
111 target_vendor = @target_vendor@
112 ACLOCAL_AMFLAGS = -I m4
113 -SUBDIRS = DOC intl main po share
114 +SUBDIRS = intl main po share
115
116 # Extra files/dirs to be included in distribution
117 EXTRA_DIST = $(top_srcdir)/admin/Makefile.template \
118
119
120
121 1.1 net-misc/d4x/files/digest-d4x-2.5.7.1-r2
122
123 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/d4x/files/digest-d4x-2.5.7.1-r2?rev=1.1&view=markup
124 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/d4x/files/digest-d4x-2.5.7.1-r2?rev=1.1&content-type=text/plain
125
126 Index: digest-d4x-2.5.7.1-r2
127 ===================================================================
128 MD5 68d6336c3749a7caabb0f5a5f84f4102 d4x-2.5.7.1.tar.bz2 1606760
129 RMD160 3f3cc855638eb5657553ed181b94cdb68e393599 d4x-2.5.7.1.tar.bz2 1606760
130 SHA256 7504bd38e561877ff5217e0e01dcb8eecaf47540248c7d15d6d1fabe049032c4 d4x-2.5.7.1.tar.bz2 1606760
131
132
133
134 --
135 gentoo-commits@g.o mailing list
Report Message
Find on MARC Find on Google Groups