diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-libs/qwt/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-libs/qwt/files')
-rw-r--r-- | x11-libs/qwt/files/qwt-5.2.3-install_qt.patch | 28 | ||||
-rw-r--r-- | x11-libs/qwt/files/qwt-6.0.2-invalid-read.patch | 250 | ||||
-rw-r--r-- | x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch | 15 |
3 files changed, 293 insertions, 0 deletions
diff --git a/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch b/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch new file mode 100644 index 000000000000..48e9385811f8 --- /dev/null +++ b/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch @@ -0,0 +1,28 @@ +diff -up qwt-5.2.2/designer/designer.pro.install_qt qwt-5.2.2/designer/designer.pro +--- qwt-5.2.2/designer/designer.pro.install_qt 2011-08-01 04:28:22.000000000 -0500 ++++ qwt-5.2.2/designer/designer.pro 2012-08-14 11:11:22.569229749 -0500 +@@ -36,6 +37,7 @@ contains(CONFIG, QwtDesigner) { + else { + SUFFIX_STR = $${RELEASE_SUFFIX} + } ++ LIBNAME = qwt$${SUFFIX_STR} + } + + TEMPLATE = lib +@@ -45,7 +47,6 @@ contains(CONFIG, QwtDesigner) { + INCLUDEPATH += $${QWT_ROOT}/src + DEPENDPATH += $${QWT_ROOT}/src + +- LIBNAME = qwt$${SUFFIX_STR} + contains(CONFIG, QwtDll) { + win32 { + DEFINES += QT_DLL QWT_DLL +@@ -103,7 +104,7 @@ contains(CONFIG, QwtDesigner) { + + # Qt 4 + +- TARGET = qwt_designer_plugin$${SUFFIX_STR} ++ TARGET = qwt5_designer_plugin$${SUFFIX_STR} + CONFIG += qt designer plugin + + RCC_DIR = resources diff --git a/x11-libs/qwt/files/qwt-6.0.2-invalid-read.patch b/x11-libs/qwt/files/qwt-6.0.2-invalid-read.patch new file mode 100644 index 000000000000..a225350990a0 --- /dev/null +++ b/x11-libs/qwt/files/qwt-6.0.2-invalid-read.patch @@ -0,0 +1,250 @@ +--- qwt-6.0.2-orig/textengines/mathml/qwt_mml_document.cpp 2012-12-01 00:22:46.752106265 +1100 ++++ qwt-6.0.2/textengines/mathml/qwt_mml_document.cpp 2013-01-31 14:29:30.590197611 +1100 +@@ -4421,7 +4421,10 @@ + if ( ok ) + return value; + else +- qWarning( "Could not convert %s to form", value_str.toLatin1().data() ); ++ { ++ QByteArray value_str_ba = value_str.toLatin1(); ++ qWarning( "Could not convert %s to form", value_str_ba.data() ); ++ } + + } + +@@ -4658,7 +4661,10 @@ + continue; + } + else +- qWarning( "MmlMtableNode::layoutSymbol(): could not parse value %s%%", value.toLatin1().data() ); ++ { ++ QByteArray value_ba = value.toLatin1(); ++ qWarning( "MmlMtableNode::layoutSymbol(): could not parse value %s%%", value_ba.data() ); ++ } + } + + // Relatively sized column, but we failed to parse the factor. Treat is like an auto +@@ -5167,7 +5173,8 @@ + double factor = factor_str.toFloat( &float_ok ); + if ( !float_ok || factor < 0 ) + { +- qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value.toLatin1().data() ); ++ QByteArray value_ba = value.toLatin1(); ++ qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value_ba.data() ); + return 0; + } + +@@ -5196,7 +5203,8 @@ + unit_size = QwtMmlNode::interpretSpacing( "1" + pseudo_unit, &unit_ok ); + if ( !unit_ok ) + { +- qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value.toLatin1().data() ); ++ QByteArray value_ba = value.toLatin1(); ++ qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value_ba.data() ); + return 0; + } + } +@@ -5368,7 +5376,8 @@ + return ( int )( em * factor ); + else + { +- qWarning( "interpretSpacing(): could not parse \"%sem\"", value.toLatin1().data() ); ++ QByteArray value_ba = value.toLatin1(); ++ qWarning( "interpretSpacing(): could not parse \"%sem\"", value_ba.data() ); + if ( ok != 0 ) + *ok = false; + return 0; +@@ -5384,7 +5393,8 @@ + return ( int )( ex * factor ); + else + { +- qWarning( "interpretSpacing(): could not parse \"%sex\"", value.toLatin1().data() ); ++ QByteArray value_ba = value.toLatin1(); ++ qWarning( "interpretSpacing(): could not parse \"%sex\"", value_ba.data() ); + if ( ok != 0 ) + *ok = false; + return 0; +@@ -5406,7 +5416,8 @@ + } + else + { +- qWarning( "interpretSpacing(): could not parse \"%scm\"", value.toLatin1().data() ); ++ QByteArray value_ba = value.toLatin1(); ++ qWarning( "interpretSpacing(): could not parse \"%scm\"", value_ba.data() ); + if ( ok != 0 ) + *ok = false; + return 0; +@@ -5428,7 +5439,8 @@ + } + else + { +- qWarning( "interpretSpacing(): could not parse \"%smm\"", value.toLatin1().data() ); ++ QByteArray value_ba = value.toLatin1(); ++ qWarning( "interpretSpacing(): could not parse \"%smm\"", value_ba.data() ); + if ( ok != 0 ) + *ok = false; + return 0; +@@ -5450,7 +5462,8 @@ + } + else + { +- qWarning( "interpretSpacing(): could not parse \"%sin\"", value.toLatin1().data() ); ++ QByteArray value_ba = value.toLatin1(); ++ qWarning( "interpretSpacing(): could not parse \"%sin\"", value_ba.data() ); + if ( ok != 0 ) + *ok = false; + return 0; +@@ -5466,7 +5479,8 @@ + return i; + else + { +- qWarning( "interpretSpacing(): could not parse \"%spx\"", value.toLatin1().data() ); ++ QByteArray value_ba = value.toLatin1(); ++ qWarning( "interpretSpacing(): could not parse \"%spx\"", value_ba.data() ); + if ( ok != 0 ) + *ok = false; + return 0; +@@ -5478,7 +5492,8 @@ + if ( float_ok && i >= 0 ) + return i; + +- qWarning( "interpretSpacing(): could not parse \"%s\"", value.toLatin1().data() ); ++ QByteArray value_ba = value.toLatin1(); ++ qWarning( "interpretSpacing(): could not parse \"%s\"", value_ba.data() ); + if ( ok != 0 ) + *ok = false; + return 0; +@@ -5503,7 +5518,8 @@ + return ( int )( base * factor / 100.0 ); + } + +- qWarning( "interpretPercentSpacing(): could not parse \"%s%%\"", value.toLatin1().data() ); ++ QByteArray value_ba = value.toLatin1(); ++ qWarning( "interpretPercentSpacing(): could not parse \"%s%%\"", value_ba.data() ); + if ( ok != 0 ) + *ok = false; + return 0; +@@ -5528,7 +5544,8 @@ + return pt_size; + } + +- qWarning( "interpretPointSize(): could not parse \"%spt\"", value.toLatin1().data() ); ++ QByteArray value_ba = value.toLatin1(); ++ qWarning( "interpretPointSize(): could not parse \"%spt\"", value_ba.data() ); + if ( ok != 0 ) + *ok = false; + return 0; +@@ -5737,7 +5754,8 @@ + */ + static const QwtMmlOperSpec *searchOperSpecData( const QString &name ) + { +- const char *name_latin1 = name.toLatin1().data(); ++ QByteArray name_latin1_ba = name.toLatin1(); ++ const char *name_latin1 = name_latin1_ba.data(); + + // binary search + // establish invariant g_oper_spec_data[begin].name < name < g_oper_spec_data[end].name +@@ -5789,7 +5807,8 @@ + if ( spec == 0 ) + continue; + +- const char *name_latin1 = name.toLatin1().data(); ++ QByteArray name_ba = name.toLatin1(); ++ const char *name_latin1 = name_ba.data(); + + // backtrack to the first instance of name + while ( spec > g_oper_spec_data && qstrcmp( ( spec - 1 )->name, name_latin1 ) == 0 ) +@@ -5918,7 +5937,8 @@ + if ( ok != 0 ) + *ok = false; + +- qWarning( "interpretMathVariant(): could not parse value: \"%s\"", value.toLatin1().data() ); ++ QByteArray value_ba = value.toLatin1(); ++ qWarning( "interpretMathVariant(): could not parse value: \"%s\"", value_ba.data() ); + + return QwtMml::NormalMV; + } +@@ -5938,7 +5958,8 @@ + if ( ok != 0 ) + *ok = false; + +- qWarning( "interpretForm(): could not parse value \"%s\"", value.toLatin1().data() ); ++ QByteArray value_ba = value.toLatin1(); ++ qWarning( "interpretForm(): could not parse value \"%s\"", value_ba.data() ); + return QwtMml::InfixForm; + } + +@@ -5959,7 +5980,8 @@ + if ( ok != 0 ) + *ok = false; + +- qWarning( "interpretColAlign(): could not parse value \"%s\"", value.toLatin1().data() ); ++ QByteArray value_ba = value.toLatin1(); ++ qWarning( "interpretColAlign(): could not parse value \"%s\"", value_ba.data() ); + return QwtMml::ColAlignCenter; + } + +@@ -5984,7 +6006,8 @@ + if ( ok != 0 ) + *ok = false; + +- qWarning( "interpretRowAlign(): could not parse value \"%s\"", value.toLatin1().data() ); ++ QByteArray value_ba = value.toLatin1(); ++ qWarning( "interpretRowAlign(): could not parse value \"%s\"", value_ba.data() ); + return QwtMml::RowAlignAxis; + } + +@@ -6018,7 +6041,8 @@ + if ( ok != 0 ) + *ok = false; + +- qWarning( "interpretFrameType(): could not parse value \"%s\"", value.toLatin1().data() ); ++ QByteArray value_ba = value.toLatin1(); ++ qWarning( "interpretFrameType(): could not parse value \"%s\"", value_ba.data() ); + return QwtMml::FrameNone; + } + +@@ -6030,7 +6054,8 @@ + QStringList l = value_list.split( ' ' ); + if ( l.count() != 2 ) + { +- qWarning( "interpretFrameSpacing: could not parse value \"%s\"", value_list.toLatin1().data() ); ++ QByteArray value_list_ba = value_list.toLatin1(); ++ qWarning( "interpretFrameSpacing: could not parse value \"%s\"", value_list_ba.data() ); + if ( ok != 0 ) + *ok = false; + return QwtMml::FrameSpacing( ( int )( 0.4 * em ), ( int )( 0.5 * ex ) ); +@@ -6089,7 +6114,10 @@ + else if ( value == "bold" ) + fn.setBold( true ); + else +- qWarning( "interpretDepreciatedFontAttr(): could not parse fontweight \"%s\"", value.toLatin1().data() ); ++ { ++ QByteArray value_ba = value.toLatin1(); ++ qWarning( "interpretDepreciatedFontAttr(): could not parse fontweight \"%s\"", value_ba.data() ); ++ } + } + + if ( font_attr.contains( "fontstyle" ) ) +@@ -6100,7 +6128,10 @@ + else if ( value == "italic" ) + fn.setItalic( true ); + else +- qWarning( "interpretDepreciatedFontAttr(): could not parse fontstyle \"%s\"", value.toLatin1().data() ); ++ { ++ QByteArray value_ba = value.toLatin1(); ++ qWarning( "interpretDepreciatedFontAttr(): could not parse fontstyle \"%s\"", value_ba.data() ); ++ } + } + + if ( font_attr.contains( "fontfamily" ) ) +@@ -6150,7 +6181,8 @@ + + if ( ok != 0 ) + *ok = false; +- qWarning( "interpretMathSize(): could not parse mathsize \"%s\"", value.toLatin1().data() ); ++ QByteArray value_ba = value.toLatin1(); ++ qWarning( "interpretMathSize(): could not parse mathsize \"%s\"", value_ba.data() ); + return fn; + } + diff --git a/x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch b/x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch new file mode 100644 index 000000000000..f00ea604f5f4 --- /dev/null +++ b/x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch @@ -0,0 +1,15 @@ + textengines/mathml/mathml.pro | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/textengines/mathml/mathml.pro b/textengines/mathml/mathml.pro +index 7032366..b1372f7 100644 +--- a/textengines/mathml/mathml.pro ++++ b/textengines/mathml/mathml.pro +@@ -63,6 +63,7 @@ contains(QWT_CONFIG, QwtPkgConfig) { + + # QMAKE_PKGCONFIG_DESTDIR is buggy, in combination + # with including pri files: better don't use it ++ QMAKE_PKGCONFIG_DESTDIR = pkgconfig + + greaterThan(QT_MAJOR_VERSION, 4) { + |