Packman Build Service PMBS

Changes of Revision 2

qmp3gain.spec Changed

qmp3gain-0.9.0-qt5.patch Changed

@@ -5,20 +5,16 @@
 Qt4 is deprecated and a possible security hazard,
 so it's preferable to build against Qt5 libs.
 
-Index: qmp3gain-0.9.0/src/backenddialog.cpp
-===================================================================
---- qmp3gain-0.9.0.orig/src/backenddialog.cpp
-+++ qmp3gain-0.9.0/src/backenddialog.cpp
+--- a/src/backenddialog.cpp
++++ b/src/backenddialog.cpp
 @@ -1,4 +1,5 @@
  #include <QtGui>
 +#include <QFileDialog>
  
  #include "backenddialog.h"
  
-Index: qmp3gain-0.9.0/src/constantgainchangedialog.h
-===================================================================
---- qmp3gain-0.9.0.orig/src/constantgainchangedialog.h
-+++ qmp3gain-0.9.0/src/constantgainchangedialog.h
+--- a/src/constantgainchangedialog.h
++++ b/src/constantgainchangedialog.h
 @@ -1,7 +1,7 @@
  #ifndef CONSTANTGAINCHANGEDIALOG_H
  #define CONSTANTGAINCHANGEDIALOG_H
@@ -28,10 +24,8 @@
  #include <QSettings>
  #include "ui_constantgainchangedialog.h"
  
-Index: qmp3gain-0.9.0/src/logoptionsdialog.cpp
-===================================================================
---- qmp3gain-0.9.0.orig/src/logoptionsdialog.cpp
-+++ qmp3gain-0.9.0/src/logoptionsdialog.cpp
+--- a/src/logoptionsdialog.cpp
++++ b/src/logoptionsdialog.cpp
 @@ -1,5 +1,7 @@
  #include <QtGui>
  #include <QPointer>
@@ -40,10 +34,8 @@
  
  #include "logoptionsdialog.h"
  
-Index: qmp3gain-0.9.0/src/mainwindow.cpp
-===================================================================
---- qmp3gain-0.9.0.orig/src/mainwindow.cpp
-+++ qmp3gain-0.9.0/src/mainwindow.cpp
+--- a/src/mainwindow.cpp
++++ b/src/mainwindow.cpp
 @@ -1,5 +1,8 @@
  #include <QtGui>
  #include <QtXml>
@@ -124,10 +116,8 @@
  			QString resourcePath = directoryOf("resources/sounds").absolutePath();
  			QString beepFile(resourcePath+"/"+"beep.wav");
  			if (QFileInfo(beepFile).exists())
-Index: qmp3gain-0.9.0/src/mymessagebox.cpp
-===================================================================
---- qmp3gain-0.9.0.orig/src/mymessagebox.cpp
-+++ qmp3gain-0.9.0/src/mymessagebox.cpp
+--- a/src/mymessagebox.cpp
++++ b/src/mymessagebox.cpp
 @@ -6,6 +6,8 @@
   */
  
@@ -137,10 +127,8 @@
  #include "mymessagebox.h"
  
  MyMessageBox::MyMessageBox() {
-Index: qmp3gain-0.9.0/src/src.pro
-===================================================================
---- qmp3gain-0.9.0.orig/src/src.pro
-+++ qmp3gain-0.9.0/src/src.pro
+--- a/src/src.pro
++++ b/src/src.pro
 @@ -8,8 +8,7 @@ APP_SUBMINOR_VER = 0
  TEMPLATE = app
  CONFIG += warn_on \
@@ -169,10 +157,8 @@
  # Input
  HEADERS += doubleprogressbar.h \
      mymessagebox.h \
-Index: qmp3gain-0.9.0/translations/translations.pri
-===================================================================
---- qmp3gain-0.9.0.orig/translations/translations.pri
-+++ qmp3gain-0.9.0/translations/translations.pri
+--- a/translations/translations.pri
++++ b/translations/translations.pri
 @@ -24,7 +24,8 @@
  	}
  	else {
@@ -183,10 +169,8 @@
  		translations.CONFIG += no_check_exist
  		INSTALLS += translations
  	}
-Index: qmp3gain-0.9.0/help/help.pri
-===================================================================
---- qmp3gain-0.9.0.orig/help/help.pri
-+++ qmp3gain-0.9.0/help/help.pri
+--- a/help/help.pri
++++ b/help/help.pri
 @@ -14,6 +14,7 @@
  	for(file, HELPS) {
  		exists($${file}.qhp) {
@@ -195,7 +179,23 @@
  		}
  	}
  
-@@ -36,6 +37,7 @@
+@@ -29,13 +30,21 @@
+ 	# qcollectiongenerator qmp3gain.qhcp -o qmp3gain.qhc
+ 
+ 	isEmpty(QMAKE_QCOLLECTIONGENERATOR) {
+-		win32:QMAKE_QCOLLECTIONGENERATOR = $$QT_INSTALL_BINS\qcollectiongenerator.exe
+-		else:QMAKE_QCOLLECTIONGENERATOR = $$QT_INSTALL_BINS/qcollectiongenerator
++		exists($$QT_INSTALL_BINS/qcollectiongenerator) {
++			QMAKE_QCOLLECTIONGENERATOR = $$QT_INSTALL_BINS/qcollectiongenerator
++		} else {
++			exists($$QT_INSTALL_BINS/qhelpgenerator) {
++				QMAKE_QCOLLECTIONGENERATOR = $$QT_INSTALL_BINS/qhelpgenerator
++			} else {
++				QMAKE_QCOLLECTIONGENERATOR = /bin/false
++			}
++		}
+ 	}
+ 
  	for(file, HELPS) {
  		exists($${file}.qhcp) {
  		HELPS_QHCP += $${file}.qhcp
@@ -203,7 +203,7 @@
  		}
  	}
  
-@@ -56,7 +58,7 @@
+@@ -56,7 +65,7 @@
  	}
  	else {
  		help.path = $${INSTALLDIR_SHARE}/help