diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2019-12-09 02:38:38 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-12-09 02:45:42 +0100 |
| commit | 1a476bf1b10b4891ac6d1cc2b7506af41463b3f7 (patch) | |
| tree | 40cc3877086d4a91daaf7c167e6dd5719a4e407a /ubuntu | |
| parent | 4bc82d311a0f567ffd683f0266aa765c5e60cec1 (diff) | |
| download | tde-packaging-1a476bf1b10b4891ac6d1cc2b7506af41463b3f7.tar.gz tde-packaging-1a476bf1b10b4891ac6d1cc2b7506af41463b3f7.zip | |
DEB tqt3: Drop deleting/re-creating symlinks for include/ntqinputcontext*.h.
Installation of the ntqinputcontext*.h, ntqconfig.h and ntqmodules.h files
moved from rules to regular *.install files.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 361189e4527c00ba422deafb714d6c749fe24004)
Diffstat (limited to 'ubuntu')
3 files changed, 5 insertions, 14 deletions
diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install index 32d3bb87d..f8241df18 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install +++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install @@ -91,6 +91,9 @@ usr/include/tqt3/ntqiconset.h usr/include/tqt3/ntqiconview.h usr/include/tqt3/ntqimage.h usr/include/tqt3/ntqimageformatplugin.h +usr/include/tqt3/ntqinputcontext.h +usr/include/tqt3/ntqinputcontextfactory.h +usr/include/tqt3/ntqinputcontextplugin.h usr/include/tqt3/ntqinputdialog.h usr/include/tqt3/ntqintcache.h usr/include/tqt3/ntqintdict.h diff --git a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install index e846fb59e..275c3ca79 100644 --- a/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install +++ b/ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install @@ -4,6 +4,8 @@ usr/lib/libtqt-mt.so usr/lib/libtqui.prl usr/lib/libtqui.so usr/lib/pkgconfig/tqt-mt.pc +usr/include/tqt3/ntqconfig.h usr/include/tqt3/ntqgl.h usr/include/tqt3/ntqglcolormap.h +usr/include/tqt3/ntqmodules.h usr/include/tqt3/ntqwidgetfactory.h diff --git a/ubuntu/_base/dependencies/tqt3/debian/rules b/ubuntu/_base/dependencies/tqt3/debian/rules index 476d0c1c9..40d633ba9 100755 --- a/ubuntu/_base/dependencies/tqt3/debian/rules +++ b/ubuntu/_base/dependencies/tqt3/debian/rules @@ -141,11 +141,6 @@ libqt-thread-stamp: post-patches echo yes | ./configure $(CONFIGURE_OPTS) - rm -rf include/ntqinputcontext.h include/ntqinputcontextfactory.h include/ntqinputcontextplugin.h - ln -s ../src/kernel/ntqinputcontext.h include/ntqinputcontext.h - ln -s ../src/inputmethod/ntqinputcontextfactory.h include/ntqinputcontextfactory.h - ln -s ../src/inputmethod/ntqinputcontextplugin.h include/ntqinputcontextplugin.h - # proceed $(MAKE) sub-src sub-plugins sub-tools $(MAKE) -C src INSTALL_ROOT=$(TMP_INSTALL) install_target @@ -171,14 +166,6 @@ libqt-thread-stamp: post-patches install -d $(P_QTMTDEV)/usr/share/tqt3/ cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/tqt3#g" > $(P_QTMTDEV)/usr/share/tqt3/.qmake.cache - # install ntqconfig.h for the mt - install -m 644 -D include/ntqconfig.h $(P_QTMTDEV)/usr/include/tqt3/ntqconfig.h - install -m 644 -D include/ntqmodules.h $(P_QTMTDEV)/usr/include/tqt3/ntqmodules.h - - install -m 644 -D include/ntqinputcontext.h $(P_HEADERS)/usr/include/tqt3/ntqinputcontext.h - install -m 644 -D include/ntqinputcontextfactory.h $(P_HEADERS)/usr/include/tqt3/ntqinputcontextfactory.h - install -m 644 -D include/ntqinputcontextplugin.h $(P_HEADERS)/usr/include/tqt3/ntqinputcontextplugin.h - touch libqt-thread-stamp clean:: @@ -209,7 +196,6 @@ clean:: extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer rm -f qmake/*o - rm -rf include/ntqinputcontext.h include/ntqinputcontextfactory.h include/ntqinputcontextplugin.h 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 |