commit 09afc45798c7f1d2b951ae9a657a74c7d4d8c7ca · pyrox.dev/nixpkgs

pkgs/kde/gear/falkon/default.nix

···

       9
       9
        
       mkKdeDerivation {

     

       10
       10
        
         pname = "falkon";

     

       11
       11
        
       

     

       12
       12
       +
         # Fix build with PySide 6.9

     

       13
       13
       +
         # Submitted upstream: https://invent.kde.org/network/falkon/-/merge_requests/128

     

       14
       14
       +
         # FIXME: remove when merged

     

       15
       15
       +
         patches = [ ./qt-6.9.patch ];

     

       16
       16
       +
       

     

       12
       17
        
         extraNativeBuildInputs = [

     

       13
       18
        
           qttools

     

       14
       19
        
           qtwebchannel

+25

pkgs/kde/gear/falkon/qt-6.9.patch

···

       1
       1
       +
       diff --git a/src/plugins/PyFalkon/typesystem_pyfalkon.xml b/src/plugins/PyFalkon/typesystem_pyfalkon.xml

     

       2
       2
       +
       index 45f23c49e..31eff876b 100644

     

       3
       3
       +
       --- a/src/plugins/PyFalkon/typesystem_pyfalkon.xml

     

       4
       4
       +
       +++ b/src/plugins/PyFalkon/typesystem_pyfalkon.xml

     

       5
       5
       +
       @@ -265,7 +265,7 @@

     

       6
       6
       +
            QList&lt;QByteArray&gt; version = QByteArray(Qz::VERSION).split('.');

     

       7
       7
       +
            PyObject *pyFalkonVersion = PyTuple_New(3);

     

       8
       8
       +
            for (int i = 0; i &lt; 3; ++i)

     

       9
       9
       +
       -        PyTuple_SET_ITEM(pyFalkonVersion, i, PyLong_FromLong(version[i].toInt()));

     

       10
       10
       +
       +        PyTuple_SetItem(pyFalkonVersion, i, PyLong_FromLong(version[i].toInt()));

     

       11
       11
       +
            PyModule_AddObject(module, "__version_info__", pyFalkonVersion);

     

       12
       12
       +
            PyModule_AddStringConstant(module, "__version__", Qz::VERSION);

     

       13
       13
       +
            </inject-code>

     

       14
       14
       +
       @@ -273,9 +273,9 @@

     

       15
       15
       +
            <template name="return_for_QFileDialog">

     

       16
       16
       +
            %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, %4, %5, &amp;%6, %7);

     

       17
       17
       +
            %PYARG_0 = PyTuple_New(2);

     

       18
       18
       +
       -    PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_));

     

       19
       19
       +
       +    PyTuple_SetItem(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](retval_));

     

       20
       20
       +
            auto ARG6_PTR = &amp;%6;

     

       21
       21
       +
       -    PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG6_TYPE](ARG6_PTR));

     

       22
       22
       +
       +    PyTuple_SetItem(%PYARG_0, 1, %CONVERTTOPYTHON[%ARG6_TYPE](ARG6_PTR));

     

       23
       23
       +
            </template>

     

       24
       24
       +
        

     

       25
       25
       +
            <suppress-warning text="Unable to translate type &quot;std::function&lt;QPoint (QSize)&gt;&quot;:*"/>