pool/wget
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1092494 from home:dimstar:libproxy

Browse Source 
- Update wget-libproxy.patch: ensure to properly use libproxy
  cflags from pkg-config. Fixes build against libproxy 0.5.

OBS-URL: https://build.opensuse.org/request/show/1092494
OBS-URL: https://build.opensuse.org/package/show/network:utilities/wget?expand=0&rev=118
This commit is contained in:
Valentin Lefebvre 2023-06-13 06:55:17 +00:00 committed by Git OBS Bridge
parent f719b87fe7
commit ca19cb1990
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
wget-libproxy.patch
View File

@ -1,8 +1,8 @@
Index: wget-1.21.2/configure.ac Index: wget-1.21.4/configure.ac
=================================================================== ===================================================================
--- wget-1.21.2.orig/configure.ac --- wget-1.21.4.orig/configure.ac
+++ wget-1.21.2/configure.ac +++ wget-1.21.4/configure.ac
@@ -654,6 +654,22 @@ else @@ -655,6 +655,22 @@ then
fi fi
fi fi
@ -25,11 +25,11 @@ Index: wget-1.21.2/configure.ac
dnl ********************************************************************** dnl **********************************************************************
dnl Checks for IPv6 dnl Checks for IPv6
dnl ********************************************************************** dnl **********************************************************************
Index: wget-1.21.2/src/Makefile.am Index: wget-1.21.4/src/Makefile.am
=================================================================== ===================================================================
--- wget-1.21.2.orig/src/Makefile.am --- wget-1.21.4.orig/src/Makefile.am
+++ wget-1.21.2/src/Makefile.am +++ wget-1.21.4/src/Makefile.am
@@ -63,7 +63,7 @@ wget_SOURCES = connect.c convert.c cooki @@ -85,11 +85,11 @@ endif
nodist_wget_SOURCES = version.c nodist_wget_SOURCES = version.c
EXTRA_wget_SOURCES = iri.c metalink.c xattr.c EXTRA_wget_SOURCES = iri.c metalink.c xattr.c
LDADD = $(CODE_COVERAGE_LIBS) $(LIBOBJS) ../lib/libgnu.a $(GETADDRINFO_LIB) $(HOSTENT_LIB)\ LDADD = $(CODE_COVERAGE_LIBS) $(LIBOBJS) ../lib/libgnu.a $(GETADDRINFO_LIB) $(HOSTENT_LIB)\
@ -38,11 +38,16 @@ Index: wget-1.21.2/src/Makefile.am
$(LIB_NANOSLEEP) $(LIB_POSIX_SPAWN) $(LIB_SELECT) $(LIBICONV) $(LIBINTL)\ $(LIB_NANOSLEEP) $(LIB_POSIX_SPAWN) $(LIB_SELECT) $(LIBICONV) $(LIBINTL)\
$(LIBTHREAD) $(LIBUNISTRING) $(SERVENT_LIB) $(LIBTHREAD) $(LIBUNISTRING) $(SERVENT_LIB)
AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib $(CODE_COVERAGE_CPPFLAGS) AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib $(CODE_COVERAGE_CPPFLAGS)
Index: wget-1.21.2/src/retr.c -AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) $(CODE_COVERAGE_CFLAGS)
+AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS) $(CODE_COVERAGE_CFLAGS) $(libproxy_CFLAGS)
../lib/libgnu.a:
cd ../lib && $(MAKE) $(AM_MAKEFLAGS)
Index: wget-1.21.4/src/retr.c
=================================================================== ===================================================================
--- wget-1.21.2.orig/src/retr.c --- wget-1.21.4.orig/src/retr.c
+++ wget-1.21.2/src/retr.c +++ wget-1.21.4/src/retr.c
@@ -61,6 +61,10 @@ as that of the covered work. */ @@ -60,6 +60,10 @@ as that of the covered work. */
#include "iri.h" #include "iri.h"
#include "hsts.h" #include "hsts.h"
@ -53,7 +58,7 @@ Index: wget-1.21.2/src/retr.c
/* Total size of downloaded files. Used to enforce quota. */ /* Total size of downloaded files. Used to enforce quota. */
wgint total_downloaded_bytes; wgint total_downloaded_bytes;
@@ -1498,7 +1502,40 @@ getproxy (struct url *u) @@ -1489,7 +1493,40 @@ getproxy (struct url *u)
break; break;
} }
if (!proxy || !*proxy) if (!proxy || !*proxy)
@ -94,10 +99,10 @@ Index: wget-1.21.2/src/retr.c
/* Handle shorthands. `rewritten_storage' is a kludge to allow /* Handle shorthands. `rewritten_storage' is a kludge to allow
getproxy() to return static storage. */ getproxy() to return static storage. */
Index: wget-1.21.2/tests/Makefile.am Index: wget-1.21.4/tests/Makefile.am
=================================================================== ===================================================================
--- wget-1.21.2.orig/tests/Makefile.am --- wget-1.21.4.orig/tests/Makefile.am
+++ wget-1.21.2/tests/Makefile.am +++ wget-1.21.4/tests/Makefile.am
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
# #
# Version: @VERSION@ # Version: @VERSION@

6
wget.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Jun 12 08:34:23 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
- Update wget-libproxy.patch: ensure to properly use libproxy
cflags from pkg-config. Fixes build against libproxy 0.5.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 16 21:23:42 UTC 2023 - Andreas Stieger <Andreas.Stieger@gmx.de> Tue May 16 21:23:42 UTC 2023 - Andreas Stieger <Andreas.Stieger@gmx.de>