Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
package-helpers
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
trisquel
package-helpers
Commits
ee91cb69
Commit
ee91cb69
authored
2 years ago
by
Luis Guzmán
Browse files
Options
Downloads
Patches
Plain Diff
psensor: port fix ftbfs psensor with gcc-11 on aramo.
parent
05a3f2aa
No related branches found
No related tags found
1 merge request
!873
psensor: port fix ftbfs psensor with gcc-11 on aramo.
Pipeline
#668
passed
2 years ago
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
helpers/DATA/psensor/fix-ftbfs-debian-patch.patch
+32
-0
32 additions, 0 deletions
helpers/DATA/psensor/fix-ftbfs-debian-patch.patch
helpers/make-psensor
+3
-0
3 additions, 0 deletions
helpers/make-psensor
with
35 additions
and
0 deletions
helpers/DATA/psensor/fix-ftbfs-debian-patch.patch
0 → 100644
+
32
−
0
View file @
ee91cb69
diff -Nru psensor-1.1.5/debian/patches/fix-ftbfs.patch psensor-1.1.5/debian/patches/fix-ftbfs.patch
--- psensor-1.1.5/debian/patches/fix-ftbfs.patch 1970-01-01 01:00:00.000000000 +0100
+++ psensor-1.1.5/debian/patches/fix-ftbfs.patch 2022-09-02 23:32:48.000000000 +0100
@@ -0,0 +1,20 @@
+Description: Fix FTBFS with gcc-11
+ Fix the indentation while keeping the logic same as before.
+
+Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+---
+
+Bug-Debian: https://bugs.debian.org/984298
+Forwarded: no
+
+--- psensor-1.1.5.orig/src/lib/pudisks2.c
++++ psensor-1.1.5/src/lib/pudisks2.c
+@@ -83,7 +83,7 @@ static void smart_update(struct psensor
+ PROVIDER_NAME,
+ data->path);
+
+- data->last_smart_update = t;
++ data->last_smart_update = t;
+ }
+
+ void udisks2_psensor_list_update(struct psensor **sensors)
diff -Nru psensor-1.1.5/debian/patches/series psensor-1.1.5/debian/patches/series
--- psensor-1.1.5/debian/patches/series 2021-02-06 19:50:55.000000000 +0000
+++ psensor-1.1.5/debian/patches/series 2022-09-02 23:33:02.000000000 +0100
@@ -1,3 +1,4 @@
0001-Update-rsensor.c-drop-is_error-macro-definition.patch
14.patch
ayatana-appindicator.patch
+fix-ftbfs.patch
This diff is collapsed.
Click to expand it.
helpers/make-psensor
+
3
−
0
View file @
ee91cb69
...
@@ -23,6 +23,9 @@ VERSION=1
...
@@ -23,6 +23,9 @@ VERSION=1
sed
'/libxnvctrl-dev/d'
-i
debian/control
sed
'/libxnvctrl-dev/d'
-i
debian/control
#Apply fix ftbfs patch
patch
-p1
<
$DATA
/fix-ftbfs-debian-patch.patch
changelog
"Removed libxnvctrl0 dependency not present in Trisquel"
changelog
"Removed libxnvctrl0 dependency not present in Trisquel"
compile
compile
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment