[five-or-more: 40/40] Merged vala port to master (!1)
- From: Robert Roth <robertroth src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [five-or-more: 40/40] Merged vala port to master (!1)
- Date: Thu, 13 Sep 2018 09:57:01 +0000 (UTC)
commit d1b5833a261df7ac66096c9a3d138d43f026116c
Merge: aa99e3a 525a274
Author: Robert Roth <robert roth off gmail com>
Date: Thu Sep 13 12:53:16 2018 +0300
Merged vala port to master (!1)
data/dots.png | Bin 26927 -> 0 bytes
data/{menu.ui => five-or-more-menu.ui} | 2 +-
data/five-or-more-preferences.ui | 57 +-
data/five-or-more.ui | 30 +-
data/gumball.png | Bin 35735 -> 0 bytes
data/meson.build | 63 +-
data/org.gnome.five-or-more.gresource.xml | 10 +
data/translatable_themes.h | 9 -
help/C/bug-filing.page | 42 +-
help/C/change-board-size.page | 116 ++--
help/C/change-theme.page | 80 +--
help/C/develop.page | 17 +-
help/C/documentation.page | 18 +-
help/C/fast-moves.page | 36 -
help/C/figures/color-dots.png | Bin 15660 -> 0 bytes
help/C/figures/color-gumball.png | Bin 34609 -> 0 bytes
help/C/index.page | 23 +-
help/C/license.page | 24 +-
help/C/play.page | 31 +-
help/C/rules.page | 82 +--
help/C/scores.page | 94 +--
help/C/strategy.page | 9 +-
help/meson.build | 61 +-
meson.build | 21 +-
meson_post_install.py | 7 +
org.gnome.five-or-more.json | 46 +-
org.gnome.five-or-more.json~ | 60 ++
po/POTFILES.in | 12 +-
po/POTFILES.skip | 4 +
src/balls-preview.c | 171 -----
src/board.vala | 431 ++++++++++++
src/config.vapi | 4 +
src/five-or-more-app.c | 742 --------------------
src/five-or-more-app.h | 48 --
src/five-or-more.c | 81 ---
src/game-area.c | 1052 -----------------------------
src/game.vala | 309 +++++++++
src/games-file-list.c | 435 ------------
src/games-file-list.h | 67 --
src/games-preimage.c | 475 -------------
src/games-preimage.h | 89 ---
src/main.vala | 165 +++++
src/meson.build | 53 +-
src/next-pieces-widget.vala | 92 +++
src/{game-area.h => piece-generator.vala} | 57 +-
src/{balls-preview.h => piece.vala} | 24 +-
src/preferences-dialog.vala | 155 +++++
src/theme-renderer.vala | 129 ++++
src/view.vala | 418 ++++++++++++
src/window.vala | 162 +++++
50 files changed, 2423 insertions(+), 3690 deletions(-)
---
diff --cc meson.build
index 9335d17,dd28078..176e8aa
--- a/meson.build
+++ b/meson.build
@@@ -1,7 -1,7 +1,7 @@@
- project('five-or-more', ['c'],
- version: '3.30.0',
- meson_version: '>= 0.43.0',
- license: 'GPLv2'
+ project('five-or-more', ['c', 'vala'],
- version: '3.29.3',
++ version: '3.30.0',
+ meson_version: '>= 0.43.0',
+ license: 'GPLv2'
)
gnome = import('gnome')
diff --cc org.gnome.five-or-more.json
index ad37842,8e10019..5e10589
--- a/org.gnome.five-or-more.json
+++ b/org.gnome.five-or-more.json
@@@ -20,18 -20,20 +20,20 @@@
"--env=DCONF_USER_CONFIG_DIR=.config/dconf"
],
"build-options" : {
- "cflags": "-O2 -g",
- "cxxflags": "-O2 -g"
+ "cflags" : "-O2 -g",
+ "cxxflags" : "-O2 -g",
+ "env" : {
+ }
},
- "modules": [
+ "modules" : [
{
- "name": "libgee",
- "buildsystem": "meson",
- "sources": [
+ "name" : "libgee",
+ "buildsystem" : "meson",
+ "sources" : [
{
- "type" : "git",
- "branch" : "meson",
- "url" : "https://git.gnome.org/browse/libgee"
+ "type": "git",
+ "branch": "meson",
+ "url": "https://gitlab.gnome.org/GNOME/libgee.git"
}
]
},
@@@ -46,13 -48,13 +48,13 @@@
]
},
{
- "name": "five-or-more",
- "buildsystem": "meson",
- "sources": [
+ "name" : "five-or-more",
+ "buildsystem" : "meson",
+ "sources" : [
{
- "type" : "git",
- "branch" : "master",
- "url" : "https://git.gnome.org/browse/five-or-more"
+ "type": "git",
+ "branch": "master",
+ "url": "https://gitlab.gnome.org/GNOME/five-or-more.git"
}
]
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]