[libtgvoip/f31] Switched to supported fork.
by Vitaly Zaitsev
commit 110c7cac30a24d209d7ebe33a9b9b79ebd2aae23
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Thu Jan 9 16:14:12 2020 +0100
Switched to supported fork.
.gitignore | 1 +
libtgvoip-build-fixes.patch | 125 ++++++++++++++++++++++++++------------------
libtgvoip-pr6.patch | 61 +++++++++++++++++++++
libtgvoip.spec | 122 +++++++++---------------------------------
sources | 2 +-
5 files changed, 164 insertions(+), 147 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9a82edc..a78bceb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
/libtgvoip-2.4.tar.gz
/libtgvoip-2.4.2.tar.gz
/libtgvoip-2.4.4.tar.gz
+/libtgvoip-88b47b6.tar.gz
diff --git a/libtgvoip-build-fixes.patch b/libtgvoip-build-fixes.patch
index 4d78b86..a430e21 100644
--- a/libtgvoip-build-fixes.patch
+++ b/libtgvoip-build-fixes.patch
@@ -1,60 +1,85 @@
-From 4d0a403c58f9f3bbc8704ba595cec175623f7410 Mon Sep 17 00:00:00 2001
+From e0e347b3c1a26754b250d02a78488cf9093a6d7b Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
-Date: Thu, 6 Jul 2017 17:27:01 +0200
+Date: Thu, 9 Jan 2020 13:18:09 +0100
Subject: [PATCH] Fixed build of libtgvoip under Fedora as shared library.
---
- libtgvoip.gyp | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
+ Makefile.am | 7 +++----
+ configure.ac | 13 ++++++++++++-
+ 2 files changed, 15 insertions(+), 5 deletions(-)
-diff --git a/libtgvoip.gyp b/libtgvoip.gyp
-index ec86cbf..c424dbe 100644
---- a/libtgvoip.gyp
-+++ b/libtgvoip.gyp
-@@ -4,7 +4,8 @@
- 'targets': [
- {
- 'target_name': 'libtgvoip',
-- 'type': 'static_library',
-+ 'type': 'shared_library',
-+ 'product_extension': 'so.<!(echo -n "$VOIPVER")',
- 'dependencies': [],
- 'defines': [
- 'WEBRTC_APM_DEBUG_DUMP=0',
-@@ -14,11 +15,11 @@
- 'variables': {
- 'tgvoip_src_loc': '.',
- 'official_build_target%': '',
-- 'linux_path_opus_include%': '<(DEPTH)/../../../Libraries/opus/include',
- },
- 'include_dirs': [
- '<(tgvoip_src_loc)/webrtc_dsp',
-- '<(linux_path_opus_include)',
-+ '<!(rpm --eval "%{_includedir}")',
-+ '<!(rpm --eval "%{_includedir}/opus")',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
-@@ -72,8 +73,6 @@
- '<(tgvoip_src_loc)/video/VideoSource.h',
- '<(tgvoip_src_loc)/video/VideoRenderer.cpp',
- '<(tgvoip_src_loc)/video/VideoRenderer.h',
-- '<(tgvoip_src_loc)/json11.cpp',
-- '<(tgvoip_src_loc)/json11.hpp',
+diff --git a/Makefile.am b/Makefile.am
+index 03c8866..0320457 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -26,8 +26,7 @@ audio/Resampler.cpp \
+ os/posix/NetworkSocketPosix.cpp \
+ video/VideoSource.cpp \
+ video/VideoRenderer.cpp \
+-video/ScreamCongestionController.cpp \
+-json11.cpp
++video/ScreamCongestionController.cpp
- # Windows
- '<(tgvoip_src_loc)/os/windows/NetworkSocketWinsock.cpp',
-@@ -724,7 +723,9 @@
+ TGVOIP_HDRS = \
+ TgVoip.h \
+@@ -55,7 +54,6 @@ os/posix/NetworkSocketPosix.h \
+ video/VideoSource.h \
+ video/VideoRenderer.h \
+ video/ScreamCongestionController.h \
+-json11.hpp \
+ utils.h
+ if TARGET_OS_OSX
+@@ -751,6 +749,7 @@ else
+ CFLAGS += -DTGVOIP_NO_DSP
+ endif
- ],
-- 'libraries': [],
-+ 'libraries': [
-+ 'json11',
-+ ],
- 'configurations': {
- 'Debug': {},
- 'Release': {},
++libtgvoip_la_LDFLAGS = -version-number @LIBTGVOIP_MAJOR_VERSION@:@LIBTGVOIP_MINOR_VERSION@:@LIBTGVOIP_PATCH_VERSION@
+ libtgvoip_la_SOURCES = $(SRC) $(TGVOIP_HDRS)
+ tgvoipincludedir = $(includedir)/tgvoip
+ nobase_tgvoipinclude_HEADERS = $(TGVOIP_HDRS)
+@@ -759,4 +758,4 @@ CXXFLAGS += -std=gnu++0x $(CFLAGS)
+ if TARGET_OS_OSX
+ OBJCFLAGS = $(CFLAGS)
+ OBJCXXFLAGS += -std=gnu++0x $(CFLAGS)
+-endif
+\ No newline at end of file
++endif
+diff --git a/configure.ac b/configure.ac
+index 222f541..cfad4ef 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,8 +1,14 @@
+ # -*- Autoconf -*-
+ # Process this file with autoconf to produce a configure script.
+
++# Define version information
++m4_define([libtgvoip_major_version], 2)
++m4_define([libtgvoip_minor_version], 4)
++m4_define([libtgvoip_patch_version], 4)
++m4_define([libtgvoip_version],[libtgvoip_major_version.libtgvoip_minor_version.libtgvoip_patch_version])
++
+ AC_PREREQ([2.69])
+-AC_INIT([libtgvoip], [2.4.4], [https://github.com/grishka/libtgvoip/issues])
++AC_INIT([libtgvoip], [libtgvoip_version], [https://github.com/grishka/libtgvoip/issues])
+ AC_CONFIG_SRCDIR([config.h.in])
+ AC_CONFIG_HEADERS([config.h])
+ AM_INIT_AUTOMAKE([subdir-objects])
+@@ -21,9 +27,14 @@ AC_CHECK_LIB([crypto], [SHA1], [], [AC_MSG_FAILURE([libssl-dev is required but n
+ AC_CHECK_LIB([m], [floorf])
+ AC_CHECK_LIB([opus], [opus_decoder_create], [], [AC_MSG_FAILURE([libopus-dev is required but not found])])
+ AC_CHECK_LIB([pthread], [pthread_create])
++AC_CHECK_LIB([json11], [main], [], [AC_MSG_FAILURE([json11-dev is required but not found])])
+
+ AC_CANONICAL_HOST
+
++AC_SUBST(LIBTGVOIP_MAJOR_VERSION, libtgvoip_major_version)
++AC_SUBST(LIBTGVOIP_MINOR_VERSION, libtgvoip_minor_version)
++AC_SUBST(LIBTGVOIP_PATCH_VERSION, libtgvoip_patch_version)
++
+ AS_CASE([$host_cpu],
+ [i?86], [cpu_x86=yes],
+ [x86_64], [cpu_x86=yes],
--
-2.20.1
+2.24.1
diff --git a/libtgvoip-pr6.patch b/libtgvoip-pr6.patch
new file mode 100644
index 0000000..5202825
--- /dev/null
+++ b/libtgvoip-pr6.patch
@@ -0,0 +1,61 @@
+From d1ae8b3704bb80ffb8f06b471bd5c33d7c8c92cb Mon Sep 17 00:00:00 2001
+From: Ilya Fedin <fedin-ilja2010(a)ya.ru>
+Date: Sun, 5 Jan 2020 12:25:31 +0400
+Subject: [PATCH] Add support for pkg-config
+
+---
+ Makefile.am | 2 ++
+ configure.ac | 4 +++-
+ tgvoip.pc.in | 10 ++++++++++
+ 3 files changed, 15 insertions(+), 1 deletion(-)
+ create mode 100644 tgvoip.pc.in
+
+diff --git a/Makefile.am b/Makefile.am
+index 03c8866..a9c9715 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -755,6 +755,8 @@ libtgvoip_la_SOURCES = $(SRC) $(TGVOIP_HDRS)
+ tgvoipincludedir = $(includedir)/tgvoip
+ nobase_tgvoipinclude_HEADERS = $(TGVOIP_HDRS)
+
++pkgconfig_DATA = tgvoip.pc
++
+ CXXFLAGS += -std=gnu++0x $(CFLAGS)
+ if TARGET_OS_OSX
+ OBJCFLAGS = $(CFLAGS)
+diff --git a/configure.ac b/configure.ac
+index 222f541..e2df927 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9,6 +9,8 @@ AM_INIT_AUTOMAKE([subdir-objects])
+ AM_SILENT_RULES([yes])
+ LT_INIT
+
++PKG_INSTALLDIR
++
+ # Checks for programs.
+ AC_PROG_CXX
+ AC_PROG_CC
+@@ -109,5 +111,5 @@ AC_FUNC_MALLOC
+ AC_FUNC_REALLOC
+ AC_CHECK_FUNCS([clock_gettime floor gettimeofday inet_ntoa memmove memset select socket sqrt strcasecmp strchr strerror strncasecmp strstr strtol strtoul uname])
+
+-AC_CONFIG_FILES([Makefile])
++AC_CONFIG_FILES([Makefile tgvoip.pc])
+ AC_OUTPUT
+diff --git a/tgvoip.pc.in b/tgvoip.pc.in
+new file mode 100644
+index 0000000..1ca7758
+--- /dev/null
++++ b/tgvoip.pc.in
+@@ -0,0 +1,10 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: tgvoip
++Description: VoIP library for Telegram clients
++Version: 2.4.4
++Libs: -L${libdir} -ltgvoip
++Cflags: -I${includedir}/tgvoip
diff --git a/libtgvoip.spec b/libtgvoip.spec
index 208b546..2599c14 100644
--- a/libtgvoip.spec
+++ b/libtgvoip.spec
@@ -1,16 +1,23 @@
+%global commit0 88b47b6f808f2573d4eaf37e1463ecd59c43deda
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+%global date 20191230
+
Name: libtgvoip
Version: 2.4.4
-Release: 2%{?dist}
-Summary: VoIP library for Telegram clients
+Release: 3.%{date}git%{shortcommit0}%{?dist}
# Libtgvoip shared library - Public Domain.
# Bundled webrtc library - BSD with patented echo cancellation algorithms.
License: Public Domain and BSD
-URL: https://github.com/grishka/%{name}
+URL: https://github.com/telegramdesktop/%{name}
+Summary: VoIP library for Telegram clients
-Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0: %{url}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
Patch0: %{name}-build-fixes.patch
+# https://github.com/telegramdesktop/libtgvoip/pull/6
+Patch100: %{name}-pr6.patch
+
Provides: bundled(webrtc-audio-processing) = 0.3
BuildRequires: pulseaudio-libs-devel
@@ -18,10 +25,11 @@ BuildRequires: alsa-lib-devel
BuildRequires: openssl-devel
BuildRequires: json11-devel
BuildRequires: opus-devel
+BuildRequires: automake
+BuildRequires: autoconf
BuildRequires: gcc-c++
-BuildRequires: cmake
+BuildRequires: libtool
BuildRequires: gcc
-BuildRequires: gyp
%description
Provides VoIP library for Telegram clients.
@@ -34,111 +42,33 @@ Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%{summary}.
%prep
-%autosetup -p1
+%autosetup -n %{name}-%{commit0} -p1
+rm -f json11.*
%build
-export VOIPVER="%{version}"
-gyp --format=cmake --depth=. --generator-output=. -Goutput_dir=out -Gconfig=Release %{name}.gyp
-
-pushd out/Release
- %cmake .
- %make_build
-popd
+autoreconf --force --install
+%configure --disable-static
+%make_build
%install
-# Installing shared library...
-%{__mkdir_p} "%{buildroot}%{_libdir}"
-%{__install} -m 0755 -p out/Release/lib.target/%{name}.so.%{version} "%{buildroot}%{_libdir}/%{name}.so.%{version}"
-%{__ln_s} %{name}.so.%{version} "%{buildroot}%{_libdir}/%{name}.so.2.4"
-%{__ln_s} %{name}.so.%{version} "%{buildroot}%{_libdir}/%{name}.so.2"
-%{__ln_s} %{name}.so.%{version} "%{buildroot}%{_libdir}/%{name}.so"
-
-# Installing additional development files...
-%{__mkdir_p} "%{buildroot}%{_includedir}/%{name}"
-find . -maxdepth 1 -type f -name "*.h" -exec install -m 0644 -p '{}' %{buildroot}%{_includedir}/%{name} \;
-%{__mkdir_p} "%{buildroot}%{_includedir}/%{name}/audio"
-find audio -maxdepth 1 -type f -name "*.h" -exec install -m 0644 -p '{}' %{buildroot}%{_includedir}/%{name}/audio \;
-%{__mkdir_p} "%{buildroot}%{_includedir}/%{name}/video"
-find video -maxdepth 1 -type f -name "*.h" -exec install -m 0644 -p '{}' %{buildroot}%{_includedir}/%{name}/video \;
+%make_install
+rm -f %{buildroot}%{_libdir}/*.la
%files
%license UNLICENSE
%{_libdir}/%{name}.so.*
%files devel
-%{_includedir}/%{name}
+%{_includedir}/tgvoip/
%{_libdir}/%{name}.so
+%{_libdir}/pkgconfig/tgvoip.pc
%changelog
+* Thu Jan 09 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.4.4-3.20191230git88b47b6
+- Switched to supported fork.
+
* Fri Aug 09 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.4.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Tue Mar 12 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.4.4-1
- Updated to 2.4.4 (regular release).
-
-* Sat Mar 09 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.4.2-4
-- Enabled ARM builds again.
-- Minor SPEC fixes.
-
-* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 2.4.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Jan 22 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.4.2-2
-- Rebuilt for Rawhide.
-
-* Sat Jan 12 2019 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.4.2-1
-- Updated to 2.4.2 (regular release).
-
-* Tue Dec 11 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.4-2
-- Backported upstream patch with crash and build fixes.
-
-* Tue Dec 11 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.4-1
-- Updated to 2.4 (regular release).
-
-* Sat Nov 10 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.3-1
-- Updated to 2.3 (regular release).
-
-* Sun Sep 02 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.2.4-1
-- Updated to 2.2.4 (regular release).
-
-* Mon Aug 27 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.2.3-2
-- Added upstream patch with proxy fix.
-
-* Fri Aug 24 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.2.3-1
-- Updated to 2.2.3 (regular release).
-
-* Fri Jul 20 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.2-1
-- Updated to 2.2 (regular release).
-
-* Mon Jul 02 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.1.1-1
-- Updated to 2.1.1 (regular release).
-
-* Tue Jun 05 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.1-0.1.20180604git6a8f543
-- Updated to 2.1 (snapshot).
-
-* Tue May 29 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.0-0.3.20180528git83ac2c6
-- Updated to latest snapshot.
-
-* Sun May 27 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.0-0.2.20180525gitd2453dd
-- Updated to latest snapshot.
-
-* Thu May 24 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.0-0.1.20180515gitb52eb58
-- Updated to 2.0-alpha4 (snapshot).
-
-* Fri Dec 29 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.0.3-1
-- Updated to 1.0.3 (regular release).
-
-* Sat Nov 18 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.0.1-2.20171111git6a0b3b2
-- Provide compactibility with 1.0.
-
-* Sat Nov 18 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.0.1-1.20171111git6a0b3b2
-- Updated to 1.0.1-git.
-
-* Fri Aug 04 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.0-3.20170801gitbfd5cfe
-- Fixed build on other architectures. Build against regular OpenSSL.
-
-* Wed Aug 02 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.0-2.20170801gitbfd5cfe
-- Updated to latest snapshot. Small SPEC fixes. Added virtual provides.
-
-* Tue Aug 01 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.0-1.20170727git01f2701
-- Initial release.
diff --git a/sources b/sources
index a16432a..b156de6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f232e43f65cf9c6ebad831ee24b74d48 libtgvoip-2.4.4.tar.gz
+SHA512 (libtgvoip-88b47b6.tar.gz) = 1c05f1741c1b117c79961641fd4994b6a3c8f95f3fdb2b51a09afc4b900bed7e4f323d9f2da724ea8dd7516fc7b423d965f70ba976736e26e7cba2bf2203eefd
4 years, 4 months
[ldoce5viewer] Adopt to use new inkscape (>=1.0)
by Damian Wrobel
commit 7021b57277bc9fad540ffb7ee9721b293aca1149
Author: Damian Wrobel <dwrobel(a)ertelnet.rybnik.pl>
Date: Wed Jan 8 16:15:10 2020 +0100
Adopt to use new inkscape (>=1.0)
...e5viewer-Fix-for-new-inkscape-and-python3.patch | 86 ++++++++++++++++++++++
ldoce5viewer.spec | 8 +-
2 files changed, 93 insertions(+), 1 deletion(-)
---
diff --git a/ldoce5viewer-Fix-for-new-inkscape-and-python3.patch b/ldoce5viewer-Fix-for-new-inkscape-and-python3.patch
new file mode 100644
index 0000000..8cb80bb
--- /dev/null
+++ b/ldoce5viewer-Fix-for-new-inkscape-and-python3.patch
@@ -0,0 +1,86 @@
+From e17a19a86c5f7a02c6005fe0ebe2e608226fe694 Mon Sep 17 00:00:00 2001
+From: Damian Wrobel <dwrobel(a)ertelnet.rybnik.pl>
+Date: Wed, 8 Jan 2020 15:58:39 +0100
+Subject: [PATCH] Fix for new inkscape and python3
+
+New inkscape do not longer support -e option (use -o instead).
+---
+ ldoce5viewer/qtgui/resources/icons/Makefile | 6 ++++--
+ ldoce5viewer/qtgui/resources/icons/icongen.py | 14 +++++++-------
+ 2 files changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/ldoce5viewer/qtgui/resources/icons/Makefile b/ldoce5viewer/qtgui/resources/icons/Makefile
+index c2a784a..ba46712 100644
+--- a/ldoce5viewer/qtgui/resources/icons/Makefile
++++ b/ldoce5viewer/qtgui/resources/icons/Makefile
+@@ -8,13 +8,15 @@ PNG_16 := $(patsubst %-src.png, %-16.png, $(PNG_SRC))
+ all: $(PNG_24) $(PNG_22) $(PNG_16)
+
+ %-48-src.png: %.svg icongen.py
+- inkscape -w 96 -h 96 -e $@ $<
++ inkscape --help | grep -- --export-file= >/dev/null \
++ && inkscape -w 96 -h 96 -o $@ $< \
++ || inkscape -w 96 -h 96 -e $@ $<
+
+ edit-clear-48.png: edit-clear-48-src.png
+ cp $< $@
+
+ %-48.png: %-48-src.png
+- python2 icongen.py $< $@
++ python3 icongen.py $< $@
+
+ %-24.png: %-48.png
+ convert $< -filter Lanczos -resize 24x24 $@
+diff --git a/ldoce5viewer/qtgui/resources/icons/icongen.py b/ldoce5viewer/qtgui/resources/icons/icongen.py
+index e27000c..aed5c6c 100644
+--- a/ldoce5viewer/qtgui/resources/icons/icongen.py
++++ b/ldoce5viewer/qtgui/resources/icons/icongen.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2
++#!/usr/bin/env python3
+
+ import sys
+
+@@ -12,22 +12,22 @@
+ def cast_gradation(img, b1, b2):
+ (w, h) = img.size
+ pix = img.load()
+- for y in xrange(h):
++ for y in range(h):
+ c = b1 + (b2 - b1) * (float(y) / (h - 1))
+- for x in xrange(w):
++ for x in range(w):
+ pix[x, y] += int(c + 0.5)
+ return img
+
+
+ def make_inset_shadow(alpha):
+ mc = alpha.copy()
+- for i in xrange(6):
++ for i in range(6):
+ mc = mc.filter(ImageFilter.SMOOTH_MORE)
+ mc = ImageChops.subtract(alpha, mc)
+ mcb = ImageEnhance.Brightness(mc).enhance(0.35)
+
+ m1 = alpha.copy()
+- for i in xrange(6):
++ for i in range(6):
+ m1 = m1.filter(ImageFilter.SMOOTH_MORE)
+ m1 = ImageChops.offset(m1, 0, OFFSET_S)
+ m1 = ImageChops.subtract(alpha, m1)
+@@ -40,13 +40,13 @@ def make_inset_shadow(alpha):
+
+ def make_highlight(alpha):
+ mc = alpha.copy()
+- for i in xrange(3):
++ for i in range(3):
+ mc = mc.filter(ImageFilter.SMOOTH_MORE)
+ mc = ImageChops.subtract(mc, alpha)
+ mcb = ImageEnhance.Brightness(mc).enhance(0.35)
+
+ m1 = alpha.copy()
+- for i in xrange(2):
++ for i in range(2):
+ m1 = m1.filter(ImageFilter.SMOOTH_MORE)
+ m1 = ImageChops.offset(m1, 0, OFFSET_H)
+ m1 = ImageChops.subtract(m1, alpha)
diff --git a/ldoce5viewer.spec b/ldoce5viewer.spec
index 27c849c..cf50d23 100644
--- a/ldoce5viewer.spec
+++ b/ldoce5viewer.spec
@@ -4,7 +4,7 @@
Name: ldoce5viewer
Version: 0
-Release: 11.%{date}git%{shortcommit0}%{?dist}
+Release: 12.%{date}git%{shortcommit0}%{?dist}
Summary: Viewer Application for the Longman Dictionary (LDOCE 5)
License: GPLv3+ and Public Domain
URL: https://forward-backward.co.jp/ldoce5viewer/
@@ -17,6 +17,9 @@ Patch0: https://patch-diff.githubusercontent.com/raw/ciscorn/ldoce5viewe
Patch1: https://patch-diff.githubusercontent.com/raw/ciscorn/ldoce5viewer/pull/69...
# Not sent upstream as it's read-only now.
Patch2: https://github.com/dwrobel/ldoce5viewer/commit/85690cc4bec3f0c9352d64a215...
+# Adopt to use new inkscape (>=1.0) (use -o instead of -o option)
+# Not sent upstream as it's read-only now.
+Patch3: https://github.com/dwrobel/ldoce5viewer/commit/e17a19a86c5f7a02c6005fe0eb...
BuildArch: noarch
@@ -138,6 +141,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Wed Jan 08 2020 Damian Wrobel <dwrobel(a)ertelnet.rybnik.pl> - 0-12.20180309git377ff48
+- Adopt to use new inkscape (>=1.0)
+
* Tue Jan 07 2020 Damian Wrobel <dwrobel(a)ertelnet.rybnik.pl> - 0-11.20180309git377ff48
- Add missing patch
4 years, 4 months
[ffmpegthumbnailer] Add audio covers to mime types
by Leigh Scott
commit de0248db11d5b1def29aa0ea4df6bbdfec08021e
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jan 8 11:38:33 2020 +0000
Add audio covers to mime types
add_audio_cover.patch | 9 +++++++++
ffmpegthumbnailer.spec | 6 +++++-
2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/add_audio_cover.patch b/add_audio_cover.patch
new file mode 100644
index 0000000..e5c4aed
--- /dev/null
+++ b/add_audio_cover.patch
@@ -0,0 +1,9 @@
+--- a/dist/ffmpegthumbnailer.thumbnailer
++++ b/dist/ffmpegthumbnailer.thumbnailer
+@@ -1,4 +1,4 @@
+ [Thumbnailer Entry]
+ TryExec=ffmpegthumbnailer
+ Exec=ffmpegthumbnailer -i %i -o %o -s %s -f
+-MimeType=video/jpeg;video/mp4;video/mpeg;video/quicktime;video/x-ms-asf;video/x-ms-wm;video/x-ms-wmv;video/x-ms-asx;video/x-ms-wmx;video/x-ms-wvx;video/x-msvideo;video/x-flv;video/x-matroska;application/mxf;video/3gp;video/3gpp;video/dv;video/divx;video/fli;video/flv;video/mp2t;video/mp4v-es;video/msvideo;video/ogg;video/vivo;video/vnd.divx;video/vnd.mpegurl;video/vnd.rn-realvideo;application/vnd.rn-realmedia;video/vnd.vivo;video/webm;video/x-anim;video/x-avi;video/x-flc;video/x-fli;video/x-flic;video/x-m4v;video/x-mpeg;video/x-mpeg2;video/x-nsv;video/x-ogm+ogg;video/x-theora+ogg
++MimeType=video/jpeg;video/mp4;video/mpeg;video/quicktime;video/x-ms-asf;video/x-ms-wm;video/x-ms-wmv;video/x-ms-asx;video/x-ms-wmx;video/x-ms-wvx;video/x-msvideo;video/x-flv;video/x-matroska;application/mxf;video/3gp;video/3gpp;video/dv;video/divx;video/fli;video/flv;video/mp2t;video/mp4v-es;video/msvideo;video/ogg;video/vivo;video/vnd.divx;video/vnd.mpegurl;video/vnd.rn-realvideo;application/vnd.rn-realmedia;video/vnd.vivo;video/webm;video/x-anim;video/x-avi;video/x-flc;video/x-fli;video/x-flic;video/x-m4v;video/x-mpeg;video/x-mpeg2;video/x-nsv;video/x-ogm+ogg;video/x-theora+ogg;audio/flac;audio/mpeg
+
diff --git a/ffmpegthumbnailer.spec b/ffmpegthumbnailer.spec
index 5d068b2..881199d 100644
--- a/ffmpegthumbnailer.spec
+++ b/ffmpegthumbnailer.spec
@@ -1,12 +1,13 @@
Name: ffmpegthumbnailer
Version: 2.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Lightweight video thumbnailer that can be used by file managers
License: GPLv2+
URL: https://github.com/dirkvdb/%{name}
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: %{url}/commit/339ebc5aa634b4680585d7c36317ab6f162ca2a9.patch#/fix_object_target.patch
+Patch1: add_audio_cover.patch
BuildRequires: ffmpeg-devel
BuildRequires: libpng-devel
@@ -62,6 +63,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%changelog
+* Wed Jan 08 2020 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.2-2
+- Add audio covers to mime types
+
* Wed Jan 08 2020 Leigh Scott <leigh123linux(a)googlemail.com> - 2.2.2-1
- Update ffmpegthumbnailer to 2.2.2
4 years, 4 months
[chromium-browser-privacy: 2/2] Update to 79.0.3945.117
by qvint
commit 3c8f2f0d9a843cd02db8d2ea56882c00525afaa4
Author: qvint <dotqvint(a)gmail.com>
Date: Wed Jan 8 07:40:54 2020 +0300
Update to 79.0.3945.117
- Update Chromium to 79.0.3945.117
- Update ungoogled-chromium to 79.0.3945.117-1
chromium-browser-privacy.spec | 8 ++++++--
sources | 4 ++--
2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/chromium-browser-privacy.spec b/chromium-browser-privacy.spec
index 9da2de1..509daf0 100644
--- a/chromium-browser-privacy.spec
+++ b/chromium-browser-privacy.spec
@@ -69,7 +69,7 @@
%global ozone 0
##############################Package Definitions######################################
Name: chromium-browser-privacy
-Version: 79.0.3945.88
+Version: 79.0.3945.117
Release: 1%{?dist}
Summary: Chromium, sans integration with Google
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -91,7 +91,7 @@ Source0: https://commondatastorage.googleapis.com/chromium-browser-official/c
# ./chromium-latest.py --stable --ffmpegclean --ffmpegarm --deleteunrar
Source0: chromium-%{version}-clean.tar.xz
%endif
-%global ungoogled_chromium_revision 7ddfefbcea9945595d09ed574437f5f3d328e553
+%global ungoogled_chromium_revision 79.0.3945.117-1
Source300: https://github.com/Eloston/ungoogled-chromium/archive/%{ungoogled_chromiu...
# The following two source files are copied and modified from the chromium source
Source10: %{name}.sh
@@ -797,6 +797,10 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/swiftshader/libGLESv2.so
#########################################changelogs#################################################
%changelog
+* Wed Jan 08 2020 qvint <dotqvint(a)gmail.com> - 79.0.3945.117-1
+- Update Chromium to 79.0.3945.117
+- Update ungoogled-chromium to 79.0.3945.117-1
+
* Wed Dec 18 2019 qvint <dotqvint(a)gmail.com> - 79.0.3945.88-1
- Update Chromium to 79.0.3945.88
- Update ungoogled-chromium to 7ddfefb
diff --git a/sources b/sources
index 11a1b3a..55f6fae 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (chromium-79.0.3945.88.tar.xz) = 6474da7225beb9c99c01dc234b820924dd2fb3d736f53abbac02556f3bec43acd09aa02224666c4a735417500d10f57265ab130c29cce27124e5a69463cf5e0d
-SHA512 (ungoogled-chromium-7ddfefbcea9945595d09ed574437f5f3d328e553.tar.gz) = 6f404a2e2c7888b75116125b2498ffa6486e2be3580cc29d7c6fd7832c38c4cff4d1d832133fcdb245684b819febce79ae15f5ed43a0dc943ccd47287a968b3d
+SHA512 (chromium-79.0.3945.117.tar.xz) = bba4f52eec8011f92e3098d29269d978b6e2571593b66c93bf6767bab00f7984e733e6df5fde883b9f643e86b1ad527c3ec7d43ba381b48935512ad82e931e26
+SHA512 (ungoogled-chromium-79.0.3945.117-1.tar.gz) = ad74112a0160c7703467d82c4a16924c030e2615f524ce9352bfa172a9a043c2ae34d12ee84d1d230101434b0377649a4d06ff6542bd49335e7e88b09f6678af
4 years, 4 months