From 1897e66dce271027512497bd9db70f155d9bf9d7 Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Fri, 10 Nov 2017 00:54:36 +0000
Subject: [PATCH] build: Drop data-to-c.pl in favour of data-to-c.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Python version was added for the Meson build, but we might as well
use it from autotools too, since it does exactly the same thing as the
Perl version (modulo not including a trailing linebreak, but that
doesn’t matter).

Works fine with Python 2.7 or Python 3.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

https://bugzilla.gnome.org/show_bug.cgi?id=790147
---
 gio/Makefile.am  |  6 +++---
 gio/data-to-c.pl | 37 -------------------------------------
 gio/data-to-c.py |  2 +-
 3 files changed, 4 insertions(+), 41 deletions(-)
 delete mode 100755 gio/data-to-c.pl
 mode change 100644 => 100755 gio/data-to-c.py

diff --git a/gio/Makefile.am b/gio/Makefile.am
index 1ffe0cc6f..0cfda50bf 100644
--- a/gio/Makefile.am
+++ b/gio/Makefile.am
@@ -762,7 +762,7 @@ BUILT_SOURCES += 		\
 	$(NULL)
 
 EXTRA_DIST += 			\
-	data-to-c.pl		\
+	data-to-c.py		\
 	gioenumtypes.h.template	\
 	gioenumtypes.c.template	\
 	gio.rc.in		\
@@ -822,8 +822,8 @@ gio_querymodules_LDADD	 = libgio-2.0.la 		\
 	$(top_builddir)/glib/libglib-2.0.la		\
 	$(NULL)
 
-gconstructor_as_data.h: $(top_srcdir)/glib/gconstructor.h data-to-c.pl
-	$(AM_V_GEN) $(srcdir)/data-to-c.pl $(top_srcdir)/glib/gconstructor.h gconstructor_code > $@.tmp && mv $@.tmp $@
+gconstructor_as_data.h: $(top_srcdir)/glib/gconstructor.h data-to-c.py
+	$(AM_V_GEN) $(srcdir)/data-to-c.py $(top_srcdir)/glib/gconstructor.h gconstructor_code $@
 
 glib_compile_schemas_LDADD = $(top_builddir)/glib/libglib-2.0.la
 glib_compile_schemas_SOURCES = \
diff --git a/gio/data-to-c.pl b/gio/data-to-c.pl
deleted file mode 100755
index 28c1d71e6..000000000
--- a/gio/data-to-c.pl
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env perl
-
-# Copyright © 2011 Red Hat, Inc
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, see <http://www.gnu.org/licenses/>.
-#
-# Author: Kalev Lember <kalevlember@gmail.com>
-
-
-if (@ARGV != 2) {
-    die "Usage: data-to-c.pl <filename> <variable>\n";
-}
-
-$file = $ARGV[0];
-
-open (FILE, $file) || die "Cannot open $file: $!\n";
-
-printf ("const char %s[] = \"", $ARGV[1]);
-while (my $line = <FILE>) {
-    foreach my $c (split //, $line) {
-        printf ("\\x%02x", ord ($c));
-    }
-}
-print "\";\n";
-
-close (FILE);
diff --git a/gio/data-to-c.py b/gio/data-to-c.py
old mode 100644
new mode 100755
index 7a8d8a865..f226220ed
--- a/gio/data-to-c.py
+++ b/gio/data-to-c.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python
 
 import sys