The package rpms/gimp3.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/gimp3.git/commit/?id=846ec060eafb759....
Change: -%ifnarch %plain_lua_arches
Thanks.
Full change: ============
commit 846ec060eafb7591f3f25ff89050a85a1c666680 Author: Nils Philippsen nils@tiptoe.de Date: Sat Aug 24 17:42:46 2024 +0200
This version was moved into the gimp package.
diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 07fffdc..0000000 --- a/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -/gimp-2.99.18.tar.xz -/gimp-2.99.19-git256e0ca5a0.tar.xz -/gimp-2.99.19-gitd38362c9a0.tar.xz -/gimp-splash.png -/gimp-2.99.19-git5814d9ed30.tar.xz -/gimp-2.99.19-git4542c0156e.tar.xz diff --git a/README.md b/README.md deleted file mode 100644 index d8f351b..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# gimp3 - -The gimp3 package diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..71a7bfb --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +This version was moved into the gimp package. diff --git a/gimp-splash.sha256sum b/gimp-splash.sha256sum deleted file mode 100644 index 2d3910d..0000000 --- a/gimp-splash.sha256sum +++ /dev/null @@ -1 +0,0 @@ -90ac7f576388aeee0cff4c8f3c05a6b2ee89ffc1f82bd42208db9a5fadc138d3 gimp-data/images/gimp-splash.xcf.xz diff --git a/gimp3-2.99.19-cm-system-monitor-profile-by-default.patch b/gimp3-2.99.19-cm-system-monitor-profile-by-default.patch deleted file mode 100644 index 0e036f8..0000000 --- a/gimp3-2.99.19-cm-system-monitor-profile-by-default.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up gimp-2.99.18/etc/gimprc.in.cm-system-monitor-profile-by-default gimp-2.99.18/etc/gimprc.in ---- gimp-2.99.18/etc/gimprc.in.cm-system-monitor-profile-by-default 2024-02-17 18:01:20.000000000 +0100 -+++ gimp-2.99.18/etc/gimprc.in 2024-05-07 14:39:06.468575598 +0200 -@@ -316,9 +316,9 @@ - - # Defines the color management behavior. This is a parameter list. - # --# (color-management -+(color-management - # (mode display) --# (display-profile-from-gdk no) -+ (display-profile-from-gdk no) - # (display-rendering-intent relative-colorimetric) - # (display-use-black-point-compensation yes) - # (display-optimize yes) -@@ -326,7 +326,8 @@ - # (simulation-use-black-point-compensation no) - # (simulation-optimize yes) - # (simulation-gamut-check no) --# (out-of-gamut-color (color-rgb 1 0 1))) -+# (out-of-gamut-color (color-rgb 1 0 1)) -+) - - # Keep a permanent record of all opened and saved files in the Recent - # Documents list. Possible values are yes and no. diff --git a/gimp3-2.99.19-don-t-require-unreleased-gegl-version.patch b/gimp3-2.99.19-don-t-require-unreleased-gegl-version.patch deleted file mode 100644 index b8588b2..0000000 --- a/gimp3-2.99.19-don-t-require-unreleased-gegl-version.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/app/tools/gimpoperationtool.c b/app/tools/gimpoperationtool.c -index 82f6096b55..f427ee9019 100644 ---- a/app/tools/gimpoperationtool.c -+++ b/app/tools/gimpoperationtool.c -@@ -103,8 +103,7 @@ static void gimp_operation_tool_add_gui (GimpOperationTool *tool) - static AuxInput * gimp_operation_tool_aux_input_new (GimpOperationTool *tool, - GeglNode *operation, - const gchar *input_pad, -- const gchar *label, -- const gchar *description); -+ const gchar *label); - static void gimp_operation_tool_aux_input_detach(AuxInput *input); - static void gimp_operation_tool_aux_input_clear (AuxInput *input); - static void gimp_operation_tool_aux_input_free (AuxInput *input); -@@ -550,20 +549,15 @@ gimp_operation_tool_create_gui (GimpOperationTool *op_tool) - - g_return_if_fail (regex != NULL); - -- label = g_strdup (gegl_node_get_pad_label (filter_tool->operation, input_pads[i])); -- -- if (label == NULL) -- label = g_regex_replace (regex, -- input_pads[i], -1, 0, -- /* Translators: don't translate "Aux" */ -- _("Aux\1 Input"), -- 0, NULL); -+ /* Translators: don't translate "Aux" */ -+ label = g_regex_replace (regex, -+ input_pads[i], -1, 0, -+ _("Aux\1 Input"), -+ 0, NULL); - - input = gimp_operation_tool_aux_input_new (op_tool, - filter_tool->operation, -- input_pads[i], label, -- gegl_node_get_pad_description (filter_tool->operation, -- input_pads[i])); -+ input_pads[i], label); - - op_tool->aux_inputs = g_list_prepend (op_tool->aux_inputs, input); - -@@ -663,8 +657,7 @@ static AuxInput * - gimp_operation_tool_aux_input_new (GimpOperationTool *op_tool, - GeglNode *operation, - const gchar *input_pad, -- const gchar *label, -- const gchar *description) -+ const gchar *label) - { - AuxInput *input = g_slice_new (AuxInput); - GimpContext *context; -@@ -681,8 +674,6 @@ gimp_operation_tool_aux_input_new (GimpOperationTool *op_tool, - context = GIMP_CONTEXT (GIMP_TOOL_GET_OPTIONS (op_tool)); - - input->box = gimp_buffer_source_box_new (context, input->node, label); -- if (description) -- gtk_widget_set_tooltip_text (input->box, description); - - /* make AuxInput owner of the box */ - g_object_ref_sink (input->box); -diff --git a/app/sanity.c b/app/sanity.c -index 80f9537172..cc1c0c7bd8 100644 ---- a/app/sanity.c -+++ b/app/sanity.c -@@ -502,7 +502,7 @@ sanity_check_gegl (void) - - #define GEGL_REQUIRED_MAJOR 0 - #define GEGL_REQUIRED_MINOR 4 --#define GEGL_REQUIRED_MICRO 49 -+#define GEGL_REQUIRED_MICRO 48 - - gegl_get_version (&gegl_major_version, - &gegl_minor_version, -diff --git a/meson.build b/meson.build -index f120965244..2605b17649 100644 ---- a/meson.build -+++ b/meson.build -@@ -384,7 +384,7 @@ freetype2_minver = '2.1.7' - freetype2 = dependency('freetype2', version: '>='+freetype2_minver) - gdk_pixbuf_minver = '2.30.8' - gdk_pixbuf = dependency('gdk-pixbuf-2.0', version: '>='+gdk_pixbuf_minver) --gegl_minver = '0.4.49' -+gegl_minver = '0.4.48' - gegl = dependency('gegl-0.4', version: '>='+gegl_minver) - exiv2_minver = '0.27.4' - exiv2 = dependency('exiv2', version: '>='+exiv2_minver) diff --git a/gimp3-2.99.19-external-help-browser.patch b/gimp3-2.99.19-external-help-browser.patch deleted file mode 100644 index 44e3aab..0000000 --- a/gimp3-2.99.19-external-help-browser.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gimp-2.99.18/etc/gimprc.in.external-help-browser gimp-2.99.18/etc/gimprc.in ---- gimp-2.99.18/etc/gimprc.in.external-help-browser 2024-05-07 14:41:40.660506520 +0200 -+++ gimp-2.99.18/etc/gimprc.in 2024-05-07 14:46:04.028680986 +0200 -@@ -828,7 +828,7 @@ - # Sets the browser used by the help system. Possible values are gimp and - # web-browser. - # --# (help-browser gimp) -+(help-browser web-browser) - - # The maximum number of actions saved in history. This is an integer value. - # diff --git a/gimp3-2.99.19-label-overlay.patch b/gimp3-2.99.19-label-overlay.patch deleted file mode 100644 index 4d49ba1..0000000 --- a/gimp3-2.99.19-label-overlay.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up gimp-2.99.19/gimp-data/images/logo/gimp-logo.svg.label-overlay gimp-2.99.19/gimp-data/images/logo/gimp-logo.svg ---- gimp-2.99.19/gimp-data/images/logo/gimp-logo.svg.label-overlay 2024-08-06 19:32:11.000000000 +0200 -+++ gimp-2.99.19/gimp-data/images/logo/gimp-logo.svg 2024-08-14 13:39:56.812959763 +0200 -@@ -172,5 +172,16 @@ - clip-path="url(#clipPath382)" - transform="translate(-1192.0575,-531.63232)" /> - </g> -+ <text -+ xml:space="preserve" -+ style="font-style:normal;font-weight:normal;font-size:10.5833px;line-height:1.25;font-family:sans-serif;fill:#f2840d;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-opacity:1" -+ x="201.05113" -+ y="180.18008" -+ id="text1"><tspan -+ sodipodi:role="line" -+ id="tspan1" -+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.5833px;font-family:'Finale Broadway Text';-inkscape-font-specification:'Finale Broadway Text, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;fill:#f2840d;fill-opacity:1;stroke:#000000;stroke-width:0.264583;stroke-opacity:1" -+ x="201.05113" -+ y="180.18008">3</tspan></text> - </g> - </svg> diff --git a/gimp3-2.99.19-mark-versionized.patch b/gimp3-2.99.19-mark-versionized.patch deleted file mode 100644 index 0e78ea0..0000000 --- a/gimp3-2.99.19-mark-versionized.patch +++ /dev/null @@ -1,95 +0,0 @@ -diff -up gimp-2.99.19/desktop/gimp3.desktop.in.in.mark-versionized gimp-2.99.19/desktop/gimp3.desktop.in.in ---- gimp-2.99.19/desktop/gimp3.desktop.in.in.mark-versionized 2024-08-14 13:16:51.968793794 +0200 -+++ gimp-2.99.19/desktop/gimp3.desktop.in.in 2024-08-14 13:16:51.969793787 +0200 -@@ -1,14 +1,14 @@ - [Desktop Entry] - Version=1.0 - Type=Application --Name=GNU Image Manipulation Program -+Name=GNU Image Manipulation Program (Version 3) - GenericName=Image Editor - Comment=Create images and edit photographs - # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! - Keywords=GIMP;graphic;design;illustration;painting; - Exec=@GIMP_COMMAND@ %U - TryExec=gimp-@GIMP_APP_VERSION@ --Icon=gimp -+Icon=gimp3 - Terminal=false - Categories=Graphics;2DGraphics;RasterGraphics;GTK; - StartupNotify=true -diff -up gimp-2.99.19/gimp-data/images/logo/meson.build.mark-versionized gimp-2.99.19/gimp-data/images/logo/meson.build ---- gimp-2.99.19/gimp-data/images/logo/meson.build.mark-versionized 2024-08-06 19:32:11.000000000 +0200 -+++ gimp-2.99.19/gimp-data/images/logo/meson.build 2024-08-14 13:16:51.970793781 +0200 -@@ -73,12 +73,12 @@ foreach size : desktop_sizes - build_by_default: true, - install: false) - meson.add_install_script('sh', '-c', -- 'mkdir -p "$MESON_INSTALL_DESTDIR_PREFIX/@1@/" && cp -f "@0@" "$MESON_INSTALL_DESTDIR_PREFIX/@1@/gimp.png"'.format(app_icon.full_path(), installdir)) -+ 'mkdir -p "$MESON_INSTALL_DESTDIR_PREFIX/@1@/" && cp -f "@0@" "$MESON_INSTALL_DESTDIR_PREFIX/@1@/gimp3.png"'.format(app_icon.full_path(), installdir)) - endforeach - - install_data('gimp-logo.svg', - install_dir: get_option('datadir') / 'icons' / 'hicolor' / 'scalable' / 'apps', -- rename: 'gimp.svg') -+ rename: 'gimp3.svg') - - - ################################################################################ -diff -up gimp-2.99.19/libgimpwidgets/gimpwidgets-private.c.mark-versionized gimp-2.99.19/libgimpwidgets/gimpwidgets-private.c ---- gimp-2.99.19/libgimpwidgets/gimpwidgets-private.c.mark-versionized 2024-08-14 10:06:02.000000000 +0200 -+++ gimp-2.99.19/libgimpwidgets/gimpwidgets-private.c 2024-08-14 13:16:51.970793781 +0200 -@@ -110,7 +110,7 @@ gimp_widgets_init (GimpHelpFunc - * then the application icon is dependant to the theme and for now at - * least, we want the installed icon. - */ -- path = g_build_filename (base_dir, "16x16", cat_dir, "gimp.png", NULL); -+ path = g_build_filename (base_dir, "16x16", cat_dir, "gimp3.png", NULL); - pixbuf = gdk_pixbuf_new_from_file (path, &error); - if (pixbuf) - icons = g_list_prepend (icons, pixbuf); -@@ -119,7 +119,7 @@ gimp_widgets_init (GimpHelpFunc - g_clear_error (&error); - g_free (path); - -- path = g_build_filename (base_dir, "32x32", cat_dir, "gimp.png", NULL); -+ path = g_build_filename (base_dir, "32x32", cat_dir, "gimp3.png", NULL); - pixbuf = gdk_pixbuf_new_from_file (path, &error); - if (pixbuf) - icons = g_list_prepend (icons, pixbuf); -@@ -128,7 +128,7 @@ gimp_widgets_init (GimpHelpFunc - g_clear_error (&error); - g_free (path); - -- path = g_build_filename (base_dir, "48x48", cat_dir, "gimp.png", NULL); -+ path = g_build_filename (base_dir, "48x48", cat_dir, "gimp3.png", NULL); - pixbuf = gdk_pixbuf_new_from_file (path, &error); - if (pixbuf) - icons = g_list_prepend (icons, pixbuf); -@@ -137,7 +137,7 @@ gimp_widgets_init (GimpHelpFunc - g_clear_error (&error); - g_free (path); - -- path = g_build_filename (base_dir, "64x64", cat_dir, "gimp.png", NULL); -+ path = g_build_filename (base_dir, "64x64", cat_dir, "gimp3.png", NULL); - pixbuf = gdk_pixbuf_new_from_file (path, &error); - if (pixbuf) - icons = g_list_prepend (icons, pixbuf); -@@ -146,7 +146,7 @@ gimp_widgets_init (GimpHelpFunc - g_clear_error (&error); - g_free (path); - -- path = g_build_filename (base_dir, "scalable", cat_dir, "gimp.svg", NULL); -+ path = g_build_filename (base_dir, "scalable", cat_dir, "gimp3.svg", NULL); - pixbuf = gdk_pixbuf_new_from_file_at_size (path, 128, 128, &error); - if (pixbuf) - { -@@ -179,7 +179,7 @@ gimp_widgets_init (GimpHelpFunc - } - g_free (path); - -- path = g_build_filename (base_dir, "256x256", cat_dir, "gimp.png", NULL); -+ path = g_build_filename (base_dir, "256x256", cat_dir, "gimp3.png", NULL); - pixbuf = gdk_pixbuf_new_from_file (path, &error); - if (pixbuf) - icons = g_list_prepend (icons, pixbuf); diff --git a/gimp3-2.99.19-no-phone-home-default.patch b/gimp3-2.99.19-no-phone-home-default.patch deleted file mode 100644 index a537498..0000000 --- a/gimp3-2.99.19-no-phone-home-default.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up gimp-2.99.18/etc/gimprc.in.no-phone-home-default gimp-2.99.18/etc/gimprc.in ---- gimp-2.99.18/etc/gimprc.in.no-phone-home-default 2024-05-07 14:40:02.746185394 +0200 -+++ gimp-2.99.18/etc/gimprc.in 2024-05-07 14:40:49.353862228 +0200 -@@ -399,7 +399,7 @@ - # Check for availability of GIMP updates through background internet queries. - # Possible values are yes and no. - # --# (check-updates yes) -+(check-updates no) - - # Timestamp of the last update check. This is an integer value. - # diff --git a/gimp3-2.99.19-parallel-compat.patch b/gimp3-2.99.19-parallel-compat.patch deleted file mode 100644 index bd47a52..0000000 --- a/gimp3-2.99.19-parallel-compat.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -up gimp-2.99.19/desktop/gimp3.desktop.in.in.parallel-compat gimp-2.99.19/desktop/gimp3.desktop.in.in ---- gimp-2.99.19/desktop/gimp3.desktop.in.in.parallel-compat 2024-08-14 12:57:43.409261747 +0200 -+++ gimp-2.99.19/desktop/gimp3.desktop.in.in 2024-08-14 12:57:43.409261747 +0200 -@@ -0,0 +1,16 @@ -+[Desktop Entry] -+Version=1.0 -+Type=Application -+Name=GNU Image Manipulation Program -+GenericName=Image Editor -+Comment=Create images and edit photographs -+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! -+Keywords=GIMP;graphic;design;illustration;painting; -+Exec=@GIMP_COMMAND@ %U -+TryExec=gimp-@GIMP_APP_VERSION@ -+Icon=gimp -+Terminal=false -+Categories=Graphics;2DGraphics;RasterGraphics;GTK; -+StartupNotify=true -+MimeType=@MIME_TYPES@ -+StartupWMClass=gimp-@GIMP_APP_VERSION@ -diff -up gimp-2.99.19/desktop/gimp.desktop.in.in.parallel-compat gimp-2.99.19/desktop/gimp.desktop.in.in ---- gimp-2.99.19/desktop/gimp.desktop.in.in.parallel-compat 2024-08-14 10:06:02.000000000 +0200 -+++ gimp-2.99.19/desktop/gimp.desktop.in.in 2024-08-14 12:57:43.409261747 +0200 -@@ -1,16 +0,0 @@ --[Desktop Entry] --Version=1.0 --Type=Application --Name=GNU Image Manipulation Program --GenericName=Image Editor --Comment=Create images and edit photographs --# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! --Keywords=GIMP;graphic;design;illustration;painting; --Exec=@GIMP_COMMAND@ %U --TryExec=gimp-@GIMP_APP_VERSION@ --Icon=gimp --Terminal=false --Categories=Graphics;2DGraphics;RasterGraphics;GTK; --StartupNotify=true --MimeType=@MIME_TYPES@ --StartupWMClass=gimp-@GIMP_APP_VERSION@ -diff -up gimp-2.99.19/desktop/meson.build.parallel-compat gimp-2.99.19/desktop/meson.build ---- gimp-2.99.19/desktop/meson.build.parallel-compat 2024-08-14 12:57:43.410261740 +0200 -+++ gimp-2.99.19/desktop/meson.build 2024-08-14 12:59:34.055544409 +0200 -@@ -1,4 +1,4 @@ --desktopfilename = 'gimp.desktop' -+desktopfilename = 'gimp3.desktop' - - desktop_conf = configuration_data() - desktop_conf.set('GIMP_COMMAND', gimp_command) diff --git a/gimp3.spec b/gimp3.spec deleted file mode 100644 index 51f1b16..0000000 --- a/gimp3.spec +++ /dev/null @@ -1,606 +0,0 @@ -#### options: -# Use the following --with/--without <option> switches to control how the -# package will be built: - -# is_default_version: This is the default GIMP version in a Fedora release -# label_overlay: Put version label in app icons -%if ! 0%{?fedora} || 0%{?fedora} >= 42 -%bcond is_default_version 1 -%bcond label_overlay 0 -%else -%bcond is_default_version 0 -%bcond label_overlay 1 -%endif - -# libunwind support (only available on some architectures) -%if ! 0%{?fedora}%{?rhel} || 0%{?fedora} >= 40 || 0%{?rhel} >= 11 -%global unwind_arches %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64 riscv64 -%else -%global unwind_arches %{arm} aarch64 hppa ia64 mips ppc %{power64} s390x %{ix86} x86_64 -%endif - -%ifarch %unwind_arches -%bcond libunwind 1 -%else -%bcond libunwind 0 -%endif - -%ifnarch s390x -%bcond tests 1 -%bcond prebuilt_splash 0 -%else -# Tests hang on s390x, skip them. -%bcond tests 0 -%bcond prebuilt_splash 1 -%endif - -# When building in Koji or mock, networking isn’t available. -%bcond skip_networking_tests 1 -# Some tests fail under normal user environments, don’t skip them by default. -%bcond skip_user_tests 0 - -# The lists of tests to skip should not have leading or trailing white space, -# this breaks the logic in %%check. - -# tests known to fail if networking isn’t available -%global skip_tests_networking gimp:desktop / appdata_file - -# tests known to fail in a normal user environment -%global skip_tests_user gimp:app / save-and-export\ -gimp:app / single-window-mode\ -gimp:app / ui - -# luajit isn’t available on all arches -%global plain_lua_arches riscv64 ppc64 ppc64le - -%global prerelease 1 - -Summary: GNU Image Manipulation Program -Name: gimp3 -Version: 2.99.19^20240822git4542c0156e -Release: %autorelease - -# Compute some version related macros. - -# In the case of a snapshot version (e.g. "Version: 2.99.19^20240814git256e0ca5a0"), this computes -# the "plain" version (as defined in upstream sources), %%snapshot and %%git_rev macros. In the case -# of a normal release, %%plain_version will be the same as %%version. -%global plain_version %{lua: - local plain_version = (string.gsub(macros.version, '^(.*)[%^~].*$', '%1')) - print(plain_version) - if plain_version ~= macros.version then - macros.snapshot = (string.gsub(macros.version, '^.*[%^~](.*)$', '%1')) - macros.git_rev = (string.gsub(macros.snapshot, '^.*git(.*)$', '%1')) - end -} -%global major %{lua: - print((string.gsub(macros.plain_version, '^(%d+)%..*$', '%1'))) -} -%global minor %{lua: - print((string.gsub(macros.plain_version, '^%d+%.(%d+)%..*$', '%1'))) -} -%global micro %{lua: - print((string.gsub(macros.plain_version, '^%d+%.%d+%.(%d+).*$', '%1'))) -} -%global bin_version %{major}.%{minor} -%global interface_age 0 -%if %prerelease -%global gettext_version 30 -%global api_version 3.0 -%global lib_api_version 3.0 -%else -%global gettext_version %{major}0 -%global api_version %{major}.0 -%global lib_api_version %{major}.0 -%endif -%global lib_minor %{lua: print(tonumber(macros.minor) * 100)} -%global lib_micro %micro - -# gimp core app is GPL-3.0-or-later, libgimp and other libraries are LGPL-3.0-or-later -# plugin file-dds is GPL-2.0-or-later and plugins script-fu/libscriptfu/{ftx,tinyscheme} -# are BSD-3-Clause, icon themes are CC-BY-SA-{3.0,4.0}, data files such as brushes and -# patterns are CC0-1.0 -License: LGPL-3.0-or-later AND GPL-2.0-or-later AND GPL-3.0-or-later AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-SA-4.0 AND CC0-1.0 -URL: https://www.gimp.org -%if %{with label_overlay} -BuildRequires: ImageMagick -%endif -BuildRequires: aalib-devel -BuildRequires: appdata-tools -BuildRequires: appstream -BuildRequires: coreutils -BuildRequires: dbus-daemon -BuildRequires: desktop-file-utils -BuildRequires: gcc -BuildRequires: gegl04-tools -BuildRequires: gettext >= 0.19.8 -BuildRequires: gi-docgen -BuildRequires: gjs -BuildRequires: glib-networking -BuildRequires: libgs-devel -BuildRequires: libxml2 -BuildRequires: libxslt -%ifnarch %plain_lua_arches -BuildRequires: lua-lgi-compat -BuildRequires: luajit -%else -BuildRequires: lua >= 5.4 -BuildRequires: lua-lgi -%endif -BuildRequires: meson -BuildRequires: perl >= 5.10.0 -BuildRequires: pkgconfig(alsa) >= 1.0.0 -BuildRequires: pkgconfig(appstream-glib) >= 0.7.7 -BuildRequires: pkgconfig(atk) >= 2.4.0 -BuildRequires: pkgconfig(babl-0.1) >= 0.1.108 -BuildRequires: pkgconfig(bzip2) -BuildRequires: pkgconfig(cairo) >= 1.14.0 -BuildRequires: pkgconfig(cairo-pdf) >= 1.12.2 -BuildRequires: pkgconfig(cfitsio) -BuildRequires: pkgconfig(fontconfig) >= 2.12.4 -BuildRequires: pkgconfig(freetype2) >= 2.1.7 -BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.30.8 -BuildRequires: pkgconfig(gegl-0.4) >= 0.4.48 -BuildRequires: pkgconfig(gexiv2) >= 0.14.0 -BuildRequires: pkgconfig(gio-2.0) -BuildRequires: pkgconfig(gio-unix-2.0) -BuildRequires: pkgconfig(glib-2.0) >= 2.70.0 -BuildRequires: pkgconfig(gmodule-no-export-2.0) -BuildRequires: pkgconfig(gobject-2.0) >= 2.70.0 -BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.24.0 -BuildRequires: pkgconfig(gudev-1.0) >= 167 -BuildRequires: pkgconfig(harfbuzz) >= 2.8.2 -BuildRequires: pkgconfig(iso-codes) -BuildRequires: pkgconfig(json-glib-1.0) >= 1.2.6 -BuildRequires: pkgconfig(lcms2) >= 2.8 -BuildRequires: pkgconfig(libheif) >= 1.15.1 -BuildRequires: pkgconfig(libjpeg) -BuildRequires: pkgconfig(libjxl) >= 0.7.0 -BuildRequires: pkgconfig(libjxl_threads) >= 0.7.0 -BuildRequires: pkgconfig(liblzma) >= 5.0.0 -BuildRequires: pkgconfig(libmng) -BuildRequires: pkgconfig(libmypaint) >= 1.3.0 -BuildRequires: pkgconfig(libopenjp2) >= 2.1.0 -BuildRequires: pkgconfig(libpng) >= 1.6.25 -BuildRequires: pkgconfig(librsvg-2.0) >= 2.40.6 -BuildRequires: pkgconfig(libtiff-4) >= 4.0.0 -%if %{with libunwind} -BuildRequires: pkgconfig(libunwind) >= 1.1.0 -%endif -BuildRequires: pkgconfig(libwebp) >= 0.6.0 -BuildRequires: pkgconfig(libwebpdemux) >= 0.6.0 -BuildRequires: pkgconfig(libwebpmux) >= 0.6.0 -BuildRequires: pkgconfig(libwmf) >= 0.2.8 -BuildRequires: pkgconfig(mypaint-brushes-1.0) >= 1.3.0 -BuildRequires: pkgconfig(OpenEXR) >= 1.6.1 -BuildRequires: pkgconfig(pango) >= 1.50.0 -BuildRequires: pkgconfig(pangocairo) >= 1.50.0 -BuildRequires: pkgconfig(pangoft2) >= 1.50.0 -BuildRequires: pkgconfig(poppler-data) >= 0.4.9 -BuildRequires: pkgconfig(poppler-glib) >= 0.69.0 -BuildRequires: pkgconfig(python3) >= 3.6.0 -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xfixes) -BuildRequires: pkgconfig(xmu) -BuildRequires: pkgconfig(xpm) -BuildRequires: pkgconfig(zlib) -BuildRequires: python3dist(pygobject) >= 3.0 -BuildRequires: vala -BuildRequires: xorg-x11-server-Xvfb - -Requires: gjs -Requires: hicolor-icon-theme -%ifnarch %plain_lua_arches -Requires: lua-lgi-compat -Requires: luajit -%else -Requires: lua >= 5.4 -Requires: lua-lgi -%endif -Requires: xdg-utils -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: python3dist(pygobject) >= 3.0 - -Recommends: mypaint-brushes - -Obsoletes: %{name}-help-browser < %{version}-%{release} -Conflicts: %{name}-help-browser < %{version}-%{release} - -%if ! %defined snapshot -Source0: https://download.gimp.org/pub/gimp/v%%7Bbin_version%7D/gimp-%%7Bversion%7D.t... -%else -# Tarball built from git snapshot with `meson dist` and renamed accordingly -Source0: gimp-%{plain_version}-git%{git_rev}.tar.xz -%endif - -# Building this from source hangs on s390x 😢. Building on any other arch will convert -# gimp-data/images/gimp-splash.xcf.xz just fine. -Source1: gimp-splash.png -Source2: gimp-splash.sha256sum - -# Fedora specific patches: - -# Try using the system monitor profile for color management by default. -Patch1: gimp3-2.99.19-cm-system-monitor-profile-by-default.patch - -# don't phone home to check for updates by default -Patch2: gimp3-2.99.19-no-phone-home-default.patch - -# use external help browser directly if help browser plug-in is not built -Patch3: gimp3-2.99.19-external-help-browser.patch - -# versionize desktop file to enable parallel install -Patch4: gimp3-2.99.19-parallel-compat.patch - -# versionize app name and icon files, this is only for when this version is not the default -Patch5: gimp3-2.99.19-mark-versionized.patch - -# overlay a "3" on top of the app icon -Patch6: gimp3-2.99.19-label-overlay.patch - -# Don’t require an unreleased gegl version -Patch7: gimp3-2.99.19-don-t-require-unreleased-gegl-version.patch - -%description -GIMP (GNU Image Manipulation Program) is a powerful image composition and -editing program, which can be extremely useful for creating logos and other -graphics for web pages. GIMP has many of the tools and filters you would expect -to find in similar commercial offerings, and some interesting extras as well. -GIMP provides a large image manipulation toolbox, including channel operations -and layers, effects, sub-pixel imaging and anti-aliasing, and conversions, all -with multi-level undo. - -%package libs -Summary: GIMP libraries -License: LGPL-3.0-or-later - -%description libs -The %{name}-libs package contains shared libraries needed for the GNU Image -Manipulation Program (GIMP). - -%package devel -Summary: GIMP plugin and extension development kit -License: LGPL-3.0-or-later -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: %{name}-devel-tools = %{version}-%{release} - -%description devel -The %{name}-devel package contains the files needed for writing GNU Image -Manipulation Program (GIMP) plug-ins and extensions. - -%package devel-tools -Summary: GIMP plugin and extension development tools -License: LGPL-3.0-or-later -Requires: %{name}-devel = %{version}-%{release} - -%description devel-tools -The %{name}-devel-tools package contains gimptool, a helper program to -build GNU Image Manipulation Program (GIMP) plug-ins and extensions. - -%prep -cat << EOF ---- 8< --- Build options --------------------------------------------------- -is default version: %{with is_default_version} -label overlay: %{with label_overlay} -tests: %{with tests} -prebuilt splash: %{with prebuilt_splash} -%if %defined snapshot -snapshot: %{snapshot} -plain_version: %{plain_version} -git_rev: %{git_rev} -%endif ---- >8 --------------------------------------------------------------------- -EOF - -%setup -q -n gimp-%{plain_version} - -%patch 1 -p1 -b .cm-system-monitor-profile-by-default -%patch 2 -p1 -b .no-phone-home-default -%patch 3 -p1 -b .external-help-browser -%patch 4 -p1 -b .parallel-compat -%if %{without is_default_version} -%patch 5 -p1 -b .mark-versionized -%endif -%if %{with label_overlay} -%patch 6 -p1 -b .label-overlay -%endif -%patch 7 -p1 -b .don-t-require-unreleased-gegl-version - -# Verify the splash file source hasn’t changed -sha256sum -c %{SOURCE2} - -%build -# Use hardening compiler/linker flags because gimp is likely to deal with files -# coming from untrusted sources -%global _hardened_build 1 - -%meson \ -%if %{with is_default_version} - -Denable-default-bin=enabled \ -%else - -Denable-default-bin=disabled \ -%endif - -Dilbm=disabled \ - -Dbug-report-url="https://bugzilla.redhat.com/" - -%if %{with prebuilt_splash} -# Building this from source hangs on s390x 😢, so prevent attempting to build it … -sed -i -e '/^subdir/!s/^/# /g' gimp-data/images/meson.build -%endif - -%meson_build - -%install -%meson_install - -%if %{with prebuilt_splash} -# … instead, copy the prebuilt file into place. -install -m 644 %{SOURCE1} %{buildroot}%{_datadir}/gimp/%{api_version}/images/gimp-splash.png -%endif - -# Generate RPM macros from pkg-config data: -# %%_gimp_datadir -- toplevel directory for brushes, gradients, scripts, ... -# %%_gimp_libdir -- toplevel directory for modules, plug-ins, ... -# %%_gimp_sysconfdir -- system-wide runtime configuration -# %%_gimp_localedir -- toplevel directory for translation files -# %%_gimp_scriptdir -- script-fu scripts directory -# %%_gimp_plugindir -- plug-in directory -gimp_pc_extract_normalize() { - PKG_CONFIG_PATH="%{buildroot}%{_libdir}/pkgconfig" \ - pkg-config --variable="$1" gimp-%{lib_api_version} | \ - sed \ - -e 's|^%_mandir|%%{_mandir}|' \ - -e 's|^%_infodir|%%{_infodir}|' \ - -e 's|^%_includedir|%%{_includedir}|' \ - -e 's|^%_libdir|%%{_libdir}|' \ - -e 's|^%_localstatedir|%%{_localstatedir}|' \ - -e 's|^%_sharedstatedir|%%{_sharedstatedir}|' \ - -e 's|^%_sysconfdir|%%{_sysconfdir}|' \ - -e 's|^%_datadir|%%{_datadir}|' \ - -e 's|^%_libexecdir|%%{_libexecdir}|' \ - -e 's|^%_sbindir|%%{_sbindir}|' \ - -e 's|^%_bindir|%%{_bindir}|' \ - -e 's|^%_exec_prefix|%%{_exec_prefix}|' \ - -e 's|^%_prefix|%%{_prefix}|' -} - -_gimp3_datadir="$(gimp_pc_extract_normalize gimpdatadir)" -_gimp3_libdir="$(gimp_pc_extract_normalize gimplibdir)" -_gimp3_sysconfdir="$(gimp_pc_extract_normalize gimpsysconfdir)" -_gimp3_localedir="$(gimp_pc_extract_normalize gimplocaledir)" -_gimp3_scriptdir="${_gimp_datadir}/scripts" -_gimp3_plugindir="${_gimp_libdir}/plug-ins" - -cat << EOF > macros.gimp3 -# RPM macros for GIMP - -%%_gimp3_datadir ${_gimp3_datadir} -%%_gimp3_libdir ${_gimp3_libdir} -%%_gimp3_sysconfdir ${_gimp3_sysconfdir} -%%_gimp3_localedir ${_gimp3_localedir} -%%_gimp3_scriptdir ${_gimp3_scriptdir} -%%_gimp3_plugindir ${_gimp3_plugindir} -EOF - -install -D -m0644 macros.gimp3 %{buildroot}%{_rpmconfigdir}/macros.d/macros.gimp3 - -echo "%{__python3}=%{__python3}" >> %{buildroot}%{_libdir}/gimp/%{api_version}/interpreters/pygimp.interp - -# -# Plugins and modules change often (grab the executeable ones) -# -find %{buildroot}%{_libdir}/gimp/%{api_version} -type f | sed "s@^%{buildroot}@@g" | grep -v '.a$' > gimp-plugin-files -find %{buildroot}%{_libdir}/gimp/%{api_version}/* -type d | sed "s@^%{buildroot}@%%dir @g" >> gimp-plugin-files - -grep '.py$' gimp-plugin-files | \ - sed 's+/[^/]*.py$+/__pycache__+g' | \ - sort -u > gimp-plugin-files-pycache - -cat gimp-plugin-files-pycache >> gimp-plugin-files - -%py_byte_compile %{__python3} %{buildroot}%{_libdir}/gimp/%{api_version} - -# -# Auto detect the lang files. -# -%find_lang gimp%{gettext_version} -%find_lang gimp%{gettext_version}-std-plug-ins -%find_lang gimp%{gettext_version}-script-fu -%find_lang gimp%{gettext_version}-libgimp -%find_lang gimp%{gettext_version}-python - -cat gimp%{gettext_version}.lang gimp%{gettext_version}-std-plug-ins.lang gimp%{gettext_version}-script-fu.lang gimp%{gettext_version}-libgimp.lang gimp%{gettext_version}-python.lang > gimp-all.lang - -# -# Build the master filelists generated from the above mess. -# -cat gimp-plugin-files gimp-all.lang > gimp.files - -%if %{with is_default_version} -# install default binary symlinks -ln -snf gimp-%{bin_version} %{buildroot}%{_bindir}/gimp -ln -snf gimp-%{bin_version}.1 %{buildroot}%{_mandir}/man1/gimp.1 -ln -snf gimp-console-%{bin_version} %{buildroot}/%{_bindir}/gimp-console -ln -snf gimp-console-%{bin_version}.1 %{buildroot}/%{_mandir}/man1/gimp-console.1 -ln -snf gimptool-%{bin_version} %{buildroot}%{_bindir}/gimptool -ln -snf gimptool-%{bin_version}.1 %{buildroot}%{_mandir}/man1/gimptool.1 -ln -snf gimprc-%{bin_version}.5 %{buildroot}/%{_mandir}/man5/gimprc.5 -%endif - -# Hardcode python interpreter in shipped python plug-ins. This actually has no -# effect because gimp maps hashbangs with and without the /usr/bin/env detour -# to the system python interpreter, but this will avoid false alarms. -grep -E -rl '^#!\s*/usr/bin/env\s+python' --include=*.py "%{buildroot}" | - while read file; do - sed -r '1s,^#!\s*/usr/bin/env\s+python$,#!%{__python3},' -i "$file" - sed -r '1s,^#!\s*/usr/bin/env\s+python3$,#!%{__python3},' -i "$file" - done - -rm -rf devel-docs/gimp-%{bin_version} -mv %{buildroot}%{_docdir}/gimp-%{bin_version} devel-docs -rm -r %{buildroot}%{_datadir}/gimp/%{api_version}/tests - -%if %{without is_default_version} -rm -rf %{buildroot}%{_datadir}/metainfo -%endif - -%if %{with tests} -%check -# Some tests in the gimp:app suite are known to fail when run in a normal desktop environment, but -# they work in isolated builds (mock, koji): save-and-export, single-window-mode, ui - -# skip tests known to fail -skip_tests="" - -%if %{with skip_networking_tests} -skip_tests="$skip_tests -%skip_tests_networking" -%endif - -%if %{with skip_user_tests} -skip_tests="$skip_tests -%skip_tests_user" -%endif - -all_tests="$(%meson_test --list 2>/dev/null)" -suites="$(echo "$all_tests" | while read suite ignore; do echo "${suite%+*}"; done | sort -u)" -for suite in $suites; do - suite_tests="$( - echo "$all_tests" | grep "^$suite /" | while read ignore ignore test; do - if ! echo "$skip_tests" | grep -qFx "$suite / $test"; then echo "$test"; fi - done - )" - if [ -n "$suite_tests" ]; then - %meson_test --suite "$suite" $suite_tests - fi -done -%endif - -%ldconfig_scriptlets libs - -%files -f gimp.files -%license LICENSE COPYING -%doc AUTHORS NEWS README -%doc docs/*.xcf* -%{_datadir}/applications/*.desktop -%if %{with is_default_version} -%{_datadir}/metainfo/*.appdata.xml -%endif - -%dir %{_datadir}/gimp -%dir %{_datadir}/gimp/%{api_version} -%{_datadir}/gimp/%{api_version}/dynamics/ -%{_datadir}/gimp/%{api_version}/file-raw/ -%{_datadir}/gimp/%{api_version}/menus/ -%{_datadir}/gimp/%{api_version}/tags/ -%{_datadir}/gimp/%{api_version}/tips/ -%{_datadir}/gimp/%{api_version}/tool-presets/ -%dir %{_libdir}/gimp -%dir %{_libdir}/gimp/%{api_version} - -%{_datadir}/gimp/%{api_version}/brushes/ -%{_datadir}/gimp/%{api_version}/fractalexplorer/ -%{_datadir}/gimp/%{api_version}/gfig/ -%{_datadir}/gimp/%{api_version}/gflare/ -%{_datadir}/gimp/%{api_version}/gimpressionist/ -%{_datadir}/gimp/%{api_version}/gradients/ -%{_datadir}/gimp/%{api_version}/icons/ -%{_datadir}/gimp/%{api_version}/images/ -%{_datadir}/gimp/%{api_version}/palettes/ -%{_datadir}/gimp/%{api_version}/patterns/ -%{_datadir}/gimp/%{api_version}/scripts/ -%{_datadir}/gimp/%{api_version}/themes/ -%{_datadir}/gimp/%{api_version}/gimp-release - -%dir %{_sysconfdir}/gimp -%dir %{_sysconfdir}/gimp/%{api_version} -%config(noreplace) %{_sysconfdir}/gimp/%{api_version}/controllerrc -%config(noreplace) %{_sysconfdir}/gimp/%{api_version}/gimp.css -%config(noreplace) %{_sysconfdir}/gimp/%{api_version}/gimprc -%config(noreplace) %{_sysconfdir}/gimp/%{api_version}/unitrc -%config(noreplace) %{_sysconfdir}/gimp/%{api_version}/sessionrc -%config(noreplace) %{_sysconfdir}/gimp/%{api_version}/templaterc -%config(noreplace) %{_sysconfdir}/gimp/%{api_version}/toolrc - -%{_bindir}/gimp-%{bin_version} -%{_bindir}/gimp-console-%{bin_version} -%{_bindir}/gimp-script-fu-interpreter-%{lib_api_version} - -%if %{with is_default_version} -%{_bindir}/gimp -%{_bindir}/gimp-console -%endif - -%{_bindir}/gimp-test-clipboard-%{bin_version} -%{_libexecdir}/gimp-debug-tool-%{bin_version} - -%if %{with is_default_version} -%{_bindir}/gimp-test-clipboard -%{_libexecdir}/gimp-debug-tool -%endif - -%{_mandir}/man1/gimp-%{bin_version}.1* -%{_mandir}/man1/gimp-console-%{bin_version}.1* -%{_mandir}/man5/gimprc-%{bin_version}.5* - -%if %{with is_default_version} -%{_mandir}/man1/gimp.1* -%{_mandir}/man1/gimp-console.1* -%{_mandir}/man5/gimprc.5* -%endif - -%{_datadir}/icons/hicolor/*/apps/gimp* - -%files libs -%license LICENSE COPYING -%doc AUTHORS NEWS README -%{_libdir}/libgimp-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro} -%{_libdir}/libgimp-%{lib_api_version}.so.%{interface_age} -%{_libdir}/libgimp-scriptfu-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro} -%{_libdir}/libgimp-scriptfu-%{lib_api_version}.so.%{interface_age} -%{_libdir}/libgimpbase-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro} -%{_libdir}/libgimpbase-%{lib_api_version}.so.%{interface_age} -%{_libdir}/libgimpcolor-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro} -%{_libdir}/libgimpcolor-%{lib_api_version}.so.%{interface_age} -%{_libdir}/libgimpconfig-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro} -%{_libdir}/libgimpconfig-%{lib_api_version}.so.%{interface_age} -%{_libdir}/libgimpmath-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro} -%{_libdir}/libgimpmath-%{lib_api_version}.so.%{interface_age} -%{_libdir}/libgimpmodule-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro} -%{_libdir}/libgimpmodule-%{lib_api_version}.so.%{interface_age} -%{_libdir}/libgimpthumb-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro} -%{_libdir}/libgimpthumb-%{lib_api_version}.so.%{interface_age} -%{_libdir}/libgimpui-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro} -%{_libdir}/libgimpui-%{lib_api_version}.so.%{interface_age} -%{_libdir}/libgimpwidgets-%{lib_api_version}.so.%{interface_age}.%{lib_minor}.%{lib_micro} -%{_libdir}/libgimpwidgets-%{lib_api_version}.so.%{interface_age} -%dir %{_libdir}/girepository-1.0 -%{_libdir}/girepository-1.0/*.typelib - -%files devel -%doc README.i18n -%doc devel-docs/* - -%{_libdir}/*.so -%{_includedir}/gimp-%{lib_api_version} -%{_libdir}/pkgconfig/* -%{_rpmconfigdir}/macros.d/macros.gimp3 -%dir %{_datadir}/gir-1.0 -%{_datadir}/gir-1.0/Gimp*.gir -%dir %{_datadir}/vala -%dir %{_datadir}/vala/vapi -%{_datadir}/vala/vapi/gimp*.deps -%{_datadir}/vala/vapi/gimp*.vapi - -%files devel-tools -%{_bindir}/gimptool-%{bin_version} -%{_mandir}/man1/gimptool-%{bin_version}.1* - -%if %{with is_default_version} -%{_bindir}/gimptool -%{_mandir}/man1/gimptool.1* -%endif - -%changelog -%autochangelog diff --git a/sources b/sources deleted file mode 100644 index d9c56f5..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -SHA512 (gimp-2.99.19-git4542c0156e.tar.xz) = 583cf4cb8150106e4f16c7ba778a17aca872610b1486d06059b1e20543293a82752fe351a069c3bad77e26a20a174327b66eb5fe92a7a6e64ad08e9879cd10ec -SHA512 (gimp-splash.png) = e4443fa1c4eaf50ce4a89681d436d9c23ccae7e3a6cac1e853bba05d851c815c59c53d52c9f3e159460d52e03b492cc48f366f6e194b7ca8c740692eb0c2d963
arch-excludes@lists.fedoraproject.org
-
githook-noreply＠fedoraproject.org