rpm/finalcut
SHA256
1
0
Fork 0
forked from pool/finalcut
Code Pull Requests Activity

Accepting request 741235 from devel:libraries:c_c++

Browse Source 
- 0001-arm-glibc-2.30.patch: Fixes compilation error with arm architecture with glibc >= 2.30 
- Release (version 0.6.0)
- Release (version 0.5.1)
- Package name adjustment
- Use correct package names in Requires.
- Fix summary containing just of the name. Edit RPM groups.
- Install examples into docdir
- Add libfinal-devel = %{version} to devel package
- Prepare to push to devel project
- Remove old tarball: finalcut-0.3.0.tar.gz
- Remove old tarball: finalcut-0.4.0.tar.gz
- Clean spec with spec-cleaner
- Add changes file
- Release (version 0.5.0)
- Release (version 0.4.0)
- Release (version 0.3.0)
- Release (version 0.2.0)
- Initial Release (version 0.1.1)

OBS-URL: https://build.opensuse.org/request/show/741235
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/finalcut?expand=0&rev=4
This commit is contained in:
Dominique Leuenberger 2019-10-21 10:30:23 +00:00 committed by Git OBS Bridge
commit cb8e8f0980
5 changed files with 103 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
0001-arm-glibc-2.30.patch Normal file
View File

@ -0,0 +1,65 @@
--- a/src/include/final/fsystemimpl.h
+++ b/src/include/final/fsystemimpl.h
@@ -36,9 +36,19 @@
#endif
#if defined(__linux__)
- #if defined(__x86_64__) || defined(__i386) || defined(__arm__)
- #include <sys/io.h> // <asm/io.h> is deprecated
- #endif // defined(__x86_64__) || defined(__i386) || defined(__arm__)
+
+ #if defined(__arm__) && defined(__GLIBC__) && defined(__GLIBC_PREREQ)
+ // ISA sysctl support on arm processors only up to glibc-2.29
+ #if !__GLIBC_PREREQ(2,30)
+ #define ARM_ISA_SYSCTL
+ #endif
+ #endif
+
+ #if defined(__x86_64__) || defined(__i386) || defined(ARM_ISA_SYSCTL)
+ #define ISA_SYSCTL_SUPPORT
+ #include <sys/io.h>
+ #endif // defined(__x86_64__) || defined(__i386) || defined(ARM_ISA_SYSCTL)
+
#endif // defined(__linux__)
#if defined(__sun) && defined(__SVR4)
@@ -88,8 +98,7 @@ class FSystemImpl : public FSystem
virtual ~FSystemImpl();
// Methods
-#if defined(__linux__)
-#if defined(__x86_64__) || defined(__i386) || defined(__arm__)
+#if defined(ISA_SYSCTL_SUPPORT)
uChar inPortByte (uShort port) override
{
return ::inb (port);
@@ -100,16 +109,9 @@ class FSystemImpl : public FSystem
return 0;
}
#endif
-#else
- uChar inPortByte (uShort) override
- {
- return 0;
- }
-#endif
-#if defined(__linux__)
-#if defined(__x86_64__) || defined(__i386) || defined(__arm__)
+#if defined(ISA_SYSCTL_SUPPORT)
void outPortByte (uChar value, uShort port) override
{
::outb (value, port);
@@ -118,11 +120,6 @@ class FSystemImpl : public FSystem
void outPortByte (uChar, uShort) override
{ }
#endif
-#else
- void outPortByte (uChar, uShort) override
- { }
-#endif
-
int isTTY (int fd) override
{

3
finalcut-0.5.1.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:95ebd37849363d65cb4fadf7e01e9df56707eb2da4c964bc92cfcae76e5158c2
size 593339

3
finalcut-0.6.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8c2260104ba918a83748f6af0f01e33c35bbc4591f49567839e45cf1555b9f2f
size 672043

17
finalcut.changes
View File

@ -1,9 +1,21 @@
-------------------------------------------------------------------
Mon Oct 17 21:29:43 UTC 2019 - Markus Gans <guru.mail@muenster.de>
- 0001-arm-glibc-2.30.patch: Fixes compilation error with arm architecture with glibc >= 2.30
-------------------------------------------------------------------
Mon Oct 15 01:14:57 UTC 2019 - Markus Gans <guru.mail@muenster.de>
- Release (version 0.6.0)
-------------------------------------------------------------------
Sat Dec 01 21:28:25 UTC 2018 - Markus Gans <guru.mail@muenster.de>
- Release (version 0.5.1)
-------------------------------------------------------------------
Thu Nov 28 23:36:24 UTC 2018 - Markus Gans <guru.mail@muenster.de>
- Package name adjustment
-------------------------------------------------------------------
@ -33,20 +45,25 @@ Mon Nov 26 11:22:27 UTC 2018 - mvetter@suse.com
-------------------------------------------------------------------
Sun Nov 25 00:03:36 UTC 2018 - Markus Gans <guru.mail@muenster.de>
- Release (version 0.5.0)
-------------------------------------------------------------------
Sat Nov 04 07:53:19 UTC 2017 - Markus Gans <guru.mail@muenster.de>
- Release (version 0.4.0)
-------------------------------------------------------------------
Sun Nov 27 14:00:41 UTC 2016 - Markus Gans <guru.mail@muenster.de>
- Release (version 0.3.0)
-------------------------------------------------------------------
Sat Dec 19 21:01:48 UTC 2015 - Markus Gans <guru.mail@muenster.de>
- Release (version 0.2.0)
-------------------------------------------------------------------
Fri Sep 18 22:35:57 UTC 2015 - Markus Gans <guru.mail@muenster.de>
- Initial Release (version 0.1.1)

29
finalcut.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package finalcut.spec
#
# Copyright (c) 2018 by Markus Gans
# Copyright (c) 2019 by Markus Gans
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -18,22 +18,26 @@
%define sover 0
Name: finalcut
Version: 0.5.1
Version: 0.6.0
Release: 0
Summary: Console widget library
License: LGPL-3.0-or-later
Group: Development/Libraries/C and C++
URL: https://github.com/gansm/finalcut/
Source: https://github.com/gansm/finalcut/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch0: 0001-arm-glibc-2.30.patch
BuildRequires: autoconf
BuildRequires: autoconf-archive
BuildRequires: automake
BuildRequires: gcc-c++
BuildRequires: gcc-c++ >= 5.1
BuildRequires: glib2-devel
BuildRequires: gpm-devel
BuildRequires: gdb
BuildRequires: libtool
BuildRequires: ncurses-devel
%description
The Final Cut is a class library and widget toolkit with full mouse
FINAL CUT is a class library and widget toolkit with full mouse
support for creating a text-based user interface. The library supports
the programmer to develop an application for the text console. It allows
the simultaneous handling of multiple windows on the screen.
@ -42,12 +46,12 @@ common controls like dialog windows, push buttons, check boxes,
radio buttons, input lines, list boxes, status bars and so on.
%package -n libfinal-devel
Summary: Development files for The Final Cut text widget library
Summary: Development files for the FINAL CUT text widget library
Group: Development/Libraries/C and C++
Requires: libfinal%{sover} = %{version}
Requires: bdftopcf
Requires: coreutils
Requires: gcc-c++
Requires: gcc-c++ >= 5.1
Requires: grep
Requires: gzip
Requires: sed
@ -57,7 +61,7 @@ Obsoletes: finalcut-devel < %{version}
Recommends: %{name}-examples = %{version}
%description -n libfinal-devel
The Final Cut is a class library and widget toolkit with full mouse
FINAL CUT is a class library and widget toolkit with full mouse
support for creating a text-based user interface. The library supports
the programmer to develop an application for the text console. It allows
the simultaneous handling of multiple windows on the screen.
@ -66,14 +70,14 @@ common controls like dialog windows, push buttons, check boxes,
radio buttons, input lines, list boxes, status bars and so on.
%package -n libfinal-examples
Summary: Example files for The Final Cut library
Summary: Example files for the FINAL CUT library
Group: Development/Languages/C and C++
BuildArch: noarch
Provides: finalcut-examples = %{version}
Obsoletes: finalcut-examples < %{version}
%description -n libfinal-examples
The Final Cut is a class library and widget toolkit with full mouse
FINAL CUT is a class library and widget toolkit with full mouse
support for creating a text-based user interface. The library supports
the programmer to develop an application for the text console. It allows
the simultaneous handling of multiple windows on the screen.
@ -86,7 +90,7 @@ Summary: Console widget toolkit
Group: System/Libraries
%description -n libfinal%{sover}
The Final Cut is a class library and widget toolkit with full mouse
FINAL CUT is a class library and widget toolkit with full mouse
support for creating a text-based user interface. The library supports
the programmer to develop an application for the text console. It allows
the simultaneous handling of multiple windows on the screen.
@ -96,6 +100,7 @@ radio buttons, input lines, list boxes, status bars and so on.
%prep
%setup -q
%patch0 -p1
%build
autoreconf -vif
@ -110,8 +115,10 @@ make %{?_smp_mflags} V=1
make install libdir=%{buildroot}%{_libdir}/ \
includedir=%{buildroot}%{_includedir} \
bindir=%{buildroot}%{_bindir} \
docdir=%{buildroot}%{_docdir}/%{name}/
docdir=%{buildroot}%{_docdir}/%{name}/ \
fontdir=%{buildroot}%{_miscfontsdir}/%{name}/
mkdir -p %{buildroot}%{_docdir}/%{name}/examples
mkdir -p %{buildroot}%{_miscfontsdir}/%{name}/
cp -p examples/*.cpp %{buildroot}%{_docdir}/%{name}/examples
cp -p examples/Makefile.clang %{buildroot}%{_docdir}/%{name}/examples
cp -p examples/Makefile.gcc %{buildroot}%{_docdir}/%{name}/examples