Date: Mon, 10 Feb 2014 20:59:12 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r343683 - in head/www/nspluginwrapper: . files Message-ID: <201402102059.s1AKxCr3011972@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Mon Feb 10 20:59:11 2014 New Revision: 343683 URL: http://svnweb.freebsd.org/changeset/ports/343683 QAT: https://qat.redports.org/buildarchive/r343683/ Log: - Catch up with glib20 changes. [1] - Add couple of upstream patches for nspluginplayer. PR: ports/186115 [1] Added: head/www/nspluginwrapper/files/patch-src__npw-player.c (contents, props changed) Modified: head/www/nspluginwrapper/Makefile Modified: head/www/nspluginwrapper/Makefile ============================================================================== --- head/www/nspluginwrapper/Makefile Mon Feb 10 20:49:27 2014 (r343682) +++ head/www/nspluginwrapper/Makefile Mon Feb 10 20:59:11 2014 (r343683) @@ -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 Added: head/www/nspluginwrapper/files/patch-src__npw-player.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nspluginwrapper/files/patch-src__npw-player.c Mon Feb 10 20:59:11 2014 (r343683) @@ -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++) + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402102059.s1AKxCr3011972>