rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fri Apr 24 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.2-12 

- drop the PopupApplet configuration backports (#495998) for now, kconf_update
  does not work as expected for Plasma
This commit is contained in:
Kevin Kofler 2009-04-24 01:45:15 +00:00
parent 55b80fabf5
commit c0bd0bc57b
3 changed files with 5 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
kdelibs-4.2.2-popupapplet-config.patch
View File

@ -1,26 +0,0 @@
Index: plasma/popupapplet.cpp
===================================================================
--- plasma/popupapplet.cpp (revision 937997)
+++ plasma/popupapplet.cpp (revision 937998)
@@ -535,8 +535,8 @@
{
//Reposition the dialog
if (dialog) {
- KConfigGroup sizeGroup = q->config();
- sizeGroup = KConfigGroup(&sizeGroup, "PopupApplet");
+ KConfigGroup *mainGroup = static_cast<Applet*>(q)->d->mainConfigGroup();
+ KConfigGroup sizeGroup(mainGroup, "PopupApplet");
sizeGroup.writeEntry("DialogHeight", dialog->height());
sizeGroup.writeEntry("DialogWidth", dialog->width());
@@ -559,8 +559,8 @@
return;
}
- KConfigGroup sizeGroup = q->config();
- sizeGroup = KConfigGroup(&sizeGroup, "PopupApplet");
+ KConfigGroup *mainGroup = static_cast<Applet*>(q)->d->mainConfigGroup();
+ KConfigGroup sizeGroup(mainGroup, "PopupApplet");
Q_ASSERT(q->containment());
Q_ASSERT(q->containment()->corona());

38
kdelibs-4.2.2-popupapplet-kconf_update.patch
View File

@ -1,38 +0,0 @@
diff -Nur kdelibs-4.2.2/plasma/CMakeLists.txt kdelibs-4.2.2-popupapplet-kconf_update/plasma/CMakeLists.txt
--- kdelibs-4.2.2/plasma/CMakeLists.txt 2009-01-06 18:27:56.000000000 +0100
+++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/CMakeLists.txt 2009-04-19 05:33:42.000000000 +0200
@@ -268,3 +268,5 @@
install(FILES scripting/plasmoids.knsrc DESTINATION ${CONFIG_INSTALL_DIR})
+install(FILES plasma_popupapplet_fix_groups.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
+install(PROGRAMS plasma_popupapplet_fix_groups.pl DESTINATION ${KCONF_UPDATE_INSTALL_DIR})
diff -Nur kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.pl kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.pl
--- kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.pl 1970-01-01 01:00:00.000000000 +0100
+++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.pl 2009-04-24 00:42:44.000000000 +0200
@@ -0,0 +1,9 @@
+#!/usr/bin/perl
+
+while(<>) {
+ if ($_ =~ m/^\[.*\[Configuration\]\[PopupApplet\]$/) {
+ print "# DELETEGROUP $_";
+ $_ =~ s/\[Configuration\]\[PopupApplet\]$/[PopupApplet]/;
+ }
+ print $_;
+}
diff -Nur kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.upd kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.upd
--- kdelibs-4.2.2/plasma/plasma_popupapplet_fix_groups.upd 1970-01-01 01:00:00.000000000 +0100
+++ kdelibs-4.2.2-popupapplet-kconf_update/plasma/plasma_popupapplet_fix_groups.upd 2009-04-23 23:18:43.000000000 +0200
@@ -0,0 +1,12 @@
+# Fix groups of the form ...[Configuration][PopupApplet] into ...[PopupApplet]
+Id=PlasmaPopupAppletFixGroups1
+File=plasma-appletsrc
+Script=plasma_popupapplet_fix_groups.pl,perl
+#
+Id=PlasmaPopupAppletFixGroups2
+File=plasmarc
+Script=plasma_popupapplet_fix_groups.pl,perl
+#
+Id=PlasmaPopupAppletFixGroups3
+File=plasmoidviewer-appletsrc
+Script=plasma_popupapplet_fix_groups.pl,perl

12
kdelibs.spec
View File

@ -1,6 +1,6 @@
Summary: K Desktop Environment 4 - Libraries
Version: 4.2.2
Release: 11%{?dist}
Release: 12%{?dist}
%if 0%{?fedora} > 8
Name: kdelibs
@ -95,10 +95,6 @@ Patch105: kdelibs-4.2.2-plasma-focus.patch
# 4.3 branch
Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
# fix Plasma PopupApplet configuration interfering with weather applet (#495998)
Patch201: kdelibs-4.2.2-popupapplet-config.patch
# kconf_update script for Patch201
Patch202: kdelibs-4.2.2-popupapplet-kconf_update.patch
BuildRequires: qt4-devel >= 4.4.0
# qt4%{_?_isa} isn't provided yet -- Rex
@ -244,8 +240,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
# 4.3
%patch200 -p1 -b .AllowExternalPaths
%patch201 -p0 -b .popupapplet-config
%patch202 -p1 -b .popupapplet-kconf_update
%build
@ -428,6 +422,10 @@ rm -rf %{buildroot}
%changelog
* Fri Apr 24 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.2-12
- drop the PopupApplet configuration backports (#495998) for now, kconf_update
does not work as expected for Plasma
* Thu Apr 23 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.2.2-11
- fix the kconf_update scriptlet for #495998 again (missing DELETEGROUP)