commit amarok for openSUSE:12.1:Update:Test
Hello community,
here is the log from the commit of package amarok for openSUSE:12.1:Update:Test
checked in at 2012-01-11 18:25:31
Comparing /work/SRC/openSUSE:12.1:Update:Test/amarok (Old)
and /work/SRC/openSUSE:12.1:Update:Test/.amarok.new (New)
Package is amarok, Maintainer is kde-maintain...@suse.de
Changes:
--- /work/SRC/openSUSE:12.1:Update:Test/amarok/amarok.changes 2011-12-12
16:26:19.0 +0100
+++ /work/SRC/openSUSE:12.1:Update:Test/.amarok.new/amarok.changes
2012-01-11 18:25:32.0 +0100
@@ -2 +2,6 @@
-Sat Dec 10 07:03:24 UTC 2011 - m...@suse.com
+Mon Dec 12 09:30:53 CET 2011 - mhruse...@suse.cz
+
+- added patch to carry around correct errmsg.sys file (bnc#712749)
+
+---
+Wed Nov 30 06:17:01 UTC 2011 - m...@suse.com
@@ -9 +14 @@
-Sun Nov 6 17:49:24 UTC 2011 - ctri...@opensuse.org
+Sat Nov 5 06:14:00 UTC 2011 - ctri...@opensuse.org
New:
errmsg-mysql-embedded.diff
Other differences:
--
++ amarok.spec ++
--- /var/tmp/diff_new_pack.P1tMo6/_old 2012-01-11 18:25:32.0 +0100
+++ /var/tmp/diff_new_pack.P1tMo6/_new 2012-01-11 18:25:32.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package amarok
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
%bcond_with ffmpeg
Name: amarok
@@ -26,6 +27,8 @@
Url:http://amarok.kde.org/
Source0:
ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/%{name}-%{version}.tar.bz2
+# PATCH-FIX-OPENSUSE errmsg-mysql-embedded.diff -- Don't require errmsg.sys
from mysql package
+Patch0: errmsg-mysql-embedded.diff
# PATCH-FEATURE-OPENSUSE ksuseinstall.diff llu...@novell.com -- Support for
on-demand codecs install using ksuseinstall
Patch1: ksuseinstall.diff
# PATCH-FIX-OPENSUSE initial-preference.diff bnc#605522 llu...@novell.com --
Increase initial preference to be used for audio files instead of Kaffeine
@@ -62,7 +65,7 @@
BuildRequires: libqca2-devel
BuildRequires: libqjson-devel
BuildRequires: loudmouth-devel
-BuildRequires: mysql
+BuildRequires: mysql-community-server
BuildRequires: qt4-qtscript
BuildRequires: taglib-devel
BuildRequires: taglib-extras-devel
@@ -87,6 +90,7 @@
%lang_package
%prep
%setup -q
+%patch0 -p1
%if !0%{?kde_updatedapps}
%patch1 -p1
%endif
++ errmsg-mysql-embedded.diff ++
Index:
amarok-2.4.3/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp
===
---
amarok-2.4.3.orig/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp
+++
amarok-2.4.3/src/core-impl/collections/db/sql/mysqlecollection/MySqlEmbeddedStorage.cpp
@@ -65,6 +65,7 @@ MySqlEmbeddedStorage::MySqlEmbeddedStora
// functions, such as FULLTEXT indexing.
out default-storage-engine = MyISAM endl;
out loose-innodb = 0 endl;
+out language=/usr/share/kde4/apps/amarok endl;
out skip-grant-tables = 1 endl;
out myisam-recover = FORCE endl;
out key_buffer_size = 16777216 endl; // (16Mb)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit amarok for openSUSE:12.1:Update:Test
Hello community,
here is the log from the commit of package amarok for openSUSE:12.1:Update:Test
checked in at 2011-12-12 16:26:14
Comparing /work/SRC/openSUSE:12.1:Update:Test/amarok (Old)
and /work/SRC/openSUSE:12.1:Update:Test/.amarok.new (New)
Package is amarok, Maintainer is kde-maintain...@suse.de
Changes:
--- /work/SRC/openSUSE:12.1:Update:Test/amarok/amarok.changes 2011-12-12
16:26:19.0 +0100
+++ /work/SRC/openSUSE:12.1:Update:Test/.amarok.new/amarok.changes
2011-12-12 16:26:19.0 +0100
@@ -1,0 +2,7 @@
+Sat Dec 10 07:03:24 UTC 2011 - m...@suse.com
+
+- Add amarok-fix-infinite-loop-eating-CPU.diff
+ * Fix infinite loop in context view eating CPU until main
+window is shown (bnc#733421)
+
+---
New:
amarok-fix-infinite-loop-eating-CPU.diff
Other differences:
--
++ amarok.spec ++
--- /var/tmp/diff_new_pack.Izk6sg/_old 2011-12-12 16:26:20.0 +0100
+++ /var/tmp/diff_new_pack.Izk6sg/_new 2011-12-12 16:26:20.0 +0100
@@ -15,17 +15,16 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
%bcond_with ffmpeg
Name: amarok
Version:2.4.3
-Release:4
+Release:0
Summary:Media Player for KDE
+License:GPL-2.0+
+Group: Productivity/Multimedia/Sound/Players
-License:GPLv2+
Url:http://amarok.kde.org/
-Group: Productivity/Multimedia/Sound/Players
Source0:
ftp://ftp.kde.org/pub/kde/stable/amarok/%{version}/src/%{name}-%{version}.tar.bz2
# PATCH-FEATURE-OPENSUSE ksuseinstall.diff llu...@novell.com -- Support for
on-demand codecs install using ksuseinstall
Patch1: ksuseinstall.diff
@@ -33,6 +32,8 @@
Patch2: initial-preference.diff
# PATCH-FIX-OPENSUSE flac_mimetype_bnc671581.diff bnc#671581 ctri...@gmx.net
-- Support for the changed mimetype for flac files
Patch3: flac_mimetype_bnc671581.diff
+# PATCH-FIX-UPSTREAM amarok-fix-infinite-loop-eating-CPU.diff bnc#733421
m...@suse.com -- Fix infinite loop in context view eating CPU until main window
shown
+Patch4: amarok-fix-infinite-loop-eating-CPU.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# Required for the fdupes macro
@@ -93,6 +94,7 @@
%if 0%{?suse_version} 1130
%patch3
%endif
+%patch4 -p1
# Remove build time references so build-compare can do its work
FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e
%%Y')
++ amarok-fix-infinite-loop-eating-CPU.diff ++
commit 79bd9a7c6777e3f5d4e723bc5d3b00e5d6fe532b
Author: Matěj Laitl ma...@laitl.cz
Date: Sun Nov 27 15:24:55 2011 +0100
Fix infinite loop in context view eating CPU until main window is shown
We used to use _scene_ sceneRect in
VerticalToolbarContainment::updateGeometry() to update applets and
geometry, but that leaded to infinite loop (across mainloop) -
m_applets-setGeometry(), refresh() would enlarge _scene_ sceneRect by
a few pixels which would trigger updateGeometry() and so on...
We now use _view_ sceneRect to update geometry. Rick W. Chen discovered
some glitches in applet collapsing when this patch is applied, but he
has a patch for that in the works and this is more serious problem, so
pushing this.
REVIEW: 103271
BUG: 278897
FIXED-IN: 2.5
Index:
amarok-2.4.3/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
===
---
amarok-2.4.3.orig/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
+++
amarok-2.4.3/src/context/containments/verticallayout/VerticalToolbarContainment.cpp
@@ -118,7 +118,18 @@ void
Context::VerticalToolbarContainment::updateGeometry()
{
Context::Containment::updateGeometry();
-QRectF rect = scene()-sceneRect();
+
+/* We used to use _scene_ sceneRect here to update applets and geomtery,
but that
+ * leaded to infinite loop (across mainloop) - see bug 278897.
+ * (m_applets-setGeometry(), refresh() would enlarge _scene_ sceneRect by
a few
+ * pixels which would trigger updateGeometry() and so on...)
+ *
+ * We now use _view_ sceneRect to update geometry and do nothing without a
view
+ */
+if(!view())
+return;
+
+QRectF rect = view()-sceneRect();
setGeometry( rect );
m_applets-setGeometry( rect );
m_applets-refresh();
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
