diff options
Diffstat (limited to 'app-misc/boxes')
| -rw-r--r-- | app-misc/boxes/Manifest | 6 | ||||
| -rw-r--r-- | app-misc/boxes/boxes-2.3.0.ebuild (renamed from app-misc/boxes/boxes-2.2.0.ebuild) | 13 | ||||
| -rw-r--r-- | app-misc/boxes/files/boxes-2.2.0-fix-clang16-build.patch | 15 | ||||
| -rw-r--r-- | app-misc/boxes/files/boxes-2.3.0-ncurses-gentoo.patch | 15 |
4 files changed, 26 insertions, 23 deletions
diff --git a/app-misc/boxes/Manifest b/app-misc/boxes/Manifest index f8d30757d346..537a3fc269c1 100644 --- a/app-misc/boxes/Manifest +++ b/app-misc/boxes/Manifest @@ -1,6 +1,6 @@ -AUX boxes-2.2.0-fix-clang16-build.patch 309 BLAKE2B cde9c190dfbb57b94a48a8d68d459ccb6521fa2eacd5103e624acc1974346e3ecd3d8ec91431309a7e09d1e421babdac3307f05a9ac081fcffb84d2ff8b184c0 SHA512 84c0f84e3c07094f0e27b1d89a8094d43712c12d6b9bd79586d73440ae92f330eada9bf4d4438bfd7eaa8109f4197d0c8fbb7078f7678a2b5c97d2b87879923f -DIST boxes-2.2.0.tar.gz 230099 BLAKE2B 4adb8ddde85cb31f32e98916d5ea2a57afcaa0470f796ba296cb3b80780f158a24b2bc5e9ba923b6a3b35b8f7781cd6ddacd89abadf6f2c07549be7ffe1458f4 SHA512 534d441c34316572d0c7e89f343a3bc5bb5a8466e4d4ed703fb2d14b714f5a6b224f7b0d408525d492da4610f9c5ffd8508e16d98a0781897567fb4aeb316f39 +AUX boxes-2.3.0-ncurses-gentoo.patch 644 BLAKE2B 8a01d5948379a268a3bb91076f35ebdc524aba16245b11bf04af0e18748c97ed7f29579ca85b5bf2c1b24cbfbef04ae1adff9a6fa2a619bd744f5883c47b8bfe SHA512 18c647b91ca5e2c0bcf1243eb3d78841d85c0275cbb766672c98b6198ec547714ef6166b58ace878bd52b40cd758dae3932bd2c605efb9156cf7f51d4d5557c8 DIST boxes-2.2.1.tar.gz 230900 BLAKE2B 65ab0c8ad52d2764279397135b072bfa6f4bf86e465cc3a4778d30c5b19ce2c0d7c5f8636173529eca92754ee16d38b46a83b067b94315b1ea82448e4b1ac0a8 SHA512 0afa115d5ec01944878ef4d8f33e2887d123b172a0589eda53a04ba671916d9ef1d8299f9df9aeac8989807f86ca1b96b1c34aed03856643a89a07586b82e3b6 -EBUILD boxes-2.2.0.ebuild 1015 BLAKE2B eedfd20bc8967a00fc4d059e7f684795e24c3e574bf4ba9ea08b271df3fb3ed754bb3a416296e28b22060af02cd8504ae9c58307832d13bb05d4f672491cefb4 SHA512 286c7edc1f006a24ebb987018bb5772daa640a6e630020b89ac10ffb1710ad368295a4b6dff182a0fed8e7ebd9df90b91e9355c90d63dcfa8e39bfeb16305267 +DIST boxes-2.3.0.tar.gz 272302 BLAKE2B 282b41aee214f54aa3c8b237bc9f2e48e4144eebd6619880a38c7a71d9bf7bb434a250f29a05f20746530e8458bb0d062cd7e5bea88ebdf64030f090b1a8674a SHA512 d7580462ed5cf8a3299f528d7e4abea1c9733da2823c204bff69a804c72b768c4d3e8505b4d8881aae066f1fd95133cf9dc52e960333a82d8c529f85eb096fb4 EBUILD boxes-2.2.1.ebuild 969 BLAKE2B 959469b5b406ab0b4a1b90e3f51702ce911309702425e6c2f1632e4054f437e23ff05f0e9f84ea13366a5d504ecdb079745083f6752270d70a867708966e850f SHA512 90ce6956a126bf01c068c905fe4fa2fa4c40573b7bdb2d6a21c9ce655a7b60908ed4c1e35f2c36aacd7a011fca701d7dc77c398f0530549820449869d8426873 +EBUILD boxes-2.3.0.ebuild 1052 BLAKE2B 077deb95e72d3cc4f69dcfb3138624e84260c89a5f895ce18f0325e5fe8dd93b6d34945ac898a6b20dc84402d7b9246275becb4774672ca9750992ebeda5139a SHA512 91c4641a619f19c1cecd93c08dbd55af27343da410af79a522c86e40004d5fea499dfe8c21d2e0f1683b2c5b63adfca5f9053b1788d8436e56cbef5176623d5f MISC metadata.xml 900 BLAKE2B ed21e2f334f908418be9025531cb81b38eb20c29a2d6824db34b60bc9cab117cf7390c223942b0a97b00a94cbf0a3d56d5991599bdc6ee2ae779cafd2ee9f423 SHA512 ff396d6d3de85f836cd7af967d783ce51ce17f4a542e5a800aec5929f0de1a27eb823014f1452045183eb437c960347c1c120ce38b60bead7f9a38eaef24e261 diff --git a/app-misc/boxes/boxes-2.2.0.ebuild b/app-misc/boxes/boxes-2.3.0.ebuild index ec80aa0a7e8e..5315f2592d7e 100644 --- a/app-misc/boxes/boxes-2.2.0.ebuild +++ b/app-misc/boxes/boxes-2.3.0.ebuild @@ -7,26 +7,29 @@ inherit toolchain-funcs DESCRIPTION="Draw any kind of boxes around your text" HOMEPAGE="https://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes" -SRC_URI="https://github.com/ascii-boxes/boxes/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI="https://github.com/ascii-boxes/boxes/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86" +KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="test" RESTRICT="!test? ( test )" RDEPEND=" - dev-libs/libpcre2[pcre32] + dev-libs/libpcre2:=[pcre32] dev-libs/libunistring:= + sys-libs/ncurses:= +" +DEPEND=" + ${RDEPEND} " -DEPEND="${RDEPEND}" BDEPEND=" app-alternatives/yacc app-alternatives/lex test? ( app-editors/vim-core ) " -PATCHES=( "${FILESDIR}/${P}-fix-clang16-build.patch" ) +PATCHES=( "${FILESDIR}/${P}-ncurses-gentoo.patch" ) src_prepare() { default diff --git a/app-misc/boxes/files/boxes-2.2.0-fix-clang16-build.patch b/app-misc/boxes/files/boxes-2.2.0-fix-clang16-build.patch deleted file mode 100644 index 38be8e1ede81..000000000000 --- a/app-misc/boxes/files/boxes-2.2.0-fix-clang16-build.patch +++ /dev/null @@ -1,15 +0,0 @@ -change function prototype to work with c2x standard. Build fails with clang16 without this - -See: https://github.com/ascii-boxes/boxes/issues/106 - ---- a/src/remove.h -+++ b/src/remove.h -@@ -22,7 +22,7 @@ - - - int remove_box(); --void output_input(); -+void output_input(const int trim_only); - - - #endif /*REMOVE_H*/ diff --git a/app-misc/boxes/files/boxes-2.3.0-ncurses-gentoo.patch b/app-misc/boxes/files/boxes-2.3.0-ncurses-gentoo.patch new file mode 100644 index 000000000000..38e7117592e4 --- /dev/null +++ b/app-misc/boxes/files/boxes-2.3.0-ncurses-gentoo.patch @@ -0,0 +1,15 @@ +Gentoo splits ncurses into several independent libraries. Therefore this needs to be linked with more than just -lncurses. + +Pascal Jäger <pascal.jaeger@leimstift.de> (2024-02-19) + +--- a/src/Makefile ++++ b/src/Makefile +@@ -64,7 +64,7 @@ debug: flags_$(BOXES_PLATFORM) | $(OUT_DIR) + CFLAGS_ADDTL="-ggdb3 $(CFLAGS_ADDTL)" flags_$(BOXES_PLATFORM) $(BOXES_EXECUTABLE_NAME) + + boxes: $(ALL_OBJ) | check_dir +- $(CC) $(LDFLAGS) $^ -o $@ -lunistring -lpcre2-32 -lncurses ++ $(CC) $(LDFLAGS) $^ -o $@ -lunistring -lpcre2-32 $(shell pkg-config --libs ncurses) + if [ "$(STRIP)" = "true" ] ; then strip $@ ; fi + + boxes.static: $(ALL_OBJ) | check_dir |