AppImages are now created on GitHub via actions.
* Commit the changes and push to the .repo
-* Generate a new AppImage (note that this should be run on a **20.04 system**)
-
-```sh
-./scripts/generate-appimage.sh <location of local appimages folder>
-```
-
-* Upload AppImage to web AppImages location
-* Edit `<location of local geeqie.github.io>/AppImage/appimages.txt` to include latest AppImage at the *top* of the list
* Update the web-page Help files if they have changed
* commit and push if necessary
+++ /dev/null
-# How to create AppImages for Geeqie
-
-## Download the required tools
-
-Download the `linuxdeploy` tools. At the time of writing, these are:
-
-```sh
-wget -c https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage
-chmod +x linuxdeploy-x86_64.AppImage
-wget -c https://raw.githubusercontent.com/linuxdeploy/linuxdeploy-plugin-gtk/master/linuxdeploy-plugin-gtk.sh
-chmod +x linuxdeploy-plugin-gtk.sh
-sudo apt install patchelf
-sudo apt install librsvg2-dev
-```
-
-The first two of these files must be in your `$PATH` environment variable.
-
-## Generate the executable
-
-```sh
-cd <your working area>
-```
-
-Download Geeqie sources:
-
-```sh
-git clone git://www.geeqie.org/geeqie.git
-cd geeqie
-```
-
-If a run has already been made, remove any existing targets:
-
-```sh
-rm -r <target dir>/AppDir
-sudo rm -rf doc/html
-```
-
-Create a fresh target directory:
-
-```sh
-mkdir <target dir>/AppDir
-```
-
-Generate the Geeqie executable:
-
-```sh
-meson setup appimage-build
-meson configure -Dprefix=/usr appimage-build
-DESTDIR=<full path to target dir>/AppDir ninja -C build-appimage install
-```
-
-## Generate the AppImage
-
-```sh
-cd <target dir>
-linuxdeploy-x86_64.AppImage \
- --appdir ./AppDir --output appimage \
- --desktop-file ./AppDir/usr/share/applications/geeqie.desktop \
- --icon-file ./AppDir/usr/share/pixmaps/geeqie.png \
- --plugin gtk \
- --executable ./AppDir/usr/bin/geeqie`
-```
-
-## Rename AppImage
-
-If required, rename the AppImage executable - e.g.:
-
-```sh
-mv ./Geeqie-v1.6-x86_64.AppImage $(./Geeqie-v1.6-x86_64.AppImage -v | sed 's/git//' | sed 's/-.* /-/' | sed 's/ /-v/' | sed 's/-GTK3//').AppImage
-```
-
-## Automation script
-
-The script `./scripts/generate-appimage.sh` automates this process.
+++ /dev/null
-#! /bin/sh
-#**********************************************************************
-# Copyright (C) 2022 - The Geeqie Team
-#
-# Author: Colin Clark
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#**********************************************************************
-
-## @file
-## @brief Generate a Geeqie AppImage.
-##
-## It must be run from the base Geeqie folder.
-## The single parameter is the directory where the AppDir
-## will be created.
-##
-
-x86_64()
-{
- linuxdeploy-x86_64.AppImage \
- --appdir ./AppDir \
- --output appimage \
- --desktop-file ./AppDir/usr/share/applications/geeqie.desktop \
- --icon-file ./AppDir/usr/share/pixmaps/geeqie.png \
- --plugin gtk \
- --executable ./AppDir/usr/bin/geeqie
-}
-
-## @FIXME arm AppImage of linuxdeploy does not yet exist
-## Compile from sources
-aarch64()
-{
- linuxdeploy \
- --appdir ./AppDir \
- --output appimage \
- --desktop-file ./AppDir/usr/share/applications/geeqie.desktop \
- --icon-file ./AppDir/usr/share/pixmaps/geeqie.png \
- --plugin gtk \
- --executable ./AppDir/usr/bin/geeqie
-
- appimagetool-aarch64.AppImage ./AppDir/ ./Geeqie-aarch64.AppImage
-}
-
-if [ ! -f geeqie.spec.in ] || [ ! -d .git ]
-then
- printf '%s\n' "This is not a Geeqie folder"
- exit 1
-fi
-
-if ! target_dir=$(realpath "$1")
-then
- printf '%s\n' "No target dir specified"
- exit 1
-fi
-
-rm -rf ./build-appimge
-rm -rf "$target_dir"/AppDir
-mkdir "$target_dir"/AppDir || {
- printf '%s\n' "Cannot make $target_dir/AppDir"
- exit 1
-}
-
-meson setup build-appimage
-meson configure build-appimage -Dprefix="/usr/"
-DESTDIR=/"$target_dir"/AppDir ninja -C build-appimage install
-
-VERSION=$(git tag | tail -1)
-export VERSION
-
-cd "$target_dir" || {
- printf '%s\n' "Cannot cd to $target_dir"
- exit 1
-}
-
-case $(uname -m) in
- "x86_64")
- x86_64
-
- new_version="$(./Geeqie-"$VERSION"-x86_64.AppImage -v | sed 's/git//' | sed 's/-.* /-/' | sed 's/ /-v/' | sed 's/-GTK3//')-x86_64.AppImage"
- mv "./Geeqie-$VERSION-x86_64.AppImage" "$new_version"
- gpg --armor --detach-sign --output "$new_version.asc" "$new_version"
- ;;
-
- "aarch64")
- aarch64
-
- new_version="$(./Geeqie-aarch64.AppImage -v | sed 's/git//' | sed 's/-.* /-/' | sed 's/ /-v/' | sed 's/-GTK3//')-aarch64.AppImage"
- mv "./Geeqie-aarch64.AppImage" "$new_version"
- gpg --armor --detach-sign --output "$new_version.asc" "$new_version"
- ;;
-
- *)
- printf "Architecture unknown"
- ;;
-esac
+++ /dev/null
-#!/bin/sh
-
-#**********************************************************************
-# Copyright (C) 2022 - The Geeqie Team
-#
-# Author: Colin Clark
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#**********************************************************************
-## @file
-## @brief Compile linuxdeploy for use on arm
-##
-## There is no AppImage for linuxdeploy on arm. It must be compiled
-## from sources.
-##
-## This is just a hack until AppImages are available on github.
-##
-
-set -x
-
-arch=$(uname -m)
-if [ "$arch" != "aarch64" ]
-then
- exit
-fi
-
-sudo apt install libfuse2
-sudo apt install libgirepository1.0-dev
-
-rm -rf /tmp/linuxdeploy-*
-
-cd "$HOME" || exit
-if [ ! -d bin ]
-then
- mkdir bin
-fi
-
-cd "$HOME"/bin || exit
-
-if [ ! -f appimagetool-aarch64.AppImage ]
-then
- wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-aarch64.AppImage
- chmod +x appimagetool-aarch64.AppImage
-fi
-
-if [ ! -f linuxdeploy-plugin.sh ]
-then
- wget https://raw.githubusercontent.com/linuxdeploy/linuxdeploy-plugin-gtk/master/linuxdeploy-plugin-gtk.sh
- chmod +x linuxdeploy-plugin-gtk.sh
-fi
-
-if [ ! -d linuxdeploy-download ]
-then
- git clone --recursive https://github.com/linuxdeploy/linuxdeploy.git
- mv linuxdeploy linuxdeploy-download
-fi
-
-cd linuxdeploy-download || exit
-
-# Use arm architecture
-sed -i 's/"x86_64"/"aarch64"/g' ./ci/build.sh
-sed -i 's/"x86_64"/"aarch64"/g' ./ci/build-static-binutils.sh
-sed -i 's/"x86_64"/"aarch64"/g' ./ci/build-static-patchelf.sh
-
-# Always use /tmp
-sed -i 's/TEMP_BASE=\/dev\/shm/TEMP_BASE=\/tmp/' ./ci/build.sh
-
-# Do not erase working directory
-sed -i 's/trap cleanup EXIT//' ./ci/build.sh
-
-# Fix possible error in current (2022-12-13) version
-sed -i 's/\/\/ system headers/#include <array>/' ./src/subprocess/subprocess.cpp
-sed -i 's/\/\/ system headers/#include <array>/' ./src/plugin/plugin_process_handler.cpp
-
-# No downloads
-sed -i 's/wget/\#/g' ./ci/build.sh
-
-# No exit on fail
-sed -i 's/set\ \-e/\#/' .ci/build.sh
-
-cp src/core/copyright/copyright.h src/core
-
-cd ..
-
-ARCH=aarch64 bash linuxdeploy-download/ci/build.sh
-
-find /tmp/linuxdeploy-build* -type f -name linuxdeploy -exec cp {} "$HOME"/bin/ \;
-find /tmp/linuxdeploy-build* -type f -name patchelf -exec cp {} "$HOME"/bin \;
-
-if [ ! -d linuxdeploy-plugin-appimage ]
-then
- git clone --recursive https://github.com/linuxdeploy/linuxdeploy-plugin-appimage.git
-fi
-
-cd linuxdeploy-plugin-appimage || exit
-
-# Always use /tmp
-sed -i 's/TEMP_BASE=\/dev\/shm/TEMP_BASE=\/tmp/' ./ci/build-appimage.sh
-
-# Do not erase working directory
-sed -i 's/trap cleanup EXIT//' ./ci/build-appimage.sh
-
-# Use arm architecture
-sed -i 's/"x86_64"/"aarch64"/g' ./ci/build-appimage.sh
-
-# No downloads
-sed -i 's/wget/\#/g' ./ci/build-appimage.sh
-
-# No exit on fail
-sed -i 's/set\ \-e/\#/' ./ci/build-appimage.sh
-
-cd ..
-
-ARCH=aarch64 bash linuxdeploy-plugin-appimage/ci/build-appimage.sh
-
-
projects / geeqie.git / commitdiff