diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-02 10:47:02 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-02 10:47:02 -0300 |
commit | 40e1222c1402c0d2aded73b95802f8197d0691a6 (patch) | |
tree | e1bf1a01ae7443e4a9f460200dad9580565b27c7 /community-staging/google-gadgets/wifi-types.patch | |
parent | 3e3dd870121c91097220248a601578b92d332f2b (diff) | |
parent | 37a1064b8105764414f279ced442e6ba2f63bea1 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/camlp5/PKGBUILD
community/dzen2/PKGBUILD
extra/boost/PKGBUILD
extra/libxmi/PKGBUILD
extra/mesa/PKGBUILD
multilib/lib32-mesa/PKGBUILD
Diffstat (limited to 'community-staging/google-gadgets/wifi-types.patch')
-rw-r--r-- | community-staging/google-gadgets/wifi-types.patch | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/community-staging/google-gadgets/wifi-types.patch b/community-staging/google-gadgets/wifi-types.patch deleted file mode 100644 index be9383a61..000000000 --- a/community-staging/google-gadgets/wifi-types.patch +++ /dev/null @@ -1,36 +0,0 @@ -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; |