rpms/libqt4
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rebuilt [release 4.8.7-7mamba;Wed Sep 16 2020]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-06 05:31:21 +01:00
parent 87dfa57a81
commit ff658f43c3
10 changed files with 997 additions and 824 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

575
libqt4-4.8.4-set-alpha-flags-after-converto32-in-eglcreatesurface.patch
View File

@ -1,578 +1,3 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<meta http-equiv="Content-Script-Type" content="text/javascript"/>
<meta http-equiv="Content-Style-Type" content="text/css"/>
<link href="/favicon.ico" rel="shortcut icon" />
<title>Sources of qt (Project Project:KDE:Mer_Extras) - MeeGo Community Open Build Service</title>
<link href="/themes/bento/css/style.css?1328175836" media="screen" rel="stylesheet" title="Normal" type="text/css" />
<link href="/stylesheets/style.css?1329473202" media="screen" rel="stylesheet" type="text/css" />
<link href="/stylesheets/package.css?1329473202" media="all" rel="stylesheet" type="text/css" />
<script src="/javascripts/layout-squashed.js?1329473202" type="text/javascript"></script>
<script type="text/javascript">
//<![CDATA[
function insertRow() {
var name = document.getElementById('add_new_parameter').value;
var service = document.getElementById('servicename').value;
var value = document.getElementById('add_new_value').value;
var number = document.getElementById('count_parameters').value + 1;
$('#pTable tr:last').before('<tr class=\"row_'+number+'\">'+
'<td>'+name+'</td>'+
'<td id="added_parameter_'+number+'">...</td>'+
'<td><a href=\"#\" onclick=\"\$(\'tr.row_'+number+'\').remove(); return false;\">X</a></td>'+
'</tr>');
document.getElementById('count_parameters').value = number;
var path="/package/service_parameter_value?number="+number+"&servicename="+escape(service)+"&parameter="+escape(name)+"&value="+escape(value)+"&package=qt&project=Project%3AKDE%3AMer_Extras";
$("#pTable td#added_parameter_"+number).load(path);
}
$(function() {
setup_favorites();
$("#advanced_tabs_trigger").click(function() {
$("#advanced_tabs").show();
$("#advanced_tabs_trigger").remove();
});
$("#files_table").tablesorter( {
sortList: [[0,1]],
widgets: ['zebra'],
headers: {
3: { sorter: false }
}
} );
});
var CSRF_PROTECT_AUTH_TOKEN = "kgkxPEjkzL2LVs6TUbmq/+Z82dltqKxgkQSqeGV0iYM=";
//]]>
</script> </head>
<body>
<!-- Start: Header -->
<div id="header">
<div id="header-content" class="container_12">
<a href="/" id="header-logo"><img alt="Obs-logo_small" height="26" src="/images/obs-logo_small.png?1329473202" /></a>
<form action="/search/search" class="label-overlay" id="global-search-form" method="get"> <div style="display: inline">
<label for="search">Search</label>
<input id="search" name="search_text" type="text" value="" /> <input type="submit" value="Search" class="hidden" />
</div>
</form>
</div>
</div>
<!-- End: Header -->
<div id="subheader" class="container_16">
<div id="breadcrump" class="grid_10 alpha">
<img alt="Home_grey" src="/themes/bento/images/home_grey.png?1328175836" /><a href="/">MeeGo Community Open Build Service</a>
&gt;
<a href="/project/list_public">Projects</a>
&gt;
<!-- multiple items in crump list but they belong together as sub group, eg sub projects -->
<a href="/project/show?project=Project">Project</a>:<a href="/project/show?project=Project%3AKDE">KDE</a>:<a href="/project/show?project=Project%3AKDE%3AMer_Extras">Mer_Extras</a>
&gt;
<a href="/package/show?package=qt&amp;project=Project%3AKDE%3AMer_Extras">qt</a>
&gt;
Sources
</div>
<div class="grid_6 omega" style="text-align: right;">
<a href="/user/register_user">Register</a> |
<a href="/user/login" id="login-trigger">Login</a>
<div id="login-form">
<form action="/user/do_login" method="post"><div style="margin:0;padding:0;display:inline"><input name="authenticity_token" type="hidden" value="kgkxPEjkzL2LVs6TUbmq/+Z82dltqKxgkQSqeGV0iYM=" /></div> <p>
<input id="return_to_path" name="return_to_path" type="hidden" value="/package/files?package=qt&amp;project=Project%3AKDE%3AMer_Extras" />
<label for="username">Username</label>
<input id="username" name="username" type="text" value="" />
</p>
<p>
<label for="password">Password</label>
<input id="password" name="password" type="password" value="" />
</p>
<p><input name="commit" type="submit" value="Login" /></p>
<p class="slim-footer"><a href="#" id="close-login">Cancel</a></p>
</form> </div>
</div>
</div>
<div id="flash-messages" class="container_16" >
<div class="ui-widget grid_16 alpha omega">
<div class="ui-state-error ui-corner-all ui-widget-shadow">
<p>
<span class="ui-icon ui-icon-alert"/>
Files could not be expanded: conflict in file qt.spec
</p>
</div>
</div>
</div>
<!-- this is needed for the delete confirm dialogues -->
<div id="dialog_wrapper" style="display: none"></div>
<!-- Start: Main Content Area -->
<div id="content" class="container_16 content-wrapper">
<div class="grid_16 box box-shadow alpha omega">
<div class="box-header header-tabs">
<ul id="package_tabs">
<li><a href="/package/show?package=qt&amp;project=Project%3AKDE%3AMer_Extras">Overview</a></li>
<li class='selected'><a href="/package/files?package=qt&amp;project=Project%3AKDE%3AMer_Extras">Sources</a></li>
<li><a href="/package/repositories?package=qt&amp;project=Project%3AKDE%3AMer_Extras">Repositories</a></li>
<li><a href="/package/revisions?package=qt&amp;project=Project%3AKDE%3AMer_Extras">Revisions</a></li>
<li><a href="/package/requests?package=qt&amp;project=Project%3AKDE%3AMer_Extras">Requests</a></li>
<li><a href="/package/users?package=qt&amp;project=Project%3AKDE%3AMer_Extras">Users</a></li>
<li><a href="#" id="advanced_tabs_trigger">Advanced</a></li>
</ul>
<div id="advanced_tabs" class="hidden">
<ul>
<li><a href="/package/attributes?package=qt&amp;project=Project%3AKDE%3AMer_Extras">Attributes</a></li>
<li><a href="/package/meta?package=qt&amp;project=Project%3AKDE%3AMer_Extras">Meta</a></li>
</ul>
</div>
</div>
<script src="/javascripts/jquery.tablesorter.js?1329473202" type="text/javascript"></script>
<!-- Links -->
<div id="package_link">
<h3>Link</h3>
<p>
This package links to the sources of the package
qt
of project Mer:fake:Core:i586.
</p><p>The link contains errors: <i>conflict in file qt.spec.</i>
</p>
</div>
<!-- Service list -->
<!-- Service elements -->
<!-- Source file list -->
<h3>Source Files <img alt="Ajax-loader" class="hidden" id="spinner_files" src="/images/ajax-loader.gif?1329473202" />
<span style="font-size: small; font-weight: normal">
<a href="/package/files?expand=1&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras">(show merged sources derived from linked package)</a>
</span>
</h3>
<div id="files_view">
<table cellspacing='1' id="files_table" class="tablesorter">
<thead>
<tr>
<th class="header" style="min-width: 100px;">Filename</th>
<th class="header">Size</th>
<th class="header" style="min-width: 90px;">Changed</th>
<th>Actions</th>
</tr>
</thead>
<tbody>
<tr><td>
<a href="/package/view_file?file=Makefile&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">Makefile</a>
</td>
<td><span class="hidden">0000000154</span>154 Bytes</td>
<td><span class="hidden">1315934310</span>10 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/Makefile?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=_link&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">_link</a>
</td>
<td><span class="hidden">0000000139</span>139 Bytes</td>
<td><span class="hidden">1326274535</span>6 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/_link?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=assistant.desktop&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">assistant.desktop</a>
</td>
<td><span class="hidden">0000003406</span>3.3 KB</td>
<td><span class="hidden">1291988009</span>19 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/assistant.desktop?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
assistant.png
</td>
<td><span class="hidden">0000002034</span>2 KB</td>
<td><span class="hidden">1291988037</span>19 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/assistant.png?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=designer.desktop&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">designer.desktop</a>
</td>
<td><span class="hidden">0000003731</span>3.6 KB</td>
<td><span class="hidden">1291987994</span>19 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/designer.desktop?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
designer.png
</td>
<td><span class="hidden">0000001443</span>1.4 KB</td>
<td><span class="hidden">1291988024</span>19 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/designer.png?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=linguist.desktop&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">linguist.desktop</a>
</td>
<td><span class="hidden">0000003248</span>3.2 KB</td>
<td><span class="hidden">1291988048</span>19 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/linguist.desktop?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
linguist.png
</td>
<td><span class="hidden">0000001382</span>1.3 KB</td>
<td><span class="hidden">1291987981</span>19 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/linguist.png?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=macros.qmake&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">macros.qmake</a>
</td>
<td><span class="hidden">0000000891</span>891 Bytes</td>
<td><span class="hidden">1291988027</span>19 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/macros.qmake?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=qt-4.8.0-Adapted-XInput2.0-code-to-support-multiple-connected.patch&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">qt-4.8.0-Adapted-XInput2.0-code-to-support-multiple-connected.patch</a>
</td>
<td><span class="hidden">0000044483</span>43.4 KB</td>
<td><span class="hidden">1326370806</span>6 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/qt-4.8.0-Adapted-XInput2.0-code-to-support-multiple-connected.patch?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=qt-4.8.0-Avoid-symbol-stripping-by-default.patch&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">qt-4.8.0-Avoid-symbol-stripping-by-default.patch</a>
</td>
<td><span class="hidden">0000000859</span>859 Bytes</td>
<td><span class="hidden">1326370807</span>6 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/qt-4.8.0-Avoid-symbol-stripping-by-default.patch?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=qt-4.8.0-BMC-15323-add-support-for-QT_USE_DRAG_DISTANCE-envir.patch&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">qt-4.8.0-BMC-15323-add-support-for-QT_USE_DRAG_DISTANCE-envir.patch</a>
</td>
<td><span class="hidden">0000001007</span>1007 Bytes</td>
<td><span class="hidden">1326370809</span>6 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/qt-4.8.0-BMC-15323-add-support-for-QT_USE_DRAG_DISTANCE-envir.patch?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=qt-4.8.0-Description-Avoid-.pc-directories-created-by-quilt.-.patch&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">qt-4.8.0-Description-Avoid-.pc-directories-created-by-quilt.-.patch</a>
</td>
<td><span class="hidden">0000000879</span>879 Bytes</td>
<td><span class="hidden">1326273640</span>6 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/qt-4.8.0-Description-Avoid-.pc-directories-created-by-quilt.-.patch?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=qt-4.8.0-Description-Fix-sqlite-config.test.patch&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">qt-4.8.0-Description-Fix-sqlite-config.test.patch</a>
</td>
<td><span class="hidden">0000000674</span>674 Bytes</td>
<td><span class="hidden">1326273642</span>6 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/qt-4.8.0-Description-Fix-sqlite-config.test.patch?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=qt-4.8.0-Description-MISSING-BMC-3183-QTBUG-11158-QTBUG-11462.patch&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">qt-4.8.0-Description-MISSING-BMC-3183-QTBUG-11158-QTBUG-11462.patch</a>
</td>
<td><span class="hidden">0000000897</span>897 Bytes</td>
<td><span class="hidden">1326273643</span>6 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/qt-4.8.0-Description-MISSING-BMC-3183-QTBUG-11158-QTBUG-11462.patch?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=qt-4.8.0-Description-Make-it-so-that-the-QIcon-loader-honors-.patch&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">qt-4.8.0-Description-Make-it-so-that-the-QIcon-loader-honors-.patch</a>
</td>
<td><span class="hidden">0000001900</span>1.9 KB</td>
<td><span class="hidden">1326273645</span>6 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/qt-4.8.0-Description-Make-it-so-that-the-QIcon-loader-honors-.patch?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=qt-4.8.0-Description-rewrite-INV_PREMUL-to-fix-a-glass-jaw-on.patch&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">qt-4.8.0-Description-rewrite-INV_PREMUL-to-fix-a-glass-jaw-on.patch</a>
</td>
<td><span class="hidden">0000001623</span>1.6 KB</td>
<td><span class="hidden">1326273646</span>6 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/qt-4.8.0-Description-rewrite-INV_PREMUL-to-fix-a-glass-jaw-on.patch?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=qt-4.8.0-Description-send-Q_ASSERT-qDebug-qWarning-and-qFatal.patch&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">qt-4.8.0-Description-send-Q_ASSERT-qDebug-qWarning-and-qFatal.patch</a>
</td>
<td><span class="hidden">0000002666</span>2.6 KB</td>
<td><span class="hidden">1326273647</span>6 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/qt-4.8.0-Description-send-Q_ASSERT-qDebug-qWarning-and-qFatal.patch?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=qt-4.8.0-Description-translations-fails-to-build-under-autobu.patch&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">qt-4.8.0-Description-translations-fails-to-build-under-autobu.patch</a>
</td>
<td><span class="hidden">0000012728</span>12.4 KB</td>
<td><span class="hidden">1326273648</span>6 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/qt-4.8.0-Description-translations-fails-to-build-under-autobu.patch?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=qt-4.8.0-Hardcode-TMPDIR-to-var-tmp-BMC-13603.patch&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">qt-4.8.0-Hardcode-TMPDIR-to-var-tmp-BMC-13603.patch</a>
</td>
<td><span class="hidden">0000001192</span>1.2 KB</td>
<td><span class="hidden">1326370810</span>6 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/qt-4.8.0-Hardcode-TMPDIR-to-var-tmp-BMC-13603.patch?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=qt-4.8.0-add-bounds-checking-in-soft-scale.patch&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">qt-4.8.0-add-bounds-checking-in-soft-scale.patch</a>
</td>
<td><span class="hidden">0000000985</span>985 Bytes</td>
<td><span class="hidden">1326370812</span>6 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/qt-4.8.0-add-bounds-checking-in-soft-scale.patch?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=qt-4.8.0-add-scaling-based-on-screen-size.patch&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">qt-4.8.0-add-scaling-based-on-screen-size.patch</a>
</td>
<td><span class="hidden">0000002148</span>2.1 KB</td>
<td><span class="hidden">1326370813</span>6 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/qt-4.8.0-add-scaling-based-on-screen-size.patch?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=qt-4.8.0-disable-subpixel-support-to-force-alpha-only-texture.patch&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">qt-4.8.0-disable-subpixel-support-to-force-alpha-only-texture.patch</a>
</td>
<td><span class="hidden">0000001808</span>1.8 KB</td>
<td><span class="hidden">1326370814</span>6 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/qt-4.8.0-disable-subpixel-support-to-force-alpha-only-texture.patch?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=qt-4.8.0-modify-alpha-checking-for-GlSurfaceCreateWithAlpha.patch&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">qt-4.8.0-modify-alpha-checking-for-GlSurfaceCreateWithAlpha.patch</a>
</td>
<td><span class="hidden">0000002446</span>2.4 KB</td>
<td><span class="hidden">1326370816</span>6 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/qt-4.8.0-modify-alpha-checking-for-GlSurfaceCreateWithAlpha.patch?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=qt-4.8.0-set-alpha-flags-after-converto32-in-eglcreatesurface.patch&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">qt-4.8.0-set-alpha-flags-after-converto32-in-eglcreatesurface.patch</a>
</td>
<td><span class="hidden">0000001844</span>1.8 KB</td>
<td><span class="hidden">1326370817</span>6 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/qt-4.8.0-set-alpha-flags-after-converto32-in-eglcreatesurface.patch?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=qt-4.8.0-xinput2-support.patch&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">qt-4.8.0-xinput2-support.patch</a>
</td>
<td><span class="hidden">0000105869</span>103.4 KB</td>
<td><span class="hidden">1326370819</span>6 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/qt-4.8.0-xinput2-support.patch?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
qt-everywhere-opensource-src-4.8.0.tar.gz
</td>
<td><span class="hidden">0238580694</span>227.5 MB</td>
<td><span class="hidden">1326273919</span>6 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=qt-rpmlintrc&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">qt-rpmlintrc</a>
</td>
<td><span class="hidden">0000000197</span>197 Bytes</td>
<td><span class="hidden">1315934465</span>10 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/qt-rpmlintrc?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=qt.changes&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">qt.changes</a>
</td>
<td><span class="hidden">0000017413</span>17 KB</td>
<td><span class="hidden">1326397901</span>6 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/qt.changes?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=qt.spec&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">qt.spec</a>
</td>
<td><span class="hidden">0000063822</span>62.3 KB</td>
<td><span class="hidden">1326536274</span>6 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/qt.spec?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=qt.yaml&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">qt.yaml</a>
</td>
<td><span class="hidden">0000068209</span>66.6 KB</td>
<td><span class="hidden">1326536276</span>6 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/qt.yaml?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
<a href="/package/view_file?file=qtdemo.desktop&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=c47f9ad39e0f1d09a49b7fc57cfbee37">qtdemo.desktop</a>
</td>
<td><span class="hidden">0000000162</span>162 Bytes</td>
<td><span class="hidden">1291987991</span>19 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/qtdemo.desktop?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
<tr><td>
qtdemo.png
</td>
<td><span class="hidden">0000001422</span>1.4 KB</td>
<td><span class="hidden">1291988040</span>19 months ago</td>
<!-- limit download for anonymous user to avoid getting killed by crawlers -->
<td><a href="https://api.pub.meego.com:443/public/source/Project:KDE:Mer_Extras/qt/qtdemo.png?rev=c47f9ad39e0f1d09a49b7fc57cfbee37&amp;"><img alt="Download" src="/themes/bento/images/icons/page_white_get.png?1328175836" title="Download File" /></a>
</td>
</tr>
</tbody>
</table>
<h3>Latest Revision</h3>
<p>
<img alt="Mdfe?size=20" height="20" src="/home/icon/mdfe?size=20" width="20" />
<a href="/home?user=mdfe">mdfe (mdfe)</a>
committed
6 months ago (revision 11)<br/>
<span style="margin: 0.3em .3em .5em 2em">osc copypac from project:home:w00t:branches:Mer:fake:Core:i586 package:qt revision:11</span><br/>
<a href="/package/rdiff?linkrev=base&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=11" style="margin-left: 2em"><img alt="Brick" src="/themes/bento/images/icons/brick.png?1328175836" /></a>
<a href="/package/rdiff?linkrev=base&amp;package=qt&amp;project=Project%3AKDE%3AMer_Extras&amp;rev=11">Show diff</a>
</p>
</div>
</div>
</div>
<!-- End: Main Content Area -->
<div style="clear: both;"></div>
<!-- Start: Footer -->
<div id="footer" class="container_12">
<div class="box_content grid_3">
<strong class="grey-medium spacer1">Locations</strong>
<ul>
<li><a href="/project/list_public">Projects</a></li>
<li><a href="/search">Search</a></li>
<li><a href="/monitor">Status Monitor</a></li>
</ul>
</div>
<div class="box_content grid_3">
<strong class="grey-medium spacer1">Help</strong>
<ul>
<li><a href="http://wiki.opensuse.org/Portal:Build_Service">Open Build Service Portal</a></li>
<li><a href="http://wiki.opensuse.org/openSUSE:Build_Service_Tutorial">Building Packages</a></li>
<li><a href="http://en.opensuse.org/openSUSE:Specfile_guidelines">Writing spec Files</a></li>
<li><a href="http://en.opensuse.org/openSUSE:Submitting_bug_reports">Reporting a Bug</a></li>
<li><a href="http://forums.opensuse.org/english/other-forums/development/open-build-service-obs/">Forums</a></li>
</ul>
</div>
<div id="footer-legal" class="grid_12">
<p>
<a href="http://openbuildservice.org">Open Build Service (OBS)</a> is an <a href="http://www.opensuse.org">openSUSE project</a>.
</p>
</div>
</div>
<!-- End: Footer -->
</body>
</html>
From e0893c1eb7b1081f4a83fa097ca53dd3aebee502 Mon Sep 17 00:00:00 2001
From: Robin Burchell <robin.burchell@collabora.com>
Date: Sun, 13 Nov 2011 12:50:43 +0100

18
libqt4-4.8.7-assistant-force-no-webkit.patch Normal file
View File

@ -0,0 +1,18 @@
--- qt-everywhere-opensource-src-4.8.7/tools/assistant/tools/assistant/assistant.pro.orig 2020-09-19 16:22:22.279000000 +0200
+++ qt-everywhere-opensource-src-4.8.7/tools/assistant/tools/assistant/assistant.pro 2020-09-19 16:17:15.170000000 +0200
@@ -85,11 +85,11 @@
openpageswidget.cpp \
openpagesmanager.cpp \
openpagesswitcher.cpp
-contains(QT_CONFIG, webkit) {
- SOURCES += helpviewer_qwv.cpp
-} else {
+#contains(QT_CONFIG, webkit) {
+# SOURCES += helpviewer_qwv.cpp
+#} else {
SOURCES += helpviewer_qtb.cpp
-}
+#}
FORMS += bookmarkdialog.ui \
bookmarkmanagerwidget.ui \

12
libqt4-4.8.7-crash-in-qppmhandler.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up qt-everywhere-opensource-src-4.8.7/src/gui/image/qppmhandler.cpp.me qt-everywhere-opensource-src-4.8.7/src/gui/image/qppmhandler.cpp
--- qt-everywhere-opensource-src-4.8.7/src/gui/image/qppmhandler.cpp.me 2019-03-22 10:22:16.213800109 +0100
+++ qt-everywhere-opensource-src-4.8.7/src/gui/image/qppmhandler.cpp 2019-03-22 10:22:40.721890281 +0100
@@ -108,7 +108,7 @@ static bool read_pbm_header(QIODevice *d
else
mcc = read_pbm_int(device); // get max color component
- if (w <= 0 || w > 32767 || h <= 0 || h > 32767 || mcc <= 0)
+ if (w <= 0 || w > 32767 || h <= 0 || h > 32767 || mcc <= 0 || mcc > 0xffff)
return false; // weird P.M image
return true;

84
libqt4-4.8.7-cups-2.3.3.patch Normal file
View File

@ -0,0 +1,84 @@
diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp
--- qt-everywhere-opensource-src-4.6.2/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-11 16:55:22.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/dialogs/qprintdialog_unix.cpp 2010-02-28 04:34:16.000000000 +0100
@@ -569,6 +569,32 @@
void QPrintDialogPrivate::selectPrinter(QCUPSSupport *cups)
{
options.duplex->setEnabled(cups && cups->ppdOption("Duplex"));
+
+ if (cups) {
+ const ppd_option_t* duplex = cups->ppdOption("Duplex");
+ if (duplex) {
+ // copy default ppd duplex to qt dialog
+ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
+ options.duplexShort->setChecked(true);
+ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
+ options.duplexLong->setChecked(true);
+ else
+ options.noDuplex->setChecked(true);
+ }
+
+ if (cups->currentPPD()) {
+ // set default color
+ if (cups->currentPPD()->color_device)
+ options.color->setChecked(true);
+ else
+ options.grayscale->setChecked(true);
+ }
+
+ // set collation
+ const ppd_option_t *collate = cups->ppdOption("Collate");
+ if (collate)
+ options.collate->setChecked(qstrcmp(collate->defchoice, "True")==0);
+ }
}
#endif
diff -ur qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp
--- qt-everywhere-opensource-src-4.6.2/src/gui/painting/qprinter.cpp 2010-02-11 16:55:22.000000000 +0100
+++ qt-everywhere-opensource-src-4.6.2-cups/src/gui/painting/qprinter.cpp 2010-02-28 04:55:15.000000000 +0100
@@ -627,6 +627,44 @@
&& d_ptr->paintEngine->type() != QPaintEngine::MacPrinter) {
setOutputFormat(QPrinter::PdfFormat);
}
+
+#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+ // fill in defaults from ppd file
+ QCUPSSupport cups;
+
+ int printernum = -1;
+ for (int i = 0; i < cups.availablePrintersCount(); i++) {
+ if (printerName().toLocal8Bit() == cups.availablePrinters()[i].name)
+ printernum = i;
+ }
+ if (printernum >= 0) {
+ cups.setCurrentPrinter(printernum);
+
+ const ppd_option_t* duplex = cups.ppdOption("Duplex");
+ if (duplex) {
+ // copy default ppd duplex to qt dialog
+ if (qstrcmp(duplex->defchoice, "DuplexTumble") == 0)
+ setDuplex(DuplexShortSide);
+ else if (qstrcmp(duplex->defchoice, "DuplexNoTumble") == 0)
+ setDuplex(DuplexLongSide);
+ else
+ setDuplex(DuplexNone);
+ }
+
+ if (cups.currentPPD()) {
+ // set default color
+ if (cups.currentPPD()->color_device)
+ setColorMode(Color);
+ else
+ setColorMode(GrayScale);
+ }
+
+ // set collation
+ const ppd_option_t *collate = cups.ppdOption("Collate");
+ if (collate)
+ setCollateCopies(qstrcmp(collate->defchoice, "True")==0);
+ }
+#endif
}
/*!

238
libqt4-4.8.7-cupsEnumDests.patch Normal file
View File

@ -0,0 +1,238 @@
diff -up qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups.cpp.cupsEnumDests qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups.cpp
--- qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups.cpp.cupsEnumDests 2012-11-23 10:09:53.000000000 +0000
+++ qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups.cpp 2013-07-03 15:30:06.232936976 +0100
@@ -50,9 +50,19 @@
QT_BEGIN_NAMESPACE
+typedef int (*CupsEnumDests)(unsigned flags, int msec, int *cancel,
+ cups_ptype_t type, cups_ptype_t mask,
+ cups_dest_cb_t cb, void *user_data);
+typedef http_t * (*CupsConnectDest)(cups_dest_t *dest, unsigned flags,
+ int msec, int *cancel,
+ char *resource, size_t resourcesize,
+ cups_dest_cb_t cb, void *user_data);
+typedef int (*CupsCopyDest)(cups_dest_t *dest, int num_dests,
+ cups_dest_t **dests);
typedef int (*CupsGetDests)(cups_dest_t **dests);
typedef void (*CupsFreeDests)(int num_dests, cups_dest_t *dests);
typedef const char* (*CupsGetPPD)(const char *printer);
+typedef const char* (*CupsGetPPD2)(http_t *http, const char *printer);
typedef int (*CupsMarkOptions)(ppd_file_t *ppd, int num_options, cups_option_t *options);
typedef ppd_file_t* (*PPDOpenFile)(const char *filename);
typedef void (*PPDMarkDefaults)(ppd_file_t *ppd);
@@ -66,12 +76,24 @@ typedef const char* (*CupsLangEncoding)(
typedef int (*CupsAddOption)(const char *name, const char *value, int num_options, cups_option_t **options);
typedef int (*CupsTempFd)(char *name, int len);
typedef int (*CupsPrintFile)(const char * name, const char * filename, const char * title, int num_options, cups_option_t * options);
+typedef int (*CupsPrintFile2)(http_t *http, const char *name, const char *filename, const char *title, int num_options, cups_option_t *options);
+
+typedef struct
+{
+ cups_dest_t *printers;
+ int num_printers;
+} EnumDestsContext;
static bool cupsLoaded = false;
static int qt_cups_num_printers = 0;
+static cups_dest_t *qt_cups_printers = 0;
+static CupsEnumDests _cupsEnumDests = 0;
+static CupsConnectDest _cupsConnectDest = 0;
+static CupsCopyDest _cupsCopyDest = 0;
static CupsGetDests _cupsGetDests = 0;
static CupsFreeDests _cupsFreeDests = 0;
static CupsGetPPD _cupsGetPPD = 0;
+static CupsGetPPD2 _cupsGetPPD2 = 0;
static PPDOpenFile _ppdOpenFile = 0;
static PPDMarkDefaults _ppdMarkDefaults = 0;
static PPDClose _ppdClose = 0;
@@ -84,14 +106,35 @@ static CupsLangEncoding _cupsLangEncodin
static CupsAddOption _cupsAddOption = 0;
static CupsTempFd _cupsTempFd = 0;
static CupsPrintFile _cupsPrintFile = 0;
+static CupsPrintFile2 _cupsPrintFile2 = 0;
+
+static int enum_dest_cb (void *user_data, unsigned flags, cups_dest_t *dest)
+{
+ EnumDestsContext *context = (EnumDestsContext *) user_data;
+
+ if ((flags & (CUPS_DEST_FLAGS_UNCONNECTED |
+ CUPS_DEST_FLAGS_REMOVED |
+ CUPS_DEST_FLAGS_ERROR |
+ CUPS_DEST_FLAGS_RESOLVING |
+ CUPS_DEST_FLAGS_CONNECTING |
+ CUPS_DEST_FLAGS_CANCELED)) == 0)
+ context->num_printers = _cupsCopyDest (dest, context->num_printers,
+ &context->printers);
+
+ return 1;
+}
static void resolveCups()
{
QLibrary cupsLib(QLatin1String("cups"), 2);
if(cupsLib.load()) {
+ _cupsEnumDests = (CupsEnumDests) cupsLib.resolve("cupsEnumDests");
+ _cupsConnectDest = (CupsConnectDest) cupsLib.resolve("cupsConnectDest");
+ _cupsCopyDest = (CupsCopyDest) cupsLib.resolve("cupsCopyDest");
_cupsGetDests = (CupsGetDests) cupsLib.resolve("cupsGetDests");
_cupsFreeDests = (CupsFreeDests) cupsLib.resolve("cupsFreeDests");
_cupsGetPPD = (CupsGetPPD) cupsLib.resolve("cupsGetPPD");
+ _cupsGetPPD2 = (CupsGetPPD2) cupsLib.resolve("cupsGetPPD2");
_cupsLangGet = (CupsLangGet) cupsLib.resolve("cupsLangGet");
_cupsLangEncoding = (CupsLangEncoding) cupsLib.resolve("cupsLangEncoding");
_ppdOpenFile = (PPDOpenFile) cupsLib.resolve("ppdOpenFile");
@@ -104,14 +147,27 @@ static void resolveCups()
_cupsAddOption = (CupsAddOption) cupsLib.resolve("cupsAddOption");
_cupsTempFd = (CupsTempFd) cupsLib.resolve("cupsTempFd");
_cupsPrintFile = (CupsPrintFile) cupsLib.resolve("cupsPrintFile");
+ _cupsPrintFile2 = (CupsPrintFile2) cupsLib.resolve("cupsPrintFile2");
- if (_cupsGetDests && _cupsFreeDests) {
- cups_dest_t *printers;
+ if (_cupsEnumDests && _cupsCopyDest &&
+ _cupsConnectDest && _cupsGetPPD2 &&
+ _cupsPrintFile2) {
+ EnumDestsContext context;
+ context.printers = 0;
+ context.num_printers = 0;
+ _cupsEnumDests(0, -1, 0, 0, 0,
+ enum_dest_cb, &context);
+
+ qt_cups_printers = context.printers;
+ qt_cups_num_printers = context.num_printers;
+ } else if (_cupsGetDests && _cupsFreeDests) {
+ cups_dest_t *printers;
int num_printers = _cupsGetDests(&printers);
- if (num_printers)
- _cupsFreeDests(num_printers, printers);
- qt_cups_num_printers = num_printers;
- }
+
+ if (num_printers)
+ _cupsFreeDests(num_printers, printers);
+ qt_cups_num_printers = num_printers;
+ }
}
cupsLoaded = true;
}
@@ -134,7 +190,15 @@ QCUPSSupport::QCUPSSupport()
return;
// Update the available printer count
- qt_cups_num_printers = prnCount = _cupsGetDests(&printers);
+ if (qt_cups_printers && _cupsCopyDest) {
+ int i;
+ for (i = 0; i < qt_cups_num_printers; ++i) {
+ prnCount = _cupsCopyDest (&qt_cups_printers[i],
+ prnCount,
+ &printers);
+ }
+ } else
+ qt_cups_num_printers = prnCount = _cupsGetDests(&printers);
for (int i = 0; i < prnCount; ++i) {
if (printers[i].is_default) {
@@ -188,7 +252,19 @@ const ppd_file_t* QCUPSSupport::setCurre
currPPD = 0;
page_sizes = 0;
- const char *ppdFile = _cupsGetPPD(printers[index].name);
+ const char *ppdFile = 0;
+ if (_cupsConnectDest && _cupsGetPPD2) {
+ char resource[HTTP_MAX_URI];
+ http_t *http = _cupsConnectDest (&printers[index], 0, -1, 0,
+ resource, sizeof (resource),
+ 0, 0);
+ if (http) {
+ char *name = strrchr (resource, '/');
+ if (name)
+ ppdFile = _cupsGetPPD2 (http, ++name);
+ }
+ } else
+ ppdFile = _cupsGetPPD(printers[index].name);
if (!ppdFile)
return 0;
@@ -343,7 +419,29 @@ bool QCUPSSupport::printerHasPPD(const c
{
if (!isAvailable())
return false;
- const char *ppdFile = _cupsGetPPD(printerName);
+
+ const char *ppdFile = 0;
+ if (_cupsConnectDest && _cupsGetPPD2) {
+ int i;
+ for (i = 0; i < prnCount; ++i)
+ if (!strcmp (printers[i].name, printerName))
+ break;
+
+ if (i == prnCount)
+ return false;
+
+ char resource[HTTP_MAX_URI];
+ http_t *http = _cupsConnectDest (&printers[i], 0, -1, 0,
+ resource, sizeof (resource),
+ 0, 0);
+ if (http) {
+ char *name = strrchr (resource, '/');
+ if (name)
+ ppdFile = _cupsGetPPD2 (http, ++name);
+ }
+ } else
+ ppdFile = _cupsGetPPD(printerName);
+
if (ppdFile)
unlink(ppdFile);
return (ppdFile != 0);
@@ -394,6 +492,26 @@ QPair<int, QString> QCUPSSupport::tempFd
int QCUPSSupport::printFile(const char * printerName, const char * filename, const char * title,
int num_options, cups_option_t * options)
{
+ if (_cupsConnectDest && _cupsPrintFile2) {
+ int i;
+ for (i = 0; i < prnCount; ++i)
+ if (!strcmp (printers[i].name, printerName))
+ break;
+
+ if (i != prnCount) {
+ char resource[HTTP_MAX_URI];
+ http_t *http = _cupsConnectDest (&printers[i], 0, -1, 0,
+ resource, sizeof (resource),
+ 0, 0);
+ if (http) {
+ char *name = strrchr (resource, '/');
+ if (name)
+ return _cupsPrintFile2 (http, ++name, filename, title,
+ num_options, options);
+ }
+ }
+ }
+
return _cupsPrintFile(printerName, filename, title, num_options, options);
}
diff -up qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups_p.h.cupsEnumDests qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups_p.h
--- qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups_p.h.cupsEnumDests 2012-11-23 10:09:53.000000000 +0000
+++ qt-everywhere-opensource-src-4.8.4/src/gui/painting/qcups_p.h 2013-07-03 15:27:24.733343017 +0100
@@ -92,7 +92,7 @@ public:
QStringList options() const;
- static bool printerHasPPD(const char *printerName);
+ bool printerHasPPD(const char *printerName);
QString unicodeString(const char *s);
diff -up qt-everywhere-opensource-src-4.8.4/src/gui/painting/qprinter.cpp.cupsEnumDests qt-everywhere-opensource-src-4.8.4/src/gui/painting/qprinter.cpp
--- qt-everywhere-opensource-src-4.8.4/src/gui/painting/qprinter.cpp.cupsEnumDests 2013-07-03 15:27:24.531342277 +0100
+++ qt-everywhere-opensource-src-4.8.4/src/gui/painting/qprinter.cpp 2013-07-03 15:27:24.733343017 +0100
@@ -844,7 +844,7 @@ void QPrinter::setPrinterName(const QStr
if(d->use_default_engine
&& d->outputFormat == QPrinter::NativeFormat) {
if (QCUPSSupport::cupsVersion() >= 10200
- && QCUPSSupport::printerHasPPD(name.toLocal8Bit().constData()))
+ && QCUPSSupport().printerHasPPD(name.toLocal8Bit().constData()))
setOutputFormat(QPrinter::PdfFormat);
else
setOutputFormat(QPrinter::PostScriptFormat);

13
libqt4-4.8.7-gcc8_qtscript.patch Normal file
View File

@ -0,0 +1,13 @@
diff -up qt-everywhere-opensource-src-4.8.7/src/script/script.pro.gcc8 qt-everywhere-opensource-src-4.8.7/src/script/script.pro
--- qt-everywhere-opensource-src-4.8.7/src/script/script.pro.gcc8 2015-05-07 09:14:43.000000000 -0500
+++ qt-everywhere-opensource-src-4.8.7/src/script/script.pro 2018-05-19 16:01:24.699926959 -0500
@@ -91,6 +91,9 @@ symbian {
TARGET.UID3=0x2001B2E1
}
+# hack around gcc8 optimization bug with -O2
+QMAKE_CXXFLAGS_RELEASE += -O1
+
symbian {
symbian-abld|symbian-sbsv2 {
MMP_RULES += ALWAYS_BUILD_AS_ARM

28
libqt4-4.8.7-icu59.patch Normal file
View File

@ -0,0 +1,28 @@
From: Fabian Vogt <fabian@ritter-vogt.de>
Subject: Fix build with ICU >= 59
ICU >= 59 requires C++11 for its header files.
Qt can't be compiled with -std=c++11 as a whole, so only enable
it for qlocale_icu.cpp.
Index: qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.pri
===================================================================
--- qt-everywhere-opensource-src-4.8.7.orig/src/corelib/tools/tools.pri
+++ qt-everywhere-opensource-src-4.8.7/src/corelib/tools/tools.pri
@@ -102,7 +102,15 @@ contains(QT_CONFIG, zlib):include($$PWD/
else:include($$PWD/../../3rdparty/zlib_dependency.pri)
contains(QT_CONFIG,icu) {
- SOURCES += tools/qlocale_icu.cpp
+ cpp11.name = cpp11
+ cpp11.input = SOURCES_CPP11
+ cpp11.dependency_type = TYPE_C
+ cpp11.variable_out = OBJECTS
+ cpp11.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_IN_BASE}$${first(QMAKE_EXT_OBJ)}
+ cpp11.commands = $${QMAKE_CXX} $(CXXFLAGS) -std=c++11 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+ QMAKE_EXTRA_COMPILERS += cpp11
+
+ SOURCES_CPP11 += tools/qlocale_icu.cpp
DEFINES += QT_USE_ICU
}

679
libqt4-4.8.7-openssl-1.1.patch
View File

@ -1,16 +1,6 @@
Description: Compile with openssl-1.1.0
* Most changes are related to openssl structures are now opaque.
* The network/ssl threading setup has been disabled because the
old openssl threading model has been removed and is apparently
no longer needed.
* A number of new functions had to be imported (see changes to
src/network/ssl/qsslsocket_openssl_symbols.cpp)
Author: Gert Wollny <gw.fossdev@gmail.com>
Last-Update: 2016-06-28
Bug-Debian: http://bugs.debian.org/828522
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslcertificate.cpp qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslcertificate.cpp
--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslcertificate.cpp 2015-05-07 16:14:44.000000000 +0200
+++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslcertificate.cpp 2018-01-05 17:44:16.997588265 +0100
@@ -259,10 +259,10 @@
QByteArray QSslCertificate::version() const
{
@ -72,8 +62,21 @@ Bug-Debian: http://bugs.debian.org/828522
q_EVP_PKEY_free(pkey);
return key;
}
--- a/src/network/ssl/qsslkey.cpp
+++ b/src/network/ssl/qsslkey.cpp
@@ -687,7 +696,11 @@
unsigned char *data = 0;
int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
info[QString::fromUtf8(obj)] = QString::fromUtf8((char*)data, size);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
q_CRYPTO_free(data);
+#else
+ q_CRYPTO_free(data, __FILE__, __LINE__);
+#endif
}
return info;
}
diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslkey.cpp qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslkey.cpp
--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslkey.cpp 2015-05-07 16:14:44.000000000 +0200
+++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslkey.cpp 2018-01-05 18:00:27.453937599 +0100
@@ -321,8 +321,19 @@
{
if (d->isNull)
@ -84,18 +87,19 @@ Bug-Debian: http://bugs.debian.org/828522
+#else
+ if (d->algorithm == QSsl::Rsa) {
+ return q_RSA_bits(d->rsa);
+ }else{
+ BIGNUM *p = NULL;
+ q_DSA_get0_pqg(d->dsa, &p, NULL, NULL);
+ return q_BN_num_bits(p);
+ } else {
+ const BIGNUM *p = (const BIGNUM *) NULL;
+ q_DSA_get0_pqg(d->dsa, &p, (const BIGNUM **) NULL, (const BIGNUM **) NULL);
+ return q_BN_num_bits(p);
+ }
+#endif
+
}
/*!
--- a/src/network/ssl/qsslsocket_openssl.cpp
+++ b/src/network/ssl/qsslsocket_openssl.cpp
diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl.cpp qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl.cpp
--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl.cpp 2015-05-07 16:14:44.000000000 +0200
+++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl.cpp 2018-01-05 12:06:06.336990956 +0100
@@ -93,6 +93,7 @@
bool QSslSocketPrivate::s_loadedCiphersAndCerts = false;
bool QSslSocketPrivate::s_loadRootCertsOnDemand = false;
@ -127,7 +131,7 @@ Bug-Debian: http://bugs.debian.org/828522
}
return ciph;
}
@@ -367,7 +373,7 @@
@@ -363,7 +369,7 @@
//
// See also: QSslContext::fromConfiguration()
if (caCertificate.expiryDate() >= QDateTime::currentDateTime()) {
@ -136,7 +140,7 @@ Bug-Debian: http://bugs.debian.org/828522
}
}
@@ -504,8 +510,10 @@
@@ -500,8 +506,10 @@
*/
void QSslSocketPrivate::deinitialize()
{
@ -147,7 +151,7 @@ Bug-Debian: http://bugs.debian.org/828522
}
/*!
@@ -526,13 +534,17 @@
@@ -522,13 +530,17 @@
return false;
// Check if the library itself needs to be initialized.
@ -165,7 +169,7 @@ Bug-Debian: http://bugs.debian.org/828522
if (q_SSL_library_init() != 1)
return false;
q_SSL_load_error_strings();
@@ -571,7 +583,9 @@
@@ -567,7 +579,9 @@
void QSslSocketPrivate::ensureCiphersAndCertsLoaded()
{
@ -176,7 +180,7 @@ Bug-Debian: http://bugs.debian.org/828522
if (s_loadedCiphersAndCerts)
return;
s_loadedCiphersAndCerts = true;
@@ -663,13 +677,18 @@
@@ -659,13 +673,18 @@
STACK_OF(SSL_CIPHER) *supportedCiphers = q_SSL_get_ciphers(mySsl);
for (int i = 0; i < q_sk_SSL_CIPHER_num(supportedCiphers); ++i) {
if (SSL_CIPHER *cipher = q_sk_SSL_CIPHER_value(supportedCiphers, i)) {
@ -196,9 +200,433 @@ Bug-Debian: http://bugs.debian.org/828522
}
}
--- a/src/network/ssl/qsslsocket_openssl_symbols_p.h
+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h
@@ -399,7 +399,25 @@
diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_p.h qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_p.h
--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_p.h 2015-05-07 16:14:44.000000000 +0200
+++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_p.h 2018-01-05 12:06:06.337990940 +0100
@@ -84,6 +84,10 @@
#include <openssl/tls1.h>
#endif
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#define OPENSSL_NO_SSL2
+#endif
+
#if OPENSSL_VERSION_NUMBER >= 0x10000000L
typedef _STACK STACK;
#endif
diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_symbols.cpp
--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp 2015-05-07 16:14:44.000000000 +0200
+++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_symbols.cpp 2018-01-05 17:59:10.636973932 +0100
@@ -111,16 +111,30 @@
DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return);
DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return)
DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return)
+#else
+DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return 0, return)
+#endif
DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return 0, return)
DEFINEFUNC3(int, BIO_read, BIO *a, a, void *b, b, int c, c, return -1, return)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
+#else
+DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
+#endif
DEFINEFUNC3(int, BIO_write, BIO *a, a, const void *b, b, int c, c, return -1, return)
DEFINEFUNC(int, BN_num_bits, const BIGNUM *a, a, return 0, return)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return)
DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG)
DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG)
+#endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
+#else
+DEFINEFUNC3(void, CRYPTO_free, void *a, a, const char *b, b, int c, c, return, DUMMYARG)
+#endif
DEFINEFUNC(void, DSA_free, DSA *a, a, return, DUMMYARG)
#if OPENSSL_VERSION_NUMBER < 0x00908000L
DEFINEFUNC3(X509 *, d2i_X509, X509 **a, a, unsigned char **b, b, long c, c, return 0, return)
@@ -157,6 +171,7 @@
DEFINEFUNC2(void, RAND_seed, const void *a, a, int b, b, return, DUMMYARG)
DEFINEFUNC(int, RAND_status, void, DUMMYARG, return -1, return)
DEFINEFUNC(void, RSA_free, RSA *a, a, return, DUMMYARG)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
DEFINEFUNC(int, sk_num, STACK *a, a, return -1, return)
DEFINEFUNC2(void, sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
#if OPENSSL_VERSION_NUMBER >= 0x10000000L
@@ -166,6 +181,12 @@
DEFINEFUNC(void, sk_free, STACK *a, a, return, DUMMYARG)
DEFINEFUNC2(char *, sk_value, STACK *a, a, int b, b, return 0, return)
#endif
+#else
+DEFINEFUNC(int, OPENSSL_sk_num, STACK *a, a, return -1, return)
+DEFINEFUNC2(void, OPENSSL_sk_pop_free, STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
+DEFINEFUNC(void, OPENSSL_sk_free, _STACK *a, a, return, DUMMYARG)
+DEFINEFUNC2(void *, OPENSSL_sk_value, STACK *a, a, int b, b, return 0, return)
+#endif
DEFINEFUNC(int, SSL_accept, SSL *a, a, return -1, return)
DEFINEFUNC(int, SSL_clear, SSL *a, a, return -1, return)
DEFINEFUNC3(char *, SSL_CIPHER_description, SSL_CIPHER *a, a, char *b, b, int c, c, return 0, return)
@@ -213,8 +234,12 @@
#else
DEFINEFUNC(long, SSL_get_verify_result, SSL *a, a, return -1, return)
#endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
DEFINEFUNC(int, SSL_library_init, void, DUMMYARG, return -1, return)
DEFINEFUNC(void, SSL_load_error_strings, void, DUMMYARG, return, DUMMYARG)
+#else
+DEFINEFUNC2(int, OPENSSL_init_ssl, uint64_t opts, opts, const OPENSSL_INIT_SETTINGS *settings, settings, return -1, return)
+#endif
DEFINEFUNC(SSL *, SSL_new, SSL_CTX *a, a, return 0, return)
#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, void *parg, parg, return -1, return)
@@ -229,13 +254,21 @@
DEFINEFUNC(const SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
#endif
DEFINEFUNC(const SSL_METHOD *, SSLv3_client_method, DUMMYARG, DUMMYARG, return 0, return)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
DEFINEFUNC(const SSL_METHOD *, SSLv23_client_method, DUMMYARG, DUMMYARG, return 0, return)
+#else
+DEFINEFUNC(const SSL_METHOD *, TLS_client_method, DUMMYARG, DUMMYARG, return 0, return)
+#endif
DEFINEFUNC(const SSL_METHOD *, TLSv1_client_method, DUMMYARG, DUMMYARG, return 0, return)
#ifndef OPENSSL_NO_SSL2
DEFINEFUNC(const SSL_METHOD *, SSLv2_server_method, DUMMYARG, DUMMYARG, return 0, return)
#endif
DEFINEFUNC(const SSL_METHOD *, SSLv3_server_method, DUMMYARG, DUMMYARG, return 0, return)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
DEFINEFUNC(const SSL_METHOD *, SSLv23_server_method, DUMMYARG, DUMMYARG, return 0, return)
+#else
+DEFINEFUNC(const SSL_METHOD *, TLS_server_method, DUMMYARG, DUMMYARG, return 0, return)
+#endif
DEFINEFUNC(const SSL_METHOD *, TLSv1_server_method, DUMMYARG, DUMMYARG, return 0, return)
#else
DEFINEFUNC(SSL_METHOD *, SSLv2_client_method, DUMMYARG, DUMMYARG, return 0, return)
@@ -274,7 +307,11 @@
DEFINEFUNC(int, X509_STORE_CTX_get_error, X509_STORE_CTX *a, a, return -1, return)
DEFINEFUNC(int, X509_STORE_CTX_get_error_depth, X509_STORE_CTX *a, a, return -1, return)
DEFINEFUNC(X509 *, X509_STORE_CTX_get_current_cert, X509_STORE_CTX *a, a, return 0, return)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get_chain, X509_STORE_CTX *a, a, return 0, return)
+#else
+DEFINEFUNC(STACK_OF(X509) *, X509_STORE_CTX_get0_chain, X509_STORE_CTX *a, a, return 0, return)
+#endif
DEFINEFUNC(X509_STORE_CTX *, X509_STORE_CTX_new, DUMMYARG, DUMMYARG, return 0, return)
#ifdef SSLEAY_MACROS
DEFINEFUNC2(int, i2d_DSAPrivateKey, const DSA *a, a, unsigned char **b, b, return -1, return)
@@ -282,10 +319,34 @@
DEFINEFUNC3(RSA *, d2i_RSAPrivateKey, RSA **a, a, unsigned char **b, b, long c, c, return 0, return)
DEFINEFUNC3(DSA *, d2i_DSAPrivateKey, DSA **a, a, unsigned char **b, b, long c, c, return 0, return)
#endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
DEFINEFUNC(void, OPENSSL_add_all_algorithms_noconf, void, DUMMYARG, return, DUMMYARG)
DEFINEFUNC(void, OPENSSL_add_all_algorithms_conf, void, DUMMYARG, return, DUMMYARG)
+#else
+DEFINEFUNC2(int, OPENSSL_init_crypto, uint64_t opts, opts, const OPENSSL_INIT_SETTINGS *settings, settings, return -1, return)
+#endif
DEFINEFUNC3(int, SSL_CTX_load_verify_locations, SSL_CTX *ctx, ctx, const char *CAfile, CAfile, const char *CApath, CApath, return 0, return)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
DEFINEFUNC(long, SSLeay, void, DUMMYARG, return 0, return)
+#else
+DEFINEFUNC(unsigned long, OpenSSL_version_num, void, DUMMYARG, return 0, return)
+#endif
+DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *ctx, ctx, return 0, return)
+
+DEFINEFUNC(ASN1_INTEGER *, X509_get_serialNumber, X509 *x, x, return 0, return)
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+DEFINEFUNC(int, EVP_PKEY_id, const EVP_PKEY *pkey, pkey, return 0, return)
+DEFINEFUNC(int, EVP_PKEY_base_id, const EVP_PKEY *pkey, pkey, return 0, return)
+DEFINEFUNC2(int, SSL_CIPHER_get_bits, const SSL_CIPHER *cipher, cipher, int *alg_bits, alg_bits, return 0, return)
+DEFINEFUNC2(long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, long options, options, return 0, return)
+DEFINEFUNC(long, X509_get_version, X509 *x, x, return 0, return)
+DEFINEFUNC(X509_PUBKEY *, X509_get_X509_PUBKEY, X509 *x, x, return 0, return)
+DEFINEFUNC(int, RSA_bits, const RSA *rsa, rsa, return 0, return)
+DEFINEFUNC(int, DSA_security_bits, const DSA *dsa, dsa, return 0, return)
+DEFINEFUNC(ASN1_TIME *, X509_getm_notAfter, X509 *x, x, return 0, return)
+DEFINEFUNC(ASN1_TIME *, X509_getm_notBefore, X509 *x, x, return 0, return)
+DEFINEFUNC4(void, DSA_get0_pqg, const DSA *d, d, const BIGNUM **p, p, const BIGNUM **q, q, const BIGNUM **g, g, return, return)
+#endif
#ifdef Q_OS_SYMBIAN
#define RESOLVEFUNC(func, ordinal, lib) \
@@ -580,7 +641,11 @@
static volatile bool symbolsResolved = false;
static volatile bool triedToResolveSymbols = false;
#ifndef QT_NO_THREAD
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
QMutexLocker locker(QMutexPool::globalInstanceGet((void *)&q_SSL_library_init));
+#else
+ QMutexLocker locker(QMutexPool::globalInstanceGet((void *)&q_OPENSSL_init_ssl));
+#endif
#endif
if (symbolsResolved)
return true;
@@ -614,9 +679,11 @@
RESOLVEFUNC(BIO_write, 269, libs.second )
RESOLVEFUNC(BN_num_bits, 387, libs.second )
RESOLVEFUNC(CRYPTO_free, 469, libs.second )
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
RESOLVEFUNC(CRYPTO_num_locks, 500, libs.second )
RESOLVEFUNC(CRYPTO_set_id_callback, 513, libs.second )
RESOLVEFUNC(CRYPTO_set_locking_callback, 516, libs.second )
+#endif
RESOLVEFUNC(DSA_free, 594, libs.second )
RESOLVEFUNC(ERR_error_string, 744, libs.second )
RESOLVEFUNC(ERR_get_error, 749, libs.second )
@@ -674,8 +741,10 @@
RESOLVEFUNC(SSL_get_peer_cert_chain, 117, libs.first )
RESOLVEFUNC(SSL_get_peer_certificate, 118, libs.first )
RESOLVEFUNC(SSL_get_verify_result, 132, libs.first )
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
RESOLVEFUNC(SSL_library_init, 137, libs.first )
RESOLVEFUNC(SSL_load_error_strings, 139, libs.first )
+#endif
RESOLVEFUNC(SSL_new, 140, libs.first )
#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
RESOLVEFUNC(SSL_ctrl, 95, libs.first )
@@ -747,9 +816,11 @@
RESOLVEFUNC(BIO_write)
RESOLVEFUNC(BN_num_bits)
RESOLVEFUNC(CRYPTO_free)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
RESOLVEFUNC(CRYPTO_num_locks)
RESOLVEFUNC(CRYPTO_set_id_callback)
RESOLVEFUNC(CRYPTO_set_locking_callback)
+#endif
RESOLVEFUNC(DSA_free)
RESOLVEFUNC(ERR_error_string)
RESOLVEFUNC(ERR_get_error)
@@ -779,10 +850,17 @@
RESOLVEFUNC(RAND_seed)
RESOLVEFUNC(RAND_status)
RESOLVEFUNC(RSA_free)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
RESOLVEFUNC(sk_free)
RESOLVEFUNC(sk_num)
RESOLVEFUNC(sk_pop_free)
RESOLVEFUNC(sk_value)
+#else
+ RESOLVEFUNC(OPENSSL_sk_free)
+ RESOLVEFUNC(OPENSSL_sk_num)
+ RESOLVEFUNC(OPENSSL_sk_pop_free)
+ RESOLVEFUNC(OPENSSL_sk_value)
+#endif
RESOLVEFUNC(SSL_CIPHER_description)
RESOLVEFUNC(SSL_CTX_check_private_key)
RESOLVEFUNC(SSL_CTX_ctrl)
@@ -797,6 +875,7 @@
RESOLVEFUNC(SSL_CTX_use_PrivateKey)
RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
+ RESOLVEFUNC(SSL_CTX_get_cert_store)
RESOLVEFUNC(SSL_accept)
RESOLVEFUNC(SSL_clear)
RESOLVEFUNC(SSL_connect)
@@ -807,8 +886,12 @@
RESOLVEFUNC(SSL_get_peer_cert_chain)
RESOLVEFUNC(SSL_get_peer_certificate)
RESOLVEFUNC(SSL_get_verify_result)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
RESOLVEFUNC(SSL_library_init)
RESOLVEFUNC(SSL_load_error_strings)
+#else
+ RESOLVEFUNC(OPENSSL_init_ssl)
+#endif
RESOLVEFUNC(SSL_new)
#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
RESOLVEFUNC(SSL_ctrl)
@@ -819,17 +902,47 @@
RESOLVEFUNC(SSL_set_connect_state)
RESOLVEFUNC(SSL_shutdown)
RESOLVEFUNC(SSL_write)
+
+ RESOLVEFUNC(X509_get_serialNumber)
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ RESOLVEFUNC(SSL_CTX_ctrl)
+ RESOLVEFUNC(EVP_PKEY_id)
+ RESOLVEFUNC(EVP_PKEY_base_id)
+ RESOLVEFUNC(SSL_CIPHER_get_bits)
+ RESOLVEFUNC(SSL_CTX_set_options)
+ RESOLVEFUNC(X509_get_version)
+ RESOLVEFUNC(X509_get_X509_PUBKEY)
+ RESOLVEFUNC(RSA_bits)
+ RESOLVEFUNC(DSA_security_bits)
+ RESOLVEFUNC(DSA_get0_pqg)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ RESOLVEFUNC(X509_get_notAfter)
+ RESOLVEFUNC(X509_get_notBefore)
+#else
+ RESOLVEFUNC(X509_getm_notAfter)
+ RESOLVEFUNC(X509_getm_notBefore)
+#endif
+#endif
+
#ifndef OPENSSL_NO_SSL2
RESOLVEFUNC(SSLv2_client_method)
#endif
RESOLVEFUNC(SSLv3_client_method)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
RESOLVEFUNC(SSLv23_client_method)
+#else
+ RESOLVEFUNC(TLS_client_method)
+#endif
RESOLVEFUNC(TLSv1_client_method)
#ifndef OPENSSL_NO_SSL2
RESOLVEFUNC(SSLv2_server_method)
#endif
RESOLVEFUNC(SSLv3_server_method)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
RESOLVEFUNC(SSLv23_server_method)
+#else
+ RESOLVEFUNC(TLS_server_method)
+#endif
RESOLVEFUNC(TLSv1_server_method)
RESOLVEFUNC(X509_NAME_entry_count)
RESOLVEFUNC(X509_NAME_get_entry)
@@ -846,7 +959,11 @@
RESOLVEFUNC(X509_STORE_CTX_get_error)
RESOLVEFUNC(X509_STORE_CTX_get_error_depth)
RESOLVEFUNC(X509_STORE_CTX_get_current_cert)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
RESOLVEFUNC(X509_STORE_CTX_get_chain)
+#else
+ RESOLVEFUNC(X509_STORE_CTX_get0_chain)
+#endif
RESOLVEFUNC(X509_cmp)
#ifndef SSLEAY_MACROS
RESOLVEFUNC(X509_dup)
@@ -867,10 +984,18 @@
RESOLVEFUNC(d2i_DSAPrivateKey)
RESOLVEFUNC(d2i_RSAPrivateKey)
#endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
RESOLVEFUNC(OPENSSL_add_all_algorithms_noconf)
RESOLVEFUNC(OPENSSL_add_all_algorithms_conf)
+#else
+ RESOLVEFUNC(OPENSSL_init_crypto)
+#endif
RESOLVEFUNC(SSL_CTX_load_verify_locations)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
RESOLVEFUNC(SSLeay)
+#else
+ RESOLVEFUNC(OpenSSL_version_num)
+#endif
#endif // Q_OS_SYMBIAN
symbolsResolved = true;
delete libs.first;
diff -ur qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols_p.h qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_symbols_p.h
--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols_p.h 2015-05-07 16:14:44.000000000 +0200
+++ qt-everywhere-opensource-src-4.8.7-openssl-1.1/src/network/ssl/qsslsocket_openssl_symbols_p.h 2018-01-05 17:59:42.041550255 +0100
@@ -207,16 +207,31 @@
int q_ASN1_STRING_to_UTF8(unsigned char **a, ASN1_STRING *b);
long q_BIO_ctrl(BIO *a, int b, long c, void *d);
int q_BIO_free(BIO *a);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
BIO *q_BIO_new(BIO_METHOD *a);
+#else
+BIO *q_BIO_new(const BIO_METHOD *a);
+#endif
BIO *q_BIO_new_mem_buf(void *a, int b);
int q_BIO_read(BIO *a, void *b, int c);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
BIO_METHOD *q_BIO_s_mem();
+#else
+const BIO_METHOD *q_BIO_s_mem();
+#endif
int q_BIO_write(BIO *a, const void *b, int c);
int q_BN_num_bits(const BIGNUM *a);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
int q_CRYPTO_num_locks();
void q_CRYPTO_set_locking_callback(void (*a)(int, int, const char *, int));
void q_CRYPTO_set_id_callback(unsigned long (*a)());
void q_CRYPTO_free(void *a);
+#else
+#define q_CRYPTO_num_locks() 1
+#define q_CRYPTO_set_locking_callback(a)
+#define q_CRYPTO_set_id_callback(a)
+void q_CRYPTO_free(void *a, const char *b, int c);
+#endif
void q_DSA_free(DSA *a);
#if OPENSSL_VERSION_NUMBER >= 0x00908000L
// 0.9.8 broke SC and BC by changing this function's signature.
@@ -258,6 +273,7 @@
void q_RAND_seed(const void *a, int b);
int q_RAND_status();
void q_RSA_free(RSA *a);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
int q_sk_num(STACK *a);
void q_sk_pop_free(STACK *a, void (*b)(void *));
#if OPENSSL_VERSION_NUMBER >= 0x10000000L
@@ -267,6 +283,16 @@
void q_sk_free(STACK *a);
char * q_sk_value(STACK *a, int b);
#endif
+#else
+int q_OPENSSL_sk_num(STACK *a);
+void q_OPENSSL_sk_pop_free(STACK *a, void (*b)(void *));
+void q_OPENSSL_sk_free(_STACK *a);
+void * q_OPENSSL_sk_value(STACK *a, int b);
+#define q_sk_num q_OPENSSL_sk_num
+#define q_sk_pop_free q_OPENSSL_sk_pop_free
+#define q_sk_free q_OPENSSL_sk_free
+#define q_sk_value q_OPENSSL_sk_value
+#endif
int q_SSL_accept(SSL *a);
int q_SSL_clear(SSL *a);
char *q_SSL_CIPHER_description(SSL_CIPHER *a, char *b, int c);
@@ -314,8 +340,14 @@
#else
long q_SSL_get_verify_result(SSL *a);
#endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
int q_SSL_library_init();
void q_SSL_load_error_strings();
+#else
+int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
+#define q_SSL_library_init() q_OPENSSL_init_ssl(0, (const OPENSSL_INIT_SETTINGS *) NULL)
+#define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, (const OPENSSL_INIT_SETTINGS *) NULL)
+#endif
SSL *q_SSL_new(SSL_CTX *a);
#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
long q_SSL_ctrl(SSL *ssl,int cmd, long larg, void *parg);
@@ -328,11 +360,21 @@
#if OPENSSL_VERSION_NUMBER >= 0x10000000L
const SSL_METHOD *q_SSLv2_client_method();
const SSL_METHOD *q_SSLv3_client_method();
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
const SSL_METHOD *q_SSLv23_client_method();
+#else
+const SSL_METHOD *q_TLS_client_method();
+#define q_SSLv23_client_method q_TLS_client_method
+#endif
const SSL_METHOD *q_TLSv1_client_method();
const SSL_METHOD *q_SSLv2_server_method();
const SSL_METHOD *q_SSLv3_server_method();
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
const SSL_METHOD *q_SSLv23_server_method();
+#else
+const SSL_METHOD *q_TLS_server_method();
+#define q_SSLv23_server_method q_TLS_server_method
+#endif
const SSL_METHOD *q_TLSv1_server_method();
#else
SSL_METHOD *q_SSLv2_client_method();
@@ -377,7 +419,12 @@
int q_X509_STORE_CTX_get_error(X509_STORE_CTX *ctx);
int q_X509_STORE_CTX_get_error_depth(X509_STORE_CTX *ctx);
X509 *q_X509_STORE_CTX_get_current_cert(X509_STORE_CTX *ctx);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
STACK_OF(X509) *q_X509_STORE_CTX_get_chain(X509_STORE_CTX *ctx);
+#else
+STACK_OF(X509) *q_X509_STORE_CTX_get0_chain(X509_STORE_CTX *ctx);
+#define q_X509_STORE_CTX_get_chain q_X509_STORE_CTX_get0_chain
+#endif
#define q_BIO_get_mem_data(b, pp) (int)q_BIO_ctrl(b,BIO_CTRL_INFO,0,(char *)pp)
#define q_BIO_pending(b) (int)q_BIO_ctrl(b,BIO_CTRL_PENDING,0,NULL)
@@ -399,7 +446,25 @@
PEM_ASN1_write_bio((int (*)(void*, unsigned char**))q_i2d_DSAPrivateKey,PEM_STRING_DSA,\
bp,(char *)x,enc,kstr,klen,cb,u)
#endif
@ -218,13 +646,13 @@ Bug-Debian: http://bugs.debian.org/828522
+X509_PUBKEY * q_X509_get_X509_PUBKEY(X509 *x);
+int q_RSA_bits(const RSA *rsa);
+int q_DSA_security_bits(const DSA *dsa);
+void q_DSA_get0_pqg(const DSA *d, BIGNUM **p, BIGNUM **q, BIGNUM **g);
+void q_DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g);
+#endif
+
#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
#define q_sk_GENERAL_NAME_num(st) q_SKM_sk_num(GENERAL_NAME, (st))
@@ -410,8 +428,15 @@
@@ -410,8 +475,17 @@
#define q_sk_SSL_CIPHER_value(st, i) q_SKM_sk_value(SSL_CIPHER, (st), (i))
#define q_SSL_CTX_add_extra_chain_cert(ctx,x509) \
q_SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509)
@ -233,177 +661,34 @@ Bug-Debian: http://bugs.debian.org/828522
#define q_X509_get_notAfter(x) X509_get_notAfter(x)
#define q_X509_get_notBefore(x) X509_get_notBefore(x)
+#else
+ASN1_TIME *q_X509_get_notAfter(X509 *x);
+ASN1_TIME *q_X509_get_notBefore(X509 *x);
+ASN1_TIME *q_X509_getm_notAfter(X509 *x);
+ASN1_TIME *q_X509_getm_notBefore(X509 *x);
+#define q_X509_get_notAfter(x) q_X509_getm_notAfter(x)
+#define q_X509_get_notBefore(x) q_X509_getm_notBefore(x)
+#endif
+
#define q_EVP_PKEY_assign_RSA(pkey,rsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_RSA,\
(char *)(rsa))
#define q_EVP_PKEY_assign_DSA(pkey,dsa) q_EVP_PKEY_assign((pkey),EVP_PKEY_DSA,\
--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -290,6 +290,22 @@
DEFINEFUNC(void, OPENSSL_add_all_algorithms_conf, void, DUMMYARG, return, DUMMYARG)
DEFINEFUNC3(int, SSL_CTX_load_verify_locations, SSL_CTX *ctx, ctx, const char *CAfile, CAfile, const char *CApath, CApath, return 0, return)
DEFINEFUNC(long, SSLeay, void, DUMMYARG, return 0, return)
+DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *ctx, ctx, return 0, return)
+
+DEFINEFUNC(ASN1_INTEGER *, X509_get_serialNumber, X509 *x, x, return 0, return)
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+DEFINEFUNC(int, EVP_PKEY_id, const EVP_PKEY *pkey, pkey, return 0, return)
+DEFINEFUNC(int, EVP_PKEY_base_id, const EVP_PKEY *pkey, pkey, return 0, return)
+DEFINEFUNC2(int, SSL_CIPHER_get_bits, const SSL_CIPHER *cipher, cipher, int *alg_bits, alg_bits, return 0, return)
+DEFINEFUNC2(long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, long options, options, return 0, return)
+DEFINEFUNC(long, X509_get_version, X509 *x, x, return 0, return)
+DEFINEFUNC(X509_PUBKEY *, X509_get_X509_PUBKEY, X509 *x, x, return 0, return)
+DEFINEFUNC(int, RSA_bits, const RSA *rsa, rsa, return 0, return)
+DEFINEFUNC(int, DSA_security_bits, const DSA *dsa, dsa, return 0, return)
+DEFINEFUNC(ASN1_TIME *, X509_get_notAfter, X509 *x, x, return 0, return)
+DEFINEFUNC(ASN1_TIME *, X509_get_notBefore, X509 *x, x, return 0, return)
+DEFINEFUNC4(void, DSA_get0_pqg, const DSA *d, d, BIGNUM **p, p, BIGNUM **q, q, BIGNUM **g, g, return, return)
+#endif
#ifdef Q_OS_SYMBIAN
#define RESOLVEFUNC(func, ordinal, lib) \
@@ -801,6 +817,7 @@
RESOLVEFUNC(SSL_CTX_use_PrivateKey)
RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
+ RESOLVEFUNC(SSL_CTX_get_cert_store)
RESOLVEFUNC(SSL_accept)
RESOLVEFUNC(SSL_clear)
RESOLVEFUNC(SSL_connect)
@@ -823,6 +840,23 @@
RESOLVEFUNC(SSL_set_connect_state)
RESOLVEFUNC(SSL_shutdown)
RESOLVEFUNC(SSL_write)
+
+ RESOLVEFUNC(X509_get_serialNumber)
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+ RESOLVEFUNC(SSL_CTX_ctrl)
+ RESOLVEFUNC(EVP_PKEY_id)
+ RESOLVEFUNC(EVP_PKEY_base_id)
+ RESOLVEFUNC(SSL_CIPHER_get_bits)
+ RESOLVEFUNC(SSL_CTX_set_options)
+ RESOLVEFUNC(X509_get_version)
+ RESOLVEFUNC(X509_get_X509_PUBKEY)
+ RESOLVEFUNC(RSA_bits)
+ RESOLVEFUNC(DSA_security_bits)
+ RESOLVEFUNC(DSA_get0_pqg)
+ RESOLVEFUNC(X509_get_notAfter)
+ RESOLVEFUNC(X509_get_notBefore)
+#endif
+
#ifndef OPENSSL_NO_SSL2
RESOLVEFUNC(SSLv2_client_method)
#endif
--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslkey.cpp.0131~ 2017-03-15 02:22:37.053244125 +0100
+++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslkey.cpp 2017-03-15 02:22:37.055244057 +0100
@@ -328,7 +328,7 @@ int QSslKey::length() const
if (d->algorithm == QSsl::Rsa) {
return q_RSA_bits(d->rsa);
}else{
- BIGNUM *p = NULL;
+ const BIGNUM *p = NULL;
q_DSA_get0_pqg(d->dsa, &p, NULL, NULL);
return q_BN_num_bits(p);
}
--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp.0131~ 2017-03-15 02:22:37.054244091 +0100
+++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols.cpp 2017-03-15 02:29:41.155236836 +0100
@@ -111,16 +111,16 @@ DEFINEFUNC(int, ASN1_STRING_length, ASN1
DEFINEFUNC2(int, ASN1_STRING_to_UTF8, unsigned char **a, a, ASN1_STRING *b, b, return 0, return);
DEFINEFUNC4(long, BIO_ctrl, BIO *a, a, int b, b, long c, c, void *d, d, return -1, return)
DEFINEFUNC(int, BIO_free, BIO *a, a, return 0, return)
-DEFINEFUNC(BIO *, BIO_new, BIO_METHOD *a, a, return 0, return)
+DEFINEFUNC(BIO *, BIO_new, const BIO_METHOD *a, a, return 0, return)
DEFINEFUNC2(BIO *, BIO_new_mem_buf, void *a, a, int b, b, return 0, return)
DEFINEFUNC3(int, BIO_read, BIO *a, a, void *b, b, int c, c, return -1, return)
-DEFINEFUNC(BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
+DEFINEFUNC(const BIO_METHOD *, BIO_s_mem, void, DUMMYARG, return 0, return)
DEFINEFUNC3(int, BIO_write, BIO *a, a, const void *b, b, int c, c, return -1, return)
DEFINEFUNC(int, BN_num_bits, const BIGNUM *a, a, return 0, return)
DEFINEFUNC(int, CRYPTO_num_locks, DUMMYARG, DUMMYARG, return 0, return)
DEFINEFUNC(void, CRYPTO_set_locking_callback, void (*a)(int, int, const char *, int), a, return, DUMMYARG)
DEFINEFUNC(void, CRYPTO_set_id_callback, unsigned long (*a)(), a, return, DUMMYARG)
-DEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)
+DEFINEFUNC(void, OPENSSL_free, void *a, a, return, DUMMYARG)
DEFINEFUNC(void, DSA_free, DSA *a, a, return, DUMMYARG)
#if OPENSSL_VERSION_NUMBER < 0x00908000L
DEFINEFUNC3(X509 *, d2i_X509, X509 **a, a, unsigned char **b, b, long c, c, return 0, return)
@@ -300,7 +300,7 @@ DEFINEFUNC(int, RSA_bits, const RSA *rs
DEFINEFUNC(int, DSA_security_bits, const DSA *dsa, dsa, return 0, return)
DEFINEFUNC(ASN1_TIME *, X509_get_notAfter, X509 *x, x, return 0, return)
DEFINEFUNC(ASN1_TIME *, X509_get_notBefore, X509 *x, x, return 0, return)
-DEFINEFUNC4(void, DSA_get0_pqg, const DSA *d, d, BIGNUM **p, p, BIGNUM **q, q, BIGNUM **g, g, return, return)
+DEFINEFUNC4(void, DSA_get0_pqg, const DSA *d, d, const BIGNUM **p, p, const BIGNUM **q, q, const BIGNUM **g, g, return, return)
#endif
#ifdef Q_OS_SYMBIAN
--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols_p.h.0131~ 2017-03-15 02:22:37.054244091 +0100
+++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslsocket_openssl_symbols_p.h 2017-03-15 02:29:50.192986268 +0100
@@ -59,6 +59,9 @@
QT_BEGIN_NAMESPACE
#define DUMMYARG
+#ifndef OPENSSL_NO_SSL2
+#define OPENSSL_NO_SSL2 1
+#endif
#if !defined QT_LINKED_OPENSSL
// **************** Shared declarations ******************
@@ -207,16 +210,16 @@ int q_ASN1_STRING_length(ASN1_STRING *a)
int q_ASN1_STRING_to_UTF8(unsigned char **a, ASN1_STRING *b);
long q_BIO_ctrl(BIO *a, int b, long c, void *d);
int q_BIO_free(BIO *a);
-BIO *q_BIO_new(BIO_METHOD *a);
+BIO *q_BIO_new(const BIO_METHOD *a);
BIO *q_BIO_new_mem_buf(void *a, int b);
int q_BIO_read(BIO *a, void *b, int c);
-BIO_METHOD *q_BIO_s_mem();
+const BIO_METHOD *q_BIO_s_mem();
int q_BIO_write(BIO *a, const void *b, int c);
int q_BN_num_bits(const BIGNUM *a);
int q_CRYPTO_num_locks();
void q_CRYPTO_set_locking_callback(void (*a)(int, int, const char *, int));
void q_CRYPTO_set_id_callback(unsigned long (*a)());
-void q_CRYPTO_free(void *a);
+void q_OPENSSL_free(void *a);
void q_DSA_free(DSA *a);
#if OPENSSL_VERSION_NUMBER >= 0x00908000L
// 0.9.8 broke SC and BC by changing this function's signature.
@@ -326,7 +329,6 @@ void q_SSL_set_accept_state(SSL *a);
void q_SSL_set_connect_state(SSL *a);
int q_SSL_shutdown(SSL *a);
#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-const SSL_METHOD *q_SSLv2_client_method();
const SSL_METHOD *q_SSLv3_client_method();
const SSL_METHOD *q_SSLv23_client_method();
const SSL_METHOD *q_TLSv1_client_method();
@@ -335,7 +337,6 @@ const SSL_METHOD *q_SSLv3_server_method(
const SSL_METHOD *q_SSLv23_server_method();
const SSL_METHOD *q_TLSv1_server_method();
@@ -421,10 +495,21 @@
#else
-SSL_METHOD *q_SSLv2_client_method();
SSL_METHOD *q_SSLv3_client_method();
SSL_METHOD *q_SSLv23_client_method();
SSL_METHOD *q_TLSv1_client_method();
@@ -415,7 +416,7 @@ long q_X509_get_version(X509 *x);
X509_PUBKEY * q_X509_get_X509_PUBKEY(X509 *x);
int q_RSA_bits(const RSA *rsa);
int q_DSA_security_bits(const DSA *dsa);
-void q_DSA_get0_pqg(const DSA *d, BIGNUM **p, BIGNUM **q, BIGNUM **g);
+void q_DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g);
#define q_OpenSSL_add_all_algorithms() q_OPENSSL_add_all_algorithms_noconf()
#endif
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
void q_OPENSSL_add_all_algorithms_noconf();
void q_OPENSSL_add_all_algorithms_conf();
+#else
+int q_OPENSSL_init_crypto(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
+#define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_INIT_ADD_ALL_DIGESTS | OPENSSL_INIT_LOAD_CONFIG, (const OPENSSL_INIT_SETTINGS *) NULL)
+# define q_OPENSSL_add_all_algorithms_noconf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS | OPENSSL_INIT_ADD_ALL_DIGESTS, (const OPENSSL_INIT_SETTINGS *) NULL)
+#endif
int q_SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile, const char *CApath);
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
long q_SSLeay();
+#else
+unsigned long q_OpenSSL_version_num();
+#define q_SSLeay q_OpenSSL_version_num
+#endif
#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
--- qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslcertificate.cpp.omv~ 2017-03-15 02:27:18.143322736 +0100
+++ qt-everywhere-opensource-src-4.8.7/src/network/ssl/qsslcertificate.cpp 2017-03-15 02:29:56.215819741 +0100
@@ -696,7 +696,7 @@
unsigned char *data = 0;
int size = q_ASN1_STRING_to_UTF8(&data, q_X509_NAME_ENTRY_get_data(e));
info[QString::fromUtf8(obj)] = QString::fromUtf8((char*)data, size);
- q_CRYPTO_free(data);
+ q_OPENSSL_free(data);
}
return info;
}
// Helper function
class QDateTime;

40
libqt4-4.8.7-qforeach.patch Normal file
View File

@ -0,0 +1,40 @@
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -2482,22 +2482,32 @@ typedef uint Flags;
#endif /* Q_NO_TYPESAFE_FLAGS */
-#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_RVCT)
+#if (defined(Q_CC_GNU) && !defined(Q_CC_RVCT))
/* make use of typeof-extension */
template <typename T>
class QForeachContainer {
public:
- inline QForeachContainer(const T& t) : c(t), brk(0), i(c.begin()), e(c.end()) { }
+ inline QForeachContainer(const T& t) : c(t), i(c.begin()), e(c.end()), control(1) { }
const T c;
int brk;
typename T::const_iterator i, e;
+ int control;
};
+// Explanation of the control word:
+// - it's initialized to 1
+// - that means both the inner and outer loops start
+// - if there were no breaks, at the end of the inner loop, it's set to 0, which
+// causes it to exit (the inner loop is run exactly once)
+// - at the end of the outer loop, it's inverted, so it becomes 1 again, allowing
+// the outer loop to continue executing
+// - if there was a break inside the inner loop, it will exit with control still
+// set to 1; in that case, the outer loop will invert it to 0 and will exit too
#define Q_FOREACH(variable, container) \
for (QForeachContainer<__typeof__(container)> _container_(container); \
- !_container_.brk && _container_.i != _container_.e; \
- __extension__ ({ ++_container_.brk; ++_container_.i; })) \
- for (variable = *_container_.i;; __extension__ ({--_container_.brk; break;}))
+ _container_.control && _container_.i != _container_.e; \
+ ++_container_.i, _container_.control ^= 1) \
+ for (variable = *_container_.i; _container_.control; _container_.control = 0)
#else

134
libqt4.spec
View File

@ -14,8 +14,6 @@
%define _qt4_translationdir %{_qt4_datadir}/translations
%define USE_DISTCC 0
#% define build_phonon 1
#% define build_openvg 1
%if "%{USE_DISTCC}" == "1"
%define DISTCC CC="ccache distcc" CXX="ccache distcc" -j 12
@ -23,7 +21,7 @@
Name: libqt4
Version: 4.8.7
Release: 6mamba
Release: 7mamba
Summary: A multiplatform, C++ GUI application development framework
Group: System/Libraries
Vendor: openmamba
@ -57,44 +55,49 @@ Patch10: libqt4-4.8.7-libboost-1.65.patch
Patch11: libqt4-4.8.7-QT_VERSION_CHECK.patch
Patch12: libqt4-4.8.7-icu-59.patch
Patch13: libqt4-4.8.7-openssl-1.1.patch
Patch14: libqt4-4.8.7-icu-63.patch
Patch14: libqt4-4.8.7-icu-63.patch
Patch15: libqt4-4.8.7-crash-in-qppmhandler.patch
Patch16: libqt4-4.8.7-gcc8_qtscript.patch
Patch17: libqt4-4.8.7-icu59.patch
Patch18: libqt4-4.8.7-cups-2.3.3.patch
Patch19: libqt4-4.8.7-cupsEnumDests.patch
Patch20: libqt4-4.8.7-qforeach.patch
Patch21: libqt4-4.8.7-assistant-force-no-webkit.patch
License: GPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: ldconfig
BuildRequires: libGL-devel
BuildRequires: libICE-devel
BuildRequires: libSM-devel
BuildRequires: libX11-devel
BuildRequires: libXext-devel
BuildRequires: libXfixes-devel
BuildRequires: libXinerama-devel
BuildRequires: libXrender-devel
BuildRequires: libXtst-devel
BuildRequires: libdbus-devel
BuildRequires: libexpat-devel
BuildRequires: libfontconfig-devel
BuildRequires: libfreetds-devel
BuildRequires: libfreetype-devel
BuildRequires: libgcc
BuildRequires: libGL-devel
BuildRequires: libglib-devel
BuildRequires: libGLU-devel
BuildRequires: libICE-devel
BuildRequires: libgst-plugins-base010-devel
BuildRequires: libgstreamer010-devel
BuildRequires: libjpeg-devel
BuildRequires: libmariadb-devel
BuildRequires: libmng-devel
BuildRequires: libmysql5-devel
BuildRequires: libodbc-devel
BuildRequires: libopenssl-devel
BuildRequires: libpng-devel
BuildRequires: libpostgresql-devel
BuildRequires: libSM-devel
%if "%{stage1}" != "1"
BuildRequires: libsqlite2-devel
%endif
BuildRequires: libqt-mobility-devel
BuildRequires: libsqlite-devel
BuildRequires: libsqlite2-devel
BuildRequires: libstdc++6-devel
BuildRequires: libtiff-devel
BuildRequires: libX11-devel
BuildRequires: libXcursor-devel
BuildRequires: libXext-devel
BuildRequires: libXfixes-devel
BuildRequires: libXinerama-devel
BuildRequires: libxml2-devel
BuildRequires: libXrandr-devel
BuildRequires: libXrender-devel
BuildRequires: libXtst-devel
BuildRequires: libz-devel
## AUTOBUILDREQ-END
BuildRequires: libicu-devel
@ -133,6 +136,7 @@ Provides: qt4-x11 = %{version}
Provides: libqt4
Obsoletes: libqt4
Requires: libicu
Requires: %{name}-common = %{?epoch:%epoch:}%{version}-%{release}
%description -n libQtCore
Qt sets the standard for high-performance, cross-platform application development.
@ -375,6 +379,7 @@ This package contains the Xml patterns library.
Group: Development/Libraries
Summary: Devel files for QT libraries
Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release}
Requires: %{name}-common = %{?epoch:%epoch:}%{version}-%{release}
Requires: libQtCore = %{?epoch:%epoch:}%{version}-%{release}
Requires: libQtDBus = %{?epoch:%epoch:}%{version}-%{release}
Requires: libQtDeclarative = %{?epoch:%epoch:}%{version}-%{release}
@ -424,6 +429,13 @@ It includes a C++ class library and tools for cross-platform development and int
This package contains the Accessibility plugin.
%package common
Group: System/Libraries
Summary: Qt4 common files
%description common
Qt4 common files.
%package demos
Group: Documentation
Summary: Qt4 demos
@ -557,6 +569,13 @@ Phonon development files for %{name}.
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
# qsslsocket_openssl_symbols.cpp:312:11: error: ‘_q_CRYPTO_free’ was not declared
sed -i "123iDEFINEFUNC(void, CRYPTO_free, void *a, a, return, DUMMYARG)" src/network/ssl/qsslsocket_openssl_symbols.cpp
@ -572,7 +591,7 @@ export PATH=$qtbuilddir/bin:$PATH
export MANPATH=$qtbuilddir/doc/man:$MANPATH
export LD_LIBRARY_PATH=$qtbuilddir/lib:$LD_LIBRARY_PATH
# workaround for class std::auto_ptr' is deprecated with gcc-6
export CXXFLAGS="%{optflags} -Wno-deprecated"
export CXXFLAGS="%{optflags} -std=gnu++98 -Wno-deprecated"
./configure \
-prefix %{_qt4_prefix} \
@ -607,30 +626,34 @@ export CXXFLAGS="%{optflags} -Wno-deprecated"
-xshape \
-xmlpatterns \
-opengl \
-openssl \
%{?build_phonon:-phonon -gstreamer} \
%{!?build_phonon:-no-phonon -no-gstreamer} \
%{!?build_openvg:-no-openvg} \
-openssl-linked \
-no-phonon \
-no-phonon-backend \
-no-openvg \
-qdbus \
-qvfb \
-sm \
-webkit \
-no-webkit \
-no-nas-sound \
-no-rpath \
-no-separate-debug-info \
-nomake demos \
-nomake examples \
-no-reduce-relocations \
-dbus-linked \
-little-endian -host-little-endian \
-plugin-sql-mysql \
-plugin-sql-psql \
-plugin-sql-sqlite << EOF
o
yes
EOF
# -reduce-relocations
-plugin-sql-sqlite \
-confirm-license -opensource
# -stl
# -tablet
# -plugin-sql-odbc
# fix xml libraries requirement
%make SUBLIBS=-lexpat %{?DISTCC}
%make
#SUBLIBS=-lexpat %{?DISTCC}
%make -C tools/qvfb
%install
@ -794,10 +817,22 @@ echo "\
%postun phonon -p /sbin/ldconfig
%endif
%files -n libQtCore
%files common
%defattr(-,root,root)
%{_qt4_libdir}/libQtCore.so.*
%{_sysconfdir}/xdg/menus/applications-merged/development-qt4.menu
%{_qt4_datadir}/phrasebooks/
%dir %{_qt4_translationdir}
%{_qt4_translationdir}/qt_*.qm
%{_qt4_translationdir}/qtconfig_*.qm
%{_qt4_translationdir}/qtscript_*.qm
#
%{_datadir}/icons/hicolor/*/apps/qt4-logo.png
%{_datadir}/desktop-directories/development-qt4.directory
%{_qt4_prefix}/LICENSE.GPL3
%doc LGPL_*.txt LICENSE.*
%files -n libQtCore
%{_qt4_libdir}/libQtCore.so.*
%if "%{_qt4_libdir}" != "%{_libdir}"
%dir %{_qt4_libdir}
%{_sysconfdir}/ld.so.conf.d/%{name}.conf
@ -812,22 +847,9 @@ echo "\
%{_qt4_plugindir}/imageformats/
%{_qt4_plugindir}/inputmethods/
%{_qt4_plugindir}/qmltooling/
%{_qt4_datadir}/phrasebooks/
%dir %{_qt4_translationdir}
%{_qt4_translationdir}/qt_*.qm
%{_qt4_translationdir}/qtconfig_*.qm
#
%{_datadir}/icons/hicolor/*/apps/qt4-logo.png
%{_datadir}/desktop-directories/development-qt4.directory
%{_qt4_prefix}/LICENSE.GPL3
%doc LGPL_*.txt LICENSE.* README
%files -n libQtDBus
%defattr(-,root,root)
%{_qt4_bindir}/qdbus
%{_qt4_bindir}/qdbuscpp2xml
%{_qt4_bindir}/qdbusxml2cpp
%{_qt4_bindir}/qdbusviewer
%{_qt4_libdir}/libQtDBus.so.*
%files -n libQt3Support
@ -886,7 +908,6 @@ echo "\
%files -n libQtScript
%defattr(-,root,root)
%{_qt4_libdir}/libQtScript.so.*
%{_qt4_translationdir}/qtscript_*.qm
%files -n libQtScriptTools
%defattr(-,root,root)
@ -953,10 +974,15 @@ echo "\
%{_qt4_bindir}/lupdate
%{_qt4_bindir}/moc
%{_qt4_bindir}/qcollectiongenerator
%{_qt4_bindir}/qdbus
%{_qt4_bindir}/qdbuscpp2xml*
%{_qt4_bindir}/qdbusxml2cpp*
%{_qt4_bindir}/qdbusviewer*
%{_qt4_bindir}/qhelpconverter
%{_qt4_bindir}/qhelpgenerator
%{_qt4_bindir}/qmake
%{_qt4_bindir}/qmlplugindump
%{_qt4_bindir}/qmake*
%{_qt4_bindir}/qt3to4
%{_qt4_bindir}/qttracereplay
%{_qt4_bindir}/rcc
@ -1080,6 +1106,7 @@ echo "\
%{_qt4_datadir}/mkspecs/
%{_qt4_datadir}/q3porting.xml
#
%doc README
%files apidocs
%defattr(-,root,root)
@ -1087,8 +1114,8 @@ echo "\
%files demos
%defattr(-,root,root)
%{_bindir}/qtdemo*
%{_qt4_bindir}/qtdemo
#%{_bindir}/qtdemo*
#%{_qt4_bindir}/qtdemo
%{_qt4_demosdir}/
%{_qt4_examplesdir}/
@ -1170,6 +1197,9 @@ echo "\
%endif
%changelog
* Wed Sep 16 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 4.8.7-7mamba
- rebuilt
* Sun Mar 17 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 4.8.7-6mamba
- fix of previous declared change
@ -1465,10 +1495,10 @@ echo "\
* Wed Sep 17 2003 Silvan Calarco <silvan.calarco@mambasoft.it> 3.2.1-1qilnx
- new version rebuild
* Tue Jul 18 2003 Silvan Calarco <silvan.calarco@qinet.it> 3.1.2-4qilnx
* Fri Jul 18 2003 Silvan Calarco <silvan.calarco@qinet.it> 3.1.2-4qilnx
- rebuild with postgresql plugin support
* Tue Jun 19 2003 Silvan Calarco <silvan.calarco@qinet.it> 3.1.2-3qilnx
* Thu Jun 19 2003 Silvan Calarco <silvan.calarco@qinet.it> 3.1.2-3qilnx
- added default profile in /etc/skel
* Sun May 25 2003 Silvan Calarco <silvan.calarco@qinet.it> 3.1.2-2qilnx