mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-23 04:23:08 +00:00
- Update to 3.01
- Remove newly added dos lf's from vendor - fix sizeof(void *) != sizeof(int) botch
This commit is contained in:
parent
2b608c5979
commit
b77a7a837f
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=219057
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= fldigi
|
||||
PORTVERSION= 2.10.3
|
||||
PORTVERSION= 3.01
|
||||
CATEGORIES= comms hamradio
|
||||
MASTER_SITES= http://www.w1hkj.com/fldigi-distro/ \
|
||||
${MASTER_SITE_LOCAL}
|
||||
@ -22,6 +22,7 @@ LIB_DEPENDS= fltk:${PORTSDIR}/x11-toolkits/fltk-threads \
|
||||
boost_wave:${PORTSDIR}/devel/boost \
|
||||
pulse:${PORTSDIR}/audio/pulseaudio
|
||||
|
||||
USE_DOS2UNIX= yes
|
||||
USE_GMAKE= yes
|
||||
GNU_CONFIGURE= yes
|
||||
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (fldigi-2.10.3.tar.gz) = d06a2606ce02c877de14884d1ce48eba
|
||||
SHA256 (fldigi-2.10.3.tar.gz) = 601a64540e3477122672f2ff7d2e094ab3d79ebcc24fcf1edb7b660fb8d86f77
|
||||
SIZE (fldigi-2.10.3.tar.gz) = 640426
|
||||
MD5 (fldigi-3.01.tar.gz) = 1dec4bedb919ddafeaf114bf14609bb8
|
||||
SHA256 (fldigi-3.01.tar.gz) = f4d2b3ca8aba052440da95dd1b20a33c91dde62928a6511a1de4ad4cb3ce2500
|
||||
SIZE (fldigi-3.01.tar.gz) = 696006
|
||||
|
@ -1,20 +1,20 @@
|
||||
--- src/dialogs/Viewer.cxx.orig 2008-02-17 13:33:02.000000000 -0500
|
||||
+++ src/dialogs/Viewer.cxx 2008-02-17 13:35:44.000000000 -0500
|
||||
@@ -87,7 +87,7 @@
|
||||
--- src/dialogs/Viewer.cxx.orig 2008-08-14 13:31:08.000000000 -0400
|
||||
+++ src/dialogs/Viewer.cxx 2008-08-17 20:28:40.000000000 -0400
|
||||
@@ -91,7 +91,7 @@
|
||||
|
||||
#ifdef REGEX
|
||||
#if HAVE_REGEX_H
|
||||
regex_t* seek_re = 0;
|
||||
-void re_comp(const char* needle)
|
||||
+void fl_re_comp(const char* needle)
|
||||
{
|
||||
if (seek_re)
|
||||
regfree(seek_re);
|
||||
@@ -292,7 +292,7 @@
|
||||
for (size_t i = 0; i < tofind.length(); i++)
|
||||
tofind[i] = toupper(tofind[i]);
|
||||
@@ -306,7 +306,7 @@
|
||||
#else
|
||||
static Fl_Color seek_color[2] = { FL_FOREGROUND_COLOR,
|
||||
adjust_color(FL_RED, FL_BACKGROUND2_COLOR) }; // invalid RE
|
||||
- re_comp(inpSeek->value());
|
||||
+ fl_re_comp(inpSeek->value());
|
||||
#endif
|
||||
}
|
||||
|
||||
if (inpSeek->textcolor() != seek_color[!seek_re]) {
|
||||
inpSeek->textcolor(seek_color[!seek_re]);
|
||||
inpSeek->redraw();
|
||||
|
20
comms/fldigi/files/patch-src_include_threads.h
Normal file
20
comms/fldigi/files/patch-src_include_threads.h
Normal file
@ -0,0 +1,20 @@
|
||||
--- src/include/threads.h.orig 2008-08-23 12:34:24.000000000 -0400
|
||||
+++ src/include/threads.h 2008-08-23 12:32:50.000000000 -0400
|
||||
@@ -46,6 +46,7 @@
|
||||
#include <config.h>
|
||||
|
||||
#include <pthread.h>
|
||||
+#include <stdint.h>
|
||||
|
||||
typedef pthread_t Fl_Thread;
|
||||
typedef pthread_mutex_t Fl_Mutex;
|
||||
@@ -87,7 +88,8 @@
|
||||
extern pthread_key_t thread_id_;
|
||||
# define CREATE_THREAD_ID() pthread_key_create(&thread_id_, 0);
|
||||
# define SET_THREAD_ID(x) pthread_setspecific(thread_id_, (void *)(x))
|
||||
-# define GET_THREAD_ID() (int)pthread_getspecific(thread_id_)
|
||||
+//# define GET_THREAD_ID() (int)pthread_getspecific(thread_id_)
|
||||
+# define GET_THREAD_ID() (uintptr_t)pthread_getspecific(thread_id_)
|
||||
#endif // USE_TLS
|
||||
|
||||
#include "fl_lock.h"
|
Loading…
Reference in New Issue
Block a user