After an evaluation, GNOME has moved from Bugzilla to GitLab. Learn more about GitLab.
No new issues can be reported in GNOME Bugzilla anymore.
To report an issue in a GNOME project, go to GNOME GitLab.
Do not go to GNOME Gitlab for: Bluefish, Doxygen, GnuCash, GStreamer, java-gnome, LDTP, NetworkManager, Tomboy.
Bug 677497 - data: Actually substitute @GETTEXT_PACKAGE@ in schema files
data: Actually substitute @GETTEXT_PACKAGE@ in schema files
Status: RESOLVED FIXED
Product: gnome-shell
Classification: Core
Component: general
unspecified
Other All
: Normal normal
: ---
Assigned To: gnome-shell-maint
gnome-shell-maint
Depends on: 677402
Blocks:
 
 
Reported: 2012-06-05 17:27 UTC by Jasper St. Pierre (not reading bugmail)
Modified: 2012-06-11 17:00 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
data: Actually substitute @GETTEXT_PACKAGE@ in schema files (1.65 KB, patch)
2012-06-05 17:27 UTC, Jasper St. Pierre (not reading bugmail)
reviewed Details | Review
data: Actually substitute @GETTEXT_PACKAGE@ in schema files (1.65 KB, patch)
2012-06-08 03:52 UTC, Jasper St. Pierre (not reading bugmail)
committed Details | Review

Description Jasper St. Pierre (not reading bugmail) 2012-06-05 17:27:23 UTC
Spotted in https://mail.gnome.org/archives/gnome-shell-list/2012-June/msg00028.html

Go team.
Comment 1 Jasper St. Pierre (not reading bugmail) 2012-06-05 17:27:25 UTC
Created attachment 215664 [details] [review]
data: Actually substitute @GETTEXT_PACKAGE@ in schema files
Comment 2 Jasper St. Pierre (not reading bugmail) 2012-06-05 17:33:10 UTC
I forgot to mention (because I forgot myself) that this patch depends on the fix in #677402. I can do a quick rebase if we want to get this in for 3.5.2.
Comment 3 Colin Walters 2012-06-05 17:33:12 UTC
Review of attachment 215664 [details] [review]:

One minor bit.

::: data/Makefile.am
@@ +59,3 @@
+
+%.gschema.xml.in: %.gschema.xml.in.in Makefile
+	$(AM_V_GEN) sed -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' \

Should use ',' instead of '^' as the latter can be a metacharacter in some shells I think.
Comment 4 Jasper St. Pierre (not reading bugmail) 2012-06-08 03:45:49 UTC
(In reply to comment #3)
> Should use ',' instead of '^' as the latter can be a metacharacter in some
> shells I think.

I ripped this from gsettings-desktop-schemas. The rest of the file uses |, though, so I'll fix it to use that.
Comment 5 Jasper St. Pierre (not reading bugmail) 2012-06-08 03:52:35 UTC
Created attachment 215891 [details] [review]
data: Actually substitute @GETTEXT_PACKAGE@ in schema files
Comment 6 Colin Walters 2012-06-08 13:26:48 UTC
Review of attachment 215891 [details] [review]:

OK, going with existing style is always good.
Comment 7 Jasper St. Pierre (not reading bugmail) 2012-06-11 17:00:45 UTC
Attachment 215891 [details] pushed as b79d173 - data: Actually substitute @GETTEXT_PACKAGE@ in schema files