Changeset 190

Timestamp:

Nov 21, 2024, 11:18:08 PM (4 weeks ago)

Author:

chronos

Message:

• Modified: Updated snap and flatpak files.

Location:

tags/1.5.0

Files:

• Core.pas (modified) (1 diff)
• Images/Screenshots/Contact - All fields.png (modified) ( previous)
• Images/Screenshots/Contact - Chat.png (modified) ( previous)
• Images/Screenshots/Contact - General.png (modified) ( previous)
• Images/Screenshots/Contact - Home.png (modified) ( previous)
• Images/Screenshots/Contact - Others.png (added)
• Images/Screenshots/Contact - Social.png (modified) ( previous)
• Images/Screenshots/Contact - Work.png (modified) ( previous)
• Images/Screenshots/Find duplicates.png (modified) ( previous)
• Images/Screenshots/vCard Studio.png (modified) ( previous)
• Install/deb/vCardStudio.desktop (modified) (1 diff)
• Install/flatpak/build.sh (modified) (1 diff)
• Install/flatpak/net.zdechov.app.vCardStudio.appdata.xml (modified) (4 diffs)
• Install/flatpak/net.zdechov.app.vCardStudio.desktop (modified) (1 diff)
• Install/flatpak/net.zdechov.app.vCardStudio.yml (modified) (3 diffs)
• Install/snap/local/vCardStudio.desktop (deleted)
• Install/snap/snapcraft.yaml (modified) (3 diffs)

tags/1.5.0/Core.pas

@@ -476 +476 @@
 {$ENDIF}
 begin
-  ProfilePhotoFileName := 'Images/Profile.png';
+  ProfilePhotoFileName := ExtractFilePath(ParamStr(0)) + DirectorySeparator +
+    'Images' + DirectorySeparator + 'Profile.png';
   {$IFDEF UNIX}
   // If installed in Linux system then use installation directory for po files

tags/1.5.0/Install/deb/vCardStudio.desktop

@@ -10 +10 @@
 StartupNotify=true
 MimeType=text/vcard
+Keywords=vcard;vcf;contacts;merge;split;duplicates;qr-code;management

tags/1.5.0/Install/flatpak/build.sh

@@ -7 +7 @@
 
 # Install dependencies
-flatpak install --system flathub org.kde.Sdk//5.15-23.08
-flatpak install --system flathub org.kde.Platform//5.15-23.08
-flatpak install --system flathub org.freedesktop.Sdk.Extension.freepascal//23.08
+flatpak install --system flathub org.kde.Sdk//5.15-24.08
+flatpak install --system flathub org.kde.Platform//5.15-24.08
+flatpak install --system flathub org.freedesktop.Sdk.Extension.freepascal//24.08
 flatpak install --system flathub org.flatpak.Builder
 

tags/1.5.0/Install/flatpak/net.zdechov.app.vCardStudio.appdata.xml

@@ -3 +3 @@
   <id>net.zdechov.app.vCardStudio</id>
 
-  <name>vCardStudio</name>
-  <summary>contact management application</summary>
-  <developer_name>Chronos</developer_name>
+  <name>vCard Studio</name>
+  <summary>Contact management application</summary>
+  <developer id="net.zdechov.chronos">
+    <name>Chronos</name>
+  </developer>
 
   <url type="homepage">https://app.zdechov.net/vcard-studio</url>
+  <url type="contact">https://app.zdechov.net/c-evo#Support</url>
+  <url type="vcs-browser">https://app.zdechov.net/vcard-studio/browser</url>
 
   <metadata_license>CC0-1.0</metadata_license>
@@ -16 +20 @@
       A contact management application with support for vCard file format (.vcf).
     </p>
-    <p>
-      Features:
-    </p>
+    <p><strong>Features:</strong></p>
     <ul>
       <li>Add, Edit, Clone or Remove contacts and contact properties</li>
-      <li>Shows contact fields in multiple tabs General, Home, Work, Social, Chat and Others</li>
+      <li>Shows contact fields in multiple tabs General, Home, Work, Social, Chat ans Others</li>
       <li>Contact photo displayed and can be changed (supported image types JPEG, PNG, GIF and BMP)</li>
       <li>Quick filter by table columns in contacts list</li>
@@ -40 +42 @@
   <launchable type="desktop-id">net.zdechov.app.vCardStudio.desktop</launchable>
 
+  <branding>
+    <color type="primary" scheme_preference="light">#99c1f1</color>
+    <color type="primary" scheme_preference="dark">#1a5fb4</color>
+  </branding>
+
   <screenshots>
     <screenshot type="default">
@@ -45 +52 @@
       <image>https://svn.zdechov.net/vcard-studio/tags/1.5.0/Images/Screenshots/vCard%20Studio.png</image>
     </screenshot>
-    <screenshot type="default">
+    <screenshot>
       <caption>Find duplicates</caption>
       <image>https://svn.zdechov.net/vcard-studio/tags/1.5.0/Images/Screenshots/Find%20duplicates.png</image>
     </screenshot>
-    <screenshot type="default">
+    <screenshot>
       <caption>Contact - General</caption>
       <image>https://svn.zdechov.net/vcard-studio/tags/1.5.0/Images/Screenshots/Contact%20-%20General.png</image>
     </screenshot>
-    <screenshot type="default">
+    <screenshot>
       <caption>Contact - Work</caption>
       <image>https://svn.zdechov.net/vcard-studio/tags/1.5.0/Images/Screenshots/Contact%20-%20Work.png</image>
     </screenshot>
-    <screenshot type="default">
+    <screenshot>
       <caption>Contact - Social</caption>
       <image>https://svn.zdechov.net/vcard-studio/tags/1.5.0/Images/Screenshots/Contact%20-%20Social.png</image>
     </screenshot>
-    <screenshot type="default">
+    <screenshot>
       <caption>Contact - Home</caption>
       <image>https://svn.zdechov.net/vcard-studio/tags/1.5.0/Images/Screenshots/Contact%20-%20Home.png</image>
     </screenshot>
-    <screenshot type="default">
+    <screenshot>
       <caption>Contact - Chat</caption>
       <image>https://svn.zdechov.net/vcard-studio/tags/1.5.0/Images/Screenshots/Contact%20-%20Chat.png</image>
     </screenshot>
-    <screenshot type="default">
+    <screenshot>
+      <caption>Contact - Others</caption>
+      <image>https://svn.zdechov.net/vcard-studio/tags/1.5.0/Images/Screenshots/Contact%20-%20Others.png</image>
+    </screenshot>
+    <screenshot>
       <caption>Contact - All fields</caption>
       <image>https://svn.zdechov.net/vcard-studio/tags/1.5.0/Images/Screenshots/Contact%20-%20All%20fields.png</image>

tags/1.5.0/Install/flatpak/net.zdechov.app.vCardStudio.desktop

@@ -10 +10 @@
 StartupNotify=true
 MimeType=text/vcard
+Keywords=vcard;vcf;contacts;merge;split;duplicates;qr-code;management

tags/1.5.0/Install/flatpak/net.zdechov.app.vCardStudio.yml

@@ -1 +1 @@
 app-id: net.zdechov.app.vCardStudio
 runtime: org.kde.Platform
-runtime-version: '5.15-23.08'
+runtime-version: '5.15-24.08'
 sdk: org.kde.Sdk
 sdk-extensions:
@@ -25 +25 @@
       - type: svn
         url: https://svn.zdechov.net/vcard-studio/tags/1.5.0
-        revision: r184
+        revision: r190
     buildsystem: simple
     build-commands:
@@ -36 +36 @@
       - install -Dm644 Install/flatpak/${FLATPAK_ID}.desktop -t $FLATPAK_DEST/share/applications
       - install -Dm644 "Images/vCard Studio.png" $FLATPAK_DEST/share/icons/hicolor/256x256/apps/${FLATPAK_ID}.png
+      - install -Dm644 Images/Profile.png -t $FLATPAK_DEST/share/vCardStudio/Images
       - install -Dm644 Languages/*.po -t $FLATPAK_DEST/share/vCardStudio/Languages
       - install -Dm644 Packages/Common/Languages/*.po -t $FLATPAK_DEST/share/vCardStudio/Languages

tags/1.5.0/Install/snap/snapcraft.yaml

@@ -29 +29 @@
 
 parts:
-  lazarus:
-    plugin: nil
-    source: .
-    source-type: local
-    build-packages:
-    - wget
-    - libgtk2.0-dev
-    override-build: |
-      wget -nc https://downloads.sourceforge.net/project/lazarus/Lazarus%20Linux%20amd64%20DEB/Lazarus%203.4/lazarus-project_3.4.0-0_amd64.deb
-      wget -nc https://downloads.sourceforge.net/project/lazarus/Lazarus%20Linux%20amd64%20DEB/Lazarus%203.4/fpc-laz_3.2.2-210709_amd64.deb
-      wget -nc https://downloads.sourceforge.net/project/lazarus/Lazarus%20Linux%20amd64%20DEB/Lazarus%203.4/fpc-src_3.2.2-210709_amd64.deb
-      apt install ./lazarus-project_3.4.0-0_amd64.deb ./fpc-laz_3.2.2-210709_amd64.deb ./fpc-src_3.2.2-210709_amd64.deb
-    prime: [-*]
   vcard-studio:
     plugin: nil
@@ -49 +36 @@
       snapcraftctl build
       lazbuild --build-mode=Release vCardStudio.lpi
-      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/bin
-      install -s -m 755 vCardStudio $SNAPCRAFT_PART_INSTALL/usr/bin/vCardStudio
-      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/vCardStudio/Languages
-      install -m 755 Languages/*.po $SNAPCRAFT_PART_INSTALL/usr/share/vCardStudio/Languages
-      install -m 755 Packages/Common/Languages/*.po $SNAPCRAFT_PART_INSTALL/usr/share/vCardStudio/Languages
-      install -m 755 Packages/VCard/Languages/*.po $SNAPCRAFT_PART_INSTALL/usr/share/vCardStudio/Languages
-      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/vCardStudio/Images
-      install -m 755 Images/Profile.png $SNAPCRAFT_PART_INSTALL/usr/share/vCardStudio/Images
-      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/applications
-      install -m 755 Install/snap/local/vCardStudio.desktop $SNAPCRAFT_PART_INSTALL/usr/share/applications
-      install -d -m 755 $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps
-      install -m 755 Images/vCard\ Studio.png $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps
+      install -Dm755 vCardStudio -t $SNAPCRAFT_PART_INSTALL/usr/share/vCardStudio
+      install -d $SNAPCRAFT_PART_INSTALL/usr/bin
+      ln -s ../share/vCardStudio/vCardStudio $SNAPCRAFT_PART_INSTALL/usr/bin/vCardStudio
+      install -Dm644 Languages/*.po -t $SNAPCRAFT_PART_INSTALL/usr/share/vCardStudio/Languages
+      install -Dm644 Packages/Common/Languages/*.po -t $SNAPCRAFT_PART_INSTALL/usr/share/vCardStudio/Languages
+      install -Dm644 Packages/VCard/Languages/*.po -t $SNAPCRAFT_PART_INSTALL/usr/share/vCardStudio/Languages
+      install -Dm644 Images/Profile.png -t $SNAPCRAFT_PART_INSTALL/usr/share/vCardStudio/Images
+      install -Dm644 Install/deb/vCardStudio.desktop -t $SNAPCRAFT_PART_INSTALL/usr/share/applications
+      install -Dm644 Images/vCard\ Studio.png -t $SNAPCRAFT_PART_INSTALL/usr/share/pixmaps
     after:
     - lazarus
@@ -103 +87 @@
     - libxrandr2
     - libxrender1
+
+  lazarus:
+    plugin: nil
+    source: .
+    source-type: local
+    build-packages:
+    - wget
+    - libgtk2.0-dev
+    override-build: |
+      wget -nc https://downloads.sourceforge.net/project/lazarus/Lazarus%20Linux%20amd64%20DEB/Lazarus%203.4/lazarus-project_3.4.0-0_amd64.deb
+      wget -nc https://downloads.sourceforge.net/project/lazarus/Lazarus%20Linux%20amd64%20DEB/Lazarus%203.4/fpc-laz_3.2.2-210709_amd64.deb
+      wget -nc https://downloads.sourceforge.net/project/lazarus/Lazarus%20Linux%20amd64%20DEB/Lazarus%203.4/fpc-src_3.2.2-210709_amd64.deb
+      apt install ./lazarus-project_3.4.0-0_amd64.deb ./fpc-laz_3.2.2-210709_amd64.deb ./fpc-src_3.2.2-210709_amd64.deb
+    stage: [-*]
+    prime: [-*]
 
   desktop-gtk2: