[notify] qt4: dropped orphaned and broken port
This commit is contained in:
Fredrik Rinnestam
parent
17b31d53ee
commit
6e51b71549
3575
qt4/.footprint
3575
qt4/.footprint
File diff suppressed because it is too large
Load Diff
|
|
@ -1,10 +0,0 @@
|
|||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/VDO9hpMnO/IH8sa9Db9L3/0HM/kSCBSy3TEQuRqfe7NIRkYj/liuiN28lDwIsrM4m/cY9KnEV0fHEmhKnvZiwU=
|
||||
SHA256 (Pkgfile) = 6d65e215a66ad70401efcd8ec97ab77a8f086ad927f97e605a830713c867a855
|
||||
SHA256 (.footprint) = 254ff8e725593951bbef43fd94bf7755726daedbacdf7fdc6df9f82d4b50e4c9
|
||||
SHA256 (qt-everywhere-opensource-src-4.8.7.tar.gz) = e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0
|
||||
SHA256 (qt-everywhere-opensource-src-4.8.7-gcc6.patch) = 57b67e6c860f11a876aaf93111728d67842dccaa23cb919826038b4fd88fd6ca
|
||||
SHA256 (0001-Fix-exclusion-of-anonymous-ciphers.patch) = 932664d39436b33f2f763866dbd45d6dfffefd8c07d420a19fc2c75f8d91f575
|
||||
SHA256 (fix_assistant_segfault_QTBUG-25324.patch) = da01fcf0ed5c519a1d52f0142408c5fcc299183736c9cb1c216f82e0dbac172f
|
||||
SHA256 (fix-moc-parsing-with-glibc-2.25.patch) = 84c42fc1b756b18dafd52b61baef5340f39e02b6acb0fc90419928849b5b2268
|
||||
SHA256 (fix-medium-font.diff) = 7c909f2cf38897ae8537e0f37d2d9d0d97f37d1d7f2910115222004f49bb2d27
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
From 479e84dcbd0d7f1333105c495d7931f1bef3e63b Mon Sep 17 00:00:00 2001
|
||||
From: "Richard J. Moore" <rich@kde.org>
|
||||
Date: Sat, 18 Apr 2015 12:44:30 +0100
|
||||
Subject: [PATCH] Fix exclusion of anonymous ciphers.
|
||||
|
||||
Qt attempted to exclude anonymous ciphers since they offer no MITM
|
||||
protection, but missed export ADH ciphers and AECDH from the exclude
|
||||
list.
|
||||
|
||||
Change-Id: Icdfa9b31643a0e9927010885c7c1d02c42460d79
|
||||
Reviewed-by: Peter Hartmann <peter-qt@hartmann.tk>
|
||||
---
|
||||
src/network/ssl/qsslsocket_openssl.cpp | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
|
||||
index ce98494..00b2b9e 100644
|
||||
--- a/src/network/ssl/qsslsocket_openssl.cpp
|
||||
+++ b/src/network/ssl/qsslsocket_openssl.cpp
|
||||
@@ -662,7 +662,10 @@ void QSslSocketPrivate::resetDefaultCiphers()
|
||||
if (cipher->valid) {
|
||||
QSslCipher ciph = QSslSocketBackendPrivate::QSslCipher_from_SSL_CIPHER(cipher);
|
||||
if (!ciph.isNull()) {
|
||||
- if (!ciph.name().toLower().startsWith(QLatin1String("adh")))
|
||||
+ // Unconditionally exclude ADH and AECDH ciphers since they offer no MITM protection
|
||||
+ if (!ciph.name().toLower().startsWith(QLatin1String("adh")) &&
|
||||
+ !ciph.name().toLower().startsWith(QLatin1String("exp-adh")) &&
|
||||
+ !ciph.name().toLower().startsWith(QLatin1String("aecdh")))
|
||||
ciphers << ciph;
|
||||
}
|
||||
}
|
||||
--
|
||||
2.6.2
|
||||
72
qt4/Pkgfile
72
qt4/Pkgfile
|
|
@ -1,72 +0,0 @@
|
|||
# Description: Qt Free Edition
|
||||
# URL: http://www.trolltech.com
|
||||
# Maintainer: Orphaned port
|
||||
# Depends on: fontconfig glib libmng mesa3d xorg-libxcursor xorg-libxi xorg-libxinerama xorg-libxrandr xorg-libsm dbus
|
||||
|
||||
name=qt4
|
||||
version=4.8.7
|
||||
release=4
|
||||
source=(https://download.qt.io/archive/qt/${version:0:3}/$version/qt-everywhere-opensource-src-$version.tar.gz
|
||||
qt-everywhere-opensource-src-4.8.7-gcc6.patch
|
||||
0001-Fix-exclusion-of-anonymous-ciphers.patch
|
||||
fix_assistant_segfault_QTBUG-25324.patch
|
||||
fix-moc-parsing-with-glibc-2.25.patch
|
||||
fix-medium-font.diff)
|
||||
|
||||
build () {
|
||||
cd qt-everywhere-opensource-src-$version
|
||||
|
||||
sed -i 's|X11R6/||g' mkspecs/*/*.conf
|
||||
|
||||
sed -i "s|-O2|$CXXFLAGS|" mkspecs/common/g++-unix.conf
|
||||
sed -i "s|INSTALLS += translations||" projects.pro
|
||||
sed -i 's|"$COMPILER" -c|$COMPILER -c|' config.tests/unix/fvisibility.test
|
||||
|
||||
patch -p1 -i $SRC/0001-Fix-exclusion-of-anonymous-ciphers.patch
|
||||
patch -p1 -i $SRC/fix_assistant_segfault_QTBUG-25324.patch
|
||||
patch -p1 -i $SRC/fix-moc-parsing-with-glibc-2.25.patch
|
||||
patch -p1 -i $SRC/fix-medium-font.diff
|
||||
patch -p1 -i $SRC/qt-everywhere-opensource-src-4.8.7-gcc6.patch
|
||||
export CXXFLAGS="$CXXFLAGS -std=gnu++98 -Wno-deprecated"
|
||||
|
||||
./configure -prefix /usr/share/qt4 \
|
||||
-bindir /usr/share/qt4/bin \
|
||||
-headerdir /usr/share/qt4/include \
|
||||
-libdir /usr/share/qt4/lib \
|
||||
-plugindir /usr/share/qt4/plugins \
|
||||
-platform linux-g++ -release -shared -sm \
|
||||
-nis -verbose -system-zlib \
|
||||
-system-lib{png,jpeg} -xmlpatterns \
|
||||
-no-{cups,fast,nas-sound,phonon,icu} \
|
||||
-x{cursor,inerama,kb,randr,render} \
|
||||
-nomake demos -nomake examples -nomake docs \
|
||||
-no-separate-debug-info -opensource -confirm-license
|
||||
|
||||
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/lib" make
|
||||
make INSTALL_ROOT=$PKG install
|
||||
|
||||
rm -rf `find $PKG/usr/share/qt4/mkspecs/* | \
|
||||
grep -v linux-g++ | grep -v common | grep -v pri | grep -v features`
|
||||
rm -f $PKG/usr/share/qt4/mkspecs/linux-g++/linux-g++
|
||||
rm -rf $PKG/usr/share/qt4/mkspecs/features/{mac,win32}
|
||||
rm -rf $PKG/usr/share/qt4/mkspecs/common/mac*
|
||||
rm -rf $PKG/usr/share/qt4/phrasebooks
|
||||
|
||||
install -d $PKG/{etc/ld.so.conf.d,usr/{bin,lib,include}}
|
||||
echo "/usr/share/qt4/lib" > $PKG/etc/ld.so.conf.d/qt4.conf
|
||||
|
||||
ln -s ../share/qt4/include $PKG/usr/include/qt4
|
||||
ln -s ../share/qt4/lib $PKG/usr/lib/qt4
|
||||
ln -s linux-g++ $PKG/usr/share/qt4/mkspecs/default
|
||||
|
||||
mv $PKG/usr/share/qt4/lib/pkgconfig $PKG/usr/lib
|
||||
|
||||
sed -i -e "s|-L$SRC/qt-everywhere-opensource-src-$version/lib ||g" \
|
||||
-e "s|$SRC/qt-everywhere-opensource-src-$version/bin|/usr/share/qt4/bin|g" \
|
||||
$PKG/usr/lib/pkgconfig/*.pc
|
||||
|
||||
for f in assistant designer linguist lrelease lupdate moc qmake qtconfig uic \
|
||||
pixeltool qdbus qdbuscpp2xml qdbusxml2cpp qt3to4 rcc uic3; do
|
||||
ln -s ../share/qt4/bin/$f $PKG/usr/bin/$f
|
||||
done
|
||||
}
|
||||
|
|
@ -1,105 +0,0 @@
|
|||
From: Ken VanDine <ken.vandine@canonical.com>
|
||||
Description: Default to regular font in X11
|
||||
Default to Regular/Normal instead of Medium in QFontDatabase for X11.
|
||||
.
|
||||
Tweak the buckets so that Medium has preference over Bold when DemiBold
|
||||
is requested.
|
||||
Bug-Ubuntu: https://launchpad.net/bugs/744812
|
||||
Bug: https://bugreports.qt-project.org/browse/QTBUG-27301
|
||||
Forwarded: https://codereview.qt-project.org/#change,35591
|
||||
Author: Michał Sawicz<michal.sawicz@canonical.com>
|
||||
|
||||
--- a/src/gui/text/qfontdatabase_x11.cpp
|
||||
+++ b/src/gui/text/qfontdatabase_x11.cpp
|
||||
@@ -729,10 +729,17 @@
|
||||
static int getFCWeight(int fc_weight)
|
||||
{
|
||||
int qtweight = QFont::Black;
|
||||
- if (fc_weight <= (FC_WEIGHT_LIGHT + FC_WEIGHT_MEDIUM) / 2)
|
||||
+ if (fc_weight <= (FC_WEIGHT_LIGHT + FC_WEIGHT_REGULAR) / 2)
|
||||
qtweight = QFont::Light;
|
||||
- else if (fc_weight <= (FC_WEIGHT_MEDIUM + FC_WEIGHT_DEMIBOLD) / 2)
|
||||
+ else if (fc_weight <= (FC_WEIGHT_REGULAR + FC_WEIGHT_MEDIUM) / 2)
|
||||
qtweight = QFont::Normal;
|
||||
+#if 0
|
||||
+ // FIXME: Uncomment this when it's safe to expand the Enum to include ::Medium
|
||||
+ // Will map Medium to DemiBold via fallthrough for the moment,
|
||||
+ // but avoids API/ABI break
|
||||
+ else if (fc_weight <= (FC_WEIGHT_MEDIUM + FC_WEIGHT_DEMIBOLD) / 2)
|
||||
+ qtweight = QFont::Medium;
|
||||
+#endif
|
||||
else if (fc_weight <= (FC_WEIGHT_DEMIBOLD + FC_WEIGHT_BOLD) / 2)
|
||||
qtweight = QFont::DemiBold;
|
||||
else if (fc_weight <= (FC_WEIGHT_BOLD + FC_WEIGHT_BLACK) / 2)
|
||||
@@ -772,9 +779,13 @@
|
||||
fontDef.styleHint
|
||||
*/
|
||||
|
||||
+ // Default to Regular and thus to the common case. Previous
|
||||
+ // versions of Qt requested Medium as default. This is fine until
|
||||
+ // a Medium weight is actually provided by a font, and so gets
|
||||
+ // promoted to bold fallthrough.
|
||||
int weight;
|
||||
if (FcPatternGetInteger(pattern, FC_WEIGHT, 0, &weight) != FcResultMatch)
|
||||
- weight = FC_WEIGHT_MEDIUM;
|
||||
+ weight = FC_WEIGHT_REGULAR;
|
||||
fontDef.weight = getFCWeight(weight);
|
||||
|
||||
int slant;
|
||||
@@ -1066,16 +1077,19 @@
|
||||
// capitalize(value);
|
||||
familyName = QString::fromUtf8((const char *)value);
|
||||
slant_value = FC_SLANT_ROMAN;
|
||||
- weight_value = FC_WEIGHT_MEDIUM;
|
||||
+ weight_value = FC_WEIGHT_REGULAR;
|
||||
spacing_value = FC_PROPORTIONAL;
|
||||
file_value = 0;
|
||||
index_value = 0;
|
||||
scalable = FcTrue;
|
||||
|
||||
+ // Fallthroughs in case a match was not found. In previous
|
||||
+ // versions of Qt, Medium was requested from FontConfig,
|
||||
+ // leading to a promotion from Medium to Bold.
|
||||
if (FcPatternGetInteger (fonts->fonts[i], FC_SLANT, 0, &slant_value) != FcResultMatch)
|
||||
slant_value = FC_SLANT_ROMAN;
|
||||
if (FcPatternGetInteger (fonts->fonts[i], FC_WEIGHT, 0, &weight_value) != FcResultMatch)
|
||||
- weight_value = FC_WEIGHT_MEDIUM;
|
||||
+ weight_value = FC_WEIGHT_REGULAR;
|
||||
if (FcPatternGetInteger (fonts->fonts[i], FC_SPACING, 0, &spacing_value) != FcResultMatch)
|
||||
spacing_value = FC_PROPORTIONAL;
|
||||
if (FcPatternGetString (fonts->fonts[i], FC_FILE, 0, &file_value) != FcResultMatch)
|
||||
@@ -1487,14 +1501,32 @@
|
||||
}
|
||||
|
||||
int weight_value = FC_WEIGHT_BLACK;
|
||||
+ // Default and request Regular font weight if none specified
|
||||
+ // Previous versions of Qt default to requesting Medium, even
|
||||
+ // though this weight does not typically exist.
|
||||
if (request.weight == 0)
|
||||
- weight_value = FC_WEIGHT_MEDIUM;
|
||||
+ weight_value = FC_WEIGHT_REGULAR;
|
||||
else if (request.weight < (QFont::Light + QFont::Normal) / 2)
|
||||
weight_value = FC_WEIGHT_LIGHT;
|
||||
- else if (request.weight < (QFont::Normal + QFont::DemiBold) / 2)
|
||||
+#if 0
|
||||
+ // FIXME: Avoid ABI Break; active this full codepath when
|
||||
+ // QFont::Medium enum is available in the future
|
||||
+ else if (request.weight < (QFont::Normal + QFont::Medium) / 2)
|
||||
+ weight_value = FC_WEIGHT_REGULAR;
|
||||
+ else if (request.weight < (QFont::Medium + QFont::DemiBold) / 2)
|
||||
weight_value = FC_WEIGHT_MEDIUM;
|
||||
else if (request.weight < (QFont::DemiBold + QFont::Bold) / 2)
|
||||
weight_value = FC_WEIGHT_DEMIBOLD;
|
||||
+#else
|
||||
+ // For the moment This may still not full-circle correctly; via
|
||||
+ // Medium->DemiBold->Bold promotion. However It's hard to do much
|
||||
+ // about this without an ABI/API tweak to include the fuller set
|
||||
+ // of standard TTF/CSS/FontConfig weights.
|
||||
+ else if (request.weight < (QFont::Normal + QFont::DemiBold) / 2)
|
||||
+ weight_value = FC_WEIGHT_REGULAR;
|
||||
+ else if (request.weight < (QFont::DemiBold + QFont::Bold) / 2)
|
||||
+ weight_value = (FC_WEIGHT_MEDIUM + FC_WEIGHT_DEMIBOLD) / 2;
|
||||
+#endif
|
||||
else if (request.weight < (QFont::Bold + QFont::Black) / 2)
|
||||
weight_value = FC_WEIGHT_BOLD;
|
||||
FcPatternDel(pattern, FC_WEIGHT);
|
||||
|
|
@ -1,49 +0,0 @@
|
|||
Fixes moc parsing of (#__VA_ARGS__) expressions
|
||||
|
||||
glibc 2.25 introduced code like the following in
|
||||
/usr/include/sys/sysmacros.h:
|
||||
|
||||
#define __SYSMACROS_DM(symbol) __SYSMACROS_DM1 \
|
||||
(In the GNU C Library, symbol is defined\n\
|
||||
by <sys/sysmacros.h>. For historical compatibility, it is\n\
|
||||
currently defined by <sys/types.h> as well, but we plan to\n\
|
||||
remove this soon. To use #symbol, include <sys/sysmacros.h>\n\
|
||||
directly. If you did not intend to use a system-defined macro\n\
|
||||
#symbol, you should undefine it after including <sys/types.h>.)
|
||||
|
||||
(where __SYSMACROS_DM1 is defined as:
|
||||
#define __SYSMACROS_DM1(...) __glibc_macro_warning (#__VA_ARGS__)
|
||||
)
|
||||
|
||||
when parsing that with moc, it gives the following parse error:
|
||||
/usr/include/glib-2.0/gobject/gtype.h:52: Parse error at "defined"
|
||||
|
||||
This patch fixes this, so it ignores arguments passed to
|
||||
(#__VA_ARGS__) since they're supposed to be strings anyway.
|
||||
|
||||
Index: qt-everywhere-opensource-src-4.8.7/src/tools/moc/preprocessor.cpp
|
||||
===================================================================
|
||||
--- qt-everywhere-opensource-src-4.8.7.orig/src/tools/moc/preprocessor.cpp
|
||||
+++ qt-everywhere-opensource-src-4.8.7/src/tools/moc/preprocessor.cpp
|
||||
@@ -535,6 +535,21 @@ void Preprocessor::substituteUntilNewlin
|
||||
MacroName macro = symbol();
|
||||
if (macros.contains(macro) && !safeset.contains(macro)) {
|
||||
substituteMacro(macro, substituted, safeset);
|
||||
+ if (substituted.count()>4)
|
||||
+ {
|
||||
+ int i=substituted.count()-4;
|
||||
+ if (substituted.at(i).lexem()=="("
|
||||
+ && substituted.at(i+1).lexem()=="#"
|
||||
+ && substituted.at(i+2).lexem()=="__VA_ARGS__"
|
||||
+ && substituted.at(i+3).lexem()==")")
|
||||
+ {
|
||||
+ // Let's ignore the following expression, since it'll considered a string, and so, it's better not to parse it.
|
||||
+ if (test(PP_LPAREN)) {
|
||||
+ while (!test(PP_RPAREN)) next();
|
||||
+ }
|
||||
+
|
||||
+ }
|
||||
+ }
|
||||
continue;
|
||||
}
|
||||
} else if (token == PP_DEFINED) {
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
Index: qt-everywhere-opensource-src-4.8.3/tools/assistant/tools/assistant/mainwindow.cpp
|
||||
===================================================================
|
||||
--- qt-everywhere-opensource-src-4.8.3.orig/tools/assistant/tools/assistant/mainwindow.cpp
|
||||
+++ qt-everywhere-opensource-src-4.8.3/tools/assistant/tools/assistant/mainwindow.cpp
|
||||
@@ -945,8 +945,7 @@ void MainWindow::updateApplicationFont()
|
||||
if (helpEngine.usesAppFont())
|
||||
font = helpEngine.appFont();
|
||||
|
||||
- const QWidgetList &widgets = qApp->allWidgets();
|
||||
- foreach (QWidget* widget, widgets)
|
||||
+ foreach (QWidget* widget, QApplication::allWidgets())
|
||||
widget->setFont(font);
|
||||
}
|
||||
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
diff -up qt-everywhere-opensource-src-4.8.7/configure.gcc6 qt-everywhere-opensource-src-4.8.7/configure
|
||||
--- qt-everywhere-opensource-src-4.8.7/configure.gcc6 2016-04-15 07:04:19.430268222 -0500
|
||||
+++ qt-everywhere-opensource-src-4.8.7/configure 2016-04-15 07:05:22.157568689 -0500
|
||||
@@ -7744,7 +7744,7 @@ case "$XPLATFORM" in
|
||||
*-g++*)
|
||||
# Check gcc's version
|
||||
case "$(${QMAKE_CONF_COMPILER} -dumpversion)" in
|
||||
- 5*|4*|3.4*)
|
||||
+ 8*|7*|6*|5*|4*|3.4*)
|
||||
;;
|
||||
3.3*)
|
||||
canBuildWebKit="no"
|
||||
@@ -8060,7 +8060,7 @@ g++*)
|
||||
3.*)
|
||||
COMPILER_VERSION="3.*"
|
||||
;;
|
||||
- 5*|4.*)
|
||||
+ 8*|7*|6*|5*|4.*)
|
||||
COMPILER_VERSION="4"
|
||||
;;
|
||||
*)
|
||||
diff -up qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6 qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h
|
||||
--- qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h.gcc6 2015-05-07 09:14:48.000000000 -0500
|
||||
+++ qt-everywhere-opensource-src-4.8.7/src/xmlpatterns/api/qcoloroutput_p.h 2016-04-15 07:04:19.431268227 -0500
|
||||
@@ -70,8 +70,8 @@ namespace QPatternist
|
||||
ForegroundShift = 10,
|
||||
BackgroundShift = 20,
|
||||
SpecialShift = 20,
|
||||
- ForegroundMask = ((1 << ForegroundShift) - 1) << ForegroundShift,
|
||||
- BackgroundMask = ((1 << BackgroundShift) - 1) << BackgroundShift
|
||||
+ ForegroundMask = 0x1f << ForegroundShift,
|
||||
+ BackgroundMask = 0x7 << BackgroundShift
|
||||
};
|
||||
|
||||
public:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user