r5780 - in packages/trunk/chromium/debian: . patches

[Paul Wise]

Author: pabs
Date: 2008-02-15 16:37:04 +0000 (Fri, 15 Feb 2008)
New Revision: 5780

Added:
   packages/trunk/chromium/debian/patches/60_user_data.patch
Modified:
   packages/trunk/chromium/debian/README.Debian
   packages/trunk/chromium/debian/changelog
   packages/trunk/chromium/debian/patches/series
Log:
* Add a patch to look for data in ~/.chromium-data/ first
* Add some information about the removed music to the README.Debian

Modified: packages/trunk/chromium/debian/README.Debian
===================================================================
--- packages/trunk/chromium/debian/README.Debian	2008-02-15 16:29:24 UTC (rev 5779)
+++ packages/trunk/chromium/debian/README.Debian	2008-02-15 16:37:04 UTC (rev 5780)
@@ -4,7 +4,40 @@
 Note that the shell script wrapper present in previous versions of
 this package is no longer required.
 
+The upstream music and sounds cannot be distributed by Debian.
+Some are simply non-free and for others there is no known licence.
+See http://bugs.debian.org/385115 for more information about this.
+There is some replacement music in chromium-data, but it doesn't
+suit the game as much as the original music did and there are no
+replacement sounds available.
+
+If you want to hear the original music and sounds, download them from
+the upstream website and place them in the directory listed below.
+
+You can also create your own music and sounds for chromium to use.
+To do this, please convert them to WAV format and save with the
+following filenames in the directory listed below.
+
 Also, please note that if you have a music CD in your cd player,
 chromium will play that instead of its own music.
 
- -- Mike Furr <mfrr at debian.org>, Tue, 4 Mar 2003 20:16:32 -0500
+User sounds & music directory:
+
+~/.chromium-data/wav/
+
+Filenames for music:
+
+music_menu.wav
+music_game.wav
+
+Filenames for sounds:
+
+boom.wav
+exploBig.wav
+exploPop.wav
+exploStd.wav
+life_add.wav
+life_lose.wav
+power.wav
+
+You can also customize the images and other data files this way.

Modified: packages/trunk/chromium/debian/changelog
===================================================================
--- packages/trunk/chromium/debian/changelog	2008-02-15 16:29:24 UTC (rev 5779)
+++ packages/trunk/chromium/debian/changelog	2008-02-15 16:37:04 UTC (rev 5780)
@@ -29,6 +29,8 @@
 
   [ Paul Wise ]
   * Add patch to fix FTBFS with GCC 4.3 (Closes: #461708)
+  * Add a patch to look for data in ~/.chromium-data/ first
+  * Add some information about the removed music to the README.Debian
 
  -- Jon Dowland <jon at alcopop.org>  Thu, 12 Jul 2007 11:26:12 +0100
 

Added: packages/trunk/chromium/debian/patches/60_user_data.patch
===================================================================
--- packages/trunk/chromium/debian/patches/60_user_data.patch	                        (rev 0)
+++ packages/trunk/chromium/debian/patches/60_user_data.patch	2008-02-15 16:37:04 UTC (rev 5780)
@@ -0,0 +1,25 @@
+--- src/main.cpp.orig
++++ src/main.cpp
+@@ -180,6 +180,14 @@
+ const char* dataLoc(const char* filename, bool doCheck)
+ {
+ 	static char buffer[256];
++	struct	stat sbuf;
++
++	if(getenv("HOME") != NULL && ((strlen(getenv("HOME"))+strlen(filename)) < 239) )
++	{
++		sprintf(buffer, "%s/.chromium-data/%s", getenv("HOME"), filename);
++		if(stat(buffer, &sbuf) == 0) return buffer;
++	}
++
+ 	if( (strlen(dataDir)+strlen(filename)) < 254)
+ 	{
+         sprintf(buffer, "%s/%s", dataDir, filename);	
+@@ -197,7 +205,6 @@
+ #ifndef _WIN32 // WIN32 users don't get error checks...
+ 	if(doCheck)
+ 	{
+-		struct	stat sbuf;
+ 		if(stat(buffer, &sbuf) == -1) 
+ 		{
+ 			fprintf(stderr, "!! ERROR !! - ");

Modified: packages/trunk/chromium/debian/patches/series
===================================================================
--- packages/trunk/chromium/debian/patches/series	2008-02-15 16:29:24 UTC (rev 5779)
+++ packages/trunk/chromium/debian/patches/series	2008-02-15 16:37:04 UTC (rev 5780)
@@ -10,3 +10,4 @@
 45_unpause_onquit
 50_fix-configure
 55_mouse-restart
+60_user_data.patch -p0