[gentoo-commits] repo/gentoo:master commit in: games-mud/kmuddy/, games-mud/kmuddy/files/

2017-07-21 Thread Michael Palimaka
commit: 3e9efb7e12ea706f8ed75e7cb66747d3c798111b
Author: Peter Levine  gmail  com>
AuthorDate: Fri Jul 21 00:15:43 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Jul 22 03:35:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e9efb7e

games-mud/kmuddy: Fix building with GCC-6

Bug: https://bugs.gentoo.org/show_bug.cgi?id=612760
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 games-mud/kmuddy/files/kmuddy-1.0.1-gcc6.patch | 30 ++
 games-mud/kmuddy/kmuddy-1.0.1-r3.ebuild|  1 +
 2 files changed, 31 insertions(+)

diff --git a/games-mud/kmuddy/files/kmuddy-1.0.1-gcc6.patch 
b/games-mud/kmuddy/files/kmuddy-1.0.1-gcc6.patch
new file mode 100644
index 000..a198d141b10
--- /dev/null
+++ b/games-mud/kmuddy/files/kmuddy-1.0.1-gcc6.patch
@@ -0,0 +1,30 @@
+Bug: https://bugs.gentoo.org/612760
+Commits: 
https://cgit.kde.org/kmuddy.git/commit/kmuddy/dialogs/dlgappsettings.cpp?id=5def190b6b3baa7502999275aac469440ec261cc
+ 
https://cgit.kde.org/kmuddy.git/commit/plugins/mapper/dialogs/dlgmappathproperties.cpp?id=0255f21b46a0f83e2e455fd2ba5c015a3b46e98a
+
+--- a/kmuddy/dialogs/dlgappsettings.cpp
 b/kmuddy/dialogs/dlgappsettings.cpp
+@@ -554,7 +554,7 @@
+   //page 8
+//layout ensures that the widget fills entire available space...
+   QHBoxLayout *keylayout = new QHBoxLayout (frmshortcuts);
+-  keys = new KShortcutsEditor (cActionManager::self()->getACol (), 
frmshortcuts, false);
++  keys = new KShortcutsEditor (cActionManager::self()->getACol (), 
frmshortcuts);
+   keylayout->addWidget (keys);
+ 
+   cActionManager::self()->invokeEvent ("dialog-create", 0, "app-prefs");
+--- a/plugins/mapper/dialogs/dlgmappathproperties.cpp
 b/plugins/mapper/dialogs/dlgmappathproperties.cpp
+@@ -242,9 +242,9 @@
+ {
+   
properties.writeEntry("SrcBeforeCommand",txtSrcBefore->text().trimmed());
+   properties.writeEntry("SrcAfterCommand",txtSrcAfter->text().trimmed());
+-  properties.writeEntry("SrcDir",(int)getSrcDirection(),0);
+-  properties.writeEntry("DestDir",(int)getDestDirection(),0);
+-  properties.writeEntry("SpecialExit",chkSpecial->isChecked(),false);
++  properties.writeEntry("SrcDir",(int)getSrcDirection());
++  properties.writeEntry("DestDir",(int)getDestDirection());
++  properties.writeEntry("SpecialExit",chkSpecial->isChecked());
+   properties.writeEntry("SpecialCmdSrc",txtSpecialSrc->text().trimmed());
+ 
+   if (properties.hasKey("PathTwoWay"))

diff --git a/games-mud/kmuddy/kmuddy-1.0.1-r3.ebuild 
b/games-mud/kmuddy/kmuddy-1.0.1-r3.ebuild
index a40866d7460..b6aeffc3910 100644
--- a/games-mud/kmuddy/kmuddy-1.0.1-r3.ebuild
+++ b/games-mud/kmuddy/kmuddy-1.0.1-r3.ebuild
@@ -25,6 +25,7 @@ PATCHES=(
"${FILESDIR}"/${P}-underlinking.patch
"${FILESDIR}"/${P}-tempnam.patch
"${FILESDIR}"/${P}-desktopvalidation.patch
+   "${FILESDIR}"/${P}-gcc6.patch
 )
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: games-mud/kmuddy/, games-mud/kmuddy/files/

2017-03-14 Thread Andreas Sturmlechner
commit: faef06a29d9e9162bb23bdef5e34496c2ff3e0a1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Mar 15 01:50:49 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Mar 15 02:25:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faef06a2

games-mud/kmuddy: EAPI 6 bump, fix DESCRIPTION, HOMEPAGE

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../files/kmuddy-1.0.1-desktopvalidation.patch | 40 +++---
 games-mud/kmuddy/files/kmuddy-1.0.1-gcc45.patch|  4 +--
 games-mud/kmuddy/files/kmuddy-1.0.1-kde45.patch|  4 +--
 games-mud/kmuddy/files/kmuddy-1.0.1-tempnam.patch  |  4 +--
 games-mud/kmuddy/kmuddy-1.0.1-r3.ebuild| 10 +++---
 5 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/games-mud/kmuddy/files/kmuddy-1.0.1-desktopvalidation.patch 
b/games-mud/kmuddy/files/kmuddy-1.0.1-desktopvalidation.patch
index 428dc94fc78..899ec0838b8 100644
--- a/games-mud/kmuddy/files/kmuddy-1.0.1-desktopvalidation.patch
+++ b/games-mud/kmuddy/files/kmuddy-1.0.1-desktopvalidation.patch
@@ -1,5 +1,5 @@
 kmuddy/kmuddy.desktop
-+++ kmuddy/kmuddy.desktop
+--- a/kmuddy/kmuddy.desktop
 b/kmuddy/kmuddy.desktop
 @@ -1,6 +1,5 @@
  [Desktop Entry]
  Version=1.0
@@ -7,8 +7,8 @@
  Name=KMuddy
  Type=Application
  Exec=kmuddy -caption "%c" %i %m
 libs/kmuddyplugin.desktop
-+++ libs/kmuddyplugin.desktop
+--- a/libs/kmuddyplugin.desktop
 b/libs/kmuddyplugin.desktop
 @@ -1,6 +1,6 @@
  [Desktop Entry]
 -Encoding=UTF-8
@@ -17,16 +17,16 @@
  X-KDE-ServiceType=KMuddy/Plugin
  X-KDE-Derived=KPluginInfo
  Comment=KMuddy Plugin
 plugins/converter/kmuddyconverterplugin.desktop
-+++ plugins/converter/kmuddyconverterplugin.desktop
+--- a/plugins/converter/kmuddyconverterplugin.desktop
 b/plugins/converter/kmuddyconverterplugin.desktop
 @@ -1,5 +1,4 @@
  [Desktop Entry]
 -Encoding=UTF-8
  Name=Profile Converter
  Comment=This plug-in converts profiles from old KMuddy versions.
  ServiceTypes=KMuddy/Plugin
 plugins/mapper/plugins/standard/kmuddymapper_standard.desktop
-+++ plugins/mapper/plugins/standard/kmuddymapper_standard.desktop
+--- a/plugins/mapper/plugins/standard/kmuddymapper_standard.desktop
 b/plugins/mapper/plugins/standard/kmuddymapper_standard.desktop
 @@ -1,6 +1,5 @@
  [Desktop Entry]
  Type=Service
@@ -34,48 +34,48 @@
  Name=Standard
  Comment=The standard mapper tools and views
  ServiceTypes=KMuddy/Mapper/Plugin
 plugins/scripting/kmuddyscriptingplugin.desktop
-+++ plugins/scripting/kmuddyscriptingplugin.desktop
+--- a/plugins/scripting/kmuddyscriptingplugin.desktop
 b/plugins/scripting/kmuddyscriptingplugin.desktop
 @@ -1,5 +1,4 @@
  [Desktop Entry]
 -Encoding=UTF-8
  Name=External Scripting
  Comment=Adds support for external scripting.
  ServiceTypes=KMuddy/Plugin
 plugins/strings/kmuddystringsplugin.desktop
-+++ plugins/strings/kmuddystringsplugin.desktop
+--- a/plugins/strings/kmuddystringsplugin.desktop
 b/plugins/strings/kmuddystringsplugin.desktop
 @@ -1,5 +1,4 @@
  [Desktop Entry]
 -Encoding=UTF-8
  Name=Strings
  Comment=This plug-in adds many strings functions.
  ServiceTypes=KMuddy/Plugin
 plugins/test/kmuddytestplugin.desktop
-+++ plugins/test/kmuddytestplugin.desktop
+--- a/plugins/test/kmuddytestplugin.desktop
 b/plugins/test/kmuddytestplugin.desktop
 @@ -1,5 +1,4 @@
  [Desktop Entry]
 -Encoding=UTF-8
  Name=Testing Plug-in
  Comment=Testing Plug-in
  ServiceTypes=KMuddy/Plugin
 plugins/vartrigs/kmuddyvartrigplugin.desktop
-+++ plugins/vartrigs/kmuddyvartrigplugin.desktop
+--- a/plugins/vartrigs/kmuddyvartrigplugin.desktop
 b/plugins/vartrigs/kmuddyvartrigplugin.desktop
 @@ -1,5 +1,4 @@
  [Desktop Entry]
 -Encoding=UTF-8
  Name=Variable Triggers
  Comment=Adds supports for triggers that fire off variable changes.
  ServiceTypes=KMuddy/Plugin
 plugins/varviewer/kmuddyvarviewerplugin.desktop
-+++ plugins/varviewer/kmuddyvarviewerplugin.desktop
+--- a/plugins/varviewer/kmuddyvarviewerplugin.desktop
 b/plugins/varviewer/kmuddyvarviewerplugin.desktop
 @@ -1,5 +1,4 @@
  [Desktop Entry]
 -Encoding=UTF-8
  Name=Variable Viewer
  Comment=This plug-in provides a variable viewer window.
  ServiceTypes=KMuddy/Plugin
 template/kmuddyplugintemplate.desktop
-+++ template/kmuddyplugintemplate.desktop
+--- a/template/kmuddyplugintemplate.desktop
 b/template/kmuddyplugintemplate.desktop
 @@ -1,5 +1,4 @@
  [Desktop Entry]
 -Encoding=UTF-8

diff --git a/games-mud/kmuddy/files/kmuddy-1.0.1-gcc45.patch 
b/games-mud/kmuddy/files/kmuddy-1.0.1-gcc45.patch
index 34b403c1471..67d2acd90c7 100644
--- a/games-mud/kmuddy/files/kmuddy-1.0.1-gcc45.patch
+++ b/games-mud/kmuddy/files/kmuddy-1.0.1-gcc45.patch
@@ -1,5 +1,5 @@
 plugins/mapper/filefilters/cmapfilefilterkmudone.cpp.old   2010-06-08 
17:55:09.0 +0200
-+++ plugins/mapper/filefilters/cmapfilefilterkmudone.cpp   2010-06-08 
17:55:49.0 +0200
+---