diff options
author | Alex Alexander <wired@gentoo.org> | 2011-03-03 23:48:20 +0200 |
---|---|---|
committer | Alex Alexander <wired@gentoo.org> | 2011-03-03 23:48:20 +0200 |
commit | b5092ff7c50f6bd7741cd6ce49e6da763ba8dd84 (patch) | |
tree | 443c3fad03392dd74d7e9633c7df8cc521d1532d /x11-themes | |
parent | PyQt4/sip: Automatic version bump, remove old (diff) | |
download | qt-b5092ff7c50f6bd7741cd6ce49e6da763ba8dd84.tar.gz qt-b5092ff7c50f6bd7741cd6ce49e6da763ba8dd84.tar.bz2 qt-b5092ff7c50f6bd7741cd6ce49e6da763ba8dd84.zip |
qgtkstyle: changes moved to main tree
Diffstat (limited to 'x11-themes')
-rw-r--r-- | x11-themes/qgtkstyle/Manifest | 6 | ||||
-rw-r--r-- | x11-themes/qgtkstyle/files/main.cpp | 48 | ||||
-rw-r--r-- | x11-themes/qgtkstyle/files/qgtkstyle-gentoo.patch | 19 | ||||
-rw-r--r-- | x11-themes/qgtkstyle/files/qgtkstyle.pro | 61 | ||||
-rw-r--r-- | x11-themes/qgtkstyle/metadata.xml | 5 | ||||
-rw-r--r-- | x11-themes/qgtkstyle/qgtkstyle-4.7.1-r2.ebuild | 66 |
6 files changed, 0 insertions, 205 deletions
diff --git a/x11-themes/qgtkstyle/Manifest b/x11-themes/qgtkstyle/Manifest deleted file mode 100644 index a3143d50..00000000 --- a/x11-themes/qgtkstyle/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX main.cpp 1549 RMD160 3e9b0eb139f4427252079c79fca3a7bc3f1ad9f4 SHA1 abbb5d4d967f0de4239aee34bbb6162b0f95abec SHA256 84a2adf33b0ac85f68d19581c24bc1893ed03f79250bb355321409f4763ed0be -AUX qgtkstyle-gentoo.patch 703 RMD160 41d706c22e4bd3844b46fb8b912eb0277ff157fd SHA1 a9298e178c662e1e8662d5a4a3372549bf77590e SHA256 8ec08c184b3d4d695ced13a43b16afbe006dc191be1768b7dd18f27f2ed9b9d9 -AUX qgtkstyle.pro 1481 RMD160 8edd6c0f5fb8444145820a038c09da3d3a6097c1 SHA1 8af534fdf3a2df2088b77eee86925c38db21e068 SHA256 e1c396f5a6567f4fda9a2a52919a521df769d8fddc5cbcab189f8b543a20edc9 -DIST qt-everywhere-opensource-src-4.7.1.tar.gz 211768512 RMD160 de6998948eb9f51a9193b9020ba80cfd52d50899 SHA1 fcf764d39d982c7f84703821582bd10c3192e341 SHA256 8cb5277c41f824cfc6dcee0e95e0bf23a9ad2c8d18d245105137481d092b124a -EBUILD qgtkstyle-4.7.1-r2.ebuild 1874 RMD160 bdd245323db50bfb65aa9973ea7017dbdcd666bb SHA1 6daf77686779c441592e38e18ecf35717502b3dd SHA256 366a4ef81a6842c85c29c1f0100408bfa7cb0a9b37f4de7d6c22db00f149fb62 -MISC metadata.xml 156 RMD160 2c307fe3d7f514f10f158344b51114121632f411 SHA1 1b61305bd125f03b40ed85c17989140608e1efee SHA256 2bc85ad7339ae0191c26e435f2da777058779a7ebf73d14658a6ea7bfcec01b2 diff --git a/x11-themes/qgtkstyle/files/main.cpp b/x11-themes/qgtkstyle/files/main.cpp deleted file mode 100644 index 12786b4f..00000000 --- a/x11-themes/qgtkstyle/files/main.cpp +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2007-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the QGtkStyle project on Trolltech Labs. -** -** This file may be used under the terms of the GNU General Public -** License version 2.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of -** this file. Please review the following information to ensure GNU -** General Public Licensing requirements will be met: -** http://www.trolltech.com/products/qt/opensource.html -** -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://www.trolltech.com/products/qt/licensing.html or contact the -** sales department at sales@trolltech.com. -** -** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -** -****************************************************************************/ - -#include "qgtkstyle.h" -#include <QtGui/QStylePlugin> - -class QGtkStylePlugin : public QStylePlugin -{ -public : - QGtkStylePlugin(); - QStyle *create(const QString &key); - QStringList keys() const; -}; - -QGtkStylePlugin::QGtkStylePlugin() -{} - -QStyle *QGtkStylePlugin::create(const QString &key) -{ - return (key.toLower() == "gtk+") ? new QGtkStyle : 0; -} - -QStringList QGtkStylePlugin::keys() const -{ - return QStringList() << "GTK+"; -} - -Q_EXPORT_PLUGIN2(qgtkstyle, QGtkStylePlugin) diff --git a/x11-themes/qgtkstyle/files/qgtkstyle-gentoo.patch b/x11-themes/qgtkstyle/files/qgtkstyle-gentoo.patch deleted file mode 100644 index e17867b6..00000000 --- a/x11-themes/qgtkstyle/files/qgtkstyle-gentoo.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- src/gui/styles/qgtkstyle_p.cpp 2010-11-06 03:55:14.000000000 +0200 -+++ src/gui/styles/qgtkstyle_p.cpp 2010-11-13 21:53:51.507000001 +0200 -@@ -252,14 +252,14 @@ - return QHashableLatin1Literal::fromData(copy); - } - -- -+Q_GLOBAL_STATIC(FontHash, app_fonts) - - bool QGtkStyleFilter::eventFilter(QObject *obj, QEvent *e) - { - if (e->type() == QEvent::ApplicationPaletteChange) { - // Only do this the first time since this will also - // generate applicationPaletteChange events -- if (!qt_app_palettes_hash() || qt_app_palettes_hash()->isEmpty()) { -+ if (!app_fonts() || app_fonts()->isEmpty()) { - stylePrivate->applyCustomPaletteHash(); - } - } diff --git a/x11-themes/qgtkstyle/files/qgtkstyle.pro b/x11-themes/qgtkstyle/files/qgtkstyle.pro deleted file mode 100644 index 2c40ba65..00000000 --- a/x11-themes/qgtkstyle/files/qgtkstyle.pro +++ /dev/null @@ -1,61 +0,0 @@ -TEMPLATE = lib -CONFIG += qt plugin link_pkgconfig - -QT = core gui - -LIBS += $$QMAKE_LIBS_X11 -LIBS += -L/usr/lib64/qt4 -QMAKE_CXXFLAGS += $$QT_CFLAGS_QGTKSTYLE -LIBS_PRIVATE += $$QT_LIBS_QGTKSTYLE - -unix:QMAKE_PKGCONFIG_REQUIRES = QtGui - -PKGCONFIG += gdk-x11-2.0 -PKGCONFIG += atk - -contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols - -TARGET = $$qtLibraryTarget(gtkstyle) - -INCLUDEPATH += $$PWD/dialogs - -FORMS += dialogs/qfiledialog.ui -HEADERS = styles/qgtkstyle.h \ - styles/qgtkpainter_p.h \ - styles/qgtkstyle_p.h \ - styles/qstylehelper_p.h \ - styles/qwindowsstyle.h \ - image/qiconloader_p.h \ - kernel/qguiplatformplugin_p.h \ - kernel/qkde_p.h \ - dialogs/qfiledialog_p.h \ - dialogs/qfiledialog.h \ - dialogs/qsidebar_p.h \ - dialogs/qfilesystemmodel.h \ - dialogs/qfileinfogatherer_p.h -SOURCES = styles/main.cpp \ - styles/qgtkstyle.cpp \ - styles/qgtkpainter.cpp \ - styles/qgtkstyle_p.cpp \ - styles/qstylehelper.cpp \ - styles/qwindowsstyle.cpp \ - image/qiconloader.cpp \ - kernel/qguiplatformplugin.cpp \ - kernel/qkde.cpp \ - dialogs/qsidebar.cpp \ - dialogs/qfiledialog.cpp \ - dialogs/qfilesystemmodel.cpp \ - dialogs/qfileinfogatherer.cpp -# RESOURCES = qstyle.qrc - -include(../qbase.pri) - -contains(QT_CONFIG, x11sm):CONFIG += x11sm - -#platforms -x11:include(kernel/x11.pri) -mac:include(kernel/mac.pri) -win32:include(kernel/win.pri) - -# target.path = $$[QT_INSTALL_PLUGINS]/styles -# INSTALLS += target diff --git a/x11-themes/qgtkstyle/metadata.xml b/x11-themes/qgtkstyle/metadata.xml deleted file mode 100644 index ab02f994..00000000 --- a/x11-themes/qgtkstyle/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>qt</herd> -</pkgmetadata> diff --git a/x11-themes/qgtkstyle/qgtkstyle-4.7.1-r2.ebuild b/x11-themes/qgtkstyle/qgtkstyle-4.7.1-r2.ebuild deleted file mode 100644 index 812dab03..00000000 --- a/x11-themes/qgtkstyle/qgtkstyle-4.7.1-r2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/qgtkstyle/qgtkstyle-4.7.1-r1.ebuild,v 1.2 2010/11/13 20:53:07 wired Exp $ - -EAPI="3" -inherit confutils qt4-build - -DESCRIPTION="Qt style that uses the active GTK theme." -SLOT="4" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" -IUSE="" - -COMMON_DEPEND=" - x11-libs/gtk+:2 - >=x11-libs/qt-gui-${PV}-r1 -" -DEPEND="${COMMON_DEPEND} - || ( >=x11-libs/cairo-1.10.0[-qt4] <x11-libs/cairo-1.10.0 ) -" -RDEPEND="${COMMON_DEPEND} - !>x11-libs/qt-gui-${PV}-r9999 -" - -pkg_setup() { - QT4_TARGET_DIRECTORIES=" - src/gui - " - - QT4_EXTRACT_DIRECTORIES=" - include - src - tools/linguist/phrasebooks - tools/linguist/shared - tools/shared" - - QT4_EXTRACT_DIRECTORIES="${QT4_TARGET_DIRECTORIES} ${QT4_EXTRACT_DIRECTORIES}" - - qt4-build_pkg_setup -} - -src_prepare() { - cp "${FILESDIR}"/qgtkstyle.pro "${S}"/src/gui/gui.pro || die - cp "${FILESDIR}"/main.cpp "${S}"/src/gui/styles/ || die - sed "/QT_NO_STYLE_/d" -i "${S}"/src/gui/styles/qgtk* || die - epatch "${FILESDIR}"/"${PN}"-gentoo.patch - qt4-build_src_prepare -} - -src_configure() { - export PATH="${S}/bin:${PATH}" - export LD_LIBRARY_PATH="${S}/lib:${LD_LIBRARY_PATH}" - - myconf="${myconf} -qt-gif -system-libpng -system-libjpeg - -no-sql-mysql -no-sql-psql -no-sql-ibase -no-sql-sqlite -no-sql-sqlite2 - -no-sql-odbc -no-xrender -no-xrandr -no-xkb -no-xshape -no-sm -no-svg -no-webkit - -no-cups -no-glib -no-libmng -no-nis -no-libtiff -no-dbus -no-qdbus -no-egl - -no-qt3support -no-xinerama -no-phonon -no-opengl -no-accessibility - -gtkstyle" - - qt4-build_src_configure -} - -src_install() { - insinto /usr/$(get_libdir)/qt4/plugins/styles/ || die - doins lib/libgtkstyle.so || die -} |