diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-04-28 20:21:43 +0100 |
| commit | 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch) | |
| tree | 758c221bad35c9288d0bd6df9c7dfc226728e52c /x11-libs/xosd | |
| parent | 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff) | |
gentoo resync : 28.04.2021
Diffstat (limited to 'x11-libs/xosd')
| -rw-r--r-- | x11-libs/xosd/Manifest | 4 | ||||
| -rw-r--r-- | x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch | 4 | ||||
| -rw-r--r-- | x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild | 34 |
3 files changed, 25 insertions, 17 deletions
diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest index 11d8ad4351a3..757fc1a919bf 100644 --- a/x11-libs/xosd/Manifest +++ b/x11-libs/xosd/Manifest @@ -1,6 +1,6 @@ -AUX xosd-config-incorrect-dup-filter-fix.patch 520 BLAKE2B fe345fcb77c8fd5788ec55d2baac5bc0d2efa0242939c6d0dd2bbc63b65ea62eb9929af84d6645a5ae493313691670d3f9a46728c73d1b1809269d8647e25a6d SHA512 cd7726a0c616d11d20eabefca3ff4a63c76e49b1e725ddc5f3ab3452e64a46e94e5584e0779cdc4b23705fb1b17a8d2535bdbb22fd1b0ee88782bca1d4d5c248 +AUX xosd-config-incorrect-dup-filter-fix.patch 519 BLAKE2B 94990ecefbb09e341c62e1012f9cb6ca6dc40113046269c1aa0c2440267fb99b7cf49f0793d88cb096ac28a174e0fb871423332270d094127d2a6309b5a417c4 SHA512 c7baa2410a485300ad24c7a7ac52669a0790d289b2b5e71522ec1a81a122515f692e86e53b6dfa69b7a337ec83c6639adf4fae578ef6bec9813e1bcbc92cea5d DIST xosd-gentoo-m4-1.tar.bz2 5043 BLAKE2B c855a8c114911c2bec1bd582c19ef09f731a8df2c22a400a895d63ad5c4a32ad393330b47ee75fb7d8943a230df6d750094457e2021025035e91e5b1cf470e6b SHA512 fcf4d8a77cc80bc04a444a4faa9e072ea1e00950b3ce685b7944302d2ee3ebdfc5ec29ccb311495ee2e1fb5e61cc2d49350b303288d1d86430fa6bc8b3772483 DIST xosd_2.2.14-2.1.debian.tar.xz 17276 BLAKE2B 77caf1f33ba66698ab7f1894da3da27e754fe5989814427de804b9797f71930e2d52ced403f72cdbac9522337876bec2c93fc83b0d97f7e0d05f8b78337d0b34 SHA512 ba5d86d2391e6dfdc6a2994e486f9c5ecd1934438815f4dc01c0633192d74a2fa2cabe647574052c4a87203e0c12b9bb8c38851975c36f19d113787dae3681ee DIST xosd_2.2.14.orig.tar.gz 418331 BLAKE2B 2f7b8fbc31a2341ede7bc85c35ede4209c1d3a74ce07dbc62f302aa6d81a00e5e0dd4880d8ac290c0ff0f3babfcdb8b5975f7375cdafdc87fa0747c8ed8295ad SHA512 3caf6d106d34488f4823e2a58fdff7a69b90f505b8da2443485167ff0362c6f27614c9a5019e738ff1f897d3c2249c934ff60953e3775566d66e8e9b30e4e473 -EBUILD xosd-2.2.14_p2_p1.ebuild 1279 BLAKE2B 19827ab402f39c742592f046948b918bc5be45355e48277afd4fa3fc7e6162b71d21230bbb0b6715c2f87ef3f490e245856fa0748a1c3f3ab18a5285f813fab6 SHA512 76acc63b1fff7afbf90ae53ea00fe975e59c6992198c6c0fb69065ffab0baf7d63e6f1dbe4c62ed6a20cef64057823f89d36cad30ef628bb40c18c8be78150d4 +EBUILD xosd-2.2.14_p2_p1.ebuild 1474 BLAKE2B f537f7836cdda97ba96538c7bdedcac13b683eba60c0fe6d37b897af9847fc92f75ee5bb0c6fe9c244a0dce289a700de1880e21d17bdad9a3100f386e48a9fd9 SHA512 08662d8194722857515fc66f9f0c724e99f2e857815a86591a361dbdcf09f75fcba7b4ff83fe1bb64794bbe5e133295520f06a84facd00321a7f52cb5131b875 MISC metadata.xml 242 BLAKE2B 7363ed5aa4ab2d52ba96610654eeb5e2f2f8f0c2e5ca4f695f6ffa88af926130fcc9ea41257f281b542a45703848ecdf78ff99c89f1fbe51116d8e6234095782 SHA512 cf2d021687f90caa78f0f9738a07a81fb632ff35dd323dbe63b080f3985d9bcc665e5cf8549840e2369d1c4427f9831a0d61d20c4b65bab93794464a98f82519 diff --git a/x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch b/x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch index 8446297f15ce..6aabea7b0d29 100644 --- a/x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch +++ b/x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch @@ -3,8 +3,8 @@ https://bugs.gentoo.org/show_bug.cgi?id=286632 This patch disables reordering and duplicate removing for non-libs arguments, thus --param and alike gcc options may be used safe now. written by Andrew Savchenko ---- script/xosd-config.in.orig -+++ script/xosd-config.in +--- a/script/xosd-config.in ++++ b/script/xosd-config.in @@ -161,7 +161,6 @@ fi;; *) diff --git a/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild b/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild index 2b11d58b4a9a..ff2f52b48e31 100644 --- a/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild +++ b/x11-libs/xosd/xosd-2.2.14_p2_p1.ebuild @@ -1,18 +1,20 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils autotools versionator +EAPI=7 -MY_PV=$(get_version_component_range 1-3) -MY_PATCH_MAJ=$(get_version_component_range 4) -MY_PATCH_MIN=$(get_version_component_range 5) +inherit autotools + +MY_PV=$(ver_cut 1-3) +MY_PATCH_MAJ=$(ver_cut 5) +MY_PATCH_MIN=$(ver_cut 7) DESCRIPTION="Library for overlaying text in X-Windows X-On-Screen-Display" HOMEPAGE="https://sourceforge.net/projects/libxosd/" SRC_URI="mirror://debian/pool/main/x/xosd/${PN}_${MY_PV}.orig.tar.gz mirror://debian/pool/main/x/xosd/${PN}_${MY_PV}-${MY_PATCH_MAJ/p/}.${MY_PATCH_MIN/p/}.debian.tar.xz http://digilander.libero.it/dgp85/gentoo/${PN}-gentoo-m4-1.tar.bz2" +S="${WORKDIR}"/${PN}-${MY_PV} LICENSE="GPL-2" SLOT="0" @@ -24,22 +26,28 @@ RDEPEND="x11-libs/libX11 x11-libs/libXt media-fonts/font-misc-misc" DEPEND="${RDEPEND} - virtual/pkgconfig x11-base/xorg-proto" +BDEPEND="virtual/pkgconfig" DOCS=( AUTHORS ChangeLog NEWS README TODO ) -S=${WORKDIR}/${PN}-${MY_PV} -src_prepare() { - epatch "${WORKDIR}"/debian/patches/*.diff +PATCHES=( + "${WORKDIR}"/debian/patches/20_underquoted_definition.diff + "${WORKDIR}"/debian/patches/25_fix_mangapges.diff + "${WORKDIR}"/debian/patches/30_aclocal.diff + "${WORKDIR}"/debian/patches/328676.diff + "${WORKDIR}"/debian/patches/35_beep_media_player.diff + "${WORKDIR}"/debian/patches/54_fix_man_makefile.diff # bug #286632 - epatch "${FILESDIR}"/"${PN}"-config-incorrect-dup-filter-fix.patch + "${FILESDIR}"/${PN}-config-incorrect-dup-filter-fix.patch +) - eapply_user +src_prepare() { + default - AT_M4DIR="${WORKDIR}/m4" eautoreconf + AT_M4DIR="${WORKDIR}"/m4 eautoreconf } src_configure() { |