Permalink
Browse files

update to r142

  • Loading branch information...
alferpal committed Jan 8, 2012
1 parent 7ec7cc7 commit 146e4f7fa351896198301ba8377c03daac5ab362
@@ -4,8 +4,8 @@ _firefox_dir='/usr/lib/firefox'
_extension_id='{9533f794-00b4-4354-aa15-c2bbda6989f8}'
pkgname=firefox-firetray-svn
-pkgver=134
-pkgrel=3
+pkgver=125
+pkgrel=1
pkgdesc="A firefox system tray extension for linux"
arch=('i686' 'x86_64')
url="http://code.google.com/p/firetray/"
@@ -17,8 +17,9 @@ conflicts=('firefox-firetray')
source=('generate_install_rdf.sh.patch'
'SConscript.patch')
+
md5sums=('bfd81f3339cf88b811b910b0aed27d5c'
- 'c05a05cef976f286d76a48ac92294b9e')
+ '7836cd0b39e08ca95d5faa5861947bb1')
_svntrunk=http://firetray.googlecode.com/svn/trunk/
_svnmod=firetray
@@ -38,7 +39,7 @@ build() {
cp -r $_svnmod $_svnmod-build
cd $_svnmod-build
- patch -Np0 -i ${srcdir}/generate_install_rdf.sh.patch || return 1
+ #patch -Np0 -i ${srcdir}/generate_install_rdf.sh.patch || return 1
patch -Np0 -i ${srcdir}/SConscript.patch || return 1
./build.sh
@@ -1,41 +1,13 @@
---- components/SConscript 2011-12-23 00:49:44.237838116 +0100
-+++ components/SConscript1 2011-12-23 00:50:11.304498924 +0100
-@@ -31,6 +31,9 @@
- gecko_bin = os.environ['GECKO_SDK_BIN'];
- if gecko_bin[-1] != os.sep: gecko_bin += os.sep
-
-+ gecko_sdk_bin = os.environ['GECKO_SDK_BIN'];
-+ if gecko_sdk_bin[-1] != os.sep: gecko_sdk_bin += os.sep
-+
- gecko_include = os.environ['GECKO_SDK_INCLUDE'];
- if gecko_include[-1] != os.sep: gecko_include += os.sep
-
-@@ -46,6 +49,7 @@
- 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 +77,10 @@
+--- components/SConscript 2012-01-08 12:03:49.414343734 +0100
++++ components/SConscript1 2012-01-08 12:11:48.045673775 +0100
+@@ -74,8 +74,8 @@
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 = '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')
+bxpt = Builder(action = 'python2 /usr/lib/xulrunner-devel-9.0.1/sdk/bin/typelib.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.xpt', src_suffix = '.idl')
+bhdr = Builder(action = 'python2 /usr/lib/xulrunner-devel-9.0.1/sdk/bin/header.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.h', src_suffix = '.idl')
- # Create environment object for build
- env = Environment(
-@@ -83,6 +89,7 @@
- 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
+ # Create environment object for build
@@ -5,8 +5,8 @@ _thunderbird_dir='/usr/lib/thunderbird'
_extension_id='{9533f794-00b4-4354-aa15-c2bbda6989f8}'
pkgname=thunderbird-firetray-svn
-pkgver=134
-pkgrel=3
+pkgver=142
+pkgrel=1
pkgdesc="A thunderbird system tray extension for linux"
arch=('i686' 'x86_64')
url="http://code.google.com/p/firetray/"
@@ -18,8 +18,9 @@ conflicts=('thunderbird-firetray')
source=('generate_install_rdf.sh.patch'
'SConscript.patch')
+
md5sums=('bfd81f3339cf88b811b910b0aed27d5c'
- 'c05a05cef976f286d76a48ac92294b9e')
+ '7836cd0b39e08ca95d5faa5861947bb1')
_svntrunk=http://firetray.googlecode.com/svn/trunk/
_svnmod=firetray
@@ -39,7 +40,7 @@ build() {
cp -r $_svnmod $_svnmod-build
cd $_svnmod-build
- patch -Np0 -i ${srcdir}/generate_install_rdf.sh.patch || return 1
+ #patch -Np0 -i ${srcdir}/generate_install_rdf.sh.patch || return 1
patch -Np0 -i ${srcdir}/SConscript.patch || return 1
./build.sh
@@ -1,41 +1,13 @@
---- components/SConscript 2011-12-23 00:49:44.237838116 +0100
-+++ components/SConscript1 2011-12-23 00:50:11.304498924 +0100
-@@ -31,6 +31,9 @@
- gecko_bin = os.environ['GECKO_SDK_BIN'];
- if gecko_bin[-1] != os.sep: gecko_bin += os.sep
-
-+ gecko_sdk_bin = os.environ['GECKO_SDK_BIN'];
-+ if gecko_sdk_bin[-1] != os.sep: gecko_sdk_bin += os.sep
-+
- gecko_include = os.environ['GECKO_SDK_INCLUDE'];
- if gecko_include[-1] != os.sep: gecko_include += os.sep
-
-@@ -46,6 +49,7 @@
- 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 +77,10 @@
+--- components/SConscript 2012-01-08 12:03:49.414343734 +0100
++++ components/SConscript1 2012-01-08 12:11:48.045673775 +0100
+@@ -74,8 +74,8 @@
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 = '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')
+bxpt = Builder(action = 'python2 /usr/lib/xulrunner-devel-9.0.1/sdk/bin/typelib.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.xpt', src_suffix = '.idl')
+bhdr = Builder(action = 'python2 /usr/lib/xulrunner-devel-9.0.1/sdk/bin/header.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.h', src_suffix = '.idl')
- # Create environment object for build
- env = Environment(
-@@ -83,6 +89,7 @@
- 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
+ # Create environment object for build

0 comments on commit 146e4f7

Please sign in to comment.