diff --git a/bin/Packager/CollectionPackagerBase.py b/bin/Packager/CollectionPackagerBase.py --- a/bin/Packager/CollectionPackagerBase.py +++ b/bin/Packager/CollectionPackagerBase.py @@ -234,6 +234,12 @@ if not os.path.exists( archiveDir ): os.makedirs( archiveDir ) + # Qt expects plugins and qml files below bin, on the target sytsem + binPath = os.path.join(archiveDir, "bin") + for path in [os.path.join(archiveDir, "plugins"), os.path.join(archiveDir, "qml")]: + if os.path.isdir(path): + utils.mergeTree(path, binPath) + return True diff --git a/portage/extragear/atcore/atcore.py b/portage/extragear/atcore/atcore.py --- a/portage/extragear/atcore/atcore.py +++ b/portage/extragear/atcore/atcore.py @@ -42,11 +42,5 @@ # TODO: Why is that needed? os.mkdir(os.path.join(archiveDir, "etc", "dbus-1", "session.d")) - # TODO: Can we generalize this for other apps? - # move everything to the location where Qt expects it - binPath = os.path.join(archiveDir, "bin") - - utils.mergeTree(os.path.join(archiveDir, "plugins"), binPath) - # TODO: Just blacklisting this doesn't work. WTF? utils.rmtree(os.path.join(archiveDir, "dev-utils")) diff --git a/portage/extragear/kdeconnect-kde/kdeconnect-kde.py b/portage/extragear/kdeconnect-kde/kdeconnect-kde.py --- a/portage/extragear/kdeconnect-kde/kdeconnect-kde.py +++ b/portage/extragear/kdeconnect-kde/kdeconnect-kde.py @@ -44,8 +44,6 @@ # move everything to the location where Qt expects it binPath = os.path.join(archiveDir, "bin") - utils.mergeTree(os.path.join(archiveDir, "plugins"), binPath) - utils.mergeTree(os.path.join(archiveDir, "qml"), binPath) utils.mergeTree(os.path.join(archiveDir, "lib/qca-qt5"), binPath) # TODO: Just blacklisting this doesn't work. WTF? diff --git a/portage/extragear/kdevelop/kdevelop.py b/portage/extragear/kdevelop/kdevelop.py --- a/portage/extragear/kdevelop/kdevelop.py +++ b/portage/extragear/kdevelop/kdevelop.py @@ -74,12 +74,5 @@ # TODO: Why is that needed? os.mkdir(os.path.join(archiveDir, "etc", "dbus-1", "session.d")) - # TODO: Can we generalize this for other apps? - # move everything to the location where Qt expects it - binPath = os.path.join(archiveDir, "bin") - - utils.mergeTree(os.path.join(archiveDir, "plugins"), binPath) - utils.mergeTree(os.path.join(archiveDir, "qml"), os.path.join(archiveDir, binPath)) - # TODO: Just blacklisting this doesn't work. WTF? utils.rmtree(os.path.join(archiveDir, "dev-utils")) diff --git a/portage/extragear/kile/kile.py b/portage/extragear/kile/kile.py --- a/portage/extragear/kile/kile.py +++ b/portage/extragear/kile/kile.py @@ -39,11 +39,5 @@ # TODO: Why is that needed? os.mkdir(os.path.join(archiveDir, "etc", "dbus-1", "session.d")) - # TODO: Can we generalize this for other apps? - # move everything to the location where Qt expects it - binPath = os.path.join(archiveDir, "bin") - - utils.mergeTree(os.path.join(archiveDir, "plugins"), binPath) - # TODO: Just blacklisting this doesn't work. WTF? utils.rmtree(os.path.join(archiveDir, "dev-utils")) \ No newline at end of file diff --git a/portage/extragear/kmymoney/kmymoney.py b/portage/extragear/kmymoney/kmymoney.py --- a/portage/extragear/kmymoney/kmymoney.py +++ b/portage/extragear/kmymoney/kmymoney.py @@ -63,9 +63,7 @@ # move everything to the location where Qt expects it binPath = os.path.join(archiveDir, "bin") - utils.mergeTree(os.path.join(archiveDir, "plugins"), binPath) utils.mergeTree(os.path.join(archiveDir, "lib", "plugins"), binPath) - utils.mergeTree(os.path.join(archiveDir, "qml"), os.path.join(archiveDir, binPath)) utils.mergeTree(os.path.join(archiveDir, "lib", "qml"), os.path.join(archiveDir, binPath)) # TODO: Just blacklisting this doesn't work. WTF? diff --git a/portage/extragear/konversation/konversation.py b/portage/extragear/konversation/konversation.py --- a/portage/extragear/konversation/konversation.py +++ b/portage/extragear/konversation/konversation.py @@ -51,11 +51,5 @@ # TODO: Why is that needed? os.mkdir(os.path.join(archiveDir, "etc", "dbus-1", "session.d")) - # TODO: Can we generalize this for other apps? - # move everything to the location where Qt expects it - binPath = os.path.join(archiveDir, "bin") - - utils.mergeTree(os.path.join(archiveDir, "plugins"), binPath) - # TODO: Just blacklisting this doesn't work. WTF? utils.rmtree(os.path.join(archiveDir, "dev-utils")) \ No newline at end of file diff --git a/portage/extragear/peruse/peruse.py b/portage/extragear/peruse/peruse.py --- a/portage/extragear/peruse/peruse.py +++ b/portage/extragear/peruse/peruse.py @@ -60,9 +60,7 @@ utils.moveFile(os.path.join(archiveDir, "etc", "xdg", "peruse.knsrc"), os.path.join(binPath, "data", "peruse.knsrc")) - utils.mergeTree(os.path.join(archiveDir, "plugins"), binPath) utils.mergeTree(os.path.join(archiveDir, "lib", "qca-qt5"), binPath) - utils.mergeTree(os.path.join(archiveDir, "qml"), os.path.join(archiveDir, binPath)) utils.rmtree(os.path.join(self.archiveDir(),"lib")) diff --git a/portage/kde/applications/kate/kate.py b/portage/kde/applications/kate/kate.py --- a/portage/kde/applications/kate/kate.py +++ b/portage/kde/applications/kate/kate.py @@ -58,11 +58,5 @@ # TODO: Why is that needed? os.mkdir(os.path.join(archiveDir, "etc", "dbus-1", "session.d")) - # TODO: Can we generalize this for other apps? - # move everything to the location where Qt expects it - binPath = os.path.join(archiveDir, "bin") - - utils.mergeTree(os.path.join(archiveDir, "plugins"), binPath) - # TODO: Just blacklisting this doesn't work. WTF? utils.rmtree(os.path.join(archiveDir, "dev-utils")) diff --git a/portage/kde/applications/kolourpaint/kolourpaint.py b/portage/kde/applications/kolourpaint/kolourpaint.py --- a/portage/kde/applications/kolourpaint/kolourpaint.py +++ b/portage/kde/applications/kolourpaint/kolourpaint.py @@ -42,10 +42,6 @@ def preArchive(self): archiveDir = self.archiveDir() - # move everything to the location where Qt expects it - binPath = os.path.join(archiveDir, "bin") - utils.mergeTree(os.path.join(archiveDir, "plugins"), binPath) - utils.mergeTree(os.path.join(archiveDir, "qml"), os.path.join(archiveDir, binPath)) # TODO: Just blacklisting this doesn't work. WTF? utils.rmtree(os.path.join(archiveDir, "dev-utils")) return TypePackager.preArchive(self) \ No newline at end of file diff --git a/portage/kde/applications/kstars/kstars.py b/portage/kde/applications/kstars/kstars.py --- a/portage/kde/applications/kstars/kstars.py +++ b/portage/kde/applications/kstars/kstars.py @@ -56,14 +56,5 @@ # TODO: Why is that needed? os.mkdir(os.path.join(archiveDir, "etc", "dbus-1", "session.d")) - # TODO: Can we generalize this for other apps? - # move everything to the location where Qt expects it - binPath = os.path.join(archiveDir, "bin") - - utils.mergeTree(os.path.join(archiveDir, "plugins"), binPath) - #utils.mergeTree(os.path.join(archiveDir, "lib", "plugins"), binPath) - utils.mergeTree(os.path.join(archiveDir, "qml"), os.path.join(archiveDir, binPath)) - #utils.mergeTree(os.path.join(archiveDir, "lib", "qml"), os.path.join(archiveDir, binPath)) - # TODO: Just blacklisting this doesn't work. WTF? utils.rmtree(os.path.join(archiveDir, "dev-utils")) diff --git a/portage/kde/applications/okular/okular.py b/portage/kde/applications/okular/okular.py --- a/portage/kde/applications/okular/okular.py +++ b/portage/kde/applications/okular/okular.py @@ -59,10 +59,5 @@ def preArchive(self): archiveDir = self.archiveDir() - # move everything to the location where Qt expects it - binPath = os.path.join(archiveDir, "bin") - utils.mergeTree(os.path.join(archiveDir, "plugins"), binPath) - utils.mergeTree(os.path.join(archiveDir, "qml"), os.path.join(archiveDir, binPath)) - # TODO: Just blacklisting this doesn't work. WTF? utils.rmtree(os.path.join(archiveDir, "dev-utils")) diff --git a/portage/kde/kdesdk/okteta/okteta.py b/portage/kde/kdesdk/okteta/okteta.py --- a/portage/kde/kdesdk/okteta/okteta.py +++ b/portage/kde/kdesdk/okteta/okteta.py @@ -56,10 +56,5 @@ def preArchive(self): archiveDir = self.archiveDir() - # move everything to the location where Qt expects it - binPath = os.path.join(archiveDir, "bin") - utils.mergeTree(os.path.join(archiveDir, "plugins"), binPath) - utils.mergeTree(os.path.join(archiveDir, "qml"), os.path.join(archiveDir, binPath)) - # TODO: Just blacklisting this doesn't work. WTF? utils.rmtree(os.path.join(archiveDir, "dev-utils"))