diff options
| -rw-r--r-- | x11-libs/libfm/Manifest | 1 | ||||
| -rw-r--r-- | x11-libs/libfm/files/libfm-fix-use-after-free.diff | 23 | ||||
| -rw-r--r-- | x11-libs/libfm/libfm-1.3.1.ebuild | 144 |
3 files changed, 0 insertions, 168 deletions
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest deleted file mode 100644 index 0aa1137e..00000000 --- a/x11-libs/libfm/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libfm-1.3.1.tar.gz 1290374 BLAKE2B 3df27fc6b4afd089e51cd36db0f764e9359b0c6373e0ff484aa7cd2ee99170530fb60f5757ade9263a5bdd1d6be9917debb66a19cc8e13c505431050b6f3a901 SHA512 82bbcb1b9c7d4543bcb075906bdc1554462b041ad936e2f0334ae478302b19808cdbfe6d0c86a039bbd72a2491f2d2ada61a324fe3933a8dde16a03d93bef2bc diff --git a/x11-libs/libfm/files/libfm-fix-use-after-free.diff b/x11-libs/libfm/files/libfm-fix-use-after-free.diff deleted file mode 100644 index 4a0ae61c..00000000 --- a/x11-libs/libfm/files/libfm-fix-use-after-free.diff +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur libfm-1.2.3/src/base/fm-config.c libfm-1.2.3-fix-uaf-new2/src/base/fm-config.c ---- libfm-1.2.3/src/base/fm-config.c 2014-10-14 18:29:21.000000000 +0200 -+++ libfm-1.2.3-fix-uaf-new2/src/base/fm-config.c 2016-06-18 18:23:35.721837971 +0200 -@@ -346,7 +346,8 @@ - cfg->modules_blacklist = NULL; - cfg->system_modules_blacklist = NULL; - _cfg_monitor_free(cfg); -- g_free(cfg->_cfg_name); -+ if(name != cfg->_cfg_name) -+ g_free(cfg->_cfg_name); - if(G_LIKELY(!name)) - name = "libfm/libfm.conf"; - else -@@ -363,7 +364,8 @@ - } - } - -- cfg->_cfg_name = g_strdup(name); -+ if(name != cfg->_cfg_name) -+ cfg->_cfg_name = g_strdup(name); - dirs = g_get_system_config_dirs(); - /* bug SF #887: first dir in XDG_CONFIG_DIRS is the most relevant - so we shoult process the list in reverse order */ diff --git a/x11-libs/libfm/libfm-1.3.1.ebuild b/x11-libs/libfm/libfm-1.3.1.ebuild deleted file mode 100644 index 2ed54cd0..00000000 --- a/x11-libs/libfm/libfm-1.3.1.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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/5.2.1" #copy ABI_VERSION because it seems upstream change it randomly -IUSE="+automount debug doc examples exif gtk gtk3 udisks vala" - -COMMON_DEPEND=">=dev-libs/glib-2.18:2 - gtk? ( >=x11-libs/gtk+-2.16:2 ) - gtk3? ( >=x11-libs/gtk+-3.18:3 ) - >=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() { - 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))" - - eapply_user -} - - src_configure() { - if use gtk3; then - econf \ - --sysconfdir="${EPREFIX}/etc" \ - --disable-dependency-tracking \ - --disable-static \ - --with-gtk=3 \ - $(use_enable examples demo) \ - $(use_enable debug) \ - $(use_enable udisks) \ - $(use_enable vala old-actions) \ - $(use_enable doc gtk-doc) \ - --with-html-dir=/usr/share/doc/${PF}/html - else - econf \ - --sysconfdir="${EPREFIX}/etc" \ - --disable-dependency-tracking \ - --disable-static \ - $(use_enable examples demo) \ - $(use_enable exif) \ - $(use_enable debug) \ - $(use_enable udisks) \ - $(use_enable vala old-actions) \ - $(use_with gtk) \ - $(use_enable doc gtk-doc) \ - --with-html-dir=/usr/share/doc/${PF}/html - fi -} - -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 - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} |