diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-03-20 14:27:17 +0000 |
commit | 5bb9ff1ee56d2b5e75e01a7f066d8b0cec84ec02 (patch) | |
tree | 66e860a5099bcad013f1cf667255dc372a7c11b3 /x11-libs/libfm | |
parent | 7218e1b46bceac05841e90472501742d905fb3fc (diff) |
gentoo resync : 20.03.2021
Diffstat (limited to 'x11-libs/libfm')
-rw-r--r-- | x11-libs/libfm/Manifest | 6 | ||||
-rw-r--r-- | x11-libs/libfm/files/libfm-1.3.2-buildsystem.patch | 34 | ||||
-rw-r--r-- | x11-libs/libfm/libfm-1.2.5.ebuild | 127 | ||||
-rw-r--r-- | x11-libs/libfm/libfm-1.3.2.ebuild | 124 | ||||
-rw-r--r-- | x11-libs/libfm/libfm-9999.ebuild | 123 |
5 files changed, 161 insertions, 253 deletions
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest index b82ffa37e0a3..748d1eed2b4b 100644 --- a/x11-libs/libfm/Manifest +++ b/x11-libs/libfm/Manifest @@ -1,7 +1,7 @@ +AUX libfm-1.3.2-buildsystem.patch 1098 BLAKE2B 63cde148b2ada201d290550769ae7714324f72617629d801ce362dbc3f33b1de7e6a712959a6e4e8629e880244ad361c054ebc898f2b089d4e19f348120e9635 SHA512 d2dc9c220e2ce70c33809ecb9ce4e85529990946537970a63d60fad33577f1ec444b066abcbbf346611035e9dac5d2750ddce84105a391040c1dc8b179ec0901 AUX libfm-fix-use-after-free.diff 863 BLAKE2B 6ec30c5c96ea4b33a1b21427e223bde954596ecea752286816e338b3255498a8fbaa79839344b77507f731012cd66a511ffe2bfca416e398f84d9dcd567b3df0 SHA512 7d9cc8699b66ec3538c27ee65b03f892752036d57432e861acfa76983ffbaeac9c1252e400f9cae3d05e7b49a33cc0af8299236c5b74a86b4c967392b879e47e -DIST libfm-1.2.5.tar.gz 1261152 BLAKE2B 30da6771ad4ab31be675a3af2ce7c9dd04e80be9f33b25300bf386f45f9fd652654e211c312d1e283a63cdbde4f5c8e3673a36fc0075e3b1981d9f5995683057 SHA512 0bc7910081cadc4c8c4648f3483fb5791e9480700400ded452dd5985e7fb0d8524f2c676f0171a5cd283422a13f240f40cfe5ccc8d10dce02dd784d62250b7cc DIST libfm-1.3.1.tar.gz 1290374 BLAKE2B 3df27fc6b4afd089e51cd36db0f764e9359b0c6373e0ff484aa7cd2ee99170530fb60f5757ade9263a5bdd1d6be9917debb66a19cc8e13c505431050b6f3a901 SHA512 82bbcb1b9c7d4543bcb075906bdc1554462b041ad936e2f0334ae478302b19808cdbfe6d0c86a039bbd72a2491f2d2ada61a324fe3933a8dde16a03d93bef2bc -EBUILD libfm-1.2.5.ebuild 3651 BLAKE2B 3a5a6b83cbc6449e57ee866aa27efaee76b027849a4e8bb4ea310f5b3e427e7689a4e925a657200c7f9d581164dcd24b601203a5e948b7f52c4a9a7f5a0e0b75 SHA512 de52c77cde4bb2b336e2470864d9a7e817b4e9194cd776981c8cdd181bb9e2d5c734f874b5e25d134ef67cc9ed2ce6ef053e56bed52b41415522f991b1debf9c +DIST libfm-1.3.2.tar.gz 1295152 BLAKE2B 80b2110610aac9e8cb37502c3e69e425256ff22565ba15b5806e30c3bed5ad141c38cac1eda91f846e14eca6b783bea3d715b3b467ae7d37b036e3f19cadc3f8 SHA512 905c5eca66e1acb8ab2ed20de9f10e43d38eae304d1d986dd9961469141f9156130602c060754a5161672208c37a3969489bb40fd9c941281817852ca38500a6 EBUILD libfm-1.3.1.ebuild 3580 BLAKE2B f98125bf71279106353c324e618b9e9c0293b26960ef85c070702063aa683bb10689aff7fb6819ec08bfc0dcea8d7c0a812a0a9dbed7bc741f1ce7dfa23af644 SHA512 f7bb2cdf588eaa9e76f393028330a7933569b7308f65c48d7fe86c1c0e6f31c5155f17d6e27d98f2600ca41415ac6248e47c7d8e4dad3c38270289c392dd33a7 -EBUILD libfm-9999.ebuild 3384 BLAKE2B ad18db8685c9b695490b2f22423c8513b9cbc545f212d7218ed3ed4ba6bfb64e2ae22bc2332be70a4430fa315e11e6ae5f701556e1d7007a6898f0dbe867168b SHA512 cb7d45eabf3084fb530ab1dd359bf1c91391e9dc699f0423a210d28e69bdd3e93617156028dd982c25decb6968b495bc828eb56fdf44971f28741597265d0d7c +EBUILD libfm-1.3.2.ebuild 3345 BLAKE2B 487b03ad1e84224c412d4a453563fcfa2d107cb0e0a2cb8fdec8de67cc971a79b0c13d00294c9cacee3bdd0efac642d6c57c447d94a1f8a89bc19c71f5411326 SHA512 3fbab2ddc7f25b09ea4603cf55509b7ff84d0ed84650b5c45912e7a8646002d676bd49018a0edf00b0071a839a0b61ba4a778a8c7c6adb0d5c444c43fcc7dc30 MISC metadata.xml 582 BLAKE2B 3e314b2f5accbb454ae1021d646393d30332919509ce60a48aa37a3285c4787a502315d74950f083f746eae9b5a7f1302a457418b3d6197195de88e0f390939a SHA512 eab4b456ea5035d3b0c358b6f871710bb3a69be67d918ed135c1acb199234d87bd2e8b1d426485490bb0b7cd9cbb66b6daaef43b39d3219a0fcf40145349dd62 diff --git a/x11-libs/libfm/files/libfm-1.3.2-buildsystem.patch b/x11-libs/libfm/files/libfm-1.3.2-buildsystem.patch new file mode 100644 index 000000000000..3b5f2b5061ee --- /dev/null +++ b/x11-libs/libfm/files/libfm-1.3.2-buildsystem.patch @@ -0,0 +1,34 @@ +From 5db9cb19a2b33c89255b8d483f42d5fc647df2c9 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Mon, 15 Mar 2021 01:20:02 +0100 +Subject: [PATCH] Drop -Werror and unwanted CPPFLAGS + +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index bf6b07f..181eed7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3,7 +3,7 @@ + + AC_PREREQ([2.63]) + AC_INIT([libfm], [1.3.2], [http://pcmanfm.sourceforge.net/]) +-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects no-dist-gzip dist-xz -Wno-portability]) ++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects no-dist-gzip dist-xz -Wno-portability]) + AC_CONFIG_MACRO_DIR(m4) + AC_CONFIG_HEADERS([config.h]) + +@@ -277,7 +277,7 @@ AC_ARG_ENABLE(debug, + ) + if test "$enable_debug" = "yes"; then + # turn on debug and disable optimization +- CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG -O0 -g" ++ CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG" + case "$CC" in + gcc*) + CPPFLAGS="$CPPFLAGS -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers" +-- +2.30.2 + diff --git a/x11-libs/libfm/libfm-1.2.5.ebuild b/x11-libs/libfm/libfm-1.2.5.ebuild deleted file mode 100644 index a94b843ec8e5..000000000000 --- a/x11-libs/libfm/libfm-1.2.5.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools multilib vala xdg-utils - -MY_PV=${PV/_/} -MY_P="${PN}-${MY_PV}" -DESCRIPTION="A library for file management" -HOMEPAGE="https://wiki.lxde.org/en/PCManFM" -SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" - -KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux" -LICENSE="GPL-2" -SLOT="0/4.5.0" #copy ABI_VERSION because it seems upstream change it randomly -IUSE="+automount debug doc examples exif gtk udisks vala" - -COMMON_DEPEND=">=dev-libs/glib-2.18:2 - gtk? ( >=x11-libs/gtk+-2.16:2 ) - >=lxde-base/menu-cache-0.3.2:= - ~x11-libs/libfm-extra-${PV} - udisks? ( dev-libs/dbus-glib )" -RDEPEND="${COMMON_DEPEND} - !lxde-base/lxshortcut - x11-misc/shared-mime-info - automount? ( - udisks? ( gnome-base/gvfs[udev,udisks] ) - !udisks? ( gnome-base/gvfs[udev] ) - ) - exif? ( media-libs/libexif )" -DEPEND="${COMMON_DEPEND} - vala? ( $(vala_depend) ) - doc? ( - dev-util/gtk-doc - ) - app-arch/xz-utils - >=dev-util/intltool-0.40 - virtual/pkgconfig - sys-devel/gettext" - -S="${WORKDIR}"/${MY_P} - -REQUIRED_USE="udisks? ( automount ) doc? ( gtk )" - -src_prepare() { - # Fix use after free bug, see - # https://github.com/lxde/libfm/pull/11/commits/9e3a809c6a8a5079f05e04edac9457d317822321 - epatch "${FILESDIR}"/libfm-fix-use-after-free.diff - - if ! use doc; then - sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed" - sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed" - fi - sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \ - configure.ac || die "sed failed" - - #disable unused translations. Bug #356029 - for trans in app-chooser ask-rename exec-file file-prop preferred-apps \ - progress;do - echo "data/ui/"${trans}.ui >> po/POTFILES.in - done - #Remove -Werror for automake-1.12. Bug #421101 - sed -i "s:-Werror::" configure.ac || die - - # subslot sanity check - local sub_slot=${SLOT#*/} - local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.') - - if [[ ${sub_slot} != ${libfm_major_abi} ]]; then - eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})" - eerror "Please update SLOT variable as follows:" - eerror " SLOT=\"${SLOT%%/*}/${libfm_major_abi}\"" - eerror - die "sub-slot sanity check failed" - fi - - eautoreconf - rm -r autom4te.cache || die - use vala && export VALAC="$(type -p valac-$(vala_best_api_version))" -} - -src_configure() { - econf \ - --disable-static \ - $(use_enable examples demo) \ - $(use_enable exif) \ - $(use_enable debug) \ - $(use_enable udisks) \ - $(use_enable vala actions) \ - $(use_with gtk) \ - $(use_enable doc gtk-doc) \ - --with-html-dir=/usr/share/doc/${PF}/html -} - -src_install() { - default - find "${D}" -name '*.la' -exec rm -f '{}' + - # Sometimes a directory is created instead of a symlink. No idea why... - # It is wrong anyway. We expect a libfm-1.0 directory and then a libfm - # symlink to it. - if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then - rm -r "${D}"/usr/include/${PN} - fi - # Remove files installed by split-off libfm-extra package - rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h - rm "${D}"/usr/$(get_libdir)/libfm-extra* - rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc -} - -pkg_preinst() { - # Resolve the symlink mess. Bug #439570 - [[ -d "${ROOT}"/usr/include/${PN} ]] && \ - rm -rf "${ROOT}"/usr/include/${PN} - if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then - cd "${D}"/usr/include - ln -s --force ${PN}-1.0 ${PN} - fi -} - -pkg_postinst() { - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_mimeinfo_database_update -} diff --git a/x11-libs/libfm/libfm-1.3.2.ebuild b/x11-libs/libfm/libfm-1.3.2.ebuild new file mode 100644 index 000000000000..8bb9a86de8f1 --- /dev/null +++ b/x11-libs/libfm/libfm-1.3.2.ebuild @@ -0,0 +1,124 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_P="${PN}-${PV/_/}" +inherit autotools vala xdg + +DESCRIPTION="Library for file management" +HOMEPAGE="https://wiki.lxde.org/en/PCManFM" +SRC_URI="https://github.com/lxde/libfm/archive/${PV}.tar.gz -> ${MY_P}.tar.gz" +S="${WORKDIR}"/${MY_P} + +LICENSE="GPL-2" +SLOT="0/5.3.1" # copy ABI_VERSION because it seems upstream change it randomly +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="+automount debug doc examples exif gtk udisks vala" + +REQUIRED_USE="udisks? ( automount ) doc? ( gtk )" + +DEPEND=" + >=dev-libs/glib-2.18:2 + >=lxde-base/menu-cache-1.1.0-r1:= + ~x11-libs/libfm-extra-${PV} + gtk? ( x11-libs/gtk+:3 ) + udisks? ( dev-libs/dbus-glib ) +" +RDEPEND="${DEPEND} + !lxde-base/lxshortcut + x11-misc/shared-mime-info + automount? ( + udisks? ( gnome-base/gvfs[udev,udisks] ) + !udisks? ( gnome-base/gvfs[udev] ) + ) + exif? ( media-libs/libexif ) +" +BDEPEND=" + app-arch/xz-utils + dev-util/glib-utils + >=dev-util/intltool-0.40 + sys-devel/gettext + virtual/pkgconfig + doc? ( dev-util/gtk-doc ) + vala? ( $(vala_depend) ) +" + +PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" ) + +src_prepare() { + xdg_src_prepare + + if ! use doc; then + sed -ie '/^SUBDIR.*=/s#docs##' Makefile.am || die + sed -ie '/^[[:space:]]*docs/d' configure.ac || die + fi + + # disable unused translations. Bug #356029 + cat <<-EOF >> po/POTFILES.in || die +data/ui/app-chooser.ui +data/ui/ask-rename.ui +data/ui/exec-file.ui +data/ui/file-prop.ui +data/ui/preferred-apps.ui +data/ui/progress.ui +EOF + + # subslot sanity check + local sub_slot=${SLOT#*/} + local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.') + + if [[ ${sub_slot} != ${libfm_major_abi} ]]; then + eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})" + eerror "Please update SLOT variable as follows:" + eerror " SLOT=\"${SLOT%%/*}/${libfm_major_abi}\"" + eerror + die "sub-slot sanity check failed" + fi + + eautoreconf + rm -r autom4te.cache || die + use vala && export VALAC="$(type -p valac-$(vala_best_api_version))" +} + +src_configure() { + local myeconfargs=( + --disable-static + --with-html-dir=/usr/share/doc/${PF}/html + $(use_enable debug) + $(use_enable doc gtk-doc) + $(use_enable examples demo) + $(use_enable exif) + $(use_with gtk gtk 3) + $(use_enable udisks) + $(use_enable vala old-actions) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die + # Sometimes a directory is created instead of a symlink. No idea why... + # It is wrong anyway. We expect a libfm-1.0 directory and then a libfm + # symlink to it. + if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then + rm -r "${D}"/usr/include/${PN} || die + fi + # Remove files installed by split-off libfm-extra package + rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h || die + rm "${D}"/usr/$(get_libdir)/libfm-extra* || die + rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc || die +} + +pkg_preinst() { + xdg_pkg_preinst + # Resolve the symlink mess. Bug #439570 + if [[ -d "${ROOT}"/usr/include/${PN} ]]; then + rm -rf "${ROOT}"/usr/include/${PN} || die + fi + if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then + cd "${D}"/usr/include || die + ln -s --force ${PN}-1.0 ${PN} || die + fi +} diff --git a/x11-libs/libfm/libfm-9999.ebuild b/x11-libs/libfm/libfm-9999.ebuild deleted file mode 100644 index 559e07188526..000000000000 --- a/x11-libs/libfm/libfm-9999.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -EGIT_REPO_URI="https://github.com/lxde/${PN}" -inherit autotools git-r3 vala xdg-utils - -DESCRIPTION="A library for file management" -HOMEPAGE="https://wiki.lxde.org/en/PCManFM" - -LICENSE="GPL-2" -SLOT="0/4.4.0" #copy ABI_VERSION because it seems upstream change it randomly -IUSE="+automount debug doc examples exif gtk udisks vala" -KEYWORDS="" - -COMMON_DEPEND=">=dev-libs/glib-2.18:2 - gtk? ( >=x11-libs/gtk+-2.16:2 ) - >=lxde-base/menu-cache-0.3.2:= - x11-libs/libfm-extra" -RDEPEND="${COMMON_DEPEND} - !lxde-base/lxshortcut - x11-misc/shared-mime-info - automount? ( - udisks? ( gnome-base/gvfs[udev,udisks] ) - !udisks? ( gnome-base/gvfs[udev] ) - ) - exif? ( media-libs/libexif )" -DEPEND="${COMMON_DEPEND} - vala? ( $(vala_depend) ) - doc? ( - dev-util/gtk-doc - ) - >=dev-util/intltool-0.40 - virtual/pkgconfig - sys-devel/gettext - dev-util/glib-utils" - -DOCS=( AUTHORS TODO ) - -REQUIRED_USE="udisks? ( automount ) doc? ( gtk )" - -src_prepare() { - if ! use doc; then - sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed" - sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed" - else - gtkdocize --copy || die - fi - sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \ - configure.ac || die "sed failed" - - intltoolize --force --copy --automake || die - #disable unused translations. Bug #356029 - for trans in app-chooser ask-rename exec-file file-prop preferred-apps \ - progress;do - echo "data/ui/"${trans}.ui >> po/POTFILES.in - done - #Remove -Werror for automake-1.12. Bug #421101 - sed -i "s:-Werror::" configure.ac || die - - # subslot sanity check - local sub_slot=${SLOT#*/} - local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.') - - if [[ ${sub_slot} != ${libfm_major_abi} ]]; then - eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})" - eerror "Please update SLOT variable as follows:" - eerror " SLOT=\"${SLOT%%/*}/${libfm_major_abi}\"" - eerror - die "sub-slot sanity check failed" - fi - - eautoreconf - rm -r autom4te.cache || die - use vala && export VALAC="$(type -p valac-$(vala_best_api_version))" -} - -src_configure() { - econf \ - --disable-static \ - $(use_enable examples demo) \ - $(use_enable exif) \ - $(use_enable debug) \ - $(use_enable udisks) \ - $(use_enable vala actions) \ - $(use_with gtk) \ - $(use_enable doc gtk-doc) \ - --with-html-dir=/usr/share/doc/${PF}/html -} - -src_install() { - default - find "${D}" -name '*.la' -exec rm -f '{}' + - # Sometimes a directory is created instead of a symlink. No idea why... - # It is wrong anyway. We expect a libfm-1.0 directory and then a libfm - # symlink to it. - if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then - rm -r "${D}"/usr/include/${PN} - fi - # Remove files installed by split-off libfm-extra package - rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h - rm "${D}"/usr/$(get_libdir)/libfm-extra* - rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc -} - -pkg_preinst() { - # Resolve the symlink mess. Bug #439570 - [[ -d "${ROOT}"/usr/include/${PN} ]] && \ - rm -rf "${ROOT}"/usr/include/${PN} - if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then - cd "${D}"/usr/include - ln -s --force ${PN}-1.0 ${PN} - fi -} - -pkg_postinst() { - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_mimeinfo_database_update -} |