commit: c502031fbce5def7620ac3ba7290a8478dc90ec2 Author: layman <layman <AT> localhost> AuthorDate: Sun Sep 17 18:23:24 2017 +0000 Commit: Jan Psota <jasiupsota <AT> gmail <DOT> com> CommitDate: Sun Sep 17 18:23:24 2017 +0000 URL: https://gitweb.gentoo.org/repo/user/bleeding-edge.git/commit/?id=c502031f
x11-misc/pcmanfm-9999 using gtk+3 git source address updated, ebuild based on from-tree version x11-libs/libfm/Manifest | 1 - ...indow_get_device_position-device-argument.patch | 60 ---------- x11-libs/libfm/libfm-1.2.3-r2.ebuild | 128 --------------------- x11-misc/pcmanfm/Manifest | 1 - x11-misc/pcmanfm/pcmanfm-1.2.3-r2.ebuild | 66 ----------- x11-misc/pcmanfm/pcmanfm-9999.ebuild | 59 ++++++---- 6 files changed, 37 insertions(+), 278 deletions(-) diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest deleted file mode 100644 index 7361d3d..0000000 --- a/x11-libs/libfm/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST libfm-1.2.3.tar.xz 898256 SHA256 c692f1624a4cbc8d1dd55f3b3f3369fbf5d26f63a916e2c295230b2344e1fbf9 SHA512 f4c214daffc47f05ba31c65203ab0542a03f5a246ea4bb62b6b365ac3fa120a1a51e37b00f8a43afe56875eb69f9be327ac724dafb6fc2de13aa77deea23f443 WHIRLPOOL ae5354c5ef5154ebce8a9124b47e0a645171d50d4034fd1e6000ff084acc15261398029c58b067b9027d4ba68d36d8addf91a28678c91a3fbd9ce0806e9b6046 diff --git a/x11-libs/libfm/files/0002-Fix-gdk_window_get_device_position-device-argument.patch b/x11-libs/libfm/files/0002-Fix-gdk_window_get_device_position-device-argument.patch deleted file mode 100644 index 831d3dc..0000000 --- a/x11-libs/libfm/files/0002-Fix-gdk_window_get_device_position-device-argument.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 3355a737e0a4dcb87bda28868c30b70b1cd2eb34 Mon Sep 17 00:00:00 2001 -From: Mamoru TASAKA <[email protected]> -Date: Sat, 23 May 2015 15:51:55 +0900 -Subject: [PATCH] Fix gdk_window_get_device_position device argument - -http://sourceforge.net/p/pcmanfm/bugs/959/ ---- - src/gtk-compat.h | 2 ++ - src/gtk/fm-dnd-auto-scroll.c | 5 +++-- - src/gtk/fm-folder-view.c | 5 +++-- - 3 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/src/gtk-compat.h b/src/gtk-compat.h -index 3f37fab..e460f74 100644 ---- a/src/gtk-compat.h -+++ b/src/gtk-compat.h -@@ -33,6 +33,8 @@ G_BEGIN_DECLS - gdk_window_get_pointer(win,xptr,yptr,mptr) - #else - # define gdk_cursor_unref(obj) g_object_unref(obj) -+# define GDK_GET_DEVICE_FROM_WINDOW(window) \ -+ gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gdk_window_get_display(window))) - #endif - - #if !GTK_CHECK_VERSION(2, 21, 0) -diff --git a/src/gtk/fm-dnd-auto-scroll.c b/src/gtk/fm-dnd-auto-scroll.c -index 72d866a..2861355 100644 ---- a/src/gtk/fm-dnd-auto-scroll.c -+++ b/src/gtk/fm-dnd-auto-scroll.c -@@ -55,8 +55,9 @@ static gboolean on_auto_scroll(gpointer user_data) - if(g_source_is_destroyed(g_main_current_source())) - return FALSE; - -- gdk_window_get_device_position (gtk_widget_get_window(widget), -- gtk_get_current_event_device(), -+ GdkWindow *window = gtk_widget_get_window(widget); -+ gdk_window_get_device_position (window, -+ GDK_GET_DEVICE_FROM_WINDOW(window), - &x, &y, NULL); - gtk_widget_get_allocation(widget, &allocation); - -diff --git a/src/gtk/fm-folder-view.c b/src/gtk/fm-folder-view.c -index 21e7dff..8ee020e 100644 ---- a/src/gtk/fm-folder-view.c -+++ b/src/gtk/fm-folder-view.c -@@ -1106,8 +1106,9 @@ static void popup_position_func(GtkMenu *menu, gint *x, gint *y, - gtk_widget_realize(GTK_WIDGET(menu)); - /* get all the relative coordinates */ - gtk_widget_get_allocation(widget, &a); -- gdk_window_get_device_position(gtk_widget_get_window(widget), -- gtk_get_current_event_device(), &x2, &y2, NULL); -+ GdkWindow *window = gtk_widget_get_window(widget); -+ gdk_window_get_device_position(window, -+ GDK_GET_DEVICE_FROM_WINDOW(window), &x2, &y2, NULL); - gtk_widget_get_allocation(GTK_WIDGET(menu), &ma); - parent_window = gtk_widget_get_parent_window(widget); - screen = gtk_widget_get_screen(widget); --- -2.4.1 - diff --git a/x11-libs/libfm/libfm-1.2.3-r2.ebuild b/x11-libs/libfm/libfm-1.2.3-r2.ebuild deleted file mode 100644 index 10c70c2..0000000 --- a/x11-libs/libfm/libfm-1.2.3-r2.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit autotools fdo-mime multilib vala - -DESCRIPTION="A library for file management" -HOMEPAGE="http://pcmanfm.sourceforge.net/"; -SRC_URI="mirror://sourceforge/project/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0/4.3.0" #copy ABI_VERSION because it seems upstream change it randomly -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux" -IUSE="+automount debug doc examples exif +gtk +gtk3 udisks vala" - -COMMON_DEPEND="dev-libs/glib:2 - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( gtk? ( x11-libs/gtk+:2 ) ) - lxde-base/menu-cache - ~x11-libs/libfm-extra-${PV}" -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 - virtual/pkgconfig - sys-devel/gettext" - -MY_PV=${PV/_/} -MY_P="${PN}-${MY_PV}" -S="${WORKDIR}"/${MY_P} - -REQUIRED_USE="udisks? ( automount ) doc? ( gtk )" - -src_prepare() { - epatch "${FILESDIR}/0002-Fix-gdk_window_get_device_position-device-argument.patch" - epatch "${FILESDIR}/libfm-eacces.patch" - - 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 \ - --sysconfdir="${EPREFIX}/etc" \ - --disable-dependency-tracking \ - --disable-static \ - $(use_enable examples demo) \ - $(use_enable exif) \ - $(use_enable debug) \ - $(use_enable udisks) \ - $(use_enable vala actions) \ - $(use_with gtk) \ - $(usex gtk3 --with-gtk=3 "" "" "") \ - $(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() { - fdo-mime_mime_database_update -} - -pkg_postrm() { - fdo-mime_mime_database_update -} diff --git a/x11-misc/pcmanfm/Manifest b/x11-misc/pcmanfm/Manifest deleted file mode 100644 index c49cb17..0000000 --- a/x11-misc/pcmanfm/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST pcmanfm-1.2.3.tar.xz 406756 SHA256 cfa8d82fc63be147045174bef074807e1e32ce8c6bf4dbd8fad49e260bcf6380 SHA512 b350566c3aee0fe857ed1f0df2ae7d2ce51caf1547b951b380145078ba60f2fe6e0490c4d4c19465c5b1e0a9966205db6f8fe4dafb7cb3e987b9157551df2b28 WHIRLPOOL b342745086bf00e294cf40115c08f63ee99bb67c7f4cb4a6527b56bc3c26f85f93953a4655d91c1186335872342ef05362530f56c865fe5e46d8220a02cc781a diff --git a/x11-misc/pcmanfm/pcmanfm-1.2.3-r2.ebuild b/x11-misc/pcmanfm/pcmanfm-1.2.3-r2.ebuild deleted file mode 100644 index 5dcade4..0000000 --- a/x11-misc/pcmanfm/pcmanfm-1.2.3-r2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PLOCALES="ar be bg bn ca cs da de el en_GB es et eu fa fi fo fr gl he hr hu id -is it ja kk km ko lg lt lv ms nl pa pl pt pt_BR ro ru si sk sl sr sr@latin sv -te th tr tt_RU ug uk vi zh_CN zh_TW" -PLOCALE_BACKUP="en_GB" - -inherit eutils fdo-mime l10n readme.gentoo - -DESCRIPTION="Fast lightweight tabbed filemanager" -HOMEPAGE="http://pcmanfm.sourceforge.net/"; -SRC_URI="mirror://sourceforge/project/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86" -IUSE="debug +gtk3" - -RDEPEND="dev-libs/glib:2 - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) - lxde-base/menu-cache - x11-misc/shared-mime-info - >=x11-libs/libfm-${PV}:=[gtk(+),gtk3=] - virtual/eject - virtual/freedesktop-icon-theme" -DEPEND="${RDEPEND} - app-arch/xz-utils - dev-util/intltool - virtual/pkgconfig - sys-devel/gettext" - -MY_PV="${PV/_/}" -MY_P="${PN}-${MY_PV}" -S="${WORKDIR}"/${MY_P} - -DOCS=( AUTHORS ) - -DOC_CONTENTS="PCmanFM can optionally support the menu://applications/ - location. You should install lxde-base/lxmenu-data for that functionality." - -src_prepare() { - export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}" - l10n_get_locales > "${S}"/po/LINGUAS - epatch_user -} - -src_configure() { - econf --sysconfdir="${EPREFIX}/etc" $(use_enable debug) \ - $(usex gtk3 --with-gtk=3 "" "" "") -} - -pkg_postinst() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update - readme.gentoo_print_elog -} - -pkg_postrm() { - fdo-mime_desktop_database_update - fdo-mime_mime_database_update -} diff --git a/x11-misc/pcmanfm/pcmanfm-9999.ebuild b/x11-misc/pcmanfm/pcmanfm-9999.ebuild index 35b8eee..5bf38cc 100644 --- a/x11-misc/pcmanfm/pcmanfm-9999.ebuild +++ b/x11-misc/pcmanfm/pcmanfm-9999.ebuild @@ -1,58 +1,73 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI=5 +EAPI=6 PLOCALES="ar be bg bn ca cs da de el en_GB es et eu fa fi fo fr gl he hr hu id is it ja kk km ko lg lt lv ms nl pa pl pt pt_BR ro ru si sk sl sr sr@latin sv te th tr tt_RU ug uk vi zh_CN zh_TW" PLOCALE_BACKUP="en_GB" -inherit autotools eutils fdo-mime git-r3 l10n readme.gentoo +inherit autotools eutils fdo-mime l10n readme.gentoo-r1 + +if [[ ${PV} == *9999* ]]; then + EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}" + inherit git-r3 + KEYWORDS="" +else + SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86" +fi + +MY_PV="${PV/_/}" +MY_P="${PN}-${MY_PV}" DESCRIPTION="Fast lightweight tabbed filemanager" -HOMEPAGE="http://pcmanfm.sourceforge.net/"; -EGIT_REPO_URI="git://pcmanfm.git.sourceforge.net/gitroot/pcmanfm/${PN}" +HOMEPAGE="https://wiki.lxde.org/en/PCManFM"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="" IUSE="debug +gtk3" RDEPEND="dev-libs/glib:2 - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( x11-libs/gtk+:2 ) + gtk3? ( x11-libs/gtk+:3 ) + !gtk3? ( x11-libs/gtk+:2 ) lxde-base/menu-cache x11-misc/shared-mime-info - =x11-libs/libfm-${PV}:=[gtk(+),gtk3=] + >=x11-libs/libfm-${PV}:=[gtk(+),gtk3=] virtual/eject virtual/freedesktop-icon-theme" DEPEND="${RDEPEND} + app-arch/xz-utils dev-util/intltool virtual/pkgconfig sys-devel/gettext" -DOCS=( AUTHORS ) - -DOC_CONTENTS="PCmanFM can optionally support the menu://applications/ - location. You should install lxde-base/lxmenu-data for that functionality." +S="${WORKDIR}"/${MY_P} src_prepare() { + default + intltoolize --force --copy --automake || die - # drop -O0 -g. Bug #382265 and #382265 - sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" "${S}"/configure.ac || die - #Remove -Werror for automake-1.12. Bug #421101 - sed -i "s:-Werror::" configure.ac || die eautoreconf + export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}" - l10n_get_locales > "${S}"/po/LINGUAS - eapply_user + l10n_get_locales > po/LINGUAS || die } src_configure() { - econf --sysconfdir="${EPREFIX}/etc" $(use_enable debug) \ - $(usex gtk3 --with-gtk=3 "" "" "") + econf \ + --sysconfdir="${EPREFIX}"/etc \ + $(usex gtk3 --with-gtk=3 "" "" "") \ + $(use_enable debug) +} + +src_install() { + default + + local DOC_CONTENTS="PCmanFM can optionally support the menu://applications/ + location. You should install lxde-base/lxmenu-data for that functionality." + readme.gentoo_create_doc } pkg_postinst() {
