pool/gnome-color-manager
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 586042 from GNOME:Next

Browse Source 
Update to 3.28.0

OBS-URL: https://build.opensuse.org/request/show/586042
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-color-manager?expand=0&rev=124
This commit is contained in:
Dominique Leuenberger 2018-03-13 08:20:11 +00:00 committed by Git OBS Bridge
parent 035fbb52eb
commit 2175cf4f25
6 changed files with 14 additions and 298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
0001-build-Set-PKGDATADIR-to-gnome-color-manager.patch
View File

@ -1,29 +0,0 @@
From 635ee49b83db46d2623826928cfa5202bdf1402a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Mon, 29 Jan 2018 20:45:01 +0100
Subject: [PATCH] build: Set PKGDATADIR to gnome-color-manager
It was set to gnome-software, which made any of the gcm-*
tools unable to find any of its data files.
https://bugzilla.gnome.org/show_bug.cgi?id=791158
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 3fd0963..d304ed1 100644
--- a/meson.build
+++ b/meson.build
@@ -85,7 +85,7 @@ prefixed_localedir = join_paths(get_option('prefix'), get_option('localedir'))
prefixed_libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'))
prefixed_mandir = join_paths(get_option('prefix'), get_option('mandir'))
prefixed_datadir = join_paths(get_option('prefix'), get_option('datadir'))
-prefixed_pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), 'gnome-software')
+prefixed_pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), 'gnome-color-manager')
libgio = dependency('gio-2.0', version : '>= 2.25.9')
libgtk = dependency('gtk+-3.0', version : '>= 2.91.0')
--
2.16.1

3
gnome-color-manager-3.26.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:652100e08520338b24218230f0586227879150d7d093ca637fc06130b72171cd
size 2611704

3
gnome-color-manager-3.28.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ec333a9fa4688b29b0f4b6cabe941f7f40bfe9a1369ba75b7ffc185c8d7a3dd6
size 2605620

258
gnome-color-manager-meson.patch
View File

@ -1,258 +0,0 @@
From 2ca18fb2c496c96563f282ff61e37931e89d90de Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Thu, 17 Aug 2017 14:28:53 +0200
Subject: [PATCH] build: Do not hardcode installation paths
https://bugzilla.gnome.org/show_bug.cgi?id=786424
---
data/appdata/meson.build | 2 +-
data/figures/meson.build | 4 ++--
data/icons/meson.build | 6 +++---
data/meson.build | 2 +-
data/targets/meson.build | 2 +-
data/ti1/meson.build | 2 +-
man/meson.build | 10 +++++-----
meson.build | 28 ++++++++++++----------------
src/meson.build | 7 +------
9 files changed, 27 insertions(+), 36 deletions(-)
diff --git a/data/appdata/meson.build b/data/appdata/meson.build
index 63c6913..3a97041 100644
--- a/data/appdata/meson.build
+++ b/data/appdata/meson.build
@@ -4,5 +4,5 @@ i18n.merge_file(
type: 'xml',
po_dir: join_paths(meson.source_root(), 'po'),
install: true,
- install_dir: join_paths(get_option('datadir'), 'metainfo')
+ install_dir: join_paths(prefixed_datadir, 'metainfo')
)
diff --git a/data/figures/meson.build b/data/figures/meson.build
index 9bf6556..695429a 100644
--- a/data/figures/meson.build
+++ b/data/figures/meson.build
@@ -4,7 +4,7 @@ install_data([
'viewer-example-02.png',
'viewer-example-03.png',
],
- install_dir : 'share/gnome-color-manager/figures'
+ install_dir : join_paths(prefixed_datadir, 'gnome-color-manager/figures')
)
install_data([
@@ -16,5 +16,5 @@ install_data([
'scan-target-good.svg',
'scan-target.svg',
],
- install_dir : 'share/gnome-color-manager/icons'
+ install_dir : join_paths(prefixed_datadir, 'gnome-color-manager/icons')
)
diff --git a/data/icons/meson.build b/data/icons/meson.build
index 9fc2ede..f1b05b3 100644
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -4,7 +4,7 @@ foreach size: icon_sizes
install_data([
size + '/gnome-color-manager.png',
],
- install_dir : 'share/icons/hicolor/' + size + '/apps',
+ install_dir : join_paths(prefixed_datadir, 'icons/hicolor/' + size + '/apps'),
)
endforeach
@@ -12,7 +12,7 @@ endforeach
install_data([
'scalable/gnome-color-manager.svg',
],
- install_dir : 'share/icons/hicolor/scalable/apps'
+ install_dir : join_paths(prefixed_datadir, 'icons/hicolor/scalable/apps')
)
install_data([
@@ -20,5 +20,5 @@ install_data([
'scalable/crt.svg',
'scalable/projector.svg',
],
- install_dir : 'share/gnome-color-manager/icons/icons'
+ install_dir : join_paths(prefixed_datadir, 'gnome-color-manager/icons/icons')
)
diff --git a/data/meson.build b/data/meson.build
index af8280f..069395c 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -17,6 +17,6 @@ foreach desktop_file: desktop_files
type: 'desktop',
po_dir: join_paths(meson.source_root(), 'po'),
install: true,
- install_dir: join_paths(get_option('datadir'), 'applications')
+ install_dir: join_paths(prefixed_datadir, 'applications')
)
endforeach
diff --git a/data/targets/meson.build b/data/targets/meson.build
index 9f0a0c7..50d33f4 100644
--- a/data/targets/meson.build
+++ b/data/targets/meson.build
@@ -11,5 +11,5 @@ install_data([
'QPcard_202.png',
'unknown.png',
],
- install_dir : 'share/gnome-color-manager/targets'
+ install_dir : join_paths(prefixed_datadir, 'gnome-color-manager/targets')
)
diff --git a/data/ti1/meson.build b/data/ti1/meson.build
index 45cbec6..c16ceed 100644
--- a/data/ti1/meson.build
+++ b/data/ti1/meson.build
@@ -6,5 +6,5 @@ install_data([
'printer-normal.ti1',
'printer-short.ti1',
],
- install_dir : 'share/gnome-color-manager/ti1'
+ install_dir : join_paths(prefixed_datadir, 'gnome-color-manager/ti1')
)
diff --git a/man/meson.build b/man/meson.build
index 81d27f5..594fbb7 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -5,34 +5,34 @@ if docbook2man.found()
input : 'gcm-calibrate.sgml',
command : [docbook2man, '@INPUT@', '--output', 'man'],
install : true,
- install_dir : 'share/man/man1'
+ install_dir : join_paths(prefixed_mandir, 'man1'),
)
custom_target('gcm-import-man',
output : 'gcm-import.1',
input : 'gcm-import.sgml',
command : [docbook2man, '@INPUT@', '--output', 'man'],
install : true,
- install_dir : 'share/man/man1'
+ install_dir : join_paths(prefixed_mandir, 'man1'),
)
custom_target('gcm-inspect-man',
output : 'gcm-inspect.1',
input : 'gcm-inspect.sgml',
command : [docbook2man, '@INPUT@', '--output', 'man'],
install : true,
- install_dir : 'share/man/man1'
+ install_dir : join_paths(prefixed_mandir, 'man1'),
)
custom_target('gcm-picker-man',
output : 'gcm-picker.1',
input : 'gcm-picker.sgml',
command : [docbook2man, '@INPUT@', '--output', 'man'],
install : true,
- install_dir : 'share/man/man1'
+ install_dir : join_paths(prefixed_mandir, 'man1'),
)
custom_target('gcm-viewer-man',
output : 'gcm-viewer.1',
input : 'gcm-viewer.sgml',
command : [docbook2man, '@INPUT@', '--output', 'man'],
install : true,
- install_dir : 'share/man/man1'
+ install_dir : join_paths(prefixed_mandir, 'man1'),
)
endif
diff --git a/meson.build b/meson.build
index 917c5db..771a028 100644
--- a/meson.build
+++ b/meson.build
@@ -80,6 +80,13 @@ add_global_link_arguments(
language: 'c'
)
+prefixed_bindir = join_paths(get_option('prefix'), get_option('bindir'))
+prefixed_localedir = join_paths(get_option('prefix'), get_option('localedir'))
+prefixed_libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'))
+prefixed_mandir = join_paths(get_option('prefix'), get_option('mandir'))
+prefixed_datadir = join_paths(get_option('prefix'), get_option('datadir'))
+prefixed_pkgdatadir = join_paths(get_option('prefix'), get_option('datadir'), 'gnome-software')
+
libgio = dependency('gio-2.0', version : '>= 2.25.9')
libgtk = dependency('gtk+-3.0', version : '>= 2.91.0')
libexif = dependency('libexif')
@@ -109,22 +116,11 @@ gnome = import('gnome')
i18n = import('i18n')
conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
-conf.set_quoted('LOCALEDIR',
- join_paths(get_option('prefix'),
- get_option('localedir')))
-conf.set_quoted('DATADIR',
- join_paths(get_option('prefix'),
- get_option('datadir')))
-conf.set_quoted('PKGDATADIR',
- join_paths(get_option('prefix'),
- get_option('datadir'),
- 'gnome-software'))
-conf.set_quoted('BINDIR',
- join_paths(get_option('prefix'),
- get_option('bindir')))
-conf.set_quoted('LIBEXECDIR',
- join_paths(get_option('prefix'),
- get_option('libexecdir')))
+conf.set_quoted('LOCALEDIR', prefixed_localedir)
+conf.set_quoted('DATADIR', prefixed_datadir)
+conf.set_quoted('PKGDATADIR', prefixed_pkgdatadir)
+conf.set_quoted('BINDIR', prefixed_bindir)
+conf.set_quoted('LIBEXECDIR', prefixed_libexecdir)
configure_file(
output : 'config.h',
configuration : conf
diff --git a/src/meson.build b/src/meson.build
index ebf0b04..73ba87c 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -29,7 +29,7 @@ if get_option('enable-exiv')
],
c_args : cargs,
install : true,
- install_dir : 'libexec',
+ install_dir : prefixed_libexecdir,
)
endif
@@ -74,7 +74,6 @@ executable(
],
c_args : cargs,
install : true,
- install_dir : 'bin'
)
executable(
@@ -96,7 +95,6 @@ executable(
],
c_args : cargs,
install : true,
- install_dir : 'bin'
)
executable(
@@ -118,7 +116,6 @@ executable(
],
c_args : cargs,
install : true,
- install_dir : 'bin'
)
executable(
@@ -142,7 +139,6 @@ executable(
],
c_args : cargs,
install : true,
- install_dir : 'bin'
)
executable(
@@ -169,7 +165,6 @@ executable(
],
c_args : cargs,
install : true,
- install_dir : 'bin'
)
if get_option('enable-tests')
--
2.13.3

9
gnome-color-manager.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Mar 12 15:32:09 UTC 2018 - dimstar@opensuse.org
- Update to version 3.28.0:
+ Fix the build system to be more standard conformant.
+ Updated translations.
- Drop 0001-build-Set-PKGDATADIR-to-gnome-color-manager.patch and
gnome-color-manager-meson.patch: fixed upstream.
-------------------------------------------------------------------
Wed Feb 28 16:27:39 UTC 2018 - dimstar@opensuse.org

10
gnome-color-manager.spec
View File

@ -18,17 +18,13 @@
Name: gnome-color-manager
Version: 3.26.0
Version: 3.28.0
Release: 0
Summary: Color management tools for GNOME
License: GPL-2.0-or-later
Group: System/GUI/GNOME
URL: http://projects.gnome.org/gnome-color-manager
Source: http://download.gnome.org/sources/gnome-color-manager/3.26/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM gnome-color-manager-meson.patch bgo#786424 dimstar@opensuse.org -- Do not hardcode directory names
Patch0: gnome-color-manager-meson.patch
# PATCH-FIX-UPSTREAM 0001-build-Set-PKGDATADIR-to-gnome-color-manager.patch bgo#791158
Patch1: 0001-build-Set-PKGDATADIR-to-gnome-color-manager.patch
Source: http://download.gnome.org/sources/gnome-color-manager/3.28/%{name}-%{version}.tar.xz
BuildRequires: docbook-utils
BuildRequires: gcc-c++
BuildRequires: libtiff-devel
@ -65,8 +61,6 @@ install and generate color profiles in the GNOME desktop.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
translation-update-upstream
%build