mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00
Code Issues Releases Activity

- Catch up with glib20 changes. [1]

Browse Source 
- Add couple of upstream patches for nspluginplayer.

PR:		ports/186115 [1]
This commit is contained in:
Jung-uk Kim 2014-02-10 20:59:11 +00:00
parent afb6e8721c
commit 5744602505
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=343683
2 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/nspluginwrapper/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= nspluginwrapper
PORTVERSION= 1.4.4
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= www linux emulators
MASTER_SITES= http://nspluginwrapper.org/download/ \
LOCAL/jkim \
@ -59,9 +59,6 @@ PLIST_SUB+= HOST_AMD64="@comment "
post-patch:
${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
${WRKSRC}/src/npw-config.c
@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
${WRKSRC}/src/npruntime.c ${WRKSRC}/src/npw-player.c \
${WRKSRC}/src/utils.c
post-install:
${MKDIR} ${STAGEDIR}${LIBDIR}/i386/linux

39
www/nspluginwrapper/files/patch-src__npw-player.c Normal file
View File

@ -0,0 +1,39 @@
--- src/npw-player.c.orig 2011-06-30 23:18:57.000000000 -0400
+++ src/npw-player.c 2014-02-10 15:02:58.000000000 -0500
@@ -25,7 +25,6 @@
#include <unistd.h>
#include <glib.h>
#include <glib/gstdio.h>
-#include <glib/gthread.h>
#include <gtk/gtk.h>
#include <gdk/gdkx.h>
#include <gdk/gdkkeysyms.h>
@@ -1233,6 +1232,7 @@
return NULL;
curl_easy_setopt (handle, CURLOPT_URL, url);
+ curl_easy_setopt (handle, CURLOPT_NOSIGNAL, 1);
curl_easy_setopt (handle, CURLOPT_WRITEFUNCTION, on_stream_read_nothing_cb);
curl_easy_setopt (handle, CURLOPT_FILETIME, 1);
curl_easy_setopt (handle, CURLOPT_TIMECONDITION, CURL_TIMECOND_LASTMOD);
@@ -1626,6 +1626,7 @@
CURL * const handle = pstream->curl_handle;
curl_easy_setopt (handle, CURLOPT_URL, pstream->np_stream->url);
+ curl_easy_setopt (handle, CURLOPT_NOSIGNAL, 1);
curl_easy_setopt (handle, CURLOPT_WRITEFUNCTION, on_stream_read_cb);
curl_easy_setopt (handle, CURLOPT_WRITEDATA, pstream);
curl_easy_setopt (handle, CURLOPT_PRIVATE, pstream);
@@ -2667,7 +2668,11 @@
}
if (g_backend == BACKEND_GTK)
- gtk_main ();
+ {
+ gdk_threads_enter ();
+ gtk_main ();
+ gdk_threads_leave ();
+ }
for (i = 0; i < plugin_descs->len; i++)
{