Package list cinnamon-menus / d4a8dcc
Remove obsolete gnome migration patches Margarita Manterola 4 years ago
5 changed file(s) with 1 addition(s) and 185 deletion(s). Raw diff Collapse all Expand all
11
22 * New upstream release.
33 * Remove obsolete fix_configure patch.
4 * Remove obsolete gnome migration patches.
45
56 -- Margarita Manterola <marga@debian.org> Sat, 19 Nov 2016 12:28:17 +0100
67
+0
-21
debian/patches/Drop-gtkdocize-invocation.patch less more
0 From: Maximiliano Curia <maxy@gnuservers.com.ar>
1 Date: Wed, 14 Sep 2016 22:08:46 +0200
2 Subject: Drop gtkdocize invocation
3
4 This is not used in this package.
5 ---
6 autogen.sh | 1 -
7 1 file changed, 1 deletion(-)
8
9 diff --git a/autogen.sh b/autogen.sh
10 index 51988b5..1e636b4 100755
11 --- a/autogen.sh
12 +++ b/autogen.sh
13 @@ -24,7 +24,6 @@ fi
14
15 aclocal --install || exit 1
16 glib-gettextize --force --copy || exit 1
17 -gtkdocize --copy || exit 1
18 intltoolize --force --copy --automake || exit 1
19 autoreconf --verbose --force --install || exit 1
20
+0
-33
debian/patches/Make-AX_-macros-optional.patch less more
0 From: Maximiliano Curia <maxy@gnuservers.com.ar>
1 Date: Wed, 14 Sep 2016 22:11:51 +0200
2 Subject: Make AX_ macros optional
3
4 Not all AX_ macros are available in previous versions of
5 autoconf-archive, making them optional allows backports.
6 ---
7 configure.ac | 5 +++--
8 1 file changed, 3 insertions(+), 2 deletions(-)
9
10 diff --git a/configure.ac b/configure.ac
11 index 3b4b8f8..10419b5 100644
12 --- a/configure.ac
13 +++ b/configure.ac
14 @@ -2,7 +2,7 @@ AC_PREREQ(2.62)
15
16 AC_INIT([cinnamon-menus], [3.0.2])
17 AC_CONFIG_SRCDIR(libmenu/gmenu-tree.h)
18 -AX_IS_RELEASE([git-directory])
19 +m4_ifdef([AX_IS_RELEASE], [AX_IS_RELEASE([git-directory])])
20
21 AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
22 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
23 @@ -33,7 +33,8 @@ PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0 >= 2.29.15)
24 AC_SUBST(GIO_UNIX_CFLAGS)
25 AC_SUBST(GIO_UNIX_LIBS)
26
27 -AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
28 +m4_ifdef([AX_COMPILER_FLAGS],
29 + [AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])])
30
31 AC_ARG_ENABLE(deprecation_flags,
32 [AC_HELP_STRING([--enable-deprecation-flags],
+0
-128
debian/patches/Migrate-away-from-gnome-common-deprecated-vars-and-macros.patch less more
0 From: Maximiliano Curia <maxy@gnuservers.com.ar>
1 Date: Fri, 22 Jul 2016 13:41:40 +0200
2 Subject: Migrate away from gnome-common deprecated vars and macros
3
4 gnome-common is deprecating some vars and macros, listed here:
5 https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=829932
6
7 This change follows the gnome recommendations from:
8 https://wiki.gnome.org/Projects/GnomeCommon/Migration
9 ---
10 autogen.sh | 43 ++++++++++++++++++++++++++++++++++---------
11 configure.ac | 5 +++--
12 libmenu/Makefile.am | 4 +++-
13 3 files changed, 40 insertions(+), 12 deletions(-)
14
15 diff --git a/autogen.sh b/autogen.sh
16 index 6a576d9..51988b5 100755
17 --- a/autogen.sh
18 +++ b/autogen.sh
19 @@ -1,15 +1,40 @@
20 -#!/bin/bash
21 +#!/bin/sh
22 # Run this to generate all the initial makefiles, etc.
23 +test -n "$srcdir" || srcdir=$(dirname "$0")
24 +test -n "$srcdir" || srcdir=.
25
26 -srcdir=`dirname $0`
27 -test -z "$srcdir" && srcdir=.
28 +olddir=$(pwd)
29
30 -PKG_NAME="cinnamon-menus"
31 -REQUIRED_AUTOMAKE_VERSION=1.10
32 +cd $srcdir
33
34 -which gnome-autogen.sh || {
35 - echo "You need to install gnome-common from GNOME Subversion (or from"
36 - echo "your distribution's package manager)."
37 +(test -f configure.ac) || {
38 + echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
39 exit 1
40 }
41 -USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh
42 +
43 +# shellcheck disable=SC2016
44 +PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
45 +
46 +if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
47 + echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
48 + echo "*** If you wish to pass any to it, please specify them on the" >&2
49 + echo "*** '$0' command line." >&2
50 + echo "" >&2
51 +fi
52 +
53 +aclocal --install || exit 1
54 +glib-gettextize --force --copy || exit 1
55 +gtkdocize --copy || exit 1
56 +intltoolize --force --copy --automake || exit 1
57 +autoreconf --verbose --force --install || exit 1
58 +
59 +cd "$olddir"
60 +if [ "$NOCONFIGURE" = "" ]; then
61 + $srcdir/configure "$@" || exit 1
62 +
63 + if [ "$1" = "--help" ]; then exit 0 else
64 + echo "Now type 'make' to compile $PKG_NAME" || exit 1
65 + fi
66 +else
67 + echo "Skipping configure process."
68 +fi
69 diff --git a/configure.ac b/configure.ac
70 index 096c3a4..3b4b8f8 100644
71 --- a/configure.ac
72 +++ b/configure.ac
73 @@ -2,14 +2,15 @@ AC_PREREQ(2.62)
74
75 AC_INIT([cinnamon-menus], [3.0.2])
76 AC_CONFIG_SRCDIR(libmenu/gmenu-tree.h)
77 +AX_IS_RELEASE([git-directory])
78
79 AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz])
80 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
81 AC_CONFIG_MACRO_DIR([m4])
82 +AC_SUBST([ACLOCAL_AMFLAGS], ["-I $ac_macro_dir \${ACLOCAL_FLAGS}"])
83 AC_CONFIG_HEADERS(config.h)
84
85 AM_MAINTAINER_MODE
86 -GNOME_MAINTAINER_MODE_DEFINES
87
88 # Before making a release, the LT_VERSION string should be modified.
89 # The string is of the form C:R:A.
90 @@ -32,7 +33,7 @@ PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0 >= 2.29.15)
91 AC_SUBST(GIO_UNIX_CFLAGS)
92 AC_SUBST(GIO_UNIX_LIBS)
93
94 -GNOME_COMPILE_WARNINGS=yes
95 +AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])
96
97 AC_ARG_ENABLE(deprecation_flags,
98 [AC_HELP_STRING([--enable-deprecation-flags],
99 diff --git a/libmenu/Makefile.am b/libmenu/Makefile.am
100 index 775c4fe..e92766b 100644
101 --- a/libmenu/Makefile.am
102 +++ b/libmenu/Makefile.am
103 @@ -2,6 +2,7 @@ lib_LTLIBRARIES = libcinnamon-menu-3.la
104
105 AM_CPPFLAGS = \
106 $(GIO_UNIX_CFLAGS) \
107 + $(WARN_CFLAGS) \
108 -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
109 $(DISABLE_DEPRECATED_CFLAGS) \
110 $(DEBUG_CFLAGS)
111 @@ -35,6 +36,7 @@ libcinnamon_menu_3_la_LIBADD = \
112 $(GIO_UNIX_LIBS)
113
114 libcinnamon_menu_3_la_LDFLAGS = \
115 + $(WARN_LDFLAGS) \
116 -version-info $(LIB_MENU_LT_VERSION) \
117 -no-undefined \
118 -export-symbols-regex gmenu_tree
119 @@ -61,7 +63,7 @@ CMenu-3.0.gir: libcinnamon-menu-3.la
120 CMenu_3_0_gir_INCLUDES = Gio-2.0
121 CMenu_3_0_gir_CFLAGS = $(AM_CPPFLAGS)
122 CMenu_3_0_gir_LIBS = libcinnamon-menu-3.la
123 -CMenu_3_0_gir_SCANNERFLAGS = --identifier-prefix=GMenu --symbol-prefix=gmenu --pkg-export=libcinnamon-menu-3.0 --c-include=gmenu-tree.h
124 +CMenu_3_0_gir_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --identifier-prefix=GMenu --symbol-prefix=gmenu --pkg-export=libcinnamon-menu-3.0 --c-include=gmenu-tree.h
125 CMenu_3_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
126 INTROSPECTION_GIRS += CMenu-3.0.gir
127
0 Migrate-away-from-gnome-common-deprecated-vars-and-macros.patch
1 Drop-gtkdocize-invocation.patch
2 Make-AX_-macros-optional.patch