[gentoo-commits] repo/gentoo:master commit in: x11-misc/rofi-file-browser-extended/, x11-misc/rofi-file-browser-extended/files/
commit: 3d04a98e40cdd18d7e359c5705b8d0428db12ffd
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 18 10:29:27 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Mon Dec 19 14:38:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d04a98e
x11-misc/rofi-file-browser-extended: drop 1.2.0-r2
Signed-off-by: Andreas Sturmlechner gentoo.org>
Signed-off-by: Florian Schmaus gentoo.org>
x11-misc/rofi-file-browser-extended/Manifest | 1 -
...er-extended-1.2.0-do-not-install-man-page.patch | 32 -
.../rofi-file-browser-extended-1.2.0-r2.ebuild | 41 --
3 files changed, 74 deletions(-)
diff --git a/x11-misc/rofi-file-browser-extended/Manifest
b/x11-misc/rofi-file-browser-extended/Manifest
index 51c29886b887..2dafe33fb12b 100644
--- a/x11-misc/rofi-file-browser-extended/Manifest
+++ b/x11-misc/rofi-file-browser-extended/Manifest
@@ -1,2 +1 @@
-DIST rofi-file-browser-extended-1.2.0.tar.gz 23560 BLAKE2B
bb5637e9a56009949b4241c218a73fdb79cf5065906b7f48874ee64e3d38d4b68a751eec937eededd040086b2560f6e6f92440d9cc0900be3f3dee54a03f8f83
SHA512
74e5adeadaa0322e1d489bda79db58b416553daefbbc353012b82855529875aefd42c53458efe059ee1aa7ea6b7550b791dd56a11c207c5cc6f4ed46d17bdb81
DIST rofi-file-browser-extended-1.3.1.tar.gz 27169 BLAKE2B
ced5ae91a865b136bcb2182a17c7a49cbdfcc861f8d1063415691afb13f5bdf3f1c2c0fc56a21a0dec31ee656c2379e55a4f60899c59ca7e056438142675aeb2
SHA512
269e33d62e5fdf7f6c48763ae4309fac53873d53af4ebf78f731b709ac6ff41d8f8cf21de917866fe5a80f4949d70d3be6e516c3825a8768106c706438a5b3d1
diff --git
a/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.2.0-do-not-install-man-page.patch
b/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.2.0-do-not-install-man-page.patch
deleted file mode 100644
index 410943815ac8..
---
a/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.2.0-do-not-install-man-page.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 47f61ae6b971e71c55788b790146ffe63d64c834 Mon Sep 17 00:00:00 2001
-From: Florian Schmaus
-Date: Tue, 1 Jun 2021 11:05:05 +0200
-Subject: [PATCH] Do not install man page
-
- CMakeLists.txt | 12
- 1 file changed, 12 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5ab8168df336..901de539097e 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,15 +28,3 @@ target_link_libraries(filebrowser
- )
-
- install(TARGETS filebrowser DESTINATION ${ROFI_PLUGINS_DIR})
--
--
--
--# Manpage
--
--add_custom_command(OUTPUT "doc/rofi-file-browser-extended.1.gz"
-- COMMAND gzip -k "doc/rofi-file-browser-extended.1"
-- COMMENT "Packing manpage")
--
--add_custom_target(manpage ALL DEPENDS "doc/rofi-file-browser-extended.1.gz")
--
--install(FILES "doc/rofi-file-browser-extended.1.gz" DESTINATION
"/usr/share/man/man1")
---
-2.31.1
-
diff --git
a/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.2.0-r2.ebuild
b/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.2.0-r2.ebuild
deleted file mode 100644
index 5dd899576fa2..
---
a/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.2.0-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A file browser for rofi"
-HOMEPAGE="https://github.com/marvinkreis/rofi-file-browser-extended;
-
-if [[ ${PV} == "" ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/marvinkreis/${PN}.git;
-else
-
SRC_URI="https://github.com/marvinkreis/${PN}/archive/refs/tags/${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="amd64 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-BDEPEND="virtual/pkgconfig"
-COMMON_DEPEND="
- dev-libs/glib:2
- x11-misc/rofi
-"
-DEPEND="
- ${COMMON_DEPEND}
- x11-libs/cairo
-"
-RDEPEND="${COMMON_DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-do-not-install-man-page.patch"
-)
-
-src_install() {
- cmake_src_install
- doman "doc/${PN}.1"
-}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/rofi-file-browser-extended/, x11-misc/rofi-file-browser-extended/files/
commit: 327662dcb2dd6690f56655e5f29afcceb36655f9
Author: Florian Schmaus gentoo org>
AuthorDate: Fri Nov 11 14:23:56 2022 +
Commit: Florian Schmaus gentoo org>
CommitDate: Fri Nov 11 14:25:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=327662dc
x11-misc/rofi-file-browser-extended: fix incompatible-function-pointer-types
Closes: https://bugs.gentoo.org/880985
Signed-off-by: Florian Schmaus gentoo.org>
Upstream: https://github.com/marvinkreis/rofi-file-browser-extended/pull/49
...1.3.1-fix-function-pointer-initialization.patch | 23 ++
... => rofi-file-browser-extended-1.3.1-r1.ebuild} | 6 +-
2 files changed, 28 insertions(+), 1 deletion(-)
diff --git
a/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.3.1-fix-function-pointer-initialization.patch
b/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.3.1-fix-function-pointer-initialization.patch
new file mode 100644
index ..0cfff4286608
--- /dev/null
+++
b/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.3.1-fix-function-pointer-initialization.patch
@@ -0,0 +1,23 @@
+From 6f62a2d0784a6937d35ac8f6df2e22c23bbfc8f4 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus
+Date: Fri, 11 Nov 2022 15:03:32 +0100
+Subject: [PATCH] Fix function pointer initialization
+
+Fix
+
+src/filebrowser.c:380:27: warning: incompatible function pointer types
initializing '_mode_get_icon' (aka 'struct _cairo_surface *(*)(const struct
rofi_mode *, unsigned int, unsigned int)') with an expression of type
'cairo_surface_t *(const Mode *, unsigned int, int)' (aka 'struct
_cairo_surface *(const struct rofi_mode *, unsigned int, int)')
[-Wincompatible-function-pointer-types]
+._get_icon = file_browser_get_icon,
+ ^
+
+See also https://bugs.gentoo.org/880985
+--- a/src/filebrowser.c
b/src/filebrowser.c
+@@ -263,7 +263,7 @@ static char *file_browser_get_display_value ( const Mode
*sw, unsigned int selec
+ }
+ }
+
+-static cairo_surface_t *file_browser_get_icon ( const Mode *sw, unsigned int
selected_line, int height )
++static cairo_surface_t *file_browser_get_icon ( const Mode *sw, unsigned int
selected_line, unsigned int height )
+ {
+ FileBrowserModePrivateData *pd = ( FileBrowserModePrivateData * )
mode_get_private_data ( sw );
+ FileBrowserFileData *fd = >file_data;
diff --git
a/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1.ebuild
b/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1-r1.ebuild
similarity index 82%
rename from
x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1.ebuild
rename to
x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1-r1.ebuild
index 2be17da588a0..a3fe3b3b176b 100644
---
a/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1.ebuild
+++
b/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.3.1-r1.ebuild
@@ -30,10 +30,14 @@ DEPEND="
"
RDEPEND="${COMMON_DEPEND}"
+PATCHES=(
+ # https://bugs.gentoo.org/880985
https://github.com/marvinkreis/rofi-file-browser-extended/pull/49
+ "${FILESDIR}/${PN}-1.3.1-fix-function-pointer-initialization.patch"
+)
+
src_prepare() {
# Delete the lines in CMakeLists.txt that install the man page.
sed -i "45,56d" CMakeLists.txt || die
- default
cmake_src_prepare
}
[gentoo-commits] repo/gentoo:master commit in: x11-misc/rofi-file-browser-extended/, x11-misc/rofi-file-browser-extended/files/
commit: afe308b1eea84cba66cfba823c61ef588c12d8ac
Author: Florian Schmaus gentoo org>
AuthorDate: Fri Aug 20 18:45:11 2021 +
Commit: Florian Schmaus gentoo org>
CommitDate: Fri Aug 20 18:45:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afe308b1
x11-misc/rofi-file-browser-extended: initial import (from ::guru)
Signed-off-by: Florian Schmaus gentoo.org>
x11-misc/rofi-file-browser-extended/Manifest | 1 +
...er-extended-1.2.0-do-not-install-man-page.patch | 32 +
x11-misc/rofi-file-browser-extended/metadata.xml | 8 +
.../rofi-file-browser-extended-1.2.0-r2.ebuild | 41 ++
4 files changed, 82 insertions(+)
diff --git a/x11-misc/rofi-file-browser-extended/Manifest
b/x11-misc/rofi-file-browser-extended/Manifest
new file mode 100644
index 000..c3a86416068
--- /dev/null
+++ b/x11-misc/rofi-file-browser-extended/Manifest
@@ -0,0 +1 @@
+DIST rofi-file-browser-extended-1.2.0.tar.gz 23560 BLAKE2B
bb5637e9a56009949b4241c218a73fdb79cf5065906b7f48874ee64e3d38d4b68a751eec937eededd040086b2560f6e6f92440d9cc0900be3f3dee54a03f8f83
SHA512
74e5adeadaa0322e1d489bda79db58b416553daefbbc353012b82855529875aefd42c53458efe059ee1aa7ea6b7550b791dd56a11c207c5cc6f4ed46d17bdb81
diff --git
a/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.2.0-do-not-install-man-page.patch
b/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.2.0-do-not-install-man-page.patch
new file mode 100644
index 000..410943815ac
--- /dev/null
+++
b/x11-misc/rofi-file-browser-extended/files/rofi-file-browser-extended-1.2.0-do-not-install-man-page.patch
@@ -0,0 +1,32 @@
+From 47f61ae6b971e71c55788b790146ffe63d64c834 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus
+Date: Tue, 1 Jun 2021 11:05:05 +0200
+Subject: [PATCH] Do not install man page
+
+---
+ CMakeLists.txt | 12
+ 1 file changed, 12 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5ab8168df336..901de539097e 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -28,15 +28,3 @@ target_link_libraries(filebrowser
+ )
+
+ install(TARGETS filebrowser DESTINATION ${ROFI_PLUGINS_DIR})
+-
+-
+-
+-# Manpage
+-
+-add_custom_command(OUTPUT "doc/rofi-file-browser-extended.1.gz"
+- COMMAND gzip -k "doc/rofi-file-browser-extended.1"
+- COMMENT "Packing manpage")
+-
+-add_custom_target(manpage ALL DEPENDS "doc/rofi-file-browser-extended.1.gz")
+-
+-install(FILES "doc/rofi-file-browser-extended.1.gz" DESTINATION
"/usr/share/man/man1")
+--
+2.31.1
+
diff --git a/x11-misc/rofi-file-browser-extended/metadata.xml
b/x11-misc/rofi-file-browser-extended/metadata.xml
new file mode 100644
index 000..7a926064dca
--- /dev/null
+++ b/x11-misc/rofi-file-browser-extended/metadata.xml
@@ -0,0 +1,8 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+ f...@gentoo.org
+ Florian Schmaus
+
+
diff --git
a/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.2.0-r2.ebuild
b/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.2.0-r2.ebuild
new file mode 100644
index 000..a049936302e
--- /dev/null
+++
b/x11-misc/rofi-file-browser-extended/rofi-file-browser-extended-1.2.0-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A file browser for rofi"
+HOMEPAGE="https://github.com/marvinkreis/rofi-file-browser-extended;
+
+if [[ ${PV} == "" ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/marvinkreis/${PN}.git;
+else
+
SRC_URI="https://github.com/marvinkreis/${PN}/archive/refs/tags/${PV}.tar.gz ->
${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+COMMON_DEPEND="
+ dev-libs/glib:2
+ x11-misc/rofi
+"
+DEPEND="
+ ${COMMON_DEPEND}
+ x11-libs/cairo
+"
+RDEPEND="${COMMON_DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-do-not-install-man-page.patch"
+)
+
+src_install() {
+ cmake_src_install
+ doman "doc/${PN}.1"
+}
