[arch-commits] Commit in acetoneiso2/trunk (PKGBUILD acetoneiso-no-qtwebkit.patch)

Antonio Rojas arojas at archlinux.org
Fri Apr 27 11:35:07 UTC 2018


    Date: Friday, April 27, 2018 @ 11:35:07
  Author: arojas
Revision: 318288

Build with Qt5

Modified:
  acetoneiso2/trunk/PKGBUILD
Deleted:
  acetoneiso2/trunk/acetoneiso-no-qtwebkit.patch

------------------------------+
 PKGBUILD                     |   38 +++++++--------
 acetoneiso-no-qtwebkit.patch |   99 -----------------------------------------
 2 files changed, 19 insertions(+), 118 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-27 11:31:30 UTC (rev 318287)
+++ PKGBUILD	2018-04-27 11:35:07 UTC (rev 318288)
@@ -5,41 +5,41 @@
 
 pkgname=acetoneiso2
 pkgver=2.3
-pkgrel=8
+pkgrel=9
 pkgdesc="An all in one ISO tool (bin mdf nrg img daa dmg cdi b5i bwi pdi iso)"
 arch=('x86_64')
 url="http://sourceforge.net/projects/acetoneiso"
 license=('GPL3')
-depends=('fuseiso' 'cdrdao' 'cdrkit' 'dvd+rw-tools' 'gnupg' 'pinentry' 'mplayer' 'phonon-qt4')
+depends=('fuseiso' 'cdrdao' 'cdrtools' 'dvd+rw-tools' 'gnupg' 'pinentry' 'mplayer' 'phonon-qt5' 'qt5-webkit')
 optdepends=("p7zip: for ISO compress/decompress support")
 conflicts=('acetoneiso')
 install=${pkgname}.install
-source=(http://downloads.sourceforge.net/acetoneiso/AcetoneISO/AcetoneISO%202.3/acetoneiso_${pkgver}.tar.gz acetoneiso-no-qtwebkit.patch)
-md5sums=('225f7af687016690ff28b9771a1ce179'
-         'd5f844e3211271b858dc74c603fd1b12')
+source=(http://downloads.sourceforge.net/acetoneiso/AcetoneISO/AcetoneISO%202.3/acetoneiso_${pkgver}.tar.gz)
+md5sums=('225f7af687016690ff28b9771a1ce179')
 
 prepare() {
-	cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso/sources
+  cd acetoneiso_${pkgver}/acetoneiso
 
-	sed -i 's#<Phonon/#<phonon/#' erase_cd.h erase_cd.cpp erase_dvd.cpp \
-	  burn_iso_2_cd.cpp burn_iso_2_cd.h burn_iso_2_dvd.cpp
-
-# Drop qtwebkit support
-  cd ../..
-  patch -p1 -i ../acetoneiso-no-qtwebkit.patch
+  sed -i 's#<Phonon/#<phonon/#' sources/*
+# Port to Qt5 https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1563802.html
+  sed -i 's/QtGui/QtWidgets/' sources/*
+  sed -i 's/getInteger/getInt/' sources/*
+  sed -i 's/WFlags/WindowFlags/' sources/*
+  sed -i 's/webkit/webkitwidgets/' acetoneiso.pro
+  sed -i 's/TARGET = /TARGET = acetoneiso/' acetoneiso.pro
+  sed -i 's/QT += phonon/LIBS += -lphonon4qt5/' acetoneiso.pro
+  sed -i 's at INCLUDEPATH.*$@& /usr/include/phonon4qt5@' acetoneiso.pro
 }
 
 build() {
-	cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso
+  cd acetoneiso_${pkgver}/acetoneiso
 
-	qmake-qt4
-	# needed for phonon
-	sed -i 's|-I/usr/include/QtCore|-I/usr/include/qt4/QtCore -I/usr/include/qt4/KDE|' Makefile
-	make
+  qmake-qt5
+  make
 }
 
 package() {
-	cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso
+  cd acetoneiso_${pkgver}/acetoneiso
 
-	make INSTALL_ROOT="${pkgdir}" install
+  make INSTALL_ROOT="${pkgdir}" install
 }

Deleted: acetoneiso-no-qtwebkit.patch
===================================================================
--- acetoneiso-no-qtwebkit.patch	2018-04-27 11:31:30 UTC (rev 318287)
+++ acetoneiso-no-qtwebkit.patch	2018-04-27 11:35:07 UTC (rev 318288)
@@ -1,99 +0,0 @@
-diff -ur acetoneiso_2.3.orig/acetoneiso/acetoneiso.pro acetoneiso_2.3/acetoneiso/acetoneiso.pro
---- acetoneiso_2.3.orig/acetoneiso/acetoneiso.pro	2010-11-11 19:52:33.000000000 +0100
-+++ acetoneiso_2.3/acetoneiso/acetoneiso.pro	2017-02-07 09:40:46.751204646 +0100
-@@ -59,7 +59,6 @@
- QT += phonon
- QT += dbus
- #QT += svg
--QT += webkit
- 
- #install#
-     target.path = /usr/bin
-diff -ur acetoneiso_2.3.orig/acetoneiso/sources/acetoneiso.cpp acetoneiso_2.3/acetoneiso/sources/acetoneiso.cpp
---- acetoneiso_2.3.orig/acetoneiso/sources/acetoneiso.cpp	2010-11-11 21:36:19.000000000 +0100
-+++ acetoneiso_2.3/acetoneiso/sources/acetoneiso.cpp	2017-02-07 09:36:27.715760057 +0100
-@@ -16,7 +16,6 @@
- 
- #include <QtGui>
- #include <QTabWidget>
--#include <QWebView>
- #include "acetoneiso.h"
- #include "connections.h"
- #include <fcntl.h>
-diff -ur acetoneiso_2.3.orig/acetoneiso/sources/acetoneiso.h acetoneiso_2.3/acetoneiso/sources/acetoneiso.h
---- acetoneiso_2.3.orig/acetoneiso/sources/acetoneiso.h	2010-11-11 00:56:58.000000000 +0100
-+++ acetoneiso_2.3/acetoneiso/sources/acetoneiso.h	2017-02-07 09:36:44.429505254 +0100
-@@ -21,8 +21,6 @@
- #include <QListWidget>
- #include <QTabWidget>
- #include <QDebug>
--#include <QtWebKit>
--#include <QWebView>
- #include <QProcess>
- #include"progress.h"
- #include"QFileSystemModel"
-diff -ur acetoneiso_2.3.orig/acetoneiso/ui/acetoneiso.ui acetoneiso_2.3/acetoneiso/ui/acetoneiso.ui
---- acetoneiso_2.3.orig/acetoneiso/ui/acetoneiso.ui	2010-11-15 02:34:50.000000000 +0100
-+++ acetoneiso_2.3/acetoneiso/ui/acetoneiso.ui	2017-02-07 09:37:46.144278448 +0100
-@@ -466,47 +466,6 @@
-         </property>
-        </widget>
-       </widget>
--      <widget class="QWidget" name="tab_2">
--       <attribute name="icon">
--        <iconset resource="../acetoneiso.qrc">
--         <normaloff>:/images/splash.png</normaloff>:/images/splash.png</iconset>
--       </attribute>
--       <attribute name="title">
--        <string>Updates</string>
--       </attribute>
--       <layout class="QGridLayout" name="gridLayout_4">
--        <item row="0" column="0">
--         <widget class="QWebView" name="webView" native="true">
--          <property name="sizePolicy">
--           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
--            <horstretch>0</horstretch>
--            <verstretch>0</verstretch>
--           </sizepolicy>
--          </property>
--          <property name="minimumSize">
--           <size>
--            <width>260</width>
--            <height>100</height>
--           </size>
--          </property>
--          <property name="maximumSize">
--           <size>
--            <width>6000</width>
--            <height>6000</height>
--           </size>
--          </property>
--          <property name="toolTip">
--           <string>Real time updates from the net</string>
--          </property>
--          <property name="url" stdset="0">
--           <url>
--            <string>http://www.acetoneteam.org/clients.html</string>
--           </url>
--          </property>
--         </widget>
--        </item>
--       </layout>
--      </widget>
-      </widget>
-     </item>
-     <item row="1" column="0">
-@@ -1810,13 +1769,6 @@
-    </property>
-   </action>
-  </widget>
-- <customwidgets>
--  <customwidget>
--   <class>QWebView</class>
--   <extends>QWidget</extends>
--   <header>QtWebKit/QWebView</header>
--  </customwidget>
-- </customwidgets>
-  <tabstops>
-   <tabstop>listWidget_2</tabstop>
-  </tabstops>



More information about the arch-commits mailing list