Skip to content

Commit 6d22b86

Browse files
ryonakanoryonakano
authored
Merge branch 'master' into developer-name
2 parents 17b4527 + 238149c commit 6d22b86

File tree

15 files changed

+1674
-282
lines changed

15 files changed

+1674
-282
lines changed

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ jobs:
1111
image: elementary/docker:unstable
1212

1313
steps:
14-
- uses: actions/checkout@v1
14+
- uses: actions/checkout@v4
1515
- name: Install Dependencies
1616
run: |
1717
apt update
18-
apt install -y meson libgranite-dev libgtk-3-dev libjson-glib-dev libgudev-1.0-dev libevdev-dev libgtksourceview-3.0-dev libxml2-dev libglib2.0-dev libgda-5.0-dev libmysqlclient-dev libpq-dev libgda-5.0-mysql libgda-5.0-postgres libsecret-1-dev libssh2-1-dev valac
18+
apt install -y meson libgranite-dev libgtk-3-dev libjson-glib-dev libgudev-1.0-dev libevdev-dev libgtksourceview-4-dev libxml2-dev libglib2.0-dev libgda-5.0-dev libmysqlclient-dev libpq-dev libgda-5.0-mysql libgda-5.0-postgres libsecret-1-dev libssh2-1-dev valac
1919
- name: Build
2020
env:
2121
DESTDIR: out

‎.github/workflows/flatpak.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ name: CI
66
jobs:
77
flatpak-builder:
88
name: "Flatpak Builder"
9-
runs-on: ubuntu-20.04
9+
runs-on: ubuntu-latest
1010
container:
11-
image: bilelmoussaoui/flatpak-github-actions:elementary-juno
11+
image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48
1212
options: --privileged
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515
- uses: bilelmoussaoui/flatpak-github-actions/flatpak-builder@master
1616
with:
1717
bundle: "sequeler-nightly.flatpak"

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ jobs:
1111
image: valalang/lint
1212

1313
steps:
14-
- uses: actions/checkout@v1
14+
- uses: actions/checkout@v4
1515
- name: Lint
1616
run: io.elementary.vala-lint -d .

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ You can install Sequeler by compiling from source, here's the list of dependenci
3737
- `gobject-2.0`
3838
- `libxml-2.0`
3939
- `libgda-5.0`
40-
- `gtksourceview-3.0`
40+
- `gtksourceview-4`
4141
- `libsecret-1`
4242
- `libssh2`
4343
- `meson`

‎build-aux/com.github.alecaddd.sequeler.json‎

Lines changed: 87 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
21
{
3-
"app-id": "com.github.alecaddd.sequeler",
2+
"id": "com.github.alecaddd.sequeler",
43
"runtime": "org.gnome.Platform",
5-
"runtime-version": "40",
4+
"runtime-version": "48",
65
"sdk": "org.gnome.Sdk",
76
"base": "io.elementary.BaseApp",
8-
"base-version": "juno-20.08",
7+
"base-version": "circe-24.08",
98
"command": "com.github.alecaddd.sequeler",
109
"finish-args": [
11-
"--share=ipc", "--socket=fallback-x11",
10+
"--share=ipc",
11+
"--socket=fallback-x11",
1212
"--socket=wayland",
1313
"--talk-name=org.freedesktop.secrets",
1414
"--metadata=X-DConf=migrate-path=/com/github/alecaddd/sequeler/",
@@ -25,31 +25,25 @@
2525
"*.a",
2626
"*.la"
2727
],
28-
"modules": [{
29-
"name": "libxml2",
30-
"build-options": {
31-
"config-opts": [
32-
"--with-python=no"
33-
]
34-
},
35-
"sources": [{
36-
"type": "archive",
37-
"url": "https://github.com/GNOME/libxml2/archive/v2.9.10.tar.gz",
38-
"sha256": "3bdffb4d728e4dc135b3210bf2a2cebb76548b820a5617c68abb7b83654066dd"
39-
}]
40-
},
28+
"build-options": {
29+
"libdir": "/app/lib"
30+
},
31+
"modules": [
4132
{
4233
"name": "gtksourceview",
34+
"buildsystem": "meson",
4335
"build-options": {
4436
"config-opts": [
45-
"--enable-gtk-doc=no"
37+
"-Dgtk_doc=false"
4638
]
4739
},
48-
"sources": [{
49-
"type": "archive",
50-
"url": "https://download.gnome.org/sources/gtksourceview/3.24/gtksourceview-3.24.11.tar.xz",
51-
"sha256": "691b074a37b2a307f7f48edc5b8c7afa7301709be56378ccf9cc9735909077fd"
52-
}]
40+
"sources": [
41+
{
42+
"type": "archive",
43+
"url": "https://download.gnome.org/sources/gtksourceview/4.8/gtksourceview-4.8.4.tar.xz",
44+
"sha256": "7ec9d18fb283d1f84a3a3eff3b7a72b09a10c9c006597b3fbabbb5958420a87d"
45+
}
46+
]
5347
},
5448
{
5549
"name": "libgda",
@@ -58,40 +52,49 @@
5852
"--with-java=no",
5953
"--with-jni=no",
6054
"--with-oracle=no"
61-
]
55+
],
56+
"cflags": "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration"
6257
},
63-
"sources": [{
64-
"type": "archive",
65-
"url": "https://download-fallback.gnome.org/sources/libgda/5.2/libgda-5.2.9.tar.xz",
66-
"sha256": "59caed8ca72b1ac6437c9844f0677f8a296d52cfd1c0049116026abfb1d87d9b"
67-
}],
68-
"modules": [{
58+
"sources": [
59+
{
60+
"type": "archive",
61+
"url": "https://download.gnome.org/sources/libgda/5.2/libgda-5.2.9.tar.xz",
62+
"sha256": "59caed8ca72b1ac6437c9844f0677f8a296d52cfd1c0049116026abfb1d87d9b"
63+
}
64+
],
65+
"modules": [
66+
{
6967
"name": "postgresql-libs",
7068
"build-options": {
7169
"config-opts": [
7270
"--with-python=no",
7371
"--with-perl=no",
7472
"--with-libxml",
7573
"--with-openssl"
76-
]
74+
],
75+
"cflags": "-Wno-error=incompatible-pointer-types"
7776
},
78-
"sources": [{
79-
"type": "archive",
80-
"url": "https://ftp.postgresql.org/pub/source/v13.2/postgresql-13.2.tar.gz",
81-
"sha256": "3386a40736332aceb055c7c9012ecc665188536d874d967fcc5a33e7992f8080"
82-
}]
77+
"sources": [
78+
{
79+
"type": "archive",
80+
"url": "https://ftp.postgresql.org/pub/source/v13.2/postgresql-13.2.tar.gz",
81+
"sha256": "3386a40736332aceb055c7c9012ecc665188536d874d967fcc5a33e7992f8080"
82+
}
83+
]
8384
},
8485
{
8586
"name": "jemalloc",
8687
"cleanup": [
8788
"/bin/",
8889
"/share"
8990
],
90-
"sources": [{
91-
"type": "archive",
92-
"url": "https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2",
93-
"sha256": "34330e5ce276099e2e8950d9335db5a875689a4c6a56751ef3b1d8c537f887f6"
94-
}]
91+
"sources": [
92+
{
93+
"type": "archive",
94+
"url": "https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2",
95+
"sha256": "34330e5ce276099e2e8950d9335db5a875689a4c6a56751ef3b1d8c537f887f6"
96+
}
97+
]
9598
},
9699
{
97100
"name": "libaio",
@@ -107,43 +110,56 @@
107110
"make",
108111
"make prefix=/app install"
109112
],
110-
"sources": [{
111-
"type": "archive",
112-
"url": "https://ftp.debian.org/debian/pool/main/liba/libaio/libaio_0.3.113.orig.tar.gz",
113-
"sha256": "2c44d1c5fd0d43752287c9ae1eb9c023f04ef848ea8d4aafa46e9aedb678200b"
114-
}]
113+
"sources": [
114+
{
115+
"type": "archive",
116+
"url": "https://ftp.debian.org/debian/pool/main/liba/libaio/libaio_0.3.113.orig.tar.gz",
117+
"sha256": "2c44d1c5fd0d43752287c9ae1eb9c023f04ef848ea8d4aafa46e9aedb678200b"
118+
}
119+
]
120+
},
121+
{
122+
"name": "libfmt",
123+
"buildsystem": "cmake-ninja",
124+
"sources": [
125+
{
126+
"type": "git",
127+
"url": "https://github.com/fmtlib/fmt.git",
128+
"tag": "8.1.1",
129+
"commit": "b6f4ceaed0a0a24ccf575fab6c56dd50ccf6f1a9"
130+
}
131+
]
115132
},
116133
{
117134
"name": "mariadb",
118-
"buildsystem": "cmake",
119-
"no-make-install": true,
135+
"buildsystem": "cmake-ninja",
120136
"config-opts": [
121137
"-DCMAKE_BUILD_TYPE=Release",
122138
"-DBUILD_CONFIG=mysql_release",
123139
"-DWITH_INNOBASE_STORAGE_ENGINE=1",
140+
"-DWITH_PCRE=system",
141+
"-DWITH_LIBFMT=system",
124142
"-DWITHOUT_ARCHIVE_STORAGE_ENGINE=1",
125143
"-DWITHOUT_BLACKHOLE_STORAGE_ENGINE=1",
126144
"-DWITHOUT_PARTITION_STORAGE_ENGINE=1",
127145
"-DWITHOUT_TOKUDB=1",
128146
"-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1",
129147
"-DWITHOUT_FEDERATED_STORAGE_ENGINE=1",
130148
"-DWITHOUT_PBXT_STORAGE_ENGINE=1",
149+
"-DWITHOUT_SERVER=ON",
131150
"-DPLUGIN_AUTH_PAM=NO"
132151
],
133-
"post-install": [
134-
"make -C libmysql install",
135-
"make -C include install",
136-
"install -Dm755 scripts/mysql_config /app/bin/mysql_config",
137-
"install -Dm644 support-files/mariadb.pc /app/share/pkgconfig/mariadb.pc"
138-
],
139152
"cleanup": [
140153
"/bin/"
141154
],
142-
"sources": [{
143-
"type": "archive",
144-
"url": "http://ftp.hosteurope.de/mirror/archive.mariadb.org/mariadb-10.1.48/source/mariadb-10.1.48.tar.gz",
145-
"sha256": "069d58b1e2c06bb1e6c31249eda34138f41fb8ae3dec7ecaeba8035812c87cf9"
146-
}]
155+
"sources": [
156+
{
157+
"type": "git",
158+
"url": "https://github.com/MariaDB/server.git",
159+
"tag": "mariadb-10.11.7",
160+
"commit": "87e13722a95af5d9378d990caf48cb6874439347"
161+
}
162+
]
147163
},
148164
{
149165
"name": "intltool",
@@ -160,15 +176,18 @@
160176
},
161177
{
162178
"name": "libssh2",
163-
"sources": [{
164-
"type": "archive",
165-
"url": "https://www.libssh2.org/download/libssh2-1.9.0.tar.gz",
166-
"sha256": "d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd"
167-
}]
179+
"sources": [
180+
{
181+
"type": "archive",
182+
"url": "https://www.libssh2.org/download/libssh2-1.9.0.tar.gz",
183+
"sha256": "d5fb8bd563305fd1074dda90bd053fb2d29fc4bce048d182f96eaa466dfadafd"
184+
}
185+
]
168186
},
169187
{
170188
"name": "libfiposix",
171-
"sources": [{
189+
"sources": [
190+
{
172191
"type": "archive",
173192
"url": "https://github.com/sionescu/libfixposix/archive/v0.4.3.tar.gz",
174193
"sha256": "78fe8bcebf496520ac29b5b65049f5ec1977c6bd956640bdc6d1da6ea04d8504"
@@ -185,7 +204,8 @@
185204
{
186205
"name": "sequeler",
187206
"buildsystem": "meson",
188-
"sources": [{
207+
"sources": [
208+
{
189209
"type": "dir",
190210
"path": "../"
191211
}

0 commit comments

Comments
 (0)