Revert enabling 'gles2' and 'eglfs' useflags for QT5. Version bump ne…

…t-libs/oxide-qt
shiznix · May 8, 2015 · 070262b · 070262b
1 parent ee996ed
commit 070262b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/net-libs/oxide-qt/Manifest b/net-libs/oxide-qt/Manifest
@@ -1,5 +1,5 @@
 AUX oxide-qt-1.2.5-remove-_FORTIFY_SOURCE-warning.patch 1425 SHA256 dd3e50ed447332a7f0e5e9b557c6b86a9671279e8ad76bc882a3c512576c69e5 SHA512 5685aaff0e2c551a7bf7f523082605e683bc1c132cf7e60131b1ad00730716da2b6c548205f04bbc1c4a04d46b0a48721e8e934a3d66d7355388f1f2088a4c5c WHIRLPOOL b9e61c6558db328d0faf64f84c1de6ac7b89e69c4beecb1cc88b118bf3512e58a3a5e3cc70bb9dc7125b3261845ffb3e67f8b4db44d43d519e3e7ec381d7e2c9
-DIST oxide-qt_1.6.5-0ubuntu0.15.04.1.debian.tar.xz 123516 SHA256 627fa8cf7f9a8bf13d737fc0a7c70a9e53c592cd9568e107972aea6cbc20a262 SHA512 3f632335bb05ef242b98d8eb97666b8d60677e609f886af42706c416cc1b1d682dccdfa043268a813087a299c911b115d47321a61a2515afa5ff98a024e4981f WHIRLPOOL 3a25f14af553780ff845189ee1bf75e66226608538009c2b760f0cf516173144703a1a51b4b433c1b7743ad3ec539c1011b4f61fc20b900118c0919b1c34dfbe
-DIST oxide-qt_1.6.5.orig.tar.xz 377366552 SHA256 6fb514fc573186b010ac7700afa7a9ee79719ba9aa0b1ed71d23882c987824f7 SHA512 c3f8d07204aabee652bd279bebd0e248dc90add891fb62a70f19ed8ab16f42d3567dfec5cd98a8da84381a0afb7685ceb30fc6060547a0ed333b34f64ad5f98a WHIRLPOOL fe41a4fe7d4697d7e37e4f395941ab99639d1bb848e62788aef4cbcd04bd18132e42eb5a844695e8a4f3b783db9b7ef3c794202c44653c316325f6811418bcd3
-EBUILD oxide-qt-1.6.5_p0_p00150401.ebuild 2057 SHA256 792c3d7fdcc1a5e086944832df4a3099034f901591cfb001790e0c987a24e236 SHA512 c6b4167c4ab754a2c0fb48b749a89dfd9c4b852d2ab84e82c5841fb9d84aa163ada68b969146ec5db0b41684dbeea12838184946dbe6c7843a5c9b8cb57a6907 WHIRLPOOL 7849884debfefdeac5ec926487f8a9d14f58cb5bbbce2ba36f0c11620e96b053faff2d48211e93617db6136bf535404e49c932e4d239e36b708902c6bf896899
+DIST oxide-qt_1.6.6-0ubuntu0.15.04.1.debian.tar.xz 123516 SHA256 0cd5e27e579ff70c079aeaf4837f85cb86b373c813485c820f2297a30258f043 SHA512 287b4b7762083710375f35d616ac72f344d950ad5eb73d2254f144f49792b5105710482fef69a69b33e675c0afda8cb0f1c34cfd05de255ad9c6873cd6dc9d06 WHIRLPOOL c443b190fbe450041c6e72921b97b36acddb48b0da2a35e9f8c4be3c2a3c1a1c2d214e568fcd197dc2c23970ded9949f9f863788f4b288bc283ff9a42b20514e
+DIST oxide-qt_1.6.6.orig.tar.xz 377364028 SHA256 56acc13e39af799b637dfc2154b9f98b7f932072020e87ad1ed3e16b5406ccd0 SHA512 f15e71d55d4654d12f69261ad9434e53dd790ad2132a6bcb4cddb5f4c952cc76313f7748762b04e514d1f21501f725a271bbdb4e4edb51211a0bb29fda5158fe WHIRLPOOL 50487c3a4c60a0397e295c28a9a3179f0ae61520ae65afa03802d9a718efb9eca817ebe37d03544e238003d4baea0280c2690ce6dd4f130282b97d5afda0b2b6
+EBUILD oxide-qt-1.6.6_p0_p00150401.ebuild 2057 SHA256 792c3d7fdcc1a5e086944832df4a3099034f901591cfb001790e0c987a24e236 SHA512 c6b4167c4ab754a2c0fb48b749a89dfd9c4b852d2ab84e82c5841fb9d84aa163ada68b969146ec5db0b41684dbeea12838184946dbe6c7843a5c9b8cb57a6907 WHIRLPOOL 7849884debfefdeac5ec926487f8a9d14f58cb5bbbce2ba36f0c11620e96b053faff2d48211e93617db6136bf535404e49c932e4d239e36b708902c6bf896899
 MISC metadata.xml 425 SHA256 76d55419b33deb59d79adcd00169b6a685914fdedc17be787cf100f6853f4749 SHA512 3cb0d2d316b74a6d8494f9a31c82087abaf28deeae29fcffafe77b1929892db48e58be20c1e51b2f4d1f21461b8fd512f9334a4ec719783cb4f619135d2b440a WHIRLPOOL 0e071c353c562d5ba49bdd2eb9aa1c2b5dfc3481031c31bf2af65731dc396622cc886e7a603206e3c64a63304cd9cb3288bd55231198a36ea2ca22ebf7ce441d
diff --git a/...ide-qt/oxide-qt-1.6.5_p0_p00150401.ebuild → ...ide-qt/oxide-qt-1.6.6_p0_p00150401.ebuild b/...ide-qt/oxide-qt-1.6.5_p0_p00150401.ebuild → ...ide-qt/oxide-qt-1.6.6_p0_p00150401.ebuild
diff --git a/profiles/vivid/unity-portage.puse b/profiles/vivid/unity-portage.puse
@@ -24,18 +24,19 @@ dev-libs/libxslt python
 dev-libs/openssl -bindist
 dev-libs/protobuf python
 dev-libs/xapian-bindings python
+
+## In Ubuntu 'qt5[gles2]' is only enabled on arm architectures so far (breaks QtGL on desktop if enabled) and 'qtgui:5[eglfs]' is also explicitly disabled #
 dev-qt/qtcore:5 icu
-dev-qt/qtdeclarative:5 gles2
-dev-qt/qtgui:5 egl eglfs evdev gles2 ibus
+dev-qt/qtgui:5 egl evdev ibus -eglfs
 dev-qt/qtmultimedia:5 widgets
-dev-qt/qtopengl:5 egl gles2
+dev-qt/qtopengl:5 egl
 dev-qt/qtquick1:5 webkit
 dev-qt/qtquickcontrols:5 widgets
 dev-qt/qtsql:5 sqlite
 dev-qt/qtwebkit:4 icu
 dev-qt/qtwebkit:5 icu qml libxml2 multimedia webp widgets xslt -gstreamer -gstreamer010
-dev-qt/qtwidgets:5 gles2
 dev-qt/qt-mobility organizer
+
 gnome-base/gvfs fuse
 gnome-extra/evolution-data-server vala
 gnome-extra/nm-applet -bluetooth	# Bluetooth relies on old bluez-4 to build, which we no longer use