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 672619 - Drop org.gnome.Empathy.gschema.xml.in
Drop org.gnome.Empathy.gschema.xml.in
Status: RESOLVED FIXED
Product: empathy
Classification: Core
Component: General
2.33.x
Other Linux
: Normal enhancement
: 3.6
Assigned To: empathy-maint
empathy-maint
Depends on:
Blocks:
 
 
Reported: 2012-03-22 12:31 UTC by Guillaume Desmottes
Modified: 2012-04-23 13:12 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
Stop generating gschema from .in file (32.53 KB, patch)
2012-04-23 12:46 UTC, Guillaume Desmottes
none Details | Review
Stop generating gschema from .in file (32.72 KB, patch)
2012-04-23 13:10 UTC, Guillaume Desmottes
committed Details | Review

Description Guillaume Desmottes 2012-03-22 12:31:12 UTC
Looks like we don't need the .in any more:

<desrt> cassidy: if you're using <_summary> you're doing it wrong :)
<cassidy> desrt, http://git.gnome.org/browse/empathy/tree/data/org.gnome.Empathy.gschema.xml.in is wrong ?
<desrt> yes.  but it's not your fault
<desrt> everyone is wrong :)
<desrt> there was a patch for proper gsettings support for intltool rotting in launchpad for a year and a half
<desrt> it finally landed
<desrt> so now you can skip the .in non-sense
<cassidy> is there some doc/pointers about that?
<desrt> ya.  intltool contains a nice testcase
<desrt> lemme get you a link
<desrt> http://bazaar.launchpad.net/~intltool/intltool/trunk/view/head:/tests/cases/gsettings.gschema.xml
<cassidy> desrt, so I can drop: gsettings_SCHEMAS = $(gsettings_files:.xml.in=.xml) right ?
<desrt> yes
<desrt> no.
<desrt> you have to have gsettings_SCHEMAS=, but you can drop the non-sense to the right of the =
<desrt> and just have the .xml file directly
<cassidy> cool, thanks for the info. I'll open a bug so won't forget to change once we branch for 3.4
<desrt> support only came in intltool like 0.50 i think
Comment 1 Guillaume Desmottes 2012-03-22 14:10:41 UTC
<jjardon> cassidy: also you can remove the @INTLTOOL_XML_NOMERGE_RULE@ from your Makefile.am
Comment 2 Guillaume Desmottes 2012-04-23 12:46:40 UTC
Created attachment 212599 [details] [review]
Stop generating gschema from .in file

intltool now supports translating gschema files properly so we don't need to
do this crack any more.
Comment 3 Guillaume Desmottes 2012-04-23 13:10:26 UTC
Created attachment 212602 [details] [review]
Stop generating gschema from .in file

intltool now supports translating gschema files properly so we don't need to
do this crack any more.
Comment 4 Guillaume Desmottes 2012-04-23 13:12:42 UTC
Attachment 212602 [details] pushed as 9f2b7eb - Stop generating gschema from .in file