commit 4e207ba1df211c872fd5aab30f575578a8bfff03 · pyrox.dev/nixpkgs

+21 -9
pkgs/development/libraries/qt-5/5.10/restore-pc-files.patch
···

       1
       1
       -
       Partially reverts <https://codereview.qt-project.org/#/c/140954/>.

     

       2
       2
       -
       

     

       3
       3
       -
       diff --git i/mkspecs/features/qt_module.prf w/mkspecs/features/qt_module.prf

     

       4
       4
       -
       index bb28af97..36bb6483 100644

     

       5
       5
       -
       --- i/mkspecs/features/qt_module.prf

     

       6
       6
       -
       +++ w/mkspecs/features/qt_module.prf

     

       7
       7
       -
       @@ -245,7 +245,7 @@ load(qt_installs)

     

       1
       1
       +
       diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf

     

       2
       2
       +
       index e6a0d97f1a..b50ce77d51 100644

     

       3
       3
       +
       --- a/mkspecs/features/qt_module.prf

     

       4
       4
       +
       +++ b/mkspecs/features/qt_module.prf

     

       5
       5
       +
       @@ -266,7 +266,7 @@ load(qt_installs)

     

       8
       6
        
        load(qt_targets)

     

       9
       9
       -
       

     

       7
       7
       +
        

     

       10
       8
        
        # this builds on top of qt_common

     

       11
       9
        
       -!internal_module:!lib_bundle:if(unix|mingw) {

     

       12
       10
        
       +!internal_module:if(unix|mingw) {

     

       13
       11
        
            CONFIG += create_pc

     

       14
       12
        
            QMAKE_PKGCONFIG_DESTDIR = pkgconfig

     

       15
       15
       -
            host_build: \
     

       13
       13
       +
            host_build: \

     

       14
       14
       +
       diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf

     

       15
       15
       +
       index 62b88c6fe2..f302f1e202 100644

     

       16
       16
       +
       --- a/mkspecs/features/qt_module_headers.prf

     

       17
       17
       +
       +++ b/mkspecs/features/qt_module_headers.prf

     

       18
       18
       +
       @@ -102,8 +102,7 @@ git_build: \

     

       19
       19
       +
        else: \

     

       20
       20
       +
            INC_PATH = $$MODULE_BASE_INDIR

     

       21
       21
       +
        include($$INC_PATH/include/$$MODULE_INCNAME/headers.pri, "", true)

     

       22
       22
       +
       -!lib_bundle: \  # Headers are embedded into the bundle, so don't install them separately.

     

       23
       23
       +
       -    CONFIG += qt_install_headers

     

       24
       24
       +
       +CONFIG += qt_install_headers

     

       25
       25
       +
        

     

       26
       26
       +
        alien_syncqt: return()

     

       27
       27
       +