Difference between revisions of "Hacking:Merging lisanet.de fork"

From GIMP Developer Wiki
Jump to: navigation, search
(New page for merging lisa.net fork)
 
(Add more process details and link to bugzilla.)
Line 9: Line 9:
 
2/ $ cd gimponosx-code/GimpPorts/ports/graphics/gimp2/files/
 
2/ $ cd gimponosx-code/GimpPorts/ports/graphics/gimp2/files/
  
3/ Check the patches and update the below lists to keep or not:
+
3/ Check the patches and update the below lists to keep or not. For instance, if you reviewed a patch and it is not good for us, you can leave a "[exclude]" next to it. If we want to keep it but it needs work, add "[need work]", and so on.
 +
 
 +
4/ I set up a [https://bugzilla.gnome.org/show_bug.cgi?id=719667 Bugzilla report]. When a patch seems good, make a `git format-patch` and upload it there for review if needed. :-)
 +
We can close this report when all the patches of the list will have been either applied in our tree or discarded. :-)
  
 
* app-actions-dialogs-actions.c.diff
 
* app-actions-dialogs-actions.c.diff

Revision as of 01:33, 2 December 2013

Simone Karin Lehmann maintains an OSX release, which is basically a mini-fork since it includes several patches to GIMP.

We had a quick check with Mitch and saw that many are outdated with current code. For instance some about a switch to Carbon->Cocoa platforms already in our code tree, or others obsoleted by our menu replacement. Others seem to make sense like the "color display change".

This is a working page for GIMP developers to go through the list and decide what we want to integrate and what we want to leave out.

1/ $ svn checkout svn://svn.code.sf.net/p/gimponosx/code/ gimponosx-code

2/ $ cd gimponosx-code/GimpPorts/ports/graphics/gimp2/files/

3/ Check the patches and update the below lists to keep or not. For instance, if you reviewed a patch and it is not good for us, you can leave a "[exclude]" next to it. If we want to keep it but it needs work, add "[need work]", and so on.

4/ I set up a Bugzilla report. When a patch seems good, make a `git format-patch` and upload it there for review if needed. :-) We can close this report when all the patches of the list will have been either applied in our tree or discarded. :-)

  • app-actions-dialogs-actions.c.diff
  • app-actions-file-actions.c.diff
  • app-actions-file-commands.c.diff
  • app-actions-file-commands.h.diff
  • app-actions-Makefile.am.diff
  • app-actions-Makefile.in.diff
  • app-actions-plug-in-actions.c.diff
  • app-actions-view-actions.c.diff
  • app-config-gimpcoreconfig.c.diff
  • app-config-gimpcoreconfig.h.diff
  • app-config-gimpdisplayconfig.c.diff
  • app-config-gimpguiconfig.c.diff
  • app-config-gimprc-blurbs.h.diff
  • app-core-gimpimage.c.diff
  • app-core-gimpimage.h.diff
  • app-core-gimp-user-install.c.diff
  • app-dialogs-preferences-dialog.c.diff
  • app-file-file-open.c.diff
  • app-file-file-save.c.diff
  • app-gui-gui.c.diff
  • app-gui-gui-unique.c.diff
  • app-gui-Makefile.am.diff
  • app-gui-Makefile.in.diff
  • app-Makefile.am.diff
  • app-Makefile.in.diff
  • app-menus-menus.c.diff
  • app-widgets-gimphelp.c.diff
  • app-widgets-Makefile.am.diff
  • app-widgets-Makefile.in.diff
  • configure.ac.diff
  • configure.diff
  • etc-gimprc.diff
  • gimpguiconfig.c.diff
  • lcms.c.diff
  • libgimpbase-gimpenv.c.diff
  • libgimp-gimpui.c.diff
  • libgimp-Makefile.am.diff
  • libgimp-Makefile.in.diff
  • libgimpthumb-gimp-thumbnail-list.c.diff
  • libgimpthumb-gimpthumb-utils.c.diff
  • libgimpwidgets-gimpdialog.c.diff
  • libgimpwidgets-Makefile.am.diff
  • libgimpwidgets-Makefile.am.diff-old.diff
  • libgimpwidgets-Makefile.in.diff
  • Makefile.in.diff
  • modules-display-filter-lcms.c.diff
  • modules-Makefile.am.diff
  • modules-Makefile.in.diff
  • plug-ins-common-file-ps.c.diff
  • plug-ins-common-file-tiff-load.c.diff
  • plug-ins-common-file-tiff-save.c.diff
  • plug-ins-common-lcms.c.diff
  • plug-ins-common-web-browser.c.diff
  • plug-ins-file-jpeg-jpeg.c.diff
  • plugins-filejpeg-jpeg.c.diff
  • plug-ins-help-gimphelplocale.c.diff
  • plug-ins-help-Makefile.am.diff
  • plug-ins-help-Makefile.in.diff
  • plug-ins-script-fu-Makefile.am.diff
  • plug-ins-script-fu-Makefile.in.diff
  • plug-ins-script-fu-script-fu-interface.c.diff
  • po-de.po.diff
  • save-export-conf-patch.diff
  • save-export-patch.diff
  • tools-gimptool.c.diff