From 3cf4bef699a9bf75c81daacad7c756ae7b538439 Mon Sep 17 00:00:00 2001
From: Peter Marquardt <wwwutz@molgen.mpg.de>
Date: Wed, 8 Feb 2023 15:25:23 +0100
Subject: [PATCH] doublecmd: update 1.0.10 to 1.1.0-alpha / git master

+= patch for /etc/os-release
---
 doublecmd.be0 | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/doublecmd.be0 b/doublecmd.be0
index 85d74c90d..2dbbb1be6 100755
--- a/doublecmd.be0
+++ b/doublecmd.be0
@@ -1,9 +1,11 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION doublecmd-1.0.10-1
+# BEE_VERSION doublecmd-1.1.0.20230208-0
 
 # SRCURL[0]="https://downloads.sourceforge.net/project/doublecmd/Double%20Commander%20Source/doublecmd-${PKGVERSION}-src.tar.gz"
-SRCURL+=("https://beehive.molgen.mpg.de/add9601cbca3b9ba1df85e502fec3c97/doublecmd-1.0.10-src.tar.gz")
+# SRCURL+=("https://beehive.molgen.mpg.de/add9601cbca3b9ba1df85e502fec3c97/doublecmd-1.0.10-src.tar.gz")
+
+SRCURL+=("https://beehive.molgen.mpg.de/8dbbdd54f7907017376562ea77b28d0b/doublecmd-86d57582.tar.gz")
 
 # git clone https://github.com/doublecmd/doublecmd.git doublecmd
 # SRCURL+=("https://beehive.molgen.mpg.de/b4dc381a2640a41cc881d7f41d0b8cc1/doublecmd-git.tar")
@@ -30,7 +32,7 @@ SRCURL+=("https://beehive.molgen.mpg.de/b1b37cb1366df1d7dabe64345590d225/fpcup-3
 # git clone --recurse-submodules https://gitlab.com/freepascal.org/lazarus/lazarus.git/ lazarus
 SRCURL+=("https://beehive.molgen.mpg.de/9c502cc2018b6d0b84fc6898ce79208a/lazarus-git.tar")
 
-PATCHURL+=("/src/mariux/patches/doublecmd-1.0.10-versioninfo-proc-before-issue.patch")
+# PATCHURL+=("/src/mariux/patches/doublecmd-1.0.10-versioninfo-proc-before-issue.patch")
 
 NPROC=$(nproc)
 
@@ -244,29 +246,25 @@ ${S}/build.bee.mkbuild
 cat >${B}/doublecmd <<_EOF_
 #!/bin/bash
 export QT_XCB_GL_INTEGRATION=none
-export LD_LIBRARY_PATH=/usr/libexec/doublecmd${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
-exec /usr/libexec/doublecmd/doublecmd "${@}"
+# export LD_LIBRARY_PATH=/usr/lib/doublecmd${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH
+exec /usr/lib/doublecmd/doublecmd "${@}"
 _EOF_
 
 }
 
 mee_install() {
+    set -x
+    ${S}/install/linux/install.sh --install-prefix ${D}
+
+    mkdir -pv ${D}/usr/lib
+    cp -vax ${B}/fpcupdeluxe/lazarus/lcl/interfaces/qt5/cbindings/libQt5Pas.so* ${D}/usr/lib
 
-    # wrapper
-    mkdir -vp ${D}/usr/bin
+    rm -v ${D}/usr/bin/doublecmd
     install -v -m0755 ${B}/doublecmd ${D}/usr/bin
-    # binary
-    mkdir -vp ${D}/usr/libexec/doublecmd
-    install -v -m0755 ${S}/doublecmd ${D}/usr/libexec/doublecmd
-    # libs
-    cp -vax ${B}/fpcupdeluxe/lazarus/lcl/interfaces/qt5/cbindings/libQt5Pas.so* ${D}/usr/libexec/doublecmd
-    # icons
-    cp -ax ${S}/pixmaps ${D}/usr/libexec/doublecmd
+    set +x
 }
 
 mee_install_post() {
     echo "./contentdiff.pl /usr/share/bee/${PKGFULLNAME}-[0-9]*/CONTENT ${D}/"
     echo "( cd ${D}; find . -ls )"
 }
-
-# QT_XCB_GL_INTEGRATION=none LD_LIBRARY_PATH=/scratch/local2/bee-root/doublecmd/doublecmd-1.0.10-0/image/usr/lib ./doublecmd