summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-12-09 02:38:38 +0100
committerSlávek Banko <slavek.banko@axis.cz>2019-12-09 02:38:38 +0100
commit361189e4527c00ba422deafb714d6c749fe24004 (patch)
tree45f354c435964ba53368d87447d7b424242a3424 /ubuntu/_base
parent2a9526fce5d10640dcdf4a4c36e84c5f092e2593 (diff)
downloadtde-packaging-361189e4527c00ba422deafb714d6c749fe24004.tar.gz
tde-packaging-361189e4527c00ba422deafb714d6c749fe24004.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>
Diffstat (limited to 'ubuntu/_base')
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install3
-rw-r--r--ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install2
-rwxr-xr-xubuntu/_base/dependencies/tqt3/debian/rules14
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 be1e2d79c..92ebc61fb 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 a022db2cc..c86cba1b1 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/$(DEB_HOST_MULTIARCH)/libtqt-mt.so
usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.prl
usr/lib/$(DEB_HOST_MULTIARCH)/libtqui.so
usr/lib/$(DEB_HOST_MULTIARCH)/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 38573561f..77535affc 100755
--- a/ubuntu/_base/dependencies/tqt3/debian/rules
+++ b/ubuntu/_base/dependencies/tqt3/debian/rules
@@ -142,11 +142,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