summaryrefslogtreecommitdiffstats
path: root/redhat/applications/kcmautostart
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2017-06-26 23:10:56 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2017-06-26 23:10:56 +0200
commit608d97009e5cad1da8c2e585fee7537d579c064d (patch)
treece3b5c15e47dfdc99bf83d8aad94817ddd964698 /redhat/applications/kcmautostart
parentf5fb93e00bc4656f22a61a8e04d227aae47e1dc4 (diff)
downloadtde-packaging-608d97009e5cad1da8c2e585fee7537d579c064d.tar.gz
tde-packaging-608d97009e5cad1da8c2e585fee7537d579c064d.zip
RPM: updates for Mageia 6
Diffstat (limited to 'redhat/applications/kcmautostart')
-rw-r--r--redhat/applications/kcmautostart/kcmautostart-3.5.13-add_french.patch69
-rw-r--r--redhat/applications/kcmautostart/kcmautostart-3.5.13-fix_crash_on_exit.patch14
-rw-r--r--redhat/applications/kcmautostart/kcmautostart-3.5.13-fix_fr_translation.patch11
-rw-r--r--redhat/applications/kcmautostart/kcmautostart-3.5.13-ftbfs.patch67
4 files changed, 0 insertions, 161 deletions
diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13-add_french.patch b/redhat/applications/kcmautostart/kcmautostart-3.5.13-add_french.patch
deleted file mode 100644
index dcdb2ef48..000000000
--- a/redhat/applications/kcmautostart/kcmautostart-3.5.13-add_french.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- kcmautostart/src/autostart.desktop.ORI 2012-05-10 11:47:47.743164035 +0200
-+++ kcmautostart/src/autostart.desktop 2012-05-10 11:49:15.127289325 +0200
-@@ -14,8 +14,10 @@
- Comment=A KControl tool for managing what programs start up with TDE.
- Comment[ca]=Panell de control per a gestionar els programes que s'inicien amb la sessió de TDE.
- Comment[es]=Panel de control para gestionar los programas que se inician con la sesión de TDE.
-+Comment[fr]=Paneau de contrôle pour gérer le démarrage des programmes à l'ouverture de session TDE.
- Keywords=autostart manager
- Name=Autostart Manager
- Name[ca]=Autoengega
- Name[es]=Arranque automático
-+Name[fr]=Démarrage automatique
- Categories=Qt;KDE;X-KDE-settings-components;
-diff -Nuar kcmautostart/po.ori//fr.po kcmautostart/po/fr.po
---- kcmautostart/po.ori//fr.po 1970-01-01 01:00:00.000000000 +0100
-+++ kcmautostart/po/fr.po 2012-05-10 19:27:38.107215981 +0200
-@@ -0,0 +1,52 @@
-+msgid ""
-+msgstr ""
-+"Content-Type: text/plain; charset=UTF-8\n"
-+"Content-Transfer-Encoding: 8bit\n"
-+"PO-Revision-Date: 2012-05-10 12:01+0100\n"
-+"Project-Id-Version: autostart_ca\n"
-+"Language-Team: <ca@li.org>\n"
-+"X-Generator: KBabel 1.11.4\n"
-+"MIME-Version: 1.0\n"
-+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-+"Last-Translator: Josep Febrer <josep@extens.info>\n"
-+
-+#: ../src/autostart.cpp:61
-+msgid "Startup"
-+msgstr "Démarrage"
-+
-+#: ../src/autostart.cpp:62
-+msgid "Shutdown"
-+msgstr "Arrêt"
-+
-+#: ../src/autostart.cpp:63
-+msgid "ENV"
-+msgstr "ENV"
-+
-+#: ../src/autostart.cpp:102
-+msgid "Name"
-+msgstr "Nom"
-+
-+#: ../src/autostart.cpp:103
-+msgid "Command"
-+msgstr "Commande"
-+
-+#: ../src/autostart.cpp:104
-+msgid "Run on"
-+msgstr "Executer"
-+
-+#: ../src/autostart.cpp:129
-+msgid "&Add"
-+msgstr "&Ajouter"
-+
-+#: ../src/autostart.cpp:131
-+msgid "&Remove"
-+msgstr "&Supprimer"
-+
-+#: ../src/autostart.cpp:133
-+msgid "&Properties"
-+msgstr "&Propiétés"
-+
-+#: ../src/autostart.cpp:317
-+msgid "This module helps you configure which applications KDE runs When starting up and shutting down."
-+msgstr "Ce module vous aide à configurer quelles applications sont exécutées à l'ouverture et à la fermeture de session de TDE."
-+
diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13-fix_crash_on_exit.patch b/redhat/applications/kcmautostart/kcmautostart-3.5.13-fix_crash_on_exit.patch
deleted file mode 100644
index da0940d89..000000000
--- a/redhat/applications/kcmautostart/kcmautostart-3.5.13-fix_crash_on_exit.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- kcmautostart/src/autostart.cpp.crash_on_exit 2013-05-10 23:35:31.443410887 +0200
-+++ kcmautostart/src/autostart.cpp 2013-05-10 23:46:31.852926622 +0200
-@@ -102,7 +102,10 @@
- if (bisDesktop) service = new KService( fileName.path() );
- }
- ~desktop() {
-- delete service;
-+ if(service) {
-+ service = NULL;
-+ delete service;
-+ }
- }
- };
-
diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13-fix_fr_translation.patch b/redhat/applications/kcmautostart/kcmautostart-3.5.13-fix_fr_translation.patch
deleted file mode 100644
index d7b0217ee..000000000
--- a/redhat/applications/kcmautostart/kcmautostart-3.5.13-fix_fr_translation.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kcmautostart/po/fr.po.ORI 2013-05-10 23:28:02.181493730 +0200
-+++ kcmautostart/po/fr.po 2013-05-10 23:28:09.944336813 +0200
-@@ -44,7 +44,7 @@
-
- #: ../src/autostart.cpp:133
- msgid "&Properties"
--msgstr "&Propiétés"
-+msgstr "&Propriétés"
-
- #: ../src/autostart.cpp:317
- msgid "This module helps you configure which applications KDE runs When starting up and shutting down."
diff --git a/redhat/applications/kcmautostart/kcmautostart-3.5.13-ftbfs.patch b/redhat/applications/kcmautostart/kcmautostart-3.5.13-ftbfs.patch
deleted file mode 100644
index 0807b3a9b..000000000
--- a/redhat/applications/kcmautostart/kcmautostart-3.5.13-ftbfs.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- kcmautostart.ORI/src/autostart.cpp 2012-05-10 11:36:44.887288951 +0200
-+++ kcmautostart.P/src/autostart.cpp 2012-05-10 11:37:16.701639283 +0200
-@@ -88,10 +88,10 @@
- path = kgs->autostartPath()+"/";
- break;
- case Shutdown:
-- path = ksd->localtdedir()+"shutdown/";
-+ path = ksd->localkdedir()+"shutdown/";
- break;
- case ENV:
-- path = ksd->localtdedir()+"env/";
-+ path = ksd->localkdedir()+"env/";
- break;
- }
- KIO::file_move(fileName, KURL( path + fileName.fileName() ));
-@@ -190,9 +190,9 @@
- if (x==0)
- path = kgs->autostartPath();
- else if (x==1)
-- path = ksd->localtdedir() + "/shutdown";
-+ path = ksd->localkdedir() + "/shutdown";
- else if (x==2)
-- path = ksd->localtdedir() + "/env";
-+ path = ksd->localkdedir() + "/env";
-
- if (! KStandardDirs::exists(path))
- KStandardDirs::makeDir(path);
---- kcmautostart/admin/cvs.sh.ftbfs 2012-05-10 11:30:01.000000000 +0200
-+++ kcmautostart/admin/cvs.sh 2013-06-04 21:27:13.097359615 +0200
-@@ -68,7 +68,7 @@
- echo "*** KDE requires automake $required_automake_version"
- exit 1
- ;;
-- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* | automake*1.12*)
-+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.1[0-9]* )
- echo "*** $AUTOMAKE_STRING found."
- UNSERMAKE=no
- ;;
-@@ -128,7 +128,7 @@
- echo "*** Creating configure"
- call_and_fix_autoconf
-
--if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
-+if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
- echo "*** Creating config.h template"
- $AUTOHEADER || exit 1
- touch config.h.in
-@@ -184,7 +184,7 @@
- fi
- fi
- $ACLOCAL $ACLOCALFLAGS
--if egrep "^AM_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
-+if egrep "^A[CM]_CONFIG_HEADER" configure.in >/dev/null 2>&1; then
- echo "*** Creating config.h template"
- $AUTOHEADER || exit 1
- touch config.h.in
---- kcmautostart/admin/configure.in.min.ORI 2013-06-04 21:28:06.399273569 +0200
-+++ kcmautostart/admin/configure.in.min 2013-06-04 21:28:12.584147551 +0200
-@@ -41,7 +41,7 @@
- KDE_SET_PREFIX
-
- dnl generate the config header
--AM_CONFIG_HEADER(config.h) dnl at the distribution this done
-+AC_CONFIG_HEADER(config.h) dnl at the distribution this done
-
- dnl Checks for programs.
- AC_PROG_CC