Skip to content

Commit

Permalink
Fix flathub build error (#63)
Browse files Browse the repository at this point in the history
* refactor: clean up project metadata

* chore: update postgres version
  • Loading branch information
ppvan authored Feb 19, 2024
1 parent 89a98ea commit ba6d23d
Show file tree
Hide file tree
Showing 7 changed files with 100 additions and 112 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/flatpak.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
on:
push:
branches: [main]
pull_request:
name: Build flatpak
jobs:
flatpak:
name: "Flatpak"
runs-on: ubuntu-latest
container:
image: bilelmoussaoui/flatpak-github-actions:gnome-44
options: --privileged
steps:
- uses: actions/checkout@v4
- uses: flatpak/flatpak-github-actions/flatpak-builder@v6
with:
bundle: palette.flatpak
manifest-path: me.ppvan.psequel.json
cache-key: flatpak-builder-${{ github.sha }}
66 changes: 0 additions & 66 deletions data/me.ppvan.psequel.appdata.xml.in

This file was deleted.

2 changes: 1 addition & 1 deletion data/me.ppvan.psequel.desktop.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ Exec=psequel
Icon=me.ppvan.psequel
Terminal=false
Type=Application
Categories=GTK;Development;
Categories=Development;Database;
StartupNotify=true
72 changes: 72 additions & 0 deletions data/me.ppvan.psequel.metainfo.xml.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop-application">
<id>me.ppvan.psequel</id>

<name>psequel</name>
<summary>A simple SQL client</summary>

<metadata_license>MIT</metadata_license>
<project_license>GPL-3.0-or-later</project_license>

<recommends>
<display_length compare="ge">960</display_length>
</recommends>

<description>
<p>Psequel is a modern, yet minial SQL client.</p>
<ul>
<li>Create connection, import, export connection to database</li>
<li>View tables, scshema, views, columns, indexes, foreign key</li>
<li>Execute query, query history</li>
</ul>

<p>
This project is not a part of or affiliated with PostgreSQL.
</p>
</description>
<content_rating type="oars-1.1" />
<provides>
<binary>psequel</binary>
</provides>
<url type="homepage">https://github.com/ppvan/psequel</url>
<url type="bugtracker">https://github.com/ppvan/psequel/issues</url>

<developer id="io.github.jtheoof">
<name>Jeremy Attali</name>
<url>https://github.com/jtheoof</url>
</developer>
<launchable type="desktop-id">me.ppvan.psequel.desktop</launchable>
<screenshots>
<screenshot type="default">
<image>https://raw.githubusercontent.com/ppvan/psequel/main/screenshots/screenshot1.png</image>
</screenshot>
<screenshot>
<image>https://raw.githubusercontent.com/ppvan/psequel/main/screenshots/screenshot2.png</image>
</screenshot>
<screenshot>
<image>https://raw.githubusercontent.com/ppvan/psequel/main/screenshots/screenshot3.png</image>
</screenshot>
<screenshot>
<image>https://raw.githubusercontent.com/ppvan/psequel/main/screenshots/screenshot4.png</image>
</screenshot>
</screenshots>

<releases>
<release version="0.1.9" date="2023-02-18">
<description>
<p>Clean up and bug fix</p>
<p>Show number of tables and views</p>
</description>
</release>
<release version="0.1.5" date="2023-08-15">
<description>
<p>Basic autocompletion</p>
</description>
</release>
<release version="0.1.4" date="2023-08-11">
<description>
<p>First Release</p>
</description>
</release>
</releases>
</component>
12 changes: 2 additions & 10 deletions data/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,10 @@ if desktop_utils.found()
test('Validate desktop file', desktop_utils, args: [desktop_file])
endif

i18n.merge_file(
input: 'me.ppvan.psequel.appdata.xml.in',
output: 'me.ppvan.psequel.appdata.xml',
po_dir: '../po',
install: true,
install_dir: join_paths(get_option('datadir'), 'appdata')
)


appstream_file = i18n.merge_file(
input: 'example.com.temp.metainfo.xml.in',
output: 'example.com.temp.metainfo.xml',
input: 'me.ppvan.psequel.metainfo.xml.in',
output: 'me.ppvan.psequel.metainfo.xml',
po_dir: '../po',
install: true,
install_dir: get_option('datadir') / 'metainfo'
Expand Down
10 changes: 6 additions & 4 deletions me.ppvan.psequel.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
"--device=dri",
"--socket=wayland"
],
"build-options": {
"append-path": "/usr/lib/sdk/vala/bin",
"prepend-ld-library-path": "/usr/lib/sdk/vala/lib"
},
"cleanup": [
"/include",
"/lib/pkgconfig",
Expand All @@ -27,12 +31,10 @@
{
"name": "psequel",
"buildsystem": "meson",
"builddir": true,
"sources": [
{
"type": "git",
"url": "https://github.com/ppvan/psequel",
"commit": "33a0704cbbc7ab7ef8483404a4578319c001b1f9"
"type": "dir",
"path": "."
}
],
"modules": [
Expand Down
31 changes: 0 additions & 31 deletions project.doap

This file was deleted.

0 comments on commit ba6d23d

Please sign in to comment.