Hi Michele, Slavek, all, The recent changes QT_* -> TQT_* in headers (example Q_EXPORT -> TQ_EXPORT) are impacting the pinentry application. I remember we discussed once how we'll proceed with updates, but I do not recall. I could prepare the patches and probably push upstream. What is your view on this matter?
thanks in advance
BR E.
On Monday 09 of October 2023 13:11:58 deloptes via tde-devels wrote:
Hi Michele, Slavek, all, The recent changes QT_* -> TQT_* in headers (example Q_EXPORT -> TQ_EXPORT) are impacting the pinentry application. I remember we discussed once how we'll proceed with updates, but I do not recall. I could prepare the patches and probably push upstream. What is your view on this matter?
thanks in advance
BR E.
Hi Emanoil,
this very good reminder and very accurate timing, because at the end of the month is planned the final R14.1.1.
I completely forgot that the current changes will also have an impact on pinentry-tqt. It will be great if you can prepare a patch and try to push it into upstream. I assume that for R14.1.1, we can add a patch into extra-dependencies repository, unless a new upstream version will be available.
Thank you!
Cheers
Slávek Banko via tde-devels wrote:
On Monday 09 of October 2023 13:11:58 deloptes via tde-devels wrote:
Hi Michele, Slavek, all, The recent changes QT_* -> TQT_* in headers (example Q_EXPORT -> TQ_EXPORT) are impacting the pinentry application. I remember we discussed once how we'll proceed with updates, but I do not recall. I could prepare the patches and probably push upstream. What is your view on this matter?
thanks in advance
BR E.
Hi Emanoil,
this very good reminder and very accurate timing, because at the end of the month is planned the final R14.1.1.
I completely forgot that the current changes will also have an impact on pinentry-tqt. It will be great if you can prepare a patch and try to push it into upstream. I assume that for R14.1.1, we can add a patch into extra-dependencies repository, unless a new upstream version will be available.
Thank you!
Cheers
No problem Slavek, I stumbled on this by accident because I started building for Debian 11.8. I have also did not check if there are updates upstream. I'll have a look.
However the header QT_H did not change. I was expecting TQT_H to work. What is your plan regarding this?
pinentry-tqt-1.2.1$ grep QT_H tqt/* tqt/secqinternal_p.h:#ifndef QT_H tqt/secqinternal_p.h:#endif // QT_H tqt/secqlineedit.h:#ifndef QT_H tqt/secqlineedit.h:#endif // QT_H tqt/secqstring.h:#ifndef QT_H tqt/secqstring.h:#endif // QT_H
BR
Slávek Banko via tde-devels wrote:
I completely forgot that the current changes will also have an impact on pinentry-tqt. It will be great if you can prepare a patch and try to push it into upstream. I assume that for R14.1.1, we can add a patch into extra-dependencies repository, unless a new upstream version will be available.
There is no new version (tag) upstream, but there are few commits on top of 1.2.1 I think few of them might be desirable in pinentry-tqt.
I will push the patch in extra-dependencies repository for now, so that you can review them. I can also set upstream and merge the upstream commits.
Let me know what you think.
On 2023/10/10 07:37 AM, deloptes via tde-devels wrote:
Slávek Banko via tde-devels wrote:
I completely forgot that the current changes will also have an impact on pinentry-tqt. It will be great if you can prepare a patch and try to push it into upstream. I assume that for R14.1.1, we can add a patch into extra-dependencies repository, unless a new upstream version will be available.
There is no new version (tag) upstream, but there are few commits on top of 1.2.1 I think few of them might be desirable in pinentry-tqt.
I will push the patch in extra-dependencies repository for now, so that you can review them. I can also set upstream and merge the upstream commits.
Let me know what you think.
Hi Emanoil, we can leave the upstream updates for R14.1.2 since R14.1.1 has been soft frozen. The QT->TQT changes in the patch will be merged because they are needed.
After R14.1.1, feel free to prepare patch with upstream commits. Cheers Michele
Michele Calgaro via tde-devels wrote:
Hi Emanoil, we can leave the upstream updates for R14.1.2 since R14.1.1 has been soft frozen. The QT->TQT changes in the patch will be merged because they are needed.
After R14.1.1, feel free to prepare patch with upstream commits.
Hi Michele, I agree and we'll proceed this way. I tagged the PR with RFC, because I am not sure that everything I changed to TQ* was indeed changed in the respective files ... for example there were such as Q_MAC or Q_WIN. Did you replace all of these? Especially some of the conditionals may not work as expected. What is your take on that?
thanks and BR
On 2023/10/12 05:20 AM, deloptes via tde-devels wrote:
Michele Calgaro via tde-devels wrote:
Hi Emanoil, we can leave the upstream updates for R14.1.2 since R14.1.1 has been soft frozen. The QT->TQT changes in the patch will be merged because they are needed.
After R14.1.1, feel free to prepare patch with upstream commits.
Hi Michele, I agree and we'll proceed this way. I tagged the PR with RFC, because I am not sure that everything I changed to TQ* was indeed changed in the respective files ... for example there were such as Q_MAC or Q_WIN. Did you replace all of these? Especially some of the conditionals may not work as expected. What is your take on that?
Replacement is a work in progress, so there is still a mix of Q* and TQ*. But for those strings that were replaced, replacement was done everywhere. Please note TDE R14.1.1 will be released in about two weeks, so we need to finalize that PR as soon as possible or pinentry-tqt won't make it otherwise. Cheers Michele
Michele Calgaro via tde-devels wrote:
On 2023/10/12 05:20 AM, deloptes via tde-devels wrote:
Michele Calgaro via tde-devels wrote:
Hi Emanoil, we can leave the upstream updates for R14.1.2 since R14.1.1 has been soft frozen. The QT->TQT changes in the patch will be merged because they are needed.
After R14.1.1, feel free to prepare patch with upstream commits.
Hi Michele, I agree and we'll proceed this way. I tagged the PR with RFC, because I am not sure that everything I changed to TQ* was indeed changed in the respective files ... for example there were such as Q_MAC or Q_WIN. Did you replace all of these? Especially some of the conditionals may not work as expected. What is your take on that?
Replacement is a work in progress, so there is still a mix of Q* and TQ*. But for those strings that were replaced, replacement was done everywhere. Please note TDE R14.1.1 will be released in about two weeks, so we need to finalize that PR as soon as possible or pinentry-tqt won't make it otherwise. Cheers Michele
Hi Michele, I did not check mails recently but I saw now your comments. I'll update respectively and push again in the next few days. We'll make it definitely for TDE R14.1.1.
Thank you for reviewing and answering also here.
BR
Slávek Banko via tde-devels wrote:
this very good reminder and very accurate timing, because at the end of the month is planned the final R14.1.1.
I pushed the patch - please have a look if all macros, definitions and conditions were indeed renamed.
BR
-
deloptes -
Michele Calgaro -
Slávek Banko