media-gfx/gimp/files/gimp-2.8.10-clang.patch

   1 --- app/Makefile.am
   2 +++ app/Makefile.am
   3 @@ -120,29 +120,29 @@
   4
   5  # FIXME: core should not depend on xcf
   6  workaround_that_core_depends_on_xcf = \
   7 -       -u $(SYMPREFIX)xcf_init
   8 +       -Wl,-u,$(SYMPREFIX)xcf_init
   9
  10  # FIXME: core should not depend on pdb
  11  workaround_that_core_depends_on_pdb = \
  12 -       -u $(SYMPREFIX)internal_procs_init              \
  13 -       -u $(SYMPREFIX)gimp_plug_in_manager_restore
  14 +       -Wl,-u,$(SYMPREFIX)internal_procs_init          \
  15 +       -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore
  16
  17  # FIXME: plug-in should not depend on pdb
  18  workaround_that_plug_in_depends_on_pdb = \
  19 -       -u $(SYMPREFIX)gimp_pdb_compat_param_spec
  20 +       -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec
  21
  22  # FIXME: file should not depend on plug-in
  23  workaround_that_file_depends_on_plug_in = \
  24 -       -u $(SYMPREFIX)plug_in_icc_profile_apply_rgb    \
  25 -       -u $(SYMPREFIX)gimp_image_map_config_get_type
  26 +       -Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb        \
  27 +       -Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type
  28
  29  # core, vectors and gegl are on the same architectural layer, prevent
  30  # the linker from panicing
  31  calm_down_linker = \
  32 -       -u $(SYMPREFIX)gimp_vectors_undo_get_type       \
  33 -       -u $(SYMPREFIX)gimp_vectors_mod_undo_get_type   \
  34 -       -u $(SYMPREFIX)gimp_vectors_prop_undo_get_type  \
  35 -       -u $(SYMPREFIX)gimp_curve_map_pixels
  36 +       -Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type   \
  37 +       -Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type       \
  38 +       -Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type      \
  39 +       -Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
  40
  41  AM_LDFLAGS = \
  42         $(munix)                                        \
  43 --- app/Makefile.in
  44 +++ app/Makefile.in
  45 @@ -702,33 +702,33 @@
  46
  47  # FIXME: core should not depend on xcf
  48  workaround_that_core_depends_on_xcf = \
  49 -       -u $(SYMPREFIX)xcf_init
  50 +       -Wl,-u,$(SYMPREFIX)xcf_init
  51
  52
  53  # FIXME: core should not depend on pdb
  54  workaround_that_core_depends_on_pdb = \
  55 -       -u $(SYMPREFIX)internal_procs_init              \
  56 -       -u $(SYMPREFIX)gimp_plug_in_manager_restore
  57 +       -Wl,-u,$(SYMPREFIX)internal_procs_init          \
  58 +       -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore
  59
  60
  61  # FIXME: plug-in should not depend on pdb
  62  workaround_that_plug_in_depends_on_pdb = \
  63 -       -u $(SYMPREFIX)gimp_pdb_compat_param_spec
  64 +       -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec
  65
  66
  67  # FIXME: file should not depend on plug-in
  68  workaround_that_file_depends_on_plug_in = \
  69 -       -u $(SYMPREFIX)plug_in_icc_profile_apply_rgb    \
  70 -       -u $(SYMPREFIX)gimp_image_map_config_get_type
  71 +       -Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb        \
  72 +       -Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type
  73
  74
  75  # core, vectors and gegl are on the same architectural layer, prevent
  76  # the linker from panicing
  77  calm_down_linker = \
  78 -       -u $(SYMPREFIX)gimp_vectors_undo_get_type       \
  79 -       -u $(SYMPREFIX)gimp_vectors_mod_undo_get_type   \
  80 -       -u $(SYMPREFIX)gimp_vectors_prop_undo_get_type  \
  81 -       -u $(SYMPREFIX)gimp_curve_map_pixels
  82 +       -Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type   \
  83 +       -Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type       \
  84 +       -Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type      \
  85 +       -Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
  86
  87  AM_LDFLAGS = \
  88         $(munix)                                        \
  89 --- app/tests/Makefile.am
  90 +++ app/tests/Makefile.am
  91 @@ -63,22 +63,22 @@
  92  # We need this due to circular dependencies, see more detailed
  93  # comments about it in app/Makefile.am
  94  AM_LDFLAGS = \
  95 -       -u $(SYMPREFIX)xcf_init                         \
  96 -       -u $(SYMPREFIX)base_init                        \
  97 -       -u $(SYMPREFIX)internal_procs_init              \
  98 -       -u $(SYMPREFIX)gimp_plug_in_manager_restore     \
  99 -       -u $(SYMPREFIX)gimp_pdb_compat_param_spec       \
 100 -       -u $(SYMPREFIX)gui_init                         \
 101 -       -u $(SYMPREFIX)plug_in_icc_profile_apply_rgb    \
 102 -       -u $(SYMPREFIX)gimp_image_map_config_get_type   \
 103 -       -u $(SYMPREFIX)gimp_vectors_undo_get_type       \
 104 -       -u $(SYMPREFIX)gimp_vectors_mod_undo_get_type   \
 105 -       -u $(SYMPREFIX)gimp_vectors_prop_undo_get_type  \
 106 -       -u $(SYMPREFIX)actions_init                     \
 107 -       -u $(SYMPREFIX)gimp_error_dialog_new            \
 108 -       -u $(SYMPREFIX)menus_save                       \
 109 -       -u $(SYMPREFIX)gimp_tools_save                  \
 110 -       -u $(SYMPREFIX)gimp_curve_map_pixels
 111 +       -Wl,-u,$(SYMPREFIX)xcf_init                             \
 112 +       -Wl,-u,$(SYMPREFIX)base_init                    \
 113 +       -Wl,-u,$(SYMPREFIX)internal_procs_init          \
 114 +       -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \
 115 +       -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec   \
 116 +       -Wl,-u,$(SYMPREFIX)gui_init                             \
 117 +       -Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb        \
 118 +       -Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type       \
 119 +       -Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type   \
 120 +       -Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type       \
 121 +       -Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type      \
 122 +       -Wl,-u,$(SYMPREFIX)actions_init                 \
 123 +       -Wl,-u,$(SYMPREFIX)gimp_error_dialog_new                \
 124 +       -Wl,-u,$(SYMPREFIX)menus_save                   \
 125 +       -Wl,-u,$(SYMPREFIX)gimp_tools_save                      \
 126 +       -Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
 127
 128  # Note that we have some duplicate entries here too to work around
 129  # circular dependencies and systems on the same architectural layer as
 130 --- app/tests/Makefile.in
 131 +++ app/tests/Makefile.in
 132 @@ -1221,22 +1221,22 @@
 133  # We need this due to circular dependencies, see more detailed
 134  # comments about it in app/Makefile.am
 135  AM_LDFLAGS = \
 136 -       -u $(SYMPREFIX)xcf_init                         \
 137 -       -u $(SYMPREFIX)base_init                        \
 138 -       -u $(SYMPREFIX)internal_procs_init              \
 139 -       -u $(SYMPREFIX)gimp_plug_in_manager_restore     \
 140 -       -u $(SYMPREFIX)gimp_pdb_compat_param_spec       \
 141 -       -u $(SYMPREFIX)gui_init                         \
 142 -       -u $(SYMPREFIX)plug_in_icc_profile_apply_rgb    \
 143 -       -u $(SYMPREFIX)gimp_image_map_config_get_type   \
 144 -       -u $(SYMPREFIX)gimp_vectors_undo_get_type       \
 145 -       -u $(SYMPREFIX)gimp_vectors_mod_undo_get_type   \
 146 -       -u $(SYMPREFIX)gimp_vectors_prop_undo_get_type  \
 147 -       -u $(SYMPREFIX)actions_init                     \
 148 -       -u $(SYMPREFIX)gimp_error_dialog_new            \
 149 -       -u $(SYMPREFIX)menus_save                       \
 150 -       -u $(SYMPREFIX)gimp_tools_save                  \
 151 -       -u $(SYMPREFIX)gimp_curve_map_pixels
 152 +       -Wl,-u,$(SYMPREFIX)xcf_init                             \
 153 +       -Wl,-u,$(SYMPREFIX)base_init                    \
 154 +       -Wl,-u,$(SYMPREFIX)internal_procs_init          \
 155 +       -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \
 156 +       -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec   \
 157 +       -Wl,-u,$(SYMPREFIX)gui_init                             \
 158 +       -Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb        \
 159 +       -Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type       \
 160 +       -Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type   \
 161 +       -Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type       \
 162 +       -Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type      \
 163 +       -Wl,-u,$(SYMPREFIX)actions_init                 \
 164 +       -Wl,-u,$(SYMPREFIX)gimp_error_dialog_new                \
 165 +       -Wl,-u,$(SYMPREFIX)menus_save                   \
 166 +       -Wl,-u,$(SYMPREFIX)gimp_tools_save                      \
 167 +       -Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels
 168
 169
 170  # Note that we have some duplicate entries here too to work around
 171 --- devel-docs/app/Makefile.am
 172 +++ devel-docs/app/Makefile.am
 173 @@ -62,10 +62,10 @@
 174         -UGTK_DISABLE_SINGLE_INCLUDES
 175
 176  GTKDOC_LIBS = \
 177 -       -u $(SYMPREFIX)xcf_init                                              \
 178 -       -u $(SYMPREFIX)internal_procs_init                                   \
 179 -       -u $(SYMPREFIX)gimp_coords_mix                                       \
 180 -       -u $(SYMPREFIX)gimp_plug_in_manager_restore                          \
 181 +       -Wl,-u,$(SYMPREFIX)xcf_init                                                  \
 182 +       -Wl,-u,$(SYMPREFIX)internal_procs_init                               \
 183 +       -Wl,-u,$(SYMPREFIX)gimp_coords_mix                                           \
 184 +       -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore                      \
 185         $(top_builddir)/app/app.o                                            \
 186          $(top_builddir)/app/batch.o                                         \
 187          $(top_builddir)/app/errors.o                                        \
 188 --- devel-docs/app/Makefile.in
 189 +++ devel-docs/app/Makefile.in
 190 @@ -511,10 +511,10 @@
 191         -UGTK_DISABLE_SINGLE_INCLUDES
 192
 193  GTKDOC_LIBS = \
 194 -       -u $(SYMPREFIX)xcf_init                                              \
 195 -       -u $(SYMPREFIX)internal_procs_init                                   \
 196 -       -u $(SYMPREFIX)gimp_coords_mix                                       \
 197 -       -u $(SYMPREFIX)gimp_plug_in_manager_restore                          \
 198 +       -Wl,-u,$(SYMPREFIX)xcf_init                                                  \
 199 +       -Wl,-u,$(SYMPREFIX)internal_procs_init                               \
 200 +       -Wl,-u,$(SYMPREFIX)gimp_coords_mix                                           \
 201 +       -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore                      \
 202         $(top_builddir)/app/app.o                                            \
 203          $(top_builddir)/app/batch.o                                         \
 204          $(top_builddir)/app/errors.o                                        \