From ad75ca50360f9590325f0f709c091832b70eab1d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 8 Oct 2022 01:28:43 +0100 Subject: gentoo auto-resync : 08:10:2022 - 01:28:43 --- x11-misc/Manifest.gz | Bin 47348 -> 47352 bytes x11-misc/dmenu/Manifest | 3 ++ x11-misc/dmenu/dmenu-5.2.ebuild | 62 ++++++++++++++++++++++++++ x11-misc/dmenu/files/dmenu-5.2-gentoo.patch | 26 +++++++++++ x11-misc/slock/Manifest | 2 + x11-misc/slock/slock-1.5.ebuild | 66 ++++++++++++++++++++++++++++ 6 files changed, 159 insertions(+) create mode 100644 x11-misc/dmenu/dmenu-5.2.ebuild create mode 100644 x11-misc/dmenu/files/dmenu-5.2-gentoo.patch create mode 100644 x11-misc/slock/slock-1.5.ebuild (limited to 'x11-misc') diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz index 568a0dd74846..a0f44c961884 100644 Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest index 5d04d9ddd520..8f7863d7f84e 100644 --- a/x11-misc/dmenu/Manifest +++ b/x11-misc/dmenu/Manifest @@ -1,7 +1,10 @@ AUX dmenu-4.9-gentoo.patch 759 BLAKE2B 965ebf79e580466fd98c3621d4d3b0cb9ea961a9f0f27cf1b91a82362aa49939469509929a66a0ef1e7a1be2a9919b2ab821882fa0d6b28e0821194e48e3c739 SHA512 15f379af1133ffa2724a1b5191108a85231f10db16850e14e1a8935f47cb3326061bed3c4854c8aba7bc1076211f1154c5927ff42e46e905b09a695666bbb576 +AUX dmenu-5.2-gentoo.patch 972 BLAKE2B 1fbb21554a33fe2d69ce51190371e23d7909956353f95526d6feb4f94ccaa119ffe08ce024aa8fdd3a4302e5f4a6aaaddaadaccbc0b458cb4535cb27fa99f3a5 SHA512 7e9d63b55424bdcfdca93bc7cfd31da78af70565177c01d571a56c23c072f3dd98e35a885c18aad860ad99f502ab696dbb3b01abc6f3a7f1471d2b9845e9b2b3 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 EBUILD dmenu-5.0.ebuild 1428 BLAKE2B 57053391b0a30b63aa82b904558414903b7d3028d39340b159c42415eb48e4e5adeb737d81becba2e4c8b4b6412a2b1dbf960454c61b96c7d1d776ba57fe1a6c SHA512 db4f3bdfeb1fe94594ea1251866e0f78d7fd9f39c18ed5a14ba3347f97e5b92f45fd3fb61053babff033609ddd598b0adfa8354092c60fcaa3b6d38969df0a03 EBUILD dmenu-5.1.ebuild 1433 BLAKE2B cb37bc32148f39f037adc68e71ce00060a9821f395b3fe974b83590f9095db7e3b50833577608852d3a6163780a30c53200a088436650a33800b4386838d70c4 SHA512 4610b621b645a5ad63bcbba9d105606f8ca026e4cf29c31b26193ab92e5aec582fa295778d88911f5d917b578052f1cf6730b9d7aa267cf79fe852b3d02f016a +EBUILD dmenu-5.2.ebuild 1441 BLAKE2B c0f77ffa13a53d1bc8a9bcd755fd660b3cca8cfef537b4268961f3b65b023e99888fca58228e2b5e3a61f054eb27bffe97f55125928603331ed09493b0c0399d SHA512 a242c95e8ba1558fb9ba7943fc7d70935693e4bf4d8d0cef45e09fc3b18ee68c22d740fe0017d30ce9193f1f6223a9138daa87d9e25565d043c0f16720bf3546 EBUILD dmenu-9999.ebuild 1387 BLAKE2B 5b0e35bff1b1bc2fa2d1d05f9e0acd0993b2070a2f9a989e79afc8f2f2ee9323d9636f23728877209a4f3cedd2fca363219175982a2971eb6fdc2cec54ab9ecf SHA512 4d1abfe39c176103d2aa364884f7c91e4701279dd4e57816b48a72b3adfee5154610c8e82297bfdf4fe6dea2669a5f3db72609e17dde90547ee469b31c5bb79d MISC metadata.xml 252 BLAKE2B ed5f11ce8c4de4fde4020b83dc772d6b47192ea5617cacf05adf13ab5a29923858b2969ed9dc26e75194cb972d41ffceee40856e6f955f42039693af96ebb2e4 SHA512 7f9b5cf205b6500eb65742c67963c3c6c375fa05c7eb094037fb9950d9d2840930e8b4d3ef76c948ddf7f37005012be51c8217c758a615dd7e128c80b6b1db28 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 +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 diff --git a/x11-misc/slock/Manifest b/x11-misc/slock/Manifest index b6b283c87d43..081045b3f5ed 100644 --- a/x11-misc/slock/Manifest +++ b/x11-misc/slock/Manifest @@ -1,4 +1,6 @@ AUX slock-1.4-fix-link-paths.patch 558 BLAKE2B f2ef75f836b02ec23b98fdb9f302e671ec8a284b75d83f701e14f5d44a746916b670768730759d4767c9617259b6ad1ec6aceecd851973038ffc2382edd99558 SHA512 3610b7e03e7089ffb4207b136f08ac0944d411284dbbf6614c615596451dcab11ad001c01c4f32c0f040138c99d6764428d60050da59933619a8bbf7fd2a011e DIST slock-1.4.tar.gz 6889 BLAKE2B 67f956fd00e7536a9db81b82e85e4128b537569d16cd25428822607a5c2f3b0310bcfec896f7e83c0091e85d21b68438f6f42da715a55cad7fac90d0d0d64b8f SHA512 ad285360dd3f16a225159abaf2f82fabf2c675bd74478cf717f68cbe5941a6c620e3c88544ce675ce3ff19af4bb0675c9405685e0f74ee4e84f7d34c61a0532f +DIST slock-1.5.tar.gz 6898 BLAKE2B f3435311b24c20fef656589f468b4cd6bbed30568459cb1d525b7dd5b57e5759ee287787d7506ad6cb922fd092bad504f38ab8c57b41deebec4f6aa554269a41 SHA512 2402b1e49f5dbe06cca2f3a31efedce6359413b240f2b98c57147483591a873c3c5457dbf6707485167002ff6d7ee0e9005d9fa506a51bf71337624e8728bb43 EBUILD slock-1.4-r1.ebuild 1160 BLAKE2B e7eb43a66c713c369dc7dff580fbbe44c6163690adc9e9d815e76b62b6c81460f33ee12b5dd8604f1057f48c09089d7ac4467190f0ef1a3cfc1ad0fbbcf7fa09 SHA512 fb6efd3b182237b772144f002bf8446f94a7190b5e985a58765e8cba40a72924607c4c62e51daa5e4f7a40113c3e3d7377d43afe9930e89451ed84f442c50548 +EBUILD slock-1.5.ebuild 1164 BLAKE2B c0c0418f8362d0e85fcbed0c7d9d726ae02391bfab4b351f190248710cbd1538a6d5d2c8dcc5396b2a3cfd3e5c63e1738b03d268d9cbab4a4225e29284828df2 SHA512 20afb70190973568003dbd050a02a8992b77381d573cb451abe543238cfa2d407970e337a4703fd8a9972b0f113985be5470c65739ff5ed4ecf6eedbe0a20d85 MISC metadata.xml 252 BLAKE2B ed5f11ce8c4de4fde4020b83dc772d6b47192ea5617cacf05adf13ab5a29923858b2969ed9dc26e75194cb972d41ffceee40856e6f955f42039693af96ebb2e4 SHA512 7f9b5cf205b6500eb65742c67963c3c6c375fa05c7eb094037fb9950d9d2840930e8b4d3ef76c948ddf7f37005012be51c8217c758a615dd7e128c80b6b1db28 diff --git a/x11-misc/slock/slock-1.5.ebuild b/x11-misc/slock/slock-1.5.ebuild new file mode 100644 index 000000000000..34bb4c6a6a2b --- /dev/null +++ b/x11-misc/slock/slock-1.5.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit fcaps savedconfig toolchain-funcs + +DESCRIPTION="simple X display locker" +HOMEPAGE="https://tools.suckless.org/slock" +SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~hppa ~ppc64 ~x86" + +RDEPEND=" + virtual/libcrypt:= + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXrandr +" +DEPEND=" + ${RDEPEND} + x11-base/xorg-proto +" + +PATCHES=( + "${FILESDIR}"/slock-1.4-fix-link-paths.patch +) + +src_prepare() { + default + + sed -i \ + -e '/^CFLAGS/{s: -Os::g; s:= :+= :g}' \ + -e '/^CC/d' \ + -e '/^LDFLAGS/{s:-s::g; s:= :+= :g}' \ + config.mk || die + sed -i \ + -e 's|@${CC}|$(CC)|g' \ + Makefile || die + + restore_config config.h + + tc-export CC +} + +src_compile() { + emake slock +} + +src_install() { + dobin slock + save_config config.h +} + +pkg_postinst() { + # cap_dac_read_search used to be enough for shadow access + # but now slock wants to write to /proc/self/oom_score_adj + # and for that it needs: + fcaps \ + cap_dac_override,cap_setgid,cap_setuid,cap_sys_resource \ + /usr/bin/slock + + savedconfig_pkg_postinst +} -- cgit v1.2.3