File: fix-FTBFS

package info (click to toggle)
gfm 1.08-1
  • links: PTS, VCS
  • area: main
  • in suites: bullseye, buster, sid
  • size: 1,240 kB
  • sloc: ansic: 2,966; cpp: 255; makefile: 95; xml: 41; sed: 16; sh: 1
file content (98 lines) | stat: -rw-r--r-- 2,701 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
Description: Get rid of the severely outdated KDE support to fix build.
Author: Lionel Debroux <lionel_debroux@yahoo.fr>
Reviewed-by: Andreas B. Mundt <andi@debian.org>
Last-Update: 2018-05-17

--- a/configure.ac
+++ b/configure.ac
@@ -90,24 +90,25 @@
 AC_CHECK_FUNCS([getcwd memset mkdir strcasecmp strchr strdup strrchr strstr])
 
 # KDE dialogs support
-AC_ARG_WITH(kde, AC_HELP_STRING([--with-kde], [Compile with KDE support]), [kde=$withval], [kde=no])
-if test "x$kde" = "xdefault"; then
-  case $host_os in
-    *mingw*)
-      kde=no
-      ;;
-    *)
-      kde=yes
-      ;;
-  esac
-fi
-if test "x$kde" = "xyes"; then
-        AC_PROG_CXX
-        AC_PATH_KDE
-        AC_DEFINE(WITH_KDE, 1, [Use KDE support])
-fi
-AM_CONDITIONAL(USE_KDE, test "x$kde" = "xyes")
-AC_SUBST(kde)
+#AC_ARG_WITH(kde, AC_HELP_STRING([--with-kde], [Compile with KDE support]), [kde=$withval], [kde=no])
+#if test "x$kde" = "xdefault"; then
+#  case $host_os in
+#    *mingw*)
+#      kde=no
+#      ;;
+#    *)
+#      kde=yes
+#      ;;
+#  esac
+#fi
+#if test "x$kde" = "xyes"; then
+#        AC_PROG_CXX
+#        AC_PATH_KDE
+#        AC_DEFINE(WITH_KDE, 1, [Use KDE support])
+#fi
+#AM_CONDITIONAL(USE_KDE, test "x$kde" = "xyes")
+#AC_SUBST(kde)
+AC_DEFINE(WITH_KDE, 0, [Use KDE support])
 
 # Ensure MSVC-compatible struct packing convention is used when
 # compiling for Win32 with gcc.
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,18 +8,17 @@
 # build instructions
 gfm_CPPFLAGS = @TIFILES_CFLAGS@ @TICONV_CFLAGS@ @TICALCS_CFLAGS@ \
 	@GLIB_CFLAGS@ @GTK_CFLAGS@ @GLADE_CFLAGS@ \
-	@KDE_INCLUDES@ @QT_INCLUDES@ \
 	-DSHARE_DIR=\"$(pkgdatadir)\" \
 	-DLOCALEDIR=\"$(datadir)/locale\"
+#	@KDE_INCLUDES@ @QT_INCLUDES@
 
 gfm_LDFLAGS = -export-dynamic
 
 gfm_LDADD = \
 	@TIFILES_LIBS@ @TICONV_LIBS@ @TICALCS_LIBS@ \
 	@GLIB_LIBS@ @GTK_LIBS@ @GLADE_LIBS@ \
-	@LIB_KDECORE@ @LIB_KDEUI@ @LIB_KIO@ @LIB_QT@ @KDE_LDFLAGS@ \
-	@QT_LDFLAGS@ @X_LDFLAGS@ \
 	@LTLIBINTL@
+#       @LIB_KDECORE@ @LIB_KDEUI@ @LIB_KIO@ @LIB_QT@ @KDE_LDFLAGS@ @QT_LDFLAGS@ @X_LDFLAGS@
 
 # automake wants all .c files listed explicitly. This sucks. qmake does the
 # right thing with just "*.c".
@@ -45,13 +44,13 @@
   gfm_LDFLAGS += -Wl,../build/mingw/gfm-rc.o
 endif
 
-if USE_KDE
-  gfm_SOURCES += kde.cpp
-  nodist_gfm_SOURCES = kde-private.cpp
-  CLEANFILES = kde-private.cpp
-
-  kde-private.cpp: kde-private.h
-	  @MOC@ kde-private.h -o kde-private.cpp
-else
-  EXTRA_DIST = kde.cpp
-endif
+#if USE_KDE
+#  gfm_SOURCES += kde.cpp
+#  nodist_gfm_SOURCES = kde-private.cpp
+#  CLEANFILES = kde-private.cpp
+#
+#  kde-private.cpp: kde-private.h
+#	  @MOC@ kde-private.h -o kde-private.cpp
+#else
+#  EXTRA_DIST = kde.cpp
+#endif