remove-broken-kde-support.patch 2.1 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667
  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-05-30 23:56:19.028317110 +0200
  4. @@ -118,22 +118,23 @@
  5. CFLAGS="$CFLAGS $ARCH"
  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 2016-03-14 20:55:57.000000000 +0100
  44. +++ package.new/src/Makefile.am 2017-05-31 00:03:11.171739478 +0200
  45. @@ -9,16 +9,16 @@
  46. tilp_CPPFLAGS = -I$(top_srcdir)/intl \
  47. @TICABLES_CFLAGS@ @TIFILES_CFLAGS@ @TICALCS_CFLAGS@ @TICONV_CFLAGS@ \
  48. @GLIB_CFLAGS@ @GTK_CFLAGS@ \
  49. - @KDE_INCLUDES@ @QT_INCLUDES@ \
  50. -DSHARE_DIR=\"$(pkgdatadir)\" \
  51. -DLOCALEDIR=\"$(datadir)/locale\" \
  52. -DSYSCONFDIR=\"$(sysconfdir)\" \
  53. -DGTK_DISABLE_DEPRECATED
  54. +# @KDE_INCLUDES@ @QT_INCLUDES@
  55. tilp_LDFLAGS = -export-dynamic
  56. tilp_LDADD = @TICABLES_LIBS@ @TIFILES_LIBS@ @TICALCS_LIBS@ @TICONV_LIBS@ \
  57. - @GLIB_LIBS@ @GTK_LIBS@ \
  58. - @LIB_KDECORE@ @LIB_KDEUI@ @LIB_KIO@ @LIB_QT@ @KDE_LDFLAGS@ \
  59. - @QT_LDFLAGS@ @X_LDFLAGS@ @LIBZ@
  60. + @GLIB_LIBS@ @GTK_LIBS@ @LIBZ@
  61. +# @LIB_KDECORE@ @LIB_KDEUI@ @LIB_KIO@ @LIB_QT@ @KDE_LDFLAGS@ \
  62. +# @QT_LDFLAGS@ @X_LDFLAGS@
  63. tilp_SOURCES = *.h \
  64. tilp_calcs.c tilp_cmdline.c tilp_config.c tilp_error.c \
  65. tilp_files.c tilp_gif.c tilp_main.c \