Accepting request 662649 from home:SchoolGuy:branches:editors

- Added patch to fix build on SLe_12_Sp3 and openSUSE_Leap_42.3 
- Fixed broken build: Added patch which was forgotten to add to version control.

OBS-URL: https://build.opensuse.org/request/show/662649
OBS-URL: https://build.opensuse.org/package/show/editors/joe?expand=0&rev=31

joe-4.6-desktop_files.patch

@@ -0,0 +1,40 @@
+Index: joe-4.6/desktop/jmacs.desktop
+===================================================================
+--- joe-4.6.orig/desktop/jmacs.desktop
++++ joe-4.6/desktop/jmacs.desktop
+@@ -9,4 +9,4 @@ TryExec=jmacs
+ Icon=accessories-text-editor
+ Type=Application
+ Terminal=true
+-Categories=Utility;Development;TextEditor;
++Categories=Utility;TextEditor;
+Index: joe-4.6/desktop/joe.desktop
+===================================================================
+--- joe-4.6.orig/desktop/joe.desktop
++++ joe-4.6/desktop/joe.desktop
+@@ -9,4 +9,4 @@ TryExec=joe
+ Icon=accessories-text-editor
+ Type=Application
+ Terminal=true
+-Categories=Utility;Development;TextEditor;
++Categories=Utility;TextEditor;
+Index: joe-4.6/desktop/jpico.desktop
+===================================================================
+--- joe-4.6.orig/desktop/jpico.desktop
++++ joe-4.6/desktop/jpico.desktop
+@@ -9,4 +9,4 @@ TryExec=jpico
+ Icon=accessories-text-editor
+ Type=Application
+ Terminal=true
+-Categories=Utility;Development;TextEditor;
++Categories=Utility;TextEditor;
+Index: joe-4.6/desktop/jstar.desktop
+===================================================================
+--- joe-4.6.orig/desktop/jstar.desktop
++++ joe-4.6/desktop/jstar.desktop
+@@ -9,4 +9,4 @@ TryExec=jstar
+ Icon=accessories-text-editor
+ Type=Application
+ Terminal=true
+-Categories=Utility;Development;TextEditor;
++Categories=Utility;TextEditor;

joe-4.6-nonvoid-functions.patch

@@ -0,0 +1,10 @@
+Index: joe-4.6/joe/util/checkwidths.c
+===================================================================
+--- joe-4.6.orig/joe/util/checkwidths.c
++++ joe-4.6/joe/util/checkwidths.c
+@@ -188,4 +188,5 @@ int main()
+     }
+ 
+     tcsetattr(fileno(stdin), TCSADRAIN, &org_attr);
++    return 0;
+ }

joe.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Jan  3 11:56:03 UTC 2019 - Enno Gotthold <egotthold@suse.com>
+
+- Added patch to fix build on SLe_12_Sp3 and openSUSE_Leap_42.3 
+
+-------------------------------------------------------------------
+Thu Jan  3 11:36:05 UTC 2019 - Enno Gotthold <egotthold@suse.com>
+
+- Fixed broken build: Added patch which was forgotten to add to version control. 
+
 -------------------------------------------------------------------
 Fri Nov 30 14:26:27 UTC 2018 - Enno Gotthold <egotthold@suse.com>
 

joe.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package joe
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -21,8 +21,7 @@ Version:        4.6
 Release:        0
 Summary:        A Text Editor
 License:        GPL-2.0-or-later
-# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
-Group:          Utility/TextEditor
+Group:          Productivity/Text/Editors
 URL:            http://sourceforge.net/projects/joe-editor
 Source:         http://downloads.sf.net/joe-editor/%{name}-%{version}.tar.gz
 Source2:        de.po
@@ -32,7 +31,8 @@ Patch3:         joe-3.3-warnings.patch
 Patch7:         joe-3.7-additional_key_mappings.patch
 Patch8:         joe-3.7-spec_association.patch
 Patch10:        joe-sigiot.patch
-Patch11:	joe-4.6-desktop_files.patch
+Patch11:        joe-4.6-desktop_files.patch
+Patch12:        joe-4.6-nonvoid-functions.patch
 BuildRequires:  automake
 BuildRequires:  ncurses-devel
 
@@ -48,6 +48,7 @@ WordStar keybindings used in Borland's development environment.
 %patch8
 %patch10
 %patch11 -p1
+%patch12 -p1
 
 %build
 autoreconf -fiv