From a7127ce5ccfb32dc00a53b7b65475265e9cbf6beafd9f27a343de4c897ee0417 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 26 Oct 2021 09:53:49 +0000 Subject: [PATCH] Accepting request 927464 from home:dimstar:Factory - Add quvi-glibc-2.34.patch: Fix build with glibc 2.34, where 'write' is an internally used name. OBS-URL: https://build.opensuse.org/request/show/927464 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/quvi?expand=0&rev=12 --- quvi-glibc-2.34.patch | 35 +++++++++++++++++++++++++++++++++++ quvi.changes | 6 ++++++ quvi.spec | 12 ++++++------ 3 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 quvi-glibc-2.34.patch diff --git a/quvi-glibc-2.34.patch b/quvi-glibc-2.34.patch new file mode 100644 index 0000000..b5321c8 --- /dev/null +++ b/quvi-glibc-2.34.patch @@ -0,0 +1,35 @@ +Index: quvi-0.9.5/src/pbar/lpbar.c +=================================================================== +--- quvi-0.9.5.orig/src/pbar/lpbar.c ++++ quvi-0.9.5/src/pbar/lpbar.c +@@ -64,7 +64,7 @@ lpbar_t lpbar_new() + { + lpbar_t p = g_new0(struct lpbar_s, 1); + p->counters.timer = g_timer_new(); +- p->mode = write; ++ p->mode = do_write; + return (p); + } + +@@ -212,7 +212,7 @@ void lpbar_print(const lpbar_t p) + g_print(C_("Transfer mode with a reason", "skip ")); + break; + case resume: +- case write: ++ case do_write: + default: + g_print("%s", (p->initial_bytes ==0) + ? C_("Transfer mode (begin at offset 0)", "write") +Index: quvi-0.9.5/src/pbar/lpbar.h +=================================================================== +--- quvi-0.9.5.orig/src/pbar/lpbar.h ++++ quvi-0.9.5/src/pbar/lpbar.h +@@ -21,7 +21,7 @@ + #ifndef lpbar_h + #define lpbar_h + +-typedef enum { retrieved_already, forced_skip, resume, write } lpbar_mode; ++typedef enum { retrieved_already, forced_skip, resume, do_write } lpbar_mode; + + struct lpbar_s + { diff --git a/quvi.changes b/quvi.changes index ae85b0d..690d736 100644 --- a/quvi.changes +++ b/quvi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 26 09:46:12 UTC 2021 - Dominique Leuenberger + +- Add quvi-glibc-2.34.patch: Fix build with glibc 2.34, where + 'write' is an internally used name. + ------------------------------------------------------------------- Sun Jan 22 19:09:11 UTC 2017 - bwiedemann@suse.com diff --git a/quvi.spec b/quvi.spec index c3627dc..07ca1f1 100644 --- a/quvi.spec +++ b/quvi.spec @@ -1,7 +1,7 @@ # # spec file for package quvi # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -20,12 +20,13 @@ Name: quvi Version: 0.9.5 Release: 0 Summary: Command line tool for parsing flash media stream URLs -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Productivity/Multimedia/Other -Url: http://quvi.sourceforge.net/ +URL: http://quvi.sourceforge.net/ Source: http://sourceforge.net/projects/quvi/files/0.9/quvi/quvi-0.9.5.tar.xz # PATCH-FIX-OPENSUSE Patch0: reproducible.patch +Patch1: quvi-glibc-2.34.patch BuildRequires: pkg-config BuildRequires: pkgconfig(glib-2.0) >= 2.24 BuildRequires: pkgconfig(gobject-2.0) >= 2.24 @@ -40,8 +41,7 @@ quvi is a command line tool for parsing flash media stream URLs. It supports many websites including YouTube and Dailymotion. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build %configure \