Changeset 631 for trunk


Ignore:
Timestamp:
Nov 11, 2024, 10:16:09 PM (13 days ago)
Author:
chronos
Message:
  • Modified: Build flatpak with GTK2.
Location:
trunk/Install/flatpak
Files:
2 edited
3 moved

Legend:

Unmodified
Added
Removed

  • trunk/Install/flatpak

    • Property svn:ignore

      •  

        old new  
        22build
        33export
         4shared-modules

  • trunk/Install/flatpak/build.sh

    r563 r631  
    11#!/bin/bash
     2set -x
    23
    34BUILD_DIR=build
    4 FLATPAK_ID=net.zdechov.app.C-evo
     5REPO_DIR=repo
     6FLATPAK_ID=net.zdechov.app.C_evo
    57
    68# Install dependencies
    7 flatpak install flathub org.kde.Sdk//5.15-23.08
    8 flatpak install flathub org.kde.Platform//5.15-23.08
    9 flatpak install flathub org.freedesktop.Sdk.Extension.freepascal//23.08
     9flatpak install --system flathub org.kde.Sdk//5.15-23.08
     10flatpak install --system flathub org.kde.Platform//5.15-23.08
     11flatpak install --system flathub org.freedesktop.Sdk.Extension.freepascal//23.08
     12flatpak install --system flathub org.flatpak.Builder
     13git clone https://github.com/flathub/shared-modules.git shared-modules
     14(cd shared-modules && git checkout a9112b9c62e2b84db4c2f6c55c9531fd7e8d03c1)
    1015
    1116# Build
    12 flatpak-builder --force-clean $BUILD_DIR $FLATPAK_ID.yml
    13 
    14 # Build bundle
    15 flatpak build-export export build
    16 flatpak build-bundle export C-evo.flatpak $FLATPAK_ID
    17 
    18 # Install
    19 flatpak-builder --user --install --force-clean $BUILD_DIR $FLATPAK_ID.yml
     17flatpak run org.flatpak.Builder --force-clean --sandbox --user --install --ccache --mirror-screenshots-url=https://dl.flathub.org/media/ --repo=$REPO_DIR $BUILD_DIR $FLATPAK_ID.yml
    2018
    2119# Run
    2220flatpak run $FLATPAK_ID
     21
     22# Linter
     23flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest $FLATPAK_ID.yml
     24flatpak run --command=flatpak-builder-lint org.flatpak.Builder repo $REPO_DIR

  • trunk/Install/flatpak/net.zdechov.app.C_evo.appdata.xml

    r630 r631  
    11<?xml version="1.0" encoding="UTF-8"?>
    22<component type="desktop-application">
    3   <id>net.zdechov.app.C-evo</id>
     3  <id>net.zdechov.app.C_evo</id>
    44
    55  <name>C-evo: New Horizons</name>
    6   <summary>A turn-based empire building game inspired by Civilization II game.</summary>
     6  <summary>Turn-based empire building game.</summary>
    77  <developer_name>Chronos</developer_name>
    88
    … …  
    2323      <li>Multiple localizations included</li>
    2424      <li>High DPI support</li>
     25      <li>Multi monitor support</li>
    2526      <li>Many other small improvements</li>
    2627    </ul>
    2728  </description>
    2829
    29   <launchable type="desktop-id">net.zdechov.app.C-evo.desktop</launchable>
     30  <launchable type="desktop-id">net.zdechov.app.C_evo.desktop</launchable>
    3031
    3132  <screenshots>
    3233    <screenshot type="default">
    3334      <caption>Game interface and world map</caption>
    34       <image>https://github.com/flathub/net.zdechov.app.C-evo/raw/master/Screenshots/Game.jpg</image>
     35      <image>https://svn.zdechov.net/c-evo/trunk/Images/Screenshots/Game.jpg</image>
    3536    </screenshot>
    3637    <screenshot>
    3738      <caption>Main menu</caption>
    38       <image>https://github.com/flathub/net.zdechov.app.C-evo/raw/master/screenshots/Main%20menu.jpg</image>
     39      <image>https://svn.zdechov.net/c-evo/trunk/Images/Screenshots/Main%20menu.jpg</image>
    3940    </screenshot>
    4041    <screenshot>
    4142      <caption>New game</caption>
    42       <image>https://github.com/flathub/net.zdechov.app.C-evo/raw/master/screenshots/New%20game.jpg</image>
     43      <image>https://svn.zdechov.net/c-evo/trunk/Screenshots/New%20game.jpg</image>
     44    </screenshot>
     45    <screenshot>
     46      <caption>Multiple opened windows</caption>
     47      <image>https://svn.zdechov.net/c-evo/trunk/Screenshots/Windows.jpg</image>
    4348    </screenshot>
    4449  </screenshots>
    4550
    4651  <releases>
    47     <release version="1.3.3" date="2024-04-24"/>
     52    <release version="1.3.6" date="2024-09-16" type="stable">
     53      <url type="details">https://svn.zdechov.net/c-evo/tags/1.3.6/Release%20notes.txt</url>
     54      <description>
     55        <ul>
     56          <li>Added: Allow to scroll map with Ctrl+arrows/num keys.</li>
     57          <li>Added: New editor menu action to create filled map from selected tile.</li>
     58          <li>Added: Allow to rename city with mouse right click on city caption in City screen.</li>
     59          <li>Added: Spiral of death map.</li>
     60          <li>Modified: Show windows by default on primary screen if multiple monitors present.</li>
     61          <li>Modified: Do not use Screen Width and Height values for Offscreen bitmap size initialization to improve multi monitor support.</li>
     62          <li>Modified: Map scrolling with mouse on window borders instead of screen borders to support mouse scrolling in windowed mode and on multiple monitors.</li>
     63          <li>Modified: Precalculate scaling coefficients also for from native values conversions for faster speed.</li>
     64          <li>Modified: Scroll just by single row with mouse wheel in tile units list.</li>
     65          <li>Fixed: Do not process keyboard input during unit move on Linux.</li>
     66          <li>Fixed: Resize main window controls on game start if map size changed.</li>
     67          <li>Fixed: Allow full screen switching in editor and movie mode.</li>
     68          <li>Fixed: Do not overflow city name text in City screen.</li>
     69          <li>Fixed: Repaint main screen after city and unit rename.</li>
     70          <li>Fixed: Rows scrolling of high number of units in single map tile.</li>
     71        </ul>
     72      </description>
     73    </release>
    4874  </releases>
    4975
    … …  
    5278  </categories>
    5379
    54   <content_rating type="oars-1.1"/>
     80  <content_rating type="oars-1.1">
     81    <content_attribute id="violence-fantasy">moderate</content_attribute>
     82  </content_rating>
    5583</component>

  • trunk/Install/flatpak/net.zdechov.app.C_evo.desktop

    r630 r631  
    22Encoding=UTF-8
    33Name=C-evo
    4 Comment=An empire building game
     4Comment=A turn-based empire building strategy game inspired by Civilization II game.
    55Exec=c-evo
    6 Icon=net.zdechov.app.C-evo.png
     6Icon=net.zdechov.app.C_evo.png
    77Terminal=false
    88Type=Application

  • trunk/Install/flatpak/net.zdechov.app.C_evo.yml

    r630 r631  
    1 app-id: net.zdechov.app.C-evo
    2 runtime: org.kde.Platform
    3 runtime-version: '5.15-23.08'
    4 sdk: org.kde.Sdk
     1app-id: net.zdechov.app.C_evo
     2runtime: org.freedesktop.Platform
     3runtime-version: '23.08'
     4sdk: org.freedesktop.Sdk
    55sdk-extensions:
    66  - org.freedesktop.Sdk.Extension.freepascal
    77command: c-evo
    88finish-args:
     9  - --socket=x11
     10  - --socket=pulseaudio
    911  - --share=ipc
    10   - --socket=fallback-x11
    11   - --socket=wayland
    12   - --filesystem=home
    1312  - --device=dri
    1413modules:
    15   - name: qt5pas
    16     buildsystem: qmake
    17     config-opts:
    18       - -after
    19       - target.path=/app/lib
    20     sources:
    21       - type: shell
    22         commands:
    23           - cp -r /usr/lib/sdk/freepascal/share/lazarus/lcl/interfaces/qt5/cbindings/. .
     14  - shared-modules/gtk2/gtk2.json
    2415  - name: c-evo
    2516    sources:
    2617      - type: svn
    2718        url: https://svn.zdechov.net/c-evo/trunk
    28         revision: r563
     19        revision: r630
    2920    buildsystem: simple
    3021    build-commands:
    31       - (. /usr/lib/sdk/freepascal/enable.sh && cd AI/StdAI &&lazbuild --build-mode=Release --ws=qt5 StdAI.lpi)
    32       - mv AI/StdAI/libstdai.so AI/StdAI/libstdai-amd64.so
    33       - (. /usr/lib/sdk/freepascal/enable.sh && lazbuild --build-mode=Release --ws=qt5 Integrated.lpi)
    34       - install -d -m 755 $FLATPAK_DEST/share/c-evo
    35       - install -s -m 755 c-evo $FLATPAK_DEST/share/c-evo
    36       - install -m 644 Language.txt $FLATPAK_DEST/share/c-evo
    37       - install -m 644 Language2.txt $FLATPAK_DEST/share/c-evo
    38       - install -m 644 Fonts.txt $FLATPAK_DEST/share/c-evo
    39       - install -d -m 755 $FLATPAK_DEST/bin
     22      - |
     23        . /usr/lib/sdk/freepascal/enable.sh
     24        lazbuild --build-mode=Release AI/StdAI/StdAI.lpi
     25        mv AI/StdAI/libstdai.so AI/StdAI/libstdai-amd64.so
     26        lazbuild --build-mode=Release Integrated.lpi
     27      - install -Dm755 c-evo -t $FLATPAK_DEST/share/c-evo
     28      - install -d $FLATPAK_DEST/bin
    4029      - ln -s $FLATPAK_DEST/share/c-evo/c-evo $FLATPAK_DEST/bin/c-evo
    41       - install -d -m 755 $FLATPAK_DEST/share/applications
    42       - install -m 755 Install/flatpak/${FLATPAK_ID}.desktop $FLATPAK_DEST/share/applications
    43       - install -d -m 755 $FLATPAK_DEST/share/mime/packages
    44       - install -m 644 Install/deb/c-evo.xml $FLATPAK_DEST/share/mime/packages
    45       - install -d -m 755 $FLATPAK_DEST/share/icons/hicolor/64x64/apps
    46       - install -m 644 Graphics/c-evo_64x64.png $FLATPAK_DEST/share/icons/hicolor/64x64/apps/${FLATPAK_ID}.png
    47       - install -d -m 755 $FLATPAK_DEST/share/pixmaps
    48       - install -m 644 Graphics/c-evo_64x64.png $FLATPAK_DEST/share/pixmaps/application-cevo.png
    49       - install -m 644 Graphics/c-evo_64x64.png $FLATPAK_DEST/share/pixmaps/application-cevomap.png
    50       - install -d -m 755 $FLATPAK_DEST/share/c-evo/AI/StdAI
    51       - install -m 644 AI/StdAI/libstdai-amd64.so $FLATPAK_DEST/share/c-evo/AI/StdAI
    52       - install -m 644 AI/StdAI/StdAI.ai.txt $FLATPAK_DEST/share/c-evo/AI/StdAI
    53       - install -m 644 AI/StdAI/StdAI.png $FLATPAK_DEST/share/c-evo/AI/StdAI
    54       - install -D Install/flatpak/net.zdechov.app.C-evo.appdata.xml -t $FLATPAK_DEST/share/metainfo/net.zdechov.app.C-evo.metainfo.xml
     30      - install -Dm644 Language.txt -t $FLATPAK_DEST/share/c-evo
     31      - install -Dm644 Language2.txt -t $FLATPAK_DEST/share/c-evo
     32      - install -Dm644 Fonts.txt -t $FLATPAK_DEST/share/c-evo
     33      - install -Dm755 Install/flatpak/${FLATPAK_ID}.desktop -t $FLATPAK_DEST/share/applications
     34      - install -Dm644 Install/deb/c-evo.xml -t $FLATPAK_DEST/share/mime/packages
     35      - install -Dm644 Graphics/c-evo_64x64.png -t $FLATPAK_DEST/share/icons/hicolor/64x64/apps/${FLATPAK_ID}.png
     36      - install -Dm644 Graphics/c-evo_64x64.png -t $FLATPAK_DEST/share/pixmaps/application-cevo.png
     37      - install -Dm644 Graphics/c-evo_64x64.png -t $FLATPAK_DEST/share/pixmaps/application-cevomap.png
     38      - install -Dm644 AI/StdAI/libstdai-amd64.so -t $FLATPAK_DEST/share/c-evo/AI/StdAI
     39      - install -Dm644 AI/StdAI/StdAI.ai.txt -t $FLATPAK_DEST/share/c-evo/AI/StdAI
     40      - install -Dm644 AI/StdAI/StdAI.png -t $FLATPAK_DEST/share/c-evo/AI/StdAI
     41      - install -Dm644 Install/flatpak/${FLATPAK_ID}.appdata.xml $FLATPAK_DEST/share/metainfo/${FLATPAK_ID}.metainfo.xml
    5542      - cp -r Graphics $FLATPAK_DEST/share/c-evo
    5643      - cp -r Help $FLATPAK_DEST/share/c-evo
Note: See TracChangeset for help on using the changeset viewer.