From owner-svn-ports-head@freebsd.org Fri Mar 25 07:42:25 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 58DE3ADC6E7; Fri, 25 Mar 2016 07:42:25 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 28BFC11CF; Fri, 25 Mar 2016 07:42:25 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u2P7gOuL046691; Fri, 25 Mar 2016 07:42:24 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2P7gNXt046686; Fri, 25 Mar 2016 07:42:23 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201603250742.u2P7gNXt046686@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Fri, 25 Mar 2016 07:42:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411822 - in head/net-im/uTox: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Mar 2016 07:42:25 -0000 Author: riggs Date: Fri Mar 25 07:42:23 2016 New Revision: 411822 URL: https://svnweb.freebsd.org/changeset/ports/411822 Log: Update to upstream version 0.7.0.20160321 While on it: - Pet portlint PR: 208230 Submitted by: fidaj@ukr.net (maintainer) Added: head/net-im/uTox/files/patch-src_ui.c (contents, props changed) Modified: head/net-im/uTox/Makefile head/net-im/uTox/distinfo head/net-im/uTox/files/patch-Makefile Modified: head/net-im/uTox/Makefile ============================================================================== --- head/net-im/uTox/Makefile Fri Mar 25 07:16:31 2016 (r411821) +++ head/net-im/uTox/Makefile Fri Mar 25 07:42:23 2016 (r411822) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= uTox -PORTVERSION= 0.5.1.20160121 -PORTREVISION= 2 +PORTVERSION= 0.7.0.20160321 CATEGORIES= net-im net-p2p MAINTAINER= fidaj@ukr.net @@ -23,7 +22,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/libtoxcore USE_GITHUB= yes GH_ACCOUNT= GrayHatter -GH_TAGNAME= b623d58 +GH_TAGNAME= 9524f98 USES= compiler:c11 desktop-file-utils gmake openal:al pkgconfig USE_XORG= x11 xext xrender @@ -37,7 +36,7 @@ DBUS_MAKE_ARGS_OFF= DBUS=0 post-patch: @${REINPLACE_CMD} -e 's|$$(GIT_V)|${DISTVERSION}-${GH_TAGNAME}|' \ - -e 's|share/man|man|' ${WRKSRC}/${MAKEFILE} + -e 's|(DATAROOTDIR)/man|(PREFIX)/man|' ${WRKSRC}/${MAKEFILE} pre-configure: @(if [ ! -e "${LOCALBASE}/lib/libtoxav.so" ]; then \ Modified: head/net-im/uTox/distinfo ============================================================================== --- head/net-im/uTox/distinfo Fri Mar 25 07:16:31 2016 (r411821) +++ head/net-im/uTox/distinfo Fri Mar 25 07:42:23 2016 (r411822) @@ -1,2 +1,2 @@ -SHA256 (GrayHatter-uTox-0.5.1.20160121-b623d58_GH0.tar.gz) = eaaeccc253c6262b9316783ed51d87b9103bef54f5dbf60b4ef9f124a9a342c0 -SIZE (GrayHatter-uTox-0.5.1.20160121-b623d58_GH0.tar.gz) = 978712 +SHA256 (GrayHatter-uTox-0.7.0.20160321-9524f98_GH0.tar.gz) = 5e6a6023e63ec77f5378541ed5f03981aa8b71b5586d8b02b24335dfcc88a636 +SIZE (GrayHatter-uTox-0.7.0.20160321-9524f98_GH0.tar.gz) = 1986717 Modified: head/net-im/uTox/files/patch-Makefile ============================================================================== --- head/net-im/uTox/files/patch-Makefile Fri Mar 25 07:16:31 2016 (r411821) +++ head/net-im/uTox/files/patch-Makefile Fri Mar 25 07:42:23 2016 (r411822) @@ -1,15 +1,18 @@ ---- Makefile.orig 2015-12-29 12:13:36.418539000 +0200 -+++ Makefile 2015-12-29 12:16:20.089265000 +0200 -@@ -2,7 +2,7 @@ +--- Makefile.orig 2016-03-21 02:14:57 UTC ++++ Makefile +@@ -2,9 +2,9 @@ # set to anything else to disable them - DBUS = 1 - V4LCONVERT = 1 --FILTER_AUDIO = 0 -+FILTER_AUDIO = 1 - UNITY = 0 + DBUS = 1 + V4LCONVERT = 1 +-FILTER_AUDIO = 0 ++FILTER_AUDIO = 1 + UNITY = 0 +-XP = 0 ++XP = 0 DEPS = libtoxav libtoxcore openal vpx libsodium -@@ -50,6 +50,37 @@ + +@@ -53,6 +53,37 @@ ifeq ($(UNAME_S), Linux) TRAY_OBJ = icons/utox-128x128.o TRAY_GEN = $(LD) -r -b binary icons/utox-128x128.png -o Added: head/net-im/uTox/files/patch-src_ui.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/uTox/files/patch-src_ui.c Fri Mar 25 07:42:23 2016 (r411822) @@ -0,0 +1,21 @@ +--- src/ui.c.orig 2016-03-21 02:14:57 UTC ++++ src/ui.c +@@ -275,16 +275,9 @@ static void draw_settings_header(int UNU + setfont(FONT_SELF_NAME); + drawstr(MAIN_LEFT + SCALE(10), SCALE(10), UTOX_SETTINGS); + #ifdef GIT_VERSION +- int x = MAIN_LEFT + SCALE(10) + UTOX_STR_WIDTH(UTOX_SETTINGS) + SCALE(10); ++ int x = MAIN_LEFT + UTOX_SCALE(5 ) + UTOX_STR_WIDTH(UTOX_SETTINGS) + UTOX_SCALE(5 ); + setfont(FONT_TEXT); +- drawtext(x, SCALE(10), (uint8_t*)GIT_VERSION, strlen(GIT_VERSION)); +- char version_string[64]; +- int count; +- count = snprintf(version_string, 64, "Core v%u.%u.%u ToxAV v%u.%u.%u ToxES v%u.%u.%u", +- tox_version_major(), tox_version_minor(), tox_version_patch(), +- toxav_version_major(), toxav_version_minor(), toxav_version_patch(), +- toxes_version_major(), toxes_version_minor(), toxes_version_patch()); +- drawtextwidth_right(w, textwidth((char_t*)version_string, count), SCALE(10), (uint8_t*)version_string, strlen(version_string)); ++ drawtext(x, UTOX_SCALE(5), (uint8_t*)GIT_VERSION, strlen(GIT_VERSION)); + #endif + } +