[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#612342: squeeze KDE updates (was Re: My last (hopefully) bits for KDE in Squeeze)



Hello,

On šeštadienis 12 Vasaris 2011 18:27:58 Adam D. Barratt wrote:
>Three would have been better; one package per report is much easier to
>keep track of.  (As would using X-Debbugs-CC so the mail on the list
>actually had the bug number).

Sorry, will try to do better next time.

> > More
> > detailed info can be found in the quoted text, individual bug reports and
> > previous mails in the thread.
> > 
> > 1) krunner #607974 src:kdebase-workspace. The upload is planned to be
> > identical to the current 4:4.4.5-8 in unstable, just with
> > squeeze-adjusted revision number. 4:4.4.5-8 fared well in unstable, I
> > have never had a single krunner crash since upgrading.
> 
> This would basically be
> http://websvn.kde.org/?view=revision&revision=1098125 ?  How close to
> the 4.5 fix is the 4.4.5 version?  (There didn't appear to be a link to
> the backported diff in the upstream bug report).

Because it was not backported by upstream, I backported it myself. But my 
backport is very close to the original patch. It's only an unfuzz of the 
modified comment lines in KDE 4.5 (see below)

@@ -1,3 +1,16 @@
+From: Aaron J. Seigo <aseigo@kde.org>
+Subject: Fix for krunner occasionally crashes (threading related)
+Origin: backport http://websvn.kde.org/?view=revision&revision=1098125
+Bug: https://bugs.kde.org/show_bug.cgi?id=236496#c11
+Bug: https://bugs.kde.org/show_bug.cgi?id=224212
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=607974
+Last-Update: 2011-01-18
+Forwarded: yes
+Applied-Upstream: 4.5.0
+
+move the kfileplaces usage to the main thread; really non-optimal, but KIO
+forces our hand. if this works out in trunk, i'll backport to the 4.4 branch.
+
 --- a/plasma/generic/runners/places/placesrunner.cpp
 +++ b/plasma/generic/runners/places/placesrunner.cpp
 @@ -19,14 +19,20 @@
@@ -21,16 +34,16 @@
      Q_UNUSED(args)
      setObjectName("Places");
      addSyntax(Plasma::RunnerSyntax(":q:", i18n("Finds file manager locations 
that match :q:")));
-@@ -34,7 +40,7 @@
+@@ -34,7 +40,7 @@ PlacesRunner::PlacesRunner(QObject* pare
  
-     // ensure the bookmarkmanager, etc. in the places model gets creates 
created in the main thread
-     // otherwise crashes ensue
+     // makes sure we have the bookmarks and what not that the places
+     // model uses set up in the main thread, otherwise crashes ensue
 -    KFilePlacesModel places;
 +    m_helper = new PlacesRunnerHelper(this);
  }
  
  PlacesRunner::~PlacesRunner()
-@@ -43,21 +49,48 @@
+@@ -43,21 +49,48 @@ PlacesRunner::~PlacesRunner()
  
  void PlacesRunner::match(Plasma::RunnerContext &context)
  {
@@ -84,7 +97,7 @@
          if ((all && !text.isEmpty()) || text.compare(term, 
Qt::CaseInsensitive) == 0) {
              type = Plasma::QueryMatch::ExactMatch;
              relevance = all ? 0.9 : 1.0;
-@@ -67,18 +100,18 @@
+@@ -67,18 +100,18 @@ void PlacesRunner::match(Plasma::RunnerC
          }
  
          if (type != Plasma::QueryMatch::NoMatch) {
@@ -133,7 +146,7 @@
  class PlacesRunner : public Plasma::AbstractRunner
  {
      Q_OBJECT
-@@ -35,8 +51,14 @@
+@@ -35,8 +51,14 @@ public:
      void match(Plasma::RunnerContext &context);
      void run(const Plasma::RunnerContext &context, const Plasma::QueryMatch 
&action);
 
> > 2) src:krusader #604196. All info, including the patch, below and in the
> > bug report. Package revision will be properly squeeze-adjusted.
> 
> Please go ahead with this one.
> 
> > 3) kde4libs #588374. Squeeze upload will be based on kde4libs 4:4.4.5-3
> > currently in unstable. It solves a desktop "defacing" issues after
> > upgrade from KDE 3 (lenny -> squeeze). Quoting the changelog:
> > 
> > * Add a kconf_update script (migrate_from_kde3_icon_theme) to migrate
> > away
> > 
> >   from old KDE 3 icon themes which are KDE 4 incompatible (e.g.
> >   crystalsvg). (Closes: #588374)
> 
> This appears not to have been included in the previous discussions,
> afaics?  It's a shame this wasn't resolved until so close to the
> release, given the date of the original report.

Well, I figured you would not accept non-RC fixes so I didn't even try asking.

> Are most themes targeted at either KDE3 or KDE4, or would they usually
> be expected to work with both?

KDE 3 themes do not work with KDE 4. Afaik, many icons were renamed to comply 
with some XDG standard. So that's where "defacing" comes from.  When KDE 4 
does not find an icon in the old KDE 3 theme, it uses a "default" one 
(probably the first from the list). So in place of all missing icons, user 
gets the same icon all over the place (new, open, save, save as, shutdown, 
restart etc... buttons look the same). The patch resets icon theme in the user 
configuration if it does not find some KDE 4 compliant icons in the current 
theme.

-- 
Modestas Vainius <modax@debian.org>

Attachment: signature.asc
Description: This is a digitally signed message part.


Reply to: