-
Notifications
You must be signed in to change notification settings - Fork 1.3k
/
patch-remove-kde.diff
93 lines (89 loc) · 2.63 KB
/
patch-remove-kde.diff
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
--- configure.ac 2016-01-15 12:28:52.000000000 -0800
+++ configure.ac 2019-02-10 21:57:57.000000000 -0800
@@ -118,24 +118,25 @@
CFLAGS="$CFLAGS $ARCH"
# 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.
--- src/Makefile.am 2016-03-14 12:55:57.000000000 -0700
+++ src/Makefile.am 2019-02-10 22:09:58.000000000 -0800
@@ -9,16 +9,15 @@
tilp_CPPFLAGS = -I$(top_srcdir)/intl \
@TICABLES_CFLAGS@ @TIFILES_CFLAGS@ @TICALCS_CFLAGS@ @TICONV_CFLAGS@ \
@GLIB_CFLAGS@ @GTK_CFLAGS@ \
- @KDE_INCLUDES@ @QT_INCLUDES@ \
-DSHARE_DIR=\"$(pkgdatadir)\" \
-DLOCALEDIR=\"$(datadir)/locale\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DGTK_DISABLE_DEPRECATED
+# @KDE_INCLUDES@ @QT_INCLUDES@
tilp_LDFLAGS = -export-dynamic
tilp_LDADD = @TICABLES_LIBS@ @TIFILES_LIBS@ @TICALCS_LIBS@ @TICONV_LIBS@ \
- @GLIB_LIBS@ @GTK_LIBS@ \
- @LIB_KDECORE@ @LIB_KDEUI@ @LIB_KIO@ @LIB_QT@ @KDE_LDFLAGS@ \
- @QT_LDFLAGS@ @X_LDFLAGS@ @LIBZ@
+ @GLIB_LIBS@ @GTK_LIBS@ @LIBZ@
+# @LIB_KDECORE@ @LIB_KDEUI@ @LIB_KIO@ @LIB_QT@ @KDE_LDFLAGS@ @QT_LDFLAGS@ @X_LDFLAGS@
tilp_SOURCES = *.h \
tilp_calcs.c tilp_cmdline.c tilp_config.c tilp_error.c \
tilp_files.c tilp_gif.c tilp_main.c \
@@ -36,16 +35,16 @@
tilp_LDFLAGS += -Wl,../build/mingw/tilp-rc.o
endif
-if USE_KDE
- tilp_SOURCES += kde.cpp
- nodist_tilp_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
+# tilp_SOURCES += kde.cpp
+# nodist_tilp_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