From 30cfd1f8997befe970a47cc67c24e30688d80f4d Mon Sep 17 00:00:00 2001 From: "S. Gilles" Date: Sat, 6 Feb 2021 06:52:47 -0500 Subject: [PATCH] media-gfx/gimp: kill for now, too complicated --- media-gfx/gimp/Manifest | 15 -- .../gimp/files/gimp-2.7.4-no-deprecation.patch | 36 --- media-gfx/gimp/files/gimp-2.8.10-clang.patch | 204 --------------- .../gimp/files/gimp-2.8.14-blend-center.patch | 30 --- media-gfx/gimp/files/gimp-2.8.6-uclibc.patch | 45 ---- .../gimp/files/gimp-2.9.2-CVE-2016-4994.patch | 88 ------- media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch | 54 ---- .../gimp/files/gimp-2.9.2-no-deprecation.patch | 50 ---- media-gfx/gimp/files/gimp-2.9.2-version.patch | 28 -- .../gimp/files/gimp-2.9.4-CVE-2007-3126.patch | 291 --------------------- media-gfx/gimp/files/gimp-2.9.4-gegl-bin.patch | 28 -- .../gimp/files/gimp-2.9.4-mkdir-makefile.patch | 36 --- media-gfx/gimp/files/gimp-2.9.6-underlinking.patch | 20 -- media-gfx/gimp/gimp-2.9.6-r1.ebuild | 196 -------------- media-gfx/gimp/metadata.xml | 15 -- 15 files changed, 1136 deletions(-) delete mode 100644 media-gfx/gimp/Manifest delete mode 100644 media-gfx/gimp/files/gimp-2.7.4-no-deprecation.patch delete mode 100644 media-gfx/gimp/files/gimp-2.8.10-clang.patch delete mode 100644 media-gfx/gimp/files/gimp-2.8.14-blend-center.patch delete mode 100644 media-gfx/gimp/files/gimp-2.8.6-uclibc.patch delete mode 100644 media-gfx/gimp/files/gimp-2.9.2-CVE-2016-4994.patch delete mode 100644 media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch delete mode 100644 media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch delete mode 100644 media-gfx/gimp/files/gimp-2.9.2-version.patch delete mode 100644 media-gfx/gimp/files/gimp-2.9.4-CVE-2007-3126.patch delete mode 100644 media-gfx/gimp/files/gimp-2.9.4-gegl-bin.patch delete mode 100644 media-gfx/gimp/files/gimp-2.9.4-mkdir-makefile.patch delete mode 100644 media-gfx/gimp/files/gimp-2.9.6-underlinking.patch delete mode 100644 media-gfx/gimp/gimp-2.9.6-r1.ebuild delete mode 100644 media-gfx/gimp/metadata.xml diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest deleted file mode 100644 index d087ef4..0000000 --- a/media-gfx/gimp/Manifest +++ /dev/null @@ -1,15 +0,0 @@ -AUX gimp-2.7.4-no-deprecation.patch 1061 SHA256 fb9532406b62a6fa12f8598b142186fad1dc4e937328c8859cb4e8e76d2b19c7 SHA512 3454f3b1a7579b1da4c36b765ae2a54adab13f0a4ecf02c4c0c3c55a12ff7af57d6d0467f663d2ef3de6cda116095f5f662a29cb3d729e0533edd585731a1dc9 WHIRLPOOL 25b645c7e3f39cabe35155dd24c061a088a1800b0a4c154196ff89f4ccf3fc1950a1028d08eddf879cc482ca334bd99bc4c6cea8288e3bf36c0bed657485d984 -AUX gimp-2.8.10-clang.patch 7670 SHA256 a7f057002f7749cdcb07871c3ef69aa73ab28e688ed5782316d5cb1489a0af1e SHA512 772ee0837a214f3ef70e823662fe12e57ee8fd5f800c6508e757b86169b86a5cbd86695870993a66d3726c019d24f79616831bed8baabce3e1d247ecbfe204fc WHIRLPOOL 0baa2a9e7e3370d2b44a180f89c66306aa3f0a6fb4a675ae9fe3413032ce8b6a8a0bd03b33e86453a2a41340e504f641eead1c9b1e4461bb7133ecae713c52fc -AUX gimp-2.8.14-blend-center.patch 999 SHA256 2fb7bdc7e31a833ddaa75c4ff7bd8ce0595b5a638f3cf9d387e2fd6a0f3764c4 SHA512 1d3cbe9d1b02e2d10ba982265f7d89f593aa6973f76d529dd909f36efe1c9d968360ec208943f66c00f6589f5c679368099e0db579ddb3655c15cb6ce8bdf930 WHIRLPOOL a1f3abe22a966a5490979c580e5c8bd591d0c3a12ae85fb86f306d066f18cc18249eeea2ac5459d99466161b09ba8167a52bb232f69839f383d809ec09e0705f -AUX gimp-2.8.6-uclibc.patch 1317 SHA256 09dcec105a741627c74214ea8dec1696f921be94d3b5492b417f9a68043979c7 SHA512 0e7da897f0d654d2be233880bc80c869f869698122db779bd23f7b995de53840553a3b877b50f0297e56fc8627888b98b3206c08c03a4d22e748feeabe92391a WHIRLPOOL 0e65f6b620c23b2ff2f9b13fd555fe3c070d73b50b3ba93c61446783861f2f0fd7ecdc2102887e9673077d691e9cfcf05bd848242565776931c7f5bff628396b -AUX gimp-2.9.2-CVE-2016-4994.patch 3118 SHA256 14f8b33b40b8de61a21276b26e6e908ef42cb19e7ea938b9a213661760af72dc SHA512 5268326b037ac174ca89525c0332620addd28348f2901e3725402c1aa9fbd2718245868fcb44405256a9c60b8b74df9c66850b0af5d80ca3c4ae7a76bbd523cb WHIRLPOOL 984d9198b18bfd7019b1b5e1348e1d7b18e2466f6d7b91ee7656feb64d2bbe9b46b376c29b8a589fea27b687ec58dd1c2255e1a99a346043ed92a3d9b5e4b0e4 -AUX gimp-2.9.2-gegl-0.3.8.patch 1810 SHA256 a10374d1992f3ead5b07d4f7b387bbb01309fc890e1c5cabeb77893bc32ef908 SHA512 215e51f12e0672dad81b87ae31cbc37a14176b357b6576057224b82d3f3b392485f1e12301ccb8cae97a9423a4ab177d9213538f0d1612e46250012ea3adeaa6 WHIRLPOOL 11bd3d0038c15b946fa1cb898d0e47b45dab06f0a1b390f627ec2b093cc4ff6ce6d2ec67c04d458525cc7528cc25f81916300f3609026bae33e56c67e2a19cd6 -AUX gimp-2.9.2-no-deprecation.patch 1391 SHA256 7e26743c6f51e942ddd051481d2ec30c59e691737f3b12bc548784243c4007e1 SHA512 69ec37957a22a8a7dfc40b912d6ba840bbaed6b27f41d1dc2447b36766c201c462a69a7b65014e21b4a4b7f87c0e630795cf64d13cf4bf7397e1a80290e71181 WHIRLPOOL 3242b67f6ca9129a0a55db340127c745de096d41d73b2666196ccaf81718b468c2393f14e57ab707856f91e5ce85787a48025f2a9f986b481ad7a158a50b78d2 -AUX gimp-2.9.2-version.patch 775 SHA256 07c83325eddd9af9be562a0878986c080ac7299954f726f5373db3ebb0bad821 SHA512 fe8894d9e89210b4d0a8584c1ad3825bb720964ad9194e0b088b6dea2e8b354a2d2f662748ea4f3c090ebb66b64c27a5922fa3d3cf3d49da9aa07e552ad608d6 WHIRLPOOL ce67beb429dd92ed1fcb6347d88eee0bf4bd7c0f36d987c35ef5edb4b7733478a253f4b00216e40f3a7964852e4094e1bcab6df73d68e8acb65fd1f5cb2964d1 -AUX gimp-2.9.4-CVE-2007-3126.patch 8937 SHA256 92dad0e1effa13636a02dd7b16d0065ca869432cff5b31366464a495a85bff4b SHA512 c3853f38204e8fcb6e492812f6c684601827517f988592526f41e285766c3ea688d404593bcaae75d8c2ba0bd2910c43f7b0ec5147659cfd2cc5429d38754306 WHIRLPOOL 8ed186ab843ecfbc82f73bf6b50938f3e0e4bb753bce8646b748d69de97d75dc6df5059338ce9978bf49f3cd52e974694beb979affcb29d5e389404be7583a73 -AUX gimp-2.9.4-gegl-bin.patch 705 SHA256 2425c117b68d812c7f1fcdac5e4654485fac0894302e5b1d7aaed281e5c0ce78 SHA512 3280cb607ba5539c17dc00816b9d745849db48ced676c0a6de3752a8ad3b7eb1717eb4b6af9a5a5db96aeaddd5992d23f0d06b2a3a967a6929e0092145594fef WHIRLPOOL 30044fb9dede9454b52d813bc445603e530e553159db90df8d84b5e26e6dc75cd0edda96d9a8080ab5cfec89662156a29d7bd498b4183bff023989122788e432 -AUX gimp-2.9.4-mkdir-makefile.patch 1492 SHA256 7bba311b9df6a17c73087bfc15db0ba7e7b215a7c4839f9fcc69aa2c826f2bc2 SHA512 c8fa19e79fcc2e38af002c472bdcf6656e3297826ba9df9e22335d09e062c84b32b5b39e9d43adc1ce8b9b20bc047e9a7ef3a52d9db39a69e03a2956204c6000 WHIRLPOOL f2ba749e8253dca3c37178aaf72a06b19d0de4582022a40613faee3058eaffcf2fde3c65f0ab89ef1bb2b530498983a6c9b7c98ea5d7585d90c6f49b2f95364f -AUX gimp-2.9.6-underlinking.patch 653 SHA256 7a59c57012f68040d0a1df490b543566d1cc9e0530a148cc9dd505c2b66710a7 SHA512 3ed27297af495828d9394d7bdd067d416733ae7a3665784ee37b19273d002a585fcb22f30ec6db93164b0f0c7220af6020984820da4c78a356b2ae71fb9e61c3 WHIRLPOOL bbd0ecfc038fea235febb65f8859a327d37c73d40b0e1117292d7dcb05ca53769d726a8f3408f98202cea549affdc5f9a116b828eaa3346f52c904b571b9a91e -DIST gimp-2.9.6.tar.bz2 25472593 SHA256 b46f31d822a33ab416dcb15e33e10b5b98430814fa34f5ea4036230e845dfc9f SHA512 c874daedb00fbfa4156f0e244b217e221b047cb3bd22a81fb190a5d9d774212dc7802ec215151c6dc87136148bf9f84ca23a0a6340681a53c39b5fa71b2ded89 WHIRLPOOL c0166b2f7d3c0592c940030441f1d918463a5759ba8748c0c3ba0467b8dd15fea364041784e36aff4298e2754ae4f62d5cb83eb4e98531bf50bda1b7603b69c7 -EBUILD gimp-2.9.6-r1.ebuild 5309 SHA256 0612750037346049b9d236674f667fa46984c930307d29934c1844c7a984d344 SHA512 f3bef150df1ca0df6c411a8ce1c2d822858306a3752e824d0f02288cc71ff3d50f43ce92524fd4b918ecae7d80a068122e2b941ef46df80a9d3c661f180f48d9 WHIRLPOOL de8f73eb717e034a04e2ddc79bc3719d461d449f3c0a5810656cb4d61b4a83fbbcbf19fdf3db6fcb2af4145a94674a43374c9129f8bef34140a5d17d28cc6c62 -MISC metadata.xml 388 SHA256 794711a232119fb44efec918fa98409c2c9976d9d4c5416a8023f283f5a24576 SHA512 e3a626ac39cea422d1b4660731048d764c4b6f1985e09577865f0047ecbc61c8677d6f15626dbbc03ceb3cb18887ba58747df5d91f5f4b2126afb9ad12eaccb0 WHIRLPOOL adf84ce8636c190d45d93b9de5d7dacfe13ff2ab2e2e29fe2c4d162f1fc8b842a5a67e4132f0dec1854d668120da8708eda128d7ccc722e096401ab0178fd063 diff --git a/media-gfx/gimp/files/gimp-2.7.4-no-deprecation.patch b/media-gfx/gimp/files/gimp-2.7.4-no-deprecation.patch deleted file mode 100644 index 66bd93d..0000000 --- a/media-gfx/gimp/files/gimp-2.7.4-no-deprecation.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- configure.ac 2012-01-02 13:15:53.695067626 +0100 -+++ configure.ac 2012-01-02 13:21:49.161623684 +0100 -@@ -1943,33 +1943,6 @@ - AC_SUBST(MIME_TYPES) - - --######################### --# Disable deprecated APIs --######################### -- --CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED -DBABL_DISABLE_DEPRECATED -DGSEAL_ENABLE" -- --# Make sure not to disable deprecated APIs for unreleased versions. --# We must build without problems with future releases of libraries --# and disabling deprecated API risks breaking the build -- --if test "x$have_glib_2_31" != "xyes"; then -- CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED" --fi -- --if test "x$have_gtk_2_26" != "xyes"; then -- CPPFLAGS="${CPPFLAGS} -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" --fi -- --if test "x$have_gdk_pixbuf_2_26" != "xyes"; then -- CPPFLAGS="${CPPFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED" --fi -- --if test "x$have_pango_1_32" != "xyes"; then -- CPPFLAGS="${CPPFLAGS} -DPANGO_DISABLE_DEPRECATED" --fi -- -- - ############################ - # Require multihead safe API - ############################ diff --git a/media-gfx/gimp/files/gimp-2.8.10-clang.patch b/media-gfx/gimp/files/gimp-2.8.10-clang.patch deleted file mode 100644 index 065c66b..0000000 --- a/media-gfx/gimp/files/gimp-2.8.10-clang.patch +++ /dev/null @@ -1,204 +0,0 @@ ---- app/Makefile.am -+++ app/Makefile.am -@@ -120,29 +120,29 @@ - - # FIXME: core should not depend on xcf - workaround_that_core_depends_on_xcf = \ -- -u $(SYMPREFIX)xcf_init -+ -Wl,-u,$(SYMPREFIX)xcf_init - - # FIXME: core should not depend on pdb - workaround_that_core_depends_on_pdb = \ -- -u $(SYMPREFIX)internal_procs_init \ -- -u $(SYMPREFIX)gimp_plug_in_manager_restore -+ -Wl,-u,$(SYMPREFIX)internal_procs_init \ -+ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore - - # FIXME: plug-in should not depend on pdb - workaround_that_plug_in_depends_on_pdb = \ -- -u $(SYMPREFIX)gimp_pdb_compat_param_spec -+ -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec - - # FIXME: file should not depend on plug-in - workaround_that_file_depends_on_plug_in = \ -- -u $(SYMPREFIX)plug_in_icc_profile_apply_rgb \ -- -u $(SYMPREFIX)gimp_image_map_config_get_type -+ -Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb \ -+ -Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type - - # core, vectors and gegl are on the same architectural layer, prevent - # the linker from panicing - calm_down_linker = \ -- -u $(SYMPREFIX)gimp_vectors_undo_get_type \ -- -u $(SYMPREFIX)gimp_vectors_mod_undo_get_type \ -- -u $(SYMPREFIX)gimp_vectors_prop_undo_get_type \ -- -u $(SYMPREFIX)gimp_curve_map_pixels -+ -Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type \ -+ -Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type \ -+ -Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type \ -+ -Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels - - AM_LDFLAGS = \ - $(munix) \ ---- app/Makefile.in -+++ app/Makefile.in -@@ -702,33 +702,33 @@ - - # FIXME: core should not depend on xcf - workaround_that_core_depends_on_xcf = \ -- -u $(SYMPREFIX)xcf_init -+ -Wl,-u,$(SYMPREFIX)xcf_init - - - # FIXME: core should not depend on pdb - workaround_that_core_depends_on_pdb = \ -- -u $(SYMPREFIX)internal_procs_init \ -- -u $(SYMPREFIX)gimp_plug_in_manager_restore -+ -Wl,-u,$(SYMPREFIX)internal_procs_init \ -+ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore - - - # FIXME: plug-in should not depend on pdb - workaround_that_plug_in_depends_on_pdb = \ -- -u $(SYMPREFIX)gimp_pdb_compat_param_spec -+ -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec - - - # FIXME: file should not depend on plug-in - workaround_that_file_depends_on_plug_in = \ -- -u $(SYMPREFIX)plug_in_icc_profile_apply_rgb \ -- -u $(SYMPREFIX)gimp_image_map_config_get_type -+ -Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb \ -+ -Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type - - - # core, vectors and gegl are on the same architectural layer, prevent - # the linker from panicing - calm_down_linker = \ -- -u $(SYMPREFIX)gimp_vectors_undo_get_type \ -- -u $(SYMPREFIX)gimp_vectors_mod_undo_get_type \ -- -u $(SYMPREFIX)gimp_vectors_prop_undo_get_type \ -- -u $(SYMPREFIX)gimp_curve_map_pixels -+ -Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type \ -+ -Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type \ -+ -Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type \ -+ -Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels - - AM_LDFLAGS = \ - $(munix) \ ---- app/tests/Makefile.am -+++ app/tests/Makefile.am -@@ -63,22 +63,22 @@ - # We need this due to circular dependencies, see more detailed - # comments about it in app/Makefile.am - AM_LDFLAGS = \ -- -u $(SYMPREFIX)xcf_init \ -- -u $(SYMPREFIX)base_init \ -- -u $(SYMPREFIX)internal_procs_init \ -- -u $(SYMPREFIX)gimp_plug_in_manager_restore \ -- -u $(SYMPREFIX)gimp_pdb_compat_param_spec \ -- -u $(SYMPREFIX)gui_init \ -- -u $(SYMPREFIX)plug_in_icc_profile_apply_rgb \ -- -u $(SYMPREFIX)gimp_image_map_config_get_type \ -- -u $(SYMPREFIX)gimp_vectors_undo_get_type \ -- -u $(SYMPREFIX)gimp_vectors_mod_undo_get_type \ -- -u $(SYMPREFIX)gimp_vectors_prop_undo_get_type \ -- -u $(SYMPREFIX)actions_init \ -- -u $(SYMPREFIX)gimp_error_dialog_new \ -- -u $(SYMPREFIX)menus_save \ -- -u $(SYMPREFIX)gimp_tools_save \ -- -u $(SYMPREFIX)gimp_curve_map_pixels -+ -Wl,-u,$(SYMPREFIX)xcf_init \ -+ -Wl,-u,$(SYMPREFIX)base_init \ -+ -Wl,-u,$(SYMPREFIX)internal_procs_init \ -+ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \ -+ -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec \ -+ -Wl,-u,$(SYMPREFIX)gui_init \ -+ -Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb \ -+ -Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type \ -+ -Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type \ -+ -Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type \ -+ -Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type \ -+ -Wl,-u,$(SYMPREFIX)actions_init \ -+ -Wl,-u,$(SYMPREFIX)gimp_error_dialog_new \ -+ -Wl,-u,$(SYMPREFIX)menus_save \ -+ -Wl,-u,$(SYMPREFIX)gimp_tools_save \ -+ -Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels - - # Note that we have some duplicate entries here too to work around - # circular dependencies and systems on the same architectural layer as ---- app/tests/Makefile.in -+++ app/tests/Makefile.in -@@ -1221,22 +1221,22 @@ - # We need this due to circular dependencies, see more detailed - # comments about it in app/Makefile.am - AM_LDFLAGS = \ -- -u $(SYMPREFIX)xcf_init \ -- -u $(SYMPREFIX)base_init \ -- -u $(SYMPREFIX)internal_procs_init \ -- -u $(SYMPREFIX)gimp_plug_in_manager_restore \ -- -u $(SYMPREFIX)gimp_pdb_compat_param_spec \ -- -u $(SYMPREFIX)gui_init \ -- -u $(SYMPREFIX)plug_in_icc_profile_apply_rgb \ -- -u $(SYMPREFIX)gimp_image_map_config_get_type \ -- -u $(SYMPREFIX)gimp_vectors_undo_get_type \ -- -u $(SYMPREFIX)gimp_vectors_mod_undo_get_type \ -- -u $(SYMPREFIX)gimp_vectors_prop_undo_get_type \ -- -u $(SYMPREFIX)actions_init \ -- -u $(SYMPREFIX)gimp_error_dialog_new \ -- -u $(SYMPREFIX)menus_save \ -- -u $(SYMPREFIX)gimp_tools_save \ -- -u $(SYMPREFIX)gimp_curve_map_pixels -+ -Wl,-u,$(SYMPREFIX)xcf_init \ -+ -Wl,-u,$(SYMPREFIX)base_init \ -+ -Wl,-u,$(SYMPREFIX)internal_procs_init \ -+ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \ -+ -Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec \ -+ -Wl,-u,$(SYMPREFIX)gui_init \ -+ -Wl,-u,$(SYMPREFIX)plug_in_icc_profile_apply_rgb \ -+ -Wl,-u,$(SYMPREFIX)gimp_image_map_config_get_type \ -+ -Wl,-u,$(SYMPREFIX)gimp_vectors_undo_get_type \ -+ -Wl,-u,$(SYMPREFIX)gimp_vectors_mod_undo_get_type \ -+ -Wl,-u,$(SYMPREFIX)gimp_vectors_prop_undo_get_type \ -+ -Wl,-u,$(SYMPREFIX)actions_init \ -+ -Wl,-u,$(SYMPREFIX)gimp_error_dialog_new \ -+ -Wl,-u,$(SYMPREFIX)menus_save \ -+ -Wl,-u,$(SYMPREFIX)gimp_tools_save \ -+ -Wl,-u,$(SYMPREFIX)gimp_curve_map_pixels - - - # Note that we have some duplicate entries here too to work around ---- devel-docs/app/Makefile.am -+++ devel-docs/app/Makefile.am -@@ -62,10 +62,10 @@ - -UGTK_DISABLE_SINGLE_INCLUDES - - GTKDOC_LIBS = \ -- -u $(SYMPREFIX)xcf_init \ -- -u $(SYMPREFIX)internal_procs_init \ -- -u $(SYMPREFIX)gimp_coords_mix \ -- -u $(SYMPREFIX)gimp_plug_in_manager_restore \ -+ -Wl,-u,$(SYMPREFIX)xcf_init \ -+ -Wl,-u,$(SYMPREFIX)internal_procs_init \ -+ -Wl,-u,$(SYMPREFIX)gimp_coords_mix \ -+ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \ - $(top_builddir)/app/app.o \ - $(top_builddir)/app/batch.o \ - $(top_builddir)/app/errors.o \ ---- devel-docs/app/Makefile.in -+++ devel-docs/app/Makefile.in -@@ -511,10 +511,10 @@ - -UGTK_DISABLE_SINGLE_INCLUDES - - GTKDOC_LIBS = \ -- -u $(SYMPREFIX)xcf_init \ -- -u $(SYMPREFIX)internal_procs_init \ -- -u $(SYMPREFIX)gimp_coords_mix \ -- -u $(SYMPREFIX)gimp_plug_in_manager_restore \ -+ -Wl,-u,$(SYMPREFIX)xcf_init \ -+ -Wl,-u,$(SYMPREFIX)internal_procs_init \ -+ -Wl,-u,$(SYMPREFIX)gimp_coords_mix \ -+ -Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore \ - $(top_builddir)/app/app.o \ - $(top_builddir)/app/batch.o \ - $(top_builddir)/app/errors.o \ diff --git a/media-gfx/gimp/files/gimp-2.8.14-blend-center.patch b/media-gfx/gimp/files/gimp-2.8.14-blend-center.patch deleted file mode 100644 index eba04df..0000000 --- a/media-gfx/gimp/files/gimp-2.8.14-blend-center.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 97e55692ebad5897be334c81c133b6626b9b6920 Mon Sep 17 00:00:00 2001 -From: Michael Natterer -Date: Wed, 26 Aug 2015 23:23:16 +0200 -Subject: app: the blend tool was rendering all gradients off-by-0.5 - -When calculating the color of a pixel, we want to calculate the color -at its center, not at its top-left corner. Found by Raymond Jennings. - -EDIT (by Sebastian Pipping ): - Cut away patch chunk for app/operations/gimpoperationblend.c - since 2.8.14 doesn't seem to have that file. - -diff --git a/app/core/gimpdrawable-blend.c b/app/core/gimpdrawable-blend.c -index af565d1..e4f92a1 100644 ---- a/app/core/gimpdrawable-blend.c -+++ b/app/core/gimpdrawable-blend.c -@@ -628,6 +628,10 @@ gradient_render_pixel (gdouble x, - RenderBlendData *rbd = render_data; - gdouble factor; - -+ /* we want to calculate the color at the pixel's center */ -+ x += 0.5; -+ y += 0.5; -+ - /* Calculate blending factor */ - - switch (rbd->gradient_type) --- -cgit v0.10.2 - diff --git a/media-gfx/gimp/files/gimp-2.8.6-uclibc.patch b/media-gfx/gimp/files/gimp-2.8.6-uclibc.patch deleted file mode 100644 index 855e987..0000000 --- a/media-gfx/gimp/files/gimp-2.8.6-uclibc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4fb7a436bca3e11abfda8bc23818af0f09714b9d Mon Sep 17 00:00:00 2001 -From: Michael Natterer -Date: Fri, 02 Aug 2013 14:50:00 +0000 -Subject: Bug 704980 - uclibc - base-utils.c: execinfo.h: No such file or directory - -Apply patch from Amadeusz Slawinski that checks for execinfo.h and -builds the code that needs it conditionally. ---- -diff --git a/app/base/base-utils.c b/app/base/base-utils.c -index 757f58d..44a9e89 100644 ---- a/app/base/base-utils.c -+++ b/app/base/base-utils.c -@@ -29,7 +29,7 @@ - #include - #endif - --#ifdef G_OS_UNIX -+#if defined(G_OS_UNIX) && defined(HAVE_EXECINFO_H) - /* For get_backtrace() */ - #include - #include -@@ -112,7 +112,7 @@ get_physical_memory_size (void) - char * - get_backtrace (void) - { --#ifdef G_OS_UNIX -+#if defined(G_OS_UNIX) && defined(HAVE_EXECINFO_H) - void *functions[MAX_FUNC]; - char **function_names; - int n_functions; -diff --git a/configure.ac b/configure.ac -index 0bbcbc7..15c7cc6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -416,7 +416,7 @@ AC_HEADER_STDC - AC_HEADER_SYS_WAIT - AC_HEADER_TIME - --AC_CHECK_HEADERS(sys/param.h sys/time.h sys/times.h sys/wait.h unistd.h) -+AC_CHECK_HEADERS(execinfo.h sys/param.h sys/time.h sys/times.h sys/wait.h unistd.h) - - AC_TYPE_PID_T - AC_FUNC_VPRINTF --- -cgit v0.9.2 diff --git a/media-gfx/gimp/files/gimp-2.9.2-CVE-2016-4994.patch b/media-gfx/gimp/files/gimp-2.9.2-CVE-2016-4994.patch deleted file mode 100644 index 846318b..0000000 --- a/media-gfx/gimp/files/gimp-2.9.2-CVE-2016-4994.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 6d804bf9ae77bc86a0a97f9b944a129844df9395 Mon Sep 17 00:00:00 2001 -From: Shmuel H -Date: Mon, 20 Jun 2016 17:14:41 +0300 -Subject: Bug 767873 - (CVE-2016-4994) Multiple Use-After-Free when parsing... - -...XCF channel and layer properties - -The properties PROP_ACTIVE_LAYER, PROP_FLOATING_SELECTION, -PROP_ACTIVE_CHANNEL saves the current object pointer the @info -structure. Others like PROP_SELECTION (for channel) and -PROP_GROUP_ITEM (for layer) will delete the current object and create -a new object, leaving the pointers in @info invalid (dangling). - -Therefore, if a property from the first type will come before the -second, the result will be an UaF in the last lines of xcf_load_image -(when it actually using the pointers from @info). - -I wasn't able to exploit this bug because that -g_object_instance->c_class gets cleared by the last g_object_unref and -GIMP_IS_{LAYER,CHANNEL} detects that and return FALSE. ---- - app/xcf/xcf-load.c | 29 +++++++++++++++++++++++++++++ - 1 file changed, 29 insertions(+) - -diff --git a/app/xcf/xcf-load.c b/app/xcf/xcf-load.c -index f48558a..244d5c2 100644 ---- a/app/xcf/xcf-load.c -+++ b/app/xcf/xcf-load.c -@@ -1141,6 +1141,18 @@ xcf_load_layer_props (XcfInfo *info, - case PROP_GROUP_ITEM: - { - GimpLayer *group; -+ gboolean is_active_layer; -+ -+ /* We're going to delete *layer, Don't leave its pointers -+ * in @info. After that, we'll restore them back with the -+ * new pointer. See bug #767873. -+ */ -+ is_active_layer = (*layer == info->active_layer); -+ if (is_active_layer) -+ info->active_layer = NULL; -+ -+ if (*layer == info->floating_sel) -+ info->floating_sel = NULL; - - group = gimp_group_layer_new (image); - -@@ -1150,6 +1162,13 @@ xcf_load_layer_props (XcfInfo *info, - g_object_ref_sink (*layer); - g_object_unref (*layer); - *layer = group; -+ -+ if (is_active_layer) -+ info->active_layer = *layer; -+ -+ /* Don't restore info->floating_sel because group layers -+ * can't be floating selections -+ */ - } - break; - -@@ -1220,6 +1239,12 @@ xcf_load_channel_props (XcfInfo *info, - { - GimpChannel *mask; - -+ /* We're going to delete *channel, Don't leave its pointer -+ * in @info. See bug #767873. -+ */ -+ if (*channel == info->active_channel) -+ info->active_channel = NULL; -+ - mask = - gimp_selection_new (image, - gimp_item_get_width (GIMP_ITEM (*channel)), -@@ -1234,6 +1259,10 @@ xcf_load_channel_props (XcfInfo *info, - *channel = mask; - (*channel)->boundary_known = FALSE; - (*channel)->bounds_known = FALSE; -+ -+ /* Don't restore info->active_channel because the -+ * selection can't be the active channel -+ */ - } - break; - --- -cgit v0.12 - diff --git a/media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch b/media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch deleted file mode 100644 index a3aa236..0000000 --- a/media-gfx/gimp/files/gimp-2.9.2-gegl-0.3.8.patch +++ /dev/null @@ -1,54 +0,0 @@ -https://bugs.gentoo.org/586828 - -Backported from: -https://git.gnome.org/browse/gimp/commit/?id=2e4685013123c584354bc38612527593a815c38b - ---- gimp-2.9.2/app/core/gimpparamspecs-duplicate.c -+++ gimp-2.9.2/app/core/gimpparamspecs-duplicate.c -@@ -66,23 +66,11 @@ - } - else - { -- - copy = g_param_spec_string (pspec->name, - g_param_spec_get_nick (pspec), - g_param_spec_get_blurb (pspec), - spec->default_value, - flags); -- -- if (GEGL_IS_PARAM_SPEC_MULTILINE (pspec)) -- { -- static GQuark multiline_quark = 0; -- -- if (! multiline_quark) -- multiline_quark = g_quark_from_static_string ("multiline"); -- -- g_param_spec_set_qdata (copy, multiline_quark, -- GINT_TO_POINTER (TRUE)); -- } - } - } - else if (G_IS_PARAM_SPEC_BOOLEAN (pspec)) ---- gimp-2.9.2/app/widgets/gimppropgui.c -+++ gimp-2.9.2/app/widgets/gimppropgui.c -@@ -227,11 +227,6 @@ - } - else if (G_IS_PARAM_SPEC_STRING (pspec)) - { -- static GQuark multiline_quark = 0; -- -- if (! multiline_quark) -- multiline_quark = g_quark_from_static_string ("multiline"); -- - if (GIMP_IS_PARAM_SPEC_CONFIG_PATH (pspec)) - { - widget = -@@ -239,7 +234,7 @@ - g_param_spec_get_nick (pspec), - GTK_FILE_CHOOSER_ACTION_OPEN); - } -- else if (g_param_spec_get_qdata (pspec, multiline_quark)) -+ else if (HAS_KEY (pspec, "multiline", "true")) - { - GtkTextBuffer *buffer; - GtkWidget *view; diff --git a/media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch b/media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch deleted file mode 100644 index 441298a..0000000 --- a/media-gfx/gimp/files/gimp-2.9.2-no-deprecation.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 81d7607e5159275a9b693a170f7767ffcb548a1b Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Sat, 5 Dec 2015 01:14:37 +0100 -Subject: [PATCH] Do not disable deprecated APIs - ---- - configure.ac | 27 --------------------------- - 1 file changed, 27 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4de6e53..8528e87 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2111,33 +2111,6 @@ MIME_TYPES="$MIME_TYPES;" - AC_SUBST(MIME_TYPES) - - --######################### --# Disable deprecated APIs --######################### -- --CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED -DBABL_DISABLE_DEPRECATED -DGSEAL_ENABLE" -- --# Make sure not to disable deprecated APIs for unreleased versions. --# We must build without problems with future releases of libraries --# and disabling deprecated API risks breaking the build -- --if test "x$have_glib_2_43" != "xyes"; then -- CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED" --fi -- --if test "x$have_gtk_2_26" != "xyes"; then -- CPPFLAGS="${CPPFLAGS} -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" --fi -- --if test "x$have_gdk_pixbuf_2_31" != "xyes"; then -- CPPFLAGS="${CPPFLAGS} -DGDK_PIXBUF_DISABLE_DEPRECATED" --fi -- --if test "x$have_pango_1_32" != "xyes"; then -- CPPFLAGS="${CPPFLAGS} -DPANGO_DISABLE_DEPRECATED" --fi -- -- - ############################ - # Require multihead safe API - ############################ --- -2.6.3 - diff --git a/media-gfx/gimp/files/gimp-2.9.2-version.patch b/media-gfx/gimp/files/gimp-2.9.2-version.patch deleted file mode 100644 index e486144..0000000 --- a/media-gfx/gimp/files/gimp-2.9.2-version.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f2f7a29ba5aceaa38a285f15c3fe8b481d05b357 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Sat, 5 Dec 2015 01:15:22 +0100 -Subject: [PATCH] Sync version string - -.. with -m4_define([gimp_micro_version], [2]) -above ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 8528e87..21d86a3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,7 +20,7 @@ m4_define([gimp_binary_age], - [m4_eval(100 * gimp_minor_version + gimp_micro_version)]) - - # For overriding the version string. Comment out if not needed. --# m4_define([gimp_version], [2.9.1]) -+# m4_define([gimp_version], [2.9.2]) - - # This is the X.Y used in -lgimp-X.Y - m4_define([gimp_api_version], [2.0]) --- -2.6.3 - diff --git a/media-gfx/gimp/files/gimp-2.9.4-CVE-2007-3126.patch b/media-gfx/gimp/files/gimp-2.9.4-CVE-2007-3126.patch deleted file mode 100644 index 6c51517..0000000 --- a/media-gfx/gimp/files/gimp-2.9.4-CVE-2007-3126.patch +++ /dev/null @@ -1,291 +0,0 @@ -From 46bcd82800e37b0f5aead76184430ef2fe802748 Mon Sep 17 00:00:00 2001 -From: Michael Natterer -Date: Sun, 6 Nov 2016 21:34:43 +0100 -Subject: Bug 773233 - CVE-2007-3126 - Gimp 2.3.14 allows context-dependent - attackers... - -...to cause a denial of service (crash) via an ICO file with an -InfoHeader containing a Height of zero - -Add some error handling to ico-load.c and bail out on zero width or height -icons. Also some formatting cleanup. ---- - plug-ins/file-ico/ico-load.c | 103 ++++++++++++++++++++++++++----------------- - 1 file changed, 62 insertions(+), 41 deletions(-) - -diff --git a/plug-ins/file-ico/ico-load.c b/plug-ins/file-ico/ico-load.c -index c8091d3..8cce94f 100644 ---- a/plug-ins/file-ico/ico-load.c -+++ b/plug-ins/file-ico/ico-load.c -@@ -124,15 +124,17 @@ static guint32 - ico_read_init (FILE *fp) - { - IcoFileHeader header; -+ - /* read and check file header */ -- if (!ico_read_int16 (fp, &header.reserved, 1) -- || !ico_read_int16 (fp, &header.resource_type, 1) -- || !ico_read_int16 (fp, &header.icon_count, 1) -- || header.reserved != 0 -- || header.resource_type != 1) -+ if (! ico_read_int16 (fp, &header.reserved, 1) || -+ ! ico_read_int16 (fp, &header.resource_type, 1) || -+ ! ico_read_int16 (fp, &header.icon_count, 1) || -+ header.reserved != 0 || -+ header.resource_type != 1) - { - return 0; - } -+ - return header.icon_count; - } - -@@ -148,22 +150,25 @@ ico_read_size (FILE *fp, - gint32 color_type; - guint32 magic; - -- if ( fseek (fp, info->offset, SEEK_SET) < 0 ) -+ if (fseek (fp, info->offset, SEEK_SET) < 0) - return FALSE; - - ico_read_int32 (fp, &magic, 1); -+ - if (magic == ICO_PNG_MAGIC) - { - png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, - NULL); -- if (! png_ptr ) -+ if (! png_ptr) - return FALSE; -+ - info_ptr = png_create_info_struct (png_ptr); -- if (! info_ptr ) -+ if (! info_ptr) - { - png_destroy_read_struct (&png_ptr, NULL, NULL); - return FALSE; - } -+ - if (setjmp (png_jmpbuf (png_ptr))) - { - png_destroy_read_struct (&png_ptr, NULL, NULL); -@@ -182,8 +187,8 @@ ico_read_size (FILE *fp, - } - else if (magic == 40) - { -- if (ico_read_int32 (fp, &info->width, 1) -- && ico_read_int32 (fp, &info->height, 1)) -+ if (ico_read_int32 (fp, &info->width, 1) && -+ ico_read_int32 (fp, &info->height, 1)) - { - info->height /= 2; - D(("ico_read_size: ICO: %ix%i\n", info->width, info->height)); -@@ -200,8 +205,9 @@ ico_read_size (FILE *fp, - } - - static IcoLoadInfo* --ico_read_info (FILE *fp, -- gint icon_count) -+ico_read_info (FILE *fp, -+ gint icon_count, -+ GError **error) - { - gint i; - IcoFileEntry *entries; -@@ -209,8 +215,11 @@ ico_read_info (FILE *fp, - - /* read icon entries */ - entries = g_new (IcoFileEntry, icon_count); -- if ( fread (entries, sizeof(IcoFileEntry), icon_count, fp) <= 0 ) -+ if (fread (entries, sizeof (IcoFileEntry), icon_count, fp) <= 0) - { -+ g_set_error (error, G_FILE_ERROR, 0, -+ _("Could not read '%lu' bytes"), -+ sizeof (IcoFileEntry)); - g_free (entries); - return NULL; - } -@@ -218,23 +227,33 @@ ico_read_info (FILE *fp, - info = g_new (IcoLoadInfo, icon_count); - for (i = 0; i < icon_count; i++) - { -- info[i].width = entries[i].width; -+ info[i].width = entries[i].width; - info[i].height = entries[i].height; -- info[i].bpp = GUINT16_FROM_LE (entries[i].bpp); -- info[i].size = GUINT32_FROM_LE (entries[i].size); -+ info[i].bpp = GUINT16_FROM_LE (entries[i].bpp); -+ info[i].size = GUINT32_FROM_LE (entries[i].size); - info[i].offset = GUINT32_FROM_LE (entries[i].offset); - - if (info[i].width == 0 || info[i].height == 0) - { -- ico_read_size (fp, info+i); -+ ico_read_size (fp, info + i); - } - - D(("ico_read_info: %ix%i (%i bits, size: %i, offset: %i)\n", - info[i].width, info[i].height, info[i].bpp, - info[i].size, info[i].offset)); -+ -+ if (info[i].width == 0 || info[i].height == 0) -+ { -+ g_set_error (error, G_FILE_ERROR, 0, -+ _("Icon #%d has zero width or height"), i); -+ g_free (info); -+ g_free (entries); -+ return NULL; -+ } - } - - g_free (entries); -+ - return info; - } - -@@ -256,10 +275,10 @@ ico_read_png (FILE *fp, - gint i; - - png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); -- if (! png_ptr ) -+ if (! png_ptr) - return FALSE; - info = png_create_info_struct (png_ptr); -- if (! info ) -+ if (! info) - { - png_destroy_read_struct (&png_ptr, NULL, NULL); - return FALSE; -@@ -287,14 +306,14 @@ ico_read_png (FILE *fp, - { - case PNG_COLOR_TYPE_GRAY: - png_set_expand_gray_1_2_4_to_8 (png_ptr); -- if ( bit_depth == 16 ) -+ if (bit_depth == 16) - png_set_strip_16 (png_ptr); - png_set_gray_to_rgb (png_ptr); - png_set_add_alpha (png_ptr, 0xff, PNG_FILLER_AFTER); - break; - case PNG_COLOR_TYPE_GRAY_ALPHA: - png_set_expand_gray_1_2_4_to_8 (png_ptr); -- if ( bit_depth == 16 ) -+ if (bit_depth == 16) - png_set_strip_16 (png_ptr); - png_set_gray_to_rgb (png_ptr); - break; -@@ -427,16 +446,18 @@ ico_read_icon (FILE *fp, - data.planes, data.image_size, data.bpp, - data.used_clrs, data.important_clrs)); - -- if (data.planes != 1 -- || data.compression != 0) -+ if (data.planes != 1 || -+ data.compression != 0) - { - D(("skipping image: invalid header\n")); - return FALSE; - } - -- if (data.bpp != 1 && data.bpp != 4 -- && data.bpp != 8 && data.bpp != 24 -- && data.bpp != 32) -+ if (data.bpp != 1 && -+ data.bpp != 4 && -+ data.bpp != 8 && -+ data.bpp != 24 && -+ data.bpp != 32) - { - D(("skipping image: invalid depth: %i\n", data.bpp)); - return FALSE; -@@ -590,8 +611,8 @@ ico_load_layer (FILE *fp, - GeglBuffer *buffer; - gchar name[ICO_MAXBUF]; - -- if ( fseek (fp, info->offset, SEEK_SET) < 0 -- || !ico_read_int32 (fp, &first_bytes, 1) ) -+ if (fseek (fp, info->offset, SEEK_SET) < 0 || -+ ! ico_read_int32 (fp, &first_bytes, 1)) - return -1; - - if (first_bytes == ICO_PNG_MAGIC) -@@ -643,7 +664,7 @@ ico_load_image (const gchar *filename, - gimp_filename_to_utf8 (filename)); - - fp = g_fopen (filename, "rb"); -- if (! fp ) -+ if (! fp) - { - g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), - _("Could not open '%s' for reading: %s"), -@@ -658,8 +679,8 @@ ico_load_image (const gchar *filename, - return -1; - } - -- info = ico_read_info (fp, icon_count); -- if (!info) -+ info = ico_read_info (fp, icon_count, error); -+ if (! info) - { - fclose (fp); - return -1; -@@ -670,12 +691,12 @@ ico_load_image (const gchar *filename, - max_height = 0; - for (i = 0; i < icon_count; i++) - { -- if ( info[i].width > max_width ) -+ if (info[i].width > max_width) - max_width = info[i].width; -- if ( info[i].height > max_height ) -+ if (info[i].height > max_height) - max_height = info[i].height; - } -- if ( max_width <= 0 || max_height <= 0 ) -+ if (max_width <= 0 || max_height <= 0) - { - g_free (info); - fclose (fp); -@@ -721,7 +742,7 @@ ico_load_thumbnail_image (const gchar *filename, - gimp_filename_to_utf8 (filename)); - - fp = g_fopen (filename, "rb"); -- if (! fp ) -+ if (! fp) - { - g_set_error (error, G_FILE_ERROR, g_file_error_from_errno (errno), - _("Could not open '%s' for reading: %s"), -@@ -730,7 +751,7 @@ ico_load_thumbnail_image (const gchar *filename, - } - - icon_count = ico_read_init (fp); -- if (! icon_count ) -+ if (! icon_count) - { - fclose (fp); - return -1; -@@ -739,8 +760,8 @@ ico_load_thumbnail_image (const gchar *filename, - D(("*** %s: Microsoft icon file, containing %i icon(s)\n", - filename, icon_count)); - -- info = ico_read_info (fp, icon_count); -- if (! info ) -+ info = ico_read_info (fp, icon_count, error); -+ if (! info) - { - fclose (fp); - return -1; -@@ -758,9 +779,9 @@ ico_load_thumbnail_image (const gchar *filename, - - match = i; - } -- else if ( w == info[i].width -- && h == info[i].height -- && info[i].bpp > bpp ) -+ else if (w == info[i].width && -+ h == info[i].height && -+ info[i].bpp > bpp) - { - /* better quality */ - bpp = info[i].bpp; --- -cgit v0.12 - diff --git a/media-gfx/gimp/files/gimp-2.9.4-gegl-bin.patch b/media-gfx/gimp/files/gimp-2.9.4-gegl-bin.patch deleted file mode 100644 index 31057b5..0000000 --- a/media-gfx/gimp/files/gimp-2.9.4-gegl-bin.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 8d5de5ce62cd0410c9bccaa77725d0cad051faad Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Mon, 18 Jul 2016 17:42:45 +0200 -Subject: [PATCH] Fix gegl executable name to check for - ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 45b31b1..0e5be99 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -674,9 +674,9 @@ else - fi - AC_MSG_RESULT($have_glib_2_43) - --AC_PATH_PROG(GEGL, gegl, no) -+AC_PATH_PROG(GEGL, gegl-0.3, no) - if test "x$GEGL" = xno; then -- add_deps_error([gegl], [Could not find gegl in your PATH.]) -+ add_deps_error([gegl], [Could not find gegl-0.3 in your PATH.]) - fi - - --- -2.9.2 - diff --git a/media-gfx/gimp/files/gimp-2.9.4-mkdir-makefile.patch b/media-gfx/gimp/files/gimp-2.9.4-mkdir-makefile.patch deleted file mode 100644 index 661ad69..0000000 --- a/media-gfx/gimp/files/gimp-2.9.4-mkdir-makefile.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c081a26345ad1c5bdf6f4ffec27bca517de6d594 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Sat, 23 Jul 2016 01:02:10 +0200 -Subject: [PATCH] Fix creation of output directories - -https://bugs.gentoo.org/show_bug.cgi?id=589394 ---- - icons/Symbolic-Inverted/Makefile.am | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/icons/Symbolic-Inverted/Makefile.am b/icons/Symbolic-Inverted/Makefile.am -index 2981cfc..f3fe6a5 100644 ---- a/icons/Symbolic-Inverted/Makefile.am -+++ b/icons/Symbolic-Inverted/Makefile.am -@@ -10,14 +10,14 @@ include $(top_srcdir)/icons/icon-list.mk - # As exceptions, we do not want to invert some icons. - # Just use these as-is: gimp-default-colors, gimp-toilet-paper.png. - 12/gimp-default-colors.png: $(top_srcdir)/icons/Symbolic/12/gimp-default-colors.png -- mkdir -p `dirname $<` && cp -f $< $@ -+ mkdir -p `dirname $@` && cp -f $< $@ - scalable/gimp-default-colors.svg: ../Symbolic/scalable/gimp-default-colors.svg -- mkdir -p `dirname $<` && cp -f $< $@ -+ mkdir -p `dirname $@` && cp -f $< $@ - - %/gimp-toilet-paper.png: $(top_srcdir)/icons/Symbolic/$(@D)/gimp-toilet-paper.png -- mkdir -p `dirname $<` && cp -f $< $@ -+ mkdir -p `dirname $@` && cp -f $< $@ - scalable/gimp-toilet-paper.svg: ../Symbolic/scalable/gimp-toilet-paper.svg -- mkdir -p `dirname $<` && cp -f $< $@ -+ mkdir -p `dirname $@` && cp -f $< $@ - - # Other exceptions: inverted gimp-color-picker-white|black are generated - # from each other. --- -2.9.2 - diff --git a/media-gfx/gimp/files/gimp-2.9.6-underlinking.patch b/media-gfx/gimp/files/gimp-2.9.6-underlinking.patch deleted file mode 100644 index 9208c2f..0000000 --- a/media-gfx/gimp/files/gimp-2.9.6-underlinking.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/libgimpbase/Makefile.am b/libgimpbase/Makefile.am -index a1a6719..85c8518 100644 ---- a/libgimpbase/Makefile.am -+++ b/libgimpbase/Makefile.am -@@ -22,6 +22,7 @@ uninstall-libtool-import-lib: - -rm $(DESTDIR)$(libdir)/libgimpbase-$(GIMP_API_VERSION).dll.a - -rm $(DESTDIR)$(libdir)/gimpbase.def - else -+libm = -lm - install-libtool-import-lib: - uninstall-libtool-import-lib: - endif -@@ -169,6 +170,7 @@ EXTRA_libgimpbase_@GIMP_API_VERSION@_la_DEPENDENCIES = $(gimpbase_def) - libgimpbase_@GIMP_API_VERSION@_la_LIBADD = \ - $(GIO_LIBS) \ - $(GEXIV2_LIBS) \ -+ $(libm) \ - $(ole32_lib) - - install-data-local: install-ms-lib install-libtool-import-lib diff --git a/media-gfx/gimp/gimp-2.9.6-r1.ebuild b/media-gfx/gimp/gimp-2.9.6-r1.ebuild deleted file mode 100644 index 50d6b26..0000000 --- a/media-gfx/gimp/gimp-2.9.6-r1.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python2_7 ) - -inherit versionator virtualx autotools eutils gnome2 multilib python-single-r1 - -DESCRIPTION="GNU Image Manipulation Program" -HOMEPAGE="https://www.gimp.org/" -SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2" -LICENSE="GPL-3 LGPL-3" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc64 ~x86" - -LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW" -IUSE="alsa aalib altivec aqua debug doc openexr gnome postscript jpeg2k cpu_flags_x86_mmx mng pdf python smp cpu_flags_x86_sse udev vector-icons webp wmf xpm" - -for lang in ${LANGS}; do - IUSE+=" linguas_${lang}" -done - -RDEPEND=">=dev-libs/glib-2.40.0:2 - >=dev-libs/atk-2.2.0 - >=x11-libs/gtk+-2.24.10:2 - dev-util/gtk-update-icon-cache - >=x11-libs/gdk-pixbuf-2.31:2 - >=x11-libs/cairo-1.12.2 - >=x11-libs/pango-1.29.4 - xpm? ( x11-libs/libXpm ) - >=media-libs/freetype-2.1.7 - >=media-libs/harfbuzz-0.9.19 - >=media-libs/gexiv2-0.10.6 - >=media-libs/libmypaint-1.3.0[gegl] - >=media-libs/fontconfig-2.2.0 - sys-libs/zlib - dev-libs/libxml2 - dev-libs/libxslt - x11-themes/hicolor-icon-theme - >=media-libs/babl-0.1.30 - >=media-libs/gegl-0.3.20:0.3[cairo] - >=dev-libs/glib-2.43 - aalib? ( media-libs/aalib ) - alsa? ( media-libs/alsa-lib ) - aqua? ( x11-libs/gtk-mac-integration ) - gnome? ( gnome-base/gvfs ) - virtual/jpeg:0 - jpeg2k? ( media-libs/jasper:= ) - >=media-libs/lcms-2.7:2 - mng? ( media-libs/libmng ) - openexr? ( >=media-libs/openexr-1.6.1 ) - pdf? ( >=app-text/poppler-0.44[cairo] >=app-text/poppler-data-0.4.7 ) - >=media-libs/libpng-1.6.25:0 - python? ( - ${PYTHON_DEPS} - >=dev-python/pygtk-2.10.4:2[${PYTHON_USEDEP}] - >=dev-python/pycairo-1.0.2[${PYTHON_USEDEP}] - ) - >=media-libs/tiff-3.5.7:0 - >=gnome-base/librsvg-2.40.6:2 - webp? ( >=media-libs/libwebp-0.6.0 ) - wmf? ( >=media-libs/libwmf-0.2.8 ) - net-libs/glib-networking[ssl] - x11-libs/libXcursor - sys-libs/zlib - app-arch/bzip2 - >=app-arch/xz-utils-5.0.0 - postscript? ( app-text/ghostscript-gpl ) - udev? ( virtual/libgudev:= )" -DEPEND="${RDEPEND} - sys-apps/findutils - virtual/pkgconfig - >=dev-util/intltool-0.40.1 - >=sys-devel/gettext-0.19 - doc? ( >=dev-util/gtk-doc-1 ) - >=sys-devel/libtool-2.2 - >=sys-devel/automake-1.11 - dev-util/gtk-doc-am" # due to our call to eautoreconf below (bug #386453) - -DOCS="AUTHORS ChangeLog* HACKING NEWS README*" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -pkg_setup() { - if use python; then - python-single-r1_pkg_setup - fi -} - -src_prepare() { - eapply "${FILESDIR}"/${P}-underlinking.patch # from 629304 - eapply_user - - sed -i -e 's/== "xquartz"/= "xquartz"/' configure.ac || die #494864 - sed 's:-DGIMP_DISABLE_DEPRECATED:-DGIMP_protect_DISABLE_DEPRECATED:g' -i configure.ac || die #615144 - eautoreconf # If you remove this: remove dev-util/gtk-doc-am from DEPEND, too - - gnome2_src_prepare - - sed 's:-DGIMP_protect_DISABLE_DEPRECATED:-DGIMP_DISABLE_DEPRECATED:g' -i configure || die #615144 - fgrep -q GIMP_DISABLE_DEPRECATED configure || die #615144, self-test -} - -src_configure() { - local myconf=( - GEGL=${EPREFIX}/usr/bin/gegl-0.3 - GDBUS_CODEGEN=${EPREFIX}/bin/false - - --enable-default-binary - --disable-silent-rules - - $(use_with !aqua x) - $(use_with aalib aa) - $(use_with alsa) - $(use_enable altivec) - --with-appdata-test - --without-webkit - $(use_with jpeg2k libjasper) - $(use_with postscript gs) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_with mng libmng) - $(use_with openexr) - $(use_with webp) - $(use_with pdf poppler) - $(use_enable python) - $(use_enable smp mp) - $(use_enable cpu_flags_x86_sse sse) - $(use_with udev gudev) - $(use_with wmf) - --with-xmc - $(use_with xpm libxpm) - $(use_enable vector-icons) - --without-xvfb-run - ) - - gnome2_src_configure "${myconf[@]}" -} - -src_compile() { - # Bugs #569738 and #591214 - local nv - for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do - # We do not check for existence as they may show up later - # https://bugs.gentoo.org/show_bug.cgi?id=569738#c21 - addwrite "${nv}" - done - addwrite /dev/dri/ # bug #574038 - addwrite /dev/ati/ # bug 589198 - addwrite /proc/mtrr # bug 589198 - - export XDG_DATA_DIRS=${EPREFIX}/usr/share # bug 587004 - gnome2_src_compile -} - -_clean_up_locales() { - einfo "Cleaning up locales..." - for lang in ${LANGS}; do - use "linguas_${lang}" && { - einfo "- keeping ${lang}" - continue - } - rm -Rf "${ED}"/usr/share/locale/"${lang}" || die - done -} - -src_test() { - virtx emake check -} - -src_install() { - gnome2_src_install - - if use python; then - python_optimize - fi - - # Workaround for bug #321111 to give GIMP the least - # precedence on PDF documents by default - mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die - - prune_libtool_files --all - - # Prevent dead symlink gimp-console.1 from downstream man page compression (bug #433527) - local gimp_app_version=$(get_version_component_range 1-2) - mv "${ED}"/usr/share/man/man1/gimp-console{-${gimp_app_version},}.1 || die - - _clean_up_locales -} - -pkg_postinst() { - gnome2_pkg_postinst -} - -pkg_postrm() { - gnome2_pkg_postrm -} diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml deleted file mode 100644 index 5bb4b5c..0000000 --- a/media-gfx/gimp/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - sping@gentoo.org - - - - Enable support for multiprocessors - - - Enable support for vector icons (experimental) - - - -- 2.11.4.GIT