wyj/gentoo-zh
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo-zh.git synced 2025-04-18 23:38:57 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix build error with qt 5.14, update EAPI

Browse Source
This commit is contained in:
zhtengw 2020-03-31 18:13:33 +08:00
parent 9c3d7aa9a4
commit e1c97ab20f
28 changed files with 329 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app-emulation/deepin-wine/Manifest
View File

@ -1,12 +1,12 @@
DIST deepin-fonts-wine_2.18-18_all.deb 213292 SHA256 e62ef12fad3ae73c1b011eed8ab76fe0a5663ef41348b737d179add2f168bebd
DIST deepin-fonts-wine_2.18-18~rc2_all.deb 213270 SHA256 5b697ff119ec3a093a6711cc16883959888a87a1e876771f1ad6f54c58c1e263
DIST deepin-fonts-wine_2.18-22~rc0_all.deb 213576 SHA256 27371116c32a22ed609f60019d8cd7febb75ecaa422f91cb407be5baa57a7caa
DIST deepin-libwine_2.18-18_i386.deb 19907122 SHA256 15ec9dc748eab58a57b50e2724f92f00f7bb9aaa078bcea1bacb3a17e1c09c72
DIST deepin-libwine_2.18-18~rc2_i386.deb 19887330 SHA256 18e9fcf79746ad84a4d35fef95505aa22df3136ffb6f5d3556b342af2be14958
DIST deepin-libwine_2.18-22~rc0_i386.deb 19906326 SHA256 0251025d26a632f4ae7ad9baad02abc906973378ad9fd8fdf65a1885bcf043a0
DIST deepin-wine32-preloader_2.18-18_i386.deb 87522 SHA256 b6ad59a0faca13e93a6d636e786137c475531eb895014a234ae62f7f6fee36a0
DIST deepin-wine32-preloader_2.18-18~rc2_i386.deb 87314 SHA256 6cab32c2205fdcb60895f37f72cbb398d3286376d558765369083dde2548ff69
DIST deepin-wine32-preloader_2.18-22~rc0_i386.deb 87734 SHA256 4ec0d3d541cb2651c8aaff74be9f09b78086acbd5db977ed5c2b8d93075f2121
DIST deepin-wine32-tools_2.18-18_i386.deb 918386 SHA256 4b33bd59565f8947cf48a3c3249af415ba3523bc9494458c8bb4bcbf667aec91
DIST deepin-wine32-tools_2.18-18~rc2_i386.deb 894558 SHA256 56ccd9348aee4150e033cd83695ebc63e9d637b0140471e1f880d0b48ca41254
DIST deepin-wine32-tools_2.18-22~rc0_i386.deb 916870 SHA256 f4e6f5277cb8c45fdd417bfc54aff5c93580196310abfef403356ed464a5e45d
DIST deepin-wine32_2.18-18_i386.deb 80936 SHA256 33e7c1339a13d095da84949263047f1ebd6aa7207440bf224f51174fe32b2cb0
DIST deepin-wine32_2.18-18~rc2_i386.deb 80576 SHA256 2be5be8f74bc43a2389baccc5062ff9184cb4de003117c3b3dfdc5923d22b4d1
DIST deepin-wine32_2.18-22~rc0_i386.deb 81110 SHA256 051d4c5839ea0992c69fb4d03510ef0f73e2ac3bfd759a3a99ba2ac9b0d267a6
DIST deepin-wine_2.18-18_all.deb 96562 SHA256 7d0ee561bae05f014d5b59c2f2a8b6d58c8b8e0df2961822b85849846db8aab7
DIST deepin-wine_2.18-18~rc2_all.deb 96518 SHA256 f734e322bad7a54451d334aabef0e912edb5dac8a78d89dd95fd49532cda1e36
DIST deepin-wine_2.18-22~rc0_all.deb 96780 SHA256 5c8d503f96faceeb5fff713e6e985669c27dc0b1616441a9130f27dfd2a6d77f

16
app-emulation/deepin-wine/deepin-wine-2.18.18.ebuild
View File

@ -27,25 +27,37 @@ IUSE=""
DEPEND=""
RDEPEND="${DEPEND}
app-arch/p7zip
dev-db/unixODBC[abi_x86_32]
>=media-libs/alsa-lib-1.0.16[abi_x86_32]
>=media-libs/lcms-2.2[abi_x86_32]
>=net-nds/openldap-2.4.7[abi_x86_32]
>=media-sound/mpg123-1.13.7[abi_x86_32]
>=media-libs/openal-1.14[abi_x86_32]
>=net-libs/libpcap-0.9.8[abi_x86_32]
net-libs/gnutls[abi_x86_32]
net-print/cups[abi_x86_32]
media-sound/pulseaudio[abi_x86_32]
media-libs/glu[abi_x86_32]
media-libs/mesa[abi_x86_32]
media-libs/mesa[abi_x86_32,osmesa]
media-libs/freetype[abi_x86_32]
media-libs/libv4l[abi_x86_32]
media-libs/libpng[abi_x86_32]
media-libs/tiff[abi_x86_32]
media-sound/gsm[abi_x86_32]
dev-libs/udis86[abi_x86_32]
dev-libs/libxml2[abi_x86_32]
dev-libs/libxslt[abi_x86_32]
media-libs/fontconfig[abi_x86_32]
x11-libs/libXcursor[abi_x86_32]
x11-libs/libXrandr[abi_x86_32]
x11-libs/libXinerama[abi_x86_32]
x11-libs/libXcomposite[abi_x86_32]
sys-apps/dbus[abi_x86_32]
sys-devel/gettext[abi_x86_32]
virtual/jpeg[abi_x86_32]
virtual/opencl[abi_x86_32]
sys-libs/ncurses-compat:5[abi_x86_32]
virtual/libusb:1[abi_x86_32]
|| ( sys-libs/ncurses:5[abi_x86_32] sys-libs/ncurses-compat:5[abi_x86_32] )
sys-libs/zlib[abi_x86_32]"
S=${WORKDIR}

16
app-emulation/deepin-wine/deepin-wine-2.18.18_rc2.ebuild → app-emulation/deepin-wine/deepin-wine-2.18.22_rc0.ebuild
View File

@ -27,25 +27,37 @@ IUSE=""
DEPEND=""
RDEPEND="${DEPEND}
app-arch/p7zip
dev-db/unixODBC[abi_x86_32]
>=media-libs/alsa-lib-1.0.16[abi_x86_32]
>=media-libs/lcms-2.2[abi_x86_32]
>=net-nds/openldap-2.4.7[abi_x86_32]
>=media-sound/mpg123-1.13.7[abi_x86_32]
>=media-libs/openal-1.14[abi_x86_32]
>=net-libs/libpcap-0.9.8[abi_x86_32]
net-libs/gnutls[abi_x86_32]
net-print/cups[abi_x86_32]
media-sound/pulseaudio[abi_x86_32]
media-libs/glu[abi_x86_32]
media-libs/mesa[abi_x86_32]
media-libs/mesa[abi_x86_32,osmesa]
media-libs/freetype[abi_x86_32]
media-libs/libv4l[abi_x86_32]
media-libs/libpng[abi_x86_32]
media-libs/tiff[abi_x86_32]
media-sound/gsm[abi_x86_32]
dev-libs/udis86[abi_x86_32]
dev-libs/libxml2[abi_x86_32]
dev-libs/libxslt[abi_x86_32]
media-libs/fontconfig[abi_x86_32]
x11-libs/libXcursor[abi_x86_32]
x11-libs/libXrandr[abi_x86_32]
x11-libs/libXinerama[abi_x86_32]
x11-libs/libXcomposite[abi_x86_32]
sys-apps/dbus[abi_x86_32]
sys-devel/gettext[abi_x86_32]
virtual/jpeg[abi_x86_32]
virtual/opencl[abi_x86_32]
sys-libs/ncurses:5[abi_x86_32]
virtual/libusb:1[abi_x86_32]
|| ( sys-libs/ncurses:5[abi_x86_32] sys-libs/ncurses-compat:5[abi_x86_32] )
sys-libs/zlib[abi_x86_32]"
S=${WORKDIR}

3
dde-base/dde-file-manager/dde-file-manager-5.0.0.ebuild → dde-base/dde-file-manager/dde-file-manager-5.0.0-r1.ebuild
View File

@ -61,6 +61,9 @@ DEPEND="${RDEPEND}
dde-base/deepin-anything
dde-base/deepin-gettext-tools
"
PATCHES=(
"${FILESDIR}"/${P}-qt5.14.patch
)
src_prepare() {
sed -i "s|\ systemd_service||g" dde-file-manager-daemon/dde-file-manager-daemon.pro

22
dde-base/dde-file-manager/files/dde-file-manager-5.0.0-qt5.14.patch Normal file
View File

@ -0,0 +1,22 @@
diff --git a/dde-file-manager-lib/shutil/dsqlitehandle.h b/dde-file-manager-lib/shutil/dsqlitehandle.h
index ae7b5e94..ec0eed6e 100644
--- a/dde-file-manager-lib/shutil/dsqlitehandle.h
+++ b/dde-file-manager-lib/shutil/dsqlitehandle.h
@@ -21,7 +21,7 @@
#include <QtSql/QSqlDatabase>
-
+#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
namespace std
{
@@ -35,7 +35,7 @@ struct hash<QString>
};
}
-
+#endif
class DSqliteHandle : public QObject

1
dde-base/dde-qt5integration/dde-qt5integration-5.0.0-r1.ebuild → dde-base/dde-qt5integration/dde-qt5integration-5.0.0-r2.ebuild
View File

@ -44,6 +44,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${P}-qt5.13.patch
"${FILESDIR}"/${P}-qt5.14.patch
)
src_prepare() {

53
dde-base/dde-qt5integration/dde-qt5integration-5.0.0.ebuild
View File

@ -1,53 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
inherit qmake-utils
DESCRIPTION="DDE system integration plugin for Qt5"
HOMEPAGE="https://github.com/linuxdeepin/qt5integration"
MY_PN=${PN#*-}
MY_P=${MY_PN}-${PV}
if [[ ${PV} = *9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/linuxdeepin/${MY_PN}.git"
else
SRC_URI="https://github.com/linuxdeepin/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
S=${WORKDIR}/${MY_P}
fi
LICENSE="GPL-3"
SLOT="0"
IUSE=""
RDEPEND="
dev-libs/libqtxdg
dev-qt/qtcore:5=
dev-qt/qtgui:5
dev-qt/qtwidgets:5
dev-qt/qtdbus:5
dev-qt/qtx11extras:5
dev-qt/qtmultimedia:5[widgets]
dev-qt/qtsvg:5
media-libs/fontconfig
media-libs/freetype
dev-qt/qt5dxcb-plugin
dev-qt/qtstyleplugins:5
"
DEPEND="${RDEPEND}
dev-libs/glib:2
>=dde-base/dtkwidget-2.0.0:=
"
src_prepare() {
QT_SELECT=qt5 eqmake5 ${MY_PN}.pro
default
}
src_install() {
emake INSTALL_ROOT=${D} install
}

46
dde-base/dde-qt5integration/files/dde-qt5integration-5.0.0-qt5.14.patch Normal file
View File

@ -0,0 +1,46 @@
diff --git a/platformthemeplugin/qdeepintheme.cpp b/platformthemeplugin/qdeepintheme.cpp
index e98487b..45e90bc 100644
--- a/platformthemeplugin/qdeepintheme.cpp
+++ b/platformthemeplugin/qdeepintheme.cpp
@@ -571,10 +571,18 @@ static bool updateScreenScaleFactors(DThemeSettings *s, const QByteArray &value,
}
QHighDpiScaling::updateHighDpiScaling();
+#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
qDebug() << QHighDpiScaling::logicalDpi();
+#else
+ qDebug() << QHighDpiScaling::logicalDpi(QGuiApplication::primaryScreen());
+#endif
updateScaleLogcailDpi(s->scaleLogicalDpi());
+#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
qDebug() << QHighDpiScaling::logicalDpi();
+#else
+ qDebug() << QHighDpiScaling::logicalDpi(QGuiApplication::primaryScreen());
+#endif
return true;
}
--- a/platformthemeplugin/qdeepintheme.cpp 2019-12-19 17:45:47.396894045 +0800
+++ b/platformthemeplugin/qdeepintheme.cpp 2019-12-19 17:46:28.436136243 +0800
@@ -516,19 +516,7 @@
static bool updateScaleLogcailDpi(const QPair<qreal, qreal> &dpi)
{
bool ok = dpi.first >= 0 && dpi.second >= 0;
-
- if (dpi.first > 0) {
- QHighDpiScaling::m_logicalDpi.first = dpi.first;
- } else if (qIsNull(dpi.first)) {
- QHighDpiScaling::m_logicalDpi.first = qGuiApp->primaryScreen()->handle()->logicalDpi().first;
- }
-
- if (dpi.second > 0) {
- QHighDpiScaling::m_logicalDpi.second = dpi.second;
- } else if (qIsNull(dpi.second)) {
- QHighDpiScaling::m_logicalDpi.second = qGuiApp->primaryScreen()->handle()->logicalDpi().second;
- }
-
+ QHighDpiScaling::m_usePixelDensity = false;
return ok;
}

33
dde-base/deepin-desktop-base/deepin-desktop-base-2019.06.19.ebuild Normal file
View File

@ -0,0 +1,33 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
DESCRIPTION="Base components for Deepin Desktop"
HOMEPAGE="https://github.com/linuxdeepin/deepin-desktop-base"
SRC_URI="https://github.com/linuxdeepin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="dde-base/deepin-wallpapers
dde-base/deepin-icon-theme
dde-base/deepin-gtk-theme
dde-base/deepin-sound-theme"
src_prepare() {
LIBDIR=$(get_libdir)
sed -i "s|/usr/lib/|/usr/${LIBDIR}/|g" Makefile
default_src_prepare
}
src_install() {
emake DESTDIR=${D} install
rm -r ${D}/etc/lsb-release ${D}/etc/systemd ${D}/usr/share/python-apt
dosym /usr/$(get_libdir)/deepin/desktop-version /etc/deepin-version
}

25
dde-base/deepin-desktop-schemas/deepin-desktop-schemas-3.13.8.ebuild Normal file
View File

@ -0,0 +1,25 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=7
inherit gnome2-utils
DESCRIPTION="GSettings deepin desktop-wide schemas"
HOMEPAGE="https://github.com/linuxdeepin/deepin-desktop-schemas"
SRC_URI="https://github.com/linuxdeepin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="gnome-base/dconf"
#src_compile() {
# emake ARCH=x86
#}
pkg_preinst() { gnome2_schemas_savelist;}
pkg_postinst() { gnome2_schemas_update; }
pkg_postrm() { gnome2_schemas_update; }

1
dde-base/deepin-desktop-schemas/deepin-desktop-schemas-3.13.9.ebuild
View File

@ -3,7 +3,6 @@
# $Id$
EAPI=7
inherit gnome2-utils
DESCRIPTION="GSettings deepin desktop-wide schemas"

6
dde-extra/deepin-system-monitor/deepin-system-monitor-5.0.0.ebuild → dde-extra/deepin-system-monitor/deepin-system-monitor-5.0.0-r1.ebuild
View File

@ -42,8 +42,12 @@ DEPEND="${RDEPEND}
dde-base/dtkwm:=
"
PATCHES=(
"${FILESDIR}"/${P}-qt5.14.patch
)
src_prepare() {
eapply_user
default
QT_SELECT=qt5 eqmake5 PREFIX=/usr ${PN}.pro
}

19
dde-extra/deepin-system-monitor/files/deepin-system-monitor-5.0.0-qt5.14.patch Normal file
View File

@ -0,0 +1,19 @@
diff --git a/src/hashqstring.h b/src/hashqstring.h
index 20522b3..07af7c3 100644
--- a/src/hashqstring.h
+++ b/src/hashqstring.h
@@ -27,6 +27,7 @@
#include <QString>
#include <string>
+#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
namespace std {
template<> struct hash<QString>
{
@@ -36,5 +37,6 @@ namespace std {
}
};
}
+#endif
#endif // HASHQSTRING_H

7
dev-qt/qcef/qcef-1.1.7-r1.ebuild
View File

@ -49,15 +49,8 @@ RDEPEND="dev-qt/qtwebchannel:5
DEPEND="${RDEPEND}
virtual/pkgconfig
"
src_prepare() {
sed -i \
-e '109c dialog\-\>setOption(QFileDialog\:\:DontConfirmOverwrite, \!\(mode \& FILE_DIALOG_OVERWRITEPROMPT_FLAG\)\);' \
src/core/qcef_dialog_handler.cpp || die
cmake-utils_src_prepare
}
src_configure() {
local mycmakeargs=(
-DQCEF_INSTALL_PATH=/usr/$(get_libdir)
)

3
dev-qt/qtxcb-private-headers/Manifest
View File

@ -1,3 +1,2 @@
DIST qtbase-everywhere-src-5.12.3.tar.xz 48382148 SHA256 fddfd8852ef7503febeed67b876d1425160869ae2b1ae8e10b3fb0fedc5fe701
DIST qtbase-everywhere-src-5.12.5.tar.xz 48463288 SHA256 fc8abffbbda9da3e593d8d62b56bc17dbaab13ff71b72915ddda11dabde4d625
DIST qtbase-everywhere-src-5.13.2.tar.xz 48735704 SHA256 26b6b686d66a7ad28eaca349e55e2894e5a735f3831e45f2049e93b1daa92121
DIST qtbase-everywhere-src-5.14.1.tar.xz 49828188 SHA256 d9d423a6e7bcf1055c0372fc029f14a6fe67dd62c67b83095cde68b60b762cf7

39
dev-qt/qtxcb-private-headers/qtxcb-private-headers-5.12.3.ebuild
View File

@ -1,39 +0,0 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
QT5_MODULE="qtbase"
inherit qt5-build
DESCRIPTION="The Private Headers for the Qt5 Xcb"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-fbsd"
fi
# TODO: linuxfb
IUSE=""
RDEPEND="
~dev-qt/qtgui-${PV}
"
DEPEND="${RDEPEND}"
QT5_TARGET_SUBDIRS=(
src/plugins/platforms/xcb
)
#QT5_GENTOO_PRIVATE_CONFIG=(
# :gui
#)
src_compile() { :; }
src_test() { :; }
src_install() {
insinto ${QT5_HEADERDIR}/QtXcb/${PV}/QtXcb/private/
doins src/plugins/platforms/xcb/*.h
}

2
dev-qt/qtxcb-private-headers/qtxcb-private-headers-5.13.2.ebuild
View File

@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EAPI=7
QT5_MODULE="qtbase"
inherit qt5-build

2
dev-qt/qtxcb-private-headers/qtxcb-private-headers-5.12.5.ebuild → dev-qt/qtxcb-private-headers/qtxcb-private-headers-5.14.1.ebuild
View File

@ -1,7 +1,7 @@
# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EAPI=7
QT5_MODULE="qtbase"
inherit qt5-build

2
media-gfx/deepin-screen-recorder/deepin-screen-recorder-5.0.0.ebuild → media-gfx/deepin-screen-recorder/deepin-screen-recorder-5.0.0-r1.ebuild
View File

@ -30,7 +30,7 @@ RDEPEND="dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
x11-libs/libXtst
gif? ( media-gfx/byzanz )
mp4? ( media-video/ffmpeg[xcb,x264] )
mp4? ( media-video/ffmpeg[x264] )
"
DEPEND="${RDEPEND}

2
media-gfx/deepin-screenshot/deepin-screenshot-4.2.2.ebuild
View File

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=7
EAPI="5"
inherit fdo-mime eutils cmake-utils

2
media-gfx/deepin-screenshot/deepin-screenshot-5.0.0.ebuild
View File

@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=7
EAPI="5"
inherit fdo-mime eutils cmake-utils

1
net-im/deepin-wine-QQ/Manifest
View File

@ -1 +1,2 @@
DIST deepin.com.qq.im_8.9.19983deepin23_i386.deb 92059660 SHA256 9f4e15a9fc934143713e2912562f357186edeb38e21d26b598475c9342343185
DIST deepin.com.qq.im_9.1.8deepin0_i386.deb 85878754 SHA256 50f49d77b2258ede558d2629b7b5a18660166876c318358bf6088002adc3d779

16
net-im/deepin-wine-wechat-work/deepin-wine-wechat-work-2.4.16.1347.0.ebuild → net-im/deepin-wine-QQ/deepin-wine-QQ-9.1.8.0.ebuild
View File

@ -5,14 +5,14 @@ EAPI=6
inherit unpacker versionator
DESCRIPTION="Tencent WeChat Work for Linux by Deepin"
DESCRIPTION="Tencent QQ for Linux by Deepin"
HOMEPAGE="https://www.deepin.org"
COMMON_URI="http://packages.deepin.com/deepin/pool/non-free/d"
MY_PN="deepin.com.weixin.work"
MY_PV=$(replace_version_separator 4 'deepin' )
QQPN="deepin.com.qq.im"
QQ_PV=$(replace_version_separator 3 'deepin' )
SRC_URI="${COMMON_URI}/${MY_PN}/${MY_PN}_${MY_PV}_i386.deb"
SRC_URI="${COMMON_URI}/${QQPN}/${QQPN}_${QQ_PV}_i386.deb"
LICENSE="Tencent"
SLOT="0"
@ -21,15 +21,17 @@ IUSE=""
DEPEND=""
RDEPEND="${DEPEND}
x11-apps/xwininfo
app-emulation/deepin-wine
app-emulation/deepin-wine-helper"
S=${WORKDIR}
src_install() {
mv ${S}/usr/local/share ${S}/usr/share
rm -r ${S}/usr/local
insinto /
doins -r opt usr
fperms 755 /opt/deepinwine/apps/Deepin-WXWork/run.sh
fperms 755 /opt/deepinwine/apps/Deepin-QQ/run.sh
}

3
net-im/deepin-wine-wechat-work/Manifest
View File

@ -1,2 +1 @@
DIST deepin.com.weixin.work_2.4.16.1347deepin0_i386.deb 54488782 SHA512 9ae72fac8e64bf5019de68fe27286aa76843a7ec2fac4e21ee9a694857965fc38bf76304137abee99ac5006b74c1dfc4783eebfab2e1f8789c5ddce3f26754a9
DIST deepin.com.weixin.work_2.8.10.2010deepin0_i386.deb 72119154 SHA512 026a2842f93a06c1b9618c68d4810d54f8fc7af1f514ef9556f59349040d466b26176e07ded7bbc46b9f2d56125233a7e5486eccbb4bdb7a20796e7efdedf89c
DIST deepin.com.weixin.work_2.8.10.2010deepin0_i386.deb 72119154 SHA256 f91fdd973320e09a5452fcd3f5ce3a5d3f14f5936c63cce957e41419f7d9849b

4
net-im/deepin-wine-wechat/Manifest
View File

@ -1,2 +1,2 @@
DIST deepin.com.wechat_2.6.2.31deepin0_i386.deb 36172778 SHA512 a910b749f8eeba99bbe271ebf3011477137917f2d8a47b33d6ed622a49b42974333f838ffa60026b5479c3c1dd1690f553118f822ce615ab3bfe894887d3e60f
DIST deepin.com.wechat_2.6.8.65deepin0_i386.deb 42635782 SHA512 442ffd9133981fc3b82b226624d4d58d890172b21b16fc21cb948210d25ffa519b5a9cd0036bdca2b58a1a3e6ce978d7b9cc6432d2e4101a58bd75518c74d445
DIST deepin.com.wechat_2.6.2.31deepin0_i386.deb 36172778 SHA256 c302b39fb801448cdebb54f8bc824e336f667c0f177e00792f652ffb4cca67b3
DIST deepin.com.wechat_2.6.8.65deepin0_i386.deb 42635782 SHA256 c7fe7925340b2c20c96a7f27766bb838e401f2813b67c8458aa07976ad5296e8

2
x11-libs/gsettings-qt/gsettings-qt-0.2.ebuild
View File

@ -12,7 +12,7 @@ SRC_URI="https://github.com/linuxdeepin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="GPL-3"
SLOT="0"
#KEYWORDS="~amd64 ~x86"
KEYWORDS="~amd64 ~x86"
IUSE="test"
DEPEND="dev-libs/glib:2

4
x11-wm/deepin-mutter/deepin-mutter-3.20.38-r1.ebuild → x11-wm/deepin-mutter/deepin-mutter-3.20.38-r2.ebuild
View File

@ -79,6 +79,10 @@ RDEPEND="${COMMON_DEPEND}
!x11-misc/expocity
"
PATCHES=(
"${FILESDIR}/${PN}-giscan.patch"
)
src_configure() {
if use elogind; then
sed -i "s|libsystemd|libelogind|g" configure.ac

117
x11-wm/deepin-mutter/files/deepin-mutter-giscan.patch Normal file
View File

@ -0,0 +1,117 @@
diff --git a/src/core/display.c b/src/core/display.c
index 3232424..de85605 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -1183,7 +1183,7 @@ meta_get_display (void)
static inline gboolean
grab_op_is_window (MetaGrabOp op)
{
- return GRAB_OP_GET_BASE_TYPE (op) == META_GRAB_OP_WINDOW_BASE;
+ return META_GRAB_OP_GET_BASE_TYPE (op) == META_GRAB_OP_WINDOW_BASE;
}
gboolean
@@ -1783,7 +1783,7 @@ get_first_freefloating_window (MetaWindow *window)
static MetaEventRoute
get_event_route_from_grab_op (MetaGrabOp op)
{
- switch (GRAB_OP_GET_BASE_TYPE (op))
+ switch (META_GRAB_OP_GET_BASE_TYPE (op))
{
case META_GRAB_OP_NONE:
/* begin_grab_op shouldn't be called with META_GRAB_OP_NONE. */
diff --git a/src/core/screen.c b/src/core/screen.c
index 17582ad..66cfd38 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -1740,7 +1740,7 @@ meta_screen_get_monitor_for_point (MetaScreen *screen,
for (i = 0; i < screen->n_monitor_infos; i++)
{
- if (POINT_IN_RECT (x, y, screen->monitor_infos[i].rect))
+ if (META_POINT_IN_RECT (x, y, screen->monitor_infos[i].rect))
return &screen->monitor_infos[i];
}
diff --git a/src/core/stack.c b/src/core/stack.c
index adccae0..5987c08 100644
--- a/src/core/stack.c
+++ b/src/core/stack.c
@@ -1222,7 +1222,7 @@ window_contains_point (MetaWindow *window,
meta_window_get_frame_rect (window, &rect);
- return POINT_IN_RECT (root_x, root_y, rect);
+ return META_POINT_IN_RECT (root_x, root_y, rect);
}
static MetaWindow*
diff --git a/src/meta/common.h b/src/meta/common.h
index 71ac256..7f2ca05 100644
--- a/src/meta/common.h
+++ b/src/meta/common.h
@@ -148,7 +148,7 @@ enum
_WGO_N = META_GRAB_OP_WINDOW_DIR_NORTH,
};
-#define GRAB_OP_GET_BASE_TYPE(op) (op & 0x00FF)
+#define META_GRAB_OP_GET_BASE_TYPE(op) (op & 0x00FF)
typedef enum
{
@@ -508,7 +508,7 @@ void meta_frame_borders_clear (MetaFrameBorders *self);
/************************************************************/
-#define POINT_IN_RECT(xcoord, ycoord, rect) \
+#define META_POINT_IN_RECT(xcoord, ycoord, rect) \
((xcoord) >= (rect).x && \
(xcoord) < ((rect).x + (rect).width) && \
(ycoord) >= (rect).y && \
diff --git a/src/ui/frames.c b/src/ui/frames.c
index e6e523a..3202ddc 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -1621,19 +1621,19 @@ get_control (MetaUIFrame *frame, int root_x, int root_y)
meta_ui_frame_calc_geometry (frame, &fgeom);
get_client_rect (&fgeom, &client);
- if (POINT_IN_RECT (x, y, client))
+ if (META_POINT_IN_RECT (x, y, client))
return META_FRAME_CONTROL_CLIENT_AREA;
- if (POINT_IN_RECT (x, y, fgeom.close_rect.clickable))
+ if (META_POINT_IN_RECT (x, y, fgeom.close_rect.clickable))
return META_FRAME_CONTROL_DELETE;
- if (POINT_IN_RECT (x, y, fgeom.min_rect.clickable))
+ if (META_POINT_IN_RECT (x, y, fgeom.min_rect.clickable))
return META_FRAME_CONTROL_MINIMIZE;
- if (POINT_IN_RECT (x, y, fgeom.menu_rect.clickable))
+ if (META_POINT_IN_RECT (x, y, fgeom.menu_rect.clickable))
return META_FRAME_CONTROL_MENU;
- if (POINT_IN_RECT (x, y, fgeom.appmenu_rect.clickable))
+ if (META_POINT_IN_RECT (x, y, fgeom.appmenu_rect.clickable))
return META_FRAME_CONTROL_APPMENU;
flags = meta_frame_get_flags (frame->meta_window->frame);
@@ -1645,7 +1645,7 @@ get_control (MetaUIFrame *frame, int root_x, int root_y)
(flags & META_FRAME_ALLOWS_TILED_RESIZE_LEFT) != 0 ||
(flags & META_FRAME_ALLOWS_TILED_RESIZE_RIGHT) != 0;
- if (POINT_IN_RECT (x, y, fgeom.title_rect))
+ if (META_POINT_IN_RECT (x, y, fgeom.title_rect))
{
if (has_vert && y <= TOP_RESIZE_HEIGHT && has_north_resize)
return META_FRAME_CONTROL_RESIZE_N;
@@ -1653,7 +1653,7 @@ get_control (MetaUIFrame *frame, int root_x, int root_y)
return META_FRAME_CONTROL_TITLE;
}
- if (POINT_IN_RECT (x, y, fgeom.max_rect.clickable))
+ if (META_POINT_IN_RECT (x, y, fgeom.max_rect.clickable))
{
if (flags & META_FRAME_MAXIMIZED)
return META_FRAME_CONTROL_UNMAXIMIZE;