Attachment 14587 Details for Bug 33334 – updated and fixed patch

[patch] updated and fixed patch

winff_qt6.spec.patch (text/plain), 3.89 KB, created by Aurelian R on 2024-07-09 10:50:26 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Aurelian R

Created: 2024-07-09 10:50:26 CEST

Size: 3.89 KB

patch

obsolete

>--- winff/winff.spec	2024-06-25 18:14:51.431193449 +0300
>+++ SPECS/winff_add_qt.spec	2024-07-09 11:39:01.031162314 +0300
>@@ -1,17 +1,19 @@
>+# Either one of gtk2, qt5, qt6. gtk3 is experimental and avoid it.
>+%bcond_without  Qt
>+%define QtV 6
>+
> Summary:	A graphical interface for the video converter ffmpeg
> Name:		winff
>-Version:	1.5.5
>-Release:	%mkrel 5
>+Version:    1.6.4
>+Release:	%mkrel 0.2
> License:	GPLv3+
> Group:		Video/Editors and Converters
> Url:		https://winff.org/
>-Source0:	https://winff.org/docs/source/%{name}-%{version}-source.tar.gz
>-Patch0:		winff-1.5.3-add-default-pdf-launcher-to-list-of-pdf-viewers.patch
>-Patch1:		winff-1.5.5-fix-upstream-version-number-in-About-menu.patch
>-Patch2:		winff-1.5.5-fix-up-the-symbols.patch
>-Patch3:		lazarus1.8.patch
>-BuildRequires:	lazarus
>+Source0:	https://github.com/WinFF/winff/archive/%{name}-%{version}/%{name}-%{name}-%{version}.tar.gz
> BuildRequires:	dos2unix
>+BuildRequires:	lazarus
>+%{?with_Qt:
>+BuildRequires:	qt%{QtV}pas-devel }
> Requires:	ffmpeg
> Requires:	xterm
> 
>@@ -21,28 +23,46 @@ most any video file that FFmpeg will con
> multiple formats at one time. You can for example convert mpeg's, flv's, and
> mov's, all into avi's all at once.
> 
>+%{?with_Qt:
>+%package qt%{QtV}
>+Summary:	A graphical interface for the video converter ffmpeg
>+Group:		Video/Editors and Converters
>+License:	GPLv3+
>+Requires:	ffmpeg
>+Requires:	xterm
>+
>+%description qt%{QtV}
>+WinFF is a GUI for the command line video converter, FFMPEG. It will convert
>+most any video file that FFmpeg will convert. WinFF does multiple files in
>+multiple formats at one time. You can for example convert mpeg's, flv's, and
>+mov's, all into avi's all at once.
>+
>+This is WinFF for Qt%{QtV}.
>+}
>+
>+
> %prep
>-%setup -q -n %{name}
>-%autopatch -p1
>+%autosetup -p1 -n %{name}-%{name}-%{version}
> 
> # Fix EOL (Version 1.2.0)
>-dos2unix *.txt
>+dos2unix winff/*.txt
> 
> %build
> 
>-# Hack to get lazarus with correct options in lazarus-tmp dir
>-mkdir mageia-lazarus-tmp
>-cp %{_sysconfdir}/lazarus/environmentoptions.xml mageia-lazarus-tmp/
>-sed -i 's|__FPCSRCDIR__|%{_datadir}/fpcsrc|g' mageia-lazarus-tmp/environmentoptions.xml
>-sed -i 's|__LAZARUSDIR__|%{_libdir}/lazarus/|g' mageia-lazarus-tmp/environmentoptions.xml
>-# use lazarus-tmp for configuration
>-lazbuild --ws=gtk2 --pcp=mageia-lazarus-tmp -B winff.lpr
>+for i in gtk2 %{?with_Qt:qt%{QtV}}; do
>+  lazbuild --ws=$i winff/winff.lpr
>+  mv winff/winff winff/winff-$i
>+done
>+mv winff/winff-gtk2 winff/winff
> 
> %install
>+
>+pushd winff
>+
> mkdir -p %{buildroot}{%{_bindir},%{_datadir}/%{name}/languages}
> 
> # Install winff binary
>-install -p -m 0755 %{name} %{buildroot}%{_bindir}
>+install -p -m 0755 %{name}%{?with_Qt:{,-qt%{QtV}}} %{buildroot}%{_bindir}
> 
> # Install languages
> install -p -m 0644 languages/*.po %{buildroot}%{_datadir}/%{name}/languages
>@@ -78,12 +98,42 @@ MimeType=application/winff;
> Keywords=avconv;ffmpeg;wrapper;conversion;video;audio;
> EOF
> 
>+%{?with_Qt:
>+# Desktop file for Qt6-backend
>+cat > %{buildroot}%{_datadir}/applications/%{name}-qt%{QtV}.desktop << EOF
>+[Desktop Entry]
>+Type=Application
>+Name=WinFF-qt%{QtV}
>+GenericName=WinFF-qt%{QtV}
>+GenericName[fr]=Convertisseur de vidÃ©o
>+Comment=A GUI for FFMPEG
>+Comment[fr]=Une interface graphique pour FFMPEG
>+Exec=%{name}-qt%{QtV}
>+Icon=%{name}
>+Categories=AudioVideo;Video;
>+MimeType=application/winff;
>+Keywords=avconv;ffmpeg;wrapper;conversion;video;audio;
>+EOF
>+}
> 
> %files
>-%doc AUTHORS *.txt docs/*
>+%doc winff/AUTHORS winff/*.txt winff/docs/*
>+%license winff/COPYING
> %{_bindir}/%{name}
> %{_datadir}/%{name}/
> %{_datadir}/applications/%{name}.desktop
> %{_datadir}/pixmaps/*.png
> %{_iconsdir}/hicolor/*/apps/winff.png
> %{_mandir}/man1/*
>+
>+%{?with_Qt:
>+%files qt%{QtV}
>+%doc  winff/AUTHORS winff/*.txt winff/docs/*
>+%license winff/COPYING
>+%{_bindir}/%{name}-qt%{QtV}
>+%{_datadir}/%{name}/
>+%{_datadir}/applications/%{name}-qt%{QtV}.desktop
>+%{_datadir}/pixmaps/*.png
>+%{_iconsdir}/hicolor/*/apps/winff.png
>+%{_mandir}/man1/*
>+}

--- winff/winff.spec	2024-06-25 18:14:51.431193449 +0300
+++ SPECS/winff_add_qt.spec	2024-07-09 11:39:01.031162314 +0300
@@ -1,17 +1,19 @@
+# Either one of gtk2, qt5, qt6. gtk3 is experimental and avoid it.
+%bcond_without  Qt
+%define QtV 6
+
 Summary:	A graphical interface for the video converter ffmpeg
 Name:		winff
-Version:	1.5.5
-Release:	%mkrel 5
+Version:    1.6.4
+Release:	%mkrel 0.2
 License:	GPLv3+
 Group:		Video/Editors and Converters
 Url:		https://winff.org/
-Source0:	https://winff.org/docs/source/%{name}-%{version}-source.tar.gz
-Patch0:		winff-1.5.3-add-default-pdf-launcher-to-list-of-pdf-viewers.patch
-Patch1:		winff-1.5.5-fix-upstream-version-number-in-About-menu.patch
-Patch2:		winff-1.5.5-fix-up-the-symbols.patch
-Patch3:		lazarus1.8.patch
-BuildRequires:	lazarus
+Source0:	https://github.com/WinFF/winff/archive/%{name}-%{version}/%{name}-%{name}-%{version}.tar.gz
 BuildRequires:	dos2unix
+BuildRequires:	lazarus
+%{?with_Qt:
+BuildRequires:	qt%{QtV}pas-devel }
 Requires:	ffmpeg
 Requires:	xterm
 
@@ -21,28 +23,46 @@ most any video file that FFmpeg will con
 multiple formats at one time. You can for example convert mpeg's, flv's, and
 mov's, all into avi's all at once.
 
+%{?with_Qt:
+%package qt%{QtV}
+Summary:	A graphical interface for the video converter ffmpeg
+Group:		Video/Editors and Converters
+License:	GPLv3+
+Requires:	ffmpeg
+Requires:	xterm
+
+%description qt%{QtV}
+WinFF is a GUI for the command line video converter, FFMPEG. It will convert
+most any video file that FFmpeg will convert. WinFF does multiple files in
+multiple formats at one time. You can for example convert mpeg's, flv's, and
+mov's, all into avi's all at once.
+
+This is WinFF for Qt%{QtV}.
+}
+
+
 %prep
-%setup -q -n %{name}
-%autopatch -p1
+%autosetup -p1 -n %{name}-%{name}-%{version}
 
 # Fix EOL (Version 1.2.0)
-dos2unix *.txt
+dos2unix winff/*.txt
 
 %build
 
-# Hack to get lazarus with correct options in lazarus-tmp dir
-mkdir mageia-lazarus-tmp
-cp %{_sysconfdir}/lazarus/environmentoptions.xml mageia-lazarus-tmp/
-sed -i 's|__FPCSRCDIR__|%{_datadir}/fpcsrc|g' mageia-lazarus-tmp/environmentoptions.xml
-sed -i 's|__LAZARUSDIR__|%{_libdir}/lazarus/|g' mageia-lazarus-tmp/environmentoptions.xml
-# use lazarus-tmp for configuration
-lazbuild --ws=gtk2 --pcp=mageia-lazarus-tmp -B winff.lpr
+for i in gtk2 %{?with_Qt:qt%{QtV}}; do
+  lazbuild --ws=$i winff/winff.lpr
+  mv winff/winff winff/winff-$i
+done
+mv winff/winff-gtk2 winff/winff
 
 %install
+
+pushd winff
+
 mkdir -p %{buildroot}{%{_bindir},%{_datadir}/%{name}/languages}
 
 # Install winff binary
-install -p -m 0755 %{name} %{buildroot}%{_bindir}
+install -p -m 0755 %{name}%{?with_Qt:{,-qt%{QtV}}} %{buildroot}%{_bindir}
 
 # Install languages
 install -p -m 0644 languages/*.po %{buildroot}%{_datadir}/%{name}/languages
@@ -78,12 +98,42 @@ MimeType=application/winff;
 Keywords=avconv;ffmpeg;wrapper;conversion;video;audio;
 EOF
 
+%{?with_Qt:
+# Desktop file for Qt6-backend
+cat > %{buildroot}%{_datadir}/applications/%{name}-qt%{QtV}.desktop << EOF
+[Desktop Entry]
+Type=Application
+Name=WinFF-qt%{QtV}
+GenericName=WinFF-qt%{QtV}
+GenericName[fr]=Convertisseur de vidÃ©o
+Comment=A GUI for FFMPEG
+Comment[fr]=Une interface graphique pour FFMPEG
+Exec=%{name}-qt%{QtV}
+Icon=%{name}
+Categories=AudioVideo;Video;
+MimeType=application/winff;
+Keywords=avconv;ffmpeg;wrapper;conversion;video;audio;
+EOF
+}
 
 %files
-%doc AUTHORS *.txt docs/*
+%doc winff/AUTHORS winff/*.txt winff/docs/*
+%license winff/COPYING
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/*.png
 %{_iconsdir}/hicolor/*/apps/winff.png
 %{_mandir}/man1/*
+
+%{?with_Qt:
+%files qt%{QtV}
+%doc  winff/AUTHORS winff/*.txt winff/docs/*
+%license winff/COPYING
+%{_bindir}/%{name}-qt%{QtV}
+%{_datadir}/%{name}/
+%{_datadir}/applications/%{name}-qt%{QtV}.desktop
+%{_datadir}/pixmaps/*.png
+%{_iconsdir}/hicolor/*/apps/winff.png
+%{_mandir}/man1/*
+}

Actions: View | Diff

Attachments on bug 33334: 14578 | 14582 | 14587