[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [emerge/kde-4.10] portage/kde/kdemultimedia/juk: fix building juk on 4.10.0
From:       Patrick Spendrin <ps_ml () gmx ! de>
Date:       2013-02-28 22:06:27
Message-ID: 20130228220627.7048EA60FB () git ! kde ! org
[Download RAW message or body]

Git commit 42635c1acfaa2ae9b12b119148ff4321bb88dda3 by Patrick Spendrin.
Committed on 28/02/2013 at 23:01.
Pushed by sengels into branch 'kde-4.10'.

fix building juk on 4.10.0

M  +1    -0    portage/kde/kdemultimedia/juk/juk-20130225.py
A  +53   -0    portage/kde/kdemultimedia/juk/juk-4.10.0.diff

http://commits.kde.org/emerge/42635c1acfaa2ae9b12b119148ff4321bb88dda3

diff --git a/portage/kde/kdemultimedia/juk/juk-20130225.py \
b/portage/kde/kdemultimedia/juk/juk-20130225.py index 3eae8a7..e6e391a 100644
--- a/portage/kde/kdemultimedia/juk/juk-20130225.py
+++ b/portage/kde/kdemultimedia/juk/juk-20130225.py
@@ -7,6 +7,7 @@ class subinfo(info.infoclass):
         for ver in ['0', '1', '2', '3', '4', '5']:
             self.targets[kd.kdeversion + ver] = "http://download.kde.org/stable/" + \
                kd.kdeversion + ver + "/src/" + self.package + "-" + kd.kdeversion + \
                ver + ".tar.xz"
             self.targetInstSrc[kd.kdeversion + ver] = self.package + '-' + \
kd.kdeversion + ver +        self.patchToApply['4.10.0'] = [("juk-4.10.0.diff", 1)]
 
         self.defaultTarget = 'gitHEAD'
 
diff --git a/portage/kde/kdemultimedia/juk/juk-4.10.0.diff \
b/portage/kde/kdemultimedia/juk/juk-4.10.0.diff new file mode 100644
index 0000000..40cc2a7
--- /dev/null
+++ b/portage/kde/kdemultimedia/juk/juk-4.10.0.diff
@@ -0,0 +1,53 @@
+diff --git a/tagrenameroptions.cpp b/tagrenameroptions.cpp
+index 9c7ab63..cb40dd4 100644
+--- a/tagrenameroptions.cpp
++++ b/tagrenameroptions.cpp
+@@ -26,7 +26,7 @@ TagRenamerOptions::TagRenamerOptions() :
+     m_emptyAction(IgnoreEmptyTag),
+     m_trackWidth(0),
+     m_disabled(true),
+-    m_category(Unknown)
++    m_category(TagUnknown)
+ {
+ }
+ 
+@@ -177,7 +177,7 @@ TagType TagRenamerOptions::tagFromCategoryText(const QString \
&text) +         if(tagTypeText(static_cast<TagType>(i), false) == text)
+             return static_cast<TagType>(i);
+ 
+-    return Unknown;
++    return TagUnknown;
+ }
+ 
+ // vim: set et sw=4 tw=0 sta:
+diff --git a/tagrenameroptions.h b/tagrenameroptions.h
+index 612b108..b5bf8e8 100644
+--- a/tagrenameroptions.h
++++ b/tagrenameroptions.h
+@@ -22,7 +22,7 @@
+ // the count of valid tag types.
+ enum TagType {
+     StartTag, Title = StartTag, Artist, Album,
+-    Track, Genre, Year, NumTypes, Unknown
++    Track, Genre, Year, NumTypes, TagUnknown
+ };
+ 
+ /**
+@@ -31,7 +31,7 @@ enum TagType {
+  */
+ struct CategoryID
+ {
+-    CategoryID() : category(Unknown), categoryNumber(0)
++    CategoryID() : category(TagUnknown), categoryNumber(0)
+     {
+     }
+ 
+@@ -131,7 +131,7 @@ public:
+     /**
+      * Function that tries to match a string back to its category.  Uses only
+      * the untranslated and case-sensitive form of the string.  If it fails it
+-     * will return Unknown.
++     * will return TagUnknown.
+      */
+     static TagType tagFromCategoryText(const QString &text);
+ 


[prev in list] [next in list] [prev in thread] [next in thread]