Merge pull request #2847 from mariux64/update-doublecmd-1.0.10-alpha

doublecmd: update 1.0.10 to 1.1.0-alpha / git master
mariux64 · Feb 8, 2023 · 7ab443e · 7ab443e
2 parents cb7cc07 + 3cf4bef
commit 7ab443e
Showing 1 changed file with 18 additions and 26 deletions.
diff --git a/doublecmd.be0 b/doublecmd.be0
@@ -1,9 +1,11 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION doublecmd-1.0.10-0
+# 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")
@@ -21,19 +23,16 @@ SRCURL+=("https://beehive.molgen.mpg.de/add9601cbca3b9ba1df85e502fec3c97/doublec
 # SRCURL+=("https://beehive.molgen.mpg.de/96a1b21fc709daaa620b057ba22f8692/lazarus-2.2.2-0.tar.gz")
 
 # git clone --recurse-submodules  https://gitlab.com/freepascal.org/fpc/source.git/ fpcsrc
-### SRCURL+=("https://beehive.molgen.mpg.de/f7fd6c50cd6787d4a1a481ff41cbeba3/fpcsrc-git.tar")
+SRCURL+=("https://beehive.molgen.mpg.de/f7fd6c50cd6787d4a1a481ff41cbeba3/fpcsrc-git.tar")
 
 # bootstrapper
 # https://github.com/LongDirtyAnimAlf/fpcupdeluxe/releases/download/bootstrappers_v1.0/fpcup-3_2_2-x86_64-linux-ppcx64
-### SRCURL+=("https://beehive.molgen.mpg.de/b1b37cb1366df1d7dabe64345590d225/fpcup-3_2_2-x86_64-linux-ppcx64 ppcx64")
+SRCURL+=("https://beehive.molgen.mpg.de/b1b37cb1366df1d7dabe64345590d225/fpcup-3_2_2-x86_64-linux-ppcx64 ppcx64")
 
 # git clone --recurse-submodules https://gitlab.com/freepascal.org/lazarus/lazarus.git/ lazarus
-###SRCURL+=("https://beehive.molgen.mpg.de/9c502cc2018b6d0b84fc6898ce79208a/lazarus-git.tar")
-
-# prebuilt
-SRCURL+=("https://beehive.molgen.mpg.de/f1090423fc6c97bb9c6fd6af28e78bb5/dc-1.0.10-fpcupdeluxe.tar")
+SRCURL+=("https://beehive.molgen.mpg.de/9c502cc2018b6d0b84fc6898ce79208a/lazarus-git.tar")
 
-# PATCHURL[0]=""
+# PATCHURL+=("/src/mariux/patches/doublecmd-1.0.10-versioninfo-proc-before-issue.patch")
 
 NPROC=$(nproc)
 
@@ -49,12 +48,9 @@ mee_extract() {
     done
     bee_extract "${X[@]}"
 
-#    tar xf ${F}/doublecmd-git.tar --strip-components=1 -C ${S}
 
     if [ ! -d ${B}/fpcupdeluxe ]; then
-        mkdir -p ${B}
-#        tar xf ${F}/dc-1.0.10-fpcupdeluxe.tar -C ${B}
-      mkdir -p ${B}/fpcupdeluxe
+      mkdir -pv ${B}/fpcupdeluxe
       tar xf ${F}/fpcsrc-git.tar -C ${B}/fpcupdeluxe
       tar xf ${F}/lazarus-git.tar -C ${B}/fpcupdeluxe
     fi
@@ -64,7 +60,6 @@ mee_extract() {
     # bee_patch "${@}"
 #}
 
-
 mee_configure_pre() {
 
     rm -rfv /root/.lazarus
@@ -109,7 +104,6 @@ if [ 1 = 1 ]; then
     make "${_MOPS[@]}" all install
 
     # Created launcher script for FPC:/home/wwwutz/fpcupdeluxe/fpc/bin/x86_64-linux/fpc.sh
-set -x
     cat >${B}/fpcupdeluxe/fpc/bin/x86_64-linux/fpc.sh <<_EOT_
 #!/bin/sh
 ${B}/fpcupdeluxe/fpc/bin/x86_64-linux/fpc -n @${B}/fpcupdeluxe/fpc/bin/x86_64-linux/fpc.cfg "\$@"
@@ -252,27 +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
+    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