[hitori] 08/59: get rid of my attempts to build this with gtk 2.12 (2.14 will be uploaded soon enough)

Markus Koschany apo at moszumanska.debian.org
Fri Jun 23 21:11:27 UTC 2017 

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository hitori.

commit 940bbdbbd50506ab5190b3d70a2d0cde99e06c86
Author: Peter de Wachter <pdewacht at gmail.com>
Date:   Sun Feb 15 20:45:17 2009 +0000

    get rid of my attempts to build this with gtk 2.12 (2.14 will be uploaded soon enough)
---
 debian/changelog                      |  2 --
 debian/control                        |  4 +--
 debian/copyright                      | 11 ++++---
 debian/patches/gtk2.12-backport.patch | 38 ----------------------
 debian/patches/series                 |  1 -
 debian/rules                          | 61 +++++++++++++++++++++++------------
 debian/watch                          |  3 +-
 7 files changed, 49 insertions(+), 71 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0f64e30..06a9ac5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,6 @@
 hitori (0.2.1-1) unstable; urgency=low
 
   * Initial release (Closes: #490222)
-  * The game is patched to use GnomeVFS to launch its help file. This patch
-    can be removed when GTK+ 2.14 enters the archive.
 
  -- Peter De Wachter <pdewacht at gmail.com>  Wed, 03 Sep 2008 20:04:39 +0200
 
diff --git a/debian/control b/debian/control
index 942fa06..a9b9d1e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,7 @@ Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Peter De Wachter <pdewacht at gmail.com>
-Build-Depends: debhelper (>= 7), quilt, autotools-dev, gnome-common,
- gnome-doc-utils, docbook-xml, intltool, libgtk2.0-dev (>= 2.12),
- libgnomevfs2-dev
+Build-Depends: debhelper (>= 7), libgtk2.0-dev (>= 2.14), chrpath
 Standards-Version: 3.8.0
 Homepage: http://tecnocode.co.uk/projects/hitori/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/hitori/
diff --git a/debian/copyright b/debian/copyright
index 974d389..ca9c782 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,7 +11,7 @@ Upstream Author:
 
 Copyright:
 
-    Copyright (C) Philip Withnall 2007-2008 <philip at tecnocode.co.uk>
+    Copyright Philip Withnall 2007-2008 <philip at tecnocode.co.uk>
 
 License:
 
@@ -37,10 +37,11 @@ The documentation is licensed separately:
     Texts, and no Back-Cover Texts.
 
 On Debian systems the complete text of the GNU General Public License
-can be found in the file `/usr/share/common-licenses/GPL'. The text of
-the GNU Free Documentation License can be found in the file
+can be found in the file `/usr/share/common-licenses/GPL-3'. The text
+of the GNU Free Documentation License can be found in the file
 `/usr/share/common-licenses/GFDL-1.2'.
 
 
-The Debian packaging is (C) 2008, Peter De Wachter <pdewacht at gmail.com>
-and is licensed under the same license (GPL) as the program. See above.
+The Debian packaging is Copyright 2008, Peter De Wachter
+<pdewacht at gmail.com> and is licensed under the same license (GPL) as
+the program. See above.
diff --git a/debian/patches/gtk2.12-backport.patch b/debian/patches/gtk2.12-backport.patch
deleted file mode 100644
index f1f3298..0000000
--- a/debian/patches/gtk2.12-backport.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/src/interface.c
-+++ b/src/interface.c
-@@ -21,6 +21,7 @@
- #include <cairo/cairo.h>
- #include <math.h>
- #include <glib/gi18n.h>
-+#include <libgnomevfs/gnome-vfs.h>
- 
- #include "config.h"
- #include "main.h"
-@@ -476,25 +477,18 @@
- void
- hitori_contents_cb (GtkAction *action, Hitori *hitori)
- {
--	GTimeVal current_time;
--	GError *error = NULL;
--
--	g_get_current_time (&current_time);
-+	gnome_vfs_init();
- 
--	if (gtk_show_uri (gtk_widget_get_screen (hitori->window), "ghelp:hitori",
--			  current_time.tv_sec * 1000 + current_time.tv_usec,
--			  &error) == FALSE) {
-+	if (gnome_vfs_url_show("ghelp:hitori") != GNOME_VFS_OK) {
- 		GtkWidget *dialog = gtk_message_dialog_new (NULL,
- 				GTK_DIALOG_MODAL,
- 				GTK_MESSAGE_ERROR,
- 				GTK_BUTTONS_OK,
- 				_("The help contents could not be displayed."));
--		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), error->message);
- 
- 		gtk_dialog_run (GTK_DIALOG (dialog));
- 
- 		gtk_widget_destroy (dialog);
--		g_error_free (error);
- 	}
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3ec45ba..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-gtk2.12-backport.patch
diff --git a/debian/rules b/debian/rules
index 72cf87a..dce5c73 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,46 +3,61 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-SHELL = /bin/bash
 
-include /usr/share/quilt/quilt.make
+export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-build: patch build-stamp
-build-stamp:
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  CROSS = --build $(DEB_HOST_GNU_TYPE)
+else
+  CROSS = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
+
+configure: configure-stamp
+configure-stamp:
 	dh_testdir
-	NOCONFIGURE=1 ./autogen.sh
-# The GENERAL flags make configure skip its version check. Remove when we have GTK+ 2.14.
-	./configure \
-		--prefix /usr \
-		--bindir /usr/games \
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+	./configure $(CROSS) \
+		--prefix=/usr \
+		--bindir=/usr/games \
 		--disable-scrollkeeper \
-		GENERAL_CFLAGS="`pkg-config --cflags gtk+-2.0 gmodule-export-2.0 gnome-vfs-2.0`" \
-		GENERAL_LIBS="`pkg-config --libs gtk+-2.0 gmodule-export-2.0 gnome-vfs-2.0`"
+		CFLAGS="$(CFLAGS)" \
+		LDFLAGS="-Wl,-z,defs -Wl,--as-needed"
+	touch configure-stamp
+
+build: build-stamp
+build-stamp: configure-stamp
+	dh_testdir
 	$(MAKE)
+	chrpath -d src/hitori #dealing with broken libtool the lazy way
 	touch build-stamp
 
-clean: unpatch
+clean:
 	dh_testdir
 	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean configure config.sub config.guess aclocal.m4 libtool ltmain.sh \
-		po/Makefile.in.in po/POTFILES \
-		{.,src,help,data,data/icons,data/icons/*}/Makefile.in
+	dh_clean config.sub config.guess
 
-install: build install-stamp
-install-stamp:
+install: build
 	dh_testdir
 	dh_testroot
 	dh_prep
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/hitori
-	touch install-stamp
 
-binary: install
+binary: binary-arch binary-indep
+
+binary-arch: install
 	dh_testdir
 	dh_testroot
 	dh_install
 	dh_installchangelogs ChangeLog
 # There are two changelogs!
-	install help/ChangeLog debian/hitori/usr/share/doc/hitori/changelog.help
+	install help/ChangeLog debian/hitori/usr/share/doc/hitori/changelog.documentation
 	dh_installdocs
 	dh_installman
 	dh_installmenu
@@ -58,4 +73,8 @@ binary: install
 	dh_md5sums
 	dh_builddeb
 
-.PHONY: build clean install binary
+binary-indep:
+# Nothing to do.
+
+
+.PHONY: build clean install binary binary-arch binary-indep
diff --git a/debian/watch b/debian/watch
index fd8d91b..d08ab29 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=3
 
-http://tecnocode.co.uk/projects/hitori/ http://tecnocode.co.uk/downloads/hitori-(.*)\.tar\.gz
+http://tecnocode.co.uk/projects/hitori/ \
+  http://tecnocode.co.uk/downloads/hitori-(.*)\.tar\.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/hitori.git

More information about the Pkg-games-commits mailing list