Attachment 190849 Details for Bug 226084 – svn-diff-gxine_0_5_910

[patch] svn-diff-gxine_0_5_910

svn-diff-gxine_0_5_910 (text/plain), 4.07 KB, created by Walter Schwarzenfeld on 2018-02-21 04:34:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2018-02-21 04:34:41 UTC

Size: 4.07 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 462469)
>+++ Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	gxine
>-PORTVERSION=	0.5.908
>-PORTREVISION=	5
>+PORTVERSION=	0.5.910
> CATEGORIES=	multimedia
> MASTER_SITES=	SF/xine/${PORTNAME}/${PORTVERSION}
> 
>@@ -16,10 +15,12 @@
> 		libmozjs185.so:lang/spidermonkey185 \
> 		libxine.so:multimedia/libxine
> 
>-USES=		desktop-file-utils gmake libtool pathfix pkgconfig tar:xz
>-USE_GNOME=	gtk20
>+USES=		desktop-file-utils gettext gmake libtool pathfix pkgconfig tar:xz
>+USE_GNOME=	gtk30
>+USE_XORF=	x11 xcb xext xinerama
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--without-hal --with-libintl-prefix=${LOCALBASE}
>+CONFIGURE_ARGS=	--without-hal --with-libintl-prefix=${LOCALBASE} --with-gtk3
>+
> INSTALLS_ICONS=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>@@ -58,6 +59,7 @@
> 		's|@MAKE_PNG_TRUE@|#|' ${WRKSRC}/pixmaps/Makefile.in
> 
> post-install:
>+	${CP} ${WRKSRC}/pixmaps/logo.mpv ${STAGEDIR}${PREFIX}/share/gxine
> .if ${PORT_OPTIONS:MWEBPLUGIN}
> 	@${STRIP_CMD} ${STAGEDIR}${WEBPLUGIN_DIR}/${WEBPLUGIN_FILES}
> .endif
>Index: distinfo
>===================================================================
>--- distinfo	(revision 462469)
>+++ distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (gxine-0.5.908.tar.xz) = 832e47136ec68a573b22b6cc1c1d57607e78b05712ba9fb8e64464b5201ed9e7
>-SIZE (gxine-0.5.908.tar.xz) = 917780
>+TIMESTAMP = 1519162632
>+SHA256 (gxine-0.5.910.tar.xz) = 567a0e14bea30e8bb82080173b61b574a6a22ab074f513c535f276780741fe17
>+SIZE (gxine-0.5.910.tar.xz) = 931616
>Index: files/patch-src__Makefile.in
>===================================================================
>--- files/patch-src__Makefile.in	(revision 462469)
>+++ files/patch-src__Makefile.in	(working copy)
>@@ -1,21 +1,5 @@
> --- src/Makefile.in.orig	2012-02-21 04:10:20.000000000 +0900
> +++ src/Makefile.in	2012-05-15 17:11:18.000000000 +0900
>-@@ -405,12 +405,12 @@
>- top_builddir = @top_builddir@
>- top_srcdir = @top_srcdir@
>- GNU_VERBOSITY := $(if $(findstring GNU,$(shell $(MAKE) -v)),0,1)
>--INCLUDES = -I../include -I$(top_srcdir)/include -I$(includedir) \
>--	   -I$(top_builddir)/pixmaps $(LIRC_INCLUDE)
>-+INCLUDES = -I../include -I$(top_srcdir)/include \
>-+	   -I$(top_builddir)/pixmaps $(JS_CFLAGS) $(LIRC_INCLUDE)
>- 
>- AM_CFLAGS = $(GNU99) $(XINE_CFLAGS) $(X_CFLAGS) \
>- 	    $(GTK2_CFLAGS) $(GTHREAD2_CFLAGS) \
>--	    $(HAL_CFLAGS) $(UDEV_CFLAGS) $(DBUS_CFLAGS) $(JS_CFLAGS) \
>-+	    $(HAL_CFLAGS) $(UDEV_CFLAGS) $(DBUS_CFLAGS) $(NSPR_CFLAGS) \
>- 	    -DLOCALEDIR=\"$(localedir)\"
>- 
>- gxine_SOURCES = \
> @@ -452,7 +452,7 @@
>  gxine_LDADD = $(XINE_LIBS) $(GTK2_LIBS) $(GTHREAD2_LIBS) \
>  	      $(JS_LIBS) $(HAL_LIBS) $(UDEV_LIBS) $(DBUS_LIBS) $(LIRC_LIBS) \
>Index: files/patch-src__lirc.c
>===================================================================
>--- files/patch-src__lirc.c	(revision 462469)
>+++ files/patch-src__lirc.c	(working copy)
>@@ -1,11 +1,11 @@
>---- src/lirc.c.orig	2011-08-07 20:20:33.000000000 +0900
>-+++ src/lirc.c	2012-05-15 03:54:41.000000000 +0900
>-@@ -223,8 +223,8 @@
>+--- src/lirc.c.orig	2018-02-20 21:48:05 UTC
>++++ src/lirc.c
>+@@ -226,8 +226,8 @@ static JSBool js_reload_lirc (JSContext 
>    if (gxine_lirc_thread_created)
>      pthread_join (gxine_lirc_thread, NULL);
>    gxine_lirc_start ();
> -#endif
>-   JS_SET_RVAL (cx, vp, gxine_lirc_thread ? JSVAL_TRUE : JSVAL_FALSE);
>+   JS_SET_RVAL (cx, vp, gxine_lirc_thread_created ? JSVAL_TRUE : JSVAL_FALSE);
> +#endif
>    return JS_TRUE;
>  }
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 462469)
>+++ pkg-plist	(working copy)
>@@ -1,17 +1,17 @@
> bin/gxine
> bin/gxine_client
>+%%ETCDIR%%/gtk.css
> %%ETCDIR%%/gtkrc
> %%ETCDIR%%/keypad.xml
> %%ETCDIR%%/startup
> %%ETCDIR%%/toolbar-fullscreen.xml
> %%ETCDIR%%/toolbar-window.xml
>-%%WEBPLUGIN%%lib/gxine/gxineplugin.so
>-man/man1/gxine.1.gz
>-man/man1/gxine_client.1.gz
> man/de/man1/gxine.1.gz
> man/de/man1/gxine_client.1.gz
> man/es/man1/gxine.1.gz
> man/es/man1/gxine_client.1.gz
>+man/man1/gxine.1.gz
>+man/man1/gxine_client.1.gz
> share/applications/gxine.desktop
> %%DATADIR%%/logo.mpv
> %%DATADIR%%/mediamarks

Actions: View | Diff

Attachments on bug 226084: 190849