[mpd] fix el8 build
by Leigh Scott
commit eb96dd59f830591108859687206f684a62d0ee30
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Nov 16 20:37:00 2021 +0000
fix el8 build
mpd.spec | 5 +++++
1 file changed, 5 insertions(+)
---
diff --git a/mpd.spec b/mpd.spec
index 604d3b0..017cf1c 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -129,6 +129,11 @@ This package contains FirewallD file for MPD.
# Force python3-sphinx
sed -i -e 's@sphinx-build@sphinx-build-3@g' doc/meson.build
+# redhat meson is too old
+%if 0%{?rhel}
+sed -i -e 's@>= 0.56.0@>= 0.55.0@g' meson.build
+%endif
+
%build
%{meson} \
-Dsystemd_system_unit_dir=%{_unitdir} \
3 years
[mpd/el8] (11 commits) ...Update to 0.23.4
by Leigh Scott
Summary of changes:
e821cf2... Update to 0.23 (*)
33c90a0... Fix pipewire samplerate (*)
db0354e... Update to 0.23.1 (*)
16bfd83... Update to 0.23.2 (*)
d528028... drop unused build dep (*)
1268d8a... Update to 0.23.3 (*)
82ad875... fix (*)
6c13e14... fix (*)
658fba3... Rebuilt for new ffmpeg snapshot (*)
7b00bc5... fix (*)
6ab38f6... Update to 0.23.4 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years
[telegram-desktop/f34: 3/3] Updated to version 3.2.5.
by Vitaly Zaitsev
commit 21417f791e03836a7b25a946bcd50b57713f7c0d
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Tue Nov 16 20:09:31 2021 +0100
Updated to version 3.2.5.
.gitignore | 1 +
sources | 2 +-
telegram-desktop.spec | 100 +++++++++++++++++++++++---------------------------
3 files changed, 47 insertions(+), 56 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9b84088..5fd5577 100644
--- a/.gitignore
+++ b/.gitignore
@@ -165,3 +165,4 @@
/tdesktop-2.8.8-full.tar.gz
/tdesktop-3.0.1-full.tar.gz
/tdesktop-3.2.4-full.tar.gz
+/tdesktop-3.2.5-full.tar.gz
diff --git a/sources b/sources
index 9b4a32b..d0a8eb7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tdesktop-3.2.4-full.tar.gz) = a4651e0af49195f4f3ff15d74a616a5ccd056f15d0448687138947ab0f816b45c05dec81029b59c5e7b5eefed3059618245ad1b3b3f27f894c6accad697ecd94
+SHA512 (tdesktop-3.2.5-full.tar.gz) = 37405780239d2bbc14762299ddca3a5d9cd61ecad70ce960c9f4ed27a31a55f01ccd2e366ca976695a0f1e90bdf57da2344059157df076820933c475043fa0f6
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 766161a..55c6531 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -1,32 +1,31 @@
%undefine __cmake_in_source_build
-# Build conditionals (with - OFF, without - ON)...
-%bcond_with clang
-%bcond_with libtgvoip
-%bcond_with rlottie
-%bcond_with wayland
-%bcond_with webkit
-%bcond_with qt5
-%bcond_without x11
+# Build conditionals...
+%global enable_wayland 0
+%global enable_x11 1
+%global system_libtgvoip 0
+%global system_rlottie 0
+%global use_clang 0
+%global use_qt5 1
# Telegram Desktop's constants...
%global appname tdesktop
%global launcher telegramdesktop
# Applying toolchain configuration...
-%if %{with clang}
+%if %{use_clang}
%global toolchain clang
%endif
# Applying some workaround for non-x86 architectures...
%ifnarch x86_64
-%define _lto_cflags %{nil}
-%global _smp_build_ncpus 1
+%global _lto_cflags %{nil}
+%global _smp_build_ncpus 2
%global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
%endif
Name: telegram-desktop
-Version: 3.2.4
+Version: 3.2.5
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -45,7 +44,7 @@ ExclusiveArch: x86_64 aarch64
BuildRequires: cmake(Microsoft.GSL)
BuildRequires: cmake(OpenAL)
BuildRequires: cmake(range-v3)
-BuildRequires: cmake(tg_owt) >= 0-13
+BuildRequires: cmake(tg_owt)
BuildRequires: cmake(tl-expected)
BuildRequires: pkgconfig(gio-2.0)
@@ -66,6 +65,7 @@ BuildRequires: pkgconfig(libxxhash)
BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(opus)
BuildRequires: pkgconfig(rnnoise)
+BuildRequires: pkgconfig(webkit2gtk-4.0)
BuildRequires: cmake
BuildRequires: desktop-file-utils
@@ -79,13 +79,17 @@ BuildRequires: minizip-compat-devel
BuildRequires: ninja-build
BuildRequires: python3
-%if %{with clang}
+%if 0%{?fedora} && 0%{?fedora} > 35
+BuildRequires: openssl1.1-devel
+%endif
+
+%if %{use_clang}
BuildRequires: compiler-rt
BuildRequires: clang
BuildRequires: llvm
%endif
-%if %{with qt5}
+%if %{use_qt5}
BuildRequires: cmake(Qt5Core)
BuildRequires: cmake(Qt5DBus)
BuildRequires: cmake(Qt5Gui)
@@ -95,6 +99,8 @@ BuildRequires: cmake(Qt5Widgets)
BuildRequires: cmake(Qt5XkbCommonSupport)
BuildRequires: cmake(dbusmenu-qt5)
BuildRequires: qt5-qtbase-private-devel
+%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
+Requires: qt5-qtimageformats%{?_isa}
%else
BuildRequires: cmake(Qt6Core)
BuildRequires: cmake(Qt6Core5Compat)
@@ -106,15 +112,12 @@ BuildRequires: cmake(Qt6OpenGLWidgets)
BuildRequires: cmake(Qt6Svg)
BuildRequires: cmake(Qt6Widgets)
BuildRequires: qt6-qtbase-private-devel
+%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}}
+Requires: qt6-qtimageformats%{?_isa}
Provides: bundled(dbusmenu-qt6) = 0.9.3
%endif
-%if %{with webkit}
-BuildRequires: pkgconfig(webkit2gtk-4.0)
-Requires: webkit2gtk3%{?_isa}
-%endif
-
-%if %{with libtgvoip}
+%if %{system_libtgvoip}
BuildRequires: pkgconfig(tgvoip) >= 2.4.4
%else
BuildRequires: pkgconfig(alsa)
@@ -122,14 +125,14 @@ BuildRequires: pkgconfig(libpulse)
Provides: bundled(libtgvoip) = 2.4.4
%endif
-%if %{with rlottie}
+%if %{system_rlottie}
BuildRequires: cmake(rlottie)
%else
Provides: bundled(rlottie) = 0~git
%endif
-%if %{with wayland}
-%if %{with qt5}
+%if %{enable_wayland}
+%if %{use_qt5}
BuildRequires: cmake(Qt5Concurrent)
BuildRequires: cmake(Qt5WaylandClient)
BuildRequires: qt5-qtbase-static
@@ -140,20 +143,19 @@ BuildRequires: qt6-qtbase-static
%endif
BuildRequires: cmake(KF5Wayland)
BuildRequires: pkgconfig(wayland-client)
+BuildRequires: extra-cmake-modules
%endif
-%if %{with x11}
+%if %{enable_x11}
BuildRequires: pkgconfig(xcb)
BuildRequires: pkgconfig(xcb-keysyms)
BuildRequires: pkgconfig(xcb-record)
BuildRequires: pkgconfig(xcb-screensaver)
%endif
-# Telegram Desktop require exact version of Qt due to Qt private API usage.
-%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
Requires: hicolor-icon-theme
Requires: open-sans-fonts
-Requires: qt5-qtimageformats%{?_isa}
+Requires: webkit2gtk3%{?_isa}
# Telegram Desktop can use native open/save dialogs with XDG portals.
Recommends: xdg-desktop-portal%{?_isa}
@@ -186,17 +188,17 @@ business messaging needs.
rm -rf Telegram/ThirdParty/{Catch,GSL,QR,SPMediaKeyTap,expected,fcitx-qt5,fcitx5-qt,jemalloc,hime,hunspell,lz4,materialdecoration,minizip,nimf,qt5ct,range-v3,xxHash}
# Unbundling libdbusmenu-qt if build against Qt5...
-%if %{with qt5}
+%if %{use_qt5}
rm -rf Telegram/ThirdParty/libdbusmenu-qt
%endif
# Unbundling rlottie if build against packaged version...
-%if %{with rlottie}
+%if %{system_rlottie}
rm -rf Telegram/ThirdParty/rlottie
%endif
# Unbundling libtgvoip if build against packaged version...
-%if %{with libtgvoip}
+%if %{system_libtgvoip}
rm -rf Telegram/ThirdParty/libtgvoip
%endif
@@ -204,7 +206,7 @@ rm -rf Telegram/ThirdParty/libtgvoip
# Building Telegram Desktop using cmake...
%cmake -G Ninja \
-DCMAKE_BUILD_TYPE=Release \
-%if %{with clang}
+%if %{use_clang}
-DCMAKE_C_COMPILER=%{_bindir}/clang \
-DCMAKE_CXX_COMPILER=%{_bindir}/clang++ \
-DCMAKE_AR=%{_bindir}/llvm-ar \
@@ -222,29 +224,10 @@ rm -rf Telegram/ThirdParty/libtgvoip
-DDESKTOP_APP_USE_PACKAGED:BOOL=ON \
-DDESKTOP_APP_USE_PACKAGED_FONTS:BOOL=ON \
-DDESKTOP_APP_DISABLE_CRASH_REPORTS:BOOL=ON \
-%if %{with qt5}
- -DDESKTOP_APP_QT6:BOOL=OFF \
-%else
- -DDESKTOP_APP_QT6:BOOL=ON \
-%endif
-%if %{with webkit}
- -DDESKTOP_APP_DISABLE_WEBKITGTK:BOOL=OFF \
-%else
- -DDESKTOP_APP_DISABLE_WEBKITGTK:BOOL=ON \
-%endif
-%if %{with wayland}
- -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION:BOOL=OFF \
-%else
- -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION:BOOL=ON \
-%endif
-%if %{with x11}
- -DDESKTOP_APP_DISABLE_X11_INTEGRATION:BOOL=OFF \
-%else
- -DDESKTOP_APP_DISABLE_X11_INTEGRATION:BOOL=ON \
-%endif
-%if %{with rlottie}
- -DDESKTOP_APP_LOTTIE_USE_CACHE:BOOL=OFF \
-%endif
+ -DDESKTOP_APP_QT6:BOOL=%{?use_qt5:OFF}%{!?use_qt5:ON} \
+ -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION:BOOL=%{?enable_wayland:OFF}%{!?enable_wayland:ON} \
+ -DDESKTOP_APP_DISABLE_X11_INTEGRATION:BOOL=%{?enable_x11:OFF}%{!?enable_x11:ON} \
+ -DDESKTOP_APP_LOTTIE_USE_CACHE:BOOL=%{?system_rlottie:OFF}%{!?system_rlottie:ON} \
-DTDESKTOP_LAUNCHER_BASENAME=%{launcher}
%cmake_build
@@ -264,6 +247,13 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{launcher}.desktop
%{_metainfodir}/%{launcher}.appdata.xml
%changelog
+* Tue Nov 16 2021 Vitaly Zaitsev <vitaly(a)easycoding.org> - 3.2.5-1
+- Updated to version 3.2.5.
+- Added OpenSSL workaround for Fedora 36+.
+- Adjusted the number of CPU cores on aarch64 during the build.
+- Switched from boolean conditionals to constants.
+- Build against Qt 5 due to issues with Qt 6 and Wayland.
+
* Mon Nov 15 2021 Vitaly Zaitsev <vitaly(a)easycoding.org> - 3.2.4-1
- Updated to version 3.2.4.
- Switched to Qt 6 with an option to build against Qt 5.
3 years
[tg_owt/f34] Build with openssl 1.1 on Fedora 36+.
by Vitaly Zaitsev
commit 36a85986571025468bbd04338a799dca14f25de6
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Tue Nov 16 19:03:03 2021 +0100
Build with openssl 1.1 on Fedora 36+.
tg_owt.spec | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
---
diff --git a/tg_owt.spec b/tg_owt.spec
index 4d5cf47..9d8db08 100644
--- a/tg_owt.spec
+++ b/tg_owt.spec
@@ -15,7 +15,7 @@
Name: tg_owt
Version: 0
-Release: 13.%{date}git%{shortcommit0}%{?dist}
+Release: 14.%{date}git%{shortcommit0}%{?dist}
# Main project - BSD
# abseil-cpp - ASL 2.0
@@ -54,6 +54,10 @@ BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xrender)
BuildRequires: pkgconfig(xtst)
+%if 0%{?fedora} && 0%{?fedora} > 35
+BuildRequires: openssl1.1-devel
+%endif
+
BuildRequires: cmake
BuildRequires: gcc
BuildRequires: gcc-c++
@@ -105,6 +109,9 @@ Requires: pkgconfig(xfixes)
Requires: pkgconfig(xrandr)
Requires: pkgconfig(xrender)
Requires: pkgconfig(xtst)
+%if 0%{?fedora} && 0%{?fedora} > 35
+Requires: openssl1.1-devel
+%endif
%description devel
%{summary}.
@@ -175,6 +182,9 @@ cp -f -p src/rtc_base/third_party/sigslot/README.chromium legal/README.sigslot
%{_libdir}/lib%{name}.a
%changelog
+* Tue Nov 16 2021 Vitaly Zaitsev <vitaly(a)easycoding.org> - 0-14.20211021gitd578c76
+- Build with openssl 1.1 on Fedora 36+.
+
* Mon Nov 15 2021 Vitaly Zaitsev <vitaly(a)easycoding.org> - 0-13.20211021gitd578c76
- Updated to latest Git snapshot.
3 years
[mpd/f34] (3 commits) ...Update to 0.23.4
by Leigh Scott
Summary of changes:
658fba3... Rebuilt for new ffmpeg snapshot (*)
7b00bc5... fix (*)
6ab38f6... Update to 0.23.4 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years
