summaryrefslogtreecommitdiffstats
path: root/net-misc/d4x/files
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/d4x/files')
-rw-r--r--net-misc/d4x/files/d4x-2.5.7.1-ds-compile.patch96
-rw-r--r--net-misc/d4x/files/d4x-2.5.7.1-gentoo.patch101
-rw-r--r--net-misc/d4x/files/d4x-ds-X.diff24
3 files changed, 221 insertions, 0 deletions
diff --git a/net-misc/d4x/files/d4x-2.5.7.1-ds-compile.patch b/net-misc/d4x/files/d4x-2.5.7.1-ds-compile.patch
new file mode 100644
index 0000000..b4620d0
--- /dev/null
+++ b/net-misc/d4x/files/d4x-2.5.7.1-ds-compile.patch
@@ -0,0 +1,96 @@
+diff -dPNur d4x-2.5.7.1/main/face/edit.cc d4x-2.5.7.1-ds/main/face/edit.cc
+--- d4x-2.5.7.1/main/face/edit.cc 2006-03-20 01:10:36.000000000 +0100
++++ d4x-2.5.7.1-ds/main/face/edit.cc 2011-10-09 12:34:07.000000000 +0200
+@@ -1450,7 +1450,7 @@
+
+ static void _proxy_port_changed_(GtkEntry *entry,GtkEntry *entryh){
+ const char *tmp=gtk_entry_get_text(entryh);
+- char *tmp1=index(tmp,':');
++ char *tmp1=(char*)index(tmp,':');
+ if (tmp1){
+ *tmp1=0;
+ char *ns=sum_strings(tmp,":",gtk_entry_get_text(entry),NULL);
+diff -dPNur d4x-2.5.7.1/main/ftp.cc d4x-2.5.7.1-new/main/ftp.cc
+--- d4x-2.5.7.1/main/ftp.cc 2006-04-05 21:11:45.000000000 +0200
++++ d4x-2.5.7.1-new/main/ftp.cc 2011-10-09 12:41:22.000000000 +0200
+@@ -261,7 +261,7 @@
+ };
+
+ static void d4x_ftp_parse_pasv(const char *str,int args[]){
+- char *a=index(str,'(');
++ char *a=(char*)index(str,'(');
+ if (a==NULL) return;
+ a+=1;
+ int i=0;
+diff -dPNur d4x-2.5.7.1/main/html.cc d4x-2.5.7.1-new/main/html.cc
+--- d4x-2.5.7.1/main/html.cc 2005-09-13 07:42:40.000000000 +0200
++++ d4x-2.5.7.1-new/main/html.cc 2011-10-09 12:38:50.000000000 +0200
+@@ -700,7 +700,7 @@
+
+ void tHtmlParser::set_content_type(const char *ct){
+ //Example: text/html; charset=koi8-r
+- char *a=index(ct,'=');
++ char *a=(char*)index(ct,'=');
+ if (a) codepage=a+1;
+ };
+
+diff -dPNur d4x-2.5.7.1/main/locstr.cc d4x-2.5.7.1-new/main/locstr.cc
+--- d4x-2.5.7.1/main/locstr.cc 2005-11-11 22:38:45.000000000 +0100
++++ d4x-2.5.7.1-new/main/locstr.cc 2011-10-09 12:40:33.000000000 +0200
+@@ -281,7 +281,7 @@
+ DBC_RETVAL_IF_FAIL(str!=NULL,NULL);
+ DBC_RETVAL_IF_FAIL(what!=NULL,NULL);
+ while (*str){
+- char *a=index(what,*str);
++ char *a=(char*)index(what,*str);
+ if (a) return(str);
+ str++;
+ };
+@@ -472,7 +472,7 @@
+ char *escape_char(const char *where,char what,char bywhat){
+ DBC_RETVAL_IF_FAIL(where!=NULL,NULL);
+ int num=0;
+- char *tmp=index(where,what);
++ char *tmp=(char*)index(where,what);
+ while(tmp){
+ num+=1;
+ tmp=index(tmp+1,what);
+@@ -481,7 +481,7 @@
+ char *rvalue=new char[strlen(where)+num*2+1];
+ *rvalue=0;
+ char *r=rvalue;
+- tmp=index(where,what);
++ tmp=(char*)index(where,what);
+ while(tmp){
+ if (tmp-where)
+ memcpy(r,where,tmp-where);
+@@ -490,7 +490,7 @@
+ r[1]=what;
+ r+=2;
+ where=tmp+1;
+- tmp=index(where,what);
++ tmp=(char*)index(where,what);
+ };
+ *r=0;
+ if (*where)
+@@ -962,17 +962,17 @@
+ DBC_RETVAL_IF_FAIL(a!=NULL,NULL);
+ DBC_RETVAL_IF_FAIL(b!=NULL,NULL);
+ int i=0;
+- char *temp=index(b,'/');
++ char *temp=(char*)index(b,'/');
+ while (temp){
+ while (*temp=='/') temp+=1;
+ temp=index(temp,'/');
+ i+=1;
+ };
+ i-=1;
+- temp=rindex(a,'/');
++ temp=(char*)rindex(a,'/');
+ while (temp && i>0){
+ *temp=0;
+- char *tmp=rindex(a,'/');
++ char *tmp=(char*)rindex(a,'/');
+ *temp='/';
+ temp=tmp;
+ i-=1;
diff --git a/net-misc/d4x/files/d4x-2.5.7.1-gentoo.patch b/net-misc/d4x/files/d4x-2.5.7.1-gentoo.patch
new file mode 100644
index 0000000..f0014ca
--- /dev/null
+++ b/net-misc/d4x/files/d4x-2.5.7.1-gentoo.patch
@@ -0,0 +1,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 \
diff --git a/net-misc/d4x/files/d4x-ds-X.diff b/net-misc/d4x/files/d4x-ds-X.diff
new file mode 100644
index 0000000..72d3596
--- /dev/null
+++ b/net-misc/d4x/files/d4x-ds-X.diff
@@ -0,0 +1,24 @@
+diff -dPNur d4x-2.5.7.1-orig/configure d4x-2.5.7.1/configure
+--- d4x-2.5.7.1-orig/configure 2017-01-29 09:42:34.000000000 +0100
++++ d4x-2.5.7.1/configure 2017-01-29 09:46:56.947138276 +0100
+@@ -18405,7 +18405,7 @@
+ # Prepare all requiered flags
+ CXXFLAGS="$CXXFLAGS $OS_CXXFLAGS"
+ CPPFLAGS="$CPPFLAGS $ESD_CFLAGS $ESD_CFLAGS $GLIB_CFLAGS $GTK_CFLAGS $OS_INCLUDES $AO_CFLAGS $SSL_CFLAGS"
+-LIBS="$LIBS $ESD_LIBS $GLIB_LIBS $GTK_LIBS $LIBRX $AO_LIBS $SSL_LIBS"
++LIBS="$LIBS $ESD_LIBS $GLIB_LIBS $GTK_LIBS $LIBRX $AO_LIBS $SSL_LIBS -lX11"
+ LDFLAGS="$LDFLAGS $SSL_LDFLAGS"
+
+ # Remove duplicates from options
+diff -dPNur d4x-2.5.7.1-orig/configure.ac d4x-2.5.7.1/configure.ac
+--- d4x-2.5.7.1-orig/configure.ac 2017-01-29 09:47:14.316452900 +0100
++++ d4x-2.5.7.1/configure.ac 2017-01-29 09:42:34.801390253 +0100
+@@ -303,7 +303,7 @@
+ # Prepare all requiered flags
+ CXXFLAGS="$CXXFLAGS $OS_CXXFLAGS"
+ CPPFLAGS="$CPPFLAGS $ESD_CFLAGS $ESD_CFLAGS $GLIB_CFLAGS $GTK_CFLAGS $OS_INCLUDES $AO_CFLAGS $SSL_CFLAGS"
+-LIBS="$LIBS $ESD_LIBS $GLIB_LIBS $GTK_LIBS $LIBRX $AO_LIBS $SSL_LIBS"
++LIBS="$LIBS $ESD_LIBS $GLIB_LIBS $GTK_LIBS $LIBRX $AO_LIBS $SSL_LIBS -lX11"
+ LDFLAGS="$LDFLAGS $SSL_LDFLAGS"
+
+ # Remove duplicates from options
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 08:59:46 +0000