Thanks, applied as ee3096188d0e077c388915de98b3bef3a902271f. Michael
[sent from post-receive hook] On Mon, 16 Sep 2024 16:34:08 +0200, Lucas Sinn <[email protected]> wrote: > Updates. > https://github.com/libsigcplusplus/libsigcplusplus/releases/tag/3.6.0 > > Signed-off-by: Lucas Sinn <[email protected]> > > Revert "libsigcpp: move to staging" > > This reverts commit 25c7db3557a9bc886c05ca66d4648e6a3d46fbdf. > > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git a/rules/host-libsigcpp.in b/rules/host-libsigcpp.in > index 0e149f78780e..f0f379da047c 100644 > --- a/rules/host-libsigcpp.in > +++ b/rules/host-libsigcpp.in > @@ -1,6 +1,4 @@ > -## SECTION=staging > -## old section: > -### SECTION=hosttools_noprompt > +## SECTION=hosttools_noprompt > > config HOST_LIBSIGCPP > tristate > diff --git a/rules/libsigcpp.in b/rules/libsigcpp.in > index 86327be7c2bd..86c402747204 100644 > --- a/rules/libsigcpp.in > +++ b/rules/libsigcpp.in > @@ -1,10 +1,8 @@ > -## SECTION=staging > -## old section: > -### SECTION=system_libraries > - > +## SECTION=system_libraries > config LIBSIGCPP > tristate > prompt "libsigc++" > + select HOST_MESON > select LIBC_M > select GCCLIBS_CXX > select GCCLIBS_GCC_S > @@ -18,7 +16,3 @@ config LIBSIGCPP > and has an ease of use unmatched by other C++ callback libraries. > Libsigc++ is licensed under the GNU Library General Public License, > LGPL. > - > - STAGING: remove in PTXdist 2025.07.0 > - Unmaintained in ptxdist and fails to build with gcc 14. Needs updating > - to a new version. > diff --git a/rules/libsigcpp.make b/rules/libsigcpp.make > index db02f33d8d0e..fc26d68decd6 100644 > --- a/rules/libsigcpp.make > +++ b/rules/libsigcpp.make > @@ -15,10 +15,10 @@ PACKAGES-$(PTXCONF_LIBSIGCPP) += libsigcpp > # > # Paths and names > # > -LIBSIGCPP_VERSION := 2.2.10 > -LIBSIGCPP_MD5 := 6d350ae0bc17b8915a06ce6b7e4240e8 > +LIBSIGCPP_VERSION := 3.6.0 > +LIBSIGCPP_MD5 := b7205d5465ac15fbc0c781d39b4011be > LIBSIGCPP := libsigc++-$(LIBSIGCPP_VERSION) > -LIBSIGCPP_SUFFIX := tar.bz2 > +LIBSIGCPP_SUFFIX := tar.xz > LIBSIGCPP_URL := $(call ptx/mirror, GNOME, > libsigc++/$(basename $(LIBSIGCPP_VERSION))/$(LIBSIGCPP).$(LIBSIGCPP_SUFFIX)) > LIBSIGCPP_SOURCE := $(SRCDIR)/$(LIBSIGCPP).$(LIBSIGCPP_SUFFIX) > LIBSIGCPP_DIR := $(BUILDDIR)/$(LIBSIGCPP) > @@ -28,12 +28,21 @@ LIBSIGCPP_DIR := $(BUILDDIR)/$(LIBSIGCPP) > # > ---------------------------------------------------------------------------- > > # > -# autoconf > +# meson > # > -LIBSIGCPP_CONF_TOOL := autoconf > +LIBSIGCPP_CONF_TOOL := meson > LIBSIGCPP_CONF_OPT := \ > - $(CROSS_AUTOCONF_USR) \ > - --disable-documentation > + $(CROSS_MESON_USR) \ > + -Dbenchmark=false \ > + -Dbuild-deprecated-api=false \ > + -Dbuild-documentation=false \ > + -Dbuild-examples=false \ > + -Dbuild-pdf=false \ > + -Dbuild-tests=false \ > + -Ddist-warnings=fatal \ > + -Dmaintainer-mode=false \ > + -Dvalidation=false \ > + -Dwarnings=min > > # > ---------------------------------------------------------------------------- > # Target-Install > @@ -48,7 +57,7 @@ $(STATEDIR)/libsigcpp.targetinstall: > @$(call install_fixup, libsigcpp,AUTHOR,"Robert Schwebel > <[email protected]>") > @$(call install_fixup, libsigcpp,DESCRIPTION,missing) > > - @$(call install_lib, libsigcpp, 0, 0, 0644, libsigc-2.0) > + @$(call install_lib, libsigcpp, 0, 0, 0644, libsigc-3.0) > > @$(call install_finish, libsigcpp) >
