From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 63528158004 for ; Sat, 13 Jul 2024 04:59:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 906DBE2A47; Sat, 13 Jul 2024 04:59:08 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6FC0BE2A47 for ; Sat, 13 Jul 2024 04:59:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 950A2335D6B for ; Sat, 13 Jul 2024 04:59:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2C3131869 for ; Sat, 13 Jul 2024 04:59:06 +0000 (UTC) From: "Vladislav Dudar" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Vladislav Dudar" Message-ID: <1720846698.2eb11ded3aee48c5c9e5a669d86d63d29c647d4a.seal331gentoo@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: x11-terms/dmd5620/, x11-terms/dmd5620/files/ X-VCS-Repository: repo/proj/guru X-VCS-Files: x11-terms/dmd5620/Manifest x11-terms/dmd5620/dmd5620-2.1.0.ebuild x11-terms/dmd5620/files/dmd5620-2.1.0-consolidated.patch X-VCS-Directories: x11-terms/dmd5620/ x11-terms/dmd5620/files/ X-VCS-Committer: seal331gentoo X-VCS-Committer-Name: Vladislav Dudar X-VCS-Revision: 2eb11ded3aee48c5c9e5a669d86d63d29c647d4a X-VCS-Branch: dev Date: Sat, 13 Jul 2024 04:59:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 50e342fe-d8e6-4649-b0dc-9081a93f89eb X-Archives-Hash: 2845225fd27c1db5fc21a08b6effec05 commit: 2eb11ded3aee48c5c9e5a669d86d63d29c647d4a Author: Vladislav Dudar gmail com> AuthorDate: Sat Jul 13 04:58:18 2024 +0000 Commit: Vladislav Dudar gmail com> CommitDate: Sat Jul 13 04:58:18 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2eb11ded x11-terms/dmd5620: add 2.1.0 Signed-off-by: Vladislav Dudar gmail.com> x11-terms/dmd5620/Manifest | 1 + x11-terms/dmd5620/dmd5620-2.1.0.ebuild | 59 ++++++++++++++++++++ .../dmd5620/files/dmd5620-2.1.0-consolidated.patch | 64 ++++++++++++++++++++++ 3 files changed, 124 insertions(+) diff --git a/x11-terms/dmd5620/Manifest b/x11-terms/dmd5620/Manifest index d64b87be8..9d26e6ccc 100644 --- a/x11-terms/dmd5620/Manifest +++ b/x11-terms/dmd5620/Manifest @@ -1 +1,2 @@ DIST dmd5620-1.2.0.tar.gz 2560536 BLAKE2B e7ccd740cd727c5a21ddef19671e08675eaf66228b4917a56b47923bf3c2c0a23373391db59f83fb30529a616db2df0107732e5106600838a6ba68fb546855a3 SHA512 674c990d08a56458b35cba76d2733ff0b75bed83589f20166ca017af37616072caf11d7b9c8b621945affbc42edfc758bc1e13fa2d0ccf1fbc76a43f6ece9298 +DIST dmd5620-2.1.0.tar.gz 14415 BLAKE2B 43b9cd0fe1167ffa365aca7e7503bc78bb4d3d3d279d06ddaad68c4fc3d963b30924a86b684288d970101c0b7254f239ad401b2dc727df097a6ebbaa33d6cf98 SHA512 8d444d2f4579855d9e6cb3f0b5bd63b0735ef8fc1b6dfd41a69283009f097492800697af22d5c81b04f8e488fd12c4bda8e77f6410b5ffab84da2f64acf51444 diff --git a/x11-terms/dmd5620/dmd5620-2.1.0.ebuild b/x11-terms/dmd5620/dmd5620-2.1.0.ebuild new file mode 100644 index 000000000..b49269679 --- /dev/null +++ b/x11-terms/dmd5620/dmd5620-2.1.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs xdg-utils + +DESCRIPTION="GTK+ 3.0 implementation of an AT&T / Teletype DMD 5620 emulator." +HOMEPAGE="https://github.com/sethm/dmd_gtk" +SRC_URI="https://github.com/sethm/dmd_gtk/archive/v${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/dmd_gtk-${PV}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64" + +RESTRICT="test mirror" + +RDEPEND=" + >=dev-libs/dmd_core-0.7.1 + x11-libs/gtk+:3 + x11-libs/gdk-pixbuf + x11-libs/cairo + dev-libs/glib:2 +" +DEPEND="${RDEPEND}" + +BDEPEND=" + ${RDEPEND} + virtual/pkgconfig +" + +src_prepare() { + # remove leftover of bundled library which is not properly packaged in github releases anyways + rmdir "${S}"/dmd_core + # apply patches + eapply "${FILESDIR}/${PN}-2.1.0-consolidated.patch" + eapply_user + # use system pkgconfig + sed -i -e "s:pkgconfig:$(tc-getPKG_CONFIG):" "${S}"/Makefile || die "sed failed" +} + +src_compile() { + emake CC="$(tc-getCC)" LD="$(tc-getLD)" +} + +src_install() { + emake PREFIX=/usr DESTDIR="${D}" install + dodoc "${S}/LICENSE.md" + dodoc "${S}/README.md" +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/x11-terms/dmd5620/files/dmd5620-2.1.0-consolidated.patch b/x11-terms/dmd5620/files/dmd5620-2.1.0-consolidated.patch new file mode 100644 index 000000000..92be1b4e7 --- /dev/null +++ b/x11-terms/dmd5620/files/dmd5620-2.1.0-consolidated.patch @@ -0,0 +1,64 @@ +--- dmd_gtk-2.1.0.orig/Makefile 2024-07-13 00:17:40.231937343 +0300 ++++ dmd_gtk-2.1.0/Makefile 2024-07-13 00:32:41.311218471 +0300 +@@ -3,27 +3,22 @@ + CC = gcc + GIT = git + CARGO = cargo +-CFLAGS = $(shell pkg-config --cflags gtk+-3.0) -Wall -std=gnu99 ++CFLAGS = $(shell printenv CFLAGS) ++CFLAGS += $(shell pkg-config --cflags gtk+-3.0) -Wall -std=gnu99 + GTKLIBS = $(shell pkg-config --libs gtk+-3.0) + EXE = dmd5620 + CSRC = $(wildcard src/*.c) + OBJ = $(CSRC:.c=.o) +-LDFLAGS = $(GTKLIBS) -lm -lpthread -lc -ldl -lutil +-CORELIB = $(LIBDIR)/target/release/libdmd_core.a ++LDFLAGS = $(shell printenv LDFLAGS) ++LDFLAGS += $(GTKLIBS) -lm -lpthread -lc -ldl ++CORELIB = $(shell pkg-config --libs dmd_core) + + ifeq ($(PREFIX),) + PREFIX := /usr/local + endif + + ifdef DEBUG +- CFLAGS+ = -g -O0 +-else +- UNAME_S := $(shell uname -s) +- ifeq ($(UNAME_S),Darwin) +- CFLAGS += -O3 -Os +- else +- CFLAGS += -O3 -Os -s +- endif ++ CFLAGS += -g + endif + + .PHONY: all clean +@@ -34,18 +29,14 @@ + @rm -f $(EXE) $(OBJ) + @cd $(LIBDIR) && $(CARGO) clean + +-$(CORELIB): +- $(if $(wildcard ./dmd_core/Cargo.toml),,$(error The submodule dmd_core is not checked out.)) +- @cd $(LIBDIR) && $(CARGO) build --release +- +-$(EXE): $(CORELIB) $(OBJ) ++$(EXE): $(OBJ) + @$(CC) $(CFLAGS) -o $@ $^ $(CORELIB) $(LDFLAGS) + + install: $(EXE) + install -d $(DESTDIR)$(PREFIX)/bin + install -m 755 $(EXE) $(DESTDIR)$(PREFIX)/bin +- install -d $(DESTDIR)$(PREFIX)/man/man1 +- install -m 644 dmd5620.man $(DESTDIR)$(PREFIX)/man/man1/dmd5620.1 ++ install -d $(DESTDIR)$(PREFIX)/share/man/man1 ++ install -m 644 dmd5620.man $(DESTDIR)$(PREFIX)/share/man/man1/dmd5620.1 + install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps + install -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps + install -m 644 assets/dmd5620.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps +@@ -55,4 +46,4 @@ + rm -f $(DESTDIR)$(PREFIX)/bin/$(EXE) + rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/dmd5620.png + rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/dmd5620.svg +- rm -f $(DESTDIR)$(PREFIX)/man/man1/dmd5620.1 ++ rm -f $(DESTDIR)$(PREFIX)/share/man/man1/dmd5620.1