[pipelight/f28] Fix for rfbz #4811
by Sérgio M. Basto
Summary of changes:
3d378e3... Fix for rfbz #4811 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months
[mythtv/el7] (6 commits) ...Merge branch 'el7'
by Sérgio M. Basto
Summary of changes:
b45ee01... Comment out install section of mythdv-optimize.service as i (*)
4bfee5e... Rebuilt for new x265 (*)
caf8e51... Update logrotate config, fixes RFBZ#4133. (*)
617d9b5... Update to v29.1-8-g925ceea0fb from branch fixes/29. Update (*)
28e870d... Fixes nothing provides mythnetvision needed by mythplugins (*)
8b06733... Merge branch 'el7' (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months
[mythtv: 7/7] Merge branch 'el7'
by Sérgio M. Basto
commit 8b06733a6d52d8977e88a13badb873de968f7650
Merge: 28e870d 7dfcea8
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Mar 9 14:32:12 2018 +0000
Merge branch 'el7'
---
6 years, 7 months
[mythtv] (7 commits) ...Merge branch 'el7'
by Sérgio M. Basto
Summary of changes:
baf7451... Fix conditionals for python-requests and python-requests-ca (*)
6da9f0b... Minor bump to rebuild. (*)
bbd315f... Revert "Minor bump to rebuild." (*)
25203d6... Merge branch 'master' into el7 (*)
aca39b0... Drop ldflags until it's sustainable upstream (*)
7dfcea8... Merge branch 'master' into el7 (*)
8b06733... Merge branch 'el7'
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months
[telegram-desktop] Fixed build under Rawhide.
by Vitaly Zaitsev
commit 5deaebbc054807298fa7830951019bebe20e5697
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri Mar 9 14:19:21 2018 +0100
Fixed build under Rawhide.
telegram-desktop-build-fixes.patch | 99 ++++++++++++++++++++++++++++++++------
telegram-desktop.spec | 1 +
2 files changed, 86 insertions(+), 14 deletions(-)
---
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index 3df70da..55563c6 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From a9e7e1727145cef91fcf40f5950ab09df9e10656 Mon Sep 17 00:00:00 2001
+From 6fa7caa33fa5604dc9099389b8381e3f160320cd Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri, 31 Mar 2017 14:29:58 +0200
Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock.
@@ -9,16 +9,17 @@ Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock.
Telegram/SourceFiles/qt_functions.cpp | 94 +++++++++++++++++++++++++++++++
Telegram/gyp/CMakeLists.inj | 3 +
Telegram/gyp/PrecompiledHeader.cmake | 4 +-
- Telegram/gyp/Telegram.gyp | 27 ++-------
- Telegram/gyp/qt.gypi | 81 +++++++-------------------
- Telegram/gyp/qt_moc.gypi | 3 +-
+ Telegram/gyp/Telegram.gyp | 29 +++-------
+ Telegram/gyp/codegen_rules.gypi | 8 +--
+ Telegram/gyp/qt.gypi | 87 ++++++++--------------------
+ Telegram/gyp/qt_moc.gypi | 5 +-
Telegram/gyp/qt_rcc.gypi | 2 +-
Telegram/gyp/settings_linux.gypi | 5 --
- Telegram/gyp/telegram_linux.gypi | 84 +++++++--------------------
+ Telegram/gyp/telegram_linux.gypi | 86 +++++++---------------------
Telegram/gyp/telegram_sources.txt | 9 +--
lib/xdg/telegramdesktop.appdata.xml | 2 +-
lib/xdg/telegramdesktop.desktop | 6 +-
- 14 files changed, 156 insertions(+), 167 deletions(-)
+ 15 files changed, 166 insertions(+), 177 deletions(-)
create mode 100644 Telegram/SourceFiles/qt_functions.cpp
create mode 100644 Telegram/gyp/CMakeLists.inj
@@ -177,7 +178,7 @@ index 5d6830e9..c3f08d3f 100644
IMPLICIT_DEPENDS CXX "${_pch_header}"
COMMENT "Precompiling ${_name} for ${_target} (C++)")
diff --git a/Telegram/gyp/Telegram.gyp b/Telegram/gyp/Telegram.gyp
-index 62a4197f..a500611a 100644
+index 62a4197f..9e5379b9 100644
--- a/Telegram/gyp/Telegram.gyp
+++ b/Telegram/gyp/Telegram.gyp
@@ -18,7 +18,6 @@
@@ -188,7 +189,13 @@ index 62a4197f..a500611a 100644
'sp_media_key_tap_loc': '<(submodules_loc)/SPMediaKeyTap',
'emoji_suggestions_loc': '<(submodules_loc)/emoji_suggestions',
'style_files': [
-@@ -54,8 +53,6 @@
+@@ -49,13 +48,11 @@
+ 'pt-BR',
+ ],
+ 'build_defines%': '',
+- 'list_sources_command': 'python <(DEPTH)/list_sources.py --input <(DEPTH)/telegram_sources.txt --replace src_loc=<(src_loc)',
++ 'list_sources_command': 'python2 <(DEPTH)/list_sources.py --input <(DEPTH)/telegram_sources.txt --replace src_loc=<(src_loc)',
+ },
'includes': [
'common_executable.gypi',
'telegram_qrc.gypi',
@@ -246,8 +253,46 @@ index 62a4197f..a500611a 100644
],
}],
],
+diff --git a/Telegram/gyp/codegen_rules.gypi b/Telegram/gyp/codegen_rules.gypi
+index bb611a87..a2e54f67 100644
+--- a/Telegram/gyp/codegen_rules.gypi
++++ b/Telegram/gyp/codegen_rules.gypi
+@@ -15,7 +15,7 @@
+ '<(SHARED_INTERMEDIATE_DIR)/update_dependent_styles.timestamp',
+ ],
+ 'action': [
+- 'python', '<(DEPTH)/update_dependent.py', '--styles',
++ 'python2', '<(DEPTH)/update_dependent.py', '--styles',
+ '-I', '<(res_loc)', '-I', '<(src_loc)',
+ '-o', '<(SHARED_INTERMEDIATE_DIR)/update_dependent_styles.timestamp',
+ '<@(style_files)',
+@@ -26,13 +26,13 @@
+ 'inputs': [
+ '<(DEPTH)/update_dependent.py',
+ '<@(qrc_files)',
+- '<!@(python <(DEPTH)/update_dependent.py --qrc_list <@(qrc_files))',
++ '<!@(python2 <(DEPTH)/update_dependent.py --qrc_list <@(qrc_files))',
+ ],
+ 'outputs': [
+ '<(SHARED_INTERMEDIATE_DIR)/update_dependent_qrc.timestamp',
+ ],
+ 'action': [
+- 'python', '<(DEPTH)/update_dependent.py', '--qrc',
++ 'python2', '<(DEPTH)/update_dependent.py', '--qrc',
+ '-o', '<(SHARED_INTERMEDIATE_DIR)/update_dependent_qrc.timestamp',
+ '<@(qrc_files)',
+ ],
+@@ -109,7 +109,7 @@
+ '<(SHARED_INTERMEDIATE_DIR)/scheme.h',
+ ],
+ 'action': [
+- 'python', '<(src_loc)/codegen/scheme/codegen_scheme.py',
++ 'python2', '<(src_loc)/codegen/scheme/codegen_scheme.py',
+ '-o', '<(SHARED_INTERMEDIATE_DIR)', '<(res_loc)/scheme.tl',
+ ],
+ 'message': 'codegen_scheme-ing scheme.tl..',
diff --git a/Telegram/gyp/qt.gypi b/Telegram/gyp/qt.gypi
-index 0b783ec2..2d42d344 100644
+index 0b783ec2..653562ff 100644
--- a/Telegram/gyp/qt.gypi
+++ b/Telegram/gyp/qt.gypi
@@ -14,25 +14,21 @@
@@ -278,7 +323,7 @@ index 0b783ec2..2d42d344 100644
}]
]
},
-@@ -72,32 +68,13 @@
+@@ -72,44 +68,25 @@
],
}],
[ 'build_linux', {
@@ -314,6 +359,21 @@ index 0b783ec2..2d42d344 100644
],
}],
],
+ },
+ 'qt_version%': '<(qt_version)',
+ 'qt_loc_unix': '<(qt_loc_unix)',
+- 'qt_version_loc': '<!(python -c "print(\'<(qt_version)\'.replace(\'.\', \'_\'))")',
++ 'qt_version_loc': '<!(python2 -c "print(\'<(qt_version)\'.replace(\'.\', \'_\'))")',
+ 'qt_libs_debug': [
+- '<!@(python -c "for s in \'<@(qt_libs)\'.split(\' \'): print(\'<(qt_lib_prefix)\' + s + \'<(qt_lib_debug_postfix)\')")',
++ '<!@(python2 -c "for s in \'<@(qt_libs)\'.split(\' \'): print(\'<(qt_lib_prefix)\' + s + \'<(qt_lib_debug_postfix)\')")',
+ ],
+ 'qt_libs_release': [
+- '<!@(python -c "for s in \'<@(qt_libs)\'.split(\' \'): print(\'<(qt_lib_prefix)\' + s + \'<(qt_lib_release_postfix)\')")',
++ '<!@(python2 -c "for s in \'<@(qt_libs)\'.split(\' \'): print(\'<(qt_lib_prefix)\' + s + \'<(qt_lib_release_postfix)\')")',
+ ],
+ },
+ 'qt_libs_debug': [ '<@(qt_libs_debug)' ],
@@ -122,16 +99,11 @@
'qt_loc': '<(qt_loc_unix)',
}],
@@ -403,10 +463,10 @@ index 0b783ec2..2d42d344 100644
'-rdynamic',
],
diff --git a/Telegram/gyp/qt_moc.gypi b/Telegram/gyp/qt_moc.gypi
-index 464d3c81..4f4d9cef 100644
+index 464d3c81..909c4c5a 100644
--- a/Telegram/gyp/qt_moc.gypi
+++ b/Telegram/gyp/qt_moc.gypi
-@@ -12,11 +12,12 @@
+@@ -12,12 +12,13 @@
'<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp',
],
'action': [
@@ -416,10 +476,12 @@ index 464d3c81..4f4d9cef 100644
# Silence "Note: No relevant classes found. No output generated."
'--no-notes',
+- '<!@(python -c "for s in \'<@(_defines)\'.split(\' \'): print(\'-D\' + s)")',
+ '<!@(rpm --eval "%{optflags}" | grep -Po "[-]([IDU]\s*\S*|E)")',
- '<!@(python -c "for s in \'<@(_defines)\'.split(\' \'): print(\'-D\' + s)")',
++ '<!@(python2 -c "for s in \'<@(_defines)\'.split(\' \'): print(\'-D\' + s)")',
# '<!@(python -c "for s in \'<@(_include_dirs)\'.split(\' \'): print(\'-I\' + s)")',
'<(RULE_INPUT_PATH)',
+ '-o', '<(SHARED_INTERMEDIATE_DIR)/<(_target_name)/moc/moc_<(RULE_INPUT_ROOT).cpp',
diff --git a/Telegram/gyp/qt_rcc.gypi b/Telegram/gyp/qt_rcc.gypi
index f5624a82..b644ce29 100644
--- a/Telegram/gyp/qt_rcc.gypi
@@ -457,9 +519,18 @@ index a4b5f58a..9658b5c3 100644
],
'cflags_c': [
diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index a5b4b197..05d3dca2 100644
+index a5b4b197..19aefb6b 100644
--- a/Telegram/gyp/telegram_linux.gypi
+++ b/Telegram/gyp/telegram_linux.gypi
+@@ -7,7 +7,7 @@
+ {
+ 'conditions': [[ 'build_linux', {
+ 'variables': {
+- 'not_need_gtk%': '<!(python -c "print(\'TDESKTOP_DISABLE_GTK_INTEGRATION\' in \'<(build_defines)\')")',
++ 'not_need_gtk%': '<!(python2 -c "print(\'TDESKTOP_DISABLE_GTK_INTEGRATION\' in \'<(build_defines)\')")',
+ 'pkgconfig_libs': [
+ # In order to work libxkbcommon must be linked statically,
+ # PKGCONFIG links it like "-L/usr/local/lib -lxkbcommon"
@@ -15,99 +15,53 @@
# QApplication() -> createPlatformIntegration -> QXcbIntegrationPlugin::create
#'xkbcommon',
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 07625a5..0c41aba 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -57,6 +57,7 @@ BuildRequires: opus-devel
BuildRequires: gtk3-devel
BuildRequires: dee-devel
BuildRequires: xz-devel
+BuildRequires: python2
%description
Telegram is a messaging app with a focus on speed and security, it’s super
6 years, 7 months
[qmplay2/f28] Update to 18.03.02
by Leigh Scott
Summary of changes:
8585055... Update to 18.03.02 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months
[telegram-desktop] Updated to 1.2.10 alpha. DO NOT BUILD FOR STABLE FEDORA RELEASES!
by Vitaly Zaitsev
commit c562a450659c34898780ad7b20ebadf51bb6fd9f
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri Mar 9 13:15:59 2018 +0100
Updated to 1.2.10 alpha.
DO NOT BUILD FOR STABLE FEDORA RELEASES!
.gitignore | 1 +
sources | 2 +-
telegram-desktop-build-fixes.patch | 8 ++++----
telegram-desktop.spec | 12 ++++++------
4 files changed, 12 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 79129ad..d4dd2f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@
/tdesktop-1.2.6.tar.gz
/crl-344cbde.tar.gz
/tdesktop-1.2.8.tar.gz
+/tdesktop-1.2.10.tar.gz
diff --git a/sources b/sources
index f5780f2..aaf9b04 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ed3d3121418d32866ae348ce75042770 crl-344cbde.tar.gz
-33f99322144c3e6d01a838b502790042 tdesktop-1.2.8.tar.gz
+eaa47f7c906378e3ff81e22af42672f8 tdesktop-1.2.10.tar.gz
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index 45c650f..3df70da 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From 03fc7824640665d679c559ecc14063b79abf5a50 Mon Sep 17 00:00:00 2001
+From a9e7e1727145cef91fcf40f5950ab09df9e10656 Mon Sep 17 00:00:00 2001
From: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri, 31 Mar 2017 14:29:58 +0200
Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock.
@@ -580,10 +580,10 @@ index a5b4b197..05d3dca2 100644
],
}]
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index 11b5c6ff..b765fba9 100644
+index a9c36e09..40b8eb15 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -702,7 +702,7 @@
+@@ -750,7 +750,7 @@
<(src_loc)/observer_peer.h
<(src_loc)/passcodewidget.cpp
<(src_loc)/passcodewidget.h
@@ -592,7 +592,7 @@ index 11b5c6ff..b765fba9 100644
<(src_loc)/settings.cpp
<(src_loc)/settings.h
<(src_loc)/shortcuts.cpp
-@@ -713,13 +713,6 @@
+@@ -761,13 +761,6 @@
<(emoji_suggestions_loc)/emoji_suggestions.h
platforms: !win
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index fa90c97..07625a5 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -10,8 +10,8 @@
Summary: Telegram Desktop official messaging app
Name: telegram-desktop
-Version: 1.2.8
-Release: 3%{?dist}
+Version: 1.2.10
+Release: 1%{?dist}
# Application and 3rd-party modules licensing:
# * S0 (Telegram Desktop) - GPLv3+ with OpenSSL exception -- main source;
@@ -135,11 +135,11 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}.
%{_datadir}/metainfo/%{name}.appdata.xml
%changelog
-* Thu Mar 08 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 1.2.8-3
-- Rebuilt for new ffmpeg snapshot
+* Fri Mar 09 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.2.10-1
+- Updated to 1.2.10 (alpha).
-* Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 1.2.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+* Thu Mar 08 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.2.9-1
+- Updated to 1.2.9 (alpha).
* Wed Jan 03 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.2.8-1
- Updated to 1.2.8 (alpha).
6 years, 7 months
[qmplay2/f26] (9 commits) ...Update to 18.03.02
by Martin Gansser
Summary of changes:
ce6ec0a... rebuilt (*)
a6f07da... Rebuilt for ffmpeg-3.5 git (*)
3366667... Rebuild for new libcdio (*)
393a311... fix build (*)
0cf7a95... Rebuild for new ffmpeg snapshot (*)
2c9f4a7... Revert 'Add missing isa' (*)
6d025d9... - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass (*)
dafb94d... - Rebuilt for new ffmpeg snapshot (*)
8585055... Update to 18.03.02 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months
[qmplay2/f27] (9 commits) ...Update to 18.03.02
by Martin Gansser
Summary of changes:
ce6ec0a... rebuilt (*)
a6f07da... Rebuilt for ffmpeg-3.5 git (*)
3366667... Rebuild for new libcdio (*)
393a311... fix build (*)
0cf7a95... Rebuild for new ffmpeg snapshot (*)
2c9f4a7... Revert 'Add missing isa' (*)
6d025d9... - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass (*)
dafb94d... - Rebuilt for new ffmpeg snapshot (*)
8585055... Update to 18.03.02 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months
[qmplay2] Update to 18.03.02
by Martin Gansser
commit 8585055e65047fbe75135f25c65bda12e50f9459
Author: Martin Gansser <martinkg(a)fedoraproject.org>
Date: Fri Mar 9 13:08:49 2018 +0100
Update to 18.03.02
.gitignore | 1 +
qmplay2.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 214285d..8d47549 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
/QMPlay2-src-17.10.24.tar.xz
/QMPlay2-src-17.12.11.tar.xz
/QMPlay2-src-17.12.31.tar.xz
+/QMPlay2-src-18.03.02.tar.xz
diff --git a/qmplay2.spec b/qmplay2.spec
index 9fa7d1d..0957cef 100644
--- a/qmplay2.spec
+++ b/qmplay2.spec
@@ -2,8 +2,8 @@
%global pname QMPlay2
Name: qmplay2
-Version: 17.12.31
-Release: 7%{?dist}
+Version: 18.03.02
+Release: 1%{?dist}
Summary: A Qt based media player, streamer and downloader
License: LGPLv3+
URL: http://zaps166.sourceforge.net/?app=QMPlay2
@@ -121,6 +121,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.
%{_includedir}/%{pname}
%changelog
+* Fri Mar 09 2018 Martin Gansser <martinkg(a)fedoraproject.org> - 18.03.02-1
+- Update to 18.03.02
+
* Thu Mar 08 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 17.12.31-7
- Rebuilt for new ffmpeg snapshot
diff --git a/sources b/sources
index 1d9df8b..6889842 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8962fd257c21f59ec6585ecd8ed3f811 QMPlay2-src-17.12.31.tar.xz
+aca441ee49c0ed206ed33a15192ffc92 QMPlay2-src-18.03.02.tar.xz
6 years, 7 months
