File 0001-Revert-Don-t-build-gtk-launch-when-gio-uni... of Package mingw32-gtk3

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Revert-Don-t-build-gtk-launch-when-gio-unix-is-not-a.patch of Package mingw32-gtk3 (Revision b91f5e81d8beaa1d7ee72cb0aafcb5dd)

Currently displaying revision b91f5e81d8beaa1d7ee72cb0aafcb5dd , Show latest

From 080229c0c6b516971d5eb56991f74e7436b8a6a0 Mon Sep 17 00:00:00 2001
From: Hib Eris <hib@hiberis.nl>
Date: Mon, 29 Apr 2013 09:49:39 +0200
Subject: [PATCH] Revert "Don't build gtk-launch when gio-unix is not
 available"

This reverts commit 9a1235bf0dbdb1701779bec0ccae043cc4243ce5.
---
 configure.ac    |    1 -
 gtk/Makefile.am |    7 +++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 34249fa..f0201dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1242,7 +1242,6 @@ if test "$have_gio_unix" = "yes"; then
 else
   GDK_GIO_PACKAGE=gio-2.0
 fi
-AM_CONDITIONAL(HAVE_GIO_UNIX, test "$have_gio_unix" = "yes")
 
 # Check for Pango flags
 
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 03f3e31..a8452fa 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1310,7 +1310,9 @@ endif
 #
 # Installed tools
 #
-bin_PROGRAMS = gtk-query-immodules-3.0
+bin_PROGRAMS = \
+	gtk-query-immodules-3.0	\
+	gtk-launch
 
 if BUILD_ICON_CACHE
 bin_PROGRAMS += gtk-update-icon-cache
@@ -1357,11 +1359,8 @@ gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS)
 gtk_update_icon_cache_SOURCES = updateiconcache.c
 endif
 
-if HAVE_GIO_UNIX
-bin_PROGRAMS += gtk-launch
 gtk_launch_LDADD = $(LDADDS)
 gtk_launch_SOURCES = gtk-launch.c
-endif
 
 .PHONY: files test test-debug
 
-- 
1.7.10.4

Places

File 0001-Revert-Don-t-build-gtk-launch-when-gio-unix-is-not-a.patch of Package mingw32-gtk3 (Revision b91f5e81d8beaa1d7ee72cb0aafcb5dd)

Places