diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-09-30 15:24:40 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-09-30 15:24:40 +0100 |
| commit | 31459e63971ac3b08706bba949851d93c45043c3 (patch) | |
| tree | f50f9db11363f1369a1aead733baccaf2842b673 /x11-misc/xsnap | |
| parent | eba9b95ba8976f2938bafa5789c1b50611bb3459 (diff) | |
gentoo auto-resync : 30:09:2022 - 15:24:40
Diffstat (limited to 'x11-misc/xsnap')
| -rw-r--r-- | x11-misc/xsnap/Manifest | 3 | ||||
| -rw-r--r-- | x11-misc/xsnap/files/xsnap-1.5.15-clang.patch | 17 | ||||
| -rw-r--r-- | x11-misc/xsnap/xsnap-1.5.15-r3.ebuild (renamed from x11-misc/xsnap/xsnap-1.5.15-r2.ebuild) | 38 |
3 files changed, 40 insertions, 18 deletions
diff --git a/x11-misc/xsnap/Manifest b/x11-misc/xsnap/Manifest index cf8b714bb28b..e83b0286d5af 100644 --- a/x11-misc/xsnap/Manifest +++ b/x11-misc/xsnap/Manifest @@ -1,4 +1,5 @@ +AUX xsnap-1.5.15-clang.patch 405 BLAKE2B 60bf4d05d5471a4163867df8a501a2c6ee08be497eca25663ad787e0e26406eced4591ef5ca4b20490552a212f68e2ecd9fbc2ef13bb5d0682279d7626dac09d SHA512 0effe1685869ad4ea593fe7c82447afcf428e3ea2fa79dc151e6ef1890bb92ea00680c49ddedfeaf0df01abc62679d96c800ebfddb8ac2c39f7cfb6bb4ddecc1 AUX xsnap-1.5.15-root_name.patch 228 BLAKE2B 5a05da8ed5f708811a1792162bbc2dc1ea01a3666391c861296fb05706d3d1a4998764d3cd98c2847cd36573f0841966d0c16bb6fb22531055ec01fcc3d49354 SHA512 965a26474cdbe809a26559ac431aa9acdbc20ff5469e58f8b95b9da0eb58e278040f233bdc42fd54aea6f556fa2a801f6f0ca610a2ed4caa100172cb9ead4ed1 DIST xsnap-1.5.15.tar.bz2 46574 BLAKE2B 4d0f67adea6f456bd92031752a307293d736b9ce14aa35435359ed7bdb9d774827130e95f526f363bc7f0bb3c8e3e637c3e4abdf7f9c157f15f7559bae3eba99 SHA512 898914dd0bfec93b641815cc07522d4ea6168266a7f5efe75715cf68555e8959a72b40b0a02e75244348afc6aa77d267fbe7ee60670da5f33e6db2f6c4476dac -EBUILD xsnap-1.5.15-r2.ebuild 1392 BLAKE2B 606de45eef077fa066870abcb006b2fab9f3439120c3b75c052a086768193cb65fa1a4aa1a005c512f23becd335f961ce1c41f9cc99e4fb0afad62a98db7815a SHA512 d0c7690570623b54b467a816d4d7c5c3a13cf57e4d32d682d785aaac10d5b5a9b1a5e176c289f72409b14743ae0169bf51a5cd7d886986e24579963d42312b0d +EBUILD xsnap-1.5.15-r3.ebuild 1439 BLAKE2B 69b5d7d668df205854eb98e53333e666c39f9e8ebc83cb909e104d49210cb36bf0d4121175396e22edd8b09fb0b524318faf176df20ac2e9cdce3e54727a433e SHA512 20eb04e42b61c5b2786a37f9c5e4d9c51b701176d84c6a7ed94645eccb6c9ebd486acfd664e02c46a4fcfd51c061d164c0490e48516f321d3184921f74462ccf MISC metadata.xml 283 BLAKE2B a331b1e9ff53500aeb6cc233060b012baa15650c7f7536cb91318e680c334d90b2cf5c61cae6b86d24e0a483831e7c2f9ed920b68aaae7ea8bb6c100313d61d4 SHA512 3c79af7b17da8a8179b4e996c70d8caa00e15ddc774d0d22b28c851eb18783f2c416af528e14f37c14869612c4d7420ecacf5333114c6b15a479f12f3b75c3f2 diff --git a/x11-misc/xsnap/files/xsnap-1.5.15-clang.patch b/x11-misc/xsnap/files/xsnap-1.5.15-clang.patch new file mode 100644 index 000000000000..9b51bcb33e5b --- /dev/null +++ b/x11-misc/xsnap/files/xsnap-1.5.15-clang.patch @@ -0,0 +1,17 @@ +https://bugs.gentoo.org/870811 +--- a/xsnap.c ++++ b/xsnap.c +@@ -150,2 +150,3 @@ + Window win; ++int init_cursor; + { +@@ -1706,3 +1707,3 @@ + static Window win0 = None; +- static w0 = 0, h0 = 0; ++ static int w0 = 0, h0 = 0; + int i, j, d, w, h; +@@ -2254,3 +2255,3 @@ + if (op_mode == 0) +- exitXsnap (NULL, NULL, snap_pixmap, copy_gc); ++ exitXsnap ((Window)0, (Window)0, snap_pixmap, copy_gc); + diff --git a/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild b/x11-misc/xsnap/xsnap-1.5.15-r3.ebuild index dd43dcab6432..560e1574bb68 100644 --- a/x11-misc/xsnap/xsnap-1.5.15-r2.ebuild +++ b/x11-misc/xsnap/xsnap-1.5.15-r3.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + inherit toolchain-funcs DESCRIPTION="Program to interactively take a 'snapshot' of a region of the screen" @@ -11,28 +12,30 @@ SRC_URI="ftp://ftp.ac-grenoble.fr/ge/Xutils/${P}.tar.bz2" LICENSE="GPL-3+" SLOT="0" KEYWORDS="amd64 ppc x86 ~amd64-linux" -IUSE="" COMMON_DEPEND=" - media-libs/libpng:0 - virtual/jpeg:0 + media-libs/libjpeg-turbo:= + media-libs/libpng:= + sys-libs/zlib:= x11-libs/libX11 x11-libs/libXft - x11-libs/libXpm -" + x11-libs/libXpm" RDEPEND=" ${COMMON_DEPEND} - media-fonts/font-misc-misc -" -DEPEND="${COMMON_DEPEND}" + media-fonts/font-misc-misc" +DEPEND=" + ${COMMON_DEPEND} + x11-base/xorg-proto" BDEPEND=" app-text/rman dev-lang/perl - x11-base/xorg-proto - >=x11-misc/imake-1.0.8-r1 -" -DOCS=( AUTHORS Changelog README ) -PATCHES=( "${FILESDIR}"/${P}-root_name.patch ) + sys-devel/gcc + >=x11-misc/imake-1.0.8-r1" + +PATCHES=( + "${FILESDIR}"/${P}-root_name.patch + "${FILESDIR}"/${P}-clang.patch +) src_prepare() { default @@ -50,7 +53,7 @@ src_prepare() { src_configure() { CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ - IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die } src_compile() { @@ -62,5 +65,6 @@ src_compile() { src_install() { default - find "${ED}" -name '*.1.gz' -exec gunzip {} \; || die + + find "${ED}" -type f -name '*.1.gz' -exec gunzip {} + || die } |