Accepting request 930133 from home:badshah400:branches:Base:System
* Update to version 0.10.1. * Drop f83685732b9dd8211840645ce76f43718b30218b.patch: incorporated upstream. OBS-URL: https://build.opensuse.org/request/show/930133 OBS-URL: https://build.opensuse.org/package/show/Base:System/power-profiles-daemon?expand=0&rev=7
This commit is contained in:
parent
b7c5ab303e
commit
0bcfbe5fa7
@ -1,75 +0,0 @@
|
|||||||
From f83685732b9dd8211840645ce76f43718b30218b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Bastien Nocera <hadess@hadess.net>
|
|
||||||
Date: Wed, 6 Oct 2021 10:22:10 +0200
|
|
||||||
Subject: [PATCH] build: Make pylint test optional
|
|
||||||
|
|
||||||
As power-profiles-daemon keeps getting built with slightly different
|
|
||||||
versions of pylint with newer warnings, disable pylint test by default
|
|
||||||
to avoid getting bug reports about it.
|
|
||||||
|
|
||||||
Closes: #52
|
|
||||||
---
|
|
||||||
.gitlab-ci.yml | 2 +-
|
|
||||||
meson.build | 6 ++++--
|
|
||||||
meson_options.txt | 4 ++++
|
|
||||||
src/meson.build | 2 +-
|
|
||||||
4 files changed, 10 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
|
|
||||||
index ab28029..592a89d 100644
|
|
||||||
--- a/.gitlab-ci.yml
|
|
||||||
+++ b/.gitlab-ci.yml
|
|
||||||
@@ -22,7 +22,7 @@ build_stable:
|
|
||||||
- dnf upgrade -y --nogpgcheck fedora-release fedora-repos*
|
|
||||||
- dnf update -y && dnf install -y $DEPENDENCIES
|
|
||||||
script:
|
|
||||||
- - meson -Dgtk_doc=true _build
|
|
||||||
+ - meson -Dgtk_doc=true -Dpylint=true _build
|
|
||||||
- ninja -v -C _build
|
|
||||||
- ninja -v -C _build install
|
|
||||||
- ninja -v -C _build uninstall
|
|
||||||
diff --git a/meson.build b/meson.build
|
|
||||||
index 70ab243..4ae43c0 100644
|
|
||||||
--- a/meson.build
|
|
||||||
+++ b/meson.build
|
|
||||||
@@ -42,8 +42,10 @@ gnome = import('gnome')
|
|
||||||
add_global_arguments('-D_GNU_SOURCE=1', language: 'c')
|
|
||||||
add_global_arguments(common_cflags, language: 'c')
|
|
||||||
|
|
||||||
-pylint = find_program('pylint-3', 'pylint3', 'pylint', required: false)
|
|
||||||
-pylint_flags = ['-d', 'C0116', '-d', 'C0114', '-d', 'W0707']
|
|
||||||
+if get_option('pylint')
|
|
||||||
+ pylint = find_program('pylint-3', 'pylint3', 'pylint', required: true)
|
|
||||||
+ pylint_flags = ['-d', 'C0116', '-d', 'C0114', '-d', 'W0707']
|
|
||||||
+endif
|
|
||||||
xmllint = find_program('xmllint', required: false)
|
|
||||||
|
|
||||||
subdir('src')
|
|
||||||
diff --git a/meson_options.txt b/meson_options.txt
|
|
||||||
index a3789f6..7e89619 100644
|
|
||||||
--- a/meson_options.txt
|
|
||||||
+++ b/meson_options.txt
|
|
||||||
@@ -6,3 +6,7 @@ option('gtk_doc',
|
|
||||||
type: 'boolean',
|
|
||||||
value: false,
|
|
||||||
description: 'Build docs')
|
|
||||||
+option('pylint',
|
|
||||||
+ type: 'boolean',
|
|
||||||
+ value: false,
|
|
||||||
+ description: 'Run pylint checks, for developers only')
|
|
||||||
diff --git a/src/meson.build b/src/meson.build
|
|
||||||
index 0c00564..f20e42a 100644
|
|
||||||
--- a/src/meson.build
|
|
||||||
+++ b/src/meson.build
|
|
||||||
@@ -72,7 +72,7 @@ script = configure_file(
|
|
||||||
install_dir: get_option('bindir')
|
|
||||||
)
|
|
||||||
|
|
||||||
-if pylint.found()
|
|
||||||
+if get_option('pylint')
|
|
||||||
test('pylint-powerprofilesctl',
|
|
||||||
pylint,
|
|
||||||
args: pylint_flags + [ script ],
|
|
||||||
--
|
|
||||||
GitLab
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
|||||||
Index: power-profiles-daemon-0.9.0/src/power-profiles-daemon.c
|
Index: power-profiles-daemon-0.10.1/src/power-profiles-daemon.c
|
||||||
===================================================================
|
===================================================================
|
||||||
--- power-profiles-daemon-0.9.0.orig/src/power-profiles-daemon.c
|
--- power-profiles-daemon-0.10.1.orig/src/power-profiles-daemon.c
|
||||||
+++ power-profiles-daemon-0.9.0/src/power-profiles-daemon.c
|
+++ power-profiles-daemon-0.10.1/src/power-profiles-daemon.c
|
||||||
@@ -526,6 +526,29 @@ holder_disappeared (GDBusConnection *con
|
@@ -531,6 +531,29 @@ holder_disappeared (GDBusConnection *con
|
||||||
g_ptr_array_free (cookies, TRUE);
|
g_ptr_array_free (cookies, TRUE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -32,7 +32,7 @@ Index: power-profiles-daemon-0.9.0/src/power-profiles-daemon.c
|
|||||||
static void
|
static void
|
||||||
hold_profile (PpdApp *data,
|
hold_profile (PpdApp *data,
|
||||||
GVariant *parameters,
|
GVariant *parameters,
|
||||||
@@ -548,6 +571,18 @@ hold_profile (PpdApp *dat
|
@@ -553,6 +576,18 @@ hold_profile (PpdApp *dat
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:8abc36acb4abeef8731f09b97931b894fcc11c2e6c7806adbd0652264318b92d
|
|
||||||
size 43887
|
|
3
power-profiles-daemon-0.10.1.tar.bz2
Normal file
3
power-profiles-daemon-0.10.1.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:fffaf7cd11ab305497fb8842fc2497caf92a3f260ba9272159b0612820f1399c
|
||||||
|
size 44125
|
@ -1,3 +1,14 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Nov 5 18:35:24 UTC 2021 - Atri Bhattacharya <badshah400@gmail.com>
|
||||||
|
|
||||||
|
- Update to version 0.10.1:
|
||||||
|
* Fix bug in the authorisation codepath added in 0.10.0, where
|
||||||
|
holding a profile could still succeed despite having sent a
|
||||||
|
denial to the calling process.
|
||||||
|
* Make pylint test optional.
|
||||||
|
- Drop f83685732b9dd8211840645ce76f43718b30218b.patch:
|
||||||
|
incorporated upstream.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Oct 6 20:32:31 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
|
Wed Oct 6 20:32:31 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: power-profiles-daemon
|
Name: power-profiles-daemon
|
||||||
Version: 0.10.0
|
Version: 0.10.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Power profiles handling over D-Bus
|
Summary: Power profiles handling over D-Bus
|
||||||
License: GPL-3.0-or-later
|
License: GPL-3.0-or-later
|
||||||
@ -25,8 +25,6 @@ URL: https://gitlab.freedesktop.org/hadess/power-profiles-daemon
|
|||||||
Source: %{url}/-/archive/%{version}/%{name}-%{version}.tar.bz2
|
Source: %{url}/-/archive/%{version}/%{name}-%{version}.tar.bz2
|
||||||
# PATCH-FEATURE-OPENSUSE hold-profile-hardening.patch boo#1189900 -- Hardening of HoldProfile D-Bus method
|
# PATCH-FEATURE-OPENSUSE hold-profile-hardening.patch boo#1189900 -- Hardening of HoldProfile D-Bus method
|
||||||
Patch0: hold-profile-hardening.patch
|
Patch0: hold-profile-hardening.patch
|
||||||
# PATCH-FIX-UPSTREAM f83685732b9dd8211840645ce76f43718b30218b.patch -- build: Make pylint test optional
|
|
||||||
Patch1: https://gitlab.freedesktop.org/hadess/power-profiles-daemon/-/commit/f83685732b9dd8211840645ce76f43718b30218b.patch
|
|
||||||
|
|
||||||
BuildRequires: c_compiler
|
BuildRequires: c_compiler
|
||||||
BuildRequires: gtk-doc
|
BuildRequires: gtk-doc
|
||||||
|
Loading…
Reference in New Issue
Block a user