Hello community,

here is the log from the commit of package exaile for openSUSE:Factory checked 
in at 2014-11-04 17:29:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/exaile (Old)
 and      /work/SRC/openSUSE:Factory/.exaile.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "exaile"

Changes:
--------
--- /work/SRC/openSUSE:Factory/exaile/exaile.changes    2014-10-25 
11:10:37.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.exaile.new/exaile.changes       2014-11-04 
17:29:43.000000000 +0100
@@ -1,0 +2,10 @@
+Sun Nov  2 20:07:17 UTC 2014 - [email protected]
+
+- Update to 3.4.1:
+  * Delay the import of modules that depend on PyGTK to after
+    --help handling.
+  * Don't refuse to run as root: we're not the moral police.
+    IIRC there were bugs when running as root, so message saying
+    it is unsupported still prints out.
+
+-------------------------------------------------------------------

Old:
----
  3.4.0.2.tar.gz

New:
----
  3.4.1.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ exaile.spec ++++++
--- /var/tmp/diff_new_pack.dOYuLc/_old  2014-11-04 17:29:45.000000000 +0100
+++ /var/tmp/diff_new_pack.dOYuLc/_new  2014-11-04 17:29:45.000000000 +0100
@@ -18,7 +18,7 @@
 
 Name:           exaile
 %define _name   Exaile
-Version:        3.4.0.2
+Version:        3.4.1
 Release:        0
 Summary:        Gtk2 Amarok-like music player
 License:        GPL-3.0+
@@ -49,7 +49,6 @@
 Recommends:     python-notify
 Recommends:     python-webkitgtk >= 1.1.2
 BuildArch:      noarch
-%py_requires
 
 %description
 Exaile is a media player aiming to be similar to Clementine, but

++++++ 3.4.0.2.tar.gz -> 3.4.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/exaile-3.4.0.2/.bzrignore new/exaile-3.4.1/.bzrignore
--- old/exaile-3.4.0.2/.bzrignore       2014-09-03 18:23:55.000000000 +0200
+++ new/exaile-3.4.1/.bzrignore 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-doc
-doc/api-objects.txt
-doc/crarr.png
-doc/epydoc.css
-doc/epydoc.js
-doc/*.html
-data/plugins
-
-po/*/
-po/POTFILES.in
-
-backup.bzr
-random
-exaile-dist.tar.bz2
-exaile-po.tar.bz2
-build
-dist
-
-doc/_build
-
-.DS_Store
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/exaile-3.4.0.2/.gitignore new/exaile-3.4.1/.gitignore
--- old/exaile-3.4.0.2/.gitignore       1970-01-01 01:00:00.000000000 +0100
+++ new/exaile-3.4.1/.gitignore 2014-11-01 18:43:02.000000000 +0100
@@ -0,0 +1,28 @@
+*.pyc
+*.pyo
+
+doc
+doc/api-objects.txt
+doc/crarr.png
+doc/epydoc.css
+doc/epydoc.js
+doc/*.html
+data/plugins
+
+po/*/
+po/POTFILES.in
+
+backup.bzr
+random
+exaile-dist.tar.bz2
+exaile-po.tar.bz2
+build
+dist
+
+doc/_build
+
+.DS_Store
+
+# Eclipse settings
+.project
+.pydevproject
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/exaile-3.4.0.2/README.Windows 
new/exaile-3.4.1/README.Windows
--- old/exaile-3.4.0.2/README.Windows   2014-09-03 18:23:55.000000000 +0200
+++ new/exaile-3.4.1/README.Windows     2014-11-01 18:43:02.000000000 +0100
@@ -111,5 +111,5 @@
     Windows 7+:  %USERPROFILE%\AppData\Local\exaile\logs
 
 If you run into any bugs not mentioned in this document, please report them
-to us via launchpad at https://bugs.launchpad.net/exaile . Please include any
+to us via github at https://github.com/exaile-dev/exaile/issues . Please 
include any
 relevant logfile snippets. 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/exaile-3.4.0.2/doc/dev/contributing.rst 
new/exaile-3.4.1/doc/dev/contributing.rst
--- old/exaile-3.4.0.2/doc/dev/contributing.rst 2014-09-03 18:23:55.000000000 
+0200
+++ new/exaile-3.4.1/doc/dev/contributing.rst   2014-11-01 18:43:02.000000000 
+0100
@@ -10,11 +10,11 @@
 * Translations
 * New features + plugins
 
-The best way to contribute is to submit patches/etc via launchpad.
+The best way to contribute is to submit patches/etc via pull request on github.
 
 If you think your bug report/request is being ignored, it probably isn't. All
 of the Exaile developers work on this project in their spare time, and so we
 don't always have time to work on your problems. We *do* try to push good 
 patches as soon as we can, however. Ping the bug report, or leave a message on
-#exaile if we haven't at least made an initial response, sometimes Launchpad's
-notification system can get lost in the noise.
+#exaile if we haven't at least made an initial response, sometimes bug report
+emails can get lost in the noise.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/exaile-3.4.0.2/doc/dev/release.rst 
new/exaile-3.4.1/doc/dev/release.rst
--- old/exaile-3.4.0.2/doc/dev/release.rst      2014-09-03 18:23:55.000000000 
+0200
+++ new/exaile-3.4.1/doc/dev/release.rst        2014-11-01 18:43:02.000000000 
+0100
@@ -5,6 +5,8 @@
 This is an attempt to document what needs to be done in order to create a
 release for Exaile.
 
+TODO: Update these instructions for github releases!
+
 Step one: Translations
 ----------------------
 
@@ -36,7 +38,7 @@
 The file to adjust is xl/version.py. You should do a commit, and then tag
 the release.::
 
-    $ bzr tag RELEASE_VERSION
+    $ git tag RELEASE_VERSION
 
 
 .. _win32_installer:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/exaile-3.4.0.2/doc/user/index.rst 
new/exaile-3.4.1/doc/user/index.rst
--- old/exaile-3.4.0.2/doc/user/index.rst       2014-09-03 18:23:55.000000000 
+0200
+++ new/exaile-3.4.1/doc/user/index.rst 2014-11-01 18:43:02.000000000 +0100
@@ -16,8 +16,9 @@
 -------
 
 If you believe you have found a bug, you can file bugs at
-`Exaile's launchpad site <https://launchpad.net/exaile>`_ You will need
-to register before you can post a bug report.
+`Exaile's github issue tracker <https://github.com/exaile-dev/exaile/issues>`_
+You will need to register for a github account before you can post a bug
+report.
 
 The following are ways you can get support or questions to answers you
 might have about using or developing Exaile.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/exaile-3.4.0.2/exaile.py new/exaile-3.4.1/exaile.py
--- old/exaile-3.4.0.2/exaile.py        2014-09-03 18:23:55.000000000 +0200
+++ new/exaile-3.4.1/exaile.py  2014-11-01 18:43:02.000000000 +0100
@@ -25,8 +25,6 @@
 else:
     if uid == 0:
         sys.stderr.write('Error: running as root is not supported!\n')
-        sys.stderr.flush()
-        sys.exit(1)
 
 # allow disabling of pyc generation. Only works on python >= 2.6
 if os.getenv("EXAILE_NO_OPTIMIZE"):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/exaile-3.4.0.2/xl/main.py new/exaile-3.4.1/xl/main.py
--- old/exaile-3.4.0.2/xl/main.py       2014-09-03 18:23:55.000000000 +0200
+++ new/exaile-3.4.1/xl/main.py 2014-11-01 18:43:02.000000000 +0100
@@ -38,18 +38,25 @@
 import platform
 import sys
 
-try:
-    import gio
-except ImportError:
-    # on Win32 using the GStreamer SDK, requires import of
-    # pygtk first
-    import pygtk
-    pygtk.require('2.0')
-    import gio
-
-from xl import common, xdg
 from xl.nls import gettext as _
 
+# Imported later to avoid PyGTK imports just for --help.
+gio = common = xdg = None
+
+def _do_heavy_imports():
+    global gio, common, xdg
+
+    try:
+        import gio
+    except ImportError:
+        # on Win32 using the GStreamer SDK, requires import of
+        # pygtk first
+        import pygtk
+        pygtk.require('2.0')
+        import gio
+
+    from xl import common, xdg
+
 # placeholder, - xl.version can be slow to import, which would slow down
 # cli args. Thus we import __version__ later.
 __version__ = None
@@ -81,7 +88,8 @@
         """
         self.quitting = False
         self.loading = True
-        
+
+        # NOTE: This automatically exits on --help.
         try:
             (self.options, self.args) = self.get_options().parse_args()
         except UnicodeDecodeError:
@@ -91,6 +99,8 @@
             self.version()
             return
 
+        _do_heavy_imports()
+
         if self.options.UseDataDir:
             xdg.data_dirs.insert(1, self.options.UseDataDir)
 
@@ -677,9 +687,10 @@
             import glib
             loop = glib.MainLoop()
             context = loop.get_context()
-            self.__mainloop(context)
+            t = threading.Thread(target=self.__mainloop, args=(context,))
+            t.daemon = True
+            t.start()
 
-    @common.threaded
     def __mainloop(self, context):
         while 1:
             try:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/exaile-3.4.0.2/xl/nls.py new/exaile-3.4.1/xl/nls.py
--- old/exaile-3.4.0.2/xl/nls.py        2014-09-03 18:23:55.000000000 +0200
+++ new/exaile-3.4.1/xl/nls.py  2014-11-01 18:43:02.000000000 +0100
@@ -31,8 +31,7 @@
 
 import sys
 import locale
-
-from xl import xdg
+import os
 
 try:
     # Set to user default, gracefully fallback on C otherwise
@@ -55,9 +54,12 @@
     # Required for dynamically added messages
     gettextmod.textdomain('exaile')
 
-    if xdg.local_hack: # running from source dir, so we have to set the paths
+    # If running from source dir, we have to set the paths.
+    # (The test is equivalent to xdg.local_hack but without the xdg import,
+    # which pulls in glib.)
+    if os.path.exists(os.path.join(os.environ['EXAILE_DIR'], 'data')):
         import os.path
-        locale_path = os.path.join(xdg.exaile_dir, 'po')
+        locale_path = os.path.join(os.environ['EXAILE_DIR'], 'po')
         try:
             locale.bindtextdomain('exaile', locale_path)
         except AttributeError: # E.g. Windows
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/exaile-3.4.0.2/xl/version.py 
new/exaile-3.4.1/xl/version.py
--- old/exaile-3.4.0.2/xl/version.py    2014-09-03 18:23:55.000000000 +0200
+++ new/exaile-3.4.1/xl/version.py      2014-11-01 18:43:02.000000000 +0100
@@ -27,7 +27,7 @@
 import xdg
 
 major = "3.4"
-minor = "0"
+minor = "1"
 extra = ""
 
 def get_latest_bzr_revno(directory):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/exaile-3.4.0.2/xlgui/__init__.py 
new/exaile-3.4.1/xlgui/__init__.py
--- old/exaile-3.4.0.2/xlgui/__init__.py        2014-09-03 18:23:55.000000000 
+0200
+++ new/exaile-3.4.1/xlgui/__init__.py  2014-11-01 18:43:02.000000000 +0100
@@ -39,6 +39,25 @@
     gtk.gdk.threads_enter()
     
 if sys.platform == 'darwin':
+
+    # When trying to load a font that doesn't exist, pango falls back to
+    # 'Sans'. If that doesn't exist, it kills the program. Apparently, 
+    # 'Sans' no longer exists as of osx 10.9, so we need to set the default
+    # font to something more sensible else we crash.
+
+    __settings = gtk.settings_get_default()
+    __font_name = __settings.get_property('gtk-font-name')
+    
+    # font names that start with '.' aren't usable
+    if __font_name.startswith('.'):
+        __font_name = __font_name[1:]
+    if ' DeskInterface ' in __font_name:
+        __font_name = __font_name.replace(' DeskInterface ', ' ')
+    if ' UI ' in __font_name:
+        __font_name = __font_name.replace(' UI ', ' ')
+
+    __settings.set_property('gtk-font-name', __font_name)
+
     __icon_theme = gtk.icon_theme_get_default()
     
__icon_theme.append_search_path('/Library/Frameworks/GStreamer.framework/Versions/0.10/share/icons')
 

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to