CVS commit: pkgsrc

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri May 26 07:09:39 UTC 2023

Modified Files:
        pkgsrc/www/libproxy: buildlink3.mk
        pkgsrc/x11/qt5-qtbase: distinfo
Added Files:
        pkgsrc/x11/qt5-qtbase/patches: patch-src_network_configure.json
            patch-src_network_kernel_qnetworkproxy__libproxy.cpp

Log Message:
libproxy: do not provide header file in old location

instead adapt qt5-qtbase to look in the new location


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/libproxy/buildlink3.mk
cvs rdiff -u -r1.76 -r1.77 pkgsrc/x11/qt5-qtbase/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtbase/patches/patch-src_network_configure.json \
    pkgsrc/x11/qt5-qtbase/patches/patch-src_network_kernel_qnetworkproxy__libproxy.cpp

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

Modified files:

Index: pkgsrc/www/libproxy/buildlink3.mk
diff -u pkgsrc/www/libproxy/buildlink3.mk:1.8 pkgsrc/www/libproxy/buildlink3.mk:1.9
--- pkgsrc/www/libproxy/buildlink3.mk:1.8       Mon May 22 21:00:09 2023
+++ pkgsrc/www/libproxy/buildlink3.mk   Fri May 26 07:09:39 2023
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2023/05/22 21:00:09 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2023/05/26 07:09:39 wiz Exp $
 
 BUILDLINK_TREE+=       libproxy
 
@@ -9,8 +9,7 @@ BUILDLINK_API_DEPENDS.libproxy+=        libprox
 BUILDLINK_ABI_DEPENDS.libproxy+=       libproxy>=0.5.0
 BUILDLINK_PKGSRCDIR.libproxy?=         ../../www/libproxy
 
-# before version 0.5, the header file was directly in include/proxy.h
-BUILDLINK_FNAME_TRANSFORM.libproxy+=   -e s,include/libproxy,include,
+BUILDLINK_INCDIRS.libproxy+=           include/libroxy
 
 .include "../../devel/glib2/buildlink3.mk"
 .endif # LIBPROXY_BUILDLINK3_MK

Index: pkgsrc/x11/qt5-qtbase/distinfo
diff -u pkgsrc/x11/qt5-qtbase/distinfo:1.76 pkgsrc/x11/qt5-qtbase/distinfo:1.77
--- pkgsrc/x11/qt5-qtbase/distinfo:1.76 Wed Apr 12 19:24:04 2023
+++ pkgsrc/x11/qt5-qtbase/distinfo      Fri May 26 07:09:39 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.76 2023/04/12 19:24:04 adam Exp $
+$NetBSD: distinfo,v 1.77 2023/05/26 07:09:39 wiz Exp $
 
 BLAKE2s (qtbase-everywhere-opensource-src-5.15.9.tar.xz) = 64626495c9269314316a33369a8815bf4d7e30810930c5ec40c57484709bc471
 SHA512 (qtbase-everywhere-opensource-src-5.15.9.tar.xz) = 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
@@ -20,7 +20,9 @@ SHA1 (patch-src_corelib_kernel_qcore__ma
 SHA1 (patch-src_corelib_thread_qmutex__p.h) = 093089b8a37baa3071257c99bbde5f6295bd2eec
 SHA1 (patch-src_corelib_thread_qwaitcondition__unix.cpp) = 9dffdbfc81bc7d3259020cd32b4039b7be6ee2bd
 SHA1 (patch-src_corelib_tools_qsharedpointer__impl.h) = 91755dcdd0e13bfc047167db918b9a4d7a172165
+SHA1 (patch-src_network_configure.json) = a7d54e656104f05919b42f525763306b4bf03323
 SHA1 (patch-src_network_kernel_qnetworkinterface__unix.cpp) = 2c5569eb2ba19999eb62e4fdb54f347c88f6e6a5
+SHA1 (patch-src_network_kernel_qnetworkproxy__libproxy.cpp) = 4cb3a47d1fdd2d165b5d884192fff74e5ec8d5c1
 SHA1 (patch-src_openglextensions_openglextensions.pro) = 575d31c3a48f36d82dc1f342078e636f4c25e33f
 SHA1 (patch-src_plugins_platforms_cocoa_qiosurfacegraphicsbuffer.mm) = 01afb2aef1d14370308c897c1d077b05c5e3f0a9
 SHA1 (patch-src_plugins_platforms_xcb_qxcbatom.cpp) = abbd0b04b881666e82f45adc18e49aafdb43d4be

Added files:

Index: pkgsrc/x11/qt5-qtbase/patches/patch-src_network_configure.json
diff -u /dev/null pkgsrc/x11/qt5-qtbase/patches/patch-src_network_configure.json:1.1
--- /dev/null   Fri May 26 07:09:39 2023
+++ pkgsrc/x11/qt5-qtbase/patches/patch-src_network_configure.json      Fri May 26 07:09:39 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_network_configure.json,v 1.1 2023/05/26 07:09:39 wiz Exp $
+
+Adapt for libproxy header path change.
+
+--- src/network/configure.json.orig    2023-03-23 19:06:47.000000000 +0000
++++ src/network/configure.json
+@@ -51,7 +51,7 @@
+                     "px_proxy_factory_free(factory);"
+                 ]
+             },
+-            "headers": "proxy.h",
++            "headers": "libproxy/proxy.h",
+             "sources": [
+                 "-lproxy"
+             ]
Index: pkgsrc/x11/qt5-qtbase/patches/patch-src_network_kernel_qnetworkproxy__libproxy.cpp
diff -u /dev/null pkgsrc/x11/qt5-qtbase/patches/patch-src_network_kernel_qnetworkproxy__libproxy.cpp:1.1
--- /dev/null   Fri May 26 07:09:39 2023
+++ pkgsrc/x11/qt5-qtbase/patches/patch-src_network_kernel_qnetworkproxy__libproxy.cpp  Fri May 26 07:09:39 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_network_kernel_qnetworkproxy__libproxy.cpp,v 1.1 2023/05/26 07:09:39 wiz Exp $
+
+Adapt for libproxy header path change.
+
+--- src/network/kernel/qnetworkproxy_libproxy.cpp.orig 2023-03-23 19:06:47.000000000 +0000
++++ src/network/kernel/qnetworkproxy_libproxy.cpp
+@@ -49,7 +49,7 @@
+ #include <QtCore/private/qeventdispatcher_unix_p.h>
+ #include <QtCore/private/qthread_p.h>
+ 
+-#include <proxy.h>
++#include <libproxy/proxy.h>
+ #include <dlfcn.h>
+ 
+ QT_BEGIN_NAMESPACE