Hello community, here is the log from the commit of package non-ntk for openSUSE:Factory checked in at 2019-09-09 12:35:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/non-ntk (Old) and /work/SRC/openSUSE:Factory/.non-ntk.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "non-ntk" Mon Sep 9 12:35:51 2019 rev:3 rq:729197 version:1.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/non-ntk/non-ntk.changes 2017-12-14 11:03:35.325930418 +0100 +++ /work/SRC/openSUSE:Factory/.non-ntk.new.7948/non-ntk.changes 2019-09-09 12:35:53.505467346 +0200 @@ -1,0 +2,6 @@ +Sun Sep 8 08:57:04 UTC 2019 - Edgar Aichinger <[email protected]> + +- add non-ntk-1.3.0-fpermissive.patch + (fixes friend declaration using default argument in fluid/Fl_Type.h) + +------------------------------------------------------------------- New: ---- non-ntk-1.3.0-fpermissive.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ non-ntk.spec ++++++ --- /var/tmp/diff_new_pack.UuV7rs/_old 2019-09-09 12:35:54.137467242 +0200 +++ /var/tmp/diff_new_pack.UuV7rs/_new 2019-09-09 12:35:54.141467242 +0200 @@ -1,7 +1,7 @@ # # spec file for package non-ntk # -# Copyright (c) 2016 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 @@ -12,17 +12,19 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + + Name: non-ntk Version: 1.3.0 Release: 0 Summary: A fork of FLTK for the non audio suite - +License: GPL-2.0-or-later Group: Applications/Multimedia + # some codes are in GPLv2+ while FLTK derived code is LGPLv2+ (SUSE-FLTK) # since linking to the same binary together, restricted solely to GPL-2.0+ -License: GPL-2.0+ URL: http://non.tuxfamily.org/ Source0: non-ntk-%{version}-git5719b00.tar.bz2 # script to create source tarball from git @@ -33,20 +35,21 @@ # sent upstream via email Patch1: non-ntk-1.3.0-fsf.patch Patch2: non-ntk-unused-shlib.patch +Patch3: non-ntk-1.3.0-fpermissive.patch %if %{defined fedora} BuildRequires: desktop-file-utils %endif %if 0%{?suse_version} -BuildRequires: update-desktop-files BuildRequires: gcc-c++ +BuildRequires: update-desktop-files %endif -BuildRequires: python BuildRequires: cairo-devel BuildRequires: libjpeg-devel -BuildRequires: pkgconfig(libpng) +BuildRequires: python-base BuildRequires: zlib-devel BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(xft) %description @@ -72,6 +75,7 @@ %package fluid Summary: Fast Light User Interface Designer +Group: Applications/Multimedia Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-devel @@ -82,6 +86,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 sed -i -e "s|append_value('C\(.*\)FLAGS', CFLAGS|append_value('C\1FLAGS','%{optflags}'.split(' ')|" \ wscript @@ -116,7 +121,7 @@ %files %defattr(-,root,root) -%doc COPYING +%license COPYING %files -n libntk1 %defattr(-,root,root) ++++++ non-ntk-1.3.0-fpermissive.patch ++++++ diff -up non-ntk-1.3.0/fluid/Fl_Type.h.orig non-ntk-1.3.0/fluid/Fl_Type.h --- non-ntk-1.3.0/fluid/Fl_Type.h.orig 2019-09-08 10:24:53.000000000 +0200 +++ non-ntk-1.3.0/fluid/Fl_Type.h 2019-09-08 10:39:55.607762387 +0200 @@ -42,10 +42,14 @@ void set_modflag(int mf); +// forward declaration: +class Fl_Type; +Fl_Widget *make_type_browser(int,int,int,int,const char *l=0); + class Fl_Type { friend class Widget_Browser; - friend Fl_Widget *make_type_browser(int,int,int,int,const char *l=0); + friend Fl_Widget *make_type_browser(int,int,int,int,const char*); friend class Fl_Window_Type; virtual void setlabel(const char *); // virtual part of label(char*)
