CVS commit: pkgsrc/editors/kate

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/editors/kate
From: "David H. Gutteridge" <gutteridge%netbsd.org@localhost>
Date: Fri, 23 Feb 2024 04:00:03 +0000

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Fri Feb 23 04:00:03 UTC 2024

Modified Files:
        pkgsrc/editors/kate: Makefile distinfo
Added Files:
        pkgsrc/editors/kate/patches: patch-addons_project_git_gitstatus.h
            patch-addons_project_kateproject.h
            patch-addons_project_kateprojectitem.h
            patch-apps_lib_ktexteditor__utils.h

Log Message:
kate: fix builds for some platforms (e.g., NetBSD 9.x)

In some contexts, use of PCH causes build failures, e.g.:

[  9%] Building C object pch/CMakeFiles/katepch.dir/cmake_pch.h.gch
[  9%] Building CXX object pch/CMakeFiles/katepch.dir/katepch_autogen/mocs_compilation.cpp.o
[  9%] Building CXX object addons/backtracebrowser/autotests/CMakeFiles/btbrowser_test.dir/__/btparser.cpp.o
<command-line>: fatal error: had to relocate PCH
compilation terminated.
--- pch/CMakeFiles/katepch.dir/katepch_autogen/mocs_compilation.cpp.o ---
*** [pch/CMakeFiles/katepch.dir/katepch_autogen/mocs_compilation.cpp.o] Error code 1

The upstream project offers the configuration option to disable PCH, so
take advantage of this. Except, evidently they have not recently tested
a build with that setting disabled, as various files then miss specific
includes that happen to get covered with their catch-all pch.h header.

While here, also don't install .desktop files as executable, they are
not scripts (and this one wouldn't magically work anyway).


To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 pkgsrc/editors/kate/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/editors/kate/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/editors/kate/patches/patch-addons_project_git_gitstatus.h \
    pkgsrc/editors/kate/patches/patch-addons_project_kateproject.h \
    pkgsrc/editors/kate/patches/patch-addons_project_kateprojectitem.h \
    pkgsrc/editors/kate/patches/patch-apps_lib_ktexteditor__utils.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/editors/kate/Makefile
diff -u pkgsrc/editors/kate/Makefile:1.89 pkgsrc/editors/kate/Makefile:1.90
--- pkgsrc/editors/kate/Makefile:1.89   Tue Feb  6 11:05:16 2024
+++ pkgsrc/editors/kate/Makefile        Fri Feb 23 04:00:03 2024
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.89 2024/02/06 11:05:16 markd Exp $
+# $NetBSD: Makefile,v 1.90 2024/02/23 04:00:03 gutteridge Exp $
 
 DISTNAME=      kate-${KAPPSVER}
+PKGREVISION=   1
 CATEGORIES=    editors
 
 HOMEPAGE=      https://www.kde.org/applications/utilities/kate/
@@ -17,6 +18,9 @@ USE_CXX_FEATURES+=    charconv
 
 LDFLAGS.SunOS+=        -lsocket
 
+# PCH-enabled builds cause failures with RELRO enabled, e.g., on NetBSD 9.x.
+CMAKE_ARGS+=   -DBUILD_PCH=OFF
+
 # generation of kded.moc fails when ${PREFIX}/include in the moc include path
 SUBST_CLASSES+=                fix-moc
 SUBST_STAGE.fix-moc=   post-configure
@@ -26,6 +30,10 @@ SUBST_FILES.fix-moc+=        _KDE_build/addons/
 SUBST_NOOP_OK.fix-moc= yes
 SUBST_SED.fix-moc=     -e 's;"${PREFIX}/include",;;g'
 
+# .desktop files should not be executable.
+post-install:
+       ${CHMOD} a-x ${DESTDIR}${PREFIX}/share/applications/org.kde.kate.desktop
+
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../devel/kitemmodels/buildlink3.mk"

Index: pkgsrc/editors/kate/distinfo
diff -u pkgsrc/editors/kate/distinfo:1.20 pkgsrc/editors/kate/distinfo:1.21
--- pkgsrc/editors/kate/distinfo:1.20   Tue Feb  6 11:05:16 2024
+++ pkgsrc/editors/kate/distinfo        Fri Feb 23 04:00:03 2024
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.20 2024/02/06 11:05:16 markd Exp $
+$NetBSD: distinfo,v 1.21 2024/02/23 04:00:03 gutteridge Exp $
 
 BLAKE2s (kate-23.08.4.tar.xz) = c11f689c33a82ed6d921c9875afca3ed1f168d9e09b1b6d3e683109a5d00fa69
 SHA512 (kate-23.08.4.tar.xz) = 99b147940809149c93a9a79bcf5263db650f3afa1fbef5158d20ed88608e3794dc8d1357d7c0119369b690dbfcd63e369a009171c3b4a99559246f876bafe28a
 Size (kate-23.08.4.tar.xz) = 8043840 bytes
+SHA1 (patch-addons_project_git_gitstatus.h) = db6349af3dea17a2e42c4b80c6a758054abd366f
+SHA1 (patch-addons_project_kateproject.h) = de6be75d21c4052e4527be3e6112922a8c356108
+SHA1 (patch-addons_project_kateprojectitem.h) = 1ee1624a5156fcd5f3d73d653294688115a126d7
+SHA1 (patch-apps_lib_ktexteditor__utils.h) = 8bea66e80a68235d6646be807008236ec0840f4d

Added files:

Index: pkgsrc/editors/kate/patches/patch-addons_project_git_gitstatus.h
diff -u /dev/null pkgsrc/editors/kate/patches/patch-addons_project_git_gitstatus.h:1.1
--- /dev/null   Fri Feb 23 04:00:03 2024
+++ pkgsrc/editors/kate/patches/patch-addons_project_git_gitstatus.h    Fri Feb 23 04:00:03 2024
@@ -0,0 +1,14 @@
+$NetBSD: patch-addons_project_git_gitstatus.h,v 1.1 2024/02/23 04:00:03 gutteridge Exp $
+
+Fix non-PCH-enabled build by adding missing includes.
+
+--- addons/project/git/gitstatus.h.orig        2023-12-04 03:09:43.000000000 +0000
++++ addons/project/git/gitstatus.h
+@@ -5,6 +5,7 @@
+ */
+ #pragma once
+ 
++#include <QSet>
+ #include <QString>
+ #include <QVector>
+ 
Index: pkgsrc/editors/kate/patches/patch-addons_project_kateproject.h
diff -u /dev/null pkgsrc/editors/kate/patches/patch-addons_project_kateproject.h:1.1
--- /dev/null   Fri Feb 23 04:00:03 2024
+++ pkgsrc/editors/kate/patches/patch-addons_project_kateproject.h      Fri Feb 23 04:00:03 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-addons_project_kateproject.h,v 1.1 2024/02/23 04:00:03 gutteridge Exp $
+
+Fix non-PCH-enabled build by adding missing includes.
+
+--- addons/project/kateproject.h.orig  2023-12-04 03:09:43.000000000 +0000
++++ addons/project/kateproject.h
+@@ -7,6 +7,8 @@
+ 
+ #pragma once
+ 
++#include <QtGlobal>
++
+ #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+ #include <KTextEditor/ModificationInterface>
+ #endif
Index: pkgsrc/editors/kate/patches/patch-addons_project_kateprojectitem.h
diff -u /dev/null pkgsrc/editors/kate/patches/patch-addons_project_kateprojectitem.h:1.1
--- /dev/null   Fri Feb 23 04:00:03 2024
+++ pkgsrc/editors/kate/patches/patch-addons_project_kateprojectitem.h  Fri Feb 23 04:00:03 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-addons_project_kateprojectitem.h,v 1.1 2024/02/23 04:00:03 gutteridge Exp $
+
+Fix non-PCH-enabled build by adding missing includes.
+
+--- addons/project/kateprojectitem.h.orig      2023-12-04 03:09:43.000000000 +0000
++++ addons/project/kateprojectitem.h
+@@ -7,6 +7,8 @@
+ 
+ #pragma once
+ 
++#include <QtGlobal>
++
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ #include <KTextEditor/Document>
+ #else
Index: pkgsrc/editors/kate/patches/patch-apps_lib_ktexteditor__utils.h
diff -u /dev/null pkgsrc/editors/kate/patches/patch-apps_lib_ktexteditor__utils.h:1.1
--- /dev/null   Fri Feb 23 04:00:03 2024
+++ pkgsrc/editors/kate/patches/patch-apps_lib_ktexteditor__utils.h     Fri Feb 23 04:00:03 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-apps_lib_ktexteditor__utils.h,v 1.1 2024/02/23 04:00:03 gutteridge Exp $
+
+Fix non-PCH-enabled build by adding missing includes.
+
+--- apps/lib/ktexteditor_utils.h.orig  2023-12-04 03:09:43.000000000 +0000
++++ apps/lib/ktexteditor_utils.h
+@@ -7,6 +7,8 @@
+ #include "kateprivate_export.h"
+ 
+ #include <QString>
++#include <QUrl>
++#include <QWidgetList>
+ 
+ QT_BEGIN_NAMESPACE
+ class QScrollBar;

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/editors/kate
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/editors/kate
Indexes:

Home | Main Index | Thread Index | Old Index