From a7cb3a79adfeb2a4fa68e7cd22a0f5a96b8af3e8 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 29 Nov 2014 19:49:12 +0000 Subject: [PATCH] qbs: Use git and git am --- ...osinfo.h-to-installed-headers.1.3.2.patch} | 10 +++--- ...h => 0002-WIP-Xcode-generator.1.3.2.patch} | 32 +++++++++--------- ...add-generator-header-installs.1.3.2.patch} | 10 +++--- ....a-for-mingw-import-libraries.1.3.2.patch} | 18 +++++++--- ...lchains-Pretend-msys-is-mingw.1.3.2.patch} | 24 +++++++++++--- mingw-w64-qbs/PKGBUILD | 33 ++++++++++--------- 6 files changed, 77 insertions(+), 50 deletions(-) rename mingw-w64-qbs/{0001-add-hostosinfo.h-to-installed-headers.patch => 0001-add-hostosinfo.h-to-installed-headers.1.3.2.patch} (76%) rename mingw-w64-qbs/{0002-WIP-Xcode-generator.patch => 0002-WIP-Xcode-generator.1.3.2.patch} (99%) rename mingw-w64-qbs/{0003-add-generator-header-installs.patch => 0003-add-generator-header-installs.1.3.2.patch} (84%) rename mingw-w64-qbs/{0005-shared-vs-static-extension.patch => 0004-Use-.dll.a-instead-of-.a-for-mingw-import-libraries.1.3.2.patch} (58%) rename mingw-w64-qbs/{0006-probe-pretend-msys-is-mingw.patch => 0005-setup-toolchains-Pretend-msys-is-mingw.1.3.2.patch} (57%) diff --git a/mingw-w64-qbs/0001-add-hostosinfo.h-to-installed-headers.patch b/mingw-w64-qbs/0001-add-hostosinfo.h-to-installed-headers.1.3.2.patch similarity index 76% rename from mingw-w64-qbs/0001-add-hostosinfo.h-to-installed-headers.patch rename to mingw-w64-qbs/0001-add-hostosinfo.h-to-installed-headers.1.3.2.patch index 0e4f6924e8..ec798b3a92 100644 --- a/mingw-w64-qbs/0001-add-hostosinfo.h-to-installed-headers.patch +++ b/mingw-w64-qbs/0001-add-hostosinfo.h-to-installed-headers.1.3.2.patch @@ -1,7 +1,7 @@ -From 30f0eea92b5ec0029abf02885c42ce04d2aa1772 Mon Sep 17 00:00:00 2001 +From 59a55dac90256bf657283ef80223871dcadef493 Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Mon, 18 Aug 2014 12:19:52 +0100 -Subject: [PATCH 1/3] add hostosinfo.h to installed headers +Subject: [PATCH 1/5] add hostosinfo.h to installed headers .. if you build Qt Creator with system qbs then this header is needed by: @@ -11,10 +11,10 @@ src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp 1 file changed, 1 insertion(+) diff --git a/src/lib/corelib/tools/tools.pri b/src/lib/corelib/tools/tools.pri -index 8171f42..0dfe50f 100644 +index a05efa8..5b497aa 100644 --- a/src/lib/corelib/tools/tools.pri +++ b/src/lib/corelib/tools/tools.pri -@@ -72,6 +72,7 @@ qbs_enable_unit_tests { +@@ -75,6 +75,7 @@ all_tests { $$PWD/cleanoptions.h \ $$PWD/codelocation.h \ $$PWD/error.h \ @@ -23,5 +23,5 @@ index 8171f42..0dfe50f 100644 $$PWD/preferences.h \ $$PWD/profile.h \ -- -2.1.0 +2.1.3 diff --git a/mingw-w64-qbs/0002-WIP-Xcode-generator.patch b/mingw-w64-qbs/0002-WIP-Xcode-generator.1.3.2.patch similarity index 99% rename from mingw-w64-qbs/0002-WIP-Xcode-generator.patch rename to mingw-w64-qbs/0002-WIP-Xcode-generator.1.3.2.patch index 27984e7113..eecc46c935 100644 --- a/mingw-w64-qbs/0002-WIP-Xcode-generator.patch +++ b/mingw-w64-qbs/0002-WIP-Xcode-generator.1.3.2.patch @@ -1,7 +1,7 @@ -From f3258a17f49b03418ba73baaa5ae1246a1f9d11a Mon Sep 17 00:00:00 2001 +From 02087c6e60eb5a921b0d16c512c8ee2da6acaa82 Mon Sep 17 00:00:00 2001 From: Jake Petroules -Date: Thu, 9 Jan 2014 09:00:47 -0500 -Subject: [PATCH 2/3] WIP: Xcode generator. +Date: Sat, 29 Nov 2014 18:12:45 +0000 +Subject: [PATCH 2/5] WIP: Xcode generator. Task-number: QBS-32 @@ -136,7 +136,7 @@ Change-Id: I5ce5cc3148aa801d75a1f64b778fe7334de43af9 create mode 100644 src/plugins/generator/xcode/xcodesimplegenerator.h diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp -index 5ecd22f..039b2a7 100644 +index 39ecdd3..0ecae03 100644 --- a/src/app/qbs/commandlinefrontend.cpp +++ b/src/app/qbs/commandlinefrontend.cpp @@ -38,6 +38,7 @@ @@ -147,7 +147,7 @@ index 5ecd22f..039b2a7 100644 #include #include -@@ -326,6 +327,9 @@ void CommandLineFrontend::handleProjectsResolved() +@@ -331,6 +332,9 @@ void CommandLineFrontend::handleProjectsResolved() if (m_cancelStatus != CancelStatusNone) throw ErrorInfo(Tr::tr("Execution canceled.")); switch (m_parser.command()) { @@ -157,7 +157,7 @@ index 5ecd22f..039b2a7 100644 case ResolveCommandType: qApp->quit(); break; -@@ -445,6 +449,29 @@ void CommandLineFrontend::build() +@@ -451,6 +455,29 @@ void CommandLineFrontend::build() m_currentBuildEffort = 0; } @@ -600,7 +600,7 @@ index 0000000..7f8ba97 + +#endif // QBS_GENERATOR_H diff --git a/src/lib/corelib/api/project.cpp b/src/lib/corelib/api/project.cpp -index 0bf6a9f..a9102f1 100644 +index 6e0dd8f..66da874 100644 --- a/src/lib/corelib/api/project.cpp +++ b/src/lib/corelib/api/project.cpp @@ -54,6 +54,7 @@ @@ -611,7 +611,7 @@ index 0bf6a9f..a9102f1 100644 #include #include #include -@@ -90,6 +91,7 @@ static void loadPlugins(const QStringList &_pluginPaths, const Logger &logger) +@@ -94,6 +95,7 @@ static void loadPlugins(const QStringList &_pluginPaths, const Logger &logger) pluginPaths << pluginPath; } } @@ -620,7 +620,7 @@ index 0bf6a9f..a9102f1 100644 qRegisterMetaType("qbs::ErrorInfo"); diff --git a/src/lib/corelib/qbs.h b/src/lib/corelib/qbs.h -index 6749fdb..7d1d238 100644 +index c71d9b9..7eba37b 100644 --- a/src/lib/corelib/qbs.h +++ b/src/lib/corelib/qbs.h @@ -29,6 +29,7 @@ @@ -631,7 +631,7 @@ index 6749fdb..7d1d238 100644 #include "api/jobs.h" #include "api/languageinfo.h" #include "api/project.h" -@@ -37,6 +38,7 @@ +@@ -38,6 +39,7 @@ #include "tools/buildoptions.h" #include "tools/cleanoptions.h" #include "tools/error.h" @@ -1024,10 +1024,10 @@ index 8bf43d2..fd23faa 100644 if (!lib->load()) { logger.qbsWarning() << Tr::tr("Pluginmanager: Cannot load plugin '%1': %2") diff --git a/src/lib/corelib/tools/tools.pri b/src/lib/corelib/tools/tools.pri -index 0dfe50f..85175b3 100644 +index 5b497aa..5008738 100644 --- a/src/lib/corelib/tools/tools.pri +++ b/src/lib/corelib/tools/tools.pri -@@ -6,6 +6,8 @@ HEADERS += \ +@@ -7,6 +7,8 @@ HEADERS += \ $$PWD/error.h \ $$PWD/fileinfo.h \ $$PWD/filetime.h \ @@ -1036,7 +1036,7 @@ index 0dfe50f..85175b3 100644 $$PWD/id.h \ $$PWD/persistence.h \ $$PWD/scannerpluginmanager.h \ -@@ -35,6 +37,8 @@ SOURCES += \ +@@ -37,6 +39,8 @@ SOURCES += \ $$PWD/codelocation.cpp \ $$PWD/error.cpp \ $$PWD/fileinfo.cpp \ @@ -4591,7 +4591,7 @@ index 0000000..e2bc712 +#endif // QBS_XCODEGENERATOR_H diff --git a/src/plugins/generator/xcode/xcodenativegenerator.cpp b/src/plugins/generator/xcode/xcodenativegenerator.cpp new file mode 100644 -index 0000000..ef6f0f3 +index 0000000..5457c3f --- /dev/null +++ b/src/plugins/generator/xcode/xcodenativegenerator.cpp @@ -0,0 +1,136 @@ @@ -4792,7 +4792,7 @@ index 0000000..d964b94 +#endif // QBS_XCODENATIVEGENERATOR_H diff --git a/src/plugins/generator/xcode/xcodesimplegenerator.cpp b/src/plugins/generator/xcode/xcodesimplegenerator.cpp new file mode 100644 -index 0000000..7bd9b05 +index 0000000..306d46d --- /dev/null +++ b/src/plugins/generator/xcode/xcodesimplegenerator.cpp @@ -0,0 +1,275 @@ @@ -5139,5 +5139,5 @@ index d3823ae..9fe2e6b 100644 -SUBDIRS = scanner +SUBDIRS = generator scanner -- -2.1.0 +2.1.3 diff --git a/mingw-w64-qbs/0003-add-generator-header-installs.patch b/mingw-w64-qbs/0003-add-generator-header-installs.1.3.2.patch similarity index 84% rename from mingw-w64-qbs/0003-add-generator-header-installs.patch rename to mingw-w64-qbs/0003-add-generator-header-installs.1.3.2.patch index d54679ebc6..fcf391bffb 100644 --- a/mingw-w64-qbs/0003-add-generator-header-installs.patch +++ b/mingw-w64-qbs/0003-add-generator-header-installs.1.3.2.patch @@ -1,7 +1,7 @@ -From 0d6026fc1cc2dcbd9446af340f84cb2c614ae134 Mon Sep 17 00:00:00 2001 +From 987ef4db561f6629e7a44b818de71d866ba746bc Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Mon, 18 Aug 2014 00:12:36 +0100 -Subject: [PATCH 3/3] add generator header installs +Subject: [PATCH 3/5] add generator header installs --- src/lib/corelib/api/api.pri | 1 + @@ -21,10 +21,10 @@ index 9b2fb38..e31ea57 100644 api_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/api INSTALLS += api_headers diff --git a/src/lib/corelib/tools/tools.pri b/src/lib/corelib/tools/tools.pri -index 85175b3..f3c3e09 100644 +index 5008738..9e361e1 100644 --- a/src/lib/corelib/tools/tools.pri +++ b/src/lib/corelib/tools/tools.pri -@@ -84,6 +84,7 @@ qbs_enable_unit_tests { +@@ -87,6 +87,7 @@ all_tests { $$PWD/qbs_export.h \ $$PWD/buildoptions.h \ $$PWD/installoptions.h \ @@ -33,5 +33,5 @@ index 85175b3..f3c3e09 100644 tools_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/tools INSTALLS += tools_headers -- -2.1.0 +2.1.3 diff --git a/mingw-w64-qbs/0005-shared-vs-static-extension.patch b/mingw-w64-qbs/0004-Use-.dll.a-instead-of-.a-for-mingw-import-libraries.1.3.2.patch similarity index 58% rename from mingw-w64-qbs/0005-shared-vs-static-extension.patch rename to mingw-w64-qbs/0004-Use-.dll.a-instead-of-.a-for-mingw-import-libraries.1.3.2.patch index f9292d45ae..820c5db21b 100644 --- a/mingw-w64-qbs/0005-shared-vs-static-extension.patch +++ b/mingw-w64-qbs/0004-Use-.dll.a-instead-of-.a-for-mingw-import-libraries.1.3.2.patch @@ -1,8 +1,17 @@ +From de2494323ad1397962936f48181335cf3682b180 Mon Sep 17 00:00:00 2001 +From: Ray Donnelly +Date: Sat, 29 Nov 2014 18:20:12 +0000 +Subject: [PATCH 4/5] Use .dll.a instead of .a for mingw* import libraries + +--- + src/lib/qtprofilesetup/qtmoduleinfo.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/src/lib/qtprofilesetup/qtmoduleinfo.cpp b/src/lib/qtprofilesetup/qtmoduleinfo.cpp -index e55cd0c..88f68d9 100644 +index 220ee5b..d55e2ff 100644 --- a/src/lib/qtprofilesetup/qtmoduleinfo.cpp +++ b/src/lib/qtprofilesetup/qtmoduleinfo.cpp -@@ -217,7 +217,7 @@ void QtModuleInfo::setupLibraries(const QtEnvironment &qtEnv, bool debugBuild, +@@ -241,7 +241,7 @@ void QtModuleInfo::setupLibraries(const QtEnvironment &qtEnv, bool debugBuild, if (qtEnv.mkspecName.contains(QLatin1String("msvc"))) libFilePath += QLatin1String(".lib"); else if (isMingw) @@ -11,5 +20,6 @@ index e55cd0c..88f68d9 100644 continue; } if (!simplifiedLine.startsWith("QMAKE_PRL_LIBS")) --- -2.1.1 \ No newline at end of file +-- +2.1.3 + diff --git a/mingw-w64-qbs/0006-probe-pretend-msys-is-mingw.patch b/mingw-w64-qbs/0005-setup-toolchains-Pretend-msys-is-mingw.1.3.2.patch similarity index 57% rename from mingw-w64-qbs/0006-probe-pretend-msys-is-mingw.patch rename to mingw-w64-qbs/0005-setup-toolchains-Pretend-msys-is-mingw.1.3.2.patch index 1b9d2509a4..5f41fe31df 100644 --- a/mingw-w64-qbs/0006-probe-pretend-msys-is-mingw.patch +++ b/mingw-w64-qbs/0005-setup-toolchains-Pretend-msys-is-mingw.1.3.2.patch @@ -1,7 +1,18 @@ -diff -urN qbs-1.3.2.orig/src/app/qbs-setup-toolchains/probe.cpp qbs-1.3.2/src/app/qbs-setup-toolchains/probe.cpp ---- qbs-1.3.2.orig/src/app/qbs-setup-toolchains/probe.cpp 2014-10-31 20:08:07.938732400 +0000 -+++ qbs-1.3.2/src/app/qbs-setup-toolchains/probe.cpp 2014-10-31 20:09:34.637691300 +0000 -@@ -85,7 +85,8 @@ +From 6850d7a5bee20766656121db96444610f6d48c10 Mon Sep 17 00:00:00 2001 +From: Ray Donnelly +Date: Sat, 29 Nov 2014 18:29:20 +0000 +Subject: [PATCH 5/5] setup-toolchains: Pretend msys is mingw + +It's close enough and the best we've got. +--- + src/app/qbs-setup-toolchains/probe.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/app/qbs-setup-toolchains/probe.cpp b/src/app/qbs-setup-toolchains/probe.cpp +index d0f123b..184efdf 100644 +--- a/src/app/qbs-setup-toolchains/probe.cpp ++++ b/src/app/qbs-setup-toolchains/probe.cpp +@@ -85,7 +85,8 @@ static QStringList validMinGWMachines() return QStringList() << QLatin1String("mingw32") << QLatin1String("mingw64") << QLatin1String("i686-w64-mingw32") << QLatin1String("x86_64-w64-mingw32") @@ -11,7 +22,7 @@ diff -urN qbs-1.3.2.orig/src/app/qbs-setup-toolchains/probe.cpp qbs-1.3.2/src/ap } static QStringList completeToolchainList(const QString &toolchainName) -@@ -196,7 +197,7 @@ +@@ -196,7 +197,7 @@ static Profile createGccProfile(const QString &compilerFilePath, Settings *setti { const QString machineName = gccMachineName(compilerFilePath); const QStringList compilerTriplet = machineName.split(QLatin1Char('-')); @@ -20,3 +31,6 @@ diff -urN qbs-1.3.2.orig/src/app/qbs-setup-toolchains/probe.cpp qbs-1.3.2/src/ap const bool isClang = toolchainTypes.contains(QLatin1String("clang")); if (isMingw && !validMinGWMachines().contains(machineName)) { +-- +2.1.3 + diff --git a/mingw-w64-qbs/PKGBUILD b/mingw-w64-qbs/PKGBUILD index 2e616464f8..f8fb061ac8 100644 --- a/mingw-w64-qbs/PKGBUILD +++ b/mingw-w64-qbs/PKGBUILD @@ -15,29 +15,32 @@ options=('docs' 'staticlibs') # '!strip' 'debug') source=("http://download.qt-project.org/official_releases/qbs/${pkgver}/${_pkgfqn}.tar.gz" #${_realname}-${pkgver}::"git://gitorious.org/qt-labs/qbs.git#tag=v$pkgver" "manifest" - "0001-add-hostosinfo.h-to-installed-headers.patch" - "0002-WIP-Xcode-generator.patch" - "0003-add-generator-header-installs.patch" - "0005-shared-vs-static-extension.patch" - "0006-probe-pretend-msys-is-mingw.patch") + "0001-add-hostosinfo.h-to-installed-headers.1.3.2.patch" + "0002-WIP-Xcode-generator.1.3.2.patch" + "0003-add-generator-header-installs.1.3.2.patch" + "0004-Use-.dll.a-instead-of-.a-for-mingw-import-libraries.1.3.2.patch" + "0005-setup-toolchains-Pretend-msys-is-mingw.1.3.2.patch") sha256sums=('03ce02bc1e5d6985e79318a7e49b95052166de5fe464c9149ce2828368292a9f' '838098b25a8044176b3139b4003594570c62a8d64f5470fbbd769f3bf44e0855' - 'b791b90bd4e49fd0188167c308a3da1773ddc6740d88c385e4f5d811ef0bb117' - '6a4a18fbd710f35ba2515b793b07471fd9d4d954e169e4f5ee6067a22c13f8a3' - '036c5452f19eebfc3c39982b47191e4c4e7ae2ba0e0b23dc818105189f54b441' - 'd6193c98284e3b228a5f2143e95da53768d08d6b229fe71fda6941de2f8f0409' - 'b96dfb92a385cdecfb7795b17292694942f50183613e40564cbe545556a090d6') + '6cc55051178868aeda33608f1ea7cc5d30641454c852c807d13b3eaf6db9a513' + '8d1bb855505379419b4ad4220d25bdd74b67709f09cd923cf1fbb8b24b3b2acb' + '29b46019650edfc4ff5d5b954e4bbfd7aa53b47dfe5d4c46505b8e3fa284b197' + '6efed604de50ac5ab43205845e5888604705fa907b6eb30c7004a9bd228973bf' + '10594ba415e7d79ddcd9dc5b33a1c8ea898090213d4596aac507d739e7e28035') prepare() { cd ${_realname}-${pkgver} [ -d src/plugins/generator ] && rm -rf src/plugins/generator rm -rf src/lib/corelib/api/generator.* rm -rf src/lib/corelib/tools/generat* - patch -p1 < "${srcdir}"/0001-add-hostosinfo.h-to-installed-headers.patch - patch -p1 < "${srcdir}"/0002-WIP-Xcode-generator.patch - patch -p1 < "${srcdir}"/0003-add-generator-header-installs.patch - patch -p1 < "${srcdir}"/0005-shared-vs-static-extension.patch - patch -p1 < "${srcdir}"/0006-probe-pretend-msys-is-mingw.patch + git init . + git add -A + git commit -m "Initial git import" + git am "${srcdir}"/0001-add-hostosinfo.h-to-installed-headers.1.3.2.patch + git am "${srcdir}"/0002-WIP-Xcode-generator.1.3.2.patch + git am "${srcdir}"/0003-add-generator-header-installs.1.3.2.patch + git am "${srcdir}"/0004-Use-.dll.a-instead-of-.a-for-mingw-import-libraries.1.3.2.patch + git am "${srcdir}"/0005-setup-toolchains-Pretend-msys-is-mingw.1.3.2.patch } build() {