Pastebin launched a little side project called VERYVIRAL.com, check it out ;-) Want more features on Pastebin? Sign Up, it's FREE!
Guest

aur-gnurobots-fix-link-order.patch

By: a guest on Apr 10th, 2012  |  syntax: Diff  |  size: 3.11 KB  |  views: 57  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. diff -rNu gnurobots/01_link_order.patch gnurobots-fixed/01_link_order.patch
  2. --- gnurobots/01_link_order.patch       1970-01-01 03:00:00.000000000 +0300
  3. +++ gnurobots-fixed/01_link_order.patch 2012-04-10 13:19:05.728908808 +0400
  4. @@ -0,0 +1,53 @@
  5. +Description: List libraries after the objects that require them
  6. +Author: Colin Watson <cjwatson@ubuntu.com>
  7. +
  8. +
  9. +Index: b/src/Makefile.am
  10. +===================================================================
  11. +--- a/src/Makefile.am
  12. ++++ b/src/Makefile.am
  13. +@@ -28,5 +28,5 @@
  14. +
  15. + gnurobots_SOURCES = main.c api.c map.c grobot.c \
  16. +               ui-window.c ui-cmdwin.c ui-arena.c
  17. +-gnurobots_LDFLAGS = $(GUILE_LDFLAGS) $(READLINE_LIBS) $(GTHREAD2_LIBS) \
  18. ++gnurobots_LDADD = $(GUILE_LDFLAGS) $(READLINE_LIBS) $(GTHREAD2_LIBS) \
  19. +               $(GTK2_LIBS) $(VTE_LIBS) -lutil
  20. +
  21. +
  22. +Index: b/src/Makefile.in
  23. +===================================================================
  24. +--- a/src/Makefile.in
  25. ++++ b/src/Makefile.in
  26. +@@ -47,9 +47,10 @@
  27. +       grobot.$(OBJEXT) ui-window.$(OBJEXT) ui-cmdwin.$(OBJEXT) \
  28. +       ui-arena.$(OBJEXT)
  29. + gnurobots_OBJECTS = $(am_gnurobots_OBJECTS)
  30. +-gnurobots_LDADD = $(LDADD)
  31. +-gnurobots_LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(gnurobots_LDFLAGS) \
  32. +-      $(LDFLAGS) -o $@
  33. ++am__DEPENDENCIES_1 =
  34. ++gnurobots_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  35. ++      $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
  36. ++      $(am__DEPENDENCIES_1)
  37. + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  38. + depcomp = $(SHELL) $(top_srcdir)/depcomp
  39. + am__depfiles_maybe = depfiles
  40. +@@ -174,7 +175,7 @@
  41. + gnurobots_SOURCES = main.c api.c map.c grobot.c \
  42. +               ui-window.c ui-cmdwin.c ui-arena.c
  43. +
  44. +-gnurobots_LDFLAGS = $(GUILE_LDFLAGS) $(READLINE_LIBS) $(GTHREAD2_LIBS) \
  45. ++gnurobots_LDADD = $(GUILE_LDFLAGS) $(READLINE_LIBS) $(GTHREAD2_LIBS) \
  46. +               $(GTK2_LIBS) $(VTE_LIBS) -lutil
  47. +
  48. + all: all-am
  49. +@@ -235,7 +236,7 @@
  50. +       -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
  51. + gnurobots$(EXEEXT): $(gnurobots_OBJECTS) $(gnurobots_DEPENDENCIES)
  52. +       @rm -f gnurobots$(EXEEXT)
  53. +-      $(gnurobots_LINK) $(gnurobots_OBJECTS) $(gnurobots_LDADD) $(LIBS)
  54. ++      $(LINK) $(gnurobots_OBJECTS) $(gnurobots_LDADD) $(LIBS)
  55. +
  56. + mostlyclean-compile:
  57. +       -rm -f *.$(OBJEXT)
  58. diff -rNu gnurobots/PKGBUILD gnurobots-fixed/PKGBUILD
  59. --- gnurobots/PKGBUILD  1970-01-01 12:13:08.000000000 +0300
  60. +++ gnurobots-fixed/PKGBUILD    2012-04-10 13:19:27.892061267 +0400
  61. @@ -11,13 +11,18 @@
  62.  license=('GPL')
  63.  depends=('vte' 'libxpm' 'guile')
  64.  
  65. -source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz")
  66. -md5sums=('2435f16a80b21ad348aa558e2e0ae9d8')
  67. +source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
  68. +       '01_link_order.patch')
  69. +md5sums=('2435f16a80b21ad348aa558e2e0ae9d8' '49ddbab6a10ae6da7d9d8fc5feac399b')
  70.  
  71.  build() {
  72.  
  73.    cd "$srcdir/$pkgname-$pkgver"
  74.  
  75. +  # fix link order to list libraries after the objects that require them
  76. +  # Copied from http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/oneiric/gnurobots/oneiric/view/head:/debian/patches/01_link_order.patch?start_revid=11
  77. +  patch -p1 < "$srcdir/01_link_order.patch"
  78. +
  79.    ./configure --prefix=/usr --with-x || return 1
  80.  
  81.    make || return 1