Permalink
Browse files

Patchs for Gecko 10

  • Loading branch information...
1 parent cd8fb9d commit 28d5ae337e21ba634312dd859693ff82a2e14911 @alferpal committed Feb 3, 2012
@@ -5,8 +5,8 @@ _extension_id='{9533f794-00b4-4354-aa15-c2bbda6989f8}'
pkgname=firefox-firetray-svn
pkgver=143
-pkgrel=1
-pkgdesc="A firefox system tray extension for linux"
+pkgrel=2
+pkgdesc="A thunderbird system tray extension for linux"
arch=('i686' 'x86_64')
url="http://code.google.com/p/firetray/"
license=('GPL')
@@ -15,10 +15,12 @@ makedepends=('xulrunner=10.0' 'scons' 'svn' 'unzip')
provides=('firefox-firetray')
conflicts=('firefox-firetray')
source=('generate_install_rdf.sh.patch'
- 'SConscript.patch')
+ 'SConscript.patch'
+ 'nsTray.cpp.patch')
-md5sums=('bfd81f3339cf88b811b910b0aed27d5c'
- '13f7123e6b9de18e381e82fb717e4367')
+md5sums=('4642fa1df184874fcb677dc2959ec94e'
+ 'df7f6cb6ba0086814ac78bd2ce5e60df'
+ '3e0394fc684cb8e36c19cf392a18971f')
_svntrunk=http://firetray.googlecode.com/svn/trunk/
_svnmod=firetray
@@ -38,8 +40,10 @@ 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
+ patch -Np0 -i ${srcdir}/nsTray.cpp.patch || return 1
+
./build.sh
mkdir -p "${pkgdir}"/"${_firefox_dir}"/extensions/"${_extension_id}"
@@ -6,8 +6,8 @@
# Create two builders to create xpt and header files from 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-10.0/sdk/bin/typelib.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.xpt', src_suffix = '.idl')
-+bhdr = Builder(action = 'python2 /usr/lib/xulrunner-devel-10.0/sdk/bin/header.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.h', src_suffix = '.idl')
++bxpt = Builder(action = 'python2 /usr/lib/xulrunner-devel-10.0/sdk/bin/typelib.py --cachedir=. -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.xpt', src_suffix = '.idl')
++bhdr = Builder(action = 'python2 /usr/lib/xulrunner-devel-10.0/sdk/bin/header.py --cachedir=. -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.h', src_suffix = '.idl')
# Create environment object for build
@@ -5,10 +5,10 @@ diff -u generate_install_rdf.sh.orig generate_install_rdf.sh
#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;10.*" \
-+"Mozilla Thunderbird;{3550f703-e582-4d05-9a08-453d09bdfdc6};3.0;10.*" \
+-"Mozilla Firefox;{ec8030f7-c20a-464f-9b0e-13a3a9e97384};3.0;9.*" \
+-"Mozilla Thunderbird;{3550f703-e582-4d05-9a08-453d09bdfdc6};3.0;9.*" \
++"Mozilla Firefox;{ec8030f7-c20a-464f-9b0e-13a3a9e97384};3.0;13.*" \
++"Mozilla Thunderbird;{3550f703-e582-4d05-9a08-453d09bdfdc6};3.0;13.*" \
"Songbird;songbird@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" \
@@ -6,7 +6,7 @@ _extension_id='{9533f794-00b4-4354-aa15-c2bbda6989f8}'
pkgname=thunderbird-firetray-svn
pkgver=143
-pkgrel=1
+pkgrel=2
pkgdesc="A thunderbird system tray extension for linux"
arch=('i686' 'x86_64')
url="http://code.google.com/p/firetray/"
@@ -16,11 +16,12 @@ makedepends=('xulrunner=10.0' 'scons' 'svn' 'unzip')
provides=('thunderbird-firetray')
conflicts=('thunderbird-firetray')
source=('generate_install_rdf.sh.patch'
- 'SConscript.patch')
+ 'SConscript.patch'
+ 'nsTray.cpp.patch')
-
-md5sums=('bfd81f3339cf88b811b910b0aed27d5c'
- '13f7123e6b9de18e381e82fb717e4367')
+md5sums=('4642fa1df184874fcb677dc2959ec94e'
+ 'df7f6cb6ba0086814ac78bd2ce5e60df'
+ '3e0394fc684cb8e36c19cf392a18971f')
_svntrunk=http://firetray.googlecode.com/svn/trunk/
_svnmod=firetray
@@ -40,8 +41,10 @@ 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
+ patch -Np0 -i ${srcdir}/nsTray.cpp.patch || return 1
+
./build.sh
mkdir -p "${pkgdir}"/"${_thunderbird_dir}"/extensions/"${_extension_id}"
@@ -6,8 +6,8 @@
# Create two builders to create xpt and header files from 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-10.0/sdk/bin/typelib.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.xpt', src_suffix = '.idl')
-+bhdr = Builder(action = 'python2 /usr/lib/xulrunner-devel-10.0/sdk/bin/header.py -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.h', src_suffix = '.idl')
++bxpt = Builder(action = 'python2 /usr/lib/xulrunner-devel-10.0/sdk/bin/typelib.py --cachedir=. -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.xpt', src_suffix = '.idl')
++bhdr = Builder(action = 'python2 /usr/lib/xulrunner-devel-10.0/sdk/bin/header.py --cachedir=. -Icomponents -I' + gecko_idl + ' -o $TARGET $SOURCE', suffix = '.h', src_suffix = '.idl')
# Create environment object for build
@@ -5,10 +5,10 @@ diff -u generate_install_rdf.sh.orig generate_install_rdf.sh
#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;10.*" \
-+"Mozilla Thunderbird;{3550f703-e582-4d05-9a08-453d09bdfdc6};3.0;10.*" \
+-"Mozilla Firefox;{ec8030f7-c20a-464f-9b0e-13a3a9e97384};3.0;9.*" \
+-"Mozilla Thunderbird;{3550f703-e582-4d05-9a08-453d09bdfdc6};3.0;9.*" \
++"Mozilla Firefox;{ec8030f7-c20a-464f-9b0e-13a3a9e97384};3.0;13.*" \
++"Mozilla Thunderbird;{3550f703-e582-4d05-9a08-453d09bdfdc6};3.0;13.*" \
"Songbird;songbird@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" \

0 comments on commit 28d5ae3

Please sign in to comment.