Changeset 634

Timestamp:

Nov 12, 2024, 9:05:12 AM (2 days ago)

Author:

chronos

Message:

• Modified: Updated flatpak files for version 1.3.6.

Location:

tags/1.3.6

Files:

• Graphics/c-evo_256x256.png (added)
• Install/flatpak (modified) (1 prop)
• Install/flatpak/build.sh (modified) (1 diff)
• Install/flatpak/net.zdechov.app.C-evo.appdata.xml (modified) (3 diffs)
• Install/flatpak/net.zdechov.app.C-evo.desktop (modified) (1 diff)
• Install/flatpak/net.zdechov.app.C-evo.yml (modified) (1 diff)

tags/1.3.6/Install/flatpak

@@ -2 +2 @@
 build
 export
+shared-modules

@@ -2 +2 @@
 build
 export
+shared-modules

tags/1.3.6/Install/flatpak/build.sh

@@ -1 +1 @@
 #!/bin/bash
+set -x
 
 BUILD_DIR=build
+REPO_DIR=repo
 FLATPAK_ID=net.zdechov.app.C-evo
 
 # Install dependencies
-flatpak install flathub org.kde.Sdk//5.15-23.08
-flatpak install flathub org.kde.Platform//5.15-23.08
-flatpak install flathub org.freedesktop.Sdk.Extension.freepascal//23.08
+flatpak install --system flathub org.freedesktop.Platform//23.08
+flatpak install --system flathub org.freedesktop.Sdk//23.08
+flatpak install --system flathub org.freedesktop.Sdk.Extension.freepascal//23.08
+flatpak install --system flathub org.flatpak.Builder
+git clone https://github.com/flathub/shared-modules.git shared-modules
+(cd shared-modules && git checkout a9112b9c62e2b84db4c2f6c55c9531fd7e8d03c1)
 
 # Build
-flatpak-builder --force-clean $BUILD_DIR $FLATPAK_ID.yml
-
-# Build bundle
-flatpak build-export export build
-flatpak build-bundle export C-evo.flatpak $FLATPAK_ID
-
-# Install
-flatpak-builder --user --install --force-clean $BUILD_DIR $FLATPAK_ID.yml
+flatpak 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
 
 # Run
 flatpak run $FLATPAK_ID
+
+# Linter
+flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest $FLATPAK_ID.yml
+flatpak run --command=flatpak-builder-lint org.flatpak.Builder repo $REPO_DIR

tags/1.3.6/Install/flatpak/net.zdechov.app.C-evo.appdata.xml

@@ -4 +4 @@
 
   <name>C-evo: New Horizons</name>
-  <summary>A turn-based empire building game inspired by Civilization II game.</summary>
+  <summary>Turn-based empire building game</summary>
   <developer_name>Chronos</developer_name>
 
@@ -23 +23 @@
       <li>Multiple localizations included</li>
       <li>High DPI support</li>
+      <li>Multi monitor support</li>
       <li>Many other small improvements</li>
     </ul>
@@ -32 +33 @@
     <screenshot type="default">
       <caption>Game interface and world map</caption>
-      <image>https://github.com/flathub/net.zdechov.app.C-evo/raw/master/Screenshots/Game.jpg</image>
+      <image>https://svn.zdechov.net/c-evo/tags/1.3.6/Images/Screenshots/Game.jpg</image>
     </screenshot>
     <screenshot>
       <caption>Main menu</caption>
-      <image>https://github.com/flathub/net.zdechov.app.C-evo/raw/master/screenshots/Main%20menu.jpg</image>
+      <image>https://svn.zdechov.net/c-evo/tags/1.3.6/Images/Screenshots/Main%20menu.jpg</image>
     </screenshot>
     <screenshot>
       <caption>New game</caption>
-      <image>https://github.com/flathub/net.zdechov.app.C-evo/raw/master/screenshots/New%20game.jpg</image>
+      <image>https://svn.zdechov.net/c-evo/tags/1.3.6/Screenshots/New%20game.jpg</image>
+    </screenshot>
+    <screenshot>
+      <caption>Multiple opened windows</caption>
+      <image>https://svn.zdechov.net/c-evo/tags/1.3.6/Screenshots/Windows.jpg</image>
     </screenshot>
   </screenshots>
 
   <releases>
-    <release version="1.3.6" date="2024-09-16"/>
+    <release version="1.3.6" date="2024-09-16" type="stable">
+      <url type="details">https://svn.zdechov.net/c-evo/tags/1.3.6/Release%20notes.txt</url>
+      <description>
+        <ul>
+          <li>Added: Allow to scroll map with Ctrl+arrows/num keys.</li>
+          <li>Added: New editor menu action to create filled map from selected tile.</li>
+          <li>Added: Allow to rename city with mouse right click on city caption in City screen.</li>
+          <li>Added: Spiral of death map.</li>
+          <li>Modified: Show windows by default on primary screen if multiple monitors present.</li>
+          <li>Modified: Do not use Screen Width and Height values for Offscreen bitmap size initialization to improve multi monitor support.</li>
+          <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>
+          <li>Modified: Precalculate scaling coefficients also for from native values conversions for faster speed.</li>
+          <li>Modified: Scroll just by single row with mouse wheel in tile units list.</li>
+          <li>Fixed: Do not process keyboard input during unit move on Linux.</li>
+          <li>Fixed: Resize main window controls on game start if map size changed.</li>
+          <li>Fixed: Allow full screen switching in editor and movie mode.</li>
+          <li>Fixed: Do not overflow city name text in City screen.</li>
+          <li>Fixed: Repaint main screen after city and unit rename.</li>
+          <li>Fixed: Rows scrolling of high number of units in single map tile.</li>
+        </ul>
+      </description>
+    </release>
   </releases>
 
   <categories>
-    <category>Games</category>
+    <category>Game</category>
   </categories>
 
-  <content_rating type="oars-1.1"/>
+  <content_rating type="oars-1.1">
+    <content_attribute id="violence-fantasy">moderate</content_attribute>
+  </content_rating>
 </component>

tags/1.3.6/Install/flatpak/net.zdechov.app.C-evo.desktop

@@ -2 +2 @@
 Encoding=UTF-8
 Name=C-evo
-Comment=An empire building game
+Comment=A turn-based empire building strategy game inspired by Civilization II game.
 Exec=c-evo
 Icon=net.zdechov.app.C-evo.png
 Terminal=false
 Type=Application
-Categories=GNOME;Application;Game;
+Categories=GNOME;Application;Game
 StartupNotify=true
 MimeType=application/cevo;application/cevomap

tags/1.3.6/Install/flatpak/net.zdechov.app.C-evo.yml

@@ -1 +1 @@
 app-id: net.zdechov.app.C-evo
-runtime: org.kde.Platform
-runtime-version: '5.15-23.08'
-sdk: org.kde.Sdk
+runtime: org.freedesktop.Platform
+runtime-version: '23.08'
+sdk: org.freedesktop.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.freepascal
 command: c-evo
 finish-args:
+  - --socket=x11
+  - --socket=pulseaudio
   - --share=ipc
-  - --socket=fallback-x11
-  - --socket=wayland
-  - --filesystem=home
   - --device=dri
 modules:
-  - name: qt5pas
-    buildsystem: qmake
-    config-opts:
-      - -after
-      - target.path=/app/lib
-    sources:
-      - type: shell
-        commands:
-          - cp -r /usr/lib/sdk/freepascal/share/lazarus/lcl/interfaces/qt5/cbindings/. .
+  - shared-modules/gtk2/gtk2.json
   - name: c-evo
     sources:
       - type: svn
-        url: https://svn.zdechov.net/c-evo/trunk
-        revision: r563
+        url: https://svn.zdechov.net/c-evo/tags/1.3.6
+        revision: r634
     buildsystem: simple
     build-commands:
-      - (. /usr/lib/sdk/freepascal/enable.sh && cd AI/StdAI &&lazbuild --build-mode=Release --ws=qt5 StdAI.lpi)
-      - mv AI/StdAI/libstdai.so AI/StdAI/libstdai-amd64.so
-      - (. /usr/lib/sdk/freepascal/enable.sh && lazbuild --build-mode=Release --ws=qt5 Integrated.lpi)
-      - install -d -m 755 $FLATPAK_DEST/share/c-evo
-      - install -s -m 755 c-evo $FLATPAK_DEST/share/c-evo
-      - install -m 644 Language.txt $FLATPAK_DEST/share/c-evo
-      - install -m 644 Language2.txt $FLATPAK_DEST/share/c-evo
-      - install -m 644 Fonts.txt $FLATPAK_DEST/share/c-evo
-      - install -d -m 755 $FLATPAK_DEST/bin
+      - |
+        . /usr/lib/sdk/freepascal/enable.sh
+        lazbuild --build-mode=Release AI/StdAI/StdAI.lpi
+        mv AI/StdAI/libstdai.so AI/StdAI/libstdai-amd64.so
+        lazbuild --build-mode=Release Integrated.lpi
+      - install -Dm755 c-evo -t $FLATPAK_DEST/share/c-evo
+      - install -d $FLATPAK_DEST/bin
       - ln -s $FLATPAK_DEST/share/c-evo/c-evo $FLATPAK_DEST/bin/c-evo
-      - install -d -m 755 $FLATPAK_DEST/share/applications
-      - install -m 755 Install/flatpak/${FLATPAK_ID}.desktop $FLATPAK_DEST/share/applications
-      - install -d -m 755 $FLATPAK_DEST/share/mime/packages
-      - install -m 644 Install/deb/c-evo.xml $FLATPAK_DEST/share/mime/packages
-      - install -d -m 755 $FLATPAK_DEST/share/icons/hicolor/64x64/apps
-      - install -m 644 Graphics/c-evo_64x64.png $FLATPAK_DEST/share/icons/hicolor/64x64/apps/${FLATPAK_ID}.png
-      - install -d -m 755 $FLATPAK_DEST/share/pixmaps
-      - install -m 644 Graphics/c-evo_64x64.png $FLATPAK_DEST/share/pixmaps/application-cevo.png
-      - install -m 644 Graphics/c-evo_64x64.png $FLATPAK_DEST/share/pixmaps/application-cevomap.png
-      - install -d -m 755 $FLATPAK_DEST/share/c-evo/AI/StdAI
-      - install -m 644 AI/StdAI/libstdai-amd64.so $FLATPAK_DEST/share/c-evo/AI/StdAI
-      - install -m 644 AI/StdAI/StdAI.ai.txt $FLATPAK_DEST/share/c-evo/AI/StdAI
-      - install -m 644 AI/StdAI/StdAI.png $FLATPAK_DEST/share/c-evo/AI/StdAI
-      - install -D Install/flatpak/net.zdechov.app.C-evo.appdata.xml -t $FLATPAK_DEST/share/metainfo/net.zdechov.app.C-evo.metainfo.xml
+      - install -Dm644 Language.txt -t $FLATPAK_DEST/share/c-evo
+      - install -Dm644 Language2.txt -t $FLATPAK_DEST/share/c-evo
+      - install -Dm644 Fonts.txt -t $FLATPAK_DEST/share/c-evo
+      - install -Dm644 Install/flatpak/${FLATPAK_ID}.desktop -t $FLATPAK_DEST/share/applications
+      - install -Dm644 Install/deb/c-evo.xml -t $FLATPAK_DEST/share/mime/packages
+      - install -Dm644 Graphics/c-evo_256x256.png $FLATPAK_DEST/share/icons/hicolor/256x256/apps/${FLATPAK_ID}.png
+      - install -Dm644 Graphics/c-evo_256x256.png -t $FLATPAK_DEST/share/pixmaps/application-cevo.png
+      - install -Dm644 Graphics/c-evo_256x256.png -t $FLATPAK_DEST/share/pixmaps/application-cevomap.png
+      - install -Dm644 AI/StdAI/libstdai-amd64.so -t $FLATPAK_DEST/share/c-evo/AI/StdAI
+      - install -Dm644 AI/StdAI/StdAI.ai.txt -t $FLATPAK_DEST/share/c-evo/AI/StdAI
+      - install -Dm644 AI/StdAI/StdAI.png -t $FLATPAK_DEST/share/c-evo/AI/StdAI
+      - install -Dm644 Install/flatpak/${FLATPAK_ID}.appdata.xml $FLATPAK_DEST/share/metainfo/${FLATPAK_ID}.metainfo.xml
       - cp -r Graphics $FLATPAK_DEST/share/c-evo
       - cp -r Help $FLATPAK_DEST/share/c-evo

@@ -2 +2 @@
 build
 export
+shared-modules