From nobody Wed Dec 20 03:28:23 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SvzY375bHz54fNx; Wed, 20 Dec 2023 03:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SvzY36bNDz3KSl; Wed, 20 Dec 2023 03:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703042903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IyiZD+0NnF7dy45D8LIzuPFvJTLBwOZy41aDgQdeiaA=; b=iXU10/pDtPS/BzbbP7bsbI3muwSoyRLVKqONtAZgVvUHWBG8mm17Rtm1Mt95pAWIIflITX Zf9lmMX2v79cEi8jiEv+624KlzgTPqpJHE/1/sHvqXpH7YBL8+oh7Q9JEPUtj9P2SXeCAj bnKd67q2xk8sgAzFJjXec+5SR15S/9+QUWw3PIb4O5vB5FwdVXVjx1HHe3v/N29hJf8Iw9 RDpiHNvrfcXOtsiOnmyXr0zpERKcOZRUhRv10h4trk1CjBDcKA/2qSIvtf5UZTgSR/5Lei mEwhX61S14y0JjgBWJn8+uKsrbuc0kWtpGDgWN/lXIi4/Tm9G18EmyQCmlgtQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703042903; a=rsa-sha256; cv=none; b=Vx+kqr4KGkwccb1N2pMw22F5DGy6Q0f3Vy8kTjLB4Mlv0m2xlci3SpIcvehY9h5lr2yQSi o+R8n+YLjeurXJCIqBNTwIvCA2kl3b4gimpo/MCP6edKDrhG8Yf6r5IKj5OPoYOdZYWgW0 1MQfbbLPxIp3EjT31opG744v4Ml0ryCL9jOKfh+B/Vrro78PfrigVZwMIIsO6XXIJcUCe/ aNA5rdARGkeylewbd20qIk4pgWSOXHRfoMoqJY38QsZ5eqAV80Y39fsumZG5MX4SNEHq8o IfAJXRjp14G72RGt9ebBd3zLVKYRAFX328lvvfsoDQkMnhLDNY1+bhTiDd20AQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703042903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IyiZD+0NnF7dy45D8LIzuPFvJTLBwOZy41aDgQdeiaA=; b=HxebBwlJxB1lyqxXSXuMVSEko7OMh+wQKwTsn3poWHF1ssxzcJhhJcOORjCw2TZiBcJb7l gES6/vx775wwuejLXfLDqDcXP7IOc7XKQM0D7UYWCYLEVzXMcCCd4pDpQAErFwHpthV5FM g3fe6/Bwd7T10YAhHDOGHxrHCRVoKrzNpWTDrhgGd4D+43LRhcjK8fvoy0OGA6EoinMIwf XSxKa/kCK0XQ0j/PuR7dbfrsww6XZ1brSiegHMd2DHw5yUURWpXX7ZHh5L6LaisF5HZZrq /njWrjXI5Pip37VEPUmLOBfCZ/uuny8JtKorhJGW2bIkeZJaPTSwea+3nfS2Sw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SvzY35VM5zY0s; Wed, 20 Dec 2023 03:28:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BK3SNEX020613; Wed, 20 Dec 2023 03:28:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BK3SNDS020610; Wed, 20 Dec 2023 03:28:23 GMT (envelope-from git) Date: Wed, 20 Dec 2023 03:28:23 GMT Message-Id: <202312200328.3BK3SNDS020610@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Don Lewis Subject: git: 21c8a01919ce - main - editors/openoffice-*: Unbreak build on 15.0-CURRENT List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: truckman X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 21c8a01919cea50496e508893978c82ffd8aa547 Auto-Submitted: auto-generated The branch main has been updated by truckman: URL: https://cgit.FreeBSD.org/ports/commit/?id=21c8a01919cea50496e508893978c82ffd8aa547 commit 21c8a01919cea50496e508893978c82ffd8aa547 Author: Don Lewis AuthorDate: 2023-12-19 01:18:26 +0000 Commit: Don Lewis CommitDate: 2023-12-20 03:28:09 +0000 editors/openoffice-*: Unbreak build on 15.0-CURRENT Revert "editors/openoffice-*: Unbreak build on 15.0-CURRENT" Undo the switch to llvm from ports. This reverts commit f25b169ac89578f18a6e480d4d84284bb8085316. Instead, pass --undefined-version to the linker to avoid the build breakage on -CURRENT by the change to the default value for this switch. Tidy up LIB_DEPENDS. --- editors/openoffice-4/Makefile | 14 +++----------- .../files/patch-solenv_gbuild_platform_freebsd.mk | 12 ++++++++++-- editors/openoffice-4/files/patch-solenv_inc_unxfbsd.mk | 11 +++++++++++ editors/openoffice-devel/Makefile | 14 +++----------- .../files/patch-solenv_gbuild_platform_freebsd.mk | 10 ++++++++++ editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk | 11 +++++++++++ 6 files changed, 48 insertions(+), 24 deletions(-) diff --git a/editors/openoffice-4/Makefile b/editors/openoffice-4/Makefile index 05a8bc8e9eca..5a099e0528fb 100644 --- a/editors/openoffice-4/Makefile +++ b/editors/openoffice-4/Makefile @@ -1,6 +1,6 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= editors java MASTER_SITES= https://dlcdn.apache.org/openoffice/${PORTVERSION}/source/ \ https://archive.apache.org/dist/openoffice/${PORTVERSION}/source/ \ @@ -75,7 +75,7 @@ LIB_DEPENDS= \ libnspr4.so:devel/nspr \ libcurl.so:ftp/curl \ libcairo.so:graphics/cairo \ - libpng.so:graphics/png \ + libpng16.so:graphics/png \ libgraphite.so:graphics/silgraphite \ libblas.so:math/blas \ libCbcSolver.so:math/cbc \ @@ -114,7 +114,7 @@ USES= autoreconf bison compiler:c++11-lib cpe desktop-file-utils \ gettext-runtime gl gmake gnome iconv jpeg perl5 pkgconfig \ shared-mime-info ssl tar:bzip2 xorg USE_GL= gl glu -USE_GNOME= gdkpixbuf2 gdkpixbuf2xlib gtk20 libxslt libidl glib20 +USE_GNOME= gdkpixbuf2 gdkpixbuf2xlib gtk20 libxslt glib20 USE_JAVA= yes JAVA_BUILD= jdk JAVA_RUN= jdk @@ -198,14 +198,6 @@ TARGET_ORDER_OVERRIDE= 710:gnome-post-icons WITH= SDK .endif -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1500005 -# linker error when compiling with llvm 17.0.6 on CURRENT -USES+= llvm:max=16 -CHOSEN_COMPILER_TYPE= clang -.endif - .include .if ${OPSYS} == FreeBSD && ( \ diff --git a/editors/openoffice-4/files/patch-solenv_gbuild_platform_freebsd.mk b/editors/openoffice-4/files/patch-solenv_gbuild_platform_freebsd.mk index 396141a03282..e2b27df8e9cf 100644 --- a/editors/openoffice-4/files/patch-solenv_gbuild_platform_freebsd.mk +++ b/editors/openoffice-4/files/patch-solenv_gbuild_platform_freebsd.mk @@ -1,6 +1,14 @@ --- solenv/gbuild/platform/freebsd.mk.orig 2021-04-02 12:58:22 UTC +++ solenv/gbuild/platform/freebsd.mk -@@ -188,13 +188,13 @@ $(call gb_Helper_abbreviate_dirs,\ +@@ -137,6 +137,7 @@ gb_LinkTarget_LDFLAGS += \ + -Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \ + -Wl,-z,combreloc \ + -Wl,-z,defs \ ++ -Wl,--undefined-version \ + $(subst -L../lib , ,$(SOLARLIB)) \ + ${FBSD_GCC_RPATH} \ + \ +@@ -188,13 +189,13 @@ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ mkdir -p $(dir $(call gb_CObject_get_dep_target,$(2))) && \ $(gb_CC) \ @@ -16,7 +24,7 @@ endef # convert parametters filesystem root to native notation -@@ -212,13 +212,13 @@ $(call gb_Helper_abbreviate_dirs,\ +@@ -212,13 +213,13 @@ $(call gb_Helper_abbreviate_dirs,\ mkdir -p $(dir $(1)) && \ mkdir -p $(dir $(call gb_CxxObject_get_dep_target,$(2))) && \ $(gb_CXX) \ diff --git a/editors/openoffice-4/files/patch-solenv_inc_unxfbsd.mk b/editors/openoffice-4/files/patch-solenv_inc_unxfbsd.mk new file mode 100644 index 000000000000..b12b8cc106bb --- /dev/null +++ b/editors/openoffice-4/files/patch-solenv_inc_unxfbsd.mk @@ -0,0 +1,11 @@ +--- solenv/inc/unxfbsd.mk.orig 2021-04-02 12:58:22 UTC ++++ solenv/inc/unxfbsd.mk +@@ -176,7 +176,7 @@ LINKFLAGSRUNPATH_NONE= + LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\' + #LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\' + LINKFLAGSRUNPATH_NONE= +-LINKFLAGS=-Wl,-z,combreloc $(LDFLAGS) $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE) ++LINKFLAGS=-Wl,-z,combreloc -Wl,--undefined-version $(LDFLAGS) $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE) + + # linker flags for linking applications + LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \ diff --git a/editors/openoffice-devel/Makefile b/editors/openoffice-devel/Makefile index c6b574bf6cd2..e10dc1a601b8 100644 --- a/editors/openoffice-devel/Makefile +++ b/editors/openoffice-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION1}.${AOOVERSION2}.${TIMESTAMP} -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 4 CATEGORIES= editors java MASTER_SITES= https://dist.apache.org/repos/dist/dev/openoffice/${AOOVERSION}-${AOORC}-${TIMESTAMP}/source/ \ @@ -78,7 +78,7 @@ LIB_DEPENDS= \ libnspr4.so:devel/nspr \ libcurl.so:ftp/curl \ libcairo.so:graphics/cairo \ - libpng.so:graphics/png \ + libpng16.so:graphics/png \ libgraphite.so:graphics/silgraphite \ libblas.so:math/blas \ libCbcSolver.so:math/cbc \ @@ -117,7 +117,7 @@ USES= autoreconf bison compiler:c++11-lib cpe desktop-file-utils \ gettext-runtime gl gmake gnome iconv jpeg perl5 pkgconfig \ python:3.9 shared-mime-info ssl tar:${TARTYPE} xorg USE_GL= gl glu -USE_GNOME= gdkpixbuf2 gdkpixbuf2xlib gtk20 libxslt libidl glib20 +USE_GNOME= gdkpixbuf2 gdkpixbuf2xlib gtk20 libxslt glib20 USE_JAVA= yes JAVA_BUILD= jdk JAVA_RUN= jdk @@ -230,14 +230,6 @@ TARGET_ORDER_OVERRIDE= 710:gnome-post-icons WITH= SDK .endif -.include - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1500005 -# linker error when compiling with llvm 17.0.6 on CURRENT -USES+= llvm:max=16 -CHOSEN_COMPILER_TYPE= clang -.endif - .include .if ${OPSYS} == FreeBSD && ( \ diff --git a/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk b/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk new file mode 100644 index 000000000000..181e832bbfc3 --- /dev/null +++ b/editors/openoffice-devel/files/patch-solenv_gbuild_platform_freebsd.mk @@ -0,0 +1,10 @@ +--- solenv/gbuild/platform/freebsd.mk.orig 2019-09-17 22:55:21 UTC ++++ solenv/gbuild/platform/freebsd.mk +@@ -125,6 +125,7 @@ gb_LinkTarget_LDFLAGS += \ + -Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \ + -Wl,-z,combreloc \ + -Wl,-z,defs \ ++ -Wl,--undefined-version \ + $(subst -L../lib , ,$(SOLARLIB)) \ + ${FBSD_GCC_RPATH} \ + \ diff --git a/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk b/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk new file mode 100644 index 000000000000..5ef223b384a3 --- /dev/null +++ b/editors/openoffice-devel/files/patch-solenv_inc_unxfbsd.mk @@ -0,0 +1,11 @@ +--- solenv/inc/unxfbsd.mk.orig 2019-09-17 22:55:21 UTC ++++ solenv/inc/unxfbsd.mk +@@ -173,7 +173,7 @@ LINKFLAGSRUNPATH_NONE= + LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN'\' + #LINKFLAGSRUNPATH_BOXT=-Wl,-z,origin -Wl,-rpath,\''$$ORIGIN/../../../basis-link/program'\' + LINKFLAGSRUNPATH_NONE= +-LINKFLAGS=-Wl,-z,combreloc $(LDFLAGS) $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE) ++LINKFLAGS=-Wl,-z,combreloc -Wl,--undefined-version $(LDFLAGS) $(LINKFLAGSDEFS) $(LINKFLAGS_SYSBASE) + + # linker flags for linking applications + LINKFLAGSAPPGUI= -Wl,-export-dynamic -Wl,--noinhibit-exec \