Gentoo Archives: gentoo-commits

From: Sobhan Mohammadpour <sobhan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/, gnome-base/gnome-desktop/files/
Date: Sat, 14 Sep 2019 21:00:26
Message-Id: 1568494805.8e70712c5f69e4270a77c83c0d0ba8a92af93615.sobhan@gentoo
1 commit: 8e70712c5f69e4270a77c83c0d0ba8a92af93615
2 Author: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 14 21:00:05 2019 +0000
4 Commit: Sobhan Mohammadpour <sobhan <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 14 21:00:05 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=8e70712c
7
8 gnome-base/gnome-desktop: add 3.34
9
10 Package-Manager: Portage-2.3.76, Repoman-2.3.17
11
12 .../files/3.34.0-make-seccomp-optional.patch | 39 ++++++++++++++
13 .../gnome-desktop/gnome-desktop-3.34.0.ebuild | 62 ++++++++++++++++++++++
14 gnome-base/gnome-desktop/metadata.xml | 8 +++
15 3 files changed, 109 insertions(+)
16
17 diff --git a/gnome-base/gnome-desktop/files/3.34.0-make-seccomp-optional.patch b/gnome-base/gnome-desktop/files/3.34.0-make-seccomp-optional.patch
18 new file mode 100644
19 index 00000000..9112e36c
20 --- /dev/null
21 +++ b/gnome-base/gnome-desktop/files/3.34.0-make-seccomp-optional.patch
22 @@ -0,0 +1,39 @@
23 +From ecaf36f478d160618c1b9a23ed1c17f09a716c6f Mon Sep 17 00:00:00 2001
24 +From: Sobhan Mohammadpour <sobhan@g.o>
25 +Date: Sat, 14 Sep 2019 16:21:18 -0400
26 +Subject: [PATCH] make seccomp optional
27 +
28 +---
29 + meson.build | 2 +-
30 + meson_options.txt | 5 +++++
31 + 2 files changed, 6 insertions(+), 1 deletion(-)
32 +
33 +diff --git a/meson.build b/meson.build
34 +index 6781ca7..9361f26 100644
35 +--- a/meson.build
36 ++++ b/meson.build
37 +@@ -57,7 +57,7 @@ host_os = host_machine.system()
38 + host_cpu = host_machine.cpu()
39 + supported_os = ['linux']
40 + unsupported_cpus = ['alpha', 'ia64', 'm68k', 'sh4', 'sparc', 'sparc64']
41 +-if supported_os.contains(host_os) and not unsupported_cpus.contains(host_cpu)
42 ++if supported_os.contains(host_os) and not unsupported_cpus.contains(host_cpu) and get_option('seccomp')
43 + seccomp_dep = dependency('libseccomp')
44 + else
45 + seccomp_dep = dependency('', required: false)
46 +diff --git a/meson_options.txt b/meson_options.txt
47 +index e3402a1..a7e7f2e 100644
48 +--- a/meson_options.txt
49 ++++ b/meson_options.txt
50 +@@ -28,3 +28,8 @@ option('gtk_doc',
51 + option('installed_tests',
52 + type: 'boolean', value: false, description: 'Enable installed tests'
53 + )
54 ++
55 ++option('seccomp',
56 ++ type: 'boolean', value: true,
57 ++ description: 'add seccomp support'
58 ++)
59 +--
60 +2.23.0
61 +
62
63 diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.34.0.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.34.0.ebuild
64 new file mode 100644
65 index 00000000..259eb8f2
66 --- /dev/null
67 +++ b/gnome-base/gnome-desktop/gnome-desktop-3.34.0.ebuild
68 @@ -0,0 +1,62 @@
69 +# Copyright 1999-2019 Gentoo Authors
70 +# Distributed under the terms of the GNU General Public License v2
71 +
72 +EAPI=6
73 +inherit gnome.org gnome2-utils meson virtualx xdg
74 +
75 +DESCRIPTION="Library with common API for various GNOME modules"
76 +HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-desktop/"
77 +
78 +LICENSE="GPL-2+ FDL-1.1+ LGPL-2+"
79 +SLOT="3/17" # subslot = libgnome-desktop-3 soname version
80 +IUSE="debug doc +introspection gtk-doc seccomp udev"
81 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
82 +
83 +# cairo[X] needed for gnome-bg
84 +COMMON_DEPEND="
85 + app-text/iso-codes
86 + >=dev-libs/glib-2.53.0:2
87 + >=x11-libs/gdk-pixbuf-2.36.5:2[introspection?]
88 + >=x11-libs/gtk+-3.3.6:3[X,introspection?]
89 + x11-libs/cairo:=[X]
90 + x11-libs/libX11
91 + x11-misc/xkeyboard-config
92 + >=gnome-base/gsettings-desktop-schemas-3.27.0
93 + introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
94 + seccomp? ( sys-libs/libseccomp )
95 + udev? (
96 + sys-apps/hwids
97 + virtual/libudev:= )
98 +"
99 +RDEPEND="${COMMON_DEPEND}
100 + !<gnome-base/gnome-desktop-2.32.1-r1:2[doc]
101 + seccomp? ( sys-apps/bubblewrap )
102 +"
103 +DEPEND="${COMMON_DEPEND}
104 + app-text/docbook-xml-dtd:4.1.2
105 + dev-util/gdbus-codegen
106 + dev-util/itstool
107 + >=sys-devel/gettext-0.19.8
108 + x11-base/xorg-proto
109 + virtual/pkgconfig
110 + media-libs/fontconfig
111 + app-text/yelp-tools
112 +"
113 +PATCHES=(
114 + "${FILESDIR}/${PV}-make-seccomp-optional.patch"
115 +)
116 +src_configure() {
117 + local emesonargs=(
118 + -Dgnome_distributor=Gentoo
119 + $(meson_use debug debug_tools)
120 + -Dudev=$(usex udev enabled disabled)
121 + $(meson_use gtk-doc gtk_doc)
122 + $(meson_use doc desktop_docs)
123 + $(meson_use seccomp)
124 + )
125 + meson_src_configure
126 +}
127 +
128 +src_test() {
129 + virtx meson_src_test
130 +}
131
132 diff --git a/gnome-base/gnome-desktop/metadata.xml b/gnome-base/gnome-desktop/metadata.xml
133 new file mode 100644
134 index 00000000..996e7cac
135 --- /dev/null
136 +++ b/gnome-base/gnome-desktop/metadata.xml
137 @@ -0,0 +1,8 @@
138 +<?xml version="1.0" encoding="UTF-8"?>
139 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
140 +<pkgmetadata>
141 + <maintainer type="project">
142 + <email>gnome@g.o</email>
143 + <name>Gentoo GNOME Desktop</name>
144 + </maintainer>
145 +</pkgmetadata>