adium 2253:a7dfc51c987c: New build scripts for libpurple and dep...
commits at adium.im
commits at adium.im
Wed May 20 04:52:14 UTC 2009
details: http://hg.adium.im/adium/rev/a7dfc51c987c
revision: 2253:a7dfc51c987c
author: ryan at rzg.local
date: Wed May 20 00:43:48 2009 -0400
New build scripts for libpurple and dependencies, all 64-bit ready. Meanwhile is not yet linked with libpurple, and I've disabled Kerberos support in Zephyr due to a problem with Apple's 64-bit build of the library.
diffstat:
Dependencies/build.sh | 553 +++++++++++++++++++++++++++++
Dependencies/patches/Meanwhile-common.c.diff | 31 +
Dependencies/patches/Meanwhile-ltmain.sh.diff | 12 +
Dependencies/patches/Meanwhile-srvc_ft.c.diff | 10 +
Dependencies/patches/Meanwhile-st_list.c.diff | 13 +
Dependencies/patches/gettext-Makefile.in.diff | 10 +
Dependencies/patches/glib-Makefile.in.diff | 10 +
Dependencies/patches/glib-gconvert.c.diff | 10 +
8 files changed, 649 insertions(+), 0 deletions(-)
diffs (689 lines):
diff -r 66285c94f683 -r a7dfc51c987c Dependencies/build.sh
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Dependencies/build.sh Wed May 20 00:43:48 2009 -0400
@@ -0,0 +1,553 @@
+#!/bin/bash -eu
+
+##
+# status <string>
+#
+status() {
+ echo -e "\033[36m$1\033[0m"
+}
+
+##
+# error <string>
+#
+error() {
+ echo -e "\033[91mError: $1\033[0m" 1>&2
+}
+
+##
+# warning <string>
+#
+warning() {
+ echo -e "\033[33mWarning: $1\033[0m" 1>&2
+}
+
+##
+# asserttools <tool> ...
+#
+# Checks to make sure the listed tools are installed, and errors if one is not
+# found.
+asserttools() {
+ missing=false
+ for tool in ${@:1}; do
+ if ! which $tool &> /dev/null; then
+ error "Missing required tool $tool."
+ missing=true
+ fi
+ done
+
+ if $missing; then exit 1; fi
+}
+
+##
+# needsconfigure <opts>
+#
+# Checks if the current directory has a config.status file, or if the options
+# passed include --configure
+needsconfigure() {
+ needsconfig=true
+ if [ -f config.status ]; then needsconfig=false; fi
+
+ for opt in ${@:1}; do
+ if [ "$opt" = "--configure" ]; then
+ needsconfig=true
+ break
+ fi
+ done
+
+ "$needsconfig"
+}
+
+##
+# prereq <package> <URL>
+#
+# Downloads the source code to the package if it is not already found in the
+# source directory.
+#
+prereq() {
+ if [ -d "$ROOTDIR/source/$1" ]; then return 0; fi
+ quiet pushd "$ROOTDIR/source"
+
+ # Work out the file extension from the name
+ ext=""
+ for zxt in ".tar.gz" ".tgz" ".tar.bz2" ".tbz", ".tar", ".zip"; do
+ if expr "$2" : '.*'${zxt//./\.}'$' > /dev/null; then
+ ext=$zxt
+ break
+ fi
+ done
+
+ if [ "$ext" = "" ]; then
+ error "Couldn't autodetect file type of $0"
+ exit 1
+ fi
+
+ # Download the package
+ status "Downloading source for package $1"
+ curl -Lfo "$1$ext" "$2"
+
+ # Extract the source to a fixed directory name
+ status "Extracting source for package $1"
+ case "$ext" in
+ \.tar\.gz|\.tgz)
+ quiet mkdir "$1"
+ tar xzf "$1$ext" --strip-components 1 -C "$1"
+ ;;
+ \.tar\.bz2|\.tbz)
+ quiet mkdir "$1"
+ tar xjf "$1$ext" --strip-components 1 -C "$1"
+ ;;
+ \.tar)
+ quiet mkdir "$1"
+ tar xf "$1$ext" --strip-components 1 -C "$1"
+ ;;
+ \.zip)
+ # Zip is a pain in the ass. We have to decide whether to make a
+ # directory and extract into it, or otherwise extract the archive
+ # and then rename the parent directory.
+ error "Too lazy to unzip package $1"
+ exit 1
+ ;;
+ esac
+
+ # Clean up and resume previous operation
+ if [ -f "$1$ext" ]; then rm -f "$1$ext"; fi
+ quiet popd
+}
+
+##
+# quiet <cmd ...>
+#
+# Tries to execute a command silently, and catches the error if it fails.
+#
+quiet() {
+ ${@:1} &> /dev/null || true
+}
+
+##
+# fwdpatch <patchfile> <opts>
+#
+# Patches files without modifying their access or modified times. We do this so
+# that we don't upset Make when we patch and unpatch on the fly.
+#
+fwdpatch() {
+ # Figure out which direction we're going in
+ mode="Applying"
+ for opt in ${@:2}; do
+ if [ "$opt" = "-R" ]; then
+ mode="Reversing"
+ break
+ fi
+ done
+
+ # Get the list of files that will be changed
+ patchfiles=( )
+ while read line
+ do
+ file=$(expr "$line" : '^patching file \(.*\)$')
+ if [ "$file" != "" ]; then
+ patchfiles[${#patchfiles[*]}]="$file"
+ fi
+ done < <(patch -fi "$1" --dry-run ${@:2})
+
+ # Record the old times
+ access=( )
+ modify=( )
+ for file in $patchfiles; do
+ access[${#access[*]}]=$(date -r $(stat -f "%a" "$file") +%Y%m%d%H%M.%S)
+ modify[${#modify[*]}]=$(date -r $(stat -f "%m" "$file") +%Y%m%d%H%M.%S)
+ done
+
+ # Go ahead and apply the patch
+ if [ ${#patchfiles[@]} -eq 1 ]; then
+ status "$mode patch $(basename \"$1\") to 1 file"
+ else
+ status "$mode patch $(basename \"$1\") to ${#patchfiles[@]} files"
+ fi
+ patch -fi "$1" ${@:2}
+
+ # Go back and reset the times on all the files
+ index=0
+ while [ "$index" -lt ${#patchfiles[@]} ]; do
+ touch -at ${access[$index]} ${patchfiles[$index]}
+ touch -mt ${modify[$index]} ${patchfiles[$index]}
+ index+=1
+ done
+}
+
+##
+# revpatch <patchfile> <opts>
+#
+# Reverses a patch. You should always do this when finished building, so the
+# developer always works on the unpatched code.
+revpatch() {
+ fwdpatch $@ -R
+}
+
+##
+# pkg-config
+#
+# We only need a native pkg-config, so no worries about making it a Universal
+# Binary.
+#
+build_pkgconfig() {
+ prereq "pkg-config" \
+ "http://pkgconfig.freedesktop.org/releases/pkg-config-0.22.tar.gz"
+
+ quiet pushd "$ROOTDIR/source/pkg-config"
+
+ if needsconfigure $@; then
+ status "Configuring pkg-config"
+ ./configure --prefix="$ROOTDIR/build"
+ fi
+
+ status "Building and installing pkg-config"
+ make
+ make install
+
+ quiet popd
+}
+
+##
+# gettext
+#
+build_gettext() {
+ prereq "gettext" \
+ "http://mirrors.kernel.org/gnu/gettext/gettext-0.17.tar.gz"
+
+ quiet pushd "$ROOTDIR/source/gettext"
+
+ # Patch to reduce the number of superfluous things we build
+ fwdpatch "$ROOTDIR/patches/gettext-Makefile.in.diff" -p0 || true
+
+ if needsconfigure $@; then
+ status "Configuring gettext"
+ CFLAGS="$FLAGS" LDFLAGS="$FLAGS" ./configure \
+ --prefix="$ROOTDIR/build" \
+ --disable-static \
+ --enable-shared \
+ --disable-dependency-tracking
+ fi
+
+ status "Building and installing gettext"
+ make
+ make install
+
+ # Undo all of our patches... goodbye!
+ revpatch "$ROOTDIR/patches/gettext-Makefile.in.diff" -p0
+
+ quiet popd
+}
+
+##
+# glib
+#
+build_glib() {
+ prereq "glib" \
+ "ftp://ftp.gnome.org/pub/gnome/sources/glib/2.20/glib-2.20.2.tar.gz"
+
+ quiet pushd "$ROOTDIR/source/glib"
+
+ # We may have to apply a patch if we're building on PowerPC
+ if [ "$(arch)" = "ppc" ]; then
+ warning "glib may not build correctly from PowerPC."
+ fi
+
+ # Patch to fix building with the native libiconv
+ fwdpatch "$ROOTDIR/patches/glib-gconvert.c.diff" -p0 || true
+
+ # Patch to reduce the number of superfluous things we build
+ fwdpatch "$ROOTDIR/patches/glib-Makefile.in.diff" -p0 || true
+
+ if needsconfigure $@; then
+ status "Configuring glib"
+ CFLAGS="$FLAGS" LDFLAGS="$FLAGS -lintl" \
+ MSGFMT="$ROOTDIR/build/bin/msgfmt" \
+ PKG_CONFIG="$ROOTDIR/build/bin/pkg-config" \
+ ./configure \
+ --prefix="$ROOTDIR/build" \
+ --disable-static \
+ --enable-shared \
+ --with-libiconv=native \
+ --disable-dependency-tracking
+ fi
+
+ status "Building and installing glib"
+ make
+ make install
+
+ # Revert the patches
+ revpatch "$ROOTDIR/patches/glib-Makefile.in.diff" -p0
+ revpatch "$ROOTDIR/patches/glib-gconvert.c.diff" -p0
+
+ quiet popd
+}
+
+##
+# Meanwhile
+#
+build_meanwhile() {
+ prereq "meanwhile" \
+ "http://dl.sourceforge.net/sourceforge/meanwhile/meanwhile-1.0.2.tar.gz"
+
+ quiet pushd "$ROOTDIR/source/meanwhile"
+
+ # Mikael Berthe writes, "It seems that the last guint32_get() fails when
+ # Meanwhile receives the FT offer. I think we can skip it -- works for me
+ # but I can't check it with an older server.
+ fwdpatch "$ROOTDIR/patches/Meanwhile-srvc_ft.c.diff" -p0 || true
+
+ # Fixes Awareness Snapshots with recent Sametime servers, thanks to Mikael
+ # Berthe. "With recent Sametime servers there seem to be 2 bytes after the
+ # Snapshot Message Blocks. This patch tries to use the end of block offset
+ # provided by th server."
+ fwdpatch "$ROOTDIR/patches/Meanwhile-common.c.diff" -p0 || true
+
+ # Patch to fix a crash in blist parsing
+ fwdpatch "$ROOTDIR/patches/Meanwhile-st_list.c.diff" -p0 || true
+
+ # The provided libtool ignores our Universal Binary-makin' flags
+ fwdpatch "$ROOTDIR/patches/Meanwhile-ltmain.sh.diff" -p0 || true
+
+ if needsconfigure $@; then
+ # Delete 'libtool' if it exists, so that we'll generate a new one
+ rm -f libtool
+
+ status "Configuring Meanwhile"
+ CFLAGS="$FLAGS" LDFLAGS="$FLAGS" \
+ PKG_CONFIG="$ROOTDIR/build/bin/pkg-config" \
+ GLIB_LIBS="$ROOTDIR/build/lib" \
+ GLIB_CFLAGS="-I$ROOTDIR/build/include/glib-2.0 \
+ -I$ROOTDIR/build/lib/glib-2.0/include" \
+ ./configure \
+ --prefix="$ROOTDIR/build" \
+ --disable-static \
+ --enable-shared \
+ --disable-doxygen \
+ --disable-mailme \
+ --disable-dependency-tracking
+ fi
+
+ status "Building and installing Meanwhile"
+ make
+ make install
+
+ # Undo all the patches
+ revpatch "$ROOTDIR/patches/Meanwhile-ltmain.sh.diff" -p0
+ revpatch "$ROOTDIR/patches/Meanwhile-st_list.c.diff" -p0
+ revpatch "$ROOTDIR/patches/Meanwhile-common.c.diff" -p0
+ revpatch "$ROOTDIR/patches/Meanwhile-srvc_ft.c.diff" -p0
+
+ quiet popd
+}
+
+##
+# Gadu-Gadu
+#
+build_gadugadu() {
+ # We used to use 1.7.1, which is pretty outdated. Is there a reason?
+ prereq "gadu-gadu" \
+ "http://toxygen.net/libgadu/files/libgadu-1.8.2.tar.gz"
+
+ quiet pushd "$ROOTDIR/source/gadu-gadu"
+
+ if needsconfigure $@; then
+ status "Configuring Gadu-Gadu"
+ CFLAGS="$FLAGS" LDFLAGS="$FLAGS" ./configure \
+ --prefix="$ROOTDIR/build" \
+ --disable-static \
+ --enable-shared \
+ --disable-dependency-tracking
+ fi
+
+ status "Building and installing Gadu-Gadu"
+ make
+ make install
+
+ quiet popd
+}
+
+##
+# intltool
+#
+build_intltool() {
+ # We used to use 0.36.2, but I switched to the latest MacPorts is using
+ prereq "intltool" \
+ "http://ftp.gnome.org/pub/gnome/sources/intltool/0.40/intltool-0.40.6.tar.gz"
+
+ quiet pushd "$ROOTDIR/source/intltool"
+
+ if needsconfigure $@; then
+ status "Configuring intltool"
+ ./configure --prefix="$ROOTDIR/build" --disable-dependency-tracking
+ fi
+
+ status "Building and installing intltool"
+ make
+ make install
+
+ quiet popd
+}
+
+##
+# fetch_libpurple
+#
+fetch_libpurple() {
+ quiet pushd "$ROOTDIR/source"
+
+ if [ -d "im.pidgin.adium" ]; then
+
+ status "Pulling latest changes to libpurple"
+ cd "im.pidgin.adium"
+ mtn pull
+ mtn update
+
+ else
+
+ quiet mkdir "im.pidgin.adium"
+ cd "im.pidgin.adium"
+
+ status "Downloading bootstrap database for libpurple"
+ curl -LOf "http://developer.pidgin.im/static/pidgin.mtn.bz2"
+
+ status "Extracting bootstrap database"
+ bzip2 -d "pidgin.mtn.bz2"
+
+ status "Migrating database to new schema"
+ mtn db -d "pidgin.mtn" migrate
+
+ status "Pulling updates to monotone database"
+ mtn -d "pidgin.mtn" pull --set-default "mtn.pidgin.im" "im.pidgin.*"
+
+ status "Checking out im.pidgin.adium branch"
+ mtn -d "pidgin.mtn" co -b "im.pidgin.adium" .
+
+ fi
+
+ quiet popd
+}
+
+##
+# libpurple
+#
+build_libpurple() {
+# fetch_libpurple
+ prereq "cyrus-sasl" \
+ "ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/sasl/cyrus-sasl-2.1.18.tar.gz"
+
+ # Copy the headers from Cyrus-SASL
+ status "Copying headers from Cyrus-SASL"
+ quiet mkdir -p "$ROOTDIR/build/include/sasl"
+ cp -f "$ROOTDIR/source/cyrus-sasl/include/"*.h "$ROOTDIR/build/include/sasl"
+
+ quiet pushd "$ROOTDIR/source/im.pidgin.adium"
+
+ PROTOCOLS="bonjour,facebook,gg,irc,jabber,msn,myspace,novell,oscar,qq,"
+ PROTOCOLS+="sametime,simple,yahoo,zephyr"
+
+ if needsconfigure $@; then
+ status "Configuring libpurple"
+ CFLAGS="$FLAGS -I/usr/include/kerberosIV \
+ -DHAVE_SSL -DHAVE_OPENSSL -fno-common" \
+ ACLOCAL_FLAGS="-I $ROOTDIR/build/share/aclocal" \
+ PATH="$ROOTDIR/build/bin:$PATH" \
+ LDFLAGS="$FLAGS -lsasl2" \
+ PATH="$ROOTDIR/build/bin:$PATH" \
+ LIBXML_CFLAGS="-I/usr/include/libxml2" \
+ LIBXML_LIBS="-lxml2" \
+ GADU_CFLAGS="-I$ROOTDIR/build/include" \
+ GADU_LIBS="-lgadu" \
+ MEANWHILE_CFLAGS="-I$ROOTDIR/build/include/meanwhile \
+ -I$ROOTDIR/build/include/glib-2.0 \
+ -I$ROOTDIR/build/lib/glib-2.0/include" \
+ MEANWHILE_LIBS="-lmeanwhile -lglib-2.0 -liconv" \
+ ./autogen.sh \
+ --disable-dependency-tracking \
+ --disable-gtkui \
+ --disable-consoleui \
+ --disable-perl \
+ --enable-debug \
+ --disable-static \
+ --enable-shared \
+ --enable-cyrus-sasl \
+ --prefix="$ROOTDIR/build" \
+ --with-static-prpls="$PROTOCOLS" \
+ --disable-plugins \
+ --disable-gstreamer \
+ --disable-avahi \
+ --disable-dbus \
+ --enable-gnutls=no \
+ --enable-nss=no --disable-meanwhile
+
+ # I disabled Kerberos support since 10.5's 64-bit Kerberos framework is
+ # missing some stuff.
+ fi
+
+ status "Building and installing libpurple"
+ make
+ make install
+
+ status "Copying internal libpurple headers"
+ cp -f "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/oscar/oscar.h" \
+ "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/oscar/snactypes.h" \
+ "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/oscar/peer.h" \
+ "$ROOTDIR/source/im.pidgin.adium/libpurple/cmds.h" \
+ "$ROOTDIR/source/im.pidgin.adium/libpurple/internal.h" \
+ "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/msn/"*.h \
+ "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/yahoo/"*.h \
+ "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/gg/buddylist.h" \
+ "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/gg/gg.h" \
+ "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/gg/search.h" \
+ "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/bosh.h" \
+ "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/buddy.h" \
+ "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/caps.h" \
+ "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/jutil.h" \
+ "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/presence.h" \
+ "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/si.h" \
+ "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/jabber.h" \
+ "$ROOTDIR/source/im.pidgin.adium/libpurple/protocols/jabber/iq.h" \
+ "$ROOTDIR/build/include/libpurple"
+
+ quiet popd
+}
+
+##
+# make_po_files
+#
+make_po_files() {
+ warning "Not yet implemented."
+}
+
+##
+# make_framework
+#
+make_framework() {
+ warning "Not yet implemented."
+}
+
+# Check that we're in the Dependencies directory
+ROOTDIR=$(pwd)
+if ! expr "$ROOTDIR" : '.*/Dependencies$' &> /dev/null; then
+ error "Please run this script from the Dependencies directory."
+ exit 1
+fi
+
+# The basic linker/compiler flags we'll be referring to
+FLAGS="-isysroot /Developer/SDKs/MacOSX10.5.sdk \
+ -arch i386 -arch x86_64 -arch ppc \
+ -I$ROOTDIR/build/include \
+ -L$ROOTDIR/build/lib"
+
+# Make the source and build directories while we're here
+quiet mkdir "source"
+quiet mkdir "build"
+
+# TODO: Make this parameterizable
+build_pkgconfig $@
+build_gettext $@
+build_glib $@
+build_meanwhile $@
+build_gadugadu $@
+build_intltool $@
+build_libpurple $@
+make_po_files $@
+make_framework $@
\ No newline at end of file
diff -r 66285c94f683 -r a7dfc51c987c Dependencies/patches/Meanwhile-common.c.diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Dependencies/patches/Meanwhile-common.c.diff Wed May 20 00:43:48 2009 -0400
@@ -0,0 +1,32 @@
+--- src/common.c Sun Nov 04 18:48:00 2007 +0100
++++ src/common.c Tue Nov 06 11:46:26 2007 +0100
+@@ -878,23 +878,24 @@ gboolean mwAwareIdBlock_equal(const stru
+ /* 8.4.2.4 Snapshot */
+
+ void mwAwareSnapshot_get(struct mwGetBuffer *b, struct mwAwareSnapshot *idb) {
+- guint32 junk;
+- char *empty = NULL;
++ guint32 end_of_block;
+
+ g_return_if_fail(b != NULL);
+ g_return_if_fail(idb != NULL);
+
+- guint32_get(b, &junk);
++ guint32_get(b, &end_of_block);
+ mwAwareIdBlock_get(b, &idb->id);
+ mwString_get(b, &idb->group);
+ gboolean_get(b, &idb->online);
+-
+- g_free(empty);
+
+ if(idb->online) {
+ mwString_get(b, &idb->alt_id);
+ mwUserStatus_get(b, &idb->status);
+ mwString_get(b, &idb->name);
++ }
++
++ if( b->ptr < b->buf + end_of_block ) {
++ mwGetBuffer_advance(b, b->buf + end_of_block - b->ptr);
+ }
+ }
+
diff -r 66285c94f683 -r a7dfc51c987c Dependencies/patches/Meanwhile-ltmain.sh.diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Dependencies/patches/Meanwhile-ltmain.sh.diff Wed May 20 00:43:48 2009 -0400
@@ -0,0 +1,13 @@
+--- ltmain.sh.orig 2005-11-22 08:18:02.000000000 -0500
++++ ltmain.sh 2009-05-19 07:10:37.000000000 -0400
+@@ -1042,8 +1042,8 @@
+ old_convenience=
+ deplibs=
+ old_deplibs=
+- compiler_flags=
+- linker_flags=
++ compiler_flags="$CFLAGS"
++ linker_flags="$LDFLAGS"
+ dllsearchpath=
+ lib_search_path=`pwd`
+ inst_prefix_dir=
diff -r 66285c94f683 -r a7dfc51c987c Dependencies/patches/Meanwhile-srvc_ft.c.diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Dependencies/patches/Meanwhile-srvc_ft.c.diff Wed May 20 00:43:48 2009 -0400
@@ -0,0 +1,11 @@
+--- src/srvc_ft.c Tue Nov 06 11:46:26 2007 +0100
++++ src/srvc_ft.c Thu Nov 08 18:58:33 2007 +0100
+@@ -142,7 +142,7 @@ static void recv_channelCreate(struct mw
+ mwString_get(b, &fnm); /* offered filename */
+ mwString_get(b, &txt); /* offering message */
+ guint32_get(b, &size); /* size of offered file */
+- guint32_get(b, &junk); /* unknown */
++ /* guint32_get(b, &junk); */ /* unknown */
+ /* and we just skip an unknown guint16 at the end */
+
+ b_err = mwGetBuffer_error(b);
diff -r 66285c94f683 -r a7dfc51c987c Dependencies/patches/Meanwhile-st_list.c.diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Dependencies/patches/Meanwhile-st_list.c.diff Wed May 20 00:43:48 2009 -0400
@@ -0,0 +1,14 @@
+--- src/st_list.c.orig 2008-08-27 11:32:47.000000000 +1000
++++ src/st_list.c 2008-08-27 10:24:34.000000000 +1000
+@@ -662,7 +662,9 @@
+ g_return_if_fail(b != NULL);
+
+ mwString_get(b, &str);
+- list_get(str, l);
+- g_free(str);
++ if (str) {
++ list_get(str, l);
++ g_free(str);
++ }
+ }
+
diff -r 66285c94f683 -r a7dfc51c987c Dependencies/patches/gettext-Makefile.in.diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Dependencies/patches/gettext-Makefile.in.diff Wed May 20 00:43:48 2009 -0400
@@ -0,0 +1,11 @@
+--- gettext-tools/Makefile.in.orig 2007-11-06 17:40:19.000000000 -0600
++++ gettext-tools/Makefile.in 2007-11-08 04:43:48.000000000 -0600
+@@ -724,7 +724,7 @@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
+ ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../autoconf-lib-link/m4 -I ../m4 -I gnulib-m4 -I libgettextpo/gnulib-m4
+-SUBDIRS = doc intl gnulib-lib libgrep src libgettextpo po projects styles misc man m4 tests gnulib-tests examples
++SUBDIRS = intl gnulib-lib libgrep src libgettextpo po projects styles misc m4
+
+ # Allow users to use "gnulib-tool --update".
+
diff -r 66285c94f683 -r a7dfc51c987c Dependencies/patches/glib-Makefile.in.diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Dependencies/patches/glib-Makefile.in.diff Wed May 20 00:43:48 2009 -0400
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2009-05-16 22:53:59.000000000 -0400
++++ Makefile.in 2009-05-16 22:53:59.000000000 -0400
+@@ -346,7 +346,7 @@
+ gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in
+ TEST_PROGS =
+ AUTOMAKE_OPTIONS = 1.7
+-SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
++SUBDIRS = . m4macros glib gmodule gthread gobject gio po
+ DIST_SUBDIRS = $(SUBDIRS) build
+ bin_SCRIPTS = glib-gettextize
+ AM_CPPFLAGS = \
diff -r 66285c94f683 -r a7dfc51c987c Dependencies/patches/glib-gconvert.c.diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Dependencies/patches/glib-gconvert.c.diff Wed May 20 00:43:48 2009 -0400
@@ -0,0 +1,11 @@
+--- glib/gconvert.c.orig 2009-03-31 19:04:20.000000000 -0400
++++ glib/gconvert.c 2009-05-19 06:10:58.000000000 -0400
+@@ -52,7 +52,7 @@
+ #error GNU libiconv in use but included iconv.h not from libiconv
+ #endif
+ #if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H)
+-#error GNU libiconv not in use but included iconv.h is from libiconv
++//#error GNU libiconv not in use but included iconv.h is from libiconv
+ #endif
+
+ #include "galias.h"
More information about the commits
mailing list