summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-12-09 02:52:37 +0100
committerSlávek Banko <slavek.banko@axis.cz>2019-12-09 02:52:37 +0100
commit0bfe4e2db5faf194cbafe6c3fcb8f331dd32f8c5 (patch)
treee3f2321c84c0d69b72048656e84ec54b21c8be1b
parenteeab3bb4a526bfcae4f948a8e2b8327f4db35c75 (diff)
downloadtde-packaging-v3.5.13-sru.tar.gz
tde-packaging-v3.5.13-sru.zip
DEB qt3: Drop deleting/re-creating symlinks for include/qinputcontext*.h.v3.5.13-sru
Installation of the qinputcontext*.h, qconfig.h and qmodules.h files moved from rules to regular *.install files. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--debian/_base/dependencies/qt3/debian/libqt3-headers.install3
-rw-r--r--debian/_base/dependencies/qt3/debian/libqt3-mt-dev.install2
-rwxr-xr-xdebian/_base/dependencies/qt3/debian/rules14
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/libqt3-headers.install3
-rw-r--r--ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.install2
-rwxr-xr-xubuntu/_base/dependencies/qt3/debian/rules14
6 files changed, 10 insertions, 28 deletions
diff --git a/debian/_base/dependencies/qt3/debian/libqt3-headers.install b/debian/_base/dependencies/qt3/debian/libqt3-headers.install
index 2c789fcee..10378c29e 100644
--- a/debian/_base/dependencies/qt3/debian/libqt3-headers.install
+++ b/debian/_base/dependencies/qt3/debian/libqt3-headers.install
@@ -91,6 +91,9 @@ usr/include/qt3/qiconset.h
usr/include/qt3/qiconview.h
usr/include/qt3/qimage.h
usr/include/qt3/qimageformatplugin.h
+usr/include/qt3/qinputcontext.h
+usr/include/qt3/qinputcontextfactory.h
+usr/include/qt3/qinputcontextplugin.h
usr/include/qt3/qinputdialog.h
usr/include/qt3/qintcache.h
usr/include/qt3/qintdict.h
diff --git a/debian/_base/dependencies/qt3/debian/libqt3-mt-dev.install b/debian/_base/dependencies/qt3/debian/libqt3-mt-dev.install
index 09432e016..d0e81fc22 100644
--- a/debian/_base/dependencies/qt3/debian/libqt3-mt-dev.install
+++ b/debian/_base/dependencies/qt3/debian/libqt3-mt-dev.install
@@ -4,6 +4,8 @@ usr/lib/libqt-mt.so
usr/lib/libqui.prl
usr/lib/libqui.so
usr/lib/pkgconfig/qt-mt.pc
+usr/include/qt3/qconfig.h
usr/include/qt3/qgl.h
usr/include/qt3/qglcolormap.h
+usr/include/qt3/qmodules.h
usr/include/qt3/qwidgetfactory.h
diff --git a/debian/_base/dependencies/qt3/debian/rules b/debian/_base/dependencies/qt3/debian/rules
index 4ef7a9c77..a42b3b2ec 100755
--- a/debian/_base/dependencies/qt3/debian/rules
+++ b/debian/_base/dependencies/qt3/debian/rules
@@ -135,11 +135,6 @@ libqt-thread-stamp: post-patches
echo yes | ./configure $(CONFIGURE_OPTS)
- rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h
- ln -s ../src/kernel/qinputcontext.h include/qinputcontext.h
- ln -s ../src/inputmethod/qinputcontextfactory.h include/qinputcontextfactory.h
- ln -s ../src/inputmethod/qinputcontextplugin.h include/qinputcontextplugin.h
-
# proceed
$(MAKE) sub-src sub-plugins sub-tools
$(MAKE) -C src INSTALL_ROOT=$(TMP_INSTALL) install_target
@@ -165,14 +160,6 @@ libqt-thread-stamp: post-patches
install -d $(P_QTMTDEV)/usr/share/qt3/
cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/qt3#g" > $(P_QTMTDEV)/usr/share/qt3/.qmake.cache
- # install qconfig.h for the mt
- install -m 644 -D include/qconfig.h $(P_QTMTDEV)/usr/include/qt3/qconfig.h
- install -m 644 -D include/qmodules.h $(P_QTMTDEV)/usr/include/qt3/qmodules.h
-
- install -m 644 -D include/qinputcontext.h $(P_HEADERS)/usr/include/qt3/qinputcontext.h
- install -m 644 -D include/qinputcontextfactory.h $(P_HEADERS)/usr/include/qt3/qinputcontextfactory.h
- install -m 644 -D include/qinputcontextplugin.h $(P_HEADERS)/usr/include/qt3/qinputcontextplugin.h
-
touch libqt-thread-stamp
clean::
@@ -203,7 +190,6 @@ clean::
extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer
rm -f qmake/*o
- rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.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
diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-headers.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-headers.install
index 2c789fcee..10378c29e 100644
--- a/ubuntu/_base/dependencies/qt3/debian/libqt3-headers.install
+++ b/ubuntu/_base/dependencies/qt3/debian/libqt3-headers.install
@@ -91,6 +91,9 @@ usr/include/qt3/qiconset.h
usr/include/qt3/qiconview.h
usr/include/qt3/qimage.h
usr/include/qt3/qimageformatplugin.h
+usr/include/qt3/qinputcontext.h
+usr/include/qt3/qinputcontextfactory.h
+usr/include/qt3/qinputcontextplugin.h
usr/include/qt3/qinputdialog.h
usr/include/qt3/qintcache.h
usr/include/qt3/qintdict.h
diff --git a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.install b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.install
index 09432e016..d0e81fc22 100644
--- a/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.install
+++ b/ubuntu/_base/dependencies/qt3/debian/libqt3-mt-dev.install
@@ -4,6 +4,8 @@ usr/lib/libqt-mt.so
usr/lib/libqui.prl
usr/lib/libqui.so
usr/lib/pkgconfig/qt-mt.pc
+usr/include/qt3/qconfig.h
usr/include/qt3/qgl.h
usr/include/qt3/qglcolormap.h
+usr/include/qt3/qmodules.h
usr/include/qt3/qwidgetfactory.h
diff --git a/ubuntu/_base/dependencies/qt3/debian/rules b/ubuntu/_base/dependencies/qt3/debian/rules
index 4ef7a9c77..a42b3b2ec 100755
--- a/ubuntu/_base/dependencies/qt3/debian/rules
+++ b/ubuntu/_base/dependencies/qt3/debian/rules
@@ -135,11 +135,6 @@ libqt-thread-stamp: post-patches
echo yes | ./configure $(CONFIGURE_OPTS)
- rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.h
- ln -s ../src/kernel/qinputcontext.h include/qinputcontext.h
- ln -s ../src/inputmethod/qinputcontextfactory.h include/qinputcontextfactory.h
- ln -s ../src/inputmethod/qinputcontextplugin.h include/qinputcontextplugin.h
-
# proceed
$(MAKE) sub-src sub-plugins sub-tools
$(MAKE) -C src INSTALL_ROOT=$(TMP_INSTALL) install_target
@@ -165,14 +160,6 @@ libqt-thread-stamp: post-patches
install -d $(P_QTMTDEV)/usr/share/qt3/
cat .qmake.cache | sed "s#$(QTDIR)#/usr/share/qt3#g" > $(P_QTMTDEV)/usr/share/qt3/.qmake.cache
- # install qconfig.h for the mt
- install -m 644 -D include/qconfig.h $(P_QTMTDEV)/usr/include/qt3/qconfig.h
- install -m 644 -D include/qmodules.h $(P_QTMTDEV)/usr/include/qt3/qmodules.h
-
- install -m 644 -D include/qinputcontext.h $(P_HEADERS)/usr/include/qt3/qinputcontext.h
- install -m 644 -D include/qinputcontextfactory.h $(P_HEADERS)/usr/include/qt3/qinputcontextfactory.h
- install -m 644 -D include/qinputcontextplugin.h $(P_HEADERS)/usr/include/qt3/qinputcontextplugin.h
-
touch libqt-thread-stamp
clean::
@@ -203,7 +190,6 @@ clean::
extensions/nsplugin/examples/grapher/libgrapher.prl bin/designer
rm -f qmake/*o
- rm -rf include/qinputcontext.h include/qinputcontextfactory.h include/qinputcontextplugin.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