dev-qt: remove 4.8.5

3 files changed, 0 insertions, 341 deletions

diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-keyboard-shortcuts.patch b/dev-qt/qtgui/files/qtgui-4.8.5-keyboard-shortcuts.patch
deleted file mode 100644
index c975ebfaca2d..000000000000
--- a/dev-qt/qtgui/files/qtgui-4.8.5-keyboard-shortcuts.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0c03af0d4d928bdbb32b09eedb1dba3ce59e5278 Mon Sep 17 00:00:00 2001
-From: Gatis Paeglis <gatis.paeglis@digia.com>
-Date: Sat, 31 Aug 2013 21:22:47 +0200
-Subject: [PATCH] Revert "QTBUG-15319: fix shortcuts with secondary Xkb
- layout."
-
-The change which attempted to fix QTBUG-15319 broke keyboard
-shortcuts for non latin keyboard layouts.
-
-This patch reverts QTBUG-15319 (f45cdeda8) since it caused a
-regression.
-
-Task-number: QTBUG-32908
-
-Change-Id: I47d7984fa7986d5218d1f3ff1fc36d2ec67c9ba7
-Reviewed-by: David Faure <david.faure@kdab.com>
----
- src/gui/kernel/qkeymapper_x11.cpp | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp
-index 005ff3f..7daa41d 100644
---- a/src/gui/kernel/qkeymapper_x11.cpp
-+++ b/src/gui/kernel/qkeymapper_x11.cpp
-@@ -282,12 +282,9 @@ QList<int> QKeyMapperPrivate::possibleKeysXKB(QKeyEvent *event)
- 
-     // first, translate key only using lock modifiers (there are no Qt equivalents for these, so we must
-     // always use them when determining the baseKeySym)
--    // Note: the Xkb group to be used for the conversion keycode->keysym has to be given to
--    //       XkbLookupKeySym(). This information is contained in the bits 8 to 15 of xmodifiers.
--    //       See https://bugreports.qt-project.org/browse/QTBUG-15319 .
-     KeySym baseKeySym;
-     uint consumedModifiers;
--    if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (0xff00 | LockMask | qt_num_lock_mask)),
-+    if (!XkbLookupKeySym(X11->display, xkeycode, (xmodifiers & (LockMask | qt_num_lock_mask)),
-                          &consumedModifiers, &baseKeySym))
-         return QList<int>();
- 
--- 
-1.8.3.2
-
diff --git a/dev-qt/qtgui/files/qtgui-4.8.5-libjpeg-9.patch b/dev-qt/qtgui/files/qtgui-4.8.5-libjpeg-9.patch
deleted file mode 100644
index 47d35e232499..000000000000
--- a/dev-qt/qtgui/files/qtgui-4.8.5-libjpeg-9.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 2a9ea11f4dea51f9e75036aab8e7a23f0eb4bd1f Mon Sep 17 00:00:00 2001
-From: aavit <eirik.aavitsland@digia.com>
-Date: Tue, 10 Sep 2013 11:46:51 +0200
-Subject: Compilation fix for libjpeg release 9
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In the latest libjpeg version, the "boolean" type is changed so that
-true and false no longer can be used instead of TRUE and FALSE.
-
-Also, purge some ancient code remains meant to support a now defunct
-OS´s idea about the boolean type.
-
-Task-number: QTBUG-33166
-Change-Id: Iebbdf300cfdc22775954de65f985358424ed2b49
-Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
-(cherry picked from qtbase/fad6aa619bf6eb048821a58065433f6b598c10e4)
----
- src/gui/image/qjpeghandler.cpp | 27 +++++----------------------
- 1 file changed, 5 insertions(+), 22 deletions(-)
-
-diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp
-index a8700b7..ba5c469 100644
---- a/src/gui/image/qjpeghandler.cpp
-+++ b/src/gui/image/qjpeghandler.cpp
-@@ -157,11 +157,7 @@ static boolean qt_fill_input_buffer(j_decompress_ptr cinfo)
-     } else {
-         src->bytes_in_buffer = num_read;
-     }
--#if defined(Q_OS_UNIXWARE)
--    return B_TRUE;
--#else
--    return true;
--#endif
-+    return TRUE;
- }
- 
- static void qt_skip_input_data(j_decompress_ptr cinfo, long num_bytes)
-@@ -489,11 +485,7 @@ static boolean qt_empty_output_buffer(j_compress_ptr cinfo)
-     dest->next_output_byte = dest->buffer;
-     dest->free_in_buffer = max_buf;
- 
--#if defined(Q_OS_UNIXWARE)
--    return B_TRUE;
--#else
--    return true;
--#endif
-+    return TRUE;
- }
- 
- static void qt_term_destination(j_compress_ptr cinfo)
-@@ -584,13 +576,8 @@ static bool write_jpeg_image(const QImage &image, QIODevice *device, int sourceQ
- 
- 
-         int quality = sourceQuality >= 0 ? qMin(sourceQuality,100) : 75;
--#if defined(Q_OS_UNIXWARE)
--        jpeg_set_quality(&cinfo, quality, B_TRUE /* limit to baseline-JPEG values */);
--        jpeg_start_compress(&cinfo, B_TRUE);
--#else
--        jpeg_set_quality(&cinfo, quality, true /* limit to baseline-JPEG values */);
--        jpeg_start_compress(&cinfo, true);
--#endif
-+        jpeg_set_quality(&cinfo, quality, TRUE /* limit to baseline-JPEG values */);
-+        jpeg_start_compress(&cinfo, TRUE);
- 
-         row_pointer[0] = new uchar[cinfo.image_width*cinfo.input_components];
-         int w = cinfo.image_width;
-@@ -751,11 +738,7 @@ bool QJpegHandlerPrivate::readJpegHeader(QIODevice *device)
-         err.error_exit = my_error_exit;
- 
-         if (!setjmp(err.setjmp_buffer)) {
--    #if defined(Q_OS_UNIXWARE)
--            (void) jpeg_read_header(&info, B_TRUE);
--    #else
--            (void) jpeg_read_header(&info, true);
--    #endif
-+            (void) jpeg_read_header(&info, TRUE);
- 
-             int width = 0;
-             int height = 0;
--- 
-2.0.0
-
diff --git a/dev-qt/qtgui/qtgui-4.8.5-r4.ebuild b/dev-qt/qtgui/qtgui-4.8.5-r4.ebuild
deleted file mode 100644
index 4a61205cd3a8..000000000000
--- a/dev-qt/qtgui/qtgui-4.8.5-r4.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils qt4-build
-
-DESCRIPTION="The GUI module for the Qt toolkit"
-SRC_URI+=" https://dev.gentoo.org/~pesa/patches/${PN}-systemtrayicon-plugin-system.patch"
-
-SLOT="4"
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS="alpha arm hppa ia64 ppc ppc64 sparc"
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-IUSE="+accessibility cups egl +glib gtkstyle mng nas nis qt3support tiff trace xinerama +xv"
-
-REQUIRED_USE="
-	gtkstyle? ( glib )
-"
-
-# cairo[-qt4] is needed because of bug 454066
-RDEPEND="
-	app-eselect/eselect-qtgraphicssystem
-	~dev-qt/qtcore-${PV}[aqua=,debug=,glib=,qt3support=]
-	~dev-qt/qtscript-${PV}[aqua=,debug=]
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/jpeg:0
-	!aqua? (
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXcursor
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXi
-		x11-libs/libXrandr
-		x11-libs/libXrender
-		xinerama? ( x11-libs/libXinerama )
-		xv? ( x11-libs/libXv )
-	)
-	cups? ( net-print/cups )
-	egl? ( media-libs/mesa[egl] )
-	glib? ( dev-libs/glib:2 )
-	gtkstyle? (
-		x11-libs/cairo[-qt4(-)]
-		x11-libs/gtk+:2[aqua=]
-	)
-	mng? ( >=media-libs/libmng-1.0.9:= )
-	nas? ( >=media-libs/nas-1.5 )
-	tiff? ( media-libs/tiff:0 )
-	!<dev-qt/qthelp-4.8.5:4
-"
-DEPEND="${RDEPEND}
-	!aqua? (
-		x11-proto/inputproto
-		x11-proto/xextproto
-		xinerama? ( x11-proto/xineramaproto )
-		xv? ( x11-proto/videoproto )
-	)
-"
-PDEPEND="qt3support? ( ~dev-qt/qt3support-${PV}[aqua=,debug=] )"
-
-PATCHES=(
-	"${DISTDIR}/${PN}-systemtrayicon-plugin-system.patch" # bug 503880
-	"${FILESDIR}/${PN}-4.7.3-cups.patch" # bug 323257
-	"${FILESDIR}/${PN}-4.8.5-cleanlooks-floating-point-exception.patch" # bug 507124
-	"${FILESDIR}/${PN}-4.8.5-disable-gtk-theme-check.patch" # bug 491226
-	"${FILESDIR}/${PN}-4.8.5-dont-crash-on-broken-GIF-images.patch" # bug 508984
-	"${FILESDIR}/${PN}-4.8.5-keyboard-shortcuts.patch" # bug 477796
-	"${FILESDIR}/${PN}-4.8.5-libjpeg-9.patch" # bug 480182
-	"${FILESDIR}/${PN}-4.8.5-qclipboard-delay.patch" # bug 514968
-	"${FILESDIR}/${PN}-4.8.5-CVE-2015-0295.patch" # bug 541972
-)
-
-pkg_setup() {
-	QT4_TARGET_DIRECTORIES="
-		src/gui
-		src/scripttools
-		src/plugins/imageformats/gif
-		src/plugins/imageformats/ico
-		src/plugins/imageformats/jpeg
-		src/plugins/imageformats/tga
-		src/plugins/inputmethods"
-
-	QT4_EXTRACT_DIRECTORIES="
-		examples/desktop/systray
-		include
-		src"
-
-	use accessibility && QT4_TARGET_DIRECTORIES+=" src/plugins/accessible/widgets"
-	use mng && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/mng"
-	use tiff && QT4_TARGET_DIRECTORIES+=" src/plugins/imageformats/tiff"
-	use trace && QT4_TARGET_DIRECTORIES+=" src/plugins/graphicssystems/trace tools/qttracereplay"
-
-	# mac version does not contain qtconfig?
-	[[ ${CHOST} != *-darwin* ]] && QT4_TARGET_DIRECTORIES+=" tools/qtconfig"
-
-	QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}"
-
-	qt4-build_pkg_setup
-}
-
-src_prepare() {
-	qt4-build_src_prepare
-
-	# Add -xvideo to the list of accepted configure options
-	sed -i -e 's:|-xinerama|:&-xvideo|:' configure || die
-}
-
-src_configure() {
-	myconf="$(qt_use accessibility)
-		$(qt_use cups)
-		$(qt_use glib)
-		$(qt_use mng libmng system)
-		$(qt_use nas nas-sound system)
-		$(qt_use nis)
-		$(qt_use tiff libtiff system)
-		$(qt_use egl)
-		$(qt_use qt3support)
-		$(qt_use gtkstyle)
-		$(qt_use xinerama)
-		$(qt_use xv xvideo)"
-
-	myconf+="
-		-system-libpng -system-libjpeg -system-zlib
-		-no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 -no-sql-odbc
-		-sm -xshape -xsync -xcursor -xfixes -xrandr -xrender -mitshm -xinput -xkb
-		-fontconfig -no-svg -no-webkit -no-phonon -no-opengl"
-
-	# bug 367045
-	[[ ${CHOST} == *86*-apple-darwin* ]] && myconf+=" -no-ssse3"
-
-	qt4-build_src_configure
-
-	if use gtkstyle; then
-		sed -i -e 's:-I/usr/include/qt4 ::' src/gui/Makefile || die "sed failed"
-	fi
-
-	sed -i -e 's:-I/usr/include/qt4/QtGui ::' src/gui/Makefile || die "sed failed"
-}
-
-src_install() {
-	QCONFIG_ADD="
-		mitshm tablet x11sm xcursor xfixes xinput xkb xrandr xrender xshape xsync
-		fontconfig system-freetype gif png system-png jpeg system-jpeg
-		$(usev accessibility)
-		$(usev cups)
-		$(use mng && echo system-mng)
-		$(usev nas)
-		$(usev nis)
-		$(use tiff && echo system-tiff)
-		$(usev xinerama)
-		$(use xv && echo xvideo)"
-	QCONFIG_REMOVE="no-freetype no-gif no-jpeg no-png no-gui"
-	QCONFIG_DEFINE="$(use accessibility && echo QT_ACCESSIBILITY)
-			$(use cups && echo QT_CUPS)
-			$(use egl && echo QT_EGL)
-			QT_FONTCONFIG QT_FREETYPE
-			$(use gtkstyle && echo QT_STYLE_GTK)
-			QT_IMAGEFORMAT_JPEG QT_IMAGEFORMAT_PNG
-			$(use mng && echo QT_IMAGEFORMAT_MNG)
-			$(use nas && echo QT_NAS)
-			$(use nis && echo QT_NIS)
-			$(use tiff && echo QT_IMAGEFORMAT_TIFF)
-			QT_SESSIONMANAGER QT_SHAPE QT_TABLET QT_XCURSOR QT_XFIXES
-			$(use xinerama && echo QT_XINERAMA)
-			QT_XINPUT QT_XKB QT_XRANDR QT_XRENDER QT_XSYNC
-			$(use xv && echo QT_XVIDEO)"
-
-	qt4-build_src_install
-
-	# install private headers
-	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
-		insinto "${QTLIBDIR#${EPREFIX}}"/QtGui.framework/Headers/private/
-	else
-		insinto "${QTHEADERDIR#${EPREFIX}}"/QtGui/private
-	fi
-	find "${S}"/src/gui -type f -name '*_p.h' -exec doins {} +
-
-	if use aqua && [[ ${CHOST##*-darwin} -ge 9 ]]; then
-		# rerun to get links to headers right
-		fix_includes
-	fi
-
-	# touch the available graphics systems
-	dodir /usr/share/qt4/graphicssystems
-	echo "default" > "${ED}"/usr/share/qt4/graphicssystems/raster || die
-	echo "" > "${ED}"/usr/share/qt4/graphicssystems/native || die
-
-	newicon tools/qtconfig/images/appicon.png qtconfig.png
-	make_desktop_entry qtconfig 'Qt Configuration Tool' qtconfig 'Qt;Settings;DesktopSettings'
-
-	# bug 388551
-	if use gtkstyle; then
-		local tempfile=${T}/${PN}${SLOT}.sh
-		cat <<-EOF > "${tempfile}"
-		export GTK2_RC_FILES=\${HOME}/.gtkrc-2.0
-		EOF
-		insinto /etc/profile.d
-		doins "${tempfile}"
-	fi
-}
-
-pkg_postinst() {
-	qt4-build_pkg_postinst
-
-	# raster is the default graphicssystem, set it on first install
-	eselect qtgraphicssystem set raster --use-old
-}