cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small fixes for clang 6, a few C++11 literals, some weird typing

Browse Source
This commit is contained in:
espie 2018-04-08 08:36:31 +00:00
parent 450f73d8f2
commit c167c0b5a3
7 changed files with 109 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
x11/qt3/patches/patch-qmake_generators_win32_borland_bmake_cpp Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-qmake_generators_win32_borland_bmake_cpp,v 1.1 2018/04/08 08:36:31 espie Exp $
Index: qmake/generators/win32/borland_bmake.cpp
--- qmake/generators/win32/borland_bmake.cpp.orig
+++ qmake/generators/win32/borland_bmake.cpp
@@ -383,7 +383,7 @@ BorlandMakefileGenerator::init()
if(project->isEmpty("QMAKE_INSTALL_DIR"))
project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)");
- bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qtmt"QTDLL_POSTFIX);
+ bool is_qt = (project->first("TARGET") == "qt" QTDLL_POSTFIX || project->first("TARGET") == "qtmt" QTDLL_POSTFIX);
QStringList &configs = project->variables()["CONFIG"];
if (project->isActiveConfig("shared"))
project->variables()["DEFINES"].append("QT_DLL");

14
x11/qt3/patches/patch-qmake_generators_win32_mingw_make_cpp Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-qmake_generators_win32_mingw_make_cpp,v 1.1 2018/04/08 08:36:31 espie Exp $
Index: qmake/generators/win32/mingw_make.cpp
--- qmake/generators/win32/mingw_make.cpp.orig
+++ qmake/generators/win32/mingw_make.cpp
@@ -394,7 +394,7 @@ MingwMakefileGenerator::init()
if(project->isEmpty("QMAKE_INSTALL_DIR"))
project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)");
- bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qt-mt"QTDLL_POSTFIX);
+ bool is_qt = (project->first("TARGET") == "qt" QTDLL_POSTFIX || project->first("TARGET") == "qt-mt" QTDLL_POSTFIX);
project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
// LIBS defined in Profile comes first for gcc

14
x11/qt3/patches/patch-qmake_generators_win32_msvc_dsp_cpp Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-qmake_generators_win32_msvc_dsp_cpp,v 1.1 2018/04/08 08:36:31 espie Exp $
Index: qmake/generators/win32/msvc_dsp.cpp
--- qmake/generators/win32/msvc_dsp.cpp.orig
+++ qmake/generators/win32/msvc_dsp.cpp
@@ -620,7 +620,7 @@ DspMakefileGenerator::init()
if ( project->variables()["QMAKESPEC"].isEmpty() )
project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") );
- bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qt-mt"QTDLL_POSTFIX);
+ bool is_qt = (project->first("TARGET") == "qt" QTDLL_POSTFIX || project->first("TARGET") == "qt-mt" QTDLL_POSTFIX);
project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
QStringList &configs = project->variables()["CONFIG"];

14
x11/qt3/patches/patch-qmake_generators_win32_msvc_nmake_cpp Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-qmake_generators_win32_msvc_nmake_cpp,v 1.1 2018/04/08 08:36:31 espie Exp $
Index: qmake/generators/win32/msvc_nmake.cpp
--- qmake/generators/win32/msvc_nmake.cpp.orig
+++ qmake/generators/win32/msvc_nmake.cpp
@@ -479,7 +479,7 @@ NmakeMakefileGenerator::init()
if(project->isEmpty("QMAKE_INSTALL_DIR"))
project->variables()["QMAKE_INSTALL_DIR"].append("$(COPY_DIR)");
- bool is_qt = (project->first("TARGET") == "qt"QTDLL_POSTFIX || project->first("TARGET") == "qt-mt"QTDLL_POSTFIX);
+ bool is_qt = (project->first("TARGET") == "qt" QTDLL_POSTFIX || project->first("TARGET") == "qt-mt" QTDLL_POSTFIX);
project->variables()["QMAKE_ORIG_TARGET"] = project->variables()["TARGET"];
QString targetfilename = project->variables()["TARGET"].first();

16
x11/qt3/patches/patch-qmake_generators_win32_msvc_vcproj_cpp Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-qmake_generators_win32_msvc_vcproj_cpp,v 1.1 2018/04/08 08:36:31 espie Exp $
Index: qmake/generators/win32/msvc_vcproj.cpp
--- qmake/generators/win32/msvc_vcproj.cpp.orig
+++ qmake/generators/win32/msvc_vcproj.cpp
@@ -1094,8 +1094,8 @@ void VcprojGenerator::initOld()
project->variables()["QMAKESPEC"].append( getenv("QMAKESPEC") );
bool is_qt =
- ( project->first("TARGET") == "qt"QTDLL_POSTFIX ||
- project->first("TARGET") == "qt-mt"QTDLL_POSTFIX );
+ ( project->first("TARGET") == "qt" QTDLL_POSTFIX ||
+ project->first("TARGET") == "qt-mt" QTDLL_POSTFIX );
QStringList &configs = project->variables()["CONFIG"];

22
x11/qt3/patches/patch-src_kernel_qdragobject_cpp
View File

@ -1,6 +1,9 @@
$OpenBSD: patch-src_kernel_qdragobject_cpp,v 1.3 2007/03/31 22:49:46 espie Exp $
--- src/kernel/qdragobject.cpp.orig Thu Oct 19 16:25:12 2006
+++ src/kernel/qdragobject.cpp Sat Mar 31 14:51:24 2007
$OpenBSD: patch-src_kernel_qdragobject_cpp,v 1.4 2018/04/08 08:36:31 espie Exp $
using shorts for colors is obviously me... (the <<8 is ill-defined)
just do it correctly with ushort.
Index: src/kernel/qdragobject.cpp
--- src/kernel/qdragobject.cpp.orig
+++ src/kernel/qdragobject.cpp
@@ -893,6 +893,16 @@ bool QTextDrag::decode( const QMimeSource* e, QString&
{
if(!e)
@ -18,3 +21,16 @@ $OpenBSD: patch-src_kernel_qdragobject_cpp,v 1.3 2007/03/31 22:49:46 espie Exp $
if ( e->cacheType == QMimeSource::Text ) {
str = *e->cache.txt.str;
@@ -1739,9 +1749,9 @@ QColorDrag::QColorDrag( QWidget *dragsource, const cha
void QColorDrag::setColor( const QColor &col )
{
- short r = (col.red() << 8) | col.red();
- short g = (col.green() << 8) | col.green();
- short b = (col.blue() << 8) | col.blue();
+ ushort r = (col.red() << 8) | col.red();
+ ushort g = (col.green() << 8) | col.green();
+ ushort b = (col.blue() << 8) | col.blue();
// make sure we transmit data in network order
r = htons(r);

18
x11/qt3/patches/patch-src_kernel_qgplugin_h Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-src_kernel_qgplugin_h,v 1.1 2018/04/08 08:36:31 espie Exp $
Index: src/kernel/qgplugin.h
--- src/kernel/qgplugin.h.orig
+++ src/kernel/qgplugin.h
@@ -79,9 +79,9 @@
# define Q_PLUGIN_VERIFICATION_DATA \
static const char *qt_ucm_verification_data = \
"pattern=""QT_UCM_VERIFICATION_DATA""\n" \
- "version="QT_VERSION_STR"\n" \
- "flags="Q_PLUGIN_FLAGS_STRING"\n" \
- "buildkey="QT_BUILD_KEY"\0";
+ "version=" QT_VERSION_STR "\n" \
+ "flags=" Q_PLUGIN_FLAGS_STRING "\n" \
+ "buildkey=" QT_BUILD_KEY "\0";
#endif // Q_PLUGIN_VERIFICATION_DATA
#define Q_PLUGIN_INSTANTIATE( IMPLEMENTATION ) \