commit:     ace80d35b2da72c1ff4189cb310bbd503228cc04
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Oct  7 18:34:18 2022 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Oct  7 19:07:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ace80d35

x11-misc/dmenu: add 5.2

Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 x11-misc/dmenu/Manifest                     |  1 +
 x11-misc/dmenu/dmenu-5.2.ebuild             | 62 +++++++++++++++++++++++++++++
 x11-misc/dmenu/files/dmenu-5.2-gentoo.patch | 26 ++++++++++++
 3 files changed, 89 insertions(+)

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 8b4995d4ede7..641869ae7333 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,2 +1,3 @@
 DIST dmenu-5.0.tar.gz 16028 BLAKE2B 
9f161e3d44d5cb80e3996db81e28cdf7f143d310ec2660c837df167d8426645dde09d4f5a0c71d4be73f80f76615a32c20dd3d7f30a23506993215c89fe40844
 SHA512 
2b6a7cdf5aefc5e7ca7a4944883c3c16ee6f5005d2a96b61482d4899ad395f9cb8926907681d88b9df3e1188cf421dad4cc17e343b752f6cb8b161d33384b3f3
 DIST dmenu-5.1.tar.gz 16096 BLAKE2B 
22132d851c37c6fd7b08ce1087cb33278f3194412cc590b196831568f7fc0b25e1b7a98b83720fcd5df1f8bae095ea7405b96003a698038599b1f25b58aa8a3c
 SHA512 
2f950c30e15880e6081e04d73dd0cf8f402f52d793a77d22c3f10739bfed6222a9c4e7ec8eb3fc676422fea09e30b8cf9789f67b276b22c398c96f5ed3b56453
+DIST dmenu-5.2.tar.gz 16196 BLAKE2B 
f827f0d0d935f9da8103dbb73ed8b67818f1213d2f8e5a406de5e8c9496ea0479b4ccb50d3a29004abc1e4e679cac177163c02458ed144d323bb50fc120f936d
 SHA512 
7be9bb76b11225ec86a30e643e9b884f6d13af581526085212cb7401383d448a72fe4dffc3ce84ffb8319dbf36ca8384597a89070cd27d39d5618f239a2da6e3

diff --git a/x11-misc/dmenu/dmenu-5.2.ebuild b/x11-misc/dmenu/dmenu-5.2.ebuild
new file mode 100644
index 000000000000..de7dd36d35cb
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-5.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="a generic, highly customizable, and efficient menu for the X 
Window System"
+HOMEPAGE="https://tools.suckless.org/dmenu/";
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz";
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="xinerama"
+
+RDEPEND="
+       media-libs/fontconfig
+       x11-libs/libX11
+       >=x11-libs/libXft-2.3.5
+       xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+       x11-base/xorg-proto
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-5.2-gentoo.patch
+)
+
+src_prepare() {
+       default
+
+       sed -i \
+               -e 's|^ @|      |g' \
+               -e '/^  echo/d' \
+               Makefile || die
+
+       restore_config config.h
+}
+
+src_compile() {
+       emake CC="$(tc-getCC)" \
+               "FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 
2>/dev/null )" \
+               "FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 
2>/dev/null )" \
+               "X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \
+               "X11LIB=$( $(tc-getPKG_CONFIG) --libs x11 2>/dev/null )" \
+               "XINERAMAFLAGS=$(
+                       usex xinerama "-DXINERAMA $(
+                               $(tc-getPKG_CONFIG) --cflags xinerama 
2>/dev/null
+                       )" ''
+               )" \
+               "XINERAMALIBS=$(
+                       usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 
2>/dev/null)" ''
+               )"
+}
+
+src_install() {
+       emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+       save_config config.h
+}

diff --git a/x11-misc/dmenu/files/dmenu-5.2-gentoo.patch 
b/x11-misc/dmenu/files/dmenu-5.2-gentoo.patch
new file mode 100644
index 000000000000..91ee6f353bda
--- /dev/null
+++ b/x11-misc/dmenu/files/dmenu-5.2-gentoo.patch
@@ -0,0 +1,26 @@
+From 3c494e2289c93ab6262409f9498866bdfd57bcf4 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <[email protected]>
+Date: Fri, 7 Oct 2022 11:29:04 -0700
+Subject: [PATCH] gentoo patch
+
+--- a/config.mk
++++ b/config.mk
+@@ -20,13 +20,13 @@ FREETYPEINC = /usr/include/freetype2
+ #MANPREFIX = ${PREFIX}/man
+ 
+ # includes and libs
+-INCS = -I$(X11INC) -I$(FREETYPEINC)
+-LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS)
++INCS = $(X11INC) $(FREETYPEINC)
++LIBS = $(X11LIB) $(XINERAMALIBS) $(FREETYPELIBS)
+ 
+ # flags
+-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 
-D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
+-CFLAGS   = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
+-LDFLAGS  = $(LIBS)
++CPPFLAGS += -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 
-D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
++CFLAGS   += -std=c99 -pedantic -Wall $(INCS) $(CPPFLAGS)
++LDFLAGS  += $(LIBS)
+ 
+ # compiler and linker
+ CC = cc

Reply via email to