Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (54a236ea0c26f479bda8094fd5952e476f10e995)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (54a236ea0c26f479bda8094fd5952e476f10e995)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (54a236ea0c26f479bda8094fd5952e476f10e995)
  • Date: Tue, 11 Dec 2018 14:45:58 +0000
GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

qt5/qttools/0001-actually-build-tools.patch | 115
-----------
qt5/qttools/DETAILS | 2
qt5/qttools/HISTORY | 5
qt5/qttools/PRE_BUILD | 3
qt5/qttools/patches/0001-remove-some-nomaketools-stuff.patch | 82 +++++++
5 files changed, 90 insertions(+), 117 deletions(-)

New commits:
commit 54a236ea0c26f479bda8094fd5952e476f10e995
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

qttools - apply patch

diff --git a/qt5/qttools/0001-actually-build-tools.patch
b/qt5/qttools/0001-actually-build-tools.patch
deleted file mode 100644
index 6f2991f..0000000
--- a/qt5/qttools/0001-actually-build-tools.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From e5aff6817397979c06f49a522db5d6c03f7485f0 Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <bwlf AT bandrate.org>
-Date: Sat, 12 Aug 2017 22:31:30 +0200
-Subject: [PATCH] actually build tools
-
----
- examples/designer/designer.pro | 4 ----
- src/assistant/assistant.pro | 6 ------
- src/assistant/assistant.pro.orig | 20 ++++++++++++++++++++
- src/designer/src/src.pro | 6 ------
- src/linguist/linguist.pro | 4 ----
- src/src.pro | 5 -----
- 6 files changed, 20 insertions(+), 25 deletions(-)
- create mode 100644 src/assistant/assistant.pro.orig
-
-diff --git a/examples/designer/designer.pro b/examples/designer/designer.pro
-index 2248d3e..0e1cbc5 100644
---- a/examples/designer/designer.pro
-+++ b/examples/designer/designer.pro
-@@ -12,7 +12,3 @@ SUBDIRS = calculatorform
- solaris-cc*:SUBDIRS -= calculatorbuilder \
- worldtimeclockbuilder
-
--qtNomakeTools( \
-- containerextension \
-- taskmenuextension \
--)
-diff --git a/src/assistant/assistant.pro b/src/assistant/assistant.pro
-index 799582a..53ecfe2 100644
---- a/src/assistant/assistant.pro
-+++ b/src/assistant/assistant.pro
-@@ -12,9 +12,3 @@ qhelpgenerator.depends = help
- qcollectiongenerator.depends = help
- qhelpconverter.depends = help
-
--qtNomakeTools( \
-- assistant \
-- qhelpgenerator \
-- qcollectiongenerator \
-- qhelpconverter \
--)
-diff --git a/src/assistant/assistant.pro.orig
b/src/assistant/assistant.pro.orig
-new file mode 100644
-index 0000000..799582a
---- /dev/null
-+++ b/src/assistant/assistant.pro.orig
-@@ -0,0 +1,20 @@
-+TEMPLATE = subdirs
-+
-+SUBDIRS += \
-+ help \
-+ assistant \
-+ qhelpgenerator \
-+ qcollectiongenerator \
-+ qhelpconverter
-+
-+assistant.depends = help
-+qhelpgenerator.depends = help
-+qcollectiongenerator.depends = help
-+qhelpconverter.depends = help
-+
-+qtNomakeTools( \
-+ assistant \
-+ qhelpgenerator \
-+ qcollectiongenerator \
-+ qhelpconverter \
-+)
-diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
-index 6915e34..807987f 100644
---- a/src/designer/src/src.pro
-+++ b/src/designer/src/src.pro
-@@ -15,9 +15,3 @@ components.depends = lib
- designer.depends = components
- plugins.depends = lib
-
--qtNomakeTools( \
-- lib \
-- components \
-- designer \
-- plugins \
--)
-diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
-index 3a70580..5715810 100644
---- a/src/linguist/linguist.pro
-+++ b/src/linguist/linguist.pro
-@@ -5,10 +5,6 @@ SUBDIRS = \
- lconvert
- !no-png:qtHaveModule(widgets): SUBDIRS += linguist
-
--qtNomakeTools( \
-- linguist \
--)
--
- equals(QMAKE_HOST.os, Windows): CMAKE_BIN_SUFFIX = ".exe"
-
- load(cmake_functions)
-diff --git a/src/src.pro b/src/src.pro
-index 41064a5..8401f9b 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -36,11 +36,6 @@ win32|winrt:SUBDIRS += windeployqt
- winrt:SUBDIRS += winrtrunner
- qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-
--qtNomakeTools( \
-- pixeltool \
-- macdeployqt \
--)
--
- # This is necessary to avoid a race condition between toolchain.prf
- # invocations in a module-by-module cross-build.
- cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) {
---
-2.14.1
-
diff --git a/qt5/qttools/DETAILS b/qt5/qttools/DETAILS
index 30282c6..948fef9 100755
--- a/qt5/qttools/DETAILS
+++ b/qt5/qttools/DETAILS
@@ -2,7 +2,7 @@ QT_URL=https://download.qt.io/official_releases/
SPELL=qttools
SPELLX=$SPELL-everywhere-src
VERSION=5.12.0
- PATCHLEVEL=1
+ PATCHLEVEL=2

SOURCE_HASH=sha512:90ce900dc64856e994b05dba8a1f2735357d7cc489b0565beb2553c6007e0a53cedf363cbec96d9af325182f5a164eafe10d2d4d180ee72f544bf0fa9dbc671d
SOURCE=$SPELLX-$VERSION.tar.xz
SOURCE_URL=$QT_URL/qt/${VERSION%.?}/$VERSION/submodules/$SOURCE
diff --git a/qt5/qttools/HISTORY b/qt5/qttools/HISTORY
index a99381c..82b12f7 100644
--- a/qt5/qttools/HISTORY
+++ b/qt5/qttools/HISTORY
@@ -1,3 +1,8 @@
+2018-12-11 Treeve Jelbert <treeve AT sourcemage.org>
+ * PRE_BUILD:, patches/*: apply updated patch, based on patch
+ by Florian Franzman.
+ * DETAILS: PATCHLEVEL++
+
2018-12-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.12.0
* PRE_BUILD: suppress check for clang - breaks build
diff --git a/qt5/qttools/PRE_BUILD b/qt5/qttools/PRE_BUILD
index e19223e..397f255 100755
--- a/qt5/qttools/PRE_BUILD
+++ b/qt5/qttools/PRE_BUILD
@@ -2,4 +2,5 @@ default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&
if ! is_depends_enabled $SPELL llvm; then
sed -i '/clang/D' qttools.pro
-fi
+fi &&
+apply_patch_dir patches
diff --git a/qt5/qttools/patches/0001-remove-some-nomaketools-stuff.patch
b/qt5/qttools/patches/0001-remove-some-nomaketools-stuff.patch
new file mode 100644
index 0000000..52d82df
--- /dev/null
+++ b/qt5/qttools/patches/0001-remove-some-nomaketools-stuff.patch
@@ -0,0 +1,82 @@
+From 81090aeb20d853c67cb6525e1cbb9dd71bda7bdb Mon Sep 17 00:00:00 2001
+From: Treeve Jelbert <treeve AT sourcemage.org>
+Date: Tue, 11 Dec 2018 15:03:38 +0100
+Subject: [PATCH] remove some nomaketools stuff. it only seems to affect
+ tarball build, not from git tree
+
+---
+ examples/designer/designer.pro | 4 ----
+ src/assistant/assistant.pro | 4 ----
+ src/designer/src/src.pro | 2 --
+ src/linguist/linguist.pro | 4 ----
+ src/src.pro | 4 ----
+ 5 files changed, 18 deletions(-)
+
+diff --git a/examples/designer/designer.pro b/examples/designer/designer.pro
+index 2248d3ec..0e1cbc52 100644
+--- a/examples/designer/designer.pro
++++ b/examples/designer/designer.pro
+@@ -12,7 +12,3 @@ SUBDIRS = calculatorform
+ solaris-cc*:SUBDIRS -= calculatorbuilder \
+ worldtimeclockbuilder
+
+-qtNomakeTools( \
+- containerextension \
+- taskmenuextension \
+-)
+diff --git a/src/assistant/assistant.pro b/src/assistant/assistant.pro
+index 2d3ca569..1cfecff0 100644
+--- a/src/assistant/assistant.pro
++++ b/src/assistant/assistant.pro
+@@ -9,7 +9,3 @@ SUBDIRS += \
+ assistant.depends = help
+ qhelpgenerator.depends = help
+
+-qtNomakeTools( \
+- assistant \
+- qhelpgenerator \
+-)
+diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
+index 79e9e64e..4850e89b 100644
+--- a/src/designer/src/src.pro
++++ b/src/designer/src/src.pro
+@@ -23,6 +23,4 @@ uitools.depends = uiplugin
+ qtNomakeTools( \
+ lib \
+ components \
+- designer \
+- plugins \
+ )
+diff --git a/src/linguist/linguist.pro b/src/linguist/linguist.pro
+index 3f54c396..957d76f3 100644
+--- a/src/linguist/linguist.pro
++++ b/src/linguist/linguist.pro
+@@ -10,10 +10,6 @@ SUBDIRS = \
+ }
+ }
+
+-qtNomakeTools( \
+- linguist \
+-)
+-
+ equals(QMAKE_HOST.os, Windows): CMAKE_BIN_SUFFIX = ".exe"
+
+ load(cmake_functions)
+diff --git a/src/src.pro b/src/src.pro
+index 7a1af007..91c58e9d 100644
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -37,10 +37,6 @@ win32|winrt:SUBDIRS += windeployqt
+ winrt:SUBDIRS += winrtrunner
+ qtHaveModule(gui):!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
+
+-qtNomakeTools( \
+- distancefieldgenerator \
+- pixeltool \
+-)
+
+ # This is necessary to avoid a race condition between toolchain.prf
+ # invocations in a module-by-module cross-build.
+--
+2.20.0
+


  • [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (54a236ea0c26f479bda8094fd5952e476f10e995), Treeve Jelbert, 12/11/2018

Archive powered by MHonArc 2.6.24.

Top of Page