diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a0dd07c..9826e23 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ stages: - extras variables: - FDO_UPSTREAM_REPO: 'ryuukyu/helvum' + FDO_UPSTREAM_REPO: 'pipewire/helvum' # Version and tag for our current container .fedora: diff --git a/Cargo.toml b/Cargo.toml index 71ab6d5..fa67851 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" rust-version = "1.56" license = "GPL-3.0-only" description = "A GTK patchbay for pipewire" -repository = "https://gitlab.freedesktop.org/ryuukyu/helvum" +repository = "https://gitlab.freedesktop.org/pipewire/helvum" readme = "README.md" keywords = ["pipewire", "gtk", "patchbay", "gui", "utility"] categories = ["gui", "multimedia"] diff --git a/README.md b/README.md index 3677e75..8d4a3cd 100644 --- a/README.md +++ b/README.md @@ -14,9 +14,7 @@ More suggestions are welcome! # Building -## Via flatpak (recommended) -The recommended way to build is using flatpak, which will take care of all dependencies and avoid any problems that may come from different system configurations. - +## Via flatpak If you don't have the flathub repo in your remote-list for flatpak you will need to add that first: ```shell $ flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo @@ -29,12 +27,12 @@ $ flatpak install org.gnome.{Platform,Sdk}//41 org.freedesktop.Sdk.Extension.rus To compile and install as a flatpak, clone the project, change to the project directory, and run: ```shell -$ flatpak-builder --install flatpak-build/ build-aux/org.freedesktop.ryuukyu.Helvum.json +$ flatpak-builder --install flatpak-build/ build-aux/org.pipewire.Helvum.json ``` You can then run the app via ```shell -$ flatpak run org.freedesktop.ryuukyu.Helvum +$ flatpak run org.pipewire.Helvum ``` ## Manually diff --git a/build-aux/org.freedesktop.ryuukyu.Helvum.json b/build-aux/org.pipewire.Helvum.json similarity index 95% rename from build-aux/org.freedesktop.ryuukyu.Helvum.json rename to build-aux/org.pipewire.Helvum.json index 2a303d6..f947d7f 100644 --- a/build-aux/org.freedesktop.ryuukyu.Helvum.json +++ b/build-aux/org.pipewire.Helvum.json @@ -1,5 +1,5 @@ { - "app-id": "org.freedesktop.ryuukyu.Helvum", + "app-id": "org.pipewire.Helvum", "runtime": "org.gnome.Platform", "runtime-version": "41", "sdk": "org.gnome.Sdk", diff --git a/data/icons/org.freedesktop.ryuukyu.Helvum-symbolic.svg b/data/icons/org.pipewire.Helvum-symbolic.svg similarity index 100% rename from data/icons/org.freedesktop.ryuukyu.Helvum-symbolic.svg rename to data/icons/org.pipewire.Helvum-symbolic.svg diff --git a/data/icons/org.freedesktop.ryuukyu.Helvum.Source.svg b/data/icons/org.pipewire.Helvum.Source.svg similarity index 99% rename from data/icons/org.freedesktop.ryuukyu.Helvum.Source.svg rename to data/icons/org.pipewire.Helvum.Source.svg index 95380b3..f61c8aa 100644 --- a/data/icons/org.freedesktop.ryuukyu.Helvum.Source.svg +++ b/data/icons/org.pipewire.Helvum.Source.svg @@ -10,7 +10,7 @@ id="svg11300" sodipodi:version="0.32" inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)" - sodipodi:docname="org.freedesktop.ryuukyu.Helvum.Source.svg" + sodipodi:docname="org.pipewire.Helvum.Source.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.0" style="display:inline;enable-background:new" diff --git a/data/icons/org.freedesktop.ryuukyu.Helvum.svg b/data/icons/org.pipewire.Helvum.svg similarity index 100% rename from data/icons/org.freedesktop.ryuukyu.Helvum.svg rename to data/icons/org.pipewire.Helvum.svg diff --git a/data/org.freedesktop.ryuukyu.Helvum.desktop.in b/data/org.pipewire.Helvum.desktop.in similarity index 100% rename from data/org.freedesktop.ryuukyu.Helvum.desktop.in rename to data/org.pipewire.Helvum.desktop.in diff --git a/data/org.freedesktop.ryuukyu.Helvum.metainfo.xml.in b/data/org.pipewire.Helvum.metainfo.xml.in similarity index 83% rename from data/org.freedesktop.ryuukyu.Helvum.metainfo.xml.in rename to data/org.pipewire.Helvum.metainfo.xml.in index f5934f8..75d3f71 100644 --- a/data/org.freedesktop.ryuukyu.Helvum.metainfo.xml.in +++ b/data/org.pipewire.Helvum.metainfo.xml.in @@ -15,12 +15,12 @@ - https://gitlab.freedesktop.org/ryuukyu/helvum/-/raw/main/docs/screenshot.png + https://gitlab.freedesktop.org/pipewire/helvum/-/raw/main/docs/screenshot.png @app-id@.desktop - https://gitlab.freedesktop.org/ryuukyu/helvum - https://gitlab.freedesktop.org/ryuukyu/helvum/-/issues + https://gitlab.freedesktop.org/pipewire/helvum + https://gitlab.freedesktop.org/pipewire/helvum/-/issues diff --git a/docs/making_a_release.md b/docs/making_a_release.md index 29167f7..ec0bd8a 100644 --- a/docs/making_a_release.md +++ b/docs/making_a_release.md @@ -2,7 +2,7 @@ The following describes the process of making a new release: -1. In `data/org.freedesktop.ryuukyu.Helvum.metainfo.xml.in`, +1. In `data/org.pipewire.Helvum.metainfo.xml.in`, add a new `` tag to the releases section with the appropriate version and date. 2. In `meson.build` and `Cargo.toml`, bumb the projects version to the new version. diff --git a/meson.build b/meson.build index 9c3b91b..7ded670 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,7 @@ project( meson_version: '>=0.50.0' ) -base_id = 'org.freedesktop.ryuukyu.Helvum' +base_id = 'org.pipewire.Helvum' dependency('glib-2.0', version: '>= 2.66') dependency('gtk4', version: '>= 4.4.0') diff --git a/src/application.rs b/src/application.rs index dc21def..c71dcb6 100644 --- a/src/application.rs +++ b/src/application.rs @@ -101,9 +101,8 @@ impl Application { gtk_receiver: Receiver, pw_sender: Sender, ) -> Self { - let app: Application = - glib::Object::new(&[("application-id", &"org.freedesktop.ryuukyu.Helvum")]) - .expect("Failed to create new Application"); + let app: Application = glib::Object::new(&[("application-id", &"org.pipewire.Helvum")]) + .expect("Failed to create new Application"); let imp = imp::Application::from_instance(&app); imp.pw_sender