root
9 years ago
parent
534a5f8be9
commit
3d2aec4b91
@ -1,3 +1,4 @@
|
||||
DIST gnupg-1.4.18.tar.bz2 3649557 SHA256 b7b5fdda78849955e0cdbc5a085f3a08f8b7fba126c622085debb62def5d6388 SHA512 f9619ede8e0d2844774e07fb42359444c5ab8e15565a87f419f76cc3d781940c564f35f429131686fdd7559c5c2edb49506b3c0a1feecbd95438743075be3e63 WHIRLPOOL 780876be0603fd0605b192721e2bbb770ad67d98acba8ef0fd769ab3241467696da5f49a189d89600d076691bf2cedb1294ffade5c44f6d24512d6a93a6f8981
|
||||
DIST gnupg-2.0.26.tar.bz2 4303384 SHA256 7758e30dc382ae7a7167ed41b7f936aa50af5ea2d6fccdef663b5b750b65b8e0 SHA512 5dd23baaac764fd48abd235ed52a85a2c7fd68b98fcde45c0f294ddb3b5629e8b1bd894585fbed4e6a6cb2bc4a5552c098c3cf1a849fffa469424fd0a4fee726 WHIRLPOOL 8d9b30337957f6bfeddea29116d862ef0c0ddd06d59bc2799db236b91b2c6767aad6f37f2166fc431c5d9454eb41f49f3e261bc38d0e89361f0c467f4591cd5a
|
||||
DIST gnupg-2.0.27.tar.bz2 4424679 SHA256 57646d3e4b919fa1e5c8f1c0cf5fe1215333041c493a5ebc4b8f2978dbe930f2 SHA512 b05e75f5ef9881df9472818743c175cfe3254088086f36dc0fcf3d34e61f648f1775d90d404f6c622561df5066d972aadbf99ea8ec1290e5d7f7310f4ef2989e WHIRLPOOL abb353b20655002a0957e38d2b889fb5e6a47ba7b7546e1c70fc1f97cf42deeca8f2b061678983f3a160210f4eaf7529441246df1f9f1d875f5cc090456fdfb7
|
||||
DIST gnupg-2.1.2.tar.bz2 4832996 SHA256 404f5a43d591dfe41f0ffb204b49a1533b67d77bc1fd68febd7e447575616792 SHA512 a12187d32a0d75e4e8ecabe87cd2a49de047dc0d5e601f73779303e0b2f3dad6c2874a665278319e50debd8acb724232be1f1122286ee82c82751063fef07ceb WHIRLPOOL 33f9e7306eb87b35a28489260b2c599164f8c8ac9d4e77d30145402df697a2705062dee02e6d1b904323df953c4b311e9d809216e8657145edd1cf8b1e63a37e
|
||||
|
||||
@ -0,0 +1,163 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.27.ebuild,v 1.1 2015/02/18 17:42:40 k_f Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit eutils flag-o-matic toolchain-funcs
|
||||
|
||||
DESCRIPTION="The GNU Privacy Guard, a GPL pgp replacement"
|
||||
HOMEPAGE="http://www.gnupg.org/"
|
||||
SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
|
||||
# SRC_URI="ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="bzip2 doc ldap nls mta readline static selinux smartcard tools usb"
|
||||
|
||||
COMMON_DEPEND_LIBS="
|
||||
>=dev-libs/libassuan-2
|
||||
>=dev-libs/libgcrypt-1.4:0=
|
||||
>=dev-libs/libgpg-error-1.11
|
||||
>=dev-libs/libksba-1.0.7
|
||||
>=dev-libs/pth-1.3.7
|
||||
>=net-misc/curl-7.10
|
||||
sys-libs/zlib
|
||||
bzip2? ( app-arch/bzip2 )
|
||||
readline? ( sys-libs/readline )
|
||||
smartcard? ( usb? ( virtual/libusb:0 ) )
|
||||
ldap? ( net-nds/openldap )"
|
||||
COMMON_DEPEND_BINS="app-crypt/pinentry"
|
||||
|
||||
# Existence of executables is checked during configuration.
|
||||
DEPEND="${COMMON_DEPEND_LIBS}
|
||||
${COMMON_DEPEND_BINS}
|
||||
static? (
|
||||
>=dev-libs/libassuan-2[static-libs]
|
||||
>=dev-libs/libgcrypt-1.4:0=[static-libs]
|
||||
>=dev-libs/libgpg-error-1.11[static-libs]
|
||||
>=dev-libs/libksba-1.0.7[static-libs]
|
||||
>=dev-libs/pth-1.3.7[static-libs]
|
||||
>=net-misc/curl-7.10[static-libs]
|
||||
sys-libs/zlib[static-libs]
|
||||
bzip2? ( app-arch/bzip2[static-libs] )
|
||||
)
|
||||
nls? ( sys-devel/gettext )
|
||||
doc? ( sys-apps/texinfo )"
|
||||
|
||||
RDEPEND="!static? ( ${COMMON_DEPEND_LIBS} )
|
||||
${COMMON_DEPEND_BINS}
|
||||
mta? ( virtual/mta )
|
||||
!<=app-crypt/gnupg-2.0.1
|
||||
selinux? ( sec-policy/selinux-gpg )
|
||||
nls? ( virtual/libintl )"
|
||||
|
||||
REQUIRED_USE="smartcard? ( !static )"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/${PN}-2.0.17-gpgsm-gencert.patch"
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=()
|
||||
|
||||
# 'USE=static' support was requested:
|
||||
# gnupg1: bug #29299
|
||||
# gnupg2: bug #159623
|
||||
use static && append-ldflags -static
|
||||
|
||||
if use smartcard; then
|
||||
myconf+=(
|
||||
--enable-scdaemon
|
||||
$(use_enable usb ccid-driver)
|
||||
)
|
||||
else
|
||||
myconf+=( --disable-scdaemon )
|
||||
fi
|
||||
|
||||
if use elibc_SunOS || use elibc_AIX; then
|
||||
myconf+=( --disable-symcryptrun )
|
||||
else
|
||||
myconf+=( --enable-symcryptrun )
|
||||
fi
|
||||
|
||||
econf \
|
||||
--docdir="${EPREFIX}/usr/share/doc/${PF}" \
|
||||
--enable-gpg \
|
||||
--enable-gpgsm \
|
||||
--enable-agent \
|
||||
--without-adns \
|
||||
"${myconf[@]}" \
|
||||
$(use_enable bzip2) \
|
||||
$(use_enable nls) \
|
||||
$(use_enable mta mailto) \
|
||||
$(use_enable ldap) \
|
||||
$(use_with readline) \
|
||||
CC_FOR_BUILD="$(tc-getBUILD_CC)"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
default
|
||||
|
||||
if use doc; then
|
||||
cd doc
|
||||
emake html
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
use tools && dobin tools/{convert-from-106,gpg-check-pattern} \
|
||||
tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys,make-dns-cert}
|
||||
|
||||
emake DESTDIR="${D}" -f doc/Makefile uninstall-nobase_dist_docDATA
|
||||
rm "${ED}"/usr/share/gnupg/help* || die
|
||||
|
||||
dodoc ChangeLog NEWS README THANKS TODO VERSION doc/FAQ doc/DETAILS \
|
||||
doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER doc/help*
|
||||
|
||||
dosym gpg2 /usr/bin/gpg
|
||||
dosym gpgv2 /usr/bin/gpgv
|
||||
dosym gpg2keys_hkp /usr/libexec/gpgkeys_hkp
|
||||
dosym gpg2keys_finger /usr/libexec/gpgkeys_finger
|
||||
dosym gpg2keys_curl /usr/libexec/gpgkeys_curl
|
||||
if use ldap; then
|
||||
dosym gpg2keys_ldap /usr/libexec/gpgkeys_ldap
|
||||
fi
|
||||
echo ".so man1/gpg2.1" > "${ED}"/usr/share/man/man1/gpg.1
|
||||
echo ".so man1/gpgv2.1" > "${ED}"/usr/share/man/man1/gpgv.1
|
||||
|
||||
dodir /etc/env.d
|
||||
echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg
|
||||
|
||||
if use doc; then
|
||||
dohtml doc/gnupg.html/* doc/*.png
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "If you wish to view images emerge:"
|
||||
elog "media-gfx/xloadimage, media-gfx/xli or any other viewer"
|
||||
elog "Remember to use photo-viewer option in configuration file to activate"
|
||||
elog "the right viewer."
|
||||
elog
|
||||
|
||||
if use smartcard; then
|
||||
elog "To use your OpenPGP smartcard (or token) with GnuPG you need one of"
|
||||
use usb && elog " - a CCID-compatible reader, used directly through libusb;"
|
||||
elog " - sys-apps/pcsc-lite and a compatible reader device;"
|
||||
elog " - dev-libs/openct and a compatible reader device;"
|
||||
elog " - a reader device and drivers exporting either PC/SC or CT-API interfaces."
|
||||
elog ""
|
||||
elog "General hint: you probably want to try installing sys-apps/pcsc-lite and"
|
||||
elog "app-crypt/ccid first."
|
||||
fi
|
||||
|
||||
ewarn "Please remember to restart gpg-agent if a different version"
|
||||
ewarn "of the agent is currently used. If you are unsure of the gpg"
|
||||
ewarn "agent you are using please run 'killall gpg-agent',"
|
||||
ewarn "and to start a fresh daemon just run 'gpg-agent --daemon'."
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST go1.4.1.src.tar.gz 10921282 SHA256 3d9bb27ad4be51f60dc44f3d0026036ef07142797b1df1b5ae816277e6c31bb3 SHA512 47cbd67cdca8d67e8d09fee6d9a9fd5ddfa65f59413bd583c83b27c598f7b1b23e51e894888c10202bada560a16758eb847bff963d77726724aefecaea5cf644 WHIRLPOOL 0e63fce9674204c79dafad2daea1b8e097370ae7a5b5ee0e463235925cec4a3e74fa0980de8fe6fa1adbc072c2921cef494c5eafe251fe4e26a0f1586bd217e0
|
||||
DIST go1.4.2.src.tar.gz 10921896 SHA256 299a6fd8f8adfdce15bc06bde926e7b252ae8e24dd5b16b7d8791ed79e7b5e9b SHA512 cda1a29d4418875dffaf3324004ddae8e1bbb573f7668e6e0c03d8b61284f4db7fca244c181f2859f8ccdd3db6391fb21e0d98a1a9fc15096c15883249d48a9c WHIRLPOOL d06c27f6ff3a6499a6c7cb3c5eccd53eb588896c4d837e1fe9855c22ee3caa5cc48fd68cbeceff105b7c47fafbbf0eb3dc28ee3af7196692c5bf18511c6760ef
|
||||
|
||||
@ -0,0 +1,121 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-lang/go/go-1.4.2.ebuild,v 1.1 2015/02/18 17:58:09 williamh Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
export CTARGET=${CTARGET:-${CHOST}}
|
||||
|
||||
inherit eutils toolchain-funcs
|
||||
|
||||
if [[ ${PV} = 9999 ]]; then
|
||||
EGIT_REPO_URI="git://github.com/golang/go.git"
|
||||
inherit git-r3
|
||||
else
|
||||
SRC_URI="https://storage.googleapis.com/golang/go${PV}.src.tar.gz"
|
||||
# Upstream only supports go on amd64, arm and x86 architectures.
|
||||
KEYWORDS="-* ~amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos"
|
||||
fi
|
||||
|
||||
DESCRIPTION="A concurrent garbage collected and typesafe programming language"
|
||||
HOMEPAGE="http://www.golang.org"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=""
|
||||
RDEPEND=""
|
||||
|
||||
# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
|
||||
QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
|
||||
|
||||
# The go language uses *.a files which are _NOT_ libraries and should not be
|
||||
# stripped.
|
||||
STRIP_MASK="/usr/lib/go/pkg/linux*/*.a /usr/lib/go/pkg/freebsd*/*.a /usr/lib/go/pkg/darwin*/*.a"
|
||||
|
||||
if [[ ${PV} != 9999 ]]; then
|
||||
S="${WORKDIR}"/go
|
||||
fi
|
||||
|
||||
src_prepare()
|
||||
{
|
||||
if [[ ${PV} != 9999 ]]; then
|
||||
sed -i -e 's#"-Werror",##g' src/cmd/dist/build.c ||
|
||||
die "sed failed"
|
||||
fi
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_compile()
|
||||
{
|
||||
export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
|
||||
export GOROOT="$(pwd)"
|
||||
export GOBIN="${GOROOT}/bin"
|
||||
if [[ $CTARGET = armv5* ]]
|
||||
then
|
||||
export GOARM=5
|
||||
fi
|
||||
tc-export CC
|
||||
|
||||
cd src
|
||||
./make.bash || die "build failed"
|
||||
}
|
||||
|
||||
src_test()
|
||||
{
|
||||
cd src
|
||||
PATH="${GOBIN}:${PATH}" \
|
||||
./run.bash --no-rebuild --banner || die "tests failed"
|
||||
}
|
||||
|
||||
src_install()
|
||||
{
|
||||
dobin bin/*
|
||||
dodoc AUTHORS CONTRIBUTORS PATENTS README
|
||||
|
||||
dodir /usr/lib/go
|
||||
insinto /usr/lib/go
|
||||
|
||||
# There is a known issue which requires the source tree to be installed [1].
|
||||
# Once this is fixed, we can consider using the doc use flag to control
|
||||
# installing the doc and src directories.
|
||||
# [1] https://golang.org/issue/2775
|
||||
doins -r doc include lib pkg src
|
||||
fperms -R +x /usr/lib/go/pkg/tool
|
||||
}
|
||||
|
||||
pkg_preinst()
|
||||
{
|
||||
has_version '<dev-lang/go-1.4' &&
|
||||
export had_support_files=true ||
|
||||
export had_support_files=false
|
||||
}
|
||||
|
||||
pkg_postinst()
|
||||
{
|
||||
# If the go tool sees a package file timestamped older than a dependancy it
|
||||
# will rebuild that file. So, in order to stop go from rebuilding lots of
|
||||
# packages for every build we need to fix the timestamps. The compiler and
|
||||
# linker are also checked - so we need to fix them too.
|
||||
ebegin "fixing timestamps to avoid unnecessary rebuilds"
|
||||
tref="usr/lib/go/pkg/*/runtime.a"
|
||||
find "${EROOT}"usr/lib/go -type f \
|
||||
-exec touch -r "${EROOT}"${tref} {} \;
|
||||
eend $?
|
||||
|
||||
if [[ ${PV} != 9999 && -n ${REPLACING_VERSIONS} &&
|
||||
${REPLACING_VERSIONS} != ${PV} ]]; then
|
||||
elog "Release notes are located at http://golang.org/doc/go1.4"
|
||||
fi
|
||||
|
||||
if $had_support_files; then
|
||||
ewarn
|
||||
ewarn "All editor support, IDE support, shell completion"
|
||||
ewarn "support, etc has been removed from the go package"
|
||||
ewarn "upstream."
|
||||
ewarn "For more information on which support is available, see"
|
||||
ewarn "the following URL:"
|
||||
ewarn "https://github.com/golang/go/wiki/IDEsAndTextEditorPlugins"
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
diff -r -U2 bpython-0.14.orig/bpython/curtsiesfrontend/repl.py bpython-0.14/bpython/curtsiesfrontend/repl.py
|
||||
--- bpython-0.14.orig/bpython/curtsiesfrontend/repl.py 2015-02-17 05:07:38.000000000 +0600
|
||||
+++ bpython-0.14/bpython/curtsiesfrontend/repl.py 2015-02-19 00:09:13.758932344 +0600
|
||||
@@ -420,7 +420,9 @@
|
||||
# for reading modules if they fail to load
|
||||
old_module_locations = {}
|
||||
+ default_level = 0 if py3 else -1
|
||||
|
||||
@functools.wraps(self.orig_import)
|
||||
- def new_import(name, globals={}, locals={}, fromlist=[], level=-1):
|
||||
+ def new_import(name, globals={}, locals={}, fromlist=[],
|
||||
+ level=default_level):
|
||||
try:
|
||||
m = self.orig_import(name, globals=globals, locals=locals,
|
||||
@ -1,343 +0,0 @@
|
||||
From f1ee10f81ac18789e9a7dc715b464415ba2bc2b8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= <mgraesslin@kde.org>
|
||||
Date: Wed, 19 Feb 2014 11:01:44 +0100
|
||||
Subject: Prefer QPA implementation in qsystemtrayicon_x11 if available
|
||||
|
||||
In order to have the possibility to provide a custom QSystemTrayIcon
|
||||
implementation in the platform theme instead of the X11 xembed based
|
||||
one, the qpa implementation needs to be called. This was not possible
|
||||
as qpa and x11 implementation were compile time mutual exclusive.
|
||||
|
||||
This change moves the qpa implementation in the shared part and the
|
||||
methods in qsystemtrayicon_qpa just delegate to them. In addition the
|
||||
_x11 part tries to create a QPlatformSystemTrayIcon through the
|
||||
platform theme and if that succeeds the implementation prefers the qpa
|
||||
variant and delegates to the same methods.
|
||||
|
||||
Change-Id: I6b33acac63524a77ebdce39af6eb74666f8c7561
|
||||
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
|
||||
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
||||
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
|
||||
---
|
||||
src/widgets/util/qsystemtrayicon.cpp | 68 ++++++++++++++++++++++++++++++++
|
||||
src/widgets/util/qsystemtrayicon_p.h | 9 +++++
|
||||
src/widgets/util/qsystemtrayicon_qpa.cpp | 51 +++++-------------------
|
||||
src/widgets/util/qsystemtrayicon_x11.cpp | 40 ++++++++++++++++++-
|
||||
4 files changed, 126 insertions(+), 42 deletions(-)
|
||||
|
||||
diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp
|
||||
index f1a69e6..fa318f3 100644
|
||||
--- a/src/widgets/util/qsystemtrayicon.cpp
|
||||
+++ b/src/widgets/util/qsystemtrayicon.cpp
|
||||
@@ -672,6 +672,74 @@ void QBalloonTip::timerEvent(QTimerEvent *e)
|
||||
QWidget::timerEvent(e);
|
||||
}
|
||||
|
||||
+//////////////////////////////////////////////////////////////////////
|
||||
+void QSystemTrayIconPrivate::install_sys_qpa()
|
||||
+{
|
||||
+ qpa_sys->init();
|
||||
+ QObject::connect(qpa_sys, SIGNAL(activated(QPlatformSystemTrayIcon::ActivationReason)),
|
||||
+ q_func(), SLOT(_q_emitActivated(QPlatformSystemTrayIcon::ActivationReason)));
|
||||
+ QObject::connect(qpa_sys, &QPlatformSystemTrayIcon::messageClicked,
|
||||
+ q_func(), &QSystemTrayIcon::messageClicked);
|
||||
+ updateMenu_sys();
|
||||
+ updateIcon_sys();
|
||||
+ updateToolTip_sys();
|
||||
+}
|
||||
+
|
||||
+void QSystemTrayIconPrivate::remove_sys_qpa()
|
||||
+{
|
||||
+ qpa_sys->cleanup();
|
||||
+}
|
||||
+
|
||||
+QRect QSystemTrayIconPrivate::geometry_sys_qpa() const
|
||||
+{
|
||||
+ return qpa_sys->geometry();
|
||||
+}
|
||||
+
|
||||
+void QSystemTrayIconPrivate::updateIcon_sys_qpa()
|
||||
+{
|
||||
+ qpa_sys->updateIcon(icon);
|
||||
+}
|
||||
+
|
||||
+void QSystemTrayIconPrivate::updateMenu_sys_qpa()
|
||||
+{
|
||||
+ if (menu) {
|
||||
+ if (!menu->platformMenu()) {
|
||||
+ QPlatformMenu *platformMenu = qpa_sys->createMenu();
|
||||
+ if (platformMenu)
|
||||
+ menu->setPlatformMenu(platformMenu);
|
||||
+ }
|
||||
+ qpa_sys->updateMenu(menu->platformMenu());
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+void QSystemTrayIconPrivate::updateToolTip_sys_qpa()
|
||||
+{
|
||||
+ qpa_sys->updateToolTip(toolTip);
|
||||
+}
|
||||
+
|
||||
+void QSystemTrayIconPrivate::showMessage_sys_qpa(const QString &message,
|
||||
+ const QString &title,
|
||||
+ QSystemTrayIcon::MessageIcon icon,
|
||||
+ int msecs)
|
||||
+{
|
||||
+ QIcon notificationIcon;
|
||||
+ switch (icon) {
|
||||
+ case QSystemTrayIcon::Information:
|
||||
+ notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation);
|
||||
+ break;
|
||||
+ case QSystemTrayIcon::Warning:
|
||||
+ notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning);
|
||||
+ break;
|
||||
+ case QSystemTrayIcon::Critical:
|
||||
+ notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxCritical);
|
||||
+ break;
|
||||
+ default:
|
||||
+ break;
|
||||
+ }
|
||||
+ qpa_sys->showMessage(message, title, notificationIcon,
|
||||
+ static_cast<QPlatformSystemTrayIcon::MessageIcon>(icon), msecs);
|
||||
+}
|
||||
+
|
||||
QT_END_NAMESPACE
|
||||
|
||||
#endif // QT_NO_SYSTEMTRAYICON
|
||||
diff --git a/src/widgets/util/qsystemtrayicon_p.h b/src/widgets/util/qsystemtrayicon_p.h
|
||||
index 211ef30..317664a 100644
|
||||
--- a/src/widgets/util/qsystemtrayicon_p.h
|
||||
+++ b/src/widgets/util/qsystemtrayicon_p.h
|
||||
@@ -98,6 +98,15 @@ public:
|
||||
QSystemTrayIconSys *sys;
|
||||
QPlatformSystemTrayIcon *qpa_sys;
|
||||
bool visible;
|
||||
+
|
||||
+private:
|
||||
+ void install_sys_qpa();
|
||||
+ void remove_sys_qpa();
|
||||
+ void updateIcon_sys_qpa();
|
||||
+ void updateToolTip_sys_qpa();
|
||||
+ void updateMenu_sys_qpa();
|
||||
+ QRect geometry_sys_qpa() const;
|
||||
+ void showMessage_sys_qpa(const QString &msg, const QString &title, QSystemTrayIcon::MessageIcon icon, int secs);
|
||||
};
|
||||
|
||||
class QBalloonTip : public QWidget
|
||||
diff --git a/src/widgets/util/qsystemtrayicon_qpa.cpp b/src/widgets/util/qsystemtrayicon_qpa.cpp
|
||||
index f98aeaf..045641c 100644
|
||||
--- a/src/widgets/util/qsystemtrayicon_qpa.cpp
|
||||
+++ b/src/widgets/util/qsystemtrayicon_qpa.cpp
|
||||
@@ -65,28 +65,20 @@ QSystemTrayIconPrivate::~QSystemTrayIconPrivate()
|
||||
|
||||
void QSystemTrayIconPrivate::install_sys()
|
||||
{
|
||||
- if (qpa_sys) {
|
||||
- qpa_sys->init();
|
||||
- QObject::connect(qpa_sys, SIGNAL(activated(QPlatformSystemTrayIcon::ActivationReason)),
|
||||
- q_func(), SLOT(_q_emitActivated(QPlatformSystemTrayIcon::ActivationReason)));
|
||||
- QObject::connect(qpa_sys, SIGNAL(messageClicked()),
|
||||
- q_func(), SIGNAL(messageClicked()));
|
||||
- updateMenu_sys();
|
||||
- updateIcon_sys();
|
||||
- updateToolTip_sys();
|
||||
- }
|
||||
+ if (qpa_sys)
|
||||
+ install_sys_qpa();
|
||||
}
|
||||
|
||||
void QSystemTrayIconPrivate::remove_sys()
|
||||
{
|
||||
if (qpa_sys)
|
||||
- qpa_sys->cleanup();
|
||||
+ remove_sys_qpa();
|
||||
}
|
||||
|
||||
QRect QSystemTrayIconPrivate::geometry_sys() const
|
||||
{
|
||||
if (qpa_sys)
|
||||
- return qpa_sys->geometry();
|
||||
+ return geometry_sys_qpa();
|
||||
else
|
||||
return QRect();
|
||||
}
|
||||
@@ -94,25 +86,19 @@ QRect QSystemTrayIconPrivate::geometry_sys() const
|
||||
void QSystemTrayIconPrivate::updateIcon_sys()
|
||||
{
|
||||
if (qpa_sys)
|
||||
- qpa_sys->updateIcon(icon);
|
||||
+ updateIcon_sys_qpa();
|
||||
}
|
||||
|
||||
void QSystemTrayIconPrivate::updateMenu_sys()
|
||||
{
|
||||
- if (qpa_sys && menu) {
|
||||
- if (!menu->platformMenu()) {
|
||||
- QPlatformMenu *platformMenu = qpa_sys->createMenu();
|
||||
- if (platformMenu)
|
||||
- menu->setPlatformMenu(platformMenu);
|
||||
- }
|
||||
- qpa_sys->updateMenu(menu->platformMenu());
|
||||
- }
|
||||
+ if (qpa_sys)
|
||||
+ updateMenu_sys_qpa();
|
||||
}
|
||||
|
||||
void QSystemTrayIconPrivate::updateToolTip_sys()
|
||||
{
|
||||
if (qpa_sys)
|
||||
- qpa_sys->updateToolTip(toolTip);
|
||||
+ updateToolTip_sys_qpa();
|
||||
}
|
||||
|
||||
bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys()
|
||||
@@ -138,25 +124,8 @@ void QSystemTrayIconPrivate::showMessage_sys(const QString &message,
|
||||
QSystemTrayIcon::MessageIcon icon,
|
||||
int msecs)
|
||||
{
|
||||
- if (!qpa_sys)
|
||||
- return;
|
||||
-
|
||||
- QIcon notificationIcon;
|
||||
- switch (icon) {
|
||||
- case QSystemTrayIcon::Information:
|
||||
- notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxInformation);
|
||||
- break;
|
||||
- case QSystemTrayIcon::Warning:
|
||||
- notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning);
|
||||
- break;
|
||||
- case QSystemTrayIcon::Critical:
|
||||
- notificationIcon = QApplication::style()->standardIcon(QStyle::SP_MessageBoxCritical);
|
||||
- break;
|
||||
- default:
|
||||
- break;
|
||||
- }
|
||||
- qpa_sys->showMessage(message, title, notificationIcon,
|
||||
- static_cast<QPlatformSystemTrayIcon::MessageIcon>(icon), msecs);
|
||||
+ if (qpa_sys)
|
||||
+ showMessage_sys_qpa(message, title, icon, msecs);
|
||||
}
|
||||
|
||||
QT_END_NAMESPACE
|
||||
diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp
|
||||
index 347e570..27d0418 100644
|
||||
--- a/src/widgets/util/qsystemtrayicon_x11.cpp
|
||||
+++ b/src/widgets/util/qsystemtrayicon_x11.cpp
|
||||
@@ -55,6 +55,9 @@
|
||||
#include <qscreen.h>
|
||||
#include <qbackingstore.h>
|
||||
#include <qpa/qplatformnativeinterface.h>
|
||||
+#include <qpa/qplatformsystemtrayicon.h>
|
||||
+#include <qpa/qplatformtheme.h>
|
||||
+#include <private/qguiapplication_p.h>
|
||||
#include <qdebug.h>
|
||||
|
||||
#ifndef QT_NO_SYSTEMTRAYICON
|
||||
@@ -209,16 +212,22 @@ void QSystemTrayIconSys::paintEvent(QPaintEvent *)
|
||||
|
||||
QSystemTrayIconPrivate::QSystemTrayIconPrivate()
|
||||
: sys(0),
|
||||
+ qpa_sys(QGuiApplicationPrivate::platformTheme()->createPlatformSystemTrayIcon()),
|
||||
visible(false)
|
||||
{
|
||||
}
|
||||
|
||||
QSystemTrayIconPrivate::~QSystemTrayIconPrivate()
|
||||
{
|
||||
+ delete qpa_sys;
|
||||
}
|
||||
|
||||
void QSystemTrayIconPrivate::install_sys()
|
||||
{
|
||||
+ if (qpa_sys) {
|
||||
+ install_sys_qpa();
|
||||
+ return;
|
||||
+ }
|
||||
Q_Q(QSystemTrayIcon);
|
||||
if (!sys && locateSystemTray()) {
|
||||
sys = new QSystemTrayIconSys(q);
|
||||
@@ -229,6 +238,8 @@ void QSystemTrayIconPrivate::install_sys()
|
||||
|
||||
QRect QSystemTrayIconPrivate::geometry_sys() const
|
||||
{
|
||||
+ if (qpa_sys)
|
||||
+ return geometry_sys_qpa();
|
||||
if (!sys)
|
||||
return QRect();
|
||||
return sys->globalGeometry();
|
||||
@@ -236,6 +247,10 @@ QRect QSystemTrayIconPrivate::geometry_sys() const
|
||||
|
||||
void QSystemTrayIconPrivate::remove_sys()
|
||||
{
|
||||
+ if (qpa_sys) {
|
||||
+ remove_sys_qpa();
|
||||
+ return;
|
||||
+ }
|
||||
if (!sys)
|
||||
return;
|
||||
QBalloonTip::hideBalloon();
|
||||
@@ -246,17 +261,26 @@ void QSystemTrayIconPrivate::remove_sys()
|
||||
|
||||
void QSystemTrayIconPrivate::updateIcon_sys()
|
||||
{
|
||||
+ if (qpa_sys) {
|
||||
+ updateIcon_sys_qpa();
|
||||
+ return;
|
||||
+ }
|
||||
if (sys)
|
||||
sys->updateIcon();
|
||||
}
|
||||
|
||||
void QSystemTrayIconPrivate::updateMenu_sys()
|
||||
{
|
||||
-
|
||||
+ if (qpa_sys)
|
||||
+ updateMenu_sys_qpa();
|
||||
}
|
||||
|
||||
void QSystemTrayIconPrivate::updateToolTip_sys()
|
||||
{
|
||||
+ if (qpa_sys) {
|
||||
+ updateToolTip_sys_qpa();
|
||||
+ return;
|
||||
+ }
|
||||
if (!sys)
|
||||
return;
|
||||
#ifndef QT_NO_TOOLTIP
|
||||
@@ -266,6 +290,11 @@ void QSystemTrayIconPrivate::updateToolTip_sys()
|
||||
|
||||
bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys()
|
||||
{
|
||||
+ QScopedPointer<QPlatformSystemTrayIcon> sys(QGuiApplicationPrivate::platformTheme()->createPlatformSystemTrayIcon());
|
||||
+ if (sys)
|
||||
+ return sys->isSystemTrayAvailable();
|
||||
+
|
||||
+ // no QPlatformSystemTrayIcon so fall back to default xcb platform behavior
|
||||
const QString platform = QGuiApplication::platformName();
|
||||
if (platform.compare(QStringLiteral("xcb"), Qt::CaseInsensitive) == 0)
|
||||
return locateSystemTray();
|
||||
@@ -274,12 +303,21 @@ bool QSystemTrayIconPrivate::isSystemTrayAvailable_sys()
|
||||
|
||||
bool QSystemTrayIconPrivate::supportsMessages_sys()
|
||||
{
|
||||
+ QScopedPointer<QPlatformSystemTrayIcon> sys(QGuiApplicationPrivate::platformTheme()->createPlatformSystemTrayIcon());
|
||||
+ if (sys)
|
||||
+ return sys->supportsMessages();
|
||||
+
|
||||
+ // no QPlatformSystemTrayIcon so fall back to default xcb platform behavior
|
||||
return true;
|
||||
}
|
||||
|
||||
void QSystemTrayIconPrivate::showMessage_sys(const QString &message, const QString &title,
|
||||
QSystemTrayIcon::MessageIcon icon, int msecs)
|
||||
{
|
||||
+ if (qpa_sys) {
|
||||
+ showMessage_sys_qpa(message, title, icon, msecs);
|
||||
+ return;
|
||||
+ }
|
||||
if (!sys)
|
||||
return;
|
||||
const QPoint g = sys->globalGeometry().topLeft();
|
||||
--
|
||||
2.0.0
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/kde-base/kwalletd/kwalletd-4.14.3.ebuild,v 1.5 2015/02/17 11:06:36 ago Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
KMNAME="kde-runtime"
|
||||
inherit kde4-meta
|
||||
|
||||
DESCRIPTION="KDE Password Server"
|
||||
KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
|
||||
IUSE="debug gpg"
|
||||
|
||||
DEPEND="
|
||||
gpg? (
|
||||
app-crypt/gpgme
|
||||
$(add_kdebase_dep kdepimlibs)
|
||||
)
|
||||
"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
RESTRICT="test"
|
||||
# testpamopen crashes with a buffer overflow (__fortify_fail)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
$(cmake-utils_use_find_package gpg Gpgme)
|
||||
$(cmake-utils_use_find_package gpg QGpgme)
|
||||
)
|
||||
|
||||
kde4-base_src_configure
|
||||
}
|
||||
@ -1 +1 @@
|
||||
Wed, 18 Feb 2015 17:36:50 +0000
|
||||
Wed, 18 Feb 2015 19:06:51 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Wed, 18 Feb 2015 17:36:50 +0000
|
||||
Wed, 18 Feb 2015 19:06:51 +0000
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
DEFINED_PHASES=compile configure install postinst prepare
|
||||
DEPEND=>=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.4:0= >=dev-libs/libgpg-error-1.11 >=dev-libs/libksba-1.0.7 >=dev-libs/pth-1.3.7 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline ) smartcard? ( usb? ( virtual/libusb:0 ) ) ldap? ( net-nds/openldap ) app-crypt/pinentry static? ( >=dev-libs/libassuan-2[static-libs] >=dev-libs/libgcrypt-1.4:0=[static-libs] >=dev-libs/libgpg-error-1.11[static-libs] >=dev-libs/libksba-1.0.7[static-libs] >=dev-libs/pth-1.3.7[static-libs] >=net-misc/curl-7.10[static-libs] sys-libs/zlib[static-libs] bzip2? ( app-arch/bzip2[static-libs] ) ) nls? ( sys-devel/gettext ) doc? ( sys-apps/texinfo )
|
||||
DESCRIPTION=The GNU Privacy Guard, a GPL pgp replacement
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.gnupg.org/
|
||||
IUSE=bzip2 doc ldap nls mta readline static selinux smartcard tools usb
|
||||
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
|
||||
LICENSE=GPL-3
|
||||
RDEPEND=!static? ( >=dev-libs/libassuan-2 >=dev-libs/libgcrypt-1.4:0= >=dev-libs/libgpg-error-1.11 >=dev-libs/libksba-1.0.7 >=dev-libs/pth-1.3.7 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) readline? ( sys-libs/readline ) smartcard? ( usb? ( virtual/libusb:0 ) ) ldap? ( net-nds/openldap ) ) app-crypt/pinentry mta? ( virtual/mta ) !<=app-crypt/gnupg-2.0.1 selinux? ( sec-policy/selinux-gpg ) nls? ( virtual/libintl )
|
||||
REQUIRED_USE=smartcard? ( !static )
|
||||
SLOT=0
|
||||
SRC_URI=mirror://gnupg/gnupg/gnupg-2.0.27.tar.bz2
|
||||
_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 flag-o-matic c263990f1b677b0f0be0a3299f179762 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac
|
||||
_md5_=011f148bc1c8d00250f73069cf9ac381
|
||||
@ -0,0 +1,10 @@
|
||||
DEFINED_PHASES=compile install postinst preinst prepare test
|
||||
DESCRIPTION=A concurrent garbage collected and typesafe programming language
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.golang.org
|
||||
KEYWORDS=-* ~amd64 ~arm ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos
|
||||
LICENSE=BSD
|
||||
SLOT=0
|
||||
SRC_URI=https://storage.googleapis.com/golang/go1.4.2.src.tar.gz
|
||||
_eclasses_=eutils 998e5931fb95b10a6a11ec796ada2759 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac
|
||||
_md5_=6b9f95a60d3f4b4341afe635ded480e7
|
||||
@ -1,14 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
|
||||
DEPEND=gpg? ( app-crypt/gpgme >=kde-base/kdepimlibs-4.14.3:4[aqua=] ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
|
||||
DESCRIPTION=KDE Password Server
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.kde.org/
|
||||
IUSE=debug gpg aqua
|
||||
KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=gpg? ( app-crypt/gpgme >=kde-base/kdepimlibs-4.14.3:4[aqua=] ) || ( kde-apps/oxygen-icons >=kde-base/oxygen-icons-4.14.3:4[aqua=] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4[-phonon] >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=dev-qt/qtwebkit-4.8.5:4 >=kde-base/kdelibs-4.14.3:4[aqua=]
|
||||
RESTRICT=test
|
||||
SLOT=4/4.14
|
||||
SRC_URI=mirror://kde/stable/4.14.3/src/kde-runtime-4.14.3.tar.xz
|
||||
_eclasses_=cmake-utils 0430c386d85cec959d72640afd63ea91 eutils 998e5931fb95b10a6a11ec796ada2759 fdo-mime 0acfe1a88fd8751a1d5dc671168219fa flag-o-matic c263990f1b677b0f0be0a3299f179762 gnome2-utils 5cdfd22a2163c9d3a891648bd19453a7 kde4-base deaaf624bd641762a3432753e86f1a6a kde4-functions 0fefdf727b8cb916a1b974021316f911 kde4-meta 43baa369240a27d6bc794953b4b07f66 multilib 3bf24e6abb9b76d9f6c20600f0b716bf toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac versionator cd0bcdb170807e4a1984115e9d53a26f virtualx 73cfc129b4b9ba23aed1abb10c825d86
|
||||
_md5_=be2cadfc8f71e8cb704104bf5716f0ec
|
||||
@ -1 +1 @@
|
||||
Wed, 18 Feb 2015 17:36:53 +0000
|
||||
Wed, 18 Feb 2015 19:06:54 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Wed Feb 18 17:36:50 UTC 2015
|
||||
Wed Feb 18 19:06:51 UTC 2015
|
||||
|
||||
@ -1 +1 @@
|
||||
Wed, 18 Feb 2015 18:00:02 +0000
|
||||
Wed, 18 Feb 2015 19:30:01 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
1424280901 Wed 18 Feb 2015 05:35:01 PM UTC UTC
|
||||
1424286301 Wed 18 Feb 2015 07:05:01 PM UTC UTC
|
||||
|
||||
Loading…
Reference in new issue