[gentoo-commits] repo/proj/guru:master commit in: app-misc/doublecmd/, app-misc/doublecmd/files/

[gentoo-commits] repo/proj/guru:master commit in: app-misc/doublecmd/, app-misc/doublecmd/files/

[Julien Roy]

commit:     15113629c3d22eca6e97474b92e1bd902ddddd20
Author:     demize <demize <AT> unstable <DOT> systems>
AuthorDate: Thu Jan  2 22:34:03 2025 +0000
Commit:     Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Thu Jan  2 22:34:03 2025 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=15113629

app-misc/doublecmd: make patch generic

Signed-off-by: demize <demize <AT> unstable.systems>

 app-misc/doublecmd/doublecmd-1.1.16-r1.ebuild                 |  2 +-
 app-misc/doublecmd/doublecmd-1.1.21.ebuild                    |  2 +-
 ...doublecmd-1.1.16-build.patch => 00-lazbuild-command.patch} |  0
 app-misc/doublecmd/files/doublecmd-1.1.21-build.patch         | 11 -----------
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/app-misc/doublecmd/doublecmd-1.1.16-r1.ebuild b/app-misc/doublecmd/doublecmd-1.1.16-r1.ebuild
index 421d135ef..2a3563aa3 100644
--- a/app-misc/doublecmd/doublecmd-1.1.16-r1.ebuild
+++ b/app-misc/doublecmd/doublecmd-1.1.16-r1.ebuild
@@ -30,7 +30,7 @@ BDEPEND="
 	>=dev-lang/lazarus-3.0[qt6]
 "
 
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
+PATCHES=( "${FILESDIR}"/00-lazbuild-command.patch )
 
 # Built with fpc, does not respect anything
 QA_FLAGS_IGNORED=".*"

diff --git a/app-misc/doublecmd/doublecmd-1.1.21.ebuild b/app-misc/doublecmd/doublecmd-1.1.21.ebuild
index 421d135ef..2a3563aa3 100644
--- a/app-misc/doublecmd/doublecmd-1.1.21.ebuild
+++ b/app-misc/doublecmd/doublecmd-1.1.21.ebuild
@@ -30,7 +30,7 @@ BDEPEND="
 	>=dev-lang/lazarus-3.0[qt6]
 "
 
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
+PATCHES=( "${FILESDIR}"/00-lazbuild-command.patch )
 
 # Built with fpc, does not respect anything
 QA_FLAGS_IGNORED=".*"

diff --git a/app-misc/doublecmd/files/doublecmd-1.1.16-build.patch b/app-misc/doublecmd/files/00-lazbuild-command.patch
similarity index 100%
rename from app-misc/doublecmd/files/doublecmd-1.1.16-build.patch
rename to app-misc/doublecmd/files/00-lazbuild-command.patch

diff --git a/app-misc/doublecmd/files/doublecmd-1.1.21-build.patch b/app-misc/doublecmd/files/doublecmd-1.1.21-build.patch
deleted file mode 100644
index b2c90cc87..000000000
--- a/app-misc/doublecmd/files/doublecmd-1.1.21-build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/build.sh
-+++ b/build.sh
-@@ -15,7 +15,7 @@
- # default - compiling DC only (using by default)
- 
- # path to lazbuild
--export lazbuild=$(which lazbuild)
-+export lazbuild="/usr/bin/lazbuild --pcp=~/.lazarus  --lazarusdir=/usr/share/lazarus"
- 
- # Set up widgetset: gtk or gtk2 or qt
- # Set up processor architecture: i386 or x86_64