gfm-remove-broken-kde-support.patch 2.1 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970
  1. diff -aur --no-dereference package.pristine/configure.ac package.new/configure.ac
  2. --- package.pristine/configure.ac 2016-01-15 21:28:52.000000000 +0100
  3. +++ package.new/configure.ac 2017-10-14 14:20:07.789743672 +0200
  4. @@ -90,22 +90,23 @@
  5. AC_CHECK_FUNCS([getcwd memset mkdir strcasecmp strchr strdup strrchr strstr])
  6. # KDE dialogs support
  7. -AC_ARG_WITH(kde, AC_HELP_STRING([--with-kde], [Compile with KDE support]), [kde=$withval], [kde=no])
  8. -if test "x$kde" = "xdefault"; then
  9. - case $host_os in
  10. - *mingw*)
  11. - kde=no
  12. - ;;
  13. - *)
  14. - kde=yes
  15. - ;;
  16. - esac
  17. -fi
  18. -if test "x$kde" = "xyes"; then
  19. - AC_PROG_CXX
  20. - AC_PATH_KDE
  21. - AC_DEFINE(WITH_KDE, 1, [Use KDE support])
  22. -fi
  23. +#AC_ARG_WITH(kde, AC_HELP_STRING([--with-kde], [Compile with KDE support]), [kde=$withval], [kde=no])
  24. +#if test "x$kde" = "xdefault"; then
  25. +# case $host_os in
  26. +# *mingw*)
  27. +# kde=no
  28. +# ;;
  29. +# *)
  30. +# kde=yes
  31. +# ;;
  32. +# esac
  33. +#fi
  34. +#if test "x$kde" = "xyes"; then
  35. +# AC_PROG_CXX
  36. +# AC_PATH_KDE
  37. +# AC_DEFINE(WITH_KDE, 1, [Use KDE support])
  38. +#fi
  39. +kde=no
  40. AM_CONDITIONAL(USE_KDE, test "x$kde" = "xyes")
  41. AC_SUBST(kde)
  42. diff -aur --no-dereference package.pristine/src/Makefile.am package.new/src/Makefile.am
  43. --- package.pristine/src/Makefile.am 2013-05-12 20:57:27.000000000 +0200
  44. +++ package.new/src/Makefile.am 2017-10-14 14:45:40.012267573 +0200
  45. @@ -8,18 +8,18 @@
  46. # build instructions
  47. gfm_CPPFLAGS = @TIFILES_CFLAGS@ @TICONV_CFLAGS@ @TICALCS_CFLAGS@ \
  48. @GLIB_CFLAGS@ @GTK_CFLAGS@ @GLADE_CFLAGS@ \
  49. - @KDE_INCLUDES@ @QT_INCLUDES@ \
  50. -DSHARE_DIR=\"$(pkgdatadir)\" \
  51. -DLOCALEDIR=\"$(datadir)/locale\"
  52. +# @KDE_INCLUDES@ @QT_INCLUDES@
  53. gfm_LDFLAGS = -export-dynamic
  54. gfm_LDADD = \
  55. @TIFILES_LIBS@ @TICONV_LIBS@ @TICALCS_LIBS@ \
  56. @GLIB_LIBS@ @GTK_LIBS@ @GLADE_LIBS@ \
  57. - @LIB_KDECORE@ @LIB_KDEUI@ @LIB_KIO@ @LIB_QT@ @KDE_LDFLAGS@ \
  58. - @QT_LDFLAGS@ @X_LDFLAGS@ \
  59. @LTLIBINTL@
  60. +# @LIB_KDECORE@ @LIB_KDEUI@ @LIB_KIO@ @LIB_QT@ @KDE_LDFLAGS@ \
  61. +# @QT_LDFLAGS@ @X_LDFLAGS@
  62. # automake wants all .c files listed explicitly. This sucks. qmake does the
  63. # right thing with just "*.c".