TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

DEB tqt3: Drop deleting/re-creating symlinks for include/ntqinputcontext*.h.

Browse Source 
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 361189e452)
pull/92/head
Slávek Banko 5 years ago
parent 4bc82d311a
commit 1a476bf1b1
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668
6 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File

3
debian/_base/dependencies/tqt3/debian/libtqt3-headers.install vendored
Unescape View File

@ -91,6 +91,9 @@ usr/include/tqt3/ntqiconset.h
usr/include/tqt3/ntqiconview.h usr/include/tqt3/ntqiconview.h
usr/include/tqt3/ntqimage.h usr/include/tqt3/ntqimage.h
usr/include/tqt3/ntqimageformatplugin.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/ntqinputdialog.h
usr/include/tqt3/ntqintcache.h usr/include/tqt3/ntqintcache.h
usr/include/tqt3/ntqintdict.h usr/include/tqt3/ntqintdict.h

2
debian/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install vendored
Unescape View File

@ -4,6 +4,8 @@ usr/lib/libtqt-mt.so
usr/lib/libtqui.prl usr/lib/libtqui.prl
usr/lib/libtqui.so usr/lib/libtqui.so
usr/lib/pkgconfig/tqt-mt.pc usr/lib/pkgconfig/tqt-mt.pc
usr/include/tqt3/ntqconfig.h
usr/include/tqt3/ntqgl.h usr/include/tqt3/ntqgl.h
usr/include/tqt3/ntqglcolormap.h usr/include/tqt3/ntqglcolormap.h
usr/include/tqt3/ntqmodules.h
usr/include/tqt3/ntqwidgetfactory.h usr/include/tqt3/ntqwidgetfactory.h

14
debian/_base/dependencies/tqt3/debian/rules vendored
Unescape View File

@ -141,11 +141,6 @@ libqt-thread-stamp: post-patches
echo yes | ./configure $(CONFIGURE_OPTS) 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 # proceed
$(MAKE) sub-src sub-plugins sub-tools $(MAKE) sub-src sub-plugins sub-tools
$(MAKE) -C src INSTALL_ROOT=$(TMP_INSTALL) install_target $(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/ 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 .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 touch libqt-thread-stamp
clean:: clean::
@ -209,7 +196,6 @@ clean::
extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer
rm -f qmake/*o 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 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 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

3
ubuntu/_base/dependencies/tqt3/debian/libtqt3-headers.install
Unescape View File

@ -91,6 +91,9 @@ usr/include/tqt3/ntqiconset.h
usr/include/tqt3/ntqiconview.h usr/include/tqt3/ntqiconview.h
usr/include/tqt3/ntqimage.h usr/include/tqt3/ntqimage.h
usr/include/tqt3/ntqimageformatplugin.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/ntqinputdialog.h
usr/include/tqt3/ntqintcache.h usr/include/tqt3/ntqintcache.h
usr/include/tqt3/ntqintdict.h usr/include/tqt3/ntqintdict.h

2
ubuntu/_base/dependencies/tqt3/debian/libtqt3-mt-dev.install
Unescape View File

@ -4,6 +4,8 @@ usr/lib/libtqt-mt.so
usr/lib/libtqui.prl usr/lib/libtqui.prl
usr/lib/libtqui.so usr/lib/libtqui.so
usr/lib/pkgconfig/tqt-mt.pc usr/lib/pkgconfig/tqt-mt.pc
usr/include/tqt3/ntqconfig.h
usr/include/tqt3/ntqgl.h usr/include/tqt3/ntqgl.h
usr/include/tqt3/ntqglcolormap.h usr/include/tqt3/ntqglcolormap.h
usr/include/tqt3/ntqmodules.h
usr/include/tqt3/ntqwidgetfactory.h usr/include/tqt3/ntqwidgetfactory.h

14
ubuntu/_base/dependencies/tqt3/debian/rules
Unescape View File

@ -141,11 +141,6 @@ libqt-thread-stamp: post-patches
echo yes | ./configure $(CONFIGURE_OPTS) 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 # proceed
$(MAKE) sub-src sub-plugins sub-tools $(MAKE) sub-src sub-plugins sub-tools
$(MAKE) -C src INSTALL_ROOT=$(TMP_INSTALL) install_target $(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/ 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 .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 touch libqt-thread-stamp
clean:: clean::
@ -209,7 +196,6 @@ clean::
extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer
rm -f qmake/*o 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 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 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

Write Preview
Loading…
Cancel
Save