[packages/fyba] Rel 3

arekm arekm at pld-linux.org
Fri May 22 20:07:11 CEST 2026 

commit 1488c4c357e4845a454538147ade2b58567168cd
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri May 22 20:06:53 2026 +0200

    Rel 3

 fyba-cxx.patch  | 43 +++++++++++++++++++++++++++++++++++++++++++
 fyba-link.patch | 29 ++++++++++++++++-------------
 fyba.spec       |  4 +++-
 3 files changed, 62 insertions(+), 14 deletions(-)
---
diff --git a/fyba.spec b/fyba.spec
index c76cf46..f7af9af 100644
--- a/fyba.spec
+++ b/fyba.spec
@@ -2,12 +2,13 @@ Summary:	FYBA - library to read and write files in Norwegian geodata standard fo
 Summary(pl.UTF-8):	FYBA - biblioteka do odczytu i zapisu plików w norweskim formacie danych geograficznych SOSI
 Name:		fyba
 Version:	4.1.1
-Release:	2
+Release:	3
 License:	MIT
 Group:		Libraries
 Source0:	https://github.com/kartverket/fyba/archive/%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	ab687582efdef26593796271529a10cb
 Patch0:		%{name}-link.patch
+Patch1:		%{name}-cxx.patch
 URL:		https://github.com/kartverket/fyba
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
@@ -55,6 +56,7 @@ Statyczne biblioteki FYBA.
 %prep
 %setup -q
 %patch -P0 -p1
+%patch -P1 -p1
 
 %build
 %{__libtoolize}
diff --git a/fyba-cxx.patch b/fyba-cxx.patch
new file mode 100644
index 0000000..2b2ddd6
--- /dev/null
+++ b/fyba-cxx.patch
@@ -0,0 +1,43 @@
+--- fyba-4.1.1/src/UT/fyut.h.orig	2014-09-22 07:36:49.000000000 +0200
++++ fyba-4.1.1/src/UT/fyut.h	2026-05-21 23:27:56.054976772 +0200
+@@ -125,8 +125,13 @@
+ 
+ 
+ /* ----------------------------------------- Makroer */
++#ifdef __cplusplus
++template<typename T, typename U> static inline auto max(T a, U b) -> decltype(a > b ? a : b) { return (a > b) ? a : b; }
++template<typename T, typename U> static inline auto min(T a, U b) -> decltype(a < b ? a : b) { return (a < b) ? a : b; }
++#else
+ #define max(a,b) (((a) > (b)) ? (a) : (b))
+ #define min(a,b) (((a) < (b)) ? (a) : (b))
++#endif
+ 
+ 
+ 
+--- fyba-4.1.1/include/fyut.h.orig	2014-09-22 07:36:49.000000000 +0200
++++ fyba-4.1.1/include/fyut.h	2026-05-21 23:28:11.523907639 +0200
+@@ -125,8 +125,13 @@
+ 
+ 
+ /* ----------------------------------------- Makroer */
++#ifdef __cplusplus
++template<typename T, typename U> static inline auto max(T a, U b) -> decltype(a > b ? a : b) { return (a > b) ? a : b; }
++template<typename T, typename U> static inline auto min(T a, U b) -> decltype(a < b ? a : b) { return (a < b) ? a : b; }
++#else
+ #define max(a,b) (((a) > (b)) ? (a) : (b))
+ #define min(a,b) (((a) < (b)) ? (a) : (b))
++#endif
+ 
+ 
+ 
+--- fyba-4.1.1/src/FYBA/FYLU.cpp.orig	2014-09-22 07:36:49.000000000 +0200
++++ fyba-4.1.1/src/FYBA/FYLU.cpp	2026-05-21 23:27:36.171874665 +0200
+@@ -10,7 +10,7 @@
+ #include <math.h>
+ #include <locale>
+ 
+-using namespace std;
++using std::locale;
+ 
+ #define U_PARA_LEN    128     /* Max lengde av parameterstreng */
+ 
diff --git a/fyba-link.patch b/fyba-link.patch
index 9e5abca..a98149f 100644
--- a/fyba-link.patch
+++ b/fyba-link.patch
@@ -1,27 +1,30 @@
---- fyba/src/GM/Makefile.am.orig	2014-05-17 07:12:11.000000000 +0200
-+++ fyba/src/GM/Makefile.am	2014-05-17 21:51:38.668339437 +0200
+--- fyba-4.1.1/Makefile.am.orig	2014-05-17 07:12:11.000000000 +0200
++++ fyba-4.1.1/Makefile.am	2014-05-17 22:19:55.298304085 +0200
+@@ -1,6 +1,6 @@
+ ACLOCAL_AMFLAGS = -I m4
+ AUTOMAKE_OPTIONS = foreign
+-SUBDIRS = src/GM src/UT src/FYBA doc
++SUBDIRS = src/UT src/GM src/FYBA doc
+
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = fyba.pc
+--- fyba-4.1.1/src/GM/Makefile.am.orig	2014-09-22 07:36:49.000000000 +0200
++++ fyba-4.1.1/src/GM/Makefile.am	2026-05-21 23:32:46.000000000 +0200
 @@ -4,6 +4,7 @@
  lib_LTLIBRARIES = libfygm.la
  libfygm_la_SOURCES = fygm.h GM.cpp stdafx.cpp stdafx.h
  libfygm_la_LDFLAGS = -version-info 0:0:0
-+libfygm_la_LIBADD = $(top_builddir)/src/UT/libfyut.la
++libfygm_la_LIBADD = ../UT/libfyut.la
  
  library_includedir=$(includedir)/fyba
  library_include_HEADERS = fygm.h 
---- fyba/src/FYBA/Makefile.am.orig	2014-05-17 07:12:11.000000000 +0200
-+++ fyba/src/FYBA/Makefile.am	2014-05-17 22:22:23.784967631 +0200
+--- fyba-4.1.1/src/FYBA/Makefile.am.orig	2014-09-22 07:36:49.000000000 +0200
++++ fyba-4.1.1/src/FYBA/Makefile.am	2026-05-21 23:32:46.000000000 +0200
 @@ -4,6 +4,7 @@
  lib_LTLIBRARIES = libfyba.la
  libfyba_la_SOURCES = fyba.h Fyba_Callback.cpp  FYBA_DLL.cpp      FYHO.cpp  FYLD.cpp  FYLH.cpp  fyln.cpp  FYLP.cpp  FYLS.cpp  FYLX.cpp  stdafx.cpp FYBA.cpp           Fyba_melding.cpp  FYLB.cpp  FYLE.cpp  FYLI.cpp  FYLO.cpp  FYLR.cpp  FYLU.cpp  FYTA.cpp fyba.h  fyba_strings.h  fybax.h  stdafx.h
  libfyba_la_LDFLAGS = -version-info 0:0:0
-+libfyba_la_LIBADD = $(top_builddir)/src/GM/libfygm.la $(top_builddir)/src/UT/libfyut.la
++libfyba_la_LIBADD = ../GM/libfygm.la ../UT/libfyut.la
  
  library_includedir=$(includedir)/fyba
  library_include_HEADERS = fyba.h     
---- fyba/Makefile.am.orig	2014-05-17 07:12:11.000000000 +0200
-+++ fyba/Makefile.am	2014-05-17 22:19:55.298304085 +0200
-@@ -1,3 +1,3 @@
- ACLOCAL_AMFLAGS = -I m4
- AUTOMAKE_OPTIONS = foreign
--SUBDIRS = src/GM src/UT src/FYBA doc
-+SUBDIRS = src/UT src/GM src/FYBA doc
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/fyba.git/commitdiff/1488c4c357e4845a454538147ade2b58567168cd

More information about the pld-cvs-commit mailing list