public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Mamoru TASAKA <mtasaka@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/kdebase3] rawhide: Remove xmkmf (imake) deps, actually not used
Date: Mon, 10 Aug 2026 08:33:03 GMT [thread overview]
Message-ID: <178635078328.1.14683480705791294218.rpms-kdebase3-de128707ffad@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/kdebase3
Branch : rawhide
Commit : de128707ffad9c34d86e91f74229287666a90170
Author : Mamoru TASAKA <mtasaka@fedoraproject.org>
Date : 2026-08-10T17:32:48+09:00
Stats : +29/-4 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/kdebase3/c/de128707ffad9c34d86e91f74229287666a90170?branch=rawhide
Log:
Remove xmkmf (imake) deps, actually not used
---
diff --git a/kdebase-3.5.10-no-xmkmf-deps.patch b/kdebase-3.5.10-no-xmkmf-deps.patch
new file mode 100644
index 0000000..360ea37
--- /dev/null
+++ b/kdebase-3.5.10-no-xmkmf-deps.patch
@@ -0,0 +1,23 @@
+--- kdebase-3.5.10/kdm/configure.in.in.xmkmf 2006-01-20 02:03:15.000000000 +0900
++++ kdebase-3.5.10/kdm/configure.in.in 2026-08-10 16:55:37.292067654 +0900
+@@ -1,4 +1,4 @@
+-KDE_FIND_PATH(xmkmf, XMKMF, [], [AC_MSG_ERROR([xmkmf/imake not found. Please make sure it's in PATH!])])
++KDE_FIND_PATH(xmkmf, XMKMF, [], [AC_MSG_RESULT([xmkmf/imake not found. Please make sure it's in PATH!])])
+
+ dnl ask imake about various X settings
+ AC_MSG_CHECKING([X paths])
+@@ -14,12 +14,12 @@
+ @echo "XBINDIR=\"$(BINDIR)\" XLIBDIR=\"$(LIBDIR)\""
+
+ ]EOF
+- if $XMKMF >&5 2>&1 && test -f Makefile; then
++ if test -n "$XMKMF" && $XMKMF >&5 2>&1 && test -f Makefile; then
+ kde_cv_defines_imake=`${MAKE-make} acimake 2> /dev/null | grep -v "^make"`
+ kde_cv_defines_imake_version=$imkv
+ else
+ AC_MSG_RESULT([failed])
+- AC_MSG_ERROR([$XMKMF (imake) failed.
++ AC_MSG_RESULT([$XMKMF (imake) failed.
+ Make sure you have all necessary X development packages installed.
+ On some systems a missing /lib/cpp symlink is at fault.])
+ fi
diff --git a/kdebase3.spec b/kdebase3.spec
index 1158bc4..148661e 100644
--- a/kdebase3.spec
+++ b/kdebase3.spec
@@ -117,6 +117,8 @@ Patch305: kdebase3-ftbfs-gcc14.patch
Patch306: kdebase3-autoconf-2.72.patch
# fix FTBFS for gcc16
Patch307: kdebase-3.5.10-gcc16-ansi.patch
+# Remove xmkmf deps
+Patch308: kdebase-3.5.10-no-xmkmf-deps.patch
Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -163,9 +165,8 @@ BuildRequires: freetype-devel
BuildRequires: openldap-devel
BuildRequires: cyrus-sasl-devel
BuildRequires: libart_lgpl-devel
-## X11 support details (xmkmf, bdftopcf)
+## X11 support details (bdftopcf)
BuildRequires: bdftopcf mkfontdir mkfontscale
-BuildRequires: imake
BuildRequires: xorg-x11-proto-devel
BuildRequires: libfontenc-devel
BuildRequires: libtirpc-devel
@@ -303,6 +304,7 @@ install -p -m644 %{SOURCE9} %{SOURCE10} %{SOURCE11} pics/crystalsvg/
%patch -P305 -p1 -b .ftbfs-gcc14
%patch -P306 -p1 -b .autoconf-2.72
%patch -P307 -p1 -b .gcc16
+%patch -P308 -p1 -b .xmkmf
make -f admin/Makefile.common cvs
@@ -318,7 +320,6 @@ export DO_NOT_COMPILE="$DO_NOT_COMPILE khotkeys kdepasswd kcheckpass drkonqi"
# Keep these (kcontrol for kcms, konsole for KonsolePart, kioslave for ioslaves
# kate for kscope
# export DO_NOT_COMPILE="$DO_NOT_COMPILE kcontrol konsole kioslave kate"
-
%configure \
--disable-new-ldflags \
--disable-dependency-tracking \
@@ -772,8 +773,9 @@ fi
%changelog
-* Sat Aug 08 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.5.10-88
+* Mon Aug 10 2026 Mamoru TASAKA <mtasaka@fedoraproject.org> - 3.5.10-88
- Fix FTBFS with gcc16
+- Remove xmkmf (imake) deps, actually not used
* Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.10-87
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
reply other threads:[~2026-08-10 8:33 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=178635078328.1.14683480705791294218.rpms-kdebase3-de128707ffad@fedoraproject.org \
--to=mtasaka@fedoraproject.org \
--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