From owner-svn-ports-head@FreeBSD.ORG Wed Aug 28 04:09:53 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id A81803C6; Wed, 28 Aug 2013 04:09:53 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7BF602791; Wed, 28 Aug 2013 04:09:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7S49rJf004309; Wed, 28 Aug 2013 04:09:53 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7S49rCZ004308; Wed, 28 Aug 2013 04:09:53 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201308280409.r7S49rCZ004308@svn.freebsd.org> From: Dmitry Marakasov Date: Wed, 28 Aug 2013 04:09:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r325498 - head/games/scramble/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.14 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: Wed, 28 Aug 2013 04:09:53 -0000 Author: amdmi3 Date: Wed Aug 28 04:09:52 2013 New Revision: 325498 URL: http://svnweb.freebsd.org/changeset/ports/325498 Log: - Fix build with clang - Remove unneeded patches Deleted: head/games/scramble/files/patch-src-perm.c head/games/scramble/files/patch-src-sound.c Modified: head/games/scramble/files/patch-src-scramble.c Modified: head/games/scramble/files/patch-src-scramble.c ============================================================================== --- head/games/scramble/files/patch-src-scramble.c Wed Aug 28 00:29:47 2013 (r325497) +++ head/games/scramble/files/patch-src-scramble.c Wed Aug 28 04:09:52 2013 (r325498) @@ -1,51 +1,20 @@ ---- src/scramble.c.orig Thu Nov 10 05:20:17 2005 -+++ src/scramble.c Thu Nov 10 05:22:01 2005 -@@ -290,14 +290,13 @@ +--- src/scramble.c.orig 2013-08-28 03:08:02.758225796 +0400 ++++ src/scramble.c 2013-08-28 03:08:42.456378896 +0400 +@@ -534,7 +534,7 @@ + + /***************************************************** ****************************************************/ - void putLetter(char * ch, int s) +-int moveLetter(int i) ++void moveLetter(int i) { -- if(!running) -- return; -- - char ch2[2]; -+ SDL_Rect dest; - ch2[0] = toupper(ch[0]); - ch2[1] = 0; -- -- SDL_Rect dest; -+ -+ if(!running) -+ return; - - s--; - -@@ -694,6 +693,8 @@ + int minx, maxx, miny, maxy, advance; + i--; +@@ -1141,7 +1141,7 @@ - for(i = 0; i < numberCurrentWords; i++) { - if(strcmp(wordAttempt, currentWordSet[i]) == 0 && currentWordSetShow[i] == 0) { -+ double per; -+ - currentWordSetShow[i] = 1; - playSound(hitSound); - -@@ -706,7 +707,7 @@ - stateChanged = 1; - redrawAll = 1; - wordsFound++; -- double per = ((double)wordsFound / (double)numberCurrentWords); -+ per = ((double)wordsFound / (double)numberCurrentWords); - if(per > percentage) { - nextLevel = 1; - if(nextLevel % 5 && percentage < .8) -@@ -1127,9 +1128,10 @@ + /***************************************************** ****************************************************/ - void letter(char c) +-inline void SE_CheckEvents() ++void SE_CheckEvents() { -+ int i; - if(!running) - return; -- int i; -+ - for(i = 0; i < 6; i++) { - if(c == letters[i].letter[0] && !letters[i].played) { - playSound(clickSound); + + SDL_Event event;