From 6ca47bd1c16818caf495d36e4c18fcd85da4bba2 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Thu, 18 Oct 2018 18:31:32 +0200 Subject: [PATCH] laditools: fix broken template - noarch=yes - add missing pycompile_module - needs gtk+3/python-gobject, not gtk+2/pygtk (fork of LADI/laditools) - add patch to support vte>=0.52 --- .../{00-python-enum34.patch => enum34.patch} | 0 srcpkgs/laditools/patches/vte3.patch | 21 +++++++++++++++++++ srcpkgs/laditools/template | 14 +++++++++---- 3 files changed, 31 insertions(+), 4 deletions(-) rename srcpkgs/laditools/patches/{00-python-enum34.patch => enum34.patch} (100%) create mode 100644 srcpkgs/laditools/patches/vte3.patch diff --git a/srcpkgs/laditools/patches/00-python-enum34.patch b/srcpkgs/laditools/patches/enum34.patch similarity index 100% rename from srcpkgs/laditools/patches/00-python-enum34.patch rename to srcpkgs/laditools/patches/enum34.patch diff --git a/srcpkgs/laditools/patches/vte3.patch b/srcpkgs/laditools/patches/vte3.patch new file mode 100644 index 00000000000..d8ccb8d7bbe --- /dev/null +++ b/srcpkgs/laditools/patches/vte3.patch @@ -0,0 +1,21 @@ +Support for vte >= 0.52. +See https://bugs.launchpad.net/ubuntu/+source/laditools/+bug/1669111. + +--- ladi-system-log.orig 2015-09-13 23:38:51.000000000 +0200 ++++ ladi-system-log 2018-10-17 18:04:59.687899590 +0200 +@@ -190,13 +190,13 @@ + + def on_clear_text (self, data=None): + current_view = self.logview_notebook.get_current_page () +- self.log_files[current_view]["term"].feed ("\033[2J\033[;f", -1) ++ self.log_files[current_view]["term"].feed ("\033[2J\033[;f") + + def on_purge (self, data=None): + current_view = self.logview_notebook.get_current_page () + # Opens the file in write anew mode thus clearing the file and close it right away + open (self.log_files[current_view]['logfile_path'], "w+") +- self.log_files[current_view]["term"].feed ("\033[2J\033[;f", -1) ++ self.log_files[current_view]["term"].feed ("\033[2J\033[;f") + + def run (self): + self.ui.show_all() diff --git a/srcpkgs/laditools/template b/srcpkgs/laditools/template index 78eda80d0a9..ca4a399a5eb 100644 --- a/srcpkgs/laditools/template +++ b/srcpkgs/laditools/template @@ -1,14 +1,20 @@ # Template file for 'laditools' pkgname=laditools version=1.1.0 -revision=1 +revision=2 +noarch=yes build_style=python2-module +pycompile_module="laditools" hostmakedepends="python-distutils-extra intltool librsvg-utils" -makedepends="pygtk-devel vte3-devel" -depends="pygtk python-enum34 python-xdg vte-python" +depends="ladish jack gtk+3 python-gobject python-dbus python-enum34 python-xdg vte3" short_desc="Linux Audio Desktop Integration Tools" maintainer="Cameron Nemo " license="GPL-3.0-or-later" -homepage="https://github.com/alessio/${pkgname}" +homepage="https://github.com/alessio/laditools" distfiles="${homepage}/archive/v${version}.tar.gz" checksum=ca99f4b6e17b7333ed87dd12a2d91da4d486e53d89dd2677edfa29170ec6efe5 + +post_install() { + # remove wmladi, we do not have wmdocklib. + rm -f ${DESTDIR}/usr/bin/wmladi +}