Attachment 170883 Details for Bug 209906 – uTox.diff

uTox.diff

patch-uTox.txt (text/plain), 2.52 KB, created by Ivan Klymenko on 2016-05-31 16:37:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Klymenko

Created: 2016-05-31 16:37:58 UTC

Size: 2.52 KB

patch

obsolete

>diff --git a/uTox.orig/Makefile b/uTox.new/Makefile
>index 9d31dc4..8b4a9a1 100644
>--- a/uTox.orig/Makefile
>+++ b/uTox.new/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	uTox
>-PORTVERSION=	0.8.2.20160511
>+PORTVERSION=	0.9.5.20160530
> CATEGORIES=	net-im net-p2p
> 
> MAINTAINER=	fidaj@ukr.net
>@@ -15,12 +15,13 @@ LIB_DEPENDS=	libfreetype.so:print/freetype2 \
> 		libsodium.so:security/libsodium \
> 		libv4lconvert.so:multimedia/libv4l \
> 		libvpx.so:multimedia/libvpx \
>-		libfilteraudio.so:audio/libfilteraudio
>+		libfilteraudio.so:audio/libfilteraudio\
>+		libopus.so:audio/opus
> RUN_DEPENDS=	${LOCALBASE}/lib/libtoxcore.a:net-im/tox
> 
> USE_GITHUB=	yes
> GH_ACCOUNT=	GrayHatter
>-GH_TAGNAME=	cc4388c
>+GH_TAGNAME=	c85c747
> 
> USES=		compiler:c11 desktop-file-utils gmake openal:al pkgconfig
> USE_XORG=	x11 xext xrender
>diff --git a/uTox.orig/distinfo b/uTox.new/distinfo
>index 63de3ac..9ca546e 100644
>--- a/uTox.orig/distinfo
>+++ b/uTox.new/distinfo
>@@ -1,2 +1,2 @@
>-SHA256 (GrayHatter-uTox-0.8.2.20160511-cc4388c_GH0.tar.gz) = 7c436cec5bd524ffcce3e1824dbebb7a93a121d0bc5d6860f8dadd1494e67067
>-SIZE (GrayHatter-uTox-0.8.2.20160511-cc4388c_GH0.tar.gz) = 2015584
>+SHA256 (GrayHatter-uTox-0.9.5.20160530-c85c747_GH0.tar.gz) = 43aaad041c7a830bc7e422908855f314f396c4c9e30577e86c225a3b5377c93e
>+SIZE (GrayHatter-uTox-0.9.5.20160530-c85c747_GH0.tar.gz) = 2020325
>diff --git a/uTox.orig/files/patch-Makefile b/uTox.new/files/patch-Makefile
>index b5fe715..fc5acdf 100644
>--- a/uTox.orig/files/patch-Makefile
>+++ b/uTox.new/files/patch-Makefile
>@@ -1,5 +1,5 @@
>---- Makefile.orig	2016-05-10 07:09:15 UTC
>-+++ Makefile
>+--- Makefile.orig	2016-05-21 14:12:16.517338000 +0300
>++++ Makefile	2016-05-21 14:17:58.301502000 +0300
> @@ -2,9 +2,9 @@
>  # set to anything else to disable them
>  DBUS 			= 1
>@@ -12,7 +12,7 @@
>  
>  DEPS = libtoxav libtoxcore openal vpx libsodium
>  
>-@@ -54,6 +54,37 @@ ifeq ($(UNAME_S), Linux)
>+@@ -54,6 +54,40 @@
>  
>  	TRAY_OBJ = icons/utox-128x128.o
>  	TRAY_GEN = $(LD) -r -b binary icons/utox-128x128.png -o
>@@ -34,13 +34,16 @@
> +
> +	ifeq ($(DBUS), 1)
> +		DEPS += dbus-1
>++		CFLAGS += -DHAVE_DBUS
> +	else
> +		CFLAGS += -DNO_DBUS
> +	endif
> +
>-+	CFLAGS += $(shell pkg-config --cflags $(DEPS))
>++	PKG_CONFIG = pkg-config
> +
>-+	LDFLAGS += $(shell pkg-config --libs $(DEPS))
>++	CFLAGS += $(shell $(PKG_CONFIG) --cflags $(DEPS))
>++
>++	LDFLAGS += $(shell $(PKG_CONFIG) --libs $(DEPS))
> +
> +	OS_SRC = $(wildcard src/xlib/*.c)
> +	OS_OBJ = $(OS_SRC:.c=.o)
>@@ -49,3 +52,4 @@
> +	TRAY_GEN = $(LD) -r -b binary icons/utox-128x128.png -o
>  else ifeq ($(UNAME_O), Cygwin)
>  	OUT_FILE = utox.exe
>+

Actions: View

Attachments on bug 209906: 170883