pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
qt5-qtbase-git: First round of rediffing patches for 5.6
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Sun May 22 00:38:45 2016 +0200
Changeset: 5ab07b337100c9e61c67a4e944fae1ccfb691ff9
Modified Files:
qt5-qtbase-git/distinfo
qt5-qtbase-git/patches/patch-qmake_generators_makefile.cpp
qt5-qtbase-git/patches/patch-qmake_generators_unix_unixmake.cpp
qt5-qtbase-git/patches/patch-qmake_generators_unix_unixmake2.cpp
qt5-qtbase-git/patches/patch-src_corelib_io_qstorageinfo_unix.cpp
qt5-qtbase-git/patches/patch-src_network_kernel_qhostinfo__unix.cpp
Removed Files:
qt5-qtbase-git/patches/patch-mkspecs_features_mac_objective__c.prf
qt5-qtbase-git/patches/patch-mkspecs_features_qt__module__pris.prf
qt5-qtbase-git/patches/patch-src_platformsupport_devicediscovery_devicediscovery.pri
Log Message:
qt5-qtbase-git: First round of rediffing patches for 5.6
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5ab07b337100c9e61c67a4e944fae1ccfb691ff9
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
qt5-qtbase-git/distinfo | 13 ++---
.../patch-mkspecs_features_mac_objective__c.prf | 17 ------
.../patch-mkspecs_features_qt__module__pris.prf | 15 -----
.../patches/patch-qmake_generators_makefile.cpp | 6 +-
.../patch-qmake_generators_unix_unixmake.cpp | 67 +---------------------
.../patch-qmake_generators_unix_unixmake2.cpp | 22 ++-----
.../patch-src_corelib_io_qstorageinfo_unix.cpp | 13 +----
.../patch-src_network_kernel_qhostinfo__unix.cpp | 8 +--
...formsupport_devicediscovery_devicediscovery.pri | 12 ----
9 files changed, 19 insertions(+), 154 deletions(-)
diffs:
diff --git a/qt5-qtbase-git/distinfo b/qt5-qtbase-git/distinfo
index 4ad544c..179bbf8 100644
--- a/qt5-qtbase-git/distinfo
+++ b/qt5-qtbase-git/distinfo
@@ -7,13 +7,11 @@ Size (qtbase-opensource-src-5.5.1.tar.xz) = 46389212 bytes
SHA1 (patch-config.tests_unix_iconv_iconv.cpp) = 05131870b21ff778b1e6f3d1e7287060b6b88764
SHA1 (patch-configure) = 482815b5f3ec25fabe0995cfc70acf164928d192
SHA1 (patch-mkspecs_features_create__cmake.prf) = 3f6b3a592e29f5529e5c87dbac036c165470eac4
-SHA1 (patch-mkspecs_features_mac_objective__c.prf) = 20838861017d969fbcf171960dfc07db1bd5a177
-SHA1 (patch-mkspecs_features_qt__module__pris.prf) = edaab0b9e407cc52f4682ce1cf8441832c57fe39
SHA1 (patch-mkspecs_features_simd.prf) = 7dbe61df6252adebeac374e3541bc5ff4c93909b
SHA1 (patch-qmake_Makefile.unix) = 0b33fc32f493e23da25bfb38ad59a6ae550581e5
-SHA1 (patch-qmake_generators_makefile.cpp) = 08bdf7b58fb7e5bd2a1c31f0a0344c733b65acb3
-SHA1 (patch-qmake_generators_unix_unixmake.cpp) = f8d2b60473b19cfab76cca1b886f71030674099d
-SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 528d7ea009dd9dd698009d7797d0b23dd469d995
+SHA1 (patch-qmake_generators_makefile.cpp) = 5fbad79354a4cd0d8cb043450688e7e9dc99f12f
+SHA1 (patch-qmake_generators_unix_unixmake.cpp) = 8301da4c1c25a31e8bf64130f744d90f5d8254c6
+SHA1 (patch-qmake_generators_unix_unixmake2.cpp) = 0c69fda3c456af81ece1573d7dec99c53a83f47d
SHA1 (patch-qmake_qmake.pri) = 142f2b7d0dbfbc829afc9f83bf8be8b3054b8cf7
SHA1 (patch-src_concurrent_qtconcurrentiteratekernel.cpp) = 295cf573cf435e0edeeefb49144f84c7c6e7559c
SHA1 (patch-src_corelib_arch_sparc_arch.pri) = cb95ec1bb7aa6084f14dff5828854deed54b8ca1
@@ -22,10 +20,9 @@ SHA1 (patch-src_corelib_global_qsystemdetection.h) = 9bdf20f66818ca1dd2a825a7491
SHA1 (patch-src_corelib_io_io.pri) = 9a59b621441291f388860b523f80b59730632328
SHA1 (patch-src_corelib_io_qlockfile__unix.cpp) = 62274f5a0c114ef86460218b4de303901ab7d0e6
SHA1 (patch-src_corelib_io_qstandardpaths_unix.cpp) = de4b6c6be89524763e40698bcf5e8f413abdb938
-SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 41852cf146138df3fd0f26d124a6f9a338d472a0
-SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = 0335273353daa7c980ccb4febb6eed11b452e50d
+SHA1 (patch-src_corelib_io_qstorageinfo_unix.cpp) = 62227ae3b0d52a0946a342956a65b0dcaca8065c
+SHA1 (patch-src_network_kernel_qhostinfo__unix.cpp) = 2580c6aa53fd77f131b5369248f1e157a6c8c718
SHA1 (patch-src_openglextensions_openglextensions.pro) = e79effc1433ddda744b79d7e1f47764fee406580
-SHA1 (patch-src_platformsupport_devicediscovery_devicediscovery.pri) = 2cd24768b41c813d0aee0943f97f913308794611
SHA1 (patch-src_platformsupport_platformsupport.pro) = 2aa60936578458cf241ca893771897f7d34fe081
SHA1 (patch-src_plugins_platforminputcontexts_compose_compose.pro) = 86f828bd545fe53c626fde0a645213077b88ef64
SHA1 (patch-src_plugins_platforminputcontexts_compose_generator_qtablegenerator.cpp) = 98a715ce225fcf698cc8389adef82bb67be8310d
diff --git a/qt5-qtbase-git/patches/patch-mkspecs_features_mac_objective__c.prf b/qt5-qtbase-git/patches/patch-mkspecs_features_mac_objective__c.prf
deleted file mode 100644
index 4eaff31..0000000
--- a/qt5-qtbase-git/patches/patch-mkspecs_features_mac_objective__c.prf
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-mkspecs_features_mac_objective__c.prf,v 1.1 2014/12/30 17:23:46 adam Exp $
-
-Use LIBTOOL for objective-c sources.
-
---- mkspecs/features/mac/objective_c.prf.orig 2014-02-01 20:37:37.000000000 +0000
-+++ mkspecs/features/mac/objective_c.prf
-@@ -15,8 +15,8 @@ isEmpty(QMAKE_EXT_OBJECTIVE_C):QMAKE_EXT
-
- objective_c.dependency_type = TYPE_C
- objective_c.variables = QMAKE_OBJECTIVE_CFLAGS
--objective_c.commands = $$QMAKE_OBJECTIVE_CC -c $(QMAKE_COMP_QMAKE_OBJECTIVE_CFLAGS) $(DEFINES) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
--objective_c.output = $$OBJECTIVE_C_OBJECTS_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
-+objective_c.commands = $(LIBTOOL) --mode=compile $$QMAKE_OBJECTIVE_CC -c $(QMAKE_COMP_QMAKE_OBJECTIVE_CFLAGS) $(DEFINES) $(INCPATH) ${QMAKE_FILE_IN} -o $$OBJECTIVE_C_OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
-+objective_c.output = $$OBJECTIVE_C_OBJECTS_DIR/${QMAKE_FILE_BASE}.lo
- objective_c.input = OBJECTIVE_SOURCES
- objective_c.name = Compile ${QMAKE_FILE_IN}
- silent:objective_c.commands = @echo objective-c ${QMAKE_FILE_IN} && $$objective_c.commands
diff --git a/qt5-qtbase-git/patches/patch-mkspecs_features_qt__module__pris.prf b/qt5-qtbase-git/patches/patch-mkspecs_features_qt__module__pris.prf
deleted file mode 100644
index f47a6b4..0000000
--- a/qt5-qtbase-git/patches/patch-mkspecs_features_qt__module__pris.prf
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-mkspecs_features_qt__module__pris.prf,v 1.1 2014/12/30 17:23:46 adam Exp $
-
-* Build libtoolized shared libraries
-
---- mkspecs/features/qt_module_pris.prf.orig 2013-11-27 01:01:16.000000000 +0000
-+++ mkspecs/features/qt_module_pris.prf
-@@ -59,7 +59,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$
- else: \
- module_rundep =
- static: \
-- module_build_type = staticlib
-+ module_build_type =
- else:mac:contains(QT_CONFIG, qt_framework): \
- module_build_type = lib_bundle
- else: \
diff --git a/qt5-qtbase-git/patches/patch-qmake_generators_makefile.cpp b/qt5-qtbase-git/patches/patch-qmake_generators_makefile.cpp
index 2555884..25d9123 100644
--- a/qt5-qtbase-git/patches/patch-qmake_generators_makefile.cpp
+++ b/qt5-qtbase-git/patches/patch-qmake_generators_makefile.cpp
@@ -2,10 +2,10 @@ $NetBSD: patch-qmake_generators_makefile.cpp,v 1.2 2015/10/26 19:03:59 adam Exp
* Libtoolized
---- qmake/generators/makefile.cpp.orig 2015-06-29 20:03:22.000000000 +0000
+--- qmake/generators/makefile.cpp.orig 2016-05-20 00:28:32.000000000 +0000
+++ qmake/generators/makefile.cpp
-@@ -3256,7 +3256,7 @@ MakefileGenerator::writePkgConfigFile()
- pkgConfiglibName = "-framework " + bundle + " ";
+@@ -3290,7 +3290,7 @@ MakefileGenerator::writePkgConfigFile()
+ pkgConfiglibName = bundle.toQString();
} else {
if (!project->values("QMAKE_DEFAULT_LIBDIRS").contains(libDir))
- t << "-L${libdir} ";
diff --git a/qt5-qtbase-git/patches/patch-qmake_generators_unix_unixmake.cpp b/qt5-qtbase-git/patches/patch-qmake_generators_unix_unixmake.cpp
index 91dcdba..3f8819d 100644
--- a/qt5-qtbase-git/patches/patch-qmake_generators_unix_unixmake.cpp
+++ b/qt5-qtbase-git/patches/patch-qmake_generators_unix_unixmake.cpp
@@ -2,49 +2,9 @@ $NetBSD: patch-qmake_generators_unix_unixmake.cpp,v 1.3 2015/10/26 19:03:59 adam
* fix install target so that destdir is added when installing QMAKE_TARGET
---- qmake/generators/unix/unixmake.cpp.orig 2015-06-29 20:03:23.000000000 +0000
+--- qmake/generators/unix/unixmake.cpp.orig 2016-05-20 00:28:32.000000000 +0000
+++ qmake/generators/unix/unixmake.cpp
-@@ -326,27 +326,29 @@ UnixMakefileGenerator::init()
- if (!strncmp(libtoolify[i], "QMAKE_LINK", 10) || !strcmp(libtoolify[i], "QMAKE_AR_CMD")) {
- libtool_flags += " --mode=link";
- if(project->isActiveConfig("staticlib")) {
-- libtool_flags += " -static";
-+ comp_flags += " -static";
- } else {
- if(!project->isEmpty("QMAKE_LIB_FLAG")) {
-+ if(project->isActiveConfig("plugin"))
-+ comp_flags += " -avoid-version";
-+ else {
- int maj = project->first("VER_MAJ").toInt();
- int min = project->first("VER_MIN").toInt();
- int pat = project->first("VER_PAT").toInt();
-- comp_flags += " -version-info " + QString::number(10*maj + min) +
-- ":" + QString::number(pat) + ":0";
-+ comp_flags += " -version-info " + QString::number(maj + min) +
-+ ":" + QString::number(pat) +
-+ ":" + QString::number(min);
-+ }
- if (strcmp(libtoolify[i], "QMAKE_AR_CMD")) {
-- QString rpath = Option::output_dir;
-- if(!project->isEmpty("DESTDIR")) {
-- rpath = project->first("DESTDIR").toQString();
-- if(QDir::isRelativePath(rpath))
-- rpath.prepend(Option::output_dir + Option::dir_sep);
-- }
-+ QString rpath = Option::fixPathToTargetOS(project->first("target.path").toQString(), false);
-+ if(rpath.right(1) != Option::dir_sep)
-+ rpath += Option::dir_sep;
- comp_flags += " -rpath " + escapeFilePath(Option::fixPathToTargetOS(rpath, false));
- }
- }
- }
- if(project->isActiveConfig("plugin"))
-- libtool_flags += " -module";
-+ comp_flags += " -module";
- } else {
- libtool_flags += " --mode=compile";
- }
-@@ -705,7 +707,7 @@ UnixMakefileGenerator::defaultInstall(co
+@@ -541,7 +541,7 @@ UnixMakefileGenerator::defaultInstall(co
QString ret, destdir = project->first("DESTDIR").toQString();
if(!destdir.isEmpty() && destdir.right(1) != Option::dir_sep)
destdir += Option::dir_sep;
@@ -53,26 +13,3 @@ $NetBSD: patch-qmake_generators_unix_unixmake.cpp,v 1.3 2015/10/26 19:03:59 adam
if(targetdir.right(1) != Option::dir_sep)
targetdir += Option::dir_sep;
-@@ -745,10 +747,19 @@ UnixMakefileGenerator::defaultInstall(co
- QString src_targ = escapeFilePath(target);
- if(src_targ == "$(TARGET)")
- src_targ = "$(TARGETL)";
-- QString dst_dir = fileFixify(targetdir, FileFixifyAbsolute);
-+ QString dst_dir = targetdir;
- if(QDir::isRelativePath(dst_dir))
-- dst_dir = Option::fixPathToTargetOS(Option::output_dir + Option::dir_sep + dst_dir);
-- ret = "-$(LIBTOOL) --mode=install cp " + src_targ + ' ' + escapeFilePath(filePrefixRoot(root, dst_dir));
-+ dst_dir = Option::fixPathToTargetOS(dst_dir);
-+ dst_dir = Option::fixPathToTargetOS(dst_dir);
-+ if(!ret.isEmpty())
-+ ret += "\n\t";
-+ if(project->first("TEMPLATE") == "app") {
-+ ret += "-$(LIBTOOL) --mode=install cp \"" + Option::fixPathToTargetOS(destdir + src_targ, false) + "\" \"" + filePrefixRoot(root, dst_dir) + "\"";
-+ } else {
-+ ret += "-$(LIBTOOL) --mode=install cp \"" + src_targ + "\" \"" + filePrefixRoot(root, dst_dir) + "\"";
-+ }
-+ if(!uninst.isEmpty())
-+ uninst.append("\n\t");
- uninst.append("-$(LIBTOOL) --mode=uninstall " + src_targ);
- } else {
- QString src_targ = target;
diff --git a/qt5-qtbase-git/patches/patch-qmake_generators_unix_unixmake2.cpp b/qt5-qtbase-git/patches/patch-qmake_generators_unix_unixmake2.cpp
index 8d36558..bc9854c 100644
--- a/qt5-qtbase-git/patches/patch-qmake_generators_unix_unixmake2.cpp
+++ b/qt5-qtbase-git/patches/patch-qmake_generators_unix_unixmake2.cpp
@@ -2,9 +2,9 @@ $NetBSD: patch-qmake_generators_unix_unixmake2.cpp,v 1.2 2015/10/26 19:03:59 ada
* Libtoolized
---- qmake/generators/unix/unixmake2.cpp.orig 2015-06-29 20:03:23.000000000 +0000
+--- qmake/generators/unix/unixmake2.cpp.orig 2016-05-20 00:28:32.000000000 +0000
+++ qmake/generators/unix/unixmake2.cpp
-@@ -178,12 +178,12 @@ UnixMakefileGenerator::writeMakeParts(QT
+@@ -173,12 +173,12 @@ UnixMakefileGenerator::writeMakeParts(QT
t << "####### Compiler, tools and options\n\n";
t << "CC = " << var("QMAKE_CC") << endl;
t << "CXX = " << var("QMAKE_CXX") << endl;
@@ -21,7 +21,7 @@ $NetBSD: patch-qmake_generators_unix_unixmake2.cpp,v 1.2 2015/10/26 19:03:59 ada
{
QString isystem = var("QMAKE_CFLAGS_ISYSTEM");
const ProStringList &incs = project->values("INCLUDEPATH");
-@@ -207,8 +207,8 @@ UnixMakefileGenerator::writeMakeParts(QT
+@@ -202,8 +202,8 @@ UnixMakefileGenerator::writeMakeParts(QT
if(!project->isActiveConfig("staticlib")) {
t << "LINK = " << var("QMAKE_LINK") << endl;
@@ -32,7 +32,7 @@ $NetBSD: patch-qmake_generators_unix_unixmake2.cpp,v 1.2 2015/10/26 19:03:59 ada
<< fixLibFlags("QMAKE_LIBS_PRIVATE").join(' ') << endl;
}
-@@ -284,6 +284,8 @@ UnixMakefileGenerator::writeMakeParts(QT
+@@ -277,6 +277,8 @@ UnixMakefileGenerator::writeMakeParts(QT
if(!project->isEmpty("QMAKE_BUNDLE")) {
t << "TARGETD = " << fileVar("TARGET_x.y") << endl;
t << "TARGET0 = " << fileVar("TARGET_") << endl;
@@ -41,17 +41,3 @@ $NetBSD: patch-qmake_generators_unix_unixmake2.cpp,v 1.2 2015/10/26 19:03:59 ada
} else if (!project->isActiveConfig("unversioned_libname")) {
t << "TARGET0 = " << fileVar("TARGET_") << endl;
if (project->isEmpty("QMAKE_HPUX_SHLIB")) {
-@@ -1185,8 +1187,12 @@ void UnixMakefileGenerator::init2()
- } else if (project->isActiveConfig("staticlib")) {
- project->values("TARGET").first().prepend(project->first("QMAKE_PREFIX_STATICLIB"));
- project->values("TARGET").first() += "." + project->first("QMAKE_EXTENSION_STATICLIB");
-- if(project->values("QMAKE_AR_CMD").isEmpty())
-+ if(project->values("QMAKE_AR_CMD").isEmpty()) {
-+ if(project->isActiveConfig("compile_libtool"))
-+ project->variables()["QMAKE_AR_CMD"].append("$(CXX) -o $(TARGET) $(OBJECTS) $(OBJMOC)");
-+ else
- project->values("QMAKE_AR_CMD").append("$(AR) $(TARGET) $(OBJECTS)");
-+ }
- } else {
- project->values("TARGETA").append(project->first("DESTDIR") + project->first("QMAKE_PREFIX_STATICLIB")
- + project->first("TARGET") + "." + project->first("QMAKE_EXTENSION_STATICLIB"));
diff --git a/qt5-qtbase-git/patches/patch-src_corelib_io_qstorageinfo_unix.cpp b/qt5-qtbase-git/patches/patch-src_corelib_io_qstorageinfo_unix.cpp
index 7490a06..8febe62 100644
--- a/qt5-qtbase-git/patches/patch-src_corelib_io_qstorageinfo_unix.cpp
+++ b/qt5-qtbase-git/patches/patch-src_corelib_io_qstorageinfo_unix.cpp
@@ -3,19 +3,8 @@ $NetBSD: patch-src_corelib_io_qstorageinfo_unix.cpp,v 1.5 2015/10/26 19:03:59 ad
* make statvfs available on non-NetBSD BSD platforms
* fix build on SunOS
---- src/corelib/io/qstorageinfo_unix.cpp.orig 2015-10-13 04:35:31.000000000 +0000
+--- src/corelib/io/qstorageinfo_unix.cpp.orig 2016-05-20 00:28:32.000000000 +0000
+++ src/corelib/io/qstorageinfo_unix.cpp
-@@ -68,8 +68,8 @@
-
- #if defined(Q_OS_BSD4)
- # if defined(Q_OS_NETBSD)
-- define QT_STATFSBUF struct statvfs
-- define QT_STATFS ::statvfs
-+# define QT_STATFSBUF struct statvfs
-+# define QT_STATFS ::statvfs
- # else
- # define QT_STATFSBUF struct statfs
- # define QT_STATFS ::statfs
@@ -78,7 +78,7 @@
# if !defined(ST_RDONLY)
# define ST_RDONLY MNT_RDONLY
diff --git a/qt5-qtbase-git/patches/patch-src_network_kernel_qhostinfo__unix.cpp b/qt5-qtbase-git/patches/patch-src_network_kernel_qhostinfo__unix.cpp
index 890ce83..665edcf 100644
--- a/qt5-qtbase-git/patches/patch-src_network_kernel_qhostinfo__unix.cpp
+++ b/qt5-qtbase-git/patches/patch-src_network_kernel_qhostinfo__unix.cpp
@@ -1,13 +1,13 @@
$NetBSD: patch-src_network_kernel_qhostinfo__unix.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $
---- src/network/kernel/qhostinfo_unix.cpp.orig 2013-11-27 01:01:10.000000000 +0000
+--- src/network/kernel/qhostinfo_unix.cpp.orig 2016-05-20 00:28:33.000000000 +0000
+++ src/network/kernel/qhostinfo_unix.cpp
-@@ -126,6 +126,8 @@ static void resolveLibrary()
+@@ -117,6 +117,8 @@ static bool resolveLibraryInternal()
if (!local_res_nclose)
local_res_ninit = 0;
}
+ if (local_res_ninit)
-+ local_res_init = 0;
++ local_res_ninit = 0;
#endif
- }
+ return true;
diff --git a/qt5-qtbase-git/patches/patch-src_platformsupport_devicediscovery_devicediscovery.pri b/qt5-qtbase-git/patches/patch-src_platformsupport_devicediscovery_devicediscovery.pri
deleted file mode 100644
index 222962c..0000000
--- a/qt5-qtbase-git/patches/patch-src_platformsupport_devicediscovery_devicediscovery.pri
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-src_platformsupport_devicediscovery_devicediscovery.pri,v 1.1 2015/10/26 19:03:59 adam Exp $
-
-Add missing header; required when libQt5PlatformSupport is a shared library.
-
---- src/platformsupport/devicediscovery/devicediscovery.pri.orig 2015-10-25 19:25:35.000000000 +0000
-+++ src/platformsupport/devicediscovery/devicediscovery.pri
-@@ -15,4 +15,5 @@ linux {
- }
- } else {
- SOURCES += $$PWD/qdevicediscovery_dummy.cpp
-+ HEADERS += $$PWD/qdevicediscovery_dummy_p.h
- }
Home |
Main Index |
Thread Index |
Old Index