pool/non-ntk
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 729196 from home:edogawa

Browse Source 
fix Tumbleweed build (change friends declaration to exclude default argument)

OBS-URL: https://build.opensuse.org/request/show/729196
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/non-ntk?expand=0&rev=9
This commit is contained in:
Edgar Aichinger 2019-09-08 09:11:24 +00:00 committed by Git OBS Bridge
parent 0c79e3ca2b
commit 2d7b74e7d7
3 changed files with 43 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
non-ntk-1.3.0-fpermissive.patch Normal file
View File

@ -0,0 +1,19 @@
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*)

6
non-ntk.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Sep 8 08:57:04 UTC 2019 - Edgar Aichinger <edogawa@aon.at>
- add non-ntk-1.3.0-fpermissive.patch
(fixes friend declaration using default argument in fluid/Fl_Type.h)
-------------------------------------------------------------------
Wed Dec 13 15:45:48 UTC 2017 - edogawa@aon.at

31
non-ntk.spec
View File

@ -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 @@ Source2: non-ntk-1.3.0-fluid.desktop
# 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: 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
@ -71,9 +74,10 @@ Requires: libntk1 = %{version}-%{release}
This package contains development files for %{name}.
%package fluid
Summary: Fast Light User Interface Designer
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-devel
Summary: Fast Light User Interface Designer
Group: Applications/Multimedia
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-devel
%description fluid
%{summary}, an interactive GUI designer for %{name}.
@ -82,6 +86,7 @@ Requires: %{name}-devel
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
sed -i -e "s|append_value('C\(.*\)FLAGS', CFLAGS|append_value('C\1FLAGS','%{optflags}'.split(' ')|" \
wscript
@ -110,13 +115,13 @@ update-desktop-database -q &> /dev/null
%post fluid
update-desktop-database -q &> /dev/null
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/ntk-fluid.desktop
%files
%defattr(-,root,root)
%doc COPYING
%license COPYING
%files -n libntk1
%defattr(-,root,root)