Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1c11540f1b25ee158d99ad6742b006a479c5b528

commit 1c11540f1b25ee158d99ad6742b006a479c5b528
Author: kikadf <[email protected]>
Date:   Thu Nov 7 14:36:37 2013 +0100

cantata-1.1.3-1-x86_64

* Version bump

diff --git a/source/xmultimedia-extra/cantata/FrugalBuild 
b/source/xmultimedia-extra/cantata/FrugalBuild
index 20d4604..b22368384 100644
--- a/source/xmultimedia-extra/cantata/FrugalBuild
+++ b/source/xmultimedia-extra/cantata/FrugalBuild
@@ -4,7 +4,7 @@
options+=('asneeded')

pkgname=cantata
-pkgver=1.1.1
+pkgver=1.1.3
pkgrel=1
pkgdesc="Cantata is a Qt4/KDE4 client for the music player daemon (MPD)."
rodepends=('mpd')
@@ -14,8 +14,7 @@ _F_googlecode_ext=".tar.bz2"
Finclude googlecode cmake
groups=('xmultimedia-extra')
archs=('i686' 'x86_64')
-source=($source $pkgname-$pkgver-translate.patch)
-sha1sums=('47bbbd3bd015553f6b09c553759d5d7110966b55' \
-          '441b607726587eed72337cdbf67f4da9b5f1988a')
+sha1sums=('7b321abf45cd2c71e86418a41c413391ad04ff6d')
+

# optimization OK
diff --git a/source/xmultimedia-extra/cantata/cantata-1.1.1-translate.patch 
b/source/xmultimedia-extra/cantata/cantata-1.1.1-translate.patch
deleted file mode 100644
index 72458cd..0000000
--- a/source/xmultimedia-extra/cantata/cantata-1.1.1-translate.patch
+++ /dev/null
@@ -1,283 +0,0 @@
-diff -Naur cantata-1.1.1/po/cantata.pot cantata-1.1.1.new/po/cantata.pot
---- cantata-1.1.1/po/cantata.pot       2013-08-21 17:54:13.000000000 +0200
-+++ cantata-1.1.1.new/po/cantata.pot   2013-08-24 12:13:27.000000000 +0200
-@@ -2628,7 +2628,8 @@
- msgid "Searching..."
- msgstr ""
-
--#: models/onlineservicesmodel.cpp:139
-+#: models/onlineservicesmodel.cpp:139 models/streamsearchmodel.cpp:117
-+#: models/streamsmodel.cpp:544
- msgid "Not Loaded"
- msgstr ""
-
-@@ -2663,10 +2664,6 @@
- msgid "<b>(Priority: %1)</b>"
- msgstr ""
-
--#: models/streamsearchmodel.cpp:117 models/streamsmodel.cpp:555
--msgid "Not Loaded"
--msgstr ""
--
- #: models/streamsearchmodel.cpp:119 models/streamsmodel.cpp:557
- msgid "Loading..."
- msgstr ""
-@@ -3769,7 +3766,7 @@
- #: po/rc.cpp:379 rc.cpp:379
- msgid ""
- "<i>Select this option if your music collection is not shared with others, "
--"and you wish Cantata to configure and control the MPD instance.</i>\n"
-+"and you wish Cantata to configure and control the MPD instance.</i>"
- msgstr ""
-
- #. i18n: file: gui/initialsettingswizard.ui:225
-diff -Naur cantata-1.1.1/po/cs.po cantata-1.1.1.new/po/cs.po
---- cantata-1.1.1/po/cs.po     2013-08-21 17:54:13.000000000 +0200
-+++ cantata-1.1.1.new/po/cs.po 2013-08-24 12:13:27.000000000 +0200
-@@ -2933,7 +2933,8 @@
- msgid "Searching..."
- msgstr "Hledá se..."
-
--#: models/onlineservicesmodel.cpp:139
-+#: models/onlineservicesmodel.cpp:139 models/streamsearchmodel.cpp:117
-+#: models/streamsmodel.cpp:544
- msgid "Not Loaded"
- msgstr "Nenahráno"
-
-@@ -2968,10 +2969,6 @@
- msgid "<b>(Priority: %1)</b>"
- msgstr "<b>(Přednost: %1)</b>"
-
--#: models/streamsearchmodel.cpp:117 models/streamsmodel.cpp:555
--msgid "Not Loaded"
--msgstr "Nenahráno"
--
- #: models/streamsearchmodel.cpp:119 models/streamsmodel.cpp:557
- msgid "Loading..."
- msgstr "Nahrává se..."
-@@ -4137,10 +4134,10 @@
- #: po/rc.cpp:379 rc.cpp:379
- msgid ""
- "<i>Select this option if your music collection is not shared with others, "
--"and you wish Cantata to configure and control the MPD instance.</i>\n"
-+"and you wish Cantata to configure and control the MPD instance.</i>"
- msgstr ""
- "<i>Tuto volbu vyberte v případě, že vaše sbírka není sdílena s 
ostatními, "
--"a vy si přejete, aby Cantata nastavila a řídila instanci MPD.</i>\n"
-+"a vy si přejete, aby Cantata nastavila a řídila instanci MPD.</i>"
-
- #. i18n: file: gui/initialsettingswizard.ui:225
- #. i18n: ectx: property (text), widget (BuddyLabel, label_10)
-diff -Naur cantata-1.1.1/po/de.po cantata-1.1.1.new/po/de.po
---- cantata-1.1.1/po/de.po     2013-08-21 17:54:13.000000000 +0200
-+++ cantata-1.1.1.new/po/de.po 2013-08-24 12:13:27.000000000 +0200
-@@ -2919,7 +2919,8 @@
- msgid "Searching..."
- msgstr "Suche..."
-
--#: models/onlineservicesmodel.cpp:139
-+#: models/onlineservicesmodel.cpp:139 models/streamsearchmodel.cpp:117
-+#: models/streamsmodel.cpp:544
- msgid "Not Loaded"
- msgstr "Nicht geladen"
-
-@@ -2954,10 +2955,6 @@
- msgid "<b>(Priority: %1)</b>"
- msgstr "<b>(Priorität: %1)</b>"
-
--#: models/streamsearchmodel.cpp:117 models/streamsmodel.cpp:555
--msgid "Not Loaded"
--msgstr "Nicht geladen"
--
- #: models/streamsearchmodel.cpp:119 models/streamsmodel.cpp:557
- msgid "Loading..."
- msgstr "Lade..."
-@@ -4120,11 +4117,11 @@
- #: po/rc.cpp:379 rc.cpp:379
- msgid ""
- "<i>Select this option if your music collection is not shared with others, "
--"and you wish Cantata to configure and control the MPD instance.</i>\n"
-+"and you wish Cantata to configure and control the MPD instance.</i>"
- msgstr ""
- "<i>Wählen Sie diese Option, wenn Ihre Musik-Sammlung ist nicht mit anderen "
- "geteilt ist"
--"und Sie möchten Cantata zur Konfiguration und Steuerung der MPD 
Instanz.</i>\n"
-+"und Sie möchten Cantata zur Konfiguration und Steuerung der MPD 
Instanz.</i>"
-
- #. i18n: file: gui/initialsettingswizard.ui:225
- #. i18n: ectx: property (text), widget (BuddyLabel, label_10)
-diff -Naur cantata-1.1.1/po/en_GB.po cantata-1.1.1.new/po/en_GB.po
---- cantata-1.1.1/po/en_GB.po  2013-08-21 17:54:13.000000000 +0200
-+++ cantata-1.1.1.new/po/en_GB.po      2013-08-24 12:13:27.000000000 +0200
-@@ -2649,7 +2649,8 @@
- msgid "Searching..."
- msgstr ""
-
--#: models/onlineservicesmodel.cpp:139
-+#: models/onlineservicesmodel.cpp:139 models/streamsearchmodel.cpp:117
-+#: models/streamsmodel.cpp:544
- msgid "Not Loaded"
- msgstr ""
-
-@@ -2684,10 +2685,6 @@
- msgid "<b>(Priority: %1)</b>"
- msgstr ""
-
--#: models/streamsearchmodel.cpp:117 models/streamsmodel.cpp:555
--msgid "Not Loaded"
--msgstr ""
--
- #: models/streamsearchmodel.cpp:119 models/streamsmodel.cpp:557
- msgid "Loading..."
- msgstr ""
-@@ -3796,7 +3793,7 @@
- #: po/rc.cpp:379 rc.cpp:379
- msgid ""
- "<i>Select this option if your music collection is not shared with others, "
--"and you wish Cantata to configure and control the MPD instance.</i>\n"
-+"and you wish Cantata to configure and control the MPD instance.</i>"
- msgstr ""
-
- #. i18n: file: gui/initialsettingswizard.ui:225
-diff -Naur cantata-1.1.1/po/es.po cantata-1.1.1.new/po/es.po
---- cantata-1.1.1/po/es.po     2013-08-21 17:54:13.000000000 +0200
-+++ cantata-1.1.1.new/po/es.po 2013-08-24 12:13:27.000000000 +0200
-@@ -2997,7 +2997,8 @@
- msgid "Searching..."
- msgstr "Buscar %1..."
-
--#: models/onlineservicesmodel.cpp:139
-+#: models/onlineservicesmodel.cpp:139 models/streamsearchmodel.cpp:117
-+#: models/streamsmodel.cpp:544
- #, fuzzy
- msgid "Not Loaded"
- msgstr "No se ha analizado"
-@@ -3033,11 +3034,6 @@
- msgid "<b>(Priority: %1)</b>"
- msgstr "<b>(Prioridad: %1)</b>"
-
--#: models/streamsearchmodel.cpp:117 models/streamsmodel.cpp:555
--#, fuzzy
--msgid "Not Loaded"
--msgstr "No se ha analizado"
--
- #: models/streamsearchmodel.cpp:119 models/streamsmodel.cpp:557
- #, fuzzy
- msgid "Loading..."
-@@ -4209,7 +4205,7 @@
- #: po/rc.cpp:379 rc.cpp:379
- msgid ""
- "<i>Select this option if your music collection is not shared with others, "
--"and you wish Cantata to configure and control the MPD instance.</i>\n"
-+"and you wish Cantata to configure and control the MPD instance.</i>"
- msgstr ""
-
- #. i18n: file: gui/initialsettingswizard.ui:225
-diff -Naur cantata-1.1.1/po/ko.po cantata-1.1.1.new/po/ko.po
---- cantata-1.1.1/po/ko.po     2013-08-21 17:54:13.000000000 +0200
-+++ cantata-1.1.1.new/po/ko.po 2013-08-24 12:13:27.000000000 +0200
-@@ -2834,7 +2834,8 @@
- msgid "Searching..."
- msgstr "찾기..."
-
--#: models/onlineservicesmodel.cpp:139
-+#: models/onlineservicesmodel.cpp:139 models/streamsearchmodel.cpp:117
-+#: models/streamsmodel.cpp:544
- msgid "Not Loaded"
- msgstr "읽지 않음"
-
-@@ -2869,10 +2870,6 @@
- msgid "<b>(Priority: %1)</b>"
- msgstr "<b>(우선순위: %1)</b>"
-
--#: models/streamsearchmodel.cpp:117 models/streamsmodel.cpp:555
--msgid "Not Loaded"
--msgstr "읽지 않음"
--
- #: models/streamsearchmodel.cpp:119 models/streamsmodel.cpp:557
- msgid "Loading..."
- msgstr "읽는 중..."
-@@ -4015,10 +4012,10 @@
- #: po/rc.cpp:379 rc.cpp:379
- msgid ""
- "<i>Select this option if your music collection is not shared with others, "
--"and you wish Cantata to configure and control the MPD instance.</i>\n"
-+"and you wish Cantata to configure and control the MPD instance.</i>"
- msgstr ""
- "<i>음원을 다른 사용자와 공유하지 않고 칸타타가 MPD를 
설정하고 관리하려면, "
--"이 옵션을 선택합니다.</i>\n"
-+"이 옵션을 선택합니다.</i>"
-
- #. i18n: file: gui/initialsettingswizard.ui:225
- #. i18n: ectx: property (text), widget (BuddyLabel, label_10)
-diff -Naur cantata-1.1.1/po/pl.po cantata-1.1.1.new/po/pl.po
---- cantata-1.1.1/po/pl.po     2013-08-21 17:54:13.000000000 +0200
-+++ cantata-1.1.1.new/po/pl.po 2013-08-24 12:13:27.000000000 +0200
-@@ -2940,7 +2940,8 @@
- msgid "Searching..."
- msgstr "Szukanie..."
-
--#: models/onlineservicesmodel.cpp:139
-+#: models/onlineservicesmodel.cpp:139 models/streamsearchmodel.cpp:117
-+#: models/streamsmodel.cpp:544
- msgid "Not Loaded"
- msgstr "Nie załadowano"
-
-@@ -2975,10 +2976,6 @@
- msgid "<b>(Priority: %1)</b>"
- msgstr "<b>(Priorytet: %1)</b>"
-
--#: models/streamsearchmodel.cpp:117 models/streamsmodel.cpp:555
--msgid "Not Loaded"
--msgstr "Nie załadowano"
--
- #: models/streamsearchmodel.cpp:119 models/streamsmodel.cpp:557
- msgid "Loading..."
- msgstr "Ładowanie..."
-@@ -4147,10 +4144,10 @@
- #: po/rc.cpp:379 rc.cpp:379
- msgid ""
- "<i>Select this option if your music collection is not shared with others, "
--"and you wish Cantata to configure and control the MPD instance.</i>\n"
-+"and you wish Cantata to configure and control the MPD instance.</i>"
- msgstr ""
- "<i>Proszę wybrać tę opcję jeśli kolekcja muzyczna nie jest 
współdzielona z "
--"innymi a Cantata ma skonfigurować i kontrolować instancję MPD.</i>\n"
-+"innymi a Cantata ma skonfigurować i kontrolować instancję MPD.</i>"
-
- #. i18n: file: gui/initialsettingswizard.ui:225
- #. i18n: ectx: property (text), widget (BuddyLabel, label_10)
-diff -Naur cantata-1.1.1/po/zh_CN.po cantata-1.1.1.new/po/zh_CN.po
---- cantata-1.1.1/po/zh_CN.po  2013-08-21 17:54:13.000000000 +0200
-+++ cantata-1.1.1.new/po/zh_CN.po      2013-08-24 12:13:27.000000000 +0200
-@@ -2757,7 +2757,8 @@
- msgid "Searching..."
- msgstr "搜索 %1 ..."
-
--#: models/onlineservicesmodel.cpp:139
-+#: models/onlineservicesmodel.cpp:139 models/streamsearchmodel.cpp:117
-+#: models/streamsmodel.cpp:544
- msgid "Not Loaded"
- msgstr "未加载"
-
-@@ -2792,11 +2793,6 @@
- msgid "<b>(Priority: %1)</b>"
- msgstr "<b>(属性: %1)</b>"
-
--#: models/streamsearchmodel.cpp:117 models/streamsmodel.cpp:555
--#, fuzzy
--msgid "Not Loaded"
--msgstr "未加载"
--
- #: models/streamsearchmodel.cpp:119 models/streamsmodel.cpp:557
- #, fuzzy
- msgid "Loading..."
-@@ -3914,7 +3910,7 @@
- #: po/rc.cpp:379 rc.cpp:379
- msgid ""
- "<i>Select this option if your music collection is not shared with others, "
--"and you wish Cantata to configure and control the MPD instance.</i>\n"
-+"and you wish Cantata to configure and control the MPD instance.</i>"
- msgstr ""
-
- #. i18n: file: gui/initialsettingswizard.ui:225
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to