Opened 9 years ago

Closed 8 years ago

Last modified 8 years ago

#21011 closed defect (fixed)

gimp2 opcode errors on OS X 10.6

Reported by: hsivank@… Owned by: dbevans (David B. Evans)
Priority: Normal Milestone:
Component: ports Version: 1.8.0
Keywords: LP64 Cc: jirapong.nanta@…, league@…, lambda@…, ruud@…, vitaly@…, julien.lusson@…, imgroxx@…, tehcog (tehcog), konrad@…, allencmcbride@…, swebster@…, david@…, reed@…, donald.h@…, francesco086@…, andree.jacobson@…, kileak5@…, carpeneto@…, martin@…, trevor.bain@…, jeremy.g.ross@…, me@…, wouter.beek@…, captainproton1971 (Captain Proton), mikie@…, amhamper@…, sck@…, marcet@…, glyph@…, chapman.alex@…, dmcguire@…, dershow, J.Liem@…, naptrel@…, christian@…, nerdling (Jeremy L), dominique.marie@…, hypocrite@…, ac90b671@…, whcordis@…, vpdmurali@…, mmellinger66@…, domiman@…, aetherknight@…, xgutter@…, thorsten.raasch@…, jeremykarlson@…, jarthel@…, ryandesign (Ryan Schmidt)
Port: gimp2

Description

When i try to build gimp2 on Snow Leopard i get :

/bin/sh ../libtool --tag=CC   --mode=compile ccache /usr/bin/gcc-4.2 -DHAVE_CONFIG_H -I. -I.. -I.. -D_REENTRANT -I/opt/local/include/glib-2.0 -I/opt/local/lib/glib-2.0/include -I/opt/local/include    -I/opt/local/include -DPREFIX=\""/opt/local"\" -DGIMPDIR=\"".gimp-2.6"\" -DDATADIR=\""/opt/local/share/gimp/2.0"\" -DLOCALEDIR=\""/opt/local/share/locale"\" -DPLUGINDIR=\""/opt/local/lib/gimp/2.0"\" -DSYSCONFDIR=\""/opt/local/etc/gimp/2.0"\" -DGIMP_PACKAGE=\""gimp"\" -DGIMP_DATA_VERSION=\"2.0\" -DGIMP_SYSCONF_VERSION=\"2.0\" -DGIMP_PLUGIN_VERSION=\"2.0\" -DG_LOG_DOMAIN=\"LibGimpBase\" -I/opt/local/include -DGIMP_DISABLE_DEPRECATED -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE  -pipe -O2 -arch x86_64 -Wall -Wdeclaration-after-statement -Wmissing-prototypes -Wmissing-declarations -Winit-self -Wpointer-arith -Wold-style-definition -MT gimpcpuaccel.lo -MD -MP -MF .deps/gimpcpuaccel.Tpo -c -o gimpcpuaccel.lo gimpcpuaccel.c
libtool: compile:  ccache /usr/bin/gcc-4.2 -DHAVE_CONFIG_H -I. -I.. -I.. -D_REENTRANT -I/opt/local/include/glib-2.0 -I/opt/local/lib/glib-2.0/include -I/opt/local/include -I/opt/local/include -DPREFIX=\"/opt/local\" -DGIMPDIR=\".gimp-2.6\" -DDATADIR=\"/opt/local/share/gimp/2.0\" -DLOCALEDIR=\"/opt/local/share/locale\" -DPLUGINDIR=\"/opt/local/lib/gimp/2.0\" -DSYSCONFDIR=\"/opt/local/etc/gimp/2.0\" -DGIMP_PACKAGE=\"gimp\" -DGIMP_DATA_VERSION=\"2.0\" -DGIMP_SYSCONF_VERSION=\"2.0\" -DGIMP_PLUGIN_VERSION=\"2.0\" -DG_LOG_DOMAIN=\"LibGimpBase\" -I/opt/local/include -DGIMP_DISABLE_DEPRECATED -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE -pipe -O2 -arch x86_64 -Wall -Wdeclaration-after-statement -Wmissing-prototypes -Wmissing-declarations -Winit-self -Wpointer-arith -Wold-style-definition -MT gimpcpuaccel.lo -MD -MP -MF .deps/gimpcpuaccel.Tpo -c gimpcpuaccel.c  -fno-common -DPIC -o .libs/gimpcpuaccel.o
{standard input}:125:suffix or operands invalid for `pushf'
{standard input}:126:suffix or operands invalid for `pushf'
{standard input}:127:suffix or operands invalid for `pop'
{standard input}:130:suffix or operands invalid for `push'
{standard input}:131:suffix or operands invalid for `popf'
{standard input}:132:suffix or operands invalid for `pushf'
{standard input}:133:suffix or operands invalid for `pop'
{standard input}:134:suffix or operands invalid for `popf'
make[2]: *** [gimpcpuaccel.lo] Error 1
make[1]: *** [all-recursive] Error 1
make: *** [all] Error 2

Attachments (3)

fix_gimp2_plateform_detection_on_snow_leopard.diff (596 bytes) - added by hsivank@… 9 years ago.
patch-plug-ins-twain-tw_mac.c.diff (578 bytes) - added by hsivank@… 9 years ago.
Portfile-gimp2.diff (852 bytes) - added by hsivank@… 8 years ago.

Download all attachments as: .zip

Change History (98)

Changed 9 years ago by hsivank@…

comment:1 Changed 9 years ago by hsivank@…

This is the faulty section (gimpcpuaccel.c)

#if !defined(ARCH_X86_64) && (defined(PIC) || defined(__PIC__))
#define cpuid(op,eax,ebx,ecx,edx)  \
  __asm__ ("movl %%ebx, %%esi\n\t" \
           "cpuid\n\t"             \
           "xchgl %%ebx,%%esi"     \
           : "=a" (eax),           \
             "=S" (ebx),           \
             "=c" (ecx),           \
             "=d" (edx)            \
           : "0" (op))
#else
#define cpuid(op,eax,ebx,ecx,edx)  \
  __asm__ ("cpuid"                 \
           : "=a" (eax),           \
             "=b" (ebx),           \
             "=c" (ecx),           \
             "=d" (edx)            \
           : "0" (op))
#endif

It seems there is a detection platform issue ...

Attached a diff to solve the problem

comment:2 Changed 9 years ago by dbevans (David B. Evans)

Owner: changed from macports-tickets@… to devans@…
Status: newassigned

comment:3 Changed 9 years ago by jirapong.nanta@…

Cc: jirapong.nanta@… added

Cc Me!

comment:4 in reply to:  1 Changed 9 years ago by jirapong.nanta@…

Replying to hsivank@…:

This is the faulty section (gimpcpuaccel.c)

#if !defined(ARCH_X86_64) && (defined(PIC) || defined(__PIC__))
#define cpuid(op,eax,ebx,ecx,edx)  \
  __asm__ ("movl %%ebx, %%esi\n\t" \
           "cpuid\n\t"             \
           "xchgl %%ebx,%%esi"     \
           : "=a" (eax),           \
             "=S" (ebx),           \
             "=c" (ecx),           \
             "=d" (edx)            \
           : "0" (op))
#else
#define cpuid(op,eax,ebx,ecx,edx)  \
  __asm__ ("cpuid"                 \
           : "=a" (eax),           \
             "=b" (ebx),           \
             "=c" (ecx),           \
             "=d" (edx)            \
           : "0" (op))
#endif

It seems there is a detection platform issue ...

Attached a diff to solve the problem

I cannot find a port file. Where is it?

comment:5 Changed 9 years ago by hsivank@…

Hello,

Sorry for my previous git patches ...

This one looks good !

(Just a small question : Is there any plant to support SCM (git, mercurial ...) with macport ?)

comment:6 in reply to:  5 Changed 9 years ago by jirapong.nanta@…

Replying to hsivank@…:

Hello,

Sorry for my previous git patches ...

This one looks good !

(Just a small question : Is there any plant to support SCM (git, mercurial ...) with macport ?)

Thank you hsivank.. just put your patch in /opt/local/var/macports/sources/rsync.macports.org/release/ports/graphics/gimp2/ folder, then
sudo port clean gimp2
sudo port install gimp2

get this error

Undefined symbols:
  "_EndQDContextForApplicationDockTile", referenced from:
      _twainMain in tw_mac.o
  "_BeginQDContextForApplicationDockTile", referenced from:
      _twainMain in tw_mac.o
  "_SetApplicationDockTileImage", referenced from:
      _twainMain in tw_mac.o
ld: symbol(s) not found

comment:7 Changed 9 years ago by hsivank@…

This is another error I've got the same ...

Extratc from plug-ins/twain/tw_mac.c :

194  /* Voodoo magic fix inspired by java_swt launcher */
195  /* Without this the icon setting doesn't work about half the time. */
196  CGrafPtr p = BeginQDContextForApplicationDockTile();
197  EndQDContextForApplicationDockTile(p);
198
199  SetApplicationDockTileImage (icon);

I'm not familiar with Voodoo !!! So comment lines 196,197 and 199

It will be ok after ...

comment:8 in reply to:  7 Changed 9 years ago by jirapong.nanta@…

Replying to hsivank@…:

This is another error I've got the same ...

Extratc from plug-ins/twain/tw_mac.c :

194  /* Voodoo magic fix inspired by java_swt launcher */
195  /* Without this the icon setting doesn't work about half the time. */
196  CGrafPtr p = BeginQDContextForApplicationDockTile();
197  EndQDContextForApplicationDockTile(p);
198
199  SetApplicationDockTileImage (icon);

I'm not familiar with Voodoo !!! So comment lines 196,197 and 199

It will be ok after ...

Awesome!! this worked. Thank you.

comment:9 in reply to:  7 Changed 9 years ago by fredrik.karlsson84@…

Replying to hsivank@…:

This is another error I've got the same ...

Extratc from plug-ins/twain/tw_mac.c :

194  /* Voodoo magic fix inspired by java_swt launcher */
195  /* Without this the icon setting doesn't work about half the time. */
196  CGrafPtr p = BeginQDContextForApplicationDockTile();
197  EndQDContextForApplicationDockTile(p);
198
199  SetApplicationDockTileImage (icon);

I'm not familiar with Voodoo !!! So comment lines 196,197 and 199

It will be ok after ...

ah, shit. put the patch in, worked fine for a little while, then i got the same error as above;:

Command output: tw_mac.c:170: warning: old-style function definition
tw_mac.c:180: warning: ISO C90 forbids mixed declarations and code
tw_mac.c:187: warning: pointer targets in passing argument 2 of 'CFURLCreateFromFileSystemRepresentation' differ in signedness
tw_mac.c:190: warning: ISO C90 forbids mixed declarations and code
tw_mac.c:196: warning: implicit declaration of function 'BeginQDContextForApplicationDockTile'
tw_mac.c:196: warning: initialization makes pointer from integer without a cast
tw_mac.c:197: warning: implicit declaration of function 'EndQDContextForApplicationDockTile'
tw_mac.c:199: warning: implicit declaration of function 'SetApplicationDockTileImage'
tw_mac.c: At top level:
tw_mac.c:204: warning: no previous prototype for 'twainMain'
tw_mac.c: In function 'twainMain':
tw_mac.c:204: warning: old-style function definition
tw_mac.c:225: warning: implicit declaration of function 'RunApplicationEventLoop'

i changed tw_mac.c and still same error, without line 199... after change, end entry:

Undefined symbols:
  "_EndQDContextForApplicationDockTile", referenced from:
      _twainMain in tw_mac.o
  "_BeginQDContextForApplicationDockTile", referenced from:
      _twainMain in tw_mac.o
ld: symbol(s) not found

Changed 9 years ago by hsivank@…

comment:10 Changed 9 years ago by hsivank@…

Hello fredrik.karlsson84

I updated Portfile-gimp2.diff and added a patch for tw_mac.c ... It should be ok now ?

comment:11 Changed 9 years ago by dbevans (David B. Evans)

This last patch needs futher modifications as you are assuming x86_64 and it is possible that snow leopard is running on 32 bit hardware in which case it is i386.

comment:12 Changed 9 years ago by hsivank@…

You are right Devans.

Is it better if i replace :

platform darwin 10 {  
 	configure.args-append --build=x86_64-apple-darwin10.0.0  
}	

by

if {$build_arch == "x86_64"} {
        configure.args-append --build=x86_64-apple-darwin10.0.0
}

?

comment:13 in reply to:  12 Changed 9 years ago by hsivank@…

Maybe :

platform darwin 10 { 
        if {$build_arch == "x86_64"} {
                configure.args-append --build=x86_64-apple-darwin10.0.0
        }
}

comment:14 Changed 9 years ago by dbevans (David B. Evans)

Yes, this last is better for the x86_64 case also need to see if the patches will work on all platforms or are just appropriate for a particular architecture.

I will apply and test on non-snow leopard this evening.

Can anyone comment on the build on snow leopard i386?

Would be nice to handle all cases at one.

comment:15 Changed 9 years ago by fredrik.karlsson84@…

I combined the patch, using the Portfile-gimp2.diff, but changed the diff to hsivank's:

platform darwin 10 { 
        if {$build_arch == "x86_64"} {
                configure.args-append --build=x86_64-apple-darwin10.0.0
        }
}

and used the patch-plug-ins-twain-tw_mac.c.diff, and it worked perfectly! thanks a lot for all the help!

comment:16 Changed 9 years ago by league@…

Cc: league@… added

Cc Me!

comment:17 Changed 9 years ago by lambda@…

Cc: lambda@… added

Cc Me!

comment:18 Changed 9 years ago by ruud@…

Cc: ruud@… added

Cc Me!

comment:19 Changed 9 years ago by vitaly@…

Cc: vitaly@… added

Cc Me!

comment:20 Changed 9 years ago by julien.lusson@…

Cc: julien.lusson@… added

Cc Me!

comment:21 Changed 9 years ago by imgroxx@…

Cc: imgroxx@… added

Cc Me!

comment:22 Changed 9 years ago by tehcog (tehcog)

Cc: brewerleece@… added

Cc Me!

comment:23 Changed 9 years ago by konrad@…

Cc: konrad@… added

Cc Me!

comment:24 Changed 9 years ago by allencmcbride@…

Cc: allencmcbride@… added

Cc Me!

comment:25 Changed 9 years ago by allencmcbride@…

I think this ticket should have the "snowleopard" keyword so it will show up in SnowLeopardProblems.

comment:26 Changed 9 years ago by swebster@…

Cc: swebster@… added

Cc Me!

comment:27 Changed 9 years ago by swebster@…

Does removing the voodoo magic bring back the problem of "Without this the icon setting doesn't work about half the time." ?

comment:28 in reply to:  27 Changed 9 years ago by hsivank@…

Replying to swebster@…:

Does removing the voodoo magic bring back the problem of "Without this the icon setting doesn't work about half the time." ?

Yes, i think ...

comment:29 Changed 9 years ago by swebster@…

I'm not an expert but this page seems to suggest that these functions are deprecated in 10.5 even and are not available to 64-bit programs. Is this the real issue we need to deal with? Alternative functions are listed, but they are also not available to 64-bit programs...

comment:30 Changed 9 years ago by hsivank@…

You're right swebster, This functions come from Carbon API. With a 64 bit application on SL we need to use Cocoa.

It will be interesting to know if the bug still occur .... before rewrite this part.

comment:31 Changed 9 years ago by jmroot (Joshua Root)

Keywords: LP64 added

comment:32 Changed 9 years ago by david@…

Cc: david@… added

Cc Me!

comment:33 Changed 9 years ago by blb@…

Cc: reed@… added

Cc reporter of dup #21696.

comment:34 Changed 9 years ago by donald.h@…

Cc: donald.h@… added

Cc Me!

comment:35 Changed 9 years ago by francesco086@…

Cc: francesco086@… added

Cc Me!

comment:36 Changed 9 years ago by andree.jacobson@…

Cc: andree.jacobson@… added

Cc Me!

comment:37 Changed 9 years ago by kileak5@…

Cc: kileak5@… added

Cc Me!

comment:38 Changed 9 years ago by carpeneto@…

Cc: carpeneto@… added

Cc Me!

comment:39 Changed 9 years ago by martin@…

Cc: martin@… added

Cc Me!

comment:40 Changed 9 years ago by trevor.bain@…

Cc: trevor.bain@… added

Cc Me!

comment:41 Changed 9 years ago by rmdegennaro@…

Cc Me!

comment:42 Changed 9 years ago by jeremy.g.ross@…

Cc: jeremy.g.ross@… added

Cc Me!

comment:43 Changed 9 years ago by me@…

Cc: me@… added

Cc Me!

comment:44 Changed 9 years ago by wouter.beek@…

Cc: wouter.beek@… added

Cc Me!

comment:45 Changed 9 years ago by captainproton1971 (Captain Proton)

Cc: captainproton1971@… added

Cc Me!

comment:46 Changed 9 years ago by mikie@…

Cc: mikie@… added

Cc Me!

comment:47 Changed 9 years ago by amhamper@…

Cc: amhamper@… added

Cc Me!

comment:48 Changed 9 years ago by jarthel@…

cc me. and how to apply the patch? thank you

comment:49 in reply to:  15 Changed 9 years ago by hsivank@…

Replying to fredrik.karlsson84@…:

I combined the patch, using the Portfile-gimp2.diff, but changed the diff to hsivank's:

platform darwin 10 { 
        if {$build_arch == "x86_64"} {
                configure.args-append --build=x86_64-apple-darwin10.0.0
        }
}

and used the patch-plug-ins-twain-tw_mac.c.diff, and it worked perfectly! thanks a lot for all the help!

Portfile-gimp2.diff updated !

comment:50 in reply to:  48 ; Changed 9 years ago by hsivank@…

Replying to jarthel@…:

cc me. and how to apply the patch? thank you

Hello jarthel, Assuming that GIMP2_DIR is the directory containing gim2 portfile's

You need to :

cp Portfile-gimp2.diff   GIMP2_DIR
cp patch-plug-ins-twain-tw_mac.c.diff GIMP2_DIR/files
cd GIMP2_DIR
patch -p0 < Portfile-gimp2.diff

take a look at http://guide.macports.org/#development.patches.applying

comment:51 in reply to:  50 ; Changed 9 years ago by hsivank@…

(duplicate comment removed)

comment:53 Changed 9 years ago by sck@…

Cc: sck@… added

Cc Me!

comment:54 Changed 9 years ago by marcet@…

Cc: marcet@… added

Cc Me!

comment:55 Changed 9 years ago by glyph@…

Cc: glyph@… added

Cc Me!

comment:56 Changed 9 years ago by xgutter@…

Cc: xgutter@… added

Cc Me!

comment:57 Changed 9 years ago by chapman.alex@…

Cc: chapman.alex@… added

Cc Me!

comment:58 Changed 9 years ago by dmcguire@…

Cc: dmcguire@… added

Cc Me!

comment:59 Changed 9 years ago by dershow

Cc: dersh@… added

Cc Me!

comment:60 in reply to:  51 ; Changed 9 years ago by timur@…

Replying to hsivank@…:

Oups, this one is clear :

Assuming that GIMP2_DIR is the directory containing gim2 portfile's

You need to :
cp Portfile-gimp2.diff GIMP2_DIR
cp patch-plug-ins-twain-tw_mac.c.diff GIMP2_DIR/files
cd GIMP2_DIR
patch -p0 < Portfile-gimp2.diff

take a look at http://guide.macports.org/#development.patches.applying

I have done *exactly* as you said, but it didn't work, I got the following error message:

sudo patch -p0 < Portfile-gimp2.diff 
patching file Portfile
Hunk #1 FAILED at 5.
Hunk #2 FAILED at 30.
Hunk #3 FAILED at 60.
3 out of 3 hunks FAILED -- saving rejects to file Portfile.rej

comment:61 in reply to:  60 ; Changed 9 years ago by hsivank@…

I have done *exactly* as you said, but it didn't work

Works for me ! ( I use macports from svn )
Have you modified the Portfile by yourself before apply the patch ?
What is the result of "pwd" ? (this patch is for gimp2 not gimp)

comment:62 in reply to:  61 Changed 9 years ago by timur@…

Yes I also just realised the same thing, it is gimp2 not gimp. Now everything works. Sorry and thanks.

comment:63 Changed 9 years ago by J.Liem@…

Cc: J.Liem@… added

Cc Me!

comment:64 Changed 9 years ago by naptrel@…

Cc: naptrel@… added

Cc Me!

comment:65 Changed 9 years ago by raimue (Rainer Müller)

Has duplicate #21338.

comment:66 Changed 9 years ago by christian@…

Cc: christian@… added

Cc Me!

comment:67 Changed 9 years ago by christian@…

It does not work for me. I have attached the Portfile-patch and placed the second patch into the files folder.

Build breaks with:

(Lengthy irrelevant gimp-app build output deleted)

comment:68 in reply to:  67 Changed 9 years ago by hsivank@…

Replying to christian@…:

It does not work for me. I have attached the Portfile-patch and placed the second patch into the files folder.

This ticket is about gimp2 not gimp-app ... !

comment:69 Changed 9 years ago by christian@…

Sorry, I shoot myself ;-) gimp2 is working! Thx.

comment:70 Changed 9 years ago by nerdling (Jeremy L)

Cc: snc@… added

Cc Me!

comment:71 Changed 9 years ago by dominique.marie@…

Cc: dominique.marie@… added

Cc Me!

comment:72 Changed 9 years ago by macports@…

I am also confirming that it is working with a brand new install of Snow Leopard and MacPorts (on a new iMac). I am posting a summary of all the steps. I am also assuming that the default location of MacPorts is being used.

  1. download the files patch-plug-ins-twain-tw_mac.c.diff and Portfile-gimp2.diff
  1. copy patch-plug-ins-twain-tw_mac.c.diff to the gimp2 port files diretory
$ sudo cp ~/Downloads/patch-plug-ins-twain-tw_mac.c.diff /opt/local/var/macports/sources/rsync.macports.org/release/ports/graphics/gimp2/files/
  1. patch the gimp2 profile
$ cd /opt/local/var/macports/sources/rsync.macports.org/release/ports/graphics/gimp2/
$ sudo patch -p0 < ~/Downloads/Portfile-gimp2.diff
  1. rebuild gimp2
$ sudo port clean gimp2
$ sudo port install gimp2

comment:73 in reply to:  72 Changed 9 years ago by jesperrr@…

Replying to macports@…:

I am posting a summary of all the steps. I am also assuming that the default location of MacPorts is being used.

Thanks a lot for that helpful summary.

comment:74 in reply to:  72 Changed 9 years ago by tehcog (tehcog)

Replying to macports@…:

I am posting a summary of all the steps...

Ty also, building now, seems to be OK.

comment:75 Changed 9 years ago by swebster@…

The tw_mac.c changes affect the icon for the scanner/camera dialog that you see in the dock. With this patch posted here you get the "ugly" generic console icon. This is obviously not that big of a deal. But if we're just going to delete the problem lines we may wish to remove even more code that has to do with setting the dock icon. This is briefly discussed on the upstream bug.

Also, this ticket is really dealing with two separate issues... the platform detection issue, and then the fact that gimp2 still contains carbon functions that won't work in 64-bit. If the concern here is really just getting gimp2 to build at all, then perhaps the proposed patches are sufficient for the moment. The patch to tw_mac.c should be removed when upstream figures out their strategy to deal with the deprecated carbon functions...

comment:76 Changed 9 years ago by hypocrite@…

Cc: hypocrite@… added

Cc Me!

comment:77 Changed 9 years ago by royliu@…

Cc: royliu@… added

Cc Me!

comment:78 Changed 9 years ago by royliu@…

Cc: royliu@… removed

Cc Me!

comment:79 Changed 9 years ago by ac90b671@…

Cc: ac90b671@… added

Cc Me!

comment:80 Changed 9 years ago by whcordis@…

Cc: whcordis@… added

Cc Me!

comment:81 Changed 9 years ago by vpdmurali@…

Cc: vpdmurali@… added

Cc Me!

comment:82 in reply to:  description Changed 9 years ago by sck@…

Any news on getting these patches released into the main trunk?

comment:83 Changed 9 years ago by mmellinger66@…

Cc: mmellinger66@… added

Cc Me!

comment:84 Changed 9 years ago by domiman@…

Cc: domiman@… added

Cc Me!

comment:85 Changed 9 years ago by aetherknight@…

Cc: aetherknight@… added

Cc Me!

comment:86 Changed 9 years ago by xgutter@…

Cc: xgutter@… removed

Cc Me!

comment:87 Changed 9 years ago by xgutter@…

Cc: xgutter@… added

Cc Me!

comment:88 Changed 9 years ago by thorsten.raasch@…

Cc: thorsten.raasch@… added

Cc Me!

comment:89 Changed 9 years ago by jeremykarlson@…

Cc: jeremykarlson@… added

Cc Me!

comment:90 in reply to:  72 Changed 8 years ago by bill@…

The patch is not applying for me:

$ sudo patch -p0 </tmp/Portfile-gimp2.diff
Hunk #1 FAILED at 5.
Hunk #2 succeeded at 31 (offset 1 line).
Hunk #3 succeeded at 61 (offset 1 line).
$  pwd
/opt/local/var/macports/sources/rsync.macports.org/release/ports/graphics/gimp2
$ ls files/
gimp
gimp-remote
patch-etc-gimprc.diff
patch-plug-ins-twain-tw_mac.c.diff

I have to be doing something dumb but after 10 minutes of staring at this I can't see what. The diff files were pulled from the links on this page.

Any ideas? thanks.

comment:91 Changed 8 years ago by hsivank@…

Hello Bill,

Revision was bumped by r61514
This is why you cannot apply Portfile-gimp2.diff
I will post a good Portfile-gimp2.diff soon ...

Changed 8 years ago by hsivank@…

Attachment: Portfile-gimp2.diff added

comment:92 Changed 8 years ago by hsivank@…

It should be ok now !

comment:93 Changed 8 years ago by amhamper@…

Excellent! Works great! Thanks!

comment:94 Changed 8 years ago by ryandesign (Ryan Schmidt)

Cc: jarthel@… ryandesign@… added
Resolution: fixed
Status: assignedclosed

I fixed this in r61996 while updating gimp2 to 2.6.8. I didn't see a reason to limit the --build argument to 64-bit Snow Leopard so I made it more general. And I didn't see a reason to disable the Carbon code when building 32-bit, so I made the patch comment out the code only on 64-bit.

comment:95 in reply to:  92 Changed 8 years ago by bill@…

That did the trick. Many thanks!

Note: See TracTickets for help on using tickets.