[prev in list] [next in list] [prev in thread] [next in thread]
List: amarok-devel
Subject: Fwd: [amarok] /: Fix plugin loading and bump_plugin_version.rb script
From: Lydia Pintscher <lydia.pintscher () gmail ! com>
Date: 2011-03-17 19:24:33
Message-ID: AANLkTinsAgc+q-qUYFupPy8EN1ubFUEjbqMENrX-nPJA () mail ! gmail ! com
[Download RAW message or body]
Heya folks,
We have a problem :(
There is a plugin version mismatch in the tag and tarball causing
plug-ins not to load. Unfortunately no-one noticed in our testing. The
commit below fixes it.
My question now: How do we handle this? Can you add it as a patch to
your packages or do you need me to re-roll the tarball? (The latter
would delay the release until after the weekend.)
Cheers
Lydia
---------- Forwarded message ----------
From: Rick W.Chen <stuffcorpse@archlinux.us>
Date: Thu, Mar 17, 2011 at 06:41
Subject: [amarok] /: Fix plugin loading and bump_plugin_version.rb script
To: kde-commits@kde.org
Git commit 37eda947bd8181a73ad0fffc88e66c25ddd69f28 by Rick W. Chen.
Committed on 17/03/2011 at 06:38.
Pushed by rickc into branch 'master'.
Fix plugin loading and bump_plugin_version.rb script
M +1 -1 release_scripts/bump_plugin_version.rb
M +1 -1 src/PluginManager.cpp
http://commits.kde.org/amarok/37eda947bd8181a73ad0fffc88e66c25ddd69f28
diff --git a/release_scripts/bump_plugin_version.rb
b/release_scripts/bump_plugin_version.rb
index 9f0c71a..d2194a2 100755
--- a/release_scripts/bump_plugin_version.rb
+++ b/release_scripts/bump_plugin_version.rb
@@ -47,7 +47,7 @@ temp = str.scan( /const int
Plugins::PluginManager::s_pluginFrameworkVersion = [
print "Bumping the plugin framework version to: #{@version}"
-str.sub!( /static const int PluginFrameworkVersion = [0-9]*;/,
"static const int PluginFrameworkVersion = #{@version};" )
+str.sub!( /const int Plugins::PluginManager::s_pluginFrameworkVersion
= [0-9]*;/, "const int
Plugins::PluginManager::s_pluginFrameworkVersion = #{@version};" )
file << str
file.close()
diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp
index ff52646..1e34510 100644
--- a/src/PluginManager.cpp
+++ b/src/PluginManager.cpp
@@ -32,7 +32,7 @@
#include <QFile>
#include <QMetaEnum>
-const int Plugins::PluginManager::s_pluginFrameworkVersion = 60;
+const int Plugins::PluginManager::s_pluginFrameworkVersion = 61;
Plugins::PluginManager* Plugins::PluginManager::s_instance = 0;
Plugins::PluginManager*
--
Lydia Pintscher
Amarok community manager
kde.org - amarok.kde.org - kubuntu.org
claimid.com/nightrose
_______________________________________________
Amarok-devel mailing list
Amarok-devel@kde.org
https://mail.kde.org/mailman/listinfo/amarok-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic