Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Mac moduleset dependencies.

Browse Source
This commit is contained in:
John Ralls 2017-05-04 16:05:47 -07:00
parent c5ddeeca5e
commit 41bd626aa2
3 changed files with 14 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mac/Imaging-Freetype2.patch
View File

@ -1,27 +0,0 @@
*** a/_imagingft.c Sat Oct 31 17:44:12 2009
--- b/_imagingft.c Thu May 22 12:30:02 2014
***************
*** 70,76 ****
--- 70,80 ----
const char* message;
} ft_errors[] =
+ #if defined(USE_FREETYPE_2_1)
+ #include <freetype2/fterrors.h>
+ #else
#include <freetype/fterrors.h>
+ #endif
/* -------------------------------------------------------------------- */
/* font objects */
--- a/setup.py Sun Nov 15 08:06:10 2009
+++ b/setup.py Fri May 23 11:26:20 2014
@@ -348,7 +348,7 @@
dir = os.path.join(root, "Tk.framework", "Headers")
add_directory(self.compiler.include_dirs, dir, 1)
break
- if frameworks:
+ if False:
exts.append(Extension(
"_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"],
extra_compile_args=frameworks, extra_link_args=frameworks

14
mac/Pillow-tk-setup.patch
View File

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

34
mac/gramps.modules
View File

@ -18,7 +18,7 @@
<repository type="tarball" name="oracle"
href="http://download.oracle.com/"/>
<repository type="tarball" name="pymodules"
href="http://pypi.python.org/packages/source/"/>
href="http://pypi.python.org/packages/"/>
<repository type="tarball" name="stowers"
href="http://www.johnstowers.co.nz/files/"/>
<repository type="git" name="github"
@ -52,8 +52,8 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
-->
<include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/>
<!--include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/-->
<!--include href="http://git.gnome.org/browse/gtk-osx/plain/modulesets-stable/gtk-osx.modules"/ -->
<include href="/Users/john/Development/GTK-OSX/gtk-osx-build/modulesets-stable/gtk-osx.modules"/>
<distutils id="gramps-git" supports-non-srcdir-builds="no">
<branch module="gramps-project/gramps.git" repo="github"
@ -83,7 +83,7 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
<distutils id="pyenchant">
<branch repo="pymodules" module="p/pyenchant/pyenchant-1.6.1.tar.gz"
<branch repo="pymodules" module="73/73/49f95fe636ab3deed0ef1e3b9087902413bcdf74ec00298c3059e660cfbb/pyenchant-1.6.8.tar.gz"
version="1.6.1"/>
</distutils>
@ -124,34 +124,28 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
<autotools id="gexiv2" autogen-sh="configure" supports-non-srcdir-builds="no"
autogenargs="--enable-introspection --with-libtool=libtool"
autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s %(autogenargs)s">
<branch module="gexiv2/0.7/gexiv2-0.7.0.tar.xz"
repo="ftp.gnome.org" version="0.7.0">
<branch module="gexiv2/0.10/gexiv2-0.10.5.tar.xz"
repo="ftp.gnome.org" version="0.10.5"
hash="sha256:318fe068cd414c0af91759a87c29fd577cd5d42bf7a6f50caff27535c02ac7f3">
</branch>
<dependencies>
<dep package="exiv2"/>
</dependencies>
</autotools>
<distutils id="setuptools">
<branch module="s/setuptools/setuptools-16.0.tar.gz"
version="16.0" repo="pymodules"/>
</distutils>
<distutils id="pil">
<!--branch module="Imaging-1.1.7.tar.gz" version="1.1.7" repo="pythonware">
<patch file="Imaging-Freetype2.patch" strip="1"/-->
<branch module="P/Pillow/Pillow-2.7.0.tar.gz" version="2.7.0"
<branch module="93/73/66854f63b1941aad9af18a1de59f9cf95ad1a87c801540222e332f6688d7/Pillow-4.1.1.tar.gz" version="4.1.1"
repo="pymodules"
hash="md5:3fdc9f16a1b60366ae8158b424655d10">
<patch file="Pillow-tk-setup.patch" strip="1"/>
hash="md5:f2565954955c8d10f3b4f1f72f852bf7">
</branch>
<dependencies>
<dep package="setuptools"/>
<!--dep package="setuptools"/-->
</dependencies>
</distutils>
<distutils id='pyicu'>
<branch version='1.8' repo='pymodules'
module='P/PyICU/PyICU-1.8.tar.gz'/>
<branch version='1.9' repo='pymodules'
module='6e/88/f42a1297909ca6d9113ba37b37067011ae29432fe592fdd98cf52ad23b77/PyICU-1.9.7.tar.gz'/>
<dependencies>
<dep package='icu'/>
</dependencies>
@ -161,7 +155,6 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
<dependencies>
<dep package="python"/>
<dep package="meta-gtk-osx-gtk3"/>
<dep package="gtk-mac-integration-python"/>
<dep package="meta-gtk-osx-gtk3-core-themes"/>
<dep package="goocanvas2"/>
<dep package="librsvg"/>
@ -170,7 +163,6 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
<dep package="gtkspell3"/>
<dep package="osmgpsmap"/>
<dep package="graphviz"/>
<dep package="pil"/>
<dep package="gexiv2"/>
</dependencies>
</metamodule>
@ -178,10 +170,12 @@ gtk-mac-bundler gtk-osx-build/projects/gramps/gramps.bundle
<metamodule id="meta-python3-modules">
<dependencies>
<dep package="python3"/>
<dep package="gtk-mac-integration-python"/>
<dep package="pycairo"/>
<dep package="pygobject3"/>
<dep package='pyicu'/>
<dep package='pybsddb'/>
<dep package="pil"/>
</dependencies>
</metamodule>