fyba-4.1.1 (rebuild with gcc-12.4.0)

fyba/README

@@ -1,32 +1,33 @@
 fyba
 ------------------------------------------
 OpenFYBA is the source code release of the FYBA library, distributed by the
-National Mapping Authority of Norway (Statens kartverk) to read and write
-files in the National geodata standard format SOSI.
+National Mapping Authority of Norway (Statens kartverk) to read and write files
+in the National geodata standard format SOSI.
 
 Runtime requirements:
-  cygwin-2.0.4-1
-  libfyba-devel-4.1.1-1bl1
-  libfyba0-4.1.1-1bl1
-  libgcc1-4.9.2-3
-  libstdc++6-4.9.2-3
+  cygwin-3.5.4-1
+  libfyba-devel-4.1.1-1bl2
+  libfyba0-4.1.1-1bl2
+  libgcc1-12.4.0-3
+  libstdc++6-12.4.0-3
+  pkg-config-2.3.0-1
 
 Build requirements:
 (besides corresponding -devel packages)
-  autoconf-13-1
-  automake-9-1
-  binutils-2.25-2
-  cygport-0.20.1-1
-  gcc-core-4.9.2-3
-  gcc-g++-4.9.2-3
-  libtool-2.4.6-1
-  make-4.1-1
+  autoconf-15-2
+  automake-20240607-1
+  binutils-2.43.1-1
+  cygport-0.36.9-1
+  gcc-core-12.4.0-3
+  gcc-g++-12.4.0-3
+  libtool-2.5.3-1
+  make-4.4.1-2
 
 Canonical website:
   https://github.com/kartverket/fyba
 
 Canonical download:
-  https://github.com/kartverket/fyba/archive/4.1.1.tar.gz
+  https://github.com/kartverket/fyba/archive/refs/tags/4.1.1.tar.gz
 
 -------------------------------------------
 
@@ -73,5 +74,8 @@ Files included in the binary package:
 
 Port Notes:
 
+----- version 4.1.1-1bl2 -----
+Rebuild with gcc-12.4.0
+
 ----- version 4.1.1-1bl1 -----
 Initial release by fd0 <https://github.com/fd00/>

fyba/fyba-4.1.1-1bl1.cygport → fyba/fyba-4.1.1-1bl2.cygport

@@ -1,9 +1,9 @@
 HOMEPAGE="https://github.com/kartverket/${PN}"
-SRC_URI="https://github.com/kartverket/${PN}/archive/${PV}.tar.gz"
-
-# https://git.pld-linux.org/?p=packages/fyba.git
+SRC_URI="https://github.com/kartverket/${PN}/archive/refs/tags/${PV}.tar.gz"
 PATCH_URI="
-	${PN}-link.patch
+	https://sources.debian.org/data/main/f/fyba/4.1.1-11/debian/patches/01_noexit_in_library.patch
+	https://sources.debian.org/data/main/f/fyba/4.1.1-11/debian/patches/02_fix_linking.patch
+	https://sources.debian.org/data/main/f/fyba/4.1.1-11/debian/patches/fix_issue.patch
 "
 
 CATEGORY="Libs"
@@ -12,6 +12,12 @@ DESCRIPTION="OpenFYBA is the source code release of the FYBA library, distribute
 National Mapping Authority of Norway (Statens kartverk) to read and write
 files in the National geodata standard format SOSI."
 
+LICENSE="MIT"
+LICENSE_SPDX="SPDX-License-Identifier: MIT"
+# LICENSE_URI=""
+
+export CPPFLAGS="${CPPFLAGS} -DFIONREAD=TIOCINQ"
+
 PKG_NAMES="
 	${PN}
 	lib${PN}0
@@ -21,7 +27,7 @@ fyba_CONTENTS="
 	usr/share
 "
 libfyba0_CONTENTS="
-	usr/bin
+	usr/bin/cyg*-0.dll
 "
 libfyba_devel_CONTENTS="
 	usr/include

fyba/fyba-4.1.1-1bl2.src.patch

@@ -0,0 +1,49 @@
+--- origsrc/fyba-4.1.1/src/FYBA/Makefile.am	2024-12-20 10:41:53.024890800 +0900
++++ src/fyba-4.1.1/src/FYBA/Makefile.am	2024-12-20 10:48:33.596481200 +0900
+@@ -1,9 +1,9 @@
+-AM_CPPFLAGS = --pedantic -Wno-long-long -Wall -O2 -D_FILE_OFFSET_BITS=64 -DUNIX -DLINUX -fPIC -Wno-write-strings -I../GM -I../UT
++AM_CPPFLAGS = --pedantic -Wno-long-long -Wall -O2 -D_FILE_OFFSET_BITS=64 -DUNIX -DLINUX -fPIC -Wno-write-strings -I$(top_srcdir)/src/GM -I$(top_srcdir)/src/UT
+ ACLOCAL_AMFLAGS = -I m5
+
+ 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_LDFLAGS = -no-undefined -version-info 0:0:0
+ libfyba_la_LIBADD = $(top_builddir)/src/UT/libfyut.la \
+                     $(top_builddir)/src/GM/libfygm.la
+
+--- origsrc/fyba-4.1.1/src/FYBA/fyba.h	2014-09-22 14:36:49.000000000 +0900
++++ src/fyba-4.1.1/src/FYBA/fyba.h	2024-12-20 10:43:09.895699400 +0900
+@@ -62,8 +62,10 @@
+ #else
+ #  define DllExport
+ #  define DLLImport
++#if !defined(__cdecl)
+ #  define __cdecl
+ #endif
++#endif
+
+
+ #ifndef SK_EntPnt_FYBA
+--- origsrc/fyba-4.1.1/src/GM/Makefile.am	2024-12-20 10:41:53.024890800 +0900
++++ src/fyba-4.1.1/src/GM/Makefile.am	2024-12-20 10:42:33.755060300 +0900
+@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m5
+
+ 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_LDFLAGS = -no-undefined -version-info 0:0:0
+ libfygm_la_LIBADD = $(top_builddir)/src/UT/libfyut.la
+
+ library_includedir=$(includedir)/fyba
+--- origsrc/fyba-4.1.1/src/UT/Makefile.am	2014-09-22 14:36:49.000000000 +0900
++++ src/fyba-4.1.1/src/UT/Makefile.am	2024-12-20 10:42:48.896019100 +0900
+@@ -3,7 +3,7 @@ ACLOCAL_AMFLAGS = -I m5
+
+ lib_LTLIBRARIES = libfyut.la
+ libfyut_la_SOURCES = ANFORSEL.cpp  DELDIR.cpp    FILNACMP.cpp  INQTID.cpp    UT1.cpp  UT4.cpp CopyFile.cpp  DELFILE.cpp  MAKEPATH.cpp  stdafx.cpp    UT2.cpp CREDIR.cpp    DISKINFO.cpp  INQSIZE.cpp   SETSIZE.cpp   StrtPros.cpp  UT3.cpp fyut.h  stdafx.h FULLPATH.cpp SPLITPTH.cpp
+-libfyut_la_LDFLAGS = -version-info 0:0:0
++libfyut_la_LDFLAGS = -no-undefined -version-info 0:0:0
+
+ library_includedir=$(includedir)/fyba
+ library_include_HEADERS = fyut.h