fix for ubuntu touch click
This commit is contained in:
1 parent
9436ce938a
commit
b01888fcfb
8 files changed
+77
-24
No files matched your search
@@ -29,8 +29,9 @@ LINUX_APPIMAGE_DESKTOP := $(LINUX_APPIMAGE_DIR)/$(APP_NAME).desktop
|
||||
LINUX_APPIMAGE_ICON := $(LINUX_APPIMAGE_DIR)/$(APP_NAME).png
|
||||
LINUX_APPIMAGE_APPDATA := $(LINUX_APPIMAGE_DIR)/$(APP_NAME).appdata.xml
|
||||
CLICK_PACKAGE ?= inbe
|
||||
CLICK_ID ?= inbe
|
||||
CLICK_TITLE ?= $(APP_TITLE)
|
||||
CLICK_MAINTAINER ?= Waozi Project <[email protected]>
|
||||
CLICK_MAINTAINER ?= Waozi <[email protected]>
|
||||
CLICK_ARCH ?= arm64
|
||||
CLICK_FRAMEWORK ?= ubuntu-sdk-20.04
|
||||
CLICK_POLICY_VERSION ?= 20.04
|
||||
@@ -712,13 +713,15 @@ $(CLICK_BIN): Makefile $(SRC) $(FLINT_SRCS) $(FLINT_ICON_STAMP) $(SQLITE_SRC) $(
|
||||
patchelf --set-interpreter "$(CLICK_PATCHELF_INTERPRETER)" --set-rpath '$$ORIGIN/../lib' $@; \
|
||||
fi
|
||||
|
||||
$(CLICK_TARGET): $(CLICK_BIN_INPUT) $(CLICK_MANIFEST_TEMPLATE) $(CLICK_CONTROL_TEMPLATE) $(CLICK_APPARMOR_TEMPLATE) $(CLICK_DESKTOP_TEMPLATE) $(CLICK_METAINFO_TEMPLATE) $(CLICK_RUNNER) $(LINUX_APPIMAGE_ICON) | $(CLICK_BUILD_DIR) $(CLICK_DIST_DIR)
|
||||
@command -v zip >/dev/null || { \
|
||||
echo "zip is missing. Re-enter the flake shell with: nix develop"; \
|
||||
$(CLICK_TARGET): Makefile $(CLICK_BIN_INPUT) $(CLICK_DIR)/inbe.apparmor $(CLICK_DIR)/inbe.desktop $(CLICK_DIR)/inbe.metainfo.xml $(CLICK_RUNNER) $(LINUX_APPIMAGE_ICON) $(VERSION_FILE) | $(CLICK_BUILD_DIR) $(CLICK_DIST_DIR)
|
||||
@command -v click >/dev/null || { \
|
||||
echo "click is missing. Re-enter the flake shell with: nix develop"; \
|
||||
exit 1; \
|
||||
}
|
||||
rm -rf $(CLICK_ROOT)
|
||||
rm -f $(CLICK_DIST_DIR)/$(CLICK_PACKAGE)_*_$(CLICK_ARCH).click
|
||||
rm -f $(CLICK_DIST_DIR)/$(CLICK_ID)_*_$(CLICK_ARCH).click
|
||||
rm -f $(CLICK_ID)_$(APP_VERSION)_$(CLICK_ARCH).click
|
||||
mkdir -p $(CLICK_ROOT)/usr/bin $(CLICK_ROOT)/usr/lib $(CLICK_ROOT)/usr/share/applications $(CLICK_ROOT)/usr/share/icons/hicolor/512x512/apps $(CLICK_ROOT)/usr/share/metainfo
|
||||
cp $(CLICK_BIN_INPUT) $(CLICK_ROOT)/usr/bin/$(APP_NAME)
|
||||
cp $(CLICK_RUNNER) $(CLICK_ROOT)/run-inbe.sh
|
||||
@@ -733,16 +736,38 @@ $(CLICK_TARGET): $(CLICK_BIN_INPUT) $(CLICK_MANIFEST_TEMPLATE) $(CLICK_CONTROL_T
|
||||
if [ -f "$$elf" ]; then patchelf --set-rpath '$$ORIGIN' "$$elf" >/dev/null 2>&1 || true; fi; \
|
||||
done; \
|
||||
fi
|
||||
cp $(CLICK_DIR)/manifest.json $(CLICK_ROOT)/manifest.json
|
||||
cp $(CLICK_DIR)/inbe.apparmor $(CLICK_ROOT)/inbe.apparmor
|
||||
cp $(CLICK_DIR)/inbe.desktop $(CLICK_ROOT)/inbe.desktop
|
||||
@if [ "$(CLICK_INCLUDE_METAINFO)" = "1" ]; then \
|
||||
mkdir -p $(CLICK_ROOT)/usr/share/metainfo; \
|
||||
cp $(CLICK_DIR)/inbe.metainfo.xml $(CLICK_ROOT)/usr/share/metainfo/$(CLICK_PACKAGE).metainfo.xml; \
|
||||
fi
|
||||
printf '%s\n' \
|
||||
'{' \
|
||||
' "name": "$(CLICK_ID)",' \
|
||||
' "title": "$(CLICK_TITLE)",' \
|
||||
' "version": "$(APP_VERSION)",' \
|
||||
' "architecture": "$(CLICK_ARCH)",' \
|
||||
' "framework": "$(CLICK_FRAMEWORK)",' \
|
||||
' "description": "Syncable breathing, meditation, and habit practice app.",' \
|
||||
' "maintainer": "$(CLICK_MAINTAINER)",' \
|
||||
' "hooks": {' \
|
||||
' "$(APP_NAME)": {' \
|
||||
' "apparmor": "$(APP_NAME).apparmor",' \
|
||||
' "desktop": "$(APP_NAME).desktop"' \
|
||||
' }' \
|
||||
' }' \
|
||||
'}' \
|
||||
> $(CLICK_ROOT)/manifest.json
|
||||
cp $(CLICK_DIR)/inbe.apparmor $(CLICK_ROOT)/inbe.apparmor
|
||||
cp $(CLICK_DIR)/inbe.desktop $(CLICK_ROOT)/inbe.desktop
|
||||
@if [ "$(CLICK_INCLUDE_METAINFO)" = "1" ]; then \
|
||||
mkdir -p $(CLICK_ROOT)/usr/share/metainfo; \
|
||||
sed -e 's/version="[^"]*"/version="$(APP_VERSION)"/' $(CLICK_DIR)/inbe.metainfo.xml > $(CLICK_ROOT)/usr/share/metainfo/$(CLICK_ID).metainfo.xml; \
|
||||
fi
|
||||
cp $(LINUX_APPIMAGE_ICON) $(CLICK_ROOT)/inbe.png
|
||||
cp $(LINUX_APPIMAGE_ICON) $(CLICK_ROOT)/usr/share/icons/hicolor/512x512/apps/inbe.png
|
||||
cd $(CLICK_ROOT) && zip -qr $(abspath $@) .
|
||||
click build $(CLICK_ROOT) $(CLICK_DIST_DIR)
|
||||
@if [ -f "$(CLICK_DIST_DIR)/$(CLICK_ID)_$(APP_VERSION)_$(CLICK_ARCH).click" ]; then \
|
||||
mv "$(CLICK_DIST_DIR)/$(CLICK_ID)_$(APP_VERSION)_$(CLICK_ARCH).click" "$(CLICK_TARGET)"; \
|
||||
elif [ -f "$(CLICK_ID)_$(APP_VERSION)_$(CLICK_ARCH).click" ]; then \
|
||||
mv "$(CLICK_ID)_$(APP_VERSION)_$(CLICK_ARCH).click" "$(CLICK_TARGET)"; \
|
||||
fi
|
||||
test -f $@
|
||||
|
||||
$(WIN64_TARGET): Makefile $(SRC) $(FLINT_WINDOWS_SRCS) $(FLINT_ICON_STAMP) $(SQLITE_SRC) $(SQLITE_AMALGAMATION_H) $(FONT_OUTPUTS) $(EMBEDDED_ASSETS_C) $(WIN64_RAYLIB_A) $(WIN64_CURL_A) $(WIN64_LIBOQS_A) | $(WINDOWS_BIN_DIR)/$(WIN64_ARCH)
|
||||
$(WIN64_CC) $(WINDOWS_CFLAGS) \
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Package: inbe
|
||||
Version: 1.4.10
|
||||
Package: inbe.waozi
|
||||
Version: 1.8.1
|
||||
Architecture: arm64
|
||||
Maintainer: Waozi Project <[email protected]>
|
||||
Maintainer: Waozi <[email protected]>
|
||||
Click-Version: 0.4
|
||||
Installed-Size: 12560
|
||||
Description: Inner Breeze
|
||||
Installed-Size: 12739
|
||||
Description: Inner Breeze
|
||||
@@ -1,5 +1,4 @@
|
||||
{
|
||||
"policy_groups": [],
|
||||
"template": "inbe",
|
||||
"policy_version": 20.04
|
||||
}
|
||||
}
|
||||
@@ -28,7 +28,7 @@
|
||||
<binary>inbe</binary>
|
||||
</provides>
|
||||
<releases>
|
||||
<release version="1.4.10" date="2024-06-21"/>
|
||||
<release version="1.8.1" date="2026-07-03"/>
|
||||
</releases>
|
||||
<content_rating type="oars-1.1"/>
|
||||
</component>
|
||||
</component>
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "inbe.waozi",
|
||||
"name": "inbe",
|
||||
"title": "Inner Breeze",
|
||||
"version": "1.4.10",
|
||||
"version": "1.8.1",
|
||||
"architecture": "arm64",
|
||||
"framework": "ubuntu-sdk-20.04",
|
||||
"description": "Syncable breathing, meditation, and habit practice app.",
|
||||
@@ -12,4 +12,4 @@
|
||||
"desktop": "inbe.desktop"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="1376" height="768" viewBox="0 0 1376 768" role="img" aria-label="Inner Breeze banner">
|
||||
<image width="1376" height="768" href="data:image/jpeg;base64,
|
||||
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 truncated
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 111 KiB |
@@ -8,6 +8,9 @@ CHANGELOG_FILE="CHANGELOG.md"
|
||||
GRADLE_FILE="droid/app/build.gradle"
|
||||
WINDOWS_RC_FILE="windows/inbe.rc"
|
||||
CHANGELOG_DIR="fastlane/metadata/android/en-US/changelogs"
|
||||
CLICK_MANIFEST_FILE="packaging/click/manifest.json"
|
||||
CLICK_CONTROL_FILE="packaging/click/control"
|
||||
CLICK_METAINFO_FILE="packaging/click/inbe.metainfo.xml"
|
||||
|
||||
# Extract all versions from CHANGELOG
|
||||
VERSIONS=$(grep '^## \[' "$CHANGELOG_FILE" | sed 's/^## \[\([^]]*\)\].*/\1/')
|
||||
@@ -71,6 +74,27 @@ else
|
||||
echo "Warning: $WINDOWS_RC_FILE not found"
|
||||
fi
|
||||
|
||||
if [ -f "$CLICK_MANIFEST_FILE" ]; then
|
||||
sed -i "s/^\([[:space:]]*\"version\": \)\"[^\"]*\"/\1\"$LATEST_VERSION\"/" "$CLICK_MANIFEST_FILE"
|
||||
echo "✓ Updated $CLICK_MANIFEST_FILE"
|
||||
else
|
||||
echo "Warning: $CLICK_MANIFEST_FILE not found"
|
||||
fi
|
||||
|
||||
if [ -f "$CLICK_CONTROL_FILE" ]; then
|
||||
sed -i "s/^Version: .*/Version: $LATEST_VERSION/" "$CLICK_CONTROL_FILE"
|
||||
echo "✓ Updated $CLICK_CONTROL_FILE"
|
||||
else
|
||||
echo "Warning: $CLICK_CONTROL_FILE not found"
|
||||
fi
|
||||
|
||||
if [ -f "$CLICK_METAINFO_FILE" ]; then
|
||||
sed -i "s/<release version=\"[^\"]*\" date=\"[^\"]*\"/<release version=\"$LATEST_VERSION\" date=\"$(date +%F)\"/" "$CLICK_METAINFO_FILE"
|
||||
echo "✓ Updated $CLICK_METAINFO_FILE"
|
||||
else
|
||||
echo "Warning: $CLICK_METAINFO_FILE not found"
|
||||
fi
|
||||
|
||||
# Create changelog directory
|
||||
mkdir -p "$CHANGELOG_DIR"
|
||||
|
||||
|
||||
Reference in new issue
Block a user