public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Alexandre Rostovtsev" <tetromino@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/
Date: Tue, 18 Aug 2015 04:08:32 +0000 (UTC)	[thread overview]
Message-ID: <1439870883.632dfebb09fbc392538fd5143a421a5ec8e94a99.tetromino@gentoo> (raw)

commit:     632dfebb09fbc392538fd5143a421a5ec8e94a99
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 18 04:02:03 2015 +0000
Commit:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 04:08:03 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=632dfebb

gnome-base/gnome-control-center: fix build with sys-libs/timezone-data-2015f

North Korea caused build failure.

Gentoo-Bug: 557628
Reported-by: Kamil Kamiński
Upstream-Bug-url: https://bugzilla.gnome.org/show_bug.cgi?id=753643

Package-Manager: portage-2.2.20.1

 gnome-base/gnome-control-center/Manifest                          | 1 +
 ...center-3.14.5.ebuild => gnome-control-center-3.14.5-r1.ebuild} | 8 +++++++-
 .../gnome-control-center/gnome-control-center-3.14.5.ebuild       | 2 ++
 ...center-3.16.2.ebuild => gnome-control-center-3.16.2-r1.ebuild} | 6 ++++++
 .../gnome-control-center/gnome-control-center-3.16.2.ebuild       | 2 ++
 5 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 73fca6c..6d1c372 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,2 +1,3 @@
 DIST gnome-control-center-3.14.5.tar.xz 6984452 SHA256 66ffaf4b1eb0a745a2928035bc1b1e1eac7ea3775941e3a06bfb68ae4c1404c4 SHA512 ef9fa7a8d95bf37bce4e67521db7c35145f9de7bc9e5a9428d1aa0b0031698e38706529b509534e68dbc4cc8c54ba3482cf439e386fe64f3374432efa637512d WHIRLPOOL 15a83613f80cc3e236fd602d5c84a9a844a236de6556b742ee25147ccecfe207914cb2e4c1ac4029065a6bf19bd81ff8257cbd26163ad7df757849c2e0865f38
+DIST gnome-control-center-3.16.2-pyongyang.tar.xz 22808 SHA256 bc240beacc4f1e425d470ba21bdf19cd2cd547f232fa7d2a72299f75a7fb94d5 SHA512 04649782c34e72aa7169a62f2572d500533904ccd22782b660ec318996daa84d7d6c613c858080f94024d38778291cb1d03bd19497ab8a5724885730519c7c79 WHIRLPOOL 3518b9208da2763b084e0d294f00f8e8876f5d6bf38d3fa04af6766865a6e9d8ca8906a4da4d87344d238e6ea4e29c941a9f3a42b4c3e05cb58192839d134d9e
 DIST gnome-control-center-3.16.2.tar.xz 7027220 SHA256 2c2636af27a07a064669abdf79a8b0580a9a611fa4f108900167100473028a3d SHA512 29c7b87ac2f713a46e20e596f69b343e9d98991c3449e79eb3f77e5d0b14f5250902caa2e481192d6da77f22a309bb7ab5fe4e4eb3c2a9e92d8b672c6b99bb09 WHIRLPOOL e1deb4f228058d5d49c9592a9d4f219190bd8909cccf803a45df767311f3d38bf79d56893f2628475a9d807ef68d57176c89972ec4b63aa81c6d0a35b9d25d60

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.14.5.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.14.5-r1.ebuild
similarity index 90%
copy from gnome-base/gnome-control-center/gnome-control-center-3.14.5.ebuild
copy to gnome-base/gnome-control-center/gnome-control-center-3.14.5-r1.ebuild
index 726db5a..28c1d75 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.14.5.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.14.5-r1.ebuild
@@ -11,10 +11,12 @@ inherit autotools bash-completion-r1 eutils gnome2
 DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
 HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
 
+SRC_URI="${SRC_URI} http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PN}-3.16.2-pyongyang.tar.xz"
+
 LICENSE="GPL-2+"
 SLOT="2"
 IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos v4l"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 
 # False positives caused by nested configure scripts
 QA_CONFIGURE_OPTIONS=".*"
@@ -120,6 +122,10 @@ src_prepare() {
 	# Fix some absolute paths to be appropriate for Gentoo
 	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
 
+	# North Korea causes build failure, https://bugzilla.gnome.org/show_bug.cgi?id=753643
+	cp ../${PN}-3.16.2-pyongyang/*.png panels/datetime/data/ || die
+	epatch ../${PN}-3.16.2-pyongyang/*.patch
+
 	epatch_user
 
 	eautoreconf

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.14.5.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.14.5.ebuild
index 726db5a..5265817 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.14.5.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.14.5.ebuild
@@ -108,6 +108,8 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 
 	gnome-base/gnome-common
+
+	<sys-libs/timezone-data-2015f
 "
 # Needed for autoreconf
 #	gnome-base/gnome-common

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.16.2-r1.ebuild
similarity index 93%
copy from gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild
copy to gnome-base/gnome-control-center/gnome-control-center-3.16.2-r1.ebuild
index 3a1e159..ca24d61 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.16.2-r1.ebuild
@@ -11,6 +11,8 @@ inherit autotools bash-completion-r1 eutils gnome2
 DESCRIPTION="GNOME's main interface to configure various aspects of the desktop"
 HOMEPAGE="https://git.gnome.org/browse/gnome-control-center/"
 
+SRC_URI="${SRC_URI} http://dev.gentoo.org/~tetromino/distfiles/${PN}/${PN}-3.16.2-pyongyang.tar.xz"
+
 LICENSE="GPL-2+"
 SLOT="2"
 IUSE="+bluetooth +colord +cups +gnome-online-accounts +i18n input_devices_wacom kerberos networkmanager v4l wayland"
@@ -130,6 +132,10 @@ src_prepare() {
 	# Fix some absolute paths to be appropriate for Gentoo
 	epatch "${FILESDIR}"/${PN}-3.10.2-gentoo-paths.patch
 
+	# North Korea causes build failure, https://bugzilla.gnome.org/show_bug.cgi?id=753643
+	cp ../${PN}-3.16.2-pyongyang/*.png panels/datetime/data/ || die
+	epatch ../${PN}-3.16.2-pyongyang/*.patch
+
 	epatch_user
 
 	eautoreconf

diff --git a/gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild b/gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild
index 3a1e159..ba69373 100644
--- a/gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild
+++ b/gnome-base/gnome-control-center/gnome-control-center-3.16.2.ebuild
@@ -115,6 +115,8 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 
 	gnome-base/gnome-common
+
+	<sys-libs/timezone-data-2015f
 "
 # Needed for autoreconf
 #	gnome-base/gnome-common


             reply	other threads:[~2015-08-18  4:08 UTC|newest]

Thread overview: 130+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-18  4:08 Alexandre Rostovtsev [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-08-31 18:20 [gentoo-commits] repo/gentoo:master commit in: gnome-base/gnome-control-center/ Gilles Dartiguelongue
2015-09-19 18:43 Agostino Sarubbo
2015-09-20  9:30 Agostino Sarubbo
2015-11-14 13:48 Pacho Ramos
2016-03-06 17:23 Mikle Kolyada
2016-07-09 11:20 Pacho Ramos
2016-07-31  9:44 Pacho Ramos
2016-10-12  7:28 Gilles Dartiguelongue
2016-11-01 11:18 Gilles Dartiguelongue
2016-11-01 12:36 Gilles Dartiguelongue
2016-12-17 13:32 Pacho Ramos
2017-02-04 13:28 Pacho Ramos
2017-02-05  8:16 Pacho Ramos
2017-02-06 22:39 Zac Medico
2017-02-15 19:43 Mart Raudsepp
2017-03-08 12:11 Mart Raudsepp
2017-03-18 19:59 Mart Raudsepp
2017-03-18 20:04 Mart Raudsepp
2017-03-19 12:30 Mart Raudsepp
2017-03-19 12:30 Mart Raudsepp
2017-03-23 10:55 Mart Raudsepp
2017-04-02 14:05 Mart Raudsepp
2017-07-25 13:36 Alexis Ballier
2017-07-25 13:36 Alexis Ballier
2017-08-15 17:33 Gilles Dartiguelongue
2018-01-08 18:02 Mart Raudsepp
2018-01-18  2:35 Mikle Kolyada
2018-01-27  0:41 Thomas Deutschmann
2018-02-03 20:56 Mart Raudsepp
2018-03-03  9:46 Michał Górny
2018-04-13 15:55 Mart Raudsepp
2018-04-26 17:15 Thomas Deutschmann
2018-04-26 22:32 Aaron Bauman
2018-04-29  0:08 Mart Raudsepp
2018-09-28 13:51 Mart Raudsepp
2019-02-23 16:33 Mart Raudsepp
2019-03-04 10:56 Mart Raudsepp
2019-03-04 10:56 Mart Raudsepp
2019-03-14  9:35 Mart Raudsepp
2019-03-23  9:24 Mart Raudsepp
2019-05-10 19:39 Mart Raudsepp
2019-05-18 20:46 Mart Raudsepp
2019-08-03 19:04 Aaron Bauman
2019-09-20  6:52 Mart Raudsepp
2019-11-30 21:17 Sergei Trofimovich
2019-12-08  4:16 Aaron Bauman
2020-01-31 20:10 Mart Raudsepp
2020-03-01 16:18 Mart Raudsepp
2020-03-15 19:38 Mart Raudsepp
2020-04-04 12:07 Mart Raudsepp
2020-04-26 10:56 Mart Raudsepp
2020-06-07 20:16 Mart Raudsepp
2020-07-12 21:32 Mart Raudsepp
2020-07-12 21:32 Mart Raudsepp
2021-01-09 17:48 Matt Turner
2021-01-09 17:48 Matt Turner
2021-03-04  0:23 Sam James
2021-03-14  0:06 Matt Turner
2021-03-21  0:33 Matt Turner
2021-04-12 23:11 Sam James
2021-04-14 18:51 Mikle Kolyada
2021-04-15  1:33 Sam James
2021-04-15  5:25 Sam James
2021-04-15 15:36 Matt Turner
2021-04-16  3:05 Matt Turner
2021-04-21  4:22 Matt Turner
2021-07-15 20:20 Sergei Trofimovich
2021-08-27 15:19 Yixun Lan
2021-12-18 15:05 Mart Raudsepp
2021-12-19  4:53 Matt Turner
2022-01-19  0:26 Sam James
2022-02-14 17:39 Matt Turner
2022-03-19 17:59 Matt Turner
2022-03-21 17:41 Matt Turner
2022-03-25 20:54 Matt Turner
2022-04-18 20:48 Jakov Smolić
2022-04-28 15:31 Matt Turner
2022-05-07 18:28 Arthur Zamarin
2022-05-10  4:06 Arthur Zamarin
2022-05-27 20:54 Pacho Ramos
2022-07-02  2:53 Matt Turner
2022-07-18 23:41 Sam James
2022-07-29  2:59 Sam James
2022-10-01 17:16 Matt Turner
2022-10-05  1:19 Matt Turner
2022-10-08 16:52 Arthur Zamarin
2022-10-18 18:10 Matt Turner
2022-10-30 16:34 Matt Turner
2022-11-05  5:59 Arthur Zamarin
2022-12-24  0:19 Matt Turner
2023-02-13 15:09 Matt Turner
2023-02-17  8:23 Arthur Zamarin
2023-03-21 18:31 Matt Turner
2023-04-21 14:00 Matt Turner
2023-05-04 18:41 Arthur Zamarin
2023-05-04 18:47 Arthur Zamarin
2023-05-04 18:47 Arthur Zamarin
2023-05-26 19:42 Matt Turner
2023-07-02 11:18 Sam James
2023-07-03  8:42 Jakov Smolić
2023-07-06 13:59 Matt Turner
2023-07-15 11:43 Arthur Zamarin
2023-07-27  5:11 WANG Xuerui
2023-08-25 16:04 Matt Turner
2023-09-15 16:52 Matt Turner
2023-09-19 17:48 Arthur Zamarin
2023-09-22  8:51 Arthur Zamarin
2023-09-22 12:14 Arthur Zamarin
2023-09-22 12:14 Arthur Zamarin
2023-09-23  9:55 WANG Xuerui
2023-09-24 13:43 Jakov Smolić
2023-10-26 15:54 Pacho Ramos
2023-12-14  4:15 Sam James
2024-02-11  8:09 Arthur Zamarin
2024-02-11 14:21 Mart Raudsepp
2024-02-11 14:21 Mart Raudsepp
2024-03-09 15:35 Mart Raudsepp
2024-03-11 21:33 Sam James
2024-03-15 20:50 Arthur Zamarin
2024-04-07  8:43 Arthur Zamarin
2024-04-22 17:42 Arthur Zamarin
2024-04-28 20:44 Mart Raudsepp
2024-07-18 16:09 Pacho Ramos
2024-07-18 16:09 Pacho Ramos
2024-10-03  8:54 Pacho Ramos
2024-10-03  8:54 Pacho Ramos
2024-10-03  8:54 Pacho Ramos
2024-10-17 12:37 Pacho Ramos
2024-11-04 18:39 Andreas Sturmlechner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1439870883.632dfebb09fbc392538fd5143a421a5ec8e94a99.tetromino@gentoo \
    --to=tetromino@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox