fix various URLs
This commit is contained in:
Alexandros Theodotou
parent
efa1106fe0
commit
8ede20d2aa
|
|
@ -69,8 +69,8 @@ jobs:
|
|||
MSYS=winsymlinks:native mv zrythm /c/src/
|
||||
cd /c/src
|
||||
pwd
|
||||
git clone https://git.sr.ht/~alextee/zrythm-builds
|
||||
git clone https://git.sr.ht/~alextee/zrythm-installer
|
||||
git clone https://gitlab.zrythm.org/zrythm/zrythm-builds
|
||||
git clone https://gitlab.zrythm.org/zrythm/zrythm-installer
|
||||
- name: Install deps
|
||||
run: |
|
||||
cd /c/src/zrythm-installer
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||
Upstream-Name: Zrythm
|
||||
Upstream-Contact: Alexandros Theodotou <alex@zrythm.org>
|
||||
Source: https://git.sr.ht/~alextee/zrythm
|
||||
Source: https://gitlab.zrythm.org/zrythm/zrythm
|
||||
License: LicenseRef-ZrythmLicense
|
||||
|
||||
Files: data/fonts/DSEG14-Classic-MINI/*
|
||||
|
|
|
|||
|
|
@ -16,14 +16,14 @@ Libera.chat IRC. Tell us how would you like to
|
|||
help, and we will do our best to guide you.
|
||||
|
||||
# Project Management
|
||||
We use [Sourcehut](https://sr.ht/~alextee/zrythm/)
|
||||
We use [GitLab](https://gitlab.zrythm.org/zrythm/zrythm)
|
||||
as the central point for development, maintenance and
|
||||
issue tracking of Zrythm.
|
||||
|
||||
The source files for all the components of the
|
||||
project, including software, web site, documentation,
|
||||
and artwork, are available in our
|
||||
[git repositories](https://git.zrythm.org/zrythm).
|
||||
[git repositories](https://gitlab.zrythm.org/zrythm).
|
||||
|
||||
# Art
|
||||
We are always looking for artists to help us design
|
||||
|
|
@ -40,7 +40,7 @@ developers discover Zrythm.
|
|||
|
||||
# Programming
|
||||
Source code is in the
|
||||
[main Git repository](https://git.zrythm.org/zrythm/zrythm/).
|
||||
[main Git repository](https://gitlab.zrythm.org/zrythm/zrythm/).
|
||||
We use C as the main programming language for the
|
||||
various components of Zrythm, in addition to
|
||||
Scheme for writing scripts and Python for the
|
||||
|
|
@ -54,47 +54,35 @@ Also, make sure to read
|
|||
development setup, as well as the coding and
|
||||
cooperation conventions used in the project.
|
||||
|
||||
## Submitting Patches
|
||||
We prefer code contributions in the form of patches.
|
||||
Use `git format-patch` to generate patch files and
|
||||
send them to the
|
||||
[development mailing list](https://lists.sr.ht/~alextee/zrythm-devel).
|
||||
You can also use
|
||||
[git-send-email](https://git-send-email.io/) for this.
|
||||
SourceHut also has a web UI to make submitting
|
||||
patches from your own repositories easier. See
|
||||
[this video tutorial](https://spacepub.space/videos/watch/ad258d23-0ac6-488c-83fc-2bacf578de3a)
|
||||
for reference.
|
||||
If you are having difficulties creating patches
|
||||
please contact us and we will guide you.
|
||||
## Contributing Code
|
||||
We prefer contributions in the form of [merge requests on our
|
||||
GitLab instance](https://gitlab.zrythm.org/zrythm/zrythm/-/merge_requests).
|
||||
|
||||
The Zrythm project uses a Contributor Ceritificate of
|
||||
Origin, which is a mechanism similar to the
|
||||
[Developer Certificate of Origin (DCO)](https://developercertificate.org/) to manage contributions.
|
||||
The Contributor Certificate of Origin is an
|
||||
affirmation that you are the creator of your
|
||||
contribution, and that you wish to allow the Zrythm
|
||||
project to use your work.
|
||||
The Contributor Certificate of Origin is an affirmation that
|
||||
you are the creator of your contribution, and that you wish to
|
||||
allow the Zrythm project to use your work.
|
||||
|
||||
Acknowledgement of this permission is done using a
|
||||
sign-off process in Git. The sign-off is a simple
|
||||
line at the end of the explanation for the patch.
|
||||
The Contributor Certificate of Origin can be found
|
||||
in the
|
||||
Acknowledgement of this permission is done using a sign-off
|
||||
process in Git. The sign-off is a simple line at the end of the
|
||||
explanation for the patch.
|
||||
The Contributor Certificate of Origin can be found in the
|
||||
[CONTRIBUTOR_CERTIFICATE_OF_ORIGIN](CONTRIBUTOR_CERTIFICATE_OF_ORIGIN)
|
||||
file at the root of this distribution.
|
||||
|
||||
If you are willing to agree to these terms, please
|
||||
add a line to every git commit message:
|
||||
If you are willing to agree to these terms, please add a line
|
||||
to every git commit message:
|
||||
|
||||
Signed-off-by: Joe Smith <joe.smith@email.com>
|
||||
|
||||
If you set your user.name and user.email as part of
|
||||
your git configuration, you can sign your commit
|
||||
automatically with `git commit -s`.
|
||||
If you set your user.name and user.email as part of your git
|
||||
configuration, you can sign your commit automatically with
|
||||
`git commit -s`.
|
||||
|
||||
You must use your real name (i.e., pseudonyms or
|
||||
anonymous contributions cannot be made).
|
||||
You must use your real name (i.e., pseudonyms or anonymous
|
||||
contributions cannot be made).
|
||||
|
||||
# Test and Bug Reports
|
||||
Install the software and send feedback to the
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ Required
|
|||
`libpanel (LGPLv3+) <https://gitlab.gnome.org/chergert/libpanel/>`_
|
||||
Dock and panel widgets
|
||||
|
||||
Note: if you want detach support use `our fork <https://git.sr.ht/~alextee/libpanel-detach>`_ (``zrythm_detach`` branch).
|
||||
Note: if you want detach support use `our fork <https://gitlab.zrythm.org/zrythm/libpanel-detach>`_ (``zrythm_detach`` branch).
|
||||
|
||||
`libsndfile (LGPLv2.1+) <http://libsndfile.github.io/libsndfile/>`_
|
||||
Audio file IO
|
||||
|
|
@ -131,10 +131,6 @@ Optional
|
|||
`SDL2 (zlib) <https://www.libsdl.org/>`_
|
||||
Audio backend
|
||||
|
||||
Dependency package names for various distros
|
||||
can be found `here <https://git.sr.ht/~alextee/zrythm-builds/tree/master/item/.builds>`_
|
||||
and `here <https://git.sr.ht/~alextee/zrythm-builds2/tree/master/item/.builds>`_
|
||||
|
||||
Configuration
|
||||
-------------
|
||||
|
||||
|
|
|
|||
48
PACKAGING.md
48
PACKAGING.md
|
|
@ -1,5 +1,5 @@
|
|||
<!---
|
||||
SPDX-FileCopyrightText: © 2019-2022 Alexandros Theodotou <alex@zrythm.org>
|
||||
SPDX-FileCopyrightText: © 2019-2023 Alexandros Theodotou <alex@zrythm.org>
|
||||
SPDX-License-Identifier: FSFAP
|
||||
-->
|
||||
|
||||
|
|
@ -8,16 +8,14 @@ Information for Packagers
|
|||
|
||||
# Upstream URLs
|
||||
|
||||
You can use <https://www.zrythm.org/releases>
|
||||
to fetch tarballs. The project's home page is
|
||||
<https://www.zrythm.org>. The main git repositories
|
||||
for packagers and the general public are on
|
||||
[SourceHut](https://git.sr.ht/~alextee/zrythm).
|
||||
You can use <https://www.zrythm.org/releases> to fetch
|
||||
tarballs. The project's home page is <https://www.zrythm.org>.
|
||||
The main git repositories for packagers and the general public
|
||||
are on [GitHub](https://github.com/zrythm/zrythm).
|
||||
|
||||
# Versioning
|
||||
|
||||
Starting from v1.0.0-alpha.0.1.0, Zrythm follows
|
||||
the following
|
||||
Zrythm follows the following
|
||||
[Semantic Versioning (SemVer) 2.0.0](https://semver.org/)
|
||||
scheme:
|
||||
|
||||
|
|
@ -56,17 +54,15 @@ nightlies:
|
|||
|
||||
# Included Programs
|
||||
|
||||
For various reasons, Zrythm ships with some
|
||||
libraries/resources that could be packaged
|
||||
separately. If you wish to package them separately
|
||||
and make Zrythm use them, you can pass the flags
|
||||
For various reasons, Zrythm ships with some libraries/resources
|
||||
that could be packaged separately. If you wish to package them
|
||||
separately and make Zrythm use them, you can pass the flags
|
||||
found in `meson_options.txt`.
|
||||
|
||||
# Debug Symbols
|
||||
|
||||
Please do not strip symbols to assist with
|
||||
meaningful stack traces which are sent with bug
|
||||
reports.
|
||||
Please do not strip symbols to assist with meaningful stack
|
||||
traces which are sent with bug reports.
|
||||
|
||||
# Docs
|
||||
|
||||
|
|
@ -74,9 +70,8 @@ See the `manpage` and `user_manual` meson options.
|
|||
|
||||
# Post-Install Commands
|
||||
|
||||
Depending on the distro, some of the
|
||||
following commands will need to be run with
|
||||
appropriate options. Some distros run these
|
||||
Depending on the distro, some of the following commands will
|
||||
need to be run with appropriate options. Some distros run these
|
||||
automatically.
|
||||
|
||||
glib-compile-schemas
|
||||
|
|
@ -93,13 +88,12 @@ for more details.
|
|||
# Trademarks
|
||||
As mentioned in the
|
||||
[Trademark Policy](TRADEMARKS.md),
|
||||
if you wish to distribute modified versions of
|
||||
Zrythm, you must either get permission or replace
|
||||
the name and logo.
|
||||
if you wish to distribute modified versions of Zrythm, you
|
||||
must either get permission or replace the name and logo.
|
||||
|
||||
To replace the trademarked name and logo, you can use
|
||||
the `program_name` and `custom_logo_and_splash` meson
|
||||
options, after replacing all files inside
|
||||
`data/icon-themes/zrythm-dark/scalable/apps`. There
|
||||
may be more things that need to be changed that
|
||||
we missed. If you find any, please let us know.
|
||||
To replace the trademarked name and logo, you can use the
|
||||
`program_name` and `custom_logo_and_splash` meson options,
|
||||
after replacing all files inside
|
||||
`data/icon-themes/zrythm-dark/scalable/apps`. There may be more
|
||||
things that need to be changed that we missed. If you find any,
|
||||
please let us know.
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ Zrythm
|
|||
======
|
||||
|
||||
[](https://hosted.weblate.org/engage/zrythm/?utm_source=widget)
|
||||
[](https://builds.sr.ht/~alextee/zrythm?)
|
||||
|
||||
*a highly automated and intuitive digital audio
|
||||
workstation*
|
||||
|
|
|
|||
|
|
@ -32,14 +32,13 @@ themes and icons as discussed in
|
|||
|
||||
Testing
|
||||
-------
|
||||
You are welcome to join us in testing
|
||||
the latest features in Zrythm and reporting
|
||||
bugs and feedback on
|
||||
`Sourcehut <https://todo.sr.ht/~alextee>`_.
|
||||
You are welcome to join us in testing the latest features in
|
||||
Zrythm and reporting bugs and feedback on
|
||||
`GitLab <https://gitlab.zrythm.org/zrythm/zrythm/-/issues>`_.
|
||||
|
||||
The latest development branch for new features is
|
||||
``development`` in our
|
||||
`git repository <https://git.zrythm.org/zrythm/zrythm>`_.
|
||||
`git repository <https://gitlab.zrythm.org/zrythm/zrythm>`_.
|
||||
|
||||
.. seealso:: :ref:`contributing/reporting-bugs:Reporting Bugs`
|
||||
|
||||
|
|
|
|||
|
|
@ -79,10 +79,8 @@ it yourself or get it from a distribution.
|
|||
When will v1 be released?
|
||||
-------------------------
|
||||
|
||||
When all bugs and features marked as `v1rc` are completed:
|
||||
|
||||
* https://todo.sr.ht/~alextee/zrythm-feature
|
||||
* https://todo.sr.ht/~alextee/zrythm-bug
|
||||
When all bugfixes and feature implementations under the
|
||||
`Version 1 release candidate milestone <https://gitlab.zrythm.org/zrythm/zrythm/-/issues?milestone_title=v1.rc>`_ are completed.
|
||||
|
||||
Usage
|
||||
+++++
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ Building from Source
|
|||
--------------------
|
||||
You can build Zrythm from source, either using
|
||||
a `source distribution tarball <https://www.zrythm.org/releases/>`_
|
||||
or `git <https://git.zrythm.org/zrythm/zrythm/>`_.
|
||||
or `git <https://gitlab.zrythm.org/zrythm/zrythm/>`_.
|
||||
|
||||
See ``INSTALL.rst`` in
|
||||
the source distribution for installation
|
||||
|
|
|
|||
|
|
@ -362,9 +362,6 @@ cdata.set_quoted (
|
|||
cdata.set_quoted (
|
||||
'NEW_ISSUE_URL',
|
||||
'https://gitlab.zrythm.org/zrythm/zrythm/-/issues/new')
|
||||
cdata.set_quoted (
|
||||
'NEW_ISSUE_EMAIL',
|
||||
'~alextee/zrythm-bug@todo.sr.ht')
|
||||
cdata.set_quoted (
|
||||
'PRIVACY_POLICY_URL',
|
||||
'https://www.zrythm.org/en/privacy.html')
|
||||
|
|
@ -380,6 +377,9 @@ cdata.set_quoted (
|
|||
cdata.set_quoted (
|
||||
'LICENSE_URL',
|
||||
'https://gitlab.zrythm.org/zrythm/zrythm/-/raw/master/LICENSES/LicenseRef-ZrythmLicense.txt')
|
||||
cdata.set_quoted (
|
||||
'TRADEMARK_POLICY_URL',
|
||||
'https://gitlab.zrythm.org/zrythm/zrythm/-/raw/master/TRADEMARKS.md')
|
||||
cdata.set_quoted (
|
||||
'BUG_REPORT_API_ENDPOINT',
|
||||
'https://accounts.zrythm.org/api/v1/error-reports/new')
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ i18n.gettext (
|
|||
languages: languages_for_gettext,
|
||||
args: [
|
||||
'--directory=' + meson_src_root,
|
||||
'--msgid-bugs-address=https://todo.sr.ht/~alextee/zrythm-bug',
|
||||
'--msgid-bugs-address=' + cdata.get ('ISSUE_TRACKER_URL'),
|
||||
'--add-comments',
|
||||
'--keyword=N_',
|
||||
'--keyword=C_:1c,2',
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: zrythm\n"
|
||||
"Report-Msgid-Bugs-To: https://todo.sr.ht/~alextee/zrythm-bug\n"
|
||||
"Report-Msgid-Bugs-To: https://gitlab.zrythm.org/zrythm/zrythm/-/issues\n"
|
||||
"POT-Creation-Date: 2023-08-15 16:37+0900\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ scripts_conf = {
|
|||
'MESON_SOURCE_ROOT': meson_src_root,
|
||||
'HOMEPAGE_URL': 'https://www.zrythm.org/en/index.html',
|
||||
'DONATION_URL': 'https://www.zrythm.org/en/community.html#donate',
|
||||
'BUG_REPORT_URL': 'https://todo.sr.ht/~alextee/zrythm-bug',
|
||||
'BUG_REPORT_URL': cdata.get ('ISSUE_TRACKER_URL'),
|
||||
'FAQ_URL': 'https://manual.zrythm.org/en/getting-started/faq.html',
|
||||
'USER_MANUAL_URL': 'https://manual.zrythm.org/en/index.html',
|
||||
'TRANSLATE_URL': 'https://hosted.weblate.org/engage/zrythm/',
|
||||
|
|
|
|||
|
|
@ -245,6 +245,7 @@ automation_track_get_automation_tracklist (
|
|||
AutomationTrack * self)
|
||||
{
|
||||
Track * track = automation_track_get_track (self);
|
||||
g_return_val_if_fail (track, NULL);
|
||||
return track_get_automation_tracklist (track);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ G_DEFINE_TYPE (
|
|||
bug_report_dialog_widget,
|
||||
GTK_TYPE_DIALOG)
|
||||
|
||||
#define SOURCEHUT_RESPONSE 450
|
||||
#define GITLAB_RESPONSE 450
|
||||
#define EMAIL_RESPONSE 451
|
||||
#define PREVIEW_AND_SEND_AUTOMATICALLY_RESPONSE 452
|
||||
|
||||
|
|
@ -399,7 +399,7 @@ on_preview_and_send_automatically_response (
|
|||
}
|
||||
|
||||
static void
|
||||
on_sourcehut_response (BugReportDialogWidget * self)
|
||||
on_gitlab_response (BugReportDialogWidget * self)
|
||||
{
|
||||
if (!validate_input (self))
|
||||
return;
|
||||
|
|
@ -412,7 +412,7 @@ on_sourcehut_response (BugReportDialogWidget * self)
|
|||
GTK_BUTTONS_CLOSE, NULL);
|
||||
|
||||
gtk_window_set_title (
|
||||
GTK_WINDOW (dialog), _ ("Send via Sourcehut"));
|
||||
GTK_WINDOW (dialog), _ ("Send via GitLab"));
|
||||
|
||||
/* set top text */
|
||||
char * atag =
|
||||
|
|
@ -457,7 +457,8 @@ on_email_response (BugReportDialogWidget * self)
|
|||
|
||||
char * report_template = get_report_template (self, true);
|
||||
char * email_url = g_strdup_printf (
|
||||
"mailto:%s?body=%s", NEW_ISSUE_EMAIL, report_template);
|
||||
/* FIXME */
|
||||
"mailto:%s?body=%s", NEW_ISSUE_URL, report_template);
|
||||
g_free (report_template);
|
||||
|
||||
gtk_show_uri (
|
||||
|
|
@ -487,8 +488,8 @@ on_response (
|
|||
exit (EXIT_FAILURE);
|
||||
}
|
||||
break;
|
||||
case SOURCEHUT_RESPONSE:
|
||||
on_sourcehut_response (self);
|
||||
case GITLAB_RESPONSE:
|
||||
on_gitlab_response (self);
|
||||
break;
|
||||
case EMAIL_RESPONSE:
|
||||
on_email_response (self);
|
||||
|
|
@ -663,8 +664,8 @@ bug_report_dialog_widget_init (BugReportDialogWidget * self)
|
|||
|
||||
gtk_dialog_add_buttons (
|
||||
GTK_DIALOG (self), _ ("_Close"), GTK_RESPONSE_CLOSE,
|
||||
_ ("Submit on _SourceHut"), SOURCEHUT_RESPONSE,
|
||||
_ ("Send via _email (publicly visible)"), EMAIL_RESPONSE,
|
||||
_ ("Submit on _GitLab"), GITLAB_RESPONSE,
|
||||
/*_ ("Send via _email (publicly visible)"), EMAIL_RESPONSE,*/
|
||||
_ ("Preview and send _automatically (privately/recommended)"),
|
||||
PREVIEW_AND_SEND_AUTOMATICALLY_RESPONSE, NULL);
|
||||
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ welcome_message_dialog_new (GtkWindow * parent)
|
|||
char * trademarks = g_strdup_printf (
|
||||
_ ("Zrythm and the Zrythm logo are "
|
||||
"%strademarks of Alexandros Theodotou%s."),
|
||||
"<a href=\"https://git.sr.ht/~alextee/zrythm/tree/master/item/TRADEMARKS.md\">",
|
||||
"<a href=\"" TRADEMARK_POLICY_URL "\">",
|
||||
"</a>");
|
||||
g_string_append_printf (gstr, "\n\n%s", trademarks);
|
||||
g_free (trademarks);
|
||||
|
|
|
|||
|
|
@ -661,6 +661,7 @@ plugin_remove_ats_from_automation_tracklist (
|
|||
bool fire_events)
|
||||
{
|
||||
Track * track = plugin_get_track (pl);
|
||||
g_return_if_fail (IS_TRACK_AND_NONNULL (track));
|
||||
AutomationTracklist * atl =
|
||||
track_get_automation_tracklist (track);
|
||||
g_return_if_fail (atl);
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
[wrap-git]
|
||||
url = https://git.sr.ht/~alextee/zrythm-libcyaml
|
||||
url = https://gitlab.zrythm.org/zrythm/zrythm-libcyaml
|
||||
revision = master
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
[wrap-git]
|
||||
url=https://git.sr.ht/~alextee/libpanel-detach
|
||||
url=https://gitlab.zrythm.org/zrythm/libpanel-detach
|
||||
revision=zrythm_detach
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
[wrap-git]
|
||||
url = https://git.sr.ht/~alextee/zrythm-rtmidi
|
||||
url = https://gitlab.zrythm.org/zrythm/zrythm-rtmidi
|
||||
revision = master
|
||||
|
|
|
|||
Loading…
Reference in New Issue