You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

107 lines
3.5 KiB

  1. Index: xapp/autogen.sh
  2. ===================================================================
  3. --- xapp.orig/autogen.sh 2016-11-19 18:32:42.305346265 +0100
  4. +++ xapp/autogen.sh 2016-11-19 18:32:42.293345934 +0100
  5. @@ -1,11 +1,39 @@
  6. #!/bin/sh
  7. +# Run this to generate all the initial makefiles, etc.
  8. +test -n "$srcdir" || srcdir=$(dirname "$0")
  9. +test -n "$srcdir" || srcdir=.
  10. -srcdir=`dirname $0`
  11. -test -z "$srcdir" && srcdir=.
  12. +olddir=$(pwd)
  13. -which gnome-autogen.sh || {
  14. - echo "You need to install gnome-common from GNOME Git (or from"
  15. - echo "your OS vendor's package manager)."
  16. +cd $srcdir
  17. +
  18. +(test -f configure.ac) || {
  19. + echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
  20. exit 1
  21. }
  22. -. gnome-autogen.sh
  23. +
  24. +# shellcheck disable=SC2016
  25. +PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
  26. +
  27. +if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
  28. + echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
  29. + echo "*** If you wish to pass any to it, please specify them on the" >&2
  30. + echo "*** '$0' command line." >&2
  31. + echo "" >&2
  32. +fi
  33. +
  34. +aclocal --install || exit 1
  35. +glib-gettextize --force --copy || exit 1
  36. +intltoolize --force --copy --automake || exit 1
  37. +autoreconf --verbose --force --install || exit 1
  38. +
  39. +cd "$olddir"
  40. +if [ "$NOCONFIGURE" = "" ]; then
  41. + $srcdir/configure "$@" || exit 1
  42. +
  43. + if [ "$1" = "--help" ]; then exit 0 else
  44. + echo "Now type 'make' to compile $PKG_NAME" || exit 1
  45. + fi
  46. +else
  47. + echo "Skipping configure process."
  48. +fi
  49. Index: xapp/configure.ac
  50. ===================================================================
  51. --- xapp.orig/configure.ac 2016-11-19 18:32:42.305346265 +0100
  52. +++ xapp/configure.ac 2016-11-19 18:34:22.468111327 +0100
  53. @@ -9,6 +9,8 @@
  54. AC_CONFIG_MACRO_DIR([m4])
  55. +m4_ifdef([AX_IS_RELEASE], [AX_IS_RELEASE([always])])
  56. +
  57. # Before making a release, the LT_VERSION string should be modified.
  58. # The string is of the form C:R:A.
  59. # - If interfaces have been changed or added, but binary compatibility has
  60. @@ -28,8 +30,7 @@
  61. AC_PROG_CC
  62. PKG_PROG_PKG_CONFIG
  63. -GNOME_COMPILE_WARNINGS([maximum])
  64. -GNOME_MAINTAINER_MODE_DEFINES
  65. +m4_ifdef([AX_COMPILER_FLAGS], [AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])])
  66. AC_ARG_ENABLE(deprecation_flags,
  67. [AC_HELP_STRING([--enable-deprecation-flags],
  68. Index: xapp/libxapp/Makefile.am
  69. ===================================================================
  70. --- xapp.orig/libxapp/Makefile.am 2016-11-19 18:32:42.305346265 +0100
  71. +++ xapp/libxapp/Makefile.am 2016-11-19 18:32:42.297346044 +0100
  72. @@ -4,6 +4,7 @@
  73. lib_LTLIBRARIES = libxapp.la
  74. AM_CPPFLAGS = \
  75. + $(WARN_CFLAGS) \
  76. -I$(top_srcdir) \
  77. $(XAPP_CFLAGS) \
  78. $(XLIB_CFLAGS) \
  79. @@ -26,6 +27,7 @@
  80. -lrt
  81. libxapp_la_LDFLAGS = \
  82. + $(WARN_LDFLAGS) \
  83. -version-info $(LT_VERSION) \
  84. -export-symbols-regex "^xapp_.*" \
  85. -no-undefined
  86. @@ -49,10 +51,10 @@
  87. XApp_1_0_gir_INCLUDES = GObject-2.0 Gtk-3.0
  88. XApp_1_0_gir_PACKAGES = gdk-pixbuf-2.0 glib-2.0 gobject-2.0 gio-2.0 gtk+-3.0
  89. XApp_1_0_gir_EXPORT_PACKAGES = xapp
  90. -XApp_1_0_gir_CFLAGS = -I$(top_srcdir) -DWITH_INTROSPECTION
  91. +XApp_1_0_gir_CFLAGS = $(WARN_CFLAGS) -I$(top_srcdir) -DWITH_INTROSPECTION
  92. XApp_1_0_gir_LIBS = libxapp.la
  93. XApp_1_0_gir_FILES = $(introspection_sources) $(libxapp_HEADERS)
  94. -XApp_1_0_gir_SCANNERFLAGS = --identifier-prefix=XApp --symbol-prefix=xapp_
  95. +XApp_1_0_gir_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --identifier-prefix=XApp --symbol-prefix=xapp_
  96. INTROSPECTION_GIRS += XApp-1.0.gir
  97. girdir = $(datadir)/gir-1.0