Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
U
upower
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
pkg
obextra
upower
Commits
831f00d8
Commit
831f00d8
authored
6 months ago
by
Bro Brian
Browse files
Options
Downloads
Patches
Plain Diff
Delete 0002-build-Fix-version-macros.patch
no longer needed
parent
fb0976dd
No related branches found
No related tags found
No related merge requests found
Pipeline
#53659
failed
6 months ago
Stage: build
Stage: rebuild
Stage: deploy
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
diff/file/0002-build-Fix-version-macros.patch
+0
-31
0 additions, 31 deletions
diff/file/0002-build-Fix-version-macros.patch
with
0 additions
and
31 deletions
diff/file/0002-build-Fix-version-macros.patch
deleted
100644 → 0
+
0
−
31
View file @
fb0976dd
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
Date: Sat, 5 Feb 2022 02:30:52 +0000
Subject: [PATCH] build: Fix version macros
The project version is a string. We need to split it into an array of
version components.
---
libupower-glib/meson.build | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/libupower-glib/meson.build b/libupower-glib/meson.build
index 1bab59b80390..2ff7baf51e85 100644
--- a/libupower-glib/meson.build
+++ b/libupower-glib/meson.build
@@ -1,7 +1,12 @@
+version_arr = meson.project_version().split('.')
+major_version = version_arr[0].to_int()
+minor_version = version_arr[1].to_int()
+micro_version = version_arr[2].to_int()
+
cdata = configuration_data()
-cdata.set('UP_MAJOR_VERSION', meson.project_version()[0])
-cdata.set('UP_MINOR_VERSION', meson.project_version()[1])
-cdata.set('UP_MICRO_VERSION', meson.project_version()[2])
+cdata.set('UP_MAJOR_VERSION', major_version)
+cdata.set('UP_MINOR_VERSION', minor_version)
+cdata.set('UP_MICRO_VERSION', micro_version)
up_version_h = configure_file(
output: 'up-version.h',
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