Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libmate-panel-applet/Makefile.am: Fix build with gettext 0.22 #1375

Merged
merged 1 commit into from Jun 29, 2023

Conversation

listout
Copy link
Contributor

@listout listout commented Jun 26, 2023

With gettext-0.22 we are getting build errors like: /usr/bin/msgfmt --desktop --keyword Name --keyword Description --template org.mate.panel.TestApplet.mate-panel-applet.desktop.in -d ../po -o org.mate.panel.TestApplet.mate-panel-applet /usr/bin/msgfmt: no input file should be given if --desktop and -d are specified Try '/usr/bin/msgfmt --help' for more information. make[3]: *** [Makefile:1035: org.mate.panel.TestApplet.mate-panel-applet] Error 1 make[3]: *** Waiting for unfinished jobs....

Bug: https://bugs.gentoo.org/908877

With gettext-0.22 we are getting build errors like:
/usr/bin/msgfmt --desktop --keyword Name --keyword Description --template org.mate.panel.TestApplet.mate-panel-applet.desktop.in -d ../po -o org.mate.panel.TestApplet.mate-panel-applet
/usr/bin/msgfmt: no input file should be given if --desktop and -d are specified
Try '/usr/bin/msgfmt --help' for more information.
make[3]: *** [Makefile:1035: org.mate.panel.TestApplet.mate-panel-applet] Error 1
make[3]: *** Waiting for unfinished jobs....

Bug: https://bugs.gentoo.org/908877
Signed-off-by: Brahmajit Das <brahmajit.xyz@gmail.com>
@lukefromdc
Copy link
Member

I've still got gettext 0.21 on Debian so cannot test the effect of the change, but I am about to look for any issues with the older version

Copy link
Member

@lukefromdc lukefromdc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Configuration and build complete without issue with gettext 0.21 on Debian Unstable, we need another test with gettext 0.22 which Debian doesn't have yet.

org.mate.panel.TestApplet.mate-panel-applet built fine in my test

@lukefromdc lukefromdc requested a review from a team June 27, 2023 04:24
@cwendling
Copy link
Member

cwendling commented Jun 27, 2023

I can't test with gettext 0.22 either, but it looks good, and the documentation for 0.21 also specifies that --keyword alone disables default keywords, and that to add some you need the =. Apparently before 0.22 it also picked the next option somehow, but it wasn't documented as such, so I think that's fine to use. So +1 from me (not tested though)

@listout
Copy link
Contributor Author

listout commented Jun 27, 2023

I forgot to mention the source of the fix: https://savannah.gnu.org/bugs/index.php?64335

@raveit65
Copy link
Member

raveit65 commented Jun 29, 2023

gettext 0.22 is in fedora rawhide https://koji.fedoraproject.org/koji/buildinfo?buildID=2219094
So building should be broken and i can test PR

@raveit65
Copy link
Member

OMG and confirmed, https://kojipkgs.fedoraproject.org//work/tasks/7597/102747597/build.log

/usr/bin/msgfmt --desktop --keyword Name --keyword Description --template org.mate.panel.TestApplet.mate-panel-applet.desktop.in -d ../po -o org.mate.panel.TestApplet.mate-panel-applet
/usr/bin/msgfmt: no input file should be given if --desktop and -d are specified
Try '/usr/bin/msgfmt --help' for more information.
make[3]: *** [Makefile:1035: org.mate.panel.TestApplet.mate-panel-applet] Error 1
make[3]: *** Waiting for unfinished jobs....

I guess this will affect a lot of packages more in MATE and the rest of linux world.

@raveit65
Copy link
Member

I could fix mate-panel build in fedora rawhide with your PR.
https://koji.fedoraproject.org/koji/taskinfo?taskID=102748594
Thanks

Copy link
Member

@raveit65 raveit65 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@raveit65 raveit65 merged commit 5a7f770 into mate-desktop:master Jun 29, 2023
1 check passed
@cwendling
Copy link
Member

I guess this will affect a lot of packages more in MATE and the rest of linux world.

I just grep'd the MATE pieces I have locally (not everything), and the only match is that one. mate-calc, pluma, atril, mate-power-manager, mate-control-center, mate-media, mate-utils, caja, mate-applets, engrampa and mate-desktop all use this but properly have the --keyword=… syntax. So maybe this was an isolated incident… let's hope 🤞

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants