| --- gtk+-2.24.20/gtk/Makefile.am.orig 2013-02-03 20:54:15.000000000 +0000 |
| +++ gtk+-2.24.20/gtk/Makefile.am 2013-07-29 03:59:13.433555700 +0000 |
| @@ -1048,15 +1051,14 @@ |
| |
| # Workaround for UAC silliness: programs with "update" in their name |
| # are believed to be installers and require elevated privileges to be |
| -# used... Use a manifest file to tell Windows that |
| +# used... Embed a manifest file into executable to tell Windows that |
| # gtk-update-icon-cache.exe doesn't require any special privileges. |
| |
| GTK_UPDATE_ICON_CACHE_MANIFEST = gtk-update-icon-cache.exe.manifest |
| +GTK_UPDATE_ICON_CACHE_RC = gtk-update-icon-cache.rc |
| +GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT = gtk-update-icon-cache_manifest.o |
| |
| -bin_SCRIPTS += \ |
| - $(GTK_UPDATE_ICON_CACHE_MANIFEST) |
| - |
| -gtk-update-icon-cache.exe.manifest: |
| +$(GTK_UPDATE_ICON_CACHE_MANIFEST): |
| (echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' ; \ |
| echo '<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">' ; \ |
| echo ' <assemblyIdentity version="1.0.0.0"' ; \ |
| @@ -1075,13 +1077,21 @@ |
| echo ' </trustInfo>' ; \ |
| echo '</assembly>' ) >$@ |
| |
| + |
| +$(GTK_UPDATE_ICON_CACHE_RC): |
| + (echo '1 24 '$(GTK_UPDATE_ICON_CACHE_MANIFEST)) >$@ |
| + |
| +$(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDATE_ICON_CACHE_MANIFEST) |
| + $(WINDRES) --input $< --output $@ --output-format=coff |
| + |
| endif |
| |
| gtk_query_immodules_2_0_DEPENDENCIES = $(DEPS) |
| gtk_query_immodules_2_0_LDADD = $(LDADDS) $(GMODULE_LIBS) |
| gtk_query_immodules_2_0_SOURCES = queryimmodules.c |
| |
| -gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) |
| +gtk_update_icon_cache_DEPENDENCIES = $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT) |
| +gtk_update_icon_cache_LDADD = $(GDK_PIXBUF_LIBS) $(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT) |
| gtk_update_icon_cache_SOURCES = updateiconcache.c |
| |
| .PHONY: files test test-debug |
| @@ -1392,7 +1402,7 @@ |
| endif |
| |
| gtkbuiltincache.h: @REBUILD@ stamp-icons |
| - $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) $(GTK_UPDATE_ICON_CACHE_MANIFEST) |
| + $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) |
| $(gtk_update_icon_cache_program) --force --ignore-theme-index \ |
| --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ |
| mv gtkbuiltincache.h.tmp gtkbuiltincache.h |
