tags 470350 patch
thanks
The patch is a bit verbose, as I've run 'autoreconf' in order to make
it actually buildable, but the gist of it is in the changes in the
configure.ac and gtwitter/Makefile.am files.
What this does is add the library flags for gnome-sharp-2.0 which was
implicit before but obviously doesn't work anymore.
cmn
--
Carlos Martín Nieto | http://cmartin.tk
diff -ur gtwitter-1.0beta.orig/Makefile.in gtwitter-1.0beta/Makefile.in
--- gtwitter-1.0beta.orig/Makefile.in 2008-03-22 10:34:18.000000000 +0100
+++ gtwitter-1.0beta/Makefile.in 2008-03-22 10:45:37.000000000 +0100
@@ -86,6 +86,8 @@
GCONF_SHARP_20_LIBS = @GCONF_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GNOME_SHARP_20_CFLAGS = @GNOME_SHARP_20_CFLAGS@
+GNOME_SHARP_20_LIBS = @GNOME_SHARP_20_LIBS@
GNOME_VFS_SHARP_20_CFLAGS = @GNOME_VFS_SHARP_20_CFLAGS@
GNOME_VFS_SHARP_20_LIBS = @GNOME_VFS_SHARP_20_LIBS@
GTK_SHARP_20_CFLAGS = @GTK_SHARP_20_CFLAGS@
Only in gtwitter-1.0beta: autom4te.cache
diff -ur gtwitter-1.0beta.orig/configure gtwitter-1.0beta/configure
--- gtwitter-1.0beta.orig/configure 2008-03-22 10:34:18.000000000 +0100
+++ gtwitter-1.0beta/configure 2008-03-22 10:45:35.000000000 +0100
@@ -646,6 +646,8 @@
GLIB_SHARP_20_LIBS
GCONF_SHARP_20_CFLAGS
GCONF_SHARP_20_LIBS
+GNOME_SHARP_20_CFLAGS
+GNOME_SHARP_20_LIBS
ENABLE_DEBUG_TRUE
ENABLE_DEBUG_FALSE
ENABLE_RELEASE_TRUE
@@ -666,7 +668,9 @@
GLIB_SHARP_20_CFLAGS
GLIB_SHARP_20_LIBS
GCONF_SHARP_20_CFLAGS
-GCONF_SHARP_20_LIBS'
+GCONF_SHARP_20_LIBS
+GNOME_SHARP_20_CFLAGS
+GNOME_SHARP_20_LIBS'
# Initialize some variables set by options.
@@ -1267,6 +1271,10 @@
C compiler flags for GCONF_SHARP_20, overriding pkg-config
GCONF_SHARP_20_LIBS
linker flags for GCONF_SHARP_20, overriding pkg-config
+ GNOME_SHARP_20_CFLAGS
+ C compiler flags for GNOME_SHARP_20, overriding pkg-config
+ GNOME_SHARP_20_LIBS
+ linker flags for GNOME_SHARP_20, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -3014,6 +3022,117 @@
:
fi
+pkg_failed=no
+{ echo "$as_me:$LINENO: checking for GNOME_SHARP_20" >&5
+echo $ECHO_N "checking for GNOME_SHARP_20... $ECHO_C" >&6; }
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$GNOME_SHARP_20_CFLAGS"; then
+ pkg_cv_GNOME_SHARP_20_CFLAGS="$GNOME_SHARP_20_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"gnome-sharp-2.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gnome-sharp-2.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_GNOME_SHARP_20_CFLAGS=`$PKG_CONFIG --cflags "gnome-sharp-2.0"
2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$GNOME_SHARP_20_LIBS"; then
+ pkg_cv_GNOME_SHARP_20_LIBS="$GNOME_SHARP_20_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors
\"gnome-sharp-2.0\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gnome-sharp-2.0") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_GNOME_SHARP_20_LIBS=`$PKG_CONFIG --libs "gnome-sharp-2.0" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ GNOME_SHARP_20_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "gnome-sharp-2.0"`
+ else
+ GNOME_SHARP_20_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "gnome-sharp-2.0"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GNOME_SHARP_20_PKG_ERRORS" >&5
+
+ { { echo "$as_me:$LINENO: error: Package requirements (gnome-sharp-2.0)
were not met:
+
+$GNOME_SHARP_20_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GNOME_SHARP_20_CFLAGS
+and GNOME_SHARP_20_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (gnome-sharp-2.0) were not met:
+
+$GNOME_SHARP_20_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GNOME_SHARP_20_CFLAGS
+and GNOME_SHARP_20_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be
found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GNOME_SHARP_20_CFLAGS
+and GNOME_SHARP_20_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old.
Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GNOME_SHARP_20_CFLAGS
+and GNOME_SHARP_20_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ GNOME_SHARP_20_CFLAGS=$pkg_cv_GNOME_SHARP_20_CFLAGS
+ GNOME_SHARP_20_LIBS=$pkg_cv_GNOME_SHARP_20_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+ :
+fi
+
# Check whether --enable-debug was given.
if test "${enable_debug+set}" = set; then
@@ -3794,6 +3913,8 @@
GLIB_SHARP_20_LIBS!$GLIB_SHARP_20_LIBS$ac_delim
GCONF_SHARP_20_CFLAGS!$GCONF_SHARP_20_CFLAGS$ac_delim
GCONF_SHARP_20_LIBS!$GCONF_SHARP_20_LIBS$ac_delim
+GNOME_SHARP_20_CFLAGS!$GNOME_SHARP_20_CFLAGS$ac_delim
+GNOME_SHARP_20_LIBS!$GNOME_SHARP_20_LIBS$ac_delim
ENABLE_DEBUG_TRUE!$ENABLE_DEBUG_TRUE$ac_delim
ENABLE_DEBUG_FALSE!$ENABLE_DEBUG_FALSE$ac_delim
ENABLE_RELEASE_TRUE!$ENABLE_RELEASE_TRUE$ac_delim
@@ -3802,7 +3923,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -ur gtwitter-1.0beta.orig/configure.ac gtwitter-1.0beta/configure.ac
--- gtwitter-1.0beta.orig/configure.ac 2008-03-22 10:34:18.000000000 +0100
+++ gtwitter-1.0beta/configure.ac 2008-03-22 10:44:42.000000000 +0100
@@ -23,6 +23,7 @@
PKG_CHECK_MODULES([GNOME_VFS_SHARP_20], [gnome-vfs-sharp-2.0])
PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0])
PKG_CHECK_MODULES([GCONF_SHARP_20], [gconf-sharp-2.0])
+PKG_CHECK_MODULES([GNOME_SHARP_20], [gnome-sharp-2.0])
AC_ARG_ENABLE(debug,
diff -ur gtwitter-1.0beta.orig/gtwitter/Makefile.am
gtwitter-1.0beta/gtwitter/Makefile.am
--- gtwitter-1.0beta.orig/gtwitter/Makefile.am 2008-03-22 10:34:18.000000000
+0100
+++ gtwitter-1.0beta/gtwitter/Makefile.am 2008-03-22 10:43:17.000000000
+0100
@@ -71,6 +71,7 @@
$(GLIB_SHARP_20_LIBS) \
$(GCONF_SHARP_20_LIBS) \
$(MONO_CAIRO_LIBS) \
+ $(GNOME_SHARP_LIBS) \
-r:System \
-r:System.Xml \
-r:Mono.Posix \
diff -ur gtwitter-1.0beta.orig/gtwitter/Makefile.in
gtwitter-1.0beta/gtwitter/Makefile.in
--- gtwitter-1.0beta.orig/gtwitter/Makefile.in 2008-03-22 10:34:18.000000000
+0100
+++ gtwitter-1.0beta/gtwitter/Makefile.in 2008-03-22 10:45:37.000000000
+0100
@@ -69,6 +69,8 @@
GCONF_SHARP_20_LIBS = @GCONF_SHARP_20_LIBS@
GLIB_SHARP_20_CFLAGS = @GLIB_SHARP_20_CFLAGS@
GLIB_SHARP_20_LIBS = @GLIB_SHARP_20_LIBS@
+GNOME_SHARP_20_CFLAGS = @GNOME_SHARP_20_CFLAGS@
+GNOME_SHARP_20_LIBS = @GNOME_SHARP_20_LIBS@
GNOME_VFS_SHARP_20_CFLAGS = @GNOME_VFS_SHARP_20_CFLAGS@
GNOME_VFS_SHARP_20_LIBS = @GNOME_VFS_SHARP_20_LIBS@
GTK_SHARP_20_CFLAGS = @GTK_SHARP_20_CFLAGS@
@@ -188,6 +190,7 @@
$(GLIB_SHARP_20_LIBS) \
$(GCONF_SHARP_20_LIBS) \
$(MONO_CAIRO_LIBS) \
+ $(GNOME_SHARP_LIBS) \
-r:System \
-r:System.Xml \
-r:Mono.Posix \
