]>
Commit | Line | Data |
---|---|---|
58d32a9b JB |
1 | --- gnome-commander-1.10.2/libgcmd/Makefile.am.orig 2019-11-28 18:39:39.931001008 +0100 |
2 | +++ gnome-commander-1.10.2/libgcmd/Makefile.am 2019-11-28 18:53:32.773155781 +0100 | |
3 | @@ -6,6 +6,8 @@ | |
49318e58 | 4 | AM_CPPFLAGS = \ |
49318e58 | 5 | $(GNOMEUI_CFLAGS) \ |
58d32a9b | 6 | $(GNOMEVFS_CFLAGS) \ |
49318e58 | 7 | + $(GNOME_CFLAGS) \ |
58d32a9b JB |
8 | + $(GTK_CFLAGS) \ |
9 | -DGTK_DISABLE_SINGLE_INCLUDES \ | |
10 | -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES | |
49318e58 | 11 | |
58d32a9b JB |
12 | --- gnome-commander-1.10.2/src/Makefile.am.orig 2019-04-13 12:03:20.000000000 +0200 |
13 | +++ gnome-commander-1.10.2/src/Makefile.am 2019-11-28 18:59:10.237994244 +0100 | |
14 | @@ -14,6 +14,7 @@ | |
15 | $(GNOME_KEYRING_CFLAGS) \ | |
16 | $(UNIQUE_CFLAGS) \ | |
134a9947 | 17 | $(PYTHON_CFLAGS) \ |
18 | + $(IPTCDATA_CFLAGS) \ | |
58d32a9b JB |
19 | -DGTK_DISABLE_SINGLE_INCLUDES \ |
20 | -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES \ | |
134a9947 | 21 | -DDATADIR=\""$(datadir)"\"\ |
58d32a9b | 22 | @@ -107,7 +108,8 @@ |
134a9947 | 23 | $(GSF_LIBS) \ |
24 | $(POPPLER_LIBS) \ | |
25 | $(PYTHON_LIBS) \ | |
26 | - $(PYTHON_EXTRA_LIBS) | |
27 | + $(PYTHON_EXTRA_LIBS) \ | |
28 | + $(IPTCDATA_LIBS) | |
29 | ||
58d32a9b JB |
30 | CLEANFILES = \ |
31 | gnome-cmd-advrename-lexer.cc | |
4602e6c4 JB |
32 | --- gnome-commander-1.10.3/libgcmd/Makefile.am.orig 2020-06-19 16:28:11.056464167 +0200 |
33 | +++ gnome-commander-1.10.3/libgcmd/Makefile.am 2020-06-19 16:29:17.959435056 +0200 | |
58d32a9b JB |
34 | @@ -1,6 +1,6 @@ |
35 | ## Process this file with automake to produce Makefile.in | |
36 | ||
4602e6c4 JB |
37 | -AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses -Werror=cast-function-type -Wno-cast-function-type -Wno-deprecated-declarations |
38 | +AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses -Wno-deprecated-declarations | |
58d32a9b JB |
39 | AM_LDFLAGS = $(WARN_LDFLAGS) |
40 | ||
41 | AM_CPPFLAGS = \ | |
4602e6c4 JB |
42 | --- gnome-commander-1.10.3/src/Makefile.am.orig 2020-06-19 16:28:11.056464167 +0200 |
43 | +++ gnome-commander-1.10.3/src/Makefile.am 2020-06-19 16:30:23.615746032 +0200 | |
44 | @@ -4,7 +4,7 @@ | |
58d32a9b JB |
45 | |
46 | AM_CXXFLAGS = $(WARN_CXXFLAGS) -Wno-error=switch-default -Wno-switch-default \ | |
4602e6c4 JB |
47 | -Werror=parentheses -Wno-parentheses \ |
48 | - -Werror=cast-function-type -Wno-cast-function-type -Wno-deprecated-declarations | |
49 | + -Wno-deprecated-declarations | |
58d32a9b JB |
50 | AM_LDFLAGS = $(WARN_LDFLAGS) |
51 | ||
52 | AM_CPPFLAGS = \ | |
4602e6c4 JB |
53 | --- gnome-commander-1.10.3/src/dialogs/Makefile.am.orig 2020-06-19 16:28:11.056464167 +0200 |
54 | +++ gnome-commander-1.10.3/src/dialogs/Makefile.am 2020-06-19 16:30:56.828899435 +0200 | |
55 | @@ -3,7 +3,7 @@ | |
58d32a9b JB |
56 | noinst_LIBRARIES = libgcmd-dialogs.a |
57 | ||
4602e6c4 JB |
58 | AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses \ |
59 | - -Werror=cast-function-type -Wno-cast-function-type -Wno-deprecated-declarations | |
60 | + -Wno-deprecated-declarations | |
58d32a9b JB |
61 | AM_LDFLAGS = $(WARN_LDFLAGS) |
62 | ||
63 | AM_CPPFLAGS = \ | |
4602e6c4 JB |
64 | --- gnome-commander-1.10.3/src/tags/Makefile.am.orig 2020-06-19 16:28:11.059797483 +0200 |
65 | +++ gnome-commander-1.10.3/src/tags/Makefile.am 2020-06-19 16:31:22.348761182 +0200 | |
66 | @@ -3,7 +3,7 @@ | |
58d32a9b JB |
67 | noinst_LIBRARIES = libgcmd-tags.a |
68 | ||
4602e6c4 JB |
69 | AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses \ |
70 | - -Werror=cast-function-type -Wno-cast-function-type -Wno-deprecated-declarations | |
71 | + -Wno-deprecated-declarations | |
58d32a9b JB |
72 | AM_LDFLAGS = $(WARN_LDFLAGS) |
73 | ||
74 | AM_CPPFLAGS = \ | |
4602e6c4 JB |
75 | --- gnome-commander-1.10.3/src/intviewer/Makefile.am.orig 2020-06-19 16:28:11.059797483 +0200 |
76 | +++ gnome-commander-1.10.3/src/intviewer/Makefile.am 2020-06-19 16:31:50.898606514 +0200 | |
77 | @@ -1,7 +1,7 @@ | |
58d32a9b JB |
78 | ## Process this file with automake to produce Makefile.in |
79 | ||
4602e6c4 JB |
80 | AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses \ |
81 | - -Werror=cast-function-type -Wno-cast-function-type -Wno-deprecated-declarations | |
82 | + -Wno-deprecated-declarations | |
58d32a9b JB |
83 | AM_LDFLAGS = $(WARN_LDFLAGS) |
84 | ||
85 | AM_CPPFLAGS = \ | |
4602e6c4 JB |
86 | --- gnome-commander-1.10.3/plugins/test/Makefile.am.orig 2020-06-19 16:28:11.059797483 +0200 |
87 | +++ gnome-commander-1.10.3/plugins/test/Makefile.am 2020-06-19 16:32:28.171737921 +0200 | |
58d32a9b JB |
88 | @@ -1,6 +1,6 @@ |
89 | ## Process this file with automake to produce Makefile.in | |
90 | ||
4602e6c4 JB |
91 | -AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses -Werror=cast-function-type -Wno-cast-function-type -Wno-deprecated-declarations |
92 | +AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses -Wno-deprecated-declarations | |
58d32a9b JB |
93 | AM_LDFLAGS = $(WARN_LDFLAGS) |
94 | ||
95 | AM_CPPFLAGS = \ | |
4602e6c4 JB |
96 | --- gnome-commander-1.10.3/plugins/fileroller/Makefile.am.orig 2020-06-19 16:28:11.059797483 +0200 |
97 | +++ gnome-commander-1.10.3/plugins/fileroller/Makefile.am 2020-06-19 16:32:54.294929733 +0200 | |
58d32a9b JB |
98 | @@ -1,6 +1,6 @@ |
99 | ## Process this file with automake to produce Makefile.in | |
100 | ||
4602e6c4 JB |
101 | -AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses -Werror=cast-function-type -Wno-cast-function-type -Wno-deprecated-declarations |
102 | +AM_CXXFLAGS = $(WARN_CXXFLAGS) -Werror=parentheses -Wno-parentheses -Wno-deprecated-declarations | |
58d32a9b JB |
103 | AM_LDFLAGS = $(WARN_LDFLAGS) |
104 | ||
105 | AM_CPPFLAGS = \ |