Hacking:Merging lisanet.de fork

From GIMP Developer Wiki
Revision as of 07:20, 4 December 2013 by Jehan (Talk | contribs)

Jump to: navigation, search

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. :-)

List of Patches

patch comment merge status
app-actions-dialogs-actions.c.diff Answer: Yes, change to 'About GIMP'.

The specs supersede what other programs do.

The OS X human interface guidelines, Windows human interface guidelines provide for 'About GIMP'. The GNOME human interface guidelines uses only 'About'. More human interface guidelines are listed at Wikipedia.

Peter Sikking advices in a blog posting about cross-platform development to use the platform specific specs.

Patch in progress
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 Makefile.in are generated. See the Makefile.am patch. discarded
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 Makefile.in are generated. See the Makefile.am patch. discarded
app-Makefile.am.diff commit e56344294c90e1ba97de5c134b50c4c522f0808f merged
app-Makefile.in.diff Makefile.in are generated. See the Makefile.am patch. discarded
app-menus-menus.c.diff
app-widgets-gimphelp.c.diff
app-widgets-Makefile.am.diff
app-widgets-Makefile.in.diff Makefile.in are generated. See the Makefile.am patch. discarded
configure.ac.diff
configure.diff configure is generated. See the configure.ac patch. discarded
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 Makefile.in are generated. See the Makefile.am patch. discarded
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 Same as libgimpwidgets-Makefile.am.diff with fixed tabulation. discarded
libgimpwidgets-Makefile.in.diff Makefile.in are generated. See the Makefile.am patch. discarded
Makefile.in.diff discarded
modules-display-filter-lcms.c.diff
modules-Makefile.am.diff
modules-Makefile.in.diff Makefile.in are generated. See the Makefile.am patch. discarded
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 Makefile.in are generated. See the Makefile.am patch. discarded
plug-ins-script-fu-Makefile.am.diff
plug-ins-script-fu-Makefile.in.diff Makefile.in are generated. See the Makefile.am patch. discarded
plug-ins-script-fu-script-fu-interface.c.diff
po-de.po.diff Answer: Yes, 'Über GIMP' is the proper translation. for Windows and OS X, for GNOME it is 'Über'. patch in progress
save-export-conf-patch.diff
save-export-patch.diff I don't think anyone has actually checked the save/export patches, but there are some written specs. If this is up to date with the patch, basically it allows to "save" images into non-XCF format if and only if the image has just

one layers. The current opinion is that this feels like "unpredictable magic". It would likely feel like really inconsistent to a user (some times you can "save" to non-XCF, sometimes no).

tools-gimptool.c.diff