From f0e30e4b4f8cdd361b91bf77196bd9c084197d07 Mon Sep 17 00:00:00 2001 From: "Daisuke Fujimura (fd0)" Date: Wed, 29 Jan 2025 18:32:08 +0900 Subject: [PATCH] liboop-1.0.1 (rebuild with gcc-12.4.0) --- liboop/README | 67 ++++--- liboop/liboop-1.0.1-1bl1.src.patch | 68 -------- ...1bl1.cygport => liboop-1.0.1-1bl2.cygport} | 12 +- liboop/liboop-1.0.1-1bl2.src.patch | 163 ++++++++++++++++++ 4 files changed, 212 insertions(+), 98 deletions(-) delete mode 100644 liboop/liboop-1.0.1-1bl1.src.patch rename liboop/{liboop-1.0.1-1bl1.cygport => liboop-1.0.1-1bl2.cygport} (83%) create mode 100644 liboop/liboop-1.0.1-1bl2.src.patch diff --git a/liboop/README b/liboop/README index ba325949f..f2f800cc3 100644 --- a/liboop/README +++ b/liboop/README @@ -1,43 +1,49 @@ liboop ------------------------------------------ Liboop is a low-level event loop management library for POSIX-based operating -systems. It supports the development of modular, multiplexed applications -which may respond to events from several sources. It replaces the select() -loop and allows the registration of event handlers for file and network I/O, -timers and signals. Since processes use these mechanisms for almost all -external communication, liboop can be used as the basis for almost any -application. +systems. It supports the development of modular, multiplexed applications which +may respond to events from several sources. It replaces the select() loop and +allows the registration of event handlers for file and network I/O, timers and +signals. Since processes use these mechanisms for almost all external +communication, liboop can be used as the basis for almost any application. Runtime requirements: - cygwin-2.9.0-3 - cygwin-devel-2.9.0-3 - libglib2.0-devel-2.52.3-1 - libglib2.0_0-2.52.3-1 - liboop-devel-1.0.1-1bl1 - liboop-glib2-devel-1.0.1-1bl1 - liboop-glib2_0-1.0.1-1bl1 - liboop-rl0-1.0.1-1bl1 - liboop-tcl0-1.0.1-1bl1 - liboop4-1.0.1-1bl1 - libreadline7-7.0.3-3 - pkg-config-0.29.1-1 - tcl-8.6.6-1 + cygwin-3.5.6-1 + cygwin-devel-3.5.6-1 + libglib2.0-devel-2.64.6-1 + libglib2.0_0-2.64.6-1 + liboop-devel-1.0.1-1bl2 + liboop-glib2-devel-1.0.1-1bl2 + liboop-glib2_0-1.0.1-1bl2 + liboop-rl-devel-1.0.1-1bl2 + liboop-rl0-1.0.1-1bl2 + liboop-tcl-devel-1.0.1-1bl2 + liboop-tcl0-1.0.1-1bl2 + liboop4-1.0.1-1bl2 + libreadline-devel-8.2-2 + libreadline7-8.2-2 + pkg-config-2.3.0-1 + tcl-8.6.12-1 + tcl-devel-8.6.12-1 Build requirements: (besides corresponding -devel packages) - autoconf-13-1 - automake-10-1 - binutils-2.28-3 - cygport-0.24.1-1 - gcc-core-6.4.0-1 - libtool-2.4.6-5 - make-4.2.1-2 + autoconf-15-2 + automake-20240607-1 + binutils-2.43.1-1 + cygport-0.36.9-1 + gcc-core-12.4.0-3 + libglib2.0-devel-2.64.6-1 + libreadline-devel-8.2-2 + libtool-2.5.4-1 + make-4.4.1-2 + tcl-devel-8.6.12-1 Canonical website: - http://www.lysator.liu.se/liboop/ + https://www.lysator.liu.se/liboop/ Canonical download: - http://ftp.lysator.liu.se/pub/liboop/liboop-1.0.1.tar.gz + https://ftp.lysator.liu.se/pub/liboop/liboop-1.0.1.tar.gz ------------------------------------------- @@ -91,6 +97,7 @@ Files included in the binary package: (liboop-rl-devel) /usr/include/oop-rl.h /usr/lib/liboop-rl.dll.a + /usr/lib/pkgconfig/liboop-rl.pc (liboop-tcl0) /usr/bin/cygoop-tcl-0.dll @@ -98,11 +105,15 @@ Files included in the binary package: (liboop-tcl-devel) /usr/include/oop-tcl.h /usr/lib/liboop-tcl.dll.a + /usr/lib/pkgconfig/liboop-tcl.pc ------------------ Port Notes: +----- version 1.0.1-1bl2 ----- +Rebuild with gcc-12.4.0 + ----- version 1.0.1-1bl1 ----- Version bump. diff --git a/liboop/liboop-1.0.1-1bl1.src.patch b/liboop/liboop-1.0.1-1bl1.src.patch deleted file mode 100644 index 71edc67dc..000000000 --- a/liboop/liboop-1.0.1-1bl1.src.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- origsrc/liboop-1.0.1/Makefile.am 2016-11-15 05:20:35.000000000 +0900 -+++ src/liboop-1.0.1/Makefile.am 2017-10-05 21:06:21.583000000 +0900 -@@ -14,35 +14,35 @@ pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = liboop.pc liboop-glib2.pc - - # versions updated as of 1.0 --liboop_la_LDFLAGS = -version-info 5:0:1 # version:revision:age -+liboop_la_LDFLAGS = -no-undefined -version-info 5:0:1 # version:revision:age - liboop_la_SOURCES = sys.c select.c signal.c alloc.c read.c read-fd.c read-mem.c - --liboop_adns_la_LDFLAGS = -version-info 3:0:0 -rpath '$(libdir)' -+liboop_adns_la_LDFLAGS = -no-undefined -version-info 3:0:0 -rpath '$(libdir)' - liboop_adns_la_LIBADD = $(ADNS_LIBS) - liboop_adns_la_SOURCES = adns.c - --liboop_glib_la_LDFLAGS = -version-info 1:0:1 -rpath '$(libdir)' -+liboop_glib_la_LDFLAGS = -no-undefined -version-info 1:0:1 -rpath '$(libdir)' - liboop_glib_la_LIBADD = $(GLIB_LIBS) - liboop_glib_la_CFLAGS = $(GLIB_INCLUDES) - liboop_glib_la_SOURCES = glib.c - --liboop_glib2_la_LDFLAGS = -version-info 0:0:0 -rpath '$(libdir)' --liboop_glib2_la_LIBADD = $(GLIB2_LIBS) -+liboop_glib2_la_LDFLAGS = -no-undefined -version-info 0:0:0 -rpath '$(libdir)' -+liboop_glib2_la_LIBADD = $(GLIB2_LIBS) liboop.la - liboop_glib2_la_CFLAGS = $(GLIB2_CFLAGS) - liboop_glib2_la_SOURCES = glib.c - --liboop_tcl_la_LDFLAGS = -version-info 0:0:0 -rpath '$(libdir)' --liboop_tcl_la_LIBADD = $(TCL_LIBS) -+liboop_tcl_la_LDFLAGS = -no-undefined -version-info 0:0:0 -rpath '$(libdir)' -+liboop_tcl_la_LIBADD = $(TCL_LIBS) liboop.la - liboop_tcl_la_CFLAGS = $(TCL_INCLUDES) - liboop_tcl_la_SOURCES = tcl.c - --liboop_www_la_LDFLAGS = -version-info 0:0:0 -rpath '$(libdir)' -+liboop_www_la_LDFLAGS = -no-undefined -version-info 0:0:0 -rpath '$(libdir)' - liboop_www_la_LIBADD = $(WWW_LIBS) - liboop_www_la_CFLAGS = $(WWW_INCLUDES) - liboop_www_la_SOURCES = www.c - --liboop_rl_la_LDFLAGS = -version-info 0:0:0 -rpath '$(libdir)' --liboop_rl_la_LIBADD = $(READLINE_LIBS) -+liboop_rl_la_LDFLAGS = -no-undefined -version-info 0:0:0 -rpath '$(libdir)' -+liboop_rl_la_LIBADD = $(READLINE_LIBS) liboop.la - liboop_rl_la_SOURCES = readline.c - - include_HEADERS = oop.h oop-adns.h oop-glib.h oop-tcl.h oop-www.h oop-rl.h oop-read.h ---- origsrc/liboop-1.0.1/configure.ac 2016-11-15 05:20:35.000000000 +0900 -+++ src/liboop-1.0.1/configure.ac 2017-10-05 21:03:44.935000000 +0900 -@@ -71,7 +71,7 @@ if test xno != x$with_glib; then - fi - - if test xno != x$with_tcl; then -- for version in 8.4 8.3 8.2 8.1 8.0 ; do -+ for version in 8.6 8.4 8.3 8.2 8.1 8.0 ; do - CPPFLAGS="$save_cppflags -I/usr/include/tcl$version" - AC_CHECK_LIB(tcl$version,Tcl_Main,[ - AC_CHECK_HEADER(tcl.h,[ -@@ -110,7 +110,7 @@ if test -z "$no_wacky_libs" ; then - fi - - test yes = "$GCC" && --CFLAGS="-Wall -Wno-comment -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Wwrite-strings $CFLAGS"' $(EXTRA_CFLAGS)' -+CFLAGS="-Wall -Wno-comment -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Wwrite-strings $CFLAGS" - - AC_SUBST(PROG_LDCONFIG) - AC_SUBST(GLIB_INCLUDES) diff --git a/liboop/liboop-1.0.1-1bl1.cygport b/liboop/liboop-1.0.1-1bl2.cygport similarity index 83% rename from liboop/liboop-1.0.1-1bl1.cygport rename to liboop/liboop-1.0.1-1bl2.cygport index 3f40daa5e..c0dbaa6af 100644 --- a/liboop/liboop-1.0.1-1bl1.cygport +++ b/liboop/liboop-1.0.1-1bl2.cygport @@ -1,5 +1,5 @@ -HOMEPAGE="http://www.lysator.liu.se/${PN}/" -SRC_URI="http://ftp.lysator.liu.se/pub/${PN}/${P}.tar.gz" +HOMEPAGE="https://www.lysator.liu.se/${PN}/" +SRC_URI="https://ftp.lysator.liu.se/pub/${PN}/${P}.tar.gz" CATEGORY="Libs" SUMMARY="Low-level event loop management library" @@ -11,6 +11,12 @@ timers and signals. Since processes use these mechanisms for almost all external communication, liboop can be used as the basis for almost any application." +LICENSE="LGPL-2.1-or-later" +LICENSE_SPDX="SPDX-License-Identifier: LGPL-2.1-or-later" +LICENSE_URI="COPYING" + +BUILD_REQUIRES="libglib2.0-devel libreadline-devel tcl-devel" + PKG_NAMES=" ${PN} ${PN}4 @@ -48,6 +54,7 @@ liboop_rl0_CONTENTS=" liboop_rl_devel_CONTENTS=" usr/include/oop-rl.h usr/lib/${PN}-rl.* + usr/lib/pkgconfig/${PN}-rl.pc " liboop_tcl0_CONTENTS=" usr/bin/cygoop-tcl-0.dll @@ -55,6 +62,7 @@ liboop_tcl0_CONTENTS=" liboop_tcl_devel_CONTENTS=" usr/include/oop-tcl.h usr/lib/${PN}-tcl.* + usr/lib/pkgconfig/${PN}-tcl.pc " liboop_SUMMARY="${SUMMARY} (licensing & readmes)" liboop4_SUMMARY="${SUMMARY} (runtime)" diff --git a/liboop/liboop-1.0.1-1bl2.src.patch b/liboop/liboop-1.0.1-1bl2.src.patch new file mode 100644 index 000000000..a2c9953db --- /dev/null +++ b/liboop/liboop-1.0.1-1bl2.src.patch @@ -0,0 +1,163 @@ +--- origsrc/liboop-1.0.1/Makefile.am 2016-11-15 05:20:35.000000000 +0900 ++++ src/liboop-1.0.1/Makefile.am 2025-01-29 17:47:40.255068200 +0900 +@@ -11,41 +11,43 @@ lib_LTLIBRARIES = liboop.la @LIBOOP_LIBS + EXTRA_LTLIBRARIES = liboop-adns.la liboop-glib2.la liboop-glib.la liboop-tcl.la liboop-www.la liboop-rl.la + + pkgconfigdir = $(libdir)/pkgconfig +-pkgconfig_DATA = liboop.pc liboop-glib2.pc ++pkgconfig_DATA = liboop.pc @LIBOOP_DATA@ ++EXTRA_DATA = liboop-glib2.pc liboop-rl.pc liboop-tcl.pc + + # versions updated as of 1.0 +-liboop_la_LDFLAGS = -version-info 5:0:1 # version:revision:age ++liboop_la_LDFLAGS = -no-undefined -version-info 5:0:1 # version:revision:age + liboop_la_SOURCES = sys.c select.c signal.c alloc.c read.c read-fd.c read-mem.c + +-liboop_adns_la_LDFLAGS = -version-info 3:0:0 -rpath '$(libdir)' ++liboop_adns_la_LDFLAGS = -no-undefined -version-info 3:0:0 -rpath '$(libdir)' + liboop_adns_la_LIBADD = $(ADNS_LIBS) + liboop_adns_la_SOURCES = adns.c + +-liboop_glib_la_LDFLAGS = -version-info 1:0:1 -rpath '$(libdir)' ++liboop_glib_la_LDFLAGS = -no-undefined -version-info 1:0:1 -rpath '$(libdir)' + liboop_glib_la_LIBADD = $(GLIB_LIBS) + liboop_glib_la_CFLAGS = $(GLIB_INCLUDES) + liboop_glib_la_SOURCES = glib.c + +-liboop_glib2_la_LDFLAGS = -version-info 0:0:0 -rpath '$(libdir)' +-liboop_glib2_la_LIBADD = $(GLIB2_LIBS) ++liboop_glib2_la_LDFLAGS = -no-undefined -version-info 0:0:0 -rpath '$(libdir)' ++liboop_glib2_la_LIBADD = $(GLIB2_LIBS) liboop.la + liboop_glib2_la_CFLAGS = $(GLIB2_CFLAGS) + liboop_glib2_la_SOURCES = glib.c + +-liboop_tcl_la_LDFLAGS = -version-info 0:0:0 -rpath '$(libdir)' +-liboop_tcl_la_LIBADD = $(TCL_LIBS) ++liboop_tcl_la_LDFLAGS = -no-undefined -version-info 0:0:0 -rpath '$(libdir)' ++liboop_tcl_la_LIBADD = $(TCL_LIBS) liboop.la + liboop_tcl_la_CFLAGS = $(TCL_INCLUDES) + liboop_tcl_la_SOURCES = tcl.c + +-liboop_www_la_LDFLAGS = -version-info 0:0:0 -rpath '$(libdir)' ++liboop_www_la_LDFLAGS = -no-undefined -version-info 0:0:0 -rpath '$(libdir)' + liboop_www_la_LIBADD = $(WWW_LIBS) + liboop_www_la_CFLAGS = $(WWW_INCLUDES) + liboop_www_la_SOURCES = www.c + +-liboop_rl_la_LDFLAGS = -version-info 0:0:0 -rpath '$(libdir)' +-liboop_rl_la_LIBADD = $(READLINE_LIBS) ++liboop_rl_la_LDFLAGS = -no-undefined -version-info 0:0:0 -rpath '$(libdir)' ++liboop_rl_la_LIBADD = $(READLINE_LIBS) liboop.la + liboop_rl_la_SOURCES = readline.c + +-include_HEADERS = oop.h oop-adns.h oop-glib.h oop-tcl.h oop-www.h oop-rl.h oop-read.h ++include_HEADERS = oop.h oop-read.h @LIBOOP_HEADERS@ ++EXTRA_HEADERS = oop-adns.h oop-glib.h oop-tcl.h oop-www.h oop-rl.h + + noinst_PROGRAMS = test-oop + +--- origsrc/liboop-1.0.1/configure.ac 2016-11-15 05:20:35.000000000 +0900 ++++ src/liboop-1.0.1/configure.ac 2025-01-29 18:23:01.226139900 +0900 +@@ -31,6 +31,7 @@ AC_CHECK_HEADERS(poll.h sys/select.h sys + + if test xno != x$with_adns; then + AC_CHECK_LIB(adns,adns_init,[ ++ LIBOOP_HEADERS="oop-adns.h ${LIBOOP_HEADERS}" + LIBOOP_LIBS="liboop-adns.la $LIBOOP_LIBS" + ADNS_LIBS="-ladns" + AC_DEFINE(HAVE_ADNS) +@@ -40,7 +41,9 @@ fi + if test xno != x$with_readline; then + AC_CHECK_LIB(readline,rl_callback_handler_install,[ + AC_CHECK_HEADER(readline/readline.h,[ ++ LIBOOP_HEADERS="oop-rl.h ${LIBOOP_HEADERS}" + LIBOOP_LIBS="liboop-rl.la $LIBOOP_LIBS" ++ LIBOOP_DATA="liboop-rl.pc ${LIBOOP_DATA}" + READLINE_LIBS="-lreadline" + AC_DEFINE(HAVE_READLINE) + ])]) +@@ -57,6 +60,7 @@ if test xno != x$with_glib; then + CPPFLAGS="$save_cppflags $GLIB_INCLUDES" + AC_CHECK_FUNC(g_main_set_poll_func,[ + AC_CHECK_HEADER(glib.h,[ ++ LIBOOP_HEADERS="oop-glib.h ${LIBOOP_HEADERS}" + LIBOOP_LIBS="liboop-glib.la $LIBOOP_LIBS" + AC_DEFINE(HAVE_GLIB) + ])]) +@@ -65,17 +69,21 @@ if test xno != x$with_glib; then + CPPFLAGS="$save_cppflags" + + PKG_CHECK_MODULES(GLIB2,glib-2.0 >= 2.0,[ ++ LIBOOP_HEADERS="oop-glib.h ${LIBOOP_HEADERS}" + LIBOOP_LIBS="liboop-glib2.la $LIBOOP_LIBS" ++ LIBOOP_DATA="liboop-glib2.pc ${LIBOOP_DATA}" + AC_DEFINE(HAVE_GLIB) + ],[:]) + fi + + if test xno != x$with_tcl; then +- for version in 8.4 8.3 8.2 8.1 8.0 ; do ++ for version in 8.6 8.4 8.3 8.2 8.1 8.0 ; do + CPPFLAGS="$save_cppflags -I/usr/include/tcl$version" + AC_CHECK_LIB(tcl$version,Tcl_Main,[ + AC_CHECK_HEADER(tcl.h,[ ++ LIBOOP_HEADERS="oop-tcl.h ${LIBOOP_HEADERS}" + LIBOOP_LIBS="liboop-tcl.la $LIBOOP_LIBS" ++ LIBOOP_DATA="liboop-tcl.pc ${LIBOOP_DATA}" + AC_DEFINE(HAVE_TCL) + TCL_INCLUDES="-I/usr/include/tcl$version" + TCL_LIBS="-ltcl$version" +@@ -95,6 +103,7 @@ if test xyes = x$with_libwww; then + LIBS="$save_libs $WWW_LIBS" + CPPFLAGS="$save_cppflags $WWW_INCLUDES" + AC_CHECK_FUNC(HTEvent_setRegisterCallback,[ ++ LIBOOP_HEADERS="oop-www.h ${LIBOOP_HEADERS}" + LIBOOP_LIBS="liboop-www.la $LIBOOP_LIBS" + AC_DEFINE(HAVE_WWW) + ]) +@@ -110,7 +119,7 @@ if test -z "$no_wacky_libs" ; then + fi + + test yes = "$GCC" && +-CFLAGS="-Wall -Wno-comment -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Wwrite-strings $CFLAGS"' $(EXTRA_CFLAGS)' ++CFLAGS="-Wall -Wno-comment -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Wwrite-strings $CFLAGS" + + AC_SUBST(PROG_LDCONFIG) + AC_SUBST(GLIB_INCLUDES) +@@ -123,5 +132,7 @@ AC_SUBST(ADNS_LIBS) + AC_SUBST(WWW_INCLUDES) + AC_SUBST(WWW_LIBS) + AC_SUBST(READLINE_LIBS) ++AC_SUBST(LIBOOP_HEADERS) + AC_SUBST(LIBOOP_LIBS) +-AC_OUTPUT([Makefile liboop.pc liboop-glib2.pc]) ++AC_SUBST(LIBOOP_DATA) ++AC_OUTPUT([Makefile liboop.pc liboop-glib2.pc liboop-rl.pc liboop-tcl.pc]) +--- origsrc/liboop-1.0.1/liboop-rl.pc.in 1970-01-01 09:00:00.000000000 +0900 ++++ src/liboop-1.0.1/liboop-rl.pc.in 2025-01-29 17:13:45.684502200 +0900 +@@ -0,0 +1,11 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: liboop-rl ++Description: Event loop management library (readline support) ++Version: @VERSION@ ++Requires: liboop = @VERSION@ readline ++Libs: -L${libdir} -loop-rl ++Cflags: -I${includedir} +--- origsrc/liboop-1.0.1/liboop-tcl.pc.in 1970-01-01 09:00:00.000000000 +0900 ++++ src/liboop-1.0.1/liboop-tcl.pc.in 2025-01-29 17:15:04.571612500 +0900 +@@ -0,0 +1,11 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: liboop-tcl ++Description: Event loop management library (tcl support) ++Version: @VERSION@ ++Requires: liboop = @VERSION@ ++Libs: -L${libdir} -loop-tcl -ltcl ++Cflags: -I${includedir}