Move gnome2_environment_reset from global scope into pkg_setup() (fix…

…es b.g.o #605658)
shiznix · Jan 15, 2017 · 022fec9 · 022fec9
1 parent 8a627cc
commit 022fec9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/unity-base/unity-scopes-shell/Manifest b/unity-base/unity-scopes-shell/Manifest
@@ -1,3 +1,3 @@
 DIST unity-scopes-shell_0.5.8+16.10.20160921-0ubuntu1.diff.gz 15701 SHA256 71b51b4b5a51f38b9b475699601558462fdf50aef63868657797eddb3d99dd07 SHA512 23de7762ff27fb8d474a650922daf311846c820c08a142fda63949c74460d18bfd7b49645bcd2ed91b08c6eedfaf8cb1142e422c471488a5c39a644509bf46c7 WHIRLPOOL 0c2ba39b605e85c65cf82d73e41a5676b83d8ae0e32ff94bfcdf3c61933597360619fecac05211a62763bfa6c07d25fed3bee8a59ea938f037a1bfec0ebb2177
 DIST unity-scopes-shell_0.5.8+16.10.20160921.orig.tar.gz 183726 SHA256 ba504e24c06a7f3b31c468c81d1eee74d11ceb5601c091748fde7101bce22670 SHA512 dec64a5b5de01acb4147be49e2c26ed37e8d910d53617832ad71ab0de84021da33eb6ec8fbaa434f83e618de115d507b163b35859ef0bf119b343ea68924e3a9 WHIRLPOOL ef9506f1ee749f31eeea37383d60eff3e3c9a71c70e48a4075baa22618502f592246e3a21c3c72587cf870bf977ca57fabad10f80a7c1b4e25988134738db808
-EBUILD unity-scopes-shell-0.5.8_p20160921_p0_p01.ebuild 2042 SHA256 e229c059ffec6b2e43d9cbced32e64a8ecfe92b4c962d746e75aae1d6c8ca6e3 SHA512 f299024bb8444c8b576e26ea6a9bce3905e40d5b1e1bdc7eaffa1180b12113fb0785e05794b3f0a61b2518b6c36a7246e66a2c88dfd28a7501d877965539cd17 WHIRLPOOL ebc013c7c6beb2879af1f0d9e11600bae118f440c07286ccde87eddac88b63822e1822ad9ef605cf87fa19a63456136b7532b6b0679583e6d313800e8e48374e
+EBUILD unity-scopes-shell-0.5.8_p20160921_p0_p01.ebuild 2043 SHA256 a308c422a79f84e21523a86d6f55e0c4e84a2e09ccf20fe1249a9e911379e96f SHA512 4e463406d928cec4f1072514fe035f0f99bd81862a2493066305873eec0e488cb080f8f519de83bc6360a7c6053b8f28ceaa1d9a8b5ba96726cb9880cebff385 WHIRLPOOL fd0201a8d375ad378f8d9dcbd5a8f8e23c508243f23c2a79b177c4f03c28293aac730dee4ef19cf0c1575312aa68cae0b33482935fe156081379f8ae3925eda8
diff --git a/unity-base/unity-scopes-shell/unity-scopes-shell-0.5.8_p20160921_p0_p01.ebuild b/unity-base/unity-scopes-shell/unity-scopes-shell-0.5.8_p20160921_p0_p01.ebuild
@@ -41,10 +41,10 @@ DEPEND="app-misc/location-service
 S="${WORKDIR}"
 export QT_SELECT=5
 unset QT_QPA_PLATFORMTHEME
-gnome2_environment_reset
 
 pkg_setup() {
 	ubuntu-versionator_pkg_setup
+	gnome2_environment_reset
 	python-single-r1_pkg_setup
 }