Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change the application ID for the beta branch. #92

Draft
wants to merge 4 commits into
base: beta
Choose a base branch
from
Draft

Change the application ID for the beta branch. #92

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d41fb6b
Change the application ID for the beta branch.
Oct 28, 2020
c1d975b
Rename the appstream data file as well when changing app ID.
Oct 28, 2020
80f3dc7
Some additional file cleanup.
Oct 28, 2020
a9afcd2
Update the configuration options.
Oct 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions org.gimp.GIMP.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"app-id": "org.gimp.GIMP",
"app-id": "org.gimp.GIMP.dev",
"branch": "beta",
"runtime": "org.gnome.Platform",
"runtime-version": "3.36",
Copy link

@farribeiro farribeiro Dec 16, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I recommend bump the runtime version, and all yml to beta files

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's already at 40

Copy link

@farribeiro farribeiro Dec 16, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update this development branch, what did i mean, merge master to this branch. It's for resolves conflict

Expand All @@ -8,6 +8,7 @@
"separate-locales": false,
"rename-desktop-file": "gimp.desktop",
"rename-icon": "gimp",
"rename-appdata-file": "org.gimp.GIMP.appdata.xml",
"finish-args": ["--share=ipc", "--share=network",
"--socket=x11", "--socket=wayland",
"--filesystem=host", "--filesystem=xdg-config/GIMP",
Expand Down Expand Up @@ -186,7 +187,7 @@
"config-opts": [ "--disable-cups" ],
"make-args": [ "so" ],
"make-install-args": [ "soinstall" ],
"cleanup": [ "/bin", "/share/man", "/share/doc/" ],
"cleanup": [ "/bin", "/share/man", "/share/doc" ],
"sources": [
{
"type": "archive",
Expand Down Expand Up @@ -278,7 +279,7 @@
{
"name" : "libheif",
"config-opts": [ "--disable-gdk-pixbuf" ],
"cleanup": [ "/bin" ],
"cleanup": [ "/bin", "/share/thumbnailers" ],
"modules": [
{
"name": "libde265",
Expand All @@ -299,6 +300,7 @@
"config-opts": [ "-DEXTRA_LIB='libx265-10.a;libx265-12.a'",
"-DEXTRA_LINK_FLAGS=-L.",
"-DLINKED_10BIT=ON", "-DLINKED_12BIT=ON" ],
"cleanup": [ "/bin" ],
"sources": [
{
"type": "git",
Expand Down Expand Up @@ -424,8 +426,7 @@
"name": "gimp",
"config-opts": [ "--disable-docs", "--disable-gtk-doc", "--disable-gtk-doc-html",
"--with-icc-directory=/run/host/usr/share/color/icc/",
"--with-lua=force", "--with-python=force", "--with-javascript=force",
"--with-build-id=org.gimp.GIMP.flatpak.stable",
"--with-build-id=org.gimp.GIMP.flatpak.dev",
"--disable-check-update" ],
"cleanup": [ "/bin/gimptool-3.0", "/bin/gimp-console-2.99" ],
"sources": [
Expand Down