Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2026-05-08 12:30:44 +02:00
Code Issues Projects Releases Wiki Activity

dff: remove doc flag, issue #146

Browse source
This commit is contained in:
blshkv 2017-01-15 12:07:40 +08:00
parent cd242de998
commit 65b91ea2c4
No known key found for this signature in database
GPG key ID: 9CCF6FCB8D8A14BF
3 changed files with 44 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app-forensics/dff/dff-1.3.0-r3.ebuild
View file

@ -15,12 +15,13 @@ SRC_URI="http://dev.pentoo.ch/~zero/distfiles/${PN}-${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc ewf +aff +dff +pff"
IUSE="ewf +aff +bfio +pff"
# doc? ( dev-qt/assistant:4 )
RDEPEND="${PYTHON_DEPS}
dev-python/sip[${PYTHON_USEDEP}]
doc? ( >=dev-python/PyQt4-4.4.0[help,webkit,assistant,${PYTHON_USEDEP}] )
!doc? ( >=dev-python/PyQt4-4.4.0[help,${PYTHON_USEDEP}] )
>=dev-python/PyQt4-4.4.0[${PYTHON_USEDEP}]
dev-python/python-magic[${PYTHON_USEDEP}]
dev-python/apsw[${PYTHON_USEDEP}]
"
@ -28,7 +29,7 @@ RDEPEND="${PYTHON_DEPS}
DEPEND="${RDEPEND}
ewf? ( >=app-forensics/libewf-20100226 )
aff? ( >=app-forensics/afflib-3.6.8 )
dff? ( >=app-forensics/libbfio-0.0.20120425 )
bfio? ( >=app-forensics/libbfio-0.0.20120425 )
pff? ( >=app-forensics/libpff-0.0.20120802_alpha )
>=dev-lang/swig-1.3.38
dev-libs/tre[python]
@ -39,9 +40,9 @@ pkg_setup() {
}
src_prepare() {
#epatch "${FILESDIR}/${P}-disable-qtassistant.patch"
#doc flag is broken, need to install help.* files manually
epatch "${FILESDIR}/${PV}-disable-qtassistant.patch"
#epatch "${FILESDIR}/${P}-libpff-0.0.20120513.patch"
epatch "${FILESDIR}/${PV}-libav10.patch"
epatch "${FILESDIR}/${PV}-fix-ftbfs-libav9.patch"

36
app-forensics/dff/files/1.3.0-disable-qtassistant.patch Normal file
View file

@ -0,0 +1,36 @@
--- dff/ui/gui/mainwindow.py.orig 2013-02-28 18:40:39.000000000 +0800
+++ dff/ui/gui/mainwindow.py 2017-01-15 11:25:57.786002942 +0800
@@ -45,7 +45,11 @@
from dff.ui.gui.dialog.dialog import Dialog
from dff.ui.gui.resources.ui_mainwindow import Ui_MainWindow
-from dff.ui.gui.widget.help import Help
+HELP = True
+try:
+ from dff.ui.gui.widget.help import Help
+except ImportError:
+ HELP = False
class MainWindow(QMainWindow, Ui_MainWindow):
def __init__(self, app, debug = False):
@@ -96,8 +100,9 @@
self.connect(self.actionShell, SIGNAL("triggered()"), self.shellActions.create)
self.connect(self.actionPython_interpreter, SIGNAL("triggered()"), self.interpreterActions.create) ## About menu
+ if HELP:
+ self.connect(self.actionHelp, SIGNAL("triggered()"), self.addHelpWidget)
- self.connect(self.actionHelp, SIGNAL("triggered()"), self.addHelpWidget)
self.connect(self.actionAbout, SIGNAL("triggered()"), self.dialog.about)
def initToolbarList(self):
@@ -309,7 +314,8 @@
self.actionShell.setEnabled(True)
self.actionPython_interpreter.setEnabled(True)
self.actionIdeOpen.setEnabled(True)
- self.actionHelp.setEnabled(True)
+ if HELP:
+ self.actionHelp.setEnabled(True)
def fullscreenMode(self):
if self.isFullScreen():

3
profiles/pentoo/base/package.use/dev-python
View file

@ -1,8 +1,7 @@
dev-python/capstone-python cython
#required by fern-wifi-cracker and kde
#help is required by dff
dev-python/PyQt4 help compat webkit declarative sql script
dev-python/PyQt4 compat webkit declarative sql script
# required by w3af dev-python/nltk
dev-lang/python tk