commit dasher for openSUSE:Factory

[h_root]

Hello community,

here is the log from the commit of package dasher for openSUSE:Factory checked 
in at 2016-06-19 11:08:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dasher (Old)
 and      /work/SRC/openSUSE:Factory/.dasher.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "dasher"

Changes:
--------
--- /work/SRC/openSUSE:Factory/dasher/dasher.changes    2014-02-12 
11:09:16.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.dasher.new/dasher.changes       2016-06-19 
11:08:55.000000000 +0200
@@ -1,0 +2,6 @@
+Sat Jun 18 12:08:57 UTC 2016 - dims...@opensuse.org
+
+- Add dasher-gcc6.patch: Fix build with gcc 6 (bool can't be used
+  as return value for functions returning string) (boo#985108).
+
+-------------------------------------------------------------------

New:
----
  dasher-gcc6.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ dasher.spec ++++++
--- /var/tmp/diff_new_pack.Qmyu1X/_old  2016-06-19 11:08:56.000000000 +0200
+++ /var/tmp/diff_new_pack.Qmyu1X/_new  2016-06-19 11:08:56.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package dasher
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -28,6 +28,8 @@
 Source2:        locale-map.txt
 # PATCH-FIX-UPSTREAM dasher-linkX11.patch bgo#657306 dims...@opensuse.org -- 
Remove unneded code requiring to link against libX11.
 Patch0:         dasher-linkX11.patch
+# PATCH-FIX-UPSTREAM dasher-gcc6.patch boo#985108 dims...@opensuse.org -- Fix 
build with gcc 6 (bool can't be used as return value for functions returning 
string)
+Patch1:         dasher-gcc6.patch
 BuildRequires:  cairo-devel
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -85,6 +87,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 translation-update-upstream
 cp %{SOURCE2} .
 

++++++ dasher-gcc6.patch ++++++
Index: dasher-4.11/Src/DasherCore/SettingsStore.cpp
===================================================================
--- dasher-4.11.orig/Src/DasherCore/SettingsStore.cpp
+++ dasher-4.11/Src/DasherCore/SettingsStore.cpp
@@ -295,7 +295,7 @@ std::string CSettingsStore::GetStringOpt
 
   // This means the key passed in a string was not found in the new table
   DASHER_ASSERT(0);
-  return false;
+  return NULL;
 }
 
 void CSettingsStore::SetBoolOption(const std::string &Key, bool Value) {
Index: dasher-4.11/Src/Gtk2/DasherAppSettings.cpp
===================================================================
--- dasher-4.11.orig/Src/Gtk2/DasherAppSettings.cpp
+++ dasher-4.11/Src/Gtk2/DasherAppSettings.cpp
@@ -389,7 +389,7 @@ const gchar *dasher_app_settings_get_str
     if(pPrivate->bWidgetSet) 
       return 
gtk_dasher_control_get_parameter_string(GTK_DASHER_CONTROL(pDasherWidget), 
iParameter);
     else
-      return false;
+      return NULL;
   }
   else
     return app_stringparamtable[ iParameter - FIRST_APP_SP ].value;