diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:45:35 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:45:35 -0300 |
| commit | a6ee13798647ec09fb33e316a90ef6ed0b7f314a (patch) | |
| tree | 815ded684a1ee9e4c23c2f03c98691b9272243c1 /extra/kdebase-workspace | |
| parent | c3b94090a6330f678ade2f767e76ab7802d3463e (diff) | |
| parent | 4d22176132f4a830ab0cc510dabbc9f8c1c362ea (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/csfml/PKGBUILD
community/evolution-rss/PKGBUILD
community/inn/PKGBUILD
community/libssh2/PKGBUILD
community/perl-xml-dom/PKGBUILD
community/php52/PKGBUILD
community/python-pysfml/PKGBUILD
community/skype-call-recorder/PKGBUILD
extra/ipod-sharp/PKGBUILD
extra/madwifi-utils/PKGBUILD
extra/madwifi/PKGBUILD
Diffstat (limited to 'extra/kdebase-workspace')
| -rw-r--r-- | extra/kdebase-workspace/nm-09.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/extra/kdebase-workspace/nm-09.patch b/extra/kdebase-workspace/nm-09.patch deleted file mode 100644 index 20ccd4d7d..000000000 --- a/extra/kdebase-workspace/nm-09.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- kdebase-workspace-4.6.3/solid/CMakeLists.txt~ 2011-04-29 03:43:20.321994578 -0700 -+++ kdebase-workspace-4.6.3/solid/CMakeLists.txt 2011-04-29 03:43:33.271995023 -0700 -@@ -17,7 +17,7 @@ - add_subdirectory(networkmanager-0.6) - endif (NM_0_6) - -- macro_ensure_version_range("0.7.0" ${NETWORKMANAGER_VERSION} "0.9.0" NM_0_7) -+ macro_ensure_version("0.7.0" ${NETWORKMANAGER_VERSION} NM_0_7) - if (NM_0_7) - message(STATUS "Will build networkmanager-0.7") - set(HAVE_NETWORKMANAGER TRUE) ---- kdebase-workspace-4.6.3/solid/networkmanager-0.7/manager.cpp~ 2011-04-29 03:32:33.838644845 -0700 -+++ kdebase-workspace-4.6.3/solid/networkmanager-0.7/manager.cpp 2011-04-29 03:40:52.308657544 -0700 -@@ -118,16 +118,16 @@ - uint deviceType = devIface.deviceType(); - NMNetworkInterface * createdInterface = 0; - switch ( deviceType ) { -- case DEVICE_TYPE_802_3_ETHERNET: -+ case NM_DEVICE_TYPE_ETHERNET: - createdInterface = new NMWiredNetworkInterface(uni, this, 0); // these are deleted by the frontend manager - break; -- case DEVICE_TYPE_802_11_WIRELESS: -+ case NM_DEVICE_TYPE_WIFI: - createdInterface = new NMWirelessNetworkInterface(uni, this, 0); - break; -- case DEVICE_TYPE_GSM: -+ case 3: - createdInterface = new NMGsmNetworkInterface(uni, this, 0); - break; -- case DEVICE_TYPE_CDMA: -+ case 4: - createdInterface = new NMCdmaNetworkInterface(uni, this, 0); - break; - /* |