From 38c447c4ac85d57cc7661a6994ccd8fdc95b63f9d9899498c1de69c207e0c6ff Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 30 Aug 2015 14:48:47 +0000 Subject: [PATCH 1/3] - Ensure ./panels/common/gsd-common-enums.h is created before starting the full make process. In some rare cases, parallel build triggers this file too late. OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=289 --- gnome-control-center.changes | 7 +++++++ gnome-control-center.spec | 1 + 2 files changed, 8 insertions(+) diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 52c7ced..6a305cb 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Aug 30 14:48:16 UTC 2015 - dimstar@opensuse.org + +- Ensure ./panels/common/gsd-common-enums.h is created before + starting the full make process. In some rare cases, parallel + build triggers this file too late. + ------------------------------------------------------------------- Wed Aug 19 19:53:20 UTC 2015 - dimstar@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index 5fab394..dc694cc 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -209,6 +209,7 @@ ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh %else --disable-ibus %endif +make ./panels/common/gsd-common-enums.h make %{?_smp_mflags} V=1 %install From 743d9c5761afc30722634bba3a4a9c3bfd2498b44d3013b9af0c2048ce8fc719 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 30 Aug 2015 15:06:50 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=290 --- gnome-control-center.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnome-control-center.spec b/gnome-control-center.spec index dc694cc..aef5f92 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -209,7 +209,9 @@ ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh %else --disable-ibus %endif -make ./panels/common/gsd-common-enums.h +pushd panels/common +make gsd-common-enums.h +popd make %{?_smp_mflags} V=1 %install From da6d3dc7ab23bacfc7481e1be6b7f4456204c2f0032010b98a832116f5a2eec8 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 31 Aug 2015 07:03:00 +0000 Subject: [PATCH 3/3] - Add gnome-control-center-Pyongyang-Time.patch: North Korea changed its timezone to UTC+08:30. - Add timezone_8.5.png, timezone_8.5_dim.png, timezone_9.png and timezone_9_dim.png as source files: patch is not willing to patch binary files. OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-control-center?expand=0&rev=291 --- gnome-control-center-Pyongyang-Time.patch | 25 +++++++++++++++++++++++ gnome-control-center.changes | 9 ++++++++ gnome-control-center.spec | 12 ++++++++++- timezone_8.5.png | 3 +++ timezone_8.5_dim.png | 3 +++ timezone_9.png | 3 +++ timezone_9_dim.png | 3 +++ 7 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 gnome-control-center-Pyongyang-Time.patch create mode 100644 timezone_8.5.png create mode 100644 timezone_8.5_dim.png create mode 100644 timezone_9.png create mode 100644 timezone_9_dim.png diff --git a/gnome-control-center-Pyongyang-Time.patch b/gnome-control-center-Pyongyang-Time.patch new file mode 100644 index 0000000..9c0eb2e --- /dev/null +++ b/gnome-control-center-Pyongyang-Time.patch @@ -0,0 +1,25 @@ +From cc600a918b2a6c34ae81cf85ef7b49a8e3f02ee6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= +Date: Tue, 18 Aug 2015 00:16:44 +0200 +Subject: [PATCH 01/13] datetime: update timezones for new "Pyongyang Time" + +https://bugzilla.gnome.org/show_bug.cgi?id=753643 +--- + panels/datetime/datetime.gresource.xml | 2 ++ + +diff --git a/panels/datetime/datetime.gresource.xml b/panels/datetime/datetime.gresource.xml +index 3282dcd..ccbf955 100644 +--- a/panels/datetime/datetime.gresource.xml ++++ b/panels/datetime/datetime.gresource.xml +@@ -81,6 +81,8 @@ + data/timezone_-8_dim.png + data/timezone_8.png + data/timezone_8_dim.png ++ data/timezone_8.5.png ++ data/timezone_8.5_dim.png + data/timezone_8.75.png + data/timezone_8.75_dim.png + data/timezone_-9.png +-- +2.4.6 + diff --git a/gnome-control-center.changes b/gnome-control-center.changes index 6a305cb..ee35b85 100644 --- a/gnome-control-center.changes +++ b/gnome-control-center.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Aug 31 06:45:31 UTC 2015 - dimstar@opensuse.org + +- Add gnome-control-center-Pyongyang-Time.patch: North Korea + changed its timezone to UTC+08:30. +- Add timezone_8.5.png, timezone_8.5_dim.png, timezone_9.png and + timezone_9_dim.png as source files: patch is not willing to patch + binary files. + ------------------------------------------------------------------- Sun Aug 30 14:48:16 UTC 2015 - dimstar@opensuse.org diff --git a/gnome-control-center.spec b/gnome-control-center.spec index aef5f92..22327aa 100644 --- a/gnome-control-center.spec +++ b/gnome-control-center.spec @@ -36,7 +36,12 @@ Summary: The GNOME Control Center License: GPL-2.0+ Group: System/GUI/GNOME Url: http://www.gnome.org -Source: http://download.gnome.org/sources/gnome-control-center/3.16/%{name}-%{version}.tar.xz +Source0: http://download.gnome.org/sources/gnome-control-center/3.16/%{name}-%{version}.tar.xz +# the timezone images should be part of Patch19 (pyongang timezone), but 'patch' does not like binary files that much +Source1: timezone_8.5.png +Source2: timezone_8.5_dim.png +Source3: timezone_9.png +Source4: timezone_9_dim.png # PATCH-FEATURE-OPENSUSE gnome-control-center-allow-extra-tools-in-shell.patch fezhang@suse.com -- Add dconf-editor, pkg-prefs, gnome-tweak-tool and tracker-preferences to gnome-control-center-allow-yast-in-shell.patch so that they can launch from g-c-c shell like YaST does. Also change the patch with a more generic name. Patch0: gnome-control-center-allow-extra-tools-in-shell.patch # PATCH-FEATURE-OPENSUSE gnome-control-center-hide-firewall-zone-entry.patch bnc#894394 fezhang@suse.com -- network: hide the firewall zone entry for firewalld, which is not used in opensuse @@ -52,6 +57,8 @@ Patch16: gnome-control-center-probe-radius-server-cert.patch Patch17: gnome-control-center-follow-polkit-permissions-for-tz.patch # PATCH-FIX-UPSTREAM gnome-control-center-fix-nb-tans.patch bgo#753005 zaitor@opensuse.org -- Fix translation of Keyboard brightness in Norwegian bokmål. Patch18: gnome-control-center-fix-nb-tans.patch +# PATCH-FIX-UPSTREAM gnome-control-center-Pyongyang-Time.patch dimstar@opensuse.org -- Fix build with new timezone data for Pyongyang time +Patch19: gnome-control-center-Pyongyang-Time.patch BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: fdupes @@ -197,6 +204,9 @@ translation-update-upstream #NEEDS-REBASE #patch14 -p1 %patch18 -p1 +%patch19 -p1 +# install new images for the timezone map into the source directory +install %{S:1} %{S:2} %{S:3} %{S:4} panels/datetime/data %build ACLOCAL_FLAGS="-I libgd" NOCONFIGURE=1 gnome-autogen.sh diff --git a/timezone_8.5.png b/timezone_8.5.png new file mode 100644 index 0000000..7d0b7bc --- /dev/null +++ b/timezone_8.5.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd541f5fae89b39c46b6d774257f351242f10d2908d70f1639faf92d6edaa939 +size 2069 diff --git a/timezone_8.5_dim.png b/timezone_8.5_dim.png new file mode 100644 index 0000000..1a5d31a --- /dev/null +++ b/timezone_8.5_dim.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:486a23eb485da73257149cb114c222037a3ba2792c474b4a6be7eaa61f24c42a +size 1177 diff --git a/timezone_9.png b/timezone_9.png new file mode 100644 index 0000000..ce30ce8 --- /dev/null +++ b/timezone_9.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3dbb7fd66a0e5cc17c266ccd11a47cd0e1e7e663484c22bfac61528d94bed408 +size 14381 diff --git a/timezone_9_dim.png b/timezone_9_dim.png new file mode 100644 index 0000000..fce3cc0 --- /dev/null +++ b/timezone_9_dim.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6e10031895021443ec562e07db78bcfc580ef0362b1074f5a1f22f5d384be6c8 +size 8377