Control: tags 991448 + patch
Control: tags 991448 + pending

I've prepared an NMU for ui-utilcpp (versioned as 1.10.0-1.1) and
uploaded it to DELAYED/5.  Please feel free to tell me if I should delay
it longer.

MR at https://salsa.debian.org/debian/ui-utilcpp/-/merge_requests/1 if
you want to integrate this that way.

/Simon
diff --git a/debian/changelog b/debian/changelog
index e38ae11..4996f08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ui-utilcpp (1.10.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload
+  * Add FTBFS patch from Steve Langasek.  Closes: #991448.
+
+ -- Simon Josefsson <si...@josefsson.org>  Wed, 25 Aug 2021 10:23:30 +0200
+
 ui-utilcpp (1.10.0-1) unstable; urgency=medium
 
   [ Ondřej Nový ]
diff --git a/debian/control b/debian/control
index 48b4461..3964b68 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends: debhelper-compat (= 12),
                libidn11-dev,
                libcap-dev,
                libboost-all-dev (>= 1.35),
+               libtirpc-dev,
                xfslibs-dev,
                doxygen (>= 1.5.6),
                graphviz (>= 2.20.2)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6a0390d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+tirpc.patch
diff --git a/debian/patches/tirpc.patch b/debian/patches/tirpc.patch
new file mode 100644
index 0000000..9c8a1d6
--- /dev/null
+++ b/debian/patches/tirpc.patch
@@ -0,0 +1,35 @@
+Description: Port from deprecated glibc rpcsvc to libtirpc-dev
+Author: Steve Langasek <steve.langa...@ubuntu.com>
+Forwarded: no
+Last-Update: 2021-07-23
+
+Index: ui-utilcpp-1.10.0/configure.ac
+===================================================================
+--- ui-utilcpp-1.10.0.orig/configure.ac
++++ ui-utilcpp-1.10.0/configure.ac
+@@ -83,8 +83,8 @@
+ AC_CHECK_FUNCS(cap_clear_flag)
+ 
+ # Push generic flags
+-AC_SUBST(AM_CPPFLAGS, ["-I\$(top_srcdir)/src"])
+-AC_SUBST(AM_CXXFLAGS, ["-pthread -lrpcsvc $(ucommon-config --cflags)"])
++AC_SUBST(AM_CPPFLAGS, ["-I\$(top_srcdir)/src -I/usr/include/tirpc"])
++AC_SUBST(AM_CXXFLAGS, ["-pthread -ltirpc $(ucommon-config --cflags)"])
+ AC_SUBST(AM_LDFLAGS, ["-pthread"])
+ AC_SUBST(AM_LIBADD, $(ucommon-config --libs))
+ AC_SUBST(AM_LDADD, $(ucommon-config --libs))
+Index: ui-utilcpp-1.10.0/src/ui-utilcpp/Makefile.am
+===================================================================
+--- ui-utilcpp-1.10.0.orig/src/ui-utilcpp/Makefile.am
++++ ui-utilcpp-1.10.0/src/ui-utilcpp/Makefile.am
+@@ -45,3 +45,10 @@
+ libui_utilcpp_la_CXXFLAGS = @AM_CXXFLAGS@ -fvisibility=default
+ libui_utilcpp_la_LDFLAGS = @AM_LDFLAGS@ -version-info @SO_VERSION@
+ libui_utilcpp_la_LIBADD = http/libui-utilcpp-http.la
++
++nodist_libui_utilcpp_la_SOURCES = xdr_rquota.c
++CLEANFILES = xdr_rquota.c
++
++xdr_rquota.c:
++	rpcgen -c /usr/include/rpcsvc/rquota.x > $@
++

Attachment: signature.asc
Description: PGP signature

Reply via email to