From de5d4612760654c0fdb5f0630291fc291eb5bf48201cb9e3cc32909ce6f9a918 Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Thu, 17 Oct 2019 21:55:59 +0000 Subject: [PATCH 1/8] OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/finalcut?expand=0&rev=18 --- 0001-arm-glibc-2.30.patch | 65 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 0001-arm-glibc-2.30.patch diff --git a/0001-arm-glibc-2.30.patch b/0001-arm-glibc-2.30.patch new file mode 100644 index 0000000..8fc88b9 --- /dev/null +++ b/0001-arm-glibc-2.30.patch @@ -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 // 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 ++ #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 + { From 895297ae869a6ebc40d2c00f65af60022c854e8f52518c05d6a880763a14180a Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Thu, 17 Oct 2019 21:57:58 +0000 Subject: [PATCH 2/8] OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/finalcut?expand=0&rev=19 --- 0001-arm-glibc-2.30.patch | 65 --------------------------------------- 1 file changed, 65 deletions(-) delete mode 100644 0001-arm-glibc-2.30.patch diff --git a/0001-arm-glibc-2.30.patch b/0001-arm-glibc-2.30.patch deleted file mode 100644 index 8fc88b9..0000000 --- a/0001-arm-glibc-2.30.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- 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 // 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 -+ #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 - { From 429a30c97f4806d24846e01d6ca5ba9bb434595ca00ca7799d239c79af1f2336 Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Fri, 18 Oct 2019 19:13:57 +0000 Subject: [PATCH 3/8] OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/finalcut?expand=0&rev=20 --- finalcut-0.5.1.tar.gz | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 finalcut-0.5.1.tar.gz diff --git a/finalcut-0.5.1.tar.gz b/finalcut-0.5.1.tar.gz deleted file mode 100644 index 5f4d45b..0000000 --- a/finalcut-0.5.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:95ebd37849363d65cb4fadf7e01e9df56707eb2da4c964bc92cfcae76e5158c2 -size 593339 From bb0d199138424a22eb4838e412ac5b962b358c3212aa75ca687cc4d74288a123 Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Fri, 18 Oct 2019 19:14:15 +0000 Subject: [PATCH 4/8] OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/finalcut?expand=0&rev=21 --- 0001-arm-glibc-2.30.patch | 65 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 0001-arm-glibc-2.30.patch diff --git a/0001-arm-glibc-2.30.patch b/0001-arm-glibc-2.30.patch new file mode 100644 index 0000000..8fc88b9 --- /dev/null +++ b/0001-arm-glibc-2.30.patch @@ -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 // 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 ++ #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 + { From 985e22015866508b28b138b81bbb463df974da9b4a28fde6429a58de8543a1fb Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Fri, 18 Oct 2019 19:14:27 +0000 Subject: [PATCH 5/8] OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/finalcut?expand=0&rev=22 --- finalcut-0.6.0.tar.gz | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 finalcut-0.6.0.tar.gz diff --git a/finalcut-0.6.0.tar.gz b/finalcut-0.6.0.tar.gz new file mode 100644 index 0000000..21ffc2a --- /dev/null +++ b/finalcut-0.6.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c2260104ba918a83748f6af0f01e33c35bbc4591f49567839e45cf1555b9f2f +size 672043 From a9667626b970f507bac68bb2267bb1bbb5312afef3fbbb10f619a853c51ee91a Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Fri, 18 Oct 2019 19:21:25 +0000 Subject: [PATCH 6/8] OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/finalcut?expand=0&rev=23 --- finalcut.changes | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/finalcut.changes b/finalcut.changes index 550f478..d836447 100644 --- a/finalcut.changes +++ b/finalcut.changes @@ -1,3 +1,7 @@ +------------------------------------------------------------------- +Mon Oct 15 01:14:57 UTC 2019 - Markus Gans +- Release (version 0.6.0) + ------------------------------------------------------------------- Sat Dec 01 21:28:25 UTC 2018 - Markus Gans - Release (version 0.5.1) From 79439d8986e92fca48161e7c209f41dbb317716354fa4c8bac20f8158518afd4 Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Fri, 18 Oct 2019 19:22:17 +0000 Subject: [PATCH 7/8] OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/finalcut?expand=0&rev=24 --- finalcut.spec | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/finalcut.spec b/finalcut.spec index 39bcbeb..42eb67b 100644 --- a/finalcut.spec +++ b/finalcut.spec @@ -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 From c3d3f4c0ea652c7b037515aae44534453a74ee2092fd4275782a8f3dcc9b4e18 Mon Sep 17 00:00:00 2001 From: Markus Gans Date: Sat, 19 Oct 2019 16:18:41 +0000 Subject: [PATCH 8/8] OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/finalcut?expand=0&rev=25 --- finalcut.changes | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/finalcut.changes b/finalcut.changes index d836447..de09a01 100644 --- a/finalcut.changes +++ b/finalcut.changes @@ -1,13 +1,21 @@ +------------------------------------------------------------------- +Mon Oct 17 21:29:43 UTC 2019 - Markus Gans + +- 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 + - Release (version 0.6.0) ------------------------------------------------------------------- Sat Dec 01 21:28:25 UTC 2018 - Markus Gans + - Release (version 0.5.1) ------------------------------------------------------------------- Thu Nov 28 23:36:24 UTC 2018 - Markus Gans + - Package name adjustment ------------------------------------------------------------------- @@ -37,20 +45,25 @@ Mon Nov 26 11:22:27 UTC 2018 - mvetter@suse.com ------------------------------------------------------------------- Sun Nov 25 00:03:36 UTC 2018 - Markus Gans + - Release (version 0.5.0) ------------------------------------------------------------------- Sat Nov 04 07:53:19 UTC 2017 - Markus Gans + - Release (version 0.4.0) ------------------------------------------------------------------- Sun Nov 27 14:00:41 UTC 2016 - Markus Gans + - Release (version 0.3.0) ------------------------------------------------------------------- Sat Dec 19 21:01:48 UTC 2015 - Markus Gans + - Release (version 0.2.0) ------------------------------------------------------------------- Fri Sep 18 22:35:57 UTC 2015 - Markus Gans + - Initial Release (version 0.1.1)