public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Yaakov Selkowitz <yselkowi@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/gimp] rawhide: Disable some features on RHEL
Date: Thu, 03 Sep 2026 20:17:41 GMT	[thread overview]
Message-ID: <178846666173.1.16209732297025347098.rpms-gimp-2b4b5870d37e@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/gimp
            Branch : rawhide
            Commit : 2b4b5870d37e84453d3a562320097bbdb31645db
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2026-08-17T16:55:10-04:00
            Stats  : +34/-0 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/gimp/c/2b4b5870d37e84453d3a562320097bbdb31645db?branch=rawhide

            Log:
            Disable some features on RHEL

When built on RHEL outside of EPEL, some dependencies are not available,
and xvfb-run is not available at all for RHEL 10.

---
diff --git a/gimp.spec b/gimp.spec
index b1bf0f1..9789bc4 100644
--- a/gimp.spec
+++ b/gimp.spec
@@ -25,6 +25,16 @@
 %bcond libunwind 0
 %endif
 
+%if ! 0%{?rhel} || 0%{?epel}
+%bcond aalib 1
+%bcond libheif 1
+%bcond libjxl 1
+%else
+%bcond aalib 0
+%bcond libheif 0
+%bcond libjxl 0
+%endif
+
 %bcond tests 1
 
 # When building in Koji or mock, networking isn’t available.
@@ -33,6 +43,10 @@
 %bcond skip_problematic_tests 1
 # Some tests fail under normal user environments, don’t skip them by default.
 %bcond skip_user_tests 0
+# Headless tests require xvfb-run, RHEL 10+ is wayland only
+%if 0%{?rhel} >= 10
+%bcond skip_headless_tests 1
+%endif
 
 # The lists of tests to skip should not have leading or trailing white space,
 # this breaks the logic in %%check.
@@ -153,7 +167,9 @@ URL:            https://www.gimp.org
 %if %{with label_overlay}
 BuildRequires:  ImageMagick
 %endif
+%if %{with aalib}
 BuildRequires:  aalib-devel
+%endif
 BuildRequires:  appdata-tools
 BuildRequires:  appstream
 BuildRequires:  cmake
@@ -206,10 +222,14 @@ BuildRequires:  pkgconfig(iso-codes)
 BuildRequires:  pkgconfig(json-glib-1.0) >= %json_glib_minver
 BuildRequires:  pkgconfig(lcms2) >= %lcms_minver
 BuildRequires:  pkgconfig(libarchive)
+%if %{with libheif}
 BuildRequires:  pkgconfig(libheif) >= %libheif_minver
+%endif
 BuildRequires:  pkgconfig(libjpeg)
+%if %{with libjxl}
 BuildRequires:  pkgconfig(libjxl) >= %jpegxl_minver
 BuildRequires:  pkgconfig(libjxl_threads) >= %jpegxl_minver
+%endif
 BuildRequires:  pkgconfig(liblzma) >= %liblzma_minver
 BuildRequires:  pkgconfig(libmng)
 BuildRequires:  pkgconfig(libmypaint) >= %libmypaint_minver
@@ -240,7 +260,9 @@ BuildRequires:  pkgconfig(zlib)
 BuildRequires:  python3dist(pygobject) >= %pygobject_minver
 BuildRequires:  python3dist(pycairo)
 BuildRequires:  vala
+%if %{without skip_headless_tests}
 BuildRequires:  xorg-x11-server-Xvfb
+%endif
 BuildRequires:  yelp-tools
 
 Requires:       %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
@@ -373,6 +395,18 @@ EOF
     -Denable-default-bin=disabled \
 %endif
     -Dilbm=disabled \
+%if %{without aalib}
+    -Daa=disabled \
+%endif
+%if %{without libheif}
+    -Dheif=disabled \
+%endif
+%if %{without libjxl}
+    -Djpeg-xl=disabled \
+%endif
+%if %{with skip_headless_tests}
+    -Dheadless-tests=disabled \
+%endif
     -Dbug-report-url="https://bugzilla.redhat.com/"
 
 %meson_build

                 reply	other threads:[~2026-09-03 20:17 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178846666173.1.16209732297025347098.rpms-gimp-2b4b5870d37e@fedoraproject.org \
    --to=yselkowi@redhat.com \
    --cc=git-commits@fedoraproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox