[vlc/f28] Add missing libjpeg
by Nicolas Chauvet
commit 169995e4eff904d025b64be49c8273f5d02388ce
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jun 1 22:21:09 2018 +0200
Add missing libjpeg
vlc.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 0979eda..f11bdc8 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -42,7 +42,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 3.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_rc:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
@@ -121,6 +121,7 @@ BuildRequires: libtar-devel
BuildRequires: libtheora-devel
BuildRequires: libtiger-devel
BuildRequires: libtiff-devel
+BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libplacebo)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(libvncclient)
@@ -564,6 +565,9 @@ fi || :
%changelog
+* Fri Jun 01 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.3-2
+- Add missing libjpeg
+
* Mon May 28 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.3-1
- Update to 3.0.3
6 years, 6 months
[vlc] Add missing libjpeg
by Nicolas Chauvet
commit 2abed9d689636563931bc485470996d140bf945d
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jun 1 22:21:09 2018 +0200
Add missing libjpeg
vlc.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 0979eda..f11bdc8 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -42,7 +42,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 3.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
URL: https://www.videolan.org
Source0: %{vlc_url}/%{?!vlc_rc:%{version}/}vlc-%{version}%{?vlc_tag}.tar.xz
@@ -121,6 +121,7 @@ BuildRequires: libtar-devel
BuildRequires: libtheora-devel
BuildRequires: libtiger-devel
BuildRequires: libtiff-devel
+BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libplacebo)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(libvncclient)
@@ -564,6 +565,9 @@ fi || :
%changelog
+* Fri Jun 01 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.3-2
+- Add missing libjpeg
+
* Mon May 28 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.0.3-1
- Update to 3.0.3
6 years, 6 months
[mock-rpmfusion-free] make (for F28 GA) F28 is not branched anymore In nonfree use include free repo instead of copy it In
by Sérgio M. Basto
commit ab9684526f8406afecb93ced782ce2781caccc70
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Jun 1 16:44:12 2018 +0100
make (for F28 GA)
F28 is not branched anymore
In nonfree use include free repo instead of copy it
In kwizart repo use include nonfree repo instead copy free and nonfree repos
Rename templates to match with the name of repos to simplify the script
Move branched-templates from not_in_use dir and update it
.gitignore | 1 +
mock-rpmfusion-free.spec | 10 +++++++++-
sources | 2 +-
3 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bef6c77..5c4f31f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ mock-rpmfusion-free-23.0.tar.bz2
/mock-rpmfusion-free-27.0.tar.bz2
/mock-rpmfusion-free-27.1.tar.bz2
/mock-rpmfusion-free-28.0.tar.bz2
+/mock-rpmfusion-free-28.1.tar.bz2
diff --git a/mock-rpmfusion-free.spec b/mock-rpmfusion-free.spec
index 5cd416b..6ca9043 100644
--- a/mock-rpmfusion-free.spec
+++ b/mock-rpmfusion-free.spec
@@ -1,5 +1,5 @@
Name: mock-rpmfusion-free
-Version: 28.0
+Version: 28.1
Release: 1%{?dist}
Summary: Mock config files for the RPM Fusion Free Repository
@@ -34,6 +34,14 @@ install -pm 0644 etc/mock/*_free.cfg %{buildroot}%{_sysconfdir}/mock
%changelog
+* Fri Jun 01 2018 Sérgio Basto <sergio(a)serjux.com> - 18.1-1
+- make (for F28 GA)
+- F28 is not branched anymore
+- In nonfree use include free repo instead of copy it
+- In kwizart repo use include nonfree repo instead copy free and nonfree repos
+- Rename templates to match with the name of repos to simplify the script
+- Move branched-templates from not_in_use dir and update it
+
* Mon Mar 05 2018 Sérgio Basto <sergio(a)serjux.com> - 28.0-1
- Ready for branch F28
diff --git a/sources b/sources
index f0caefb..e432ba1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d4fc91ae9cfa083b8c1c3684bd300a5b mock-rpmfusion-free-28.0.tar.bz2
+2915c8ea823bd22a20e8ba9c9d177288 mock-rpmfusion-free-28.1.tar.bz2
6 years, 6 months
[chromium-freeworld/f28] (39 commits) ...Merge Fedora, chromium-66.0.3359.181-2
by Miro Hrončok
Summary of changes:
9d223e0... Update the chromium-lastest.py to always download the polic (*)
07728cd... Improve the chromium-latest.py script (*)
c28ea78... Merge branch 'master' into f26 (*)
d02ac4e... Fix the policy templates handling (*)
7745b94... fix merge (*)
6844a76... Merge branch 'master' into f26 (*)
a2f0a87... Merge branch 'master' into f26 (*)
699efa4... Merge branch 'master' into f26 (*)
6fc5f9d... Merge branch 'master' into f26 (*)
dee55f8... Merge branch 'master' into f26 (*)
cf44702... Merge branch 'f26' of ssh://pkgs.fedoraproject.org/rpms/chr (*)
1795734... Merge branch 'master' into f26 (*)
fb49317... Merge branch 'master' into f26 (*)
b2a482e... Merge branch 'master' into f26 (*)
dcb134e... Merge branch 'master' into f26 (*)
752de26... Merge branch 'master' into f26 (*)
6588e7b... check that there is no system google module, shadowing bund (*)
11492d0... add explicit dependency on minizip (bz 1534282) (*)
0996727... Merge branch 'master' into f26 (*)
cdad621... Be explicit about the Python version used (*)
e00e15d... use system fontconfig (except on epel7) (*)
b899d5f... Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/ (*)
0476e61... Merge Fedora, chromium-65.0.3325.181-2 (*)
ee8969a... Merge Fedora, chromium-65.0.3325.181-3 (*)
5479a8c... 66.0.3359.139 (*)
5afa5c7... Merge branch 'master' into f26 (*)
840f0be... fix sources (*)
85fa5c5... missing patch (*)
c380501... Merge branch 'master' into f26 (*)
8667898... disable patch47 (*)
3f9e662... fix arm build (*)
0f7615a... Merge branch 'master' into f26 (*)
55ffd95... 66.0.3359.170 (*)
b3bbed0... add swiftshader to files (*)
16a75be... only x86_64 i686 have swiftshader (*)
f953b3f... fix gcc8 alignof issue on i686 (*)
7575596... update to 66.0.3359.181 (*)
f1f56dc... fix missing files (*)
e69acc6... Merge Fedora, chromium-66.0.3359.181-2 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 6 months
[telegram-desktop/f27] Updated to version 1.3.0.
by Vitaly Zaitsev
commit 52f580856eb911e7868a781822c9eb49f7c15ef8
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Fri Jun 1 13:43:37 2018 +0200
Updated to version 1.3.0.
.gitignore | 1 +
sources | 2 +-
telegram-desktop-build-fixes.patch | 29 +++++++++++++++--------------
telegram-desktop-system-fonts.patch | 33 +++++++++++++++++++++++++++++++++
telegram-desktop.spec | 35 ++++++++++++++++++++++++++++-------
5 files changed, 78 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8a8d7cb..7e0cf68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,3 +45,4 @@
/tdesktop-1.2.15.tar.gz
/tdesktop-1.2.16.tar.gz
/tdesktop-1.2.17.tar.gz
+/tdesktop-1.3.0.tar.gz
diff --git a/sources b/sources
index 3d6c893..3f4086e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
ed3d3121418d32866ae348ce75042770 crl-344cbde.tar.gz
-ef9c74659cba6f792e43a245ceb1c102 tdesktop-1.2.17.tar.gz
+2bfaea91997754312c3b1857d0554f43 tdesktop-1.3.0.tar.gz
diff --git a/telegram-desktop-build-fixes.patch b/telegram-desktop-build-fixes.patch
index 38130ea..bf446e5 100644
--- a/telegram-desktop-build-fixes.patch
+++ b/telegram-desktop-build-fixes.patch
@@ -1,4 +1,4 @@
-From ff1914aaef5cde44f38359ffa2169bf1d0ec2c64 Mon Sep 17 00:00:00 2001
+From c4742c80a5af1f74b34fcd794a214cf3856f0cd8 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.
@@ -6,16 +6,16 @@ Subject: [PATCH] Fixed build under Fedora using rpmbuild and mock.
---
Telegram/Resources/qrc/telegram_linux.qrc | 1 -
Telegram/SourceFiles/core/launcher.cpp | 1 +
- Telegram/SourceFiles/qt_functions.cpp | 94 +++++++++++++++++++++++++++++++
+ Telegram/SourceFiles/qt_functions.cpp | 94 +++++++++++++++++++++++
Telegram/gyp/CMakeLists.inj | 3 +
Telegram/gyp/PrecompiledHeader.cmake | 4 +-
- Telegram/gyp/Telegram.gyp | 29 +++-------
- Telegram/gyp/codegen_rules.gypi | 8 +--
- Telegram/gyp/qt.gypi | 87 ++++++++--------------------
+ 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 | 86 +++++++---------------------
+ Telegram/gyp/telegram_linux.gypi | 86 +++++----------------
Telegram/gyp/telegram_sources.txt | 9 +--
lib/xdg/telegramdesktop.appdata.xml | 2 +-
lib/xdg/telegramdesktop.desktop | 6 +-
@@ -34,7 +34,7 @@ index 0554fa17..3ea02740 100644
</qresource>
</RCC>
diff --git a/Telegram/SourceFiles/core/launcher.cpp b/Telegram/SourceFiles/core/launcher.cpp
-index 7f173565..c70ccc79 100644
+index 62662277..66598a1d 100644
--- a/Telegram/SourceFiles/core/launcher.cpp
+++ b/Telegram/SourceFiles/core/launcher.cpp
@@ -51,6 +51,7 @@ int Launcher::exec() {
@@ -518,7 +518,7 @@ index 03284c1d..9b6f0c51 100644
],
'cflags_c': [
diff --git a/Telegram/gyp/telegram_linux.gypi b/Telegram/gyp/telegram_linux.gypi
-index a5b4b197..19aefb6b 100644
+index 22f3e161..10d73e48 100644
--- a/Telegram/gyp/telegram_linux.gypi
+++ b/Telegram/gyp/telegram_linux.gypi
@@ -7,7 +7,7 @@
@@ -530,7 +530,7 @@ index a5b4b197..19aefb6b 100644
'pkgconfig_libs': [
# In order to work libxkbcommon must be linked statically,
# PKGCONFIG links it like "-L/usr/local/lib -lxkbcommon"
-@@ -15,99 +15,53 @@
+@@ -15,50 +15,29 @@
# QApplication() -> createPlatformIntegration -> QXcbIntegrationPlugin::create
#'xkbcommon',
],
@@ -598,7 +598,8 @@ index a5b4b197..19aefb6b 100644
# '<!(pkg-config 2> /dev/null --libs <@(pkgconfig_libs))',
],
'cflags_cc': [
- '-Wno-strict-overflow',
+@@ -66,49 +45,24 @@
+ '-Wno-maybe-uninitialized',
],
'ldflags': [
- '-Wl,-wrap,aligned_alloc',
@@ -650,10 +651,10 @@ index a5b4b197..19aefb6b 100644
],
}]
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
-index a9c36e09..40b8eb15 100644
+index f60aba58..d01a9eff 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
-@@ -750,7 +750,7 @@
+@@ -753,7 +753,7 @@
<(src_loc)/observer_peer.h
<(src_loc)/passcodewidget.cpp
<(src_loc)/passcodewidget.h
@@ -662,7 +663,7 @@ index a9c36e09..40b8eb15 100644
<(src_loc)/settings.cpp
<(src_loc)/settings.h
<(src_loc)/shortcuts.cpp
-@@ -761,13 +761,6 @@
+@@ -764,13 +764,6 @@
<(emoji_suggestions_loc)/emoji_suggestions.h
platforms: !win
@@ -707,5 +708,5 @@ index 0a806951..550b9f78 100644
StartupWMClass=TelegramDesktop
Type=Application
--
-2.14.3
+2.17.0
diff --git a/telegram-desktop-system-fonts.patch b/telegram-desktop-system-fonts.patch
new file mode 100644
index 0000000..8d6202d
--- /dev/null
+++ b/telegram-desktop-system-fonts.patch
@@ -0,0 +1,33 @@
+Description: Remove links to packaged Open Sans font
+ This makes Telegram Desktop use system-wide fonts.
+ Warnings about non-existent fonts in resources are also disabled.
+Author: Nicholas Guriev <guriev-ns(a)ya.ru>
+Bug-Debian: https://bugs.debian.org/890341
+Last-Update: Sat, 31 Mar 2018 14:36:39 +0300
+
+--- a/Telegram/Resources/qrc/telegram.qrc
++++ b/Telegram/Resources/qrc/telegram.qrc
+@@ -1,8 +1,5 @@
+ <RCC>
+ <qresource prefix="/gui">
+- <file alias="fonts/OpenSans-Regular.ttf">../fonts/OpenSans-Regular.ttf</file>
+- <file alias="fonts/OpenSans-Bold.ttf">../fonts/OpenSans-Bold.ttf</file>
+- <file alias="fonts/OpenSans-Semibold.ttf">../fonts/OpenSans-Semibold.ttf</file>
+ <file alias="art/bg.jpg">../art/bg.jpg</file>
+ <file alias="art/bg_initial.jpg">../art/bg_initial.jpg</file>
+ <file alias="art/logo_256.png">../art/logo_256.png</file>
+--- a/Telegram/SourceFiles/ui/twidget.cpp
++++ b/Telegram/SourceFiles/ui/twidget.cpp
+@@ -70,9 +70,9 @@ void Start() {
+ }
+ Started = true;
+
+- auto regular = LoadCustomFont(qsl(":/gui/fonts/OpenSans-Regular.ttf"), qsl("Open Sans"));
+- auto bold = LoadCustomFont(qsl(":/gui/fonts/OpenSans-Bold.ttf"), qsl("Open Sans"), style::internal::FontBold);
+- auto semibold = LoadCustomFont(qsl(":/gui/fonts/OpenSans-Semibold.ttf"), qsl("Open Sans Semibold"));
++ auto regular = ValidateFont(qsl("Open Sans"));
++ auto bold = ValidateFont(qsl("Open Sans"), style::internal::FontBold);
++ auto semibold = ValidateFont(qsl("Open Sans Semibold"));
+
+ #ifdef Q_OS_WIN
+ // Attempt to workaround a strange font bug with Open Sans Semibold not loading.
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 92cec4f..4e51905 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.17
-Release: 2%{?dist}
+Version: 1.3.0
+Release: 1%{?dist}
# Application and 3rd-party modules licensing:
# * S0 (Telegram Desktop) - GPLv3+ with OpenSSL exception -- main source;
@@ -28,10 +28,12 @@ Source0: %{url}/archive/v%{version}.tar.gz#/%{appname}-%{version}.tar.gz
Source1: https://github.com/telegramdesktop/crl/archive/%{commit1}.tar.gz#/crl-%{s...
Patch0: %{name}-build-fixes.patch
Patch1: %{name}-api-tokens.patch
+Patch2: %{name}-system-fonts.patch
Recommends: libappindicator-gtk3%{?_isa}
Requires: qt5-qtimageformats%{?_isa}
Requires: hicolor-icon-theme
+Requires: open-sans-fonts
Requires: gtk3%{?_isa}
# Compilers and tools...
@@ -116,10 +118,6 @@ for size in 16 32 48 64 128 256 512; do
install -m 0644 -p Telegram/Resources/art/icon${size}.png "$dir/%{name}.png"
done
-# Installing tg protocol handler...
-install -d "%{buildroot}%{_datadir}/kde4/services"
-install -m 0644 -p lib/xdg/tg.protocol "%{buildroot}%{_datadir}/kde4/services/tg.protocol"
-
# Installing appdata for Gnome Software...
install -d "%{buildroot}%{_datadir}/metainfo"
install -m 0644 -p lib/xdg/telegramdesktop.appdata.xml "%{buildroot}%{_datadir}/metainfo/%{name}.appdata.xml"
@@ -132,11 +130,34 @@ appstream-util validate-relax --nonet "%{buildroot}%{_datadir}/metainfo/%{name}.
%license LICENSE LEGAL
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
-%{_datadir}/kde4/services/tg.protocol
%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/metainfo/%{name}.appdata.xml
%changelog
+* Fri Jun 01 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.3.0-1
+- Updated to 1.3.0.
+
+* Sat May 26 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.2.24-1
+- Updated to 1.2.24 (alpha).
+
+* Fri May 25 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.2.23-1
+- Updated to 1.2.23 (alpha).
+
+* Thu May 24 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.2.22-1
+- Updated to 1.2.22 (alpha).
+
+* Sat May 19 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.2.21-2
+- Updated to 1.2.21 (alpha).
+
+* Sun May 13 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.2.20-1
+- Updated to 1.2.20 (alpha).
+
+* Tue May 08 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.2.19-1
+- Updated to 1.2.19 (alpha).
+
+* Sat May 05 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.2.18-1
+- Updated to 1.2.18 (alpha).
+
* Mon Apr 09 2018 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1.2.17-2
- Added custom API tokens.
6 years, 6 months