* [gentoo-commits] repo/gentoo:master commit in: x11-misc/pcmanfm/, x11-misc/pcmanfm/files/
@ 2016-09-15 7:42 Hanno Boeck
0 siblings, 0 replies; 4+ messages in thread
From: Hanno Boeck @ 2016-09-15 7:42 UTC (permalink / raw
To: gentoo-commits
commit: 83ae8df1d1e83ce4ff424c175201c3537e1eeda3
Author: Hanno <hanno <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 15 07:42:17 2016 +0000
Commit: Hanno Boeck <hanno <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 07:42:17 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83ae8df1
x11-misc/pcmanfm: version bump to 1.2.4
Also fix duplicate global definition, bump EAPI to 6.
Package-Manager: portage-2.3.0
x11-misc/pcmanfm/Manifest | 1 +
.../files/pcmanfm-1.2.4-fix-no-common.patch | 11 ++++
x11-misc/pcmanfm/pcmanfm-1.2.4.ebuild | 72 ++++++++++++++++++++++
3 files changed, 84 insertions(+)
diff --git a/x11-misc/pcmanfm/Manifest b/x11-misc/pcmanfm/Manifest
index 2324e37..10d7c87 100644
--- a/x11-misc/pcmanfm/Manifest
+++ b/x11-misc/pcmanfm/Manifest
@@ -2,3 +2,4 @@ DIST pcmanfm-0.9.10.tar.gz 565628 SHA256 f133c6f207f719d1fc69fe8bc07b2de6883c693
DIST pcmanfm-1.1.2.tar.gz 434785 SHA256 23ee33b34066ac83ce9a98bc9930049e69839438fb60489bd453bec8c2068950 SHA512 0640919477bef8a88b76eb96aaf7f261c423189b60b27f720514040b4006ab5d9d30db5f25380320efc322ca2631298c72ee52a92bebf11ebf162eaa577058e1 WHIRLPOOL e94311f287d1fecf85444e30038a8e6cc65942855c3a562c5fd3c86e53ec46adb4fcf732993857d6e0bb212d1dd49034efd0b9983edcc8f006c4481126e3c778
DIST pcmanfm-1.2.2.tar.xz 406584 SHA256 f620019ac0203b2d0e6eb8aa5a6a46e2bee15a43b4bdd9580db367b6325e9503 SHA512 a76be2e1e02d0e285b0ae239121260d438ae8fe96741d6cf24ddd554eb49187ae4a31d3193ebc688a4c042a96d35f3bfc6bb7c5af7fc288b08cd36711bd91e60 WHIRLPOOL 3bd00d760bd53f9bf010deddc39f7ac11e6c355908b72d258dd38fdf5227cfd2c33dd49d4b771b9ce7c8d64b6870ee5f39049e7b0bbee00834095e35deca6c5a
DIST pcmanfm-1.2.3.tar.xz 406756 SHA256 cfa8d82fc63be147045174bef074807e1e32ce8c6bf4dbd8fad49e260bcf6380 SHA512 b350566c3aee0fe857ed1f0df2ae7d2ce51caf1547b951b380145078ba60f2fe6e0490c4d4c19465c5b1e0a9966205db6f8fe4dafb7cb3e987b9157551df2b28 WHIRLPOOL b342745086bf00e294cf40115c08f63ee99bb67c7f4cb4a6527b56bc3c26f85f93953a4655d91c1186335872342ef05362530f56c865fe5e46d8220a02cc781a
+DIST pcmanfm-1.2.4.tar.xz 417316 SHA256 38cdbb5f01d24483b41b8e6846e4aa66a5751bb3982a8618899e88a853dbe313 SHA512 f4d0ed9d5dcc1b01643715fd54b94ff46967801f0c6d1dde6d196fadbedb5551cfda536d548237b187e5545cceea0a987f7c1c8e38659cae109b6483f14798f7 WHIRLPOOL ab2e6cac1a52c0f17c2469db0a8d8629c1a11fbefcc3bb0befe4ae55e0ed2905b476681e2fc67c8292667c8a2c384df7c10f48cfc0be7ed1bbab384d0ebc0aef
diff --git a/x11-misc/pcmanfm/files/pcmanfm-1.2.4-fix-no-common.patch b/x11-misc/pcmanfm/files/pcmanfm-1.2.4-fix-no-common.patch
new file mode 100644
index 00000000..46b0ac8
--- /dev/null
+++ b/x11-misc/pcmanfm/files/pcmanfm-1.2.4-fix-no-common.patch
@@ -0,0 +1,11 @@
+--- a/src/tab-page.h 2014-08-24 00:46:28.000000000 +0200
++++ b/src/tab-page.h 2016-08-21 18:12:33.509482924 +0200
+@@ -147,7 +147,7 @@
+ #if FM_CHECK_VERSION(1, 2, 0)
+ #include "pcmanfm-modules.h"
+
+-GList *_tab_page_modules; /* in pcmanfm.c */
++extern GList *_tab_page_modules; /* in pcmanfm.c */
+ #endif
+
+ G_END_DECLS
diff --git a/x11-misc/pcmanfm/pcmanfm-1.2.4.ebuild b/x11-misc/pcmanfm/pcmanfm-1.2.4.ebuild
new file mode 100644
index 00000000..81eafd6
--- /dev/null
+++ b/x11-misc/pcmanfm/pcmanfm-1.2.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 eutils fdo-mime l10n readme.gentoo-r1
+
+MY_PV="${PV/_/}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Fast lightweight tabbed filemanager"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+IUSE="debug"
+# Upstream report:
+# https://sourceforge.net/p/pcmanfm/bugs/1026/
+PATCHES=( "${FILESDIR}/${P}-fix-no-common.patch" )
+
+RDEPEND=">=dev-libs/glib-2.18:2
+ >=x11-libs/gtk+-2.16:2
+ >=lxde-base/menu-cache-0.3.2
+ x11-misc/shared-mime-info
+ >=x11-libs/libfm-${PV}:=[gtk(+)]
+ virtual/eject
+ virtual/freedesktop-icon-theme"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig
+ sys-devel/gettext"
+
+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
+ default
+}
+
+src_configure() {
+ econf --sysconfdir=/etc $(use_enable debug)
+}
+
+src_install() {
+ default
+ readme.gentoo_create_doc
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/pcmanfm/, x11-misc/pcmanfm/files/
@ 2017-07-30 15:13 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2017-07-30 15:13 UTC (permalink / raw
To: gentoo-commits
commit: 3e7da11f260f36acddc64b074d2eef63bb1a14b6
Author: charIes17 <charles17 <AT> arcor <DOT> de>
AuthorDate: Mon Jul 17 07:36:09 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jul 30 15:13:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e7da11f
x11-misc/pcmanfm: Add patch for CVE-2017-8934
Bug: https://bugs.gentoo.org/show_bug.cgi?id=618622
Bug: https://bugs.gentoo.org/show_bug.cgi?id=624938
Package-Manager: Portage-2.3.6, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/5118
.../files/pcmanfm-1.2.5-CVE-2017-8934.patch | 40 ++++++++++++++++++++++
x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild | 4 +--
x11-misc/pcmanfm/pcmanfm-1.2.5.ebuild | 24 +++++++------
x11-misc/pcmanfm/pcmanfm-9999.ebuild | 4 +--
4 files changed, 58 insertions(+), 14 deletions(-)
diff --git a/x11-misc/pcmanfm/files/pcmanfm-1.2.5-CVE-2017-8934.patch b/x11-misc/pcmanfm/files/pcmanfm-1.2.5-CVE-2017-8934.patch
new file mode 100644
index 00000000000..2acd91bffe2
--- /dev/null
+++ b/x11-misc/pcmanfm/files/pcmanfm-1.2.5-CVE-2017-8934.patch
@@ -0,0 +1,40 @@
+# index 8c2049a..876f7f3 100644 (file)
+# --- a/NEWS
+# +++ b/NEWS
+# @@ -1,3 +1,7 @@
+# +* Fixed potential access violation, use runtime user dir instead of tmp dir
+# + for single instance socket.
+# +
+# +
+# Changes on 1.2.5 since 1.2.4:
+
+ * Removed options to Cut, Remove and Rename from context menu on mounted
+diff --git a/src/single-inst.c b/src/single-inst.c
+index 62c37b3..aaf84ab 100644 (file)
+--- a/src/single-inst.c
++++ b/src/single-inst.c
+@@ -2,7 +2,7 @@
+ * single-inst.c: simple IPC mechanism for single instance app
+ *
+ * Copyright 2010 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+- * Copyright 2012 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
++ * Copyright 2012-2017 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+@@ -404,11 +404,16 @@ static void get_socket_name(SingleInstData* data, char* buf, int len)
+ }
+ else
+ dpynum = 0;
++#if GLIB_CHECK_VERSION(2, 28, 0)
++ g_snprintf(buf, len, "%s/%s-socket-%s-%d", g_get_user_runtime_dir(),
++ data->prog_name, host ? host : "", dpynum);
++#else
+ g_snprintf(buf, len, "%s/.%s-socket-%s-%d-%s",
+ g_get_tmp_dir(),
+ data->prog_name,
+ host ? host : "",
+ dpynum,
+ g_get_user_name());
++#endif
+ }
diff --git a/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild b/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild
index dfe38dce2bc..a15faa771fe 100644
--- a/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -13,7 +13,7 @@ MY_PV="${PV/_/}"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="Fast lightweight tabbed filemanager"
-HOMEPAGE="http://pcmanfm.sourceforge.net/"
+HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.xz"
LICENSE="GPL-2"
diff --git a/x11-misc/pcmanfm/pcmanfm-1.2.5.ebuild b/x11-misc/pcmanfm/pcmanfm-1.2.5.ebuild
index 232e40452c5..165284c0435 100644
--- a/x11-misc/pcmanfm/pcmanfm-1.2.5.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-1.2.5.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+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"
@@ -13,7 +14,7 @@ MY_PV="${PV/_/}"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="Fast lightweight tabbed filemanager"
-HOMEPAGE="http://pcmanfm.sourceforge.net/"
+HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
@@ -36,23 +37,26 @@ DEPEND="${RDEPEND}
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."
+PATCHES=( "${FILESDIR}"/${PN}-1.2.5-CVE-2017-8934.patch )
src_prepare() {
- export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
- l10n_get_locales > "${S}"/po/LINGUAS
default
+
+ export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
+ l10n_get_locales > po/LINGUAS || die
}
src_configure() {
- econf --sysconfdir=/etc $(use_enable debug)
+ econf \
+ --sysconfdir="${EPREFIX}"/etc \
+ $(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
}
diff --git a/x11-misc/pcmanfm/pcmanfm-9999.ebuild b/x11-misc/pcmanfm/pcmanfm-9999.ebuild
index 0613ad8b5f8..5edc83ba4c0 100644
--- a/x11-misc/pcmanfm/pcmanfm-9999.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -22,7 +22,7 @@ MY_PV="${PV/_/}"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="Fast lightweight tabbed filemanager"
-HOMEPAGE="http://pcmanfm.sourceforge.net/"
+HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
LICENSE="GPL-2"
SLOT="0"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/pcmanfm/, x11-misc/pcmanfm/files/
@ 2020-03-18 6:46 Hanno Böck
0 siblings, 0 replies; 4+ messages in thread
From: Hanno Böck @ 2020-03-18 6:46 UTC (permalink / raw
To: gentoo-commits
commit: d58971ab9ae338f5c5a7138149f2ca5499f4c6be
Author: Hanno Böck <hanno <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 18 06:46:09 2020 +0000
Commit: Hanno Böck <hanno <AT> gentoo <DOT> org>
CommitDate: Wed Mar 18 06:46:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d58971ab
x11-misc/pcmanfm: Remove old versions
Cleanup for CVE-2017-8934 (see bug #618622).
Signed-off-by: Hanno Böck <hanno <AT> gentoo.org>
Package-Manager: Portage-2.3.94, Repoman-2.3.21
x11-misc/pcmanfm/Manifest | 2 -
.../files/pcmanfm-1.2.5-CVE-2017-8934.patch | 40 ------------
x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild | 63 -------------------
x11-misc/pcmanfm/pcmanfm-1.2.5.ebuild | 72 ----------------------
4 files changed, 177 deletions(-)
diff --git a/x11-misc/pcmanfm/Manifest b/x11-misc/pcmanfm/Manifest
index cfa29c589d6..fb8f8b08509 100644
--- a/x11-misc/pcmanfm/Manifest
+++ b/x11-misc/pcmanfm/Manifest
@@ -1,3 +1 @@
-DIST pcmanfm-1.2.3.tar.xz 406756 BLAKE2B e8f4c166559266b4628f5fda4b7595ea8a28e37aa71cc3ec957ff04af8c919a248da5b189eb52040f2d049f633313cf9386c77b331b8e491ed4b3a69615c5010 SHA512 b350566c3aee0fe857ed1f0df2ae7d2ce51caf1547b951b380145078ba60f2fe6e0490c4d4c19465c5b1e0a9966205db6f8fe4dafb7cb3e987b9157551df2b28
-DIST pcmanfm-1.2.5.tar.xz 417808 BLAKE2B 1bc4ff7879baa1b62c5acf0b48977f5a81b5bac2d449064ed3ae74740f8e6981ae129cdfe123b63e57e2a22769273348df1a48def61eeb6a72a5918fdad2847c SHA512 ce53315483f58361c5a7797bdca355dbbedc2cf3907d319c7c65be844ea74ed297497dc3183c903e06b8294f6301d19347f6b9871e34bf773c04ff4fb8ab32f3
DIST pcmanfm-1.3.1.tar.xz 423380 BLAKE2B c117f789d88b8c776f09dd598256bc889bf1d1ea2854a646da30e57e8e3b4a1410cf8411841e1b3c303f7f0cf4ec3d4046c0e05ad9c453efd1589592415119f3 SHA512 68fbc55b3ffd9da17c861d2cc41590a455ec2c0eb590ba4862f8a0ae01caac34a58645d847d318553ff588df20d355bbcbf1138a792cb45922eb04b047f681c4
diff --git a/x11-misc/pcmanfm/files/pcmanfm-1.2.5-CVE-2017-8934.patch b/x11-misc/pcmanfm/files/pcmanfm-1.2.5-CVE-2017-8934.patch
deleted file mode 100644
index 2acd91bffe2..00000000000
--- a/x11-misc/pcmanfm/files/pcmanfm-1.2.5-CVE-2017-8934.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-# index 8c2049a..876f7f3 100644 (file)
-# --- a/NEWS
-# +++ b/NEWS
-# @@ -1,3 +1,7 @@
-# +* Fixed potential access violation, use runtime user dir instead of tmp dir
-# + for single instance socket.
-# +
-# +
-# Changes on 1.2.5 since 1.2.4:
-
- * Removed options to Cut, Remove and Rename from context menu on mounted
-diff --git a/src/single-inst.c b/src/single-inst.c
-index 62c37b3..aaf84ab 100644 (file)
---- a/src/single-inst.c
-+++ b/src/single-inst.c
-@@ -2,7 +2,7 @@
- * single-inst.c: simple IPC mechanism for single instance app
- *
- * Copyright 2010 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
-- * Copyright 2012 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
-+ * Copyright 2012-2017 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
-@@ -404,11 +404,16 @@ static void get_socket_name(SingleInstData* data, char* buf, int len)
- }
- else
- dpynum = 0;
-+#if GLIB_CHECK_VERSION(2, 28, 0)
-+ g_snprintf(buf, len, "%s/%s-socket-%s-%d", g_get_user_runtime_dir(),
-+ data->prog_name, host ? host : "", dpynum);
-+#else
- g_snprintf(buf, len, "%s/.%s-socket-%s-%d-%s",
- g_get_tmp_dir(),
- data->prog_name,
- host ? host : "",
- dpynum,
- g_get_user_name());
-+#endif
- }
diff --git a/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild b/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild
deleted file mode 100644
index 968a5439acb..00000000000
--- a/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 xdg-utils l10n readme.gentoo
-
-MY_PV="${PV/_/}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Fast lightweight tabbed filemanager"
-HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
-SRC_URI="https://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.18:2
- >=x11-libs/gtk+-2.16:2
- >=lxde-base/menu-cache-0.3.2
- x11-misc/shared-mime-info
- >=x11-libs/libfm-${PV}:=[gtk(+)]
- virtual/eject
- virtual/freedesktop-icon-theme"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- sys-devel/gettext"
-
-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=/etc $(use_enable debug)
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/x11-misc/pcmanfm/pcmanfm-1.2.5.ebuild b/x11-misc/pcmanfm/pcmanfm-1.2.5.ebuild
deleted file mode 100644
index 79c9d379f07..00000000000
--- a/x11-misc/pcmanfm/pcmanfm-1.2.5.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 eutils xdg-utils l10n readme.gentoo-r1
-
-MY_PV="${PV/_/}"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Fast lightweight tabbed filemanager"
-HOMEPAGE="https://wiki.lxde.org/en/PCManFM"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.18:2
- >=x11-libs/gtk+-2.16:2
- >=lxde-base/menu-cache-0.3.2
- x11-misc/shared-mime-info
- >=x11-libs/libfm-${PV}:=[gtk(+)]
- virtual/eject
- virtual/freedesktop-icon-theme"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- >=dev-util/intltool-0.40
- virtual/pkgconfig
- sys-devel/gettext"
-
-S="${WORKDIR}"/${MY_P}
-
-PATCHES=( "${FILESDIR}"/${PN}-1.2.5-CVE-2017-8934.patch )
-
-src_prepare() {
- default
-
- export LINGUAS="${LINGUAS:-${PLOCALE_BACKUP}}"
- l10n_get_locales > po/LINGUAS || die
-}
-
-src_configure() {
- econf \
- --sysconfdir="${EPREFIX}"/etc \
- $(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() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- readme.gentoo_print_elog
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/pcmanfm/, x11-misc/pcmanfm/files/
@ 2024-07-28 4:49 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-07-28 4:49 UTC (permalink / raw
To: gentoo-commits
commit: 4b32696a00abf08b3734ed3355aeb382c917c5f3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 04:48:39 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 04:48:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b32696a
x11-misc/pcmanfm: fix modern C issues
Closes: https://bugs.gentoo.org/919077
Signed-off-by: Sam James <sam <AT> gentoo.org>
x11-misc/pcmanfm/files/pcmanfm-1.3.2-c99.patch | 31 +++++++++++++
x11-misc/pcmanfm/pcmanfm-1.3.2-r2.ebuild | 62 ++++++++++++++++++++++++++
2 files changed, 93 insertions(+)
diff --git a/x11-misc/pcmanfm/files/pcmanfm-1.3.2-c99.patch b/x11-misc/pcmanfm/files/pcmanfm-1.3.2-c99.patch
new file mode 100644
index 000000000000..52337891d5d6
--- /dev/null
+++ b/x11-misc/pcmanfm/files/pcmanfm-1.3.2-c99.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/919077
+https://github.com/lxde/pcmanfm/pull/17
+
+From 9bf5145eba45cd5e3b87d4f040618fe0ea69a81d Mon Sep 17 00:00:00 2001
+From: Mamoru TASAKA <mtasaka@fedoraproject.org>
+Date: Fri, 26 Jul 2024 12:13:32 +0900
+Subject: [PATCH] Fix build with gcc14 -Werror=incompatible-pointer-types
+
+gcc14 now defaults to gcc -Werror=incompatible-pointer-types .
+This commit adds required casts to different pointer types.
+--- a/src/desktop.c
++++ b/src/desktop.c
+@@ -1267,7 +1267,7 @@ static AtkObject *fm_desktop_accessible_ref_selection(AtkSelection *selection,
+ item = items->data;
+ if (item->item->is_selected)
+ if (i-- == 0)
+- return g_object_ref(item);
++ return (AtkObject *)g_object_ref(item);
+ }
+ return NULL;
+ }
+@@ -1454,7 +1454,7 @@ static AtkObject *fm_desktop_accessible_ref_child(AtkObject *accessible,
+ item = g_list_nth_data(priv->items, index);
+ if (!item)
+ return NULL;
+- return g_object_ref(item);
++ return (AtkObject *)g_object_ref(item);
+ }
+
+ static void fm_desktop_accessible_initialize(AtkObject *accessible, gpointer data)
+
diff --git a/x11-misc/pcmanfm/pcmanfm-1.3.2-r2.ebuild b/x11-misc/pcmanfm/pcmanfm-1.3.2-r2.ebuild
new file mode 100644
index 000000000000..27188a32160d
--- /dev/null
+++ b/x11-misc/pcmanfm/pcmanfm-1.3.2-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P="${PN}-${PV/_/}"
+inherit xdg readme.gentoo-r1
+
+DESCRIPTION="Fast lightweight tabbed filemanager"
+HOMEPAGE="https://github.com/lxde/pcmanfm"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.xz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~riscv ~x86"
+IUSE="debug"
+
+RDEPEND="
+ dev-libs/atk
+ >=dev-libs/glib-2.18:2
+ >=lxde-base/menu-cache-1.1.0-r1
+ sys-apps/util-linux
+ virtual/freedesktop-icon-theme
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ >=x11-libs/libfm-${PV}:=[gtk]
+ x11-libs/libX11
+ x11-libs/pango
+ x11-misc/shared-mime-info
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=dev-util/intltool-0.40
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.2-c99.patch
+)
+
+src_configure() {
+ econf \
+ --sysconfdir="${EPREFIX}"/etc \
+ --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() {
+ xdg_pkg_postinst
+ readme.gentoo_print_elog
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-07-28 4:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-18 6:46 [gentoo-commits] repo/gentoo:master commit in: x11-misc/pcmanfm/, x11-misc/pcmanfm/files/ Hanno Böck
-- strict thread matches above, loose matches on Subject: below --
2024-07-28 4:49 Sam James
2017-07-30 15:13 David Seifert
2016-09-15 7:42 Hanno Boeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox