openlp-core team mailing list archive

[Jonathan Springer <springermac@xxxxxxxxx>]

Jonathan Springer has proposed merging lp:~springermac/openlp/packaging into lp:openlp/packaging.

Requested reviews:
  Tomas Groth (tomasgroth)

For more details, see:
https://code.launchpad.net/~springermac/openlp/packaging/+merge/281353

Changes for Qt5
-- 
Your team OpenLP Core is subscribed to branch lp:openlp/packaging.

=== modified file 'osx/Info.plist'
--- osx/Info.plist	2015-08-24 18:14:55 +0000
+++ osx/Info.plist	2015-12-25 16:05:30 +0000
@@ -116,8 +116,6 @@
 	<false/>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
-	<key>LSBackgroundOnly</key>
-	<true/>
 	<key>NSHighResolutionCapable</key>
 	<true/>
 	<key>CFBundleHelpBookFolder</key>

=== modified file 'osx/macosx-builder.py'
--- osx/macosx-builder.py	2015-08-28 19:31:35 +0000
+++ osx/macosx-builder.py	2015-12-25 16:05:30 +0000
@@ -329,7 +329,6 @@
                '--windowed',
                '--noupx',
                '--additional-hooks-dir', self.hooks_path,
-               '--runtime-hook', os.path.join(self.hooks_path, 'rthook_openlp_pyqt4.py'),
                '--runtime-hook', os.path.join(self.hooks_path, 'rthook_ssl.py'),
                '-i', self.mac_icon,
                '-p', self.work_path,
@@ -341,11 +340,9 @@
             cmd.append('--log-level=DEBUG')
         if self.args.devel:
             cmd.append('-d')
-        pyinstaller = Popen(cmd, stdout=PIPE)
-        output = pyinstaller.communicate()[0]
+        pyinstaller = Popen(cmd)
         code = pyinstaller.wait()
         if code != 0:
-            self._print(output)
             raise Exception('Error running PyInstaller')
 
     def write_version_file(self):

=== modified file 'pyinstaller-hooks/hook-openlp.core.ui.media.py'
--- pyinstaller-hooks/hook-openlp.core.ui.media.py	2015-06-16 20:07:34 +0000
+++ pyinstaller-hooks/hook-openlp.core.ui.media.py	2015-12-25 16:05:30 +0000
@@ -20,6 +20,6 @@
 # Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
 ###############################################################################
 
-hiddenimports = ['openlp.core.ui.media.phononplayer',
+hiddenimports = ['openlp.core.ui.media.systemplayer',
                  'openlp.core.ui.media.vlcplayer',
                  'openlp.core.ui.media.webkitplayer']

=== removed file 'pyinstaller-hooks/rthook_openlp_pyqt4.py'
--- pyinstaller-hooks/rthook_openlp_pyqt4.py	2015-06-16 20:07:34 +0000
+++ pyinstaller-hooks/rthook_openlp_pyqt4.py	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: autoindent shiftwidth=4 expandtab textwidth=80 tabstop=4 softtabstop=4
-
-###############################################################################
-# OpenLP - Open Source Lyrics Projection                                      #
-# --------------------------------------------------------------------------- #
-# Copyright (c) 2008-2015 OpenLP Developers                                   #
-# --------------------------------------------------------------------------- #
-# This program is free software; you can redistribute it and/or modify it     #
-# under the terms of the GNU General Public License as published by the Free  #
-# Software Foundation; version 2 of the License.                              #
-#                                                                             #
-# This program is distributed in the hope that it will be useful, but WITHOUT #
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or       #
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for    #
-# more details.                                                               #
-#                                                                             #
-# You should have received a copy of the GNU General Public License along     #
-# with this program; if not, write to the Free Software Foundation, Inc., 59  #
-# Temple Place, Suite 330, Boston, MA 02111-1307 USA                          #
-###############################################################################
-
-
-# PyQt4 supports two different APIs: version 1 (default on Python 2) and
-# version 2 (default on Python 3). For OpenLP we want to use the version 2 API
-# with Python 2.
-#
-# The v2 API has to be set before any import of PyQt4 modules.
-# However, the executable created by PyInstaller overrides qt_plugins directory
-# (it uses PyQt4) before any code from OpenLP gets executed.
-#
-# The following code is bundled with the created executable and executed
-# before any other code.
-
-import sip
-
-sip.setapi('QDate', 2)
-sip.setapi('QDateTime', 2)
-sip.setapi('QString', 2)
-sip.setapi('QTextStream', 2)
-sip.setapi('QTime', 2)
-sip.setapi('QUrl', 2)
-sip.setapi('QVariant', 2)

=== modified file 'windows/windows-builder.py'
--- windows/windows-builder.py	2015-10-13 19:56:37 +0000
+++ windows/windows-builder.py	2015-12-25 16:05:30 +0000
@@ -296,7 +296,6 @@
                '--windowed',
                '--noupx',
                '--additional-hooks-dir', self.hooks_path,
-               '--runtime-hook', os.path.join(self.hooks_path, 'rthook_openlp_pyqt4.py'),
                '--distpath', self.dist_path_pyinst_arg,
                '-i', self.win32_icon,
                '-p', self.branch_path,
@@ -306,11 +305,9 @@
             cmd.append('--log-level=ERROR')
         else:
             cmd.append('--log-level=DEBUG')
-        pyinstaller = Popen(cmd, stdout=PIPE)
-        output = pyinstaller.communicate()[0]
+        pyinstaller = Popen(cmd)
         code = pyinstaller.wait()
         if code != 0:
-            self._print(output)
             raise Exception('Error running PyInstaller')
 
     def write_version_file(self):