Request 5401 (accepted)

Overview

Request 5401 (accepted)

Fix build with Qt5

Created by Aloysius almost 3 years ago
In state accepted
Package maintainer: mantre

Submit dvdinfo

Submit package home:Aloysius:branches:Multimedia / dvdinfo to package Multimedia / dvdinfo

dvdinfo.changes Added

dvdinfo.spec Changed

@@ -1,30 +1,41 @@
-# Copyright (c) 2007-2009 oc2pus
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments to toni@links2linux.de
+# spec file for package dvdinfo
+#
+# Copyright (c) 2021 Packman Team <packman@links2linux.de>
+# Copyright (c) 2007-2009 oc2pus <toni@links2linux.de>
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
 
-# norootforbuild
+# Please submit bugfixes or comments via https://bugs.links2linux.org/
+#
 
-%define _prefix	/usr
 
-Name:			dvdinfo
-Version:		0.9.2
-Release:		0.pm.2
-Summary:		DVDx InfoTool shows the DVD structure of a DVD-Video disc
-Source:			%{name}-src_0-9-2.tar.gz
-Patch0:			%{name}-gcc44.patch
-Patch1:			%{name}-qt4.patch
-URL:			http://www.labdv.com/dvdx/download.php
-Group:			Productivity/Multimedia/Other
-BuildRoot:		%{_tmppath}/build-%{name}-%{version}
-License: GPL-2.0
-BuildRequires:	freetype2-devel
-BuildRequires:	gcc-c++
-BuildRequires:	qt-devel
-BuildRequires:	libdvdcss-devel
-BuildRequires:	libdvdread3-devel
-BuildRequires:	update-desktop-files
+%define _over   0-9-2
+Name:           dvdinfo
+Version:        0.9.2
+Release:        0
+Summary:        DVDx InfoTool shows the DVD structure of a DVD-Video disc
+License:        GPL-2.0-or-later
+Group:          Productivity/Multimedia/Other
+URL:            http://www.labdv.com/dvdx/download.php
+Source:         %{name}-src_0-9-2.tar.gz
+Patch0:         %{name}-gcc44.patch
+Patch1:         %{name}-qt4.patch
+Patch2:         %{name}-qt5.patch
+BuildRequires:  gcc-c++
+BuildRequires:  libdvdread3-devel
+BuildRequires:  pkgconfig
+BuildRequires:  update-desktop-files
+BuildRequires:  pkgconfig(Qt5Widgets)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(libdvdcss)
 
 %description
 DVDx InfoTool shows the DVD structure (such as VTS, PGC, and menus)
@@ -32,63 +43,41 @@
 or not). The information can be displayed in two views: a complete
 dump or 'text' which filters out less useful details.
 
-
-
 %prep
-%setup -q -n %{name}-src_0-9-2
-%patch0 -p1
-%if %suse_version > 1110
-%patch1 -p1
-%endif
+%setup -q -n %{name}-src_%{_over}
+%autopatch -p1
 
-%__chmod 644 InfoTool/COPYING InfoTool/README
+chmod 644 InfoTool/COPYING InfoTool/README
 
 %build
 pushd InfoTool/linux
-	qmake dvdinfo-linux.pro
-	%__make %{?jobs:-j%{jobs}}
+        %qmake5
+	%make_build
 popd
 
 %install
-%__install -dm 755 %{buildroot}%{_bindir}
-%__install -m 755 InfoTool/linux/%{name} \
+install -dm 755 %{buildroot}%{_bindir}
+install -m 755 InfoTool/linux/%{name} \
 	%{buildroot}%{_bindir}
 
-# icon
-#%__install -dm 755 %{buildroot}%{_datadir}/pixmaps
-#%__install -m 644 %{name}.png \
-#	%{buildroot}%{_datadir}/pixmaps
-
-# menu
-%__install -dm 755 %{buildroot}%{_datadir}/applications
-%__cat > %{buildroot}%{_datadir}/applications/%{name}.desktop <<EOF
+install -dm 755 %{buildroot}%{_datadir}/applications
+cat > %{buildroot}%{_datadir}/applications/%{name}.desktop <<EOF
 [Desktop Entry]
-#Encoding=UTF-8
+Version=1.0
 Type=Application
 Exec=%{name}
-#Icon=%{name}
+Icon=tools-rip-video-dvd
 Terminal=false
 Name=DVDx InfoTool
 GenericName=DVDx InfoTool
 Comment=DVDx InfoTool shows the DVD structure of a DVD-Video disc
-#Categories=AudioVideo;AudioVideoEditing;
+Categories=AudioVideo;AudioVideoEditing;
 EOF
-%suse_update_desktop_file %{name} AudioVideo AudioVideoEditing
-
-%clean
-[ -d "%{buildroot}" -a "%{buildroot}" != "" ] && %__rm -rf "%{buildroot}"
 
 %files
-%defattr(-,root,root)
-%doc InfoTool/COPYING InfoTool/README
+%license InfoTool/COPYING
+%doc InfoTool/README
 %{_bindir}/%{name}
-#%{_datadir}/pixmaps/*.png
 %{_datadir}/applications/%{name}.desktop
 
 %changelog
-* Tue Dec 23 2008 Toni Graffy <toni@links2linux.de> - 0.9.2-0.pm.2
-- rebuild with new libdvdread(-devel)
-* Tue Jan 08 2008 Toni Graffy <toni@links2linux.de> - 0.9.2-0.pm.1
-- update to 0.9.2
-* Sun Dec 23 2007 Toni Graffy <toni@links2linux.de> - 0.9.1-0.pm.1
-- initial package 0.9.1

dvdinfo-qt5.patch Added

@@ -0,0 +1,78 @@
+Index: dvdinfo-src_0-9-2/InfoTool/linux/dvdinfo-linux.pro
+===================================================================
+--- dvdinfo-src_0-9-2.orig/InfoTool/linux/dvdinfo-linux.pro
++++ dvdinfo-src_0-9-2/InfoTool/linux/dvdinfo-linux.pro
+@@ -20,6 +20,7 @@ TARGET = dvdinfo
+ LANGUAGE = C++
+ CONFIG += debug release
+ CONFIG += qt
++QT += widgets
+ HEADERS += ../src/dvdtitleinfoview.h \
+     ../src/dvdinfoview.h \
+     ../src/dvdinfocore.h \
+Index: dvdinfo-src_0-9-2/InfoTool/src/dvdinfoview.cpp
+===================================================================
+--- dvdinfo-src_0-9-2.orig/InfoTool/src/dvdinfoview.cpp
++++ dvdinfo-src_0-9-2/InfoTool/src/dvdinfoview.cpp
+@@ -20,7 +20,7 @@
+  *
+  *****************************************************************************/
+ 
+-#include <QtGui>
++#include <QtWidgets>
+ 
+ #include "dvdinfoview.h"
+ 
+Index: dvdinfo-src_0-9-2/InfoTool/src/dvdtitleinfoview.cpp
+===================================================================
+--- dvdinfo-src_0-9-2.orig/InfoTool/src/dvdtitleinfoview.cpp
++++ dvdinfo-src_0-9-2/InfoTool/src/dvdtitleinfoview.cpp
+@@ -20,7 +20,7 @@
+  *
+  *****************************************************************************/
+ 
+-#include <QtGui>
++#include <QtWidgets>
+ #include <stdint.h>
+ 
+ #include "dvdtitleinfoview.h"
+Index: dvdinfo-src_0-9-2/InfoTool/src/mainwindow.cpp
+===================================================================
+--- dvdinfo-src_0-9-2.orig/InfoTool/src/mainwindow.cpp
++++ dvdinfo-src_0-9-2/InfoTool/src/mainwindow.cpp
+@@ -20,7 +20,7 @@
+  *
+  *****************************************************************************/
+ 
+-#include <QtGui>
++#include <QtWidgets>
+ #include <QRegExp>
+ #include <stdint.h>
+ #include <iostream>  // for console developer messages like: cout << "Set view: " << index << endl;
+@@ -365,7 +365,7 @@ void MainWindow::createMenus()
+ 
+ void MainWindow::loadDvdInfo(const QString &dvdPath)
+ {
+-	currentDvdInfo = ReadDvdInfo( (const char *) dvdPath.toAscii() );
++	currentDvdInfo = ReadDvdInfo( (const char *) dvdPath.toLatin1() );
+ 
+ 	if ( !currentDvdInfo.valid ) {
+ 		QMessageBox::warning(this, tr("DVDx InfoTool"),
+@@ -428,7 +428,7 @@ void MainWindow::saveDvdInfo(const QStri
+ 
+ void MainWindow::loadDvdTitleInfo(const QString &dvdPath, const int title)
+ {
+-	currentDvdTitleInfo = ReadDvdTitleInfo( (const char *) dvdPath.toAscii(), title );
++	currentDvdTitleInfo = ReadDvdTitleInfo( (const char *) dvdPath.toLatin1(), title );
+ 
+ 	if ( !currentDvdTitleInfo.valid ) {
+ 		QMessageBox::warning(this, tr("DVDx InfoTool"),
+@@ -487,7 +487,7 @@ void MainWindow::loadDvdVtsInfo(const QS
+ {
+ 	// TODO: replace with ReadDvdInfo() then getDvdVtsInfo()
+ 	
+-	currentDvdVtsInfo = ReadDvdVtsInfo( (const char *) dvdPath.toAscii(), vts );
++	currentDvdVtsInfo = ReadDvdVtsInfo( (const char *) dvdPath.toLatin1(), vts );
+ 
+ 	if ( !currentDvdVtsInfo.valid ) {
+ 		QMessageBox::warning(this, tr("DVDx InfoTool"),

Build Results
RPM Lint

Refresh

Comments for request 5401 0

Request History

Aloysius created request almost 3 years ago

Fix build with Qt5

olh accepted request almost 3 years ago