[Pkg-mozext-commits] [SCM] system tray extension for thunderbird/firefox alike apps branch, upstream, updated. upstream/0.3.4-4-g23803ad

[Sascha Girrulat]

The following commit has been merged in the upstream branch:
commit f6f44b63539b90da9c025403a5f7263a0d434f6e
Author: fsoltrash at gmail.com <fsoltrash at gmail.com>
Date:   Fri Jan 6 17:21:36 2012 +0000

    added vimftw's SConscript changes to build with gecko sdk 9
    
    git-svn-id: http://firetray.googlecode.com/svn/trunk@142 1aa13f37-862e-0410-bb36-2ba89cdadaa9

diff --git a/changes b/changes
index 2723c6a..f49ddcb 100644
--- a/changes
+++ b/changes
@@ -1,3 +1,5 @@
+0.3.5  Applied vimftw patch to build using gecko sdk 9
+
 0.3.0  Moved Tray handling functions to a new javascript XPCOM component to avoid problems when the first window is closed (see Issue 79)
        Applied patch for Gecko2 support (Issue 127)
        Added option to select between "unread" and "new" messages notification (Issue 120)
diff --git a/components/SConscript b/components/SConscript
index f10b0f9..06011af 100644
--- a/components/SConscript
+++ b/components/SConscript
@@ -46,6 +46,7 @@ except:
         print "Using GECKO_SDK=" + geckosdk
         if geckosdk[-1] != os.sep: geckosdk += os.sep
         gecko_bin = geckosdk + 'bin'
+	gecko_sdk_bin = geckosdk + 'sdk/bin'
         gecko_include = geckosdk + 'include'
         gecko_idl = geckosdk + 'idl'
         gecko_lib = geckosdk + 'lib'
@@ -73,8 +74,9 @@ with open(gecko_include + os.sep + 'mozilla-config.h', 'r') as f:
             break
 
 # Create two builders to create xpt and header files from idl.
-bxpt = Builder(action = 'xpidl -w -m typelib -Icomponents -I' + gecko_idl + ' -e $TARGET $SOURCE', suffix = '.xpt', src_suffix = '.idl')
-bhdr = Builder(action = 'xpidl -w -m header -Icomponents -I' + gecko_idl + ' -e $TARGET $SOURCE', suffix = '.h', src_suffix = '.idl')
+bxpt = Builder(action = 'typelib.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.xpt', src_suffix = '.idl')
+bhdr = Builder(action = 'header.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.h', src_suffix = '.idl')
+
 
 # Create environment object for build
 env = Environment(
@@ -83,6 +85,7 @@ env = Environment(
     LIBS = xpcom_libs,
     ENV = os.environ)
 env.AppendENVPath('PATH', gecko_bin)
+env.AppendENVPath('PATH', gecko_sdk_bin)
 env.Append(BUILDERS = {'MozXPT' : bxpt, 'MozHeader' : bhdr })
 
 env.ParseConfig('pkg-config ' + linking_options + ' --cflags gtk+-2.0') # libnotify
@@ -105,3 +108,4 @@ r = env.Install('#dist/components', [nptray, xpts, 'nsFireTrayHandler.js'])
 
 Default([xpts, headers, nptray])
 Return('r')
+
diff --git a/generate_install_rdf.sh b/generate_install_rdf.sh
index 8266d09..d203d53 100755
--- a/generate_install_rdf.sh
+++ b/generate_install_rdf.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION="0.3.1"
+VERSION="0.3.5"
 EXTENSION_ID="{9533f794-00b4-4354-aa15-c2bbda6989f8}"
 EXTENSION_NAME="FireTray"
 HOMEPAGE="http://code.google.com/p/firetray/"
@@ -15,8 +15,8 @@ APP_SEPARATOR=';'
 #SUPPORTED APPS:
 # "name;id;min.ver;max.ver"
 SUPPORTED_APPS=( \
-"Mozilla Firefox;{ec8030f7-c20a-464f-9b0e-13a3a9e97384};3.0;5.*" \
-"Mozilla Thunderbird;{3550f703-e582-4d05-9a08-453d09bdfdc6};3.0;5.*" \
+"Mozilla Firefox;{ec8030f7-c20a-464f-9b0e-13a3a9e97384};3.0;9.*" \
+"Mozilla Thunderbird;{3550f703-e582-4d05-9a08-453d09bdfdc6};3.0;9.*" \
 "Songbird;songbird at songbirdnest.com;0.8;1.8.0" \
 "SeaMonkey;{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a};2.0a1;2.0.*   " \
 "Sunbird;{718e30fb-e89b-41dd-9da7-e25a45638b28};1.0b1;1.0pre" \
@@ -37,6 +37,7 @@ CONTRIBUTORS=( \
 "Hicham.Haouari" \
 "Jreybert" \
 "aedrin" \
+"vimftw" \
 )
 
 TRANSLATORS=( \

-- 
system tray extension for thunderbird/firefox alike apps