Sent: 2010-06-20 17:53:01 UTC (over 1 year ago)

From: Olivier

impossible to get the new git version

permalink

Here is what I get:

17:50 root@olecarme /opt/gimp# git pull
remote: Counting objects: 288, done.
remote: Compressing objects: 100% (182/182), done.
remote: Total 182 (delta 143), reused 0 (delta 0)
Receiving objects: 100% (182/182), 36.59 KiB, done.
Resolving deltas: 100% (143/143), completed with 64 local objects.
>From git://git.gnome.org/gimp
1c91f68..552158a gimp-2-6 -> origin/gimp-2-6
bc72b15..ba3d530 master -> origin/master
Updating bc72b15..ba3d530
error: Your local changes to 'm4macros/gtk-doc.m4' would be overwritten by
merge. Aborting.
Please, commit your changes or stash them before you can merge.
zsh: exit 1 git pull

Is it a problem with me, or with the git site?

--
Olivier Lecarme

_______________________________________________
Gimp-developer mailing list
Gimp-developer@lists.XCF.Berkeley.EDU
https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-developer

Sent: 2010-06-20 17:57:53 UTC (over 1 year ago)

From: Martin Nordholts

impossible to get the new git version

permalink

On 06/20/2010 05:53 PM, Olivier wrote:
> Here is what I get:
>
> 17:50 root@olecarme /opt/gimp# git pull
> remote: Counting objects: 288, done.
> remote: Compressing objects: 100% (182/182), done.
> remote: Total 182 (delta 143), reused 0 (delta 0)
> Receiving objects: 100% (182/182), 36.59 KiB, done.
> Resolving deltas: 100% (143/143), completed with 64 local objects.
> From git://git.gnome.org/gimp
> 1c91f68..552158a gimp-2-6 -> origin/gimp-2-6
> bc72b15..ba3d530 master -> origin/master
> Updating bc72b15..ba3d530
> error: Your local changes to 'm4macros/gtk-doc.m4' would be overwritten
> by merge. Aborting.
> Please, commit your changes or stash them before you can merge.
> zsh: exit 1 git pull
>
> Is it a problem with me, or with the git site?

You have a local change in which gtkdocize has change the version
controlled file m4macros/gtk-doc.m4 into a symlink. I've pushed a change
that removes our local copy of gtk-doc.m4. You need to get rid of the
local changes before you pull, so first do

git checkout m4macros

then

git pull

should work.

If anyone finds more problems with gtk-doc, let me know.

/ Martin

--

My GIMP Blog:
http://www.chromecode.com/
"Automatic tab style and removed tab title bar"
_______________________________________________
Gimp-developer mailing list
Gimp-developer@lists.XCF.Berkeley.EDU
https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-developer

Sent: 2010-06-20 18:00:25 UTC (over 1 year ago)

From: Olivier

impossible to get the new git version

permalink

>
> You have a local change in which gtkdocize has change the version
> controlled file m4macros/gtk-doc.m4 into a symlink. I've pushed a change
> that removes our local copy of gtk-doc.m4. You need to get rid of the
> local changes before you pull, so first do
>
> git checkout m4macros
>
> then
>
> git pull
>
> should work.
>
> It works! Thanks a lot!

--
Olivier Lecarme

_______________________________________________
Gimp-developer mailing list
Gimp-developer@lists.XCF.Berkeley.EDU
https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-developer

Sent: 2010-06-20 18:15:38 UTC (over 1 year ago)

From: Olivier

impossible to get the new git version

permalink

>
> You have a local change in which gtkdocize has change the version
> controlled file m4macros/gtk-doc.m4 into a symlink. I've pushed a change
> that removes our local copy of gtk-doc.m4. You need to get rid of the
> local changes before you pull, so first do
>
> git checkout m4macros
>
> then
>
> git pull
>
> should work.
>
> If anyone finds more problems with gtk-doc, let me know.
>

It worked on one computer, not on the other. Both are using Debian testing
and are up-to-date. On the first one, the compilation is working smoothly
just now. On the second one, here is the problem:

18:11 root@pierredelune /opt/gimp# ./autogen.sh --prefix=/opt/gimp-2.7

I am testing that you have the tools required to build the
GNU Image Manipulation Program from git. This test is not foolproof,
so if anything goes wrong, see the file HACKING for more information...

checking for libtool >= 1.5 ... Major version might be too new (2.2.6)
checking for gtkdocize ... yes
checking for autoconf >= 2.54 ... yes (version 2.65)
checking for automake >= 1.9.6 ... yes (version 1.11.1)
checking for intltool >= 0.40.1 ... yes (version 0.41.1)
checking for xsltproc ... yes

I am going to run ./configure with the following arguments:

--enable-maintainer-mode --prefix=/opt/gimp-2.7

libtoolize: putting auxiliary files in `.'.
libtoolize: linking file `./ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4macros'.
libtoolize: linking file `m4macros/libtool.m4'
libtoolize: linking file `m4macros/ltoptions.m4'
libtoolize: linking file `m4macros/ltsugar.m4'
libtoolize: linking file `m4macros/ltversion.m4'
libtoolize: linking file `m4macros/lt~obsolete.m4'
data/tags/Makefile.am:19: wildcard $(top_srcdir: non-POSIX variable name
data/tags/Makefile.am:19: (probably a GNU make extension)
data/tips/Makefile.am:20: wildcard $(top_srcdir: non-POSIX variable name
data/tips/Makefile.am:20: (probably a GNU make extension)
desktop/Makefile.am:52: wildcard $(top_srcdir: non-POSIX variable name
desktop/Makefile.am:52: (probably a GNU make extension)
gtk-doc.make:7: GTK_DOC_USE_LIBTOOL does not appear in AM_CONDITIONAL
devel-docs/app/Makefile.am:116: `gtk-doc.make' included from here

[a lot of similar couples of lines]

zsh: exit 1 ./autogen.sh --prefix=/opt/gimp-2.7

--
Olivier Lecarme

_______________________________________________
Gimp-developer mailing list
Gimp-developer@lists.XCF.Berkeley.EDU
https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-developer

Sent: 2010-06-20 18:20:08 UTC (over 1 year ago)

From: Martin Nordholts

impossible to get the new git version

permalink

On 06/20/2010 06:15 PM, Olivier wrote:
> desktop/Makefile.am:52: (probably a GNU make extension)
> gtk-doc.make:7: GTK_DOC_USE_LIBTOOL does not appear in AM_CONDITIONAL
> devel-docs/app/Makefile.am:116: `gtk-doc.make' included from here
>
> [a lot of similar couples of lines]
>
> zsh: exit 1 ./autogen.sh --prefix=/opt/gimp-2.7

That's interesting, do you have any possibility to enter #gimp on
irc.gimp.org so we can sort this out? If not we should probably take the
details privately to avoid spamming gimp-developer.

Regards,
Martin

_______________________________________________
Gimp-developer mailing list
Gimp-developer@lists.XCF.Berkeley.EDU
https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-developer