[kde-plasma-networkmanagement] - make plasma_applet unconditional - include javascript to enable nm plasmoid in systray, kde45+ (#6
Rex Dieter
rdieter at fedoraproject.org
Wed Sep 22 13:28:46 UTC 2010
commit 9d2ee45e6332e2aa7ad7f8ac30e70356e41e502a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Wed Sep 22 08:34:20 2010 -0500
- make plasma_applet unconditional
- include javascript to enable nm plasmoid in systray, kde45+ (#604798)
00-fedora-networkmanagement.js | 47 +++++++++++++++++++++++++++++
kde-plasma-networkmanagement.spec | 21 ++++++++----
networkmanagement-0.9-build_options.patch | 4 +-
3 files changed, 63 insertions(+), 9 deletions(-)
---
diff --git a/00-fedora-networkmanagement.js b/00-fedora-networkmanagement.js
new file mode 100644
index 0000000..5dc591a
--- /dev/null
+++ b/00-fedora-networkmanagement.js
@@ -0,0 +1,47 @@
+/*
+ 00-fedora-networkmanagement.js - Add NM plasmoid to the systray
+ Copyright (C) 2010 Kevin Kofler <kevin.kofler at chello.at>
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ Portions lifted from 01-kubuntu-10.04.js:
+ Harald Sitter, apachelogger at ubuntu.com 2010-04-02
+ Jonathan Riddell, jriddell at ubuntu.com 2010-02-18
+ Copyright Canonical Ltd, may be copied under the GNU GPL 2 or later
+*/
+
+systrayFound = false;
+pids = panelIds;
+for (i = 0; i < pids.length; ++i) {
+ p = panelById(pids[i]);
+ if (!p) continue;
+ ids = p.widgetIds;
+ for (j = 0; j < ids.length; ++j) {
+ w = p.widgetById(ids[j]);
+ if (!w || w.type != "systemtray") continue;
+ systrayFound = true;
+ w.currentConfigGroup = new Array("Applets");
+ max = 0;
+ for (k = 0; k < w.configGroups.length; ++k)
+ if (parseInt(w.configGroups[k]) > max)
+ max = parseInt(w.configGroups[k]);
+ w.currentConfigGroup = new Array("Applets", max + 1);
+ w.writeConfig("plugin", "org.kde.networkmanagement");
+ print("Network management plasmoid added to the systray");
+ break;
+ }
+ if (systrayFound) break;
+}
+if (!systrayFound)
+ print("No systray found");
diff --git a/kde-plasma-networkmanagement.spec b/kde-plasma-networkmanagement.spec
index 811a83f..7ab9acf 100644
--- a/kde-plasma-networkmanagement.spec
+++ b/kde-plasma-networkmanagement.spec
@@ -4,7 +4,7 @@
Name: kde-plasma-networkmanagement
Epoch: 1
Version: 0.9
-Release: 0.24.%{snap}%{?dist}
+Release: 0.25.%{snap}%{?dist}
Summary: NetworkManager KDE 4 integration
Group: Applications/Internet
@@ -18,6 +18,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Please always use create_tarball.rb so translations get included.
Source0: networkmanagement-%{version}-%{snap}.tar.bz2
+# Add plasma-nm to default systray if needed, for upgraders...
+Source10: 00-fedora-networkmanagement.js
+
# adds to NM_* cmake build options used below. Mostly for testing purposes.
Patch1: networkmanagement-0.9-build_options.patch
@@ -51,9 +54,8 @@ Obsoletes: kde-plasma-networkmanagement-devel < 0.1-0.21
Requires: knetworkmanager-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
-# define/set to include plasma applet
-%define plasma_applet 1
%if "%{?_kde4_version}" < "4.4.76"
+# include knm monolithic client
%define monolithic 1
%error
Conflicts: kdebase-runtime > 4.4.76
@@ -138,8 +140,8 @@ Obsoletes: knetworkmanager4-vpnc < %{?epoch:%{epoch}:}%{version}-%{release}
%patch1 -p1 -b .build_options
%if 0%{?monolithic}
%patch2 -p1 -b .disable_kded
-%endif
%patch50 -p0 -b .kdebug238325
+%endif
%patch51 -p0 -b .bssid
@@ -148,7 +150,6 @@ mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} \
-DDBUS_SYSTEM_POLICY_DIR=%{_sysconfdir}/dbus-1/system.d \
- %{?plasma_applet:-DNM_PLASMA_APPLET=BOOL:ON} \
%{?monolithic:-DNM_MONOLITHIC=BOOL:ON -DINSTALL_KNM_AUTOSTART=ON} \
..
popd
@@ -176,6 +177,7 @@ rm -fv %{buildroot}%{_kde4_datadir}/kde4/services/networkmanagement_strongswanui
%find_lang knetworkmanager --with-kde
%else
rm -fv %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/knetworkmanager.mo
+install -m644 -p -D %{SOURCE10} %{buildroot}%{_kde4_appsdir}/plasma-desktop/updates/00-fedora-networkmanagement.js
%endif
%find_lang libknetworkmanager
%find_lang plasma_applet_networkmanagement
@@ -216,7 +218,6 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
%files -f plasma_applet_networkmanagement.lang
%defattr(-,root,root,-)
-%if 0%{?plasma_applet}
%if "%{?_kde4_version}" < "4.4.76"
%{_kde4_appsdir}/desktoptheme/default/icons/*
%endif
@@ -224,6 +225,8 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
%{_kde4_datadir}/kde4/services/kded/networkmanagement.desktop
%{_kde4_libdir}/kde4/plasma_applet_networkmanagement.so
%{_kde4_libdir}/kde4/kded_networkmanagement.so
+%if ! 0%{?monolithic}
+%{_kde4_appsdir}/plasma-desktop/updates/*.js
%endif
%if 0%{?monolithic}
@@ -277,9 +280,13 @@ gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null || :
%changelog
+* Wed Sep 22 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.25.20100920
+- make plasma_applet unconditional
+- include javascript to enable nm plasmoid in systray, kde45+ (#604798)
+
* Mon Sep 20 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.24.20100920
- 20100920 snapshot
-- Obsoletes: knetworkmanager (if built against kde-4.5)
+- Obsoletes: knetworkmanager , if built against kde-4.5 (#604798)
* Tue Sep 14 2010 Rex Dieter <rdieter at fedoraproject.org> 1:0.9-0.23.20100830
- knetworkmanager doesn´t recognize BSSID (kde#238046)
diff --git a/networkmanagement-0.9-build_options.patch b/networkmanagement-0.9-build_options.patch
index b1a1431..79a087b 100644
--- a/networkmanagement-0.9-build_options.patch
+++ b/networkmanagement-0.9-build_options.patch
@@ -5,10 +5,10 @@ diff -up networkmanagement-0.9/CMakeLists.txt.no_applet networkmanagement-0.9/CM
${CMAKE_CURRENT_BUILD_DIR}
)
-+if (NM_PLASMA_APPLET)
++#if (NM_PLASMA_APPLET)
add_subdirectory(applet)
+add_subdirectory(kded)
-+endif (NM_PLASMA_APPLET)
++#endif (NM_PLASMA_APPLET)
add_subdirectory(backends)
add_subdirectory(libs)
add_subdirectory(tests)
More information about the scm-commits
mailing list