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 661128 - patch for po files
patch for po files
Status: RESOLVED FIXED
Product: gdk-pixbuf
Classification: Platform
Component: general
git master
Other Linux
: Normal normal
: ---
Assigned To: gdk-pixbuf-maint
gdk-pixbuf-maint
: 629654 (view as bug list)
Depends on:
Blocks:
 
 
Reported: 2011-10-06 21:15 UTC by Colin Walters
Modified: 2012-01-09 15:00 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
Import Makefile.in.in from gtk (8.83 KB, patch)
2011-10-06 21:15 UTC, Colin Walters
none Details | Review
Unbreak jhbuild for gdk-pixbuf (23.77 KB, patch)
2012-01-07 05:13 UTC, Allison Karlitskaya (desrt)
committed Details | Review

Description Colin Walters 2011-10-06 21:15:48 UTC
Created attachment 198476 [details] [review]
Import Makefile.in.in from gtk

See attached.
Comment 1 Matthias Clasen 2011-10-07 02:56:44 UTC
Does this make it shut up ? If so, +100
Comment 2 Colin Walters 2011-10-10 16:29:07 UTC
Not quite =/

For some reason gettextize modifies the Makefile.in.in with this, but it doesn't with gtk+.
Comment 3 Matthias Clasen 2011-12-16 23:23:11 UTC
*** Bug 629654 has been marked as a duplicate of this bug. ***
Comment 4 Allison Karlitskaya (desrt) 2012-01-07 05:13:21 UTC
Created attachment 204797 [details] [review]
Unbreak jhbuild for gdk-pixbuf

The problem is pretty simple -- despite the guards against .po files
being updated on 'make' in the GNU gettext Makefile, if 'gdk-pixbuf.pot'
is newer than any .po file, the .po file will be updated from it.

git plays a strange game with timestamps, of course -- and this is the
source of our pain.  Even if gdk-pixbuf.pot was less-recently updated
than the .po files, you end up with the same timestamps on both (the
time of the checkout) and the .po gets remade.

We also have the problem that if the .pot file doesn't exist at all, it
is generated on the spot.

The only way to solve this issue is to have an old .pot file.  To that
end, we can just touch it to a date in the distant past from the
autogen.sh.

Since the content of the .pot file doesn't matter if it's old, we may as
well let touch create it as an empty file -- so let's remove it from
version control.
Comment 5 Matthias Clasen 2012-01-07 22:35:37 UTC
Review of attachment 204797 [details] [review]:

A quick test seems to confirm your analysis. So you earn the +100

::: autogen.sh
@@ +8,3 @@
 cd "$srcdir"
 
+touch -t 200001010000 po/gdk-pixbuf.pot

This should have a comment, otherwise it is too likely to get 'optimized' away
Comment 6 Colin Walters 2012-01-08 15:54:55 UTC
But what I don't understand is how is gdk-pixbuf different from gtk+?

git grep \\.pot doesn't show anything like the equivalent of your command above.
Comment 7 Allison Karlitskaya (desrt) 2012-01-09 15:00:31 UTC
Attachment 204797 [details] pushed as 591ab99 - Unbreak jhbuild for gdk-pixbuf