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 626302 - Fix gtk+ git module name
Fix gtk+ git module name
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:
Blocks:
 
 
Reported: 2010-08-07 11:45 UTC by Frederic Crozat
Modified: 2010-08-11 18:30 UTC
See Also:
GNOME target: ---
GNOME version: ---


Attachments
Fix gtk+ git module name (1.12 KB, patch)
2010-08-07 11:45 UTC, Frederic Crozat
needs-work Details | Review

Description Frederic Crozat 2010-08-07 11:45:27 UTC
Fix incorrect escaping preventing gtk+ git checkout
Comment 1 Frederic Crozat 2010-08-07 11:45:30 UTC
Created attachment 167313 [details] [review]
Fix gtk+ git module name
Comment 2 drago01 2010-08-07 12:20:17 UTC
Review of attachment 167313 [details] [review]:

::: tools/build/gnome-shell.modules
@@ +17,3 @@
   </autotools>
 
+  <autotools id="gobject-introspection" autogenargs="--disable-tests">

That looks unrelated to what the patch is supposed to be about.

@@ +92,2 @@
   <autotools id="gtk3">
+    <branch checkoutdir="gtk3" repo="git.gnome.org" module="gtk+"/>

This was intentional see http://git.gnome.org/browse/gnome-shell/commit/?id=b76fe12209e2c3224bd327959755d1f8c018a3c8

What exactly does not work for you i.e how does it fail?

Also if you think that the above commit is broken for any reason I'd prefer "git revert" rather than a hand made revert.
Comment 3 Frederic Crozat 2010-08-07 12:29:12 UTC
sorry about the first part, it was caused by gobject-introspection trying to be built before cairo : maybe order should be changed (or tests should be disabled).

jhbuild failed to checkout gtk+ until I reverted the escaping for gtk+ module name. 

I'm using git 1.7.1 from opensuse 11.3

it seems the "fix" was only needed for git 1.7.2 and has been fixed in upstream git since.
Comment 4 Florian Müllner 2010-08-07 12:35:20 UTC
(In reply to comment #2)
> What exactly does not work for you i.e how does it fail?

It is a known problem - current versions of git do not support '+' in URLs, so it has to be escaped. Unfortunately, escaping is not supported for any previous version of git. In other words: the URL in the module set will be broken either for older git versions (current HEAD) or for newer ones (attached patch). A better solution would be to patch jhbuild to adjust URLs based on the git version in use (and hopefully git will be fixed as well).
Comment 5 Owen Taylor 2010-08-09 15:33:10 UTC
Fedora 13 now has:

* Fri Jul 30 2010 Thomas Spura <tomspur@fedoraproject.org> - 1.7.2.1-2
- cherry-pick: "Do not unquote + into ' ' in URLs"

So, apparently 1.7.2.1 isn't fixed, but a fix has been made somewhere upstream.

If Fedora is the only common distro that upgraded to 1.7.2, I'm fine just reverting the change from + %2b.
Comment 6 Olav Vitters 2010-08-11 18:15:02 UTC
FYI: I did a ln -s gtk+.git 'gtk .git' on git.gnome.org.
Comment 7 Owen Taylor 2010-08-11 18:23:15 UTC
(In reply to comment #6)
> FYI: I did a ln -s gtk+.git 'gtk .git' on git.gnome.org.

mmph, guess that works :-)

With that in place server side, think we can revert the change.
Comment 8 Owen Taylor 2010-08-11 18:30:55 UTC
Pushed a revert of the origin commit