Changeset de89edf for kde/kf5-apps

Timestamp:

02/26/2024 09:33:08 PM (2 months ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

12.1, ken/TL2024, lazarus, trunk, xry111/llvm18

Children:

e4c883c0

Parents:

27bda4fc

Message:

Gwenview: fix building with recent kImageAnnotator and kColorPicker.

File:

• kde/kf5-apps/gwenview.xml (modified) (2 diffs)

kde/kf5-apps/gwenview.xml

@@ -66 +66 @@
       </listitem>
     </itemizedlist>
-<!--
+
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
         <para>
-          Required patch for building against <xref linkend="exiv2"/>:
-          <ulink url="&patch-root;/gwenview-&kf5apps-version;-exiv2_0.27-1.patch"/>
+          Required patch for building against <xref linkend="kimageannotator"/>:
+          <ulink url="&patch-root;/gwenview-&kf5apps-version;-build_fixes-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
--->
+
     <bridgehead renderas="sect3">Gwenview Dependencies</bridgehead>
 
@@ -102 +102 @@
     <title>Installation of Gwenview</title>
 
-    <!-- Ticket #19206 -->
+    <!-- Ticket #19206 and #19329 -->
     <para>
       First, work around an incompatibility with recent changes in kImageAnnotator:
     </para>
 
-<!--
-<screen><userinput remap="pre">find . -name CMakeLists.txt | xargs sed -i 's/kImageAnnotator_FOUND/kImageAnnotator-Qt5_FOUND/'</userinput></screen>
--->
-<screen><userinput remap="pre">sed -i /find_package/s/kImageAnnotator/&amp;1-Qt5/" CMakeLists.txt</userinput></screen>
-
-<!-- Note that the above doe not "fix" the problem, but makes cmake skip looking 
-     for kImageAnnotator  - the needs to be reviewd and a proper fix created.
--->
+<screen><userinput remap="pre">patch -Np1 -i ../gwenview-&kf5apps-version;-build_fixes-1.patch</userinput></screen>
 
     <para>