[arch-commits] Commit in kdebase-workspace/trunk (PKGBUILD nm-09.patch)

[Andrea Scarpino]

    Date: Friday, April 29, 2011 @ 06:49:49
  Author: andrea
Revision: 121198

NM09 patch modified to skip networkmanager version check

Modified:
  kdebase-workspace/trunk/PKGBUILD
  kdebase-workspace/trunk/nm-09.patch

-------------+
 PKGBUILD    |    4 ++--
 nm-09.patch |   18 ++++++++++++++----
 2 files changed, 16 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-04-29 10:45:50 UTC (rev 121197)
+++ PKGBUILD	2011-04-29 10:49:49 UTC (rev 121198)
@@ -36,14 +36,14 @@
           '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
           'd7b5883f7e65c6839b1f65f94d58026673dd0226'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          '46259fe725e505aa8314407120f0aa9013823fa5')
+          '91ed84f5bb99909cab1b5ca0779bbf5cf6c72d33')
 
 build() {
 	cd ${srcdir}/${pkgname}-${pkgver}
 	patch -p0 -i ${srcdir}/kdm-zsh-profile.patch
 	patch -p0 -i ${srcdir}/fixpath.patch
 	patch -p0 -i ${srcdir}/terminate-server.patch
-    patch -p0 -i ${srcdir}/nm-09.patch
+    patch -p1 -i ${srcdir}/nm-09.patch
 
 	cd ${srcdir}
 	mkdir build

Modified: nm-09.patch
===================================================================
--- nm-09.patch	2011-04-29 10:45:50 UTC (rev 121197)
+++ nm-09.patch	2011-04-29 10:49:49 UTC (rev 121198)
@@ -1,7 +1,17 @@
-diff -up kdebase-workspace-4.6.1/solid/networkmanager-0.7/manager.cpp.foo kdebase-workspace-4.6.1/solid/networkmanager-0.7/manager.cpp
---- kdebase-workspace-4.6.1/solid/networkmanager-0.7/manager.cpp.foo	2011-03-22 20:02:37.298879915 -0500
-+++ kdebase-workspace-4.6.1/solid/networkmanager-0.7/manager.cpp	2011-03-22 20:03:40.423090754 -0500
-@@ -118,16 +118,16 @@ QObject *NMNetworkManager::createNetwork
+--- 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 ) {