libproxy: another problem fixed

[Thomas Klausner <wiz%gatalith.at@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Mon May 22 15:55:10 2023 +0200
Changeset:	4eecabbabcfedf4ca2a50198acf25a358be761ef

Modified Files:
	libproxy/distinfo
	libproxy/patches/patch-src_libproxy_proxy.h
Removed Files:
	libproxy/TODO

Log Message:
libproxy: another problem fixed

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4eecabbabcfedf4ca2a50198acf25a358be761ef

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

diffstat:
 libproxy/TODO                               | 45 -----------------------------
 libproxy/distinfo                           |  2 +-
 libproxy/patches/patch-src_libproxy_proxy.h |  5 +++-
 3 files changed, 5 insertions(+), 47 deletions(-)

diffs:
diff --git a/libproxy/TODO b/libproxy/TODO
deleted file mode 100644
index 6e0b5346ef..0000000000
--- a/libproxy/TODO
+++ /dev/null
@@ -1,45 +0,0 @@
-breaks qt5-qtbase
-
-In file included from ../../include/QtCore/qobjectdefs.h:1,
-                 from ../../include/QtCore/../../src/corelib/kernel/qobject.h:46,
-                 from ../../include/QtCore/qobject.h:1,
-                 from ../../include/QtCore/../../src/corelib/io/qiodevice.h:45,
-                 from ../../include/QtCore/qiodevice.h:1,
-                 from ../../include/QtNetwork/../../src/network/socket/qabstractsocket.h:44,
-                 from ../../include/QtNetwork/qabstractsocket.h:1,
-                 from ../../include/QtNetwork/../../src/network/kernel/qhostaddress.h:48,
-                 from ../../include/QtNetwork/qhostaddress.h:1,
-                 from kernel/qnetworkproxy.h:44,
-                 from kernel/qnetworkproxy_libproxy.cpp:41:
-../../include/QtCore/../../src/corelib/kernel/qobjectdefs.h:93:20: error: expected unqualified-id before 'public'
-   93 | # define Q_SIGNALS public QT_ANNOTATE_ACCESS_SPECIFIER(qt_signal)
-      |                    ^~~~~~
-../../include/QtCore/../../src/corelib/kernel/qobjectdefs.h:89:22: note: in expansion of macro 'Q_SIGNALS'
-   89 | #     define signals Q_SIGNALS
-      |                      ^~~~~~~~~
-/scratch/x11/qt5-qtbase/work/.buildlink/include/glib-2.0/gio/gdbusintrospection.h:157:25: note: in expansion of macro 'signals'
-  157 |   GDBusSignalInfo     **signals;
-      |                         ^~~~~~~
-
-and qt6-qtbase:
-In file included from /scratch/x11/qt6-qtbase/work/qtbase-everywhere-src-6.5.0/include/QtCore/qtmetamacros.h:1,
-                 from /scratch/x11/qt6-qtbase/work/qtbase-everywhere-src-6.5.0/include/QtCore/../../src/corelib/global/qnamespace.h:13,
-                 from /scratch/x11/qt6-qtbase/work/qtbase-everywhere-src-6.5.0/include/QtCore/qnamespace.h:1,
-                 from /scratch/x11/qt6-qtbase/work/qtbase-everywhere-src-6.5.0/include/QtCore/../../src/corelib/text/qbytearray.h:9,
-                 from /scratch/x11/qt6-qtbase/work/qtbase-everywhere-src-6.5.0/include/QtCore/qbytearray.h:1,
-                 from /scratch/x11/qt6-qtbase/work/qtbase-everywhere-src-6.5.0/include/QtCore/../../src/corelib/text/qstringview.h:8,
-                 from /scratch/x11/qt6-qtbase/work/qtbase-everywhere-src-6.5.0/include/QtCore/qstringview.h:1,
-                 from /scratch/x11/qt6-qtbase/work/qtbase-everywhere-src-6.5.0/include/QtCore/../../src/corelib/text/qchar.h:656,
-                 from /scratch/x11/qt6-qtbase/work/qtbase-everywhere-src-6.5.0/include/QtCore/qchar.h:1,
-                 from /scratch/x11/qt6-qtbase/work/qtbase-everywhere-src-6.5.0/include/QtCore/../../src/corelib/text/qstring.h:14,
-                 from /scratch/x11/qt6-qtbase/work/qtbase-everywhere-src-6.5.0/include/QtCore/qstring.h:1,
-                 from /scratch/x11/qt6-qtbase/work/qtbase-everywhere-src-6.5.0/include/QtNetwork/../../src/network/kernel/qhostaddress.h:10,
-                 from /scratch/x11/qt6-qtbase/work/qtbase-everywhere-src-6.5.0/include/QtNetwork/qhostaddress.h:1,
-                 from /scratch/x11/qt6-qtbase/work/qtbase-everywhere-src-6.5.0/src/network/kernel/qnetworkproxy.h:8,
-                 from /scratch/x11/qt6-qtbase/work/qtbase-everywhere-src-6.5.0/src/network/kernel/qnetworkproxy_libproxy.cpp:5:
-/scratch/x11/qt6-qtbase/work/qtbase-everywhere-src-6.5.0/include/QtCore/../../src/corelib/kernel/qtmetamacros.h:45:20: error: expected unqualified-id before 'public'
-   45 | # define Q_SIGNALS public QT_ANNOTATE_ACCESS_SPECIFIER(qt_signal)
-      |                    ^~~~~~
-
-
-https://github.com/libproxy/libproxy/issues/226
diff --git a/libproxy/distinfo b/libproxy/distinfo
index 2d13e6fd81..a8359ddd85 100644
--- a/libproxy/distinfo
+++ b/libproxy/distinfo
@@ -4,4 +4,4 @@ BLAKE2s (libproxy-0.5.0.tar.gz) = 4ed621c85760f691a47513b3b00515b370389d0f774a0c
 SHA512 (libproxy-0.5.0.tar.gz) = 699d09d747c3e56247b1d0a8dee0cd7c122199cc4296aa61753a4e52b4346ad5d98d608f953d28a5779e7d49f64be639e22c696ac82d48bbdaa7b743501b18e6
 Size (libproxy-0.5.0.tar.gz) = 58746 bytes
 SHA1 (patch-src_backend_plugins_pacrunner-duktape_pacrunner-duktape.c) = fb9a76af07848e2a3205a872cd7067e94653701b
-SHA1 (patch-src_libproxy_proxy.h) = 6a740b835dcdbc6aaa78d24cd00816eeff10cd0f
+SHA1 (patch-src_libproxy_proxy.h) = 213e4496209521105cadbe95f85c6a03843907e4
diff --git a/libproxy/patches/patch-src_libproxy_proxy.h b/libproxy/patches/patch-src_libproxy_proxy.h
index 5ee5053121..4384b361c2 100644
--- a/libproxy/patches/patch-src_libproxy_proxy.h
+++ b/libproxy/patches/patch-src_libproxy_proxy.h
@@ -3,13 +3,16 @@ $NetBSD$
 Fix C++ usage of header.
 https://github.com/libproxy/libproxy/issues/226
 
+Fix Use glib-object header instead of gio
+https://github.com/libproxy/libproxy/issues/230
+
 --- src/libproxy/proxy.h.orig	2023-05-15 13:09:42.000000000 +0000
 +++ src/libproxy/proxy.h
 @@ -22,12 +22,12 @@
  
  #pragma once
  
-+#include <gio/gio.h>
++#include <glib-object.h>
 +
  #ifdef __cplusplus
  extern "C" {