[kscd/f20: 9/12] Revert "4.12.5"
Rex Dieter
rdieter at fedoraproject.org
Tue Jul 1 14:11:15 UTC 2014
commit 3849575a057bae585f0f26fde00c85ec5a8981f9
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Tue Jul 1 09:11:20 2014 -0500
Revert "4.12.5"
This reverts commit 427406e53849697996e0b74dd1d5c0e1fb9a41b4.
.gitignore | 20 ++-
0001-Swap-names-of-loop-random-buttons.patch | 249 ++++++++++++++++++++++++++
kscd.spec | 11 +-
sources | 2 +-
4 files changed, 275 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 92b9c83..f90e6ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,19 @@
-/kscd-4.12.5.tar.xz
+/kscd-4.10.1.tar.xz
+/kscd-4.10.2.tar.xz
+/kscd-4.10.3.tar.xz
+/kscd-4.10.4.tar.xz
+/kscd-4.10.90.tar.xz
+/kscd-4.10.95.tar.xz
+/kscd-4.10.97.tar.xz
+/kscd-4.11.0.tar.xz
+/kscd-4.11.1.tar.xz
+/kscd-4.11.2.tar.xz
+/kscd-4.11.3.tar.xz
+/kscd-4.11.90.tar.xz
+/kscd-4.11.95.tar.xz
+/kscd-4.11.97.tar.xz
+/kscd-4.12.0.tar.xz
+/kscd-4.12.1.tar.xz
+/kscd-4.12.2.tar.xz
+/kscd-4.12.3.tar.xz
+/kscd-4.12.4.tar.xz
diff --git a/0001-Swap-names-of-loop-random-buttons.patch b/0001-Swap-names-of-loop-random-buttons.patch
new file mode 100644
index 0000000..00bc831
--- /dev/null
+++ b/0001-Swap-names-of-loop-random-buttons.patch
@@ -0,0 +1,249 @@
+From c7e6f1e42d55e199af2db1f34f57c40980319fe8 Mon Sep 17 00:00:00 2001
+From: Rex Dieter <rdieter at math.unl.edu>
+Date: Fri, 18 Apr 2014 07:48:21 -0500
+Subject: [PATCH] Swap names of loop/random buttons
+
+BUG: 234332,333499
+FIXED-IN: 4.12.5
+---
+ gui/skin/Chrome.svg | 12 ++++++------
+ gui/skin/Obsidian-Coast.svg | 12 ++++++------
+ gui/skin/Steel.svg | 12 ++++++------
+ gui/skin/default.svg | 12 ++++++------
+ 4 files changed, 24 insertions(+), 24 deletions(-)
+
+diff --git a/gui/skin/Chrome.svg b/gui/skin/Chrome.svg
+index c4c6ec0..f8b694e 100644
+--- a/gui/skin/Chrome.svg
++++ b/gui/skin/Chrome.svg
+@@ -3307,7 +3307,7 @@
+ </g>
+ <g
+ transform="matrix(1.0022412,0,0,0.9737707,-825.6827,-14.659788)"
+- id="random_default">
++ id="loop_default">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,892.10325,213.70193)"
+@@ -3363,7 +3363,7 @@
+ </g>
+ <g
+ transform="matrix(1.0022412,0,0,0.9737707,-772.39677,-108.90664)"
+- id="loop_default">
++ id="random_default">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,895.23183,310.68787)"
+@@ -5314,7 +5314,7 @@
+ style="fill:#ffffff;fill-opacity:0.75688076;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" />
+ <g
+ transform="matrix(1.0013357,0,0,0.9768147,-648.73132,580.29593)"
+- id="random_over">
++ id="loop_over">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,892.10325,213.70193)"
+@@ -5370,7 +5370,7 @@
+ </g>
+ <g
+ transform="matrix(1.0013357,0,0,0.9768147,-598.7852,486.25445)"
+- id="loop_over">
++ id="random_over">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,895.23183,310.68787)"
+@@ -5422,7 +5422,7 @@
+ </g>
+ <g
+ transform="matrix(1.0013357,0,0,0.9768147,-597.84517,541.04104)"
+- id="loop_pressed">
++ id="random_pressed">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,895.23183,310.68787)"
+@@ -5474,7 +5474,7 @@
+ </g>
+ <g
+ transform="matrix(1.0013357,0,0,0.9768147,-646.40288,635.08252)"
+- id="random_pressed">
++ id="loop_pressed">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,892.10325,213.70193)"
+diff --git a/gui/skin/Obsidian-Coast.svg b/gui/skin/Obsidian-Coast.svg
+index 979e56f..4fd8a05 100644
+--- a/gui/skin/Obsidian-Coast.svg
++++ b/gui/skin/Obsidian-Coast.svg
+@@ -3262,7 +3262,7 @@
+ </g>
+ <g
+ transform="matrix(1.0022412,0,0,0.9737707,-825.6827,-14.659788)"
+- id="random_default">
++ id="loop_default">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,892.10325,213.70193)"
+@@ -3318,7 +3318,7 @@
+ </g>
+ <g
+ transform="matrix(1.0022412,0,0,0.9737707,-772.39677,-108.90664)"
+- id="loop_default">
++ id="random_default">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,895.23183,310.68787)"
+@@ -5269,7 +5269,7 @@
+ style="fill:#ffffff;fill-opacity:0.75688076;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" />
+ <g
+ transform="matrix(1.0013357,0,0,0.9768147,-648.73132,580.29593)"
+- id="random_over">
++ id="loop_over">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,892.10325,213.70193)"
+@@ -5325,7 +5325,7 @@
+ </g>
+ <g
+ transform="matrix(1.0013357,0,0,0.9768147,-598.7852,486.25445)"
+- id="loop_over">
++ id="random_over">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,895.23183,310.68787)"
+@@ -5377,7 +5377,7 @@
+ </g>
+ <g
+ transform="matrix(1.0013357,0,0,0.9768147,-597.84517,541.04104)"
+- id="loop_pressed">
++ id="random_pressed">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,895.23183,310.68787)"
+@@ -5429,7 +5429,7 @@
+ </g>
+ <g
+ transform="matrix(1.0013357,0,0,0.9768147,-646.40288,635.08252)"
+- id="random_pressed">
++ id="loop_pressed">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,892.10325,213.70193)"
+diff --git a/gui/skin/Steel.svg b/gui/skin/Steel.svg
+index 4e4a4f1..d1f7ebd 100644
+--- a/gui/skin/Steel.svg
++++ b/gui/skin/Steel.svg
+@@ -3274,7 +3274,7 @@
+ </g>
+ <g
+ transform="matrix(1.0022412,0,0,0.9737707,-825.6827,-14.659788)"
+- id="random_default">
++ id="loop_default">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,892.10325,213.70193)"
+@@ -3330,7 +3330,7 @@
+ </g>
+ <g
+ transform="matrix(1.0022412,0,0,0.9737707,-772.39677,-108.90664)"
+- id="loop_default">
++ id="random_default">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,895.23183,310.68787)"
+@@ -5281,7 +5281,7 @@
+ style="fill:#ffffff;fill-opacity:0.75688076;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" />
+ <g
+ transform="matrix(1.0013357,0,0,0.9768147,-648.73132,580.29593)"
+- id="random_over">
++ id="loop_over">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,892.10325,213.70193)"
+@@ -5337,7 +5337,7 @@
+ </g>
+ <g
+ transform="matrix(1.0013357,0,0,0.9768147,-598.7852,486.25445)"
+- id="loop_over">
++ id="random_over">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,895.23183,310.68787)"
+@@ -5389,7 +5389,7 @@
+ </g>
+ <g
+ transform="matrix(1.0013357,0,0,0.9768147,-597.84517,541.04104)"
+- id="loop_pressed">
++ id="random_pressed">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,895.23183,310.68787)"
+@@ -5441,7 +5441,7 @@
+ </g>
+ <g
+ transform="matrix(1.0013357,0,0,0.9768147,-646.40288,635.08252)"
+- id="random_pressed">
++ id="loop_pressed">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,892.10325,213.70193)"
+diff --git a/gui/skin/default.svg b/gui/skin/default.svg
+index bdae25f..5c3ece9 100644
+--- a/gui/skin/default.svg
++++ b/gui/skin/default.svg
+@@ -3367,7 +3367,7 @@
+ </g>
+ <g
+ transform="matrix(1.0022412,0,0,0.9737707,-825.6827,-14.659788)"
+- id="random_default">
++ id="loop_default">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,892.10325,213.70193)"
+@@ -3423,7 +3423,7 @@
+ </g>
+ <g
+ transform="matrix(1.0022412,0,0,0.9737707,-772.39677,-108.90664)"
+- id="loop_default">
++ id="random_default">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,895.23183,310.68787)"
+@@ -5374,7 +5374,7 @@
+ style="fill:#ffffff;fill-opacity:0.75688076;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:4;stroke-opacity:1" />
+ <g
+ transform="matrix(1.0013357,0,0,0.9768147,-648.73132,580.29593)"
+- id="random_over">
++ id="loop_over">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,892.10325,213.70193)"
+@@ -5430,7 +5430,7 @@
+ </g>
+ <g
+ transform="matrix(1.0013357,0,0,0.9768147,-598.7852,486.25445)"
+- id="loop_over">
++ id="random_over">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,895.23183,310.68787)"
+@@ -5482,7 +5482,7 @@
+ </g>
+ <g
+ transform="matrix(1.0013357,0,0,0.9768147,-597.84517,541.04104)"
+- id="loop_pressed">
++ id="random_pressed">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,895.23183,310.68787)"
+@@ -5534,7 +5534,7 @@
+ </g>
+ <g
+ transform="matrix(1.0013357,0,0,0.9768147,-646.40288,635.08252)"
+- id="random_pressed">
++ id="loop_pressed">
+ <path
+ d="M 648.54949,117.80585 C 648.55929,145.27115 625.06007,167.54111 596.06891,167.54111 C 567.07775,167.54111 543.57853,145.27115 543.58833,117.80585 C 543.57853,90.340547 567.07775,68.070594 596.06891,68.070594 C 625.06007,68.070594 648.55929,90.340547 648.54949,117.80585 L 648.54949,117.80585 z"
+ transform="matrix(0.389659,0,0,0.3809113,892.10325,213.70193)"
+--
+1.9.0
+
diff --git a/kscd.spec b/kscd.spec
index 0144b97..1fe2603 100644
--- a/kscd.spec
+++ b/kscd.spec
@@ -1,7 +1,7 @@
Name: kscd
Summary: CD Player
-Version: 4.12.5
-Release: 1%{?dist}
+Version: 4.12.4
+Release: 2%{?dist}
License: GPLv2+
URL: http://www.kde.org/applications/multimedia/kscd/
@@ -15,6 +15,8 @@ URL: http://www.kde.org/applications/multimedia/kscd/
Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz
## upstream patches
+# http://quickgit.kde.org/?p=kscd.git&a=commit&h=357eb85684552c237803ffa9db037b3918a7a220
+Patch101: 0001-Swap-names-of-loop-random-buttons.patch
BuildRequires: desktop-file-utils
BuildRequires: kdelibs4-devel >= %{version}
@@ -34,6 +36,8 @@ KsCD is a small, fast, CDDB enabled audio CD player.
%prep
%setup -q
+%patch101 -p1 -b .0001
+
%build
mkdir -p %{_target_platform}
@@ -77,9 +81,6 @@ fi
%changelog
-* Sun Apr 27 2014 Rex Dieter <rdieter at fedoraproject.org> - 4.12.5-1
-- 4.12.5
-
* Fri Apr 18 2014 Rex Dieter <rdieter at fedoraproject.org> 4.12.4-2
- upstream fix for swapped Loop and Random buttons (kde #234332)
diff --git a/sources b/sources
index b79228e..29a9088 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8872a59d7343302f8b2da43769279676 kscd-4.12.5.tar.xz
+20fb0cabdb5a90fd7c641604f785f1af kscd-4.12.4.tar.xz
More information about the scm-commits
mailing list