Joining the Debian Qt/KDE Team and requesting Salsa access
Hi all, I am looking to join Debian's Qt/KDE Team and see what I can do here. My Salsa username is byang. I have multiple packages that involves the Qt and KDE software stack, and handling them from inside the team could be a better choice. To start with, I am looking at handling the libkimageannotator transition [1][2]. It involves src:gwenview, which will need some tweak from the gwenview side (maintainer in CC list). Since KDE software is already depending on the ibkcolorpicker / libkimageannotator / ksnip series of projects, I am wondering if moving their package maintenance under KDE Extras umbrella would be reasonable. There is a "k" in their names but no libkf* libraries are used. Thanks, Boyuan Yang [1] https://release.debian.org/transitions/html/auto-kimageannotator.html [2] https://github.com/ksnip/kColorPicker/issues/13 signature.asc Description: This is a digitally signed message part
Bug#1069855: ark may remove archive on SMB share
Source: ark Version: 4:23.08.1-2 Severity: normal Dear Maintainer, when adding a file to an archive on a (samba) SMB share, the archive disappears completely: In '/etc/fstab': //192.168.122.184/share/ /media/sambashare cifs user,nobrl,user=andi,password=123 0 0 Mount the share, then: cd /media/sambashare/ tar zcf test.tar.gz /usr/share/doc/cifs-utils ls test.tar.gz … ark --add-to test.tar.gz /usr/share/images/desktop-base/desktop-grub.png ls test.tar.gz ls: cannot access 'test.tar.gz': No such file or directory A share provided by ksmbd does not show show the issue. This has been found when trying to understand the issue reported in [1]. Thanks and best regards, Andi [1] https://bugs.debian.org/1069835 mount: //192.168.122.157/homedirs on /media/ksmbdshare type cifs (rw,nosuid,nodev,relatime,vers=3.1.1,cache=strict,username=smbuser,uid=1000,noforceuid,gid=1000,noforcegid,addr=192.168.122.157,file_mode=0755,dir_mode=0755,soft,nounix,serverino,mapposix,nobrl,rsize=4194304,wsize=4194304,bsize=1048576,echo_interval=60,actimeo=1,closetimeo=1,user=ansible,user=smbuser) //192.168.122.184/homes on /media/sambashare type cifs (rw,nosuid,nodev,relatime,vers=3.1.1,cache=strict,username=andi,uid=1000,noforceuid,gid=1000,noforcegid,addr=192.168.122.184,file_mode=0755,dir_mode=0755,soft,nounix,serverino,mapposix,nobrl,rsize=4194304,wsize=4194304,bsize=1048576,echo_interval=60,actimeo=1,closetimeo=1,user=ansible,user=andi) -- GPG key: 4096R/617B586D 2010-03-22 Andreas B. Mundt-- Andreas B. Mundt-- Andreas B. Mundt-- Andreas B. Mundt-- 938A 5CEE 1E29 0DE2 55D9 AC98 B01F EA84 617B 586D https://keys.openpgp.org/
Processing of kf6-kauth_6.0.0-1_amd64.changes
kf6-kauth_6.0.0-1_amd64.changes uploaded successfully to localhost along with the files: kf6-kauth_6.0.0-1.dsc kf6-kauth_6.0.0.orig.tar.xz kf6-kauth_6.0.0.orig.tar.xz.asc kf6-kauth_6.0.0-1.debian.tar.xz kf6-kauth_6.0.0-1_amd64.buildinfo libkf6auth-data_6.0.0-1_all.deb libkf6auth-dev-bin-dbgsym_6.0.0-1_amd64.deb libkf6auth-dev-bin_6.0.0-1_amd64.deb libkf6auth-dev_6.0.0-1_amd64.deb libkf6auth-doc_6.0.0-1_all.deb libkf6authcore6-dbgsym_6.0.0-1_amd64.deb libkf6authcore6_6.0.0-1_amd64.deb Greetings, Your Debian queue daemon (running on host usper.debian.org)
kf6-kauth_6.0.0-1_amd64.changes is NEW
binary:libkf6auth-data is NEW. binary:libkf6auth-dev is NEW. binary:libkf6auth-dev-bin is NEW. binary:libkf6auth-doc is NEW. binary:libkf6authcore6 is NEW. binary:libkf6auth-data is NEW. binary:libkf6auth-dev-bin is NEW. binary:libkf6auth-dev is NEW. binary:libkf6auth-doc is NEW. binary:libkf6authcore6 is NEW. source:kf6-kauth is NEW. Your package has been put into the NEW queue, which requires manual action from the ftpteam to process. The upload was otherwise valid (it had a good OpenPGP signature and file hashes are valid), so please be patient. Packages are routinely processed through to the archive, and do feel free to browse the NEW queue[1]. If there is an issue with the upload, you will receive an email from a member of the ftpteam. If you have any questions, you may reply to this email. [1]: https://ftp-master.debian.org/new.html or https://ftp-master.debian.org/backports-new.html for *-backports pgpwHHCaMM7TB.pgp Description: PGP signature
[bts-link] source package src:qtwebkit-opensource-src
# # bts-link upstream status pull for source package src:qtwebkit-opensource-src # see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html # https://bts-link-team.pages.debian.net/bts-link/ # user debian-bts-l...@lists.debian.org # remote status report for #779569 (http://bugs.debian.org/779569) # Bug title: addToJavaScriptWindowObject exports QObject's slots by default # * https://bugreports.qt.io/browse/QTBUG-45049 # * remote status changed: Open -> Closed # * remote resolution changed: (?) -> Won-t-Do # * closed upstream tags 779569 + fixed-upstream usertags 779569 - status-Open usertags 779569 + status-Closed resolution-Won-t-Do thanks
[bts-link] source package konqueror
# # bts-link upstream status pull for source package konqueror # see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html # https://bts-link-team.pages.debian.net/bts-link/ # user debian-bts-l...@lists.debian.org # remote status report for #1063665 (http://bugs.debian.org/1063665) # Bug title: konqueror: start page -> "The requested operation could not be completed", "Undocumented error" code 1560894720 # * http://bugs.kde.org/show_bug.cgi?id=451480 # * remote status changed: (?) -> UNCONFIRMED usertags 1063665 + status-UNCONFIRMED thanks
[bts-link] source package kmail
# # bts-link upstream status pull for source package kmail # see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html # https://bts-link-team.pages.debian.net/bts-link/ # user debian-bts-l...@lists.debian.org # remote status report for #228952 (http://bugs.debian.org/228952) # Bug title: kmail: Kmail with Kvim interation # * http://bugs.kde.org/show_bug.cgi?id=59481 # * remote status changed: CONFIRMED -> RESOLVED # * remote resolution changed: (?) -> WONTFIX # * upstream said bug is wontfix tags 228952 + upstream wontfix usertags 228952 - status-CONFIRMED usertags 228952 + status-RESOLVED resolution-WONTFIX thanks
[bts-link] source package baloo-kf5
# # bts-link upstream status pull for source package baloo-kf5 # see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html # https://bts-link-team.pages.debian.net/bts-link/ # user debian-bts-l...@lists.debian.org # remote status report for #1032252 (http://bugs.debian.org/1032252) # Bug title: baloo-kf5: baloo displays search results multiple times. # * http://bugs.kde.org/show_bug.cgi?id=401863 # * remote status changed: CONFIRMED -> RESOLVED # * remote resolution changed: (?) -> FIXED # * closed upstream tags 1032252 + fixed-upstream usertags 1032252 - status-CONFIRMED usertags 1032252 + status-RESOLVED resolution-FIXED thanks
Processed: [bts-link] source package kmail
Processing commands for cont...@bugs.debian.org: > # > # bts-link upstream status pull for source package kmail > # see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html > # https://bts-link-team.pages.debian.net/bts-link/ > # > user debian-bts-l...@lists.debian.org Setting user to debian-bts-l...@lists.debian.org (was debian-bts-l...@lists.debian.org). > # remote status report for #228952 (http://bugs.debian.org/228952) > # Bug title: kmail: Kmail with Kvim interation > # * http://bugs.kde.org/show_bug.cgi?id=59481 > # * remote status changed: CONFIRMED -> RESOLVED > # * remote resolution changed: (?) -> WONTFIX > # * upstream said bug is wontfix > tags 228952 + upstream wontfix Bug #228952 [kmail] kmail: Kmail with Kvim interation Added tag(s) wontfix. > usertags 228952 - status-CONFIRMED Usertags were: status-CONFIRMED. There are now no usertags set. > usertags 228952 + status-RESOLVED resolution-WONTFIX There were no usertags set. Usertags are now: status-RESOLVED resolution-WONTFIX. > thanks Stopping processing here. Please contact me if you need assistance. -- 228952: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=228952 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
Processed: [bts-link] source package baloo-kf5
Processing commands for cont...@bugs.debian.org: > # > # bts-link upstream status pull for source package baloo-kf5 > # see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html > # https://bts-link-team.pages.debian.net/bts-link/ > # > user debian-bts-l...@lists.debian.org Setting user to debian-bts-l...@lists.debian.org (was debian-bts-l...@lists.debian.org). > # remote status report for #1032252 (http://bugs.debian.org/1032252) > # Bug title: baloo-kf5: baloo displays search results multiple times. > # * http://bugs.kde.org/show_bug.cgi?id=401863 > # * remote status changed: CONFIRMED -> RESOLVED > # * remote resolution changed: (?) -> FIXED > # * closed upstream > tags 1032252 + fixed-upstream Bug #1032252 [baloo-kf5] baloo-kf5: baloo displays search results multiple times. Added tag(s) fixed-upstream. > usertags 1032252 - status-CONFIRMED Usertags were: status-CONFIRMED. There are now no usertags set. > usertags 1032252 + status-RESOLVED resolution-FIXED There were no usertags set. Usertags are now: resolution-FIXED status-RESOLVED. > thanks Stopping processing here. Please contact me if you need assistance. -- 1032252: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1032252 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
Processed: [bts-link] source package src:qtwebkit-opensource-src
Processing commands for cont...@bugs.debian.org: > # > # bts-link upstream status pull for source package src:qtwebkit-opensource-src > # see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html > # https://bts-link-team.pages.debian.net/bts-link/ > # > user debian-bts-l...@lists.debian.org Setting user to debian-bts-l...@lists.debian.org (was debian-bts-l...@lists.debian.org). > # remote status report for #779569 (http://bugs.debian.org/779569) > # Bug title: addToJavaScriptWindowObject exports QObject's slots by default > # * https://bugreports.qt.io/browse/QTBUG-45049 > # * remote status changed: Open -> Closed > # * remote resolution changed: (?) -> Won-t-Do > # * closed upstream > tags 779569 + fixed-upstream Bug #779569 [src:qtwebkit-opensource-src] addToJavaScriptWindowObject exports QObject's slots by default Added tag(s) fixed-upstream. > usertags 779569 - status-Open Usertags were: status-Open. There are now no usertags set. > usertags 779569 + status-Closed resolution-Won-t-Do There were no usertags set. Usertags are now: status-Closed resolution-Won-t-Do. > thanks Stopping processing here. Please contact me if you need assistance. -- 779569: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=779569 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
Bug#1069831: kaddressbook: KAddressBook is not in the application launcher.
Hej Olaf,
Am Donnerstag, 25. April 2024, 14:56:01 CEST schrieb olaf:
> Package: kaddressbook
> Version: 4:22.12.3-1+b1
> Severity: normal
>
> Dear Maintainer,
>
> the term used in the KDE Help Center (KDE-Hilfezentrum) is
> "KAddressBook" ("Das Handbuch zu KAddressBook").
>
> There is no "KAddressBook" in the "KDE application launcher"
> ("Anwendungsstarter", my translation, what this launcher is called in
> the original is unknown to me).
>
> However, there is an "Addressbuch" which becomes "KAddressBook" after
> startup.
>
> Maybe it has something to do with the infantilization of program
> names, as GNOME has done, maybe it is a translation error into German?
I think this is one of those "It's not a bug, it's a feature."
When you type a term into the search field in your application launcher,
I think it only searches the fields for your system language, highly
likely by design. I KAddressbook's example, the German translation lists
"Addresbuch" and therefore the app will show up in your launcher.
However, it will not show up when you type "kaddressbook" as this term
is not listed under German.
If you switched your system language to English, it would list the app
when you search for "kaddressbook", but not when you search for
"Adressbuch". And this is intentional as you wouldn't want tons of
results just because your search term matches something in French or
Swaheli, now would you ?
I'm inclined to close this bug as I don't think that this is a bug...
--
Med vänliga hälsningar
Patrick Franz
Bug#1062965: Re: Bug#1069810: qt6-tools:6.4.2: Please add support for loongarch64
Hej, Am Donnerstag, 25. April 2024, 13:49:46 CEST schrieb 王怀卿: [...] > Would you > please provide an approximate timeline for the release of the 6.6.2 > version of qt6-tools by the Debian community? I'm sorry, but I cannot. I doubt anyone can. The time_t transition is quite complex and the first packages have started to migrate to testing, but It's unknown when all relevant packages for Qt 6 can migrate. What you can do is check when qt6-base migrates. That might give you an idea how long it's going to take until 6.6.2 is available. -- Med vänliga hälsningar Patrick Franz
Bug#1069831: kaddressbook: KAddressBook is not in the application launcher.
Package: kaddressbook
Version: 4:22.12.3-1+b1
Severity: normal
Dear Maintainer,
the term used in the KDE Help Center (KDE-Hilfezentrum) is
"KAddressBook" ("Das Handbuch zu KAddressBook").
There is no "KAddressBook" in the "KDE application launcher"
("Anwendungsstarter", my translation, what this launcher is called in
the original is unknown to me).
However, there is an "Addressbuch" which becomes "KAddressBook" after
startup.
Maybe it has something to do with the infantilization of program
names, as GNOME has done, maybe it is a translation error into German?
-- System Information:
Debian Release: trixie/sid
APT prefers testing
APT policy: (990, 'testing'), (500, 'stable-security'), (9, 'unstable'), (1,
'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 6.6.28 (SMP w/12 CPU threads; PREEMPT)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8),
LANGUAGE=de:en_GB
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
Versions of packages kaddressbook depends on:
ii akonadi-server 4:22.12.3-1+b1
ii kaddressbook-data 4:22.12.3-1
ii kdepim-runtime 4:22.12.3-2
ii libc6 2.38-6
ii libgcc-s1 14-20240330-1
ii libkf5akonadicontact5 [libkf5akonadicontact5-22.12] 4:22.12.3-1+b1
ii libkf5akonadicore5abi2 [libkf5akonadicore5-22.12] 4:22.12.3-1+b1
ii libkf5akonadisearch-bin 4:22.12.3-1+b1
ii libkf5akonadisearch-plugins 4:22.12.3-1+b1
ii libkf5akonadisearchdebug5 [libkf5akonadisearchdebug5-2 4:22.12.3-1+b1
2.12]
ii libkf5akonadiwidgets5abi1 [libkf5akonadiwidgets5-22.12 4:22.12.3-1+b1
]
ii libkf5configcore5 5.107.0-1+b1
ii libkf5configgui55.107.0-1+b1
ii libkf5configwidgets55.107.0-2+b1
ii libkf5contacts5 5:5.107.0-1
ii libkf5coreaddons5 5.107.0-1+b1
ii libkf5crash55.107.0-1+b1
ii libkf5grantleetheme5 [libkf5grantleetheme5-22.12] 22.12.3-2+b1
ii libkf5i18n5 5.107.0-1+b1
ii libkf5itemmodels5 5.107.0-1+b1
ii libkf5kcmutils5 5.107.0-2+b1
ii libkf5kontactinterface5 [libkf5kontactinterface5-22.12 22.12.3-1+b1
]
ii libkf5libkdepim5 [libkf5libkdepim5-22.12] 4:22.12.3-1
ii libkf5parts55.107.0-1+b1
ii libkf5pimcommon5abi2 [libkf5pimcommon5-22.12] 4:22.12.3-1
ii libkf5pimcommonakonadi5abi1 [libkf5pimcommonakonadi5-2 4:22.12.3-1
2.12]
ii libkf5widgetsaddons55.107.0-1+b1
ii libkf5xmlgui5 5.107.0-1+b1
ii libkpimaddressbookimportexport5 [libkpimaddressbookimp 4:22.12.3-1+b1
ortexport5-22.12]
ii libkuserfeedbackcore1 1.3.0-3+b1
ii libkuserfeedbackwidgets11.3.0-3+b1
ii libqt5core5t64 [libqt5core5a] 5.15.10+dfsg-7.2+b1
ii libqt5dbus5t64 [libqt5dbus5]5.15.10+dfsg-7.2+b1
ii libqt5gui5t64 [libqt5gui5] 5.15.10+dfsg-7.2+b1
ii libqt5printsupport5t64 [libqt5printsupport5]5.15.10+dfsg-7.2+b1
ii libqt5widgets5t64 [libqt5widgets5] 5.15.10+dfsg-7.2+b1
ii libstdc++6 14-20240330-1
Versions of packages kaddressbook recommends:
ii kdepim-addons 22.12.3-1
kaddressbook suggests no packages.
-- no debconf information
Bug#1062965: Re: Bug#1069810: qt6-tools:6.4.2: Please add support for loongarch64
> -原始邮件- > 发件人: "Patrick Franz" > 发送时间:2024-04-25 18:19:55 (星期四) > 收件人: sub...@bugs.debian.org, debian-qt-kde@lists.debian.org, 王怀卿 > , 1069...@bugs.debian.org > 抄送: 王洪虎 , 宋鼎 , 杨小娟 > , 桑猛 , 1062...@bugs.debian.org > 主题: Re: Bug#1069810: qt6-tools:6.4.2: Please add support for loongarch64 > > Hej, > > I will likely not add this patch for 6.4.2 as my plan regarding Qt 6 is > the following: > > During the time_t transition, I only want to change or fix what is > absolutely necessary for the transition to succeed. Adding support for > loong64 is not among that. > Once the transition is completed for Qt 6, I want to push Qt 6.6.2 to > unstable which builds successfully on loong64. > > Thanks for your understanding. > > > -- > Med vänliga hälsningar > > Patrick Franz > Thank you for your reply and explanation. As shown below the dashed line, I noticed that the issue has been resolved in the control file of version 6.6.2 of qt6-tools. Would you please provide an approximate timeline for the release of the 6.6.2 version of qt6-tools by the Debian community? - Source: qt6-tools Section: libs Priority: optional Maintainer: Debian Qt/KDE Maintainers Uploaders: Patrick Franz , Build-Depends: clang-17, cmake (>= 3.24~), debhelper-compat (= 13), libclang-17-dev, libcurl4-openssl-dev | libcurl4-dev, libgl-dev, liblitehtml-dev (>= 0.6~), libssl-dev, libvulkan-dev [linux-any], libxcb-xkb-dev, libzstd-dev (>= 1.3), llvm-17-dev, ninja-build, pkgconf, pkg-kde-tools, qt6-base-dev (>= 6.6.2+dfsg~), qt6-base-private-dev (>= 6.6.2+dfsg~), qt6-declarative-dev (>= 6.6.2+dfsg~), qt6-declarative-private-dev (>= 6.6.2+dfsg~), Build-Depends-Indep: qt6-base-dev (>= 6.6~) , qt6-documentation-tools (>= 6.6~) , Standards-Version: 4.6.2 Homepage: https://www.qt.io/developers/ Vcs-Browser: https://salsa.debian.org/qt-kde-team/qt6/qt6-tools Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-tools.git Rules-Requires-Root: no 本邮件及其附件含有龙芯中科的商业秘密信息，仅限于发送给上面地址中列出的个人或群组。禁止任何其他人以任何形式使用（包括但不限于全部或部分地泄露、复制或散发）本邮件及其附件中的信息。如果您错收本邮件，请您立即电话或邮件通知发件人并删除本邮件。 This email and its attachments contain confidential information from Loongson Technology , which is intended only for the person or entity whose address is listed above. Any use of the information contained herein in any way (including, but not limited to, total or partial disclosure, reproduction or dissemination) by persons other than the intended recipient(s) is prohibited. If you receive this email in error, please notify the sender by phone or email immediately and delete it.
Re: Bug#1069810: qt6-tools:6.4.2: Please add support for loongarch64
Hej, I will likely not add this patch for 6.4.2 as my plan regarding Qt 6 is the following: During the time_t transition, I only want to change or fix what is absolutely necessary for the transition to succeed. Adding support for loong64 is not among that. Once the transition is completed for Qt 6, I want to push Qt 6.6.2 to unstable which builds successfully on loong64. Thanks for your understanding. -- Med vänliga hälsningar Patrick Franz
Bug#1069810: qt6-tools:6.4.2: Please add support for loongarch64
Source: qt6-tools Version: 6.4.2 Severity: wishlist Tags: ftbfs patch User: debian-loonga...@lists.debian.org Usertags: loong64 We need to add architectural support for qt6-tools-6.4.2 Otherwise it will build failures . Please consider the following patch that I metioned. Would it be possible to include the support for LoongArch in the next upload? If you have any questions, you can contact me at any time. root@loongson:/home/loongson/whq/qt6-tools-6.4.2# dpkg-buildpackage dpkg-buildpackage: info: source package qt6-tools dpkg-buildpackage: info: source version 6.4.2-3 dpkg-buildpackage: info: source distribution unstable dpkg-buildpackage: info: source changed by Lisandro Damián Nicanor Pérez Meyer dpkg-buildpackage: info: host architecture loong64 dpkg-source --before-build . dpkg-checkbuilddeps: error: Unmet build dependencies: clang-15 libclang-15-dev llvm-15-dev dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting dpkg-buildpackage: warning: (Use -d flag to override.) For some reasons, we are unable to build LLVM-15 version on the loong64 architecture. Therefore, we need to build qt6-tools on a higher version of LLVM. Consequently, we need to modify the control file in the Debian directory. diff --git a/debian/control b/debian/control index 2d95429..deaa591 100644 --- a/debian/control +++ b/debian/control @@ -3,16 +3,16 @@ Section: libs Priority: optional Maintainer: Debian Qt/KDE Maintainers Uploaders: Patrick Franz , -Build-Depends: clang-15, +Build-Depends: clang, cmake (>= 3.24~), debhelper-compat (= 13), - libclang-15-dev, + libclang-dev, libgl-dev, liblitehtml-dev (>= 0.6~), libssl-dev, libvulkan-dev [linux-any], libxcb-xkb-dev, - llvm-15-dev, + llvm-dev, ninja-build, pkg-config, pkg-kde-tools, Additionally, since we are compiling with a higher version of LLVM, we also need to backport some upstream code into this version of qt6-tools. commit 87fac2de7378963e753a847da667d52d4ba95bff Author: Björn Schäpers Date: Wed Feb 8 12:31:04 2023 +0100 lupdate: Fix build with clang 16+ The signature changed again. I've tested it with a current main, that is clang 17, but the commit 854c10f8d185286d941307e1033eb492e085c203 with introduced the change is also contained in clang 16. Pick-to: 6.4 6.5 Change-Id: I050ca5843708be4489757538849000d3675005ac Reviewed-by: Kai Köhne diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.cpp b/src/linguist/lupdate/lupdatepreprocessoraction.cpp index d963747d8..478d5fbea 100644 --- a/src/linguist/lupdate/lupdatepreprocessoraction.cpp +++ b/src/linguist/lupdate/lupdatepreprocessoraction.cpp @@ -157,7 +157,9 @@ void LupdatePPCallbacks::SourceRangeSkipped(clang::SourceRange sourceRange, void LupdatePPCallbacks::InclusionDirective(clang::SourceLocation /*hashLoc*/, const clang::Token & /*includeTok*/, clang::StringRef /*fileName*/, bool /*isAngled*/, clang::CharSourceRange /*filenameRange*/, -#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0)) +#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(16,0,0)) +const clang::OptionalFileEntryRef file, +#elif (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0)) const clang::Optional file, #else const clang::FileEntry *file, diff --git a/src/linguist/lupdate/lupdatepreprocessoraction.h b/src/linguist/lupdate/lupdatepreprocessoraction.h index 3e44cee83..673ecb495 100644 --- a/src/linguist/lupdate/lupdatepreprocessoraction.h +++ b/src/linguist/lupdate/lupdatepreprocessoraction.h @@ -52,7 +52,9 @@ private: void InclusionDirective(clang::SourceLocation /*hashLoc*/, const clang::Token &/*includeTok*/, clang::StringRef /*fileName*/, bool /*isAngled*/, clang::CharSourceRange /*filenameRange*/, -#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0)) +#if (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(16,0,0)) +const clang::OptionalFileEntryRef file, +#elif (LUPDATE_CLANG_VERSION >= LUPDATE_CLANG_VERSION_CHECK(15,0,0)) const clang::Optional file, #else const clang::FileEntry *file,
