mirror of
https://git.FreeBSD.org/ports.git
synced 2025-02-07 11:49:40 +00:00
Update to upstream SVN rev 605, removing patch.
Fix build-tarball Makefile target, adding missing ${DISTFILES}: target.
This commit is contained in:
parent
a1248a8453
commit
215977f6ef
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=266710
@ -6,7 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= pidgin-skype
|
||||
PORTVERSION= 0.0.0.604
|
||||
PORTVERSION= 0.0.0.605
|
||||
CATEGORIES= net-im
|
||||
MASTER_SITES= ${MASTER_SITE_LOCAL}
|
||||
MASTER_SITE_SUBDIR= mandree
|
||||
@ -28,6 +28,7 @@ USE_XZ= yes
|
||||
|
||||
# this is a local target to build a tarball
|
||||
build-tarball: ${DISTFILES}
|
||||
${DISTFILES}:
|
||||
${RM} -rf ${WRKSRC}
|
||||
svn export -r${PORTVERSION:E} \
|
||||
http://skype4pidgin.googlecode.com/svn/trunk/ ${WRKSRC}
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (pidgin-skype-svn-r604.tar.xz) = c32da346e2baf4105dc5e52be89243fbe8a14e04c5414afaed73d7d6475bc75b
|
||||
SIZE (pidgin-skype-svn-r604.tar.xz) = 113888
|
||||
SHA256 (pidgin-skype-svn-r605.tar.xz) = 9ae6e905653b9b7cfe8529c144566d0a5090bfca257d4746b1a52050f2a688c0
|
||||
SIZE (pidgin-skype-svn-r605.tar.xz) = 113900
|
||||
|
@ -1,32 +0,0 @@
|
||||
--- ./skype_messaging.c.orig 2010-01-28 02:22:49.000000000 +0100
|
||||
+++ ./skype_messaging.c 2010-12-20 02:20:23.000000000 +0100
|
||||
@@ -176,7 +176,7 @@
|
||||
#ifdef __APPLE__
|
||||
guint timeout = 0;
|
||||
#else
|
||||
-#ifdef _WIN32
|
||||
+#if _WIN32 || __FreeBSD__
|
||||
guint timeout = 0;
|
||||
#else
|
||||
gboolean condition_result;
|
||||
@@ -223,6 +223,12 @@
|
||||
|
||||
if (timeout++ == 10000)
|
||||
#else
|
||||
+#ifdef __FreeBSD__
|
||||
+ usleep(1000);
|
||||
+ g_static_mutex_lock2(&mutex);
|
||||
+
|
||||
+ if (timeout++ == 10000)
|
||||
+#else
|
||||
|
||||
//wait for message for a maximum of 10 seconds
|
||||
g_get_current_time(&endtime);
|
||||
@@ -235,6 +241,7 @@
|
||||
if(!condition_result)
|
||||
#endif
|
||||
#endif
|
||||
+#endif
|
||||
{
|
||||
//we timed out while waiting
|
||||
g_hash_table_remove(message_queue, &cur_message_num);
|
Loading…
x
Reference in New Issue
Block a user