diff options
Diffstat (limited to 'dilos/dependencies')
9 files changed, 38 insertions, 42 deletions
diff --git a/dilos/dependencies/tqt3/debian/README.Debian b/dilos/dependencies/tqt3/debian/README.Debian index 86b633251..324900564 100644 --- a/dilos/dependencies/tqt3/debian/README.Debian +++ b/dilos/dependencies/tqt3/debian/README.Debian @@ -200,19 +200,19 @@ int main( int argc, char **argv ) Using Qt for Debian as a developer or packager ---------------------------------------------- -Q: I want to compile a source package that utilizes qmake to build the +Q: I want to compile a source package that utilizes tqmake to build the Makefiles. What do I need to do to makeit work ? -A: qmake retquires two environment variables to be set, QTDIR and QMAKESPEC. +A: tqmake retquires two environment variables to be set, QTDIR and QMAKESPEC. To make it work, do export QTDIR=/usr/share/tqt3 export QMAKESPEC=linux-g++ -Then run qmake -o Makefile <projectfile>.pro +Then run tqmake -o Makefile <projectfile>.pro After that, the Makefile is correctly created to build your application on Debian. As a packager, export thosetwo variables in the rules file before -calling qmake. +calling tqmake. Q: I have an application that when linking gives me symbol referencing errors to Q*Style. Why does my applicationnot link correctly ? diff --git a/dilos/dependencies/tqt3/debian/control b/dilos/dependencies/tqt3/debian/control index cf33ea5e7..37193d59b 100644 --- a/dilos/dependencies/tqt3/debian/control +++ b/dilos/dependencies/tqt3/debian/control @@ -175,7 +175,7 @@ Description: TQt3 Designer provided by TQt to create applications with easy database access through TQt. The resulting user interface files can then be converted to C++ classes using the tquic commandline utility which is usually done - automatically for the developer with a project management with qmake + automatically for the developer with a project management with tqmake or automake. Package: tqt3-designer-plugins @@ -239,7 +239,7 @@ Description: The TQt3 assistant application the complete TQt3 documentation and serves as an online help viewer for any TQt program that wants to give the usesr access to online help. Within the TQt tools it is used as the help viewer for the online help - for the TQt3 Designer and Linguist as well as qmake and the TQt 3 API + for the TQt3 Designer and Linguist as well as tqmake and the TQt 3 API documentation. . Developers of TQt Application who want to faciliate the TQt Assistant for online diff --git a/dilos/dependencies/tqt3/debian/maintain/build-examples.sh b/dilos/dependencies/tqt3/debian/maintain/build-examples.sh index ed29d712b..97426d69e 100644 --- a/dilos/dependencies/tqt3/debian/maintain/build-examples.sh +++ b/dilos/dependencies/tqt3/debian/maintain/build-examples.sh @@ -3,33 +3,33 @@ 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 +# first copy over the libtqt-mt.so build configuration of .tqmake.cache +cp /usr/share/tqt3/.tqmake.cache ./.tqmake.cache # Now compile the examples. The themes example # won't work since tqconfig.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 +cd examples; tqmake -o Makefile examples.pro; make -k # Now compile the tutorial. -cd $BUILDDIR/tutorial; qmake -o Makefile tutorial.pro; make +cd $BUILDDIR/tutorial; tqmake -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 ..; + cd $a && tqmake -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 ..; + cd $a && tqmake -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 ..; + cd $a && tqmake -o Makefile $a.pro; make; cd ..; done # Return to the build directory diff --git a/dilos/dependencies/tqt3/debian/patches/06_disable_rpath.diff b/dilos/dependencies/tqt3/debian/patches/06_disable_rpath.diff index a3d74ffce..7d22cb882 100644 --- a/dilos/dependencies/tqt3/debian/patches/06_disable_rpath.diff +++ b/dilos/dependencies/tqt3/debian/patches/06_disable_rpath.diff @@ -1,11 +1,11 @@ author: Martin Loschwitz <madkiss@madkiss.org> -Disables the rpath settings in qmake.conf +Disables the rpath settings in tqmake.conf -Index: b/mkspecs/linux-g++/qmake.conf +Index: b/mkspecs/linux-g++/tqmake.conf =================================================================== ---- a/mkspecs/linux-g++/qmake.conf -+++ b/mkspecs/linux-g++/qmake.conf +--- a/mkspecs/linux-g++/tqmake.conf ++++ b/mkspecs/linux-g++/tqmake.conf @@ -55,7 +55,7 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, @@ -15,10 +15,10 @@ Index: b/mkspecs/linux-g++/qmake.conf QMAKE_LIBS = -luuid QMAKE_LIBS_DYNLOAD = -ldl -Index: b/mkspecs/linux-g++-64/qmake.conf +Index: b/mkspecs/linux-g++-64/tqmake.conf =================================================================== ---- a/mkspecs/linux-g++-64/qmake.conf -+++ b/mkspecs/linux-g++-64/qmake.conf +--- a/mkspecs/linux-g++-64/tqmake.conf ++++ b/mkspecs/linux-g++-64/tqmake.conf @@ -58,7 +58,7 @@ QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB QMAKE_LFLAGS_SONAME = -Wl,-soname, diff --git a/dilos/dependencies/tqt3/debian/patches/09_amd64_lib64.diff b/dilos/dependencies/tqt3/debian/patches/09_amd64_lib64.diff index de42482fc..ff63bd756 100644 --- a/dilos/dependencies/tqt3/debian/patches/09_amd64_lib64.diff +++ b/dilos/dependencies/tqt3/debian/patches/09_amd64_lib64.diff @@ -1,5 +1,5 @@ ---- a/mkspecs/linux-g++-64/qmake.conf -+++ b/mkspecs/linux-g++-64/qmake.conf +--- a/mkspecs/linux-g++-64/tqmake.conf ++++ b/mkspecs/linux-g++-64/tqmake.conf @@ -43,11 +43,11 @@ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_T QMAKE_INCDIR = QMAKE_LIBDIR = diff --git a/dilos/dependencies/tqt3/debian/rules b/dilos/dependencies/tqt3/debian/rules index a6fc3e9d3..8d50db2ed 100755 --- a/dilos/dependencies/tqt3/debian/rules +++ b/dilos/dependencies/tqt3/debian/rules @@ -183,9 +183,9 @@ libqt-thread-stamp: post-patches cd tools/designer/tools/tqtconv2ui && $(MAKE) cp bin/tqtconv2ui $(TMP_INSTALL)/usr/bin/tqtconv2ui - # install qmake.cache file + # install tqmake.cache file install -d $(P_QTMTDEV)/usr/share/tqt3/ - cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/tqt3#g" > $(P_QTMTDEV)/usr/share/tqt3/.qmake.cache + cat .tqmake.cache | sed "s#$(QTDIR)#/usr/share/tqt3#g" > $(P_QTMTDEV)/usr/share/tqt3/.tqmake.cache touch libqt-thread-stamp @@ -205,10 +205,10 @@ clean:: $(MAKE) -C tools/msg2tqm distclean; $(MAKE) -C tools/tqtmergetr distclean; $(MAKE) -C tools/qembed distclean; \ $(MAKE) -C tools/designer/tools/tqtconv2ui distclean; $(MAKE) -C tools/designer/tools/tqtcreatecw distclean; \ $(MAKE) -C tools/designer/plugins/glade distclean; \ - $(MAKE) -C config.tests/unix/largefile distclean; $(MAKE) -C qmake distclean; \ + $(MAKE) -C config.tests/unix/largefile distclean; $(MAKE) -C tqmake distclean; \ fi - -rm -rf .qmake.cache src/.qmake.internal.cache tools/designer/designer/.qmake.internal.cache qmake/GNUmakefile \ + -rm -rf .tqmake.cache src/.tqmake.internal.cache tools/designer/designer/.tqmake.internal.cache tqmake/GNUmakefile \ config.status bin/tqmoc bin/tqmake src/tqmoc/*.o mkspecs/default lib/lib* `pwd`/debian/doc $(TMP_INSTALL) \ src/tools/qconfig.cpp plugins/accessibleqtwidgets.prl \ config.tests/unix/ipv6/ipv6test config.tests/unix/ipv6/ipv6test.o config.tests/unix/ptrsize/ptrsizetest.o \ @@ -216,7 +216,7 @@ clean:: config.tests/unix/endian/endiantest lib/tqt-mt.pc extensions/nsplugin/examples/trivial/libtrivial.prl \ extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer - rm -f qmake/*o + rm -f tqmake/*o rm -f src/.obj/debug-shared-mt/*o plugins/src/inputmethods/imsw-multi/.obj/debug-shared-mt/*o plugins/inputmethods/*so rm -f plugins/src/inputmethods/imsw-none/.obj/debug-shared-mt/*o plugins/src/inputmethods/simple/.obj/debug-shared-mt/*o plugins/src/inputmethods/xim/.obj/debug-shared-mt/*o @@ -336,8 +336,8 @@ binary-indep: build install # logo32.png cp `pwd`/doc/html/logo32.png `pwd`/debian/tqt3-doc/usr/share/tqt3/doc/html/ - # remove qmake html docu from tqt3-doc - rm -rf `pwd`/debian/tqt3-doc/usr/share/tqt3/doc/html/qmake* + # remove tqmake html docu from tqt3-doc + rm -rf `pwd`/debian/tqt3-doc/usr/share/tqt3/doc/html/tqmake* # create examples package install -d `pwd`/debian/doc/tqt3-examples/tools/designer @@ -428,14 +428,14 @@ binary-arch: build install do cat "$$a" | sed 's/logo32/logo32-assistant/g' > "$$a".new && mv "$$a".new "$$a"; done cd `pwd`/debian/tqt3-dev-tools/usr/share/tqt3/doc/html && for a in `find . -name '*.html'`; \ - do cat "$$a" | sed 's/logo32/logo32-qmake/g' > "$$a".new && mv "$$a".new "$$a"; done + do cat "$$a" | sed 's/logo32/logo32-tqmake/g' > "$$a".new && mv "$$a".new "$$a"; done for a in designer linguist assistant; do install -m644 -D `pwd`/doc/html/logo32.png `pwd`/debian/tqt3-"$$a"/usr/share/tqt3/doc/html/logo32-"$$a".png; done - install -m644 -D `pwd`/doc/html/logo32.png `pwd`/debian/tqt3-dev-tools/usr/share/tqt3/doc/html/logo32-qmake.png + install -m644 -D `pwd`/doc/html/logo32.png `pwd`/debian/tqt3-dev-tools/usr/share/tqt3/doc/html/logo32-tqmake.png - # fix qmake.conf files - cd `pwd`/debian/tqt3-dev-tools/usr/share/tqt3/mkspecs/ && for a in *; do cd "$$a" && cat qmake.conf | sed 's/\$$(QTDIR)\/include/\/usr\/share\/tqt3\/include/g' | sed 's/\$$(QTDIR)/\/usr\/share\/tqt3/g' | \ - sed 's/\-I\/usr\/include/&\/tqt3/g' >> qmake.conf.new && mv qmake.conf.new qmake.conf && cd ../; done + # fix tqmake.conf files + cd `pwd`/debian/tqt3-dev-tools/usr/share/tqt3/mkspecs/ && for a in *; do cd "$$a" && cat tqmake.conf | sed 's/\$$(QTDIR)\/include/\/usr\/share\/tqt3\/include/g' | sed 's/\$$(QTDIR)/\/usr\/share\/tqt3/g' | \ + sed 's/\-I\/usr\/include/&\/tqt3/g' >> tqmake.conf.new && mv tqmake.conf.new tqmake.conf && cd ../; done dh_link -ptqt3-designer usr/share/tqt3/doc/html usr/share/doc/tqt3-designer/html dh_link -ptqt3-assistant usr/share/tqt3/doc/html usr/share/doc/tqt3-assistant/html @@ -445,9 +445,9 @@ binary-arch: build install # copy README.Debian for a in libtqt3-mt-dev libtqt3-mt$(DEB_TIME64_SUFFIX) tqt3-doc; do install -D `pwd`/debian/README.Debian `pwd`/debian/"$$a"/usr/share/doc/"$$a"/README.Debian; done - # install the qmake binary + # install the tqmake binary rm -rf `pwd`/debian/tqt3-dev-tools/usr/bin/tqmake - install -D `pwd`/qmake/tqmake `pwd`/debian/tqt3-dev-tools/usr/bin/tqmake + install -D `pwd`/tqmake/tqmake `pwd`/debian/tqt3-dev-tools/usr/bin/tqmake # Install source for the designer tools, such as tqtcreatecw. cp -ra tools/designer/tools debian/tqt3-designer/usr/share/tqt3/tools diff --git a/dilos/dependencies/tqt3/debian/tqt3-dev-tools.install b/dilos/dependencies/tqt3/debian/tqt3-dev-tools.install index 3c795661b..d06db6cd7 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-dev-tools.install +++ b/dilos/dependencies/tqt3/debian/tqt3-dev-tools.install @@ -1,6 +1,6 @@ usr/share/tqt3/mkspecs/* -usr/share/tqt3/doc/html/qmake*html -usr/share/tqt3/doc/html/qmake*dcf +usr/share/tqt3/doc/html/tqmake*html +usr/share/tqt3/doc/html/tqmake*dcf usr/bin/tqmake usr/bin/tqlupdate usr/bin/tqlrelease diff --git a/dilos/dependencies/tqt3/debian/tqt3-dev-tools.postinst b/dilos/dependencies/tqt3/debian/tqt3-dev-tools.postinst index 9af54f964..7f19b8858 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-dev-tools.postinst +++ b/dilos/dependencies/tqt3/debian/tqt3-dev-tools.postinst @@ -25,7 +25,4 @@ update-alternatives --install \ --slave /usr/share/man/man1/lrelease.1.gz lrelease.1.gz \ "/usr/share/man/man1/tqlrelease.1.gz" -update-alternatives --install \ - /usr/bin/qmake qmake "/usr/bin/tqmake" "45" \ - #DEBHELPER# diff --git a/dilos/dependencies/tqt3/debian/tqt3-dev-tools.prerm b/dilos/dependencies/tqt3/debian/tqt3-dev-tools.prerm index 1f8b6a46c..3deeda1c2 100644 --- a/dilos/dependencies/tqt3/debian/tqt3-dev-tools.prerm +++ b/dilos/dependencies/tqt3/debian/tqt3-dev-tools.prerm @@ -12,7 +12,6 @@ case "$1" in update-alternatives --remove uic "/usr/bin/tquic" update-alternatives --remove lupdate "/usr/bin/tqlupdate" update-alternatives --remove lrelease "/usr/bin/tqlrelease" - update-alternatives --remove qmake "/usr/bin/tqmake" ;; esac |