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
