summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNik Reist <nik.reist@murena.io>2024-05-24 10:54:16 -0400
committerFrançois Andriot <albator78@libertysurf.fr>2024-10-07 21:13:14 +0200
commitba22e312b82d48e1a0067e96b5f9d690cf92fc28 (patch)
tree720fe033c98beec44d273ca6ce46ee7c1524b95c
parent43c883d1f51f3d5191340b2e3924663ec8ac33a2 (diff)
downloadtde-packaging-ba22e312b82d48e1a0067e96b5f9d690cf92fc28.tar.gz
tde-packaging-ba22e312b82d48e1a0067e96b5f9d690cf92fc28.zip
Add clang compile support
- Add check for installed compiler, remove BuildRequires - Add platform option for clang when the default symlink resolves to it - Add OpenMandriva specific checks for required files removed during packaging - Comment missing docs, install, and headers during packaging process - Increment version number to latest stable release - Replace symlink for build-examples with the actual file, install dereferences - Add missing translation file for "tr" - Fix lib prefixes for dependencies needed in MDK/OMV for 64 bit Signed-off-by: Nik Reist <nik.reist@murena.io>
-rw-r--r--[l---------]redhat/dependencies/tqt3/build-examples.sh37
-rw-r--r--redhat/dependencies/tqt3/tqt3.spec5
2 files changed, 40 insertions, 2 deletions
diff --git a/redhat/dependencies/tqt3/build-examples.sh b/redhat/dependencies/tqt3/build-examples.sh
index 4d654fcc9..f62d83b85 120000..100644
--- a/redhat/dependencies/tqt3/build-examples.sh
+++ b/redhat/dependencies/tqt3/build-examples.sh
@@ -1 +1,36 @@
-../../../debian/_base/dependencies/tqt3/debian/maintain/build-examples.sh \ No newline at end of file
+#!/bin/sh
+
+BUILDDIR=$PWD
+export QTDIR=/usr/share/tqt3
+
+# first copy over the libtqt-mt.so build configuration of .qmake.cache
+cp /usr/share/tqt3/.qmake.cache ./.qmake.cache
+
+# Now compile the examples. The themes example
+# won't work since ntqconfig.h is not really correct with the
+# ifdef's for the TQT_NO_xyz_STYLE, so we use make -k to continue
+cd examples; qmake -o Makefile examples.pro; make -k
+
+# Now compile the tutorial.
+cd $BUILDDIR/tutorial; qmake -o Makefile tutorial.pro; make
+
+# Then the designer examples.
+cd $BUILDDIR/tools/designer/examples
+for a in `find . -type d -maxdepth 1 -mindepth 1`; do
+ cd $a && qmake -o Makefile $a.pro; make; cd ..;
+done
+
+# There is a bigger sql example in book/ with more subdirectories:
+cd book
+for a in `find . -type d -maxdepth 1 -mindepth 1`; do
+ cd $a && qmake -o Makefile $a.pro; make; cd ..;
+done
+
+# Finally, build the linguist tutorials:
+cd $BUILDDIR/tools/linguist/tutorial
+for a in `find . -type d -maxdepth 1 -mindepth 1`; do
+ cd $a && qmake -o Makefile $a.pro; make; cd ..;
+done
+
+# Return to the build directory
+cd $BUILDDIR
diff --git a/redhat/dependencies/tqt3/tqt3.spec b/redhat/dependencies/tqt3/tqt3.spec
index aff20e142..e1cbaba4c 100644
--- a/redhat/dependencies/tqt3/tqt3.spec
+++ b/redhat/dependencies/tqt3/tqt3.spec
@@ -51,7 +51,6 @@ Source1: build-examples.sh
Source2: trinity-tqt3-rpmlintrc
BuildRequires: glibc-devel
-BuildRequires: gcc-c++
BuildRequires: make
BuildRequires: desktop-file-utils
@@ -1389,11 +1388,15 @@ echo yes | ./configure \
-shared \
-fast \
-no-exceptions \
+%if "%{?c_compiler}" == "clang"
+ -platform linux-clang \
+%else
%if "%{_lib}" == "lib64"
-platform linux-g++-64 \
%else
-platform linux-g++ \
%endif
+%endif
\
%{?with_nis:-nis} %{?!with_nis:-no-nis} \
-no-pch \