← Back to branch summary

~rosco2/ubuntu/wily/gramps/bug-1492304

« back to all changes in this revision

Viewing changes to mac/Pillow-tk-setup.patch

  • Committer: Package Import Robot
  • Author(s): Ross Gammon
  • Date: 2015-08-11 23:03:11 UTC
  • mfrom: (1.4.3)
  • mto: This revision was merged to the branch mainline in revision 58.
  • Revision ID: package-import@ubuntu.com-20150811230311-acjr8gcfe8isx7ij
https://launchpad.net/bugs/1464845
https://launchpad.net/bugs/1451259
* New upstream release
* Drop patches applied upstream or cherry-picked from there
* Add version constraints for gtk and pygobject
* Add goocanvas dependency - available soon
* Drop webkit dpendency as HTML view has been removed
* Force removal of upstream packages when installing Debian one
  (LP: #1464845)
* Drop fixperm override as permissions fixed upstream
* Fix spelling error in changelog
* Switch to nose for unit tests
* Add build dependencies for the nose tests
* Update copyright file
* Add uversionmangle to watch file to deal with alpha/beta versions
* Add manual test cases
* Drop FAQ URL from upstream metadata - changes every release
* Add patch to fix transparent windows in Ubuntu.
  Thanks to Lance Orner (LP: #1451259)

Show diffs side-by-side

added added

removed removed

Lines of Context:
mac/Pillow-tk-setup.patch
 
1
diff -c /Users/john/Development/gtk-sources/Pillow-2.7.0/setup.py\~ /Users/john/Development/gtk-sources/Pillow-2.7.0/setup.py
 
2
--- a/setup.py  Fri Jan  2 03:52:21 2015
 
3
+++ b/setup.py  Sun Mar 22 14:54:09 2015
 
4
@@ -575,7 +575,7 @@
 
5
             exts.append(Extension(
 
6
                 "PIL._webp", ["_webp.c"], libraries=libs, define_macros=defs))
 
7
 
 
8
-        if sys.platform == "darwin":
 
9
+        if _tkinter and sys.platform == "darwin":
 
10
             # locate Tcl/Tk frameworks
 
11
             frameworks = []
 
12
             framework_roots = [
 
13
 
 
14
Diff finished.  Sun Mar 22 20:37:52 2015