Skip to content

Commit

Permalink
Merge pull request #1 from BuddiesOfBudgie/gnometobudgie
Browse files Browse the repository at this point in the history
Replace gnome build components with budgie equivalents
  • Loading branch information
fossfreedom authored Oct 29, 2023
2 parents fcad448 + df2b6bd commit ed9f7e3
Show file tree
Hide file tree
Showing 36 changed files with 465 additions and 374 deletions.
1 change: 1 addition & 0 deletions .github/FUNDING.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
open_collective: buddies-of-budgie
68 changes: 68 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
name: Bug report
description: Let us know about an unexpected error, a crash, or an incorrect behavior.
title: "[Bug] "
body:
- type: markdown
attributes:
value: |
⚠️ Before submitting this issue, please check the open issues and ensure that you fill in as much as possible in this template.
📝 If including build failures, or general tool output, please ensure they are in English, i.e. `LC_ALL=C LANG=C`.
📝 If your issue is a *crash*, include a stack trace. (gdb)
- type: textarea
id: description
attributes:
label: Description
description: Description of the issue you encountered.
validations:
required: true

- type: input
id: version
attributes:
label: budgie-session version
description: Provide the exact version of your budgie-session package.
validations:
required: true

- type: input
id: os
attributes:
label: Operating System
description: Name and version number of your Operating System.
placeholder: Solus 4
validations:
required: true

- type: textarea
id: reproduce
attributes:
label: Steps to reproduce the issue
description: Please add the steps on how to reproduce the issue.
placeholder: |
1. Go to '...'
2. Click on '...'
3. Scroll down to '...'
4. See error
validations:
required: true

- type: textarea
id: actual-result
attributes:
label: Actual result
description: Please add screenshots if needed.
validations:
required: true

- type: textarea
id: expected-result
attributes:
label: Expected result
validations:
required: true

- type: textarea
id: additional-information
attributes:
label: Additional information
32 changes: 32 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Feature request
description: Suggest a new feature or other enhancement.
title: "[Request] "
body:
- type: input
id: version
attributes:
label: budgie-session version
description: |
Version name of budgie-session, i.e. budgie-session 0.9 OR specific git commit.
validations:
required: true

- type: textarea
id: cases
attributes:
label: Use-cases
description: In order to properly evaluate a feature request, it is necessary to understand the use-cases for it. Please describe below the end goal you are trying to achieve that has led you to request this feature.
validations:
required: true

- type: textarea
id: proposal
attributes:
label: Proposal
description: If you have any idea on how it could be addressed, please note it below.

- type: textarea
id: references
attributes:
label: References
description: Are there any other GitHub issues, whether open or closed, that are related to the problem you've described above or to the suggested solution? If so, please add them below.
26 changes: 26 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Configuration for our stale bot
# See all options at https://github.com/probot/stale

daysUntilStale: 30

# If we triaged it to a certain milestone or project, Stale should leave it alone
exemptAssignees: true
exemptMilestones: true
exemptProjects: true

# Stale should leave PRs alone. It is okay for them to stay open for a while
only: issues

# Only apply to labels we manually add here...
onlyLabels: [needs-more-info, third-party]

# Comment the bot posts
markComment: >
This issue has been automatically marked as stale because it has not had recent activity. This will be closed if no further activity occurs.
This issue may have been marked for the following reasons:
1. If it was marked as needs-more-info, we are currently awaiting actionable information to address this issue.
2. If it was marked as third-party, this may be an issue related to a third-party rather than Budgie itself. These issues are kept open for a certain amount of time of facilitate discussions / investigations.
# The default is wontfix which may send the wrong message.
# For example, if we are waiting for more information, the implication we won't fix the issue just because we don't have all the details isn't friendly.
staleLabel: closed-by-stale
17 changes: 17 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Build on Ubuntu 22.04
on:
push:
branches:
- main
pull_request:
branches:
- main
jobs:
ubuntu:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v1
- run: sudo apt update
- run: sudo apt install libdbus-1-dev libgl-dev libgles-dev libglib2.0-dev libgnome-desktop-3-dev libgtk-3-dev libice-dev libjson-glib-dev libsm-dev libsystemd-dev libx11-dev libxau-dev libxcomposite-dev libxext-dev libxrender-dev libxt-dev libxtst-dev meson systemd xmlto xsltproc xtrans-dev
- run: meson build
- run: meson compile -C build
5 changes: 0 additions & 5 deletions data/gnome-custom-session.desktop.in.in

This file was deleted.

2 changes: 0 additions & 2 deletions data/gnome-dummy.session.desktop.in.in

This file was deleted.

8 changes: 0 additions & 8 deletions data/gnome-wayland.desktop.in.in

This file was deleted.

8 changes: 0 additions & 8 deletions data/gnome-xorg.desktop.in.in

This file was deleted.

8 changes: 0 additions & 8 deletions data/gnome.desktop.in.in

This file was deleted.

14 changes: 2 additions & 12 deletions data/meson.build
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
desktop_plain = 'gnome'

desktops = [
desktop_plain,
'gnome-xorg',
'gnome-wayland',
]

shell_component = {
Expand Down Expand Up @@ -74,8 +71,6 @@ foreach name: desktops
endforeach

sessions = [
'gnome',
'gnome-dummy'
]

foreach session: sessions
Expand Down Expand Up @@ -105,7 +100,7 @@ endforeach

schema_conf = configuration_data()

schema = 'org.gnome.SessionManager.gschema.xml'
schema = 'org.buddiesofbudgie.SessionManager.gschema.xml'

configure_file(
input: schema + '.in',
Expand All @@ -115,12 +110,7 @@ configure_file(
configuration: schema_conf
)

install_data(
'gnome-session.convert',
install_dir: join_paths(session_datadir, 'GConf', 'gsettings')
)

if enable_systemd_session
if 1==2
unit_conf = configuration_data()
unit_conf.set('libexecdir', session_libexecdir)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<schemalist gettext-domain="gnome-session-3.0">
<schema id="org.gnome.SessionManager" path="/org/gnome/gnome-session/">
<schemalist gettext-domain="budgie-session-3.0">
<schema id="org.buddiesofbudgie.SessionManager" path="/org/buddiesofbudgie/budgie-session/">
<key name="auto-save-session" type="b">
<default>false</default>
<summary>Save sessions</summary>
Expand Down
51 changes: 51 additions & 0 deletions doc/dbus/budgie-session.xml.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
<!ENTITY dbus-Manager SYSTEM "org.gnome.SessionManager.ref.xml">
<!ENTITY dbus-Client SYSTEM "org.gnome.SessionManager.Client.ref.xml">
<!ENTITY dbus-ClientPrivate SYSTEM "org.gnome.SessionManager.ClientPrivate.ref.xml">
<!ENTITY dbus-Inhibitor SYSTEM "org.gnome.SessionManager.Inhibitor.ref.xml">
<!ENTITY dbus-Presence SYSTEM "org.gnome.SessionManager.Presence.ref.xml">
]>

<book id="index">
<bookinfo>
<title>Budgie Session @VERSION@ Documentation</title>
<releaseinfo>Version @VERSION@</releaseinfo>
<authorgroup>
<author>
<surname>Budgie Developers</surname>
<affiliation>
<address>
<email>[email protected]</email>
</address>
</affiliation>
</author>
</authorgroup>
</bookinfo>

<part>
<title>Reference</title>

<reference id="dbus-reference">
<title>D-Bus API Reference</title>

<partintro>
<para>
This API is not yet stable and is likely to change in the future.
</para>
</partintro>

&dbus-Manager;
&dbus-Client;
&dbus-ClientPrivate;
&dbus-Inhibitor;
&dbus-Presence;

</reference>
</part>

<index>
<title>Index</title>
</index>

</book>
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
<refentry id="gnome-session-inhibit" lang="en">
<refentry id="budgie-session-inhibit" lang="en">

<refentryinfo>
<title>gnome-session-inhibit</title>
<productname>gnome-session</productname>
<title>budgie-session-inhibit</title>
<productname>budgie-session</productname>
</refentryinfo>

<refmeta>
<refentrytitle>gnome-session-inhibit</refentrytitle>
<refentrytitle>budgie-session-inhibit</refentrytitle>
<manvolnum>1</manvolnum>
<refmiscinfo class="manual">User Commands</refmiscinfo>
</refmeta>

<refnamediv>
<refname>gnome-session-inhibit</refname>
<refpurpose>inhibit gnome-session functionality</refpurpose>
<refname>budgie-session-inhibit</refname>
<refpurpose>inhibit budgie-session functionality</refpurpose>
</refnamediv>

<refsynopsisdiv>
<cmdsynopsis>
<command>gnome-session-inhibit</command>
<command>budgie-session-inhibit</command>
<arg choice="opt" rep="repeat">OPTION</arg>
<arg choice="opt">COMMAND</arg>
</cmdsynopsis>
</refsynopsisdiv>

<refsect1><title>Description</title>
<para><command>gnome-session-inhibit</command> can inhibit certain
gnome-session functionality while executing the given COMMAND. To
achieve this, it calls the Inhibit() method of the gnome-session
<para><command>budgie-session-inhibit</command> can inhibit certain
budgie-session functionality while executing the given COMMAND. To
achieve this, it calls the Inhibit() method of the budgie-session
D-Bus API and creates an inhibitor. The inhibitor is automatically
removed when gnome-session-inhibit exits.
removed when budgie-session-inhibit exits.
</para>
<para>
A typical use case is to prevent the session from going idle (and
Expand Down Expand Up @@ -58,15 +58,15 @@ print version information and exit
<varlistentry>
<term><option>--app-id</option> ID</term>
<listitem><para>
The application id to use when calling the gnome-session Inhibit() method.
The application id to use when calling the budgie-session Inhibit() method.
If this option is not specified, "unknown" is used.
</para></listitem>
</varlistentry>

<varlistentry>
<term><option>--reason</option> REASON</term>
<listitem><para>
A human-readable reason to pass along when calling the gnome-session
A human-readable reason to pass along when calling the budgie-session
Inhibit() method. If this option is not specified, "not specified" is used.
</para></listitem>
</varlistentry>
Expand Down
35 changes: 35 additions & 0 deletions doc/man/budgie-session-quit.1
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
.\"
.\" budgie-session-quit manual page.
.\" (C) 2000 Miguel de Icaza ([email protected])
.\" (C) 2009-2010 Vincent Untz ([email protected])
.\" (C) 2023 buddiesofbudgie
.\"
.TH budgie-SESSION-QUIT 1 "budgie"
.SH NAME
budgie-session-quit \- End the current budgie session
.SH SYNOPSIS
.B budgie-session-quit [\-\-logout|\-\-power-off|\-\-reboot] [\-\-force] [\-\-no-prompt]
.SH DESCRIPTION
The \fIbudgie-session-quit\fP program can be used to end a budgie session.
.SH OPTIONS
The following options are supported:
.TP
.I "--logout"
Prompt the user to confirm logout. This is the default behavior.
.TP
.I "--power-off"
Prompt the user to confirm system power off.
.TP
.I "--reboot"
Prompt the user to confirm system reboot.
.TP
.I "--force"
Ignore any inhibitors.
.TP
.I "--no-prompt"
End the session without user interaction. This only works with \fI--logout\fP.
.SH BUGS
If you find bugs in the \fIbudgie-session-quit\fP program, please report
these on https://github.com/buddiesofbudgie/budgie-session.
.SH SEE ALSO
.BR budgie-session(1)
Loading

0 comments on commit ed9f7e3

Please sign in to comment.