diff options
Diffstat (limited to 'community/google-gadgets')
| -rw-r--r-- | community/google-gadgets/PKGBUILD | 11 | ||||
| -rw-r--r-- | community/google-gadgets/wifi-types.patch | 36 |
2 files changed, 43 insertions, 4 deletions
diff --git a/community/google-gadgets/PKGBUILD b/community/google-gadgets/PKGBUILD index 7bd430d67..fbe77e1be 100644 --- a/community/google-gadgets/PKGBUILD +++ b/community/google-gadgets/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 43358 2011-03-25 11:00:25Z schiv $ +# $Id: PKGBUILD 44556 2011-04-08 21:04:15Z spupykin $ # Maintainer: Ray Rashif <schiv@archlinux.org> pkgbase=google-gadgets @@ -8,7 +8,7 @@ _basedir="$startdir/pkg/base" pkgver=0.11.2 _sover=1.0 _sobump=0.0.0 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url="http://code.google.com/p/google-gadgets-for-linux/" license=('APACHE') @@ -19,8 +19,10 @@ makedepends=('gstreamer0.10-base-plugins' 'libwebkit' 'networkmanager' 'zip' 'flex') options=('!libtool') -source=("http://google-gadgets-for-linux.googlecode.com/files/$_realname-$pkgver.tar.bz2") -md5sums=('279305553bcbf74f3e3615f6abc36a5e') +source=("http://google-gadgets-for-linux.googlecode.com/files/$_realname-$pkgver.tar.bz2" + "wifi-types.patch") +md5sums=('279305553bcbf74f3e3615f6abc36a5e' + 'f0df71c60a174e9d629db87b8bd9e102') build() { cd "$srcdir/$_realname-$pkgver" @@ -31,6 +33,7 @@ build() { # xulrunner 2.0 is incompatible; # we build without smjs-script/browser-element + patch -p1 <$srcdir/wifi-types.patch ./configure --prefix=/usr \ --disable-werror \ --disable-update-desktop-database \ diff --git a/community/google-gadgets/wifi-types.patch b/community/google-gadgets/wifi-types.patch new file mode 100644 index 000000000..be9383a61 --- /dev/null +++ b/community/google-gadgets/wifi-types.patch @@ -0,0 +1,36 @@ +diff -wbBur google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/network.cc +--- google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc 2009-03-15 04:12:42.000000000 +0000 ++++ google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/network.cc 2011-04-08 20:57:16.000000000 +0000 +@@ -23,17 +23,9 @@ + namespace framework { + namespace linux_system { + +-#ifdef NM_DEVICE_TYPE_WIFI + static const int kDeviceTypeWifi = NM_DEVICE_TYPE_WIFI; +-#else +-static const int kDeviceTypeWifi = DEVICE_TYPE_802_11_WIRELESS; +-#endif + +-#ifdef NM_DEVICE_TYPE_ETHERNET + static const int kDeviceTypeEthernet = NM_DEVICE_TYPE_ETHERNET; +-#else +-static const int kDeviceTypeEthernet = DEVICE_TYPE_802_3_ETHERNET; +-#endif + + static const int kDeviceTypeUnknown = 0; + +diff -wbBur google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/wireless.cc +--- google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc 2009-12-28 10:39:53.000000000 +0000 ++++ google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/wireless.cc 2011-04-08 20:57:39.000000000 +0000 +@@ -77,11 +77,7 @@ + + using namespace ggadget::dbus; + +-#ifdef NM_DEVICE_TYPE_WIFI + static const int kDeviceTypeWifi = NM_DEVICE_TYPE_WIFI; +-#else +-static const int kDeviceTypeWifi = DEVICE_TYPE_802_11_WIRELESS; +-#endif + + // Defined in nm 0.7 + static const int kDeviceStateActivated = 8; |