commit c3765a831a28b5978bcf16874f28c7a62f9c6dde
Author: Jan Rękorajski <[email protected]>
Date: Fri Dec 6 20:15:54 2019 +0100
- fix nested function trampoline gcc error
- rel 19
dchub.spec | 4 +++-
trampoline.patch | 32 ++++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 1 deletion(-)
---
diff --git a/dchub.spec b/dchub.spec
index 05c8c4f..7823ba2 100644
--- a/dchub.spec
+++ b/dchub.spec
@@ -2,7 +2,7 @@ Summary: Direct Connect Hub
Summary(pl.UTF-8): Serwer Direct Connect
Name: dchub
Version: 0.5.2
-Release: 18
+Release: 19
License: GPL
Group: Applications/Communications
Source0: http://ac2i.homelinux.com/dctc/%{name}-%{version}.tar.gz
@@ -13,6 +13,7 @@ Patch2: %{name}-crcdir.patch
Patch3: %{name}-pic.patch
Patch4: am.patch
Patch5: format-security.patch
+Patch6: trampoline.patch
URL: http://ac2i.homelinux.com/dctc/
BuildRequires: autoconf
BuildRequires: automake
@@ -46,6 +47,7 @@ dchub jest hubem sieci direct connect służącej do wymiany
plików.
%patch3 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%build
%{__aclocal}
diff --git a/trampoline.patch b/trampoline.patch
new file mode 100644
index 0000000..7285726
--- /dev/null
+++ b/trampoline.patch
@@ -0,0 +1,32 @@
+--- dchub-0.5.2/src/timed_out_string.c~ 2003-11-05 19:03:50.000000000
+0100
++++ dchub-0.5.2/src/timed_out_string.c 2019-12-06 20:13:38.490145493 +0100
+@@ -654,14 +654,6 @@
+ return result;
+ }
+
+-#ifdef WIN32
+-#define BUG_COMPILE 1
+-#endif
+-#ifdef __APPLE__
+-#define BUG_COMPILE 1
+-#endif
+-
+-#ifdef BUG_COMPILE
+ static unsigned long local_key;
+
+ static int list(const time_t timeout, const char *ptr1, const int len1, const
char *ptr2, const int len2, void *xtra)
+@@ -675,14 +667,3 @@
+ local_key = key;
+ scan_all_tos_entry(key, list, NULL);
+ }
+-#else
+-void gui_ban_list(const unsigned long key)
+-{
+- int list(const time_t timeout, const char *ptr1, const int len1, const
char *ptr2, const int len2, void *xtra)
+- {
+- gui_send(key, ptr1, len1, ptr2, len2, 'b');
+- return(0);
+- }
+- scan_all_tos_entry(key, list, NULL);
+-}
+-#endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dchub.git/commitdiff/c3765a831a28b5978bcf16874f28c7a62f9c6dde
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
