unity: Update to version 7.5.0+17.04.20161027 with Ubuntu release 0ub…

…untu1
chenxiaolong · Oct 28, 2016 · 18043ae · 18043ae
1 parent beea704
commit 18043ae
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 27 deletions.
diff --git a/unity/0001-Revert-r3134-Remove-Systray-Whitelist.patch b/unity/0001-Revert-r3134-Remove-Systray-Whitelist.patch
@@ -1,4 +1,4 @@
-From 909114ff114898c2533ff67a5e528126d26f7c44 Mon Sep 17 00:00:00 2001
+From 067963486fcf8ecc9b1e1b737a736841dc318304 Mon Sep 17 00:00:00 2001
 From: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 Date: Thu, 10 Apr 2014 20:09:48 -0400
 Subject: [PATCH 1/5] Revert r3134: Remove Systray Whitelist
@@ -160,7 +160,7 @@ index b2ff8e0..e11fe93 100644
    glib::Signal<void, GSettings*, gchar*> whitelist_changed_;
    glib::Signal<gboolean, GtkWidget*, cairo_t*> draw_signal_;
 diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index d1f58d3..9fed625 100644
+index 4d949ae..c6f0e0b 100644
 --- a/tests/CMakeLists.txt
 +++ b/tests/CMakeLists.txt
 @@ -251,7 +251,6 @@ if (ENABLE_X_SUPPORT)
@@ -243,5 +243,5 @@ index c407576..0000000
 -}
 -
 -- 
-2.10.0
+2.10.1
 
diff --git a/unity/0002-Disable-Werror.patch b/unity/0002-Disable-Werror.patch
@@ -1,4 +1,4 @@
-From cb96f326eaf5d29f35eaadcb18a54af5eef29b62 Mon Sep 17 00:00:00 2001
+From c4bda95e2da4785b6a49757cedbdc1865958a71a Mon Sep 17 00:00:00 2001
 From: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 Date: Thu, 10 Apr 2014 20:10:51 -0400
 Subject: [PATCH 2/5] Disable -Werror
@@ -9,31 +9,31 @@ Subject: [PATCH 2/5] Disable -Werror
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 90c5998..f961c7e 100644
+index 1c5f7e3..4358c3f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -209,7 +209,7 @@ if (BOOT_LOGGER)
      SET (BOOT_LOGGER_FLAG "-DENABLE_LOGGER")
  endif (BOOT_LOGGER)
 
--SET (MAINTAINER_CXXFLAGS "-Werror -Wall -Wcast-align -Wempty-body -Wformat-security -Winit-self -Warray-bounds")
-+SET (MAINTAINER_CXXFLAGS "-Wall -Wcast-align -Wempty-body -Wformat-security -Winit-self -Warray-bounds")
+-SET (MAINTAINER_CXXFLAGS "-Werror -Wall -Wcast-align -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wno-error=deprecated-declarations")
++SET (MAINTAINER_CXXFLAGS "-Wall -Wcast-align -Wempty-body -Wformat-security -Winit-self -Warray-bounds -Wno-error=deprecated-declarations")
 
  option (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS "Disable errors when local typedefs are unused" ON)
  if (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS)
 diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
-index de866c1..5f2e3d6 100644
+index 9a9f9e0..4958dbb 100644
 --- a/services/CMakeLists.txt
 +++ b/services/CMakeLists.txt
 @@ -35,7 +35,7 @@ set(PANEL_SOURCES
  set(CFLAGS
      ${SERVICE_DEPS_CFLAGS}
      ${SERVICE_DEPS_CFLAGS_OTHER}
--    "-Werror -Wall"
-+    "-Wall"
+-    "-Werror -Wall -Wno-error=deprecated-declarations"
++    "-Wall -Wno-error=deprecated-declarations"
      )
 
  string (REPLACE ";" " " CFLAGS "${CFLAGS}")
 -- 
-2.10.0
+2.10.1
 
diff --git a/unity/0003-Fix-launchers.patch b/unity/0003-Fix-launchers.patch
@@ -1,4 +1,4 @@
-From 87b1b784db53204a550c518808d5f0afa2dd4e2c Mon Sep 17 00:00:00 2001
+From f661369cf4b006e2cef61e3562129e821e8fa1de Mon Sep 17 00:00:00 2001
 From: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 Date: Thu, 10 Apr 2014 20:11:47 -0400
 Subject: [PATCH 3/5] Fix launchers
@@ -27,5 +27,5 @@ index 9c8c3e9..189e705 100644
          'unity://running-apps',
          'unity://expo-icon',
 -- 
-2.10.0
+2.10.1
 
diff --git a/unity/0004-Remove-social.scope.patch b/unity/0004-Remove-social.scope.patch
@@ -1,4 +1,4 @@
-From 5b6d261bff37cafd2c10c015dbdbd042a4a3b827 Mon Sep 17 00:00:00 2001
+From d078c42da6537aebb282eae3e2f2018536de2329 Mon Sep 17 00:00:00 2001
 From: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 Date: Thu, 10 Apr 2014 20:17:50 -0400
 Subject: [PATCH 4/5] Remove social.scope
@@ -21,5 +21,5 @@ index 189e705..65c7278 100644
        <description>The scopes listed in the scope bar will be ordered according to this list.</description>
      </key>
 -- 
-2.10.0
+2.10.1
 
diff --git a/unity/0005-Remove-xpathselect-dependency.patch b/unity/0005-Remove-xpathselect-dependency.patch
@@ -1,4 +1,4 @@
-From 1f0b81298629fe94bc7674327b7aa9130f6de89b Mon Sep 17 00:00:00 2001
+From b5a9d3d9635cd01d1263e7f6fdaceb316bc9ed15 Mon Sep 17 00:00:00 2001
 From: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 Date: Mon, 29 Sep 2014 14:49:09 -0400
 Subject: [PATCH 5/5] Remove xpathselect dependency
@@ -15,7 +15,7 @@ Subject: [PATCH 5/5] Remove xpathselect dependency
  delete mode 100644 unity-shared/DebugDBusInterface.h
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f961c7e..62144a0 100644
+index 4358c3f..7c8fa85 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -250,7 +250,6 @@ set(UNITY_PLUGIN_SHARED_DEPS
@@ -559,5 +559,5 @@ index 4083a61..0000000
 -
 -#endif /* _DEBUG_DBUS_INTERFACE_H */
 -- 
-2.10.0
+2.10.1
 
diff --git a/unity/PKGBUILD b/unity/PKGBUILD
@@ -1,12 +1,12 @@
 # Maintainer: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
 
 # vercheck-pkgbuild: auto
-# vercheck-ubuntu: name=${pkgname}, repo=yakkety
+# vercheck-ubuntu: name=${pkgname}, repo=zesty
 # vercheck-launchpad: name=${pkgname}
 
 pkgname=unity
 _actual_ver=7.5.0
-_extra_ver=+16.10.20160906.1
+_extra_ver=+17.04.20161027
 _ubuntu_rel=0ubuntu1
 pkgver=${_actual_ver}${_extra_ver/+/.}
 pkgrel=2
@@ -38,13 +38,13 @@ source=("https://launchpad.net/ubuntu/+archive/primary/+files/unity_${_actual_ve
         unity-debug
         run_this_if_unity_is_on_fire.py
         unity.pam)
-sha512sums=('38e149902e96ab18736f475f399fcceaa61c072c05786ea2e187936c0b9f5b1df51216d83e2de76f10d8e6eb8cc0fb4a53365c960df0b09944c7d16c44aaa7f4'
-            'db6bc90116bcc8fcafc5b30803143a71ef53c36e53e31fee10019625765b0808113dab4df5710196e3a9d06770697e06048025956f9c9eae84be5f4189475710'
-            'ac857c13e24d92dcce44d2bda22c8387de2a4744b35ee0286ae6cea94d8f64aa22cfde58546939d0379b19e5b40356fa615ce40e6ab27a14e09d177b2bd2f650'
-            '292eb73c896f0df7a4c67b126d80849fcda36343586903bbde60f6b9fc9de823d6a729e5251825bf091e960f1390fec693d1f12a2538444ccf3a030fae3030c5'
-            '8bd75f389cb01572fd38ce7d5e12ced37ab4911a89a021a3b9fbe9d904ac851da63fb4a7256070c2afb9f536754fcc79aecd7714e406a2586574c79e46d9c2ec'
-            '8ba6f011cc845915619b89615c5ecf7072750984306a39a3f2cae16089f8b71c3910345cb5ff6e13b18c11f3370d207fe35abcb78681b7f8e3b90c64e939a103'
-            'd95303704cad80d9b98515cf980c035ddc5400942e3bcc5b0f0d0345688978d62b767fb15b981e23e0721bbd49cb9229ea69ef0187cc9aa48a3c208b75fb9735'
+sha512sums=('cc57531eaf2e42052bc647ceb431bc0825452ae540a83ea295110b0c5b2ad743e3ea448594e43d55e8210c5e44f3966ef9f4f0f07e376094a2e84435737cd756'
+            '5d2f5b2388479cf627904b32a1816bbfbc5fa18816725472826462af612b21d87416ccae10d8059a89c7656b077dc74b2e5afc694ffe9295cb70b5fb7dcdd13d'
+            'be2905053504eaa7b4a52fe9485a97a9548585b37a1750ffa15b71ce659243b7395c70b479baea20fcf207356a085230e71d38a9e0bd39fb26c08f05cb1d4555'
+            '30f7066a077850479e5411aebb015c8b00d1ff52c02ccfb1ad0b86dc43dc690ab6b9667e94f9f9e4658e0d3c8890c101b049bf19a80d6cdb765a514f5aa2eafd'
+            'a0891cf93316fc6e488bf2d7eee33c3dad8c1ac39edfadf3bbf6730f7ee66afc8a84c981e7ec483e81f7c5b5937244e5f6d83ad8d9c7f6135707d10303feb4f4'
+            '716955f50fce28bc81f035191a89deec1507151c0a1b310b2cd5ffc615b2465bb170f0f708df5cf004ae08bfa1682ae33c39c0667c550a60a6b602c8629dfb6e'
+            '97f888482f4eb312ef3c350c118ac8b7e4e2c2a3eb3f89d0bf1b84cb1587ecd184bbfe15d6fca5a856c7279c893a5ab909c0de66fcbb492ad15ff033ea1c3ff0'
             'ec9ea91d79129b23aae6c4b9584fb396ecc572a0bafcac6229cc413ee441f610cb51ffce9383544c9fc62e747d5718be9be050850943eac4820095f190dc0ed0'
             'b217490bf5eb5b0e83dbc9737b80b2ab9d7288362f370625f3c99d5a862c0e1947376b9fab4fdc9c2ddd4e8bd6e8d2ff5763a3a4391732f0781abbc60b159db5'
             'f76ce70ee8ad4a83c94a5919fcabadf7f82e90cf3c70079344e8ab4069dd41f9055f86e01ee5d96ff52819ed9979bdbe85c59e0d50aa4c511e5a20e19a9ea06d'