Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
doublecmd: fix bugs
- add pixmaps
- fix downloads
- add GetOsFromOsRelease
  • Loading branch information
wwwutz committed Feb 8, 2023
1 parent cb7cc07 commit 8efb238
Showing 1 changed file with 8 additions and 14 deletions.
22 changes: 8 additions & 14 deletions doublecmd.be0
@@ -1,6 +1,6 @@
#!/usr/bin/env beesh

# BEE_VERSION doublecmd-1.0.10-0
# BEE_VERSION doublecmd-1.0.10-1

# 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")
Expand All @@ -21,19 +21,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")
SRCURL+=("https://beehive.molgen.mpg.de/9c502cc2018b6d0b84fc6898ce79208a/lazarus-git.tar")

# prebuilt
SRCURL+=("https://beehive.molgen.mpg.de/f1090423fc6c97bb9c6fd6af28e78bb5/dc-1.0.10-fpcupdeluxe.tar")

# PATCHURL[0]=""
PATCHURL+=("/src/mariux/patches/doublecmd-1.0.10-versioninfo-proc-before-issue.patch")

NPROC=$(nproc)

Expand All @@ -49,12 +46,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
Expand All @@ -64,7 +58,6 @@ mee_extract() {
# bee_patch "${@}"
#}


mee_configure_pre() {

rm -rfv /root/.lazarus
Expand Down Expand Up @@ -109,7 +102,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 "\$@"
Expand Down Expand Up @@ -268,6 +260,8 @@ mee_install() {
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
}

mee_install_post() {
Expand Down

0 comments on commit 8efb238

Please sign in to comment.