[kde-plasma-networkmanagement] - fix build for kde-4.4

Rex Dieter rdieter at fedoraproject.org
Tue Sep 7 18:26:35 UTC 2010


commit 6b10a4a2ba77bb1d0d4b99d8d85e5dcf5ce0c170
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 7 13:31:57 2010 -0500

    - fix build for kde-4.4

 kde-plasma-networkmanagement.spec       |    3 ++
 networkmanagement-0.9-kutils_libs.patch |   54 +++++++++++++++++++++++++++++++
 2 files changed, 57 insertions(+), 0 deletions(-)
---
diff --git a/kde-plasma-networkmanagement.spec b/kde-plasma-networkmanagement.spec
index 02812fb..e6a9101 100644
--- a/kde-plasma-networkmanagement.spec
+++ b/kde-plasma-networkmanagement.spec
@@ -32,6 +32,8 @@ Patch2: networkmanagement-0.9-disable_kded.patch
 # Adding "Enable networking" button to knetworkmanager
 # https://bugs.kde.org/238325
 Patch50: networkmanagement-kdebug238325.patch
+# fix build for kde-4.4.x
+Patch51: networkmanagement-0.9-kutils_libs.patch
 
 BuildRequires:  kdelibs4-devel
 BuildRequires:  kdebase-workspace-devel
@@ -153,6 +155,7 @@ Obsoletes:      knetworkmanager4-vpnc < %{?epoch:%{epoch}:}%{version}-%{release}
 %patch2 -p1 -b .disable_kded
 %endif
 %patch50 -p0 -b .kdebug238325
+%patch51 -p1 -b .kutils_libs
 
 
 %build
diff --git a/networkmanagement-0.9-kutils_libs.patch b/networkmanagement-0.9-kutils_libs.patch
new file mode 100644
index 0000000..9786032
--- /dev/null
+++ b/networkmanagement-0.9-kutils_libs.patch
@@ -0,0 +1,54 @@
+diff -up networkmanagement-0.9/applet/CMakeLists.txt.KUTILS_LIBS networkmanagement-0.9/applet/CMakeLists.txt
+--- networkmanagement-0.9/applet/CMakeLists.txt.KUTILS_LIBS	2010-08-30 17:43:18.000000000 -0500
++++ networkmanagement-0.9/applet/CMakeLists.txt	2010-09-07 13:14:51.743818273 -0500
+@@ -26,7 +26,6 @@ set(networkmanager_SRCS
+     )
+ 
+ kde4_add_plugin(plasma_applet_networkmanagement ${networkmanager_SRCS})
+-target_link_libraries(plasma_applet_networkmanagement ${KDE4_PLASMA_LIBS} knmclient knminternals ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} solidcontrol ${KDE4_KCMUTILS_LIBS})
+ 
+ install(TARGETS plasma_applet_networkmanagement DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES plasma-applet-networkmanagement.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+@@ -39,4 +38,7 @@ if (NOT IS45)
+     install(FILES
+         network.svgz
+         DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/default/icons/)
++    target_link_libraries(plasma_applet_networkmanagement ${KDE4_PLASMA_LIBS} knmclient knminternals ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} solidcontrol ${KDE4_KUTILS_LIBS})
++else (NOT IS45)
++    target_link_libraries(plasma_applet_networkmanagement ${KDE4_PLASMA_LIBS} knmclient knminternals ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} solidcontrol ${KDE4_KCMUTILS_LIBS})
+ endif (NOT IS45)
+diff -up networkmanagement-0.9/settings/config/CMakeLists.txt.KUTILS_LIBS networkmanagement-0.9/settings/config/CMakeLists.txt
+--- networkmanagement-0.9/settings/config/CMakeLists.txt.KUTILS_LIBS	2010-08-30 17:43:20.000000000 -0500
++++ networkmanagement-0.9/settings/config/CMakeLists.txt	2010-09-07 13:18:15.699057553 -0500
+@@ -18,7 +18,12 @@ set(kcm_networkmanagement_SRCS
+ kde4_add_ui_files(kcm_networkmanagement_SRCS manageconnectionwidget.ui menutooltipsettingswidget.ui traysettings.ui)
+ kde4_add_plugin(kcm_networkmanagement ${kcm_networkmanagement_SRCS})
+ 
+-target_link_libraries(kcm_networkmanagement knmui knminternals solidcontrol ${KDE4_KDEUI_LIBS} ${KDE4_KCMUTILS_LIBS})
++macro_ensure_version("4.4.76" ${KDE_VERSION} IS45)
++if (IS45)
++   target_link_libraries(kcm_networkmanagement knmui knminternals solidcontrol ${KDE4_KDEUI_LIBS} ${KDE4_KCMUTILS_LIBS})
++else (IS45)
++   target_link_libraries(kcm_networkmanagement knmui knminternals solidcontrol ${KDE4_KDEUI_LIBS} ${KDE4_KUTILS_LIBS})
++endif (IS45)
+ 
+ ## next target: tray config KCM
+ 
+diff -up networkmanagement-0.9/settings/configshell/CMakeLists.txt.KUTILS_LIBS networkmanagement-0.9/settings/configshell/CMakeLists.txt
+--- networkmanagement-0.9/settings/configshell/CMakeLists.txt.KUTILS_LIBS	2010-08-30 17:43:20.000000000 -0500
++++ networkmanagement-0.9/settings/configshell/CMakeLists.txt	2010-09-07 13:18:53.667797710 -0500
+@@ -14,7 +14,13 @@ set(networkmanagement_configshell_SRCS
+ 
+ kde4_add_executable(networkmanagement_configshell ${networkmanagement_configshell_SRCS})
+ 
+-target_link_libraries(networkmanagement_configshell knmui knminternals solidcontrol ${KDE4_KDEUI_LIBS} ${KDE4_KCMUTILS_LIBS})
++macro_ensure_version("4.4.76" ${KDE_VERSION} IS45)
++if (IS45)
++   target_link_libraries(networkmanagement_configshell knmui knminternals solidcontrol ${KDE4_KDEUI_LIBS} ${KDE4_KCMUTILS_LIBS})
++else (IS45)
++   target_link_libraries(networkmanagement_configshell knmui knminternals solidcontrol ${KDE4_KDEUI_LIBS} ${KDE4_KUTILS_LIBS})
++endif (IS45)
++
+ 
+ install(TARGETS networkmanagement_configshell DESTINATION ${LIBEXEC_INSTALL_DIR})
+ 


More information about the scm-commits mailing list