From patchwork Wed Mar 6 11:53:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 1353 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F0CC516D30; Wed, 6 Mar 2019 12:05:59 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 3486216D2B for ; Wed, 6 Mar 2019 12:05:59 +0000 (GMT) Received: from localhost ([127.0.0.1]:60233 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1VJ8-0007Wk-DS for patchwork@mira.cbaines.net; Wed, 06 Mar 2019 07:05:58 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45955) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1V7h-0006uP-MX for guix-patches@gnu.org; Wed, 06 Mar 2019 06:54:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1V7f-0004jr-NI for guix-patches@gnu.org; Wed, 06 Mar 2019 06:54:09 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48484) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h1V7a-0004hQ-Qy for guix-patches@gnu.org; Wed, 06 Mar 2019 06:54:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1h1V7a-0000fG-Lf for guix-patches@gnu.org; Wed, 06 Mar 2019 06:54:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#34767] [PATCH] gnu: Add acetoneiso. Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Mar 2019 11:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 34767 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 34767@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.15518732372541 (code B ref -1); Wed, 06 Mar 2019 11:54:02 +0000 Received: (at submit) by debbugs.gnu.org; 6 Mar 2019 11:53:57 +0000 Received: from localhost ([127.0.0.1]:33795 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h1V7T-0000et-Ni for submit@debbugs.gnu.org; Wed, 06 Mar 2019 06:53:56 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59690) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1h1V7R-0000ee-6j for submit@debbugs.gnu.org; Wed, 06 Mar 2019 06:53:54 -0500 Received: from lists.gnu.org ([209.51.188.17]:52781) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1V7K-0004W5-M8 for submit@debbugs.gnu.org; Wed, 06 Mar 2019 06:53:47 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45831) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1V7I-0006Xs-Fh for guix-patches@gnu.org; Wed, 06 Mar 2019 06:53:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1V7G-0004Ti-5e for guix-patches@gnu.org; Wed, 06 Mar 2019 06:53:44 -0500 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:57953) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1V7B-0004PO-Nc for guix-patches@gnu.org; Wed, 06 Mar 2019 06:53:39 -0500 X-Originating-IP: 90.92.41.33 Received: from localhost.localdomain (lfbn-1-12225-33.w90-92.abo.wanadoo.fr [90.92.41.33]) (Authenticated sender: mail@ambrevar.xyz) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id A3A681C0002 for ; Wed, 6 Mar 2019 11:53:33 +0000 (UTC) From: Pierre Neidhardt Date: Wed, 6 Mar 2019 12:53:18 +0100 Message-Id: <20190306115318.17395-1-mail@ambrevar.xyz> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/kde-frameworks.scm (acetoneiso): New variable. --- gnu/packages/kde-frameworks.scm | 79 +++++++++++++++ .../patches/acetoneiso-no-qtwebkit.patch | 99 +++++++++++++++++++ 2 files changed, 178 insertions(+) create mode 100644 gnu/packages/patches/acetoneiso-no-qtwebkit.patch diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 2ae5feaf5..4d4b8ccfc 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -23,6 +23,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages kde-frameworks) + #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) #:use-module (guix download) #:use-module ((guix licenses) #:prefix license:) @@ -38,6 +39,7 @@ #:use-module (gnu packages boost) #:use-module (gnu packages bison) #:use-module (gnu packages boost) + #:use-module (gnu packages cdrom) #:use-module (gnu packages compression) #:use-module (gnu packages databases) #:use-module (gnu packages disk) @@ -3750,3 +3752,80 @@ offers abstract functionality to deal with scripts.") ;; under a variety of licenses. (license (list license:lgpl2.0+ license:lgpl2.1+ license:lgpl2.0 license:gpl3+)))) + +(define-public acetoneiso + (package + (name "acetoneiso") + (version "2.3") + (source (origin + (method url-fetch) + (uri (string-append + "https://downloads.sourceforge.net/acetoneiso/AcetoneISO/AcetoneISO%20" + version "/acetoneiso_" version ".tar.gz")) + (sha256 + (base32 + "0s07k8krzjkl2gpq2a7lxngijfxk81h37v5rrs98iw13bll6y7pa")) + (patches (search-patches "acetoneiso-no-qtwebkit.patch")))) + (build-system gnu-build-system) + (inputs + ;; TODO: Package fuseiso, cdrdao. + `(("cdrtools" ,cdrtools) + ("dvd+rw-tools" ,dvd+rw-tools) + ;; ("gnupg" ,gnupg) + ;; ("pinentry" ,pinentry) + ("mplayer" ,mplayer) + ("phonon" ,phonon) + ;; ("qtwebkit" ,qtwebkit) + ("qtbase" ,qtbase))) + (arguments + `(#:tests? #f ;no tests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'use-qt5 + ;; See https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/acetoneiso2. + (lambda* (#:key inputs #:allow-other-keys) + ;; (substitute* "acetoneiso/sources/acetoneiso.h" + ;; (("#include \n") "")) + (let ((phonon (assoc-ref inputs "phonon")) + (qt (assoc-ref inputs "qtbase"))) + (substitute* "acetoneiso/acetoneiso.pro" + ;; Need to specify target or else nothing will be built. + (("TARGET = ") "TARGET = acetoneiso") + ;; Remove webkit. + ;; (("QT \\+= webkit") "") + ;; Use Qt5 + (("QT \\+= phonon") "LIBS += -lphonon4qt5") + (("INCLUDEPATH \\+= ." all) + (string-append all + " " qt "/include/qt5/QtWidgets" + " " phonon "/include/phonon4qt5" + " " phonon "/include/phonon4qt5/phonon"))) + (substitute* (find-files "acetoneiso/sources" ".") + (("QtGui") "QtWidgets") + (("getInteger") "getInt") + (("WFlags") "WindowFlags"))) + #t)) + (replace 'configure + (lambda _ + (chdir "acetoneiso") + (invoke "qmake"))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (invoke "make" (string-append "INSTALL_ROOT=" + (assoc-ref outputs "out")) + "install")))))) + (home-page "https://sourceforge.net/projects/acetoneiso") + (synopsis "All in one ISO tool (BIN MDF NRG IMG DAA DMG CDI B5I BWI PDI ISO)") + (description "AcetoneISO is a feature-rich and complete software +application to manage CD/DVD images. It will let you mount typical images +formats such as ISO BIN NRG MDF IMG and do plenty of other things: + +@itemize +@item Mount most common Windows images in a clean and easy GUI. +@item Convert all known images to ISO or extract the contents to a folder. +@item Encrypt, compress, split any type of image. +@item Download videos from Youtube. +@item Convert DVD video to Xvid .avi and any generic video to Xvid .avi. +@item Extract audio from a video. +@end itemize\n") + (license license:gpl3+))) diff --git a/gnu/packages/patches/acetoneiso-no-qtwebkit.patch b/gnu/packages/patches/acetoneiso-no-qtwebkit.patch new file mode 100644 index 000000000..7c6e78aaf --- /dev/null +++ b/gnu/packages/patches/acetoneiso-no-qtwebkit.patch @@ -0,0 +1,99 @@ +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 + #include +-#include + #include "acetoneiso.h" + #include "connections.h" + #include +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 + #include + #include +-#include +-#include + #include + #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 @@ + + + +- +- +- +- :/images/splash.png:/images/splash.png +- +- +- Updates +- +- +- +- +- +- +- 0 +- 0 +- +- +- +- +- 260 +- 100 +- +- +- +- +- 6000 +- 6000 +- +- +- +- Real time updates from the net +- +- +- +- http://www.acetoneteam.org/clients.html +- +- +- +- +- +- + + + +@@ -1810,13 +1769,6 @@ + + + +- +- +- QWebView +- QWidget +-
QtWebKit/QWebView
+- +- + + listWidget_2 +