From 6c2599affa164663c81cb76a9c8d1933dcb2c344 Mon Sep 17 00:00:00 2001 From: Andreas Wacknitz <A.Wacknitz@gmx.de> Date: Sun, 26 Nov 2023 18:13:03 +0100 Subject: [PATCH] gtk+3: drop 32 bit --- components/library/gtk+3/Makefile | 44 ++++++++++++++++++-------------------------- 1 files changed, 18 insertions(+), 26 deletions(-) diff --git a/components/library/gtk+3/Makefile b/components/library/gtk+3/Makefile index 450e6ad..aa76fee 100644 --- a/components/library/gtk+3/Makefile +++ b/components/library/gtk+3/Makefile @@ -15,14 +15,14 @@ # Copyright 2020 Marco van Wieringen # -BUILD_BITS= 32_and_64 -USE_COMMON_TEST_MASTER= no +BUILD_BITS= 64 +USE_DEFAULT_TEST_TRANSFORMS= yes include ../../../make-rules/shared-macros.mk COMPONENT_NAME= gtk+ COMPONENT_MJR_VERSION= 3.24 COMPONENT_VERSION= $(COMPONENT_MJR_VERSION).34 -COMPONENT_REVISION= 2 +COMPONENT_REVISION= 3 COMPONENT_SUMMARY= GTK+ - GIMP Toolkit Library for creation of graphical user interfaces COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz @@ -36,34 +36,29 @@ include $(WS_MAKE_RULES)/common.mk -PATH=$(PATH.gnu) +PATH= $(PATH.gnu) CFLAGS += -I/usr/X11/include -# fixes possible textiter test failure -gcc_OPT = -O2 -LD_Z_IGNORE= +COMPONENT_PREP_ACTION= ( \ + cd $(@D) && \ + libtoolize --force && \ + aclocal -I ./m4 && \ + gtkdocize && \ + autoheader && \ + automake -a -f -c --gnu && \ + autoconf ) -# Uses isinf, etc. only available in c99 and newer -CFLAGS.gcc += -std=gnu11 - -COMPONENT_PREP_ACTION = (cd $(@D) && \ - libtoolize --force && \ - aclocal -I ./m4 && \ - gtkdocize && \ - autoheader && \ - automake -a -f -c --gnu && \ - autoconf ) - -COMPONENT_PRE_CONFIGURE_ACTION = ( $(CLONEY) $(SOURCE_DIR) $(@D) ) +COMPONENT_PRE_CONFIGURE_ACTION= ( $(CLONEY) $(SOURCE_DIR) $(@D) ) CONFIGURE_SCRIPT = $(@D)/configure -CONFIGURE_OPTIONS.32 = --sysconfdir=/etc -CONFIGURE_OPTIONS.64 = --sysconfdir=/etc/$(MACH64) +CONFIGURE_OPTIONS += --sysconfdir=/etc +# When we had both, 32 and 64 bit we needed to distinguish between the configuration files. +#CONFIGURE_OPTIONS.64 = --sysconfdir=/etc/$(MACH64) CONFIGURE_OPTIONS += --enable-explicit-deps=yes CONFIGURE_OPTIONS += --enable-cloudprint -CONFIGURE_OPTIONS.64 += --enable-introspection +CONFIGURE_OPTIONS += --enable-introspection CONFIGURE_OPTIONS += --enable-man CONFIGURE_OPTIONS += --disable-glibtest CONFIGURE_OPTIONS += --disable-papi @@ -79,13 +74,10 @@ COMPONENT_BUILD_ENV += CFLAGS="$(CFLAGS)" COMPONENT_BUILD_ENV += CC="$(CC)" -# for tests to pass unexport SHELLOPTS -COMPONENT_TEST_TRANSFORMER = grep -COMPONENT_TEST_TRANSFORMS = '"^ /"' # Test dependencies -REQUIRED_PACKAGES += gnome/theme/hicolor-icon-theme +TEST_REQUIRED_PACKAGES += gnome/theme/hicolor-icon-theme # Build dependencies REQUIRED_PACKAGES += developer/documentation-tool/gtk-doc -- Gitblit v1.9.3