Skip to content

Commit

Permalink
Mac install fpc323, add -dev openssl for Debian
Browse files Browse the repository at this point in the history
  • Loading branch information
davidbannon committed Mar 21, 2024
1 parent a441bd6 commit 4f85c58
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 3 deletions.
14 changes: 12 additions & 2 deletions package/mk_dmg.bash
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,16 @@
#
# WARNING - as packageonly is not being told where Lazarus is, it cannot find
# Lazarus's premade language files.

FPC_PATH="$HOME"/fpcupdeluxe/fpc/bin/x86_64-darwin # Thats Fixes from fpcupdeluxe, last rebuild March 2024

if [ "$OLD_PATH" == "" ]; then
export PATH="$FPC_PATH":"$PATH"
else
export PATH="$FPC_PATH":"$OLD_PATH"
fi



LAZ_FULL_DIR="$1"
LAZ_DIR=`basename "$LAZ_FULL_DIR"`
Expand Down Expand Up @@ -121,7 +131,7 @@ function MakeDMG () {
cp ../glyphs/tomboy-ng.icns "$CONTENTS/Resources/."
# for i in $MANUALS; do
# cp ../doc/"$i" "$CONTENTS/Resources/.";
# done;
# dmk_dmg.bashone;
cp -R ../doc/HELP "$CONTENTS/Resources/."
mkdir "$CONTENTS/MacOS/locale"
for i in `ls -b ../po/*.??.po`; do
Expand All @@ -139,7 +149,7 @@ function MakeDMG () {
# ~/create-dmg-master/create-dmg --volname "$PRODUCT""$BITS" --volicon "../glyphs/vol.icns" "$PRODUCT""$BITS"_"$VERSION".dmg "./$WORK/"
create-dmg --volname "$PRODUCT""$BITS" --volicon "../glyphs/vol.icns" "$PRODUCT""$BITS"_"$VERSION".dmg "./$WORK/"
}

mk_dmg.bash
if [ "$PACKAGEONLY" == "false" ]; then
if [ "LAZ_PCP" == "" ]; then
echo "Failed to find config file"
Expand Down
1 change: 1 addition & 0 deletions scripts/mkcontrol.bash
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ function AdjustValues () {
;;
"unstable") # ie Debian, as set above
PACKAGE="tomboy-ng" # in case its a Debian QT5 build, always tomboy-ng in Debian
DEPENDS="libqt5pas1, libssl-dev" # Ugly hack necessary until next FPC release.
;;
esac
}
Expand Down
4 changes: 3 additions & 1 deletion whatsnew
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
Revised Bullet control system.
Revised Color setting system for Qt5 and Qt6
Tab key now indents paragraph, not compatible with old Tomboy.

Revised PDF export, embedded fonts.
Draft "file link" capability. Subject to revision.
Support for openssl 3.0 (compile with fpc323, require dev pkg on Debian)

0 comments on commit 4f85c58

Please sign in to comment.