Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/anjuta/files/
Date: Sat, 21 May 2022 08:53:45
Message-Id: 1653123201.5840d1e32384cd68db7970ba49671898bbca83a8.chewi@gentoo
1 commit: 5840d1e32384cd68db7970ba49671898bbca83a8
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 21 08:51:51 2022 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Sat May 21 08:53:21 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5840d1e3
7
8 dev-util/anjuta: Patch out itstool dependency in 3.34.0-r2
9
10 Closes: https://bugs.gentoo.org/844964
11 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
12
13 dev-util/anjuta/files/3.34.0-minimal.patch | 50 ++++++++++++++++++++----------
14 1 file changed, 33 insertions(+), 17 deletions(-)
15
16 diff --git a/dev-util/anjuta/files/3.34.0-minimal.patch b/dev-util/anjuta/files/3.34.0-minimal.patch
17 index e3aae39fb377..3acd4c486b44 100644
18 --- a/dev-util/anjuta/files/3.34.0-minimal.patch
19 +++ b/dev-util/anjuta/files/3.34.0-minimal.patch
20 @@ -6,11 +6,11 @@ variables, but not all.
21
22 diff -Naur a/configure b/configure
23 --- a/configure 2019-09-08 19:32:47.000000000 +0100
24 -+++ b/configure 2022-05-15 09:45:11.158669066 +0100
25 ++++ b/configure 2022-05-21 09:43:26.396618735 +0100
26 @@ -4894,6 +4894,7 @@
27 ac_compiler_gnu=$ac_cv_c_compiler_gnu
28 -
29 -
30 +
31 +
32 +: <<'END'
33 for ac_prog in flex lex
34 do
35 @@ -25,40 +25,56 @@ diff -Naur a/configure b/configure
36 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
37 @@ -17726,6 +17728,7 @@
38 fi
39 -
40 -
41 +
42 +
43 +: <<'END'
44 pkg_failed=no
45 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDA" >&5
46 $as_echo_n "checking for GDA... " >&6; }
47 @@ -19533,6 +19536,7 @@
48 $as_echo "#define ENABLE_PACKAGEKIT 1" >>confdefs.h
49 -
50 +
51 fi
52 +END
53 -
54 +
55 LIBANJUTA_CFLAGS='$(ANJUTA_CFLAGS) $(GDL_CFLAGS) $(DEPRECATED_FLAGS) -I$(top_srcdir) -I$(top_builddir)/libanjuta -DPACKAGE_PIXMAPS_DIR=\""$(datadir)/pixmaps/$(PACKAGE)"\" -DPACKAGE_LIB_DIR=\""$(pkglibdir)"\" -DPACKAGE_DATA_DIR=\""$(datadir)/$(PACKAGE)"\"'
56 LIBANJUTA_LIBS='$(top_builddir)/libanjuta/libanjuta-3.la'
57 @@ -19624,6 +19628,7 @@
58 -
59 -
60 -
61 +
62 +
63 +
64 +: <<'END'
65 case "$am__api_version" in
66 1.01234)
67 as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
68 @@ -20441,6 +20446,7 @@
69 -
70 -
71 +
72 +
73 ac_config_commands="$ac_config_commands po-directories"
74 +END
75 -
76 -
77 -
78 -@@ -24091,6 +24097,14 @@
79 +
80 +
81 +
82 +@@ -22459,6 +22465,7 @@
83 +
84 +
85 +
86 ++: <<'END'
87 + YELP_LC_MEDIA_LINKS=true
88 + YELP_LC_DIST=true
89 +
90 +@@ -22738,6 +22745,7 @@
91 + done; \
92 + done;
93 + '
94 ++END
95 +
96 +
97 +
98 +@@ -24091,6 +24099,14 @@
99 am__EXEEXT_FALSE=
100 fi
101 -
102 +
103 +HAVE_PLUGIN_TERMINAL_TRUE='#'
104 +HAVE_PLUGIN_DEVHELP_TRUE='#'
105 +HAVE_PLUGIN_GLADE_TRUE='#'