Author: wade
Date: 2008-02-05 00:38:03 -0500 (Tue, 05 Feb 2008)
New Revision: 94850
Added:
trunk/release/macosx/dllmap_munge
trunk/release/macosx/setup-files/README.rtf
trunk/release/packaging/rpm_defs/mono-core/mono-flush_cache_ppc.patch
trunk/release/packaging/rpm_defs/monodevelop/monodevelop-mac_wrapper_94433.patch
Modified:
trunk/release/macosx/buildpackage
trunk/release/macosx/setup-files/ReadMe.rtf
trunk/release/macosx/setup-files/postflight
trunk/release/packaging/conf/macos-10-ppc
trunk/release/packaging/defs/gtk-sharp210
trunk/release/packaging/defs/gtksourceview2-sharp
trunk/release/packaging/defs/libgdiplus
trunk/release/packaging/defs/mono
trunk/release/packaging/defs/monodevelop
trunk/release/packaging/dep_defs/macosx
trunk/release/windows-installer/buildwindows-installer
Log:
Lots of changes for the new mac installer: gtk# and monodevelop
Major changes:
-don't build on 10.3 any longer
macosx/setup-files/postflight
-generate some files on post install for pango and gtk+
macosx/buildpackage
-generate packages for readme instead of manually updating
dllmap_munge:
-fix up .config files for mac... we need full paths for about everything
Modified: trunk/release/macosx/buildpackage
===================================================================
--- trunk/release/macosx/buildpackage 2008-02-05 04:55:01 UTC (rev 94849)
+++ trunk/release/macosx/buildpackage 2008-02-05 05:38:03 UTC (rev 94850)
@@ -20,7 +20,7 @@
# Which noarch packages to include in the various packages
packages_to_include = {}
-packages_to_include['macos-10-ppc'] = ['mono', 'cocoa-sharp', 'libgdiplus',
'xsp', 'monodoc', 'boo', 'ikvm', 'nant', 'IPCE', 'mono-basic' ]
+packages_to_include['macos-10-ppc'] = ['libgdiplus', 'mono', 'cocoa-sharp',
'xsp', 'monodoc', 'boo', 'ikvm', 'nant', 'IPCE', 'mono-basic', 'gtk-sharp210',
'mono-addins', 'gtksourceview2-sharp', 'monodevelop' ]
packages_to_include['macos-10-x86'] = packages_to_include['macos-10-ppc']
@@ -75,6 +75,7 @@
# Keep list of files used to build this package
packages_used = []
+dep_packages_used = []
versions = {}
# Clean up
@@ -87,20 +88,24 @@
files = []
for pac in packages_to_include[arch]:
package = packaging.package(arch_conf, pac)
- versions[pac] = package.get_version()
- files += package.get_files()
- files += package.get_dep_files()
+ for f in package.get_files():
+ files.append(f)
+ packages_used.append(os.path.basename(f))
+
+ for f in package.get_dep_files(zip_runtime_deps=True):
+ files.append(f)
+ dep_packages_used.append(os.path.basename(f))
+
# Remove duplicates
files = utils.remove_list_duplicates(files)
- packages_used += map(os.path.basename, files)
-
# Add helper files to the list
files += [config.packaging_dir + '/do-install-zip-pkgs']
files += [config.packaging_dir + '/../pyutils/utils.py']
files += [config.packaging_dir + '/../pyutils/rpm2cpio.py']
files += ['./universal_merge']
+ files += ['./dllmap_munge']
for file in files:
print file
@@ -118,7 +123,8 @@
conf.buildenv.print_output=debug
framework_prefix = "/Library/Frameworks/Mono.framework"
prefix = "%s/Versions/%s" % (framework_prefix, version)
- (code, output) = conf.buildenv.execute_command("%s/do-install-zip-pkgs
%s%s %s %s " % (arch_remote_packages_loc, arch_remote_PKGROOT, prefix, prefix,
arch_remote_packages_loc) )
+ # TODO: don't use executable_path anymore (fix pango issues... ?)
(maybe we could use a really long path instead of build_deps, and that would
allow enough room? lame...)
+ (code, output) = conf.buildenv.execute_command("%s/do-install-zip-pkgs
--relative_paths %s%s %s %s " % (arch_remote_packages_loc, arch_remote_PKGROOT,
prefix, prefix, arch_remote_packages_loc) )
if code:
print "Error extracting and installing packages"
sys.exit(1)
@@ -134,7 +140,6 @@
else:
(code, output) = conf.buildenv.execute_command("cd %s; rmdir PKGROOT;
mv %s PKGROOT " % (remote_temp, 'PKGROOT_' + target) )
-
#### Strip files to save space
# These were in the old script as "cleanup"
@@ -161,11 +166,40 @@
print "Saving list of packages..."
packages_used = utils.remove_list_duplicates(packages_used)
packages_used.sort()
+
+dep_packages_used = utils.remove_list_duplicates(dep_packages_used)
+dep_packages_used.sort()
+
fd = open("%s/packages_used.txt" % temp_dir, 'w')
-for file in packages_used:
+for file in packages_used + dep_packages_used:
fd.write(file + "\n")
fd.close()
+# Get list of components for readme
+def package_pretty_name(package_name):
+ return package_name.replace(".novell.noarch.rpm",
"").replace(".macos10.novell.ppc.zip", "").replace(".macos10.novell.x86.zip",
"")
+
+packages = []
+packages_text = ""
+dep_packages = []
+dep_packages_text = ""
+
+for file in packages_used:
+ packages.append(package_pretty_name(file))
+packages = utils.remove_list_duplicates(packages)
+packages.sort()
+
+for file in dep_packages_used:
+ dep_packages.append(package_pretty_name(file))
+dep_packages = utils.remove_list_duplicates(dep_packages)
+dep_packages.sort()
+
+# Collect text for packages
+for f in packages:
+ packages_text += "\n\t" + f + "\\\\"
+for f in dep_packages:
+ dep_packages_text += "\n\t" + f + "\\\\"
+
# Get some version information
mono_package = packaging.package(conf, 'mono')
revision = mono_package.get_revision(release)
@@ -174,17 +208,14 @@
package_filename = "MonoFramework-%s_%s.%s" % (version, revision, arch_name)
# Substitue versions in setup files
-# TODO: This needs to be redone to make new packages automatic
parameter_map = {}
parameter_map[re.compile("@@MONO_VERSION@@")] = version
parameter_map[re.compile("@@MONO_RELEASE@@")] = release
parameter_map[re.compile("@@MONO_VERSION_RELEASE@@")] = version + '_' + release
-parameter_map[re.compile("@@COCOASHARP_VERSION@@")] = versions['cocoa-sharp']
-parameter_map[re.compile("@@LIBGDIPLUS_VERSION@@")] = versions['libgdiplus']
-parameter_map[re.compile("@@XSP_VERSION@@")] = versions['xsp']
-parameter_map[re.compile("@@MONODOC_VERSION@@")] = versions['monodoc']
-parameter_map[re.compile("@@BOO_VERSION@@")] = versions['boo']
-parameter_map[re.compile("@@IKVM_VERSION@@")] = versions['ikvm']
+
+parameter_map[re.compile("@@PACKAGES@@")] = packages_text
+parameter_map[re.compile("@@DEP_PACKAGES@@")] = dep_packages_text
+
parameter_map[re.compile("@@MONO_PACKAGE_FILENAME@@")] = package_filename +
".pkg"
cwd = os.getcwd()
@@ -227,6 +258,13 @@
print "Done creating symlinks...."
+# assembly .config munge
+(code, output) = conf.buildenv.execute_command("%s/dllmap_munge %s %s" %
(arch_remote_packages_loc, remote_PKGROOT + os.sep + prefix, prefix) )
+if code:
+ print "Error munging dllmaps for .config files"
+ sys.exit(1)
+
+
# Note: DiskManagementTool hangs this has been fixed in 10.4 (
http://lists.apple.com/archives/installer-dev/2005/Jul/msg00005.html )
# This doesn't happen all the time... in fact, never on
macbld1.provo.novell.com running 10.3 ... ?
# Maybe we make sudo not ask for a password and then prepend this with sudo?
@@ -236,12 +274,19 @@
exit_reg = ""
#exit_reg = re.compile('PackageMaker.* done \(.*\)')
-# TODO: need to figure out how to set 'Allows Back Rev.' flag, or possibly
clean up 'receipt'
+# We are setting 'Allows Back Rev.' flag.
+# TODO: Do we need to clean up 'receipt'?
+# Move .app files out of the .pkg
+(code, output) = conf.buildenv.execute_command("cd %s; mkdir new; mv
PKGROOT/Library/Frameworks/Mono.framework/Versions/Current/*.app new" %
(remote_temp) )
+
+# Copy .dmg readme
+conf.buildenv.copy_to('setup-files/README.rtf', remote_temp + os.sep + 'new')
+
packagemaker =
"/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"
-conf.buildenv.execute_command('cd %s; %s -build -p %s/%s.pkg -f %s -r %s -i
%s/Info.plist -d %s/Description.plist' % (remote_PKGROOT, packagemaker,
remote_temp, package_filename, remote_PKGROOT, resources_dir,
framework_resources_dir, framework_resources_dir), terminate_reg=exit_reg)
+conf.buildenv.execute_command('cd %s; %s -build -p %s/new/%s.pkg -f %s -r %s
-i %s/Info.plist -d %s/Description.plist' % (remote_PKGROOT, packagemaker,
remote_temp, package_filename, remote_PKGROOT, resources_dir,
framework_resources_dir, framework_resources_dir), terminate_reg=exit_reg)
-conf.buildenv.execute_command('/usr/bin/hdiutil create -ov -srcfolder
%s/%s.pkg -volname MonoFramework-%s %s/%s.dmg' % (remote_temp,
package_filename, version, remote_temp, package_filename) )
+conf.buildenv.execute_command('/usr/bin/hdiutil create -ov -srcfolder %s/new
-volname MonoFramework-%s %s/%s.dmg' % (remote_temp, version, remote_temp,
package_filename) )
distutils.dir_util.mkpath(output_dir)
Added: trunk/release/macosx/dllmap_munge
===================================================================
--- trunk/release/macosx/dllmap_munge 2008-02-05 04:55:01 UTC (rev 94849)
+++ trunk/release/macosx/dllmap_munge 2008-02-05 05:38:03 UTC (rev 94850)
@@ -0,0 +1,79 @@
+#!/usr/bin/env python
+
+import os
+import sys
+import glob
+
+import utils
+
+try:
+ (script, dest_dir, prefix) = sys.argv
+except:
+ print "Usage: dllmap_munge <dest_dir> <prefix>"
+ print " where dest_dir is where files are located"
+ print " where prefix is the final install path"
+ sys.exit(1)
+
+os.chdir(dest_dir)
+
+print "Replace intl in etc/mono/config"
+parameter_map = {}
+parameter_map['libintl.dylib'] = prefix + '/lib/libintl.dylib'
+utils.substitute_parameters_in_file("etc/mono/config", parameter_map)
+
+print "Replace gtk# dllmaps"
+file_map = {
+ 'libglib-2.0.0.dylib': '',
+ 'libgdk-x11-2.0.0.dylib': 'libgdk-quartz-2.0.0.dylib',
+ 'libgtk-x11-2.0.0.dylib': 'libgtk-quartz-2.0.0.dylib',
+ 'libgobject-2.0.0.dylib': '',
+ 'libgdk_pixbuf-2.0.0.dylib': '',
+ 'libatk-1.0.0.dylib': '',
+ 'libglade-2.0.0.dylib': '',
+ 'libgthread-2.0.0.dylib': '',
+ 'libpango-1.0.0.dylib': '',
+ 'libpangocairo-1.0.0.dylib': '',
+
+ # these are for mconfig
+ 'libgmodule-2.0.so': 'libgmodule-2.0.0.dylib',
+ 'libglib-2.0.so': 'libglib-2.0.0.dylib',
+
+ # gtksourceview2-sharp
+ 'libgobject-2.0.so.0': 'libgobject-2.0.0.dylib',
+ 'libglib-2.0.so.0': 'libglib-2.0.0.dylib',
+ 'libgtksourceview-2.0.so.0': 'libgtksourceview-2.0.dylib',
+
+ # shlib-cop
+ 'libgmodule-2.0.so.0': 'libgmodule-2.0.0.dylib',
+}
+
+parameter_map = {}
+for k,v in file_map.iteritems():
+ if v == '':
+ parameter_map['target="' + k + '"'] = 'target="' +
os.path.join(prefix, 'lib', k) + '"'
+ else:
+ parameter_map['target="' + k + '"'] = 'target="' +
os.path.join(prefix, 'lib', v) + '"'
+
+code, config_list = utils.launch_process('find . -name "*\.config"',
print_output=0)
+for file in config_list.split("\n"):
+ print "Substituting: " + file
+ utils.substitute_parameters_in_file(file, parameter_map)
+
+
+print "Add glue dllmaps"
+file_map = [
+ [ 'lib/mono/gac/glib-sharp/*/glib-sharp.dll.config',
'glibsharpglue-2', 'libglibsharpglue-2.so' ],
+ [ 'lib/mono/gac/gdk-sharp/*/gdk-sharp.dll.config',
'gdksharpglue-2', 'libgdksharpglue-2.so' ],
+ [ 'lib/mono/gac/gtk-sharp/*/gtk-sharp.dll.config',
'gtksharpglue-2', 'libgtksharpglue-2.so' ],
+ [ 'lib/mono/gac/pango-sharp/*/pango-sharp.dll.config',
'pangosharpglue-2', 'libpangosharpglue-2.so' ],
+ [ 'lib/mono/gac/glade-sharp/*/glade-sharp.dll.config',
'gladesharpglue-2', 'libgladesharpglue-2.so' ],
+
+ # Extra maps... more?
+ [ 'lib/mono/gac/gtk-sharp/*/gtk-sharp.dll.config',
'glibsharpglue-2', 'libglibsharpglue-2.so' ],
+]
+
+for a in file_map:
+ file = glob.glob(a[0]).pop()
+ print "adding dllmap to: " + file
+ utils.add_dll_map(file, '<dllmap dll="%s" target="%s/lib/%s"/>' %
(a[1], prefix, a[2]))
+
Property changes on: trunk/release/macosx/dllmap_munge
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/release/macosx/setup-files/README.rtf
===================================================================
--- trunk/release/macosx/setup-files/README.rtf 2008-02-05 04:55:01 UTC (rev
94849)
+++ trunk/release/macosx/setup-files/README.rtf 2008-02-05 05:38:03 UTC (rev
94850)
@@ -0,0 +1,15 @@
+{\rtf1\ansi\ansicpg1252\cocoartf949
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\margl1440\margr1440\vieww20160\viewh10660\viewkind0
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural
+
+\f0\b\fs40 \cf0 NOTES\
+\
+\pard\pardeftab720\ql\qnatural
+
+\b0\fs24 \cf0 1. All System.Windows.Forms and Gtk# applications require X11
to be installed. We do not use X11 for anything but font rendering.\
+2. The included MoMA and MonoDevelop applications require Mono.framework
1.2.6_6 or higher.\
+3. The Carbon System.Windows.Forms driver is enabled by default. If you wish
to run under X11 export the MONO_MWF_MAC_FORCE_X11 environment variable.\
+4. System.Windows.Forms is known to not work under X11 on 10.5. Apple has
introduced a broken implementation of some extensions that we cannot disable.\
+}
\ No newline at end of file
Modified: trunk/release/macosx/setup-files/ReadMe.rtf
===================================================================
--- trunk/release/macosx/setup-files/ReadMe.rtf 2008-02-05 04:55:01 UTC (rev
94849)
+++ trunk/release/macosx/setup-files/ReadMe.rtf 2008-02-05 05:38:03 UTC (rev
94850)
@@ -13,26 +13,9 @@
This package installs Mono and all of its dependencies inside of
/Library/Frameworks/Mono.framework. This behavior is likely to change with a
future release so that depencancies will get their own frameworks.\
\
What gets installed inside Mono.framework?\
+\@@PACKAGES@@
+\@@DEP_PACKAGES@@
\
- mono-@@MONO_VERSION@@\
- cocoa#-@@COCOASHARP_VERSION@@\
- libgdiplus-@@LIBGDIPLUS_VERSION@@\
- xsp-@@XSP_VERSION@@\
- monodoc-@@MONODOC_VERSION@@\
- boo-@@BOO_VERSION@@\
- ikvm-@@IKVM_VERSION@@\
-\
- pkg-config-0.22\
- gettext-0.16.1\
- glib-2.14.1\
- freetype-2.1.10\
- jpeg-6b\
- libpng-1.2.20\
- libungif-4.1.4\
- tiff-3.8.2\
- freetype-2.2.1
- expat-2.0.1
-\
Included in this version of the Mono.framework is Cocoa#. Cocoa# is an API
bridge that allows Mono developers to call Cocoa APIs while using Mono and C#.
A Cocoa# wiki is available at http://www.mono-project.com/CocoaSharp\
\
\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural
Modified: trunk/release/macosx/setup-files/postflight
===================================================================
--- trunk/release/macosx/setup-files/postflight 2008-02-05 04:55:01 UTC (rev
94849)
+++ trunk/release/macosx/setup-files/postflight 2008-02-05 05:38:03 UTC (rev
94850)
@@ -21,4 +21,12 @@
ln -sf $PWD/${j} /usr/share/man/${i}/${j}
done)
done
+
+# gtk+ setup
+cd /Library/Frameworks/Mono.framework/Versions/Current/etc
+gdk-pixbuf-query-loaders > gtk-2.0/gdk-pixbuf.loaders
+
+# pango setup
+mkdir -p pango
+pango-querymodules > pango/pango.modules
fi
Modified: trunk/release/packaging/conf/macos-10-ppc
===================================================================
--- trunk/release/packaging/conf/macos-10-ppc 2008-02-05 04:55:01 UTC (rev
94849)
+++ trunk/release/packaging/conf/macos-10-ppc 2008-02-05 05:38:03 UTC (rev
94850)
@@ -1,22 +1,25 @@
USE_ZIP_PKG=1
-# We require building on a 10.3 box
-# So use the 10.3 sdk, even though this box is 10.4
+username=builder
+hostname=g5-mono.boston.ximian.com
#username=builder
-#hostname=g5-mono.boston.ximian.com
-# set CC to make sure we build with the 10.3 sdk
-# These extra defines are needed when building on 10.4 with 10.3 sdk (not
needed when building on 10.3)
-# headerpad_max_install_names helps with relocating binaries to a destination
of a very large pathname
-# (See
http://lists.apple.com/archives/darwin-development/2003/Sep/msg00274.html)
+#hostname=ppc-macos-1.mono.lab.novell.com
+# Can't build gtk+ on 10.3
+# Seems we need to set this. Otherwise it gets set to 10.1
+env="MACOSX_DEPLOYMENT_TARGET=10.4,LDFLAGS= -headerpad_max_install_names "
+
+# 10.3 settings
+#username=nds_cm
+#hostname=macbld1.provo.novell.com
+#env="LDFLAGS= -headerpad_max_install_names "
# Do this instead, more reliable
#env="CC=gcc -isysroot /Developer/SDKs/MacOSX10.3.9.sdk -DSYS_POLL_NO_WARN
-DPOLL_NO_WARN,MACOSX_DEPLOYMENT_TARGET=10.3,LDFLAGS=
-headerpad_max_install_names "
# NOTE: we can build on 10.4 with the 10.3 sdk as long we don't use
@executable_path
# (We may just end up using @executable_path just for the installer)
+# set CC to make sure we build with the 10.3 sdk
+# These extra defines are needed when building on 10.4 with 10.3 sdk (not
needed when building on 10.3)
+# headerpad_max_install_names helps with relocating binaries to a destination
of a very large pathname
+# (See
http://lists.apple.com/archives/darwin-development/2003/Sep/msg00274.html)
-# for testing
-username=nds_cm
-hostname=macbld1.provo.novell.com
-env="LDFLAGS= -headerpad_max_install_names "
-
web_index=6
Modified: trunk/release/packaging/defs/gtk-sharp210
===================================================================
--- trunk/release/packaging/defs/gtk-sharp210 2008-02-05 04:55:01 UTC (rev
94849)
+++ trunk/release/packaging/defs/gtk-sharp210 2008-02-05 05:38:03 UTC (rev
94850)
@@ -3,6 +3,8 @@
web_index=6
BUILD_HOSTS=(
+ macos-10-ppc
+ macos-10-x86
suse-102-i586
suse-102-ppc
suse-102-x86_64
@@ -51,3 +53,90 @@
make dist-bzip2
}
+macos_10_x86_ZIP_DEPS=(
+
+
http://primates.ximian.com/~wberrier/macos/deps/x86/glib-2.14.1-0.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/pkg-config-0.22-0.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/gettext-0.16.1-0.macos10.novell.x86.zip
+
+
http://primates.ximian.com/~wberrier/macos/deps/x86/jpeg-6b-0.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/libpng-1.2.20-0.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/giflib-4.1.6-0.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/tiff-3.8.2-0.macos10.novell.x86.zip
+
+
http://primates.ximian.com/~wberrier/macos/deps/x86/pixman-0.9.6-0.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/cairo-1.5.8-0.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/pango-1.19.0-0.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/atk-1.20.0-0.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/gtk+-2.15.0-0.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/libglade-2.6.2-0.macos10.novell.x86.zip
+
+ # Probably not needed
+
#http://primates.ximian.com/~wberrier/macos/deps/x86/XML-Parser-2.36-0.macos10.novell.x86.zip
+)
+
+macos_10_x86_ZIP_RUNTIME_DEPS=(
+
+
http://primates.ximian.com/~wberrier/macos/deps/x86/hicolor-icon-theme-0.10-0.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/icon-naming-utils-0.8.6-0.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/gnome-icon-theme-2.20.0-0.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/gtk-engines-2.12.2-0.macos10.novell.x86.zip
+
#http://primates.ximian.com/~wberrier/macos/deps/x86/ImageMagick-6.3.8-0.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/tango-icon-theme-0.8.1-0.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/tango-icon-theme-extras-0.1.0-0.macos10.novell.x86.zip
+ http://primates.ximian.com/~wberrier/macos/deps/various/gtkrc_mac.zip
+)
+
+macos_10_ppc_ZIP_DEPS=(
+
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/glib-2.14.1-0.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/pkg-config-0.22-0.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/gettext-0.16.1-0.macos10.novell.ppc.zip
+
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/jpeg-6b-0.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/libpng-1.2.20-0.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/giflib-4.1.6-0.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/tiff-3.8.2-0.macos10.novell.ppc.zip
+
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/pixman-0.9.6-0.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/cairo-1.5.8-0.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/pango-1.19.0-0.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/atk-1.20.0-0.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/gtk+-2.15.0-0.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/libglade-2.6.2-0.macos10.novell.ppc.zip
+
+ # Probably not needed
+
#http://primates.ximian.com/~wberrier/macos/deps/x86/XML-Parser-2.36-0.macos10.novell.ppc.zip
+)
+
+macos_10_ppc_ZIP_RUNTIME_DEPS=(
+
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/hicolor-icon-theme-0.10-0.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/icon-naming-utils-0.8.6-0.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/gnome-icon-theme-2.20.0-0.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/gtk-engines-2.12.2-0.macos10.novell.ppc.zip
+
#http://primates.ximian.com/~wberrier/macos/deps/ppc/ImageMagick-6.3.8-0.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/tango-icon-theme-0.8.1-0.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/tango-icon-theme-extras-0.1.0-0.macos10.novell.ppc.zip
+ http://primates.ximian.com/~wberrier/macos/deps/various/gtkrc_mac.zip
+)
+
+
+macos_10_ZIP_BUILD () {
+
+ # This is so we can use the relocated mono (Will probably have to do
this for all builds on mac)
+ export MONO_GAC_PREFIX=/tmp/build_deps
+ export MONO_PREFIX=/tmp/build_deps
+ export MONO_CFG_DIR=/tmp/build_deps/etc
+ export MONO_PATH=/tmp/build_deps/lib
+
+ # add this so libxml is found
+ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/pkgconfig
+
+ ./configure --prefix=/tmp/install || exit 1
+
+ make || exit 1
+ make install || exit 1
+
+}
+
Modified: trunk/release/packaging/defs/gtksourceview2-sharp
===================================================================
--- trunk/release/packaging/defs/gtksourceview2-sharp 2008-02-05 04:55:01 UTC
(rev 94849)
+++ trunk/release/packaging/defs/gtksourceview2-sharp 2008-02-05 05:38:03 UTC
(rev 94850)
@@ -26,6 +26,14 @@
libgdiplus
)
+macos_10_ppc_ZIP_DEPS=(
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/gtksourceview-2.0.2-0.macos10.novell.ppc.zip
+)
+
+macos_10_x86_ZIP_DEPS=(
+
http://primates.ximian.com/~wberrier/macos/deps/x86/gtksourceview-2.0.2-0.macos10.novell.x86.zip
+)
+
HEAD_PATH=(
trunk/gtksourceview2-sharp
)
Modified: trunk/release/packaging/defs/libgdiplus
===================================================================
--- trunk/release/packaging/defs/libgdiplus 2008-02-05 04:55:01 UTC (rev
94849)
+++ trunk/release/packaging/defs/libgdiplus 2008-02-05 05:38:03 UTC (rev
94850)
@@ -136,6 +136,24 @@
Cflags: -I\${includedir}
EOF
+
+ # fake freetype2.pc files for Apple's libs
+ cat <<EOF > /tmp/build_deps/lib/pkgconfig/freetype2.pc
+prefix=/usr/X11R6
+exec_prefix=\${prefix}
+libdir=/usr/X11R6/lib
+includedir=\${prefix}/include
+
+Name: FreeType 2
+Description: A free, high-quality, and portable font engine.
+Version: 9.16.3
+Requires:
+Libs: -L\${libdir} -lfreetype -lz
+Cflags: -I\${includedir}/freetype2 -I\${includedir}
+EOF
+
+ export
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
+ # TODO: any other options needed here to build to use without x11?
./configure --enable-quartz --prefix=/tmp/install --with-libjpeg
--includedir=/tmp/build_deps/include || exit 1
make || exit 1
make install || exit 1
@@ -146,21 +164,21 @@
# See http://primates.ximian.com/~wberrier/macos/deps/README
-
http://primates.ximian.com/~wberrier/macos/deps/ppc/glib-2.14.1-1.macos10.novell.ppc.zip
-
http://primates.ximian.com/~wberrier/macos/deps/ppc/pkg-config-0.22-1.macos10.novell.ppc.zip
-
http://primates.ximian.com/~wberrier/macos/deps/ppc/gettext-0.16.1-1.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/glib-2.14.1-0.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/pkg-config-0.22-0.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/gettext-0.16.1-0.macos10.novell.ppc.zip
-
http://primates.ximian.com/~wberrier/macos/deps/ppc/jpeg-6b-1.macos10.novell.ppc.zip
-
http://primates.ximian.com/~wberrier/macos/deps/ppc/libpng-1.2.20-1.macos10.novell.ppc.zip
-
http://primates.ximian.com/~wberrier/macos/deps/ppc/giflib-4.1.6-2.macos10.novell.ppc.zip
-
http://primates.ximian.com/~wberrier/macos/deps/ppc/tiff-3.8.2-1.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/jpeg-6b-0.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/libpng-1.2.20-0.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/giflib-4.1.6-0.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/tiff-3.8.2-0.macos10.novell.ppc.zip
# Freetype...
# Panther's freetype is too old... Tiger's is ok. we need it here
-
http://primates.ximian.com/~wberrier/macos/deps/ppc/freetype-2.1.10-2.macos10.novell.ppc.zip
+
#http://primates.ximian.com/~wberrier/macos/deps/ppc/freetype-2.1.10-2.macos10.novell.ppc.zip
- # 10.3 and 10.4 have differing expat versions, use our own
-
http://primates.ximian.com/~wberrier/macos/deps/ppc/expat-2.0.1-1.macos10.novell.ppc.zip
+ # 10.4 and 10.5 have differing expat versions, use our own
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/expat-2.0.1-0.macos10.novell.ppc.zip
)
@@ -168,21 +186,21 @@
# See http://primates.ximian.com/~wberrier/macos/deps/README
-
http://primates.ximian.com/~wberrier/macos/deps/x86/glib-2.14.1-1.macos10.novell.x86.zip
-
http://primates.ximian.com/~wberrier/macos/deps/x86/pkg-config-0.22-1.macos10.novell.x86.zip
-
http://primates.ximian.com/~wberrier/macos/deps/x86/gettext-0.16.1-1.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/glib-2.14.1-0.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/pkg-config-0.22-0.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/gettext-0.16.1-0.macos10.novell.x86.zip
-
http://primates.ximian.com/~wberrier/macos/deps/x86/jpeg-6b-1.macos10.novell.x86.zip
-
http://primates.ximian.com/~wberrier/macos/deps/x86/libpng-1.2.20-1.macos10.novell.x86.zip
-
http://primates.ximian.com/~wberrier/macos/deps/x86/giflib-4.1.6-2.macos10.novell.x86.zip
-
http://primates.ximian.com/~wberrier/macos/deps/x86/tiff-3.8.2-1.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/jpeg-6b-0.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/libpng-1.2.20-0.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/giflib-4.1.6-0.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/tiff-3.8.2-0.macos10.novell.x86.zip
# Freetype...
# Panther's freetype is too old... Tiger's is ok. we need it here
-
http://primates.ximian.com/~wberrier/macos/deps/x86/freetype-2.1.10-2.macos10.novell.x86.zip
+
#http://primates.ximian.com/~wberrier/macos/deps/x86/freetype-2.1.10-2.macos10.novell.x86.zip
- # 10.3 and 10.4 have differing expat versions, use our own
-
http://primates.ximian.com/~wberrier/macos/deps/x86/expat-2.0.1-1.macos10.novell.x86.zip
+ # 10.4 and 10.5 have differing expat versions, use our own
+
http://primates.ximian.com/~wberrier/macos/deps/x86/expat-2.0.1-0.macos10.novell.x86.zip
)
Modified: trunk/release/packaging/defs/mono
===================================================================
--- trunk/release/packaging/defs/mono 2008-02-05 04:55:01 UTC (rev 94849)
+++ trunk/release/packaging/defs/mono 2008-02-05 05:38:03 UTC (rev 94850)
@@ -1,6 +1,6 @@
web_index=0
-#USE_PATCHES=1
+USE_PATCHES=1
BUILD_HOSTS=(
debian-4-arm
@@ -134,16 +134,22 @@
macos_10_ppc_ZIP_DEPS=(
# See http://primates.ximian.com/~wberrier/macos/deps/README
-
http://primates.ximian.com/~wberrier/macos/deps/ppc/glib-2.14.1-1.macos10.novell.ppc.zip
-
http://primates.ximian.com/~wberrier/macos/deps/ppc/pkg-config-0.22-1.macos10.novell.ppc.zip
-
http://primates.ximian.com/~wberrier/macos/deps/ppc/gettext-0.16.1-1.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/glib-2.14.1-0.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/pkg-config-0.22-0.macos10.novell.ppc.zip
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/gettext-0.16.1-0.macos10.novell.ppc.zip
+
+ # Temporarily inject updated mwf (need to name this file so it gets
unpacked last)
+
http://primates.ximian.com/~wberrier/macos/deps/various/native_mwf-1.2.6_updated.tar.gz
)
macos_10_x86_ZIP_DEPS=(
# See http://primates.ximian.com/~wberrier/macos/deps/README
-
http://primates.ximian.com/~wberrier/macos/deps/x86/glib-2.14.1-1.macos10.novell.x86.zip
-
http://primates.ximian.com/~wberrier/macos/deps/x86/pkg-config-0.22-1.macos10.novell.x86.zip
-
http://primates.ximian.com/~wberrier/macos/deps/x86/gettext-0.16.1-1.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/glib-2.14.1-0.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/pkg-config-0.22-0.macos10.novell.x86.zip
+
http://primates.ximian.com/~wberrier/macos/deps/x86/gettext-0.16.1-0.macos10.novell.x86.zip
+
+ # Temporarily inject updated mwf (need to name this file so it gets
unpacked last)
+
http://primates.ximian.com/~wberrier/macos/deps/various/native_mwf-1.2.6_updated.tar.gz
)
sunos_8_sparc_ZIP_BUILD () {
Modified: trunk/release/packaging/defs/monodevelop
===================================================================
--- trunk/release/packaging/defs/monodevelop 2008-02-05 04:55:01 UTC (rev
94849)
+++ trunk/release/packaging/defs/monodevelop 2008-02-05 05:38:03 UTC (rev
94850)
@@ -3,11 +3,15 @@
# Not needed anymore... ?
#fresh_checkout=1
+USE_PATCHES=1
+
BUILD_HOSTS=(
suse-101-i586
+ macos-10-x86
)
USE_HOSTS=(
+ macos-10-x86
suse-101-i586
suse-101-ppc
suse-101-x86_64
@@ -22,7 +26,6 @@
MONO_DEPS=(
mono
monodoc
- gtksourceview-sharp2
mono-addins
mono-basic
xsp
@@ -34,10 +37,18 @@
gtk-sharp28
gtk-sharp210
gnome-sharp2
+ gtksourceview-sharp2
+ gtksourceview2-sharp
)
get_destroot () {
- DEST_ROOT=noarch
+ if test "x$DISTRO" = "xmacos-10-x86" ; then
+ DEST_ROOT=$DISTRO
+ elif test "x$DISTRO" = "xmacos-10-ppc" ; then
+ DEST_ROOT="macos-10-x86"
+ else
+ DEST_ROOT=noarch
+ fi
}
HEAD_PATH=(
@@ -50,3 +61,44 @@
update_version_file () {
sed -i "s/\(AC_INIT.*, \).*,/\1$VERSION,/" configure.in
}
+
+
+macos_10_ZIP_BUILD () {
+
+ # This is so we can use the relocated mono (Will probably have to do
this for all builds on mac)
+ export MONO_GAC_PREFIX=/tmp/build_deps
+ export MONO_PREFIX=/tmp/build_deps
+ export MONO_CFG_DIR=/tmp/build_deps/etc
+ export MONO_PATH=/tmp/build_deps/lib
+
+ export PERL5LIB=/tmp/build_deps/lib/perl5/site_perl
+
+ ./configure --prefix=/tmp/install --enable-gtksourceview2
--disable-versioncontrol --disable-update-mimedb --disable-update-desktopdb
--disable-gnomeplatform --enable-macplatform || exit 1
+
+ make || exit 1
+ make install || exit 1
+}
+
+macos_10_x86_ZIP_DEPS=(
+
+
http://primates.ximian.com/~wberrier/macos/deps/x86/XML-Parser-2.36-0.macos10.novell.x86.zip
+)
+
+# Even though we only build on x86, we need this dep for a mach-o file
included in XML-Parser
+# otherwise, our universal_merge fails because of missing files
+macos_10_ppc_ZIP_DEPS=(
+
+
http://primates.ximian.com/~wberrier/macos/deps/ppc/XML-Parser-2.36-0.macos10.novell.ppc.zip
+)
+
+# Not sure if rpm and .tar.gz will work... we'll find out
+macos_10_x86_ZIP_RUNTIME_DEPS=(
+
http://download.opensuse.org/repositories/Mono:/Community/openSUSE_10.3/noarch/moma-1.2.6.94332-2.2.noarch.rpm
+
http://primates.ximian.com/~wberrier/macos/deps/various/app-bundles.tar.gz
+)
+
+macos_10_ppc_ZIP_RUNTIME_DEPS=(
+
http://download.opensuse.org/repositories/Mono:/Community/openSUSE_10.3/noarch/moma-1.2.6.94332-2.2.noarch.rpm
+
http://primates.ximian.com/~wberrier/macos/deps/various/app-bundles.tar.gz
+)
+
Modified: trunk/release/packaging/dep_defs/macosx
===================================================================
--- trunk/release/packaging/dep_defs/macosx 2008-02-05 04:55:01 UTC (rev
94849)
+++ trunk/release/packaging/dep_defs/macosx 2008-02-05 05:38:03 UTC (rev
94850)
@@ -1,12 +1,17 @@
#!/usr/bin/env python
-# Hmm... pkgconfig fails when building with 10.3 sdk on 10.4... build the ppc
deps on 10.3 for now.
-# Ok, pkg is building, but now glib fails... fixed with LDFLAGS fixes in
do-install-zip-pkgs
-# Now build is failing on 10.4 with 10.3 sdk because we can't find
/Developer/SDKs/MacOSX10.3.9.sdk glib stuff
-# Ugh.. had to do a symlink from /Developer/SDKs/MacOSX10.3.9.sdk/tmp to /tmp
as a workaround
+# We support 10.4 and up
+# gtk+ build notes:
+#
+#http://developer.imendio.com/projects/gtk-macosx/build-instructions
+#http://developer.imendio.com/svn/gtk-osx-build/gtk-osx.modules
+
+
BUILD_HOSTS = ['macos-10-ppc', 'macos-10-x86']
+prefix = "/Library/Frameworks/Mono.framework/Versions/Current"
+
packages = [
{
'name': 'pkg-config',
@@ -42,8 +47,13 @@
{
'name': 'glib',
'source': 'ftp://ftp.gtk.org/pub/glib/2.14/glib-2.14.1.tar.bz2',
+ 'pre':"""
+ sed -e
"s/\/usr\/local\/share\/:\/usr\/share\//\/usr\/local\/share\/:\/usr\/share\/:\/Library\/Frameworks\/Mono.framework\/Versions\/Current\/share\//g"
glib/gutils.c > new
+ mv new glib/gutils.c
+ """,
'post':"""
- rm -Rf /tmp/install/bin/*
+ # glib-mkenums is required for pango, maybe others
+ #rm -Rf /tmp/install/bin/*
rm -Rf /tmp/install/share/gtk-doc
"""
},
@@ -94,17 +104,18 @@
rm -Rf /tmp/install/bin/*
"""
},
- # Include this because macosx freetype is too old for the new cairo
- # (Tiger's used to be sufficient, but it looks like the new cairo needs
newer than Tiger's)
+# # Include this because macosx freetype is too old for the new cairo
+# # (Tiger's used to be sufficient, but it looks like the new cairo needs
newer than Tiger's)
+# # Note: we may not even need this if we're dropping support for 10.3
+# {
+# 'name': 'freetype',
+# 'source':
'http://download.savannah.gnu.org/releases/freetype/freetype-2.1.10.tar.bz2',
+# 'post':"""
+# rm -Rf /tmp/install/bin/*
+# """
+# },
+ # Include our own because 10.4 and 10.5 ppc have differing expat
versions
{
- 'name': 'freetype',
- 'source':
'http://download.savannah.gnu.org/releases/freetype/freetype-2.1.10.tar.bz2',
- 'post':"""
- rm -Rf /tmp/install/bin/*
- """
- },
- # Include our own because 10.3 and 10.4 ppc have differing expat
versions
- {
'name': 'expat',
'source':
'http://easynews.dl.sourceforge.net/sourceforge/expat/expat-2.0.1.tar.gz',
'post':"""
@@ -112,6 +123,216 @@
rm -Rf /tmp/install/man
"""
},
+ {
+ 'name': 'pixman',
+ 'source':
'http://cairographics.org/snapshots/pixman-0.9.6.tar.gz',
+ },
+ {
+ 'name': 'cairo',
+ #'source':
'http://www.cairographics.org/releases/cairo-1.4.10.tar.gz',
+ 'source':
'http://cairographics.org/snapshots/cairo-1.5.8.tar.gz',
+ 'build': """
+
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/X11R6/lib/pkgconfig FONTCONFIG_CFLAGS="
-I /usr/X11R6/include " FONTCONFIG_LDFLAGS=" -lfontconfig " ./configure
--prefix=/tmp/install --enable-quartz --enable-atsui --enable-pdf --disable-xlib
+ make
+ make install
+ """,
+ 'post':"""
+ # Remove docs
+ rm -Rf /tmp/install/share
+ """
+ },
+ # TODO: There are problems relocating these binaries... is the max
header flag not getting passed in?
+ # Hrm... the flag is getting set... which binary is failing?
+ {
+ 'name': 'pango',
+ 'source':
'http://ftp.gnome.org/pub/GNOME/sources/pango/1.19/pango-1.19.0.tar.bz2',
+ 'build': """
+
+ # Hrm... LDFLAGS not getting set for atsui basic... for
it (TODO: file bug)
+ sed -e "s/framework Carbon/framework Carbon
-headerpad_max_install_names/g" modules/basic/Makefile.in > new
+ mv new modules/basic/Makefile.in
+
+ # Use this prefix so we don't have to do any tricks to
relocate (Do this with all modules?)
+
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/X11R6/lib/pkgconfig
PATH=$PATH:/usr/X11R6/bin ./configure --prefix=%s --without-x
+ make
+
+ rm -Rf /tmp/temp_install
+ make install DESTDIR=/tmp/temp_install || exit 1
+
+ # Do this so all the zip files have the same base, and
we can lay them back here later
+ mkdir -p /tmp/install
+ cd /tmp/temp_install%s
+ mv * /tmp/install
+ """ % (prefix, prefix),
+ },
+ {
+ 'name': 'atk',
+ 'source':
'http://ftp.gnome.org/pub/gnome/sources/atk/1.20/atk-1.20.0.tar.bz2',
+ },
+# ## Tarball generated on linux (opensuse 10.3) using:
+# # Applied patch:
http://people.imendio.com/richard/patches/gtk-configure.patch
+# # Applied patch: from Geoff to remove some spew
+# ./autogen.sh --enable-gtk-doc
+# make
+# # had to remove gtk/test from 'configure' script and from
gtk/Makefile.am SUBDIRS ... why wasn't that in the tarball?
+# make dist-bzip2
+ {
+ 'name': 'gtk+',
+ 'version': '2.15.0',
+ 'source':
'http://primates.ximian.com/~wberrier/macos/sources/gtk+-2.15.0.tar.bz2',
+ 'build': """
+
+ # Dah... 10.3 sdk doesn't have cups.h in the devkit,
don't use 10.3 to build
+ #/usr/include/cups/cups.h
+ unset CC
+ unset MACOSX_DEPLOYMENT_TARGET
+
+ ./configure --prefix=%s --with-gdktarget=quartz
--disable-gtk-doc --disable-docs
+ make
+ cd gtk/xdgmime
+ make
+ cd -
+ make
+ cp /usr/share/automake-*/mkinstalldirs .
+ make install DESTDIR=/tmp/temp_install || exit 1
+
+ # Do this so all the zip files have the same base, and
we can lay them back here later
+ mkdir -p /tmp/install
+ cd /tmp/temp_install%s
+ mv * /tmp/install
+ """ % (prefix, prefix),
+ },
+ {
+ 'name': 'libglade',
+ 'source':
'http://ftp.gnome.org/pub/GNOME/sources/libglade/2.6/libglade-2.6.2.tar.bz2',
+ 'build':"""
+ export
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/pkgconfig
+ ./configure --prefix=/tmp/install
+ make
+ make install
+ """
+ },
+ {
+ 'name': 'XML-Parser',
+ 'source':
'http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/XML-Parser-2.36.tar.gz',
+ 'build':"""
+ perl Makefile.PL PREFIX=/tmp/install
EXPATLIBPATH=/usr/X11R6/lib EXPATINCPATH=/usr/X11R6/include
+ make
+ make install
+ """
+ },
+ {
+ 'name': 'XML-Simple',
+ 'source':
'http://search.cpan.org/CPAN/authors/id/G/GR/GRANTM/XML-Simple-2.18.tar.gz',
+ 'build':"""
+ perl Makefile.PL PREFIX=/tmp/install
+ make
+ make install
+ """
+ },
+ {
+ 'name': 'gtksourceview',
+ 'source':
'http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/2.0/gtksourceview-2.0.2.tar.bz2',
+ 'build':"""
+ # We have a libxml-2.0.pc file... even though mac
doesn't ship with pkg-config :)
+ export
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/lib/pkgconfig
+ ./configure --prefix=/tmp/install
+ make
+ make install
+ """
+ },
+# # Dah... this isn't needed for gtk#... it's in gnome#.
+# {
+# 'name': 'librsvg',
+# 'source':
'http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.18/librsvg-2.18.2.tar.bz2',
+# 'build':"""
+# # fake freetype2.pc files for Apple's libs
+# cat <<EOF > /tmp/build_deps/lib/pkgconfig/freetype2.pc
+#prefix=/usr/X11R6
+#exec_prefix=\${prefix}
+#libdir=/usr/X11R6/lib
+#includedir=\${prefix}/include
+#
+#Name: FreeType 2
+#Description: A free, high-quality, and portable font engine.
+#Version: 9.16.3
+#Requires:
+#Libs: -L\${libdir} -lfreetype -lz
+#Cflags: -I\${includedir}/freetype2 -I\${includedir}
+#EOF
+# export
PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
+# ./configure --prefix=/tmp/install
+# make
+# make install
+#
+# """
+# },
+ #################
+ # Theme stuff
+ #################
+ {
+ 'name': 'hicolor-icon-theme',
+ 'source':
'http://icon-theme.freedesktop.org/releases/hicolor-icon-theme-0.10.tar.gz',
+ },
+ {
+ 'name': 'icon-naming-utils',
+ 'source':
'http://tango.freedesktop.org/releases/icon-naming-utils-0.8.6.tar.gz',
+ },
+ {
+ 'name': 'gnome-icon-theme',
+ 'source':
'http://ftp.gnome.org/pub/GNOME/sources/gnome-icon-theme/2.20/gnome-icon-theme-2.20.0.tar.bz2',
+ 'build':"""
+ export
INU_DATA_DIR=/tmp/build_deps/share/icon-naming-utils
+ ./configure --prefix=/tmp/install
+ make
+ make install
+ """,
+ },
+ {
+ 'name': 'gtk-engines',
+ 'source':
'http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/2.12/gtk-engines-2.12.2.tar.bz2',
+ },
+ #####
+ # fontconfig and freetype disabled... enable them?
+ {
+ 'name': 'ImageMagick',
+ 'version': '6.3.8',
+ 'source':
'ftp://ftp.imagemagick.org/pub/ImageMagick/ImageMagick-6.3.8-2.tar.bz2',
+ 'build':"""
+ ./configure --prefix=/tmp/install
+ make
+ make install SITEPREFIX=/tmp/install
+ # Remove docs
+ rm -Rf /tmp/install/share/doc/ImageMagick-6.3.8
+ # We don't have to worry too much, because we don't
ship ImageMagick
+ """,
+ },
+ # Ugh... requires imagemagick
+ {
+ 'name': 'tango-icon-theme',
+ 'source':
'http://tango.freedesktop.org/releases/tango-icon-theme-0.8.1.tar.gz',
+ 'build':"""
+ export
MAGICK_CONFIGURE_PATH=/tmp/build_deps/lib/ImageMagick-6.3.8/config
+ export
MAGICK_CODER_MODULE_PATH=/tmp/build_deps/lib/ImageMagick-6.3.8/modules-Q16/coders
+ export
INU_DATA_DIR=/tmp/build_deps/share/icon-naming-utils
+ ./configure --prefix=/tmp/install
+ make
+ make install
+ """,
+ },
+ {
+ 'name': 'tango-icon-theme-extras',
+ 'source':
'http://tango.freedesktop.org/releases/tango-icon-theme-extras-0.1.0.tar.gz',
+ 'build':"""
+ export
MAGICK_CONFIGURE_PATH=/tmp/build_deps/lib/ImageMagick-6.3.8/config
+ export
MAGICK_CODER_MODULE_PATH=/tmp/build_deps/lib/ImageMagick-6.3.8/modules-Q16/coders
+ export
INU_DATA_DIR=/tmp/build_deps/share/icon-naming-utils
+ ./configure --prefix=/tmp/install
+ make
+ make install
+ """,
+ },
+
+
]
-
Added: trunk/release/packaging/rpm_defs/mono-core/mono-flush_cache_ppc.patch
===================================================================
--- trunk/release/packaging/rpm_defs/mono-core/mono-flush_cache_ppc.patch
2008-02-05 04:55:01 UTC (rev 94849)
+++ trunk/release/packaging/rpm_defs/mono-core/mono-flush_cache_ppc.patch
2008-02-05 05:38:03 UTC (rev 94850)
@@ -0,0 +1,22 @@
+Index: mono/mono/mini/mini-ppc.c
+===================================================================
+--- mono/mono/mini/mini-ppc.c (revision 92013)
++++ mono/mono/mini/mini-ppc.c (revision 92014)
+@@ -316,7 +316,7 @@
+
+ g_assert ((code - start) <= 16);
+
+- mono_arch_flush_icache (code, 16);
++ mono_arch_flush_icache (start, 16);
+ cached = start;
+ mono_mini_arch_unlock ();
+ return cached;
+@@ -350,7 +350,7 @@
+
+ g_assert ((code - start) <= size);
+
+- mono_arch_flush_icache (code, size);
++ mono_arch_flush_icache (start, size);
+ cache [sig->param_count] = start;
+ mono_mini_arch_unlock ();
+ return start;
Added:
trunk/release/packaging/rpm_defs/monodevelop/monodevelop-mac_wrapper_94433.patch
===================================================================
---
trunk/release/packaging/rpm_defs/monodevelop/monodevelop-mac_wrapper_94433.patch
2008-02-05 04:55:01 UTC (rev 94849)
+++
trunk/release/packaging/rpm_defs/monodevelop/monodevelop-mac_wrapper_94433.patch
2008-02-05 05:38:03 UTC (rev 94850)
@@ -0,0 +1,12 @@
+Index: monodevelop/monodevelop.in
+===================================================================
+--- monodevelop/monodevelop.in (revision 94432)
++++ monodevelop/monodevelop.in (revision 94433)
+@@ -30,6 +30,7 @@
+ mozilla_script=$(which mozilla 2> /dev/null)
+ firefox_script=$(which firefox 2> /dev/null)
+
++ if [ -z $mozilla_script ] && [ -z $firefox_script ]; then return; fi
+ for runtime_script in "$firefox_script $mozilla_script"; do
+ MOZDIR=$(grep "MOZ_DIST_LIB=" $runtime_script 2> /dev/null |
cut -d '"' -f 2 | cut -d '=' -f 2)
+ if test -e "$MOZDIR/$MOZFILE"; then echo $MOZDIR; return; fi
Modified: trunk/release/windows-installer/buildwindows-installer
===================================================================
--- trunk/release/windows-installer/buildwindows-installer 2008-02-05
04:55:01 UTC (rev 94849)
+++ trunk/release/windows-installer/buildwindows-installer 2008-02-05
05:38:03 UTC (rev 94850)
@@ -94,6 +94,7 @@
def get_filelist(self):
# Only compute once
+ # TODO: could be redone to use updated runtime_deps stuff in
packaging.py, but this should still be ok
try:
return self.files
except AttributeError:
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
